From 8a2ac56844286b4b196b384498f388a0fd4acd6a Mon Sep 17 00:00:00 2001 From: Anya Tokugawa Date: Sat, 4 Jul 2026 23:19:18 +0900 Subject: [PATCH 1/4] rename space to district --- internal/server/config_handler.go | 3 +- internal/server/district_context.go | 20 ++++ internal/server/render.go | 21 ++-- internal/server/request_context.go | 43 ++++++++ internal/store/districts.go | 157 ++++++++++++++++++++++++++++ internal/store/store.go | 11 +- templates/pages/config.gohtml | 7 ++ 7 files changed, 253 insertions(+), 9 deletions(-) create mode 100644 internal/server/district_context.go create mode 100644 internal/server/request_context.go create mode 100644 internal/store/districts.go diff --git a/internal/server/config_handler.go b/internal/server/config_handler.go index af21ca8..427eb72 100644 --- a/internal/server/config_handler.go +++ b/internal/server/config_handler.go @@ -369,8 +369,9 @@ func (s *Server) handleConfig( return } - s.render( + s.renderWithContext( w, + r, "config.gohtml", map[string]any{ "NavItems": resolveNavItems( diff --git a/internal/server/district_context.go b/internal/server/district_context.go new file mode 100644 index 0000000..4e4f225 --- /dev/null +++ b/internal/server/district_context.go @@ -0,0 +1,20 @@ +package server + +import "pageswiki/internal/store" + +func (s *Server) currentDistrict() *store.District { + + sp, err := + s.store.GetDefaultDistrict() + + if err != nil { + return &store.District{ + ID: 1, + Name: "default", + Title: "Default District", + Enabled: true, + } + } + + return sp +} diff --git a/internal/server/render.go b/internal/server/render.go index 26a52e0..240ffc5 100644 --- a/internal/server/render.go +++ b/internal/server/render.go @@ -15,6 +15,7 @@ func mergeTemplateData( "WikiName": wikiName, "Theme": theme, "ThemeCSS": sThemeCSS, + "District": nil, } if data == nil { @@ -44,12 +45,20 @@ func (s *Server) render( err := s.templates.ExecuteTemplate( w, name, - mergeTemplateData( - data, - s.getWikiName(), - s.getTheme(), - s.getThemeCSS(), - ), + func() map[string]any { + m := + mergeTemplateData( + data, + s.getWikiName(), + s.getTheme(), + s.getThemeCSS(), + ) + + m["District"] = + s.currentDistrict() + + return m + }(), ) if err != nil { diff --git a/internal/server/request_context.go b/internal/server/request_context.go new file mode 100644 index 0000000..6f65bda --- /dev/null +++ b/internal/server/request_context.go @@ -0,0 +1,43 @@ +package server + +import ( + "net/http" + + "pageswiki/internal/store" +) + +type RequestContext struct { + District *store.District +} + +func (s *Server) BuildRequestContext( + r *http.Request, +) *RequestContext { + + return &RequestContext{ + District: s.currentDistrict(), + } +} + +func (s *Server) renderWithContext( + w http.ResponseWriter, + r *http.Request, + name string, + data map[string]any, +) { + + if data == nil { + data = map[string]any{} + } + + data["Context"] = + s.BuildRequestContext( + r, + ) + + s.render( + w, + name, + data, + ) +} diff --git a/internal/store/districts.go b/internal/store/districts.go new file mode 100644 index 0000000..277b129 --- /dev/null +++ b/internal/store/districts.go @@ -0,0 +1,157 @@ +package store + +import ( + "database/sql" + "time" + + "github.com/google/uuid" +) + +type District struct { + ID int64 + UUID string + Name string + Title string + Domain string + Enabled bool + CreatedAt int64 +} + +func (s *Store) EnsureDistrictsSchema() error { + + _, err := s.DB.Exec(` + CREATE TABLE IF NOT EXISTS districts ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + uuid TEXT NOT NULL UNIQUE, + name TEXT NOT NULL UNIQUE, + title TEXT NOT NULL, + domain TEXT NOT NULL DEFAULT '', + enabled INTEGER NOT NULL DEFAULT 1, + created_at INTEGER NOT NULL + ) + `) + + if err != nil { + return err + } + + return s.EnsureAtLeastOneDistrict() +} + +func (s *Store) EnsureAtLeastOneDistrict() error { + + var count int + + err := s.DB.QueryRow(` + SELECT count(*) + FROM districts + `).Scan(&count) + + if err != nil { + return err + } + + if count > 0 { + return nil + } + + _, err = s.DB.Exec(` + INSERT INTO districts ( + uuid, + name, + title, + domain, + enabled, + created_at + ) + VALUES (?, 'default', 'Default District', '', 1, ?) + `, + uuid.NewString(), + time.Now().Unix(), + ) + + return err +} + +func (s *Store) GetDefaultDistrict() (*District, error) { + + row := s.DB.QueryRow(` + SELECT + id, + uuid, + name, + title, + domain, + enabled, + created_at + FROM districts + WHERE enabled = 1 + ORDER BY + CASE WHEN name = 'default' THEN 0 ELSE 1 END, + id + LIMIT 1 + `) + + return scanDistrict(row) +} + +func (s *Store) CountDistricts() (int, error) { + + var count int + + err := s.DB.QueryRow(` + SELECT count(*) + FROM districts + `).Scan(&count) + + return count, err +} + +func (s *Store) DeleteDistrict( + id int64, +) error { + + count, err := + s.CountDistricts() + + if err != nil { + return err + } + + if count <= 1 { + return sql.ErrNoRows + } + + _, err = s.DB.Exec(` + DELETE FROM districts + WHERE id = ? + `, id) + + return err +} + +func scanDistrict(row interface { + Scan(dest ...any) error +}) (*District, error) { + + var d District + var enabled int + + err := row.Scan( + &d.ID, + &d.UUID, + &d.Name, + &d.Title, + &d.Domain, + &enabled, + &d.CreatedAt, + ) + + if err != nil { + return nil, err + } + + d.Enabled = enabled != 0 + + return &d, nil +} diff --git a/internal/store/store.go b/internal/store/store.go index 46ab585..0cd92b2 100644 --- a/internal/store/store.go +++ b/internal/store/store.go @@ -10,7 +10,14 @@ func New( db *sql.DB, ) *Store { - return &Store{ - DB: db, + st := + &Store{ + DB: db, + } + + if err := st.EnsureDistrictsSchema(); err != nil { + panic(err) } + + return st } diff --git a/templates/pages/config.gohtml b/templates/pages/config.gohtml index 2a11676..d35be6f 100644 --- a/templates/pages/config.gohtml +++ b/templates/pages/config.gohtml @@ -79,6 +79,13 @@ Editor

{{ T "config.title" }}

+

+Current District: +{{ .Context.District.Name }} +/ +{{ .Context.District.Title }} +

+

{{ T "config.home" }}

Date: Sun, 5 Jul 2026 00:01:24 +0900 Subject: [PATCH 2/4] Add district settings management --- internal/server/config_handler.go | 77 +++++++ internal/server/district_context.go | 26 ++- internal/server/request_context.go | 4 +- internal/store/districts.go | 312 ++++++++++++++++++++++++++++ templates/pages/config.gohtml | 210 +++++++++++++++++++ 5 files changed, 627 insertions(+), 2 deletions(-) diff --git a/internal/server/config_handler.go b/internal/server/config_handler.go index 427eb72..633712c 100644 --- a/internal/server/config_handler.go +++ b/internal/server/config_handler.go @@ -283,6 +283,70 @@ func (s *Server) handleConfig( return } + case "district-create": + + err = s.store.CreateDistrict( + r.FormValue("district_name"), + r.FormValue("district_title"), + r.FormValue("district_domain"), + r.FormValue("district_enabled") == "1", + ) + + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + + case "district-update": + + id, parseErr := + strconv.ParseInt( + r.FormValue("district_id"), + 10, + 64, + ) + + if parseErr != nil { + http.Error(w, "invalid district id", http.StatusBadRequest) + return + } + + err = s.store.UpdateDistrict( + id, + r.FormValue("district_name"), + r.FormValue("district_title"), + r.FormValue("district_domain"), + r.FormValue("district_enabled") == "1", + ) + + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + + case "district-delete": + + id, parseErr := + strconv.ParseInt( + r.FormValue("district_id"), + 10, + 64, + ) + + if parseErr != nil { + http.Error(w, "invalid district id", http.StatusBadRequest) + return + } + + err = s.store.DeleteDistrict( + id, + ) + + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + case "zombie-purge": _, err = s.store.PurgeZombieObjects( @@ -312,6 +376,10 @@ func (s *Server) handleConfig( panel = "objects" } + if strings.HasPrefix(section, "district-") { + panel = "districts" + } + http.Redirect( w, r, @@ -369,6 +437,14 @@ func (s *Server) handleConfig( return } + districts, err := + s.store.ListDistricts() + + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + s.renderWithContext( w, r, @@ -390,6 +466,7 @@ func (s *Server) handleConfig( "ZombieGraceHours": zombieGraceHours, "Objects": recent, "ZombieObjects": zombies, + "Districts": districts, "HomeNavItemsConfig": s.getHomeNavItems(), "SystemNavItemsConfig": s.getSystemNavItems(), }, diff --git a/internal/server/district_context.go b/internal/server/district_context.go index 4e4f225..2c8d706 100644 --- a/internal/server/district_context.go +++ b/internal/server/district_context.go @@ -1,6 +1,10 @@ package server -import "pageswiki/internal/store" +import ( + "net/http" + + "pageswiki/internal/store" +) func (s *Server) currentDistrict() *store.District { @@ -18,3 +22,23 @@ func (s *Server) currentDistrict() *store.District { return sp } + +func (s *Server) districtForRequest( + r *http.Request, +) *store.District { + + if r == nil { + return s.currentDistrict() + } + + sp, err := + s.store.GetDistrictByHost( + r.Host, + ) + + if err != nil { + return s.currentDistrict() + } + + return sp +} diff --git a/internal/server/request_context.go b/internal/server/request_context.go index 6f65bda..5b62bcc 100644 --- a/internal/server/request_context.go +++ b/internal/server/request_context.go @@ -15,7 +15,9 @@ func (s *Server) BuildRequestContext( ) *RequestContext { return &RequestContext{ - District: s.currentDistrict(), + District: s.districtForRequest( + r, + ), } } diff --git a/internal/store/districts.go b/internal/store/districts.go index 277b129..57d1869 100644 --- a/internal/store/districts.go +++ b/internal/store/districts.go @@ -2,6 +2,8 @@ package store import ( "database/sql" + "errors" + "strings" "time" "github.com/google/uuid" @@ -95,6 +97,236 @@ func (s *Store) GetDefaultDistrict() (*District, error) { return scanDistrict(row) } +func (s *Store) GetDistrictByHost( + host string, +) (*District, error) { + + host = + normalizeDistrictHost( + host, + ) + + if host == "" { + return s.GetDefaultDistrict() + } + + subdomain := + host + + if i := strings.IndexByte(host, '.'); i > 0 { + subdomain = host[:i] + } + + row := s.DB.QueryRow(` + SELECT + id, + uuid, + name, + title, + domain, + enabled, + created_at + FROM districts + WHERE enabled = 1 + AND ( + lower(domain) = ? + OR lower(domain) = ? + OR lower(name) = ? + ) + ORDER BY + CASE WHEN lower(domain) = ? THEN 0 ELSE 1 END, + id + LIMIT 1 + `, + host, + subdomain, + subdomain, + host, + ) + + d, err := + scanDistrict( + row, + ) + + if errors.Is(err, sql.ErrNoRows) { + return s.GetDefaultDistrict() + } + + return d, err +} + +func (s *Store) ListDistricts() ([]District, error) { + + rows, err := s.DB.Query(` + SELECT + id, + uuid, + name, + title, + domain, + enabled, + created_at + FROM districts + ORDER BY + CASE WHEN name = 'default' THEN 0 ELSE 1 END, + name, + id + `) + + if err != nil { + return nil, err + } + + defer rows.Close() + + var out []District + + for rows.Next() { + d, err := + scanDistrict( + rows, + ) + + if err != nil { + return nil, err + } + + out = append( + out, + *d, + ) + } + + return out, rows.Err() +} + +func (s *Store) CreateDistrict( + name string, + title string, + domain string, + enabled bool, +) error { + + name = + normalizeDistrictName( + name, + ) + + title = + strings.TrimSpace( + title, + ) + + domain = + normalizeDistrictHost( + domain, + ) + + if name == "" { + return errors.New("district name is required") + } + + if title == "" { + title = name + } + + if err := s.ensureDistrictUnique(0, name, domain); err != nil { + return err + } + + enabledValue := 0 + + if enabled { + enabledValue = 1 + } + + _, err := s.DB.Exec(` + INSERT INTO districts ( + uuid, + name, + title, + domain, + enabled, + created_at + ) + VALUES (?, ?, ?, ?, ?, ?) + `, + uuid.NewString(), + name, + title, + domain, + enabledValue, + time.Now().Unix(), + ) + + return err +} + +func (s *Store) UpdateDistrict( + id int64, + name string, + title string, + domain string, + enabled bool, +) error { + + name = + normalizeDistrictName( + name, + ) + + title = + strings.TrimSpace( + title, + ) + + domain = + normalizeDistrictHost( + domain, + ) + + if id <= 0 { + return errors.New("district id is required") + } + + if name == "" { + return errors.New("district name is required") + } + + if title == "" { + title = name + } + + if err := s.ensureDistrictUnique(id, name, domain); err != nil { + return err + } + + enabledValue := 0 + + if enabled { + enabledValue = 1 + } + + _, err := s.DB.Exec(` + UPDATE districts + SET + name = ?, + title = ?, + domain = ?, + enabled = ? + WHERE id = ? + `, + name, + title, + domain, + enabledValue, + id, + ) + + return err +} + func (s *Store) CountDistricts() (int, error) { var count int @@ -155,3 +387,83 @@ func scanDistrict(row interface { return &d, nil } + +func normalizeDistrictName( + name string, +) string { + + name = + strings.TrimSpace( + strings.ToLower( + name, + ), + ) + + name = + strings.ReplaceAll( + name, + " ", + "-", + ) + + return name +} + +func normalizeDistrictHost( + host string, +) string { + + host = + strings.TrimSpace( + strings.ToLower( + host, + ), + ) + + if host == "" { + return "" + } + + if i := strings.IndexByte(host, ':'); i > 0 { + host = host[:i] + } + + return strings.Trim( + host, + ".", + ) +} + +func (s *Store) ensureDistrictUnique( + excludeID int64, + name string, + domain string, +) error { + + var count int + + err := s.DB.QueryRow(` + SELECT count(*) + FROM districts + WHERE id != ? + AND ( + lower(name) = ? + OR (? != '' AND lower(domain) = ?) + ) + `, + excludeID, + name, + domain, + domain, + ).Scan(&count) + + if err != nil { + return err + } + + if count > 0 { + return errors.New("district name or domain already exists") + } + + return nil +} diff --git a/templates/pages/config.gohtml b/templates/pages/config.gohtml index d35be6f..e9da79f 100644 --- a/templates/pages/config.gohtml +++ b/templates/pages/config.gohtml @@ -54,6 +54,10 @@ Editor + +Districts + + {{ T "config.objects" }} @@ -197,6 +201,212 @@ Save +
+ +

Districts

+ +

+Districts are selected from the request host. The domain may be a full host or a subdomain label. +

+ + + + + + + + + + + + + + + + + +{{ range .Districts }} + + + + + + + + + + + + + + + + + +{{ end }} + + + +
IDNameTitleDomainEnabledCreatedActions
+{{ .ID }} + +
+ + + + +
+ + + + + + + + +{{ formatUnix .CreatedAt }} + + + +
+ +

Create District

+ +
+ + + + + + +
+
+ + + + +
+
+ + + + +
+
+ + + +
+
+ + + +
+ +
+
Date: Sun, 5 Jul 2026 00:06:33 +0900 Subject: [PATCH 3/4] Localize config page labels --- internal/server/i18n.go | 176 ++++++++++++++++++++++------------ templates/pages/config.gohtml | 78 +++++++-------- 2 files changed, 153 insertions(+), 101 deletions(-) diff --git a/internal/server/i18n.go b/internal/server/i18n.go index 783afa0..be5bddd 100644 --- a/internal/server/i18n.go +++ b/internal/server/i18n.go @@ -6,70 +6,122 @@ import ( var translations = map[string]map[string]string{ "en": { - "config.title": "Config", - "config.home": "Home", - "config.wiki_name": "Wiki name", - "config.locale": "Language", - "config.timezone": "Timezone", - "config.theme": "Theme", - "config.zombie_grace_hours": "Zombie grace period (hours)", - "config.home_path": "Home semantic path", - "config.save": "Save", - "config.nav": "Navigation", - "config.objects": "Recent Objects", - "config.primary": "Primary Link", - "config.size": "Size", - "config.updated": "Updated", - "config.object": "Object", - "config.nav_label": "Label", - "config.nav_href": "Href", - "config.nav_order": "Order", - "config.nav_save": "Save Navigation", - "config.nav_home": "Home Navigation", - "config.nav_system": "System Navigation", - "link.title": "Link Manager", - "link.object": "Object", - "link.primary": "Primary", - "link.path": "Path", - "link.linked_at": "Linked At", - "link.action": "Action", - "link.delete": "Delete", - "link.add": "Add", - "link.add_path": "Add Link", - "link.placeholder": "/pageswiki/example", + "config.title": "Config", + "config.home": "Home", + "config.wiki_name": "Wiki name", + "config.locale": "Language", + "config.timezone": "Timezone", + "config.theme": "Theme", + "config.zombie_grace_hours": "Zombie grace period (hours)", + "config.home_path": "Home semantic path", + "config.save": "Save", + "config.nav": "Navigation", + "config.objects": "Recent Objects", + "config.primary": "Primary Link", + "config.size": "Size", + "config.updated": "Updated", + "config.object": "Object", + "config.nav_label": "Label", + "config.nav_href": "Href", + "config.nav_order": "Order", + "config.nav_save": "Save Navigation", + "config.nav_home": "Home Navigation", + "config.nav_system": "System Navigation", + "config.editor": "Editor", + "config.keymap": "Keymap", + "config.keymap_default": "Default", + "config.syntax_highlight": "Syntax highlighting", + "config.autocomplete": "Autocomplete", + "config.districts": "Districts", + "config.current_district": "Current District", + "config.district_help": "Districts are selected from the request host. The domain may be a full host or a subdomain label.", + "config.id": "ID", + "config.name": "Name", + "config.district_title": "Title", + "config.domain": "Domain", + "config.enabled": "Enabled", + "config.created": "Created", + "config.actions": "Actions", + "config.create_district": "Create District", + "config.create": "Create", + "config.delete": "Delete", + "config.delete_district_confirm": "Delete this district?", + "config.unlinked": "unlinked", + "config.zombie_objects": "Zombie Objects", + "config.zombie_help": "Unlinked and empty objects older than the grace period.", + "config.revisions": "Revisions", + "config.max_body": "Max Body", + "config.purge_zombies": "Purge Zombies", + "config.purge_zombies_confirm": "Purge zombie objects?", + "link.title": "Link Manager", + "link.object": "Object", + "link.primary": "Primary", + "link.path": "Path", + "link.linked_at": "Linked At", + "link.action": "Action", + "link.delete": "Delete", + "link.add": "Add", + "link.add_path": "Add Link", + "link.placeholder": "/pageswiki/example", }, "ja": { - "config.title": "設定", - "config.home": "ホーム", - "config.wiki_name": "Wiki名称", - "config.locale": "言語", - "config.timezone": "タイムゾーン", - "config.zombie_grace_hours": "ゾンビ判定猶予時間(時間)", - "config.theme": "テーマ", - "config.home_path": "トップページ", - "config.save": "保存", - "config.nav": "ナビゲーション", - "config.nav_home": "ホームナビゲーション", - "config.nav_system": "システムナビゲーション", - "config.objects": "最近のオブジェクト", - "link.title": "リンク管理", - "link.object": "オブジェクト", - "link.primary": "主リンク", - "link.path": "パス", - "link.linked_at": "リンクされた日時", - "link.action": "操作", - "link.delete": "削除", - "link.add": "追加", - "link.add_path": "リンクを追加", - "link.placeholder": "/pageswiki/example", - "config.primary": "主なリンク", - "config.size": "サイズ", - "config.updated": "最終更新", - "config.object": "オブジェクト", - "config.nav_label": "表示名", - "config.nav_href": "リンク先", - "config.nav_order": "順序", - "config.nav_save": "ナビゲーションを保存", + "config.title": "設定", + "config.home": "ホーム", + "config.wiki_name": "Wiki名称", + "config.locale": "言語", + "config.timezone": "タイムゾーン", + "config.zombie_grace_hours": "ゾンビ判定猶予時間(時間)", + "config.theme": "テーマ", + "config.home_path": "トップページ", + "config.save": "保存", + "config.nav": "ナビゲーション", + "config.nav_home": "ホームナビゲーション", + "config.nav_system": "システムナビゲーション", + "config.objects": "最近のオブジェクト", + "link.title": "リンク管理", + "link.object": "オブジェクト", + "link.primary": "主リンク", + "link.path": "パス", + "link.linked_at": "リンクされた日時", + "link.action": "操作", + "link.delete": "削除", + "link.add": "追加", + "link.add_path": "リンクを追加", + "link.placeholder": "/pageswiki/example", + "config.primary": "主なリンク", + "config.size": "サイズ", + "config.updated": "最終更新", + "config.object": "オブジェクト", + "config.nav_label": "表示名", + "config.nav_href": "リンク先", + "config.nav_order": "順序", + "config.nav_save": "ナビゲーションを保存", + "config.editor": "エディタ", + "config.keymap": "キーマップ", + "config.keymap_default": "標準", + "config.syntax_highlight": "構文ハイライト", + "config.autocomplete": "入力補完", + "config.districts": "District", + "config.current_district": "現在のDistrict", + "config.district_help": "DistrictはリクエストHostから選択されます。domainには完全なホスト名、またはサブドメイン名を指定できます。", + "config.id": "ID", + "config.name": "名前", + "config.district_title": "タイトル", + "config.domain": "ドメイン", + "config.enabled": "有効", + "config.created": "作成日時", + "config.actions": "操作", + "config.create_district": "Districtを作成", + "config.create": "作成", + "config.delete": "削除", + "config.delete_district_confirm": "このDistrictを削除しますか?", + "config.unlinked": "未リンク", + "config.zombie_objects": "ゾンビオブジェクト", + "config.zombie_help": "リンクされておらず、猶予時間を過ぎた空のオブジェクトです。", + "config.revisions": "リビジョン", + "config.max_body": "最大本文サイズ", + "config.purge_zombies": "ゾンビを削除", + "config.purge_zombies_confirm": "ゾンビオブジェクトを削除しますか?", }, } diff --git a/templates/pages/config.gohtml b/templates/pages/config.gohtml index e9da79f..70519a3 100644 --- a/templates/pages/config.gohtml +++ b/templates/pages/config.gohtml @@ -51,11 +51,11 @@ -Editor +{{ T "config.editor" }} -Districts +{{ T "config.districts" }} @@ -84,7 +84,7 @@ Districts

{{ T "config.title" }}

-Current District: +{{ T "config.current_district" }}: {{ .Context.District.Name }} / {{ .Context.District.Title }} @@ -194,7 +194,7 @@ English >
@@ -206,23 +206,23 @@ Save class="config-section config-panel" > -

Districts

+

{{ T "config.districts" }}

-Districts are selected from the request host. The domain may be a full host or a subdomain label. +{{ T "config.district_help" }}

- - - - - - - + + + + + + + @@ -242,7 +242,7 @@ Districts are selected from the request host. The domain may be a full host or a id="district-delete-{{ .ID }}" method="post" action="/-/sys/config" - onsubmit="return confirm('Delete this district?')" + onsubmit="return confirm('{{ T "config.delete_district_confirm" }}')" > -Enabled +{{ T "config.enabled" }} @@ -320,13 +320,13 @@ Enabled form="district-update-{{ .ID }}" type="submit" > -Save +{{ T "config.save" }} @@ -337,7 +337,7 @@ Delete
IDNameTitleDomainEnabledCreatedActions{{ T "config.id" }}{{ T "config.name" }}{{ T "config.district_title" }}{{ T "config.domain" }}{{ T "config.enabled" }}{{ T "config.created" }}{{ T "config.actions" }}
-

Create District

+

{{ T "config.create_district" }}

-Enabled +{{ T "config.enabled" }}

@@ -435,7 +435,7 @@ Create {{ if .Path }}
{{ .Path }} {{ else }} -unlinked +{{ T "config.unlinked" }} {{ end }} @@ -459,10 +459,10 @@ Create -

Zombie Objects

+

{{ T "config.zombie_objects" }}

-Unlinked and empty objects older than the grace period. +{{ T "config.zombie_help" }}

@@ -470,9 +470,9 @@ Unlinked and empty objects older than the grace period. - - - + + + @@ -507,7 +507,7 @@ Unlinked and empty objects older than the grace period. @@ -587,7 +587,7 @@ Purge Zombies @@ -679,7 +679,7 @@ Purge Zombies @@ -714,7 +714,7 @@ Purge Zombies class="config-section config-panel" > -

Editor

+

{{ T "config.editor" }}

+ + + + + diff --git a/assets/vimwasm/app/pageswiki.vim b/assets/vimwasm/app/pageswiki.vim new file mode 100644 index 0000000..448e043 --- /dev/null +++ b/assets/vimwasm/app/pageswiki.vim @@ -0,0 +1,12 @@ +" Small, bundled, pure Vimscript workspace navigation. No shell or network. +if exists('g:loaded_pageswiki') | finish | endif +let g:loaded_pageswiki = 1 +set path=/work/** +set wildignore+=*.swp,*.bak +command! Files call feedkeys(':find ', 'n') +nnoremap f :Files +nnoremap b :ls:buffer +nnoremap ]b :bnext +nnoremap [b :bprevious +nnoremap w :write +nnoremap / :nohlsearch diff --git a/assets/vimwasm/app/vimrc b/assets/vimwasm/app/vimrc new file mode 100644 index 0000000..6a27806 --- /dev/null +++ b/assets/vimwasm/app/vimrc @@ -0,0 +1,55 @@ +set nocompatible +set runtimepath^=/.vim +set number +set guifont=PagesWikiHack:h16 +set background=dark +set cursorline +set laststatus=2 +set showcmd +set ruler +set scrolloff=4 +set sidescrolloff=4 +set noswapfile +set nobackup +set nowritebackup +set display+=lastline +set linebreak +set listchars=tab:»\ ,trail:·,extends:›,precedes:‹ +let mapleader = " " +set hidden +set encoding=utf-8 +set fileencoding=utf-8 +set mouse=a +set backspace=indent,eol,start +set wildmenu +set wildmode=longest:full,full +set incsearch +set hlsearch +set ignorecase +set smartcase +set autoindent +set expandtab +set shiftwidth=4 +set softtabstop=4 +set tabstop=4 +syntax enable +filetype plugin indent on +highlight Normal guifg=#e6edf3 guibg=#1e222a +highlight LineNr guifg=#8994a6 guibg=#1e222a +highlight CursorLine guibg=#2b3240 +highlight StatusLine guifg=#e6edf3 guibg=#35415a gui=NONE + +" Close the hosted Vim session with :q even when the argument list contains +" more files. Unsaved buffers still require :q! explicitly. +cnoreabbrev q getcmdtype() ==# ':' && getcmdline() ==# 'q' ? 'qa' : 'q' +cnoreabbrev q! getcmdtype() ==# ':' && getcmdline() ==# 'q!' ? 'qa!' : 'q!' + +" Pages Wiki writes each exported buffer as a new Revision. +augroup pageswiki + autocmd! + autocmd BufWritePost /work/* execute 'export ' . expand('%:p') +augroup END + +" Pure Vimscript plugins are preloaded into /.vim/plugin by app.js. +" vim-plug installation and fzf's native executable do not work in MEMFS. +" Vendoring fzf.vim alone does not remove that native dependency. diff --git a/assets/vimwasm/package-lock.json b/assets/vimwasm/package-lock.json new file mode 100644 index 0000000..acf1f56 --- /dev/null +++ b/assets/vimwasm/package-lock.json @@ -0,0 +1,21 @@ +{ + "name": "pageswiki-vimwasm-adapter", + "version": "0.1.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "pageswiki-vimwasm-adapter", + "version": "0.1.0", + "dependencies": { + "vim-wasm": "0.0.13" + } + }, + "node_modules/vim-wasm": { + "version": "0.0.13", + "resolved": "https://registry.npmjs.org/vim-wasm/-/vim-wasm-0.0.13.tgz", + "integrity": "sha512-2EkJ4OfMgvA/bURJeu43wqIQ4tpCJymst++Y4R/AKuQlnrvdI4hTpG2jf0yL5TrLt1ui12leLRghrwPOybyu8w==", + "license": "Vim" + } + } +} diff --git a/assets/vimwasm/package.json b/assets/vimwasm/package.json new file mode 100644 index 0000000..91af6b2 --- /dev/null +++ b/assets/vimwasm/package.json @@ -0,0 +1,8 @@ +{ + "name": "pageswiki-vimwasm-adapter", + "private": true, + "version": "0.1.0", + "dependencies": { + "vim-wasm": "0.0.13" + } +} diff --git a/cmd/adapter-gateway/main.go b/cmd/adapter-gateway/main.go new file mode 100644 index 0000000..0c37389 --- /dev/null +++ b/cmd/adapter-gateway/main.go @@ -0,0 +1,515 @@ +package main + +import ( + "bytes" + "crypto/rand" + "encoding/base64" + "encoding/hex" + "encoding/json" + "fmt" + "html/template" + "io" + "log" + "net/http" + "net/http/httputil" + "net/url" + "os" + "path/filepath" + "strings" + "sync" + "time" +) + +type gatewaySession struct { + VimSettings json.RawMessage + Token string + PluginID string + Filename string + ContentType string + ExpiresAtMS int64 + Workspace string + Files map[string]gatewayFile + LastError string +} + +type gatewayFile struct { + SemanticPath string + RevisionUUID string + LastContent string +} + +type gateway struct { + origin string + client *http.Client + mu sync.Mutex + sessions map[string]gatewaySession + codeProxy *httputil.ReverseProxy + excalidrawProxy *httputil.ReverseProxy +} + +func main() { + origin := strings.TrimRight(os.Getenv("PAGESWIKI_ORIGIN"), "/") + if origin == "" { + origin = "http://app:3000" + } + codeOrigin := os.Getenv("CODE_SERVER_ORIGIN") + if codeOrigin == "" { + codeOrigin = "http://code-server:8080" + } + codeURL, err := url.Parse(codeOrigin) + if err != nil { + log.Fatal(err) + } + proxy := httputil.NewSingleHostReverseProxy(codeURL) + originalDirector := proxy.Director + proxy.Director = func(req *http.Request) { + req.URL.Path = strings.TrimPrefix(req.URL.Path, "/code") + if req.URL.Path == "" { + req.URL.Path = "/" + } + originalDirector(req) + } + excalidrawOrigin := os.Getenv("EXCALIDRAW_VIEWER_ORIGIN") + if excalidrawOrigin == "" { + excalidrawOrigin = "http://excalidraw-viewer:8080" + } + excalidrawURL, err := url.Parse(excalidrawOrigin) + if err != nil { + log.Fatal(err) + } + excalidrawProxy := httputil.NewSingleHostReverseProxy(excalidrawURL) + excalidrawDirector := excalidrawProxy.Director + excalidrawProxy.Director = func(req *http.Request) { + req.URL.Path = strings.TrimPrefix(req.URL.Path, "/excalidraw") + if req.URL.Path == "" { + req.URL.Path = "/" + } + excalidrawDirector(req) + } + g := &gateway{origin: origin, client: &http.Client{Timeout: 30 * time.Second}, sessions: map[string]gatewaySession{}, codeProxy: proxy, excalidrawProxy: excalidrawProxy} + mux := http.NewServeMux() + mux.HandleFunc("/health", func(w http.ResponseWriter, _ *http.Request) { w.Write([]byte("ok")) }) + mux.HandleFunc("/open", g.open) + mux.HandleFunc("/code/open", g.open) + mux.HandleFunc("/vim/open", g.open) + mux.HandleFunc("/edit", g.edit) + mux.HandleFunc("/save", g.save) + mux.HandleFunc("/code/", g.code) + mux.HandleFunc("/vim/api/session", g.vimSession) + mux.HandleFunc("/vim/api/save", g.vimSave) + vimFiles := http.FileServer(http.Dir("/vimwasm")) + vimHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.Path == "/vim/" { + data, err := os.ReadFile("/vimwasm/index.html") + if err != nil { + http.Error(w, "vim.wasm frontend is unavailable", http.StatusServiceUnavailable) + return + } + w.Header().Set("Content-Type", "text/html; charset=utf-8") + _, _ = w.Write(data) + return + } + http.StripPrefix("/vim/", vimFiles).ServeHTTP(w, r) + }) + mux.Handle("/vim/", isolationHeaders(vimHandler)) + mux.Handle("/excalidraw/", excalidrawHeaders(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + g.excalidrawProxy.ServeHTTP(w, r) + }))) + log.Printf("adapter gateway origin=%s listen=:3000", origin) + log.Fatal(http.ListenAndServe(":3000", mux)) +} + +func excalidrawHeaders(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Security-Policy", "default-src 'self'; script-src 'self' 'unsafe-eval' 'wasm-unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' data: blob:; font-src 'self' data:; worker-src 'self' blob:; connect-src 'self'; frame-ancestors 'self'; object-src 'none'; base-uri 'none'") + w.Header().Set("X-Content-Type-Options", "nosniff") + w.Header().Set("Referrer-Policy", "no-referrer") + next.ServeHTTP(w, r) + }) +} + +func isolationHeaders(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Cross-Origin-Opener-Policy", "same-origin") + w.Header().Set("Cross-Origin-Embedder-Policy", "require-corp") + w.Header().Set("Cross-Origin-Resource-Policy", "same-origin") + w.Header().Set("Origin-Agent-Cluster", "?1") + next.ServeHTTP(w, r) + }) +} + +func randomID() string { + b := make([]byte, 24) + _, _ = rand.Read(b) + return hex.EncodeToString(b) +} + +func ensureCoderDirectory(root, directory string) error { + relative, err := filepath.Rel(root, directory) + if err != nil || relative == ".." || strings.HasPrefix(relative, ".."+string(filepath.Separator)) { + return fmt.Errorf("workspace directory escapes root") + } + current := root + for _, component := range strings.Split(relative, string(filepath.Separator)) { + if component == "" || component == "." { + continue + } + current = filepath.Join(current, component) + if err := os.Mkdir(current, 0700); err != nil && !os.IsExist(err) { + return err + } + if err := os.Chown(current, 1000, 1000); err != nil { + return err + } + } + return nil +} + +func (g *gateway) request(method, path, bearer string, input any, output any) error { + var body io.Reader + if input != nil { + data, _ := json.Marshal(input) + body = bytes.NewReader(data) + } + req, err := http.NewRequest(method, g.origin+path, body) + if err != nil { + return err + } + req.Header.Set("Content-Type", "application/json") + if bearer != "" { + req.Header.Set("Authorization", "Bearer "+bearer) + } + res, err := g.client.Do(req) + if err != nil { + return err + } + defer res.Body.Close() + if res.StatusCode < 200 || res.StatusCode >= 300 { + message, _ := io.ReadAll(io.LimitReader(res.Body, 4096)) + return fmt.Errorf("Pages Wiki HTTP %d: %s", res.StatusCode, strings.TrimSpace(string(message))) + } + return json.NewDecoder(res.Body).Decode(output) +} + +func (g *gateway) open(w http.ResponseWriter, r *http.Request) { + publicPrefix := strings.TrimRight(strings.TrimSpace(r.Header.Get("X-Forwarded-Prefix")), "/") + ticket := strings.TrimSpace(r.URL.Query().Get("ticket")) + if ticket == "" { + http.Error(w, "ticket is required", 400) + return + } + var exchanged struct { + SessionToken string `json:"session_token"` + PluginID string `json:"plugin_id"` + Filename string `json:"filename"` + ContentType string `json:"content_type"` + ExpiresAtMS int64 `json:"expires_at_ms"` + } + if err := g.request("POST", "/_/api/v1/adapter/session/exchange", "", + map[string]string{"ticket": ticket}, &exchanged); err != nil { + http.Error(w, err.Error(), http.StatusBadGateway) + return + } + var workspaceData struct { + VimSettings json.RawMessage `json:"vim_settings"` + Files []struct { + Path string `json:"path"` + SemanticPath string `json:"semantic_path"` + RevisionUUID string `json:"revision_uuid"` + ContentBase64 string `json:"content_base64"` + } `json:"files"` + } + if err := g.request("GET", "/_/api/v1/adapter/session/workspace", exchanged.SessionToken, nil, &workspaceData); err != nil { + http.Error(w, err.Error(), http.StatusBadGateway) + return + } + id := randomID() + workspace := filepath.Join("/workspaces", id) + if err := os.MkdirAll(workspace, 0700); err != nil { + http.Error(w, err.Error(), 500) + return + } + _ = os.Chown(workspace, 1000, 1000) + files := make(map[string]gatewayFile, len(workspaceData.Files)) + filename := "document.txt" + for index, source := range workspaceData.Files { + clean := filepath.Clean(filepath.FromSlash(source.Path)) + if clean == "." || filepath.IsAbs(clean) || strings.HasPrefix(clean, ".."+string(filepath.Separator)) { + continue + } + data, decodeErr := base64.StdEncoding.DecodeString(source.ContentBase64) + if decodeErr != nil { + http.Error(w, "invalid workspace content", http.StatusBadGateway) + return + } + target := filepath.Join(workspace, clean) + if _, duplicate := files[clean]; duplicate { + http.Error(w, "workspace contains duplicate filenames", http.StatusConflict) + return + } + if err := ensureCoderDirectory(workspace, filepath.Dir(target)); err != nil { + http.Error(w, err.Error(), 500) + return + } + if err := os.WriteFile(target, data, 0600); err != nil { + http.Error(w, err.Error(), 500) + return + } + _ = os.Chown(target, 1000, 1000) + files[clean] = gatewayFile{SemanticPath: source.SemanticPath, + RevisionUUID: source.RevisionUUID, LastContent: source.ContentBase64} + if index == 0 { + filename = clean + } + } + if len(files) == 0 { + http.Error(w, "workspace contains no editable files", http.StatusBadGateway) + return + } + g.mu.Lock() + g.sessions[id] = gatewaySession{Token: exchanged.SessionToken, PluginID: exchanged.PluginID, Filename: filename, + ContentType: exchanged.ContentType, ExpiresAtMS: exchanged.ExpiresAtMS, + Workspace: workspace, Files: files, VimSettings: workspaceData.VimSettings} + g.mu.Unlock() + cookiePath := "/" + if publicPrefix != "" { + cookiePath = publicPrefix + "/" + } + http.SetCookie(w, &http.Cookie{Name: "pageswiki_adapter", Value: id, Path: cookiePath, HttpOnly: true, SameSite: http.SameSiteLaxMode, MaxAge: 8 * 3600}) + if exchanged.PluginID == "vim.wasm" { + go g.expire(id) + http.Redirect(w, r, publicPrefix+"/vim/", http.StatusFound) + return + } + go g.watch(id) + http.Redirect(w, r, publicPrefix+"/code/?folder="+url.QueryEscape(workspace), http.StatusFound) +} + +func (g *gateway) session(r *http.Request) (gatewaySession, bool) { + cookie, err := r.Cookie("pageswiki_adapter") + if err != nil { + return gatewaySession{}, false + } + g.mu.Lock() + defer g.mu.Unlock() + s, ok := g.sessions[cookie.Value] + if !ok || s.ExpiresAtMS < time.Now().UnixMilli() { + delete(g.sessions, cookie.Value) + return gatewaySession{}, false + } + return s, true +} + +var editorTemplate = template.Must(template.New("editor").Parse(` +{{.Filename}} + +
{{.Filename}} {{.Status}}
`)) + +func (g *gateway) edit(w http.ResponseWriter, r *http.Request) { + s, ok := g.session(r) + if !ok { + http.Error(w, "session expired", 401) + return + } + var content struct { + ContentBase64 string `json:"content_base64"` + } + if err := g.request("GET", "/_/api/v1/adapter/session/content", s.Token, nil, &content); err != nil { + http.Error(w, err.Error(), 502) + return + } + data, err := base64.StdEncoding.DecodeString(content.ContentBase64) + if err != nil { + http.Error(w, "invalid content", 502) + return + } + w.Header().Set("Content-Type", "text/html; charset=utf-8") + _ = editorTemplate.Execute(w, map[string]any{"Filename": s.Filename, "Content": string(data), "Status": r.URL.Query().Get("status")}) +} + +func (g *gateway) save(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodPost { + http.Error(w, "method not allowed", 405) + return + } + s, ok := g.session(r) + if !ok { + http.Error(w, "session expired", 401) + return + } + r.Body = http.MaxBytesReader(w, r.Body, 65<<20) + if err := r.ParseForm(); err != nil { + http.Error(w, err.Error(), 400) + return + } + var output map[string]any + err := g.request("PUT", "/_/api/v1/adapter/session/content", s.Token, map[string]string{ + "content_base64": base64.StdEncoding.EncodeToString([]byte(r.FormValue("content"))), + "message": "hosted editor: " + s.Filename, + }, &output) + if err != nil { + http.Error(w, err.Error(), http.StatusConflict) + return + } + http.Redirect(w, r, "/edit?status=saved", http.StatusFound) +} + +func (g *gateway) code(w http.ResponseWriter, r *http.Request) { + if _, ok := g.session(r); !ok { + http.Error(w, "session expired", http.StatusUnauthorized) + return + } + g.codeProxy.ServeHTTP(w, r) +} + +func (g *gateway) vimSession(w http.ResponseWriter, r *http.Request) { + session, ok := g.session(r) + if !ok || session.PluginID != "vim.wasm" { + http.Error(w, "session expired", http.StatusUnauthorized) + return + } + type vimFile struct { + Path string `json:"path"` + Content string `json:"content"` + } + files := make([]vimFile, 0, len(session.Files)) + for relative, tracked := range session.Files { + data, err := base64.StdEncoding.DecodeString(tracked.LastContent) + if err != nil { + continue + } + files = append(files, vimFile{Path: filepath.ToSlash(relative), Content: string(data)}) + } + w.Header().Set("Content-Type", "application/json") + w.Header().Set("Cache-Control", "no-store") + _ = json.NewEncoder(w).Encode(map[string]any{"initial": filepath.ToSlash(session.Filename), "files": files, "vim_settings": session.VimSettings}) +} + +func (g *gateway) vimSave(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodPut { + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + session, ok := g.session(r) + if !ok || session.PluginID != "vim.wasm" { + http.Error(w, "session expired", http.StatusUnauthorized) + return + } + var input struct { + Path string `json:"path"` + ContentBase64 string `json:"content_base64"` + } + r.Body = http.MaxBytesReader(w, r.Body, 65<<20) + if err := json.NewDecoder(r.Body).Decode(&input); err != nil { + http.Error(w, "invalid JSON", http.StatusBadRequest) + return + } + clean := filepath.Clean(filepath.FromSlash(strings.TrimPrefix(input.Path, "/work/"))) + tracked, exists := session.Files[clean] + if !exists { + http.Error(w, "file is outside the adapter workspace", http.StatusForbidden) + return + } + var output struct { + RevisionUUID string `json:"revision_uuid"` + } + err := g.request("PUT", "/_/api/v1/adapter/session/content", session.Token, + map[string]string{"content_base64": input.ContentBase64, "path": tracked.SemanticPath, + "revision_uuid": tracked.RevisionUUID, "message": "vim.wasm write: " + clean}, &output) + if err != nil { + http.Error(w, err.Error(), http.StatusConflict) + return + } + cookie, _ := r.Cookie("pageswiki_adapter") + g.mu.Lock() + current, exists := g.sessions[cookie.Value] + if exists { + updated := current.Files[clean] + updated.LastContent = input.ContentBase64 + updated.RevisionUUID = output.RevisionUUID + current.Files[clean] = updated + g.sessions[cookie.Value] = current + } + g.mu.Unlock() + w.Header().Set("Content-Type", "application/json") + _ = json.NewEncoder(w).Encode(map[string]any{"revision_uuid": output.RevisionUUID}) +} + +func (g *gateway) expire(id string) { + g.mu.Lock() + session, ok := g.sessions[id] + g.mu.Unlock() + if !ok { + return + } + delay := time.Until(time.UnixMilli(session.ExpiresAtMS)) + if delay > 0 { + timer := time.NewTimer(delay) + defer timer.Stop() + <-timer.C + } + g.mu.Lock() + session, ok = g.sessions[id] + delete(g.sessions, id) + g.mu.Unlock() + if ok { + if err := os.RemoveAll(session.Workspace); err != nil { + log.Printf("remove expired workspace %s: %v", session.Workspace, err) + } + } +} + +func (g *gateway) watch(id string) { + ticker := time.NewTicker(2 * time.Second) + defer ticker.Stop() + defer func() { + g.mu.Lock() + session, ok := g.sessions[id] + delete(g.sessions, id) + g.mu.Unlock() + if ok { + if err := os.RemoveAll(session.Workspace); err != nil { + log.Printf("remove expired workspace %s: %v", session.Workspace, err) + } + } + }() + for range ticker.C { + g.mu.Lock() + session, ok := g.sessions[id] + g.mu.Unlock() + if !ok || session.ExpiresAtMS < time.Now().UnixMilli() { + return + } + for relative, tracked := range session.Files { + data, err := os.ReadFile(filepath.Join(session.Workspace, relative)) + if err != nil { + continue + } + encoded := base64.StdEncoding.EncodeToString(data) + if encoded == tracked.LastContent { + continue + } + var output struct { + RevisionUUID string `json:"revision_uuid"` + } + err = g.request("PUT", "/_/api/v1/adapter/session/content", session.Token, + map[string]string{"content_base64": encoded, "path": tracked.SemanticPath, + "revision_uuid": tracked.RevisionUUID, "message": "code-server autosave: " + relative}, &output) + g.mu.Lock() + current, exists := g.sessions[id] + if exists { + currentFile := current.Files[relative] + if err == nil { + currentFile.LastContent = encoded + currentFile.RevisionUUID = output.RevisionUUID + current.Files[relative] = currentFile + current.LastError = "" + } else { + current.LastError = err.Error() + } + g.sessions[id] = current + } + g.mu.Unlock() + } + } +} diff --git a/cmd/pageswiki/federation_enroll.go b/cmd/pageswiki/federation_enroll.go new file mode 100644 index 0000000..8ebac14 --- /dev/null +++ b/cmd/pageswiki/federation_enroll.go @@ -0,0 +1,254 @@ +package main + +import ( + "bytes" + "crypto/ed25519" + "crypto/rand" + "crypto/sha256" + "encoding/base64" + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "io" + "net/http" + "os" + "path/filepath" + "strings" + "time" + + "pageswiki/internal/store" +) + +type externalCampusEnrollment struct { + FQDN string + Token string + HTTP bool + NoDefaultCampus bool +} + +type campusEnrollmentSnapshot struct { + Campus store.Campus + Instance store.FederationInstance + Domains []store.Domain + Manifest store.SignedCampusManifest `json:"manifest"` +} + +func parseExternalCampusEnrollment(args []string) (*externalCampusEnrollment, error) { + if len(args) == 0 { + return nil, nil + } + noDefaultCampus := false + filtered := make([]string, 0, len(args)) + for _, arg := range args { + if arg == "--no-default-campus" { + if noDefaultCampus { + return nil, errors.New("--no-default-campus was specified twice") + } + noDefaultCampus = true + continue + } + filtered = append(filtered, arg) + } + if len(filtered) != 3 || + (filtered[0] != "--add-external-campus" && + filtered[0] != "--add-external-campus-http") { + return nil, errors.New( + "usage: pageswiki [--no-default-campus] " + + "[--add-external-campus FQDN TOKEN | " + + "--add-external-campus-http FQDN TOKEN]", + ) + } + return &externalCampusEnrollment{ + FQDN: strings.TrimSpace(filtered[1]), + Token: strings.TrimSpace(filtered[2]), + HTTP: filtered[0] == "--add-external-campus-http", + NoDefaultCampus: noDefaultCampus, + }, nil +} + +func enrollExternalCampus( + dataDir string, + st *store.Store, + enrollment *externalCampusEnrollment, +) error { + if enrollment == nil { + return nil + } + instanceFQDN := strings.TrimSpace(os.Getenv("PAGESWIKI_INSTANCE_FQDN")) + if instanceFQDN == "" { + return errors.New( + "PAGESWIKI_INSTANCE_FQDN is required for external Campus enrollment", + ) + } + snapshot, scheme, err := fetchCampusSnapshot( + dataDir, + enrollment, + instanceFQDN, + ) + if err != nil { + return err + } + if err := applyEnrollmentSnapshot(st, snapshot, "", instanceFQDN, scheme); err != nil { + return err + } + if err := saveCampusEnrollment( + dataDir, + snapshot.Campus.UUID, + enrollment, + ); err != nil { + return err + } + if enrollment.NoDefaultCampus { + _, err = st.RemoveUnusedBootstrapCampus() + } + return err +} + +func applyEnrollmentSnapshot(st *store.Store, snapshot *campusEnrollmentSnapshot, expectedCampusUUID, instanceFQDN, scheme string) error { + if snapshot.Manifest.SchemaVersion != 0 { + return st.ApplySignedManagedCampusManifest(snapshot.Manifest, expectedCampusUUID, instanceFQDN, scheme) + } + // Transitional compatibility for pre-manifest controllers. New controllers + // always emit a signed manifest; this branch can be removed after upgrades. + return st.ApplyManagedCampusSnapshot(snapshot.Campus, snapshot.Domains, instanceFQDN, scheme) +} + +func fetchCampusSnapshot( + dataDir string, + enrollment *externalCampusEnrollment, + instanceFQDN string, +) (*campusEnrollmentSnapshot, string, error) { + privateKey, fingerprint, err := ensureInstanceIdentity(dataDir) + if err != nil { + return nil, "", err + } + payload, err := json.Marshal(map[string]any{ + "manifest_version": 2, + "capability_signature": base64.RawStdEncoding.EncodeToString(ed25519.Sign(privateKey, []byte(store.FederationCapabilityMessage(instanceFQDN, enrollment.Token)))), + "fqdn": instanceFQDN, + "fingerprint": fingerprint, + "public_key": base64.RawStdEncoding.EncodeToString( + privateKey.Public().(ed25519.PublicKey), + ), + "signature": base64.RawStdEncoding.EncodeToString( + ed25519.Sign( + privateKey, + []byte(instanceFQDN+"\n"+enrollment.Token), + ), + ), + }) + if err != nil { + return nil, "", err + } + scheme := "https" + if enrollment.HTTP { + scheme = "http" + } + endpoint := fmt.Sprintf( + "%s://%s/_/api/v1/federation/enroll", + scheme, + enrollment.FQDN, + ) + request, err := http.NewRequest( + http.MethodPost, + endpoint, + bytes.NewReader(payload), + ) + if err != nil { + return nil, "", err + } + request.Header.Set("Content-Type", "application/json") + request.Header.Set("Authorization", "Bearer "+enrollment.Token) + client := &http.Client{Timeout: 20 * time.Second} + response, err := client.Do(request) + if err != nil { + return nil, "", err + } + defer response.Body.Close() + if response.StatusCode != http.StatusOK { + message, _ := io.ReadAll(io.LimitReader(response.Body, 4<<10)) + detail := strings.TrimSpace(string(message)) + if detail != "" { + return nil, "", fmt.Errorf( + "Campus controller enrollment failed: %s: %s", + response.Status, + detail, + ) + } + return nil, "", fmt.Errorf( + "Campus controller enrollment failed: %s", + response.Status, + ) + } + var snapshot campusEnrollmentSnapshot + if err := json.NewDecoder(response.Body).Decode(&snapshot); err != nil { + return nil, "", err + } + return &snapshot, scheme, nil +} + +func saveCampusEnrollment( + dataDir string, + campusUUID string, + enrollment *externalCampusEnrollment, +) error { + tokenDir := filepath.Join(dataDir, "federation") + if err := os.MkdirAll(tokenDir, 0700); err != nil { + return err + } + tokenPath := filepath.Join(tokenDir, campusUUID+".token") + if err := os.WriteFile( + tokenPath, + []byte(enrollment.Token+"\n"), + 0600, + ); err != nil { + return err + } + if enrollment.NoDefaultCampus { + markerPath := filepath.Join( + tokenDir, + campusUUID+".no-default-campus", + ) + if err := os.WriteFile(markerPath, nil, 0600); err != nil { + return err + } + } + scheme := "https" + if enrollment.HTTP { + scheme = "http" + } + endpointPath := filepath.Join(tokenDir, campusUUID+".endpoint") + return os.WriteFile( + endpointPath, + []byte(scheme+"://"+enrollment.FQDN+"\n"), + 0600, + ) +} + +func ensureInstanceIdentity( + dataDir string, +) (ed25519.PrivateKey, string, error) { + keyPath := filepath.Join(dataDir, "instance-ed25519.key") + privateKey, err := os.ReadFile(keyPath) + if errors.Is(err, os.ErrNotExist) { + _, generated, generateErr := ed25519.GenerateKey(rand.Reader) + if generateErr != nil { + return nil, "", generateErr + } + if writeErr := os.WriteFile(keyPath, generated, 0600); writeErr != nil { + return nil, "", writeErr + } + privateKey = generated + } else if err != nil { + return nil, "", err + } + if len(privateKey) != ed25519.PrivateKeySize { + return nil, "", errors.New("invalid instance Ed25519 private key") + } + publicKey := ed25519.PrivateKey(privateKey).Public().(ed25519.PublicKey) + sum := sha256.Sum256(publicKey) + return ed25519.PrivateKey(privateKey), + "sha256:" + hex.EncodeToString(sum[:]), + nil +} diff --git a/cmd/pageswiki/federation_enroll_test.go b/cmd/pageswiki/federation_enroll_test.go new file mode 100644 index 0000000..4ad1b69 --- /dev/null +++ b/cmd/pageswiki/federation_enroll_test.go @@ -0,0 +1,80 @@ +package main + +import "testing" + +func TestExternalCampusEnrollmentArguments(t *testing.T) { + enrollment, err := parseExternalCampusEnrollment([]string{ + "--add-external-campus", + "campus.example.test", + "secret-token", + }) + if err != nil { + t.Fatal(err) + } + if enrollment.FQDN != "campus.example.test" || + enrollment.Token != "secret-token" { + t.Fatalf("enrollment = %#v", enrollment) + } +} + +func TestExternalCampusHTTPEnrollmentArguments(t *testing.T) { + enrollment, err := parseExternalCampusEnrollment([]string{ + "--add-external-campus-http", + "campus.internal.test", + "secret-token", + }) + if err != nil { + t.Fatal(err) + } + if !enrollment.HTTP { + t.Fatal("HTTP enrollment did not select HTTP transport") + } +} + +func TestExternalCampusNoDefaultCampusArgument(t *testing.T) { + for _, args := range [][]string{ + { + "--no-default-campus", + "--add-external-campus", + "campus.example.test", + "secret-token", + }, + { + "--add-external-campus-http", + "campus.internal.test", + "secret-token", + "--no-default-campus", + }, + } { + enrollment, err := parseExternalCampusEnrollment(args) + if err != nil { + t.Fatal(err) + } + if !enrollment.NoDefaultCampus { + t.Fatalf("NoDefaultCampus is false for %#v", args) + } + } +} + +func TestNoDefaultCampusRequiresExternalCampus(t *testing.T) { + if _, err := parseExternalCampusEnrollment([]string{ + "--no-default-campus", + }); err == nil { + t.Fatal("--no-default-campus without enrollment was accepted") + } +} + +func TestInstanceFingerprintIsPersistent(t *testing.T) { + dataDir := t.TempDir() + _, first, err := ensureInstanceIdentity(dataDir) + if err != nil { + t.Fatal(err) + } + _, second, err := ensureInstanceIdentity(dataDir) + if err != nil { + t.Fatal(err) + } + if first != second { + t.Fatalf("fingerprints differ: %q, %q", first, second) + } +} diff --git a/cmd/pageswiki/federation_reconcile.go b/cmd/pageswiki/federation_reconcile.go new file mode 100644 index 0000000..2bb76b6 --- /dev/null +++ b/cmd/pageswiki/federation_reconcile.go @@ -0,0 +1,119 @@ +package main + +import ( + "errors" + "log" + "net/url" + "os" + "path/filepath" + "strings" + "time" + + "pageswiki/internal/store" +) + +const managedCampusReconcileInterval = 5 * time.Second + +func startManagedCampusReconciler(dataDir string, st *store.Store) { + instanceFQDN := strings.TrimSpace(os.Getenv("PAGESWIKI_INSTANCE_FQDN")) + if instanceFQDN == "" { + return + } + go func() { + ticker := time.NewTicker(managedCampusReconcileInterval) + defer ticker.Stop() + for range ticker.C { + reconcileManagedCampuses(dataDir, st, instanceFQDN) + } + }() +} + +func reconcileManagedCampuses( + dataDir string, + st *store.Store, + instanceFQDN string, +) { + campuses, err := st.ListCampuses() + if err != nil { + log.Printf("managed Campus reconciliation: %v", err) + return + } + for _, campus := range campuses { + if campus.AuthorityMode != "managed" || !campus.Enabled { + continue + } + if err := reconcileManagedCampus( + dataDir, + st, + campus, + instanceFQDN, + ); err != nil { + _ = st.RecordCampusContact(campus.UUID, err.Error()) + if campus.LastContactError != err.Error() { + log.Printf( + "managed Campus %s reconciliation failed: %v", + campus.FQDN, + err, + ) + } + } + } +} + +func reconcileManagedCampus( + dataDir string, + st *store.Store, + campus store.Campus, + instanceFQDN string, +) error { + tokenDir := filepath.Join(dataDir, "federation") + token, err := os.ReadFile( + filepath.Join(tokenDir, campus.UUID+".token"), + ) + if err != nil { + return err + } + controllerAddress := campus.Transport + "://" + campus.FQDN + endpoint, err := os.ReadFile( + filepath.Join(tokenDir, campus.UUID+".endpoint"), + ) + if err == nil { + controllerAddress = strings.TrimSpace(string(endpoint)) + } else if !errors.Is(err, os.ErrNotExist) { + return err + } + parsed, err := url.Parse(controllerAddress) + if err != nil || parsed.Host == "" { + return errors.New("invalid saved Campus controller endpoint") + } + enrollment := &externalCampusEnrollment{ + FQDN: parsed.Host, + Token: strings.TrimSpace(string(token)), + HTTP: parsed.Scheme == "http", + } + snapshot, scheme, err := fetchCampusSnapshot( + dataDir, + enrollment, + instanceFQDN, + ) + if err != nil { + return err + } + if snapshot.Campus.UUID != campus.UUID && snapshot.Manifest.Campus.UUID != campus.UUID { + return errors.New("Campus controller identity changed") + } + if err := applyEnrollmentSnapshot(st, snapshot, campus.UUID, instanceFQDN, scheme); err != nil { + return err + } + markerPath := filepath.Join( + tokenDir, + campus.UUID+".no-default-campus", + ) + if _, err := os.Stat(markerPath); err == nil { + _, err = st.RemoveUnusedBootstrapCampus() + return err + } else if !errors.Is(err, os.ErrNotExist) { + return err + } + return nil +} diff --git a/cmd/pageswiki/federation_reconcile_test.go b/cmd/pageswiki/federation_reconcile_test.go new file mode 100644 index 0000000..85bfd61 --- /dev/null +++ b/cmd/pageswiki/federation_reconcile_test.go @@ -0,0 +1,118 @@ +package main + +import ( + "encoding/json" + "net/http" + "net/http/httptest" + "strings" + "testing" + + "pageswiki/internal/db" + "pageswiki/internal/store" +) + +func TestManagedCampusReconciliationDeploysAssignedDomain(t *testing.T) { + dataDir := t.TempDir() + database, err := db.Open(dataDir + "/pages.db") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := store.New(database) + if err := st.EnsureConfigTable(); err != nil { + t.Fatal(err) + } + + const ( + campusUUID = "1140999c-b690-4c38-850d-8e04572e489e" + domainUUID = "2251000d-c7a1-4d49-961e-9f15683f590f" + instanceFQDN = "node.example.test" + ) + campus := store.Campus{ + UUID: campusUUID, + Name: "external", + Title: "External Campus", + DefaultLang: "en", + AuthorityMode: "controller", + FQDN: "campus.example.test", + Enabled: true, + } + domain := store.Domain{ + UUID: domainUUID, + Name: "deployed", + Title: "Deployed Domain", + Domain: "deployed.example.test", + Enabled: true, + CampusUUID: campusUUID, + Placement: "remote", + InstanceFQDN: instanceFQDN, + InstanceFingerprint: "sha256:test", + } + controller := httptest.NewServer(http.HandlerFunc( + func(w http.ResponseWriter, r *http.Request) { + if r.URL.Path != "/_/api/v1/federation/enroll" { + http.NotFound(w, r) + return + } + _ = json.NewEncoder(w).Encode(map[string]any{ + "campus": campus, + "domains": []store.Domain{domain}, + }) + }, + )) + t.Cleanup(controller.Close) + + if err := st.ApplyManagedCampusSnapshot( + campus, + nil, + instanceFQDN, + "http", + ); err != nil { + t.Fatal(err) + } + enrollment := &externalCampusEnrollment{ + FQDN: strings.TrimPrefix(controller.URL, "http://"), + Token: "test-token", + HTTP: true, + NoDefaultCampus: true, + } + if err := saveCampusEnrollment( + dataDir, + campusUUID, + enrollment, + ); err != nil { + t.Fatal(err) + } + + managed, err := st.GetCampusByUUID(campusUUID) + if err != nil { + t.Fatal(err) + } + if err := reconcileManagedCampus( + dataDir, + st, + *managed, + instanceFQDN, + ); err != nil { + t.Fatal(err) + } + deployed, err := st.GetDomainByUUID(domainUUID) + if err != nil { + t.Fatal(err) + } + if deployed.Placement != "local" || !deployed.Enabled { + t.Fatalf("deployed Domain = %#v", deployed) + } + campuses, err := st.ListCampuses() + if err != nil { + t.Fatal(err) + } + if len(campuses) != 1 || + campuses[0].UUID != campusUUID || + campuses[0].AuthorityMode != "managed" { + t.Fatalf("Campuses after reconciliation = %#v", campuses) + } +} diff --git a/cmd/pageswiki/main.go b/cmd/pageswiki/main.go index fe4d8a3..a2750da 100644 --- a/cmd/pageswiki/main.go +++ b/cmd/pageswiki/main.go @@ -3,13 +3,18 @@ package main import ( "log" "os" + "path/filepath" + "pageswiki/internal/db" "pageswiki/internal/server" "pageswiki/internal/store" - "path/filepath" ) func main() { + enrollment, err := parseExternalCampusEnrollment(os.Args[1:]) + if err != nil { + log.Fatal(err) + } dataDir := os.Getenv( @@ -20,7 +25,7 @@ func main() { dataDir = "./data" } - err := os.MkdirAll( + err = os.MkdirAll( dataDir, 0755, ) @@ -53,7 +58,20 @@ func main() { log.Fatal(err) } - st := store.New(database) + documentRoot, err := + store.MigrateLegacyDocumentRoot( + dataDir, + ) + + if err != nil { + log.Fatal(err) + } + + st := + store.NewWithDocumentRoot( + database, + documentRoot, + ) err = st.EnsureConfigTable() @@ -66,6 +84,10 @@ func main() { if err != nil { log.Fatal(err) } + if err := enrollExternalCampus(dataDir, st, enrollment); err != nil { + log.Fatal(err) + } + startManagedCampusReconciler(dataDir, st) srv := server.New(st) diff --git a/data/pageswiki-cli b/data/pageswiki-cli new file mode 100755 index 0000000..2813459 --- /dev/null +++ b/data/pageswiki-cli @@ -0,0 +1,1636 @@ +#!/usr/bin/env python3 + +"""Pages Wiki data CLI. + +Provides one-shot, rsync-like transfers and an interactive semantic-path shell. +Uses only the Python standard library. +""" + +from __future__ import annotations + +import difflib +import fnmatch +import glob +import hashlib +import html +import json +import mimetypes +import os +from pathlib import Path +import posixpath +import re +import shlex +import subprocess +import sqlite3 +import sys +import tempfile +import time +import uuid + +try: + import readline +except ImportError: + readline = None + + +class CLIError(Exception): + pass + + +def looks_like_text(value: str) -> bool: + if not value: + return True + controls = sum( + 1 + for char in value + if ord(char) < 32 and char not in "\n\r\t\f" + ) + return controls * 100 <= len(value) * 2 + + +def decode_text(payload: bytes) -> tuple[str, str] | None: + candidates: list[tuple[str, str]] = [] + if payload.startswith(b"\xef\xbb\xbf"): + candidates.append(("utf-8-sig", "utf-8")) + elif payload.startswith(b"\xff\xfe"): + candidates.append(("utf-16", "utf-16le")) + elif payload.startswith(b"\xfe\xff"): + candidates.append(("utf-16", "utf-16be")) + else: + candidates.append(("utf-8", "utf-8")) + if b"\x1b$" in payload: + candidates.append(("iso2022_jp", "iso-2022-jp")) + candidates.extend( + [ + ("shift_jis", "shift_jis"), + ("euc_jp", "euc-jp"), + ] + ) + for codec, label in candidates: + try: + value = payload.decode(codec) + except UnicodeDecodeError: + continue + if looks_like_text(value): + return value, label + return None + + +def detect_content_type(payload: bytes, filename: str = "") -> str: + guessed = mimetypes.guess_type(filename)[0] if filename else None + signatures = ( + (b"%PDF-", "application/pdf"), + (b"\x89PNG\r\n\x1a\n", "image/png"), + (b"\xff\xd8\xff", "image/jpeg"), + (b"GIF87a", "image/gif"), + (b"GIF89a", "image/gif"), + (b"\x1f\x8b", "application/gzip"), + (b"BZh", "application/x-bzip2"), + (b"\xfd7zXZ\x00", "application/x-xz"), + (b"7z\xbc\xaf\x27\x1c", "application/x-7z-compressed"), + (b"\x7fELF", "application/x-executable"), + (b"\x00asm", "application/wasm"), + (b"SQLite format 3\x00", "application/vnd.sqlite3"), + (b"OggS", "application/ogg"), + (b"fLaC", "audio/flac"), + ) + for signature, content_type in signatures: + if payload.startswith(signature): + return content_type + if payload.startswith(b"RIFF") and payload[8:12] == b"WEBP": + return "image/webp" + if len(payload) >= 12 and payload[4:8] == b"ftyp": + return "video/mp4" + if payload.startswith(b"PK\x03\x04"): + if guessed and ( + guessed.startswith("application/vnd.") + or guessed == "application/epub+zip" + ): + return guessed + return "application/zip" + + decoded = decode_text(payload) + if decoded is None: + return guessed or "application/octet-stream" + text, charset = decoded + first_line = text.splitlines()[0].lower() if text.splitlines() else "" + if first_line.startswith("#!") and "python" in first_line: + return f"text/x-python; charset={charset}" + if first_line.startswith("#!") and any( + shell in first_line for shell in ("/sh", "bash", "zsh") + ): + return f"application/x-sh; charset={charset}" + if first_line.startswith("#!") and any( + runtime in first_line for runtime in ("node", "deno") + ): + return f"application/javascript; charset={charset}" + try: + json.loads(text) + except (json.JSONDecodeError, ValueError): + pass + else: + return f"application/json; charset={charset}" + if text.lstrip().startswith(" str: + """Convert common Markdown constructs to canonical HTML.""" + + def inline(value: str) -> str: + value = html.escape(value, quote=False) + value = re.sub( + r"`([^`]+)`", + lambda match: f"{match.group(1)}", + value, + ) + value = re.sub( + r"\[([^]]+)]\(([^)]+)\)", + lambda match: ( + f'' + f"{match.group(1)}" + ), + value, + ) + value = re.sub(r"\*\*([^*]+)\*\*", r"\1", value) + value = re.sub(r"(?\1", value) + return value + + output: list[str] = [] + paragraph: list[str] = [] + list_kind: str | None = None + in_code = False + code_language = "" + code_lines: list[str] = [] + + def flush_paragraph() -> None: + if paragraph: + output.append("

" + inline(" ".join(paragraph)) + "

") + paragraph.clear() + + def close_list() -> None: + nonlocal list_kind + if list_kind: + output.append(f"") + list_kind = None + + for raw_line in source.splitlines(): + line = raw_line.rstrip() + if line.startswith("```"): + flush_paragraph() + close_list() + if in_code: + language_class = ( + f' class="language-{html.escape(code_language, quote=True)}"' + if code_language + else "" + ) + output.append( + f"
"
+                    + html.escape("\n".join(code_lines))
+                    + "
" + ) + code_lines.clear() + in_code = False + else: + in_code = True + code_language = line[3:].strip() + continue + if in_code: + code_lines.append(raw_line) + continue + if not line.strip(): + flush_paragraph() + close_list() + continue + heading = re.match(r"^(#{1,6})\s+(.+)$", line) + if heading: + flush_paragraph() + close_list() + level = len(heading.group(1)) + output.append(f"{inline(heading.group(2))}") + continue + item = re.match(r"^\s*([-*+] |\d+[.] )(.+)$", line) + if item: + flush_paragraph() + kind = "ol" if item.group(1)[0].isdigit() else "ul" + if list_kind != kind: + close_list() + list_kind = kind + output.append(f"<{kind}>") + output.append("
  • " + inline(item.group(2)) + "
  • ") + continue + if line.startswith("> "): + flush_paragraph() + close_list() + output.append("

    " + inline(line[2:]) + "

    ") + continue + paragraph.append(line.strip()) + + flush_paragraph() + close_list() + if in_code: + output.append("
    " + html.escape("\n".join(code_lines)) + "
    ") + return "\n".join(output) + + +HELP = """\ +Usage: + pageswiki-cli COMMAND [ARG ...] + pageswiki-cli ADDRESS + pageswiki-cli shell + +Commands: + ls [PATH] list direct children + cd PATH change semantic working path (shell) + mv SOURCE DEST move a path and its descendants + view [ADDRESS] show metadata and payload + cat [ADDRESS] write only the payload to stdout + edit [ADDRESS] edit through $EDITOR and write changes + get ADDRESS [LOCAL] download unless content is unchanged + put LOCAL ADDRESS upload unless content is unchanged + mget REMOTE_PATTERN [LOCAL_DIR] + download matching semantic paths + mput LOCAL_GLOB REMOTE_DIR + upload matching local files + revision [ADDRESS] list Page revisions + diff REVISION REVISION unified Document diff + restore REVISION create a new Revision from an old one + link ADDRESS PATH bind another path to a Page + unlink PATH [ADDRESS] remove a path binding + domain [NAME|UUID|HOST] show or select the active Domain + extension [ID] [on|off] list or toggle a system extension + pwd print semantic working path + help show this help + exit | quit leave the interactive shell + +Addresses: + path:/semantic/path + uuid:PAGE-UUID + rev:REVISION-UUID + asset:TYPE:NAME + +Environment: + PAGESWIKI_DATA_DIR directory containing pages.db and documents/ + PAGESWIKI_DB explicit SQLite database path + PAGESWIKI_DOCUMENTS_DIR explicit content-addressed Document directory + PAGESWIKI_LANG language for put/revision selection (default: und) + PAGESWIKI_DOMAIN Domain name, UUID, or host (default: default) + PAGER pager used by view on an interactive terminal + EDITOR editor used by edit + PAGESWIKI_HISTORY interactive history file +""" + + +class PagesWikiCLI: + command_names = ( + "ls", + "cd", + "mv", + "view", + "cat", + "edit", + "get", + "put", + "mget", + "mput", + "revision", + "diff", + "restore", + "link", + "unlink", + "domain", + "extension", + "pwd", + "help", + "exit", + "quit", + ) + + def __init__(self) -> None: + script_dir = Path(__file__).resolve().parent + self.data_dir = Path( + os.environ.get("PAGESWIKI_DATA_DIR", script_dir) + ).resolve() + self.database_path = Path( + os.environ.get("PAGESWIKI_DB", self.data_dir / "pages.db") + ).resolve() + self.documents = Path( + os.environ.get( + "PAGESWIKI_DOCUMENTS_DIR", + self.data_dir / "documents", + ) + ).resolve() + self.language = os.environ.get("PAGESWIKI_LANG", "und").strip() or "und" + if not re.fullmatch( + r"(?:und|[A-Za-z]{2,8}(?:-[A-Za-z0-9]{1,8})*)", + self.language, + ): + raise CLIError(f"invalid language tag: {self.language}") + self.cwd = "/" + self._completion_matches: list[str] = [] + + if not self.database_path.is_file(): + raise CLIError(f"SQLite database not found: {self.database_path}") + + self.db = sqlite3.connect( + self.database_path, + timeout=30, + isolation_level="DEFERRED", + ) + self.db.row_factory = sqlite3.Row + self.db.execute("PRAGMA busy_timeout = 30000") + self.db.execute("PRAGMA foreign_keys = ON") + self._check_schema() + self.domain_uuid = "" + self.domain_name = "" + self.select_domain(os.environ.get("PAGESWIKI_DOMAIN", "default")) + + def close(self) -> None: + self.db.close() + + def _check_schema(self) -> None: + required = {"objects", "paths", "revisions"} + rows = self.db.execute( + "SELECT name FROM sqlite_master WHERE type = 'table'" + ) + existing = {row["name"] for row in rows} + missing = sorted(required - existing) + if missing: + raise CLIError( + "database schema is not initialized: " + + ", ".join(missing) + + "; start Pages Wiki once" + ) + path_columns = { + row["name"] for row in self.db.execute("PRAGMA table_info(paths)") + } + if "domain_uuid" not in path_columns: + raise CLIError( + "paths are not Domain-scoped; start Pages Wiki once to migrate" + ) + with self.db: + self.db.execute( + """ + CREATE TABLE IF NOT EXISTS assets ( + domain_uuid TEXT NOT NULL, + address TEXT NOT NULL, + object_uuid TEXT NOT NULL, + head_document_hash TEXT, + content_type TEXT NOT NULL DEFAULT 'application/octet-stream', + filename TEXT NOT NULL DEFAULT '', + size_bytes INTEGER NOT NULL DEFAULT 0, + created_at_ms INTEGER NOT NULL, + updated_at_ms INTEGER NOT NULL, + PRIMARY KEY (domain_uuid, address), + UNIQUE (object_uuid) + ) + """ + ) + revision_columns = { + row["name"] + for row in self.db.execute("PRAGMA table_info(revisions)") + } + if "content_type" not in revision_columns: + self.db.execute( + "ALTER TABLE revisions ADD COLUMN content_type " + "TEXT NOT NULL DEFAULT 'text/html; charset=utf-8'" + ) + if "filename" not in revision_columns: + self.db.execute( + "ALTER TABLE revisions ADD COLUMN filename " + "TEXT NOT NULL DEFAULT ''" + ) + + def select_domain(self, selector: str) -> None: + selector = selector.strip() or "default" + row = self.db.execute( + """ + SELECT + d.uuid, + d.name, + COALESCE(d.placement, 'local') AS placement + FROM domains d + JOIN campuses c ON c.uuid = d.campus_uuid + WHERE d.enabled = 1 AND c.enabled = 1 + AND ( + d.uuid = ? + OR lower(d.name) = lower(?) + OR lower( + CASE + WHEN d.domain = '' THEN c.fqdn + WHEN instr(d.domain, '.') > 0 THEN d.domain + ELSE d.domain || '.' || c.fqdn + END + ) = lower(?) + ) + ORDER BY CASE WHEN d.name = 'default' THEN 0 ELSE 1 END, d.id + LIMIT 1 + """, + (selector, selector, selector), + ).fetchone() + if row is None: + raise CLIError(f"Domain not found or disabled: {selector}") + if row["placement"] != "local": + raise CLIError( + "Domain is remote and has no local Path namespace" + ) + self.domain_uuid = row["uuid"] + self.domain_name = row["name"] + self.cwd = "/" + + @staticmethod + def hash_bytes(payload: bytes) -> str: + return hashlib.sha256(payload).hexdigest() + + @staticmethod + def now_ms() -> int: + return time.time_ns() // 1_000_000 + + @staticmethod + def strip_scheme(value: str, scheme: str) -> str: + prefix = scheme + ":" + return value[len(prefix) :] if value.startswith(prefix) else value + + def semantic_path(self, raw: str | None) -> str: + if raw is None or raw == "": + return self.cwd + raw = self.strip_scheme(raw, "path") + if not raw.startswith("/"): + raw = posixpath.join(self.cwd, raw) + normalized = posixpath.normpath(raw) + return "/" if normalized == "." else "/" + normalized.lstrip("/") + + def document_path(self, document_hash: str) -> Path: + normalized = document_hash.lower() + if ( + len(normalized) != 64 + or any(ch not in "0123456789abcdef" for ch in normalized) + ): + raise CLIError(f"invalid Document SHA-256: {document_hash}") + return self.documents / "sha256" / normalized[:2] / normalized + + def read_document( + self, + document_hash: str, + compatibility_body: str | bytes | None = None, + ) -> bytes: + path = self.document_path(document_hash) + if path.is_file(): + payload = path.read_bytes() + actual = self.hash_bytes(payload) + if actual != document_hash.lower(): + raise CLIError(f"Document hash mismatch: {path}") + return payload + + if compatibility_body is None: + raise CLIError(f"Document is missing: {path}") + if isinstance(compatibility_body, str): + payload = compatibility_body.encode() + else: + payload = compatibility_body + if self.hash_bytes(payload) != document_hash.lower(): + raise CLIError( + "SQLite compatibility body does not match Document hash" + ) + return payload + + def write_document(self, payload: bytes) -> str: + document_hash = self.hash_bytes(payload) + path = self.document_path(document_hash) + path.parent.mkdir(parents=True, exist_ok=True) + + if path.exists(): + existing = path.read_bytes() + if self.hash_bytes(existing) != document_hash: + raise CLIError(f"existing Document is corrupt: {path}") + return document_hash + + descriptor, temporary = tempfile.mkstemp( + prefix=".document-", + dir=path.parent, + ) + try: + with os.fdopen(descriptor, "wb") as stream: + stream.write(payload) + stream.flush() + os.fsync(stream.fileno()) + os.chmod(temporary, 0o644) + os.replace(temporary, path) + finally: + if os.path.exists(temporary): + os.unlink(temporary) + return document_hash + + def resolve_page(self, address: str | None) -> str: + target = address or self.cwd + if target.startswith("uuid:"): + page_uuid = self.strip_scheme(target, "uuid") + row = self.db.execute( + "SELECT uuid FROM objects WHERE uuid = ?", + (page_uuid,), + ).fetchone() + if row is None: + raise CLIError(f"Page/Object not found: {page_uuid}") + return page_uuid + + if target.startswith("asset:"): + row = self.db.execute( + "SELECT object_uuid FROM assets WHERE domain_uuid = ? AND address = ?", + (self.domain_uuid, target), + ).fetchone() + if row is None: + raise CLIError(f"Asset not found: {target}") + return row["object_uuid"] + + path = self.semantic_path(target) + row = self.db.execute( + "SELECT object_uuid FROM paths WHERE domain_uuid = ? AND path = ?", + (self.domain_uuid, path), + ).fetchone() + if row is None: + raise CLIError(f"Semantic Path not found: {path}") + return row["object_uuid"] + + def revision_row(self, address: str) -> sqlite3.Row: + revision_uuid = self.strip_scheme(address, "rev") + row = self.db.execute( + """ + SELECT + uuid, + object_uuid, + COALESCE(document_hash, '') AS document_hash, + COALESCE(NULLIF(lang, ''), 'und') AS lang, + COALESCE(NULLIF(content_type, ''), 'text/html; charset=utf-8') + AS content_type, + COALESCE(filename, '') AS filename, + COALESCE(body, '') AS body, + COALESCE(message, '') AS message, + COALESCE(created_at_ms, COALESCE(created_at, 0) * 1000) + AS created_at_ms + FROM revisions + WHERE uuid = ? + """, + (revision_uuid,), + ).fetchone() + if row is None: + raise CLIError(f"Revision not found: {revision_uuid}") + return row + + def latest_revision( + self, + page_uuid: str, + language: str | None = None, + ) -> sqlite3.Row | None: + preferred = language or self.language + for candidate in dict.fromkeys((preferred, "und")): + row = self.db.execute( + """ + SELECT + uuid, + object_uuid, + COALESCE(document_hash, '') AS document_hash, + COALESCE(NULLIF(lang, ''), 'und') AS lang, + COALESCE(NULLIF(content_type, ''), 'text/html; charset=utf-8') + AS content_type, + COALESCE(filename, '') AS filename, + COALESCE(body, '') AS body, + COALESCE(message, '') AS message, + COALESCE( + created_at_ms, + COALESCE(created_at, 0) * 1000 + ) AS created_at_ms + FROM revisions + WHERE object_uuid = ? + AND COALESCE(NULLIF(lang, ''), 'und') = ? + ORDER BY + COALESCE( + created_at_ms, + COALESCE(created_at, 0) * 1000 + ) DESC, + rowid DESC + LIMIT 1 + """, + (page_uuid, candidate), + ).fetchone() + if row is not None: + return row + return None + + def payload_for_address(self, address: str | None) -> tuple[bytes, str]: + target = address or self.cwd + if target.startswith("rev:"): + row = self.revision_row(target) + return ( + self.read_document(row["document_hash"], row["body"]), + row["document_hash"], + ) + if target.startswith("asset:"): + row = self.db.execute( + """ + SELECT head_document_hash + FROM assets + WHERE domain_uuid = ? AND address = ? + """, + (self.domain_uuid, target), + ).fetchone() + if row is None: + raise CLIError(f"Asset not found: {target}") + document_hash = row["head_document_hash"] or "" + if not document_hash: + return b"", self.hash_bytes(b"") + return self.read_document(document_hash), document_hash + + page_uuid = self.resolve_page(target) + row = self.latest_revision(page_uuid) + if row is None: + return b"", self.hash_bytes(b"") + return ( + self.read_document(row["document_hash"], row["body"]), + row["document_hash"], + ) + + def create_page(self, path: str) -> str: + page_uuid = str(uuid.uuid4()) + now = self.now_ms() + with self.db: + self.db.execute( + """ + INSERT INTO objects (uuid, kind, created_at) + VALUES (?, 'page', ?) + """, + (page_uuid, now // 1000), + ) + self.db.execute( + """ + INSERT INTO paths ( + domain_uuid, + path, + object_uuid, + created_at, + is_primary + ) + VALUES (?, ?, ?, ?, 1) + """, + (self.domain_uuid, path, page_uuid, now // 1000), + ) + return page_uuid + + def save_revision( + self, + page_uuid: str, + payload: bytes, + message: str, + language: str | None = None, + content_type: str = "text/html; charset=utf-8", + filename: str = "", + force: bool = False, + ) -> tuple[str, str]: + lang = language or self.language + document_hash = self.write_document(payload) + latest = self.latest_revision(page_uuid, lang) + if ( + not force + and latest is not None + and latest["document_hash"] == document_hash + and latest["content_type"] == content_type + and latest["filename"] == filename + ): + return "skipped", latest["uuid"] + + try: + body: str | bytes = payload.decode("utf-8") + except UnicodeDecodeError: + body = payload + + revision_uuid = str(uuid.uuid4()) + now = self.now_ms() + with self.db: + self.db.execute( + """ + INSERT INTO revisions ( + uuid, + object_uuid, + body, + document_hash, + lang, + content_type, + filename, + message, + created_at_ms, + created_at + ) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + """, + ( + revision_uuid, + page_uuid, + body, + document_hash, + lang, + content_type, + filename, + message, + now, + now // 1000, + ), + ) + return "updated", revision_uuid + + def put_asset(self, address: str, payload: bytes, filename: str = "", content_type: str | None = None) -> str: + content_type = content_type or detect_content_type(payload, filename) + document_hash = self.write_document(payload) + row = self.db.execute( + """ + SELECT object_uuid, COALESCE(head_document_hash, '') AS head, content_type, filename + FROM assets + WHERE domain_uuid = ? AND address = ? + """, + (self.domain_uuid, address), + ).fetchone() + if row is not None and row["head"] == document_hash and row["content_type"] == content_type and row["filename"] == filename: + return "skipped" + + now = self.now_ms() + with self.db: + self.db.execute("""CREATE TABLE IF NOT EXISTS asset_head_history ( + id INTEGER PRIMARY KEY AUTOINCREMENT, domain_uuid TEXT NOT NULL, + address TEXT NOT NULL, action TEXT NOT NULL DEFAULT 'put', + document_hash TEXT NOT NULL, content_type TEXT NOT NULL DEFAULT 'application/octet-stream', + filename TEXT NOT NULL DEFAULT '', size_bytes INTEGER NOT NULL DEFAULT 0, + actor_uuid TEXT NOT NULL DEFAULT '', created_at_ms INTEGER NOT NULL)""") + if row is None: + object_uuid = str(uuid.uuid4()) + self.db.execute( + """ + INSERT INTO objects (uuid, kind, created_at) + VALUES (?, 'asset', ?) + """, + (object_uuid, now // 1000), + ) + self.db.execute( + """ + INSERT INTO assets ( + domain_uuid, + address, + object_uuid, + head_document_hash, + content_type, + filename, + size_bytes, + created_at_ms, + updated_at_ms + ) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) + """, + ( + self.domain_uuid, + address, + object_uuid, + document_hash, + content_type, + filename, + len(payload), + now, + now, + ), + ) + else: + result = self.db.execute( + """ + UPDATE assets + SET head_document_hash = ?, size_bytes = ?, updated_at_ms = ?, content_type = ?, filename = ? + WHERE domain_uuid = ? AND address = ? AND head_document_hash = ? + """, + (document_hash, len(payload), now, content_type, filename, self.domain_uuid, address, row["head"]), + ) + if result.rowcount != 1: + raise CLIError("asset HEAD conflict; reload before saving") + self.db.execute("""INSERT INTO asset_head_history + (domain_uuid,address,action,document_hash,content_type,filename,size_bytes,actor_uuid,created_at_ms) + VALUES (?,?,'put',?,?,?,?, 'cli',?)""", + (self.domain_uuid,address,document_hash,content_type,filename,len(payload),now)) + return "updated" + + def command_ls(self, args: list[str]) -> None: + if len(args) > 1: + raise CLIError("usage: ls [PATH]") + parent = self.semantic_path(args[0] if args else None) + prefix = "/" if parent == "/" else parent + "/" + rows = self.db.execute( + """SELECT path, object_uuid FROM paths + WHERE domain_uuid = ? AND path LIKE ? ORDER BY path""", + (self.domain_uuid, prefix + "%"), + ) + children: dict[str, dict[str, object]] = {} + for row in rows: + remainder = row["path"][len(prefix) :] + if not remainder: + continue + name, separator, _ = remainder.partition("/") + is_directory = bool(separator) + entry = children.setdefault( + name, + { + "directory": False, + "object_uuid": "", + }, + ) + if is_directory: + entry["directory"] = True + else: + entry["object_uuid"] = row["object_uuid"] + exact = self.db.execute( + "SELECT object_uuid FROM paths WHERE domain_uuid = ? AND path = ?", + (self.domain_uuid, parent), + ).fetchone() + if not children and exact is None: + raise CLIError(f"Semantic Path not found: {parent}") + for name, entry in children.items(): + is_directory = bool(entry["directory"]) + object_uuid = str(entry["object_uuid"]) + suffix = "/" if is_directory else "" + identity = f"\t{object_uuid}" if object_uuid else "" + print(f"{name}{suffix}{identity}") + + def command_cd(self, args: list[str]) -> None: + if len(args) != 1: + raise CLIError("usage: cd PATH") + path = self.semantic_path(args[0]) + prefix = "/" if path == "/" else path + "/" + row = self.db.execute( + """ + SELECT 1 + FROM paths + WHERE domain_uuid = ? AND (path = ? OR path LIKE ?) + LIMIT 1 + """, + (self.domain_uuid, path, prefix + "%"), + ).fetchone() + if row is None and path != "/": + raise CLIError(f"Semantic Path not found: {path}") + self.cwd = path + + def command_mv(self, args: list[str]) -> None: + if len(args) != 2: + raise CLIError("usage: mv SOURCE DEST") + source = self.semantic_path(args[0]) + destination = self.semantic_path(args[1]) + if source == "/" or destination == "/": + raise CLIError("moving the semantic root is not allowed") + if destination == source or destination.startswith(source + "/"): + raise CLIError("destination cannot be inside source") + + rows = list( + self.db.execute( + """ + SELECT path + FROM paths + WHERE domain_uuid = ? AND (path = ? OR path LIKE ?) + ORDER BY LENGTH(path) + """, + (self.domain_uuid, source, source + "/%"), + ) + ) + if not rows: + raise CLIError(f"Semantic Path not found: {source}") + + source_paths = {row["path"] for row in rows} + mappings = [ + (path, destination + path[len(source) :]) + for path in source_paths + ] + destinations = {new for _, new in mappings} + placeholders = ",".join("?" for _ in destinations) + collisions = list( + self.db.execute( + f"""SELECT path FROM paths + WHERE domain_uuid = ? AND path IN ({placeholders})""", + (self.domain_uuid, *destinations), + ) + ) + collisions = [ + row["path"] for row in collisions if row["path"] not in source_paths + ] + if collisions: + raise CLIError("destination exists: " + ", ".join(collisions)) + + temporary_prefix = f"/.__pageswiki_mv_{uuid.uuid4().hex}" + with self.db: + temporary = [] + for old, new in mappings: + temp = temporary_prefix + old + self.db.execute( + """UPDATE paths SET path = ? + WHERE domain_uuid = ? AND path = ?""", + (temp, self.domain_uuid, old), + ) + temporary.append((temp, new)) + for temp, new in temporary: + self.db.execute( + """UPDATE paths SET path = ? + WHERE domain_uuid = ? AND path = ?""", + (new, self.domain_uuid, temp), + ) + if self.cwd == source or self.cwd.startswith(source + "/"): + self.cwd = destination + self.cwd[len(source) :] + print(f"moved {len(mappings)} path(s)") + + def print_page_info(self, page_uuid: str) -> None: + row = self.db.execute( + """ + SELECT uuid, COALESCE(kind, '') AS kind, COALESCE(created_at, 0) AS created + FROM objects WHERE uuid = ? + """, + (page_uuid,), + ).fetchone() + if row is None: + raise CLIError(f"Page/Object not found: {page_uuid}") + print(f"Page/Object UUID: {row['uuid']}") + print(f"Kind: {row['kind']}") + print("Semantic Paths:") + for path in self.db.execute( + """ + SELECT path, COALESCE(is_primary, 0) AS primary_path + FROM paths WHERE domain_uuid = ? AND object_uuid = ? + ORDER BY primary_path DESC, path + """, + (self.domain_uuid, page_uuid), + ): + marker = "*" if path["primary_path"] else "-" + print(f" {marker} {path['path']}") + + def command_view(self, args: list[str]) -> None: + if len(args) > 1: + raise CLIError("usage: view [ADDRESS]") + target = args[0] if args else self.cwd + if target.startswith("rev:"): + row = self.revision_row(target) + print(f"Revision UUID: {row['uuid']}") + print(f"Page UUID: {row['object_uuid']}") + print(f"Document SHA-256: {row['document_hash']}") + print(f"Language: {row['lang']}") + print(f"Content-Type: {row['content_type']}") + print(f"Filename: {row['filename'] or '-'}") + print(f"Created at (ms): {row['created_at_ms']}") + print(f"Message: {row['message']}") + elif target.startswith("asset:"): + row = self.db.execute( + """ + SELECT object_uuid, COALESCE(head_document_hash, '') AS hash + FROM assets WHERE domain_uuid = ? AND address = ? + """, + (self.domain_uuid, target), + ).fetchone() + if row is None: + raise CLIError(f"Asset not found: {target}") + print(f"Asset: {target}") + print(f"Page/Object UUID: {row['object_uuid']}") + print(f"Document SHA-256: {row['hash']}") + else: + self.print_page_info(self.resolve_page(target)) + payload, _ = self.payload_for_address(target) + print("--- Document ---") + self.output_payload(payload, use_pager=True) + + def output_payload(self, payload: bytes, use_pager: bool = False) -> None: + pager = os.environ.get("PAGER", "").strip() + if use_pager and pager and sys.stdout.isatty(): + try: + process = subprocess.run( + shlex.split(pager), + input=payload, + check=False, + ) + except OSError as error: + raise CLIError(f"cannot start PAGER: {error}") from error + if process.returncode != 0: + raise CLIError( + f"PAGER exited with status {process.returncode}" + ) + return + + sys.stdout.flush() + sys.stdout.buffer.write(payload) + if use_pager and payload and not payload.endswith(b"\n"): + sys.stdout.buffer.write(b"\n") + sys.stdout.buffer.flush() + + def command_cat(self, args: list[str]) -> None: + if len(args) > 1: + raise CLIError("usage: cat [ADDRESS]") + target = args[0] if args else self.cwd + payload, _ = self.payload_for_address(target) + self.output_payload(payload) + + def command_edit(self, args: list[str]) -> None: + if len(args) > 1: + raise CLIError("usage: edit [ADDRESS]") + target = args[0] if args else self.cwd + if target.startswith("rev:"): + raise CLIError("Revision addresses are immutable") + + editor = os.environ.get("EDITOR", "").strip() + if not editor: + raise CLIError("EDITOR is not set") + + original, _ = self.payload_for_address(target) + suffix = self.local_default(target).suffix + descriptor, temporary = tempfile.mkstemp( + prefix="pageswiki-edit-", + suffix=suffix, + ) + try: + with os.fdopen(descriptor, "wb") as stream: + stream.write(original) + stream.flush() + os.fsync(stream.fileno()) + try: + process = subprocess.run( + [*shlex.split(editor), temporary], + check=False, + ) + except OSError as error: + raise CLIError(f"cannot start EDITOR: {error}") from error + if process.returncode != 0: + raise CLIError( + f"EDITOR exited with status {process.returncode}" + ) + + edited = Path(temporary).read_bytes() + self.put_payload(edited, target, f"EDITOR:{editor}") + finally: + try: + os.unlink(temporary) + except FileNotFoundError: + pass + + def local_default(self, address: str) -> Path: + if address.startswith("asset:"): + return Path(address.removeprefix("asset:").replace(":", "-")) + if address.startswith("rev:"): + return Path(address.removeprefix("rev:")) + path = self.semantic_path(address) + return Path(posixpath.basename(path.rstrip("/")) or "root") + + def write_local(self, destination: Path, payload: bytes) -> str: + if destination.exists() and destination.is_file(): + if self.hash_bytes(destination.read_bytes()) == self.hash_bytes(payload): + return "skipped" + destination.parent.mkdir(parents=True, exist_ok=True) + descriptor, temporary = tempfile.mkstemp( + prefix=".pageswiki-", + dir=destination.parent, + ) + try: + with os.fdopen(descriptor, "wb") as stream: + stream.write(payload) + stream.flush() + os.fsync(stream.fileno()) + os.replace(temporary, destination) + finally: + if os.path.exists(temporary): + os.unlink(temporary) + return "updated" + + def command_get(self, args: list[str]) -> None: + if not 1 <= len(args) <= 2: + raise CLIError("usage: get ADDRESS [LOCAL]") + address = args[0] + payload, document_hash = self.payload_for_address(address) + if len(args) == 2 and args[1] == "-": + sys.stdout.buffer.write(payload) + return + destination = Path(args[1]) if len(args) == 2 else self.local_default(address) + status = self.write_local(destination, payload) + print( + f"{status}: {address} -> {destination} " + f"({len(payload)} bytes, {document_hash})" + ) + + def put_payload( + self, + payload: bytes, + address: str, + source: str, + content_type: str | None = None, + ) -> None: + if address.startswith("asset:"): + status = self.put_asset(address, payload, Path(source).name, content_type) + print(f"{status}: {source} -> {address} ({len(payload)} bytes)") + return + + if address.startswith("rev:"): + raise CLIError("Revision addresses are immutable") + + if address.startswith("uuid:"): + page_uuid = self.resolve_page(address) + created = False + destination = address + else: + path = self.semantic_path(address) + try: + page_uuid = self.resolve_page(path) + created = False + except CLIError: + page_uuid = self.create_page(path) + created = True + destination = f"path:{path}" + + filename = "" if source == "-" else Path(source).name + if source.startswith("EDITOR:"): + latest = self.latest_revision(page_uuid) + if latest is not None: + content_type = latest["content_type"] + filename = latest["filename"] + if content_type is None: + detection_name = filename or self.semantic_path(address).rsplit("/", 1)[-1] + content_type = detect_content_type(payload, detection_name) + status, revision_uuid = self.save_revision( + page_uuid, + payload, + f"cli put {source}", + content_type=content_type, + filename=filename, + ) + if created: + status = "created" + print( + f"{status}: {source} -> {destination} " + f"(Revision {revision_uuid})" + ) + + def command_put(self, args: list[str]) -> None: + if len(args) != 2: + raise CLIError("usage: put LOCAL ADDRESS") + source, address = args + payload = sys.stdin.buffer.read() if source == "-" else Path(source).read_bytes() + payload, address, content_type = self.prepare_upload( + payload, + address, + source, + ) + self.put_payload(payload, address, source, content_type) + + def command_mget(self, args: list[str]) -> None: + if not 1 <= len(args) <= 2: + raise CLIError("usage: mget REMOTE_PATTERN [LOCAL_DIR]") + pattern = self.semantic_path(args[0]) + destination = Path(args[1]) if len(args) == 2 else Path(".") + paths = [ + row["path"] + for row in self.db.execute( + "SELECT path FROM paths WHERE domain_uuid = ? ORDER BY path", + (self.domain_uuid,), + ) + if fnmatch.fnmatch(row["path"], pattern) + ] + if not paths: + raise CLIError(f"no Semantic Paths match: {pattern}") + wildcard_at = min( + (pattern.find(ch) for ch in "*?[" if ch in pattern), + default=len(pattern), + ) + base = pattern[:wildcard_at].rstrip("/") + base = posixpath.dirname(base) if base else "/" + for path in paths: + relative = posixpath.relpath(path, base) + self.command_get([f"path:{path}", str(destination / relative)]) + + def command_mput(self, args: list[str]) -> None: + if len(args) != 2: + raise CLIError("usage: mput LOCAL_GLOB REMOTE_DIR") + pattern, remote_dir_raw = args + sources = [Path(item) for item in glob.glob(pattern, recursive=True)] + sources = [item for item in sources if item.is_file()] + if not sources: + raise CLIError(f"no local files match: {pattern}") + remote_dir = self.semantic_path(remote_dir_raw) + wildcard_at = min( + (pattern.find(ch) for ch in "*?[" if ch in pattern), + default=len(pattern), + ) + base_raw = pattern[:wildcard_at] + if not base_raw: + base = Path(".") + elif base_raw.endswith(("/", os.sep)): + base = Path(base_raw) + else: + base = Path(base_raw).parent + for source in sources: + try: + relative = source.relative_to(base) + except ValueError: + relative = Path(source.name) + remote = posixpath.join(remote_dir, relative.as_posix()) + payload, address, content_type = self.prepare_upload( + source.read_bytes(), + f"path:{remote}", + str(source), + ) + self.put_payload(payload, address, str(source), content_type) + + def prepare_upload( + self, + payload: bytes, + address: str, + source: str, + ) -> tuple[bytes, str, str | None]: + suffix = Path(source).suffix.lower() + if suffix not in {".md", ".markdown"}: + return payload, address, None + try: + markdown = payload.decode("utf-8") + except UnicodeDecodeError as exc: + raise CLIError(f"Markdown must be UTF-8: {source}") from exc + if address.startswith("path:"): + address = re.sub(r"(?i)\.(?:md|markdown)$", "", address) + elif not any(address.startswith(prefix) for prefix in ("uuid:", "asset:", "rev:")): + address = re.sub(r"(?i)\.(?:md|markdown)$", "", address) + return ( + markdown_to_html(markdown).encode("utf-8"), + address, + "text/html; charset=utf-8", + ) + + def command_revision(self, args: list[str]) -> None: + if len(args) > 1: + raise CLIError("usage: revision [ADDRESS]") + page_uuid = self.resolve_page(args[0] if args else self.cwd) + self.print_page_info(page_uuid) + print("Revisions:") + for row in self.db.execute( + """ + SELECT + uuid, + COALESCE(NULLIF(lang, ''), 'und') AS lang, + COALESCE(document_hash, '') AS hash, + COALESCE(message, '') AS message, + COALESCE( + created_at_ms, + COALESCE(created_at, 0) * 1000 + ) AS created_at_ms + FROM revisions + WHERE object_uuid = ? + ORDER BY created_at_ms DESC, rowid DESC + """, + (page_uuid,), + ): + print( + f" {row['uuid']} {row['lang']} " + f"{row['created_at_ms']} {row['hash']} {row['message']}" + ) + + def command_diff(self, args: list[str]) -> None: + if len(args) != 2: + raise CLIError("usage: diff REVISION REVISION") + before = self.revision_row(args[0]) + after = self.revision_row(args[1]) + before_payload = self.read_document( + before["document_hash"], + before["body"], + ).decode("utf-8", errors="replace") + after_payload = self.read_document( + after["document_hash"], + after["body"], + ).decode("utf-8", errors="replace") + sys.stdout.writelines( + difflib.unified_diff( + before_payload.splitlines(keepends=True), + after_payload.splitlines(keepends=True), + fromfile=before["uuid"], + tofile=after["uuid"], + ) + ) + + def command_restore(self, args: list[str]) -> None: + if len(args) != 1: + raise CLIError("usage: restore REVISION") + row = self.revision_row(args[0]) + payload = self.read_document(row["document_hash"], row["body"]) + _, revision_uuid = self.save_revision( + row["object_uuid"], + payload, + f"cli restore {row['uuid']}", + row["lang"], + force=True, + ) + print(f"restored: {row['uuid']} -> {revision_uuid}") + + def command_link(self, args: list[str]) -> None: + if len(args) != 2: + raise CLIError("usage: link ADDRESS PATH") + page_uuid = self.resolve_page(args[0]) + path = self.semantic_path(args[1]) + now = self.now_ms() + try: + with self.db: + self.db.execute( + """ + INSERT INTO paths ( + domain_uuid, + path, + object_uuid, + created_at, + is_primary + ) + VALUES (?, ?, ?, ?, 0) + """, + (self.domain_uuid, path, page_uuid, now // 1000), + ) + except sqlite3.IntegrityError as error: + raise CLIError(f"Semantic Path already exists: {path}") from error + print(f"linked: path:{path} -> uuid:{page_uuid}") + + def command_unlink(self, args: list[str]) -> None: + if not 1 <= len(args) <= 2: + raise CLIError("usage: unlink PATH [ADDRESS]") + path = self.semantic_path(args[0]) + parameters: list[str] = [self.domain_uuid, path] + query = "DELETE FROM paths WHERE domain_uuid = ? AND path = ?" + if len(args) == 2: + query += " AND object_uuid = ?" + parameters.append(self.resolve_page(args[1])) + with self.db: + cursor = self.db.execute(query, parameters) + if cursor.rowcount == 0: + raise CLIError(f"Semantic Path binding not found: {path}") + print(f"unlinked: path:{path}") + + def command_domain(self, args: list[str]) -> None: + if len(args) > 1: + raise CLIError("usage: domain [NAME|UUID|HOST]") + if args: + self.select_domain(args[0]) + print(f"{self.domain_name}\t{self.domain_uuid}") + + def command_extension(self, args: list[str]) -> None: + if len(args) > 2: + raise CLIError("usage: extension [ID] [on|off]") + row = self.db.execute("SELECT value FROM config WHERE domain_uuid=? AND key=?", (self.domain_uuid, "system_extension_states")).fetchone() + states = json.loads(row[0]) if row and row[0] else {} + if not args: + for extension_id, enabled in sorted(states.items()): + print(f"{extension_id}\t{'enabled' if enabled else 'disabled'}") + print("(extensions not listed here use the default: enabled)") + return + extension_id = args[0].strip() + if not re.fullmatch(r"[a-z][a-z0-9._-]{1,63}", extension_id): + raise CLIError("invalid extension ID") + if len(args) == 1: + print(f"{extension_id}\t{'enabled' if states.get(extension_id, True) else 'disabled'}") + return + value = args[1].lower() + if value not in {"on", "off"}: + raise CLIError("usage: extension ID on|off") + states[extension_id] = value == "on" + payload = json.dumps(states, ensure_ascii=False, sort_keys=True, separators=(",", ":")) + with self.db: + self.db.execute("INSERT INTO config(domain_uuid,key,value,updated_at) VALUES(?,?,?,strftime('%s','now')) ON CONFLICT(domain_uuid,key) DO UPDATE SET value=excluded.value,updated_at=excluded.updated_at", (self.domain_uuid, "system_extension_states", payload)) + print(f"{extension_id}\t{value}") + + def inspect_address(self, address: str) -> None: + if address.startswith(("rev:", "asset:")): + self.command_view([address]) + return + page_uuid = self.resolve_page(address) + self.command_revision([f"uuid:{page_uuid}"]) + + def remote_completion_candidates(self) -> list[str]: + candidates: set[str] = set() + + for row in self.db.execute( + "SELECT path FROM paths WHERE domain_uuid = ? ORDER BY path", + (self.domain_uuid,), + ): + path = row["path"] + candidates.add(path) + candidates.add(f"path:{path}") + relative = posixpath.relpath(path, self.cwd) + if relative != "." and not relative.startswith("../"): + candidates.add(relative) + + for row in self.db.execute("SELECT uuid FROM objects ORDER BY uuid"): + candidates.add(f"uuid:{row['uuid']}") + + for row in self.db.execute( + """ + SELECT uuid + FROM revisions + ORDER BY + COALESCE(created_at_ms, COALESCE(created_at, 0) * 1000) DESC, + rowid DESC + """ + ): + candidates.add(f"rev:{row['uuid']}") + + for row in self.db.execute( + "SELECT address FROM assets WHERE domain_uuid = ? ORDER BY address", + (self.domain_uuid,), + ): + candidates.add(row["address"]) + + return sorted(candidates) + + @staticmethod + def local_completion_candidates(text: str) -> list[str]: + expanded = os.path.expanduser(text or ".") + pattern = expanded + "*" + candidates = [] + for match in glob.glob(pattern): + candidate = match + if text.startswith("~"): + home = str(Path.home()) + if candidate.startswith(home): + candidate = "~" + candidate[len(home) :] + if os.path.isdir(match): + candidate += os.sep + candidates.append(candidate) + return sorted(candidates) + + def complete( + self, + text: str, + state: int, + ) -> str | None: + if readline is None: + return None + + if state == 0: + line = readline.get_line_buffer() + begin = readline.get_begidx() + prefix = line[:begin] + try: + words = shlex.split(prefix) + except ValueError: + words = prefix.split() + + if not words: + candidates = list(self.command_names) + else: + command = words[0] + argument_position = len(words) + local_argument = ( + command in {"put", "mput"} and argument_position == 1 + ) or ( + command in {"get", "mget"} and argument_position == 2 + ) + if local_argument: + candidates = self.local_completion_candidates(text) + else: + candidates = self.remote_completion_candidates() + + self._completion_matches = [ + candidate for candidate in candidates if candidate.startswith(text) + ] + + if state < len(self._completion_matches): + return self._completion_matches[state] + return None + + def setup_readline(self) -> Path | None: + if readline is None: + return None + + history_path = Path( + os.environ.get( + "PAGESWIKI_HISTORY", + Path.home() / ".pageswiki_history", + ) + ).expanduser() + + try: + readline.read_history_file(history_path) + except FileNotFoundError: + pass + + readline.set_history_length(1000) + readline.set_completer(self.complete) + readline.set_completer_delims(" \t\n") + + if "libedit" in (readline.__doc__ or ""): + readline.parse_and_bind("bind ^I rl_complete") + else: + readline.parse_and_bind("tab: complete") + + return history_path + + def dispatch(self, words: list[str], interactive: bool = False) -> bool: + if not words: + return True + if len(words) == 1 and ":" in words[0] and words[0].split(":", 1)[0] in { + "path", + "uuid", + "rev", + "asset", + }: + self.inspect_address(words[0]) + return True + + command, args = words[0], words[1:] + commands = { + "ls": self.command_ls, + "cd": self.command_cd, + "mv": self.command_mv, + "view": self.command_view, + "cat": self.command_cat, + "edit": self.command_edit, + "get": self.command_get, + "put": self.command_put, + "mget": self.command_mget, + "mput": self.command_mput, + "revision": self.command_revision, + "diff": self.command_diff, + "restore": self.command_restore, + "link": self.command_link, + "unlink": self.command_unlink, + "domain": self.command_domain, + "extension": self.command_extension, + } + if command in {"exit", "quit"}: + return False + if command == "help": + print(HELP) + return True + if command == "pwd": + if args: + raise CLIError("usage: pwd") + print(self.cwd) + return True + if command == "shell": + if interactive: + raise CLIError("already in interactive shell") + self.shell() + return True + handler = commands.get(command) + if handler is None: + raise CLIError(f"unknown command: {command}") + handler(args) + return True + + def shell(self) -> None: + history_path = self.setup_readline() + try: + while True: + try: + line = input(f"pages:{self.domain_name}:{self.cwd}> ") + except EOFError: + print() + return + if readline is not None and line.strip(): + history_length = readline.get_current_history_length() + previous = ( + readline.get_history_item(history_length) + if history_length > 0 + else None + ) + if previous != line: + readline.add_history(line) + try: + words = shlex.split(line) + if not self.dispatch(words, interactive=True): + return + except (CLIError, OSError, sqlite3.Error) as error: + print(f"error: {error}", file=sys.stderr) + finally: + if readline is not None and history_path is not None: + history_path.parent.mkdir(parents=True, exist_ok=True) + try: + readline.write_history_file(history_path) + except OSError as error: + print( + f"warning: cannot write history: {error}", + file=sys.stderr, + ) + + +def main() -> int: + cli: PagesWikiCLI | None = None + try: + arguments = sys.argv[1:] + if arguments == ["help"] or arguments == ["--help"] or arguments == ["-h"]: + print(HELP) + return 0 + if not arguments: + if not sys.stdin.isatty(): + print(HELP) + return 2 + cli = PagesWikiCLI() + if not arguments: + cli.shell() + return 0 + cli.dispatch(arguments) + return 0 + except (CLIError, OSError, sqlite3.Error) as error: + print(f"pageswiki-cli: {error}", file=sys.stderr) + return 1 + finally: + if cli is not None: + cli.close() + + +if __name__ == "__main__": + raise SystemExit(main()) diff --git a/data/pageswiki_cli_test.py b/data/pageswiki_cli_test.py new file mode 100644 index 0000000..215e1c9 --- /dev/null +++ b/data/pageswiki_cli_test.py @@ -0,0 +1,47 @@ +import importlib.util +from pathlib import Path +import unittest + + +SCRIPT = Path(__file__).with_name("pageswiki-cli") +SPEC = importlib.util.spec_from_file_location("pageswiki_cli", SCRIPT) +if SPEC is None or SPEC.loader is None: + from importlib.machinery import SourceFileLoader + + SPEC = importlib.util.spec_from_loader( + "pageswiki_cli", + SourceFileLoader("pageswiki_cli", str(SCRIPT)), + ) +assert SPEC is not None and SPEC.loader is not None +pageswiki_cli = importlib.util.module_from_spec(SPEC) +SPEC.loader.exec_module(pageswiki_cli) + + +class ContentTypeDetectionTest(unittest.TestCase): + def test_extensionless_shell(self) -> None: + content_type = pageswiki_cli.detect_content_type( + b"#!/usr/bin/env bash\necho hello\n", + ) + self.assertEqual(content_type, "application/x-sh; charset=utf-8") + + def test_extensionless_utf8_text(self) -> None: + content_type = pageswiki_cli.detect_content_type( + "拡張子なしの文書\n".encode(), + ) + self.assertEqual(content_type, "text/plain; charset=utf-8") + + def test_magic_number_wins_over_text_analysis(self) -> None: + content_type = pageswiki_cli.detect_content_type( + b"%PDF-1.7\nsample", + ) + self.assertEqual(content_type, "application/pdf") + + def test_shift_jis_text(self) -> None: + content_type = pageswiki_cli.detect_content_type( + "日本語の文書\n".encode("shift_jis"), + ) + self.assertEqual(content_type, "text/plain; charset=shift_jis") + + +if __name__ == "__main__": + unittest.main() diff --git a/data/test_cli_assets.py b/data/test_cli_assets.py new file mode 100644 index 0000000..de6bd5f --- /dev/null +++ b/data/test_cli_assets.py @@ -0,0 +1,43 @@ +import runpy +import sqlite3 +import tempfile +import unittest +from pathlib import Path + + +CLI = runpy.run_path(str(Path(__file__).with_name("pageswiki-cli")))["PagesWikiCLI"] + + +class AssetMetadataTest(unittest.TestCase): + def test_head_metadata_and_history_follow_cli_uploads(self): + with tempfile.TemporaryDirectory() as directory: + cli = CLI.__new__(CLI) + cli.documents = Path(directory) / "documents" + cli.domain_uuid = "test-domain" + cli.db = sqlite3.connect(":memory:") + self.addCleanup(cli.db.close) + cli.db.row_factory = sqlite3.Row + cli.db.executescript(""" + CREATE TABLE objects(uuid TEXT PRIMARY KEY,kind TEXT,created_at INTEGER); + CREATE TABLE assets(domain_uuid TEXT,address TEXT,object_uuid TEXT, + head_document_hash TEXT,content_type TEXT,filename TEXT,size_bytes INTEGER, + created_at_ms INTEGER,updated_at_ms INTEGER,PRIMARY KEY(domain_uuid,address)); + """) + address = "asset:image:logo" + payload = b"\x89PNG\r\n\x1a\nfixture" + self.assertEqual(cli.put_asset(address, payload, "logo.png"), "updated") + self.assertEqual(cli.put_asset(address, payload, "logo.png"), "skipped") + self.assertEqual(cli.put_asset(address, payload, "renamed.png"), "updated") + row = cli.db.execute("SELECT * FROM assets").fetchone() + self.assertEqual(row["content_type"], "image/png") + self.assertEqual(row["filename"], "renamed.png") + self.assertEqual(row["size_bytes"], len(payload)) + self.assertEqual(cli.document_path(row["head_document_hash"]).read_bytes(), payload) + history = cli.db.execute("SELECT * FROM asset_head_history ORDER BY id").fetchall() + self.assertEqual(len(history), 2) + self.assertEqual(history[-1]["document_hash"], row["head_document_hash"]) + self.assertEqual(history[-1]["filename"], "renamed.png") + + +if __name__ == "__main__": + unittest.main() diff --git a/docker-compose.yml b/docker-compose.yml index 4ebd4f1..675a430 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,23 +1,97 @@ services: - nginx: - container_name: pageswiki-proxy - image: nginx:1.27-alpine - restart: unless-stopped - ports: - - "8080:80" - volumes: - - ./deploy/nginx.conf:/etc/nginx/conf.d/default.conf:ro - depends_on: - - app - app: container_name: pageswiki build: . + image: pageswiki-app + networks: + default: + aliases: + - extpages.anya.jp volumes: - ./data:/data + ports: + - "3000:3000" environment: PAGESWIKI_DATA_DIR: /data KROKI_URL: http://kroki:8000 + PAGESWIKI_ADAPTER_GATEWAY_ORIGIN: http://adaptor-gateway:3000 + extra_hosts: + - "id.anya.jp:172.18.0.10" + healthcheck: + test: ["CMD", "wget", "-q", "-O", "-", "http://localhost:3000/health"] + interval: 2s + timeout: 1s + retries: 15 + restart: unless-stopped + app2: + container_name: pageswiki-ext + image: pageswiki-app + command: > + /pageswiki --no-default-campus --add-external-campus-http extpages.anya.jp:3000 ${PAGESWIKI_EXTERNAL_CAMPUS_TOKEN:?Set PAGESWIKI_EXTERNAL_CAMPUS_TOKEN in .env} + volumes: + - ./data2:/data + ports: + - "3001:3000" + environment: + PAGESWIKI_INSTANCE_FQDN: ext-node-pages.anya.jp + PAGESWIKI_DATA_DIR: /data + KROKI_URL: http://kroki:8000 + extra_hosts: + - "id.anya.jp:172.18.0.10" + depends_on: + app: + condition: service_healthy + restart: unless-stopped + adaptor-gateway: + container_name: pageswiki-adaptor-gateway + build: + context: . + dockerfile: Dockerfile.adapter-gateway + environment: + PAGESWIKI_ORIGIN: http://app:3000 + CODE_SERVER_ORIGIN: http://code-server:8080 + EXCALIDRAW_VIEWER_ORIGIN: http://excalidraw-viewer:8080 + volumes: + - adapter-workspaces:/workspaces + expose: + - "3000" + depends_on: + app: + condition: service_healthy + code-server: + condition: service_started + excalidraw-viewer: + condition: service_healthy + restart: unless-stopped + code-server: + container_name: pageswiki-code-server + image: codercom/code-server:latest + command: + - --bind-addr + - 0.0.0.0:8080 + - --auth + - none + - --disable-telemetry + - --disable-proxy + - --disable-getting-started-override + - /workspaces + expose: + - "8080" + volumes: + - adapter-workspaces:/workspaces + restart: unless-stopped + excalidraw-viewer: + container_name: pageswiki-excalidraw-viewer + build: + context: . + dockerfile: Dockerfile.excalidraw-viewer + expose: + - "8080" + healthcheck: + test: ["CMD", "wget", "-q", "-O", "-", "http://127.0.0.1:8080/health"] + interval: 5s + timeout: 2s + retries: 12 restart: unless-stopped kroki: image: yuzutech/kroki @@ -34,3 +108,12 @@ services: restart: unless-stopped expose: - "8002" + +volumes: + adapter-workspaces: + +networks: + default: + ipam: + config: + - subnet: 172.23.0.0/27 diff --git a/docs/design/README.md b/docs/design/README.md new file mode 100644 index 0000000..dc7cf38 --- /dev/null +++ b/docs/design/README.md @@ -0,0 +1,58 @@ +# PagesWiki design documentation + +## Current reading order + +The reorganized Japanese handbook is [ja/index.md](ja/index.md), published under +`https://pages.anya.jp/lab/pageswiki-dev/`. It separates implemented slices, +proposals, unresolved decisions and delivery gates. Its chapter identifiers are +language-neutral; existing English source documents remain here for traceability +and future aligned translations, not as automatically current English editions. + +- Concepts and boundaries: chapters 1–6. +- Existing product and runtime: chapters 7–11. +- Organizer / task / calendar / RSS / mail / HTML editing proposals: chapters 12–17. +- Operations, i18n, ordered work, decisions and sources: chapters 18–22. +- [Source-to-chapter inventory](ja/sources.md). +- [Decision and inconsistency register](ja/decisions.md). + +## Document roles + +`arch.md`, `address-model.md`, `access-model.md`, `auth.md` and `i18n-delivery.md` +include original conceptual drafts. Detailed topic documents describe contracts +and implementation slices. `implementation-status.md` contains dated progress; +older paragraphs are historical and may be superseded. The roadmap is a task +inventory; the execution ledger is verification/deployment history, not a blanket +feature-completeness claim. + +For new work, update the relevant chapter and detailed contract together. Keep +stable identity, authorization and bounded processing constraints. Do not convert +design proposals into active features or public grants merely by documenting them. + +## Publication + +Japanese Markdown under `ja/` is the editing source. The documentation export +tool renders canonical HTML with the application's Markdown renderer, validates +chapter links, and emits a manifest. Upload through the trusted data CLI with an +explicit Domain and `PAGESWIKI_LANG=ja`; no authentication/publication policy is +changed. Record resulting Page/Revision identities separately from source text. +English publication is deferred until an aligned translation and language UI +are ready. Never overwrite Japanese with English at language `und`. + +Generate a fresh, empty staging directory, then run: + +```sh +go run ./tools/design-export -out /tmp/pageswiki-design-staging +go test ./tools/design-export +``` + +The tool does not access the database or network. Review `manifest.json`, check +destination collisions, and select the correct database/Domain explicitly before +using `data/pageswiki-cli put` for each rendered HTML file and manifest Path. +The index maps to `/lab/pageswiki-dev`, not `/lab/pageswiki-dev/index`. +Do not blindly replace existing Wiki edits on a later publication: compare the +recorded Revision UUID/hash with the current head and resolve divergence first. + +The initial upload receipt is [publication-ja-2026-09-19.json](publication-ja-2026-09-19.json). +All 23 canonical payloads were read back and compared. Source hashes and stored +Page/Revision identities support later language alignment. Anonymous HTTPS access +still redirects to login; this upload did not change public access settings. diff --git a/docs/design/access-model.md b/docs/design/access-model.md new file mode 100644 index 0000000..3a17274 --- /dev/null +++ b/docs/design/access-model.md @@ -0,0 +1,665 @@ +# Access Model draft + +## Goal + +Separate: + +```text +knowledge navigation +projection rendering +editing surfaces +object retrieval +native execution +``` + +into independent runtime layers. + +The system treats: + +``` +content != rendering != editor != storage +``` + +as a core architectural principle. + +# Core Principle + +Pages Wiki does NOT treat editors as canonical reality. + +Editors are: + +```text +authoring projections +``` + +onto canonical semantic object structures. + +Canonical storage is: + +```text +DOM/object graph centered +``` + +depending on object class. + +# High-Level Access Architecture + +```mermaid +graph TD + +KA[Knowledge Access] +PA[Projection Access] +EA[Editing Access] +OA[Object Access] +NA[Native Access] + +KA --> PA +PA --> EA + +PA --> OA +EA --> OA + +PA --> NA +EA --> NA +``` + +* * * + +# 1. Knowledge Access + +## Purpose + +Semantic navigation for humans. + +# Example + +```text +/research/network/bgp +/dev/api/auth +/hr/onboarding +``` + +# Responsibilities + +- semantic routing +- hierarchy traversal +- language negotiation +- capability evaluation +- object resolution + +# Output + +Usually: + +```text +rendered semantic projection +``` + +# Resolution Pipeline + +```text +path + ↓ +uuid + ↓ +revision + ↓ +projection +``` + +# Important Principle + +Knowledge access is: + +```text +human semantic navigation +``` + +NOT raw object retrieval. + +# 2. Projection Access + +## Purpose + +Interpret semantic objects into runtime surfaces. + +# Example + +```text +/_/view/flow/uuid:abcd +/_/view/slides/uuid:abcd +/_/view/sheet/uuid:abcd +/_/view/print/uuid:abcd +/_/view/canvas/uuid:abcd +``` + +# Projection Examples + +| Projection | Meaning | +| --- | --- | +| `flow` | Flowing article | +| `slides` | Staged presentation | +| `print` | Printable layout | +| `sheet` | Spreadsheet runtime | +| `canvas` | Whiteboard/canvas | +| `topology` | Graph topology | +| `preview` | Lightweight rendering | + +# Important Principle + +Projection is: + +```text +runtime interpretation +``` + +NOT canonical storage. + +# Same Object, Multiple Projections + +```mermaid +graph TD + +OBJ[Semantic Object] + +FLOW[Flow Projection] +SLIDE[Slides Projection] +PRINT[Print Projection] +SHEET[Sheet Projection] + +OBJ --> FLOW +OBJ --> SLIDE +OBJ --> PRINT +OBJ --> SHEET +``` + +* * * + +# 3. Editing Access + +## Purpose + +Provide authoring surfaces. + +* * * + +# Important Principle + +Editors are: + +```text +projection-specific authoring surfaces +``` + +NOT canonical storage owners. + +* * * + +# Editor Pipeline + +```mermaid +graph TD + +EDITOR[Editor] +AST[Semantic Object Graph] +REV[Revision Snapshot] + +EDITOR --> AST +AST --> REV +``` + +* * * + +# Supported Editors + +| Editor | Purpose | +| --- | --- | +| Markdown | Lightweight flow editing | +| WYSIWYG | Visual article editing | +| Raw HTML | Direct DOM editing | +| Slide Editor | Presentation authoring | +| Sheet Editor | Spreadsheet runtime editing | +| Whiteboard Editor | Canvas editing | +| DrawIO-like Editor | Topology editing | + +* * * + +# Important Principle + +All editors ultimately produce: + +```text +semantic object graph +``` + +or: + +```text +canonical DOM representation +``` + +depending on object class. + +* * * + +# Editor Negotiation + +Runtime selects editor based on: + +- object class +- supported projection types +- runtime capabilities +- user preferences +- available native integrations + +* * * + +# Example + +```text +HTML article +``` + +Available editors: + +- Markdown +- WYSIWYG +- Raw HTML + +* * * + +# Example + +```text +Presentation object +``` + +Available editors: + +- Slide editor +- Raw DOM editor + +* * * + +# Example + +```text +Spreadsheet object +``` + +Available editors: + +- Sheet runtime editor +- Native Excel integration + +* * * + +# 4. Object Access + +## Purpose + +Raw immutable object retrieval. + +* * * + +# Example + +```text +/_/obj/sha256:abcd +``` + +* * * + +# Typical Objects + +- PDF +- PPTX +- XLSX +- PNG +- SVG +- JS +- CSS +- DrawIO payload +- Excalidraw payload + +* * * + +# Important Principle + +Object access is: + +```text +transport/storage retrieval +``` + +NOT semantic navigation. + +* * * + +# Object Access Pipeline + +```mermaid +graph TD + +OBJREF[Object Reference] +FETCH[Object Fetch] +CACHE[Cache/CDN] +RETURN[Runtime Consumer] + +OBJREF --> FETCH +FETCH --> CACHE +CACHE --> RETURN +``` + +* * * + +# Important Principle + +Object retrieval supports: + +- deduplication +- CDN caching +- immutable references +- snapshot reproducibility +- derived object generation + +* * * + +# 5. Native Access + +## Purpose + +Bridge semantic objects into local/native applications. + +> Implementation status: TODO. The current integration-adapter runtime only +> permits hosted HTTP(S) viewers and editors. Direct executable launch requires +> a separately designed local helper, temporary workspace, credential store, +> executable allowlist, conflict detection, and Revision write-back protocol. + +* * * + +# Example + +| Semantic Link | Native Projection | +| --- | --- | +| `teams.office.com` | `msteams://` | +| `mailto:` | Mail client | +| `tel:` | Dialer | +| `vscode://` | VS Code | +| `figma://` | Figma | +| `slack://` | Slack | + +* * * + +# Native Resolution Pipeline + +```mermaid +graph TD + +LINK[Semantic Link] +RES[Resolver] +NATIVE[Native Handler] +WEB[Web Fallback] + +LINK --> RES + +RES --> NATIVE +RES --> WEB +``` + +* * * + +# Important Principle + +Links represent: + +```text +semantic execution intent +``` + +NOT fixed transport mechanisms. + +* * * + +# Runtime chooses: + +- native app +- browser fallback +- embedded projection +- external mounted surface + +depending on environment. + +* * * + +# 6. Workspace Plane vs Revision Plane + +## Workspace Plane + +Mutable editing world. + +Contains: + +- path +- alias +- asset +- live editors + +* * * + +# Revision Plane + +Immutable historical world. + +Contains: + +- revision +- sha256 snapshots +- derived projections + +* * * + +# Important Principle + +Editors operate on: + +```text +workspace objects +``` + +Revisions store: + +```text +immutable semantic snapshots +``` + +* * * + +# 7. Canonical Storage Principle + +Canonical storage depends on object class. + +* * * + +# Flow Articles + +Canonical form: + +```text +HTML DOM +``` + +* * * + +# Presentation Objects + +Canonical form: + +```text +presentation object graph +``` + +Projected into: + +- SVG sections +- HTML slides +- print layouts + +* * * + +# Spreadsheet Objects + +Canonical form: + +```text +structured semantic table graph +``` + +Projected into: + +- HTML tables +- spreadsheet runtime +- CSV +- print layouts + +* * * + +# Canvas/Whiteboard Objects + +Canonical form: + +```text +spatial object graph +``` + +Projected into: + +- SVG +- interactive canvas +- thumbnails + +* * * + +# Important Principle + +Projection-specific formats are: + +```text +runtime surfaces +``` + +NOT canonical storage truth. + +* * * + +# 8. Embedded Object Model + +Embedded objects may be: + +| Type | Meaning | +| --- | --- | +| Inline | Embedded payload | +| Linked | Immutable external object | +| Mounted | Live external application | +| Derived | Generated projection | +| Lazy | Runtime-fetched object | + +* * * + +# Example + +```html + +``` + +* * * + +# Important Principle + +Large payloads should generally use: + +```text +external immutable object references +``` + +instead of giant inline blobs. + +* * * + +# 9. Semantic Link Model + +Semantic links may resolve into: + +- knowledge paths +- projections +- native applications +- external services +- embedded runtimes + +* * * + +# Example + +```text +/research/network/bgp +``` + +may contain: + +```text +teams:// +mailto: +vscode:// +figma:// +tel: +``` + +runtime-aware semantic links. + +* * * + +# 10. Final Architectural Direction + +Pages Wiki evolves toward: + +```text +semantic knowledge runtime environment +``` + +rather than: + +```text +filesystem-oriented wiki +``` + +* * * + +# Conceptual Summary + +| Layer | Responsibility | +| --- | --- | +| Knowledge Access | Semantic navigation | +| Projection Access | Runtime interpretation | +| Editing Access | Authoring surfaces | +| Object Access | Immutable retrieval | +| Native Access | Local runtime execution | + +* * * + +# Final Principle + +Pages Wiki separates: + +```text +meaning +identity +projection +editing +storage +runtime execution +``` + +into independent architectural planes. diff --git a/docs/design/address-model.md b/docs/design/address-model.md new file mode 100644 index 0000000..59baaa7 --- /dev/null +++ b/docs/design/address-model.md @@ -0,0 +1,644 @@ +# Address Model Draft + +## Goal + +Separate: + +```text +identity +reachability +semantic meaning +projection +mutability +``` + +into independent address layers. + +The addressing model is designed to support: + +- semantic navigation +- immutable revisions +- mutable editing workspaces +- object storage +- projection rendering +- delegated sharing +- graph-capable knowledge topology + +## Core Principle + +```text +Address != Meaning +``` + +Addresses are: + +```text +reachable locators +``` + +NOT semantic meaning themselves. + +* * * + +# Address Layer Overview + +| Scheme | Purpose | Mutable | Human-oriented | +| --- | --- | --- | --- | +| `path:` | Semantic navigation | yes | yes | +| `uuid:` | Stable Page/Object identity | no | partially | +| `rev:` | Immutable historical snapshot | no | no | +| `sha256:` | Immutable content identity | no | no | +| `asset:` | Mutable editable workspace | yes | partially | +| `alias:` | Semantic pointer | yes | yes | +| `share:` | Delegated capability projection | caveat-bound | yes | +| `derived:` | Generated object | preferably no | no | +| `external:` | Foreign mounted object | provider-defined | partially | + +* * * + +# 1. path: + +## Purpose + +Human semantic routing namespace. + +* * * + +# Example + +```text +/research/network/bgp +/dev/api/auth +/hr/onboarding +``` + +* * * + +# Properties + +Property Value mutable yes human-readable yes semantic yes canonical identity no + +* * * + +# Important Principle + +Paths are: + +```text +semantic navigation surfaces +``` + +NOT canonical object identities. + +* * * + +# Resolution Flow + +```text +path + ↓ +uuid + ↓ +revision + ↓ +projection +``` + +* * * + +# 2. uuid: + +## Purpose + +Stable semantic object identity. + +* * * + +# Example + +```text +uuid:550e8400-e29b-41d4-a716-446655440000 +``` + +* * * + +# Properties + +Property Value mutable no semantic no canonical identity yes stable yes + +* * * + +# Important Principle + +UUIDs are: + +```text +opaque reachable locators +``` + +NOT semantic meaning. + +* * * + +# UUID Targets + +UUID may identify: + +- HTML document object +- PDF semantic object +- Spreadsheet object +- DrawIO semantic object +- Presentation object +- Embedded semantic object + +* * * + +# Important Principle + +UUID does NOT imply rendering format. + +Projection decides interpretation. + +* * * + +# 3. rev: + +## Purpose + +Immutable historical semantic snapshot. + +* * * + +# Example + +```text +rev:018f6b5d... +``` + +* * * + +# Properties + +Property Value immutable yes historical yes reproducible yes + +* * * + +# Revision Responsibilities + +A revision freezes: + +- HTML structure +- embedded object references +- semantic state +- projection state + +A Revision has its own UUID. Immutable payload identity is represented +separately by `sha256:`. A Revision record links a Page UUID, language tag, +Document hash, authoring metadata, and creation time. + +* * * + +# Important Principle + +Revisions MUST reference: + +```text +immutable object references only +``` + +* * * + +# Forbidden + +```text +revision -> mutable asset HEAD +``` + +* * * + +# Allowed + +```text +revision -> sha256 immutable snapshot +``` + +* * * + +# 4. sha256: + +## Purpose + +Immutable content-addressed object identity. + +* * * + +# Example + +```text +sha256:deadbeef... +``` + +* * * + +# Properties + +Property Value immutable yes content-addressed yes deduplicatable yes cacheable yes + +* * * + +# Typical Targets + +- DrawIO payload +- Excalidraw payload +- PDF binary +- Image +- CSS snapshot +- JS snapshot +- PPTX binary +- XLSX binary + +* * * + +# Important Principle + +sha256 objects are: + +```text +historical truth +``` + +* * * + +# 5. asset: + +The normative lifecycle, freezing, authorization, and retention rules are in +[`asset-model.md`](asset-model.md). + +## Purpose + +Mutable editable workspace object. + +* * * + +# Example + +```text +asset:drawio:network-core +asset:xlsx:q1-budget +asset:slide:roadmap +``` + +* * * + +# Properties + +Property Value mutable yes editable yes workspace-oriented yes + +* * * + +# Important Principle + +Assets represent: + +```text +current editable HEAD +``` + +* * * + +# Save Flow + +```text +asset mutable HEAD + ↓ +save + ↓ +snapshot + ↓ +sha256 immutable object +``` + +For HTML Revisions, supported embedding attributes containing an `asset:` +address are resolved at save time. Unresolved Asset HEADs reject the save. + +* * * + +# Important Principle + +Asset identity represents: + +```text +semantic continuity of editing +``` + +NOT immutable historical truth. + +* * * + +# 6. alias: + +## Purpose + +Semantic indirection pointer. + +* * * + +# Example + +```text +alias:latest-network-design +``` + +* * * + +# Properties + +Property Value mutable yes semantic yes canonical no + +* * * + +# Typical Uses + +- latest stable design +- current handbook +- canonical public URL +- migration pointer + +* * * + +# 7. share: + +## Purpose + +Delegated capability projection. + +* * * + +# Example + +```text +share:abcdef +``` + +* * * + +# Typical Projection + +```text +/s/abcdef +``` + +* * * + +# Properties + +Property Value temporary usually delegated yes capability-bound yes + +* * * + +# Internal Model + +Share addresses usually resolve to: + +```text +macaroon delegated capability +``` + +* * * + +# 8. derived: + +## Purpose + +Generated/transformed object identity. + +* * * + +# Example + +```text +derived:thumbnail:sha256:abcd +derived:ocr:sha256:abcd +derived:preview-svg:sha256:abcd +``` + +* * * + +# Properties + +Property Value generated yes reproducible usually immutable preferred + +* * * + +# Typical Derived Objects + +- thumbnails +- OCR text +- SVG previews +- rendered PDF pages +- AI summaries +- embeddings + +* * * + +# 9. external: + +## Purpose + +Mounted foreign object reference. + +* * * + +# Example + +```text +external:gdrive:file123 +external:figma:abcd +external:slack:thread456 +``` + +* * * + +# Properties + +Property Value foreign ownership yes mutability external-defined projection-capable yes + +* * * + +# Runtime Resolution Pipeline + +```text +path + ↓ +uuid + ↓ +revision + ↓ +projection + ↓ +embedded object resolution + ↓ +sha256 / asset / external + ↓ +renderer +``` + +* * * + +# Projection Principle + +## Address != Rendering + +Rendering is determined by: + +- mime type +- object class +- projection adapter +- user context +- runtime capability + +* * * + +# Example + +```text +uuid:abcd +``` + +may render as: + +- HTML article +- PDF viewer +- slide deck +- spreadsheet runtime +- whiteboard canvas + +depending on projection adapter. + +The adapter contract, bounded-delivery rules, and structured-format roadmap +are defined in [projection-adapters.md](projection-adapters.md). + +* * * + +## Raw Document Projection + +Raw payload delivery is a projection, not another identity namespace. The +HTTP form therefore carries an explicit internal address: + +```text +/v/raw/path:/manual/report +/v/raw/uuid:550e8400-e29b-41d4-a716-446655440000 +/v/raw/rev:018f6b5d... +``` + +Viewer embeds `path:` when displaying the current semantic projection. +Immutable Revision Viewer embeds `rev:`. A bare `/raw/` is +forbidden because it conflates projection, reachability, and identity. + +## Path Rename + +Rename changes reachability, not Page identity. It is committed atomically as: + +```text +link(new-path, existing-page-uuid) +unlink(old-path, existing-page-uuid) +``` + +Recursive rename applies the same mapping to every descendant in one database +transaction. Destination collisions abort the entire operation. When the +basename of an extension-bearing file changes, the latest language projections +receive a new Revision carrying the new `filename`; older Revisions remain +immutable. + +* * * + +# Mutability Model + +| Layer | Mutable | +| --- | --- | +| `path:` | yes | +| `alias:` | yes | +| `asset:` | yes | +| `uuid:` | no | +| `rev:` | no | +| `sha256:` | no | +| `derived:` | preferably no | + +* * * + +# Important Separation + +## Workspace Plane + +Mutable editing world. + +Contains: + +- asset: +- path: +- alias: + +* * * + +# Revision Plane + +Immutable historical world. + +Contains: + +- rev: +- sha256: +- derived: + +* * * + +# Core Architectural Principle + +Pages Wiki separates: + +```text +semantic navigation +identity +content storage +projection +editing +history +``` + +into independent planes. + +* * * + +# Conceptual Summary + +| Layer | Responsibility | +| --- | --- | +| `path:` | Semantic routing | +| `uuid:` | Stable Page/Object identity | +| `rev:` | Historical snapshot identity | +| `sha256:` | Immutable content reality | +| `asset:` | Mutable editing continuity | +| Projection | Runtime interpretation | +| Capability | Authorized reachability | + +* * * + +# Final Conceptual Direction + +Pages Wiki evolves toward: + +```text +semantic knowledge routing ++ +immutable object graph ++ +projection-oriented rendering ++ +capability-based reachability +``` + +rather than: + +```text +filesystem-oriented page hierarchy +``` diff --git a/docs/design/arch.md b/docs/design/arch.md new file mode 100644 index 0000000..33a0098 --- /dev/null +++ b/docs/design/arch.md @@ -0,0 +1,438 @@ +# Overview + +## Concept + +Pages Wiki is designed as **semantic locality driven knowledge system** rather than a traditional filesystem wiki. + +### Key properties + +- Hierarchy-oriented UI +- Graph-capable Internal model +- Language-neutral Semantic paths +- Capability-centric authorization +- Delegated access via macaroons xxx + +## Knowledge City Model + +Pages Wiki don’t only comprises Machine friendly but also Human-Facing friendly with Knowledge City Model. + +Knowledge City Model constitute five administrative division unit called ‘domain’, ‘quartier’, ‘street’, ‘spot’, ‘page’. + +- ‘page’ is minimal knowledge unit. +- ‘spot’ constitute multiple pages. Namely, spot is minimal knowledge group. + + - An overgrown knowledge spot can’t be upgraded to a street. +- ‘zone’ is managed unit in data structure. + + - ‘street’ is group of spot. ‘street’ used minimal knowledge city block. + + - If existed mixed spot and various page, it is unconsolidated street. + - ‘quartier’ can be called if it consists of an aggregation of streets delineated through urban planning. + + - An overgrown knowledge street can be upgraded to a quartier. +- ‘Domain’ is really site group. For example, ’Domain’ may indicate division and department group, project, and team. ‘Domain’ used as subdomain space in URI. +- ‘Domain’ managed by one ‘Campus’. + +```mermaid + +graph TD + Cm[Campus] + + DmA[Domain: Sales Unit] + DmB[Domain: Technical Unit] + DmC[Domain: Management Unit] + + %% Campus から Domain への接続 + Cm-..->DmA + Cm-..->DmB + Cm-..->DmC + + %% Zone定義(Quartier と Street を内包し、縦に並ぶよう調整) + subgraph Zone ["Zone"] + direction TB + + %% Quartier レ法 + QtA[Quartier: Network] + QtB[Quartier: Server] + QtC[Quartier: Application] + + %% Street レ法 + StA[Street: DNS] + StB[Street: Web] + StC[Street: Mail] + + %% Zone内での上下関係を固定するための接続 + QtB-->StA + QtB-->StB + StB-.if it is overgrown, upgrade to 'quartier'.->QtB + QtB-->StC + end + + %% Domain から Zone(Quartier) への接続 + DmB-->QtA + DmB-->QtB + DmB-->QtC + + %% Zone(Street) から下位レイヤーへの接続 + SpA[Spot: Web Infrastructure] + SpB[Spot: Wiki Application] + SpC[Spot: Search Engine] + + StB-->SpA + StB-->SpB + StB-->SpC + + %% Spot から Page への接続 + PgA[Page: Access Control Model] + PgB[Page: Addressing Model] + PgC[Page: Authenticating Model] + + SpB-->PgA + SpB-->PgB + SpB-->PgC +``` + +## Internal Semantic Structure + +Pages Wiki is arranged by machine-friendly semantic structure. + +The detailed responsibilities, invariants, schema, projections, API surface, +and implementation order for Quartier, Street, Spot, and MagicPage are defined +in [Knowledge City Model Detailed Design](knowledge-city-model.md). + +Collaboration, notification, delegated sharing, extension providers, external +storage, malware inspection, controller DR, and multi-node HA must preserve +these identities through the contracts in +[Platform Extension Architecture](platform-extension-architecture.md). These +features extend Page/Revision/City projections; they do not introduce alternate +Page identity, mutable Revision payloads, or filesystem-style ownership. + +- ‘ZoneTree’ is arranged tree-structured model for control ‘quartier’ and ‘street’, and so ‘spot’ as external pointer. ZoneTree referenced from domain. +- ‘SpotGraph’ is page pointer graph from spot. + + - SpotGraph point page ID. Multiple spot can any page with page ID(called ‘MagicPage’). +- Revision + + - A Page UUID owns an ordered Revision history. + - Each immutable Revision has a Revision UUID and references an immutable + Document by SHA-256. + - Revision identity and Document content identity are distinct. + - Revisions carry a BCP 47 language tag; `und` represents legacy or + language-unspecified content. + +```mermaid +graph LR + +Dm[Domain] +ZT[Zone Tree] +SG[Spot Graph] +PG[Pages] +RV[Revisions] + +Dm--Domain refer to ZoneTree-->ZT +ZT--ZoneTree refer to spot with SpotGraph-->SG +SG--SpotGraph refer to page-->PG +PG--page refer to revisions-->RV +``` + +### MagicPage + +The MagicPage can reach from multiple spot without depending quartier and street. So, A single Page may appear in multiple Spots. + +This creates: rooted multitree + +instead of strict filesystem hierarchy. + +```mermaid +graph LR + +SPA[Spot A] +SPB[Spot B] +SPC[Spot C] + +P1[Page UUID=P1] +P2[Page UUID=P2] + +SPA --> P1 +SPB --> P1 +SPC --> P2 +``` + +## Language Projection Model + +```mermaid +graph LR + +REQ[Request] +AL[Accept-Language] +P[Page UUID] + +JAJP[Revision ja-JP] +JA[Revision ja] +EN[Revision en] + +REQ --> AL +AL --> P + +P --> JAJP +JAJP -->|not found| JA +JA -->|not found| EN +``` + +### Example + +```http +GET /dev/api/auth +Accept-Language: ja-JP,ja;q=0.9,en;q=0.8 +``` + +# Canonical Identity Model + +```mermaid +graph TD + +DOMAIN[Domain UUID] +PATH[Semantic Path] +UUID[Page UUID] +REV[Revision] + +DOMAIN --> PATH +PATH --> UUID +UUID --> REV +``` + +### Important Principle + +```text +path != object +representation != object +(domain_uuid, path) = semantic address +object UUID = instance-global identity +``` + +A Domain owns a semantic path namespace, not the Page Object itself. The same +normalized path may exist in multiple Domains without conflict, and multiple +Domains may bind different paths to the same Page UUID. Cross-Domain links use +an absolute URL containing the destination FQDN. See +`domain-namespace-federation.md` for local/remote placement and Campus +authority modes. + +## Authentication / Authorization Flow + +```mermaid +graph TD + +OIDC[OIDC Provider] +PR[Principal] +MB[Membership] +RL[Role] +CAP[Capability Graph] + +OIDC --> PR +PR --> MB +MB --> RL +RL --> CAP +``` + +### Important Separation + +| Layer | Responsibility | +| --- | --- | +| OIDC | Identity proof | +| Principal | Canonical internal identity | +| Membership | Organizational mapping | +| Role | Semantic grouping | +| Capability | Actual authority | + +## Capability Model + +```mermaid +graph TD + +PR[Principal] +CAP[Capabilities] + +SP[Spot] +PAGE[Page] + +PR --> CAP +CAP --> SP +SP --> PAGE +``` + +## Example + +```text +Alice + └─ auth-api:read +``` + +Spot: + +```text +Auth API + └─ requires auth-api:read +``` + +## Capability Evaluation + +```mermaid +graph TD + +REQ[Read Request] +PR[Principal] +SP[Spot] +CAP[Capability Check] +ALLOW[Allow] +DENY[Implicit Deny] + +REQ --> PR +REQ --> SP + +PR --> CAP +SP --> CAP + +CAP -->|has capability| ALLOW +CAP -->|missing capability| DENY +``` + +### Important Principle + +```text +default deny +positive grants only +``` + +## Macaroon Delegation + +```mermaid +graph TD + +PR[Principal] +CAP[Capability] + +MAC[Macaroon] +CAV[Caveats] + +USR[Temporary User] + +PR --> CAP +CAP --> MAC +MAC --> CAV +MAC --> USR +``` + +### Caveat Examples + +- expires +- readonly +- network restriction +- lang restriction +- path restriction + +## Share Link Model + +```mermaid +graph TD + +SHARE["/s/abcdef"] + +MAC[Anonymous Macaroon] + +SP[Spot] +VIEW[Read-only Projection] + +SHARE --> MAC +MAC --> SP +SP --> VIEW +``` + +## Storage Model + +```mermaid +graph TD + +PAGE[Page UUID] +REV1[Revision 1] +REV2[Revision 2] +REV3[Revision 3] + +PAGE --> REV1 +PAGE --> REV2 +PAGE --> REV3 +``` + +Metadata is stored in the database. Immutable Document payloads use a global +content-addressed filesystem: + +```text +documents/ + └─ sha256/ + └─ ab/ + └─ abcdef... +``` + +The payload extension is not used as identity. MIME type and canonical format +are metadata. A Revision row references the hash and never references a +mutable asset HEAD. + +## Runtime Rendering Pipeline + +```mermaid +graph TD + +REQ[HTTP Request] + +PATH[Semantic Path] +UUID[Page UUID] +LANG[Language Resolution] +REV[Revision] +AUTH[Capability Evaluation] +RENDER[Render] + +REQ --> PATH +PATH --> UUID +UUID --> LANG +LANG --> REV +REV --> AUTH +AUTH --> RENDER +``` + +## Overall Architectural Direction + +```mermaid +graph TD + +UI[Hierarchy UI] +TREE[Rooted Tree] +GRAPH[Semantic Graph] +UUID[UUID Identity] +LANG[Language Projection] +CAP[Capability Access] +MAC[Macaroon Delegation] + +UI --> TREE +TREE --> GRAPH +GRAPH --> UUID +UUID --> LANG +LANG --> CAP +CAP --> MAC +``` + +## Final Summary + +### Pages Wiki is: + +- hierarchy-oriented for humans +- graph-capable internally +- semantic-locality-driven +- UUID identity based +- language-neutral +- capability-centric +- projection-oriented + +### NOT: + +- filesystem ACL centric +- path identity centric +- language hierarchy centric diff --git a/docs/design/archive-import.md b/docs/design/archive-import.md new file mode 100644 index 0000000..be16275 --- /dev/null +++ b/docs/design/archive-import.md @@ -0,0 +1,34 @@ +# Archive Import and Knowledge City Planning + +Archive import is a staged, auditable operation. Uploading an archive never +writes Pages directly. + +## Pipeline + +1. Store the uploaded ZIP or tar-family archive in private import storage. +2. Queue `import.analyze`; foreground requests always take scheduler priority. +3. Validate entry names, link types, file count and expanded byte limits. +4. Produce an immutable dry-run manifest containing source path, destination + Path, detected content type and initial Quartier/Street/Spot suggestions. +5. Allow a curator to edit, merge, exclude and approve suggestions. +6. Queue import execution in bounded batches. Markdown is transpiled to the + canonical HTML Document while its source representation remains available. +7. Record created UUIDs and topology operations in an import journal so a + session can be reviewed, retried or rolled back. + +## Safety limits + +- archive upload: 512 MiB; +- expanded content: 2 GiB; +- entries: 10,000; +- absolute paths, `..`, NUL, hard links and symbolic links are rejected; +- supported staging formats: ZIP, tar, tar.gz/tgz and tar.xz/txz. + +## Initial suggestion rules + +The first directory component proposes a Quartier, the second proposes a +Street, and the nearest containing directory proposes a Spot. Markdown receives +higher initial confidence than opaque assets. Later scoring incorporates +front matter, headings, README/index portals, internal links, vocabulary and +existing City boundaries. Suggestions never mutate City topology until a +curator confirms the plan. diff --git a/docs/design/asset-model.md b/docs/design/asset-model.md new file mode 100644 index 0000000..b2355fb --- /dev/null +++ b/docs/design/asset-model.md @@ -0,0 +1,247 @@ +# Asset Model + +## 1. Purpose + +An Asset is a mutable authoring identity whose HEAD points to one immutable +Document. It represents continuity of editing for binary or application-native +material such as an image, DrawIO scene, Excalidraw scene, spreadsheet, slide +deck, audio file, or video file. + +An Asset is not: + +- a Semantic Path or a Viewer URL; +- a Page Revision; +- immutable historical truth; +- an authorization capability; +- a remote-instance address. + +The identity layers remain distinct: + +| Identity | Meaning | Mutable | +| --- | --- | --- | +| `asset::` | Editable Asset identity and current HEAD | yes | +| `sha256:` | Exact immutable Document bytes | no | +| `rev:` | Immutable Page Revision that may refer to Documents | no | +| `path:/...` | Domain-scoped semantic reachability | yes | + +## 2. Address and scope + +The canonical local address is: + +```text +asset:: +``` + +Examples: + +```text +asset:image:knowledge-city-logo +asset:drawio:network-core +asset:xlsx:q1-budget +``` + +`type` is a projection/editor hint, not trusted MIME metadata. `name` is the +stable authoring name. The complete address is Domain-local, case-sensitive, +and unique by `(domain_uuid, address)` in the `assets` table. + +Asset authoring identity is Domain-scoped so separate Domains may independently +own `asset:image:logo`. Immutable Documents remain content-addressed and may be +deduplicated across Domains. A local `asset:` address must never be resolved on +another instance. A remote resource requires an absolute HTTPS URL and an +explicit federation or external-object contract. + +## 3. Stored state + +The current additive schema is: + +| Column | Meaning | +| --- | --- | +| `domain_uuid` | Owning Domain; part of the composite primary key | +| `address` | Canonical `asset:` identity; part of the composite primary key | +| `object_uuid` | Stable Object UUID with kind `asset` | +| `head_document_hash` | Current immutable Document SHA-256; empty means no HEAD | +| `created_at_ms` | Asset creation time | +| `content_type` | Mutable MIME metadata for the current HEAD | +| `filename` | Mutable filename metadata for the current HEAD | +| `size_bytes` | Current HEAD byte length | +| `updated_at_ms` | Last HEAD update time | + +The bytes are stored in the Document Store under their SHA-256. The Asset row +contains no duplicate body. Filename, MIME type, and size describe the mutable +HEAD but do not participate in Document identity. Immutable delivery uses +bounded content detection when historical metadata is unavailable. + +## 4. State transitions + +### Create or update HEAD + +```text +input bytes + -> calculate SHA-256 + -> atomically persist immutable Document + -> compare with Asset HEAD + -> create Asset or move HEAD +``` + +Writing identical bytes with unchanged MIME and filename is a no-op. Correcting +MIME or filename records a metadata/history update without changing the hash. +Moving HEAD never mutates or overwrites the +old Document. The local CLI currently implements this operation through +`put LOCAL asset::` and `edit asset::`. + +Asset HEAD updates do not create Page Revisions. An old Document remains live +when a Page Revision has frozen a reference to it; otherwise it may become +garbage after it is no longer an Asset HEAD. Garbage collection must treat +current Asset HEADs and `revision_document_refs` as roots. + +### Read + +`view`, `cat`, and `get` resolve the Asset HEAD at operation time. These are +mutable reads and must not be used for reproducible rendering or historical +export. Reproducible consumers use the resolved `sha256:` identity. + +### Delete + +Administrator HTTP deletion removes the mutable Asset identity only; it does +not delete a Document still +referenced by a Revision, another Asset HEAD, export, or retention root. +Automatic retention and physical Document collection policy remain pending. + +## 5. Revision save and freezing + +A saved Page Revision must never use a live `asset:` dependency as its rendered +payload. It does retain the authoring address as provenance so a later edit can +resolve the then-current HEAD. For HTML payloads, the server resolves `asset:` +values at save time: + +| Authoring input | Stored Revision | +| --- | --- | +| `asset-ref="asset:…"` | Retain `asset-ref`; add/update `immutable-ref="sha256:"` | +| `immutable-ref="asset:…"` | Normalize to retained `asset-ref` plus fixed `immutable-ref` | +| `src="asset:…"` | Fixed `src="/_/obj/sha256:"` plus `data-pageswiki-asset-src="asset:…"` | +| `href="asset:…"` | Fixed `href` plus `data-pageswiki-asset-href` provenance | +| `poster="asset:…"` | Fixed `poster` plus `data-pageswiki-asset-poster` provenance | +| `data="asset:…"` | Fixed `data` plus `data-pageswiki-asset-data` provenance | + +Only HTML attribute values are transformed. Explanatory prose, code blocks, +and non-HTML payloads are not rewritten. A missing Asset or an Asset without a +valid HEAD rejects the save with `ErrEmbeddedAssetUnavailable`; silently +leaving a mutable dependency is forbidden. + +On a later save, the provenance address is resolved again and the fixed hash is +updated to the current Asset HEAD. Merely viewing an old Revision never resolves +the mutable address and therefore remains reproducible. + +### Authoring forms + +Markdown may use ordinary resource and link syntax because compilation produces +the supported HTML attributes: + +```markdown +![Knowledge City logo](asset:image:knowledge-city-logo) +[Download the workbook](asset:xlsx:q1-budget) +``` + +Equivalent HTML examples are: + +```html +Knowledge City logo +Download the workbook + + + +``` + +`asset:` is accepted only in `asset-ref`, legacy `immutable-ref`, `src`, `href`, +`poster`, and `data`. CSS `url()`, `srcset`, inline scripts, arbitrary +`data-*` attributes, and plain text are not resolvers. They require a future +typed parser rather than unsafe textual replacement. + +### Access surfaces + +| Surface | Address | Semantics | +| --- | --- | --- | +| CLI authoring | `asset::` | Mutable HEAD read/write in selected Domain | +| Administrator HEAD URL | `/v/raw/asset::` | Resolves current HEAD on every request; private and non-canonical | +| HTML/Markdown authoring | `asset::` | Resolved only while saving a Revision | +| Stored semantic reference | `asset-ref="asset:…"` | Provenance for later editing; never rendered directly | +| Stored immutable reference | `sha256:` | Exact dependency identity | +| Browser delivery | `/_/obj/sha256:` | Authorized immutable GET/HEAD/Range | +| Management API | `/_/api/v1/assets?address=asset:…` | Domain-admin metadata and mutation surface | + +The mutable Asset URL is an authenticated administrator authoring projection; +it is never emitted into published Pages or historical Revisions. It uses a +private revalidation cache policy and reports both the Asset address and +resolved HEAD hash in response headers. Published Pages always load the frozen +Document URL. + +Every frozen dependency is recorded as: + +```text +revision_document_refs(revision_uuid, document_hash) +``` + +This relation is part of Revision truth. It enables dependency inspection, +authorization, export, and garbage-collection reachability without reparsing +historical HTML. + +## 6. Delivery and authorization + +Immutable bytes are delivered through: + +```text +/_/obj/sha256: +``` + +Knowing a hash is not authorization. Delivery succeeds only when the Document +is either the body of, or a frozen dependency of, a Revision whose Object has a +readable Path in the current Domain. The response exposes Object, Revision, and +Document identities in the PagesWiki metadata headers and supports ETag, HEAD, +and byte ranges. + +The current HEAD of a Domain Asset may also be inspected through the same +immutable URL by a Domain or Campus administrator, even before any Revision has +frozen it. This administrative exception is for Asset management and does not +make the mutable HEAD anonymously readable. Once frozen into a Page Revision, +ordinary access follows that Page's read authorization. + +The trusted local CLI bypasses HTTP Capability evaluation and is controlled by +database and filesystem permissions. The administrator HTTP API is restricted +to Domain or Campus administrators and requires an Asset HEAD ETag for updates +and deletion, or `If-None-Match: *` for creation. It records immutable HEAD +history with actor identity. Moving this endpoint into the typed policy matrix +and general audit outbox remains pending. Last-writer-wins HTTP updates are not +accepted. + +## 7. Consistency rules + +1. `head_document_hash` and every frozen dependency must be a lowercase, + 64-character SHA-256. +2. Asset HEAD movement never changes existing Documents or Revisions. +3. Revision save resolves all supported embedded Asset references or fails. +4. `asset:` is authoring identity; `sha256:` is delivery/storage identity. +5. A hash, Asset address, or Object UUID never grants access by itself. +6. Cross-instance Asset resolution is forbidden without an explicit origin. +7. GC must preserve Documents reachable from Revisions, frozen references, + current Asset HEADs, and configured retention roots. + +## 8. Implementation status + +| Capability | Status | +| --- | --- | +| Local CLI create/update/read/edit | active | +| Content-addressed Document persistence | active | +| HTML save-time freezing | active | +| Revision-to-Document dependency records | active | +| Authorized immutable HTTP delivery | active | +| Asset owner excluded from Zombie Object GC | active | +| Asset MIME/filename/size metadata | active | +| Administrator HTTP CRUD and ETag/CAS updates | active | +| Initial Domain Asset management UI | active | +| History/restore and dependency detail UI | active | +| Delete/retention UI and audit trail | designed, not implemented | +| Remote/federated Asset synchronization | not designed as implicit lookup | diff --git a/docs/design/auth-backend.md b/docs/design/auth-backend.md new file mode 100644 index 0000000..cab4c13 --- /dev/null +++ b/docs/design/auth-backend.md @@ -0,0 +1,152 @@ +# Authentication and Authorization Backend + +## Boundary + +Authentication proves an identity. Every authenticator produces the same +internal `principal_uuid`; authenticators never grant document access directly. +Authorization is Domain-scoped and evaluates positive grants only: + +```text +request -> session -> principal -> Domain membership -> role -> capability +``` + +Campus owns trusted identity-provider configuration. A Domain owns membership, +roles, grants, session policy, and the default authorization mode. Managed +Campus provider metadata is inherited from its controller; secrets remain on +the instance that performs authentication and are never federated. + +## Authentication methods + +| Method | Stable external key | Secret location | +| --- | --- | --- | +| password | normalized username | Argon2id verifier in credential table | +| OIDC | exact `(issuer, subject)` | encrypted client secret/config | +| LDAP | `(provider UUID, immutable directory attribute)` | encrypted bind secret | +| TOTP | principal + factor UUID | encrypted seed; recovery codes hashed | +| magic link | normalized verified email | one-use hashed challenge | +| device approval | requesting-device challenge UUID | one-use hashed challenge | + +OIDC groups and LDAP groups are attributes. Explicit mapping rules may create +or remove Membership/Role bindings, but group names are not capabilities. +The route policy, internal group schema, `/g/` namespace, and endpoint matrix +are specified in [Endpoint Authorization and Groups](authorization-groups.md). + +## Core records + +- `principals`: canonical person/service identity and lifecycle state. +- `principal_identities`: unique provider subjects attached to a Principal. +- `auth_credentials`: password/TOTP/recovery material and version metadata. +- `domain_memberships`: Principal membership in one Domain. +- `auth_roles`, `auth_role_bindings`: Domain roles and membership assignment. +- `groups`, `group_members`, `auth_group_role_bindings`: Domain-scoped + Principal collections and their Role assignment. +- `auth_capability_grants`: positive operation grants with typed targets. +- `auth_sessions`: opaque, hashed, rotating browser sessions. +- `auth_challenges`: short-lived one-use login/MFA/device challenges. +- `auth_audit_log`: append-only authentication and policy decisions. + +Capabilities use verbs `read`, `create`, `upload`, `write`, `rename`, `delete`, +`link`, `manage`, and `delegate`. Targets are `domain`, `quartier`, `street`, `spot`, `path`, or +`object`. Locality inheritance is resolved by the address model; an exceptional +Page/Object grant does not rewrite the path hierarchy. + +## Evaluation + +1. Resolve Domain before reading the session. +2. Hash the opaque cookie and load an unexpired, unrevoked session for that + Domain. Reject suspended/quarantined Principals. +3. Resolve Membership and its Role bindings. +4. Match the requested verb and target against positive grants. `manage` + includes administrative operations but does not imply `delegate`. +5. Record denied sensitive operations and every policy/configuration mutation. + +No matching grant means deny. During migration, `authorization_mode=legacy` +leaves existing anonymous behavior intact. Administrators bootstrap an owner, +verify access, then switch a Domain to `enforcing`. New Domains should default +to `enforcing` once the bootstrap flow is complete. + +## HTTP flows + +- `/_/auth/login`, `/_/auth/logout`, `/_/auth/callback/oidc/{provider}` +- `/u/{username}` is the Domain-scoped profile and user-Wiki root. + `/u/{username}/_/edit` is its owner-only profile editor and + `/_/auth/profile` redirects there. Other descendants are ordinary semantic + Wiki paths. Usernames exclude dots so the public handle can be derived as + `{username}.{domain FQDN}` without ambiguity. +- `/_/auth/challenge/password`, `/totp`, `/magic-link`, `/device` +- `/_/api/v1/auth/session`, `/principals`, `/roles`, `/grants`, `/audit` + +Cookies are `Secure`, `HttpOnly`, `SameSite=Lax`, host-only, and contain only a +random secret whose SHA-256 hash is stored. Login rotates the session; password +or factor changes revoke all Principal sessions. State/nonce/PKCE are mandatory +for OIDC. Magic links and device approvals store only a token hash, are +single-use, expire quickly, and are bound to Domain and intended action. + +TOTP seeds are encrypted with AES-GCM using a 256-bit instance key stored as +`auth.key` beside the Document Store (`0600`), or derived from +`PAGESWIKI_AUTH_KEY`. Enrollment remains disabled until a valid six-digit code +is confirmed. Login challenges expire after five minutes, allow five attempts, +and reject reuse of an accepted 30-second counter. + +OIDC providers are configured per Domain from the authentication panel. The +flow uses discovery, Authorization Code, PKCE S256, state, and nonce, then +resolves the subject through UserInfo. A first login may bind `(issuer, sub)` +only to an existing Principal with the same verified email; it never creates a +role or capability from provider claims. Client secrets are encrypted with the +instance authentication key. + +LDAP providers are also Domain-scoped. The implemented login sequence follows +the same separation used by Wiki.js' LDAP authenticator: + +1. connect to an `ldap://` or `ldaps://` endpoint with an 8-second socket + deadline; optionally upgrade an `ldap://` connection with StartTLS; +2. bind the configured search service account, or use an anonymous search when + both bind fields are empty; +3. insert the RFC 4515-escaped login into a configured filter containing + `{{username}}`, search below the configured Base DN, and require exactly one + result (server size limit 2, time limit 6 seconds); +4. read an explicitly configured immutable ID, local username, email, and + display-name attribute; +5. bind as the returned user DN with the submitted password. A search result by + itself is never accepted as proof of authentication; +6. resolve the first login by an exact unique local username or email, then + persist `(provider UUID, immutable ID)`. Following logins use only that + immutable binding. Optional automatic provisioning creates an ordinary + `member` with no local password credential. + +The immutable attribute should be `entryUUID` for common LDAP servers or the +binary `objectGUID` for Active Directory. DN, email, display name, and account +name are mutable attributes and therefore are not stable subjects. Bind +passwords use the instance authentication-key encryption; leaving the password +blank in the settings form preserves the existing encrypted value. TLS +certificate validation is on by default, a private CA can be appended as PEM, +and disabling validation is an explicit per-Domain administrator action. + +The settings panel exposes a saved-configuration login test. User passwords are +used only for the user-DN bind and are neither persisted nor logged. Connection +admission is bounded to four process-wide LDAP operations. The browser receives +the same generic invalid-credentials response for lookup and password failures; +the server log retains the provider-side error without the submitted username +or password. + +SMTP magic links target existing active/read-only Principals by normalized +email. The public request response never reveals whether an address exists. +Links contain a random token whose hash alone is stored, expire after fifteen +minutes, and are consumed atomically once. SMTP credentials use the same +encrypted provider-secret storage. Delivery is admitted through a bounded +background slot so an SMTP server cannot hold the login request open. + +LDAP and SMTP run through bounded worker queues with timeouts; request handlers +do not wait indefinitely on an external directory or mail server. A durable +authentication-attempt quota keyed by Domain, normalized account identifier, +source prefix, and challenge kind remains required before an Internet-facing +multi-tenant deployment; bounded provider admission is not a rate limiter. + +## Delivery order + +1. Common schema, Principal normalization, sessions, RBAC evaluation, audit. +2. Bootstrap owner plus password/Argon2id and optional TOTP. +3. OIDC Authorization Code + PKCE. +4. SMTP magic link and device approval challenges. +5. LDAP bind/search with immutable identity mapping. +6. Delegated macaroon capabilities after canonical RBAC is enforced. diff --git a/docs/design/auth.md b/docs/design/auth.md new file mode 100644 index 0000000..b571596 --- /dev/null +++ b/docs/design/auth.md @@ -0,0 +1,642 @@ +# Pages Wiki vNext Authentication / Authorization Draft + +## Goal + +Separate: + +```text +Authentication +Identity +Capability +Delegation +Projection +``` + +into independent layers. + +Avoid tightly coupling: + +```text +OIDC groups +filesystem ACLs +path hierarchy +``` + +to the knowledge topology. + +* * * + +# Core Philosophy + +## Authentication != Authorization + +Authentication answers: + +```text +Who are you? +``` + +Authorization answers: + +```text +What may you do? +``` + +These are intentionally separated. + +* * * + +# High-Level Architecture + +```text +OIDC + ↓ +Principal + ↓ +Membership / Roles + ↓ +Capability Graph + ↓ +Macaroon Delegation + ↓ +Runtime Policy Evaluation +``` + +* * * + +# Layer 1: Authentication + +## Responsibility + +Identity proof only. + +* * * + +# Recommended Mechanism + +OIDC / OpenID Connect. + +Examples: + +- Keycloak +- Authentik +- Azure AD +- Google Workspace +- GitHub OIDC + +* * * + +# OIDC Output + +Example claims: + +```json +{ + "iss": "...", + "sub": "...", + "email": "...", + "groups": [...] +} +``` + +* * * + +# Important Principle + +OIDC groups are NOT canonical authorization objects. + +They are only: + +```text +external identity attributes +``` + +* * * + +# Layer 2: Principal + +## Responsibility + +Canonical internal identity normalization. + +* * * + +# Principal Model + +```text +principal_id +issuer +subject +display_name +email +``` + +* * * + +# Important Principle + +The canonical identity inside Pages is: + +```text +principal_id +``` + +NOT: + +```text +OIDC group +email address +username +``` + +* * * + +# Layer 3: Capability Model + +## Responsibility + +Represent authority within the knowledge topology. + +* * * + +# Capability Philosophy + +Capabilities are attached primarily to: + +```text +Zone +Spot +``` + +rather than individual Pages. + +* * * + +# Why + +Knowledge naturally clusters around semantic localities. + +ACLs scale better when attached to locality. + +* * * + +# Example + +```text +Spot(Auth API) + allow: + engineering-reader + api-editor +``` + +Pages inherit effective visibility from their locality. + +* * * + +# Capability Model + +```text +principal + ↓ +membership + ↓ +role + ↓ +capability +``` + +* * * + +# Example + +```text +engineering-team + ↓ +api-editor + ↓ +write Spot(Auth API) +``` + +* * * + +# Important Principle + +Roles are internal semantic policy objects. + +They are NOT identical to OIDC groups. + +* * * + +# OIDC Mapping + +```text +OIDC group + ↓ +Pages membership + ↓ +Pages role + ↓ +Capability +``` + +* * * + +# Capability Target Types + +Capabilities may target: + +| Object Type | Meaning | +| --- | --- | +| Zone | Containment locality | +| Spot | Semantic locality | +| Page | Exceptional override only | +| Binding | Projection-level visibility | + +* * * + +# Default Authorization Strategy + +## Default Deny + +No capability means: + +```text +access denied +``` + +* * * + +# Positive Grant Only + +Avoid large explicit deny graphs. + +Prefer: + +```text +grant omission +``` + +instead of: + +```text +explicit deny +``` + +* * * + +# Why + +Explicit deny causes: + +- precedence complexity +- inheritance conflicts +- ACL explosion +- runtime ambiguity + +* * * + +# Recommended Model + +```text +allow-only locality policies +``` + +plus: + +```text +principal-side overlays +``` + +for exceptional cases. + +* * * + +# Exceptional Restriction Handling + +Instead of: + +```text +deny alice +``` + +prefer: + +```text +alice.status = suspended +``` + +or: + +```text +alice lacks capability +``` + +* * * + +# Principal States + +Examples: + +```text +active +readonly +suspended +quarantined +audit-only +``` + +* * * + +# Layer 4: Macaroon + +## Responsibility + +Portable delegated constrained capability. + +* * * + +# Important Principle + +Macaroon is NOT the canonical ACL database. + +Macaroon is: + +```text +authority artifact +delegated capability token +portable constrained access proof +``` + +* * * + +# Macaroon Role + +Macaroons transport delegated authority. + +* * * + +# Example + +Canonical server-side capability: + +```text +Alice + └─ read Spot(Auth API) +``` + +Delegated macaroon: + +```text +read-only +spot=auth-api +expires<2026-02-01 +office-network-only +``` + +* * * + +# Caveats + +Macaroon caveats attenuate authority. + +Examples: + +Caveat Meaning expires time restriction network source network restriction readonly capability narrowing path locality restriction lang projection restriction method operation restriction + +* * * + +# Important Property + +Macaroons can only: + +```text +reduce authority +``` + +never expand it. + +* * * + +# Runtime Validation + +```text +1. Verify macaroon signature +2. Verify caveats +3. Verify delegated capability validity +4. Apply runtime policy +``` + +* * * + +# Share Links + +Example: + +```text +/s/abcdef +``` + +may internally represent: + +```text +anonymous delegated macaroon capability +``` + +* * * + +# Important Property + +Share links may work without OIDC login. + +This enables: + +```text +identity-less delegated access +``` + +* * * + +# Capability vs ACL + +## Traditional ACL + +```text +Object + └─ Subjects +``` + +* * * + +# Capability-Oriented Model + +```text +Principal + └─ Possessed Authorities +``` + +* * * + +# Real-World Analogy + +Pages authorization behaves more like: + +```text +building access control +``` + +than filesystem ACLs. + +* * * + +# Example + +```text +Zone = building +Spot = room +Capability = key +Macaroon = temporary visitor pass +``` + +* * * + +# Locality Unlock Model + +## Spot + +```text +requires capability: + auth-api:read +``` + +* * * + +# Principal + +```text +possesses: + auth-api:read +``` + +* * * + +# Runtime + +```text +Does principal possess required capability? +``` + +* * * + +# Capability Delegation + +Example: + +```text +Alice delegates: + read-only access + to Spot(Auth API) + valid for 24 hours +``` + +This maps naturally to: + +```text +temporary visitor badge +``` + +* * * + +# Runtime Authorization Evaluation + +## Without Macaroon + +```text +principal session + ↓ +effective capability lookup +``` + +* * * + +# With Macaroon + +```text +verify macaroon + ↓ +apply caveats + ↓ +treat as delegated capability +``` + +* * * + +# Runtime Evaluation Components + +| Component | Responsibility | +| --- | --- | +| Principal | Identity | +| Capability Graph | Canonical authority | +| Macaroon | Delegated authority | +| Runtime Policy | Dynamic constraints | +| Effective Cache | Acceleration | + +* * * + +# Runtime Constraints + +Examples: + +```text +time +network +risk +device +lang +projection +``` + +* * * + +# Effective Capability Cache + +Recommended for scalability. + +Example: + +```text +principal_effective_capabilities +``` + +* * * + +# Important Principle + +The source of truth is: + +```text +server-side capability graph +``` + +NOT macaroon tokens. + +* * * + +# Architectural Direction + +Layer Model Authentication OIDC Identity Principal Authorization Capability graph Delegation Macaroon Constraints Caveats Runtime Effective policy evaluation + +* * * + +# Conceptual Summary + +Pages Wiki authorization is evolving toward: + +```text +semantic locality capability system +``` + +rather than: + +```text +filesystem ACL system +``` diff --git a/docs/design/authorization-groups.md b/docs/design/authorization-groups.md new file mode 100644 index 0000000..cad723f --- /dev/null +++ b/docs/design/authorization-groups.md @@ -0,0 +1,410 @@ +# Endpoint Authorization and Groups + +## Scope + +2026-09-14 extension: [locality access and publication](locality-access-publication.md) +adds restrictive named user/group layers over existing grants and a separate +explicitly approved anonymous semantic/raw path. For Objects, all local +restrictive alias caps apply before the original positive-grant/any-readable- +alias rule below. Existing group profiles and administrative roles are unchanged. + +This document completes the backend design between authentication and the +existing capability graph. It specifies route-level enforcement, target +resolution, groups, and the `/g/` namespace. Authentication providers prove a +Principal; neither an OIDC/LDAP group nor an HTTP route grants authority by +itself. + +## Request authorization pipeline + +Every registered route has a static `RoutePolicy`. Authorization must not infer +authority from arbitrary URL substring matching. + +```go +type RoutePolicy struct { + Name string + Methods map[string]MethodPolicy + Authentication AuthenticationPolicy // public, optional, principal, service + CSRF bool +} + +type MethodPolicy struct { + Capability string // read, write, rename, delete, link, manage, delegate + Resolve TargetResolver +} + +type AuthorizationTarget struct { + DomainUUID string + Type string // domain, quartier, street, spot, path, object, group + ID string // canonical UUID where one exists +} +``` + +The request sequence is fixed: + +1. Normalize the request and attach a request ID. +2. Resolve the local Domain from the effective host. Reject remote placement. +3. Match a registered route and method. An unregistered method returns `405`. +4. Resolve credentials into an optional Principal or a service/delegation + context. Domain browser sessions and Bearer tokens use the same stored + session record; adapter, federation, and future share tokens are distinct + credential types and are never promoted to Principal sessions. +5. Guard browser mutations with same-origin Fetch Metadata/Origin before any + authorization bypass. Cookie requests missing that evidence require a + matching Referer; otherwise deny. Explicit Bearer/service clients may omit + browser metadata, but actual cross-origin requests are still rejected. See + [browser request boundaries](browser-request-security.md). +6. Resolve the target without performing the operation. Path input is + normalized and resolved in the current Domain; Object and Revision routes + resolve back to their owning Object and all currently relevant bindings. +7. Evaluate Principal state, Domain membership, direct Role bindings, group + Role bindings, and positive grants. No match means deny. +8. Invoke the handler only after authorization. Record sensitive allows, + administrative mutations, and all denies in `auth_audit_log`. + +Target resolvers return `404` only after the caller has enough `read` authority +to distinguish absence. Otherwise they return `403`, preventing private-object +enumeration. Authentication failures are `401` JSON for APIs and a login +redirect for browser navigation. Authorization failures are `403` in both. + +For a path, candidate grants are the exact Object/Path exceptional grant, its +Spot/Street/Quartier ancestry once ZoneTree exists, and finally the Domain. +Evaluation stops at no artificial path segment: only stored topology records +participate. Until those locality records exist, the safe fallback is the +Domain grant plus exact Object/Path grants, not string-prefix inheritance. + +An Object with several semantic bindings is readable through its UUID when an +exact Object grant applies or at least one live binding is readable. Responses +then include only bindings separately readable by the caller. A Revision and +its raw/derived projections inherit this Object decision; knowing a Revision +UUID never supplies authority. Broad Domain grants require a live local binding +or recorded creation provenance while the Object has no bindings anywhere. +Other unbound/foreign-only Objects require an exact Object grant, never a broad +Domain or Object-wildcard grant. See [Object authority scope](object-authority-scope.md). + +## Route policy inventory + +The first implementation slice uses the following policies. A more specific +locality target replaces `domain` as Quartier, Street, and Spot records become +available. + +| Surface | Methods | Authentication | Capability and target | +| --- | --- | --- | --- | +| `/health`, static theme/CSS needed by login | GET/HEAD | public | none; health exposes no internals | +| `/_/auth/login`, setup, OIDC callback, magic-link request/verify | declared flow methods | public challenge | rate-limited, challenge-bound | +| `/_/auth/logout` | GET/HEAD confirmation; POST revocation | principal | revoke the supplied session only; browser origin guard | +| `/u/{username}`, `/g/{group}` and semantic Viewer paths | GET/HEAD | optional in legacy, principal in enforcing | `read` resolved path/domain | +| `/e/-/...`, `/:/new`, upload and compile write surfaces | GET plus declared writes | principal | `write` resolved path/locality | +| `/o/uuid:*`, `/o/path:*`, `/r/view/*`, `/r/history/*`, `/r/diff/*` | GET/HEAD | policy-dependent principal | `read` owning object/path; immutable IDs do not bypass policy | +| `/v/raw/*`, previews, archive/email/PDF children | GET/HEAD | policy-dependent principal | `read` source object/revision; cached derivations inherit source policy | +| `/v/search`, tree, browser and children | GET/HEAD | optional/principal | filter every result by `read`; never reveal hidden counts or ancestors | +| `/l/uuid:*` | GET | principal | `read`; POST/DELETE require `link` on object and affected paths | +| object/revision/tag APIs | exact route method | principal | list/read=`read`, create/save/tag=`write`, restore=`write`, purge=`delete` | +| path bind/copy/rename/remove APIs | POST | principal | `link`, `write`, `rename`, or `delete` on both source and destination as applicable | +| GC zombie list/purge | GET/POST | principal | Domain `manage` | +| `/-/sys/config*`, auth administration | GET/POST | principal | Domain `manage`; provider secrets never returned | +| event scheduler and queue APIs | GET or mutation method | principal | GET Domain `manage`; mutation Domain `manage` | +| adapter registry/open-with | GET/POST | principal | read source plus Domain `manage` for registry mutation | +| adapter session exchange/read/write | declared ticket | service | ticket scope, object UUID, base Revision, method, expiry, one use | +| federation enrollment | POST | service | Campus enrollment token, rate limit, controller mode; not Domain RBAC | +| future `/s/*` | GET/HEAD | delegated | macaroon caveats and underlying still-valid delegated grant | + +Handlers must declare supported methods; a mutating operation is never exposed +through GET. Search indexes, recent-object lists, children projection caches, +preview caches, archive entries, and adapter workspaces are derived data and +must apply the source object's current authorization on every read. + +The server keeps these declarations in a central typed endpoint policy +classifier. Exact API routes are method-closed, unknown mutations below a +reserved namespace fail closed, and semantic Page mutations use a Path target. +Handler-local checks remain authoritative where the target is carried in JSON, +multipart data, or an adapter ticket; those checks must be replaced only by a +typed target resolver with equivalent source and destination coverage. + +For immutable addresses, authorization resolves back to mutable authority: +a Revision is authorized through its Object, and an Object is readable through +an exact Object grant or at least one readable live Path binding in the current +Domain. Raw bytes, bounded text, generated PDF pages, cached thumbnails, print, +history, and diff projections all reuse that decision. Their responses use +private caches varying on credentials even when the underlying Revision is +content-addressed. Directory/search projections authorize their requested scope +and filter every returned Path; hidden entries are excluded from displayed +counts. + +Recursive namespace mutations expand the complete stored source set before the +transaction. Rename requires `rename` on every source and `create` on every +mapped destination; copy requires `read` and `create` respectively; recursive +delete requires `delete` on every affected Path. Link management additionally +requires `link` authority on the Object and affected Path, and only readable +bindings are returned by its UI. + +## Content permission profiles + +The group UI exposes profiles rather than ambiguous collections of checkboxes: + +| Profile | Effective capabilities | Explicit exclusions | +| --- | --- | --- | +| `read` | `read` | every mutation | +| `read_write_once` | `read`, `create`, `upload` for a previously absent target | overwrite, later Revision save, rename, unlink, delete | +| `read_write` | `read`, `create`, `upload`, `write`, `rename`, `link` | delete | +| `upload_only` | `upload` for a previously absent target | list/read, overwrite, rename, unlink, delete | + +`write` implies `create` and `upload` for canonical direct Role grants, while a +group profile stores its exact set above. `create` means create a new semantic +binding/Object and its first Revision. `upload` is checked only after the final +filename and destination path are normalized. Both fail closed if the target +already exists unless `write` is also granted. Deletion is never inferred from +write and requires an explicit `delete` grant outside these four profiles. + +`group admin` and `group user` are membership administration roles, not content +profiles. Owner and manager are presented as group-admin variants; member is +presented as group user. Their Wiki access still comes only from a content +permission profile or another Role binding. + +## Group model + +A Pages group is a Domain-scoped collection of Domain memberships. It is not an +authentication provider group, a Role, a Capability, a Campus object, or a +semantic path. The group UUID is stable while its name and Wiki binding may +change. + +```sql +CREATE TABLE groups ( + uuid TEXT PRIMARY KEY, + domain_uuid TEXT NOT NULL, + name TEXT NOT NULL, + display_name TEXT NOT NULL DEFAULT '', + description TEXT NOT NULL DEFAULT '', + visibility TEXT NOT NULL DEFAULT 'members', -- public, domain, members + state TEXT NOT NULL DEFAULT 'active', -- active, readonly, archived + created_at_ms INTEGER NOT NULL, + updated_at_ms INTEGER NOT NULL, + UNIQUE(domain_uuid, name) +); + +CREATE TABLE group_members ( + group_uuid TEXT NOT NULL, + membership_uuid TEXT NOT NULL, + member_role TEXT NOT NULL DEFAULT 'member', -- owner, manager, member + source TEXT NOT NULL DEFAULT 'local', -- local or mapping UUID + created_at_ms INTEGER NOT NULL, + PRIMARY KEY(group_uuid, membership_uuid) +); + +CREATE TABLE auth_group_role_bindings ( + group_uuid TEXT NOT NULL, + role_uuid TEXT NOT NULL, + created_at_ms INTEGER NOT NULL, + PRIMARY KEY(group_uuid, role_uuid) +); + +CREATE TABLE auth_group_mappings ( + uuid TEXT PRIMARY KEY, + domain_uuid TEXT NOT NULL, + provider_type TEXT NOT NULL, + provider_uuid TEXT NOT NULL, + external_group TEXT NOT NULL, + group_uuid TEXT NOT NULL, + mode TEXT NOT NULL DEFAULT 'additive', -- additive or authoritative + enabled INTEGER NOT NULL DEFAULT 1, + UNIQUE(domain_uuid, provider_type, provider_uuid, external_group) +); +``` + +Names use `^[a-z0-9][a-z0-9_-]{1,63}$`; dots and the reserved names `_`, `new`, +and `sys` are rejected. Display names are unrestricted presentation metadata. +Initial implementation permits direct Principal membership only. Nested groups +are deliberately deferred to avoid membership cycles and unclear ownership. + +Deleting a group is a soft archive followed by explicit purge. Archive removes +effective group Role bindings immediately but retains audit history and its Wiki +objects. Purge requires Domain `manage`, fails while bindings/mappings remain, +and never deletes Wiki Objects or Revisions implicitly. + +### Effective capabilities + +The evaluator unions positive grants from: + +```text +Domain membership -> direct Role bindings -> grants +Domain membership -> group membership -> group Role bindings -> grants +``` + +Then it applies Principal, Domain membership, group, and Role lifecycle state. +There are no negative group grants. A Principal who belongs to the same Role +both directly and through groups receives one effective grant. Cache keys include +`domain_uuid`, `principal_uuid`, and a monotonically increasing policy version; +membership, binding, role, grant, or state mutation increments that version. + +`owner`, `manager`, and `member` in `group_members.member_role` govern group +administration only: + +- owner: metadata, managers/members, Role bindings, external mappings, archive; +- manager: metadata and member list, but not owners, Role bindings, or mappings; +- member: view the group according to visibility and use granted Roles. + +Domain `manage` bypasses group-administration roles. Group ownership itself does +not imply Wiki `read` or `write`; those remain capabilities. At least one local +owner must remain while a group is active. + +Group `visibility` controls only profile metadata and discoverability. `public` +does not make the group Wiki public, `domain` does not grant Wiki `read`, and +`members` does not make every member a Wiki editor. The normal capability +decision always protects the Wiki subtree. + +## `/g/` user interface namespace + +`/g/` is reserved before the semantic Viewer catch-all, parallel to `/u/`: + +| Route | Purpose | Required authority | +| --- | --- | --- | +| `/g/{groupname}` | Group profile followed by the group Wiki root document | visibility plus Wiki `read` | +| `/g/{groupname}/_/edit` | Metadata, owners/managers/members, Role bindings and mappings | group manager/owner or Domain `manage` | +| `/g/{groupname}/_/avatar` | Mutable non-revision group image | GET by visibility; PUT/POST owner/manager | +| `/g/{groupname}/...` | Ordinary group Wiki semantic subtree | normal path capability | +| `/e/-/g/{groupname}/...` | Canonical editor route for group Wiki documents | normal `write` capability | + +The reserved `/_/` segment is intercepted only immediately below the group +name. It never creates semantic children named `_`. `/g/` is excluded from the +normal root `children` projection just as `/u/` is; group discovery is provided +by an explicit group directory UI subject to group visibility. + +The profile shell and Wiki document are separate projections. Absence of a Wiki +root document does not make the group absent. Renaming a group changes its +`/g/{name}` binding transactionally, preserves the group UUID and Objects, and +leaves an optional time-bounded redirect alias. It must check destination path +conflicts before mutation. + +## Group API + +HTML forms call versioned JSON endpoints; handlers may render errors for normal +browser submission but share the same service layer. + +| Endpoint | Methods | Operation | +| --- | --- | --- | +| `/_/api/v1/groups` | GET, POST | visible group list; create group | +| `/_/api/v1/groups/{uuid}` | GET, PATCH, DELETE | detail; metadata/state; archive | +| `/_/api/v1/groups/{uuid}/members` | GET, POST | list; add Domain membership | +| `/_/api/v1/groups/{uuid}/members/{membership_uuid}` | PATCH, DELETE | change administrative role; remove | +| `/_/api/v1/groups/{uuid}/roles` | GET, PUT, DELETE | effective Role bindings | +| `/_/api/v1/groups/{uuid}/mappings` | GET, POST, DELETE | external group mappings | + +All mutations require CSRF for cookie sessions, use optimistic `updated_at_ms` +or an ETag, and append actor, request ID, old/new values, and outcome to the +audit log. Bulk membership updates are transactional and bounded. List APIs use +cursor pagination and do not disclose invisible groups. + +## Implementation boundaries + +Route policies live beside route registration in `internal/server/routes` so a +new handler cannot silently inherit a broad default. Startup validates that +every non-catch-all route has policies for every accepted method. Typed target +resolvers live in `internal/server/authorization_targets.go`; they perform only +bounded reads. `internal/store/authorization.go` owns the effective direct and +group grant query, while `internal/store/groups.go` owns transactional group +mutations. HTTP handlers do not issue authorization SQL directly. + +The semantic Viewer catch-all has one explicit policy whose resolver uses the +normalized semantic path. Reserved `/u/` and `/g/` handlers are registered +before it and delegate their Wiki descendants back to that same semantic +service after resolving the profile shell. + +Minimum audit events are `auth.login.*`, `authz.denied`, `role.binding.*`, +`grant.*`, `group.created`, `group.updated`, `group.member.*`, +`group.role_binding.*`, `group.mapping.*`, and `group.archived`. Details contain +stable UUIDs and changed field names, but never passwords, provider secrets, +TOTP seeds, session/challenge tokens, email magic links, or raw OIDC tokens. + +Required integration tests enumerate every registered route/method in the +policy registry and cover anonymous, authenticated-but-ungranted, direct Role, +group Role, readonly, suspended, cross-Domain, cookie-without-CSRF, Bearer, +service-ticket, renamed-path, multiple-binding, and derived-cache access. + +## External group synchronization + +OIDC/LDAP claims are normalized attributes, then matched only against explicit +`auth_group_mappings`. No mapping means no change. `additive` adds mapped +memberships but never removes local membership. `authoritative` may remove only +memberships previously created by that same mapping UUID; it cannot remove a +local owner or membership from another source. Every synchronization is audited. + +OIDC synchronization occurs after successful subject verification and before +session issuance. Existing sessions observe policy-version changes on their next +request. Controller-managed Campus manifests may distribute provider metadata +and mapping definitions, but client/bind/SMTP secrets and live group membership +are not federated unless a future signed policy explicitly says so. + +## Built-in administrator groups + +Every Domain has reserved `campus_admin` and `domain_admin` groups. They cannot +be created, renamed, archived, or repurposed as ordinary groups. Existing owner +or Domain-manage bindings seed both groups during migration to avoid lockout. + +- `campus_admin` controls Campus records and tokens, Domain creation, + placement, update, and deletion for that Campus. It has an owner-controlled + option to project its membership into every Domain belonging to the Campus. +- `domain_admin` controls Domain-local configuration, accounts, sessions, + groups, Roles, and grants. Only a `domain_admin` may create an ordinary + group. It is never inherited merely because two Domains share a Campus. +- ordinary group admins control only their own group and cannot grant + themselves either built-in administrative membership. + +Campus projection records each independent origin in `campus_admin_grants`; +`group_members` is its strongest-role projection. Disabling inheritance or +removing a source revokes derived grants transactionally, without promoting +inherited entries into new roots. New projection-owned Domain memberships are +removed, and their sessions revoked, after the last source disappears unless +an independent group/role grant has adopted that membership. Local and other +inherited sources are preserved. Legacy memberships with unknown provenance +remain inert rather than being guessed to be safe to delete. See +[Campus administrator revocation](campus-admin-revocation.md) for the migration +boundary, transaction hooks, regression coverage, and remaining protocol work. + +## Cross-Domain identity inheritance + +Cross-instance inheritance uses a Domain-pair PSK, not a browser session or a +Campus enrollment token. The source stores only the PSK hash; the receiver +stores the PSK encrypted by its instance authentication key. A peer record pins +source/target Domain UUIDs, source FQDN, instance fingerprint, enabled datasets, +and last successful sequence. TLS remains mandatory except for an explicitly +named development-only HTTP setup path. + +The signed snapshot/delta contains Principal UUID plus non-secret profile +metadata, stable external identities, groups, administrative membership role, +and content permission profiles. It never contains password verifiers, TOTP +seeds, recovery codes, sessions, challenges, provider client secrets, SMTP +credentials, avatars unless separately enabled, or audit-log secrets. + +Imported rows retain `(source_instance_fingerprint, source_domain_uuid, +source_uuid)` as their stable key. Local UUIDs remain local. Each imported +membership records its peer UUID as source, so disabling a peer removes only +that peer's effective membership. Groups with the same display/name but a +different source identity are not merged implicitly. + +The receiver pulls monotonically sequenced deltas and applies each sequence in +one transaction. Replay is idempotent; gaps trigger a full snapshot. A changed +source fingerprint stops synchronization and emits a warning until a Campus +administrator approves the replacement. `campus_admin` may opt into fan-out to +all Domains in its Campus; `domain_admin` and ordinary groups are inherited only +when explicitly selected by the peer policy. + +## Migration and implementation slices + +1. Replace `requestedCapability` with route policy registration, exact methods, + typed target resolvers, and deny/audit tests. Preserve `legacy` only for + semantic read routes; administration and mutation are never anonymous. +2. Add CSRF for cookie mutations and separate Principal, adapter, federation, + and future delegation credential resolvers. +3. Add group schema/service, `/g/` routing, profile/edit UI, and i18n. Migrate no + existing Role binding destructively; group Role bindings use a new table. +4. Extend effective authorization with group bindings and policy-version cache; + add direct/group union and state-invalidation tests. +5. Add external group mapping and audited OIDC/LDAP group synchronization. LDAP + authentication is implemented; directory-group lookup and explicit mapping + reconciliation remain separate authorization work and must not be inferred + from the successful login attributes. +6. Switch new Domains to enforcing after owner bootstrap; retire the broad + `legacy` bypass only after the endpoint matrix has integration coverage. + +Rollback disables group-derived evaluation and route-policy enforcement behind +separate migration flags; additive tables remain readable. It never drops +Principals, sessions, existing direct Role bindings, Objects, or Revisions. diff --git a/docs/design/automatic-publication.md b/docs/design/automatic-publication.md new file mode 100644 index 0000000..ef67c7d --- /dev/null +++ b/docs/design/automatic-publication.md @@ -0,0 +1,70 @@ +# Scoped automatic publication + +Implemented 2026-09-19. Explicit opt-in, local Domain policy; no existing scope is +enabled by migration or deployment. This is a live-head publication mechanism, +not the reviewer/Inbox workflow in `publication-approval-inbox.md`. + +## Scope and controls + +- City detail → governance dialog → Automatic publication → preview current impact. +- `inherit`: no local automatic rule; ancestor automatic rules may apply. +- `required`: manual publication only, including descendants. A descendant cannot + override this floor by selecting automatic. Supported at Domain/Quartier/Street/Spot. +- `automatic`: supported only at Street/Spot, with an effective public audience. + Existing eligible Pages, future descendants (including moved-in Pages) and all + current language heads are public immediately. Empty scopes can opt in too. +- Existing public audience ceilings and user/group restrictions remain authoritative. + Aliased Objects, reserved Paths and restricted descendant scopes remain excluded. +- Automatic and inherited activation require confirmation of current impact and + future publication. Preview binds actor/scope/governance/topology and all automatic + rule versions. CAS plus SQLite writer reservation reject stale or concurrent edits. +- Stopping automatic publication does not revoke separately frozen approvals. Use + audience restriction for complete privacy. Existing publication-revoke also sets + this scope to manual-only to stop automatic publication inherited from an ancestor. + +## Authority, data and read behavior + +`locality_auto_publication` stores Domain, node kind/UUID, mode, pinned Path boundary, +enabling Principal and version. The enabling Principal must remain an active member +with current governance and scoped read authority. Existing owner/admin delegation +is reused; ownership, membership and role revocation suspend the corresponding grant. +Audit records use `city_governance_events`; no silent new grants or source-content edits. + +Automatic publication uses a read transaction, not materialized approval entries or +an asynchronous job. This gives read-after-write publication for authorized posts, +CLI writes and edits without a stale scheduler window. Anonymous body/raw reads, +public navigation, projected blog/diary titles, RSS and share readiness use the same +rules. Manual exact-Revision approvals remain the default and remain separate. + +The boundary is pinned to the configured Path; renaming the Street/Spot boundary +suspends its grant until explicitly reconfirmed. Moving a Page outside the boundary +does not carry publication with its UUID. Audience restrictions are checked live. +Domain/Campus disablement and authorization-mode changes fail closed. Enforcing +authorization cannot be switched off while an automatic rule remains configured. + +Public-navigation generations include automatic rules and their authority sources. +Role/member invalidation is conditional on the existence of automatic rules, keeping +the existing invariant that ordinary authenticated navigation never caches ACLs. + +## API and budgets + +`GET/PATCH /_/api/v1/city/{zones|spots|domains}/{uuid}/governance/auto-publication` +uses the existing authenticated handler-owned governance authorization. PATCH fields: +`mode`, `version`, `epoch`, `topology_version`, `confirm`, `impact_token`. +GET never grants publication. Strict JSON and 4KiB input limits apply. + +Impact previews retain the existing 512-Path limit; a too-large preview still permits +manual-only shutdown, but not activation. Live navigation is metadata-only and bounded +by 20,000 entries / 4MiB with a 2-second caller deadline. Exact body lookup restricts +the query to the requested Path. Policy enumeration is capped at 128 local rows. +Errors/budget exhaustion do not fall back to public/unfiltered content. + +## Remaining work + +- Independent reviewer policies, requests, quorum, Inbox and signed Campus inheritance. + A future `approval=required` floor must also block this live-head publication mode. +- Federation of these policies is not implemented; no automatic-policy fields are + added to Domain provisioning manifests. +- Larger activation previews need paginated impact review/token binding rather than + silently lifting the current limit. Policy tombstone/archived-node cleanup is pending. +- External caches, feed-reader copies and already-posted social links cannot be recalled. diff --git a/docs/design/browser-request-security.md b/docs/design/browser-request-security.md new file mode 100644 index 0000000..59b5937 --- /dev/null +++ b/docs/design/browser-request-security.md @@ -0,0 +1,91 @@ +# Browser request and session boundaries + +Implemented 2026-09-14. All requests pass the browser mutation guard before +authorization's legacy-mode or handler-owned route branches. Same-origin forms +and fetch calls continue working without page-specific hidden-token injection. + +## CSRF + +The guard uses Go's `http.CrossOriginProtection` (available since Go 1.25) and +has no trusted cross-origin list or route-prefix exceptions. Fetch Metadata and +Origin distinguish same-origin requests from unrelated or sibling origins; +`Origin: null` is rejected. Host resolution never trusts `X-Forwarded-Host`. +For legacy clients without same-origin Fetch Metadata, Origin must also use the +request's scheme; an HTTP origin cannot target an HTTPS browser session merely +because the host matches. TLS-terminating proxies must preserve forwarded scheme. +See the [Go 1.25 HTTP release notes](https://go.dev/doc/go1.25#net/http). + +Unsafe requests carrying an ambient session/MFA cookie must additionally have +validated origin metadata or a matching HTTP(S) Referer. Missing browser-origin +evidence fails closed. Headerless server-to-server clients remain supported; +API clients should use explicit Bearer authentication. Cross-origin login, +profile/group/configuration/upload and API mutations are covered, not just +document save routes. API denials return JSON with status 403. + +Logout is POST-only for revocation; GET/HEAD render confirmation without +changing session state. Profile menus submit a native same-origin POST form. +Bearer logout revokes exactly the supplied token, not an unrelated cookie. + +Legacy semantic editor GET entry can still allocate an empty Page. Its entry +routes are therefore checked as mutations too; direct address-bar/bookmark +navigation with browser `Sec-Fetch-Site: none` remains allowed. Moving creation +fully into the save transaction remains a separate editor API correction. +OIDC/magic-link callbacks are one-use, purpose-bound login flows, not generic +state-changing GET endpoints. OIDC additionally has browser-bound state. + +## Credential purpose + +New API tokens begin with `pw_api_`; new cookie sessions begin with +`pw_browser_`. The complete prefix plus random secret is SHA-256 hashed in the +session store. Changing/removing a prefix cannot convert its purpose. +Browser tokens are rejected in Authorization; API tokens are rejected in the +session cookie. Adapter/federation/challenge tokens use independent validation +and tables and are not accepted as login sessions. + +Unprefixed pre-upgrade sessions retain compatibility until their recorded +expiry (normally 24 hours). No live session is forcibly migrated or broadened. +Once the old rows expire, new sessions enforce transport separation throughout. +Store helpers without HTTP context remain trusted internal APIs. + +Session insertion itself requires an active/readonly Principal and active Domain +membership in the same SQL statement. Each session lookup rechecks membership; +disabling/removing it invalidates the next request even if a session row remains. +Dynamic responses default to `private, no-store` with credential variation; +individual immutable projections can opt into a specific private cache policy. + +An explicitly supplied invalid/unknown/ambiguous Authorization header never +falls back to a cookie. Duplicate session cookies are rejected. Login body +size and local return URLs are validated; slash/backslash/control-character +redirect variants cannot redirect to another authority. + +## Request-scoped read authorization + +Domain lookup is cached only in one request. A bounded single-query snapshot +loads at most 4096 direct-role/group Path read grants, honoring principal and +membership states, exact direct grants and literal group subtree boundaries. +It is immutable, contains no list of all document Paths and is discarded at +request end. Errors/oversized policies fail closed. Tree/children/search/City +read filtering reuses this snapshot; mutation authorization does not. + +The next request rechecks sessions, membership and grants. There is no TTL +allow-cache that outlives revocation. A change during an already-rendering +request takes effect on the next request; transactional mutation authorization +and streaming revocation have separate contracts. + +## City projection + +Map/detail/Spot Page APIs, City macros and Viewer locality badges filter by +readable locality boundaries and Page Paths. Counts and portal choices are +recomputed from visible Pages; nearby relations require both visible ends. +No Domain-only topology ETag is reused across callers (`private, no-store`). +Parents without readable boundaries are not exposed just because a descendant +or MagicPage happens to be readable. Unbound/hidden aliases are not substituted +with UUID links to bypass Path visibility. The complete topology is still loaded +before projection; lazy server-side City pagination remains outstanding. + +Regression tests cover cross-origin/missing-metadata denials, login/logout, +purpose confusion, exact/wildcard grant semantics, principal states, next-request +revocation, hidden City metadata/counts/portals/relations and macro projection. +An opt-in Chromium regression additionally submits the real login and logout +forms using HttpOnly cookies and actual Fetch Metadata, with no injected Bearer +credential, and verifies logout leaves a separate API session intact. diff --git a/docs/design/campus-admin-revocation.md b/docs/design/campus-admin-revocation.md new file mode 100644 index 0000000..7b78c6d --- /dev/null +++ b/docs/design/campus-admin-revocation.md @@ -0,0 +1,99 @@ +# Campus administrator inheritance: revocation and provenance + +Implemented: 2026-09-14. This note supersedes the former insert-only Campus +projection described in `authorization-groups.md`. Cross-instance Domain-pair +PSK synchronization is still a separate, unimplemented protocol. + +## Authority and data ownership + +`campus_admin_grants` is the authoritative set of independent and inherited +grants for the built-in `campus_admin` group only. Its key is +`(group_uuid, membership_uuid, source)`. An independent grant uses `local`, +`migration`, or an existing non-Campus source identifier. Derived grants use +`campus_admin_inherit:`. + +`group_members` remains the public/effective membership table. The strongest +remaining role wins (`owner > manager > member`), with a direct source winning +ties. A weaker local grant is kept in provenance, not overwritten by a stronger +inherited role, and becomes effective again when that inherited role expires. +Ordinary groups and `domain_admin` retain their existing storage and behavior. + +Projection roots must have an active source group, active principal, active +source Domain membership, enabled source Domain, and enabled inheritance flag. +The target must be an enabled Domain in the same Campus with an active built-in +group. Only independent grants are roots. Derived rows cannot retransmit +authority, become new roots, or keep one another alive in a cycle. Multiple +independent origins are recorded separately; removing one does not remove the +others. Changing a principal to readonly also withdraws inherited administrator +membership; changing it back to active can restore the projection but does not +revive revoked sessions. + +## Transaction boundary + +The following write paths reconcile within the same SQLite transaction: + +- enabling/disabling Campus inheritance; +- adding, changing, or removing an independent Campus group member; +- changing a principal's state and revoking its sessions; +- updating/deleting a Domain, including moves between Campuses; +- applying a managed-Campus topology snapshot or deleting a managed Campus; +- built-in group creation/bootstrap migration. + +The projection rebuilds the effective Campus group membership from authoritative +grants. Any SQL failure rolls back both the source mutation and the projection. +No asynchronous queue or stale authorization cache sits between revocation and +the next authorization decision. Direct SQL administration must explicitly run +`ProjectCampusAdminMemberships`; deleting only the materialized `group_members` +row is not a revocation API. Future LDAP/OIDC mappings and PSK importers must +write provenance and reconcile in their own transaction, not edit the cache. + +Inherited-only members cannot be removed at a destination: revoke their origin +or disable its inheritance. Removing an independent owner requires another +independent owner at that source; an owner inherited from somewhere else is +not sufficient. Bootstrap migration records each migrated source binding once +in `campus_admin_migrations`, so a later explicit Campus-group removal is not +undone by a restart or the creation of another Domain. + +## Domain membership and session cleanup + +`campus_admin_membership_origins` records exactly which Domain memberships the +projector created. After the last derived grant disappears, a provenance-owned +membership with no other group membership or role binding is removed and that +principal's sessions in that Domain are revoked atomically. + +Existing local memberships are never reactivated, relabeled as inherited, or +deleted by projection. Adding an independent group grant adopts an inherited +membership as local. An independent role binding likewise prevents cleanup and +preserves its session. No role binding or capability grant is deleted: the old +Campus projection never created `auth_role_bindings`, and revocation of a group +membership already removes access through that group's permission profiles. +Independent `domain_admin` and direct role capabilities remain unchanged. + +## Upgrade behavior and limits + +Older installations recorded only one source per effective group member and +did not record the origin of a Domain membership. On the first schema upgrade, +only stored non-inherited Campus group memberships seed authoritative grants; +old inherited chains are discarded and regenerated from those roots. A legacy +Domain membership with ambiguous origin is retained, while its inherited group +authority is revoked normally. Do not guess that an untagged membership belongs +to the projector and delete a potentially independent local identity record. +An old local grant previously overwritten or mislabeled by the single-source +implementation cannot be reconstructed; an administrator must explicitly grant +that local role again if needed. Newly recorded grants do not have this loss. + +Reconciliation is set-based and limited to Campus administrator memberships; +it runs on administrative changes, not on ordinary reads or session lookups. +It currently recomputes all Campus administrator projections in one transaction. +Incremental Campus-scoped reconciliation and sequenced cross-instance deltas are +future scaling work; do not advertise distributed revocation guarantees before +the PSK protocol and its source-disappearance policy exist. + +## Regression coverage + +`groups_inheritance_test.go` covers disable/re-enable, repeated reconciliation, +source removal, suspension/quarantine/readonly, removed/disabled/moved source +Domains, multiple roots, prevention of transitive amplification, weaker local +role restoration, independent role/session preservation, legacy-chain cleanup, +restart-safe bootstrap removal, and injected mid-transaction failures for +disable/remove/suspend. Existing concurrent owner-integrity tests remain green. diff --git a/docs/design/campus-domain-model.md b/docs/design/campus-domain-model.md new file mode 100644 index 0000000..fead369 --- /dev/null +++ b/docs/design/campus-domain-model.md @@ -0,0 +1,99 @@ +# Campus and Domain Model + +## Purpose + +Campus is the top-level administrative and language-default boundary. +Domain is the host-selected subdomain space presented to a request. Every +Domain belongs to exactly one Campus. + +This slice intentionally stops before ZoneTree. Quartier, Street, Spot, and +SpotGraph remain later topology work. + +## Identity + +Both Campus and Domain have: + +- an integer SQLite row ID for local administration; +- a stable UUID for relationships; +- a normalized, unique machine name; +- a human-readable title; +- an enabled flag; +- a creation timestamp. + +Campus additionally has a BCP 47 default language, authority mode, and FQDN. +Domain additionally has a host selector. A selector can be a full host +(`docs.example.test`), a subdomain label (`docs`), or empty to select the +Campus FQDN itself. + +## Ownership invariants + +- Every Domain `campus_uuid` resolves to an existing Campus. +- At least one Campus exists and at least one Campus remains enabled. +- A Campus referenced by a Domain cannot be deleted. +- A Campus referenced by a Domain cannot be disabled. +- Creating or moving a Domain requires an enabled target Campus. +- Disabled Domains do not participate in request-host selection. +- Request-host resolution is exact and has no last-resort Domain fallback. +- An empty Domain host matches only its owning Campus FQDN. +- The request Campus is derived from the resolved Domain; it is not selected + independently. + +SQLite does not currently rebuild legacy tables to add a foreign-key +constraint. These invariants are enforced by store operations so existing +installations can migrate without destructive table replacement. + +## Schema + +```sql +CREATE TABLE campuses ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + uuid TEXT NOT NULL UNIQUE, + name TEXT NOT NULL UNIQUE, + title TEXT NOT NULL, + default_lang TEXT NOT NULL DEFAULT 'en', + authority_mode TEXT NOT NULL DEFAULT 'standalone', + fqdn TEXT NOT NULL, + enabled INTEGER NOT NULL DEFAULT 1, + created_at INTEGER NOT NULL +); + +-- Added to domains during initialization: +ALTER TABLE domains ADD COLUMN campus_uuid TEXT; +CREATE INDEX idx_domains_campus_uuid ON domains(campus_uuid); +``` + +## Startup migration + +Initialization is idempotent: + +1. The existing District-to-Domain compatibility migration runs. +2. If no Campus exists, `Default Campus` is created. +3. The nullable `domains.campus_uuid` column is added when absent. +4. Empty, unknown, and legacy Campus references are assigned to the enabled + default Campus. + +UUIDs, Domain host selectors, and existing paths are preserved. + +## Request context + +The server resolves one Domain from the HTTP Host and then resolves its +owning Campus. Both values are exposed as `RequestContext.Domain` and +`RequestContext.Campus`. + +Revision language selection uses this order: + +1. explicit language request; +2. request language preferences; +3. Campus default language; +4. system locale; +5. language-neutral revision; +6. latest revision. + +## Administration + +The Config view supports Campus create, update, and delete, as well as Domain +assignment to a Campus. The last enabled Campus cannot be disabled. A Campus +must first have its Domains moved or deleted before it can be deleted. + +The data CLI remains object/path/revision/asset oriented. Campus and Domain +administration is therefore not added to the CLI in this slice. diff --git a/docs/design/city-immersive-map.md b/docs/design/city-immersive-map.md new file mode 100644 index 0000000..c16d18c --- /dev/null +++ b/docs/design/city-immersive-map.md @@ -0,0 +1,93 @@ +# City courtyard projection and immersive navigation + +Implemented UI slice, 2026-09-14. Complements +[City organization](city-organization-ui.md) and the larger +[City review](city-review-and-reconciliation.md); not a replacement for its +authorization, reconciliation or Worker hardening work. + +## Interaction + +The browsing sequence is `Domain → Quartier → Street → Spot → Page`. +Clicking a Spot now explores its courtyard **inside the map**, rather than +immediately navigating to its portal document. The central building represents +the Spot; surrounding smaller buildings are its Page placements. The focused +Spot offers a separate portal Page link. An actual boundary/portal Page is not +repeated as its own surrounding Page building. A descendant suggested by the +API as a fallback portal remains independently visible/selectable. Undefined +placements use a fountain and retain +yellow-green Page markers. + +Page buildings link to their semantic Path, falling back to `/o/uuid:{uuid}`. +These are rendering changes only: no document Paths, memberships, UUIDs, +revisions or contents are changed. The displayed set follows existing SpotGraph +membership, including explicit links; it is not a new filesystem hierarchy. + +Breadcrumbs and clicking outside the courtyard ascend within the map. Map +exploration does not call pushState or add browsing history. Actual Page links +still navigate normally (from a map popup, in the containing window). +Ctrl/Command selection and the existing merge/rename/move dialogs work for +whole Spots and individual Page buildings, without following their links. + +## Layout and visual vocabulary + +- Domain/Quartier retain the single generated city fabric and its allocations. +- Street close-ups use a deterministic courtyard layout, with generated road + segments projected behind it and paths connecting courtyard gates to roads. + This is a readable close-up schematic, not geometric continuity at every zoom + level. Connected road allocation and natural parcel packing remain future work. +- Nonoverlapping plots reserve space for the Spot, six nearby Pages and gates. + At most six Spots are rendered per Street screen; further Spots are paginated. +- A focused Spot renders at most 24 surrounding Pages per screen, also paginated. + Page UUID deduplication prevents multiple graph edges creating duplicate houses. +- Labels remain horizontal and visible at rest, with bounded two-line wrapping + and full-name/Path tooltips. The existing label toggle controls the new labels. +- Native SVG motifs include stucco/terracotta houses, a pediment and colonnade, + stone paving, balustrades, cypresses, fountains and ornamental iron gates. + Theme-derived stone/brass colors, the academic crest and compass carry the + same visual language into the map frame and menu. No external images/fonts + or raster-generation service are needed for these additions. + +The new `city-estates.js` module owns only close-up layout and rendering. +`city-map.js` retains topology, navigation, generated fabric and API interaction; +`city-organizer.js` retains selection and mutations. The obsolete geometry +script and mutation-observer Spot repositioning no longer run on the map. +Pointer dragging and wheel zoom use SVG coordinates with a screen-pixel drag +threshold, including differently sized close-up viewBoxes. + +## Utility menu + +The initial normal and popup screens show the map, breadcrumb, menu launcher, +small navigation hint, compass and (only when needed) pagination/selection bar. +The permanent inspector, directory, planner and toolbar are moved into a themed +native modal (`city-menu.js`): + +- Guide: selected locality, details link and existing editing operations. +- Directory: named navigation to Quartier/Street/Spot views. +- Planning, for authorized planners only: URL planning and one creation form at + a time, selected by kind. +- Settings: zoom/reset/labels, topology status, scoped search and account links. + +The dialog uses native modal focus containment and Escape dismissal. Its Escape +handler does not propagate to the containing map popup. There is no permanent +outer-page scrolling; menu content can scroll independently. Mobile CSS reduces +the frame and changes the menu navigation to two columns. + +## Verification and limits + +Opt-in Chromium fixtures cover normal/popup modes: resting labels, Ctrl +selection, title/group/merge/move regression, plot nonoverlap, six-Spot and +24-Page bounds, full pagination reachability, correct Page/portal links, +unchanged map URL/history, menu panel switching, creation-form visibility, +directory navigation and background ascent. Screenshots cover sparse Street, +dense Spot and menu scenes, including a 390px viewport with Index White. Run: + +```sh +PAGESWIKI_BROWSER_TEST=1 go test ./internal/server -run 'TestCity(Labels|Organizer|Immersive)Chromium' -count=1 +``` + +These are DOM-rendering bounds, **not** server/API pagination. The map still +loads topology and Page placements eagerly; the directory and some inspector +option lists still traverse that loaded topology. Per-result authorization, +bounded/lazy server projection, connected roads, Worker generation, keyboard +directional navigation and auto-reconciliation remain open in CITY-A–D. +This slice does not claim to solve those scaling/security gaps. diff --git a/docs/design/city-organization-ui.md b/docs/design/city-organization-ui.md new file mode 100644 index 0000000..a3c17d0 --- /dev/null +++ b/docs/design/city-organization-ui.md @@ -0,0 +1,81 @@ +# City organization UI + +Implemented follow-up, 2026-09-13. This is a bounded manual editing slice of +[the City review](city-review-and-reconciliation.md), not the automatic outbox +or Worker pipeline. + +## User model + +Hierarchy remains `Quartier → Street → Spot → Page`; a Spot cannot own a Spot. +Yellow-green points are unclassified Pages, not nested Spot objects. + +- Context menu or inspector pencil: edit a locality's **display title**. UUID, + slug/name and Path remain unchanged. Japanese titles are accepted. +- Ctrl/Command-click toggles selection of Page buildings/points or whole Spots. + Selection persists while navigating between Streets. As of 2026-09-14, ordinary + Spot clicks explore a courtyard; Page buildings and the separate portal link + navigate to documents. See [immersive map projection](city-immersive-map.md). +- The floating icon toolbar/context menu can combine the selection into an + existing Spot, or create one Spot containing the selected Pages. +- Whole-Spot merge archives the sources, transfers Page placements and + incoming/outgoing relations, deduplicates relations and drops self-relations. + Source descriptions/charters remain on archived rows; they are not concatenated + into the destination. Existing destination labels take precedence over duplicates. +- Move relocates whole Spots to a Street, retaining UUIDs. Path boundaries + change atomically with Street placement. Single moves allow a custom boundary; + bulk moves use the old boundary's final segment under the new Street. + Conflicts or invalid ancestry reject the entire operation. + +These operations **preserve document URLs, Page UUIDs, Revisions and content**. +Moving a Spot captures its existing inferred members as explicit memberships; +the moved boundary may infer new Pages too. This is a City/SpotGraph operation, +not recursive filesystem/URL rename. The modal explains the distinction before +submission. Changing document URLs remains a separate Path operation. + +## Backend contract + +- `POST /_/api/v1/city/{zones|spots}/{uuid}/title`: title and mandatory + `base_version`; zones additionally supply `kind=quartier|street`. +- `POST /_/api/v1/city/organize`: mandatory `base_version`, `action=merge|move`, + whole-Spot UUIDs and/or `{spot_uuid,page_uuid}` selections. Merge chooses + exactly one of `target_spot_uuid` and a `new_spot` definition. Move accepts + whole Spots and a destination Street only. +- Both routes require existing Domain administrator/manage authorization. + Targets, sources, parents and Page membership are revalidated inside the + transaction against the current Domain. Stale topology returns 409. +- Selection is limited to 200 entries. Expansion is capped at 2,000 Page-edge + placements and 2,000 affected relations; larger operations fail without + partial application. This is not a background bulk-import API. +- Transfer, archive/move, overrides and one topology event/version increment + commit together. Title no-ops do not increment versions. Validation/DB failures + roll back everything; retries using an old version cannot reapply. +- Audit events store requests, source placements and previous Path/Street + boundaries. No automatic undo UI or exact reverse-operation endpoint exists + yet; this is not a complete reversible merge implementation. + +`city_page_overrides(domain_uuid,page_uuid,spot_uuid)` records manual placement. +Active overrides prevent autoplan reconstructing old assignments and suppress +inferred membership in other Spots. Other explicit MagicPage edges remain valid. +An archived destination no longer suppresses inference; overrides are carried +forward when its whole Spot is merged again. This is not the future full +generation-provenance/outbox design or a general exclusion-management UI. + +Normal and popup views share a themed native modal and selection toolbar; +Ctrl/Command-click in a popup must not trigger top-window navigation. +The generator seed no longer includes topology version, and its in-page fabric +is reused on reload so renaming does not randomly rebuild the town. Allocation +can still change with membership weights; Worker generation and persistent +geometry caching remain open. + +## Verification and remaining work + +Store/API tests cover Unicode titles, identity/URL preservation, stale requests, +admin denial, invalid/cross-Domain selections, relation transfer/deduplication, +inference preservation, and rollback after injected mid-write failure. +Chromium tests exercise Ctrl selection/deselection, grouping undefined Pages, +rename, whole-Spot merge, relocation and autoplan overrides in normal/popup modes. + +Remaining: editable slug aliases and redirects for merged Spot detail URLs; +per-Page override management/undo; URL-renaming with explicit preview; +bounded automatic reconciliation; projection authorization/read scaling; +Worker/geometry capacity fixes and directional keyboard navigation. diff --git a/docs/design/city-read-integrity.md b/docs/design/city-read-integrity.md new file mode 100644 index 0000000..71dc271 --- /dev/null +++ b/docs/design/city-read-integrity.md @@ -0,0 +1,91 @@ +# Bounded City read snapshots and literal Path boundaries + +Implemented 2026-09-14. This is a bounded repair of CITY-04/CITY-06, not completion +of the [City review](city-review-and-reconciliation.md) or its lazy projection plan. + +## Read contract + +`GetCityMapContext` uses one read-only SQLite transaction with a two-second +deadline, shortened by request cancellation. The topology version, Quartiers, +Streets, Spots, Page placements and relations all come from that same snapshot. +Each cursor is fully scanned, checked and closed before the next query; a +one-connection pool therefore works without nested-connection deadlock. + +Quartiers, Streets, Spots and relations use four bulk cursors. Page placements +still use one bounded query per Spot, on the **same transaction/connection**. +Parent joins require current-Domain active Quartiers/Streets/Spots. Foreign or +archived parents cannot introduce children into the model. Explicit Page edges +require a current-Domain Path binding, including edges left behind after moving +the last binding to another Domain. Relations require two visible active Spots. + +The projection fails with `ErrCityMapBudget` rather than silently truncating: + +| Budget | Limit per complete map | +| --- | ---: | +| Quartier + Street + Spot nodes | 4,096 | +| Page placements, including multiple semantic appearances | 20,000 | +| Relations examined | 8,192 | +| Database snapshot / connection wait | 2 seconds | + +Errors return an empty model, not partial topology with apparently successful +counts. Spot counts deduplicate Page UUIDs while preserving distinct typed edges. +Exact boundary Pages remain preferred portals. Query/scan/version errors are +propagated, and all error/cancellation paths release cursors and connections. + +`ListSpotPagesContext` applies the same two-second read transaction and 20,000 +placement safety limit to an HTTP Spot projection. Trusted `ListSpotPages` +retains its complete-set contract. This is a safety ceiling, **not pagination**. +No Page bodies or revision histories are read for these projections. + +HTTP map/detail/Page projections return `503` with `Retry-After: 5` when a +safety ceiling or request deadline is reached, rather than misreporting a +large locality as missing. Missing or unreadable localities remain `404`; +unexpected storage failures remain `500`. + +The server's separate request-scoped read-policy filter remains mandatory: a +consistent Domain snapshot is not authorization to see every locality or Page. +No cross-principal model cache or topology-only public ETag is introduced. + +## Literal boundary contract + +All SQL containment/overlap matching in `city.go` and `city_operations.go` uses +case-sensitive binary segment ranges, not `LIKE`. A normalized non-root boundary +`/a%_` contains its exact Path and the range `[/a%_/, /a%_0)`; `%`, `_`, backslash +and Unicode are ordinary characters. `/A` does not contain `/a`, and `/life` +does not contain `/life2`. An empty legacy boundary contains nothing. + +Root `/` covers every absolute Path. Creating it therefore conflicts with any +other active Quartier boundary, regardless of creation order. Streets and Spots +still require strict descendant Paths and their existing valid parent/Domain. +No raw Path or UUID is changed, decoded again, lowercased or escaped in storage. + +Creation validation, import overlap lookup, Path-context resolution, inferred +Page membership, appearance lookup and health checks use these semantics. +Context and health use bounded read snapshots too. The `/u` health exclusion +includes the namespace root and descendants, not unrelated or differently-cased +Paths. Health is still a basic topology summary, not a full reconciliation of +manual membership overrides and all curation semantics. + +## Verification and remaining work + +`city_read_test.go` covers a one-connection pool, WAL concurrent commits between +snapshot pinning and topology loading, all three size ceilings, connection-wait +cancellation, nested scan errors, connection release, foreign/archived parent +edges, foreign explicit Pages, literal wildcard/case/Unicode boundaries, root +overlap, and health/context/overlap consistency. Existing City/import/organizer +tests remain regression gates. + +2026-09-14 named references: `/v/city/s/{quartier}/{street}` resolves in one +bounded query with its current active parent. Legacy unique Street names and +explicit `uuid:` references still work; ambiguous legacy references fail closed +with the same 404 as missing/hidden nodes. Details check ancestor read access, +do not load the map, and propagate cancellation. Breadcrumb macros defer map +loading until `nearby` actually needs it. Literal Page links encode `?/#/%`. +Regressions: `city_reference_test.go`, `city_links_test.go`, and Chromium +`city-links.js` (normal, popup and all three initial-focus levels). + +Still pending: lazy paginated locality/Page APIs; removal of per-Spot Page +queries; size limits for individual legacy metadata fields; context propagation +to remaining health/macro callers; full URL-autoplan provenance/atomic adoption. Large City data +can currently exceed a safety ceiling and show an error until lazy projections +are implemented. Raising global limits is not a replacement for that work. diff --git a/docs/design/city-review-and-reconciliation.md b/docs/design/city-review-and-reconciliation.md new file mode 100644 index 0000000..003aaf0 --- /dev/null +++ b/docs/design/city-review-and-reconciliation.md @@ -0,0 +1,261 @@ +# City module review and URL-driven reconciliation + +Reviewed: 2026-09-13; implementation follow-up 2026-09-14. +Status: **incremental repairs landed; automatic reconciliation remains design-only**. + +Scope: City stores/APIs, URL autoplan, SVG UI, the bundled gen-city 1.4.6 +adapter, and scheduler integration. This supplements +[Knowledge City Model](knowledge-city-model.md) and the +[platform outbox contract](platform-extension-architecture.md#event-and-outbox-contract). +Phase 2 checkboxes represent first slices, not completion of these repairs. + +## Landed follow-ups + +- [x] CITY-05 named-route slice: parent-qualified Streets, bounded cancellable + detail lookup with active same-Domain ancestors and ambiguity detection; + shared links across search, map, inspector, context menu and macros. + Detail views no longer load the whole City; map focus and locality search + support all three levels. Spot autoplan name collision handling remains open. +- [x] Per-result map/detail/Page/macro/badge authorization and private responses; + visible portal/count/relation recomputation. +- [x] One-connection-safe bounded City/Spot read transactions and binary literal + Path containment/overlap/context/health matching; see + [read integrity and remaining limits](city-read-integrity.md). +- [x] Stable Domain fabric seed, local Worker generation, bounded geometry cache, + deadline/cancellation and directional Arrow/WASD/HJKL navigation; see + [Worker contract](city-worker-navigation.md). +- [x] Horizontal/resting labels, manual organization, nonoverlapping bounded + Spot courtyards with Page buildings and a modal utility menu; see + [immersive projection](city-immersive-map.md). + +Lazy Page APIs, connected road allocation, deterministic generated Spot names and the +outbox/provenance/idempotent inference pipeline are not implied by these checks. + +## Original findings, in repair order + +| ID / priority | Evidence at audit | Correction | +| --- | --- | --- | +| CITY-01 / P0 | `city_handler.go` returns `GetCityMap` and `ListSpotPages` without per-member authorization. Middleware gates the endpoint, not each returned Page/locality. | Batch-authorize nodes, Page links, portals, relations and counts. Audit details/macros too; Domain read must not expose denied descendants. | +| CITY-02 / P1 | `buildCityAutoPlan` ignores Paths shorter than three segments despite its UI's shallow-Page description. `AddSpotPage` increments topology version even on identical repeated UPSERTs. | Explicit root/portal/leaf rules and no-op reconciliation for unchanged inputs. Separate inferred membership from manual edges. | +| CITY-03 / P1 | POST `/city/autoplan` synchronously scans all Paths and applies separate node/edge transactions; the first error leaves a partially applied plan. No generation ownership/checkpoint exists. | Preview/adoption, bounded resumable batches, source provenance and itemized conflicts before automatic jobs. | +| CITY-04 / P1 | `CityNodeOverlappingPath` merges exact/ancestor/descendant candidates with `LIMIT 1`; it and `ListSpotPages` use unescaped LIKE patterns. Autoplan treats lookup errors as absence. | Literal normalized Path segments, compatible parent/identity matching, explicit ambiguity and DB errors. Test `%`, `_`, case and non-ASCII Paths. | +| CITY-05 / P1 | Streets allow repeated names under different parents but `CityNode`/detail URLs resolve by Domain/name. Spots require Domain-unique names, while autoplan derives only a URL segment. | Server-provided unambiguous hrefs, parent-qualified readable Street routes, existing UUID fallback, deterministic Spot name collision handling without altering display titles. | +| CITY-06 / P1 | `GetCityMap` nests open cursors and queries per Quartier/Street/Spot, returning every Spot's entire Page list. Autoplan also queries while the Paths cursor is open. No consistent read snapshot. | Bounded bulk queries, snapshots, closed cursors, cancellation and lazy locality/Page APIs. Test with a one-connection pool. | +| CITY-07 / P1 | `render()` seeds gen-city with `domain_uuid:topology_version` on every reload. Cached `city-geometry.js` output is assigned to `geometry` but never used by this renderer. | Stable base-fabric seed and one real geometry cache; remove obsolete generation after migration/tests. | +| CITY-08 / P1 | gen-city's `async generate()` runs synchronous matrix initialization, recursive path generation and building generation. Layout/SVG construction also runs on the main thread. | Worker generation/layout with cancellation and budgets; separately bound DOM work. `await` alone is not CPU isolation. | +| CITY-09 / P1 | `cityLayout` sorts/slices roads by coordinates, not connectivity; early Streets can consume all roads. Spots without buildings are omitted. Proximity uses infinite-line rather than segment distance. | Connected/fair allocation, finite segment projection and fallback picking targets. Geometry scarcity must never hide a logical node. | +| CITY-10 / P1 | Street weights sum Spot weights (duplicate Page counting), unlike Quartier weights. Allocation repeats on navigation; a MutationObserver repairs Spot positions afterward. | Deduplicate at every level, cache allocation, place directly, manage label collisions and remove post-render repair. | +| CITY-11 / P2 | Three embedded creation panels plus inspector move/binding/relation forms; many dynamic English literals. | Contextual icon actions, shared modal forms, localized errors and progressive disclosure. | +| CITY-12 / P2 | Only Enter/Space node keys; no map navigation stack. `showSpot` can append a late response to a different selection. Deleted current nodes can leave an invalid view. | Directional focus, explicit view state, stale-response guards, valid-parent fallback and separate in-map history. | + +CITY-01 describes a confirmed missing check in the inspected call chain, not a +production exploit test. CITY-06 is a code-level scaling/pool risk, not a +measurement of a production DB lock. Additional correctness requirements: + +- Path/Revision/policy changes can change map output without changing its + topology-only ETag. Model and authorization generations belong in validators. +- Explicit edges resolve a Page's primary Path, which may be outside the + inferred locality or unreadable. Preserve locality-specific safe portal links. +- Undefined classification currently guesses from name/path substrings. Add an + explicit kind instead of interpreting a user's spelling as system metadata. +- Deleting a generated node requires an exclusion/tombstone; otherwise the next + sweep recreates it. Offer explicit re-enablement. +- Recursive rename already updates City prefixes transactionally. Reuse this + identity-preserving behavior rather than recreating locality UUIDs. + +## Component boundaries + +1. **URL topology reconciler**: canonical Path bindings → derived memberships + and generated node proposals, running in the existing event scheduler. +2. **Authorized City projection**: topology + metadata → a caller-specific, + bounded navigation model. Geometry never grants access. +3. **Geometry adapter**: stable fabric + permitted model → blocks, connected + Streets, anchors, hit targets and labels. gen-city does not own identity. + +Retain gen-city for the first repair and evaluate continuity/capacity/performance +fixtures before replacing it or maintaining a fork. Preserve its license and +rebuild the committed bundle from `assets/city-generator`, not vendor edits. + +## URL inference and preservation + +- Infer from canonical Domain-scoped Paths, never display slugs, host strings + or repeated URL decoding. Use shared reserved-address rules to exclude user, + group and system routes instead of an incomplete local exclusion list. +- First directory → Quartier; second → Street; third → Spot; deeper descendants + → that Spot. A directory has descendants and may be virtual (no own Page). +- A locality-boundary Page is its portal, not a child of itself. For example, + `/life/home/kitchen` with descendants is the Kitchen Spot portal; + `/life/home/readme` without descendants is an undefined Page on Home Street. +- A leaf gaining descendants may gain a locality without changing Page UUID. + Change only derived membership, not curated semantic edges. +- `/`, `/life`, `/life/home` remain Domain/Quartier/Street portal Pages. Show + shallow/unassigned Pages at their nearest valid level; do not manufacture + strict-descendant boundaries to force them into a Spot. +- Undefined Pages stay individual yellow-green points. An internal bucket must + not become a fabricated public `/_undefined` portal. +- Store source/rule version and manual overrides separately from descriptions. + Existing nodes and `source=local` edges start as manual/unknown: never adopt + automatically by matching “Generated from URL Paths” text. +- Preview adoption. Reuse exact compatible boundaries; ambiguous ancestors or + descendants need explicit mapping. Keep exclusions, UUIDs and Page content. +- Aliases may infer multiple memberships, but count each Page UUID once in each + aggregate; select readable portal Paths within the locality. + +## Event/queue design + +Extend the shared transactional outbox; do not install expensive callbacks in +individual HTTP handlers or build a second scheduler. Cover WebUI, CLI, import, +hosted editors, restore, link/unlink, rename and deletion through store writes. + +| Committed change | City invalidation | +| --- | --- | +| Path bind/create/unlink/delete; Object deletion | Domain/prefix membership and metadata. | +| Rename/move, including recursive operations | Old and new prefixes; retain locality UUIDs. | +| Revision/edit/restore; filename, MIME or title change | Metadata in Domains binding this Page; unchanged Paths do not regenerate fabric. | +| Topology/manual rules | Affected mapping/layout. | +| Permission/group inheritance change | Authorized projections, not canonical geometry seed. | +| Periodic or manual repair | Same bounded reconciler/checkpoint. | + +Proposed persistent state, **not yet migrated**: + +- Shared `activity_outbox`: instance/event UUID, Domain sequence, event version, + actor/source, typed Page/Revision target and old/new Path data. Atomic with the + mutation; no document bodies or credentials. +- `city_reconcile_state`: Domain, desired/applied sequence, rule version, + debounce deadline, continuation cursor and last error/job UUID. +- Generated node/membership provenance: stable source key, rule version and + manual override/exclusion; independent of explicit SpotGraph edges. +- Completed model generation: publish finished snapshots, not half-built + reconciliation as a completed map. + +Delivery protocol: + +1. Commit change and outbox event together; rollback emits no work. SQLite + invalidation triggers may cover legacy writers, but cannot replace actor-aware + events. Unsupported raw SQL edits rely on periodic repair. +2. Consume bounded batches, advance desired sequence and coalesce import/rename + bursts by prefix/Domain. Do not create a full-scan job for every file. +3. Enqueue `city.reconcile`, keyed by Domain. Initial proposed debounce: 2 seconds, + maximum coalescing delay: 10 seconds, configurable to avoid starvation under + continuous editing. These are starting values, not measured tuning results. +4. Capture watermark N and process bounded batches (initial target: 200 Paths, + short transactions). Persist derived changes and progress together. Reconcile + current state; do not replay stale rename payloads as commands. Recheck source + generation before publishing a completed snapshot. +5. Acknowledge only processed N. If desired advanced while queued/running, enqueue + a successor **after the active job finishes**, or let the dispatcher do so. + Current active-key queue deduplication must not acknowledge/drop newer edits. +6. Retries are idempotent; unchanged data does not increment topology version. + Keep itemized conflicts/cursors. Queue-full, pause, crash and cancellation + preserve pending invalidations and unprocessed events. +7. `city.reconcile.sweep` is a fair, bounded recovery pass across Domains using + the same algorithm. Compact outbox only after consumers' checkpoints/retention + requirements allow it. + +Use existing `/_/api/v1/event/` and `/_/api/v1/queue` definitions, trigger, job and +log mechanisms. Proposed City event types are **not registered yet**. When POST +`/city/autoplan` becomes asynchronous, return `202` with a job UUID and update +its UI simultaneously. Dry-run needs bounded results and a base/rule-version +token; stale approval must not silently apply a newly recomputed plan. + +Settings are Domain-scoped. Existing Domains start manual; enable URL-auto after +an adoption preview. New-Domain URL-auto defaults can follow once gates pass. +Manual/scheduled triggers share settings and permission checks. Workers may +mutate derived City state only, not arbitrary Pages using an administrator token. + +Use low priority, one City writer per Domain, shared preview/import resource +budgets, cancellation and backoff. Keep geometry out of write transactions and +request handling. This is single-writer operation: current startup requeue of +all running jobs is not an HA lease; multi-instance workers require fencing. + +## Geometry and read scalability + +- Fabric key = Domain UUID + explicit seed + generator/version/options. Ordinary + edits and topology increments must not change the seed. +- Layout key = fabric + structural/membership generation + layout version; + metadata/policy generations are separate. Preserve prior assignments with + bounded growth/shrink hysteresis to avoid global rearrangement for one Page. +- Build a connected road graph, clip at Quartier boundaries, allocate fairly, + project anchors onto bounded segments. Keep every locality pickable with + explicit fallback/capacity warnings when geometry is scarce. +- Deduplicate weights at every level; leave unoccupied space when membership + is small. Use zoom-dependent labels/aggregation for dense points. +- Worker generates/allocates with size/time/cancellation limits; viewport/zoom + bounds main-thread rendering separately. Superseded results cannot replace + newer views. Remove observer-driven placement repair after regression tests. +- Top-level API returns Quartier summaries, not every descendant Page. Lazy + bounded Street/Spot/Page APIs use bulk queries, snapshots and cancellation. +- Cache authorized models by Domain, principal/policy and data generation with + private HTTP validators. Invalidate on logout/policy change; don't put restricted + labels/coordinates in a shared origin-wide cache. Topology-independent fabric + can be cached separately. Remove unused `city-geometry.js` storage work. +- During regeneration keep the last valid authorized map, with a small status + icon. Failures provide a directory fallback/retry, never block Page navigation. + +## Compact UI and keyboard contract + +- Toolbar: breadcrumbs, search, zoom/reset, add icon, settings icon. Generation + status tooltip links to details and existing job monitor, not verbose inline text. +- Add opens one modal for Quartier/Street/Spot with contextual parent/Path defaults + and ancestry/conflict validation. Page bindings/relations use the same modal + shell. Preserve inputs on failure, prevent duplicate submits and scope parents. +- Settings modal: manual/URL-auto, adoption preview, rules/exclusions, event timing + and explicit regeneration. Changing fabric seed is a separate confirmed action. +- Accessible icon names/tooltips, adequate hit areas, visible focus, Japanese and + English strings, trapped/restored modal focus. Escape closes innermost overlay + before outer map popup. No global form-input shortcuts. + +| Key, only while map navigation is focused | Action | +| --- | --- | +| Arrows; W/A/S/D; K/H/J/L | Focus nearest visible selectable node up/left/down/right, without activation. | +| Enter / Space | Open locality or activate Spot portal/Page, matching click behavior. | +| Backspace | Parent City level, without leaving the page. | +| `+` / `-`; `0` | Zoom in/out; reset viewport. | +| Shift+F10 / Context Menu | Context menu on focused node. | +| Escape | Close menu/modal/map popup from inside outward. | +| Tab / Shift+Tab | Native accessible traversal, roving tab stop within map nodes. | + +Do not intercept input/textarea/select/contenteditable, IME or Ctrl/Alt/Meta +shortcuts. Pointer drag pans; directional keys navigate nodes, with defined +offscreen/empty-view fallback. Refresh preserves selection/zoom; deletion falls +back to nearest valid parent. Guard async inspector/load responses by selection +and request generation, and cancel obsolete requests. + +Locality history is an in-memory stack, not a browser entry for each movement. +Existing back/forward buttons invoke browser history; they cannot provide +per-locality traversal without entries. Provide distinct map back/forward +controls instead of pretending these two requirements are equivalent. + +## Delivery and acceptance checklist + +1. [ ] **CITY-A — correctness gate**: denied descendants, literal Paths, scoped + names/links, shallow/portal rules, source-aware idempotent plan/apply. +2. [ ] **CITY-B — durable events**: outbox and watermarks, consumer, CLI/import/ + adapter coverage, concurrent-edit/rollback/retry tests, manual/scheduled/auto UI. +3. [ ] **CITY-C — responsive map**: stable seed/cache, Worker, connected allocation, + capacity fallbacks, lazy authorized reads and continuity/stale-result tests. +4. [ ] **CITY-D — compact navigation**: icons/modals, keyboard/i18n/focus/history, + popup and error recovery browser tests. + +CITY-C/D may proceed independently of CITY-B once CITY-A's read/identity +contracts are established. Do not enable automatic production reconciliation +before CITY-A/B pass. Main-roadmap P0 authentication work remains open. + +Fixtures: 500 / 5,000 / 50,000 Paths, aliases, many tiny Streets, one crowded +Street, virtual folders, repeated names, `%`/`_`/Unicode, manual/archived mappings, +denied descendants, rename/edit during generation, crash/queue-full/retry/cancel. +Record API p50/p95, response size, query count, SQLite write-lock duration, +generation CPU/memory and browser long tasks before fixing production budgets. + +Audit checks performed locally: + +- Passed existing tests: `GOCACHE=/tmp/pageswiki-go-cache go test + ./internal/store ./internal/server -run 'TestCity|Test.*City|Test.*Topology' + -count=1`. These do not cover all findings above. +- Ran the checked-in gen-city bundle in a Node VM three times, seed key + `audit-city:1`, dimensions 240×160. Synchronous call times: about 39/32/29 ms; + 259 roads and 279 buildings each. A zero-delay timer did not run before + generation completed. This supports the source finding of synchronous work, + not a browser/production latency benchmark. +- No live DB mutation, schema migration, runtime/UI change or deployment in + this audit. diff --git a/docs/design/city-worker-navigation.md b/docs/design/city-worker-navigation.md new file mode 100644 index 0000000..17def5e --- /dev/null +++ b/docs/design/city-worker-navigation.md @@ -0,0 +1,76 @@ +# City generation Worker and directional navigation + +Implemented bounded CITY-C/D slice, 2026-09-14. Preserves the generated fabric +and [courtyard projection](city-immersive-map.md); this does not replace the +server topology/reconciliation work in [the City audit](city-review-and-reconciliation.md). + +## Generation and lifecycle + +`city-generator-client.js` retains the asynchronous `PagesWikiGenCity` facade, +but the generator bundle is no longer loaded into the main document. A local +`city-generator-worker.js` imports the rebuilt gen-city 1.4.6 bundle and returns +only numeric roads/building polygons. Its synchronous internals therefore cannot +block browser input or navigation. The Worker is terminated when finished, on +abort/supersession, on page suspension, or after a 5-second deadline. There is +one active generation job per map/client. Same-key requests share the job. + +Inputs are limited to a 256-character stable Domain key and integer dimensions +64–320 by 64–240 (the map requests 240 by 160). The adapter and Worker enforce +these bounds; returned geometry is limited to 4,096 roads, 4,096 buildings and +16 finite vertices per building. The main-thread deadline can kill runaway +synchronous Worker code without waiting for it to process a cancellation message. + +The base seed is the Domain UUID, not a topology version or membership count. +Geometry-only caches use the generator/layout version, Domain UUID and dimensions +as their key. Memory and sessionStorage each retain at most three fabrics; a +serialized storage entry must fit 512 KiB. Storage denial, quota exhaustion and +corruption do not disable generation. No Page names, Paths, grants, topology +or principal information are cached here. Authorized API results remain separate. + +The map aborts superseded fetches and discards late render responses. `pagehide` +cancels fetch/generation; BFCache `pageshow` reloads the authorized model and +reuses valid geometry. An unsupported/blocked Worker, timeout or malformed result +shows a retry action and error without executing gen-city synchronously as a +fallback. Utility menus remain usable; this is not a claim that the map works +without Workers. The SVG exposes its busy state to assistive technology. + +## Keyboard interaction + +`city-navigation.js` handles directional focus over currently visible Quartier, +Street, Spot entry, Page/portal links and overflow controls: + +- Arrow keys, WASD and HJKL choose the nearest useful candidate in the requested + screen-space direction; there is no arbitrary wrap across the map. +- Enter/Space activates the focused element. Repeated activation keydown is + suppressed to avoid drilling through multiple levels while a key is held. +- Backspace moves to the parent locality and restores the former child's focus. + At the Domain level it stays in the map. It never calls browser back/history. +- Ctrl/Command/Alt shortcuts, IME composition, editable fields, controls outside + the map, open modals and context menus are not consumed. Ctrl selection and + existing dialogs continue to work. Escape remains available to the containing + popup/menu rather than being repurposed for hierarchy navigation. + +The existing mouse, semantic Page hrefs, popup top-window Page navigation, +horizontal labels and courtyard design are unchanged. Navigation changes local +view state only; actual Page links still navigate normally. + +## Verification and remaining limits + +Opt-in Chromium tests run in normal and popup modes with the real Worker and +real gen-city output. They cover stable repeated seeds, a deliberately busy +Worker while main-thread timers keep running, timeout/abort/supersession, +stale messages, storage bounds, invalid results and pagehide/BFCache resumption. +Keyboard tests cover all key families, semantic Page activation, focus restoration, +modifier/IME/editing/modal exclusion and unchanged URL/history. Existing label, +organization, immersive/pagination and mobile-light-theme fixtures still pass: + +```sh +PAGESWIKI_BROWSER_TEST=1 go test ./internal/server -run 'TestCity(Labels|Organizer|Immersive|Keyboard|Worker)Chromium' -count=1 +``` + +This isolates base-fabric generation, not all City work. Topology-to-road +allocation, SVG DOM construction and loaded directory/inspector options remain +on the main thread. Connected road allocation, lazy locality projections and +larger-scale DOM virtualization remain separate tasks. A future server-side +geometry cache could share work across tabs/devices; no cross-tab worker pool +or server generation scheduler is introduced here. diff --git a/docs/design/configuration-panels.md b/docs/design/configuration-panels.md new file mode 100644 index 0000000..30a14cb --- /dev/null +++ b/docs/design/configuration-panels.md @@ -0,0 +1,194 @@ +# Configuration panels, bookmarks, and resource charts + +Resource history is now collected by a built-in background event, not by an +open browser. The current persistence, retention and extension-catalog design +is specified in [System extensions](system-extensions.md); it supersedes the +earlier in-memory live-sampling description below. + +Bookmark sections and direct home-page management are specified in +[Home navigation and hosted Vim](home-bookmark-sections-vim.md). The flat +bookmark representation below remains compatible; section rows extend it. + +## 設定画面の構成 + +`/-/sys/config?panel=` を共通シェルとする。`config_panels.go` の +サーバー所有レジストリがグループとパネルIDを定義する。 + +| グループ | パネルID | +| --- | --- | +| 表示・ナビゲーション | `home`, `editor`, `bookmarks`, `nav-home`, `nav-system` | +| コンテンツ | `objects`, `assets` | +| 認証・アクセス | `auth`(アカウント), `auth-providers`, `auth-sessions` | +| キャンパス・ドメイン | `campuses`, `domains` | +| 連携アダプタ | `adapters`, `adapters-builtin`, `adapter-` | +| 運用 | `scheduler`(実行状態・リソース), `logs`(実行履歴・ログ), `events`, `queue` | + +選択グループを展開し、他グループは折りたたむ。各summaryは手動でも開閉可能。 +サイドバー全体を閉じた場合は本文の幅も広げる。小画面は縦並びとする。 +パネル選択をURLに反映するため再読み込み/直接リンクで同じパネルを開ける。 +既存の `panel=nav` は `nav-home` として扱う。 + +共通CSSは `/static/css/config.css`、遷移・APIエラー処理・グラフは +`/static/js/config-panels.js`。チェックボックスはネイティブinputを残した +`role=switch` とし、labelの `data-label` をCSSの `attr(data-label)` で表示する。 +inputにも翻訳済み `aria-label` を付け、キーボード操作・disabled・フォーム所属・ +送信値を保持する。秘密情報は既存のpassword入力と空欄時保持の契約に従う。 + +## スケジューラの情報分離 + +- 実行状態: 件数、直近25ジョブ、再試行/キャンセル、プレビュー生成の手動トリガー。 +- イベント: 実施タイミング、次回実行、追加/実行/削除。周期と日時は選択した + スケジュール方式に対応する項目だけ表示。優先度・試行回数・JSONは詳細設定に置く。 +- キュー: 一時停止、並列数、キュー深度、リトライ待ち時間、履歴保持。 +- ログ: 直近50件の実行ログ。 +- リソース: 下記のライブグラフ。 + +従来はスケジューラを開くと4種類のAPIをまとめて取得していた。現在は選択した +パネルで必要なAPIだけ取得し、遷移時に中止する。定期取得はリソースパネルに限定。 +設定フォームを定期更新で上書きしない。APIの非JSONエラーも本文/ステータスとして +表示し、JSON構文エラーで本来のエラーを隠さない。 + +## アセット一覧の障害と是正 + +報告: `Unexpected token 'o', "forbidden: "... is not valid JSON`。 +原因はGETがendpoint policyに登録されていなかったこと。POST/DELETEの登録により +同じエンドポイントがmethod-closedになり、一覧GETが認可ハンドラに到達する前に +拒否されていた。GET/POST/DELETEは型付きpolicyからアセット管理ハンドラへ渡し、 +現行のキャンパス/ドメイン管理者権限をハンドラで検証する。 + +調査時の `asset:image:profile` は、HEAD、履歴、実ファイルSHA-256が一致し、 +記録サイズ・実サイズともに2,627バイトだった。データを削除・再生成する必要はない。 + +あわせて以下を是正した。 + +- 参照数を「同一ドメインにPathを持つ参照元Revisionの異なり数」に統一。 + 過去HEADと現在HEADを含める。詳細はPath別の行を返すため、同じRevisionの + 別名Pathがある場合の行数は参照数と一致するとは限らない。 +- HEAD履歴がない旧データも、現在HEADから依存関係を取得可能にした。 +- 更新/削除は書き込みSQLでも期待HEADを比較し、競合を検出する。 +- 同じバイト列でもMIME/ファイル名を変えた場合はメタデータと履歴を更新する。 +- CLIのアセット書き込みもMIME、ファイル名、サイズ、履歴を同一トランザクションで更新。 +- 一覧APIは `no-store`。画面はテキスト形式の拒否応答も読み取れる。 + +HEADハッシュのETagはバイト列の識別子である。メタデータだけの同時更新を厳密に +区別するには将来、Asset状態バージョンを含めた条件付き更新契約が必要。 + +## ブックマークマネージャー + +`panel=bookmarks` でドメイン共通のブックマークを最大64件管理する。 +行には名前、指定方法(Path / URL)、宛先、上下移動、削除を用意する。 +保存時に管理者権限を検証し、入力が不正なら保存済み一覧を変更しない。 + +既存の `home_bookmarks` JSONを継承し、`kind` を任意追加する。 + +```json +[{"label":"Docs","kind":"path","href":"/docs"}, + {"label":"External","kind":"url","href":"https://example.com/"}] +``` + +Pathはドメインルート相対の意味を持ち、URL化するときに空白・%・Unicodeを +適切にエスケープする。URLはHTTP(S)またはルート相対URLを許可し、JavaScript、 +プロトコル相対URL、資格情報を含むURLは拒否する。ローカルの宛先は表示時にも認可する。 +ホーム設定の保存ではブックマークを更新せず、別パネルの保存で消える事故を防ぐ。 +現在は「検索+ブックマーク」のホームに反映し、共通サイドバー実装時に同じデータを使う。 +個人ブックマーク、フォルダ分類、UUID追従型ブックマークは将来の別拡張とする。 + +## 設定テーブルの表示密度 + +設定画面の `.recent-table` / `.config-form-table` に限定して行の余白を圧縮する。 +セルの上下paddingは0.22rem、行内コントロールは高さ1.8rem、セル内フォームの外余白は0。 +空のform要素は表示しないが、form IDを用いた行内入力・保存/削除との関連付けは維持する。 +名前と識別子を1行にまとめ、通常セルは折り返さず、幅不足はテーブル領域内で横スクロール。 +長いPath・ファイル名・URL・補足説明は全文をDOMとtitleに残した省略表示とする。 +ログ展開行とその本文は例外として複数行表示を保つ。Viewer/Editorなど他画面のテーブルには適用しない。 + +## リソースグラフ + +`scheduler` パネルはhtop型の監視画面とし、上部に現在値と4つのグラフ、下部に +実行中ジョブのみを表示する。旧 `panel=resources` は `scheduler` の別名として維持。 +収集設定・表示期間・自動更新・指標の説明は、タイトル横の歯車から開くネイティブdialogに +まとめる。閉じるボタン・Escape・背景クリックで閉じ、歯車へフォーカスを戻す。 +別パネルへの移動時も閉じる。表示設定は即時反映し、同一originのlocalStorage +`pageswiki.monitor.display.v1` に期間・自動更新ON/OFF・現在値とグラフの更新間隔を保存。 +初期値は1時間・自動更新ON・現在値1秒・グラフ5秒。保存された期間があれば優先する。 +不正な値は使わず、storage利用不可でも既定値で動作する。収集設定は保存操作でDBへ永続化。 +時間範囲はタイトル直下に1つだけ表示し、各グラフの時間ラベル・表示点数は出さない。 +更新操作はリロードアイコン、設定は歯車。履歴へのリンクはサイドバーに集約する。 +グラフは常に1行4列。狭い画面ではグラフ領域内だけ横スクロールし、2列/1列へ折り返さない。 + +`GET /_/api/v1/queue/resources` の現在値と `GET /_/api/v1/queue/jobs?status=running&limit=100` +を既定1秒間隔で取得する(要求完了後に次を予約し、重複実行しない)。実行中の絞り込みはLIMITより前にDBで行い、最近終了した +ジョブに長時間実行ジョブが埋もれない。ワーカー上限32に対し表示上限100。 +現在値のキュー統計はstatus索引で待機・実行中だけを集計し、完了履歴を全走査しない。 +グラフは既定5秒ごとに、現在値から得たライブサンプルを履歴へ重ねて描画する。 +両間隔は1〜60秒で設定可能。グラフ間隔は現在値の間隔以上に補正する。 +永続履歴APIの再取得は30秒ごとに抑え、期間変更と手動更新時は即時再取得。 +ライブバッファも描画も最大361点。I/O速度は間引き前に計算し、時間バケットの最終値を描く。 +ブラウザ内ライブサンプルはDBへ書き戻さず、再起動後は永続サンプルから復元する。 +バックグラウンド収集は引き続きビルトイン +`resource.sample` イベントで行い、画面を閉じても7日間保持する。 +詳しい収集契約は [システム拡張](system-extensions.md) を参照。 +パネルを離れる、タブが非表示になる、自動更新を止める場合は定期取得を停止する。 +取得中リクエストはAbortControllerで中止し、古い結果が再表示しないよう世代を管理する。 + +グラフはテーマの色を使ったSVGで、外部ライブラリ/CDN不要。 + +### 実行履歴とログ + +`logs` パネルにジョブと実行ログを統合。既定は終了状態 +(succeeded/skipped/failed/cancelled)、待機・個別状態のフィルタも用意する。 +`GET /_/api/v1/queue/jobs?status=history&limit=50&cursor=...` のkeysetページングで +50件ずつ置換し、DOMへ無制限に追記しない。順序は投入時刻降順+UUID降順。 +完了状態用partial indexを指定し、SQLiteが状態別索引のIN検索後に保持履歴全体を +一時ソートする計画を避ける。ジョブpayloadは一覧SQLでも応答でも読み出さない。 +新しいジョブへは更新ボタンで戻る。cursorは位置を表すのみで認可は毎要求再検査する。 +ログはジョブの展開時だけ `/_/api/v1/event/logs?job_uuid=...&limit=100` で取得。 +以前のログは `before_id` で100件ずつ置換する。内容はHTMLではなくテキストとして表示。 +実行中のキャンセル、失敗等の再試行を維持する。終了した実行中行は次回更新で消える。 +実行状態は秒数・試行数を示すが、ジョブ別のCPU/RSS計測や進捗率を捏造しない。 + +| 指標 | 意味 | +| --- | --- | +| CPU | ホストの1分ロードアベレージ。CPU使用率ではない | +| メモリ | このGoプロセスのheap bytes | +| I/O | PagesWikiプロセスの読み込み・書き込み速度(B/s)。2系列で表示 | +| キュー負荷 | 待機ジョブ数+実行ワーカー数 | + +これらはドメイン別ではなくインスタンス/ホスト単位の指標。 +ディスク容量は現在値カードに残し、グラフの1枠はI/Oに使う。I/Oの計測範囲と制約は +[システム拡張の監視仕様](system-extensions.md#ディスクio)を参照。 +コンテナCPU制限・RSS・cgroup使用率・複数インスタンス・長期保管は将来の +監視プロバイダ拡張として別API/保持方針を設計する。 + +## アダプタ個別パネルの拡張契約 + +現行プラグインは `adapter-` に個別パネルを持ち、共通partialで接続先・ +対応MIME/拡張子、有効化、別タブ、既定エディタ、HTML/Markdown変換を編集できる。 +旧 `/-/sys/config/adapters?id=...` のGETは統合パネルへリダイレクトする。 +保存も同じパネルに戻り、ドメイン別の既存プラグイン設定へ保存する。 + +将来のアダプタ固有項目は次の契約で追加する。 + +1. サーバーが信頼するmanifestに `settings_schema_version` と複数のパネル定義を登録。 + 定義は `id`, `title_key`, `group`, `fields` とし、フィールドはboolean、text、 + enum、number、secretの許可リストから選ぶ。現行partialがその最初の実装。 +2. 保存先は `(domain_uuid, adapter_id, schema_version)` で区切る。バリデーションと + schema移行はサーバー所有。未定義キーは拒否し、秘密値は読み出しレスポンスに含めない。 +3. 特殊UIが必要な場合のみ、サーバー登録済みの専用partial/モジュールを使う。 + プラグインやドキュメントから任意HTML/JavaScriptを設定画面に挿入しない。 +4. 外部設定画面の埋め込みが必要な場合は、別途sandbox iframeと固定originの + postMessage契約を設計する。通常ログインCookie/Bearerをiframeへ渡さない。 +5. アダプタ固有の接続確認・秘密管理・長い検証処理は個別APIとイベントへ分離。 + +汎用schema rendererと外部設定iframeは未実装。今回の共通シェル・レジストリ・ +アダプタpartialを拡張点として使用する。 + +## 検証 + +- 管理者のAsset GETが成功し、一般ユーザーのGETが拒否されるHTTP回帰テスト。 +- 参照数のドメイン分離、旧HEAD参照、同一バイト列のメタデータ訂正。 +- ブックマーク保存/不正URL拒否、アダプタ個別設定の保存と戻り先。 +- 設定HTMLの重複ID、メニューの未定義パネル、inline JavaScriptの構文検証。 +- Chromiumでassets/events/queue/resources/bookmarks/adapter個別パネルを確認。 + `PAGESWIKI_BROWSER_TEST=1 go test ./internal/server -run TestConfigChromiumSmoke` +- CLI: `python3 -m unittest discover -s data -p test_cli_assets.py`。 diff --git a/docs/design/data-cli.md b/docs/design/data-cli.md new file mode 100644 index 0000000..0689aac --- /dev/null +++ b/docs/design/data-cli.md @@ -0,0 +1,183 @@ +# Data CLI + +`data/pageswiki-cli` is a local administrative data surface. It provides +rsync-like one-shot transfers and an interactive Semantic Path shell. + +It accesses: + +- metadata in `pages.db`; +- immutable payloads in `documents/sha256/`; +- mutable Asset HEAD metadata in `assets`. + +The implementation uses Python's standard library only. + +## Invocation modes + +### One-shot + +```bash +data/pageswiki-cli get path:/manual/start start.html +data/pageswiki-cli put start.html path:/manual/start +``` + +Transfers compare SHA-256 before writing. Identical content is reported as +`skipped` and does not create another Revision. + +### Interactive shell + +```bash +data/pageswiki-cli shell +``` + +Invoking without arguments also opens the shell when stdin is a terminal. +The shell maintains a Semantic Path working directory: + +```text +pages:/> cd /manual +pages:/manual> ls +pages:/manual> view start +``` + +The shell uses `readline` when available: + +- Up/Down traverse command history. +- Tab completes commands, Semantic Paths, UUIDs, Revisions, Assets, and local + transfer paths. +- History persists in `~/.pageswiki_history`, or the path specified by + `PAGESWIKI_HISTORY`. + +## Commands + +| Command | Behavior | +| --- | --- | +| `ls [PATH]` | List direct Semantic Path children | +| `cd PATH` | Change shell Semantic Path | +| `mv SOURCE DEST` | Move a Path and its descendants transactionally | +| `view [ADDRESS]` | Display metadata and send payload to `PAGER` on a TTY | +| `cat [ADDRESS]` | Write only the canonical payload to stdout | +| `edit [ADDRESS]` | Edit through `EDITOR` and write back changed content | +| `get ADDRESS [LOCAL]` | Download one payload | +| `put LOCAL ADDRESS` | Upload a Page Revision or update an Asset HEAD | +| `mget REMOTE_PATTERN [DIR]` | Download matching Semantic Paths | +| `mput LOCAL_GLOB REMOTE_DIR` | Upload matching local files | +| `revision [ADDRESS]` | List a Page's immutable Revision history | +| `diff REV REV` | Produce a unified Document diff | +| `restore REV` | Create a new Revision from an old Revision | +| `link ADDRESS PATH` | Add a Semantic Path projection | +| `unlink PATH [ADDRESS]` | Remove a Path projection only | +| `pwd` | Show the shell Semantic Path | + +`put` and `mput` infer a Revision Content-Type from the local filename, with +the destination Semantic Path as a fallback. Markdown input is converted to +canonical HTML and loses only its `.md` / `.markdown` Semantic Path suffix. +Other extensions remain part of the Path. Binary payloads are stored as +immutable Documents and retain their original filename and Content-Type. +| `help` | Show usage | +| `exit`, `quit` | Leave the shell | + +`get ADDRESS -` writes to stdout and `put - ADDRESS` reads from stdin. +Unlike `view`, `cat` never invokes a pager and is suitable for pipelines. + +## Supported addresses + +| Address | Meaning | +| --- | --- | +| `path:/...` | Mutable Semantic Path projection | +| `uuid:` | Stable Page/Object identity | +| `rev:` | Immutable Revision identity | +| `asset::` | Mutable Asset HEAD | + +A single address without a command retains the earlier inspection behavior. + +## Write semantics + +### Page `put` + +1. Resolve `path:` or `uuid:`. +2. Create a Page UUID and Path binding if a Path does not exist. +3. Hash the input and atomically persist its immutable Document. +4. Compare with the newest Revision in `PAGESWIKI_LANG`. +5. Skip identical content or create a new Revision UUID. + +Page payloads must be UTF-8. Binary data belongs in an `asset:` address. + +### Asset `put` + +1. Hash and atomically persist arbitrary bytes. +2. Create the Asset identity if absent. +3. Skip an identical HEAD or update `head_document_hash`. + +### `edit` + +1. Resolve the current canonical payload. +2. Write it to a private temporary file. +3. Invoke the command in `EDITOR`. +4. Apply Page or Asset `put` semantics when the editor exits successfully. +5. Skip unchanged content and remove the temporary file. + +Immutable `rev:` addresses cannot be edited. + +### `mv` + +- Semantic root cannot be moved. +- A destination cannot be inside its source. +- Every destination is collision-checked before mutation. +- A unique temporary namespace avoids primary-key collisions. +- All Path updates commit in one SQLite transaction. + +### `restore` + +Restore never rewrites history. It reads the selected immutable Revision and +creates a new Revision on the same Page with the same language. + +### `link` and `unlink` + +These commands mutate reachability only. They never delete the Page, +Revisions, or Documents. An unlinked Page may become a zombie and remains +recoverable by UUID until garbage collection. + +## Consistency and safety + +- SQLite writes use explicit transactions and a busy timeout. +- The CLI initializes the additive `assets` table when absent; core schema + migrations remain owned by the server. +- Documents use temporary files, `fsync`, and atomic replacement. +- Payload hashes are verified on every read. +- Revision addresses reject writes. +- rsync-like transfers skip identical hashes. +- Missing canonical Documents may use the transitional SQLite body only when + its SHA-256 matches. + +This CLI is a trusted local administrative interface and intentionally bypasses +future HTTP Capability evaluation. Filesystem and database permissions define +who may use it. + +## Environment + +| Variable | Meaning | +| --- | --- | +| `PAGESWIKI_DATA_DIR` | Directory containing `pages.db` and `documents/` | +| `PAGESWIKI_DB` | Explicit SQLite path | +| `PAGESWIKI_DOCUMENTS_DIR` | Explicit Document root | +| `PAGESWIKI_LANG` | Language used for selection and Page writes | +| `PAGER` | Pager invoked by `view` on an interactive terminal | +| `EDITOR` | Editor invoked by `edit` | +| `PAGESWIKI_HISTORY` | Interactive command-history file | + +## Asset metadata + +The normative Asset lifecycle and authorization model are defined in +[`asset-model.md`](asset-model.md). The CLI is a trusted local implementation +of HEAD reads and updates, not the public Asset API. + +| Column | Meaning | +| --- | --- | +| `domain_uuid` | Domain containing the mutable Asset name | +| `address` | Canonical Domain-local `asset:` address | +| `object_uuid` | Stable owning Object UUID | +| `head_document_hash` | Current immutable Document snapshot | +| `created_at_ms` | Creation timestamp | +| `updated_at_ms` | HEAD update timestamp | + +Administrator HTTP Asset mutation is available with Domain/Campus-admin checks +and ETag preconditions. The CLI remains the trusted local bulk interface. diff --git a/docs/design/diary-blog-plugins.md b/docs/design/diary-blog-plugins.md new file mode 100644 index 0000000..d08aac2 --- /dev/null +++ b/docs/design/diary-blog-plugins.md @@ -0,0 +1,278 @@ +# 日記・ブログ:ビルトインシステム拡張 + +初期版 0.1/URL・入口拡張(2026-09-17)。MIME連携アダプタではなく、通常のWiki Pageに +付随する日付・記事情報とナビゲーションを提供する。任意の外部コードをロードする +プラグイン機構ではない。 + +## 実装した範囲 + +| | 日記 | ブログ | +| --- | --- | --- | +| ID | `content.diary` | `content.blog` | +| UI | `/v/diary` | `/v/blog` | +| 設定 | `/-/sys/config?panel=diary` | `/-/sys/config?panel=blog` | +| 一覧 | 月別/日付別 | 日付降順、任意の月・カテゴリで絞り込み | +| ナビゲーション | 月カレンダー、最近8件、自分の記事 | 月カレンダー、最近8件、カテゴリ、自分の記事 | +| 登録制約 | 同日複数件可 | 同日複数件可 | + +両方ともDomainごとに**既定無効**。Domain管理者が有効化する。無効化しても +登録情報、Wikiページ、Revisionは削除しない。 + +「新規記事」ダイアログは日付・keyword・タイトル・カテゴリ・Markdown本文を +まとめて保存する。既存Pageを使う場合は従来のPath指定による登録も可能。 +本文の継続編集は既存エディタ、記事情報の変更・登録解除は一覧から行う。 + +## 同一インスタンスのDomain射影(第一段階) + +- ドメイン一覧の歯車内で日記・ブログそれぞれの参照元DomainとPath prefixを指定。 + 空の参照元は従来の自Domain記事を表示する。入口形式・有効状態は上の設定で指定する。 +- `periodical_projections(domain_uuid,kind,source_uuid,prefix)`で参照のみ保持し、 + Page、Revision、Path、記事情報は複製しない。既存の表示先記事も削除しない。 +- Campus管理者による設定に限定。同じCampus(同じコントローラの管理単位)の + 有効なlocal配置Domain同士のみ許可。managed Campus上のローカル設定変更は禁止。 + 自己参照・連鎖・循環を拒否し、閲覧時にも有効状態・配置・所属・連鎖を再検査する。 +- 初期射影範囲は認証済みの一覧・月/日カレンダー・カテゴリ・最近の記事・own。 + 参照元・表示先の双方の読取ポリシーとprefixで絞り、件数/カテゴリ/ページ送りを + その後に計算する。ソース権限は一括読込し、記事ごとのSQL認可問い合わせはしない。 + Source側がlegacyモードでも、射影では明示的な読取権限を要求する。 +- 匿名の場合も、設定済みのlocal射影先の `/` と `/v/{kind}/YYYY/MM[/DD]` を + 閲覧できる。参照元の現在有効な公開承認済みPath/Revisionだけから一覧・件数・ + 最近の記事を構成する。日付は承認済み `{prefix}/YYYY/MM/DD[/keyword]` Path、 + **登録タイトルはPageの公開状態を継承する公開表示情報**とする(2026-09-19変更)。 + 現在有効な公開承認のあるPageのタイトルだけをJOINで取得し、タイトル変更は + 次の要求で反映する。カテゴリ・著者・登録日付は公開しない。タイトル未登録なら + 最新20記事に限り承認済みHTMLのh1を64KiB以内で読み、なければ日付/Path末尾。 + 不正/期限切れの認証情報は匿名へ降格しない。公開変更/失効は次の要求で反映する。 + 記事本文の公開権限を増やさず、未承認の最新Revisionを公開しない。 +- 表示先の認証セッションでPrincipalを特定する。参照元の同じPrincipalに読取権限が + 必要。クロスサブドメインCookie共有やセッションの暗黙継承は実装しない。 +- 専用ドメイン(入口形式がblog/diary)では記事リンクを表示先の + `/YYYY/MM/DD[/keyword]` とし、承認済み本文を同じホストで表示する。 + カレンダー・同月の他の記事(最大31件)・前後の記事を同じ公開集合から構成する。 + サイト名称・テーマは表示先Domainのもの。記事本文は既存のinert HTML境界を使う。 + 本文中の既知の公開記事リンクも表示先へ変換し、それ以外は参照元URLを保持する。 + 画像のCSPは設定済み参照元originだけ追加許可し、画像自体の公開権限は拡張しない。 + 「参照元で閲覧・編集」は従来通り元FQDNへ移動する。作成・登録・更新・解除の + APIを射影先で使うと403。Store transaction側でも射影設定を再検査して拒否する。 +- entries APIは`source_domain`・`source_origin`・`projection`を付加する。 + Path/Page UUIDは参照元のもの。日付ナビゲーションは表示先の `/v/{kind}/...`。 + 日付既定値は参照元Timezone、テーマ・名称は表示先Domainの設定。 +- 一覧は毎回DBから読み、`private, no-store`。ACL失効・元記事変更は次の要求で反映。 + 参照先が無効/remote配置/別Campusへ変わった場合は503で閉じ、自Domain記事への + 黙った切り替えはしない。同期や既存公開承認をこの参照設定で拡張しない。 +- この参照設定は現時点では**ローカル専用でmanifest v2には含めない**。 + 別インスタンスへの参照設定配信・認証付き取得・失効・ + タイトル以外の匿名メタデータ公開・SSOは後続。従って「同じコントローラなら任意の配置先で射影」 + までを実装済みとはしない。 +- 専用ドメインの `/rss.xml` はRSS 2.0、最新20記事のタイトル・正規リンク・GUID・ + Revision日時と、`content:encoded` の安全化済み本文HTML(CDATA)を配信する。 + 本文取得前に正確なRevision公開承認を再確認する。記事リンク・ページ内リンクは + 表示先の絶対URL、画像やその他の参照元リンクは元ドメインの絶対URLに変換する。 + 上限は1記事1MiB入力、本文合計8MiB、生成処理5秒。上限超過は503とし、黙って + 本文を切り捨てない。HEADは本文を生成しない。非公開登録情報は含めない。絶対URLは登録FQDNから + 作り、Hostヘッダー由来のfeed汚染を防ぐ。HTMLにRSS autodiscoveryとRSSリンクを設置。 + 毎回公開承認を確認し、HTTP共有キャッシュは使わない。ただし購読者が既に取得した + RSSや本文のコピーは、公開撤回しても遠隔削除できない。 + +## 原子的な新規投稿のAPI + +- `/v/blog/-/new`、`/v/diary/-/new` は認証必須の独立した新規記事画面。 + Domain timezoneの日付・keyword・カテゴリ・Markdown本文を既存posts APIへ送る。 + 作成/Pathの権限はAPI内のtransactionで検証し、保存だけでは公開承認しない。 + 未有効のプラグインは404、射影先は参照元の同ルートへ303で案内する。 + GETで記事やPathを作成せず、POSTはこの画面URLでは受けない。 +- 投稿完了画面にXのWeb Intentリンクを表示し、ユーザのクリックでのみXへ移動する。 + サーバーからの自動投稿・外部SDK・OAuth資格情報の保持は行わない。 + posts応答の`share_targets`は有効な同Campus/local射影先と入口設定から生成する。 + ブログ専用ドメインの `/YYYY/MM/DD[/keyword]` を優先し、複数なら選択式。 + 射影設定があるのに利用可能な共有先がなければ、元ドメインへ黙って切り替えない。 + `published`は公開承認の検査結果。未公開なら警告とクリック時の確認を出す。 + 共有操作で公開承認は変更しない。公開記事ページにはタイトル・canonical URLの + OGP/Xカードメタデータを出す(カードの表示や更新時期は外部サービス側に依存)。 + +- `POST /_/api/v1/extension/content.{diary|blog}/posts`:`request_id`(UUID)、 + `title`、`date`、`keyword`、`category`、`body`(Markdown)。未知フィールド拒否。 + 要求JSON上限320 KiB、変換後HTML上限256 KiB。ブラウザ本文入力上限131072文字。 +- prefixとTimezoneはサーバー設定を使用する。Path・Page UUID・著者の指定は不可。 + 通常のMarkdownレンダラでHTML化し、通常のRevision挿入関数とasset固定処理を共有。 +- SQLite write予約後にactive membership、ローカル配置、有効状態、create/writeの + 両権限、上位Locality制限、現在のprefix、Pathの不存在を検査する。 + Page・provenance・Path・Revision・asset参照・記事情報・journal・再送receiptを + 同一transactionで確定する。既存Pathは409で拒否し、上書きしない。 +- `periodical_posts`のDomain/kind/actor/request_idと要求digestで再送を識別する。 + 同じ要求は既存Page UUIDを返し、変更された要求は409。再送にも現在の権限と + Path binding/記事登録の存続を要求し、削除後の再送で復元しない。 +- Document Storeのimmutable blobはcommit前に書き込む。DB rollback時には + 未参照blobが残り得るが、Page・Revision・Path・記事索引は可視化されない。 + 未参照blob回収とreceipt保持/GCの統合は後続。プロセス内revision書込ロックを共有。 +- 本文保存は公開承認ではない。匿名の本文・記事情報・日付・件数を追加公開しない。 +- 日付付き一覧へ遷移して保存結果を表示する。ダイアログ内の入力は送信失敗時に + 保持し、同じrequest_idで再試行する。ブラウザ永続ストレージには下書きを保存しない。 +- Search/公開失効など既存DB triggerは共通Revision/Path挿入で適用される。 + City自動生成・通知への共通outbox配送は依然として後続(journalだけで配送済みとしない)。 + +## 記事URLとドメイン入口(2026-09-17) + +- 設定画面の日記/ブログパネルにDomain・kind単位のprefixを追加。既定値は + `/diary`・`/blog`。`/`も指定可能。設定変更は既存Pathを移動しない。 +- 「新規ページ」は日付・任意keywordを指定するダイアログを開く。 + `{prefix}/yyyy/mm/dd` または `{prefix}/yyyy/mm/dd/{keyword}` をサーバーで + 検証し、書き込み権限とPathの不存在を確認してエディタへのリンクを返す。 + 日本語keyword可。keywordは単一要素とし、traversal・制御文字・URL区切りは拒否。 +- エディタを別タブで開き、本文保存後に元のダイアログから記事登録へ進む。 + この任意の従来フローは二段階操作。新規記事ダイアログでは一括保存できる。 + 計画APIはPageを作成・予約しない。確認後に別の操作が同じ + Pathを作成した場合、既存エディタはそのPageを開くため、排他的な新規作成保証は + 専用の原子的投稿APIが提供する。計画APIは自動上書き・自動登録を行わない。 +- keywordなしのPageとkeyword付きの子Pageは同日に共存可能。 + `idx_diary_owner_date`はschema初期化で削除し、既存データは保持する。 +- Domain設定のトップページ形式に日記/ブログを追加。`home_layout=diary|blog` + は認証後の `/` で直接一覧・カレンダーを描画する。日付選択は以下のviewer Pathへ + 進む。従来の `/v/diary`・`/v/blog` は残す。既存home_pathを削除しない。 +- 配置先の表示名を「配置先」に短縮。物理的なInstance FQDN・fingerprintと + home_layoutは別設定のままとし、別Domainの記事や権限を暗黙に共有しない。 +- 匿名公開処理は従来の承認済みPage/ディレクトリ表示を維持する。 + home_layout設定で記事メタデータを公開しない。設定済み射影の匿名カレンダーは + 上記の公開Path/Revision由来データのみで構成する。 +- Domain一覧の歯車「ドメインの入口設定」からトップページ・日記/ブログの有効状態・ + prefixを一括指定できる。配置先そのものは既存のDomain更新フォームで指定する。 + 初回ダイアログは現在の設定値を引き継ぐ。保存後はこのパネルを設定の正本とし、 + homeパネル/個別プラグインの設定APIからの競合する更新を拒否する。 + +### コントローラからの配信 + +- `domain_entry_settings(domain_uuid,settings_json)`が明示的な入口設定を保持。 + Campus管理者のみ更新可能。外部キャンパス管理下ではローカル更新不可。 + 設定検証・管理権限確認・保存・ローカル配置への反映は同一transaction。 +- 署名付きCampus manifestに`domain_entries`を追加。明示設定がある場合だけ + schema_version=2を使用し、設定のない従来manifestはversion=1のままとする。 + 入口設定も署名・内容hash・revision更新の対象。対象CampusのDomainのみ含める。 +- 受信時はDomainの所属・Layout列挙・prefix・選択したプラグインの有効状態を検証。 + Domain snapshot、入口設定、local配置のhome_layout/periodical設定、受信checkpointを + 同じtransactionで更新する。remote配置のDomainには実行設定を有効化しない。 +- 記事本文・記事登録・公開承認・資格情報・任意configは配信しない。 + prefix変更も記事移動を発生させない。同一revisionの再送は従来どおり冪等。 +- v2非対応ノードは同期を拒否するため、**配置先を先に更新してから**入口設定を保存する。 + enrollmentで`manifest_version=2`と専用の`capability_signature`を送信し、 + インスタンス鍵で署名した`normalized FQDN + LF + token + LF + manifest=2`を検証する。 + 従来のenrollment署名も併せて必須。古いクライアントの申告なしはversion=1として扱う。 +- `federation_instance_capabilities(instance_uuid,manifest_version)`で鍵identity単位に + 能力を記録。FQDNが同一でも鍵変更は別の申告・承認が必要。 + Campus manifestは全承認済みノードに渡るため、一台でもv2未確認なら入口設定保存を + 409で拒否し、ダイアログにも案内を表示する。受信側は従来どおり署名・versionを検証し、 + 設定を削ったv1へ黙ってフォールバックしない。 +- capabilityは対応機能の申告であり、稼働状態・実際の反映完了の証明ではない。 + enrollment更新時に申告がなくなればversion=1へ戻す。署名は既存enrollment同様 + token期間中のproofでありnonce付きの鮮度証明ではない。反映ACK/鮮度管理は後続。 +- manifestで設定が省略された場合は設定解除を意味しない。既存設定を保持する。 + 現段階では管理を解除する操作はなく、Wiki形式への変更・各プラグインの無効化も + 入口設定パネルから明示的に行う。削除Domainの設定保持/GCは後続。 + +### 日付ナビゲーションの正規URL + +- 月別:`GET /v/{diary|blog}/yyyy/mm`。 +- 日別:`GET /v/{diary|blog}/yyyy/mm/dd`。 +- 自分の記事:存在フラグ`?own`。カテゴリは`?category=...`、ページ送りは + `offset`を維持する。組み合わせは`?category=Work&own`。 +- `/v/blog`は全期間、`/v/diary`はDomain timezoneの当月。 +- 旧`month`/`date`/`mine=1`は認証確認後、302で正規URLへ転送する。 + date単独でも対象月を導出する。矛盾する日付、存在しない日付、重複した日付query、 + 桁数不正は400。未知のHTTPメソッドを許可せず、現段階はGETのみ。 +- カテゴリ/ownは月移動・日付選択・ページ送りで保持する。フィルタフォームの + 再適用は日付選択とoffsetをリセットし、指定月(ブログは全期間も可)から表示する。 +- 専用ドメインの `/` は入口。`/yyyy/mm/dd`は通常Pageの本文を置けるため、 + 日付別一覧をそこへマウントしない。月・日への移動は`/v/{kind}/...`を使用する。 +- 新規投稿計画APIの`date`は記事作成パラメータであり、閲覧URLの日付queryとは別。 + 将来のQUERY対応はTODO。現段階ではルータや認証middlewareに追加しない。 + +## データモデル + +- `periodical_settings(domain_uuid, kind, enabled)`:Domainとプラグイン単位の有効状態。 +- `periodical_prefixes(domain_uuid, kind, prefix)`:投稿先prefix。未設定時はkind別既定値。 +- `periodical_entries(domain_uuid, kind, page_uuid, owner_uuid, local_date, + title, category, timezone, version)`:正本はPage UUIDで参照する。Pathは保存せず + 閲覧時に現在のbindingから解決する。renameで日付・カテゴリが失われない。 +- `periodical_events(id, domain_uuid, kind, page_uuid, actor_uuid, operation, + version, created_at_ms)`:設定/登録/解除と同一transactionで記録する変更journal。 + 本文・タイトル・資格情報は複写しない。これは共通outbox配送や通知機能そのものではない。 + +本文はDocument Storeと既存Revisionにのみ保存する。登録解除はメタデータだけを +外し、Pageを削除しない。最後のPathがなくなったPageは一覧から非表示になる。 +メタデータの孤立行のGC・完全消去・履歴保持期間は後続の保持ポリシーで扱う。 + +日付は明示したcivil date(YYYY-MM-DD)であり、UTC時刻への暗黙変換をしない。 +作成時のDomain timezoneをサーバーで記録する。設定timezone変更後も過去の記事を +別日に移動しない。未来の日付を指定しても公開予約や時刻による自動公開は行わない。 +著者は最初の登録時の認証済みPrincipalで固定し、クライアントのowner指定は信用しない。 + +## 権限と公開範囲 + +- 登録情報を利用するUI/APIは**認証必須**。legacyモードでも匿名メタデータ一覧を + 許さない。設定済み射影の公開Path/Revision由来一覧は上記の限定例外。 +- 設定変更はactiveなDomain管理者グループのowner/manager。 +- 記事登録・情報更新・解除は対象Pathのwrite権限と上位Locality制限を再検査する。 + `upload_only`や`read_write_once`だけでは、既存Pageの記事情報を書き換えられない。 + 既存エディタと同じく、本人の `/u/{username}` Wiki配下は本人の編集権限で扱う。 + この場合もactive membership・実際のidentity・上位Locality制限を検査する。 +- 一覧・カテゴリ・カレンダー件数・最近の記事・ページ送りは、現在のPage閲覧権限で + 絞った後に構築する。非公開の別名で先にdedupeして可視Pageを失わない。 +- 登録操作は匿名公開承認ではない。Page本文の匿名公開は従来の正確なRevision承認に + 従う。登録タイトルのみPageの公開状態を継承し、それ以外は個別の承認契約が必要。 +- 下書き/公開/予約公開を、この登録テーブルの有無や日付と混同しない。 + 公開一覧・RSS/Atomには記事メタデータの承認されたスナップショットと失効検査が必要。 + +変更transactionは最初にSQLiteのwrite予約を取得し、active membership、設定、Pathの +Page UUID、write grant、group/locality caps、期待versionを同一snapshotで検査する。 +既存記事の変更にはPage UUIDも要求し、renameやPathの再bindを検出する。 +削除・再登録後もjournalからversionを引き継ぎ、古い編集要求の再利用を拒否する。 +古いversionによる登録更新は409で明示し、上書きしない。同日複数記事は許可する。 + +## APIと負荷上限 + +`/_/api/v1/extension/content.{diary|blog}/{settings|entries}`: + +- `GET settings`:有効状態。`POST settings`:`{enabled: bool}`。 + GETはprefixも返す。POSTは任意の`prefix`を受け、有効状態・prefix・journalを + 同一transactionで保存する。prefix省略時は既存設定を維持する。 +- `GET plan?date=YYYY-MM-DD&keyword=...`:認証・有効状態・対象Pathのwrite権限を + 確認し、未使用Pathとeditor_hrefを返す。既存Pathは409。POSTは不可。 +- `GET entries`:現在読める記事のメタデータのみ。 +- `POST entries`:`path,title,date,category,version`(新規は0)。更新/解除は + `page_uuid`と現在のversionを付け、解除には`remove:true`を指定する。 +- 未定義メソッド・未知フィールド・複数JSON値は拒否。本文上限8 KiB。 +- UIは20件単位、最近の記事は8件。索引取得は本文を読まない2秒のmetadata query、 + 最大5,000 binding行/4 MiB。超過時は黙って結果を欠落させず503。 + 設定・更新transactionは3秒。UIの編集権限評価は表示中の最大20件だけ。 +- 初期版はpermission-filtered keyset pagingではない。大規模サイト向けには上限を + 単純に広げず、バッチ権限評価・索引分割・不透明cursorを先に実装する。 +- ブラウザ側に記事や権限を永続キャッシュしない。BFCache復帰時に再読込。 + 設定パネルは表示された時だけ非同期で読む。fetchは15秒で打ち切る。 + +## 次の実装/TODO + +- [x] Page+初回Revision+記事情報を原子的に作成するMarkdown投稿フォーム。 + 既存の本文保存・asset固定とjournal、冪等再送を実装。 +- [ ] 投稿journalから共通outboxへの配送、City自動生成・通知、receipt保持期間とGC。 +- [x] 同一Campus・同一インスタンスの参照型一覧/カレンダー射影と双方の読取権限検査。 +- [x] 承認済みPath/Revision由来の匿名射影一覧・カレンダー。 +- [x] 専用ドメイン内の記事本文、登録タイトル、同月/前後ナビゲーション、RSS 2.0。 +- [ ] タイトル以外の登録メタデータの匿名射影承認、別インスタンスの + 参照設定配信と認証付き取得・失効、クロスDomain SSO。 +- [x] Domain入口設定ダイアログと署名付きmanifest v2による設定配信・原子的反映。 +- [x] 署名付きcapability申告・全承認済みノードのv2事前確認・UI案内。 +- [ ] Domain新規作成フォームとの一体化、設定の管理解除・GC、配信反映ACK/鮮度管理。 +- [ ] 残りの記事メタデータの公開承認・Atom。承認ポリシー/Inboxと接続し、 + Pageや上位階層の公開範囲を広げない。タイトル変更・公開撤回で即時失効。 +- [ ] 本文抜粋、表紙、複数カテゴリ/タグ。 +- [ ] 個人/共有コレクション、著者選択、所有者移管/引き継ぎ。 +- [ ] コメント基盤と最近のコメント:閲覧制限、モデレーション、削除・通知を共通化。 +- [ ] tDiary取り込み:提供サンプルと公式仕様を確認して対応版/形式を固定する。 + Ruby/eval/Marshalの任意実行は禁止。既存import session/journalを使い、事前確認、 + 日付・timezone・旧URL・セクション・添付・コメントの対応、再開・重複防止を実装。 + 移行著者は出典であり、ローカル認証ユーザーと偽って紐付けない。 +- [ ] 共通outbox・保持/export/削除ポリシー・metadata履歴、孤立メタデータのGC。 +- [ ] 索引のkeyset pagingと負荷試験、外部拡張の署名・分離runtimeは別途。 + +検証:登録/更新/解除、同日複数記事、うるう日、write拒否、Domain越境、グループ失効、 +rename追従、非公開カテゴリ/件数の漏えい、journal失敗時のrollback、version再利用、 +無効化時のデータ保持、厳格JSON、匿名拒否、PC/モバイルでの設定と登録操作。 diff --git a/docs/design/domain-namespace-federation.md b/docs/design/domain-namespace-federation.md new file mode 100644 index 0000000..3940eaf --- /dev/null +++ b/docs/design/domain-namespace-federation.md @@ -0,0 +1,244 @@ +# Domain Namespace and Federation + +## Decisions + +### Paths are Domain-local + +A semantic path is identified by the pair: + +```text +(domain_uuid, normalized_path) +``` + +Therefore `/handbook` in the Sales Domain and `/handbook` in the Engineering +Domain are different bindings and do not conflict. + +The `paths` table uses a composite primary key: + +```sql +CREATE TABLE paths_v2 ( + domain_uuid TEXT NOT NULL, + path TEXT NOT NULL, + object_uuid TEXT NOT NULL, + created_at INTEGER NOT NULL, + is_primary INTEGER NOT NULL DEFAULT 0, + PRIMARY KEY (domain_uuid, path) +); +``` + +Existing rows are assigned to the current default Domain during migration. +All path reads and mutations must receive the request Domain UUID explicitly; +silently using a process-wide default is prohibited in request handlers. + +### Objects are instance-global + +Page Objects are not owned by a Domain. Their UUID is globally unique within +an instance, while a Domain owns bindings from its paths to Object UUIDs. + +This preserves the MagicPage property: + +```text +sales.example.test/guide ─┐ +engineering.example.test/guide ├─> Page UUID 7a… +support.example.test/runbook ─┘ +``` + +Revisions, immutable Documents, tags, and assets remain attached to Object +identity. Authorization may still restrict which Domains may bind or expose +an Object. + +If stronger tenant isolation is later required, it belongs in policy and +storage-placement layers rather than by weakening UUID identity. + +## Link addressing + +Links have two forms: + +- Same Domain: a root-relative semantic path such as `/guide`. +- Another Domain or another instance: an absolute URL containing the + destination FQDN, such as `https://engineering.example.test/guide`. + +A cross-Domain link must not be stored as a bare `/guide`, because its meaning +would change with the request Host. Internally, a locally managed destination +may additionally retain `domain_uuid` for rename tracking, but its rendered +and exported form is still an absolute URL. + +Object addresses (`uuid:`, `rev:`, and `asset:`) are local-instance addresses. +To address another instance they require an origin: + +```text +https://engineering.example.test/o/uuid:… +https://engineering.example.test/o/rev:… +``` + +No request should transparently resolve a remote UUID against the local +SQLite database. + +## Local and remote Domains + +A configured FQDN does not by itself mean that a Domain is remote. One +PagesWiki instance may serve several local FQDNs. Domain placement therefore +must be explicit: + +| placement | Meaning | +| --- | --- | +| `local` | This instance serves the Domain and owns its path namespace. | +| `remote` | The Domain is a catalog entry served by another instance. | + +A remote Domain has no writable local path namespace. Its origin is derived +from its owning Campus FQDN and Domain host. Proxying remote content is not +implicit. + +Implemented additive Domain fields: + +```sql +placement TEXT NOT NULL DEFAULT 'local', +``` + +The URL scheme is transport policy and is not part of Campus or Domain +identity. + +## Host resolution + +Campus stores an FQDN without `http://` or `https://`. A Domain host resolves +as follows: + +- empty host: the Campus FQDN; +- label without a dot: `label.`; +- host containing a dot: the host is already an FQDN and is used unchanged. + +Resolution is exact. An unknown request Host does not fall back to an +arbitrary default Domain. The Domain with an empty host is selected only when +the request Host equals its Campus FQDN. + +## Campus authority modes + +Campus configuration has an explicit authority mode: + +| mode | Responsibility | +| --- | --- | +| `standalone` | All Campus and local Domain configuration is maintained on this instance. | +| `controller` | This instance is authoritative for a Campus topology and publishes desired configuration for managed instances. | +| `managed` | This instance accepts topology configuration from one external Campus controller. Local topology edits are disabled. | + +Implemented additive Campus fields: + +```sql +authority_mode TEXT NOT NULL DEFAULT 'standalone', +fqdn TEXT NOT NULL +``` + +The FQDN identifies the Campus in every authority mode. A controller Campus +may contain both local and remote Domain records. A managed instance stores +the controller Campus UUID, FQDN, and Domain UUIDs unchanged. + +A Domain owned by a controller Campus also records `instance_fqdn`. This is +the concrete PagesWiki instance selected to serve that Domain. Controller +Domains require this value; standalone Domains default it to the Campus FQDN. +Managed instances treat Domain topology as read-only because those records +are reconciled from the controller. + +Controller instances issue random enrollment tokens. Only a SHA-256 token +hash is stored by the controller, and the plaintext token is displayed once. +A joining instance presents the token, its FQDN, and the SHA-256 fingerprint +of its persistent Ed25519 public key. +The enrollment request includes that public key and a signature over the +normalized instance FQDN and enrollment token, so the controller verifies +proof-of-possession before recording the fingerprint. + +Registration creates a pending instance. An administrator verifies its +fingerprint and approves it before it becomes available in the Domain +placement selector. The placement stores both the instance FQDN and +fingerprint. Re-registering the same FQDN with a different fingerprint +creates another pending identity and never inherits the old approval. +Pending instances receive Campus metadata but no Domain assignments. Revoking +an instance disables Domains assigned to that exact FQDN and fingerprint. +Enrollment tokens are individually revocable. + +An external Campus is initialized with: + +```text +pageswiki --add-external-campus CAMPUS_FQDN TOKEN +``` + +Development environments may explicitly select unencrypted transport with +`--add-external-campus-http CAMPUS_FQDN TOKEN`. HTTP is never selected +implicitly; the standard command always uses HTTPS. + +Either enrollment form may be combined with `--no-default-campus` for a +dedicated managed instance. Its bootstrap standalone Campus and Domain remain +available while enrollment or approval is pending, and are removed +transactionally after the controller assigns the first enabled Domain. + +`PAGESWIKI_INSTANCE_FQDN` supplies the joining instance FQDN. Enrollment +fetches and applies the controller Campus name, title, default language, +FQDN, and Domain snapshot. These fields are read-only locally. The token is +stored under the data directory with mode `0600`; the instance Ed25519 private +key is also stored with mode `0600`. + +The Managed Campus Save action performs a Controller health probe without +making inherited fields editable. The management view displays a yellow-green +lamp after a successful probe and a red lamp after failure. The transport +(`https` or explicitly selected `http`) is retained from enrollment. Delete +detaches the Managed Campus, its Domain projections, Domain settings, and +Path bindings; Page Objects and immutable Revisions remain intact. + +## Domain-scoped settings + +Campus and Domain topology are instance-level administration. All other +settings use `(domain_uuid, key)` identity. This includes locale, timezone, +theme, home path, editor behavior, navigation, and +maintenance preferences. Legacy settings are assigned to the default Domain; +new Domains start with product defaults. + +The displayed Wiki name is not an independent setting: it is always the +resolved Domain title. Recent Objects are selected by Domain Path bindings. +The administration view may inspect another Domain through an explicit +Campus and Domain selector. + +## Configuration distribution + +Federation is desired-state synchronization, not shared SQLite access. + +The preferred flow is: + +1. A controller publishes a versioned, signed Campus manifest. +2. A managed instance authenticates with its enrollment token and pulls the + manifest. +3. The instance validates schema version, Campus UUID, allowed hostnames, and + monotonic manifest revision. +4. It applies the manifest transactionally. +5. It reports the applied revision and validation errors. + +Pulling avoids requiring inbound administrative access to every managed +instance. A push notification may trigger a pull, but does not contain +authoritative configuration itself. + +The manifest controls topology and presentation defaults only. It must not +carry SQLite files, revisions, Documents, local secrets, OIDC client secrets, +Macaroon root keys, or instance-private signing keys. + +## Security requirements + +- Transport security policy is evaluated separately from the stored FQDN. +- Controller manifests require signature verification and replay protection. +- A managed instance is pinned to one Campus UUID and controller identity. +- Hostname changes require explicit allow-list validation. +- Local emergency override and last-known-good rollback are retained. +- Controller unavailability does not remove the last applied configuration. +- Remote links are rendered as external navigation, never server-side fetched + merely because a page contains the link. + +## Migration order + +1. [x] Add placement and authority metadata. Remote Domains have no local + writable Path namespace, and managed Campus topology is read-only. +2. [x] Rebuild `paths` with `(domain_uuid, path)` identity and assign legacy + rows to the default Domain. +3. [x] Thread Domain UUID through Store APIs, server handlers, recursive + operations, browser/tree queries, and the data CLI. +4. [x] Add cross-Domain absolute-link helpers and tests. +5. [x] Add signed controller manifests and managed-instance reconciliation. + +Steps 2 and 3 shipped together. Adding `domain_uuid` while leaving unscoped +queries would have created cross-Domain data disclosure. diff --git a/docs/design/event-scheduler.md b/docs/design/event-scheduler.md new file mode 100644 index 0000000..69ca067 --- /dev/null +++ b/docs/design/event-scheduler.md @@ -0,0 +1,91 @@ +# Event Scheduler + +## Purpose + +CPU-, memory-, and decoder-heavy work must not execute in Viewer requests. +PagesWiki uses a persistent SQLite event queue for deferred work. + +`event_jobs` records: + +- event UUID and type +- idempotency key +- JSON payload +- `queued`, `running`, `succeeded`, or `failed` status +- scheduled time and attempt count +- latest error +- creation and update timestamps + +The current implementation is a single scheduler loop that may run up to the +configured concurrency in goroutines. It checks foreground request activity +between claims and keeps one reserved background slot so a long-lived editor or +stream cannot starve all jobs. Cross-instance leases are still future work. The +transactional Domain outbox now records Page/Revision creation and Path/Object +mutations. Domain-local consumer watermarks are durable and monotonic; +notification delivery remains future work. +External preview tools run through bounded +commands with timeouts. + +## Event log retention and trends + +`event_logs` remains the recent, drill-down log. Each record is associated with +its event type when the job is known. `event_log_policies` provides per-event +retention, aggregation window, bucket size, and maximum raw-row settings; `*` +is the safe default. `event_log_buckets` stores compact counts and first/last +timestamps by event type, level, and time bucket, so trend charts do not scan +the raw log table. The API exposes `/event/logs/trends` and `/event/policies`. + +Retention removes old rows in place and keeps bounded aggregate buckets. A +future partition/rotation implementation may replace the physical table, but +must use an atomic rename-and-recreate procedure; an online `DROP TABLE` is +never used while workers can append logs. + +## Preview Events + +`preview.generate` uses the immutable Document hash as its idempotency key. +Viewer never generates a thumbnail. A children projection: + +1. checks the immutable preview cache; +2. emits the cached thumbnail URL when present; +3. otherwise enqueues the event and immediately renders a format icon. + +The browser polls only the lightweight cache URL for visible entries. Once the +job succeeds, it replaces the icon with the cached image without reloading the +Page. + +Current generators: + +| Input | Generator | Cached form | +| --- | --- | --- | +| PNG/JPEG/GIF | bounded Go image resampler | JPEG | +| PDF | `pdftoppm`, first page | JPEG | +| Video | `ffmpeg`, one frame | JPEG | +| Excalidraw | bounded server SVG renderer | sandboxed SVG | + +Individual PDF pages use the same queue. A cache miss returns `202` with +`Retry-After`; the browser retries until the scheduler writes the immutable +`-p.jpg` file. PDF page counts and non-ZIP archive listings +are persisted output of `projection.metadata.generate`, not Viewer work. See +[deferred projection metadata](projection-metadata-cache.md) for cache quotas, +pending/retry responses, authorization, and decoder limits. + +Generated files live beside the Document Store in `previews/` and are addressed +by immutable Document hash. Cache responses are immutable for one year. + +## Scheduling + +- Missing previews are enqueued when an icon projection encounters them. +- A periodic sweep runs every 15 minutes. +- The first sweep runs shortly after startup. +- Configuration → Execution monitor combines resource charts with running jobs + only. Job history & logs contains paginated completed jobs and per-job logs. + Event definitions exposes the manual “Generate missing previews” trigger. + +See [Configuration panels](configuration-panels.md) for polling, indexed queue +listing, lazy log retrieval and legacy resource-panel URL compatibility. + +Failures remain visible in scheduler statistics and logs. Retry/backoff and +cancellation are persisted in the queue; a later sweep or manual trigger may +enqueue a missing cache again. Preview requests never execute the generator in +the normal Viewer request path. Non-ZIP entry extraction remains a bounded +foreground stream pending its separate cached-entry design; metadata listing +and PDF page counts have migrated to deferred projections. diff --git a/docs/design/federation-manifest-integrity.md b/docs/design/federation-manifest-integrity.md new file mode 100644 index 0000000..edd517d --- /dev/null +++ b/docs/design/federation-manifest-integrity.md @@ -0,0 +1,78 @@ +# Signed Campus manifest integrity + +Implemented bounded single-writer-SQLite correction, 2026-09-14. This is not +controller HA, key rotation, multi-node metadata fencing or a new federation +trust protocol. + +## Controller sequence allocation + +`BuildSignedCampusManifest` canonicalizes the supplied Domain list by UUID, +rejects duplicate/missing identities and hashes the Campus plus filtered Domains. +A single SQLite `INSERT ... ON CONFLICT DO UPDATE ... RETURNING revision` +allocates the sequence against the current persisted hash: + +- First content gets revision 1. +- Identical content retains its revision and timestamp. +- Changed content atomically increments the previous revision. +- Database errors and integer overflow fail, never resetting to revision 1. + +The returned revision is signed with the existing Ed25519 identity. Concurrent +calls cannot sign different content with the same revision. Ordering-only changes +to the supplied Domain list do not churn revisions. This orders supplied +snapshots; it does **not** make the caller's earlier Campus/Domain reads a +transactional configuration snapshot. A controller-wide configuration generation +is still needed before claiming DR/HA or preventing an old caller snapshot from +being issued later with a newer revision. + +## Managed-instance application + +Verify signature, schema, Campus identity and Domain identity/hostname shape +before acquiring a database write reservation. Then, in one transaction: + +1. Reserve SQLite's writer with a no-op update to the manifest-state table. + This works even for a first enrollment with no row; competing first pins + serialize instead of both reading an absent checkpoint. +2. Read the pinned fingerprint, applied revision and exact payload. Only + `sql.ErrNoRows` means an unpinned Campus. Other database errors fail closed. +3. Reject changed signing identity, lower revisions and a reused revision with + different payload. An exact duplicate succeeds without reapplying the snapshot. +4. Check authority ownership and apply the Campus/Domain snapshot using the + transaction-owned helper. Update placement/default locale as before and keep + `projectCampusAdminMembershipsTx` in this same transaction. +5. Persist the verified public key/fingerprint, revision and payload checkpoint; + commit all snapshot, inherited-permission and checkpoint changes together. + +A checkpoint/projection/domain-write failure rolls everything back, including a +new trust pin. Retrying the same manifest after a rolled-back failure is safe. +No failed/replayed manifest silently retries with relaxed verification. + +## Authority and legacy compatibility + +A valid signature establishes a signing identity, not authority over every +local UUID. A managed snapshot cannot replace a standalone/controller Campus +or reparent a Domain UUID owned by another Campus. A new managed Campus and +updates to its own Domains remain supported, including initial pending enrollment +followed by an approved manifest that deploys Domains to the matching instance. + +The legacy unsigned snapshot entry point still permits enrollment/resynchronizing +an **unpinned** managed Campus. It acquires the same writer reservation before +checking the pin. Once a signed checkpoint exists, unsigned fallback is rejected; +omitting a manifest can no longer bypass signing-identity/replay checks. Explicit +trust reset or key rotation needs a separate administrator-controlled workflow. +Initial enrollment remains trust-on-first-use through the configured controller +and enrollment transport; signing does not make an HTTP bootstrap resistant to +an active network attacker. + +## Verification and remaining work + +Tests cover 20 concurrent same/changed-content sequence allocations, canonical +ordering and overflow, 24 concurrent duplicate/out-of-order deliveries, competing +first keys/payloads, injected initial/updated-checkpoint and inherited-projection +failures, missing state tables, a one-connection pool, cross-authority collisions, +legacy-to-signed upgrade, approved placement/locale inheritance and unsigned +downgrade rejection. Existing managed enrollment/reconciliation tests remain in +the suite. + +There are no new tables, shared keys or schema migrations. Key rotation, explicit +global authority transfer, independently versioned instance projections, bounded +configuration capture and DR/HA are follow-ups rather than implied guarantees. diff --git a/docs/design/hardening-execution-2026-09.md b/docs/design/hardening-execution-2026-09.md new file mode 100644 index 0000000..340f1a8 --- /dev/null +++ b/docs/design/hardening-execution-2026-09.md @@ -0,0 +1,536 @@ +# September 2026 execution ledger + +User direction: continue the remaining roadmap in priority order; defer extremely +complex/high-risk changes with explicit prerequisites. Preserve existing identity +and deployments. This ledger separates completed slices from unresolved gates. + +## Active batch + +### Japanese design consolidation and Wiki publication (2026-09-19) + +- Added a 22-chapter Japanese handbook plus index, separating current behavior, + proposals, unresolved choices and historical claims. Original source documents + remain unchanged in identity/location; a source inventory maps them to chapters. +- Expanded Organizer/tasks/tickets, calendar/contacts/DAV, RSS/FreshRSS/newsboat, + IMAP capture and incremental HTML editing proposals with identities, authority, + conflict/retention behavior, delivery slices and acceptance fixtures. No new + external integration or connector is enabled by this design work. +- Reviewed primary RFC and FreshRSS/newsboat documentation; runtime/client + compatibility remains a prerequisite, not a claimed implementation. +- `tools/design-export` renders with the application Markdown renderer, validates + internal chapter links and emits source/payload hashes. Tests cover tables, + chapter count, bad links and staging overwrite refusal. +- Uploaded 23 new `ja` Page revisions through the trusted local data CLI to + `https://pages.anya.jp/lab/pageswiki-dev/`; destination was empty beforehand. + Read-back comparison and manifest/DB hash checks passed for all 23 payloads. + Receipt: `publication-ja-2026-09-19.json`. Existing English sources are retained. +- Anonymous HTTPS access still redirects to login. No publication/authorization + settings, external credentials, application runtime or deployment were changed. + `go test ./...` and diff checks passed. + +### Scoped automatic publication and compact blog index (2026-09-19) + +- Added explicitly confirmed Street/Spot automatic publication, live revision and + publisher-authority checks, inherited manual-approval boundaries, ACL/alias + exclusions, and versioned impact previews. Existing settings stay unchanged; + no production locality is opted in by this deployment. See + [automatic publication](automatic-publication.md) for limits and remaining work. +- Blog/diary and projected public indexes use compact date/title tables. The month + selector sits above the sidebar calendar; authenticated row actions remain + accessible through labelled icons. Existing post editing and public article + navigation are preserved. +- Full Go tests, vet and diff checks passed. Opt-in Chromium coverage passed for + automatic publication, City governance, periodicals and public projection. +- Follow-up: month input, apply and reset form a single compact row; SVG buttons + have localized tooltips/accessibility labels. Desktop/mobile browser tests + enforce single-line controls and placement above the calendar. +- Pre-migration online backups of both databases passed quick checks under + `/home/anya/.cache/pageswiki-backups/pre-auto-publication-kv0VzP/`. +- Deployed app2 then app with image + `sha256:8ca7973bb12126ba2291dc9e6e1c9a4c5faad77ff92b56cf4f79ee69e9620523`. + Both instances responded successfully with zero restarts; app is healthy. + Public HTTPS serves the compact index and three RSS embedded article bodies; + both databases still contain zero automatic-publication rules. Production mobile + rendering confirms the one-line month controls. Anonymous source editing still + redirects to login. +- Future tasks/tickets, organizer/DAV, mail ingestion and HTML editing ideas are + recorded in [design backlog](organizer-and-editing-ideas.md), not implemented in + this batch. Full WYSIWYG remains an explicit undecided design choice. + +### Full-content RSS, standalone composition and X sharing (2026-09-19) + +- RSS `content:encoded` uses the inert HTML pipeline, namespace-aware XML/CDATA, + absolute public article/image/anchor URLs and exact live Revision rechecks. + Limits: 20 articles, 1MiB input/article, 8MiB total HTML, 5s generation; HEAD skips + body work. RSS-reader copies cannot be remotely recalled after unpublishing. +- Added authenticated GET-only `/v/blog/-/new` and `/v/diary/-/new`, themed responsive + forms backed by the existing atomic posts API. Projection targets redirect to the + configured source composer. No GET creates content; disabled plugins return 404. +- Post completion offers X Web Intent with title and registered projection-domain + URL; multiple eligible Domains are selectable. Invalid/disabled/cross-Campus + projections are excluded, and pending publication is explicitly warned/confirmed. + No external posting occurs without user action; no OAuth secrets or new grants. +- Added namespace/CDATA, absolute link, unsafe HTML, composition route and share- + domain/prefix regressions; Chromium covers standalone posting and sharing controls + at desktop/mobile widths without navigating to X or creating production content. +- Full Go tests, vet, JS syntax, diff check and opt-in Chromium suites passed. + Deployed app2 then app with image + `sha256:f51dadce7481b480bdd924ad65d050e6d9570a37081c91a7cd5562394d9be4bc`. + HTTPS RSS returned 200 with three embedded public HTML bodies and the content + namespace; article returned 200 with target-domain OGP URL; both new-entry routes + redirected anonymous requests to login (303). app healthy, both containers running + with zero restarts. No production article creation or X posting was performed. + +### Dedicated public blog articles and RSS (2026-09-19) + +- Dedicated diary/blog Domains now project approved source article bodies at + `/YYYY/MM/DD[/keyword]`. Header/browser title use target Domain branding; article + pages keep month calendar, other entries that month and older/newer navigation. + Known public article links in sanitized bodies are remapped to the target host. +- Registered titles explicitly inherit the Page's live publication status. This + changes the earlier h1-only index contract at the user's request. Private category, + author and registration date are still omitted; dates derive from approved Paths. + No registration table writes, grant changes or migration are needed. +- `/rss.xml` emits RSS 2.0 with up to 20 public titles, target-domain links/GUIDs and + Revision timestamps. HTML advertises the feed. No private metadata or body copies + in RSS; no shared HTTP caching. Subscriber-retained copies cannot be revoked. +- Full Go tests, vet, diff check and Chromium tests at 1440/390 px passed. Tests cover + keyword routes, domain title, escaped registration titles, sanitized body, previous/ + next links, feed XML, private entries, edited-revision revocation and both auth modes. +- Remaining: Atom, excerpts/covers, publication approval of other metadata, cross- + instance projection and SSO. Non-public embedded assets do not gain public access. +- Deployed app2 then app with + `sha256:2a9743aadf687dedb7465b6e9c22f313818aa59fe341a94c5c6ec82c139386cf`. + Anonymous HTTPS index, `/2026/09/17` and `/rss.xml` all returned 200 (one published + entry); parent editor still returned login 303. Confirmed registered Japanese title, + sanitized body, blog Domain header and calendar in + `/tmp/pageswiki-blog-article-review-0919.png`. app healthy; publication count remains + one and enforcing config unchanged. No production content/config writes were made + by this task; current Object count is 1456 (live instance continues background work). + +### Public diary/blog projection index (2026-09-17) + +- Root cause: configured projection views always required a session, even with + approved publications in the source prefix. Added anonymous root/month/day views + in enforcing and legacy target modes, using only the source's live publication + manifest. Source authorization mode must remain enforcing. +- Dates derive from approved Paths; headings from approved HTML, bounded to 64KiB + for at most 20 displayed and 8 recent entries. No private article metadata, + categories, authors, editor dialogs or unrelated navigation is exposed. +- No grants, auth modes, schema or content changed. Body links remain on the source + host. Source disablement, invalid credentials and publication revocation fail + closed. Registration metadata approval and same-host body projection remain TODO. +- Validation: full `go test ./...`, `go vet ./...`, JS syntax, diff check and existing + Chromium periodical flow passed. New tests cover both target modes, private + registration metadata, unapproved Paths, invalid credentials and edited revisions. +- app2 then app deployed with image + `sha256:36f5fba8a86db9ed6ea94872400bc86745c6499e3c09b49c11896303a953d86f`. + Anonymous HTTPS root/day views on blog.pages.anya.jp returned 200 with exactly one + approved article; source article returned 200, parent editor and invalid credentials + returned login 303. Browser screenshot checked at + `/tmp/pageswiki-public-blog-review.png`. app healthy, both running without restarts. + Object/publication counts remained 1455/1; authorization configuration unchanged. + +### Domain entry dialog CSS correction (2026-09-17) + +- Root cause: the modal was nested in a dense administration table cell. Broad + descendant selectors made forms inline-flex, help paragraphs inline, and controls + inherit compact table sizing. Previously the browser test checked `open` but not + actual geometry (a hidden panel ancestor could still conceal the dialog). +- Moved modals outside tables and panels into the body. Added isolated responsive + fields, block help text, themed controls, toggle labels, sticky header/close button, + background scroll lock, accessible dialog title and CSS cache-version update. +- New Chromium regression checks at 1440/390 px with Light/Nanoha Dark: visible + viewport bounds, no horizontal overflow or overlapping controls, form/help display, + sticky close button and close/reopen. Screenshots inspected under + `/tmp/pageswiki-domain-entry-review/`. Existing periodical browser flow, full Go + tests, vet and diff check passed. +- UI-only release; no schema/content/permission changes or database restore. + app2 then app updated to + `sha256:d2cb4a02e780790294245e60a394e6046be1f3160bc9e4186c0daf7f9a8a4369`. + Both health endpoints responded, zero restarts; served config.css matches source. + +### Local diary/blog projection deployment (2026-09-17) + +- First slice: same-Campus, local-placement metadata projection, source-prefix + filtering and source+destination read policies; no copied content. Article/body/edit + links open the source Domain. No anonymous, cross-instance or host-preserving body + projection yet. Local projection settings are not in federation manifests. +- Backup directory `/home/anya/.cache/pageswiki-backups/pre-periodical-projection-aw54pH/`: + app.sqlite and app2.sqlite, private permissions, both quick_check OK. +- app2 then app deployed with image + `sha256:e44fbb1a55f7eef4a4c4fec08a87efa8bc7e592f222c99090930c95590d435cf`. + Main DB initialization briefly left the listener unavailable during restart; + final app health=healthy, app2 health endpoint OK, zero restarts, public HTTPS=200. + Running template contains the domain-projection settings forms. +- Full tests, vet, diff check, focused race and desktop/mobile Chromium passed. + Fixture tests cover no-copy behavior, source ACL denial/revocation, prefix filter, + source links, target write rejection, self/cycle/cross-Campus rejection and remote + source fail-closed behavior. +- Production Objects=1454, publication entries=4, matching pre-update counts. + No production projection bindings were created automatically; user chooses source. + +### Diary/blog and Domain entry deployment (2026-09-17) + +- User explicitly authorized backup and deployment. Online SQLite backups: + `/home/anya/.cache/pageswiki-backups/pre-domain-entry-6a73yw/app.sqlite` + and `app2.sqlite`, directory private / files 0600; both `PRAGMA quick_check=ok`. +- Deployed accumulated date-path navigation, atomic article composer, Domain + entry-settings gear/dialog and signed manifest v2 to app2 first, then app. +- Continued implementation: signed manifest capability proof in enrollment; + unknown/legacy approved peers block entry-setting updates with 409 and UI guidance. + The check covers all approved Campus peers because they share a Campus manifest. +- Final running image on both instances: + `sha256:0dbcb4aacbc924855f0b686a859bd10c7932eea9d1736fc9f4be9a6337b694ae`. + app healthy, app2 running, zero restarts; Host-routed health checks both OK. + `https://pages.anya.jp/` returned 200. Served periodicals.js hash matches source. + Running template includes `data-domain-entry-open`; authenticated gear/modal and + posting interactions were exercised in isolated Chromium fixtures, not by creating + production administrator sessions. +- Actual approved ext-node enrollment reports manifest_version=2. Old pending + fingerprint remains pending; no approval or identity changes were made. +- Main DB before/after: 1454 Objects and 4 publication entries. No entry settings, + article content, user roles or publication grants were changed during deployment. +- Tests: full `go test ./...`, vet, diff check, browser fixtures at desktop/mobile, + capability proof validation, legacy downgrade detection, incompatible-peer + rejection, signed manifest integrity/rollback and focused race tests passed. +- Remaining: anonymous metadata/calendar publication approval, Domain-create form + integration, entry-control release/GC, apply ACK/freshness and journal/outbox delivery. + +- [x] Diary/blog initial built-ins — 2026-09-16. + `content.diary` and `content.blog` provide Domain-scoped, default-disabled + settings, Page UUID metadata, calendar/recent entries, category/month/mine + filters, and register/edit/unregister dialogs. Canonical content and revisions + stay in ordinary Pages. Metadata writes reserve SQLite's writer before live + membership, Path binding, grant/Locality and version checks; own-user Wiki + authority matches the semantic editor. Metadata journal commits atomically; + unregister/re-register generations prevent ABA replay. Private metadata is + not exposed anonymously; Page publication behavior is unchanged. Atomic + new-post composition, public metadata approval/feeds, comments and tDiary + import remain [explicit follow-ups](diary-blog-plugins.md). + Full Go suite PASS (Server 12.417 s), focused race PASS (Server 5.745 s, + Store 1.790 s), vet/JS syntax/diff checks PASS; combined config, public + navigation, governance and diary/blog Chromium PASS (9.332 s). PC/mobile + screenshots inspected under `/tmp/pageswiki-periodicals-review/`. + DB-only backups at + `/home/anya/.cache/pageswiki-backups/pre-periodicals-drFK6Ljf/` are mode 0600; + both quick_check results are `ok`. Backups use low-priority I/O. + Rebuilt image: + `sha256:9948aca99fa03eb43dda06a03ae59a680cad3d5b5284fd6c2217e09d69f75c22`. + Deployed to both nodes: local Host-routed health checks return `ok`, zero + restarts, served JS matches source. Both have all three additive tables and + zero enabled instances. Main anonymous root remains 200; diary/blog require + login (303) and unauthenticated metadata APIs return 401. Managed legacy-mode + diary also requires login. Existing main objects (1,448), publication + manifest (one) and approved entries (four) remain unchanged; no plugin was + enabled and no article was registered in production during verification. +- [x] Public children view controls now match the authenticated icon order and + sizing (`▦`, `☷`, `≡`), with localized tooltips/accessible labels and retained + active state. Desktop/mobile Chromium PASS (1.948 s), focused navigation tests + PASS (0.454 s), JS syntax and diff checks PASS. Rebuilt image: + `sha256:35b1fd0e0c291e42769b81dd50a53d237b94071431387c41b289d692a578e2b7`. +- [x] Anonymous navigation usability — 2026-09-16 23:19 JST. + Added public root/virtual-parent directory landings and read-only + `/v/browser/{path}`; separate Page/child-folder links, compact responsive + header and direct City exits. Public tree now supports all/per-folder + expand/collapse, name/Path filtering and arrow/Home/End navigation. Component + sorting keeps `/a/x` before `/a-b` for correct branch operations. Children + requests are capped at three concurrent fetches, cancellable and timed out, + with generation-safe retries and view-only session preference. Initial + directory/pagination links and macro fallback links work without JavaScript. + Full Go suite PASS (Server 12.387 s), vet/JS syntax/diff checks PASS; + focused race suite PASS (Server 7.287 s); broad Chromium suite PASS (19.837 s), + including anonymous navigation at 1440 px and 390 px. Screenshots inspected: + `/tmp/pageswiki-public-navigation-review/public-navigation-{1440,390}.png`. + Tests cover failure/retry, view switching, hierarchy prefix collisions, + pagination/exclusions, private-parent body suppression, bad credentials, + mutation denial and warm-cache revocation. See [contract](public-navigation.md). + Both nodes rebuilt/deployed with + `sha256:cf75c402c04cb185e1c7965480c35b352e2182c857af9367e7b3dfa672a68597`. + Both local Host-routed health endpoints return `ok`, zero restarts; managed + home returns 200. Main anonymous root/browser/tree/children/City return 200 + (approximately 1–21 ms in local checks); protected autoplan remains 401. + Public directory headers retain private/no-store and inert CSP. Served JS/CSS + hashes match source on both nodes. No new schema migration; existing main + publication remains one manifest/four entries and its governance, topology, + binding, hash and head checks pass. No approvals or production content were + changed; no public TLS ingress change or verification is claimed. +- [x] Permission-aware public navigation — 2026-09-16 22:44 JST. + Ordinary approved Pages now offer asynchronous children, structural breadcrumbs, + read-only tree and filtered City Map; remove the public download control. + Navigation-free presentation remains a future share-URL concern. Cached data + uses SQLite mutation generations; authenticated membership/ACL decisions are + evaluated per request. City reload/retry discards previous authorized labels + before revalidation. See [navigation contract](public-navigation.md). + Full Go suite PASS (Server 9.335 s), vet, JS syntax and diff checks PASS; + broad Chromium suite PASS (16.670 s); focused navigation/ACL/publication race + tests PASS (Server 7.529 s, Store 14.706 s). Coverage includes warm-cache + publication withdrawal and group removal without data-cache invalidation. + DB-only SQLite backups in + `/home/anya/.cache/pageswiki-backups/pre-public-navigation-FMqnj5pu/` are 0600; + both quick_check results are `ok`. + Both nodes rebuilt/deployed with + `sha256:aade0a87dbdd0966c92908836dda57f5d5a3440028cb2181194104c8ede9f9ae`. + Host-routed local health checks return `ok`, both running with zero restarts; + managed home returns 200. Main anonymous tree/children/City HTML/map API return + 200 (approximately 1–18 ms in the local smoke check), while autoplan remains + 401. Tree response is private/no-store with inert CSP; main served JS hashes + match source. Additive navigation schema has 45 invalidation triggers on each + node. Existing main publication records remain one manifest/four entries; + managed records remain zero. No publication was activated or revoked by this + deployment. Public TLS ingress was not changed or certified by local checks. +- [x] Document hierarchical approval requirements and approver Inbox delivery. + [Approval design](publication-approval-inbox.md) defines inherited required + floors, immutable review subjects, live reviewer authorization, transactional + outbox/retry and recipient-private notifications. AP-1 through AP-6 remain + unchecked implementation work; this design does not enable a new workflow. +- [x] Named user/group locality read or read/write permissions, stable subject + identity resolution, superior-cap/authority-rank restriction preservation, + next-request membership checks, Object alias caps and SQLite namespace fences. + Explicit bounded anonymous current-revision approval/withdrawal now serves a + separate inert semantic Viewer and streaming raw-media path with safe OGP. + Per-scope publication generations prevent replaying pre-revocation consent. + See [scope, operational limitations and follow-ups](locality-access-publication.md). + Whole Go suite passes (Server 10.176 s, Store 4.560 s), focused race suite + passes (Server 6.206 s, Store 1.013 s), and approval/governance Chromium + checks pass (1.994 s); the broader browser suite passed (27.547 s). + Source-Domain restrictions also clamp exceptional foreign Object grants; + a regression verifies that these exceptions cannot bypass the new ACLs. + Vet, JS syntax and diff checks pass. SQLite backups (DB only) are under + `/home/anya/.cache/pageswiki-backups/pre-locality-access-lpnkGqwV/`, mode 0600; + both pass quick_check. Both existing nodes deployed as + `sha256:4a797ee34ef0c0fe0d48cea891a943393f0f722f07c192879f61b5dc3456ba9d`. + Host-routed local health checks return `ok`, both running with zero restarts. + Served governance JS hashes match the workspace on both listeners. All five + new access/publication tables exist and remain empty on both DBs: no production + restriction or public approval was created. Main anonymous home remains 303, + managed legacy home 200; anonymous access/publication administration requests + are denied (main 401, managed 403). Managed public TLS/vhost remains the + previously recorded infrastructure caveat; these are local listener checks. + +- [x] Quartier/Spot co-owner appointments, Domain/local publication-cap drafts, + epoch/topology concurrency checks and in-transaction membership/authority + revalidation; local before/after audit and Japanese/English modal settings. + Includes bounded appointment-authorized member lookup. Full impact reports, + structural mutation fences and anonymous publication remain pending; existing + production visibility is unchanged. See [governance contract](locality-publication-ownership.md). + Verification: full Go suite (Server 8.584 s, Store 4.015 s), focused race + tests (Server 2.698 s, Store 1.015 s), combined City/governance/search/HTML + Chromium regressions (16.275 s), vet, JS syntax and diff checks pass. + Pre-migration SQLite backups (DB only, not a complete DR package) are under + `/home/anya/.cache/pageswiki-backups/pre-governance-aNwngqHe/`, mode 0600. + Both backups pass `PRAGMA quick_check`. Both existing app nodes deployed as + `sha256:dc6960ba1b01800b08351f660d20848dcca0e0f7f382fe18e362d93f7171d147`. + Local Host-routed health checks return `ok`, zero restarts; all four additive + governance tables exist on both DBs, with no owners/policies automatically + inserted. Served governance JS hashes match the workspace on both nodes. + Anonymous governance requests are denied (main 401, managed 403); main home + still redirects to login (303). No production owner appointment or public + policy change was made as a smoke test. Existing managed public TLS caveat + remains; these are local listener/Host checks, not a TLS infrastructure fix. +- [x] P0 inert HTML display boundary across semantic/home/profile/object/history/ + preview/print and HTML/Markdown Editor previews; canonical content unchanged. + Application nonce CSP, forged macro-hook stripping, escaped failure fallback, + bounded/cancellable City macro reads, and ACL-checked sandboxed diagram cache. + See [precise policy and compatibility](html-projection-trust.md). Owner/public + APIs and new anonymous access remain disabled/pending. Final full Go suite + passes (Server 7.866 s), focused race tests pass (Server 4.247 s, Store + 1.057 s), and final HTML/PDF/archive/editor/bookmark Chromium tests pass + (14.006 s). Broader City/search/login Chromium checks also passed (27.590 s). + `go vet`, editor JS syntax and diff checks pass. Read-only compatibility + sampling was limited to 500 HTML revisions; it was not a complete Path audit. + Deployed both existing nodes as + `sha256:41cd97c7705b8be6b1bf763aee7678c5d510878d5ec6d78aa3b3792a7eb32517`. + Both local Host-routed `/health` endpoints return `ok`, zero restarts; managed + home returns 200 with nonce CSP, nosniff, private/no-store and + `X-PagesWiki-HTML-Policy: inert-v1`. Main anonymous home still redirects to + login (303). Both served Editor scripts match workspace SHA-256. No schema + migration, production document rewrite, visibility change or TLS change. + Managed public TLS/vhost caveat from the earlier social-card check remains + outside this deployment; these checks do not claim public HTTPS there works. +- [x] OGP/X cards for existing public semantic Page/home/City HTML, bounded + canonical text extraction, configured-host canonical/image URLs, original + image-document cards and an application-owned cached PNG fallback. No crawler + auth bypass, external image fetch, schema migration or visibility change. + Private/enforcing HTML suppresses metadata and adds noindex. See + [social card policy](social-link-cards.md). Full Go suite (Server 6.818 s), + social race tests (2.434 s), City/search Chromium checks (3.846 s), vet and + diff checks pass. No claim of actual X post/card display; no post was sent. + Deployed both nodes as + `sha256:a16fa6cbe8a3a6b5141d7d29de0e6faef67989285a9983b2ffa306d4e016b75c`; + both health endpoints return `ok`, zero restarts. Managed-host anonymous home + includes HTTPS OGP/card URLs, image HEAD returns 200/image/png (7,327 bytes), + main `pages.anya.jp` still redirects anonymous crawlers (303). The common + image is also reachable through public HTTPS; its 1200×630 output was visually + inspected. No private production Page was made public for this test. + External caveat: `https://wiki.extpages.anya.jp/` and its image fail TLS with + `unrecognized name`; managed-host checks above used its local app listener + with the configured Host. Public HTTPS image success was on `pages.anya.jp`. + Fix the managed FQDN's TLS/vhost before expecting external cards there. +- [x] City named-reference follow-up: qualified Street URLs, shared links, + explicit UUID locality search, ancestor-aware lightweight details and literal + Page links in both the map and inspector. No schema/data migration required. + Whole-map loading is also deferred out of simple City breadcrumb macros. + Verification: full Go suite, City/search browser regressions (including + repeated Street names and three initial-focus levels), `go vet` and JS syntax + checks pass. City/search race tests also pass (Store 35.000 s, Server + 7.391 s); the combined Chromium suite passes in 13.166 s. The HTML trust gate + and broader CITY-A–D work remain open. + Deployment: both existing app nodes rebuilt/recreated as + `sha256:8e53fec5c485ed5763bf44705cfdf4071d04f2b8932dca038148eedda26f4c42`. + Both health endpoints return `ok`, zero restarts; main unauthenticated City + request redirects (303), managed-host search returns 200 under its existing + policy. Served City map/estate scripts match workspace SHA-256 hashes. +- [x] OIDC issuer JWKS signatures, claim validation, bounded discovery/key cache; + one-use browser state and collision-safe external account linking. +- [x] Bounded SMTP delivery, safe headers/mailboxes, live account checks. +- [x] Campus-admin inheritance revocation, provenance and local-right preservation. +- [x] Recursive Path mutations: transactional authorized snapshots and literal prefixes. +- [x] Browser mutation CSRF protection and explicit credential precedence/logout; + browser/API purpose prefixes and atomic active-session checks. +- [x] Object authority scope and atomic creation provenance; safe all-alias purge. +- [x] Signed manifest allocation/application/checkpoint atomicity and authority guards. +- [x] City map/detail/Page list read filtering and private response caching policy. +- [x] Batch/request-scoped read authorization to reduce listing query amplification. +- [x] PDF/archive metadata scheduler projections with persistent bounded cache. +- [x] City generator Worker and directional keyboard navigation. +- [x] Search results: compact overview, full Page Path, matching-text excerpts and + safe keyword highlighting; retain list/detail/thumbnail integration and read ACLs. +- [x] Object/Revision metadata pagination and localized history navigation. +- [x] Literal URL encoding in children list/detail/icon projections. +- [x] City one-connection-safe read snapshot and literal boundary lookup/health. +- [x] Atomic bounded zombie GC and Domain-provenance-scoped HTTP administration. +- [x] Integrated Go/browser tests, rebuild, and both instance health checks. + +Update this list only after the corresponding implementation and verification. +The broad phase checkboxes stay open when only a bounded slice has landed. + +Focused implementations, constraints and regressions are linked from +[Implementation status](implementation-status.md#confirmed-corrections-2026-09-14). +## Verification and deployment + +Completed 2026-09-14 01:43 JST. All source changes were frozen before rebuilding; +later edits only recorded the final outcomes in design documents. + +- Final `GOMAXPROCS=2 GOCACHE=/tmp/pageswiki-go-cache go test ./... -count=1`: + PASS for all packages (server 5.947 s, store 3.105 s). +- Targeted server/store `-race` covering authentication, inheritance, + recursive/Object integrity, federation, GC, City and metadata projections: + PASS (server 21.774 s, store 38.202 s). Independent focused race runs also + covered search, pagination and the final deterministic GC regression fixture. +- Opt-in Chromium: 13 suites PASS (48.544 s), covering real HttpOnly-cookie + login/logout, City normal/popup/mobile and Worker/navigation, search in all + three modes, PDF/archive/comic metadata, settings, execution monitor, + bookmark/Vim settings UI and editor/home. This does not validate the paused + vim.wasm runtime. Artifacts: `/tmp/pageswiki-hardening-final`. +- `go vet ./...` and `git diff --check`: PASS. +- Before schema migration, online SQLite backups of both nodes completed with + `PRAGMA quick_check` = `ok`. Directory: + `/home/anya/.cache/pageswiki-backups/pre-hardening-20260914-1wH8jcKm/`. + `app.sqlite` and `app2.sqlite` are mode `0600`; their containing directory is + private. These are DB snapshots, not complete Document-store/key DR backups. +- `docker compose build app` and `docker compose up -d --no-deps app app2`: + PASS. Both containers run image + `sha256:dc0ac3305c6a6abb42d84e56c8291cabc9c582a421f4ce91ca4276b123735ad2`, + with no restart loop. Both local `/health` endpoints return `ok`. +- Main-instance search CSS and City Worker client hashes match the working + files; managed-instance search CSS matches too when using its configured Host. + `https://pages.anya.jp/` and the protected main search route return the + expected unauthenticated `303`; the managed Domain search route returns + `200` under its existing read configuration. A foreign-Origin unsafe request + is rejected with `403`. No production account credentials were used. + +Browser behavior tests used isolated fixture databases, not production content. +Live external OIDC/SMTP provider credentials and production multi-user flows +were not exercised; protocol, denial and concurrency coverage used test fixtures. + +### Search timeout follow-up — 2026-09-14 03:47 JST + +The user reported a search timeout after the initial deployment. Read-only +production-data investigation found a Path-first repeated FTS scan and +unbounded snippet input work, neither represented by the original small fixtures. +Corrected the join order, rowid excerpt lookup, per-document/total snippet input +budgets and optional 400 ms enrichment deadline. Results survive snippet-only +timeouts; genuine search failures now have localized, non-leaking retry UI. +See [evidence and remaining search limits](search-results.md#timeout-regression-and-correction-2026-09-14). + +- Full Go suite PASS (server 6.869 s, store 3.511 s); search `-race` PASS + (server 2.967 s, store 8.063 s); Chromium search PASS (0.740 s); + `go vet ./...` and `git diff --check` PASS. +- Added query-plan assertions, a 600-Page/1,200-Revision regression, Unicode + byte-budget/alias tests, deadline/error tests and large-body UI coverage. +- Read-only diagnostics against the existing main DB passed twice, with + representative search processing times around 72–506 ms. No production + account credentials or Page content were output or changed. +- Rebuilt/deployed both app nodes with image + `sha256:0f10da866a03167da7811ddc88f66d6a65bd27aae17557c824a9f7b5071b88a8`. + Both `/health` endpoints return `ok`, no restart loop, search CSS matches + source on both configured hosts. No schema/index migration was needed. + +### City-first search and filters — 2026-09-14 04:05 JST + +Added permission-filtered, metadata-only Quartier/Street/Spot results above +Pages. Added a compact options disclosure for MIME/suffix categories, a single +extension, and creation/update calendar-date ranges. Options persist in the +GET URL and retry link. File-specific filters exclude City metadata; date +filters apply to both. City/Page queries share the existing deadline and do +not load the full City graph. See [search contracts](search-results.md#city-first-results-and-search-options). + +- Full Go suite PASS (server 6.746 s, store 3.470 s); combined search/City + `-race` PASS (server 4.288 s, store 10.257 s). Added filtered-query plan + coverage also passed in the final Store search race run (18.373 s). +- Chromium desktop/mobile (1440/390 px) PASS, including real City results, + safe links, match highlights, preserved filters, all Page view modes and + separation from file multi-selection. Final run: 1.173 s. Screenshots: + `/tmp/pageswiki-search-city-final/search-results-desktop.png` and + `search-results-mobile.png`. `go vet ./...` and `git diff --check` PASS. +- Read-only main-DB verification: representative keyword search 79–515 ms, + filter-only cases 1–6 ms, City metadata 2 ms. These are Store timings, not + authenticated production HTTP measurements. No schema migration is needed. +- Both app nodes rebuilt/deployed with image + `sha256:1f6d64c354e940c0941db9914a836f47e7285ac962a9c68f9b6cebcddd2e0dc3`. + Both `/health` endpoints return `ok`, zero restarts, source CSS hashes match + each configured host. Protected public search returns the expected `303` + without credentials; managed-node filter-only search returns `200` under + its existing read configuration. + +## Deliberate high-risk deferrals + +- Executable authored-HTML compatibility is not supported. Normal HTML now uses + the inert projection boundary; any future executable mode requires separate + origin/capability approval and isolation tests. Public locality ACLs and owner + governance still require transaction/cache revocation gates. See + [policy and acceptance tests](html-projection-trust.md). +- HA/LB writable metadata, controller DR promotion and distributed job leases: + need a selected replication strategy, fencing, key custody and fault drills. +- Untrusted third-party code/plugin execution and native application launch: + need isolated runtime, signature/capability lifecycle and a separate helper + trust model; existing hosted editor integrations remain supported. +- Production S3/SSHFS/WebDAV/MWDB/Karton/SNMP/LDAP integrations: implement only + after endpoint/credential policy and test services are available. No fabricated + live integration claims or unrequested credential/infra provisioning. +- Broad notifications/inbox, comments, diary/tDiary import, rankings and external + search: retain the existing detailed contracts; gate on transactional activity + provenance, privacy/retention and authorization. Small prerequisites may land + first, without claiming those product features complete. +- vim.wasm runtime remains explicitly on hold from the earlier user instruction. + +These are not removed from the roadmap. Lower-risk outstanding items that do not +fit this batch remain unchecked, with the next sequence recorded at handoff. + +## Next implementation sequence + +1. Complete locality Page/alias/dependency impact reports and structural mutation + fencing on the implemented owner/draft-policy foundation. Require fresh + activation consent and endpoint/cache revocation coverage before anonymous + access; never silently activate saved drafts. +2. Complete mutation authority/version fencing and local/external account + ownership lifecycle, then remaining endpoint/adapter denial audits. +3. Add shallow, paginated City projections and transactional mutation outbox / + reconciliation provenance; retain manual curation when deriving from URLs. +4. Replace remaining full directory aggregates and historical/raw-HTML FTS work + with current-only bounded projections; add cancellation-aware streaming or + immutable-hash clone operations for large binary changes. +5. Resume activity/notification and trusted system-extension product slices + after those authority and event-provenance prerequisites. Keep HA/DR and + external-service provisioning behind their separately documented decisions. diff --git a/docs/design/home-bookmark-sections-vim.md b/docs/design/home-bookmark-sections-vim.md new file mode 100644 index 0000000..b43a316 --- /dev/null +++ b/docs/design/home-bookmark-sections-vim.md @@ -0,0 +1,146 @@ +# Home navigation and hosted Vim follow-up + +## Application assets and editor routes + +Templates load CSS and JavaScript from `/static/`. The legacy +`/o/path:/system/static/` namespace remains a read-only compatibility alias to +the confined static file server. It is not a UUID/Object address and must not +be sent through document authorization. Other `/o/` addresses remain protected. + +`/e/docs` and `/e/-/docs` both edit `/docs`; `/e/`, `/e/-`, and `/e/-/` +edit `/`. The authorization target and editor use the same path decoder. +Database resolution errors must not be mistaken for a missing page. + +## Bookmark sections + +The Domain-scoped `home_bookmarks` JSON array stays backward compatible: + +```json +[ + {"kind":"section","label":"Reference","href":"","children":false}, + {"kind":"url","label":"Example","href":"https://example.com/"}, + {"kind":"section","label":"Documents","href":"/docs","children":true} +] +``` + +A section starts a card and owns subsequent links until the next section. +Legacy links before any section form a default card. `children=true` replaces +that section's displayed links with the immediate children of its parent Path; +manually configured links remain stored for when the toggle is turned off. +Virtual folders are included, but `/u`, `/_`, and `/-` are excluded at the root. + +Management is available through a small settings icon on every home layout to +Domain/Campus admins. A native modal dialog provides focus containment, Escape +and close-button dismissal, while retaining unsaved edits if closed. The same +section-card editor is used at `/-/sys/config?panel=bookmarks`. Section moves +and deletion operate on the entire group; links can be moved to another +section using a selector. Page content is never deleted by bookmark deletion. +Saves use the existing server validation and request JSON acknowledgement; +errors remain in the form instead of navigating away. On success the home +reloads its cards. A navigation warning protects unsaved edits. Classic and directory layouts show cards; the +search-only layout retains its search focus while allowing management. +Limits: 64 rows total, including at most 16 section rows. Labels and URLs are +validated server-side; invalid submissions leave previous settings untouched. +Path URLs escape literal percent signs, fragments, spaces and Unicode. + +`GET /v/bookmarks?section=&after=` loads children +as JSON. It resolves the section within the active Domain, checks the parent +and each child against current read permissions, and returns at most 80 scanned +children per request with a continuation cursor. No revision bodies, metadata +stats, thumbnails or full-Domain listing are loaded. Queries use the Path +prefix index and request cancellation. Browser loading is lazy and limited to +two concurrent requests. Responses are `no-store`, avoiding stale permission +results. Empty filtered pages may still contain a continuation cursor. + +Follow-up: batch authorization and materialized immediate-child indexes for +extremely large subtrees; optimistic concurrency for multiple administrators +editing the same configuration (currently last successful save wins). + +## vim.wasm configuration and plugins + +The pinned runtime writes injected files using `wx+`: an existing bundled +`/.vim/vimrc` is skipped, despite the package README suggesting overwrite. +Use a new `/pageswiki.vimrc` MEMFS file and explicit `-u /pageswiki.vimrc`. +This is verified inside the real Wasm binary, not merely by HTTP success. + +The Gateway image bundles the existing licensed Hack Nerd Font locally. +`document.fonts.load('16px PagesWikiHack')` completes before startup so canvas +cell widths use the final font. `guifont=PagesWikiHack:h16` controls actual Vim +rendering; CSS alone does not. Font, Worker and Wasm retain same-origin isolation. + +`assets/vimwasm/app/vimrc` sets line numbers, cursor line, status line, search, +indentation and dark colors. `pageswiki.vim` is a bundled pure-Vimscript plugin +in `/.vim/plugin`, with an explicit runtimepath. Available operations: + +- `:Files` / Space+f: `:find` with Tab completion beneath `/work`. +- Space+b: buffer listing and selection. +- `[b` / `]b`: previous/next buffer; `:next` still traverses arguments. +- Space+w: write; Space+/: clear search highlight. + +The existing BufWritePost export and scoped Gateway write-back remain in use. +The base settings are image-managed. Domain administrators can customize them +at `/-/sys/config?panel=adapter-vim.wasm`, separately from connection settings. + +### Domain customization contract + +`POST /-/sys/config/vim` stores one `vim_wasm_settings` JSON config value per +Domain: `enabled`, `font_size` (10–32), `vimrc`, `colorscheme`, `color_name`. +The settings panel uploads UTF-8 files into editable text fields, supports +download, custom-colorscheme removal, and reset to defaults. Each script is +limited to 64 KiB; NUL bytes, invalid UTF-8 and path-bearing filenames are +rejected server-side. One custom colorscheme is managed initially; uploading +another replaces that slot. Nothing is written into the host filesystem. + +Only active builtin Domain/Campus administrators can save; readonly accounts +cannot mutate executable configuration even if they retain group membership. A supplied Origin must +match the request Host. Vimscript is executable trusted configuration and may +invoke browser integration features; it is not a safe format for untrusted +uploads. This is explicitly disclosed in the UI. No server shell, terminal, +package manager or arbitrary process execution is exposed. + +An authorized `vim.wasm` workspace response includes the session Domain's +`vim_settings`. The Gateway retains that snapshot in its server-side session +and supplies it with `GET /vim/api/session` (`no-store`). Other adapter types +do not receive these settings. Changes apply on a newly opened session. + +MEMFS initialization order: bundled defaults, configured font size, source +`/pageswiki-user.vimrc`, then a fixed-path custom colorscheme under +`/pageswiki-config/colors/pageswiki_custom.vim`. A conventional uploaded name +matching `[A-Za-z0-9_-]+.vim` is also registered as a local alias before the +user vimrc is sourced, so `colorscheme uploaded` works for `uploaded.vim`. +Other uploaded filenames remain display metadata; no uploaded name is inserted +into a command. Disabled customization +retains source text but does not execute it. `?safe=1` on the Vim frontend URL +skips all Domain customizations, including the font size, so a broken startup +script cannot prevent recovery through the defaults and settings panel. + +Follow-up: versioned per-user settings, multiple named scheme slots, and an +isolated test-startup window. A restricted terminal is not needed for the +current configuration workflow. Any future terminal bridge needs a separate +capability, runtime sandbox, resource limits and explicit authority design. + +Third-party plugin policy: vendor pinned, licensed pure-Vimscript files into +MEMFS and test against this old pinned Vim feature set. Candidate classes are +surround/text-object/comment helpers without native or network dependencies; +no unreviewed third-party plugin is added by this change. Runtime vim-plug +installation is unsupported. Vendoring `fzf.vim` alone is insufficient because +fzf requires a native executable; shell/system()-dependent plugins belong in +code-server or need a separately designed Wasm/JavaScript bridge. + +## Verification + +`go test ./...` includes asset routing, matching editor/authorization paths, +section persistence, invalid input, admin restrictions and child access tests. +Opt-in browser tests: + +```sh +PAGESWIKI_BROWSER_TEST=1 go test ./internal/server -run 'TestEditorHomeChromiumSmoke|TestConfigChromiumSmoke|TestVimWasmChromiumSmoke|TestBookmarkAndVimSettingsChromium' -count=1 +``` + +The Vim test uses CDP real-time waiting (virtual time can finish before Worker +compilation), two isolated files and a fake save endpoint. It asserts the actual +guifont, loaded `:Files` command, argument count and absence of startup errors. +It also edits a buffer with `:write` and verifies that BufWritePost exports the +changed bytes to the fake Gateway save endpoint. Both custom settings and safe +mode are exercised. UI tests open and close the settings dialog, save a +section with automatic children, and upload/save vimrc and colorscheme files. diff --git a/docs/design/html-projection-trust.md b/docs/design/html-projection-trust.md new file mode 100644 index 0000000..6843568 --- /dev/null +++ b/docs/design/html-projection-trust.md @@ -0,0 +1,317 @@ +# HTML projection trust boundary + +Audited and remediated: 2026-09-14; controlled external-resource extension: +2026-09-23. Status: **normal HTML projections use `controlled-v2`**. Authored +active HTML remains denied by default. A Domain administrator may separately +approve an exact external resource URL; approved JavaScript is intentionally +executable and is therefore a high-trust Domain configuration action. + +## Implemented contract — controlled-v2 + +`internal/server/html_projection.go` applies a parser-based allowlist using +[bluemonday](https://github.com/microcosm-cc/bluemonday), pinned to v1.0.27. The +sequence is bounded token preflight → authored allowlist → tree normalization +and authorized macro expansion → diagram references → final allowlist. This +changes display projections only, not saved Documents, hashes or Revisions. + +- All known authored-HTML surfaces share this boundary: semantic Viewer, + configured home, profile Wiki, object UUID, historical Revision, Preview, + print, and HTML/Markdown editor preview. Object viewing checks adapter MIME + kind; non-HTML is escaped text or a download link, never blind HTML. +- Formatting, tables, code, internal/external links and local passive images + are supported. Author scripts, event attributes, forms, iframes, SVG/MathML, + styles, arbitrary classes and `data-*` hooks are removed. This is intentional + compatibility tightening, not a source migration or an executable trust flag. +- By default images must resolve to local `/v/raw/`, `/_/obj/`, `/static/`, or + `/o/path:/system/static/` resources after path normalization. External images, + relative semantic URLs, data images and arbitrary authenticated GET targets + are not loaded by authored markup. Use immutable asset/raw references. +- The Domain setting “Approved external resources” is the only exception. + External images require an exact normalized HTTPS URL match. External CSS + and JavaScript require both an exact HTTPS URL and pinned SHA-256 SRI. The + server discards authored integrity/crossorigin attributes and emits canonical + `integrity` and `crossorigin=anonymous` attributes from configuration. + Approval entries are converted to unpredictable text placeholders before the + authored and generated allowlists, then restored as server-authored tags; + macro output therefore cannot forge an approval. CSP is derived from the same + list: image/style origins and JavaScript content hashes are added while + `connect-src` remains same-origin. Revocation takes effect on the next render. + Wildcards, HTTP, credentials, fragments, inline script/style and event + attributes remain unsupported. Because approved JavaScript can invoke + same-origin APIs as the viewer, only immutable audited code should be added. +- Authored IDs and fragment targets are SHA-256-namespaced to avoid application + DOM collisions. Only code-language classes survive the authored pass. +- Only text-node macros expand, not macros in attributes, links or code. + Application-owned children hooks cannot be forged by authored `data-*`. + Each macro is dispatched once; lookup failures remain escaped authored text, + including entity-decoded tags and nested-macro-looking strings. + Existing read filtering is retained; City reads inherit request cancellation + and use bounded Store projections. Macro output is not cached across readers. +- Input is at most 1 MiB; token/tree budgets are 16,384 with depth 128; output + is at most 4 MiB before final sanitization; at most 32 macro invocations. + Preflight is deliberately conservative for deeply/unclosed malformed HTML. + Cooperative request/DB work has a two-second deadline. These are bounds, not + hard CPU isolation of the in-process parser. Failure shows a localized warning + and at most 64 KiB of escaped source, never original active HTML. +- `/_/api/v1/render/markdown` accepts optional `html` only with `projection:true`. + Display results are private/no-store. Canonical Markdown-to-HTML conversion + remains separate and preserves authoring semantics; it must not be displayed + without projection. Editor preview requests debounce/abort obsolete work and + fail to escaped text. Saving does not save the sanitized preview. +- Normal display/editor templates use per-response CSP nonces for application + scripts and prohibit authored inline event handlers. Nonces are inserted into + trusted template source **before** request data, never rendered body strings. + Same-origin application frames/resources remain available; document styles + are removed while application/theme styles remain enabled. Config and other + non-document screens are not claimed to have this CSP yet. +- Diagram SVG responses, including cache hits, have sandbox CSP and nosniff. + GET cache use requires current Domain/Path read authority and a live bounded + source reference (128 entries, 32 KiB/source, 30-minute lifetime). These + references are keyed by policy version, Domain, Path and source; responses + are private/no-store so browser caches do not bypass fresh checks. Reopening + the Viewer registers references after restart/eviction. Renderer requests + inherit cancellation; source/cache/output reads are size-bounded. Durable + diagram scheduling, disk quotas, atomic artifact publication and hard decoder + isolation remain follow-up work; foreground diagram GETs are not eliminated. +- There is no grandfathering of old active HTML and no document-level trusted + executable mode. The explicit Domain approval list above is the only active + external-resource exception. + Registered application/plugin frames are separate trust contracts. Anonymous + locality ACLs, ownership appointments, alias/move fences and public cache + revocation must land before enabling new public access. + +Verification: `html_projection_test.go`, `html_projection_browser_test.go`, and +`diagram_projection_security_test.go` cover inert attack corpora, resource limits, +cancelled requests, unchanged stored content, cache authority/revocation and CSP. +Real Chromium loads nine display/editor surfaces as an administrator after a +path-scoped writer saves a hostile test document through the real save API. +Authored execution and privileged sentinel requests must stay absent; parser- +inserted non-nonced scripts/events are also blocked by CSP. Existing PDF/archive/ +comic, metadata, bookmark and editor browser regressions remain required. + +Read-only compatibility sampling of the main DB's latest 500 HTML **revisions** +(not a complete current-Path inventory) found no script/event/iframe/SVG markers +in their first 128 KiB, one style-bearing revision, and no body over 1 MiB. +This limited marker count is not a sanitizer/security proof or a guarantee that +no existing document needs layout changes. No production document was rewritten. + +The following sections preserve the original diagnostic and design rationale; +their unsafe behavior describes the **pre-remediation** implementation. + +## Finding and release gate + +Before remediation, saved HTML executed JavaScript in the Pages Wiki application origin +when a reader opens its semantic Viewer. Document write permission therefore +implicitly grants the ability to execute code as a later reader, including a +reader with stronger permissions. Authentication, path ACLs, and CSRF checks do +not make authored HTML safe after it is inserted into the authenticated page. +HttpOnly cookies cannot be read directly, but same-origin authored code can +issue authenticated requests and read accessible responses or the page DOM. + +**Before enabling or broadening shared links, comments, anonymous/public +viewing, or untrusted-author publication, this boundary must be closed and its +browser regression suite must pass.** This is also an existing risk in private +Domains with authors and readers of different privilege levels; it is not +limited to future public features. Do not describe the pre-remediation Viewer as an +isolated HTML viewer, or treat an HTML MIME classification as a trust decision. + +## Observed entry paths (before remediation) + +The central semantic path is: + +`Revision.Body → expandMacrosForRequest → renderDiagramsInHTML → template.HTML → parent page DOM` + +The macro and diagram helpers replace recognized constructs; they are not HTML +sanitizers and preserve unrelated scripts and event attributes. Go's +`template.HTML` deliberately bypasses normal template escaping. + +| Entry / projection | Current implementation and insertion | +| --- | --- | +| `/{semantic-path}` | `internal/server/semantic_handlers.go`, `handleSemanticRoute`: HTML-kind `Revision.Body` is expanded and cast to `template.HTML`; `templates/pages/page.gohtml` inserts `.RenderedHTML` directly into `.page-html`. | +| `/` with a configured HTML home Path | `internal/server/handlers.go`, `handleHome`: the saved home body is macro-expanded and inserted through `page.gohtml`. | +| `/o/uuid:{object-uuid}` | `internal/server/object_uri_handlers.go`, `handleObjectView`: casts `latest.Body` directly to `template.HTML`, without even the MIME/adapter-kind guard; `object_view.gohtml` inserts it into the parent document. | +| `/r/view/{revision-uuid}` | `internal/server/revision_routes.go`, `handleRevisionView`: HTML-kind historical body is cast directly and inserted by `revision_view.gohtml`. | +| `/v/preview/{path}` | `internal/server/preview_handler.go`, `handlePreview` / `renderPreviewDocument`: HTML-kind body is expanded and inserted by `preview.gohtml`. | +| `/_/view/print/{path:…\|uuid:…\|rev:…}` | `internal/server/print_handler.go`, `handlePrint`: HTML body is expanded and inserted by `print.gohtml`. | +| `/u/{username}` | `internal/server/profile_handler.go`, `handleUserProfile`: the associated user Wiki HTML is expanded and inserted by `profile.gohtml`; child Wiki pages use the semantic handler. | +| `/e/{path}` live Preview | `static/js/editor.js`: HTML source and Markdown projection responses are assigned to `preview.innerHTML`. This is another active-markup sink to cover; script-tag behavior under `innerHTML` differs from initial document parsing, but event attributes and other active content must not be considered safe. | + +The first row was verified in a real browser. The remaining rows were traced in +source and require endpoint-specific browser coverage during remediation. This +is an inventory of known sinks, not proof that no additional projection exists. + +### Protections that do not cover these paths + +Raw HTML download/attachment handling in `internal/server/raw_view.go`, the CSP +sandbox on raw SVG, and the sandboxed EML HTML frame are separate response +paths. They do not constrain saved HTML inserted into the normal Viewer. +The audited semantic response had no `Content-Security-Policy` header and its +authored content was not in a sandboxed iframe. `nosniff` or a correct +`text/html` Content-Type would not remove executable content. + +## Local verification + +A scratch Go test, injected with `go test -overlay` rather than added to the +repository, created a temporary migrated DB and temporary Document root. It +saved a test-only HTML Revision, bound `/audit/sentinel`, and served the real +semantic handler and templates through a localhost `httptest.Server`. A test +owner session supplied request authorization; no external instance was used. +Headless Chromium loaded that local page. + +The payload contained only a paragraph, an inline script setting +`document.documentElement.dataset.htmlScriptAudit`, and an invalid `data:` image +whose `onerror` set `dataset.htmlEventAudit`. Both sentinel values became +`executed` in the parent DOM. The HTTP response still contained the original +inline script and its CSP header was empty. There was no data extraction, +credential access, or application mutation from the payload. + +This diagnostic confirmed the current unsafe behavior; it is not a permanent +test that expects the vulnerability to remain. Remediation must invert those +expectations into denial tests. + +## Mismatch with existing design + +- [Architecture](arch.md) distinguishes immutable Document content from Revision + identity. Canonical HTML support does not itself authorize executable + JavaScript, and the reviewed architecture does not define all authors as + trusted application-script authors. +- [Projection adapters](projection-adapters.md), “Security and Failure Rules,” + says stored HTML and SVG retain their existing isolation rules. In practice + the raw/SVG isolation is not shared by semantic HTML projections. That wording + was insufficient to establish the missing boundary. That document now + records the implemented common projection boundary and its limits. +- [Platform extension architecture](platform-extension-architecture.md) + explicitly says document content may request a widget provider/resource but + may not supply executable JavaScript; providers use a sandboxed frame or a + sanitized server projection. Direct authored HTML execution bypasses that + intended separation. +- The Preview adapter-kind check prevents treating every binary/text file as + HTML, but it does not make a legitimately classified HTML body trusted. + +## Policy rationale: immutable source, controlled projection + +### Normal HTML is inert + +Keep canonical Document bytes, hashes, Revision IDs, history, and authoring +round trips unchanged. Enforce safety when producing a display projection, +using a parser-based allowlist rather than regular-expression replacements. +The normal mode must not allow authored scripts, inline event handlers, +executable URLs, active embedded documents, or attributes that create a second +execution context. Define URL schemes, relative URL resolution, allowed markup, +CSS/layout limits, and external resource/privacy behavior explicitly. SVG, +MathML, `srcdoc`, forms, CSS URLs, and DOM-clobbering attributes need explicit +decisions, not implicit passthrough. + +Introduce one projection boundary shared by Viewer, home, profile, historical +Revision, preview, print, and client-side editor preview. Object-UUID viewing +must also use the MIME/adapter registry rather than blindly casting a body. +If projection parsing fails or exceeds resource bounds, fail safely to escaped +source/download; never fall back to unsanitized HTML. + +Distinguish authored nodes from server-generated macro/widget output. Parse +recognized macro requests into structured inputs, authorize their data access, +and produce escaped, typed output through trusted renderer contracts. A string +that resembles generated markup is not proof of trust. Avoid sanitizing only +before an expansion that can reintroduce authored unsafe attributes, or only +after expansion without accounting for required application-owned controls. +No general template call site should be able to turn arbitrary `Revision.Body` +into trusted markup by convention alone. + +Editor authoring mode continues to preserve source, while its visual preview +uses the same safe projection policy. Do not conflate a safe display result +with a replacement for the canonical body when saving. + +### Explicit trusted HTML is isolated + +If executable HTML compatibility is genuinely required, make it a separate, +administrator-granted capability and an explicit Domain policy, not an implied +consequence of page write permission. Bind approval to the actual approved +content/revision or to a clearly defined trusted publishing workflow: granting +trust to a mutable Path must not let any later lower-privilege editor inherit +script execution. Define revocation, audit records, and visible mode indicators. + +Executable content must not run with application-origin authority. Consider a +dedicated uncredentialed origin or an opaque-origin sandbox, with the minimal +permissions needed for that use case. Never combine same-origin document +content with permissive `allow-scripts allow-same-origin` and call it isolation. +Do not forward application cookies, bearer tokens, unrestricted save callbacks, +or privileged data into that context. Any necessary `postMessage` integration +must be narrowly typed, sender-checked, capability-scoped, and bounded; an +opaque-origin sender requires validating the known frame/window and a dedicated +channel rather than trusting the string `null` as an origin. + +Existing application/plugin scripts remain a separate administrator-controlled +surface. Registered widget/plugin frames must not become an escape hatch for +arbitrary page-authored code or inherited reader capabilities. Shared/public +projections and comments must always use the safe policy unless a separately +reviewed, isolated publication contract explicitly permits more. + +### Defense in depth and scaling + +Adopt an application CSP compatible with approved application scripts, using +nonces/hashes or external script assets rather than unrestricted inline script +execution. CSP is defense in depth, not a substitute for safe markup and +isolation. Frame responses need their own policy; tightening only the parent +page does not fully define each child document's privileges. + +Bound input size, parse depth/nodes, output size, CPU time, and any external +resource work. Cache content-only safe projections by immutable Document hash, +renderer version, and safety-policy version. Keep ACL-dependent macro output +separate or key/revalidate it with Domain, principal/grants, and request context; +never reuse a privileged projection as an anonymous/shared response. Cache and +preview artifacts generated under an older unsafe policy need invalidation. + +## Compatibility impact and staged implementation + +Existing pages may rely on inline scripts, handlers, style blocks, custom +attributes, embedded frames, forms, or SVG. Blanket filtering can break those +pages, diagrams, child-list controls, and editor previews. A restrictive CSP +also affects inline application scripts. The implementation above deliberately +separates these template-owned scripts from authored HTML; original source stays +available for editing/download if custom layout needs adjustment. + +1. Approve the default allowlist, external-resource policy, and whether a + trusted executable mode is needed at all; record explicit ownership. +2. Inventory active constructs with a read-only diagnostic and report affected + Paths only to authorized administrators. Do not rewrite stored content. +3. Build the common projection boundary and server/client regression fixtures; + preserve supported macro, diagram, print, and editor behavior deliberately. +4. Integrate every known route, safe error fallbacks, policy-versioned caches, + CSP, and any separately reviewed isolated mode. Do not grandfather all old + HTML as trusted or infer trust from MIME, filename, creation time, or author + display name. +5. Verify upgrades and rollback without changing canonical bytes. Only then + remove the P0 gate for public sharing, comments, and anonymous expansion. + +## Required tests and acceptance criteria + +- Browser denial fixtures for parser-inserted scripts, event attributes, + executable URL variants, SVG/MathML active content, iframe/srcdoc, malformed + markup, DOM clobbering, and CSS/resource-policy violations. Use harmless DOM + sentinels and local test endpoints, not credential-exfiltration payloads. +- Apply the same corpus to semantic Path, configured home, object UUID, + historical Revision, user Wiki, preview, print, and both HTML/Markdown editor + previews. Test direct navigation, client-side replacement, and restored + revisions, not just the first render of new content. +- Cross-account fixtures: a lower-privilege author cannot execute in a reader's + page or issue reader-authorized mutations. Anonymous/shared viewers and + comments cannot activate markup or receive private macro results. +- Canonical Document bytes, SHA-256, Revision IDs, downloads, and authoring + round trips remain unchanged. Non-HTML bodies are never interpreted as HTML + by the object-UUID route. Unknown formats and parser failures stay inert. +- Supported formatting, links, images, children macros, diagrams, code blocks, + accessibility, themes, and print layouts still work. Template-owned controls + are not confused with forged authored markup. +- If trusted mode is implemented, verify origin isolation, cookie/token + exclusion, navigation/form/download permissions, message validation, + approval-on-edit behavior, revocation, and public-projection restrictions. +- Test CSP headers and violation behavior, resource bounds, cancellation, + oversized/deep input, cache policy-version changes, ACL revocation, and no + privileged-to-public cache reuse. A single endpoint-only sanitizer test is + insufficient to close this gate. + +Acceptance requires inactive authored markup in every normal projection, an +explicitly reviewed policy for any executable mode, preserved canonical +content, and passing endpoint/browser integration tests. The normal projection +slice meets this boundary with no executable mode. Additional public/shared +surfaces must inherit it and pass their own ACL/revocation tests before release. diff --git a/docs/design/i18n-delivery.md b/docs/design/i18n-delivery.md new file mode 100644 index 0000000..d8d321e --- /dev/null +++ b/docs/design/i18n-delivery.md @@ -0,0 +1,395 @@ +# Language Projection Draft + +## Goal + +Language should NOT affect semantic hierarchy. + +Language is treated as: + +```text +projection +representation +view +``` + +rather than containment. + +* * * + +# Core Philosophy + +## URL hierarchy is language-neutral + +Paths represent: + +```text +semantic location +knowledge locality +human navigation +``` + +NOT language ownership. + +* * * + +# Example + +Preferred: + +```text +/dev/api/auth +``` + +Avoid: + +```text +/ja/dev/api/auth +/en/dev/api/auth +``` + +because language hierarchy pollutes semantic hierarchy. + +* * * + +# Important Separation + +Layer Meaning Path semantic hierarchy Page UUID identity Revision representation Language projection + +* * * + +# Internal Model + +## Page + +Language-neutral semantic object. + +```text +Page UUID +``` + +Example: + +```text +Page + ├─ Japanese revision + ├─ English revision + └─ Chinese revision +``` + +* * * + +# Revision + +Language-specific content snapshot. + +## `revisions` table + +| Field | Meaning | +| --- | --- | +| `uuid` | Immutable Revision UUID | +| `object_uuid` | Parent Page UUID; retained name during the Object-to-Page migration | +| `document_hash` | SHA-256 of the immutable canonical payload | +| `lang` | Canonical BCP 47 language tag or `und` | +| `message` | Commit message | +| `created_at_ms` | Unix epoch milliseconds | + +The payload is addressed by `document_hash`; it is not identified by the +Revision UUID. + +* * * + +# Language Resolution + +## Request + +```http +GET /dev/api/auth +Accept-Language: ja-JP,ja;q=0.9,en;q=0.8 +``` + +* * * + +# Resolution Flow + +```text +Page UUID + ↓ +find latest revision(lang=ja-JP) + ↓ not found +find latest revision(lang=ja) + ↓ not found +find latest revision(lang=en) + ↓ not found +find latest revision(lang=campus default) + ↓ not found +find latest revision(lang=system default) + ↓ not found +find latest revision(lang=und) +``` + +* * * + +# Fallback Philosophy + +Language fallback is preferred over URL duplication. + +* * * + +# Recommended Fallback Chain + +Example: + +```text +ja-JP + ↓ +ja + ↓ +campus default + ↓ +system default + ↓ +und +``` + +Duplicate candidates are removed while preserving order. Invalid language +tags are ignored. `und` is the compatibility projection for revisions created +before language-aware delivery. + +* * * + +# Zone Language Metadata + +Zones may optionally define language affinity. + +## `zones` + +| Field | Meaning | +| --- | --- | +| `default_lang` | Preferred fallback language | +| `allowed_langs` | Allowed languages | + +* * * + +# Example + +## JP-oriented campus + +```text +default_lang = ja +allowed_langs = ja,en +``` + +* * * + +# Global campus + +```text +default_lang = en +allowed_langs = * +``` + +* * * + +# Spot Language Metadata + +Spot may optionally specify: + +| Field | Meaning | +| --- | --- | +| `preferred_lang` | Preferred rendering language | + +This influences rendering preference only. + +It does NOT change identity. + +* * * + +# Canonical URL Policy + +Canonical URL remains language-neutral. + +Example: + +```text +/dev/api/auth +``` + +Language selection is handled at rendering time. + +* * * + +# Optional Explicit Language URL + +Explicit language paths may exist for: + +- debugging +- preview +- direct linking +- translators + +Example: + +```text +/_/lang/ja/dev/api/auth +``` + +However: + +```text +this is NOT canonical +``` + +* * * + +# Why This Design + +## Prevents hierarchy pollution + +Avoids: + +```text +language hierarchy +``` + +overwriting: + +```text +semantic hierarchy +``` + +* * * + +# Benefits + +## 1. Stable semantic URLs + +The same knowledge object keeps the same path. + +* * * + +## 2. Shared semantic identity + +Multiple languages refer to the same: + +```text +Page UUID +``` + +* * * + +## 3. Better multitree behavior + +Aliases and bindings remain language-neutral. + +* * * + +## 4. Better graph compatibility + +Semantic relations do not duplicate per-language. + +* * * + +# Relation to Existing Architecture + +This design aligns with: + +```text +path != object +``` + +and extends it into: + +```text +representation != object +``` + +* * * + +# Conceptual Mapping + +Concept Meaning Path semantic locator UUID identity Revision representation Language projection + +* * * + +# NDN-like Interpretation + +## Name + +```text +/dev/api/auth +``` + +semantic and language-neutral. + +* * * + +## Content Negotiation + +Language selection behaves similarly to: + +```text +content negotiation +``` + +using: + +```text +Accept-Language +``` + +* * * + +# UI Philosophy + +Language switching should feel lightweight. + +Example UI: + +```text +[Japanese] [English] [中文] +``` + +without changing semantic location. + +* * * + +# Important Principle + +Language should not fork the knowledge universe. + +Avoid: + +```text +ja-wiki +en-wiki +``` + +style silo fragmentation unless intentionally desired. + +* * * + +# Current Recommended Direction + +Layer Model UI semantic hierarchy URL language-neutral Internal revision projection Identity UUID Rendering Accept-Language + fallback + +* * * + +# Summary + +Language is treated as: + +```text +projection +representation +view +``` + +NOT: + +```text +ownership +containment +hierarchy +``` + +This preserves semantic structure while supporting multilingual knowledge naturally. diff --git a/docs/design/implementation-roadmap.md b/docs/design/implementation-roadmap.md new file mode 100644 index 0000000..83725aa --- /dev/null +++ b/docs/design/implementation-roadmap.md @@ -0,0 +1,570 @@ +# Architecture Implementation Roadmap + +## Principles + +### Task management first slice (2026-09-24) + +2026-09-25 task CalDAV (`0.8.0`, implemented and fixture-tested, **deployed to app/app2 on 2026-09-26 at 00:24 JST**; [deployment record](../operations/deployments/2026-09-26-task-caldav.md)): +private fixed VTODO collection, revocable read/read-write app passwords with UI, +conditional writes and archive deletion. Real vdirsyncer 0.21.0 / Todoman 4.7.0 +discovery and bidirectional sync tests. Date-only deadlines; not full CalDAV +conformance. See [task CalDAV contract and CLI setup](ja/task-caldav.md). + +2026-09-25 task follow-up (`0.7.0`, implemented and deployed to app/app2 at 07:07 JST): +daily/tomorrow planning, explicit carryover rescheduling, hierarchy-aware pagination +and parent context, and atomic Wiki-note creation with UUID-bound view/edit actions. +See [daily task / Wiki note contract](ja/task-daily-notes.md). Capacity, bulk family +planning, manual sorting and shared tasks remain open. + +2026-09-25 follow-up (implemented, fixture-tested and **deployed to app/app2 at 05:59 JST**; [deployment record](../operations/deployments/2026-09-25-active-notifications-calendar-mobile.md)): + +- [x] Inline title/status/date editing, independently dated two-level subtasks, + bounded monthly day schedule, home shortcut and Today navigation modal (`0.6.0`). +- [x] Inbox presentation preferences per account/browser, focused expiring toasts, + opt-in return modal, sound presets/volume, notification-only Service Worker. +- [x] Opt-in Web Push: transactional Inbox outbox, revocable session-bound subscriptions, + VAPID, vendor allowlist/DNS pinning, bounded scheduler delivery/retry/expiry and focus acknowledgements. +- [ ] Live OS/browser delivery acceptance with an explicitly opted-in test device + (Chrome/Firefox/Safari), iOS home-screen installation and OS power-saving behavior. + +See [active notification contract](ja/active-notifications.md) and +[inline task/day schedule contract](ja/task-inline-schedule.md). + +- [x] `organizer.tasks` private per-principal/Domain items and projects, CAS payloads, + atomic head/revision/change journal, conditional writes and idempotent creation. +- [x] Today, Inbox, Backlog, Someday, Review, Completed and Archive; project/task detail, + quick capture, due/planned/review dates, priority, estimate and readable Wiki UUID links. +- [x] Bounded lists/history, EN/JA, theme-aware desktop/mobile dialogs, extension kill switch. +- [x] Typed independent outbox subscriptions; atomic task/project events, bounded journal + migration through the scheduler, no City jobs for task-only changes. +- [ ] Shared collections/assignees, export/recovery and bulk review. +- [x] Opt-in due/planned-date task reminders, atomic reservations/cancellation, + bounded background Inbox delivery, live metadata authorization and badge refresh. +- [x] Private local calendar time-block links, durable retry intents, current event time/ETag lookup, unlink tombstones; imported/shared/public calendars excluded. +- [x] Persistent Pomodoro: start/pause/resume/finish/cancel, one active session per principal, conditional transitions, bounded scheduler completion and Inbox notification. +- [x] Today bounded estimates/current local time blocks/recorded focus intervals, overlap and incomplete-total indicators. Calendar event summaries include an explicitly approved task-title snapshot, never notes. +- [ ] Personal capacity, carry-over and period/project reports; historical focus-span backfill; calendar reminders, notification defaults/quiet hours/digests; Pomodoro personal defaults/cycles and routines. + +See [time-block and Pomodoro contracts](ja/task-planning-focus.md) for API, privacy, +two-store recovery, polling limits and remaining work. Canonical calendars and task +DB metadata both require backup. Production app/app2 deployment completed on +2026-09-25 JST; see the [deployment record](../operations/deployments/2026-09-25-task-today.md) +for backup, verification and the observed transient scheduler lock contention. +- [x] Limited private VTODO / CalDAV with vdirsyncer + Todoman file synchronization. +- [ ] Time-of-day deadlines, recurrence/alarms, shared task collections, incremental + sync-token and additional CalDAV clients; dependency graph, tickets and offline UI. + +See [Japanese task implementation contract](ja/tasks-implementation.md). +The existing `/v/plan` calendar default is unchanged; tasks start at `/v/plan/today`. + +### Calendar subproject (2026-09-22) + +- [x] Small-screen/touch calendar navigation, readable week columns and day selector, + scroll-first gestures, compact month counts and VisualViewport-aware editor. + [Mobile contract](ja/calendar-mobile.md): fixture-tested and deployed 2026-09-25; iPhone Safari acceptance pending. + +- [x] Initial file-canonical calendar/month snapshots, rebuildable SQLite index, + conditional event CRUD and bounded CalDAV time-range REPORT. +- [x] `/v/plan` year/month/week/day/events/timeline, event dialogs and per-calendar collaborators. +- [x] Per-user default calendar overlays and explicit comma-separated `pretty_name` selection. +- [x] Week/day time grids, configured-timezone day boundaries, zoom through 400% with 5-minute precision, + ETag-protected move/start/end resizing without refetch, equal overlap lanes, drag-range creation, + horizontal rescheduling and `week/list`. +- [x] Read-only ICS polling with interval/conditional GET and bounded external CalDAV REPORT/multiget; + background event queue, encrypted Basic credentials, SSRF guards and failure-safe snapshots. +- [x] Outlook published-ICS projection for METHOD:PUBLISH, VTIMEZONE/TZID, Windows timezone names, + bounded RRULE expansion, EXDATE/RDATE, moved/cancelled RECURRENCE-ID instances and orphaned + exception projections, plus multi-megabyte synthetic fixtures. +- [ ] Recurrence PERIOD/THISANDFUTURE, alarms/durations, provider validation, discovery/OAuth, + configurable synchronization windows and conflict-aware bidirectional synchronization. +- [ ] Full iCalendar temporal semantics (recurrences, timezones, exceptions), CalDAV discovery/client compatibility, + application credentials, synchronization tokens and maintenance/metrics jobs. +- [ ] Group sharing, audited administration, ownership recovery and calendar scheduling/notifications. + +See [Japanese implementation contract and limitations](ja/calendar-implementation.md). +The initial supported subset is not a claim of full CalDAV conformance. + +System-service plugins are distinct from document adapters. See +[System extensions](system-extensions.md) for implementation boundaries and the next slices. + +- [x] Responsive wider bookmark-card grid (viewport-dependent columns). +- [x] Built-in resource.sample event, SQLite history, retention and bounded graphs without foreground collection. +- [x] Separate system-extension catalog and settings area for trusted built-ins. +- [x] Unified execution/resource monitor (running jobs only), paginated job history with lazy logs. +- [x] Protect group owners from ordinary member downgrades and atomically retain an owner during concurrent removal. +- [ ] Transactional activity outbox and Domain/principal recent-edit projections. +- [x] Diary/blog initial built-ins: Page UUID metadata, calendar/recent entries, + categories, read-filtered indices, per-Domain enable/disable and registration UI. + See [initial scope](diary-blog-plugins.md); this is authenticated, existing-Page registration only. +- [x] Diary/blog atomic Markdown new-post composition, transactional metadata/Revision, + embedded-asset freezing, idempotent retry and create/write enforcement. +- [ ] Diary/blog: anonymous metadata approval/feeds, + recent comments and safe resumable tDiary import; declarative time/OS/sunset theme rules. +- [x] Diary/blog per-Domain prefixes, optional keyword URL planner, multiple articles + per day, and authenticated Domain-root diary/blog entry view (2026-09-17). + Legacy Page registration remains available. +- [x] Domain entry-settings dialog and signed manifest v2 provisioning of layout, + diary/blog enablement and prefixes; atomic destination apply and managed edit guards. +- [x] Signed enrollment capability proof and Campus-wide approved-peer v2 preflight + before entry-setting changes; unknown/legacy peers block with a visible explanation. +- [ ] Entry provisioning inside Domain creation, controlled-settings release/retention, + applied-setting acknowledgments and freshness policy. +- [x] Diary/blog dated viewer routes `/v/{kind}/yyyy/mm[/dd]`, `own` presence + filter, legacy-query redirects, and canonical calendar/filter/pagination navigation. +- [x] Local same-Campus diary/blog index/calendar projection without copying articles; + source and destination read-policy filtering, source body/edit links, target write guard. +- [ ] Project article bodies on destination host, approved anonymous projection, + cross-instance source transport/revocation and source-setting federation. +- [ ] Rankings, reactions and moderated Page/inline comment services. +- [ ] Linkding-compatible bookmark-source injection with scoped credentials. +- [ ] Explicit external-search fallback and PagesWiki/GROWI/PukiWiki connectors. +- [ ] S3-compatible Document Store; read-only WebDAV/SSH external collections. +- [ ] Optional SNMP resource collector with target/OID allowlists and SNMPv3 secrets. +- [ ] Third-party system-plugin signature validation, isolated runtime and lifecycle operations. + +vim.wasm runtime fixes are on hold by user request; its existing configuration UI is retained. + +### Prioritized execution order (2026-09-14) + +Feature checkboxes above are not an instruction to bypass the hardening gates. +The execution order is maintained in [Implementation status](implementation-status.md#ordered-next-work). + +1. Completed this slice: unified monitor/history UI, bounded/indexed job/log retrieval; + first P0 correction: owner downgrade and concurrent last-owner removal protection. +2. Completed bounded hardening: OIDC/JWKS, inherited-admin revocation, + browser mutation/purpose checks, Domain/Object scope and read filtering; + see the [execution ledger](hardening-execution-2026-09.md). +3. Completed recursive authorized snapshots, literal prefix transactions and + signed manifest/checkpoint atomicity. Remaining write-policy fencing and + content-author trust are gates before public/shared collaboration. +4. Completed PDF/archive metadata jobs, bounded read-policy snapshots, + Object/Revision pagination and improved search; continue lazy City/directory + projection, decoder isolation and durable entry extraction. +5. Transactional activity outbox, actor attribution, idempotent URL reconciliation + and recent-edit projections. +6. Diary/widgets/import and themes, then comments/rankings, external search/bookmarks, + storage connectors and SNMP. HA leases/fencing gate multi-node deployment; + external plugin installation remains disabled until isolation/security gates pass. + +- Migrations must preserve existing UUID and path reachability. +- New architecture is introduced in vertical slices with regression tests. +- Reserved authorization features must not be simulated with insecure + allow-all placeholders. +- New collaboration and extension features must use the stable Page UUID, + immutable Revision, Domain-scoped policy, projection-adapter, event, and + scheduler contracts described in + [Platform Extension Architecture](platform-extension-architecture.md). +- SQLite remains a supported single-node metadata backend. HA work must add a + replicated metadata strategy or explicit single-writer fencing; sharing a + live SQLite file over a network filesystem is not an HA design. + +## Phase 1 — Identity and projection foundations + +- [x] Separate Object creation from Semantic Path binding. +- [x] Rename the implemented District model to Domain. +- [x] Separate Revision UUID from Document SHA-256. +- [x] Add Revision language metadata and fallback selection. +- [x] Move immutable payloads to `documents/sha256/` with a transitional + SQLite compatibility cache. +- [x] Add rsync-like and interactive `path:` / `uuid:` / `rev:` / `asset:` + data administration. + +## Phase 2 — Knowledge City topology + +Current review: [City reconciliation and navigation](city-review-and-reconciliation.md). +The completed items below are initial implementations. The next City slices are: + +- [x] Audit City/autoplan/gen-city and design URL-driven event reconciliation. +- [x] CITY-A named links: parent-qualified Street URLs, ambiguity-safe lookup, + shared search/map/macro links, ancestor authorization, lightweight details, + literal Page URLs and map focus/locality-search regression coverage. +- [ ] CITY-A: per-result authorization, literal Paths, scoped links/names, + shallow/portal inference, manual ownership and idempotent application. +- [ ] CITY-B: transactional mutation outbox → debounced, durable City queue + consumer; scheduled/manual repair through the same pipeline. +- [ ] CITY-C: stable fabric, Worker/cache, connected roads, bounded lazy + projection and capacity-safe picking targets. +- [ ] CITY-D: icon/modal creation/settings, arrow/WASD/HJKL navigation, + focus/history handling and i18n browser regressions. +- [x] City label follow-up: visible resting labels, horizontal Street names, + retained hover/focus highlighting and working label toggle; normal/popup tests. +- [x] Manual City organization: display-title modal, Ctrl/Command selection, + existing/new Spot merge, Street relocation retaining Page URLs, transactional + validation and manual-inference overrides; see [contract](city-organization-ui.md). +- [x] Immersive City follow-up: focused Spot courtyards and surrounding Page + buildings, nonoverlapping bounded/paginated close-ups, themed architectural SVG, + modal utility menu and directory navigation; normal/popup regressions. See + [projection and limits](city-immersive-map.md); CITY-A–D gates remain open. +- [x] Filter City map/details/macros/badges by readable boundaries and Pages; + recompute visible portals/counts/relations and use private responses. +- [x] Local gen-city Worker with time/input/output/cache bounds, cancellation + and retry, plus spatial Arrow/WASD/HJKL navigation in normal/popup modes; + see [worker and navigation](city-worker-navigation.md). +- [x] One-connection-safe bounded City snapshots and literal Path + containment/overlap/context/health; true lazy Page pagination remains open. + +- [x] Define Campus identity and defaults. +- [x] Define Domain ownership by Campus. +- [x] Scope Semantic Paths by `(domain_uuid, path)`. +- [x] Add local/remote Domain placement. +- [x] Add absolute cross-Domain link helpers. +- [x] Add standalone/controller/managed Campus authority modes. +- [x] Scope non-topology configuration by Domain. +- [x] Scope Recent Objects by selected Campus and Domain. +- [x] Record controller-selected Domain instance FQDN. +- [x] Add hashed enrollment tokens and fingerprinted instance registration. +- [x] Add pending/approved/revoked instance placement selection. +- [x] Add external Campus bootstrap enrollment. +- [x] Add Managed Campus health status and detach actions. +- [x] Add signed Campus manifest reconciliation. +- [x] Implement ZoneTree nodes for Quartier and Street. +- [x] Implement Spot identity and ZoneTree pointers. +- [x] Implement SpotGraph Page bindings and MagicPage traversal. +- [x] Define Quartier planning, Street routing, Spot locality, topology + invariants, projections, APIs, policy inheritance, and delivery slices. +- [x] Add the initial topology schema, monotonic Domain topology version, + topology events, and Quartier/Street/Spot creation stores. +- [x] Add the initial interactive `/v/city` SVG guide map and authorized map API. +- [x] Add SpotPage/MagicPage edges, Viewer locality badges, Spot detail Page + lists, and initial typed SpotGraph relation visualization. +- [x] Add Quartier/Street/Spot detail projections, transactional Street/Spot + moves, ordering, and reversible SpotPage/SpotRelation edge removal. +- [x] Add planning preview/apply, reversible before/after event payloads, and + city health analysis. +- [x] Add `/v/city` map and locality breadcrumbs. +- [x] Add locality-scoped search and topology macros. + +## Phase 3 — Projection runtime + +- [x] Formalize the initial Viewer projection adapter registry and contract. +- [x] Route Viewer and semantic editor selection through adapters. +- [x] Route preview through adapters, including bounded text and CSV projections. +- [x] Route bounded print layouts through adapters at `/_/view/print/
    `. +- [x] Route the semantic Viewer through the initial adapter registry. +- [x] Add bounded text retrieval backed by seekable Document Store reads. +- [x] Defer PDF page rendering to idempotent scheduler jobs with retrying + Viewer delivery and bounded PDF page-count commands. +- [ ] Defer non-ZIP archive metadata and entry extraction to cached, bounded + scheduler projections. + - [x] Persist PDF page-count and non-ZIP metadata via shared scheduler jobs, + bounded immutable-hash cache and localized pending/retry views. + - [ ] Persist seekable non-ZIP extracted entries with quota/lease/Range and + archive-bomb controls; move ZIP central-directory work off the request path. +- [x] Add bounded structural JSON retrieval by immutable Revision and lazy + JSON-Pointer expansion without unmarshalling the complete payload. +- [x] Separate authoring and projection macro transpilation so HTML-to-Markdown + round trips preserve `children` while Markdown previews render it. +- [ ] Generalize the authoring/projection macro contract to typed extension + macros with versioned round-trip and projection tests. +- [x] Add ZIP/archive directory and Debian metadata adapters. +- [x] Add a bounded CSV table adapter. +- [x] Add the bounded `@excalidraw/excalidraw` hosted Viewer plugin with an + isolated immutable-Revision contract and safe built-in Canvas fallback. +- [x] Separate built-in projections from Domain-scoped hosted adapter plugins. +- [x] Restrict hosted adapter targets to HTTP(S) services such as vim.wasm or + a separately deployed editor gateway. +- [x] Define and implement one-use launch tickets and optimistic Revision + write-back with a reference hosted-editor gateway. +- [x] Connect an internal code-server instance to the hosted-editor Gateway, + with session workspace materialization and autosave Revision write-back. +- [x] Connect a cross-origin-isolated vim.wasm frontend to the hosted-editor + Gateway contract with hierarchical MEMFS loading and Revision write-back. +- [ ] Evaluate a local helper, temporary workspace, and executable allowlist + before enabling native applications such as Vim or VS Code. +- [x] Freeze embedded mutable Asset HEADs into immutable Document hashes on + Revision save and retain authorization references from the containing Page. +- [x] Scope mutable Asset addresses and management metadata by Domain. +- [x] Add typed Asset MIME/filename/size metadata and immutable HEAD history. +- [x] Add administrator HTTP create/update/delete with ETag preconditions. +- [x] Add the initial Asset management panel under Domain configuration. +- [x] Add Asset HEAD history/restore and Page/Revision dependency-detail UI. +- [ ] Add Asset retention controls, policy-matrix capabilities, and general + audit-outbox integration as specified in `asset-model.md`. +- [ ] Add a capability-checked mutable Asset authoring-preview endpoint and + typed `srcset`/CSS resource resolution without allowing live Asset URLs into + stored Viewer output. +- [x] Add authorized immutable object retrieval at `/_/obj/sha256:`, + limited to Documents referenced by a readable Path in the current Domain. + +## Navigation and home layouts + +See [Home layouts and sidebar design](navigation-home-sidebar.md). + +- [x] Vendor Hack Nerd Font for Browser and Tree without a runtime CDN dependency. +- [x] Add Domain-scoped classic, centered-search, and search/bookmark home layouts. +- [x] Keep home search global to the current Domain even when rendering `/top`. +- [x] Scope `/v/tree/{path}` to the requested subtree with breadcrumbs and cached expansion. +- [x] Limit Browser revision lookups to displayed files and repair missing revision indexes. +- [x] Define a shared sidebar layout, state ownership, and bounded children API contract. +- [ ] Implement the shared sidebar and authorized, paginated lazy navigation API. +- [x] Group configuration navigation and split scheduler, queue, logs, resources, + authentication providers, and adapter-specific settings into separate panels. +- [x] Add accessible themed switches and a Domain bookmark manager for Paths/URLs. +- [x] Restore public application assets and align compact/legacy editor paths. +- [x] Manage bookmarks from home; section cards and permission-filtered async child links. +- [x] Refine bookmark management into an icon-launched modal and section-card editor with group operations. +- [x] Add admin-only Domain vimrc/colorscheme upload, download/reset, session-scoped delivery and safe-mode recovery. +- [x] Explicitly load hosted Vim configuration, bundle its font and add a pure-Vimscript navigation plugin; verify the real Wasm runtime. + See [home navigation and hosted Vim](home-bookmark-sections-vim.md). +- [x] Add bounded, visibility-aware live resource graphs without a CDN dependency. +- [x] Repair Asset GET authorization and align metadata/history/reference reporting. +- [ ] Add versioned adapter-specific settings schemas and secret-field handling; + see [Configuration panels](configuration-panels.md). +- [ ] Add a transactional directory index and batch authorization for large hierarchies. + +## Phase 4 — Identity and authorization + +- [x] Normalize password, TOTP, OIDC, and magic-link authentication into Principals. +- [x] Add the initial direct Membership, Role, and positive-grant schema. +- [x] Add the initial Domain-level Capability evaluation with default deny. +- [x] Replace capability inference from URL words such as `delete` and `rename` + with a centralized typed endpoint policy classifier; deny undefined mutations + in reserved namespaces and method-close exact API routes. +- [ ] Complete typed object/path target resolvers for derived views and remove + the remaining handler-specific authorization exceptions. + - [x] Resolve raw, windowed text, PDF-page, preview-cache, print, Object, + Revision, history, and diff reads through their source Object/Path grants. + - [x] Filter Tree, Browser, Search, Preview listings, and asynchronous children + results per visible Path without returning hidden child counts. + - [x] Scope the initial Object list and Revision list API responses to the + current Domain and readable Object/Path grants. + - [x] Declare JSON/multipart target resolution as handler-owned policy and + remove route-name bypasses from middleware; enforce every expanded source + and destination Path for recursive rename, copy, and delete operations. + - [x] Bind hosted adapter sessions to the issuing Principal and re-check + current read/write grants on every workspace/content operation. + - [ ] Move multipart/JSON source-and-destination mutation checks into typed + decoded-request objects shared by middleware and handlers. +- [x] Add cookie-session CSRF and credential-type separation (legacy unprefixed + sessions expire normally); POST-only logout and live membership checks. +- [x] Verify OIDC issuer JWKS signatures/claims/browser state and reject + ambiguous email matches or conflicting external-identity binding. +- [x] Add Domain-scoped LDAP/LDAPS authentication with service search bind, + escaped exact-one user lookup, user-DN password bind, encrypted secrets, + immutable provider identity, bounded time/concurrency, optional member-only + provisioning, saved-configuration test UI, and Japanese/English labels. +- [x] Revoke derived Campus-admin grants transactionally without deleting + independent local grants or regenerating removed bootstrap authority. +- [x] Scope foreign/unbound Object authority and record atomic API creation + provenance; check all local aliases for global Object purge. +- [x] Revalidate zombie eligibility within the purge write transaction; scope + HTTP/config cleanup by Domain provenance and reject orphan-producing writes. +- [x] Bound Object/Revision metadata APIs with cursor pagination and batched + read checks; compact search exposes full Path and safe matching excerpts. +- [x] Common inert HTML projection boundary, bounded macro expansion, application + CSP and cross-account browser denial tests; preserve canonical authoring bytes. + See [policy and compatibility](html-projection-trust.md). No executable mode. +- [x] Gate the first anonymous semantic/raw slice on explicit current-revision + manifests, inert HTML, mutation invalidation and denial/revocation tests. +- [ ] Extend those gates to anonymous discovery/dependencies and delegated + shares with full impact-aware mutation/alias handling. +- [ ] Add Domain groups, group Role bindings, and `/g/` management surfaces. +- [ ] Add explicit OIDC/LDAP group mappings and policy-version invalidation; + LDAP authentication must remain usable without enabling group synchronization. +- [ ] Add auditable policy decisions. +- [ ] Add an authorized effective-permission inventory for Campus, Domain, + Quartier, Street, Spot, Page, share, group, Role, and Principal scopes. +- [ ] Add explicit anonymous-read policy grants without weakening default deny. +- [ ] Add signed PSK federation of selected Principal, group, Role, and grant + records between Domains, including origin, sequence, conflict, revocation, + and `campus_admin` inheritance policy. + +## Cross-phase enabling work — Extension seams + +These items must land before the later feature that depends on them. They are +listed separately because they replace concrete single-feature assumptions +without changing user-visible Page identity. + +- [ ] Put filesystem `DocumentRoot` access behind the seekable, content-addressed + Document Store interface before adding S3 or multi-node payload placement. +- [ ] Generalize topology/event-job records into a versioned transactional + Domain event outbox before notifications, feeds, metrics, comments, or DR + consume mutation events. +- [ ] Add a typed extension manifest and provider registry before adding third- + party transpilers, widgets, scanners, storage backends, or themes. +- [ ] Inventory process-local sessions, caches, preview slots, scheduler state, + adapter workspaces, and signing material before declaring LB/HA support. +- [ ] Add typed annotation/reaction/assessment stores keyed by Page and Revision + UUID before exposing comments, likes, or quality evaluation in Viewer HTML. +- [ ] Add privacy, retention, moderation, audit, export, and deletion contracts + before collecting view history, engagement, comments, or notification data. + +## Phase 5 — Delegation + +- [ ] Add Macaroon root-key rotation and verification. +- [ ] Implement attenuation caveats. +- [x] Add server-rendered OGP/X link cards for already-public Page/home/City + views, absolute configured-host URLs and a cached PNG fallback; retain + authentication and private metadata suppression. See [social cards](social-link-cards.md). +- [ ] Add read-only share projections under `/s/`. +- [x] Add Quartier/Spot owner appointments and governance dialogs; subordinate + publication policies may only narrow superior ceilings. Keep permission to + publish separate from actual publication and preserve authenticated ACLs. + See [detailed ownership/publication design](locality-publication-ownership.md). +- [x] Add named user/group read and read/write settings with ancestor caps, + stable identities, next-request membership checks and recovery authority. + Initial namespace guards freeze protected moves/aliases and City structure; + replace them with impact-aware mutation workflows in the next slice. +- [x] Add bounded explicit current-revision approvals and a separate inert + anonymous semantic Viewer/raw-media path with safe OGP and revocation tests. + No automatic activation of drafts or future edits. See + [exact scope and follow-ups](locality-access-publication.md). +- [x] Public Page breadcrumbs, asynchronous children, read-only tree and filtered + City navigation; database-generation cache invalidation and fresh authenticated + read filters. Remove public download controls; reserve isolated presentation + for share URLs. See [navigation contract](public-navigation.md). +- [x] Add owner-managed `/u/{username}` audiences for profile metadata, avatar, + Wiki root and descendants, plus narrowing subtree overrides, a dedicated + anonymous reader/navigation snapshot, immediate superior-ceiling revocation, + alias/UUID/Revision fences and atomic rename tracking. Keep `/u/` out of the + global anonymous tree. See [user-space publication](user-space-publication.md). +- [x] Harden anonymous navigation: public root/virtual-folder landing, read-only + directory, Page/children round trips, tree expand/collapse/filter/keyboard + controls, mobile header and City exits, cancellable bounded children loading, + retries and progressive pagination; retain exact-publication boundaries. +- [x] Explicit Street/Spot automatic publication with inherited manual-approval + boundaries, confirmed impact previews, live publisher/ACL checks and cache + invalidation. Existing scopes remain opt-in; see + [implemented slice and limits](automatic-publication.md). +- [ ] Immutable review requests, scoped approvers, durable outbox delivery and + reviewer notification Inbox. Continue the remaining AP-1 through AP-6 work in + [approval workflow design](publication-approval-inbox.md); automatic publication + does not implement the human approval workflow or silently activate drafts. +- [ ] Complete dependency/alias-aware publication previews, large-site review + and per-capability audiences; current approvals exclude aliases, restricted + user/group scopes and dependencies rather than implicitly publishing them. +- [ ] Fence locality publication against alias/move/merge/archive/import bypass, + and share one anonymous read evaluator across safe Viewer/media, City/search, + children and OGP. Gate enablement on HTML isolation and revocation tests. +- [ ] Add share management, expiry, revocation, access audit, optional password, + download prohibition, language/path restrictions, and QR-friendly links. +- [ ] Ensure share credentials are separate from login, adapter, federation, + and API bearer credentials. + +## Phase 6 — Activity, notification, and collaboration + +- [ ] Formalize a Domain-sequenced event outbox for Page, Revision, Path, + topology, policy, share, comment, reaction, quality, and federation events. +- [ ] Add Page/Spot/Street/Quartier subscription and change-notification rules. +- [ ] Add a per-Principal notification inbox with unread state, grouping, + filtering, retention, cursor pagination, and authorization-safe deep links. +- [ ] Add delivery channels for Web inbox, email digest, webhook, and future + push adapters, with retry/dead-letter state in the event scheduler. +- [ ] Add recently edited and recently viewed Page projections; keep private + activity private and provide retention/opt-out controls. +- [ ] Add privacy-aware Page view counters with bot filtering, idempotent event + aggregation, time windows, and “most viewed” projections. +- [ ] Add Page reactions/likes without modifying immutable Revision payloads. +- [ ] Add document-quality assessments with rubric/version, reviewer identity, + score history, and machine/human provenance. +- [ ] Add Revision-anchored inline comments with text-range anchors, context + hashes, orphan/rebase handling, resolution state, and permissions. +- [ ] Add Page-level threaded comments below the document with moderation, + mentions, subscriptions, edit history, and soft deletion. + +## Phase 7 — Knowledge City services + +- [ ] Complete Campus landing, Domain catalog, controller status, announcements, + shared navigation defaults, audit, export, and delegated Campus governance. +- [ ] Complete Quartier charter, entrances, localized signage, curators, + announcements, scoped activity/search, subscriptions, health, merge/split, + export/import, and policy-default surfaces. +- [ ] Complete Street route intent, sections, Inbox, landing, activity, + maintenance queue, subscriptions, merge/split/promotion, and policy override. +- [ ] Complete Spot generated portal, curator workflow, dynamic sections, + watchers/digests, backlinks, shortest routes, health states, split/merge, + archive/successor, and machine-readable context payload. +- [ ] Add Campus/Quartier/Street/Spot notification and permission inventory + integration without turning locality into Page identity. + +## Phase 8 — Controller disaster recovery and high availability + +- [ ] Add controller manifest journal replication to a designated DR instance, + including signing-key rotation/escrow, encrypted backup, sequence verification, + last-known-good snapshots, RPO/RTO reporting, and restore drills. +- [ ] Add controller leader election or manual promotion with fencing so two + controllers cannot publish the same Campus sequence concurrently. +- [ ] Add managed-instance controller failover using a pinned set of controller + identities and an auditable promotion epoch. +- [ ] Separate process-local cache/session/job state from canonical state and + define shared/replicated backends required by multiple application nodes. +- [ ] Add health, readiness, graceful drain, idempotency, forwarded-origin + validation, and node identity endpoints for load balancers. +- [ ] Add an LB reference deployment with TLS termination, WebSocket support, + upload limits, no mandatory sticky session, and failure tests. +- [ ] Add an HA metadata backend or a fenced single-writer/replica design; + never mount the writable SQLite database concurrently from multiple nodes. +- [ ] Add Document Store replication/read-repair and background-job leases so + only one node performs a claimed task. +- [ ] Exercise node loss, controller loss, network partition, stale replica, + key rotation, and rollback in automated fault tests. + +## Phase 9 — Content composition and extension runtime + +- [ ] Evaluate tasks/tickets, an organizer with calendar/contact interoperability, + RSS/Atom reading and FreshRSS/newsboat integration, IMAP mail-to-Wiki and + incremental HTML editor improvements. Full WYSIWYG remains + an open decision, not a commitment. See the design-only + [organizer and editing ideas](organizer-and-editing-ideas.md); these are not part + of the current implementation batch. The detailed design has since been expanded + in the [Japanese handbook](ja/index.md), chapters 12–17; implementation remains + unchecked and follows [the dependency-ordered plan](ja/roadmap.md). + +- [ ] Add a versioned transpiler registry that converts PukiWiki, Redmine, + DokuWiki, MediaWiki, and future source syntaxes into canonical HTML while + preserving the original source as immutable metadata or a related Revision. +- [ ] Complete Markdown round-trip guarantees and record compiler ID/version, + warnings, source map, and canonicalization result on every conversion. +- [ ] Add Excalidraw and draw.io canvas projections with immutable asset + freezing and configured hosted-editor actions. +- [ ] Add Kroki and PlantUML diagram adapters with bounded input, pinned renderer + version, cached immutable output, timeout, and network policy. +- [ ] Add nwdiag as a bounded network-diagram projection and editor adapter; + support static SVG fallback, pinned renderer versions, and explicit source + import/save without executing authored code. +- [ ] Add a widget/oEmbed registry for Spotify, YouTube, SoundCloud, and future + providers with Domain allowlists, consent placeholders, CSP sandboxing, + privacy mode, and no arbitrary document-authored script execution. +- [ ] Add administrator-packaged widgets with signed manifests, semantic + versioning, capability declarations, resource quotas, and disable/rollback. +- [ ] Add a generated top-page composer using authorized queries, static blocks, + recent work, recent views, popular Pages, featured City entrances, and feeds. +- [x] Add initial diary/blog template/query/navigation projections over ordinary + Pages, not a new Page identity or date-dependent storage hierarchy. Registration + metadata follows Page UUID; atomic new-post composition, local Domain projection, + dedicated public article routes/navigation and RSS 2.0 are implemented. + Remaining federation/metadata/Atom work is in the [follow-up plan](diary-blog-plugins.md). +- [ ] Add directory-scoped RSS/Atom feed widgets with scheduler fetching, + conditional requests, sanitization, per-host limits, caching, and provenance. +- [ ] Add a bounded CSV table macro and CSV editor projection. RFC 4180-compatible + CSV remains the interchange baseline; ODS is a separate multi-sheet adapter. +- [ ] Add Reveal-compatible slide projection adapters for HedgeDoc and Slidev, + plus a CSS-only scroll-snap/print editor fallback with explicit import/save. +- [ ] Add custom theme packages with inheritance, tokens, preview, validation, + CSP-safe assets, versioning, export/import, and one-click rollback. + +## Phase 10 — External storage, inspection, and ecosystem + +- [ ] Define a Document Store backend interface preserving SHA-256 identity, + seek/range reads, atomic put-if-absent, integrity verification, and streaming. +- [ ] Add S3-compatible immutable Document storage with multipart upload, + server-side encryption, credential isolation, lifecycle policy, replication, + local cache, and read-after-write verification. +- [ ] Keep metadata, mutable configuration, and secrets out of the Document + Store; external object keys must never replace Document SHA-256 identity. +- [ ] Add asynchronous file inspection states (`pending`, `clean`, `suspicious`, + `malicious`, `error`, `expired`) and quarantine-aware authorization. +- [ ] Add MWDB/Karton integration through a bounded inspection adapter and event + queue; Viewer/download policy must fail closed where a Domain requires audit. +- [ ] Record scanner engine/version, signatures, hashes, timestamps, verdict + provenance, rescan policy, administrator override, and audit events. +- [ ] Add an extension catalog/API for projection, editor, transpiler, widget, + notification, inspection, storage, search, and theme providers. +- [ ] Add typed IPAM, DNS zone/record, and inventory/asset extensions with + approval-gated provider writes, dry-run, etag checks, secrets, audit, and + bounded queue execution. +- [ ] Add extension signature verification, capability review, compatibility + ranges, install/upgrade/disable/rollback, health, logs, and resource quotas. + +Each phase requires schema migration, rollback analysis, and tests before the +next phase begins. diff --git a/docs/design/implementation-status.md b/docs/design/implementation-status.md new file mode 100644 index 0000000..dfa1630 --- /dev/null +++ b/docs/design/implementation-status.md @@ -0,0 +1,401 @@ +# Implementation status and hardening backlog + +For the consolidated current reading order, use the [Japanese handbook](ja/index.md) +and [decision register](ja/decisions.md). Dated entries below preserve history; +older statements about missing anonymous navigation, blog publication or RSS are +superseded by the newer slices, not additional unfinished implementations. + +This document is a working handoff for the current repository state. It is +based on the implementation-roadmap, architecture documents, and a static +review of the handlers and stores. Checked roadmap items describe a usable +first slice; they do not imply production-ready federation, HA, or extension +security. + +## Current state + +2026-09-25 task reminders: explicit per-task due/planned-date switches and a local +notification time now schedule owner-only Inbox reminders. Reservations are updated +in the source transaction; the bounded scheduler rechecks current state/authority, +skips previous-day catch-up, and commits Inbox insertion plus acknowledgment together. +Titles are projected under current authorization rather than copied into notices. +Notification badges refresh on visible pages without reload. Calendar reminders, +quiet hours, digests and external delivery remain pending. See [contract](ja/task-reminders.md). + +2026-09-24 outbox follow-up: City now subscribes only to relevant page/revision/path/object +events, with independent consumer checkpoints rather than shared processed flags. +Per-type high-water marks avoid repeated full-history discovery. Task/project mutations +append metadata-only events in their source transaction; a bounded scheduled bridge +replays the earlier task journal idempotently. Notification delivery and retention are +not included. See [delivery contract](ja/outbox-delivery.md). + +2026-09-24 task first slice: private `organizer.tasks` items/projects, Today/Inbox/ +Backlog/Review/Completed/Archive UI, conditional updates, idempotent create, +immutable CAS revision payloads and UUID-based Wiki references are implemented. +Ownership is distinct from Wiki ACLs; even Domain administrators cannot read +another principal's tasks through these endpoints. The local atomic change journal +is now connected to the common outbox, but notification delivery, time-block/calendar integration, Pomodoro, +sharing and VTODO synchronization remain follow-ups. SQLite metadata and the +Document Store must be backed up together. See [contract and remaining work](ja/tasks-implementation.md). + +2026-09-19 outbox foundation: `activity_outbox` now has a persistent, bounded +envelope with Domain-local monotonic sequence numbers, actor/target references, +idempotency keys, retry state and pending-page retrieval. The append API is +transaction-bound and deliberately does not authorize or project payloads. +Page creation and Revision writes now append through this envelope in their +source transactions. Path rename/delete and Object purge are also recorded; +Domain-local consumer checkpoints are durable and monotonic. A debounced City +consumer now reconciles pending URL events through the scheduler and advances +its checkpoint only after a successful plan. Recipient-scoped notification Inbox +storage and an authenticated list/read API are now implemented with idempotent +deduplication and keyset pagination; approval request producers, reviewer UI and +delivery workers remain pending, so this is not yet a completed activity pipeline. + +Street/Spot automatic publication is opt-in through the governance dialog. Current +and future eligible heads follow the pinned Path boundary with live audience and +enabling-actor authority checks. Domain/Quartier/Street/Spot manual-only floors narrow +it; anonymous navigation/blog projection/RSS/share readiness follow the same policy. +Existing scopes stay unchanged. Reviewer/Inbox and policy federation remain pending; +see [automatic-publication.md](automatic-publication.md). + +Local diary/blog projection first slice: Campus admins select source Domain and prefix +inside the entry dialog. Same-Campus/local placement only, no copied content; both +Domains' read policies filter private metadata; editing stays on the source Domain. +Target article writes are rejected. Anonymous projection indexes/calendars now derive +only from approved source Paths/Revisions, never private registration metadata. +Dedicated-domain links now open `/YYYY/MM/DD[/keyword]` on that host with sanitized +published bodies, calendar/month/adjacent-article navigation, target Domain branding +and `/rss.xml` (20 items). Registered titles now explicitly inherit Page publication +visibility; category/owner/registration date stay private. No cross-instance transport, +source configuration federation or automatic cross-Domain session sharing yet. + +RSS now includes sanitized, absolute-URL HTML in `content:encoded` with bounded +generation and exact publication rechecks. Authenticated `/v/{blog|diary}/-/new` +pages reuse atomic composition. Post completion offers X sharing with configured +projection-domain URLs, target selection and unpublished-link warnings; no automatic +social posting, publication grants or credentials are added. + +Domain entry provisioning is implemented in source: Campus-admin dialog per Domain, +explicit allowlisted settings, signed manifest v2 when settings are present, and +transactional apply together with Domain snapshot/checkpoint. Legacy manifests without +entry settings remain v1. Destinations must be upgraded before activating v2 settings; +signed enrollment capability proof and Campus-wide preflight are implemented. +Create-form integration, apply acknowledgments/freshness and control-release/GC remain +pending. Managed nodes cannot override entry settings locally. No new public grants. + +Atomic diary/blog composition is now implemented in source: Markdown composer, +create/write checks inside the writer transaction, Page/Path/Revision/article/journal/ +receipt atomicity and idempotent retries. Shared Revision insertion and asset freezing +are reused. Anonymous article-index approval, City/notification outbox dispatch, +receipt retention and application acknowledgments remain pending. Existing +two-step editor/registration is optional, not the only new-post workflow. + +2026-09-17 URL/entry slice (source implementation): per-Domain diary/blog prefixes, +date/keyword URL planner, same-day multiple diary entries, and home_layout diary/blog +rendering at `/`. Placement label shortened; placement identity remains separate. +The planner is read-only and does not reserve Paths. Editor save and registration +remain separate in the legacy flow; public calendar approval is still TODO. +Existing article Paths are not migrated. + +Diary/blog initial slice: `content.diary` and `content.blog` are separate trusted +built-ins with Domain enable/disable settings, Page UUID-bound metadata, +calendar/recent entries/categories, registration/update/unregister dialogs and +fresh read filters. Disabled by default; indices require authentication and +registration does not publish a Page. Public index +approval/feeds, comments and tDiary import remain explicitly deferred; see +[detailed design](diary-blog-plugins.md). + +2026-09-16 anonymous navigation hardening: public root and virtual parents now +offer safe directory landing pages, with read-only `/v/browser` and separate +Page/children links. Trees support all/per-folder expand/collapse, name/Path +filtering and keyboard navigation. Responsive public headers, direct City exits, +bounded/abortable asynchronous listings, retry and no-JavaScript pagination are +implemented. No additional publication or approval policy is enabled. + +2026-09-16 navigation follow-up: approved public Pages now expose filtered +children/tree/City navigation and breadcrumbs, without a download button. +Database generations invalidate bounded metadata caches; authenticated filters +remain request-scoped, including group revocation on unchanged cached data. +Private parent bodies/titles are not exposed through structural folders. See +[navigation](public-navigation.md). Hierarchical approval requirements and the +reviewer workflow remain [designed and TODO](publication-approval-inbox.md), +while the reusable recipient Inbox API is available but not populated by approval +requests. Approval request subjects, decisions, generation fencing and bounded +expiry sweeps are persisted, but reviewer eligibility and decision UI are not +exposed; the current explicit approval workflow remains in force. + +2026-09-14 user/group and anonymous follow-up: named local user/group read or +read/write settings now intersect ancestor caps, resolve stable subject IDs and +observe live membership. Explicit bounded current-revision approvals enable a +separate inert anonymous semantic Viewer and raw-media path with revocation and +OGP. Existing visibility is unchanged until configured. Important first-slice +limits: authenticated ACLs freeze protected namespace/City structural changes; +anonymous edits require reapproval, and discovery/dependencies remain private. +See [implementation contract and remaining tasks](locality-access-publication.md). + +2026-09-14 locality governance: scoped Quartier/Spot co-owner appointments, +versioned publication-cap drafts, transactional authority rechecks, local audit +records and themed Japanese/English settings dialogs are implemented. Domain +ceiling is in the City Map utility menu. The subsequent bounded anonymous slice +and coarse namespace fences are described above; complete impact-aware +mutation/dependency handling remains a next gate. See +[exact first-slice scope](locality-publication-ownership.md). + +2026-09-14 P0 HTML remediation, extended 2026-09-23: normal +Viewer/home/profile/object/history/print and both Editor previews use the +`controlled-v2` allowlist with application CSP. External resources remain +default-deny; Domain administrators may approve exact HTTPS image URLs or +SHA-256-pinned CSS/JavaScript URLs through the shared Projection/CSP policy. +Canonical bytes are preserved; authored scripts/styles/frames are not activated. +Diagram cache reads recheck Domain/Path authority and sandbox SVG. See +[contract, compatibility and tests](html-projection-trust.md). Ownership/public +activation remains separate work, not implicitly enabled by this security fix. + +2026-09-14 publication governance design: explicit Quartier/Spot owners may +administer publication only within superior ceilings; appointment authority, +cap-vs-publication semantics, mutation/alias fencing and the release sequence +are documented in [locality ownership](locality-publication-ownership.md). +The owner API/UI and draft policies have subsequently been implemented as above; +production visibility has not been changed. + +2026-09-14 social-card follow-up: already-public semantic Pages, home layouts +and City views now emit OGP/X metadata with bounded canonical-text summaries, +safe absolute URLs and a common PNG cover (original images for image documents). +Enforcing domains retain authentication and suppress content-card metadata; +no visibility policy was changed. See [contract and limits](social-link-cards.md). + +2026-09-14 City reference follow-up: parent-qualified readable Street URLs now +replace ambiguous name-only links in map/search/macros. Details require ancestor +read permission and fetch only the requested node; map focus and locality search +work for Quartier, Street and Spot. Literal Page link encoding is shared by the +map and its inspector. See [read integrity](city-read-integrity.md). + +2026-09-14 City/search options follow-up: metadata-only Quartier/Street/Spot +matches appear ahead of Pages, with visible ancestor context and safe links. +Search now supports file categories, one extension, and Domain-local calendar +date ranges over creation/update times. Filters run before candidate limits; +City and Page reads share the existing deadline. See +[search options and their exact semantics](search-results.md#city-first-results-and-search-options). + +2026-09-14 search timeout follow-up: corrected a production Path-first repeated +FTS scan and costly snippet generation. Input/time-bounded optional excerpts +now preserve search results; query-plan and realistic-volume regressions plus +read-only live-data timing cover the original blind spot. See +[search correction](search-results.md#timeout-regression-and-correction-2026-09-14). + +2026-09-14 hardening follow-up: authentication and inherited authorization, +recursive mutations, federation snapshots and garbage collection now have +bounded, denial/concurrency-focused regression coverage. City generation and +PDF/archive metadata work are off the request/rendering path; search and history +have bounded, clearer projections. See the [execution ledger](hardening-execution-2026-09.md) +for validation/deployment and explicit deferrals. The subsequently corrected +normal HTML boundary is recorded above; broader publication gates remain open. + +2026-09-14 City UI follow-up: Spot clicks now explore their courtyards, with +surrounding Page links, bounded nonoverlapping close-ups and a modal utility +menu. Manual title/selection/merge/move controls remain available. See +[City projection and its remaining limits](city-immersive-map.md). + +2026-09-13 follow-up: execution and resource panels are now one monitor with only +running jobs. Completed jobs and lazy, paginated logs share a history panel. +Active queue counts avoid scanning completed history; job queries use indexed +status filters and keyset pagination. Legacy `panel=resources` resolves to the monitor. +The first resumed hardening task protects group owners from ordinary update +downgrades and checks last-owner removal within the DELETE itself (including +concurrent removals and manager authority against the target's current role). + +Current follow-up adds viewport-responsive bookmark columns, persistent +background resource monitoring, and a separate trusted system-extension +catalog. Other system services are designed and sequenced in +[System extensions](system-extensions.md); third-party plugin execution is +not yet enabled. vim.wasm runtime work is paused at the user's request. + +Latest UI follow-up: application asset authorization and `/e/` target decoding +are corrected; home bookmarks support admin management, section cards and +bounded asynchronous child links. Hosted Vim now explicitly loads its vimrc, +local font and pure-Vimscript navigation plugin. See +[implementation and remaining limits](home-bookmark-sections-vim.md). + +Viewer shortcut follow-up: `e/f/v/c/u/s/p` and the four Ctrl-arrow navigation +bindings are implemented in `static/js/viewer-shortcuts.js`. They suppress +themselves while typing or inside dialogs; sharing copies the current canonical +URL and opens a user-confirmed X Intent. The X action is cataloged as the trusted +builtin `sharing.x` extension; it does not grant publication or create a share +credential. Permission shortcut behavior depends on the City governance context. + +The repository currently has working first slices for: + +- Campus and Domain scoped semantic paths, local/remote placement, controller + enrollment, signed manifest reconciliation, and the initial Knowledge City + topology/map UI. +- UUID/Object, immutable Revision, SHA-256 Document storage, language fallback, + asset HEAD/history, bounded text and JSON projections, archive/CSV/EML/PDF + adapters, and hosted code-server/vim.wasm/Excalidraw adapters. +- Password/TOTP sessions, OIDC, LDAP/LDAPS, and SMTP magic-link flows, Domain + capabilities, built-in campus/domain administrator groups, group permission + profiles, and a centralized endpoint policy classifier. +- Persistent event jobs with priority, retry, cancellation, concurrency + settings, preview generation, import jobs, and manual scheduler controls. + +The current deployment is a single writable SQLite application node plus a +managed external-domain node. This is a supported development topology, not +HA: canonical metadata, session revocation, scheduler claims, and adapter +state are still process/instance local. + +## Confirmed corrections (2026-09-14) + +The [execution ledger](hardening-execution-2026-09.md) records verification and +deployment separately. Completed, regression-tested slices include: + +- OIDC issuer JWKS signatures, algorithm/claim checks, browser-bound state, + bounded key/discovery fetches and account-binding collision rejection; + [verification contract](oidc-verification.md). +- SMTP connection/protocol deadlines, bounded replies, STARTTLS, mailbox/header + validation, one-use challenges and live membership checks; + [delivery limits](smtp-magic-link-hardening.md). +- Campus-admin provenance and transactional derived-membership revocation while + retaining independent local grants; [inheritance contract](campus-admin-revocation.md). +- Same-origin browser mutation protection, POST logout, typed browser/API + credentials, atomic session-state checks and request-scoped batch Path reads; + [request boundaries](browser-request-security.md). +- Domain scope for Object reads/saves/binds, exact exceptional Object grants and + atomic API creation provenance; [Object scope](object-authority-scope.md). +- Transactional complete-binding snapshots for recursive Path changes and + all-alias Domain-local Object purges; [mutation integrity](path-mutation-integrity.md). +- Atomic controller manifest sequence allocation and managed snapshot, + inherited-permission and checkpoint application; authority collision and + unsigned-downgrade rejection; [manifest integrity](federation-manifest-integrity.md). +- Private, per-result City map/details/macros/badges, recomputed visible + portals/counts/relations, local generation Worker, cancellation/cache bounds, + directional keyboard navigation and immersive courtyards; + [navigation contract](city-worker-navigation.md). +- Persisted scheduler projections for PDF page counts and non-ZIP archive + metadata, localized pending/retry UI and immutable Revision entry links; + [projection cache](projection-metadata-cache.md). +- Bounded compact search with full Paths, matching-source badges and safe + excerpts/highlighting; [search contract](search-results.md). +- Bounded metadata-only Object/Revision APIs and paginated history, retaining + array response shapes and explicit continuation; + [Object pagination](object-list-pagination.md), [Revision pagination](revision-listing.md). +- Literal URL encoding in all three children views, including filenames with + question marks, fragments, percent signs and non-ASCII characters. +- One-connection-safe City read transactions with deadlines/ceilings and literal + boundary matching; [read integrity](city-read-integrity.md). +- Atomic bounded zombie selection/purge, current-Domain provenance for HTTP + administration, retained global maintenance grace and orphan-writer guards; + [GC integrity](zombie-gc-integrity.md). + +These are not a claim that every endpoint, derived projection or write path has +finished authorization and concurrency review. + +### 2026-09-23: user-space audience controls + +- `/u/{username}/_/edit` now separates profile metadata, avatar, Wiki-root and + descendant audiences. Descendant exact/subtree overrides can only narrow the + default, are CAS-versioned/audited, and follow atomic Path rename. +- A dedicated anonymous live-head reader supplies user profile, Viewer/raw, + children, scoped Tree and Browser projections without adding `/u/` to global + anonymous navigation. It rechecks the Domain public ceiling per request and + rejects aliases and UUID/Revision bypasses. +- Authenticated listings and direct Object/Revision authorization also enforce + private user-space audiences. Owner and Domain-admin recovery are explicit. + Focused revocation, alias, navigation and recursive-rename tests pass. See + [user-space publication](user-space-publication.md). + +## Remaining gates and risks + +### P0: authority and content trust + +1. Finish authorization-policy/version fencing inside every write transaction. + Recursive binding snapshots protect namespace races, not a concurrent + revocation of the grants themselves. Typed decoded mutation targets, + handler-method closure and idempotency remain wider cross-handler work. +2. Complete publication-impact review and mutation fencing on the implemented + owner/draft-policy and [inert HTML boundary](html-projection-trust.md). Keep public + enabling gated on structural mutation/alias fences and common anonymous-read + policy/revocation tests. See [ownership design](locality-publication-ownership.md). + Extend denial tests to each new projection; CSP is not an authorization grant. +3. Local-email ownership, explicit external-account linking, provider subject + migrations and administrator last-owner suspension/transfer need dedicated + lifecycle workflows. Rejecting ambiguous email matches is not email proof. +4. Domain-to-Domain PSK identity/group/grant inheritance needs its own origin, + replay, conflict and revocation contract. The completed Campus-admin local + projection is not that cross-instance synchronization feature. +5. Audit remaining list/projection, asset and adapter paths with + denial-focused tests before claiming complete Domain isolation. Legacy + unknown-origin unbound Objects require explicit grants or trusted recovery. + HTTP zombie GC is now provenance-scoped; trusted global maintenance remains + a distinct instance authority rather than a Domain administrator operation. + +### P1: City correctness and responsiveness + +See [City review and reconciliation](city-review-and-reconciliation.md). +CITY-A through CITY-D remain partially open. Remaining work includes shallow +Path/portal inference, deterministic generated Spot name collisions, +idempotent no-op application, explicit generated/manual ownership, exclusion +tombstones, event watermarks and a transactional mutation outbox. + +Worker generation and bounded courtyard DOM do not solve connected/fair road +allocation or all main-thread topology/layout work. Lazy locality/Page +projections and a directory index remain important for much larger Wikis. +The Viewer sidebar / paginated navigation API is also separate from the +already-implemented home layouts and scoped Tree View. + +### P1: projection and storage scaling + +1. Non-ZIP entry extraction still runs a bounded foreground decoder. Durable + entry artifacts need quotas, leases, Range semantics and archive-bomb policy. + ZIP central-directory parsing and nested/compressed TAR expansion need their + own bounded worker/index contract. +2. Native decoders have input/output/thread/time bounds, not hard memory/cgroup + limits. A weighted scheduler resource budget and decoder isolation remain. +3. Search FTS still contains historical revisions; current-only indexing, + Japanese infix search and sanitized plain-text indexing are separate tasks. + SQL deadlines/candidate bounds limit work, not unlimited recall. +4. Browser/children/Tree and some link projections still aggregate large Path + sets. Request-scoped ACL removes repeated grant queries but does not replace + a directory index, bounded SQL candidates or fully opaque continuations. +5. Large-binary restore and several trusted full-list helpers still hydrate or + enumerate complete data. HTTP Object/Revision pagination does not silently + change explicit CLI full exports. +6. Remote Document Store backends, read-repair, retention proofs, cross-instance + job leases, dead-letter operations and writable metadata fencing remain. + +### Operations and intentionally deferred high-risk work + +- Existing deployment is two application instances with separate SQLite state, + not a shared-writer HA service. DR/LB require replication, fencing, key custody + and recovery drills; no live SQLite-over-network-filesystem shortcut. +- Enrollment tokens currently present in compose must be moved to a selected + secret mechanism and rotated deliberately. No credentials were automatically + replaced, printed or copied as part of these repairs. +- Untrusted plugin execution/native helpers remain disabled/deferred until the + runtime capability/signature/isolation model exists. vim.wasm runtime work + remains on the user's explicit hold. +- Live S3/SSHFS/WebDAV/MWDB/Karton/SNMP/LDAP integration requires selected endpoints, + credentials and test services. No external service was provisioned implicitly. + +## Ordered next work + +1. Add complete publication-impact previews and structural mutation/alias fences + to locality governance; keep anonymous access disabled until all publication + gates and fresh activation confirmations are satisfied. +2. Complete remaining mutation/policy transaction fences and account ownership + lifecycle; preserve denial tests and audited provenance. +3. Finish bounded/lazy City and directory projections; implement idempotent + URL inference with generated/manual ownership before automatic event-driven + application. +4. Add the transactional Domain activity outbox, verified actor attribution, + durable consumer watermarks and recent-edit projections. +5. Then add delegated shared links, notifications/inbox, moderated comments, + rankings/quality, diary calendar/recent entries/comments and resumable tDiary + import. Their detailed contracts remain in [System extensions](system-extensions.md). +6. External connectors, isolated third-party plugins and DR/LB/HA follow only + after their authority, retention and operations prerequisites are met. + +## Verification expectations + +Every hardening slice must run `go test ./...`, include a regression test for +the denied case, and update the relevant design document and roadmap checkbox. +Deployment validation must confirm both app nodes are healthy and that a +foreground request cannot expose another Domain's Object, Revision, Path, or +adapter workspace. diff --git a/docs/design/ja/active-notifications.md b/docs/design/ja/active-notifications.md new file mode 100644 index 0000000..7c936c9 --- /dev/null +++ b/docs/design/ja/active-notifications.md @@ -0,0 +1,61 @@ +# アクティブ通知とWeb Push + +更新:2026-09-25。実装・隔離fixture検証済み。同日05:59 JSTに本番2インスタンスへ反映済み。[反映記録](../../operations/deployments/2026-09-25-active-notifications-calendar-mobile.md)。実機Push受信確認は未実施。 + +## UIと設定 + +通知ベルを開いたInboxの「⚙ 通知設定」に集約する。アカウント・ドメイン・ブラウザごとにlocalStorageへ保存し、他ユーザの設定を継承しない。通知本文はlocalStorageに保存しない。 + +| 状態 | 動作 | +| --- | --- | +| フォーカス中 | 右下に8秒で消えるトースト。最大3個。入力フォーカスを奪わない。既定ON | +| 別タブ・別ウィンドウ/タブ終了 | 明示的に許可した端末へWeb Push。OSの通知UIを使用 | +| 再訪 | 前回訪問以降の未読がある場合、設定ONならInboxを自動表示。既定OFF | +| ダイアログ・入力を操作中 | 自動Inboxは保留し、次の確認時まで待つ | + +新着は30件ずつ取得し、Inboxは「さらに表示」でページングする。訪問watermarkはサーバー時刻を使う。Web Locksと通知UUIDの短い履歴(最大200個)で複数タブのトーストを抑制する。Web Locks非対応時はbest effort。 + +音は「なし/ソフト/チャイム/ベル」と音量・試聴。Web Audioはブラウザの自動再生制限に従い、利用者の操作後に有効になる。カスタム音はフォーカス中のページ通知用。背景/タブ終了時の音はOS設定で決まり、サイト側から任意の音に置き換えることは保証しない。 + +ブラウザの通知許可は設定操作時のみ要求する。HTTPSと対応ブラウザが必要。iOS等はホーム画面への追加など端末側の条件もある。サービス・省電力・通信・キュー待ちに依存するため、定刻到達を保証するアラーム用途ではない。 + +## 配信経路と安全性 + +`notification_inbox`挿入のDB triggerで`notification_push_queue`へ原子的に追加する。Inboxの全種類(タスク期限・計画日、Pomodoro、アナウンス等)で同じ経路を使う。購読開始前の通知を一斉再送しない。 + +`/_/api/v1/notifications/push`: + +- GET: VAPID公開鍵のみ。秘密鍵はDB内部に保存。 +- POST: PushSubscription、focused、seen(最大30通知ID)。購読更新/閲覧中のack。 +- DELETE: 現在の利用者が所有する購読を削除。 + +購読はDomain・Principal・**元の認証セッションのハッシュ**に束縛する。Bearer tokenは保存しない。配信時にセッション期限/失効、Principal、membership、Domain配置を再確認する。ログアウト後や無効化後は送信しない。最大8購読/利用者・Domain、30日lease(閲覧時に更新)。 + +VAPID秘密鍵は`notification_push_keys`に保存するため、DBバックアップを秘密情報として扱う。鍵を失った復旧では再購読が必要。端末の購読URL・鍵・通知本文をログへ出さない。 + +送信先はChrome/Chromium FCM、Mozilla Push、Apple Web Pushに限定。HTTPS/443のみ、資格情報・fragmentを拒否し、公開IPをDNS解決後に固定する。proxy環境変数とredirectは使用しない。プライベートIPへの接続は禁止する。Push本文は暗号化された通知UUID/受取人UUID/Domain UUIDのみ。件名・本文をPushサービスへ送らない。OSに表示するのも一般的な「新着通知」のみ。クリック後に通常の認可されたInboxで詳細を表示する。 + +Service Workerは`/static/js/notifications-worker.js`、scopeは`/static/js/`。fetch handlerやページキャッシュを持たず、既存のWikiページ/エディタに古い内容を返さない。notificationclickは同一originの`/v/notification`だけを開く。 + +## スケジューラと上限 + +イベント`notification.push.deliver`、定義`builtin.notification.push`。既定30秒、priority -3。設定画面のイベント設定から停止・間隔変更・手動実行でき、再起動で既存設定を上書きしない。 + +- 最大20件/run、全体25秒、送信要求5秒。DB transaction内でネットワーク通信しない。 +- 60秒のclaim lease。期限切れを再取得できる。クラッシュ時はat-least-onceだが、ブラウザ通知tagを固定し積み上げない。 +- 429/5xx/通信失敗は指数backoff、最大5試行。404/410は購読を削除。 +- キューの有効期間24時間、Push側TTL300秒。期限切れキュー削除は最大500件/run、期限切れ購読削除は100件/run。 +- フォーカスlease90秒。閲覧中は送信を延期し、ブラウザが一覧を受け取った通知のackでキューを消す。表示できなかったままタブが閉じればlease終了後に再評価する。 +- 前面pollは30秒。Pushが有効な背景タブは定期pollを停止し、Pushと復帰を契機に更新する。 +- sent/failed集計をイベントログへ記録。再送でもInbox本体は複製しない。 + +フォーカスを失う瞬間やネットワーク遅延にはraceがあり、OS通知を完全に抑制する保証はしない。常に通知権限とOSの設定が優先する。 + +## 検証・残TODO + +- Go: 原子rollback、claim重複防止、focus延期とack、他人のack拒否、失効後の配信遮断、backoff、購読API認証、公開鍵のみ、送信先とP-256鍵検証、イベント設定保持。 +- Chromiumの合成fixture: 前面トースト、再訪Inbox、設定モーダルの横幅、既存Inbox既読/バッジ。実通知サービスへは送っていない。 +- TODO: 実機Chrome/Firefox/Safari/iOSでの購読・閉タブ配信・復帰・logoutを確認。Pushサービス障害テストの拡充、端末一覧/VAPID rotation UI、quiet hours/digest、種類別設定、OS通知の詳細表示opt-in、端末間の個人設定同期。 +- TODO: expired/revoked購読の清掃メトリクス、Push queue深さ/遅延/失敗コードの管理UI。旧worker購読の移行手順。 + +参考:[MDN Push API](https://developer.mozilla.org/en-US/docs/Web/API/Push_API)、[MDN Notifications API](https://developer.mozilla.org/en-US/docs/Web/API/Notifications_API)、[webpush-go](https://github.com/SherClockHolmes/webpush-go)。 diff --git a/docs/design/ja/address-storage.md b/docs/design/ja/address-storage.md new file mode 100644 index 0000000..0e6d6bb --- /dev/null +++ b/docs/design/ja/address-storage.md @@ -0,0 +1,43 @@ +# 2. アドレス・保存・アセット + +状態:基本モデルとローカル保存は実装済み。外部保存・保持管理の一部はTODO。 + +## アドレス表 + +| 内部指定 | 意味 | HTTP上の主な入口 | +| --- | --- | --- | +| `path:/manual/start` | ドメイン内の可変な住所 | `/manual/start` | +| `uuid:…` | Page/Objectの安定ID | `/o/uuid:…` | +| `rev:…` | 特定の不変Revision | `/r/view/…`、`/v/raw/rev:…` | +| `sha256:…` | 不変Document | `/_/obj/sha256:…` | +| `asset:image:logo` | ドメイン内の編集用HEAD | 管理者向け `/v/raw/asset:image:logo` | + +通常エディタの正規入口は `/e/-/{path}`。従来の `/e/{path}` は互換入口です。生データは `/v/raw/path:/…` 等を使い、通常Pathと紛らわしい `/raw/` を増設しません。別ドメインへのリンクは宛先FQDNを含む絶対URLです。 + +## 保存トランザクション + +1. 言語・MIME・保存対象と現在の書き込み権限を検証する。 +2. 内容のSHA-256を計算し、`documents/sha256/` に不変Documentを永続化する。 +3. Page、Revision、必要なPathと依存参照を確定する。 +4. 派生処理へ通知する。共通outboxの全書き込み接続は後続課題。 + +Documentを先に書くため、DBのrollbackで未参照blobが残る可能性はあります。逆に、DBだけ確定して正本バイト列が存在しない状態は許しません。SQLiteのbody列は移行互換用で、Document Storeと二つの正本を作りません。 + +## アセットの可変HEADと固定参照 + +Asset名は `(domain_uuid, asset address)` で一意です。HEAD変更は旧Documentを上書きしません。HTML保存時に `asset:` を解決し、表示用参照をSHA-256へ固定します。編集用の由来は別属性で残し、次回保存時にHEADを再解決します。 + +`revision_document_refs` が依存Documentを記録します。過去Revisionの閲覧で最新HEADへ追従しないことが再現性の条件です。CLIと管理画面ではHEADを扱えますが、公開ページの依存物を自動公開する根拠にはなりません。 + +## 認可・条件付き操作 + +ハッシュURLは現在のDomainで読めるPageや許可された管理操作との関係を検証します。ETagと `X-PagesWiki-Object-UUID`、`X-PagesWiki-Revision-UUID`、`X-PagesWiki-Document-SHA256` は識別情報であり資格情報ではありません。 + +Asset更新は条件付き更新を使います。ただし同じ内容でMIME等だけ変わる競合には、HEADハッシュとは別の状態versionを導入する設計が必要です。 + +## TODO + +- 保持期限・削除プレビュー・export中の保護を統合したDocument GC。 +- Assetの状態version、共通監査outbox、依存関係込みの公開レビュー。 +- 大容量復元のストリーミング、外部Document backend、破損検出とread-repair。 +- CLIの全書き込みとWebの正本保存契約の統一。CLIは現在も信頼されたローカル管理経路で、HTTP認可を迂回する点を明示する。 diff --git a/docs/design/ja/auth-permissions.md b/docs/design/ja/auth-permissions.md new file mode 100644 index 0000000..dcc680e --- /dev/null +++ b/docs/design/ja/auth-permissions.md @@ -0,0 +1,59 @@ +# 5. 認証・グループ・権限 + +状態:パスワード・TOTP・セッション、OIDC、LDAP、SMTPリンク、グループと主要な認可経路は実装済み。全経路の監査完了を意味しません。 + +## 認証から認可へ + +認証器はPrincipal identityを証明します。その後、Domain membership、グループ・Role、対象操作のcapability、上位Localityの制限を評価します。OIDCのclaimやメールアドレスだけで管理権限を付与しません。 + +Principalにはactive / readonly / suspended / quarantinedの状態があります。membershipや状態の失効は次の要求で反映します。 + +LDAPはドメイン単位で設定します。検索用アカウントで`{{username}}`を +RFC 4515エスケープして一意なエントリを取得し、そのエントリのユーザーDNで +再bindできた場合だけ認証成功です。初回だけローカルの一意なユーザー名または +メールアドレスへ連結でき、その後は`entryUUID`やActive Directoryの +`objectGUID`など、設定した不変属性とprovider UUIDの組で識別します。DN、表示名、 +メールアドレスを継続ログインの識別子にはしません。自動作成は任意で、作成時は +ローカルパスワードを持たない通常のmemberに限定します。 + +LDAP/LDAPS、StartTLS、証明書検証、追加CA PEM、検索Base DNとfilter、属性mapping、 +既存アカウントの照合項目、保存済み設定によるログインテストを管理画面から設定 +できます。bindパスワードは暗号化し、利用者パスワードは保存・ログ出力しません。 +LDAPグループをPagesWikiのグループや権限へ同期する処理は認証と分離し、明示的な +mappingだけを適用する後続タスクです。 + +## セッションの目的を分離する + +ブラウザはHttpOnlyのホスト限定Cookie、APIは明示的なBearer credentialを扱います。現行はブラウザ用とAPI用のトークン種別を分け、相互に流用しません。「全画面でlocalStorageへBearerを置く」構成にはしていません。 + +adapter、federation、認証challenge、将来のshareはそれぞれ別の検証系です。明示された無効なAuthorizationをCookieで救済しません。Cookie経由の変更には同一origin検証、ログアウトにはPOSTを使います。 + +OIDCはissuer・署名・claim・state/nonce/PKCE・browser bindingを検査します。SMTPリンクは短命・一回限りのchallengeで、配送遅延をログイン要求に持ち込みません。メール一致とメール所有の証明、外部identityの明示的な連結は引き続き整理が必要です。 + +## 権限プロファイル + +| 表示用プロファイル | 許可する内容 | 許可しない内容 | +| --- | --- | --- | +| read | 閲覧 | 全変更 | +| read/write once | 未存在の対象の新規作成・アップロード、閲覧 | 上書き、再編集、削除 | +| read/write | 閲覧・作成・更新・rename・link | deleteの暗黙付与 | +| upload only | 指定範囲の未存在対象へアップロード | 一覧、閲覧、上書き、削除 | +| group admin / user | グループ内の管理上の役割 | それだけを根拠にした本文権限 | + +削除は独立したgrantです。新規作成・uploadの可否は正規化後の最終Pathをトランザクション内で検査します。Pathを先に調べ、後で無条件上書きする実装は禁止です。 + +## 管理グループと所有者 + +`campus_admin` はキャンパスとドメイン配置、`domain_admin` はDomain設定・アカウント・グループを管理するビルトイングループです。普通のグループ管理者がこれらを自分へ付与できてはいけません。 + +Quartier・Spotのco-ownerは公開設定等の委譲された管理者です。所有者であることと、上位が許可していない公開を広げることは別です。 + +## TODO + +- 全変更経路で認可versionと更新対象を同一トランザクションに固定する。 +- 最後の管理者の停止・移管、メール所有、外部identity連結・解除。 +- OIDC/LDAP外部グループの明示mapping、由来を保持した同期・失効・監査。 +- 説明可能な権限総覧:付与元、継承、上位制限、対象操作、失効理由を表示する。 +- PSK継承、adapter、Asset等を含む拒否・競合・再送テストの拡充。 + +個人用 `/u/{username}`、グループ用 `/g/{groupname}` は本文領域と `/_/edit` 等の管理領域を区別します。プロフィール画像変更を本文の無制限履歴と混同しません。ユーザー領域の所有者はプロフィール情報・画像・Wiki root・配下のaudienceを個別に狭められます。`private` は通常のDomain read grantより優先し、所有者と復旧権限を持つDomain管理者だけが読めます。匿名公開はDomainのpublic上限を越えられません。 diff --git a/docs/design/ja/blog-diary.md b/docs/design/ja/blog-diary.md new file mode 100644 index 0000000..e54a7ee --- /dev/null +++ b/docs/design/ja/blog-diary.md @@ -0,0 +1,35 @@ +# 10. ブログ・日記・公開ドメイン射影 + +状態:投稿・登録・カレンダー・同一インスタンス射影・公開記事・RSSは実装済み。コメント、tDiary移行、遠隔射影はTODO。 + +## 記事の実体とURL + +ブログと日記は別のシステム拡張ですが、本文は通常Page/Revisionです。Domainごとのprefixに対し `{prefix}/yyyy/mm/dd`、任意keywordがあれば `{prefix}/yyyy/mm/dd/{keyword}` へ作成します。同日複数記事が可能です。 + +日付・著者・カテゴリ等はPage UUIDに紐づく記事メタデータです。Path変更で失わず、登録解除でPage本文は消しません。日付はcivil dateで、timezone変更時に過去の記事を勝手に別日へ移しません。 + +## 表示と投稿 + +月別は `/v/blog/yyyy/mm`、日別は `/v/blog/yyyy/mm/dd`。日記も同様です。`?own` とカテゴリを日付移動で維持します。`/v/blog` は全期間、日記の入口は当月が基本です。日付の旧query入口は正規Pathへ案内します。 + +タイトル下は日付とタイトルのコンパクトな一覧、月入力・適用・リセットはカレンダー上の一行です。大量記事では読みやすさとページ送りを優先します。 + +`/v/blog/-/new` と `/v/diary/-/new` は認証された投稿画面です。Page、Path、Revision、記事情報、journal、再送receiptを原子的に作成します。既存Pathは409、同じrequest_idの再送は重複作成せず返します。入力変更後の同じID流用も409です。 + +## 専用ドメインはコピーではなく射影 + +例:元ドメインの `/blog` を `blog.pages.anya.jp/` に表示します。現行は同一Campus・同一インスタンスに限ります。編集は元ドメイン、表示の名称・テーマは表示先ドメイン、専用記事リンクは `/yyyy/mm/dd[/keyword]` です。 + +元が非公開なら、射影の設定だけで公開しません。匿名一覧・月件数・記事本文は承認済みまたは自動公開条件を満たす内容に限定します。登録タイトルはPage公開を継承しますが、他の登録メタデータまで無条件に公開しません。設定不整合で別の内容へ黙ってfallbackしません。 + +## RSSとX + +専用ドメインの `/rss.xml` は最新20記事を配信し、`content:encoded` に安全化したHTMLを含めます。リンクを絶対URLへ直し、正確な公開状態を再検査します。1記事1 MiB入力、合計8 MiB、5秒の生成制限を持ちます。 + +投稿後のXシェアはWeb Intentをユーザーが押す方式です。設定された専用ドメインのURLを選び、未公開なら警告します。投稿完了、公開完了、X投稿完了を同じ状態にしません。既にRSS等へ複製された本文は撤回できません。 + +## TODO + +遠隔記事射影の署名・取得・失効、metadata公開範囲、Atom、keyset paging、outbox接続、receipt/孤立データ保持、予約公開、コメント・最近のコメント、tDiary import。 + +tDiaryは対応版・入力形式をfixtureで固定し、Ruby/eval/Marshalを実行して取り込む方法は使いません。旧URL、セクション、添付、コメント著者の出典を保持し、重複・部分失敗から再開できる取り込みを設計します。 diff --git a/docs/design/ja/caldav-common.md b/docs/design/ja/caldav-common.md new file mode 100644 index 0000000..fc5b7ef --- /dev/null +++ b/docs/design/ja/caldav-common.md @@ -0,0 +1,70 @@ +# 予定・タスク共通CalDAV接続 + +2026-09-27追記:`organizer.tasks 0.10.0`で[MKCALENDARによるVTODOリスト作成](caldav-task-lists.md)を追加。共通直下のUUIDはVEVENTまたはVTODOリストを表し、種別でハンドラを選ぶ。予定本文の読み込みで判定しない。 + +2026-09-26実装。`organizer.calendar 0.2.0`/`organizer.tasks 0.9.0`。01:33 JSTに本番両インスタンスへ反映済み。[反映・検証記録](../../operations/deployments/2026-09-26-common-caldav.md)。 + +2026-09-27追記:[OneTask向け互換モード](caldav-onetask-compatibility.md)を実装、10:01 JSTに本番反映。通常は引き続き`calendar-access`を宣言せず、明示ONで発行した資格情報のみ接続判定互換のため宣言する。完全なRFC準拠ではない。実機の同期完了は未確認。 + +## 1. 接続と認証 + +共通接続先は `/_/api/v1/caldav/`。slash有無ともリダイレクトせずPROPFINDを処理する。rootはcurrent-user-principal/principal-URL/calendar-home-setを返す。Depth 1は許可された予定カレンダー(VEVENT)と個人タスクコレクション(VTODO)を返す。予定とタスクを同じICSリソースに混在させない。 + +| 対象 | URI | +| --- | --- | +| 共通home/principal | `/_/api/v1/caldav/` | +| 予定 | `/_/api/v1/caldav/{calendarUUID}/` | +| 個人タスク | `/_/api/v1/caldav/tasks/default/` | +| 既存タスク専用home(維持) | `/_/api/v1/caldav/tasks/` | +| 接続資格情報の発行/一覧 | `POST/GET /_/api/v1/caldav-credentials` | +| 失効 | `DELETE /_/api/v1/caldav-credentials/{id}` | + +予定/タスク両画面の⇄ボタンから共通設定を開く。発行時に対象 `tasks`(タスクのみ)、`calendar`(予定のみ)、`all`(両方)とread/write、有効期間を明示選択する。初期選択は開いた画面の対象で、両方を自動付与しない。 + +Basicのユーザー名は資格情報ID、パスワードは発行時のみ表示するランダム値。従来と同様、秘密値はSHA-256のみ保存し、閉じたダイアログからも消去する。通常ログインセッションでのみ発行/失効できる。DAV資格情報をWikiやJSON APIのログインとして利用することはできない(匿名公開APIを非ログイン扱いで参照できることとは別)。HTTPSを使う。 + +既存の資格情報と旧管理APIは維持。`organizer_dav_scopes`に対応行がない資格情報は必ず`tasks`として扱う。既存資格情報を予定アクセス付きに更新するAPIは設けず、新規発行と旧資格情報の明示失効で切り替える。新規の予定/共通秘密値は`pw_dav_`、既存互換タスク秘密値は`pw_taskdav_`。古いバイナリは`pw_dav_`を拒否するため、切り戻し時にも予定限定資格情報がタスク権限へ化けない。 + +## 2. 認可 + +- 資格情報をドメイン/所有者/期限/失効状態に結び、principalとdomain membershipの状態も確認する。 +- Scopeは対象種別の上限であり、他人のカレンダーを共有する権限ではない。既存のカレンダーowner/member/publicポリシーを別途適用する。 +- 共通homeの探索結果はscopeと有効な拡張機能で絞る。片方の拡張が無効でも、他方の接続設定・探索は動く。 +- 予定の書き込みは資格情報のwrite許可、active状態、カレンダーのCanWriteを全て必要とする。外部ソース由来カレンダーは従来通り書き込み不可。 +- 予定変更時はカレンダーmetadata lock内でACLと資格情報の失効・期限・write・scopeを再確認する。タスクは既存のDB transaction内再確認を維持する。 +- API・DAV応答はprivate/no-store。通常の匿名公開予定の読取経路は維持し、無効なBasic資格情報を匿名扱いにフォールバックしない。 + +## 3. 予定のresource名と正本 + +Web作成分は従来の`base64url(UID).ics`を維持。CLIが作成する任意の安全なASCIIファイル名(英数字・`.`・`_`・`-`、末尾`.ics`、最大700 bytes)を受理する。UIDとファイル名は別の識別子。 + +CLI由来のUID→filenameは`calendar.json`の`dav_names`として保持する。新規resource予約と月別ICSを同じmanifest置換でcommitする。DBだけのaliasにはせず、索引再構築・カレンダー設定変更でも保持する。削除時は対応aliasも削除する。同じcalendar内のUID重複、filename衝突、既存UIDの差替えを拒否する。 + +既存のWeb用canonical URLも引き続き解決する。WebビューアはfilenameをUIDとしてbase64 decodeする前提を廃止し、既存JSONイベントAPIの`?resource={filename}`でサーバー側解決する。`?uid=`も維持。ETag一致時には本文を取り直さない。 + +新規PUTは`If-None-Match: *`を推奨するが、chroncal互換で完全な新規identityに限り条件なし作成も可能。既存更新にはIf-Match(未指定428、不一致412)を必須とし、並行作成でも上書きしない。DELETEは予定の削除、タスクのアーカイブという既存の意味を維持する。 + +## 4. 取得上限と互換性 + +- 従来のtime-range付きREPORTとETagを利用したWeb表示を維持する。 +- 初回同期用の全件calendar-query(VCALENDAR全体、またはVEVENT指定)を追加。metadata lock内で完全なsnapshotを取得し、最大10,000 resource/32 MiBを超えれば507で全体を失敗させる。黙った切り捨てはしない。 +- PROPFIND Depth 1による予定resource列挙、全項目calendar-data選択にも対応。無制限Depth、部分projection、未対応filterは拒否する。 +- 1 resource上限256 KiB、multigetは200 href、DAVリクエストは20秒上限。既存のtime-range上限370日も維持する。 +- sync-collection/sync-tokenは未対応。405を返し、chroncalはcalendar-queryへフォールバックする。完全なCalDAV適合を示すcalendar-accessは広告しない。 +- 新規予定のiCalendar対応範囲は従来のまま:単独VEVENT、UTC DATE-TIMEまたはDATE。TZID/VTIMEZONE、浮動時刻、繰り返し、VALARMは書き込み未対応。chroncalの`--timezone`で出力されるVTIMEZONEも拒否する。情報を黙って欠落させる変換はしない。 + +## 5. 検証と運用 + +隔離したfixture、HOME、XDG、DB、資格情報のみでchroncal 0.10.0の共通探索、予定とタスクの取得、予定作成/CLI編集/Web変更取得/削除、タスク作成/完了/Web変更取得/アーカイブを検証。vdirsyncer/Todomanの既存タスク回帰も実施する。 + +権限scope、旧資格情報の移行既定値、read-only、失効、アカウント停止、拡張無効化、既存上書き拒否、並行作成、ACL取消、DB索引再構築、取得上限、Webのresource解決を試験する。ブラウザでは予定・タスク両方の設定UI、発行/失効/秘密値消去と、CLI filenameの予定描画を確認する。 + +本番の外部取り込みカレンダーの本文を調査・試験に利用しない。反映確認はhealth、未認証の経路、静的資産、エラーログ件数に限定する。 + +## 6. 後続TODO・切り戻し + +- [ ] losslessなTZID/VTIMEZONE、繰り返し・例外、アラームのDAV書込契約。正本を拡張する際は外部ICS取り込みの投影と混同しない。 +- [ ] sync-token/tombstone/変更journalによる大規模差分同期。 +- [ ] 資格情報ごとのcalendar ID制限、カレンダー作成・属性変更のDAV対応。 +- [ ] macOS/iOS等のGUI CalDAVクライアント実機検証。 +- 旧バイナリは追加DB表を無視できるが、calendar manifestを更新すると未知の`dav_names`を失う。**CLIで予定を作成した後は、旧バイナリでカレンダーを編集しない**。緊急切り戻しではカレンダー拡張を無効化して修正版を待つか、整合したDBと正本のバックアップ復元を別途承認の上で行う。DBのみ復元し正本を過去に戻したつもりにしない。 diff --git a/docs/design/ja/caldav-davx5-compatibility.md b/docs/design/ja/caldav-davx5-compatibility.md new file mode 100644 index 0000000..b555047 --- /dev/null +++ b/docs/design/ja/caldav-davx5-compatibility.md @@ -0,0 +1,34 @@ +# DAVx⁵/Tasks.orgの互換性調査 + +2026-09-27。利用者指定の公開ソース`bitfireAT/davx5-ose`を読み、commit `167dc85f211119db6a98596c08f64e5df32ca679`(2026-09-25)を基準に確認。インストール済みアプリのバージョンとは同一と仮定しない。Android実機でDAVx⁵を実行した検証ではない。 + +## 同期方式 + +- `core/src/main/kotlin/at/bitfire/davdroid/sync/TasksSyncManager.kt`:タスクは`PROPFIND_REPORT`固定。 +- `resource/remote/BaseWebDavCollection.kt`:Depth 0のPROPFINDでsupported-report-set、sync-token、getctag等を取得する。 +- `resource/remote/ResponseExt.kt`:sync-tokenを優先し、なければgetctagを使う。両方なければnull。 +- `sync/SyncManager.kt`のsyncRequired:状態nullは「同期必要」と判断する。両方ないこと自体で同期を拒否しない。 +- `sync/TaskSyncer.kt`と`resource/remote/CalDavCollection.kt`:VTODOのcalendar-queryを送り、ETagで比較し、必要なリソースをcalendar-multigetする。タスクqueryにtime-rangeは指定していない。 +- カレンダーは、期間制限やsync-collection未対応の場合PROPFIND_REPORTを選ぶ。未対応のsync-collectionを広告してはいけない。 + +したがって、提示された`XTaskApp / CodeSpark / SyncTaskListsSend`の「sync-token or ctag必須」というエラーは、調査したDAVx⁵の同期コードの挙動とは異なる。端末上でどのアプリが直接CalDAV接続しているかを区別する必要がある。 + +## PagesWikiとの差分と残件 + +- 既存リストの単純VTODO同期に必要なREPORT、ETag、multigetは既存実装にある。実機確認は未完了。 +- DAVx⁵のリスト新規作成は`DavCollectionRepository.generateMkColXml`でDAV:resourcetypeを常に付ける。現在のPagesWikiの限定MKCALENDARはこれを未対応propertyとして拒否する。VTODO専用で正しいresourcetypeを受理する回帰試験と実装が必要。 +- 作成時には説明・色・タイムゾーンや複数component-setも付く場合がある。受理する項目は正本保存・PROPFIND往復まで設計し、未知の意味を黙って破棄しない。 +- 時刻付きVTODO、繰り返し、VALARMはPagesWikiの現行限定プロファイルでは未対応。DAVx⁵が生成できる全タスク形式に対応済みではない。 +- リストの削除/属性編集、差分sync-tokenも別途残件。 + +## 今回の状態 + +追加途中だったctagのローカル変更(追加表・更新フック・応答property)は利用者の指示を受け取り下げた。本番には反映していない。取り下げ後の名前付きリスト・認可・原子性テストは成功。本番は0.10.0のまま。 + +利用者はTasks.orgを試す予定。DAVx⁵経由ではDAVx⁵のタスクアプリにTasksを選択し、同期対象の既存リストを有効化する。同じアカウントをTasks.org側に直接CalDAVとしても追加すると、Tasks.orgはDAVx⁵データを無視するため二重設定に注意する。初回は件名・日付だけのタスクで両方向を確認し、複雑な形式は分ける。 + +## 参照 + +- [調査対象の固定commit](https://github.com/bitfireAT/davx5-ose/tree/167dc85f211119db6a98596c08f64e5df32ca679) +- [Tasks.org公式:DAVx⁵連携](https://tasks.org/docs/sync_davx5/) +- [DAVx⁵公式:タスク連携](https://manual.davx5.com/tasks_notes.html) diff --git a/docs/design/ja/caldav-onetask-compatibility.md b/docs/design/ja/caldav-onetask-compatibility.md new file mode 100644 index 0000000..9856f72 --- /dev/null +++ b/docs/design/ja/caldav-onetask-compatibility.md @@ -0,0 +1,73 @@ +# OneTaskのcalendar-access判定への互換対応 + +最新追記:利用者のスタックトレースにより`SyncTaskListsSend → CreateCalendar → MKCALENDAR`のVTODOリスト新規作成失敗と特定した。[複数タスクリスト実装](caldav-task-lists.md)で対応する。以下の「MKCALENDAR未対応」は0.9系時点の調査記録。0.10.0で明示的なVTODOリスト作成を追加するが、全機能のRFC準拠は引き続き宣言しない。 + +## 2026-09-27 接続診断の追記 + +利用者のcurl応答で、共通入口の認証済みOPTIONSが204、`DAV: 1, calendar-access`、`X-PagesWiki-CalDAV-Profile: limited-compatibility`となることを確認した。資格情報の再発行を繰り返す段階ではない。別アプリOneCalendarでの追加成功に続いて、**OneTask側も追加できたと利用者から確認された**。追加順序によるものか再試行によるものかは未確定であり、カレンダーを先に追加することを必須手順にしない。アカウント追加とVTODOの同期・更新成功は分けて扱う。 + +従来のアクセスログにはHTTPステータスがなく、10:13 JST頃の共通入口PROPFINDが成功したか判定できなかった。CalDAV経路だけ、次の固定分類による診断ログへ置き換える。 + +- method、target(home/task_home/task_collection/task_resource/calendar_collection/calendar_resource/well_known)、status、duration、request_id。 +- auth(none/basic/malformed_basic/bearer/other/multiple)、outcome(未判定・Basic成功/拒否・session成功・匿名・欠落・不正・複数Authorization)。 +- challengeの有無、限定互換宣言の有無。 +- 資格情報ID・ユーザ名・秘密値・Authorization値・Cookie・User-Agent・リソース名・query・XML/ICS本文は出力しない。認証拒否の詳細な秘密値照合結果も公開しない。 + +認証・ACL・プロトコル応答は変更しない。401なら認証、403なら権限/未対応要求、207ならクライアントの探索解釈を切り分ける。ただし207でも個別propstatは404になり得るため、207だけで必要プロパティが全て成功したと判断しない。認証省略や権限緩和で迂回しない。外部取り込み予定にはアクセスせず、実データ本文なしのログと隔離fixtureで調査を継続する。 + +診断ログ追加は10:16〜10:17 JSTにapp/app2へ反映。認証済み共通入口PROPFINDの207を確認。MKCALENDARの404も観測したが、実行アプリはログから特定できない。外部クライアントからのコレクション新規作成は未対応であり、既存タスクの作成・更新とは別課題として残す。未実装のMKCALENDARを成功扱いしない。 + +その後「追加はできたが、タスクの中身が見えず`calendar or event not found`」との報告。10:17:27のMKCALENDAR404と同じ文言を既存カレンダーハンドラが返す。10:18:28にはtask_collectionへのPROPFIND207/basic_acceptedも観測。現在のログにタスク本文取得のREPORT/GET失敗はなく、一覧表示の不具合とMKCALENDAR未対応の関係は未確定。「PagesWiki Tasks」が見えるか、エラーが同期時かリスト新規作成時かを利用者へ確認中。未対応メソッドを存在確認より前で拒否して誤解を招く404を避けること、VTODO探索の階層とクライアント相互運用を検証することを残件とする。接続成功のみで同期解決済みにしない。 + +2026-09-27実装、10:01 JSTに本番両インスタンスへ反映済み。[反映記録](../../operations/deployments/2026-09-27-onetask.md)。**OneTaskアカウント追加は利用者確認済み。ただしタスク表示は未解決。互換ONで発行した資格情報が必要。** + +## 原因と今回の境界 + +OneTaskはOPTIONS応答に`calendar-access`がない場合、`This CalDav server does not support calendar-access`として探索を停止する。従来のPagesWikiは限定的なCalDAV実装のため`DAV: 1`のみを返していた。これは認証失敗やPROPFINDの失敗ではない。 + +[RFC 4791 §5.1](https://www.rfc-editor.org/rfc/rfc4791.html#section-5.1)では`calendar-access`は全MUST要件への対応宣言である。現在のPagesWikiはその全てを実装していない。従って本変更は**RFC完全準拠への変更ではなく、利用者が明示的に選ぶ接続判定の互換モード**である。付加的な独自ヘッダでこのRFC上の意味を変えられるわけではない。通常モードは今まで通り宣言しない。 + +## 設定と保存 + +カレンダー/タスクの⇄設定で認証情報を発行するとき、「OneTask互換モード(calendar-accessを宣言)」を選ぶ。初期値はOFF。限定実装と未対応機能を同じ画面に明示し、一覧にもOneTask互換と表示する。 + +管理API `POST /_/api/v1/caldav-credentials` の追加フィールド: + +```json +{"label":"Android OneTask","scope":"tasks","write":true,"days":90,"calendar_access_compat":true} +``` + +従来APIも同じフィールドを受理する。scope(対象)とwrite(権限)は別のまま。互換設定で予定への権限や書き込み権限を追加しない。既存認証情報は自動変更しない。公開してしまった秘密値を再利用せず、旧認証情報を失効して新規発行する。 + +DBには`organizer_dav_compat(credential_id)`を追加。発行と互換フラグを同じtransactionで保存し、資格情報削除triggerで関連行を削除する。secret自体は従来どおりhashのみ。通常のログインセッション以外で発行できない。 + +## 応答 + +認証成功後、対象domain/owner/資格情報ID/有効期限に対応する互換行がある場合のみ、共通home・task home・task collection/resource・calendar collection/resourceで以下を返す。 + +```http +DAV: 1, calendar-access +X-PagesWiki-CalDAV-Profile: limited-compatibility +``` + +既存資格情報・互換OFF・Bearer/Cookieセッション・匿名要求は通常のまま。User-Agentから推測して勝手に互換設定を有効にしない。DB確認エラー時は通常応答に倒す。認証・scope・期限の失敗は401のままであり、失敗を成功応答に偽装しない。 + +OPTIONSの204は維持。Allowには実装しているメソッドのみを示し、MKCALENDAR・calendar-schedule・sync-token等を追加宣言しない。task collectionのPROPFINDにはcurrent-user-privilege-setとcurrent-user-principalを追加し、読み取り専用をwriteとして返さない。 + +## データと検証 + +未対応のTZID/日時付きVTODO期限/繰り返し/VALARM/部分projectionやfilterは引き続き明示的に拒否する。互換設定はこれらを変換・削除して保存を通す機能ではない。ETag必須の既存更新とACLも維持する。 + +`TestDAVCalendarAccessCompatibility`は報告されたOPTIONSの判定を再現し、その後の探索・取得・更新・削除、通常モード維持、User-Agent偽装無効、read-only、scope、失効・期限、管理API隔離、未対応繰り返し拒否を確認する。これはOneTaskアプリ自体の実行試験ではない。 + +chroncalの共通接続fixtureは互換ONで、旧タスク接続とvdirsyncer/Todomanは通常モードで回帰試験する。Chromiumでは設定の初期OFF、明示ON発行、一覧反映、失効、秘密値消去、タスク画面4サイズを確認する。すべて隔離された合成データを用い、本番資格情報・外部カレンダー本文は使わない。 + +2026-09-27の結果:全Goテスト成功。chroncal 0.10.0/vdirsyncer実行fixture成功。`TestCalendarChromiumSmoke`と`TestTasksChromium`(1440/1024/390/320幅)成功。JS構文・`git diff --check`成功。本番へのデプロイ、認証情報の発行・失効はこの作業では行っていない。 + +## 運用・残件 + +- [x] 本番への反映(2026-09-27 10:01 JST)。DBは追加表とtriggerのみで破壊的変更なし。旧バイナリは互換設定を無視するため、切り戻すとOneTaskの接続判定は再び失敗する。 +- [x] OneTask実機でアカウント追加(利用者報告)。 +- [ ] OneTask実機で一覧表示・作成・完了・変更・削除を確認する。一覧表示に問題報告があり、接続成功を全操作成功と扱わない。 +- [ ] 実機で次の要求が失敗する場合は、Authorization・本文を除去したメソッド、対象経路、status、画面エラーを基に限定fixtureを追加する。 +- [ ] 完全なRFC対応を目指す作業は共通CalDAVの残件(時間帯・繰り返し・filter等)として別途継続する。 diff --git a/docs/design/ja/caldav-task-lists.md b/docs/design/ja/caldav-task-lists.md new file mode 100644 index 0000000..7586e8e --- /dev/null +++ b/docs/design/ja/caldav-task-lists.md @@ -0,0 +1,53 @@ +# CalDAVタスクリスト作成とプロジェクト同期 + +**後続仕様**:0.11.0で通常プロジェクトも個別リストへ統一し、条件なし上書きを受理する。以下は0.10.0の記録。[新しい契約・移行と競合通知TODO](task-dav-project-unification.md)を参照。 + +2026-09-27。`organizer.tasks 0.10.0`。OneTaskの`SyncTaskListsSend`が`MKCALENDAR`でVTODOリストを作成する実例に対応する。認証エラーではなく、旧実装が未知のリストUUIDをVEVENTカレンダーとして検索し404にしたことが原因。従来の固定リストと認証・ETag・権限を維持し、成功応答だけを偽装しない。 + +10:44〜10:45 JSTに本番両インスタンスへ反映済み。[反映記録](../../operations/deployments/2026-09-27-task-lists.md)。OneTask実機での再同期確認は利用者待ち。 + +## 1. 正本とURI + +- `MKCALENDAR /_/api/v1/caldav/{UUID}/`でVTODO専用リストを作成する。要求URIをそのまま維持し、別URIへのリダイレクトは行わない。 +- 1リストを1つの個人プロジェクトに対応付ける。表示名はプロジェクトのTitle、所属タスクはProjectUUIDで決まる。外部作成分はWebでも同じプロジェクトとして管理できる。 +- URIのUUIDとプロジェクトのUUIDは別の識別子。正本プロジェクトの`dav_collection`にURIのUUIDを保存し、通常の版・CAS文書・変更journalを使用する。 +- DBの`organizer_dav_collections`はdomain/pathの一意性・routing索引。プロジェクト正本の情報から再構築できる。通常JSON APIから`dav_collection`を注入・変更できない。 +- 従来の`/_/api/v1/caldav/tasks/default/`は維持。DAV専用リストを持つプロジェクトのタスクだけを除外し、それ以外の既存タスク・通常プロジェクトは引き続きここに表示する。既存プロジェクトを勝手に外部リスト化しない。 +- 名前付きリスト内のリソースは`/_/api/v1/caldav/{UUID}/{filename}.ics`。Webで所属プロジェクトを変更すると、元のリストから消え、移動先に同じUID/filenameで現れる。これはCalDAV MOVE対応ではない。 +- 共通homeおよび旧task homeの探索で、利用者自身の有効な名前付きリストを返す。タスク拡張だけが有効な場合も使える。 + +## 2. 作成契約 + +[RFC 4791 §5.3.1](https://www.rfc-editor.org/rfc/rfc4791.html#section-5.3.1)に従い、作成は一括成功か全拒否とする。対応範囲は明示的なVTODO component-setとdisplayname。VEVENT/混在/未対応property/不正XMLを黙って無視しない。 + +- UTF-8 XML、application/xmlまたはtext/xml。64 KiB、既存XMLの深さ・要素数制限を適用。 +- component-setはVTODOのみを必須とする。displayname省略時はURI末尾を用いる。表示名の長さ等は既存プロジェクト検証を適用。 +- 作成成功201+Location、private/no-cache/no-store。既存URIへの再作成は405+DAV:resource-must-be-null。再送で別プロジェクトを増殖させない。 +- domain/pathは他利用者分も含めて一意。既存VEVENTカレンダーのディレクトリを上書きしない(存在だけ検査し、予定本文は読まない)。 +- 1利用者・1ドメインにつき最大256リスト。上限超過507。削除済みとしてURIを再利用する契約はまだ設けない。 +- タスクscopeまたはall、write権限、active membership/principal、拡張有効状態を検証。作成transaction内でも資格情報の失効・期限・権限を再確認する。 +- 匿名作成・匿名リスト閲覧は不可。他利用者のリストは404、カレンダーだけの資格情報はタスクへ使えない。 + +## 3. タスク同期 + +PROPFIND/calendar-query/calendar-multiget/GET/HEAD/PUT/DELETEを既存実装と共通化し、リストごとに完全なsnapshotを返す。別リストのhrefをmultigetに混ぜても個別404にする。 + +UIDとfilenameの一意性はリスト内。異なるリストでは同名・同UIDを許可する。DB検索索引のみ、正本上のUIDでは許可しないNULを区切りにプロジェクトUUIDを付与し、既定リストの任意UIDと衝突しないようにする。外部ICSや返却URLに索引用の接頭辞は出さない。 + +Web編集時もプロジェクトのリストidentityとタスクのDAVメタデータを保持する。既存更新はETagとversion CAS、DELETEはタスクのアーカイブ。write transaction内で所属リストを再確認する。リストをアーカイブした場合、タスクを既定リストへ漏らさず、DAV上ではそのリストを非表示にする。 + +## 4. 検証 + +- OneTaskの提供したMKCALENDARのXML形状を合成fixtureで再現。201→探索→PUT→GET→REPORT→完了→Web変更→削除。 +- 二つのリストの同UID/filename、相互混入防止、multigetの範囲制限、Web所属変更、索引再構築。 +- 他利用者、read-only、calendar-only、匿名、拡張無効、VEVENT URI衝突、並行二重作成、失敗時にプロジェクトを残さないこと。 +- chroncalの名前付きリスト往復同期。旧固定リスト・共通VEVENT接続・vdirsyncer/Todomanの回帰。 +- Webタスク/カレンダー画面のブラウザ回帰。実機OneTaskでの最終同期確認は利用者の再試行で行う。 +- 本番の資格情報・タスク・外部取り込み予定をfixtureに使用しない。観測は秘匿済みログとhealthに限定する。 + +## 5. 残件と切戻し + +- リストのPROPPATCHによる名称・色変更、リストDELETE、DAV MOVEは未対応。リスト名はWebのプロジェクトで変更可能。リストDELETEを全タスク削除として仮実装しない。 +- DTSTART/DUEの時刻、TZID、繰り返し、VALARM、複雑filterは従来の限定VTODO契約を維持。sync-tokenによる差分同期も別件。 +- OneTaskが追加のproperty・filter・日時形式を送る場合は実要求に基づき、情報を落とさない形で対応を追加する。アカウント追加成功やCLI試験だけでOneTaskの全操作成功とはしない。 +- **名前付きリスト作成後、0.9系の旧バイナリでプロジェクト/タスクを編集しない。** 未知のdav_collectionが失われたり、旧既定リストへ混入し得る。緊急切戻しはタスク拡張を停止してから行う。DBだけの無断巻戻しでユーザーの新規タスクを消さない。 diff --git a/docs/design/ja/calendar-city-fixes-20260922.md b/docs/design/ja/calendar-city-fixes-20260922.md new file mode 100644 index 0000000..ae038ac --- /dev/null +++ b/docs/design/ja/calendar-city-fixes-20260922.md @@ -0,0 +1,15 @@ +# カレンダー・Cityのジョブ障害是正(2026-09-22) + +## City + +URL自動生成はSpot名をPathの同じ深さから作るが、Spot名の一意制約はStreet内ではなくDomain全体だった。別Streetで同名のSpotやundefinedを生成するとreconcileが失敗し、outboxが未完了のまま再試行されていた。 + +Pathによる既存要素の再利用を優先し、新規作成時に名前が衝突する場合のみPath由来の安定hashを識別名に追加する。表示タイトルは維持する。別Pathの要素を名前だけでマージしない。QuartierとStreetの正規化名衝突も同じ方法で回避する。再実行で要素が増殖しないことを合成データで検証する。 + +残タスク:手動作成との同時実行競合のリトライ、繰り返し失敗の再投入backoffと警告集約。過去の失敗ログは成功へ改竄しない。 + +## 外部カレンダー接続 + +DNS検証後に先頭IPだけへ接続していたため、その経路が利用できない場合に失敗した。他の検証済みIPへ再試行し、DNS/TLS証明書/タイムアウト/安全制限をURLやトークンなしで分類する。localhostとprivate IP直指定は設定段階でも拒否する。 + +Outlookへの実接続・予定内容の調査は行わない。ユーザー指定により、以降の検証は合成データのみとし、取り込まれた外部予定にはアクセスしない。一般的なOutlookフィードのTZID、有限RRULE、EXDATE/RDATE、移動・取消を含むRECURRENCE-ID、ゼロ時間予定、Microsoft終日予定を有限期間へ射影する。対応外形式は前回snapshotを維持して失敗させ、通信成功と形式対応を混同しない。 diff --git a/docs/design/ja/calendar-contacts.md b/docs/design/ja/calendar-contacts.md new file mode 100644 index 0000000..9bd202f --- /dev/null +++ b/docs/design/ja/calendar-contacts.md @@ -0,0 +1,47 @@ +# 14. 予定・iCalendar・CalDAV・連絡先 + +状態:カレンダー部分は2026-09-22にローカル正本・Plan UI・限定CalDAVを実装開始。最新の契約・実装範囲・残作業は [カレンダー詳細設計](calendar-implementation.md) を参照。以下の旧順序/URI案より同設計を優先する。連絡先と外部同期は引き続き設計案。 + +## 四つのレイヤー + +| レイヤー | 役割 | PagesWikiでの扱い案 | +| --- | --- | --- | +| Wiki URL | 人が開く説明・知識への入口 | rename可能なPage Path | +| iCalendar | 予定・タスク等の交換形式 | export/import、UIDと元データを保持 | +| CalDAV | カレンダー資源を扱うWebDAV拡張 | remote connector、将来の提供面 | +| CardDAV / vCard | 連絡先の通信 / データ形式 | 個人・共有address book | + +iCalendarとCalDAVは同義ではなく、`.ics`を配信するだけでCalDAVサーバーにはなりません。vCardとCardDAVも区別します。[RFC 5545](https://www.rfc-editor.org/rfc/rfc5545)、[RFC 4791](https://www.rfc-editor.org/rfc/rfc4791)、[RFC 6350](https://www.rfc-editor.org/rfc/rfc6350)、[RFC 6352](https://www.rfc-editor.org/rfc/rfc6352)。 + +## identity対応案 + +local item UUID、calendar UID、remote href、Wiki Page UUIDを対応表に持ちます。Wiki renameでUIDを変更しません。remote href変更は移動・再取得として確認し、同じ題名だけで統合しません。ローカル生成UIDはDomain名変更でも維持します。 + +予定はevent、タスクはtodo、連絡先はcontactの型付き状態です。説明用Pageは任意の参照であり、毎回ICS/vCardをHTMLへ変換して正本を置換しません。原形式のDocument snapshotを保持し、未対応propertyの欠落を検出します。 + +## 予定のモデル案 + +開始・終了、終日フラグ、timezone/TZID、繰り返しrule、例外、参加者、状態、source versionを分離します。終日をUTCの時刻に変換せず、時間帯なしの時刻も区別します。無限recurrenceは画面の対象期間内だけ展開し、件数上限を持ちます。 + +例外instanceのキーは元seriesとrecurrence identityです。単発の変更・series全体の変更をUIで分けます。参加依頼、回答、メール送信などのschedulingは単純な予定保存とは別の後続機能です。 + +## 同期と競合 + +connectorはremote ETagとlocal versionを別々に持ち、更新前の値で条件付き操作します。ETagをDocument SHA-256と仮定しません。対応サーバーではcollection sync-tokenを利用する案ですが、無効なtokenからの再同期と未対応時のboundedな全量照合も必要です。[WebDAV同期仕様](https://www.rfc-editor.org/rfc/rfc6578)。 + +通信失敗では外部削除と見なさず、tombstoneは確認できた削除だけです。両側で変更された場合はbase/local/remoteを比較し、内容を保存した競合状態へ移します。勝手な最新版上書きはしません。 + +## 連絡先 + +address bookの所有者・共有範囲、contact UUID、remote UID、複数メール/電話、名称、所属、写真の固定参照を持ちます。人物Principalとcontactは別です。メール一致だけでユーザーへ自動連結しません。重複候補を示し、mergeは変更前をexportできる確認操作にします。 + +## URL/API案と実装順 + +人向けは `/v/organizer`、APIは `/_/api/v1/extension/organizer.{calendar|contacts}/…` を候補とします。**未実装・未予約**です。DAV提供面はroot discovery、認証、標準メソッドとルーターの衝突を調査してから決めます。Wiki PathをそのままDAV collectionにしません。 + +1. ICS/vCard fixture、入出力preview、警告、重複防止。 +2. local calendar/agenda・連絡先一覧、権限・version試験。 +3. 選定サーバーに対するread-only connector。 +4. 限定された双方向同期、最後に必要性が確認できたDAV提供。 + +CAL-1:終日・夏時間・例外。CAL-2:UID/href/Path変更。CAL-3:412競合・token失効。CARD-1:複数propertyと未知項目。DAV-1:権限失効・大量collection・app token失効。これらを完了条件にします。 diff --git a/docs/design/ja/calendar-implementation.md b/docs/design/ja/calendar-implementation.md new file mode 100644 index 0000000..e5c9438 --- /dev/null +++ b/docs/design/ja/calendar-implementation.md @@ -0,0 +1,165 @@ +# カレンダー拡張:正本・CalDAV・Plan UI + +更新:2026-09-22。既存の「予定・iCalendar・CalDAV・連絡先」のうちカレンダー部分を具体化する。連絡先、タスク、メール、招待配送は別サブプロジェクト。 + +## 1. 判断と実装状態 + +正本を SQLite に置かない。カレンダー単位の manifest と月別 iCalendar ファイルを正本とし、DB は消して再構築できる検索索引に限定する。Wiki Page の HTML 化や revision に予定を埋め込まない。 + +初期実装は **限定された CalDAV メソッド実装**。完全な CalDAV サーバーの適合性を宣言しない。`DAV: 1` のみ返し、`calendar-access`、`calendar-schedule`、sync-token は未対応のまま広告しない。 + +| 項目 | 初期実装 | +| --- | --- | +| 正本 | カレンダーの manifest、月ごとの VCALENDAR/VEVENT | +| 検索 | SQLite に domain/calendar/UID・開始/終了・ETag を索引化 | +| 日時 | UTC DATE-TIME、終日 DATE、DTEND は排他的 | +| 保存 | 未知の VEVENT property を保持。UI編集は対象フィールドのみ更新 | +| 並行更新 | 強い ETag の条件付き更新、競合時412、無条件更新428 | +| UI | 年・月・週・日・起点31日一覧・水平タイムライン、詳細・作成・編集・削除 | +| 共有 | 所有者、ユーザー単位 read/write、明示的な匿名公開 | +| 無効化 | system extension `organizer.calendar` の既存スイッチ | + +ローカルCRUDと正本の1予定表現では、RRULE/RDATE/EXDATE/RECURRENCE-ID、TZID/VTIMEZONE、floating時刻、DURATION、VALARM、VTODO、METHOD による scheduling を**入力拒否**する。外部購読に限り、検証済みのVTIMEZONE/TZIDと単一RRULEを有限期間のUTC/DATE予定へ射影する。受理後に検索から消えたり、繰り返しが単発予定に化けたりしないことを優先する。例外予定などの未対応が残るため、一般のカレンダーアプリを無制限に接続できる段階ではない。 + +## 2. URI + +### UI + +- `/v/plan`:最後に開いた表示種別の現在日。表示履歴がなければ現在週。 +- `/v/plan/cal/yyyy`:年。 +- `/v/plan/cal/yyyy/mm`:月。 +- `/v/plan/cal/yyyy/mm/dd`:日。 +- 同上の `/week`:月曜から日曜、その日を含む週。 +- 同上の `/events`:その日から31日間の一覧。 +- 同上の `/timeline`:その日の時間を左から右に配置。 +- 同上の `/new`:その日を初期値に新規予定ダイアログ。 +- `/v/plan/event/{UID}`:予定詳細。 +- `/v/event/new`、`/v/event/{UID}/edit`:指定どおり作成・編集。 +- `/v/calendar`:`/v/plan` への互換入口。 + +複数カレンダー選択は `?calendar=work,personal` のように `pretty_name` をコンマで連結する。各名は個別にURLエンコードし、区切りのコンマはそのままとする。表示設定ダイアログで複数選択・自分の既定値を保存できる。既定値はドメイン内のユーザー単位で、内部UUIDの配列をファイル `preferences/{principalUUID}.json` に保存する。無指定時は可視な既定値を使い、未設定・すべて失効した場合のみ可視な先頭カレンダーへフォールバックする。既定値による移動ではクエリを追加しない。匿名利用は個人設定を持たない。 + +`pretty_name` はドメイン内で一意(大文字小文字だけ違う名前も重複)。Unicode NFCの文字/数字、`-`、`_` が使用でき、空白・コンマ・スラッシュ・UUIDそのものは不可。最大120バイト。別途 `name` は自由な表示タイトルとして保持する。月別iCalendar正本の `NAME`([RFC 7986 §5.1](https://www.rfc-editor.org/rfc/rfc7986#section-5.1))、CalDAV collectionのdisplaynameにはpretty_nameを使う。VEVENT単体のUID/ETagやDAV資源hrefは名前変更の影響を受けない。名称の重複チェックはドメイン単位のlockで直列化する。 + +旧データのpretty_nameは `calendar-{UUID}` を安全な初期値とし、歯車から変更可能。旧UUIDクエリは互換受付してpretty_nameへ置換する。UUIDを保持する既定設定と予定所属はrenameに追従する。外部に配布した旧pretty_nameリンクのリダイレクトは未提供。 + +UIDはカレンダー内で一意。別カレンダー間に同じUIDがあり得るので、生成する詳細リンクはその予定のpretty_nameを1つだけ含める。複数表示の新規予定では、書込可能なカレンダーから作成先を選ぶ。Wiki Pathのrenameは予定UIDに影響しない。 + +### プロトコルと管理API + +CalDAV入口:`/_/api/v1/caldav/`。既存のジョブ `/_/api/v1/event/` と混同しない。 + +2026-09-26更新:`organizer.calendar 0.2.0`で専用Basic認証・共通principal探索・初回全件同期・CLI resource名を追加。[予定・タスク共通CalDAV](caldav-common.md)が追加契約。以下の旧仕様に対しcollectionのDepth 1、上限付き全件REPORT、CLI指定filename、JSONイベント取得の`?resource=`が追加される。UTC/DATEに限定する書込プロファイルは維持する。 + +| URI | 操作 | +| --- | --- | +| DAV root | OPTIONS、PROPFIND Depth:0/1(可視カレンダー) | +| `/{calendarUUID}/` | PROPFIND Depth:0、REPORT calendar-query / calendar-multiget | +| `/{calendarUUID}/{base64url(UID)}.ics` | GET/HEAD、PUT、DELETE | +| `/_/api/v1/extension/organizer.calendar/calendars` | GET一覧、POST作成 | +| 同上 `/{calendarUUID}/settings` | PUT 設定/DELETEカレンダー、manifest version必須 | +| 同上 `/{calendarUUID}/events` | GET `?uid=`、POST作成/編集 | +| `/_/api/v1/extension/organizer.calendar/event?uid=` | 可視カレンダーからUID解決。複数一致は409 | + +UIDは任意のテキストなのでDAVのファイル名へ直接使わずbase64urlにする。絶対URLのhrefや別カレンダーへのmultigetは受理しない。全件無制限のDepth:infinityやREPORTは提供しない。現在は作成を管理JSON APIで行い、MKCALENDAR/PROPPATCH/ACLは後続。 + +## 3. ファイルと障害復旧 + +``` +documents/calendars/{domainUUID}/{calendarUUID}/ + calendar.json + .lock + 2026-09.{sha256}.ics + 2026-10.{sha256}.ics +``` + +`calendar.json` は名前・所有者・公開設定・メンバー・version・月→ファイルSHA-256対応を持つ。月別ファイルは世代ごとに不変。VEVENTは開始月へ収納し、月をまたぐイベントは分割しない。 + +変更順序:カレンダーのプロセス間lock取得 → 現manifestとETagを確認 → 変更月の新ファイルを書きfsync → manifestをatomic renameしてディレクトリfsync → 未参照の旧世代を清掃。 + +9月から10月へ予定を移動する場合も、両月の新ファイルを準備してからmanifestを一度だけ置換する。中断した未参照ファイルは次の成功時に清掃する。過去世代を無限に保持する履歴設計にはしない。正本バックアップはmanifestとその参照先を一組で取得し、稼働中はlockと協調する必要がある。 + +DB表は `calendar_index_state`、`calendar_month_cache`、`calendar_event_cache`。manifest versionが変わったときだけ、hashが変わった月を索引へ反映する。DB反映前の中断は次回アクセスで修復する。DBだけが最新になりファイルが古い状態を正本とはしない。復旧時は3表を**一緒に**破棄し、正本から再構築する。 + +手動でICSを書き換える運用は未提供。hash名のファイルを直接編集しない。キャッシュ再構築時にはSHA-256を検証する。正本ファイルのACLは0600、ディレクトリは0700。HAの複数ノード同時書込やネットワークFSのロック保証は別途検証する。 + +## 4. 取得・キャッシュ・負荷 + +フロントエンドは対象期間の `calendar-query` でgetetagのみ取得。タブ内メモリのETagと一致する予定は再取得しない。変更分だけJSONの予定投影を取得し、同時取得は最大4件。独自にREPORTへ304を返す実装はしない。ICS GETではIf-None-Match/304を利用可能。 + +月をまたぐ予定は開始月のファイル列挙ではなく、DBの開始/終了の重なりで取得する。ゼロ時間の予定は開始時点が期間内なら一致。DATEとUTC日時を表示時に混同しない。UIの時刻入力・表示・日境界は**ドメイン設定のタイムゾーン**を用い、正本はUTCで保存する。DSTで存在しない時刻や二重になる時刻をドラッグ操作で暗黙補正せず、編集画面で再指定させる。DATEの検索境界差を補うためUIのREPORTは前後1日を加え、描画時に絞る。 + +週・日ビューは67〜400%の6段階で時間軸を拡縮する。100%以下は15分、200%は10分、300〜400%は5分単位で移動・リサイズする。予定中央のドラッグは長さを保った移動、上端は開始、下端は終了の変更である。同時刻帯で重なる予定は最大同時数分の等幅laneへ配置する。短い予定には操作可能な最低表示高を確保し、その表示領域同士も衝突しないlaneへ分ける。保存成功時はAPI応答の予定だけをタブ内集合へ反映してlaneを再計算し、期間REPORTや予定全件を再取得しない。時間列の空白をドラッグすると設定タイムゾーンの選択範囲を入力済みの新規予定ダイアログを開き、クリックだけでは作成しない。 + +上限:ドメイン256カレンダー、1資源256KiB、XML64KiB/深さ12、月5000件/16MiB、期間370日、結果5000件、multiget200件、lock待機5秒。超過は部分成功にせずエラー。ETagだけのREPORTは本文をparseしない。永続ブラウザキャッシュや共有CDNへの予定保存は行わない。権限を確認してから304・本文を返す。 + +## 5. 権限 + +カレンダー所有者が名前・公開設定・collaboratorを管理する。collaboratorは同じドメインの有効なユーザーで、`read` または `write`。writeには予定作成・変更・削除を含むが、共有設定の変更は含まない。readonlyアカウントの書込は不可。グループ共有・所有権移管・管理者による復旧は後続。 + +カレンダー全体の削除も所有者だけが行う。設定ダイアログで全予定を含む完全削除を確認し、`DELETE .../settings` に現在のmanifest versionを渡す。古いversionは412とし、削除対象の外部同期ジョブはqueuedなら取消、runningなら取消要求を付ける。正本ディレクトリを原子的に不可視化して削除し、SQLiteの3索引表を消す。ユーザー既定値に残ったUUIDは毎回の可視性検査で除外される。実行済みジョブ履歴とログは監査情報として削除しない。 + +匿名公開はカレンダー全体を対象とし、説明・場所を含めて公開する旨をUIで告知する。既存のドメイン公開上限がpublic、ドメイン有効、authorization_mode=enforcingのときだけ有効。上限を閉じれば次の取得から匿名アクセスを拒否する。公開範囲の狭い予定を混在させるには別カレンダーを使う。VEVENTのCLASSだけをアクセス制御として扱わない。 + +Page公開とは別の正本なのでCityのSpot/Pathへ暗黙に従属させない。将来Pageへの関連付けをしてもPage参照権限と予定権限は別途評価する。 + +## 6. RFC対応の検証と残タスク + +基準:[RFC 5545](https://www.rfc-editor.org/rfc/rfc5545) / [RFC 4791](https://www.rfc-editor.org/rfc/rfc4791)。パーサーは `github.com/emersion/go-ical` を固定バージョンで使用し、アプリ側でDTSTART必須、UTC/DATE、排他的DTEND、UID、不支持property、制御文字、必須項目を追加検証する。出力はCRLF・UTF-8を分断しない75octet折返し。ライブラリ採用だけをRFC適合の証明にはしない。 + +- [x] 単発UTC/終日、未知property保持、月境界、同時更新、キャッシュ再構築、公開取消の回帰テスト。 +- [x] Plan各ビュー、期間REPORT、差分取得、設定・予定ダイアログ、所有者限定のカレンダー完全削除。 +- [x] 外部購読用のTZID/VTIMEZONE(IANA、主要Windows名、定義内のSTANDARD/DAYLIGHT)と夏時間fixture。 +- [ ] ローカル正本でのTZID/VTIMEZONE/floating対応、DURATIONの暦日演算。 +- [x] bounded recurrence展開、EXDATE/RDATE、RECURRENCE-ID例外、時間範囲オーバーラップ、件数・本文量・対応頻度によるCPU/メモリ上限。 +- [ ] 標準XML precondition/error、PROPFIND/PROPPATCH/MKCALENDARの適合性、principal discovery、`/.well-known/caldav`、Depthと未知filterの完全な検証。 +- [ ] アプリ専用の失効可能なCalDAV credential、権限のread/writeスコープ、クライアント適合試験(現状は既存session Bearer)。 +- [ ] collection sync-token、tombstone保持と期限切れの再同期。現状は期間REPORTが正しい集合を返す。 +- [ ] バッチmultigetの単一索引snapshot化、大量calendarの一覧ページング、UI期間ごとのvirtualization。 +- [ ] 専用ジョブとしてreindex/検証/容量統計、イベント資源監視、管理者向けバックアップ・restore・所有権復旧。 +- [ ] グループcollaborator、イベントごとのvisibility、承認Inbox、共有変更監査、変更通知。 +- [ ] 招待・参加回答・リマインダーはCRUDとは別のevent/scheduler連携。iTIPメール配送を無断で有効にしない。 +- [x] 外部ICSの条件付きGET購読、外部CalDAVの期間REPORT/差分multigetによるread-only同期(下記制約あり)。 +- [ ] 外部連携のdiscovery、OAuth、sync-token、取得期間の設定、競合UI付きの双方向同期。 + +完全なCalDAV適合性・繰り返し対応の完了までは「一般クライアント互換」の完了チェックを付けない。 + +## 7. 今回の検証記録 + +- `go test ./internal/calendar ./internal/server -run 'TestCalendar|TestPolicyForRequest'`:成功。 +- Chromium:月・週・timeline・詳細の描画、設定タイムゾーン、400%/5分ズーム、中央移動、上下端リサイズ、重複予定の等幅配置、ダイアログによる作成/編集/削除、カレンダー名の変更、ETag一致時の本文再取得抑止を確認。 +- 全体テストは `TestConfigBookmarksSaveAndPanelRegistry` が既存設定画面の `config-form-table` に横スクロールコンテナがないとして失敗。カレンダー画面には当該テーブルは追加していない。別UIタスクとして調査・是正する(テストを緩めない)。 + +## 8. 時間軸の操作 + +終日の入力・詳細表示では終了日を**含む**。同日開始・同日終了で1日の予定を作成できる。保存時だけ終了日にUTC暦日を1日加算し、編集・表示時には1日戻す。正本ICSとAPIのDTENDはRFC 5545の排他的境界を維持する。既存データの移行・外部予定の書換は不要。 + +トップバーはCity・直近の予定・通知・プロフィールの並び。直近の予定は既定カレンダー(未設定なら先頭1件)の今日から31日間を最大20件表示する。`GET /_/api/v1/extension/organizer.calendar/upcoming?date=yyyy-mm-dd` はログイン必須、毎回権限確認、no-store、5秒上限、カレンダー毎20件の本文取得上限を設ける。モーダルを開いたときだけ取得し、閉じたら中断する。通知と予定は背景スクロールを抑止した中央モーダルで、Escape/閉じるボタンに対応する。 + +日・週ビューは縦の時間軸、timelineは横の時間軸に予定を表示する。従来の週リストは `/v/plan/cal/yyyy/mm/dd/week/list` とし、先頭行に曜日を表示する。日・週の尺度は40/60/90/120 px/時から選択できる。 + +最後に開いた年・月・週・週リスト・日・timeline・予定一覧の表示種別だけをPrincipal単位でブラウザへ保存する。予定本文、カレンダー名、選択日、資格情報は永続化しない。予定の新規作成後は詳細画面へ遷移せず、作成を開始した表示種別と基準日へ戻して再取得する。新規作成専用URLから開始した場合も、保存済み表示種別(未保存なら週)へ戻る。 + +書込可能な予定の移動ハンドルをドラッグすると15分単位で日時を変更する。日・週では上下キー、timelineでは左右キーでも移動可能。期間の長さを保持し、Escapeでドラッグを取消す。存在しない/曖昧なローカル時刻への日・週移動を拒否する。保存は既存ETag付きAPIを通し、競合時には上書きしない。終日・外部読取専用の予定にハンドルは表示しない。ブラウザ試験で縦横の実マウス操作とキーボード操作を検証する。 + +## 9. 外部カレンダーの読み取り同期 + +新しい空のカレンダーを作り、所有者が「外部同期」ダイアログでICS URLまたはCalDAVコレクションURLを設定する。取得間隔は1分〜7日、手動同期・停止を提供する。外部同期を停止しても、取得済み予定と読み取り専用属性は保持する。双方向同期や、既存のローカル予定への混在取込は行わない。公開・collaborator設定は取込先の設定に従うため、私用フィードは非公開カレンダーで利用する。 + +- API:`PUT /_/api/v1/extension/organizer.calendar/calendars/{UUID}/source` で設定、同じURIへの `POST` で手動キュー投入。所有者限定、設定更新はmanifest version必須。 +- 組込イベント `calendar.source.sweep` が60秒ごとに期限を確認し、`calendar.source.sync` を低優先度・カレンダー単位の重複抑制付きでキューへ投入する。実行状態・ログは既存イベント管理に統合。UIを開く必要はない。間隔は次回取得の目安でありキュー混雑により遅れる。 +- ICS:ETag/Last-Modifiedを条件付きGETに利用する。304では予定を再書込しない。 +- CalDAV:過去90日〜未来275日のREPORTでgetetagを取得し、変更分のみ100資源単位のcalendar-multigetで取得する。期間外はローカル投影に保持しない。コレクションURLを直接指定し、discoveryはまだ行わない。 +- 完全な応答を検証してから全月snapshotとmanifestを更新する。取得失敗、未対応形式、部分的なmultiget、途中で変わったETagでは前回の予定を保持。正常な空集合は削除として反映する。安定したUID順で保存し、応答順の変化による書換を避ける。 +- 上限:ICS本文8MiB、CalDAV各応答8MiB・予定本文合計8MiB、5000件の射影予定、ジョブ50秒。Outlookで約10秒かかる応答を許容するため、response header 25秒・HTTP全体45秒とする。2.6MiB超・4500件の合成fixtureを回帰試験に含める。 +- Outlook公開ICSの `METHOD:PUBLISH`、`X-WR-CALNAME`、`VTIMEZONE/TZID`、単一 `RRULE`、Microsoft固有X-propertyを受理する。主要Windows TZIDはIANAへ対応付け、それ以外はSTANDARD/DAYLIGHTとTZOFFSETTOの遷移を同期期間について解決する。RRULEは過去90日〜未来275日の各予定へ安定UIDで展開し、内部正本はUTC/DATEのまま維持する。`X-MICROSOFT-CDO-ALLDAYEVENT:TRUE` のローカル午前0時境界はDATEの終日予定へ変換する。 +- Outlookが出力する `DTSTART == DTEND` の時刻予定はゼロ時間予定として保持し、同じ境界のMicrosoft終日予定だけは排他的終了を翌日に正規化する。終了が開始より前、またはDATEとDATE-TIMEが混在する場合は予定内容をログへ出さず同期全体を失敗させる。 +- 外部購読の解析済みプロパティ値・パラメータに混入したC0(タブを除く)、DEL、C1制御文字は正本化の前に除去し、予定へ `X-PAGESWIKI-SANITIZED:CONTROL-CHARACTER` 相当の印を残す。ローカルCRUDの厳格な入力検証は緩和しない。NUL、不正UTF-8、制御文字を含むUIDは同一性・構文破壊を避けるため購読全体を拒否する。 +- RDATEとEXDATE(DATE/DATE-TIME、複数値)、RECURRENCE-IDによる移動・内容変更・取消を親RRULEへ合成する。例外の出力UIDは元のRECURRENCE-IDから安定生成し、移動後も同一インスタンスとして扱う。EXDATEと変更例外が同一回を指す場合は明示的な変更例外を優先する。 +- 購読射影が親RRULEを省略し、`RECURRENCE-ID` 付きの変更回だけを含む場合は、取消回を無視し、DTSTARTを持つ回を元のRECURRENCE-ID由来の安定UIDで単発射影する。親がないためDTEND省略時の長さは推測せずゼロ時間予定とする。 +- RDATEのPERIOD、RECURRENCE-IDの`RANGE=THISANDFUTURE`、DURATION、VALARM、floating時刻はまだ未対応。部分的に欠落させずフィード全体を同期エラーにし、前回snapshotを保持する。現段階でOutlookの全機能や一般プロバイダへの完全対応は宣言しない。 +- 同期失敗はcompose logへdomain UUID、calendar UUID、protocol、処理段階、安全化した理由を出す。購読URL、認証情報、UID、タイトル、説明、場所、ICS本文はログへ出さない。 +- HTTPS/443の公開アドレスのみ許可する。接続時DNS検証と接続IP固定、プライベート/loopback/link-local等の遮断、リダイレクト再検査、環境proxy無効によりSSRFを防ぐ。認証付きリダイレクトは同一origin限定。 +- 任意のBasic認証資格情報は既存認証鍵を用いた暗号化とdomain/calendar束縛で保存し、APIに再表示しない。URLに購読トークンを含む場合は保護された0600のmanifestに保存される。URL/認証情報をジョブpayloadに入れず、取得エラーを秘匿化する。バックアップには正本に加えて認証暗号鍵も必要。 + +実プロバイダ接続試験、より広いiCalendar形式、資格情報更新・失効の監査、同期専用の容量/CPU指標、取得対象の管理者allowlistは後続タスクとする。 diff --git a/docs/design/ja/calendar-mobile.md b/docs/design/ja/calendar-mobile.md new file mode 100644 index 0000000..ea0d32c --- /dev/null +++ b/docs/design/ja/calendar-mobile.md @@ -0,0 +1,33 @@ +# カレンダーのスマートフォンUI + +2026-09-25実装。iPhone SE相当の320×568/375×667と667×375横画面を対象。**Chromiumのタッチ・画面サイズエミュレーションで検証済み。Safari/iPhone実機の確認は未実施。** 同日05:59 JSTに本番2インスタンスへ反映済み。[反映記録](../../operations/deployments/2026-09-25-active-notifications-calendar-mobile.md)。 + +## 操作と表示 + +- 小さい画面では、表示種別の7リンクをselectにまとめる。今日/前後/日付ピッカーは常時表示。 +- カレンダー選択・更新・新規予定を残し、追加/設定/外部同期/表示対象は「⋯」メニューへ集約。権限による元の表示制御を引き継ぐ。 +- 上部の重複ナビと重複見出しを省略。見出し自体はスクリーンリーダー用に維持する。 +- 週ビューは細い7列にせず、縦画面で約1日、横画面で約2日の幅を確保。曜日/日付ボタンで同じ週の列へ横移動する。見出しの日付を押すと日ビューへ進む。PCの7列表示は維持する。 +- 月ビューは日付と予定件数を表示し、詳細は日ビューで見る。狭いセルへの件名詰め込みは行わない。 +- 一覧では日付/件名を優先。場所の列はスマホでは省略し、予定詳細で確認する。 + +## タッチ操作 + +coarse pointerでは通常、予定の上も空き領域もスクロールとpinch zoomを優先する。指が触れただけで時刻変更・範囲作成を開始しない。タップは予定の詳細へ進む。 + +時間グリッドの「編集操作」をONにした場合だけ、移動・開始/終了の伸縮・空き領域の範囲選択を有効化する。ON/OFFはaria-pressedで表現。PCのドラッグ・矢印キー操作は維持する。タイムラインの小さいドラッグハンドルはタッチでは隠し、予定詳細から時刻を編集する。 + +## Safariへの配慮 + +フォームの文字を16px以上、操作領域を40〜44pxに揃える。画面のzoomを禁止するviewport指定は追加しない。編集ダイアログはVisualViewportのheight/offsetを使い、ブラウザバーやソフトキーボードによる変化を考慮する。pinch zoom中はサイズ更新を停止する。CSSのdvh fallbackとsafe-area insetを併用する。 + +スマホのスクロール領域と編集ダイアログはbackdrop blurを外し、テーマの背景色でコントラストを確保する。予定データのキャッシュ/REPORT/ETag/タイムゾーン処理は変更しない。 + +## 検証と残TODO + +- 合成ローカルカレンダーで320/375縦・667横、ページ横はみ出し、列幅、日付選択、スクロールと編集gesture切替、月の件数、設定メニュー、編集dialogの収まりを自動検証。 +- 既存のPC CRUD・ドラッグ・resize・400% zoom・ETag試験を継続。 +- 外部取り込みカレンダーの内容にはアクセスしない。 +- TODO: Safari実機でソフトキーボード開閉、画面回転、pinch zoom、背景復帰、長い終日予定、多重重複予定を確認。端末・OSバージョンに応じた調整。 + +参考:[WebKitの動的viewport単位](https://webkit.org/blog/12669/new-webkit-features-in-safari-15-5/)、[MDN touch-action](https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/touch-action)。 diff --git a/docs/design/ja/campus-federation.md b/docs/design/ja/campus-federation.md new file mode 100644 index 0000000..c1d6f6a --- /dev/null +++ b/docs/design/ja/campus-federation.md @@ -0,0 +1,39 @@ +# 3. キャンパス・ドメイン・連携 + +状態:ローカル管理、外部キャンパス参加、署名付き設定配信は実装済み。コンテンツ同期・DRとは別機能。 + +## FQDNと配置 + +キャンパスの設定値はURLではなくFQDNです。ドメインのホスト指定が短い名前ならキャンパスFQDNのサブドメインとして扱い、FQDNならその値を使います。空のホスト名はキャンパスFQDN自身に対応し、未知Hostの受け皿にはしません。 + +表示用FQDNと配置先インスタンスは別の情報です。FQDNを指定しただけでは別インスタンスとは限りません。配置先は承認された候補から選び、同じFQDNの鍵フィンガープリント変更は同じ実体として黙認しません。 + +## 設定の所有者 + +- キャンパス管理:配下ドメイン、配置、参加トークン、キャンパスの共通情報。 +- ドメイン管理:Wiki名、テーマ、記事・拡張設定、メンバー、権限。 +- 外部キャンパス管理:コントローラから受け取った管理項目をローカルで独自に上書きしない。 +- 秘密:実際に認証・接続するインスタンス側に保持し、一般設定manifestへ混ぜない。 + +ドメインの設定は個別です。同じキャンパスに属するだけで記事、グループ、認証セッションを共有しません。 + +## 参加と配信 + +コントローラ発行トークンで参加要求し、インスタンスidentityを承認します。設定manifestは署名と単調なsequenceを持ち、受信側は適用とcheckpoint更新を同一トランザクションで行います。古いsnapshotへの巻き戻しや同名の別authorityへの置換を拒否します。 + +入口設定を含むmanifest v2は、全承認済み配置先の対応能力を事前確認します。対応能力の申告は「適用完了」や「オンライン」の証明ではありません。反映ACKと鮮度の明示はTODOです。 + +`--add-external-campus` は通常経路、`--add-external-campus-http` は明示的な開発用HTTP経路です。HTTP許可を一般接続の既定値へ拡張しません。 + +## 継承の区別 + +キャンパス管理者のローカル継承には、付与元ごとの記録と失効処理があります。独立したローカル付与を消さず、継承を切ったときに派生権限だけを除きます。 + +Domain間PSKによるidentity・group継承は設計段階です。署名付き差分、失効、origin競合、鍵交代を含む同期契約と実装が必要です。キャンパスmanifestの配信やローカル管理者継承が完成したことをもって、任意ドメイン間の安全な権限同期が完成したとは扱いません。 + +## TODOと合格条件 + +- 反映ACK、設定管理の解除、削除ドメインの保持・GC。 +- 同名・異originのグループ衝突、PSK失効、sequence欠落、鍵交換の試験。 +- 秘密の外部管理と明示的なローテーション手順。 +- 別インスタンス記事射影は、取得権限・失効・障害時の閉じ方を設計してから実装する。 diff --git a/docs/design/ja/decisions.md b/docs/design/ja/decisions.md new file mode 100644 index 0000000..f59ebed --- /dev/null +++ b/docs/design/ja/decisions.md @@ -0,0 +1,42 @@ +# 21. 決定事項・矛盾の整理・未決事項 + +状態:既存設計の統合と、新規構想の判断台帳。設計案を実装完了に読み替えません。 + +## 原資料の読み替え + +| 古い記述・混在 | 現在の読み方 | +| --- | --- | +| OIDCは形だけ、UserInfoだけを根拠にする | 署名・claim・state/nonce等のhardeningが入っている。詳細契約を優先 | +| CookieをやめてBearer一本にする | ブラウザCookieとAPI Bearerを目的分離して併用 | +| 匿名ナビゲーション・RSSは未実装 | 限定公開条件で実装済み。全metaや全依存物の公開ではない | +| 匿名公開はすべて毎Revision再承認 | 手動公開はそのまま。確認したStreet/Spotのみlive-head自動公開可能 | +| 個別記事の一覧登録だけが投稿方法 | 原子的な新規投稿APIと独立画面を追加済み | +| 同じCampusなら任意ノードでブログ射影 | 現行の参照型記事射影は同一インスタンスまで | +| resourceはブラウザを開いたときだけ記録 | 背景イベントで保存。表示更新と保存間隔は別 | +| groupプロフィールのnamespaceが設計のみ | 実装側にgroup画面・APIあり。機能ごとの完了度で読む | +| Asset名はinstance全体の名前 | mutable Asset名はDomain-local、Document hashは不変content identity | +| イベントキューがあるのでoutboxも完成 | queue、個別journal、transactional outbox配送は異なる | +| すべての文書はHTML正本 | 文章の正本HTMLと、バイナリ/固有形式の正本を区別 | + +古い文書は削除せず、初期思想・変更理由・実装の追跡用に保持します。本書とコードが違う場合はまず差分を確認し、設計を理由に現在の安全制約を外しません。 + +## 新規ADRの案 + +| ID | 提案 | 状態・決めるための条件 | +| --- | --- | --- | +| ADR-O1 | organizerはtyped metadataと任意Page参照 | タスク初版は専用表+既存CAS Document Store(2026-09-24)。通常のObject閲覧・リンク・削除の権限境界を拡大せず、個人所有を確実に分離する。DBは捨てられる索引ではない。[実装契約](tasks-implementation.md) | +| ADR-O2 | task共通部+ticket workflow | 提案。番号・外部依頼者・遷移権限の要件確認 | +| ADR-O3 | ICS/vCard入出力→read-only DAV→双方向 | 推奨順。対象サーバー/clientを選んで互換表を作る | +| ADR-O4 | FreshRSS正本+PagesWiki connector+newsboat | 第一候補。利用環境・追加運用負荷を確認。内蔵readerは代案 | +| ADR-O5 | IMAP read-only、Wikiコピーは明示操作 | 初期設計方針。providerとsampleが実装前提 | +| ADR-O6 | HTMLパーツを先行し全面WYSIWYGは保留 | 提案。round-tripと操作改善の評価でgo/no-go | +| ADR-O7 | Wiki Pathと外部UID/hrefを分離 | 共通の設計制約。rename fixtureを全connectorで実施 | +| ADR-O8 | 外部stateの変更は別段階の明示権限 | 共通の設計制約。既読・削除・送信の監査と確認 | + +## 未決事項 + +利用するFreshRSSの有無と版、対象CalDAV/CardDAV client、IMAP provider、taskの共有単位、ticketの依頼者公開範囲、保持期限、外部接続を許可するhost、RPO/RTO、WYSIWYG採用基準です。これらが未決でもlocal fixtureと設計は進められますが、外部サービスを勝手に立ち上げたり資格情報を流用したりしません。 + +## 文書運用 + +新しい決定には理由・代案・互換影響・試験を残します。変更履歴ledgerと現状の説明を分けます。日本語統合版から詳細原資料へ辿れる対応表を維持し、英語版は同じchapter IDで追従させます。 diff --git a/docs/design/ja/extensions.md b/docs/design/ja/extensions.md new file mode 100644 index 0000000..7323f18 --- /dev/null +++ b/docs/design/ja/extensions.md @@ -0,0 +1,61 @@ +# 11. システム拡張・通知・協働 + +状態:信頼済みビルトインcatalogと設定入口あり。任意第三者コードのロードは未実装。 + +## アダプタとシステム拡張 + +アダプタは特定Documentを開く・編集する役割、システム拡張は活動、通知、コメント、予定、メール、RSS、検索provider等のサービスです。外部サービス連携用URLに汎用管理権限を押し込めません。 + +現行catalogは `/_/api/v1/extension/`、個別操作は `/_/api/v1/extension/{id}/…` の系統です。catalogに載っても任意コード実行や権限付与は許可されません。 + +## 共通manifest案 + +安定ID、版、互換範囲、scope、設定schema、必要capability、outbound host、secret reference、購読event、checkpoint、実行image digest、署名、CPU/メモリ/時間/出力制限を宣言します。 + +設定はinstance / Domain / Principalを区別します。ホスト所有のフォームを基本にし、独自UIはsandboxと型付きメッセージに限定します。無効化はデータ消去と別操作です。export、移行、rollback、孤立データの保持期間を必須契約にします。 + +## 協働機能の正本 + +| 機能 | 保存するidentityと状態 | 漏えいさせないもの | +| --- | --- | --- | +| 最近編集 | event、actor、Page/Revision、Domain sequence | 現在読めないPageのタイトル | +| 最近閲覧 | 本人の閲覧履歴と保持期限 | 他者の私的な閲覧履歴 | +| いいね・ランキング | Page、反応者、期間集計、計算版 | 非公開Pageの順位や件数 | +| 品質評価 | rubric版、評価者、対象Revision、根拠 | 機械評価を人の決裁と偽る表示 | +| inline comment | Revision、範囲、周辺hash、孤立状態 | 改訂後の別文章への誤結合 | +| コメントthread | Page、投稿・編集履歴、moderation | 削除・権限失効後の本文 | +| 通知Inbox | event、受信者、配送・既読 | 保存時点の権限で固定した本文 | + +通知を開く時点で権限を再評価します。権限を失った相手へ昔のタイトル付きメールを新規送信しません。送信済み外部通知の撤回不能性は別途表示します。 + +## 外部検索・埋め込み・テーマ + +ローカル検索にない場合も、検索語を自動でGoogle等へ転送しません。宛先と送信語を示して選択させます。GROWI、PukiWiki、他PagesWikiは個別API契約・資格情報・上限を確認します。 + +Spotify/YouTube等のwidgetはprovider許可と同意プレースホルダを使います。文書内の任意scriptを実行しません。時間・日没によるテーマは型付き条件とCSS theme IDを扱い、位置情報を無断取得しません。 + +## ネットワーク・資産管理拡張(設計TODO) + +IPアドレス管理(IPAM)、DNSゾーン/レコード管理、機器・ソフトウェア等の資産管理は、通常のWiki本文を直接書き換えるアダプタではなく、監査可能なシステム拡張として設計します。正本はそれぞれ `network_prefix`、`dns_zone`/`dns_record`、`asset_item` の型付きエンティティとし、説明・手順・添付資料だけをPage/Assetへの参照で持ちます。 + +| 拡張 | 最初の範囲 | 外部副作用と権限 | +| --- | --- | --- | +| IPAM | prefix、address、予約・割当、重複検査、CIDR表示 | read/writeを分離し、割当変更は承認と監査を必須化 | +| DNS | zone、record、TTL、所有者、検証済みtarget、差分 | zone単位の管理者、DNS providerへのapplyはdry-run→承認→idempotent apply | +| 資産 | asset、serial、owner、場所、状態、保証・関連Page | 個人情報・秘密値を本文や検索snippetへ出さず、履歴と廃棄を保持 | + +外部DNSやCMDBへ接続する場合も、secret reference、許可origin、rate limit、最終同期時刻、providerのrevision/etagを保存します。DNSの名前解決やIPスキャンをページ表示中に実行せず、イベントキューのbounded jobにします。削除・再利用・移管はsoft deleteと競合検知を経てから行い、失敗時は外部状態と内部状態の差分を通知Inboxへ送ります。API候補は `/_/api/v1/extension/network.ipam/*`、`network.dns/*`、`inventory.assets/*` とし、schemaが固まるまで実装しません。 + +## CSV/表・スライド拡張(設計TODO) + +CSVをPage本文へ複製せず、認可済みの別Documentをテーブルとして投影するmacroを用意します。候補構文は `{{csv:/data/items.csv range=A1:H200 header=true}}` とし、Path、Revision(またはasset hash)、列・行上限、表示モードを正規化してキャッシュキーに含めます。macroは表示時にboundedなProjectionを作るだけで、結果HTMLを正本へ逆流させません。CSV Editorは元Revisionを編集し、表投影とは別の操作・競合・権限として扱います。 + +交換形式はRFC 4180互換CSV(UTF-8、CRLF、引用符・改行を含むfield、BOMの扱いを明示)を第一正本とします。複数シート、型、数式、結合セル、書式が必要な場合はODSを別アダプタ/Assetとして扱い、CSVへの不可逆変換を黙って行いません。行数、列数、セル長、総バイト、ネストmacroを制限し、malformed inputは安全なテキスト表示へfallbackします。 + +スライドは、Markdown/HTMLの正本からReveal.js互換のProjectionを生成する連携アダプタを設けます。HedgeDoc、Slidevは外部originのホスト型アダプタとして、保存・公開・ユーザー情報をPages Wikiの権限へ自動昇格させず、read-only preview→明示的なimport/saveの順にします。JSを使用できない環境向けには、CSS scroll-snap/`:target`/print CSSだけでページ送りできるCSS-only Slide Editorを別実装します。外部ランタイム停止時は静的HTML/Markdownへ安全にfallbackし、任意script、remote import、iframe権限を本文から許可しません。 + +ネットワーク図ではnwdiagを追加候補とします。ソースをbounded parserで検証し、renderer version/theme/document hashをキーに静的SVGをキュー生成します。include、外部画像・font、未知directive、危険なSVG属性は拒否し、renderer停止時はescaped sourceまたは最後に検証済みの静的画像へfallbackします。編集アダプタの保存はone-use ticketと楽観的Revision競合を使い、Kroki経由の場合もorigin、timeout、quotaを明示します。 + +## 最初に作る共通部 + +outbox、actor provenance、現在権限で絞るprojection、設定のsecret参照、connectorの予算と再試行、export/削除です。機能別に通知・認可・秘密管理を作り直さないことを次章以降の前提にします。 diff --git a/docs/design/ja/feeds.md b/docs/design/ja/feeds.md new file mode 100644 index 0000000..624ef46 --- /dev/null +++ b/docs/design/ja/feeds.md @@ -0,0 +1,41 @@ +# 15. RSSビューア・FreshRSS・newsboat + +状態:設計案。既存のブログRSS「配信」と、本章の外部RSS「購読」は別機能。 + +## 選択肢と推奨する試作順 + +| 案 | 正本 | 利点 | 追加する責任 | +| --- | --- | --- | --- | +| PagesWiki内蔵reader | ローカルの購読と状態 | Wiki保存と一体のUI | 取得・既読・同期・client対応を全て持つ | +| FreshRSS connector | FreshRSSの購読・既読 | 既存reader資産を利用 | API互換性、権限、cacheと失効 | +| newsboat単独の橋渡し | newsboat側の購読・状態 | CLI利用に合わせやすい | ローカル連携経路・export/importの設計 | + +FreshRSSにはGoogle Reader互換APIがあり、APIの有効化と専用passwordを使います。newsboatにはFreshRSS連携が用意され、カテゴリのtag化やstar操作を扱えます。[FreshRSS公式API](https://freshrss.github.io/FreshRSS/en/developers/06_GoogleReader_API.html)、[newsboat公式マニュアル](https://newsboat.org/releases/2.42/docs/newsboat.html#_freshrss)。 + +このため最初の候補は **FreshRSSを正本、PagesWikiを読取connector、newsboatを同じFreshRSSのclient** とする構成です。これは設計上の提案で、ユーザー環境のFreshRSS導入・採用決定ではありません。PagesWikiがnewsboatをサーバー上で起動したり、そのSQLiteを共有したりする必要はありません。 + +## 読取MVP + +購読一覧、フォルダ、記事一覧、外部原文、Wiki保存を提供します。初期段階では表示しただけでFreshRSSへ既読を送りません。UIには「読取専用・既読は同期していない」と明示します。ブラウザへFreshRSS password/tokenを渡さず、backend connectorがsecret参照を使います。 + +最小cache案はsource UUID、remote feed/item ID、title、safe excerpt/body hash、canonical URL、published/updated/fetched時刻、remote state/versionです。IDなしRSSにはfeed単位の保守的な代替キーを使い、題名だけで重複排除しません。Atomはentry IDと更新情報を持つ形式です。[Atom仕様](https://www.rfc-editor.org/rfc/rfc4287)。 + +## 既読・star同期を追加する条件 + +server-authoritative stateと未送信の操作を分けます。操作ごとのrequest_idで重複を防ぎ、成功応答前に確定済みと表示しません。newsboat等で同時変更された場合、古いローカルcacheをまとめて送り返しません。接続解除・認可失効時は未送信変更を勝手に再送しません。 + +FreshRSS APIに条件付き更新がない操作もあり得るため、対応版の実機fixtureで競合動作を確認するまで完全な双方向同期を約束しません。 + +## 内蔵fetcherを選ぶ場合 + +定期event、条件付きGET、host別同時数、timeout、応答サイズ、展開サイズ、backoffを設けます。XML外部entityを無効にし、feed HTMLを安全化します。redirect/DNSを含むSSRF対策、外部画像の同意、個人購読URLや認証情報の秘匿が必要です。 + +OPMLは購読の入出力として扱い、既読・star・全本文のバックアップと同一視しません。importはpreview・追加/置換選択・重複確認を行い、既存購読を黙って削除しません。 + +## Wiki保存と権利・公開 + +既定はURL、出典、短いメモの保存です。全文保存は取得可能性・利用条件・個人用途等を確認する独立操作とし、feedが短いからといって有料記事を自動取得しません。保存先が自動公開範囲なら内容と添付の公開を明示確認します。 + +## TODOと受け入れ + +RSS-1:read-only FreshRSS fixture。RSS-2:安全な一覧と出典付きWiki保存。RSS-3:必要なら既読/star送信。RSS-4:内蔵reader採用判断とOPML。オフライン、欠落ID、巨大feed、未知HTML、同期再送、他user情報、feed削除後の保存Page維持を試験します。 diff --git a/docs/design/ja/html-editor.md b/docs/design/ja/html-editor.md new file mode 100644 index 0000000..8b88c9f --- /dev/null +++ b/docs/design/ja/html-editor.md @@ -0,0 +1,38 @@ +# 17. HTMLパーツとWYSIWYGの判断 + +状態:設計案。全面WYSIWYG採用は未決定。既存エディタを置換しない段階的改善を第一案とします。 + +## 解決したい問題 + +表、画像とcaption、引用、注意書き、コード、リンク、macro、埋め込みを毎回手書きする負荷を減らします。単にHTMLを隠すことより、既存文書を壊さず効率よく編集できることを重視します。 + +## 段階案 + +1. Source+Projection previewを保ち、HTMLパーツ挿入paletteを加える。 +2. 選択範囲の整形、リンク・表・画像の型付きdialogを追加する。 +3. 対応するblockだけを視覚編集し、未知blockはread-only islandまたはsource編集へ戻す。 +4. 完全WYSIWYGはfixture評価と操作上の効果が確認できた場合だけ採用判断する。 + +HTMLパーツは安定ID、版、schema、HTML template、preview、許可属性、必要providerを持ちます。挿入時に文書へ具体化するパーツと、動的macroを区別します。パーツ更新で過去Revisionを勝手に書き換えません。 + +## 保存契約 + +canonical HTMLと編集モデルと安全な表示HTMLは別です。preview展開済みchildren、閲覧者ごとのリンク、署名URL、session値を保存しません。unknownな属性を無言で削除するeditorは、その文書を視覚編集できると表示してはいけません。 + +保存は対象Page、編集開始Revision、言語、期待versionを照合し、競合時に選択・差分確認へ戻します。autosaveは下書きと本Revisionのどちらかを明示し、previewしただけで公開headを進めません。自動公開範囲では保存が公開へ直結することを表示します。 + +## round-trip fixture + +- children等のmacro、asset provenanceと固定hash、embedded-object。 +- code/pre、入れ子list、table、caption、非ASCII Path、RTL、複数言語。 +- 未対応HTML、コメント、アクセシビリティ属性、長文・巨大table。 +- paste時のscript/event属性/外部参照、安全化後と正本の違い。 +- undo/redo、IME変換中、選択維持、キーボード、screen reader。 + +比較はbyte一致だけでなく、許可した正規化以外の意味・依存参照・未知blockを失わないことを検査します。変更なしで保存した場合に大量diffを作るeditorも不合格候補です。 + +## 採用判断の条件 + +HTMLパーツだけで主な不便が解決するならそこで止めます。完全WYSIWYGは、round-trip・IME・大規模文書・保守性・ライセンス・bundle負荷を比較したADRを作ってから選びます。特定ライブラリ採用や共同編集CRDTの導入は今回決めません。 + +EDITOR-1:fixtureとpalette schema。EDITOR-2:少数パーツの挿入。EDITOR-3:限定block prototype。EDITOR-4:比較評価とgo/no-go。共有編集は別の権限・競合・接続設計を必要とする後続事項です。 diff --git a/docs/design/ja/i18n.md b/docs/design/ja/i18n.md new file mode 100644 index 0000000..7cf0c10 --- /dev/null +++ b/docs/design/ja/i18n.md @@ -0,0 +1,31 @@ +# 19. 多言語と設計書の配信 + +状態:Revision言語とfallback、日英UIの基盤あり。全画面の言語選択・翻訳管理・公開版の対応は継続課題。 + +## 同じ知識、同じPath + +Pageは言語中立で、RevisionにBCP 47言語tagを持たせます。同じ章の日本語と英語を別Pageとして増やすのではなく、同じPage UUIDの `ja` と `en` を将来の配信先とします。 + +UI locale、本文の言語、Campus/Domainの既定言語は同じ設定ではありません。本文が日本語でも英語UIを使えます。`und` は言語未指定・legacy互換であり、「全言語で同じ内容」という保証ではありません。 + +## 解決と権限 + +明示指定、Accept-Language、地域tagの基底、Campus/system既定、und等を考慮する既存基盤があります。明示選択のURLや全endpointでの一貫性は別の完成条件です。fallbackで別言語を返す場合には選択された言語を把握できるUIが必要です。 + +非公開の日本語Revisionを英語fallbackで漏らしたり、その逆を起こしてはいけません。公開承認は言語headと正確なRevisionの関係を含めて検査します。自動公開ルールでは各言語の現在headも対象になる点を管理者へ示します。 + +## 今回の設計書配置 + +リポジトリの `docs/design/ja/` に日本語の編集元を置き、章IDをファイル名で安定化します。Wikiは `/lab/pageswiki-dev` を総目次とし、その配下へ同じ章IDで配置します。章番号は題名の表示順であってURL identityにしません。 + +配信用にMarkdownをHTMLへ変換し、`ja` Revisionとして保存します。日本語版を理由に既存英語資料を削除しません。Wiki側の公開権限を追加・変更しません。 + +英語化は原資料を単に一括アップロードするのではなく、日本語版の章ID・現在状態・決定事項と対応させます。原資料には古い構想が残るため、そのまま最新英語版とは扱えません。 + +## 翻訳台帳の案 + +`chapter_id, source_lang, source_hash, target_lang, translated_from_hash, reviewed_at, status` を持ち、元章の変更でstaleを検出します。翻訳の自動生成とreview済み公開を分けます。言語を切り替えると別の章に移動しないことを検証します。 + +## TODO + +言語選択UI、lang別history/diff、translation stale表示、明示指定とcanonical、Content-Language/Vary/cacheの整合、公開言語別の失効、英語版のreview。これらが整うまでは英語の中間資料はリポジトリで保持します。 diff --git a/docs/design/ja/index.md b/docs/design/ja/index.md new file mode 100644 index 0000000..01e391a --- /dev/null +++ b/docs/design/ja/index.md @@ -0,0 +1,53 @@ +# PagesWiki 開発設計書 + +更新日:2026-09-19。日本語の統合設計版。実装の変更履歴ではなく、現在の境界と次の設計判断を確認するための入口です。 + +## この設計書の読み方 + +- **実装済み**:利用できる機能の範囲。関連する制約や未監査部分も併記します。 +- **設計案**:今回具体化した方針。API・テーブル・既定値は、実装や互換性試験で確定させます。 +- **TODO**:未実装の作業。記述やURL例が存在しても利用可能とは限りません。 +- **保留**:安全性・運用方式・外部環境の選択が必要で、現時点では着手しません。 + +既存の英語・日本語の原資料はリポジトリに残します。初期構想と追記が混在するため、現状の読み取りでは本書の状態表示と、対応実装・テストを優先します。チェック済み項目も製品全体の完成を意味しません。 + +## 第I部 基盤 + +1. [設計思想と責務の分離](/lab/pageswiki-dev/principles) +2. [アドレス・保存・アセット](/lab/pageswiki-dev/address-storage) +3. [キャンパス・ドメイン・連携](/lab/pageswiki-dev/campus-federation) +4. [Knowledge City と案内図](/lab/pageswiki-dev/knowledge-city) +5. [認証・グループ・権限](/lab/pageswiki-dev/auth-permissions) +6. [公開・承認・共有・匿名ナビゲーション](/lab/pageswiki-dev/publication) + +## 第II部 利用機能と実行基盤 + +7. [ビューア・エディタ・連携アダプタ](/lab/pageswiki-dev/viewer-editor) +8. [検索・ツリー・ホーム・設定画面](/lab/pageswiki-dev/navigation-search) +9. [イベント・キュー・リソース監視](/lab/pageswiki-dev/scheduler-resources) +10. [ブログ・日記・公開ドメイン射影](/lab/pageswiki-dev/blog-diary) +11. [システム拡張・通知・協働](/lab/pageswiki-dev/extensions) + +## 第III部 オーガナイザーと編集拡張の設計案 + +12. [オーガナイザーの共通モデル](/lab/pageswiki-dev/organizer) +13. [タスクとチケット](/lab/pageswiki-dev/tasks-tickets) + - [個人タスク・プロジェクトの実装契約と次段階](tasks-implementation.md)(2026-09-24) + - [個人タスクのCalDAV/CLI連携](task-caldav.md)(2026-09-26、本番反映済み) + - [時間枠とPomodoroの実装契約](task-planning-focus.md)(2026-09-25) +14. [予定・iCalendar・CalDAV・連絡先](/lab/pageswiki-dev/calendar-contacts) +15. [RSSビューア・FreshRSS・newsboat](/lab/pageswiki-dev/feeds) +16. [IMAP取り込みとメールからWikiへの保存](/lab/pageswiki-dev/mail) +17. [HTMLパーツとWYSIWYGの判断](/lab/pageswiki-dev/html-editor) + +## 第IV部 運用・実装計画 + +18. [性能・保全・外部ストレージ・HA/DR](/lab/pageswiki-dev/operations) +19. [多言語と設計書の配信](/lab/pageswiki-dev/i18n) +20. [実装順序と受け入れ条件](/lab/pageswiki-dev/roadmap) +21. [決定事項・矛盾の整理・未決事項](/lab/pageswiki-dev/decisions) +22. [原資料との対応と外部仕様](/lab/pageswiki-dev/sources) + +## 今回の範囲 + +今回行うのは設計の再整理と日本語設計書の配置です。オーガナイザー、外部サービス、DAVサーバー、メールアカウント、公開権限の新設は行いません。設計書の配置も匿名公開の許可とは別です。 diff --git a/docs/design/ja/knowledge-city.md b/docs/design/ja/knowledge-city.md new file mode 100644 index 0000000..29dc242 --- /dev/null +++ b/docs/design/ja/knowledge-city.md @@ -0,0 +1,38 @@ +# 4. Knowledge City と案内図 + +状態:階層、境界、案内図、URL推論・編集の初期実装あり。自動整理の完全な整合性と大規模化は継続課題。 + +## 街の役割 + +Domainを一つのKnowledge City、Quartierを学区・街区、Streetを通り、Spotを知識の拠点として扱います。道路交通図ではなく、西洋建築の街区・中庭・入口を手がかりに知識へ到達する案内図です。 + +Spotを開くと、その拠点と周囲のPageを探索できます。ポータルPageは説明の入口であって、配下の一覧を失わせる自動転送の代用品にはしません。 + +## Path境界と多重参照 + +`/life`、`/life/home`、`/life/home/kitchen` をQuartier、Street、Spotへ対応させる例では、子境界は親の厳密な子孫です。同階層境界の重複はprimaryな所属の曖昧さを避けるため制限します。移動・統合では境界と親子関係を一緒に検証します。 + +Pageのprimary所属はPathから推論し、明示的なSpot参照は別のグラフ辺として持ちます。他のSpotへ紹介してもPageを複製せず、所属させただけで閲覧権限を与えません。Spotの下へ別のSpotを任意にネストさせる操作は現行モデルの階層ではありません。 + +## 案内図の表示規約 + +- Domainで生成した街の幾何をQuartier・Streetへ割り当て、ズームで文脈を保つ。 +- Page数は相対重みだけでなく、少量のStreetを小さくする規模の目安にも使う。 +- 未整理Pageは黄緑の個別ポイント。意味のない重複Spot名を増やさない。 +- ラベルは原則水平。未ホバー時は場所を把握でき、ホバー時は対象を強調する。 +- Spot近接・ラベル重なり・クリックとドラッグの判定を試験する。 +- メニューはモーダルへ集約し、地図ポップアップは地図中心。ESC、矢印、WASD/HJKLを既存操作と衝突させない。 +- 戻る・進むはアプリ内の状態遷移として扱い、URLの恒久履歴と同じものだと説明しない。 + +## URLからの自動整理 + +設計案は「推論結果を無条件に再生成」ではなく、手動編集を保護するreconciliationです。生成元、生成版、手動上書き、除外tombstoneを記録し、同じ入力なら変更なしに収束させます。 + +更新トランザクションと共通outboxを接続し、作成・編集・rename・削除を記録します。 +DomainごとのCity consumerは10秒周期でイベントをdebounceし、URLからの自動計画を +背景キューで実行します。成功時だけwatermarkを進め、失敗時は再試行します。完全な +所有権・分散consumer・通知配送はTODOです。 + +## 性能・認可のTODO + +現在のWorker生成や表示数上限だけでは、サーバー側で全体を読む問題は解決しません。局所的な階層取得、Pageのcursor、directory索引を先に整備します。権限で除外した名前・件数・ポータル・辺をcacheから復活させないことを合格条件にします。 diff --git a/docs/design/ja/mail.md b/docs/design/ja/mail.md new file mode 100644 index 0000000..9f01e0a --- /dev/null +++ b/docs/design/ja/mail.md @@ -0,0 +1,33 @@ +# 16. IMAP取り込みとメールからWikiへの保存 + +状態:設計案。初期はメール原本を変更しない読取専用取り込み。SMTP送信は別機能。 + +## データと識別 + +account、mailbox、UIDVALIDITY、UIDを組み合わせてremote identityを持ちます。Message-IDは重複・欠落があるため補助情報に留めます。UIDVALIDITY変更は新しい世代として再照合し、UIDだけで別のメールを上書きしません。[IMAP4rev2](https://www.rfc-editor.org/rfc/rfc9051)。 + +原MIME/EMLは不変Documentとして保存し、headers、本文part、添付、thread候補を派生metadataへ分けます。メールは私的collectionに属し、必要なものだけWiki Pageへコピーします。メールアドレスとローカルPrincipalを自動同一視しません。 + +## 初回取り込みと増分 + +フォルダ・期間・件数・サイズを選んでpreviewします。UID範囲を小batchで取得し、Documentとmetadata確定後にcheckpointを進めます。既読を付けない取得方式を使い、初期実装ではSTORE、MOVE、EXPUNGE等の変更操作を行いません。本文取得には非既読化の `BODY.PEEK` 等の意味を検証します。[IMAP仕様](https://www.rfc-editor.org/rfc/rfc9051)。 + +切断・timeoutは再試行し、外部の削除とは扱いません。IMAP4rev1互換、OAuth、サーバー固有のlabel/folder挙動は対象providerを選んだ上でfixtureにします。IDLEを採用しても定期照合を残し、全accountで無制限な接続を保持しません。 + +## 表示 + +既存EML parser/viewerを再利用し、HTMLはinert処理または分離表示にします。remote画像は既定で読み込まない案です。CID参照はそのメールの添付へ限定し、別のprivate Documentを指せません。添付名のPath traversal、巨大multipart、圧縮bombを制限します。 + +## Wikiへコピーする操作 + +確認画面で、宛先Path、題名、本文形式、添付の選択、出典リンク、公開見込みを表示します。共有メールでも自動公開はしません。`copy_receipt(account,message,destination,request_id)` 等で再送を識別し、Page・Revision・固定添付参照・監査を原子的に確定する案です。 + +コピーした後、元メールが消えてもWiki Pageを消しません。逆にmirrorの保持期限削除で、Wikiから参照されるDocumentをGCしません。コピーは既読・移動・削除・返信を同時に実行する操作ではありません。 + +privateメールをautomatic公開範囲へ入れると公開されるため、宛先policy versionを確認時と書込時で照合します。公開範囲が変化したら409等で再確認させます。本文を読めることと、外部へ公開できることを混同しません。 + +## 運用とTODO + +MAIL-1:read-only小規模fixtureとcheckpoint。MAIL-2:EML表示・添付境界。MAIL-3:copy-to-Wikiとpolicy競合。MAIL-4:保持・export・account解除。双方向既読同期やメール送信は後続の明示選択です。 + +認証失敗のbackoff、accountごとの予算、暗号化secret、ログのheader/body秘匿、再取得上限を設けます。UIは最終成功と遅延・失敗を表示し、未取得を「メール0件」としません。 diff --git a/docs/design/ja/navigation-search.md b/docs/design/ja/navigation-search.md new file mode 100644 index 0000000..511574d --- /dev/null +++ b/docs/design/ja/navigation-search.md @@ -0,0 +1,31 @@ +# 8. 検索・ツリー・ホーム・設定画面 + +状態:検索・children・Tree・ホーム・ブックマーク・設定整理の初期機能は実装済み。大規模索引と共通サイドバーは継続課題。 + +## 閲覧の入口 + +トップバーの検索はhome PathではなくDomain全体の `/` を基準にします。指定フォルダ内の検索とはモードを分けます。結果は全文だけでなくタイトル・Path・City要素のどこに一致したかを示し、Quartier/Street/Spotを上位にまとめます。 + +ファイル種別、拡張子、作成・更新日を候補取得の前に適用します。snippet生成失敗で結果全体を消さず、HTMLをそのまま検索結果へ注入しません。日本語の部分一致・現在Revisionだけの索引は残課題です。 + +## childrenとTree + +childrenは現在Pathを既定にし、表示形式は本文macroの `view` 引数ではなくナビゲーションのアイコン操作で切り替えます。仮想フォルダでは設定により配下を表示します。サムネイルは描画を妨げず非同期取得します。 + +`/v/tree/{path}` は範囲を限定します。展開・全展開・全折りたたみ状態の保持、複数選択、rename・移動・削除はPath操作と一致させます。一般の子一覧から予約ユーザー領域を混入させません。再帰操作は事前の全対象確認と競合検出が必要です。 + +## ホームとブックマーク + +通常トップバー型、中央検索型、検索+セクションカード型を選びます。セクションは手動URL/Path、または指定親の子リンクを表示します。設定は歯車のポップアップで、閲覧画面を編集フォームで埋めません。カード列はviewportに適応します。 + +外部ブックマーク連携は、手動登録と同期由来を区別し、同期時にローカル項目を削除しません。 + +## 設定画面 + +基本・認証・ドキュメント・拡張・運用等のグループとサブパネルを使います。選択したパネルだけ非同期で読み込みます。フォームの入力をpollingで上書きしません。トグルの装飾には実際のlabel・フォーカス・キーボード操作を残します。 + +テーブルは一行中心、詳細は展開またはポップアップへ。非JSONの403等をJSON parse errorに置き換えず、元の原因を表示します。 + +## TODO + +directory索引と不透明cursor、権限付き検索の十分なrecall、共通サイドバー、個人ブックマーク、関連するテーブルのアクセシビリティ試験。キャッシュは認可結果の長期保存にせず、現在の権限を再評価します。 diff --git a/docs/design/ja/operations.md b/docs/design/ja/operations.md new file mode 100644 index 0000000..f38690e --- /dev/null +++ b/docs/design/ja/operations.md @@ -0,0 +1,42 @@ +# 18. 性能・保全・外部ストレージ・HA/DR + +状態:単一writerのSQLite運用、限定付きジョブ・cache、バックアップ手段あり。HAと外部保存は別途設計・検証が必要。 + +## 現状と性能優先順位 + +複数インスタンスがあっても、同じDBを共有するHAではありません。各SQLiteとDocument Storeのauthorityを区別します。コンテンツを読む要求に、全履歴走査、全文body hydration、巨大archive展開、外部接続待ちを持ち込まないことが最優先です。 + +| 課題 | 次の修正方向 | 完了を判定する試験 | +| --- | --- | --- | +| 全Path集計 | directory索引・局所query・cursor | 大階層で候補数とDB時間が限定される | +| 全City取得 | shallow projection・遅延Page取得 | 小範囲表示で全体を読まない | +| 歴史RevisionのFTS | current-only、安全なplain text索引 | 更新・削除・日本語検索・権限失効 | +| 大容量restore | immutable参照再利用・stream | heapがpayloadサイズに比例しない | +| decoder | process隔離・重み付き予算 | timeout/cancel/メモリ上限で確実に終了 | +| 失効とcache | generation+要求時認可 | 古い一覧からprivate内容を復活させない | + +上限を増やす前にquery planと現実的なデータ量を測ります。公開ページの匿名cacheと認証ユーザーの認可cacheを同一にしません。 + +## 保全 + +DBだけでなくDocument Store、設定、復旧に必要な鍵を区別してバックアップします。稼働SQLiteを単純copyせず、online backup等の整合した手段を使います。Documentの固定hash検証、参照整合性、戻し手順をfixtureまたは別環境で確認します。 + +削除・復元は現行権限、全Path binding、依存参照、保持期限を確認します。バックアップ復元による過去権限復活には運用上の失効再適用が必要です。秘密を一般のWiki設計書やログへ複製しません。 + +## 外部ストレージ案 + +Document backendはStat/Open/ReadAt/PutIfAbsent/Verify/DeleteUnreferencedを持ち、SHA-256 identityを維持します。S3 key・ETag・URLをDocument identityとみなしません。multipart、短命URL、Range、GC、read-after-write確認を試験します。 + +WebDAV/SSHFSの可変ファイルとimmutable CASは別です。最初はread-only connector/import、マウントは専用sidecar等の運用責務としWeb要求でmountしません。SSH host key、outbound制限、secret管理が前提です。 + +## ファイル監査 + +MWDB/Karton等の接続はpending/clean/suspicious/malicious/error/expiredの状態と、engine・版・hash・時刻・由来を持つ非同期処理を案とします。監査必須の範囲ではcleanがない間のviewer/download/adapterを閉じます。scannerへ機密本文を送る操作には別の送信方針が必要です。 + +## DRとHAの順序 + +コントローラDRは署名manifest journal、鍵の保全、sequence、昇格epoch、旧leaderのfencingから設計します。記事DBとDocumentの複製は別の責務です。Campus manifestは記事バックアップではありません。 + +LB/HAにはsession失効共有、job lease、cache invalidation、uploadのnode非依存、WebSocket drain、proxy origin検証を要します。SQLiteをネットワーク共有して複数writerで動かす構成は採りません。fenced single-writer+replicaか、適切なmetadata backendを先に選びます。 + +RPO/RTOは目標値をユーザーと決め、復旧訓練の実測で保証範囲を定めます。現在の構成に無根拠な無停止・無損失を約束しません。 diff --git a/docs/design/ja/organizer.md b/docs/design/ja/organizer.md new file mode 100644 index 0000000..92cd565 --- /dev/null +++ b/docs/design/ja/organizer.md @@ -0,0 +1,45 @@ +# 12. オーガナイザーの共通モデル + +状態:設計案。今回は設計のみで、外部アカウント登録や同期を有効にしません。 + +## 目的と最初の範囲 + +Wikiの知識と、予定・タスク・連絡先・受信情報を相互に参照できる入口を作ります。メール、RSS、カレンダーの既存サービスを全て置き換えることは初期目標ではありません。 + +初期の画面は「今日」「タスク」「予定」「受信情報」「連絡先」を切り替える、薄い集約画面とします。各コレクションの権限で絞り、未読件数すら他者へ漏らさない設計です。共有の通知Inboxと、メール受信箱・RSS未読一覧は別物です。 + +## identityの案 + +| 概念 | 安定したキー | 別途持つ可変情報 | +| --- | --- | --- | +| collection | ローカルUUID、Domain、所有Principal/共有scope | 表示名・接続先 | +| item | ローカルUUID、kind、collection | status、title、version | +| Page参照 | Page UUID、参照Domain | 現在のPath・表示URL | +| remote binding | connector UUID、remote collection、remote ID | remote href、ETag、checkpoint | +| connector | ローカルUUID、provider、owner、許可scope | secret_ref、health、最終成功 | + +イベント、タスク、メール等を無型の一つのJSON表へ押し込む案は採りません。共通identity・監査を持ち、kind固有の表または厳格schemaを持ちます。Wiki本文が必要なitemだけPage UUIDへ関連付けます。全メールを自動でPageにする必要はありません。 + +## 正本を一つ選ぶ + +コレクションごとに `local_authoritative`、`remote_readonly`、将来の `remote_sync` を区別します。最初はlocalまたは読取専用mirrorです。remoteを正本とする項目の編集は、無断でlocal版を作るのではなく、未対応または明示的なcopyとして扱います。 + +同期を導入した場合もremote IDとWiki Pathを同一identityにしません。renameはbookmark/DAVのresource identityを再生成する理由になりません。 + +## 変更と同期の契約案 + +変更には期待versionとrequest_idを要求し、item更新・監査・outboxを同一transactionにします。connectorsは小さなbatchで取得し、保存成功後にcheckpointを進めます。再試行は重複排除し、失敗した一件のせいで全件再取り込みしません。 + +削除はtombstoneとして配送可能な期間を持たせます。画面から消したこと、mirror cacheを削除したこと、外部原本を削除したことを区別します。時計だけのlast-write-winsで予定やタスクを無言で上書きしません。 + +## 接続安全性 + +Domain、Principal、provider、許可host、credential purposeを固定します。リダイレクトとDNS再解決も検証し、無制限の内部ネットワーク取得を防ぎます。秘密はsecret_refだけを設定・ログへ載せます。接続解除はtoken失効、job停止、cache保持・削除の選択を伴います。 + +## UI案 + +一覧はcompact table、詳細はdrawerまたはdialog、設定は歯車。外部由来・最終同期・未送信変更・競合を区別して表示します。オフラインを「空の予定」と扱いません。Wiki保存時は保存先、出典、添付、公開予定の確認を一つの画面で行います。 + +## 受け入れ条件と未決事項 + +rename後もitem identity維持、権限失効で次要求から不可視、二重配送で重複なし、同期停止時の未送信保護、個人設定のDomain越境拒否を必須にします。共通itemを独立Object kindにするか拡張表に留めるかはprototypeで決め、DB migrationはその後です。 diff --git a/docs/design/ja/outbox-delivery.md b/docs/design/ja/outbox-delivery.md new file mode 100644 index 0000000..87f17dd --- /dev/null +++ b/docs/design/ja/outbox-delivery.md @@ -0,0 +1,53 @@ +# 共通outbox:購読・移行・復旧契約 + +更新日:2026-09-25。単一インスタンスのSQLiteと既存イベントキューでの初期実装です。タスクの期限日/計画日通知は[正本と同時に作る予約](task-reminders.md)から配信します。outbox購読による汎用変更通知、分散配送、outboxの自動削除は未実装です。 + +## 責務を分ける + +| 要素 | 役割 | +| --- | --- | +| `activity_outbox` | 正本変更と同時に保存する小さなイベント。Domain-local sequence、UUID、型、actor、対象、一意キー | +| `activity_outbox_heads` | Domain・イベント型ごとの最新sequence。INSERT triggerで同じtransaction内に更新 | +| `activity_outbox_checkpoints` | consumer・Domainごとの完了位置。成功後にのみ単調に進める | +| `event_jobs` | 実際の実行・再試行・優先度・ログ・キャンセル。outboxの記録とは別 | + +`status`、`attempts`、`next_attempt_ms` 等のoutbox旧列は互換のため残しますが、consumer配信の完了や再試行判定には使いません。旧 `processed` 行も、新規consumerにとっては未処理になり得ます。`CompleteActivityOutboxThrough` は指定したconsumerのcheckpointのみ更新します。 + +## 購読と負荷 + +`ActivitySubscription` のconsumer IDとevent type集合は信頼するworkerコードで定義します。HTTP入力から任意の購読を生成しません。現在のCity購読は `page.created`、`revision.created`、`path.renamed`、`path.unlinked`、`object.deleted` です。タスク変更や無関係の拡張イベントだけではCityジョブを作りません。 + +未処理Domainの発見はheadsとcheckpointの比較で行い、全イベント履歴を毎回検索しません。1回最大100 Domain。イベント取得は型ごとにsequence索引から上限件数を取り、その結果をマージします。1回の最終結果は最大500件、型は最大16種類です。無関係のイベントが大量に入っても、対象イベントの手前を何ページも読み飛ばしません。 + +同じconsumer IDのまま購読型を増やすと、checkpointより古い新購読型のイベントを取り逃がします。**購読集合の変更時は新しいconsumer IDを使う**ことを契約とします(例:`notifications.tasks.v2`)。再生の開始位置・過去通知の抑止を別途指定します。 + +Cityは取得した対象イベントの最終sequenceまで、再構成成功後にcheckpointを進めます。並行して追加された後続イベントは次回に残ります。再構成後・checkpoint保存前の停止は再実行になりますが、既存の冪等な再構成で回復します。途中で失敗したbatchの一部だけを成功扱いにしてはいけません。 + +## タスクの直接接続と既存データ + +タスクhead・版・専用ジャーナル・共通outbox・headsを同じtransactionで保存します。どこか一つが失敗したらDBの変更は全体をrollbackします。CASファイルの孤立可能性は従来どおりで、未commitのheadには現れません。 + +タスクの一意キーはDomainにスコープされた `organizer:{kind}:{uuid}:{version}`。payloadは版番号と変更時刻のみです。作成の再送、旧記録の再生、ジョブ再試行で二重記録しません。 + +`organizer_activity_bridge` は専用ジャーナルの移行位置です。`task.activity.publish` は1回100件、3秒timeout、既定60秒間隔・priority -5。処理したイベントと移行位置を同時commitします。失敗時は位置を進めません。対象が欠損して種類を判定できない場合はエラー停止し、黙ってスキップしません。タスクの物理削除導入時にはtombstoneを追加する必要があります。 + +この移行ジョブは拡張のユーザー操作を実行するものではなく、保存済み変更記録の内部保全です。拡張の無効化とは別に、イベント定義のenabledをOFFにできます。既存enabled・intervalの設定は起動時に保持します。`/_/api/v1/event/run` からも既存の管理権限で手動実行できます。ログは件数のみで、個人タスクのタイトルや本文は出しません。 + +## アップグレードと保全 + +初回のみ旧outboxを集計してheadsを作成します。この移行と完了マーカーはtransaction内で行い、途中失敗は再実行できます。次回以降の起動で履歴全件を再集計しません。既存checkpointと旧processed行は保持します。 + +新しいsequenceの採番は保持されたheadsの最大値から行います。将来の履歴整理でsequenceが巻き戻らないための対策ですが、**outboxの自動削除機能を提供するものではありません**。削除可能範囲には全必須consumerの完了確認に加えて、一意キーの再送抑止用tombstoneが必要です。heads・checkpoint・移行位置・正本DBをまとめてバックアップします。 + +## 残タスク + +- [x] タスクの期限日/計画日通知:正本transactionで予約を更新し、配信時に現在権限・版を再検査。旧outboxイベントから予約を復活させない。 +- [ ] 汎用の変更通知consumerと購読設定。 +- [ ] consumer別の未処理/失敗表示、再生操作、購読変更時のbootstrap。 +- [ ] 多数の失敗Domainがある場合の公平なdispatch、consumer別backoff/dead-letter。 +- [ ] Outbox保持ポリシー:必須購読者の進捗、sequenceと一意キーの保全、consumer廃止手続き。 +- [ ] 分散lease/fencing。現時点でHA時のexactly-onceを保証しない。 + +## テスト + +購読者間の独立、型での絞り込み、ページング、旧processed行の取得、初回移行/再起動、transaction rollback、無関係イベント1200件の中の対象取得、sequence巻き戻り防止を検証します。サーバー側では、タスク変更でCityジョブが作られないこと、ページ変更では作られること、タスク保存全体のrollback、移行の再開/重複抑止、管理者の停止・間隔設定保持を検証します。運用DB・外部カレンダーは使用しません。 diff --git a/docs/design/ja/principles.md b/docs/design/ja/principles.md new file mode 100644 index 0000000..a57d9a0 --- /dev/null +++ b/docs/design/ja/principles.md @@ -0,0 +1,36 @@ +# 1. 設計思想と責務の分離 + +状態:基盤は実装済み。拡張への適用は継続中。 + +## 知識の住所と実体を分ける + +PagesWikiは、人には階層と街の案内図を提供し、内部では同じ知識を複数の場所から参照できるシステムです。ファイルシステムのコピーをWikiの基本単位にはしません。 + +| 層 | 責務 | 他の層と混同しないもの | +| --- | --- | --- | +| Campus | ドメイン群の管理・配置・管理方針 | 記事本文の自動複製 | +| Domain | FQDN、Path名前空間、設定、権限評価 | インスタンスそのもの | +| Quartier / Street / Spot | 知識の整理・案内・管理範囲 | Pageの永続ID | +| Page | 言語や表示形式に依存しない知識の実体 | Path、ファイル名 | +| Revision | Pageの不変な版、言語、内容参照 | 最新版を指す可変名 | +| Document | SHA-256で識別する不変バイト列 | 認可情報 | +| Projection | 表示・編集・印刷・検索等の表現 | 別のPage正本 | + +## 守る不変条件 + +- `(domain_uuid, path)` が意味上の住所。名前変更してもPage UUIDを変えない。 +- Page UUID、Revision UUID、Document SHA-256は別物。ハッシュを知っていても読めるとは限らない。 +- 同じPageを複数箇所で紹介しても、Revision履歴を複製しない。 +- 言語はRevisionの属性。通常のPathに `/ja/` と `/en/` を強制しない。 +- 閲覧・編集・公開・管理・委譲は別の許可。ログイン成功だけで本文権限を与えない。 +- コメント、既読、評価、タスク状態はHTMLへ隠しフィールドとして埋め込まず、型付きメタデータとして持つ。 + +## 正本・派生データ・外部コピー + +正本の更新と重要なメタデータはトランザクションで確定させます。検索索引、サムネイル、ランキング、通知は派生データとして再構築可能にします。外部メールやRSSの取り込みでは、外部の原本とWikiへの明示的なコピーを区別します。 + +現在、全書き込みが共通outboxへ接続されているわけではありません。「イベント化すべき」という設計契約を実装済みと読み替えてはいけません。 + +## 変更の受け入れ基準 + +機能ごとに、名前変更、権限失効、再試行、停止・再起動、大きな入力、外部障害を試験します。上限超過時に無制限処理や無認可表示へ切り替えません。通常の閲覧・保存を重いバックグラウンド処理より優先します。 diff --git a/docs/design/ja/publication.md b/docs/design/ja/publication.md new file mode 100644 index 0000000..c23e1bc --- /dev/null +++ b/docs/design/ja/publication.md @@ -0,0 +1,53 @@ +# 6. 公開・承認・共有・匿名ナビゲーション + +状態:明示的なRevision公開、Street/Spotの自動公開、匿名ナビゲーションは実装済み。承認者Inboxは受信者単位の保存・既読APIまで実装済みで、承認要求の生成・決裁UI・配送ワーカーはTODO。共有URL管理もTODO。 + +## 三つの異なるもの + +1. 公開可能な上限:上位管理者が許可するaudience。下位は狭められるが広げられない。 +2. 実際の公開:特定Revisionの明示承認、または確認済みの自動公開ルール。 +3. 認証後のread/write:ユーザー・グループの権限。公開設定を変更しただけで編集者を増やさない。 + +`public` という上限を保存しただけで配下全部を公開したと扱いません。 + +## 現行の自動公開 + +| モード | 動作 | +| --- | --- | +| inherit | この階層ではルールを追加せず上位に従う | +| required | この範囲と配下は手動公開のみ。下位の自動公開で解除できない | +| automatic | Street/Spotの現在と将来の対象Page、および各言語の現在headを公開 | + +Domain・Quartierもrequiredの上限制約を設定できます。automaticは有効な公開audienceを必要とし、影響プレビューと明示確認、policy/topology/versionの一致で有効化します。空の範囲にも設定できるため、今後作成する記事も対象になり得ます。 + +固定したPath境界のrename、設定した本人の権限失効、Domain/Campus無効化は公開を継続する根拠になりません。境界内への移動も対象になり得るため、importやメールコピーでは公開先の確認が重要です。別名、制限された子範囲、予約領域は現行の除外対象です。 + +自動公開の停止と、別途承認したRevisionの撤回は同じ操作ではありません。完全に非公開へ戻す場合はaudienceも制限します。新しい導入・migrationで自動公開を有効にしません。 + +影響確認は現在512 Path、ルール列挙128行、公開ナビゲーション20,000件/4 MiB等の上限があります。大きい範囲は分割・ページ送り付き確認の実装が必要です。上限超過を認可成功として扱いません。 + +## 匿名表示と共有リンク + +公開Pageは読めるchildren・tree・City・パンくずへ移動できます。構造上必要な仮想親フォルダは、非公開の親本文やタイトルを見せる許可ではありません。通常・詳細・アイコン表示を共通化します。公開画面にダウンロード操作を強調する必要はありません。 + +ユーザー領域 `/u/{username}` はCityの通常公開から除外したまま、専用の公開設定を `/u/{username}/_/edit` に実装しています。プロフィール情報、プロフィール画像、ユーザーWikiのroot、配下の既定値をそれぞれ `private` / `domain` / `public` から選べます。配下の個別Pathは既定値より狭い範囲に限って上書きでき、その指定はsubtreeにも効きます。Domainの公開上限がpublicで、有効なCampus/Domainかつ認可がenforcingの場合だけpublicを保存・配信できます。上限を閉じれば次の要求から匿名配信も閉じます。 + +これは所有者が明示的に有効化する現在headの自動公開です。通常Pageの固定Revision承認を流用せず、将来の編集も同じ範囲で公開されます。匿名children・tree・browserは当該ユーザー領域だけの公開snapshotを使用し、グローバル匿名treeへ `/u/` を混ぜません。別名を持つObject、UUID/Revision経由、予約 `/_/` 経路では迂回できません。詳細は [user-space visibility contract](../user-space-publication.md) を参照してください。 + +将来のshare URLは期限・範囲・目的を限定した単一ページ表示が基本です。ログインセッションや公開ナビゲーション全体への昇格はさせません。Macaroonを含む委譲方式は設計段階で、予約 `/s/` があることは実装済みを意味しません。 + +## 承認Inboxの設計と実装状況 + +承認要求は対象Revision、依存物、scope、policy version、要求者と期限を固定します。変更された本文に旧承認を流用しません。承認者の現在の権限を決裁時に再検査し、outboxから通知Inboxへ重複排除して配送します。 + +状態はdraft → requested → approved / rejected / expired / supersededを案とします。取り消し・公開撤回は別監査イベントです。上位の承認必須設定を下位が解除できないこと、自動公開との優先順位、本人承認の可否を実装前に確定します。 + +共通通知Inboxの第一段階として、`notification_inbox`にDomain・受信者・イベント・種別を保存し、同じ組合せを重複排除します。`GET /_/api/v1/notifications` は現在のPrincipalに限定して `unread`、`limit`、`before` のkeyset取得を行い、`POST/PATCH /_/api/v1/notifications/read` は同じDomain・受信者の通知だけを既読化します。通知は権限や承認を付与せず、本文や秘密を保存しません。承認要求からの生成と再表示時の権限再検査は次段階です。 + +承認要求の対象(Path/Object/RevisionのハッシュとJSON)、policy version、generation、期限、要求者を`publication_requests`に固定保存し、決裁履歴を`publication_decisions`へ追記します。期限付きpending要求はスケジューラが小さなbatchでexpiredへ遷移させます。レビュアーの現在権限を再検査する決裁APIとInbox UIは、まだ公開していません。 + +認証済みのDomain管理者向けに、`POST /_/api/v1/publication/requests`でboundedな対象manifestを登録できます。idempotency keyで再送をまとめ、指定されたレビュアーがDomain管理権限を持つ場合だけInbox通知を作成します。`POST /_/api/v1/publication/requests/{uuid}/decisions`はDomainとgenerationを再検査し、承認・拒否をCASで一度だけ適用します。上位方針の継承、定足数、対象Revisionの現在性検査は、公開運用へ進む前の残タスクです。 + +## TODO + +依存Assetと別名の完全な影響レビュー、広域の移動・統合時のfence、ルールGC、承認者・定足数・Inbox、署名付きpolicy配信、share失効管理。RSS読者や外部SNSが既に取得したコピーを遠隔削除できるとは約束しません。 diff --git a/docs/design/ja/recipe-management.md b/docs/design/ja/recipe-management.md new file mode 100644 index 0000000..0665f25 --- /dev/null +++ b/docs/design/ja/recipe-management.md @@ -0,0 +1,32 @@ +# 料理レシピ管理(RECIPE) + +状態:設計TODO。通常のWiki文書を置き換えず、Document/Revisionを正本として +レシピ用の構造化メタデータと表示Projectionを重ねる。 + +## 基本モデル + +- レシピUUID、タイトル、概要、作者、出典、タグ、料理ジャンル、公開範囲。 +- 材料は名称・数量・単位・任意の代替材料・アレルゲンを持つ。 +- 手順は順序、本文、所要時間、温度、器具、画像Asset参照を持つ。 +- 分量(何人分)、準備時間、調理時間、合計時間、難易度を分離する。 +- Revisionと同じく変更履歴・差分・権限・監査を持ち、公開承認を迂回しない。 + +## 表示と編集 + +材料の人数倍・縮小、単位変換、買い物リスト化は表示時の派生値とし、正本の +数量を破壊しない。Markdown/HTML本文からの移行はpreviewと警告付きで行い、 +未知の単位や曖昧な数量は文字列として保持する。画像・動画・PDFのAssetは +既存のMIME/権限処理を再利用し、本文への埋め込みは安全なProjectionを通す。 + +## 連携と拡張 + +JSON-LD Recipe、印刷用カード、買い物リスト、カテゴリ・材料検索を候補とする。 +外部レシピサイトやメールからの取り込みは、出典URL・取得時刻・著作権表示を +保持し、無断公開や大量取得を行わない。栄養計算は外部データの版と不確実性を +表示し、医療上の助言とは扱わない。 + +## 受け入れ条件 + +単位変換で丸め誤差を明示すること、権限フィルタ後の検索結果だけを表示すること、 +Revision競合・削除・Asset失効を再現できるfixtureを用意すること、共有時に作者・ +出典・公開範囲を再確認することを条件とする。 diff --git a/docs/design/ja/roadmap.md b/docs/design/ja/roadmap.md new file mode 100644 index 0000000..ec6c600 --- /dev/null +++ b/docs/design/ja/roadmap.md @@ -0,0 +1,63 @@ +# 20. 実装順序と受け入れ条件 + +状態:2026-09-19再整理。旧Phase番号は原ロードマップとの対応用に残し、実装は依存関係とリスク順に進めます。 + +## 優先順 + +2026-09-27追記:`organizer.tasks 0.11.1`で[既定タスクリスト名の変更](task-dav-default-list-name.md)を実装し、12:51 JSTに[本番両インスタンスへ反映](../../operations/deployments/2026-09-27-default-task-list-name.md)。PROPPATCH 405を解消し、利用者・domain別の表示名を保存、全探索結果へ反映する。実機再試行は確認待ち。色・アイコン・通常プロジェクトのPROPPATCHは別件。 + +2026-09-27追記:`organizer.tasks 0.11.0`の[タスク所属統一と上書き同期](task-dav-project-unification.md)を実装し、12:18 JSTに[本番両インスタンスへ反映](../../operations/deployments/2026-09-27-task-unification.md)。全Webプロジェクトを個別CalDAVリストとして公開し、既定リストはプロジェクトなしに限定。無条件PUT/DELETEはトークン別設定なしで受理し、版履歴を保持する。実機再同期は確認待ち。次の優先タスクは競合候補の保存、Inbox通知、上書き前/受信版の比較・採否選択(同文書のTODO)。反映時に観測したスケジューラclaimの一時的DBロックとディスク容量整理も運用記録へ残した。 + +2026-09-25追記:個人タスクCalDAV `0.8.0`を実装・隔離試験済み(2026-09-26 00:24 JST本番反映済み)。専用資格情報UI、VTODO、CLI双方向同期。制約と次段階は[タスクCalDAV](task-caldav.md)に整理。 + +2026-09-26追記:[予定・タスク共通CalDAV](caldav-common.md)を実装。共通principal/scope付き資格情報/VEVENT・VTODO探索・CLI同期/両画面の共通設定UI。chroncal実行試験とWeb回帰を実施。後続はTZID/VTIMEZONE等のlossless書込、sync-token、資格情報ごとのcalendar制限。反映状況は運用記録を参照。 + +2026-09-27追記:[OneTaskのOPTIONS判定互換モード](caldav-onetask-compatibility.md)を資格情報単位で実装、10:01 JSTに本番反映。OneTask実機の全操作確認は残件。通常モードは維持し、未対応データを黙って変換しない。 + +2026-09-27追記:[VTODOの複数タスクリスト](caldav-task-lists.md)を`organizer.tasks 0.10.0`として実装。OneTaskのMKCALENDAR失敗に対応し、リストをWebプロジェクトへ対応付ける。隔離試験では新規作成、リスト別CRUD、権限分離、索引復旧、Web所属変更、chroncalの名前付きリスト同期まで確認。後続:OneTask実機の再同期、PROPPATCH/リストDELETE、時刻付き期限・繰り返し・アラーム、差分同期。反映状況は[運用記録](../../operations/deployments/2026-09-27-task-lists.md)を参照。 + +| 優先 | 作業単位 | 前提 | 完了条件 | +| --- | --- | --- | --- | +| P0-1 | 認可transaction fence | typed target、現行認証 | revokeと同時更新の拒否、全変更経路の棚卸し | +| P0-2 | 公開影響と構造変更 | inert HTML、現行公開 | alias/依存/移動/統合で公開を無断拡張しない | +| P0-3 | identity lifecycle | 現行Principal/group | 外部連結、メール所有、最後の管理者保護 | +| P1-1 | 共通outbox | actor・Domain sequence | 正本との原子性、二重配送、checkpoint復旧 | +| P1-2 | City/directory局所化 | 所属モデル、索引 | 部分取得、手動編集保持、boundedなreconcile | +| P1-3 | 検索・decode・大容量 | 現行上限と測定 | current-only検索、隔離、stream、cancel | +| P2-1 | 通知と承認Inbox | P0、outbox | 現在権限で再表示・決裁・失効 | +| P2-2 | HTMLパーツ | round-trip fixture | macro/asset/未知HTMLを壊さない | +| P2-3 | local task | extension契約、原子的ジャーナル | 個人タスク/プロジェクト・Inbox通知・個人local時間枠・永続化Pomodoro・Todayの見積/時間枠/集中集約を実装済み。次は計画持ち越し、日課、共有 | +| P2-4 | RSS読取・Wiki保存 | connector共通部 | FreshRSS fixtureと安全なcopy | +| P2-6 | 料理レシピ管理 | Document/Asset、検索、権限 | 材料・分量・手順・調理時間・人数・タグを構造化し、単位変換と安全な共有を検証 | +| P3 | calendar/contact/mail | import/secret/競合契約 | read-only同期、明示copy、障害復旧 | +| P4 | 外部書込・DAV提供・HA | 運用選択、試験環境 | 双方向競合、fencing、復旧訓練 | +| P2-5 | CSV表macro・ODS境界 | projection/asset権限 | RFC4180 fixture、行列上限、Revision競合、safe fallback | +| P3-2 | Slide projection/editor | adapter manifest、CSP | Reveal互換preview、CSS-only編集、HedgeDoc/Slidev隔離 | +| P3-3 | IPAM・DNS・資産管理 | typed entity、承認Inbox、outbox | 重複検査、dry-run/apply監査、外部同期差分、soft delete | + +P2以降の順序は利用価値で入れ替え可能ですが、P0の該当安全条件と共通outboxを省略しません。read-only prototypeは、本番への外部送信や公開を伴わない隔離fixtureで並行検証できます。 + +## 既に使える機能と残り + +2026-09-25追加(0.7.0、2026-09-25 07:07 JST本番反映済み):[日別計画・持ち越し・親子グループ・Wikiメモ](task-daily-notes.md)。期限を変えない再割当て、親子cursor・補足親、初期Wiki本文とタスク紐づけの原子的作成を実装。日別キャパシティ・一括計画・共有は残件。 + +2026-09-25追記(同日05:59 JSTに本番反映済み):タスクのインライン編集、2階層サブタスク、月別日割り工程表、ホーム/Todayモーダル、Inboxのアクティブ通知、スマホカレンダーUIを実装・fixture検証。[タスク一覧の契約](task-inline-schedule.md)、[通知とWeb Pushの契約](active-notifications.md)、[スマホカレンダー](calendar-mobile.md)に上限・安全条件・実機確認の残件を記載。 + +- アドレス・不変Revision・Document・Asset:基本実装あり。保持・大容量・外部backendが残り。 +- Campus/Domain・manifest:基本実装あり。反映ACK、PSK権限同期、DRが残り。 +- City Map:実装あり。局所取得、reconcile所有権、生成品質が残り。 +- 認証・グループ:実装あり。全endpoint監査・identity lifecycleが残り。 +- 匿名公開・children/tree/City:実装あり。大規模影響確認、share、承認Inboxが残り。 +- ブログ・日記・公開射影・本文RSS:実装あり。遠隔射影、コメント、tDiary等が残り。 +- オーガナイザー:カレンダーと限定CalDAV、個人タスク/プロジェクト・個別ONのInbox通知、個人local時間枠と永続化Pomodoroあり。[タスク実装契約](tasks-implementation.md)、[時間枠とPomodoro](task-planning-focus.md)参照。一般のカレンダー予定通知・共有・VTODO、RSS購読・IMAPは未実装。 +- 全面WYSIWYG、native app起動、第三者runtime、vim.wasm改善:判断待ちまたは保留。 + +## 共通のDone + +仕様状態、schema/migration、rollbackまたはforward-fix手順、認可拒否、権限失効、version競合、重複再送、payload/行数/時間/並列上限、cancel、i18n、アクセシビリティ、運用メトリクスをそろえます。 + +Go全体テストと必要なbrowser fixtureを実施し、実装済み表示とdeployment記録を別々に更新します。外部APIはmockのみでlive接続成功と報告しません。 + +## 設計タスク一覧 + +次章のADR-O1〜O8を採用判断の単位とします。TASK、TICKET、CAL、CARD、DAV、RSS、MAIL、EDITOR、CSV、SLIDE、IPAM、DNS、INV、RECIPEの各IDは詳細章のTODOと対応します。実装開始時に担当・受け入れfixture・依存issue・見直し日を付けます。規模や納期を根拠なしに確約しません。 diff --git a/docs/design/ja/scheduler-resources.md b/docs/design/ja/scheduler-resources.md new file mode 100644 index 0000000..0626ab2 --- /dev/null +++ b/docs/design/ja/scheduler-resources.md @@ -0,0 +1,40 @@ +# 9. イベント・キュー・リソース監視 + +状態:永続ジョブ、定期実行、再試行・ログ、背景リソース監視あり。共通outboxの +永続 envelope(Domain sequence、idempotency、retry state、pending取得)は実装済み。 +正本変更との同一transaction接続はPage/Revision/Path/Objectの初期経路で実装済み。 +2026-09-25:consumerごとのcheckpointとイベント型別取得、タスク/プロジェクトの同一transaction接続、個別ONのタスク期限日/計画日Inbox通知も実装済み。汎用変更通知の配送、outbox保持ポリシー、分散leaseはTODO。 + +イベントログは生ログとトレンド用bucketを分離する。`event_log_policies`で +イベント種別ごとの保持時間、集約開始時間、bucket幅、最大生ログ件数を指定し、 +`event_log_buckets`には件数と最初・最後の時刻だけを保持する。生ログの削除は +稼働中に安全な条件付きDELETEで行い、workerが書き込み中にテーブルをDROPしない。 +物理partitionの導入時もrename→新規作成→切替を原子的に行う。 + +## 責務 + +`/_/api/v1/event/` は実行する処理とタイミング、`/_/api/v1/queue/` は実行要求と状態を扱います。予定、実行中、結果、ログ、キュー設定を区別します。イベントは安全な型付き処理であり、ユーザー入力をそのままshell commandへ変換しません。 + +## 前景を優先する + +サムネイル・PDF・archive解析等は背景処理へ送ります。ジョブの同時数、入力・出力、時間、再試行を制限し、通常要求の活動を見ながらclaimします。長い接続だけで背景処理が永久停止しないよう、最低限の進行枠も必要です。 + +今後はジョブ件数だけでなくCPU/メモリ重みを管理します。native decoderのhard memory limit、プロセス分離、cancel時の子プロセス停止は別の安全条件です。 + +## outboxの実装と残り + +正本変更と `activity_outbox` を同一transactionで記録します。Domain sequence、event UUID、型と版、actor、対象UUID、idempotency keyを含めます。本文や秘密をすべて複写しません。[購読・移行・復旧契約](outbox-delivery.md)を参照してください。 + +配送はat-least-onceを前提に、consumerごとのcheckpointと重複排除を使います。処理成功後にcheckpointを進め、途中停止から再試行します。City、通知、検索、集計が個別のHTTP handler callbackへ散らばらないようにします。既存の個別journalがあるだけではこの配送契約の完成ではありません。 + +## 運用画面とリソース + +実行モニタはリソースグラフ4列と現在実行中のジョブ。設定は歯車、手動更新はアイコン。完了ジョブは履歴・ログへ統合し、ログは選択時に読みます。履歴期間の既定は1時間で選択を保持します。 + +現在値の表示更新、グラフの表示更新、背景の保存間隔は異なる設定です。1秒表示にしても1秒ごとの永続化や精密な瞬間使用率を意味しません。ブラウザを閉じても保存イベントは続きます。以前の「60秒既定」という原資料だけを最新設定の根拠にしません。 + +I/Oはプロセスの累積read/write bytes差分を時間で割った値です。再起動・欠測・counter減少は0に補間しません。ホスト全体のIOPS、latency、コンテナ合算と混同しません。 + +## TODOと検証 + +重み付き予算、dead-letterと安全な再投入、分散lease/fencing、outbox、SNMPv3読取collector。停止中の欠測、長いViewer接続、重いPDF連発、ジョブ再送、log大量化でも閲覧を優先できることを測定します。 diff --git a/docs/design/ja/sources.md b/docs/design/ja/sources.md new file mode 100644 index 0000000..3a1526e --- /dev/null +++ b/docs/design/ja/sources.md @@ -0,0 +1,44 @@ +# 22. 原資料との対応と外部仕様 + +更新日:2026-09-19。原資料はリポジトリの `docs/design/` に残します。以下はWiki上のファイル配信URLではなく、ソース資料との対応表です。 + +## 原資料の分類 + +| 本書の章 | 原資料ファイル | +| --- | --- | +| 設計思想 | `arch.md`、`access-model.md`、`platform-extension-architecture.md` | +| アドレス・保存 | `address-model.md`、`uri.md`、`asset-model.md`、`data-cli.md`、`revision-language-model.md` | +| Campus・Domain | `campus-domain-model.md`、`domain-namespace-federation.md`、`federation-manifest-integrity.md` | +| City | `knowledge-city-model.md`、`city-immersive-map.md`、`city-organization-ui.md`、`city-read-integrity.md`、`city-review-and-reconciliation.md`、`city-worker-navigation.md` | +| 認証・権限 | `auth.md`、`auth-backend.md`、`authorization-groups.md`、`browser-request-security.md`、`campus-admin-revocation.md`、`object-authority-scope.md`、`oidc-verification.md`、`smtp-magic-link-hardening.md` | +| 公開・共有 | `locality-publication-ownership.md`、`locality-access-publication.md`、`automatic-publication.md`、`publication-approval-inbox.md`、`public-navigation.md`、`social-link-cards.md` | +| Viewer・Editor | `projection-adapters.md`、`html-projection-trust.md`、`projection-metadata-cache.md`、`home-bookmark-sections-vim.md` | +| ナビゲーション・import | `navigation-home-sidebar.md`、`configuration-panels.md`、`search-results.md`、`archive-import.md`、`path-mutation-integrity.md` | +| Scheduler・拡張 | `event-scheduler.md`、`system-extensions.md`、`platform-extension-architecture.md` | +| 日記・ブログ | `diary-blog-plugins.md` | +| 新規構想 | `organizer-and-editing-ideas.md`、本書第12〜17章 | +| 保全・性能 | `object-list-pagination.md`、`revision-listing.md`、`zombie-gc-integrity.md`、`implementation-status.md` | +| 多言語 | `i18n-delivery.md`、`revision-language-model.md` | +| 実装計画・履歴 | `implementation-roadmap.md`、`implementation-status.md`、`hardening-execution-2026-09.md` | + +初期draft、詳細契約、実装状況、実行履歴は文書の用途が違います。仕様の全項目を実装済みと判定するためにdraftの文体を使わず、コードとテストの実装単位で確認します。 + +## 今回の照合対象の実装 + +`internal/store/automatic_publication.go`、`locality_publication.go`、`navigation.go`、`periodicals.go`、`public_periodicals.go`、`groups_inheritance.go`、`city_reference.go`、`revision_store.go`、`internal/server/periodical*.go`、`public_periodical*.go`、`internal/extensions/registry.go`、`data/pageswiki-cli` 等を、状態の混同が起きやすい箇所として確認しました。これは全実装の安全性監査を完了したという意味ではありません。 + +## 公式仕様と連携資料 + +以下は2026-09-19に確認した設計根拠です。プロトコル対応を実装する際は更新RFC・errata・選定clientの版も固定します。 + +- [RFC 5545 — iCalendar](https://www.rfc-editor.org/rfc/rfc5545) +- [RFC 4791 — CalDAV](https://www.rfc-editor.org/rfc/rfc4791) +- [RFC 6350 — vCard](https://www.rfc-editor.org/rfc/rfc6350) +- [RFC 6352 — CardDAV](https://www.rfc-editor.org/rfc/rfc6352) +- [RFC 6578 — WebDAV Collection Synchronization](https://www.rfc-editor.org/rfc/rfc6578) +- [RFC 9051 — IMAP4rev2](https://www.rfc-editor.org/rfc/rfc9051) +- [RFC 4287 — Atom](https://www.rfc-editor.org/rfc/rfc4287) +- [FreshRSS — Google Reader compatible API](https://freshrss.github.io/FreshRSS/en/developers/06_GoogleReader_API.html) +- [newsboat 2.42 — FreshRSS integration](https://newsboat.org/releases/2.42/docs/newsboat.html#_freshrss) + +これらの仕様が存在することと、PagesWikiがその機能を提供することは別です。本書のモデル、MVP順序、table/API案はPagesWiki向けの設計提案として区別します。 diff --git a/docs/design/ja/task-caldav.md b/docs/design/ja/task-caldav.md new file mode 100644 index 0000000..69beb2d --- /dev/null +++ b/docs/design/ja/task-caldav.md @@ -0,0 +1,183 @@ +# 個人タスクのCalDAV/CLI連携 + +2026-09-27追記:0.11.0の[所属統一と上書き同期](task-dav-project-unification.md)で、全プロジェクトのリスト化と無条件PUT/DELETEを実装し、12:18 JSTに本番両インスタンスへ反映。以下の条件ヘッダ必須という説明は旧版の契約。明示されたETagの条件は引き続き尊重する。 + +2026-09-27追記:`organizer.tasks 0.10.0`の[複数タスクリスト](caldav-task-lists.md)で、OneTaskのMKCALENDARとプロジェクト別同期に対応。以下の固定1コレクション・UIDのdomain/owner一意性は初版の説明。名前付きリストではリスト単位の一意性となり、従来URIは既定リストとして維持する。 + +更新:2026-09-26。`organizer.tasks 0.9.0`。01:33 JSTにapp/app2へ[共通CalDAVの本番反映](../../operations/deployments/2026-09-26-common-caldav.md)完了。以前の経緯は[chroncal互換性修正](../../operations/deployments/2026-09-26-chroncal-compatibility.md)、初回0.8.0の反映・バックアップは[初回デプロイ記録](../../operations/deployments/2026-09-26-task-caldav.md)を参照。 + +## 1. 目的と境界 + +2026-09-26追記:`organizer.tasks 0.9.0`で[予定・タスク共通CalDAV](caldav-common.md)を追加。旧タスク専用URLと資格情報は維持する。以下のタスク専用資格情報の制約は旧資格情報/`tasks` scopeに適用し、予定を扱うには新規に`calendar`または`all`を選んで発行する。 + +0.8.1互換性修正(2026-09-26):chroncal 0.10.0の探索・初回同期・作成・完了・Web変更取得・削除を隔離fixtureで検証。末尾slashを除くクライアント向けにhome/collectionのslashなしURIも直接処理し、301によるPROPFIND→GET変換を回避する。返却hrefはslash付きのcanonical形式を維持する。 + +Webの個人タスクをサードパーティCLIでも扱う。正本を別に増やすのではなく、既存のTaskRecord・版・変更journal・通知予約を共通で使用する。カレンダー予定のVEVENTとは別のVTODOコレクションを提供する。 + +- ドメイン×利用者ごとに一つの固定コレクション。未完了・完了・取りやめを含む。アーカイブは除外する。 +- プロジェクト自体はVTODO化しない。サブタスクは個別のVTODOとして並ぶ。既存のプロジェクト・親子・Wiki関連・取り組む日・工程終了・見積もりはCLIから消されないが、初版ではCalDAV編集項目ではない。 +- DESCRIPTIONはタスクのプレーンテキストメモ。関連Wikiドキュメントの本文を取得・公開しない。 +- 匿名公開、共有タスク、アサイン、外部カレンダー取得は行わない。 +- `organizer.tasks`無効化時はエンドポイント全体を404にする。`organizer.calendar`の有効化は不要。 + +RFC 5545 VTODOの**限定プロファイル**。フルCalDAV適合を意味する`calendar-access`は広告せず、`DAV: 1`と対応するREPORT・VTODO component-setを示す。 + +## 2. URI・認証 + +| 用途 | URI | +| --- | --- | +| タスク専用home/principal discovery | `/_/api/v1/caldav/tasks/` | +| 固定コレクション | `/_/api/v1/caldav/tasks/default/` | +| VTODOリソース | `/_/api/v1/caldav/tasks/default/{name}.ics` | +| 専用パスワード一覧/発行 | `GET/POST /_/api/v1/extension/organizer.tasks/dav-credentials` | +| 専用パスワード失効 | `DELETE /_/api/v1/extension/organizer.tasks/dav-credentials/{id}` | + +タスク画面の上部ツールバーの **⇄(CalDAV / CLI連携)** で発行・失効する。日本語/英語とテーマに追従する。名前、読み取り専用/読み書き、有効期間を指定。UIは30・90・365日、APIは1〜365日、既定90日。利用者・ドメインごとに有効な資格情報を最大20件に制限する。 + +HTTP Basicのユーザー名には発行された**認証情報ID**、パスワードには発行されたランダム秘密値を使用する。普段のログイン名やログインパスワードではない。秘密値は発行時のみ表示し、画面を閉じたらDOMから破棄する。DBには256-bit乱数のSHA-256のみを保存する。専用資格情報では通常のタスクJSON API、認証管理API、Wiki、予定カレンダーにはアクセスできない。 + +既存のBearerセッションでもこのDAVにアクセスできるが、CLIの常用は専用資格情報を使う。通常セッションで認証した管理APIのみが新規資格情報を発行できる。失効・有効期限・利用者状態・ドメインmembershipを毎回確認。書き込みでは資格情報の失効・read/write権限をタスク更新transaction内で再確認する。Cookie fallbackやCSRF検査を迂回しない。 + +本番接続はHTTPSを使用。専用資格情報をコマンド引数・共有設定・ログへ出さない。以下のAPI発行例は説明用で、実際にはUIを推奨する。 + +```json +{"label":"Laptop / vdirsyncer","write":true,"days":90} +``` + +## 3. フィールド対応 + +| VTODO | PagesWiki | +| --- | --- | +| UID | 永続同期ID。Web由来はタスクUUID、CLI作成時は外部UIDを保持 | +| SUMMARY | 件名(必須、最大300 UTF-8 bytes) | +| DESCRIPTION | タスクの非公開メモ(最大16 KiB) | +| STATUS | NEEDS-ACTION ↔ 未着手、IN-PROCESS ↔ 進行中、COMPLETED ↔ 完了、CANCELLED ↔ 取りやめ | +| DTSTART;VALUE=DATE | 工程開始日(取り組む日ではない) | +| DUE;VALUE=DATE | 期限日 | +| PRIORITY | 1=最優先、2〜4=高、5=通常、6〜9=低、0/省略=通常。Webからの出力は1/3/5/9 | +| COMPLETED | サーバーが記録した完了時刻(UTC) | +| CREATED / LAST-MODIFIED / DTSTAMP | サーバーの作成・更新日時(UTC) | +| SEQUENCE | タスクversion−1 | + +既存データを上書きするPUTは、公開した対応項目だけを置換する。PRIORITYの元の数値は同じUI優先度の範囲なら保持。CATEGORIES、LOCATION、URL、CLASS、RELATED-TO、X-*はCLI往復メタデータとして保持するが、初版ではPagesWikiの分類・関係・表示を変更しない。RELATED-TOは親子作成APIではない。PERCENT-COMPLETEは保持するがUIの完了判定はSTATUSを正とする。完了後は100を出力し、状態変更時には旧進捗率をクリアする。 + +**現在の制限:** DTSTART/DUEはDATEのみ。UTC・ローカル・TZID付きの時刻指定、VTIMEZONE、RRULE/RDATE/EXDATE/RECURRENCE-ID、DURATION、VALARM、ATTENDEE/ORGANIZER/METHODは明示的にエラーにする。時刻・繰り返しを無断で切り落とさない。DTSTAMPは必須のUTC DATE-TIME。 + +VTODOはDUE > DTSTARTを要求する。一方、Webの工程日付と期限は独立しているため、同日または期限以前にできない開始日はDAV射影ではDTSTARTを省略する。元のWeb開始日は保持し、期限が変わらない通常のGET→PUTでも消さない。この状態の開始日編集はWebを使用する。工程開始と既存の工程終了の矛盾は422で拒否する。 + +CRLF、TEXTエスケープ、75 octetsでUTF-8境界を壊さないfoldを適用する。1リソース=1 VCALENDAR+1 VTODO、最大32 KiB。未対応の意味論は403の`valid-calendar-data`で理由を返す。 + +## 4. 同期・競合・復旧 + +- PROPFIND Depth 0/1:home discovery、component-set、リソース一覧、ETag。principal/home-setはタスク専用homeに収束する。 +- REPORT `calendar-query`:VCALENDAR/VTODO component-filter。`calendar-data`の空要素に加え、明示的な`comp name="VCALENDAR"`+`allprop`+`allcomp`による全項目取得に対応。部分選択・展開・time-range/property-filterは403(未対応条件を無視した結果を返さない)。 +- REPORT `calendar-multiget`:最大200 href、欠損/別authority/コレクション外hrefは個別404。REPORTのDepth省略に対応。 +- GET/HEAD:正規化ICSとSHA-256 ETag。If-None-Matchで304。 +- PUT作成:`If-None-Match: *`を推奨。chroncal互換として完全に新規のhrefへの条件なしPUTも受け付けるが、transaction内のhref/UID一意性で競合作成による上書きを防ぐ。既存リソースの更新とDELETE:最新の強いETagの`If-Match`が必要。旧版は412、既存への条件なし更新は428。アーカイブ済みidentityの条件なし復活も428。DBのタスクversionでもCASする。 +- PUTでは表現を正規化するため、[RFC 9110 §9.3.4](https://www.rfc-editor.org/rfc/rfc9110.html#section-9.3.4)に従いその応答にETagを付けない。クライアントはGET/multigetで正規化版とETagを取り直す。 +- DELETEはアーカイブ。タスク版・Wikiメモ・子タスクを物理削除しない。Webで復元すると同じhref・UIDで再登場する。 +- UIDとhrefは別の識別子。外部UIDをUUID形式に強制しない。href名は安全なASCII英数字、`.`、`_`、`-`、最大128 bytes、末尾`.ics`。同じ利用者・ドメイン内でUIDとhrefをそれぞれ一意にする。既存identityの変更は拒否する。 +- 完了タスクを一覧から除外しない。黙った件数切り捨ては同期クライアントに削除と誤解されるので禁止する。最大10,000件/正本JSON合計32 MiB、超過時507でコレクション全体を失敗させる。大規模運用はsync-token設計へ進める。 +- 正本TaskRecord内にCLI由来UID/href/受理したICSを保存する。DBの`organizer_dav_resources`は検索索引兼一意性制約で、既存Webタスクを起動時に登録する。更新はタスク版・journal・通知と同一transaction。 +- 通常一覧・工程表の応答にはICS全文を含めない。詳細とDAVでのみ取得する。 +- バックアップは従来どおりDBとCASの両方。`organizer_dav_credentials`もDBに含まれる。個別資格情報の復元時には失効済み秘密値の復活に注意し、必要ならすべて失効する。 + +## 5. CLI接続手順 + +vdirsyncer 0.21.0 + Todoman 4.7.0で検証。検証用資格情報・DB・HTTPサーバーはすべてfixtureで、本番/外部カレンダーの内容にはアクセスしない。 + +### vdirsyncer + +`~/.config/vdirsyncer/config`(0600): + +```ini +[general] +status_path = "~/.local/state/vdirsyncer/" + +[pair pageswiki_tasks] +a = "pageswiki_tasks_local" +b = "pageswiki_tasks_remote" +collections = ["default"] +metadata = ["displayname"] + +[storage pageswiki_tasks_local] +type = "filesystem" +path = "~/.local/share/pageswiki-tasks/" +fileext = ".ics" + +[storage pageswiki_tasks_remote] +type = "caldav" +url = "https://pages.anya.jp/_/api/v1/caldav/tasks/" +username = "発行された認証情報ID" +password.fetch = ["command", "pass", "show", "pageswiki/task-caldav"] +item_types = ["VTODO"] +``` + +`password.fetch`は利用するパスワード管理ツールに合わせる。`pass show`の対象にはパスワードだけを保存する。セキュリティ上、設定例には実際のパスワードを埋め込まない。 + +```sh +mkdir -p ~/.local/share/pageswiki-tasks/default +vdirsyncer discover pageswiki_tasks +vdirsyncer sync pageswiki_tasks +vdirsyncer metasync pageswiki_tasks +``` + +### Todoman + +`~/.config/todoman/config.py`: + +```python +path = "~/.local/share/pageswiki-tasks/*" +date_format = "%Y-%m-%d" +time_format = "%H:%M" +default_list = "PagesWiki Tasks" # metasyncでdisplayname取得後。未取得なら "default" +default_due = 0 # 自動的な時刻付き期限を生成しない +``` + +```sh +todo list +todo new --due 2026-10-01 "CLIから作成するタスク" +vdirsyncer sync pageswiki_tasks +todo done 1 # 実際の対象IDに置き換える +vdirsyncer sync pageswiki_tasks +``` + +TodomanはローカルICSを編集し、vdirsyncerがサーバーと同期する。Webの変更を取り込むには先にsyncする。競合時の`a wins`/`b wins`は設定せず、差分確認して解消する。 + +## 6. 検証と次段階 + +### chroncal + +```sh +chroncal account add PagesWiki \ + --server https://pages.anya.jp/_/api/v1/caldav/tasks/ \ + --username '発行された認証情報ID' \ + --auth basic --password-cmd 'pass show pageswiki/task-caldav' +chroncal todo list +chroncal todo add 'CLIで作成' --calendar 'PagesWiki Tasks' --due 2026-10-01 +chroncal sync run --account PagesWiki +``` + +パスワード取得コマンドは手元の秘密管理方式に合わせる。通常運用はOS keyringを使用し、`--allow-plaintext`はセキュリティ上の意味を理解した場合のみ。試験ではユーザーの既存設定・DB・keyringを参照しないよう、全XDGディレクトリとHOMEを一時領域へ分離する。 + +差分`sync-collection`は未対応のため405を返し、chroncalは全件`calendar-query`にフォールバックする。これは今回のprincipal探索で発生した405とは別で、同期継続が確認できている。追加クライアント対応のために`sync-token`対応を偽って広告しない。 + +```sh +PAGESWIKI_CHRONCAL=/usr/local/bin/chroncal go test ./internal/server -run '^TestTaskDAVChroncal$' -count=1 +``` + +### 回帰試験 + +実装テスト:任意UID/href、JSON UI更新での保持、完了・復元、stale ETag、同時PUT、別利用者・ドメイン分離、専用資格情報の範囲・失効・expiry・suspended、書き込みtransaction内失効、XML namespace/Depth、未対応条件拒否、UTF-8 fold、機能kill switch。 + +実CLI試験:discovery、PROPFINDとVTODO calendar-query両経路、multiget、Web→ローカル取得、Todoman作成・完了、Web変更取得、ローカル削除→アーカイブ、再syncで版が増えないこと。 + +```sh +PAGESWIKI_VDIRSYNCER=/path/to/venv/bin/vdirsyncer go test ./internal/server -run '^TestTaskDAVVdirsyncer$' -count=1 +``` + +同じvenvに`todo`が必要。ブラウザ試験は4サイズで資格情報発行・失効・閉じた後の秘密値破棄・スクロール幅も検証する。 + +残件:時刻付き期限の正本設計、繰り返し・VALARM、標準RELATED-TOの双方向階層同期、共有コレクションACL、property/time-rangeフィルター、sync-token/差分同期、アカウント設定への資格情報管理統合、総合principal/well-known discovery、追加クライアント互換試験。現時点では対応をうたわない。 + +規範/参考:[RFC 5545 VTODO](https://www.rfc-editor.org/rfc/rfc5545.html#section-3.6.2)、[RFC 4791](https://www.rfc-editor.org/rfc/rfc4791.html)、[vdirsyncer公式設定例](https://github.com/pimutils/vdirsyncer/blob/main/config.example)、[Todoman設定](https://todoman.readthedocs.io/en/stable/configure.html)。 diff --git a/docs/design/ja/task-daily-notes.md b/docs/design/ja/task-daily-notes.md new file mode 100644 index 0000000..f4962e3 --- /dev/null +++ b/docs/design/ja/task-daily-notes.md @@ -0,0 +1,73 @@ +# 日別計画・親子グループ・Wikiメモ + +2026-09-25実装。organizer.tasks 0.7.0。今回の変更は2026-09-25 07:07 JST本番反映済み。 + +[本番反映記録](../../operations/deployments/2026-09-25-task-daily-notes.md)。 + +## 日別の計画 + +| 画面 | URI | 対象 | +| --- | --- | --- | +| 持ち越し | `/v/plan/tasks/carryover` | 昨日以前の計画日、または昨日以前の期限が残る未完了タスク | +| 今日 | `/v/plan/today` | 既存の今日の計画・今日までの期限超過 | +| 明日 | `/v/plan/tasks/tomorrow` | ドメインのタイムゾーンでの翌日の計画・期限 | +| 任意の日 | `/v/plan/tasks/day/YYYY/MM/DD` | 指定日が計画日または期限の未完了タスク | + +日付ピッカーと前後日の移動を提供する。日別画面のクイック作成/新規作成では選択日を計画日に入れる。カレンダー時間枠の初期日付も日別画面の選択日を優先し、他画面はタスクの計画日があれば利用する。時刻の解釈・DST検証は既存のカレンダーAPIによる。 + +持ち越し画面では割り当て先日付を指定し、各行の矢印でその日に変更できる。変更するのは `planned_on` のみ。期限・工程日・子の計画日・カレンダーイベントは自動変更しない。期限超過のタスクは計画を将来に移しても持ち越しに残る。完了や取消済み・archive済みは除外する。完了した日の実績表示はこの画面の対象外。 + +APIは既存itemsの `view=day&date=YYYY-MM-DD`、`view=carryover`。指定日が不正なら422。今日と持ち越しの基準日はクライアントではなくサーバーのドメイン時刻で決定する。既存のToday集計・外部カレンダーは変更しない。 + +## 親子の一覧 + +- UIは `hierarchy=1` で取得。親の作成日時/UUIDをグループキーとし、親→子の順で同じグループに配置する。子はグループ内で新しい順。 +- cursor比較にもグループキーと親子順位を含める。続きを取得した際はUUID単位で統合し、親・子を重複させない。 +- 子だけが日付や検索条件に一致したときは、同じDomain・所有者の親を補足表示する。「親」マークは親自体がフィルタ対象ではないことを示す。この補足は親に日付を割り当てたり、Today集計へ追加したりしない。 +- 親を今日・明日へ入れた場合も、展開操作で日付未設定/別日/完了済みを含む子を取得できる。最初に一致した子だけを表示している場合は「すべてのサブタスク」アイコンを提供する。 +- 展開はオンデマンド、1回100件。超過時はその親の中で続きを読み込む。親情報は最大100件のバッチ取得とし、一覧の各子について個別APIを呼ばない。 +- 同一画面での再読込では展開済み状態を保持する。画面間・ブラウザ再起動をまたぐ永続化は未対応。 +- 未保存の編集がある間は一覧再構築・子の置換を抑止し、編集中の入力を破棄しない。 + +グループソートには所有者で限定した自己結合を利用する。出力は既定60/最大100件、APIは既存の5秒上限。極端に大量の個人タスクでソートが支配的になった場合、安定したfamily sort keyの索引化を検討する。全ユーザ・全Domainを読み込む設計にはしない。 + +## Wikiメモの保存先と動作 + +従来のTaskRecord.notesは個人用の短いプレーンテキストメモとして残す。今回の「メモ表示」「メモ編集」は、通常のWiki Pageへ接続する別の導線。 + +プロジェクトの編集画面で次を指定する。 + +1. **関連するWikiのPath**:実在する、本人が読めるプロジェクトのページ。 +2. **Wikiメモのサブ階層**:そのページの配下を表す相対Path。既定は `tasks`。複数階層も指定可。 + +例: + +- プロジェクトの関連Wiki:`/projects/pageswiki` +- サブ階層:`work/notes` +- タスク件名:`通知UIの改善` +- 作成先:`/projects/pageswiki/work/notes/通知UIの改善` + +件名を1つのPathセグメントとして扱う。`/\\?#%` と制御文字はハイフンへ変換、単独の `.`/`..`/`_` はUUID付きの安全な名前へ置換する。相対サブ階層の絶対Path、空セグメント、親移動、制御空間 `_` は拒否する。 + +既存の関連WikiページUUIDがタスクにあれば、それをメモとして使う。なければ上記の候補Pathを確認し、明示的な確認後に新規作成する。初期本文はHTMLエスケープした件名のH1。表示ボタンからでも未作成なら作成確認→エディタとなる。編集時は利用可能な既定のHosted Editorを優先し、それ以外は標準の `/e/-/...` を利用する。 + +初回作成後はタスクの `page_uuid` で関連付ける。Wiki側のrename/移動に追従する。タスク件名やプロジェクトのサブ階層を変えても、既存のメモを自動rename/移動しない。同名ページが既にあれば409で停止し、詳細画面からの明示的な関連付け、または件名の変更を案内する。既存の内容を上書き・自動統合しない。 + +プロジェクト未選択/関連Wiki未指定の場合は設定を案内する。プロジェクトの関連ページ自体の新規作成は既存Wikiエディタで行う。リンク済みメモが削除・権限失効した場合、同じPathへ勝手に作り直さない。詳細画面で関連付けを明示的に解除してから再作成する。 + +## API・保存・公開の境界 + +- `GET items/{uuid}/note`:現在のPath、閲覧/編集URL、linked/exists/writable、TaskRecord、ETag。副作用なし。 +- `POST items/{uuid}/note`:新規作成と関連付け。`If-Match: "{task version}"`、JSON `{"path":"確認した作成先"}` が必要。欠落428、版/確認先変更412、Path衝突409。 +- Page、Path、初期Revision、タスクhead/revision/journal、共通outboxを同一transactionで確定する。プロジェクト版と関連Path→UUIDもwriter transactionで再照合。DB失敗時にPageや紐づけだけを残さない。CASファイルは既存仕様どおりrollback後に未参照ファイルとして残る可能性がある。 +- タスクは個人専用のまま。WikiメモはWiki Pathの公開設定と権限に従う。作成確認でこの違いを明示する。タスク所有権だけでWikiのread/create/writeをバイパスしない。 +- readonly・他人のタスク・失効membership・無効な拡張を拒否。既存Wikiへの明示リンクは従来のpage_path更新を利用する。 +- DBスキーマ変更なし。`notes_subpath,omitempty` はプロジェクト正本JSONの追加項目。未指定の既存正本のhashは変えない。旧バイナリでプロジェクト設定を保存するとこの追加項目が落ちるため、運用開始後はforward-fixを推奨する。 + +## 検証・残り + +Go fixture:日別/持ち越し条件、親子cursor、補足親の私有境界、日付検証、メモ作成、保存失敗rollback、H1 escaping、同名衝突、確認先変更、UUID追従、readonly、Wiki書込権限を検証。 + +Chromium fixture(1440/1024/390/320px):親から日付未設定の子を展開、子の重複防止、明日への作成、時間枠の初期日、持ち越しの割当て、メモ編集ボタンで新規Wikiへ遷移、表示ボタンでViewerへ遷移。外部取り込みカレンダーにはアクセスしない。 + +残件:親子の計画日の明示的一括変更、日別キャパシティ、日別の完了実績、親子のドラッグ並べ替え、共有、メモの任意rename/移動のタスクUI統合、実機Safari検証。本番2インスタンスへ2026-09-25 07:07 JSTに反映済み。 diff --git a/docs/design/ja/task-dav-default-list-name.md b/docs/design/ja/task-dav-default-list-name.md new file mode 100644 index 0000000..a85904c --- /dev/null +++ b/docs/design/ja/task-dav-default-list-name.md @@ -0,0 +1,31 @@ +# 既定タスクリストの表示名変更 + +2026-09-27、`organizer.tasks 0.11.1`。**12:51 JSTに本番app/app2へ反映済み。** [反映記録](../../operations/deployments/2026-09-27-default-task-list-name.md)。Tasks.org実機の再試行は利用者確認待ち。 + +## 原因 + +利用者が既定リスト名を変更するとエラーになると報告。本番の秘匿済みログでは03:39:59 UTCに`PROPPATCH target=task_collection status=405`、認証結果は`basic_accepted`。0.11.0ではリストのPROPPATCHが未実装で、既定名`PagesWiki Tasks`も固定値だった。認証不良や名前の衝突ではない。 + +## 変更契約 + +- `PROPPATCH /_/api/v1/caldav/tasks/default/`のDAV:displaynameのsetを受理。末尾slashなしも同じリスト。 +- 表示名は`organizer_dav_default_lists`にdomain/owner単位で保存する個人設定。未設定なら従来の`PagesWiki Tasks`。トークンを交換しても同じ利用者の設定を使用する。 +- URLやプロジェクトなしという所属の意味は変更しない。架空のプロジェクトは作らない。タスク本文、UID、revision、ETagは変わらない。 +- 共通CalDAV home、旧task home、既定リスト自身のPROPFINDで同じ保存名を返す。索引再構築でも設定を失わない。 +- UTF-8で1〜300 bytes、空白だけや制御文字は拒否。XMLテキストとしてescapeして返す。名前をアクセスログへ追加しない。 + +## PROPPATCHと認可 + +[RFC 4918 §9.2](https://www.rfc-editor.org/rfc/rfc4918.html#section-9.2)の原子的更新・Multi-Statusに従う。全命令を検証後に保存し、正常時は207/property status 200。未対応propertyやremoveは403、無効な名前は409、同じ要求のその他の正常propertyは424で、部分更新しない。複数setは順序どおり解釈する。不正XML・DTD・過大なXMLの制限には共通DAV parserを用いる。 + +認証、tasks/all scope、write権限を必要とする。保存transaction内でwriterを取得してから現在のmembership/principal/トークンの失効・期限・scope/拡張の有効状態を再確認する。別domain/ownerへの設定変更はできない。 + +## 範囲と残件 + +今回の対象は既定タスクリストの名前のみ。通常プロジェクト/MKCALENDARリストのPROPPATCH、色・アイコン・任意dead property、リストDELETEは引き続き未実装。プロジェクトの名称はWebのプロジェクト編集で変更可能。Tasks.orgのupdateCollectionはdisplaynameを個別要求し、その後必要に応じて色・アイコンの別要求を送るため、それらの未対応応答は名前変更の成功とは分けて扱う。 + +## 検証 + +隔離HTTPテストで、日本語・XML特殊文字の名前、3箇所の探索結果、ETag/本文の不変、プロジェクトが増えないこと、schema再実行後の永続性、OPTIONSのPROPPATCH広告、malformed XML/不正名/未対応property混在の原子性を確認。他owner、別domain、readonly、calendar-only、匿名、失効トークン、拡張無効化も検証する。本番の既定名は変更しておらず、実機の再試行は反映後に必要。 + +実施結果:全Goテスト成功。chroncalの既定・共通・名前付き・通常Webプロジェクトの同期試験、vdirsyncer/Todoman試験も成功。追加の名前変更・認可・原子性テストは5回反復成功。 diff --git a/docs/design/ja/task-dav-project-unification.md b/docs/design/ja/task-dav-project-unification.md new file mode 100644 index 0000000..cfa10ad --- /dev/null +++ b/docs/design/ja/task-dav-project-unification.md @@ -0,0 +1,64 @@ +# タスクの所属統一とCalDAV上書き同期 + +後続0.11.1:[既定タスクリストの表示名変更](task-dav-default-list-name.md)を実装し、2026-09-27 12:51 JSTに本番反映。所属・URLは維持したまま、固定名PagesWiki Tasksを利用者ごとに変更できる。 + +2026-09-27。`organizer.tasks 0.11.0`。**12:18 JSTに本番app/app2へ反映済み。Tasks.org Desktop実機の再同期は利用者確認待ち。** [反映・移行確認記録](../../operations/deployments/2026-09-27-task-unification.md)。 + +利用者の決定:PagesWikiのプロジェクトと外部タスクリストを統一する。条件なしの書き込みは上書きを受け付け、トークン単位の上書き互換スイッチは設けない。競合を通知してどちらを採用するか選ぶ機能は次段階に実装する。 + +## 1. 確認した不整合 + +0.10.0では、MKCALENDARで作ったリストのみプロジェクトと一対一に対応し、通常のWebプロジェクトはプロジェクトなしのタスクと同じ既定リストに混在していた。また、既存リソースのPUT/DELETEは条件ヘッダ必須で、直接接続クライアントの無条件更新を428で拒否していた。 + +Tasks.org公開ソースの確認対象はcommit `0fde622e917ea2cbb0956c3effe9209c11045a67`。`CaldavSynchronizer.pushTask`は`remote.put(requestBody)`、削除は`remote.delete {}`で条件ヘッダを渡さない。依存するdav4kmp `1.0.0-beta01`(commit `dec7bd10952278c7ac196de111880f00d75d8f3e`)もそれを自動補完しない。本番の秘匿ログに認証成功後のPUT 428が反復していた。ただし、利用者のインストール版と調査したソースが同じか、個々のログがDesktop由来かは未確定。ctag追加による解決ではない。 + +- [Tasks.org同期処理](https://github.com/tasks/tasks/blob/0fde622e917ea2cbb0956c3effe9209c11045a67/kmp/src/commonMain/kotlin/org/tasks/caldav/CaldavSynchronizer.kt) +- [dav4kmp HTTP処理](https://github.com/tasks/dav4kmp/blob/dec7bd10952278c7ac196de111880f00d75d8f3e/src/commonMain/kotlin/at/bitfire/dav4jvm/ktor/DavResource.kt) + +## 2. 所属・URI契約 + +| 正本の所属 | CalDAVリスト | +| --- | --- | +| `ProjectUUID`が空 | `/_/api/v1/caldav/tasks/default/`。既存表示名PagesWiki Tasksは維持し、意味をプロジェクトなしに限定 | +| 通常のWebプロジェクト | `/_/api/v1/caldav/tasks/projects/{projectUUID}/` | +| 既存MKCALENDARプロジェクト | `/_/api/v1/caldav/{dav_collection}/`。既存URLを維持 | + +- タスクのUUID、UID、filename、ProjectUUID、版、本文を移行で変更しない。名前やカテゴリから所属を推測しない。 +- 通常プロジェクトのURLは不変UUIDから導出するため、`dav_collection`を正本へ後付けする必要はない。表示名は常にプロジェクトのタイトル。名称変更でURLは変わらない。 +- `tasks/projects/`はタスク専用名前空間。予定カレンダーのUUIDと衝突しない。外部取り込み予定は読まない。 +- リストの新規タスクはそのプロジェクトへ所属する。Webで所属を変更するとリスト間を移る。CalDAVのMOVE実装とは別。 +- 閲覧できるのは同じdomain/ownerのプロジェクトのみ。アーカイブ済みプロジェクトは探索・アクセスから除外し、そのタスクを既定リストへ流出させない。 +- リスト全体の完全な探索に現在の256件上限を適用し、超過時に部分リストを返さず507にする。将来の大量プロジェクト向け探索最適化は残件。 + +## 3. 移行と古いクライアント + +起動時のEnsureTasksSchemaで、ルーティング索引とタスクのリスト別identity索引を同じDB transactionで再構築する。全プロジェクト(アーカイブ済みも含む)とタスクの現行headから導出し、失敗時は全体をrollbackする。正本・履歴を書き換えず、反復実行でURI/ETagは変わらない。起動時の再構築はタスク数に比例する処理であり、リクエストごとには行わない。 + +既定リストから通常プロジェクトへ移った旧hrefは`organizer_dav_legacy_hrefs`に移行メタデータとして記録する。旧hrefへのGETは404、古い未同期PUTによる再作成は409 `task_collection_relocated`。別リストを旧href経由で変更・削除するaliasにはしない。これにより、古い端末の再送で同じタスクがプロジェクトなしに増えることを防ぐ。索引を再構築しても移行メタデータは保持する。 + +本番反映前後には未送信の変更を保全し、各端末でリストの再探索・新しいプロジェクトの同期有効化を行う。未同期データがある状態でアカウントやローカルデータを削除しない。409の場合は新しい所属リストを確認して未送信変更を反映する。0.10以下へ安易に戻すと旧既定リストに再混在するため、戻す場合はタスク拡張を停止し移行方針を確認する。 + +## 4. 書き込みの現行契約 + +- 条件ヘッダなしのPUT/DELETEを全タスクCalDAV接続で受理する。追加のトークン互換設定・User-Agent判定は設けない。既存のOPTIONS calendar-access広告設定とは独立した話。 +- 最後にcommitした内容を採用する。削除は従来どおりアーカイブ。削除後に無条件PUTが来た場合は同じidentityの新しい版として復元する。 +- 明示されたIf-Match/If-None-MatchはHTTPの事前条件として尊重し、不成立なら412。Web UI/JSON APIの版チェックは変更しない。 +- 保存は既存のwriter transactionとversion CASを維持する。条件なし書込の競合時は最新headを取得して最大8回再試行し、CalDAVで表現する項目だけを再適用する。PagesWiki固有の計画日・整理先・関連文書等を古いheadへ巻き戻さない。過度な競合は409で再同期を要求する。 +- 同時新規作成は同じhrefの1identityへ収束する。別hrefへのUID衝突、UID変更、他利用者へのアクセス、失効トークン、readonly、無効化された拡張は従来どおり拒否。 +- 新規head、CAS本文、organizer_revisions、organizer_changesは既存の同一保存処理を用いる。上書き前の版は保持される。PUT本文を正規化するためPUT成功応答にETagは付けず、GET/REPORTで取得する。 +- **この段階では競合通知も採否選択UIもない。** 古い端末の変更が新しい内容を上書きし得ることは、今回採用した動作。 + +## 5. 次段階:競合通知と採否選択(未実装TODO) + +1. **比較の根拠と来歴**:書き込み元(Web/DAV、資格情報の非秘密ID)、対象task/domain/owner、受信時刻、base版が分かるか、上書き前/採用後の版を記録する。秘密値や生の本文をアクセスログへ出さない。DTSTAMPや端末時計だけで新旧を決めない。 +2. **baseが不明な更新**:条件なし要求だけでは競合を厳密に判定できない。直近配信版などの補助記録は参照先を共有する端末もあり確定根拠にならないため、「競合候補」として扱う。全ての通常編集を競合扱いしない検出条件と上限・保持期間を設計する。 +3. **候補保存とInbox outbox**:上書き前/受信版の参照をhead更新と同じtransactionで保存し、ownerの通知Inboxへ重複抑制付きで配送する。通常のアクティブ通知設定に従い、作業を強制的に遮らない。未解決候補が参照する版をGCしない。 +4. **比較・選択UI**:「上書き前を採用」「受信版を採用」「現在の内容を維持」を項目差分付きで表示。採用は履歴を戻すのではなく新しいrevisionを作成する。 +5. **解決の競合**:候補の解決時にも最新headを再確認し、通知後の第三の変更を黙って消さない。owner/domain/現在権限を再検証し、解決済み通知の二重操作を防止する。 +6. **受け入れ試験**:Webと二つのDAV端末の競合、更新対削除、復元、通信再送、遅延したInbox配送、別domain/owner、権限失効、履歴GC、同一候補の二重決裁。 + +## 6. 今回の検証範囲 + +合成データで通常プロジェクトの探索・所属、旧索引移行・再実行、URI/ETag維持、古いhref再作成防止、名前変更、他owner隔離、アーカイブの非流出、無条件同時更新・同時作成・削除・復元・履歴保持を検証する。既存の明示ETag競合試験、認可試験、共通CalDAV・CLI同期・Web回帰も継続する。外部取り込みカレンダーや本番の認証情報・本文をテストデータにしない。 + +実施結果:`go test ./...`成功。追加の所属・上書き試験は10回反復成功、関連試験の`-race`も成功。実chroncalで既定・共通home・MKCALENDAR・通常Webプロジェクトの各リストを検証し、vdirsyncer/Todomanも成功。ChromiumでタスクUI(desktop/laptop/mobile/mobile-small)とカレンダーUIの回帰試験成功。これらは隔離fixtureの結果であり、Tasks.org Desktopの実機成功や本番反映を意味しない。 diff --git a/docs/design/ja/task-inline-schedule.md b/docs/design/ja/task-inline-schedule.md new file mode 100644 index 0000000..8a61b0d --- /dev/null +++ b/docs/design/ja/task-inline-schedule.md @@ -0,0 +1,49 @@ +# インラインタスク、サブタスク、日割り工程表 + +更新:2026-09-25。`organizer.tasks` 0.6.0。実装・隔離fixture検証済み。同日05:59 JSTに本番2インスタンスへ反映済み。[反映記録](../../operations/deployments/2026-09-25-active-notifications-calendar-mobile.md)。 + +## 一覧中心の編集 + +0.7.0の追加仕様(2026-09-25 07:07 JST本番反映済み):[日別計画・親子グループ・Wikiメモ](task-daily-notes.md)。以下の0.6.0契約を拡張する。 + +件名・状態・取り組む日・期限・見直す日・工程開始/終了を一覧で直接編集する。変更確定/フォーカス移動時に保存する。詳細メモ、通知時刻等は既存の詳細画面へ残す。時間枠ボタンは一覧から直接カレンダー追加モーダルを開く。 + +保存は行が取得したversionでIf-Matchを行う。完全なTaskRecordを再取得してから変更項目を合成するが、If-Matchは再取得したversionへ勝手に進めない。他の画面との競合では入力を保持し、行の再読込で明示的に破棄できる。編集中/保存中は一覧の自動再読込で入力を捨てない。 + +### コンパクト一覧(2026-09-25追加、06:17 JST本番反映済み) + +[本番反映記録](../../operations/deployments/2026-09-25-compact-task-ui.md)。 + +- 幅1024px以上は表に近い1タスク1行。共通見出しの下に完了操作・件名・状態・取り組む日・期限・見直す日・工程開始・工程終了・操作を並べる。行高は通常約34px、行内のmargin/gapは0。サブタスクも列幅を揃え、件名の字下げと親へのリンクで階層を示す。 +- 利用可能な横幅を使い、列が収まらないPC幅では一覧の内側のみ横スクロールする。入力や操作を折り返さず、ページ全体の横はみ出しを防ぐ。詳細・カレンダー追加・再読込・子の展開・子の追加はラベル付きアイコン操作。 +- 1024px未満はフィールドラベルを省略しないカード状の配置。日付は2列、入力文字16px以上、タッチ対象44px以上。サブタスクは罫線と字下げで区別する。入力・保存契約はPCと同一。 +- 保存中/成功の通知はスクリーンリーダー向けstatusに残し、行を増やさない。保存エラー・競合は行の下に本文を表示して入力を保持する。アイコンにはtooltipとアクセシブル名を設け、サブタスクの展開状態をaria-expandedで伝える。 +- Chromium fixtureで1440px・1024px・390px・320px幅、PC列揃え、タッチ領域、インライン保存、階層表示を検証する。実機Safariのdate入力等は引き続き別途確認が必要。 + +## 階層と日付 + +`parent_uuid`を持つサブタスクを親の一覧からインライン追加できる。初版は親→サブタスクの2階層。同じDomain・所有者のtaskのみ。自己参照・循環・3階層目・他人の親・新規のarchived親への配置を拒否する。親の完了・archiveは既存の子を完了/archiveしない。 + +子は独立した件名、状態、各種日付、見積りを持つ。作成時に親のproject/bucket/priorityをコピーするが、その後の自動継承はしない。Todayの見積もりは各項目独立で加算するため、親と子に同じ工数を二重計上しない運用とする。roll-upは未実装。 + +新しい`start_on`/`end_on`は工程のcivil dateで、両端を含む。片方だけならその1日。逆順と366日を超える範囲を拒否する。期限/計画日や実際のカレンダー時間枠は自動変更しない。 + +## 工程表とナビゲーション + +- `/v/plan/tasks/schedule`:ドメイン現在月。 +- `/v/plan/tasks/schedule/YYYY/MM`:月の日割り工程表。日付列に工程のバーを表示、タスク詳細へ遷移。 +- `?project={UUID}`でプロジェクトを絞り込む。 +- API:`GET /_/api/v1/extension/organizer.tasks/schedule?month=YYYY-MM&project=...`。 +- 月最大200件、超過はpartial表示。開始日の索引と366日上限で走査範囲を制限する。メモは返さない。 +- family API:`items?view=family&parent={UUID}`。100件まで+cursor、完了/archive済みの子も確認できる。 +- ホームの検索ショートカットへタスク一覧アイコン、上部ナビバーへ「今日のタスク」モーダルを追加。開くまで一覧fetchをしない。 + +## Migration、検証、次段階 + +DBにparent/start/end列と子一覧・工程表索引を追加する。新フィールドは空ならcanonical JSONから省略するため既存正本のhashを変更しない。工程と親参照は版管理対象。同一transactionで正本参照、投影、履歴、outbox、通知を更新する。 + +旧バイナリは新フィールドを保存時に落とすため、新しい階層・工程を利用した後の単純なbinary rollbackは避け、forward-fixを優先する。データごと戻す場合はDBと正本を同じバックアップ時点へ戻し、それ以降の更新が失われることを確認する。 + +Goで日付範囲、月またぎ、階層制約、親状態と子の独立性を検証。ChromiumでPC/スマートフォン幅のインライン日付編集、子追加、Todayモーダル、時間枠・Pomodoroの既存操作を検証。 + +TODO:日割りバーのdrag/resize、折りたたみ状態保持、子の昇格/別の親への移動UI、親への工数roll-up、日付未設定を工程表から割当てる操作、依存関係・共有・日課instance。時間単位の工程表とは別機能として扱う。 diff --git a/docs/design/ja/task-planning-focus.md b/docs/design/ja/task-planning-focus.md new file mode 100644 index 0000000..e28aaa3 --- /dev/null +++ b/docs/design/ja/task-planning-focus.md @@ -0,0 +1,118 @@ +# タスクの時間枠とPomodoro + +更新:2026-09-25。`organizer.tasks` v0.5.0 の実装契約。[個人タスクの基本設計](tasks-implementation.md)、[期限日/計画日の通知](task-reminders.md)を前提にします。 + +## 1. 利用できる画面 + +`/v/plan/today` および各タスク画面にPomodoroバーを表示します。集中25分、休憩5分を初期値とし、それぞれ1〜180分の範囲で指定できます。開始/一時停止/再開/終了/中断を提供します。 + +保存済みタスクの編集ダイアログに以下を追加します。 + +- **時間枠をカレンダーへ**:カレンダー・開始・終了を指定するモーダル。既存の時間枠の表示、予定詳細への移動、未完了要求の再試行、関連解除。 +- **このタスクに集中**:タスクに関連付けてPomodoroを開始。タスクに未保存の変更があれば、先に保存するよう促します。 + +日本語/英語、既存テーマ、PC/スマートフォンに対応します。readonly利用者は状態の表示のみ可能です。完了・アーカイブ済みタスクでは新しい時間枠や関連タイマーを開始しません。タスクに関連付けないタイマーも使えます。 + +## 2. 時間枠の意味と境界 + +タスクの期限日、取り組む日、カレンダーの割当時刻は別の情報です。時間枠の作成・変更・解除によって、タスクの日付・状態・版を自動更新しません。 + +初版の対象は **自分が所有する、非公開・メンバー未設定・Sourceなしのローカルカレンダー** に限定します。公開・共有カレンダー、外部ICS/CalDAV取り込みは除外します。ピッカーはカレンダーのメタデータだけを調べ、外部SourceのURLや資格情報をレスポンスへ含めません。 + +予定の作成/再取得時は、カレンダーのロック取得後、ICSスナップショットを読む**前**にこの条件を再検査します。そのためピッカーを開いた後に公開・共有などの設定が変更されても、条件外の予定をタスク連携から読まない設計です。 + +利用者の明示した方針に従い、新しく作る予定名は `Focus time(タスクの件名)` とします。作成要求のDB transactionで件名をsnapshot保存し、再試行中にタスク名が変わっても要求の予定名を変えません。改行・制御文字は空白化し、iCalendarのエスケープ/折り返しを適用します。メモ・task UUIDはICSへコピーしません。 + +後からそのカレンダーを公開・共有した場合、予定に含めたタスク件名も見えることを作成画面に明記します。既存予定の名前は自動変更しません。旧版で作った `Focus time` や利用者が編集した予定名も、再試行で上書きしません。タスク名の変更による既存予定名への自動同期も行いません。 + +1タスクにつき有効な関連は最大100件、1枠は24時間以内。フォームはドメインのタイムゾーンを明示し、そのIANA zoneと現地日時を送信します。存在しない夏時間の時刻は拒否します。夏時間終了時の重複時刻はGoのzone解決に従うため、厳密な片側指定が必要なクライアントはRFC3339オフセット付き日時を送ります。 + +## 3. 正本と失敗からの回復 + +予定の正本は従来の月別ICS/calendar manifestです。関連と未完了要求の正本はSQLiteの `organizer_time_blocks` です。これらを一つの原子的commitであるかのようには扱いません。 + +1. DBのwriter transactionで、所有者・現在のmembership・タスクの種類/状態/版・拡張の有効性を確認し、`pending`要求を記録。 +2. 要求UUIDから決定的に作るevent UIDで、カレンダー側のロック内で「存在すればそのまま、なければ作成」。 +3. DBの関連を`active`へ更新。失敗したら`pending`を残し、同じ要求UUIDで再試行。 + +再試行は既存予定を上書きしません。予定が移動・時刻変更されても、同一calendar UUID+event UIDから現在時刻とETagを取得します。`active`な予定が削除されていたら、GETや再試行では再作成せず、利用不可として表示します。 + +関連解除は`unlinked` tombstone化で、カレンダーの予定を削除しません。同じ要求の再送は拒否し、関連が復活しないようにします。解除と進行中の作成が競合した場合も、解除した関連をactiveへ戻しません。ただし独立したファイルcommitがすでに進んでいれば、関連のない予定が残る可能性があります。予定削除が必要ならカレンダー画面で確認のうえ実施します。 + +1つのHTTP要求で全関連のカレンダーデータを走査しません。関連一覧取得はDBのみ。UIは10件ずつ、表示する各関連の現在時刻を逐次取得します。画面を閉じたら続きの取得を止め、各fetchは15秒timeoutです。サーバーの要求処理は5秒timeoutです。 + +### 時間枠API + +prefix:`/_/api/v1/extension/organizer.tasks/` + +| Method / suffix | 内容 | +| --- | --- | +| `GET calendars` | 対象カレンダーのID・名前・pretty_name、ドメインのzone | +| `GET blocks?task_uuid=...` | 自分のタスクの有効関連一覧(最大100件、初期要求の日時) | +| `GET blocks/{uuid}` | 現在の時刻・ETag・予定href。参照不可なら`available:false` | +| `POST blocks` | `uuid,task_uuid,task_version,calendar_uuid,start,end,timezone`で作成/再試行 | +| `DELETE blocks/{uuid}` | 関連だけを解除。予定は残す | + +`start/end`はRFC3339、または`yyyy-mm-ddThh:mm`+IANA timezone。保存はUTCに正規化します。新規作成には現在のタスク版を要求。同じ要求の再試行では、タイトル編集などで版が進んでいても、要求内容が不変でタスクが未完了なら許可します。タスクが完了済みなどの場合は、新規/再試行の作成は止めます。未完了要求自体は一覧から解除できます。 + +## 4. Pomodoroの状態と永続化 + +`organizer_focus`をセッションの正本、`organizer_focus_changes`を状態遷移の監査記録とします。タスクの正本・履歴とは分離します。DBをキャッシュとして削除してはいけません。 + +- 状態は`running / paused / completed / cancelled`。 +- 1インスタンスの同一Principalにつき、ドメインをまたいでもrunning/pausedは1つだけ。DBの部分UNIQUE索引とwriter transactionで保証。 +- 開始にはクライアントUUID、変更には現在versionを要求。二重開始の再送で開始時刻をリセットしない。古いversionの変更は412。 +- duration、残時間、終了予定時刻を保存し、休止/再開時に計算する。毎秒の書き込みはしない。 +- 異なるドメインに有効なセッションがあれば、そちらで終了させてから新しく開始する。他ドメインのtask UUID等はエラーへ出さない。 +- 権限失効・ドメイン無効化・拡張停止によって他ドメインに取り残された自分のセッションは、新規開始時に`revoked`として中断記録し、利用不能なタイマーが永久に次の開始を妨げないようにする。タスクそのものは変更しない。 + +`GET focus`は現在ドメインのactive session、なければ直近のsessionとサーバー現在時刻を返します。`POST focus`は`action=start/pause/resume/complete/cancel`、`uuid,version`を受け、開始時には`phase,minutes,task_uuid`(任意)を指定します。 + +ブラウザはサーバー時刻と単調時計を基準に表示を更新し、可視中のみ30秒ごととタブ復帰時にサーバー状態を確認します。非表示中は定期fetchも表示更新もしません。秒表示はDBアクセスを伴いません。別端末での変更は次回取得時に反映され、競合操作は版で拒否します。 + +終了は**タイマーの終了**で、タスクの完了ではありません。手動早期終了は残時間を保持します。集中区間は後述のToday画面で日付ごとに集計します。期間別・プロジェクト別の実績ダッシュボードは未実装です。 + +### Todayの見通し(v0.5.0) + +`GET /_/api/v1/extension/organizer.tasks/today`を追加。日付は任意入力にせず、ドメインのタイムゾーンにおける今日の0時から翌日0時までを対象とします。夏時間の日は固定24時間ではなく、現地日付で区切ります。 + +- **未完了タスクの見積もり**:今日取り組む、または今日までが期限の未完了タスクの見積分数。現在のToday一覧と同じ定義です。完了済みは含めません。最大100件、超過時は一部集計と表示。 +- **今日の時間枠**:activeな関連を持つ個人localカレンダーについて、ロック内で公開・共有・Sourceを再検査してからキャッシュを現行manifestへ合わせ、期間内のeventを関連へJOINします。初期要求の日時では絞らず、後から別の日へ移した予定も現在の日時で判定します。タスクが完了・アーカイブ済みでも、予定が関連付きで残っていれば時間枠に含めます。 +- **記録済みの集中時間**:開始/再開から休止/終了までの区間を`organizer_focus_spans`へ保存。session更新・監査と同じtransactionなので、失敗時は区間もrollbackします。休憩と休止中の時間は除き、日付境界で切り分けます。実行中の区間は取得時の現在時刻まで、スケジューラの遅延は本来の終了時刻までで打ち切ります。手動中断までに集中した時間は含めます。 + +時間枠は当日内の合計割当時間と、その和集合による占有時間を別々に計算します。差分を重複として表示します。一般の予定・労働時間帯・空き時間はまだ集計しないため、これを一日の可処分時間や完全なキャパシティ表示とは呼びません。 + +関連するカレンダーは最大20、各カレンダーの期間内関連は最大100、返す時間枠は全体で最大100、集中区間は最大1000件です。上限超過はpartial flag、参照不可・取得失敗はunavailable件数を返し、不完全な合計を完全な合計のように見せません。本文を表示せず、件名は現在の所有タスクから取得してtextContentで描画します。外部カレンダー内容は読まず、カレンダー拡張停止中は見積もり・集中時間のみ表示します。 + +UIは初回、手動更新、タスク/時間枠/タイマーの変更、30秒以上後のタブ復帰で取得します。定期的な全カレンダー走査は行いません。重複fetchをまとめ、非表示になれば中断します。秒単位の実績更新ではなく、更新時点の集計と明記します。 + +移行時は現在runningの区間を現行セッションから補います。旧版ですでに終了・休止した過去区間は自動バックフィルしません。旧履歴の検証付き・限定バッチ再構築はTODOです。区間は索引付きの投影ですが、その再構築機能が完成するまではDBと一緒にバックアップしてください。 + +## 5. 終了イベントとInbox + +組み込みイベント`task.focus.complete`(定義ID `builtin.task.focus`)を既定60秒・priority -2・再試行3回で登録します。既存設定を再起動で上書きしません。設定画面で停止・間隔変更・手動実行できます。 + +最大100セッション/回、3秒上限で、`state,deadline_ms`索引から期限を迎えたrunning sessionを拾います。完了記録・監査・Inbox挿入は同じtransaction。通知の一意キーはセッションUUIDです。再実行でも二重配信しません。 + +配信時に現在のPrincipal・membership・Domain・拡張の状態を再検査します。無効なら中断扱いで通知しません。終了から24時間以上遅れたものは完了記録だけを残し、古い通知を大量配信しません。手動で終了/中断したセッションにも余分な終了通知は送りません。 + +Inboxは一般的な「タイマーが終了しました」とタスク画面へのリンクのみ。タスク本文・件名はコピーしません。ブラウザを閉じていてもサーバーが動作中なら処理しますが、終了と同時のOS通知やPushを保証する機能ではありません。既定のイベント間隔とキュー待ちによる遅延があります。 + +## 6. 検証と次段階 + +隔離fixtureで以下を検証します。実際の外部カレンダーの内容は調べません。 + +- 時間枠:時差・夏時間gap・古いタスク版・再送・月またぎ移動・予定削除・関連解除・公開/共有後の遮断・件名snapshotとメモ非複製。 +- ファイル保存後のDB更新失敗からの再試行と、外部Sourceの欠損スナップショットに到達しないguard。 +- タイマー:並列開始・版競合・休止再開・重複通知防止・通知挿入失敗のrollback・readonly・失効・拡張停止・遅れた通知の抑制。 +- PC/スマートフォンのChromium:時間枠の作成、予定へのリンク、表示のはみ出し、Pomodoro開始/休止/リロード復元。 + +残TODO(優先順): + +1. Todayの並べ替え・前日計画の持ち越しと個人キャパシティ設定。期間別/プロジェクト別の実績、旧集中履歴の限定バッチ再構築。 +2. 個人タイマーの既定値、集中/休憩の反復と長い休憩。自動連続開始は明示設定にする。 +3. 時間枠のpending要求の監査/復旧UIを充実させる。永久失敗・tombstone・focus監査の保持/圧縮/exportを設計する。 +4. 個人通知設定とquiet hours、カレンダー予定そのものの通知。 +5. 日課テンプレート・日付別instance、前日計画の持ち越し、複数選択整理。 + +共有タスク・共同所有カレンダーへの配置・外部カレンダー読み取り・OS通知・CalDAV VTODO同期は今回の対象外です。 diff --git a/docs/design/ja/task-reminders.md b/docs/design/ja/task-reminders.md new file mode 100644 index 0000000..7d72c03 --- /dev/null +++ b/docs/design/ja/task-reminders.md @@ -0,0 +1,45 @@ +# タスク通知:予約・配信・取消 + +更新日:2026-09-25。個人タスクの期限日/計画日のInbox通知を実装。カレンダー通知、メール、OS push、集中タイマー、quiet hours、通知の集約は未実装。 + +## 操作と既定値 + +タスク編集に「期限日にInboxへ通知」「取り組む日にInboxへ通知」と時刻入力を追加する。両方とも既定OFF。通知を選択した日付が必須で、未指定の時刻は09:00。期限は引き続き日付型であり、通知時刻によって時刻付きの締切へ変換しない。プロジェクトには通知を設定しない。 + +保存時のドメイン設定のタイムゾーンをサーバー側で取得し、`reminder_timezone` に記録する。APIが指定した別のzoneを信用しない。設定画面のzone変更だけでは保存済み予約を動かさず、タスクの再保存で新しいzoneを適用する。編集画面には保存時に適用するzoneを表示する。 + +夏時間で存在しない現地時刻は保存を拒否する。重複する現地時刻はGoのタイムゾーン解決で決まる一方の時刻に固定し、二度送らない。civil date/timeとzoneから解決した発火時刻を予約に保存する。 + +## 保存と予約 + +`TaskRecord` の追加項目:`notify_due`、`notify_planned`、`reminder_time`、`reminder_timezone`。既存レコードの未指定は通知OFFとし、旧データ移行だけで通知を有効にしない。 + +`organizer_reminders` はDomain・task UUID・種類を主キーとし、owner、source version、発火時刻、civil date、zone、通知一意キー、pending/sent/skippedを保持する。`(state,fire_at_ms,...)` の索引から配信対象だけを取得する。 + +予約の作成/更新/取消は、タスクhead・履歴・専用ジャーナル・共通outboxと同じtransactionで行う。予約作成失敗で他だけがcommitされることはない。予約自体は正本から導く索引であり、共通outboxの旧イベントを使って非同期に復活させない。これにより、完了・日時変更と旧イベントの遅延配送の競合を避ける。 + +完了、取りやめ、アーカイブ、通知OFFで対応する予約を取り消す。タイトル/メモの変更ではsource versionのみ追従し、同じ通知を再送しない。日付・通知時刻・zoneの変更は新しい通知機会になる。 + +## 配信と権限 + +組み込みイベント `task.reminders.deliver`(定義ID `builtin.task.reminders`)を既定60秒間隔で実行する。最大100予約/回、処理上限3秒、priority -2、再試行3回。スケジューラの停止・同時実行数制御に従い、設定画面で間隔変更・停止・手動実行が可能。起動時に管理者の設定を上書きしない。 + +SQLite writer transactionの中で候補取得、現在版・状態、現在所有者、membership、Principal状態、Domainの有効性とlocal配置、拡張の有効性を再検査する。送信可能なのはactiveまたはreadonlyの現所有者のみ。他人の担当指定・共有配送はまだ行わない。 + +Inbox挿入と予約のsent更新は同時commit。一意キーはDomain、task UUID、種類、civil date/time、zoneから決定する。タスク版番号は一意キーに入れず、予約のsource version照合に使う。したがって件名変更・完了取消・ワーカーの再試行で、同じ機会の通知を再送しない。 + +権限失効・拡張無効化・現行版不一致の場合はskippedとし、再試行を繰り返さない。自動で遡って復活させず、再保存された現在の設定で予約を再評価する。Inboxへすでに入った通知は履歴として残すが、現在読めない件名・リンクは表示しない。 + +## 遅延と履歴 + +配信対象は発火時刻を過ぎた**同じ現地日付**の予約だけ。スケジューラ停止中などに前日以前となった分はskippedとし、古いBacklog通知を大量に送らない。日付境界直前の通知は、実行遅延で翌日に入ると送られない。時刻ぴったりの配信やOS通知を保証するものではない。 + +Inboxには一般的な通知文と対象UUIDだけを保存し、個人タスクの件名・本文を複製しない。API/通知詳細表示時に、現所有者・membership・最新予約と版を照合して現在の件名を取得する。完了/取消/日付変更などで対象予約が一致しなければ、「完了・変更済み、または現在利用できません」と表示し、taskへのリンクを外す。通知一覧の表示にCAS本文は読まない。 + +上部ナビの未読赤丸は可視タブで最大1分間隔、またはタブ復帰時に小さな問い合わせで更新する。非表示タブでは定期fetchしない。同じスクリプトが共通ヘッダーと通知ページに読み込まれてもイベントを二重登録しない。既存の「Inboxを開いたとき赤丸を消し、表示した通知を既読にする」挙動は維持する。 + +## 検証と後続 + +テスト対象:初期OFF、指定日とzoneでの予約、夏時間、存在しない時刻、日付変更・完了・取消・アーカイブ・OFF、権限失効、拡張停止、期限切れ予約、同一機会の重複防止、並列配信、予約/Inbox挿入失敗時のrollback、現時点での件名表示、別所有者への漏えい防止。ブラウザでは通知設定の保存、バックグラウンド配信後の赤丸、Inbox表示まで隔離環境で確認する。 + +次段階:個人/ドメインの通知既定値、quiet hours、集約、予約状態の詳細表示、ローカルカレンダーの時間枠との関連付け・予定通知。外部から取り込んだカレンダー内容へのアクセスは、別途許可があるまで行わない。 diff --git a/docs/design/ja/tasks-implementation.md b/docs/design/ja/tasks-implementation.md new file mode 100644 index 0000000..063bfc5 --- /dev/null +++ b/docs/design/ja/tasks-implementation.md @@ -0,0 +1,105 @@ +# タスク管理拡張:実装契約と次段階 + +更新日:2026-09-25。個人用タスク・プロジェクト、明示ONの期限日/計画日通知、個人ローカルカレンダーへの時間枠、永続化Pomodoroを実装。0.7.0で[日別計画・親子グループ・Wikiメモ](task-daily-notes.md)を追加(2026-09-25 07:07 JST本番反映済み)。共有・一般のカレンダー予定通知・CalDAVタスク同期の完成を意味しません。[タスク通知の契約](task-reminders.md)、[時間枠とPomodoro](task-planning-focus.md)も参照してください。 + +## 今回利用できる機能 + +2026-09-25追記:`0.8.0`で[個人タスクのCalDAV/CLI連携](task-caldav.md)を実装。専用資格情報、限定VTODO、vdirsyncer/Todoman同期、ETag/CASに対応。2026-09-26 00:24 JST本番反映済み。時刻付き期限・繰り返し・共有・フルCalDAV適合は未対応。 + +- 今日:ドメインのタイムゾーンにおける今日の計画、今日が期限または期限超過の未完了タスク。 +- 取り込み箱/Backlog/いつか:取り込んだものを消さずに整理先を変更。 +- 見直し:見直す日を迎えたもの、または30日間変更されていない未完了タスク。 +- プロジェクト:名前とメモ、関連Wiki、所属タスクの一覧。タスクは一つのプロジェクトへ所属、または未所属。 +- タスク:件名、プレーンテキストのメモ、状態、優先度、分単位の見積もり、期限、取り組む日、見直す日、関連Wiki。 +- 完了/再開、アーカイブ/復元。完了取消でも過去の版は残る。初版は物理削除を提供しない。 +- タイトル絞り込みとカーソルページング、変更履歴の版番号・日時表示。 +- 日本語/英語、既存テーマ、デスクトップの左ナビとモバイルの横ナビ・全画面編集モーダル。 + +取り組む日は日付のみであり、カレンダーの時間枠ではありません。予定イベントの複製や外部カレンダーの読み取りは行いません。プロフィールメニューの「タスク」とカレンダー画面から到達できます。 + +## URIとAPI + +| 用途 | URI | +| --- | --- | +| 今日 | `/v/plan/today` | +| 全未完了 | `/v/plan/tasks` | +| 整理先 | `/v/plan/tasks/{inbox,backlog,someday,review,done,archived}` | +| プロジェクト | `/v/plan/projects`、`/v/plan/project/{uuid}` | +| タスク詳細・新規 | `/v/plan/task/{uuid}`、`/v/plan/task/-/new` | +| API一覧・作成 | `/_/api/v1/extension/organizer.tasks/items` | +| API取得・置換 | `/_/api/v1/extension/organizer.tasks/items/{uuid}` | +| 最近50版の履歴 | `/_/api/v1/extension/organizer.tasks/items/{uuid}/history` | + +`/v/plan` のカレンダー既定ビューは変更しません。既存カレンダーの広いprefixよりタスクの厳密なルートを優先します。プロジェクトは初版ではUUID URIです。pretty nameを後付けしても同一性はUUIDを維持します。 + +一覧GETは `kind=task|project`、`view`、`project`、`q`、`limit`、`before` を受け付けます。既定60件、上限100件。作成はPOST、更新はPUT、`If-Match: "{version}"` 必須。ヘッダーなしは428、古い版は412。UUIDをクライアントで生成し、同内容の作成再送は同じ版を返します。異内容の再送は競合です。成功時は `item` と現在読める `page_path`、ETagを返します。一覧はメモ本文を省略するため、編集やクイック完了前に必ず詳細を取得します。 + +## 保存と復旧の境界 + +`organizer_items` はDomain・所有者・UUID・種類・検索用メタデータ・現在版を保持します。本文を含む型付きJSONは既存Document StoreへSHA-256で保存し、同じJSONをDBにも保持します。`organizer_revisions` は版からDocumentへの参照、`organizer_changes` は後続処理用の小さな変更ジャーナルです。head更新・履歴・変更ジャーナルは同じSQLiteトランザクションです。 + +これは通常のWiki Objectではありません。Wiki Objectに直接載せると、既存の汎用閲覧・リンク操作・削除経路すべてにタスク所有権の導入が必要になるため、初版は専用の権限境界に隔離します。Wikiとの関連はPageのObject UUIDです。Pathは読むたびに同じドメイン内の閲覧可能なaliasから解決し、renameへ追従します。関連ページの権限が失効しても、タスクを読む権限がWikiを読む権限を上書きしません。 + +**タスクDBは捨てられるキャッシュではありません。** 所有権・current head・版参照を含むSQLiteとDocument Storeを一緒にバックアップします。単独ファイルから全メタデータを復元するインポート/再構築ツールは未実装です。DBロールバック前に保存されたCASファイルは孤立する場合がありますが、headには現れません。将来のCAS GCでは `organizer_revisions.document_hash` もmark対象に含める必要があります。 + +2026-09-24追記:共通outboxへの接続を実装しました。タスク/プロジェクト保存は `organizer.task.changed`/`organizer.project.changed` を同一transactionに追加します。本文・件名・期限・Wiki Pathは複写せず、対象UUID・actor・版番号・変更時刻を記録します。Cityは必要なイベント種別のみ購読し、他consumerの完了状態を変更しません。 + +旧 `organizer_changes` は削除せず、`task.activity.publish` が1回100件・3秒上限で既存記録を共通outboxへ移行します。既定60秒間隔・低優先度・再試行3回で、イベント設定画面から停止・間隔変更・手動実行が可能です。既存の設定値は再起動で上書きしません。新規保存分も同じ一意キーで確認するため二重イベントを作りません。これはデータ移行・修復用の内部ジョブで、タスク拡張のON/OFFとは独立して停止できます。通知送信やカレンダー読み取りはしません。 + +変更記録の保存は通知の配信完了ではありません。タスク期限日/計画日の予約は、正本と同一transactionで更新し、[別の配信ジョブ](task-reminders.md)で現在権限・最新状態・重複防止を検査してInboxへ送ります。移行された旧版outboxイベントから通知予約を再構築しません。汎用の購読者向け変更通知と保持期間は次段階です。[購読・復旧契約](outbox-delivery.md)も参照してください。 + +## 権限と制限 + +- 登録済みPrincipalと現ドメインの有効membershipが必須。配置先がlocalの有効Domainだけで保存・取得する。legacy認証モードでも匿名は利用不可。 +- 初版は個人所有。domain_adminも他人のタスク一覧・詳細・履歴を取得できない。 +- activeは読み書き、readonlyは読み取りのみ。失効・suspended membership・無効Domainは拒否。保存時に同じwriterトランザクションでも再検査する。 +- `organizer.tasks` は既存のシステム拡張設定で無効化可能。UI/APIを閉じ、保存層でも無効化を検査。データは削除しない。 + 既存CLIの対話シェルでも `extension organizer.tasks off`/`extension organizer.tasks on` で切り替え可能。 +- Wiki関連付けは同ドメインの実在Pathと現在の読み取り権限が必要。参照先が削除・非公開化されればリンクは表示しない。 +- プロジェクトは自分の同ドメインのもののみ指定可能。アーカイブされたプロジェクトへの新たな振り分けは不可。既存の所属タスクを勝手に消したりアーカイブしない。 +- 件名300 UTF-8 bytes、メモ16 KiB、JSONリクエスト32 KiB、一覧100件、履歴50件、API処理5秒の上限。権限ごとのキャッシュを混在させずno-store。 +- メモはプレーンテキスト。HTML/JSとして実行しない。プロジェクト選択は名前で検索、最大100候補。任意の本文全件取得や全カレンダー取得は行わない。 + +## 次の実装順序 + +### T2:Backlogと協働の改善 + +- [x] アーカイブ一覧でタスク/プロジェクトを切り替え、プロジェクト詳細の設定から復元。 +- [x] 日別/明日の計画、昨日以前からの持ち越しの明示的な再割当て、親子グループ順・展開、Wikiメモの新規作成/閲覧/編集。 +- [ ] 任意の並べ替え、日別キャパシティ表示。期限を勝手に変更しない。 +- [ ] 複数選択の整理/プロジェクト振り分け、チェックリスト、保存検索、ラベル。 +- [ ] 一覧のタイトル部分一致が大規模化した場合のFTS索引。操作ごとの件数・時間・失敗数の拡張別監視。 +- [ ] 機械可読export/import、ジャーナルと版の保持・復旧手順。 +- [ ] collection単位の所有者/編集者/閲覧者。担当への指定と閲覧権限を分離。プロジェクトとWikiの権限を混同しない。 + +### T3:カレンダーと通知 + +- [x] イベント種別とconsumerごとのoutbox進捗、タスク変更の原子的な記録、既存ジャーナルの限定バッチ移行。 +- [x] 個人タスクの期限日/計画日の明示ON通知。原子的予約・取消、限定バッチでのInbox配信、現在の権限による表示。 +- [x] `organizer_time_blocks`:task UUID、calendar UUID、event UIDで関連付け。個人非公開localのみ、現在時刻・ETag取得、同一要求の再試行、関連解除。dueと時間枠を分離。 +- [x] Todayへタスクに関連した個人local時間枠を当日限定で投影。現在の予定日時で集計し、重複・件数制限・参照不可を明示。外部取り込み内容は扱わない。 +- [ ] カレンダー通知を共通Inboxへ追加。タスク分の予約更新/取消・権限再検査は実装済み。 +- [x] タスク通知は発火時刻索引から最大100件を取得。一意キーは通知機会(日付・時刻・zone・種類)、版番号は現在版照合に使う。タイトル変更では再送しない。 +- [ ] 通知設定:ドメイン既定+個人既定+個別上書き、quiet hours、過去の大量未配信は要約、Inboxと赤丸の挙動は既存設計へ統一。 + +### T4:Pomodoro・日課 + +- [x] focus sessionをタスクから独立した記録にし、開始/休止/再開/終了/中断を監査。1ユーザー1つのactive sessionを条件付き更新で保証。 +- [x] ブラウザ表示はサーバーの終了予定時刻・残時間から復元し、毎秒DB書き込みをしない。別端末・リロード・バックグラウンドで継続可能。終了は組み込みイベントからInboxへ通知。 +- [x] 集中25分/休憩5分の初期値を画面で変更。通知はInboxのみで、OS通知はしない。 +- [x] Todayに未完了タスク見積もり・時間枠・記録済み集中時間を別集計。休止・休憩を除外し、日付またぎを分割。 +- [ ] 個人既定値・反復サイクル・長い休憩、期間別実績、旧集中履歴の限定バッチ再構築。 +- [ ] 日課テンプレートと日付別instance。完了から次回生成するルールは一意キーで再実行可能にする。繰り返しタスクを単一レコードの日時上書きで消費しない。 + +### T5:標準連携・高度な管理 + +- [x] 個人タスクの限定VTODO/CalDAV、専用資格情報UI/API、vdirsyncer/Todoman同期試験。カレンダーVEVENTの完了とタスク完了を同一視しない。[契約・残件](task-caldav.md)。 +- [ ] 時刻付き期限・繰り返し・共有・sync-token・追加クライアントの互換性。 +- [ ] 親子タスク/依存循環検出、週次レビュー、チケットqueue/受付番号/workflow。 +- [ ] モバイルのオフラインキューと競合UI、ショートカット、押下しやすい複数操作。 + +## 受け入れ試験 + +`internal/server/tasks_test.go` は個人/Domain境界、readonly・membership失効、kill switch、版競合、作成再送、完了取消の履歴、保存途中のロールバック、日付検証、ページング、プロジェクト参照、Wiki rename追従を検証します。 + +`PAGESWIKI_BROWSER_TEST=1` の `TestTasksChromium` は隔離されたDB・HTTPサーバーでデスクトップ/モバイルの実操作を検証します。運用中の外部カレンダー・予定本文にはアクセスしません。 diff --git a/docs/design/ja/tasks-tickets.md b/docs/design/ja/tasks-tickets.md new file mode 100644 index 0000000..5667e57 --- /dev/null +++ b/docs/design/ja/tasks-tickets.md @@ -0,0 +1,46 @@ +# 13. タスクとチケット + +状態:個人用local taskとプロジェクト、期限日/計画日のInbox通知、個人ローカルカレンダーへの時間枠、永続化Pomodoroを実装(2026-09-25)。個人タスクの限定CalDAV/CLI同期は0.8.0で実装・隔離試験済み、2026-09-26 00:24 JST本番反映済み。共有、チケット、一般のカレンダー予定通知、繰り返し・差分CalDAV同期は設計段階です。[実装契約と次段階](tasks-implementation.md)、[時間枠とPomodoro](task-planning-focus.md)、[CalDAV/CLI](task-caldav.md)を参照してください。 + +## 二つの用途 + +タスクは「誰が何をいつまでにするか」。チケットは受付番号、責任者、状態遷移、履歴、問い合わせや障害等の業務上の単位です。チケットをそのままカレンダー予定にしません。 + +第一案は共通work itemを基盤に、task viewとticket workflowを分けます。チケット固有の公開範囲・番号・遷移が複雑になれば専用表へ分離しますが、認証やコメントは共通基盤を再利用します。 + +## データ案 + +- 共通:UUID、Domain、collection、kind、title、body_page_uuid、creator、assignee、version、created/updated、archive状態。 +- タスク:status、priority、start/due、完了日時、checklist、parent task、dependency。 +- チケット:queue UUID、queue内の単調な受付番号、workflow版、type、labels、watchers、resolution。 +- 添付:固定Document参照と出典。コメント:共通thread。変更履歴:actor付きevent。 + +Path、受付番号、題名はidentityではありません。同じPageに複数work itemが関連しても、暗黙に一つへ統合しません。assignee表示とPrincipalの権限付与も別です。 + +## 状態と操作 + +最初のtaskはtodo / doing / done / cancelledとし、遷移を監査します。未完了への復帰で元の完了記録を消さず、履歴を残します。チケットはopen / in_progress / resolved / closedを案とし、reopen権限、完了理由、受付担当と解決担当を後で分けられる構造にします。 + +create/read/update/assign/transition/comment/manageは概念上分離します。外部依頼者には自分のチケットだけを見せる場合があるため、queue一覧の閲覧とticketの閲覧を分けます。担当にしただけで非公開本文が読めるようにしません。 + +## 期限・依存・繰り返し + +期限は日付だけか時刻付きかを明示します。日付のみをUTC午前0時へ変換しません。依存は循環を拒否し、削除済み・閲覧不可の依存先の詳細を表示しません。親子進捗の自動集計は別projectionです。 + +繰り返しは第二段階。完了時に次のinstanceを作る方式と、iCalendar recurrenceを扱う方式の対応を先に決めます。完了イベントの二重配送で次回タスクが二つ増えない鍵を必要とします。 + +## CalDAVとの関係 + +iCalendarにはVTODOがあり、CalDAVはカレンダー資源を扱います。ただしクライアントごとのタスク・繰り返し対応を試験する必要があります。これは「CalDAVだけでチケット管理が完成する」という意味ではありません。[iCalendar](https://www.rfc-editor.org/rfc/rfc5545)、[CalDAV](https://www.rfc-editor.org/rfc/rfc4791)。 + +最初はlocal task一覧と期限表示、次にVTODOの明示export/import、最後に選定クライアントとの同期を検討します。workflow、コメント、細かな権限をVTODOへ無理に押し込みません。失われる情報を変換警告に残します。 + +## 実装TODO + +- TASK-1:個人local作成/取得/更新、version競合、Page参照、所有者限定一覧は実装済み。削除は復元可能なアーカイブ、物理削除は未提供。 +- TASK-2:日付の期限/計画/見直し、タイトルフィルタ、archive、個別ONのInbox通知は実装済み。担当共有、通知集約、exportは未実装。 +- TASK-3:checklist/依存とboundedな一覧・calendar射影。 +- TICKET-1:queue・番号予約・workflow版・権限付き遷移。 +- TASK-4:VTODO fixture、未対応property保持、繰り返し・同期の判断。 + +同時採番、二重POST、完了取消、夏時間・終日、assignee失効、本文削除を受け入れ試験にします。 diff --git a/docs/design/ja/viewer-editor.md b/docs/design/ja/viewer-editor.md new file mode 100644 index 0000000..1c7c116 --- /dev/null +++ b/docs/design/ja/viewer-editor.md @@ -0,0 +1,39 @@ +# 7. ビューア・エディタ・連携アダプタ + +状態:主要形式のビューアとホスト型エディタあり。ネイティブ起動・任意外部コード実行は保留。 + +## 正本と表示 + +文章はHTMLを正本にし、Markdownは編集・import形式として変換します。Office、PDF、画像、音声、動画、Canvas等のバイナリ・固有形式をすべてHTMLへ不可逆変換する意味ではありません。MIME、拡張子、限定された内容判定でProjectionを選びます。 + +拡張子のないテキストも文字コードと先頭内容を限定的に調べます。長いTXT/JSONは部分取得し、行番号・syntax highlight・ミニマップ等はブラウザのDOMやメモリ上限の中で動かします。 + +## 対応領域 + +CSV、コード、PDF、画像lightbox、音声・動画、ZIP等のarchive、コミック、EML、DEB/PEのメタデータ、Excalidraw等に初期実装があります。Office全般の完全再現や任意archiveの無制限展開を保証するものではありません。 + +PDFページ数・archiveメタデータ・サムネイルは原則キューで生成し、未生成ならアイコン・待機状態を返します。一部のentry展開はまだ限定された前景処理で、キャッシュ付き生成への移行が必要です。 + +## 連携アダプタ + +アダプタはDocumentの表示・編集を担当します。MIME、対応操作、設定schema、外部origin、リソース上限を宣言します。ランキングやメール収集はアダプタではなくシステム拡張です。 + +code-server、vim.wasm等はホスト型連携として扱います。workspaceへの配下展開、HTML/Markdown変換、保存競合、短命なsessionをホスト側で制御し、通常のログインcredentialをそのまま渡しません。vim.wasmのruntime改善は現在保留です。ネイティブvim.exe等への直接受け渡しも保留し、補助アプリ不要で自由起動できるとは扱いません。 + +## HTMLの安全性 + +Viewer・履歴・印刷・Editor previewはinert allowlistを使い、保存されたscript/style/iframeを通常ページの権限で実行しません。正本バイト列を勝手に変更せず、表示段階の安全化として区別します。埋め込みは登録済みproviderとsandboxによる明示契約が必要です。 + +## ビューアのキーボード操作 + +通常のViewerでは、`e` 編集、`f` 検索、`v` 表示形式切替、`c` 配下への新規作成、`u` アップロード、`s` 共有リンク、`p` 権限導線を使えます。`Ctrl+↑` は親Path、`Ctrl+↓` は配下一覧、`Ctrl+→` / `Ctrl+←` は前後ページです。入力欄・select・textarea・contenteditable・開いているdialogではショートカットを停止します。 + +共有リンクは現在の正規URLをコピーし、X Web Intentをユーザー操作で開く方式です。これは公開権限を付与したり、未公開Pageを自動公開したりしません。権限ダイアログがその画面にない場合、City governanceの案内だけを表示します。 + +## Macroと変換の二つのモード + +編集用のHTML→Markdownではchildren等のmacro宣言を保持します。表示・preview・export向けのProjectionでは認可済みの結果を展開します。展開された一覧を保存本文へ逆流させないことがround-tripの条件です。 + +## TODO + +変換provider/version・警告・原本保持、未対応構文の欠落検知、draw.io・nwdiag等の統合、widgetの許可・同意・CSP、decoder隔離、プラグイン停止時の安全なfallback。HTML編集の段階的改善は第17章で具体化します。nwdiagはネットワーク構成を記述するソースと、静的SVG/画像としてのProjection、明示的な編集アダプタを分離して設計します。 diff --git a/docs/design/knowledge-city-model.md b/docs/design/knowledge-city-model.md new file mode 100644 index 0000000..5b8b484 --- /dev/null +++ b/docs/design/knowledge-city-model.md @@ -0,0 +1,502 @@ +# Knowledge City Model Detailed Design + +Implementation review (2026-09-13): see +[City review and URL-driven reconciliation](city-review-and-reconciliation.md) +for verified gaps and the repair checklist. Authorization, geometry and cache +requirements here are design targets, not claims that every current code path +already satisfies them. + +Label follow-up (2026-09-13): the current map shows its active level's labels +without hover. Street names are horizontal text anchored to their roads (no +textPath rotation), including in the Street detail view. Hover/focus retains +road highlighting; the explicit Labels toggle hides/shows the current renderer's +labels. Normal and popup views have Chromium regressions using vertical/diagonal +road fixtures. This does not implement the broader event/Worker/UI repair plan. + +## Purpose + +The [manual organization UI](city-organization-ui.md) supports display-title +edits, multi-selection, Spot merging and Street relocation. These preserve +document URLs and use explicit Page memberships when the new boundary differs. +Spot nesting remains invalid; use a Street parent or merge into another Spot. + +Knowledge City is a human navigation and governance model over the existing +Domain, Page UUID, Revision, Document, and semantic-path planes. It must make a +large body of knowledge understandable, maintainable, and traversable without +turning the database back into a filesystem. + +```text +Campus administrative federation and defaults +Domain host-selected namespace and policy boundary +Quartier planned knowledge district and policy boundary +Street operational sequence of nearby Spots +Spot smallest semantic locality and Page graph root +Page reusable knowledge object +Revision immutable historical representation +``` + +The city hierarchy answers “where is this knowledge curated?” The SpotGraph +answers “what else is semantically connected?” Semantic paths answer “how can +this Page currently be reached?” These are separate questions. + +## Design principles + +1. **Locality is not identity.** Zone, Spot, Page, and Revision have distinct + UUIDs. Moving a Page or Spot never changes Page identity or history. +2. **Tree for orientation, graph for knowledge.** Quartier and Street form the + ZoneTree. Street points to Spots. Spots form a graph and point to Pages. +3. **One planned placement, many semantic appearances.** A Spot has one primary + Street placement. A Page may belong to many Spots and is a MagicPage when it + does. Shortcuts do not create a second primary placement. +4. **Path is a projection with a City boundary.** City placement does not + replace UUID identity, but each Quartier, Street, and Spot binds one semantic + Path prefix used as its primary jurisdiction. Path moves change inferred + locality without changing Page identity or history. +5. **Governance follows locality.** Capability defaults may flow Domain → + Quartier → Street → Spot. Exceptional Page grants remain explicit. Publication + ceilings are restrictive intersections, not overridable defaults: subordinate + owners cannot widen superior limits. See [owners and publication](locality-publication-ownership.md). +6. **No destructive topology cascade.** Archiving a Zone or Spot does not delete + Pages, Revisions, Documents, path bindings, or external links. +7. **Planning changes are auditable.** Structural operations are transactional, + versioned, previewable, and reversible where identity permits. +8. **Language-neutral structure.** Machine names and UUIDs are language-neutral; + titles, descriptions, signage, and landing copy may be localized. + +## Quartier + +A Quartier is a deliberately planned aggregation of Streets. It is the largest +knowledge-locality boundary below a Domain and exists to make policy and +navigation comprehensible at scale. + +### Required functions + +- stable UUID, language-neutral machine name, localized title/description; +- charter: purpose, intended audience, inclusion/exclusion criteria; +- boundary: owned child Streets; Quartier nesting is not allowed initially; +- zoning policy defaults: visibility, curation workflow, retention, templates, + language fallback, navigation and search defaults; +- governance: curator groups, approval roles, escalation owner and contacts; +- explicit Quartier/Spot owner appointments and scoped publication administration, + bounded by superior ceilings; ownership does not grant document editing; +- entrances: landing projection, featured Spots, announcements and guides; +- signage: aliases, keywords, icon/color, breadcrumb label and external links; +- scoped search, recent changes, activity feed and subscription; +- map and health dashboard for Streets, Spots, orphan Pages and broken links; +- lifecycle: draft, active, deprecated, archived; +- planning operations: reorder, move Street, merge Quartiers, split Quartier, + preview plan, apply transaction, record topology revision; +- export/import of topology metadata without copying Page Documents by default. + +Quartier is not created merely because a Street has many children. Promotion is +an explicit planning decision with a charter and redistribution plan. + +## Street + +A Street is the smallest ordered Zone and groups nearby Spots for day-to-day +navigation. It represents an understandable route through related localities, +not a permissionless directory. + +### Required functions + +- stable UUID, machine name and localized signage; +- exactly one parent Quartier in the first implementation; +- ordered Spot placements with optional sections and featured entrances; +- Street-level policy overrides and curator assignment; +- Street landing, compact/detail/map views and scoped search; +- activity, vacant/overgrown indicators and maintenance queue; +- move, reorder, merge, split and deprecate operations; +- a documented route intent such as lifecycle, architecture layer, product + area, department workflow, or learning sequence. + +An unconsolidated Street may temporarily contain loose Page placements. These +are not silently treated as Spots. The UI exposes them as an Inbox requiring a +curator to create/select a Spot. The Street remains marked `unconsolidated` +until the Inbox is empty. + +### Street-to-Quartier promotion + +Promotion preserves the Zone UUID but changes its kind only through a plan: + +1. preview affected Spot placements, links, policies and aliases; +2. define at least one child Street and partition all existing Spots; +3. validate names, capabilities and destination conflicts; +4. atomically change kind, create child Streets and move placements; +5. increment topology version and retain an audit/reversal record. + +A Quartier cannot directly own Spots after the transaction. + +## Spot + +A Spot is the smallest semantic knowledge locality. It is large enough to have +its own purpose, curators, Page membership and capability boundary, but it never +contains child Spots and cannot be promoted into a Street. An overgrown Spot is +split into multiple Spots or has Pages moved/linked elsewhere. + +### Required functions + +- stable UUID, machine name, localized title, summary and curator contacts; +- one primary Street placement and lifecycle state; +- charter and optional content schema/template; +- generated landing projection independent of any one Page; +- ordered Page membership with typed edges: + `primary`, `guide`, `reference`, `example`, `attachment`, `related`; +- Page pinning, featuring, manual ordering and query-backed dynamic sections; +- typed Spot-to-Spot relations: + `related`, `depends_on`, `supersedes`, `implements`, `learn_before`, + `operated_by`; +- backlinks, inbound/outbound relation view and shortest knowledge route; +- scoped search, activity stream, watchers and change digest; +- capability requirements and curator workflow; +- health indicators: empty, orphaned, stale, duplicate, overgrown, broken, + unreviewed and language-gap; +- split, merge, move and archive operations that preserve Pages; +- a machine-readable context payload for macros, adapters and future agents. + +Spot membership is a graph edge, not a path link. Adding a Page to a second Spot +creates a MagicPage appearance and does not clone its Revisions. Removing the +last Spot edge leaves the Page as an orphan candidate but does not delete it. + +## Page placement and MagicPage behavior + +### Semantic Path jurisdiction + +Each active locality binds a normalized, language-neutral Path prefix. A +Street prefix must be a strict descendant of its parent Quartier prefix, and a +Spot prefix must be a strict descendant of its Street prefix. Boundaries at the +same level may not overlap, preventing ambiguous primary locality. + +For example, `/life`, `/life/home`, and `/life/home/kitchen` may bind Quartier +`life`, Street `home`, and Spot `kitchen`. Every Page Path below the Spot prefix +is inferred as a primary member of that Spot. Pages below only a Street or +Quartier remain in that locality's unconsolidated scope until a Spot boundary +is planned. Exact and descendant matching is segment-aware, so `/life2` is not +inside `/life`. + +This inferred primary membership is evaluated from current Path bindings and +is not persisted as Page identity. Explicit `spot_pages` edges remain semantic +appearances; they can place the same Page in additional Spots as a MagicPage. +An explicit edge takes presentation precedence over an inferred edge within +the same Spot. Renaming a Page Path may therefore change its inferred primary +locality but never its UUID, revisions, or explicit MagicPage appearances. + +`spot_pages` records why and how a Page appears. The same Page can be primary in +one Spot and a reference in another. Each Spot controls its own label, order and +visibility of the edge; it does not override Page title/content globally. + +Viewer responses may expose all other Spot appearances only when the caller can +read those Spots. Search and breadcrumbs never leak inaccessible locality names +or result counts. Cross-Domain appearances are absolute external references +containing the destination FQDN; a local Spot edge never pretends to own a +remote Page UUID. + +## Topology schema + +```sql +CREATE TABLE zones ( + uuid TEXT PRIMARY KEY, + domain_uuid TEXT NOT NULL, + kind TEXT NOT NULL, -- quartier, street + parent_uuid TEXT, -- NULL for Quartier; Quartier UUID for Street + name TEXT NOT NULL, + title TEXT NOT NULL DEFAULT '', + description TEXT NOT NULL DEFAULT '', + charter_json TEXT NOT NULL DEFAULT '{}', + policy_json TEXT NOT NULL DEFAULT '{}', + state TEXT NOT NULL DEFAULT 'draft', + sort_key INTEGER NOT NULL DEFAULT 0, + version INTEGER NOT NULL DEFAULT 1, + created_at_ms INTEGER NOT NULL, + updated_at_ms INTEGER NOT NULL, + UNIQUE(domain_uuid, parent_uuid, name) +); + +CREATE UNIQUE INDEX idx_zones_quartier_name + ON zones(domain_uuid, name) WHERE kind = 'quartier'; + +CREATE TABLE zone_localizations ( + zone_uuid TEXT NOT NULL, + lang TEXT NOT NULL, + title TEXT NOT NULL, + description TEXT NOT NULL DEFAULT '', + PRIMARY KEY(zone_uuid, lang) +); + +CREATE TABLE spots ( + uuid TEXT PRIMARY KEY, + domain_uuid TEXT NOT NULL, + name TEXT NOT NULL, + title TEXT NOT NULL DEFAULT '', + summary TEXT NOT NULL DEFAULT '', + charter_json TEXT NOT NULL DEFAULT '{}', + schema_json TEXT NOT NULL DEFAULT '{}', + landing_json TEXT NOT NULL DEFAULT '{}', + state TEXT NOT NULL DEFAULT 'draft', + version INTEGER NOT NULL DEFAULT 1, + created_at_ms INTEGER NOT NULL, + updated_at_ms INTEGER NOT NULL, + UNIQUE(domain_uuid, name) +); + +CREATE TABLE street_spots ( + street_uuid TEXT NOT NULL, + spot_uuid TEXT NOT NULL UNIQUE, -- one primary Street placement + sort_key INTEGER NOT NULL DEFAULT 0, + section TEXT NOT NULL DEFAULT '', + created_at_ms INTEGER NOT NULL, + PRIMARY KEY(street_uuid, spot_uuid) +); + +CREATE TABLE spot_pages ( + spot_uuid TEXT NOT NULL, + page_uuid TEXT NOT NULL, + edge_type TEXT NOT NULL DEFAULT 'primary', + label TEXT NOT NULL DEFAULT '', + sort_key INTEGER NOT NULL DEFAULT 0, + featured INTEGER NOT NULL DEFAULT 0, + source TEXT NOT NULL DEFAULT 'local', + created_at_ms INTEGER NOT NULL, + PRIMARY KEY(spot_uuid, page_uuid, edge_type) +); + +CREATE TABLE spot_relations ( + source_spot_uuid TEXT NOT NULL, + target_spot_uuid TEXT NOT NULL, + relation_type TEXT NOT NULL, + weight REAL NOT NULL DEFAULT 1.0, + created_at_ms INTEGER NOT NULL, + PRIMARY KEY(source_spot_uuid, target_spot_uuid, relation_type) +); + +CREATE TABLE street_inbox_pages ( + street_uuid TEXT NOT NULL, + page_uuid TEXT NOT NULL, + created_at_ms INTEGER NOT NULL, + PRIMARY KEY(street_uuid, page_uuid) +); + +CREATE TABLE topology_events ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + domain_uuid TEXT NOT NULL, + topology_version INTEGER NOT NULL, + actor_principal_uuid TEXT NOT NULL, + operation TEXT NOT NULL, + target_type TEXT NOT NULL, + target_uuid TEXT NOT NULL, + before_json TEXT NOT NULL DEFAULT '{}', + after_json TEXT NOT NULL DEFAULT '{}', + request_id TEXT NOT NULL DEFAULT '', + created_at_ms INTEGER NOT NULL +); +``` + +Foreign-key-like invariants are enforced transactionally during compatibility +migration and later promoted to SQLite foreign keys when legacy tables can be +rebuilt safely. Every Domain has a monotonically increasing topology version. + +## Structural invariants + +- a Zone belongs to exactly one Domain; +- a Street has exactly one parent Quartier; +- a Quartier is directly owned by its Domain and contains Streets, never other + Quartiers or Spots; +- a Street points to Spots and temporary Inbox Pages, never child Zones; +- a Spot has at most one primary Street placement and no child Spot; +- Spot and Page on an edge belong to the same local Domain unless the edge is an + explicit external reference; +- ZoneTree is acyclic and bounded in depth; +- `depends_on` and `learn_before` cycles are rejected or explicitly marked; +- the last Page/Spot edge removal never cascades to Page deletion; +- archived nodes cannot accept new children or edges; +- names are normalized and unique only in their declared scope; UUID is the + stable reference used by APIs and relations. + +## Policy inheritance + +The effective policy is evaluated in this order: + +```text +Domain defaults + -> Quartier policy + -> Street override + -> Spot requirement + -> exceptional Page/Object grant +``` + +Policies remain positive-grant based. A lower locality can require a narrower +capability but does not manufacture authority. Curator status is separate from +read/write authority, just as group administration is separate from content +permissions. Moving a Spot previews any effective-policy change before commit. + +## Human-facing projections + +Knowledge City uses explicit projections so it does not capture ordinary Page +paths: + +| Route | Projection | +| --- | --- | +| `/v/city` | Domain city map and directory | +| `/v/city/q/{quartier-name}` | Quartier detail | +| `/v/city/s/{quartier-name}/{street-name}` | Parent-qualified Street detail | +| `/v/city/p/{spot-name}` | Spot detail and readable Page links | +| `/v/city/{q,s,p}/uuid:{uuid}` | Explicit identity selector, stable across renames | +| `/v/city?{quartier,street,spot}={uuid}` | Focus that locality in the map | +| `/v/city/changes` | Planned authorized topology activity (not implemented) | + +Human links use names; mutation APIs use UUIDs. Legacy `/v/city/s/{name}` +resolves only a Domain-unique Street name; ambiguous names return 404 rather +than selecting an arbitrary parent. Bare UUID-looking names are not UUID +selectors. Named URLs follow current names/parents, not historical redirects. +A Spot +landing can bind an ordinary semantic path when desired; that binding is an +explicit, conflict-checked operation. + +Viewer breadcrumbs can offer two independent trails: + +- semantic path breadcrumbs; +- city locality breadcrumbs (Quartier → Street → Spot). + +For MagicPages the UI shows the current Spot trail and an authorized “also in” +list. It never chooses a fake universal parent. + +## Search, discovery and knowledge routes + +Search accepts locality scopes (`domain`, `quartier`, `street`, `spot`) and +filters authorization before aggregation. Results can use list, detail and +thumbnail projections already shared by children/search UI. + +City discovery adds: + +- nearby knowledge from shared Spot and typed Spot relations; +- curated routes and learning sequences; +- “missing entrance”, “orphan Page”, “empty Spot”, and stale-area reports; +- Page-to-Page route explanation through Spot membership/relation edges; +- subscriptions to a Spot, Street or Quartier activity stream; +- stable topology context for adapters and future retrieval/agent workloads. + +Recommendations never silently alter topology. Dynamic/query-backed sections +are projections; curator-approved edges are canonical topology. + +## Macros + +Macros read topology through bounded cached projections: + +```text +{{city}} +{{quartier}} +{{street}} +{{spot}} +{{spot-pages edge="guide" view="icon"}} +{{nearby relation="depends_on"}} +{{city-breadcrumbs}} +``` + +With no explicit UUID, a macro uses the current authorized locality context. +Macro output is asynchronous where expensive, contains no unauthorized counts, +and is keyed by Domain topology version plus Principal policy version. + +## API surface + +```text +GET,POST /_/api/v1/city/zones +GET,PATCH,DELETE /_/api/v1/city/zones/{uuid} +POST /_/api/v1/city/zones/{uuid}/move +POST /_/api/v1/city/streets/{uuid}/promote +GET,POST /_/api/v1/city/spots +GET,PATCH,DELETE /_/api/v1/city/spots/{uuid} +GET,POST,DELETE /_/api/v1/city/spots/{uuid}/pages +GET,POST,DELETE /_/api/v1/city/spots/{uuid}/relations +GET,POST,DELETE /_/api/v1/city/streets/{uuid}/inbox +GET /_/api/v1/city/map +GET /_/api/v1/city/health +GET /_/api/v1/city/events +POST /_/api/v1/city/plans/preview +POST /_/api/v1/city/plans/apply +``` + +Mutations use UUIDs, ETag/version preconditions, idempotency keys for bulk +plans, CSRF for cookie sessions and topology-targeted capabilities. Preview and +apply use the same validated plan payload; apply rejects a changed topology +version. + +## Caching and indexing + +- ZoneTree adjacency and breadcrumb cache: keyed by Domain topology version; +- SpotGraph adjacency: keyed by Spot version and authorization policy version; +- FTS locality fields: localized title, summary, charter keywords and permitted + Page content; +- health metrics: scheduler jobs with low priority and incremental invalidation; +- map/layout/thumbnail: derived cache, never source of truth; +- foreground navigation always outranks topology analysis and preview work. + +### City geometry adapter + +Map geometry is a derived projection behind a replaceable `City Geometry +Adapter`; it is never topology identity. The built-in adapter accepts the +authorized City Map projection and emits Quartier polygons, Street curves and +Spot building lots. Generation is deterministic from Domain UUID, topology +version and the ordered topology signature. Browser caches are versioned and +bounded, so navigation never waits for background geometry generation. + +An external town generator may replace this adapter when it returns the same +neutral geometry contract. Generator-specific IDs must not enter Zone, Spot, +Page or Path identity. A later persisted layout layer may pin curator-adjusted +coordinates independently of regenerated background parcels. + +The generator runs once per Domain topology version. Its single road/building +fabric is partitioned into contiguous Quartier regions rather than generating +and stitching independent towns. Region targets use unique Page UUID weights: +Path/primary `1.0`, guide `0.7`, example `0.5`, attachment `0.25`, and +reference/related `0.15`. Repeated paths and MagicPage appearances therefore +do not multiply physical area. Street road capacity uses the summed weighted +Spot membership, while Spots are assigned to buildings nearest their Street +segments. Minimum shares prevent empty or new localities from disappearing. + +Allocation is absolute as well as relative. Weighted Page demand determines +the occupied fraction of the generated City; unallocated roads and buildings +remain visible but have no Knowledge City owner. Quartiers divide only the +occupied region. A Street receives roughly 1.5 generated road segments per +weighted Page, with a one-segment minimum, rather than consuming every road in +its Quartier. Only when demand approaches generated capacity may the planned +localities fill most of the map. + +## Federation and inheritance + +The Domain owning a topology is authoritative. Controller-managed Campus +manifests may place or replicate its definition, but two instances do not +concurrently edit the same topology without an explicit leader and sequence. +Domain PSK identity/group inheritance does not automatically inherit ZoneTree or +SpotGraph. A later topology peer policy must opt in separately. + +Cross-Domain Spot relations carry destination FQDN, Domain UUID, remote Spot +UUID and last verified instance fingerprint. They degrade to external links +when offline and never create a local writable clone. + +## Lifecycle and maintenance + +Creation starts in `draft`; activation requires valid placement, charter and +curator. Deprecation supplies a successor and signage. Archive removes the node +from default navigation but preserves stable UUID access for authorized audit. +Purge is exceptional, Domain-admin-only, requires no structural references and +does not purge Pages. + +Health rules are advisory except for structural invariants. Suggested initial +thresholds are configurable per Domain rather than hard-coded: Page count, +staleness interval, broken-link ratio, missing language and unreviewed changes. + +## Delivery plan + +1. Add topology schema, Domain topology version, stores and invariant tests. +2. Implement Quartier/Street CRUD, map projection and capability target + resolvers; no automatic path rewrite. +3. Implement Spot CRUD, primary Street placement and generated landing. +4. Implement SpotPage/MagicPage edges, authorized “also in”, backlinks and + city breadcrumbs. +5. Add Spot relations, scoped search, nearby knowledge and route explanation. +6. Add planning preview/apply, Street promotion, split/merge and audit events. +7. Add health scheduler, maintenance queues, subscriptions and topology macros. +8. Add optional signed topology federation only after single-authority behavior + and rollback are proven. + +Each slice requires migration rollback, cross-Domain isolation, authorization, +cycle, concurrent-version and cache-invalidation tests. diff --git a/docs/design/locality-access-publication.md b/docs/design/locality-access-publication.md new file mode 100644 index 0000000..5e79966 --- /dev/null +++ b/docs/design/locality-access-publication.md @@ -0,0 +1,182 @@ +# User/group access and approved anonymous publication + +Implemented first slice, 2026-09-14. This extends, rather than replaces, +[locality governance](locality-publication-ownership.md) and +[endpoint authorization](authorization-groups.md). No production ACL or public +approval is installed automatically. Existing legacy domains remain legacy; +configuration of these controls requires `authorization_mode=enforcing`. + +2026-09-16 update: [public navigation](public-navigation.md) supersedes the +navigation-disabled first-slice restrictions below for children, tree, City Map +and locality links. Normal public Pages are navigable and have no download +button; a navigation-free view is reserved for share URLs. Approval-policy +inheritance and reviewer Inbox are [design/TODO only](publication-approval-inbox.md). + +## Authenticated user/group permissions + +Domain, Quartier, Street and Spot governance dialogs expose a separate access +form. `inherit` adds no restriction; `restricted` selects up to 64 local users +or groups. Empty selection denies non-administrative content access. + +| Setting | Newly granted content capabilities | Not newly granted | +| --- | --- | --- | +| Read only | read | all mutations | +| Read/write | read, write, create, upload | delete, rename, link, manage, ownership | + +This locality selector is deliberately narrower than the existing group-wide +`read_write` profile (which also includes rename/link). Existing grants continue +to supply their original capabilities, subject to locality restrictions and the +temporary namespace fences below. Do not interpret it as an administrator role. + +- Matching subjects at one locality form a union. Every applicable ancestor + restriction is then intersected. A child cannot grant write through a + read-only parent or grant access to a subject excluded by a parent. +- A Domain administrator can establish a positive grant. A delegated owner can + restrict existing/ancestor-granted rights, not invent a new positive grant. +- Policy authority is retained: Domain admin = 3, Quartier owner = 2, Spot owner + = 1. A subordinate editing a superior-authored policy may remove subjects or + downgrade read/write to read, but cannot clear it, add subjects, or promote + read to read/write. Such narrowing retains the superior grant/rank. +- Active built-in Domain administrators bypass locality content caps for + recovery, but still require their underlying capability grants. Ordinary + members of an administrative group are not automatically administrators. +- Usernames resolve to stable local membership IDs; group names resolve to + stable group IDs. Name reuse must not transfer rights. Supplied IDs must + agree with resolved names. Group membership, account state and Domain + membership are re-evaluated on the next request, not held in a global cache. + Readonly principals cannot gain write from a matching group. +- The initial username picker resolves password-type username identities; + external-only identities need a local username identity before selection. +- Object/raw/history access intersects the restrictive caps on all local + aliases, even when an Object grant or a different readable alias exists. + Listings use a bounded request-scoped snapshot; no positive Object grant + reveals otherwise hidden semantic aliases. + Exact foreign Object grants also cannot bypass a restricted source-Domain + binding; cross-Domain delegation of these new ACLs is not implemented. +- Saves recheck active governance authority and epoch/topology in a reserved + SQLite write transaction and append local before/after audit records. + Content operations already authorized/in flight are not recalled; this is + not a distributed linearizable revocation protocol. + +`GET/PATCH /_/api/v1/city/{domains,zones,spots}/{uuid}/governance/access` +uses `epoch`, `topology_version`, `mode`, and entries containing +`kind: user|group`, `name`, `permission: read|read_write`, optional stable `id`. +Readonly scope, authority rank and grant flags are computed server-side. +Missing/stale versions fail; client fields cannot assert administrator status. + +### Temporary namespace guard (important operational limitation) + +Applying a restriction is refused when an in-scope Object already has aliases +outside that scope or in another Domain. Resolve these bindings first. +SQLite guards apply to CLI/import/direct-store paths as well as HTTP: + +- Protected Path move, removal and rebinding are refused, as is adding an + existing Object inside a restricted scope or aliasing a protected Object out. +- New Objects may receive their first Path and revision normally. +- City parent/path/state changes and deletions in an ACL-bearing Domain are + blocked, including Street–Spot membership changes. Title-only changes remain + possible. Automatic/import City mapping may therefore be refused; this is a + fail-closed guard, **not** a completed impact-aware reconciliation workflow. +- Enforcing mode cannot be disabled while restrictions exist. + +Do not work around these guards by silently dropping ACLs. A Domain admin can +explicitly remove restrictions, but that changes access and needs deliberate +review. Replacing this coarse guard with atomic, impact-reviewed mutations is +the next priority. + +## Anonymous current-content approvals + +A public Domain ceiling merely permits publication. A local public policy +within all ancestor ceilings supplies intent; saving it alone publishes nothing. +The dialog's anonymous section offers target enumeration, explicit approval, +and revocation. It warns that external caches cannot be recalled. + +`GET /_/api/v1/city/{domains,zones,spots}/{uuid}/governance/publication` +returns an impact token, epoch/topology version, eligible current +Path/Object/Revision/SHA-256/language tuples and excluded Paths. Domain itself +is not publishable. A candidate is excluded if it has any aliases, is in a +reserved namespace, or is under either a user/group restriction or a local +authenticated-only ceiling. The actor must be able to read every candidate; +governance authority alone cannot enumerate/publish another user's secrets. + +The metadata-only preview is bounded to 512 Paths, 32 language heads per Object, +2048 entries and three seconds. Exceeding a limit rejects the whole approval; +there is no silently truncated approval. The digest includes actor, Domain, +scope, versions, entries and exclusions. It is a concurrency commitment, not a +bearer credential. An authorized actor must still approve it. + +`PATCH .../publication` receives `epoch`, `topology_version`, `publication_version`, `enabled`, +`impact_token`, `confirm`. Activation reserves the SQL writer, checks current +authority, regenerates impact and compares the digest before writing one atomic +manifest. A per-scope publication generation advances on both approval and +revocation, so pre-revocation consent cannot be replayed to publish again. +Revocation does not need impact enumeration or read access to all +old contents, so an oversized/now-restricted manifest remains revocable. + +- Approval binds only current immutable revisions, never future edits or new + descendants. All language heads in the preview are included explicitly. +- Ordinary Page edits withdraw the affected language entry; Path binding/alias + changes withdraw the Object's entries. Restoring an old binding does not + silently revive approval. SQLite triggers cover direct store/CLI writes too. +- Governance/ACL/owner changes invalidate all manifests in that Domain through + their epoch. City changes invalidate manifests conservatively, including + title changes in this first slice. Reapproval is explicit. +- Different scopes may approve the same Path. Revoking one approval removes + only that approval; the UI states that another scope may still publish it. + An ancestor authenticated-only policy or a user/group restriction invalidates + the Domain's approvals and prevents reapproval of the restricted subtree. +- Manifest presence prevents switching the Domain to legacy authorization. +- Revocation controls the next request, including conditional/Range requests. + It cannot recall in-flight bytes or copies retained by browsers/crawlers. + +## Public read surface and exclusions + +Only GET/HEAD of a known semantic Page URL or `/v/raw/path:{semantic-path}` +can use the approved anonymous read path under enforcing mode. It is considered +only when no session cookie or Authorization header exists. Invalid/expired +credentials do not downgrade to anonymous. Valid authenticated requests keep +the authenticated authorization pipeline. + +Every read checks enabled host-resolved Domain, live binding, current language +head, approved digest and current governance/topology versions. Lookup is +Path-indexed, metadata-only and limited to two seconds. Raw streaming uses +`OpenDocument`/`ServeContent` with Range support and existing identity headers; +it does not hydrate large documents or queue preview generation. + +The dedicated themed Viewer includes no private topbar, bookmarks, user menu, +City ancestors or automatic discovery. HTML uses `controlled-v2` plus nonce CSP; +code/text is escaped and bounded. Raster images, audio/video and native PDF +frames are supported. Raw HTML/SVG/unknown files are sandboxed attachments. +Responses remain private/no-store, varying on credentials and language. +OGP/X metadata derives only from this approved content and configured Domain +identity; ordinary enforcing responses continue suppressing social metadata. + +**Not part of this slice:** anonymous City/search/browser/children expansion, +asset/hash/UUID/revision/history access, derived thumbnails, archive viewers, +diagrams, hosted adapters, and dependency manifests. Authored macros remain +literal on anonymous HTML pages. Referenced assets are not automatically made +public. Restricted user/group scopes are not anonymously publishable: an +“everyone can read, selected subjects can write” audience needs a later +per-capability audience model (existing write grants remain usable outside a +restricted scope). No public production Page is created as a deployment test. + +## Follow-up tasks + +- [ ] Transactional impact-aware move/merge/import/reconciliation, replacing the + coarse authenticated namespace freeze without weakening restrictions. +- [ ] Atomic per-content-operation authorization snapshots where still checked + before mutation; bounded grant evaluation with large policy catalogs. +- [ ] Stable local usernames for external-only identities and bounded group + name autocomplete; stale/deleted subject diagnostics and orphan cleanup. +- [ ] Per-capability audiences (anonymous read plus named writers), preview of + effective inherited user/group membership, and privilege-impact confirmation. +- [ ] Dependency-aware anonymous children/City/search/media projections and + shared assets, retaining exact source/alias authority and revocation. +- [ ] Paginated manifest review for larger sites, targeted epoch invalidation, + publication expiry/status monitoring and approval co-ownership visibility. +- [ ] Domain-sequenced transactional outbox and federated ACL/approval protocol; + new local ACL tables are not implicitly exported by current group inheritance. + +Tests: `TestLocalityUserGroupAccess`, `TestAnonymousApprovedPublication`, +`TestCityGovernanceChromium`, `TestAnonymousPublicationChromium`, existing +governance concurrency, HTML/browser/auth/read-policy and full regression suites. diff --git a/docs/design/locality-publication-ownership.md b/docs/design/locality-publication-ownership.md new file mode 100644 index 0000000..e457ea0 --- /dev/null +++ b/docs/design/locality-publication-ownership.md @@ -0,0 +1,271 @@ +# Locality owners and constrained publication + +Status (2026-09-14): **owner appointments and publication-policy drafts implemented**. +The subsequent [user/group and anonymous approval slice](locality-access-publication.md) +now enables separately approved current-revision Viewer/media access. It supersedes +the earlier anonymous-disabled status below, not the remaining full dependency/ +mutation gates. No saved draft is activated automatically. This supersedes the earlier proposal +that a child publication setting could simply override an ancestor's restriction. + +## Implemented first slice + +- Stable-UUID Quartier/Spot bindings support up to 32 co-owners. Appointment is + limited to active local Domain memberships; only active principals/memberships + exercise authority. Revocation/suspension is checked on each request. +- `domain_admin` owner/manager membership is authoritative for this API; generic + document write/manage grants, ordinary group administration and an unrelated + `campus_admin` membership are not a fallback. Existing explicitly inherited + Domain authority must materialize through the established group lifecycle. +- Quartier owners govern their own Quartier, Streets and Spots, and appoint + Spot owners only. They cannot appoint peers. Spot owners cannot appoint peers + or mutate topology/content through this feature. Existing content read ACLs + still govern detail pages; the governance API itself exposes configuration, + not Page bodies or an unfiltered Page list. +- Domain policy defaults to `authenticated_acl`; `public` there permits draft + publication but does not publish the root. Local defaults are `inherit`. + The evaluator intersects all caps, separately retaining publication intent. + Saving `public` beneath a restrictive cap fails; superior tightening clamps + previously stored descendant intent without erasing it. +- Relaxations require explicit confirmation. **This is a draft confirmation, + not publication-impact consent**. This endpoint retains `impact_complete:false`; + its `publication_enabled` now reports this node's separate approved manifest. + `GET/PATCH .../publication` provides bounded current-revision review/approval, + excluding aliases and dependencies. Do not silently activate saved drafts. +- `GET` / `PATCH /_/api/v1/city/{zones,spots,domains}/{uuid}/governance` are + handler-authorized with the existing session and CSRF protections. Only the + requesting Domain UUID is accepted for `domains`. Zone kind and active, + same-Domain parentage/strict descendant Paths are verified, not inferred from + client claims. Invalid/missing targets fail closed. +- `POST .../governance/preview` validates a proposed owner/policy draft without + persisting it; it is **not** a Page/alias publication-impact report. + `GET .../governance/members?q=...` is appointment-authorized, returns at most + 30 matching active local display identities, and never returns emails/tokens. +- PATCH/preview require both Domain governance `epoch` and `topology_version`. + A write reservation is acquired before reading actor membership, group/owner + authority, parent chain and policies, so a concurrent revocation cannot commit + between authority validation and the write. Stale versions return 409. Preview + rolls back its short reservation; no-op saves currently advance the epoch. + Request work has a two-second context deadline; SQLite busy handling can still + return retryable unavailability. There are no cross-request authority caches. +- Additive tables are `city_owner_bindings`, `locality_publication_policies`, + `city_governance_epochs`, and `city_governance_events`. Audit records contain + actor UUID, node UUID, epoch, timestamps and before/after configuration, not + document bodies or secrets. These are a local transactional audit log, not + the future durable Domain activity outbox or request-ID-correlated audit UI. +- Details have a themed settings-icon dialog with owners, member lookup, local + policy, ancestor caps and draft result. Domain draft ceiling is reachable + from the City Map utility menu's settings icon; configuration-panel embedding + can reuse this component later. Labels, confirmations and errors support + Japanese/English. Opening/closing and stale async responses are guarded. + +Not completed: complete dependency/alias impact, impact-aware move/merge/archive/ +import/reconciliation (the current ACL guard rejects structural changes), orphan +binding cleanup, anonymous discovery, full audit UI/outbox and automatic future +revision publication. The separate bounded Viewer/media activation and revocation +slice is specified in [the implementation contract](locality-access-publication.md). + +Verification: `city_governance_test.go` in Store/Server covers cap intersections, +multiple owners, self/peer appointment denial, unrelated Quartier/Domain denial, +active membership checks, owner/admin revocation, blocked intents, explicit +relaxation, non-persisting preview, stale epochs/topology, concurrent saves and +CSRF. `city_governance_browser_test.go` exercises real dialog/member search/save/ +reopen for both locality and Domain controls in Chromium. + +## Requirements and boundary + +- Quartiers and Spots can have explicitly appointed owners, including multiple + co-owners. Ownership is scoped governance, not a Domain administrator Role. +- A subordinate owner may narrow the publication audience permitted by superior + governance, never enlarge it beyond an ancestor's ceiling. +- Preserve existing authenticated content ACLs. Ownership and publication do not + implicitly grant editing, deleting, membership administration, historical + Revision access, object enumeration or arbitrary code execution. +- Do not disable `authorization_mode=enforcing` to implement public localities. + Anonymous publication must be a separate, explicitly authorized read path. +- Broadening anonymous access must use + [safe HTML projections](html-projection-trust.md), now implemented for normal + displays, and pass the governance/mutation/revocation gates below. OGP itself + grants no read authority. + +## Ownership and appointments + +Initial bindings refer to active Domain memberships (and their Principal), not +usernames. User renames do not change ownership. Multiple owners are supported; +an ownerless node falls under its superior administrators. Group ownership can +be added later only with an explicit group-membership/delegation policy; ordinary +group managers must not silently acquire publication-administration powers. + +| Actor | May appoint/remove owners | May administer publication | +| --- | --- | --- | +| Domain administrator | Quartier and Spot owners in its Domain | Domain ceilings and locality policies | +| Quartier owner | Spot owners within that Quartier | That Quartier, its Streets and Spots, bounded by superior ceilings | +| Spot owner | No appointment or co-owner changes by default | Its own Spot, bounded by all superior ceilings | +| Ordinary Page author / group admin | None by this feature | None by this feature | + +Quartier owners do not appoint their own peers or remove superior authority. +Spot owners do not transfer ownership or add co-owners themselves. Superior +appointment keeps delegated authority auditable and avoids accidental transfer +of publication control. Street has no independent owner role in this slice; +its Quartier governs Street policy. A future Street owner must obey the same +attenuation rules, not create a separate bypass. + +Campus administrators retain their existing Campus authority and explicit +Domain-admin inheritance semantics. Do not add an unconditional cross-Domain +content/ownership bypass merely because an account belongs to `campus_admin`. + +Owner appointments, revocations, account suspension and Domain membership +revocation take effect on the next request. Ownership bindings cannot outlive +their Domain scope or be imported as authority through untrusted topology data. +An owner must also have explicit read access to inspect document content; a +governance UI can report counts without revealing otherwise unreadable bodies. + +## Publication ceiling is not a publication grant + +There are two independent decisions: + +1. **Ceiling:** the widest audience superior governance allows. +2. **Publication intent:** whether this locality and its Path subtree are + actually being published, or inherit an explicit ancestor publication. + +A Domain starts with an authenticated-only ceiling and no anonymous publication. +Allowing public publication at the Domain ceiling does not publish the Domain +root, unconfigured localities, or arbitrary Pages. A Quartier/Spot owner must +then explicitly publish a locality, or inherit an already published ancestor. + +The first UI supports: + +- `inherit`: retain the ancestor publication intent; add no restriction. +- `public`: request anonymous read for this boundary and descendants. Accepted + only when every ancestor ceiling allows it; also establishes public intent + inherited by descendants. +- `authenticated_acl`: block anonymous reads here and below. Authenticated + readers still need the existing read grants; this does **not** grant every + logged-in account access. It acts as a ceiling that descendants cannot widen. + +Thus a public Quartier may contain an authenticated-only Spot, but an +authenticated-only Quartier cannot contain a public Spot. An unconfigured +Quartier under a Domain that merely *allows* publication is not public; a Spot +may explicitly be published there only if no ancestor imposed a narrower cap. +Unpublished parent metadata is not thereby published with that Spot. + +For anonymous access: + +`allowed = explicit-or-inherited publication intent AND every ancestor ceiling` + +For authenticated readers, retain the existing ACL evaluator. If selected-group +audience caps are introduced later, they must be an additional intersection, +not a positive grant or a priority-ordered override. Formally, effective audience +is the intersection of all applicable caps and the branch's positive read basis. +Predicates should be combined at evaluation time; do not enumerate users to +compare audiences. This slice does not introduce selected-group restrictions +or change current positive-grant semantics without a separate migration. + +An attempted `public` save under an authenticated-only cap fails explicitly; +do not store a misleading, silently clamped UI value. If a superior subsequently +tightens a ceiling, existing descendant public intent becomes ineffective +immediately without deleting the descendant's policy. A later relaxation must +preview and explicitly confirm any previously blocked public intent becoming +effective. Explicit child `authenticated_acl` restrictions remain in force. + +Returning a child from `authenticated_acl` to `inherit` can reopen access where +the parent is public. It is permitted within the owner's superior ceiling, but +requires the same public-impact confirmation as choosing `public`. Attenuation +is relative to superior authority, not an irreversible chronological lock. + +## Scope and bypass resistance + +- Publication follows the literal Path boundary, including its portal and new + descendant Pages. `/life` never matches `/lifestyle`; `%`, `_`, Unicode and + encoded separators are not SQL wildcards or a second decoding opportunity. +- Related Spot/Page appearances, reference edges and bookmarks never convey + publication. A public Page can link to a private Page without exposing its + private title, description, contents or preview. +- City/search/children/OGP/thumbnail projections use the same anonymous read + decision. Suppress unreadable ancestor names in public breadcrumbs; do not + make the ancestor public merely to show a published child. +- Owner and policy bindings are keyed by stable UUID. Changing a boundary, + moving a Street/Spot, recursive rename, link/unlink, import, merge, archive, + deletion and reconciliation all require publication-impact checks. Ordinary + document `write`, `rename` or `link` cannot publish previously private bytes + by moving/aliasing them into a public boundary. New content written directly + into an already public boundary follows its policy; make that visible in UI. +- Do not silently discard restrictions on node deletion, merge or archive. + Preserve equivalent restrictions or require a superior-authorized explicit + policy transition. Reconciliation cannot remove manually imposed restrictions + or create owner bindings. +- Aliases require special attention: if an Object is published through one + allowed Path, those same content bytes are not secret through another alias. + Warn in impact previews and require publication authority; do not expose other + alias names or infer that raw UUID/hash/history endpoints are now public. +- Initially publish only the current safe Viewer and the current approved media + needed by it. Assets, previews and embedded resources get independent checks; + never enumerate or publish historical revisions through a public Page. + +## Persistence and remaining target API contract + +Separate tables, rather than opaque `zones.policy_json` authorization: + +- `city_owner_bindings`: Domain UUID, node kind/UUID, membership UUID, appointing + Principal, timestamps; unique binding per node/member. +- `locality_publication_policies`: Domain UUID, node kind/UUID (including Domain), + intent/cap, policy version, actor and timestamps. Initial enum constraints + disallow arbitrary audience JSON. Ancestor joins validate active, same-Domain + parentage. Governance version is independent of cosmetic layout version. +- Domain publication-policy epoch: changes to ancestors invalidate derived + decisions, summaries and pending impact confirmations. +- Audit/outbox: before/after owners, policies and effective-publication impact, + actor, versions and request ID. No payload bodies or secrets in audit records. + +Handler-owned endpoints (configuration operations implemented; full publication +impact reports remain pending): + +| Endpoint | Purpose | +| --- | --- | +| `GET /_/api/v1/city/{zones,spots}/{uuid}/governance` | Authorized owners, local policy, superior ceilings and effective result | +| `POST /_/api/v1/city/{zones,spots}/{uuid}/governance/preview` | Owner/policy draft validation only | +| `PATCH /_/api/v1/city/{zones,spots}/{uuid}/governance` | Versioned owner/policy mutation with scoped authority | +| `GET/PATCH .../governance/access` | Named user/group restrictions within superior caps | +| `GET/PATCH .../governance/publication` | Bounded current-revision impact, explicit approval and revocation | + +Domain ceiling is Domain-scoped with its own policy epoch; the current UI lives +in the City Map utility menu and can later be embedded in Domain configuration. +The endpoint registry must deliberately admit scoped owners for these operations; +do not relax the existing Domain-admin guard on unrelated City mutations. + +Resolve actor membership/ownership, parent chain, caps and expected policy epoch +in one transaction. Stale versions return 409; insufficient authority returns +403 (or 404 for an unreadable target). Fail closed on unknown/malformed policies, +missing parents, foreign references, limits and query errors. Reject exhausted +impact previews rather than treating a truncated list as complete consent. + +Use bounded bulk reads / request-scoped snapshots, not a query per Page or a +process-wide authority cache. Public-mode decisions must be part of cache keys; +revocation takes precedence over any immutable-image cache reuse. Third-party +social caches cannot be recalled after publication; disclose this at confirmation. + +## UI and implementation sequence + +Use a settings-icon modal in Quartier/Spot details, with three compact sections: +owners, publication, and affected Pages. Show the superior ceiling, local choice, +effective status and the source of each inherited restriction. Disable forbidden +choices with explanations, but enforce all rules again server-side. Use existing +locale/theme/dialog conventions; localize both UI and permission errors. + +Implementation order: + +1. Completed prerequisite: inert HTML projection boundary and browser denial + regressions. No executable compatibility mode or anonymous grant was added. +2. Completed first slice: scoped owner bindings / appointments, versioned policy + storage, pure cap evaluator and governance API/UI. Public enabling and full + Page/alias impact preview remain release-gated. +3. Structural mutation/alias/import/reconciliation fencing and publication audit. +4. Common anonymous read policy under enforcing authorization, safe current + Viewer/media projections, filtered discovery and OGP integration. +5. Revocation/cache tests and staged enablement without changing existing Domains. + +Required regressions include co-owners, removed/suspended owners, foreign Domain +IDs, parent appointment rules, peer self-appointment denial, direct API bypass, +ancestor tightening races, unpublished ancestors with a public child, child +reopening within a permitted cap, move/merge/archive/alias bypasses, batch limits, +literal Paths, current-vs-history access, private preview dependencies, inherited +admin revocation, public/private cache isolation, and preserved canonical bytes. diff --git a/docs/design/navigation-home-sidebar.md b/docs/design/navigation-home-sidebar.md new file mode 100644 index 0000000..c861e9f --- /dev/null +++ b/docs/design/navigation-home-sidebar.md @@ -0,0 +1,132 @@ +# Home layouts and navigation sidebar + +## 実装済みのトップページ + +配色テーマ(Index、Railgun、Nanoha等)とレイアウトを分離する。 +`/-/sys/config?panel=home` でドメインごとに設定する。 + +| `home_layout` | 表示 | +| --- | --- | +| `classic`(既定) | 従来のトップバーと `home_path` のページ。未指定時はルート一覧 | +| `search` | トップバーなし、画面中央にWiki名と検索欄 | +| `directory` | トップバーなし、中央上部に検索欄、その下にブックマーク | + +すべてのトップページ検索は `scope=/`。これは現在のドメイン全体であり、 +他ドメイン横断検索ではない。`/` で `/top` を表示しても検索対象は `/`。 +`/top` 自体に直接アクセスした場合は通常のViewerとして `/top` 配下検索を維持する。 +既存のパス検索を使用し、全文検索エンジンの追加はこの変更に含めない。 + +`home_bookmarks` はJSONの `[{label,href}]` をドメイン設定に保存する。 +管理UIは `panel=bookmarks` の行編集式マネージャーとし、名前とPath/URLを指定する。 +従来のJSONは互換維持し、指定方法を表す `kind` を任意追加する。 +最大64件。HTTP(S)とルート相対パスのみ許可し、ローカルのリンクは表示時に +現在の閲覧権限を確認する。個人ブックマークとは区別する。 +`home_path` の内容はclassicでのみ表示し、レイアウト切替で元ページを変更しない。 +検索型でもアカウントメニューとCity Mapのポップアップは右上から開ける。 + +## 実装済みの壁紙とPath Picker + +ドメイン設定の `home_wallpaper_path` は、単一の画像Page Pathまたは仮想フォルダの +Pathを受け取る。画像の場合は固定表示し、フォルダの場合は直下にある +`image/*` のPageだけを候補としてリクエストごとに暗号学的乱数で1件選ぶ。 +再帰走査はせず、本文の読み込みやプレビュー生成も行わない。候補とRaw配信の双方に +現在の閲覧権限を適用し、非公開画像の存在を匿名トップページへ漏らさない。 +HTMLは候補がある場合だけ `private, no-cache` とし、画像本体の通常キャッシュは維持する。 + +`home_wallpaper_opacity` は0–100の整数で、表示時に0–1へ変換する。画像は装飾目的の +空alt、固定配置、`object-fit: cover` とし、Classic、Search、Directory、`home_path`、 +Diary/Blogトップに共通適用する。コンテンツは独立した上位stacking layerに置く。 + +設定画面のPath欄は共通 `GET /_/api/v1/path-picker` を利用する。APIはDomainと現在の +Principalで直下の子だけを認可し、最大250件、`private, no-store` で返す。 +`any`、`file`、`folder`、`image`、`image-or-folder` の型を持ち、UIは対象input IDと +modeをdata属性で指定する。これにより今後のストレージ、アダプタ、City設定でも +任意HTMLや専用ファイルブラウザを増やさず同じPickerを再利用できる。 + +## サイドバー詳細設計(実装待ち) + +管理画面のグループ化されたサイドバーは +[Configuration panels](configuration-panels.md) に従い実装済み。 +以下はViewer等の共通ナビゲーションサイドバーの設計である。 + +Viewer、Browser、Treeで共通のナビゲーションコンポーネントを導入する。 +Browserの既存サイドバーは現在独自実装であるため、共通化時に置換する。 +Editorの編集幅と検索型トップページの中央配置を維持するため、これらの画面では +初期状態を閉じる。City Mapポップアップ内にはサイドバーを表示しない。 + +表示要素の順序は次のとおり。 + +1. 現在のドメイン名、全体検索、Homeへのリンク。 +2. 管理者設定の共通ブックマーク。今回の `home_bookmarks` を共通データとして使う。 +3. 現在のパスを起点とするディレクトリツリー。パンくずで上位へ移動できる。 +4. City Mapへの入口と、そのパスに対応するQuartier / Street / Spot。 +5. 将来の個人ブックマーク、最近閲覧・編集したページ。Activity機能のAPIに接続する。 + +DOMは共通partialと独立したCSS/JavaScriptへ分離する。配色は既存テーマ変数を使用。 +PCでは左側の幅可変ペイン(初期16rem、12–28rem)、小画面ではオーバーレイとする。 +開閉ボタンは `aria-expanded` / `aria-controls` を更新し、オーバーレイはESCで閉じ、 +トリガーへフォーカスを戻す。非表示状態で本文のグリッド幅を残さない。 + +ユーザの幅・開閉・展開状態は `(Domain UUID, Principal UUID, root Path, UI version)` +単位で端末に保存する。ページ名・本文・API応答はlocalStorageに保存しない。 +ログアウト・アカウント切替時は読み込み中リクエストとメモリ上の一覧を破棄する。 + +## サイドバー用データ取得契約(実装待ち) + +`GET /_/api/v1/navigation/children?path=/docs&limit=100&cursor=...` を追加する。 +直接の子のみを返し、`path`, `label`, `is_directory`, `has_children`, +`object_uuid`(ある場合), `next_cursor` を含める。曖昧なPageと仮想フォルダの +二重行は作らず、同じパスに本文と子がある状態を表現する。 + +サーバ側はDomain/Principalの現行権限を適用し、子の存在フラグも閲覧可能な子から +算出する。隠しページの件数を返さない。上限200、パス順のカーソル方式とし、 +権限チェック後にページを構成する。認可はバッチ化し、共有キャッシュには +認可済み結果を無条件で入れない。応答は `private, no-store` から開始する。 + +初期描画ではサイドバーの枠と現在のパスだけを描画する。展開時に子を取得し、 +同時リクエスト数を2に制限する。画面遷移時はAbortControllerで中止する。 +プレビュー生成、全文取得、全Domainツリー取得はこのAPIの仕事に含めない。 +将来の大規模ツリーは直接の親パス索引/派生ディレクトリテーブルを導入し、 +Path mutationと同一トランザクションで更新する。 + +## 実装済みのTree View + +`/v/tree` は従来どおりルート、`/v/tree/{path}` は指定パス配下だけを表示する。 +SQLで範囲を絞り、同名接頭辞(`/docs2`)、大文字小文字の違い、別Domain、 +`%` / `_` を含むパスが混ざらない。`/u` 名前空間の除外と行単位の認可を維持する。 +パンくず、フォルダ行の配下リンク、アップロード先が現在のルートを引き継ぐ。 +全展開を初期状態とし、折りたたみ状態をホストと表示ルートごとに保存する。 +サイドバーと共通化する段階で保存キーにDomain/Principal UUIDを追加する。 + +## Browser初回表示の調査・是正 + +2026-09-13の読み取り調査で `data/pages.db` は944 Paths、1,614 Revisions。 +`EXPLAIN QUERY PLAN` は最新リビジョン取得に全走査と一時ソートを示していた。 +既存DBで `revision_metadata_v1` が適用済みの場合、後から同じマイグレーションに +追加されたインデックス作成が省略されることを確認した。 + +是正内容: + +- Hack Nerd Font v3.2.1を同梱し、Browser/TreeのCDNフォント依存を除去。 + `font-display: swap` で初回の文字表示をフォント取得完了まで待たせない。 +- 完了済みマイグレーションでも `idx_revisions_object_created` を確認・作成。 +- BrowserのSQLを、配下全体の全Revisionを順位付けする方式から、まず直下の + 子を集約し、表示するファイルだけ最新Revisionを検索する方式へ変更。 +- 文書を持つフォルダの重複行を統合。表示する文書のサイズはDocument Storeの + statを優先し、SQL互換本文では文字数ではなくバイト数を使用。 +- テンプレートの言語・タイムゾーン設定を1描画につき1回取得する。 + +合成データ(500 Pages、20 Revisions/Page、4KiB/Revision)での +`BenchmarkBrowserNestedHistory` は旧SQL約96.6ms、新処理約0.74ms。 +これはローカルのSQL中心の比較で、実環境の初回表示全体の速度保証ではない。 +再実行: `go test ./internal/store -run '^$' -bench BenchmarkBrowserNestedHistory`。 + +反映後の実DBでは最新Revision検索が `USING COVERING INDEX +idx_revisions_object_created (object_uuid=?)` に変わったことを確認した。 +app/app2のhealthは200、設定済みHost `pages.anya.jp` でローカルTTFと +トップページCSSの200配信を確認。トップページ3形式と配下TreeのHTMLは +一時DBを用いたHTTPハンドラテストで検証している。 + +残課題: 直下の子の集約は配下Pathsの走査を伴う。大規模化には派生ディレクトリ索引、 +ページング、認可のバッチ化が必要。一般Browserの子件数は権限別に計算する設計へ +改める。これらは上記サイドバーAPIと同じ取得層にまとめる。 diff --git a/docs/design/object-authority-scope.md b/docs/design/object-authority-scope.md new file mode 100644 index 0000000..c91819c --- /dev/null +++ b/docs/design/object-authority-scope.md @@ -0,0 +1,41 @@ +# Object authority is not global Domain authority + +Implemented 2026-09-14. An Object UUID remains a global identity, but a broad +Domain capability must not authorize another Domain's Object simply because +the caller knows its UUID. Read, Revision/history/projection, save and link +checks reuse the same Object resolver. + +Broad Domain/Object-wildcard grants are considered only when the current Domain +has a live semantic binding. A separately issued **exact Object grant** remains +an intentional exceptional delegation, including an unbound Object. Without +such a grant, foreign-only and unknown-origin unbound Objects fail closed. +One readable local Path can still authorize Object reads. HTTP purge is stricter: +all aliases must belong to this Domain and be individually deletable, with the +complete binding set revalidated in the delete transaction. + +## Create → save → bind + +The Object creation API now calls `CreateObjectInDomain`. Creation and insertion +of `object_origins(object_uuid, domain_uuid, created_at)` are atomic. While an +Object has **no live bindings anywhere**, this provenance permits the creating +Domain's normal capability checks, preserving the separate create/save/bind API. +It supplies scope, not a capability: a user still needs the requested grant. + +Once bindings exist, provenance is not a substitute for a current local binding. +Moving the last binding to another Domain therefore removes the creating +Domain's broad access. Explicit exact Object grants are not changed by moving +Paths; revocation of those grants has its own authority lifecycle. + +Existing UUIDs and Paths are not rewritten. No unknown legacy unbound Object is +silently assigned to the default Domain. Such objects require an exact grant or +trusted local administrative recovery; this is a deliberate security boundary. +New API-created provenance is not a claim that every historical CLI/import/Page +creation recorded ownership. A future verified provenance migration must account +for ambiguous multi-Domain history and asset references. + +Regression tests cover foreign reads/Revisions/saves/binds, wildcard versus exact +grants, the API create/save/bind sequence, relocation, and unknown unbound Objects. +Concurrent grant or namespace revocation during an already-authorized write +still requires policy-version/transaction fencing across all write routes; +the separate recursive mutation snapshot fixes do not imply that wider gate is +complete. diff --git a/docs/design/object-list-pagination.md b/docs/design/object-list-pagination.md new file mode 100644 index 0000000..1a95bbe --- /dev/null +++ b/docs/design/object-list-pagination.md @@ -0,0 +1,97 @@ +# Object metadata list: bounded cursor pagination + +Implemented: 2026-09-14. Endpoint: `GET` / `HEAD /_/api/v1/object/list`. + +## Compatible response and continuation + +The body remains a JSON array of the existing `Object` representation +(`UUID`, `Kind`, `CreatedAt`). No Path, revision body, aggregate count, or +unreadable Object metadata is added. Empty results serialize as `[]`. + +Query parameters: + +- `limit`: default 100, positive integers, capped at 200. +- `cursor`: opaque continuation token from the preceding response. + +When continuation is possible, responses include both `X-Next-Cursor` and an +RFC-style `Link: <...>; rel="next"` header containing the same cursor. HEAD +returns the corresponding metadata/continuation headers without an entity +body. Responses are `private, no-store`; unsupported methods return 405. + +Clients **must continue when a next cursor exists, even if the current array +is empty**. A page may examine only unreadable Objects and still have later +readable Objects. Absence of a next cursor is the end-of-scan condition. There +is deliberately no `total`, denied count, or public scanned-row count. + +Ordering is `(COALESCE(created_at, 0) DESC, uuid ASC)`. The keyset position does +not require the boundary Object to continue existing, and handles identical +timestamps and legacy NULL timestamps without OFFSET or duplicates. New +Objects/links created between requests may appear before or after the current +position; pagination is not a multi-request immutable snapshot. +The continuation query separately seeks the same-timestamp UUID suffix and +then older timestamps, keeping large same-second imports from repeatedly +rescanning UUIDs before the cursor. + +## Cursor confidentiality and authority + +The cursor contains its purpose/version, Domain, principal, fifteen-minute +expiry, and `(created_at, UUID)` position. The existing instance authentication +key encrypts/authenticates it with AES-GCM; the transport encoding is base64url. +A base64-only bookmark would disclose the last denied Object's UUID and time +on an empty page, so it is explicitly not used. + +Tampered, expired, wrong-purpose, cross-Domain, and cross-principal cursors +return a generic 400. Cursors do not carry permissions: current session, +membership and grants are reevaluated on every request. They survive a process +restart when the authentication key is unchanged. Replicas need the same key +to interchange cursors; key distribution itself is not implemented here. + +## Bounded selection and authorization + +The API retains its existing scope: only Objects with a **live semantic Path +binding in the current Domain** are candidates. Unbound Objects and Objects +bound exclusively in another Domain do not become listable merely because +their global UUID or creation origin is known. Direct Object grants authorize +metadata among these candidates; they do not widen this listing's scope. + +The handler installs a two-second request context, loads exact Object / broad +Domain-or-Object read grants in one bounded query, and uses the shared +request-scoped Path-read filter. Principal and Domain membership must be active +(readonly Principals may read). Candidate metadata and binding inspection share +a read-only SQLite transaction. + +- At most 400 candidates, plus one lookahead row, are selected in SQL. +- Direct Object and broad read grants are applied before looking at Paths. +- At most 8,000 binding rows are inspected in one batch for the remaining + candidates. No per-Object SQL authorization loop remains. +- Exact Object / Domain grant loading is capped at 4,096 grants. +- If a binding/grant budget is exceeded, the request fails closed with a + generic 503. It does not incorrectly skip insufficiently inspected Objects. +- A visible page ending early resumes after its last returned Object; a + denied-only candidate batch resumes after its last inspected Object. + +Schema initialization adds metadata-order and Object/Domain/Path indexes once. +The helper tolerates legacy Domain-only migrations where Object tables have +not yet been installed. No foreground listing performs DDL. + +## Remaining scaling work + +Very many cross-Domain Objects can still require scanning the metadata-order +index before finding in-Domain candidates; the deadline bounds this rather than +a claim of constant query time. Very highly aliased Objects can exceed the +binding budget for a Path-only reader. Domain-specific listing projections and +SQL-side joins to a compiled, bounded ACL projection would address these cases. +The older trusted store listing methods remain available to their other callers; +this change specifically bounds the HTTP metadata-list endpoint. + +## Regression tests + +Tests cover default/max limits, stable tied/NULL timestamps, deleted boundary +Objects, HEAD behavior, malformed/tampered/expired/scoped cursors, empty pages +with continuation, exact Object and Path grants, grant revocation, hidden Path +and cursor confidentiality, Domain/unbound exclusion, cancellation, extreme +binding budgets, and the legacy Domain-only migration fixture. + +```sh +go test -race ./internal/server ./internal/store -run 'TestObjectList|TestObjectMetadata|TestLegacyDistrictsMigrateToDomains' -count=1 +``` diff --git a/docs/design/oidc-verification.md b/docs/design/oidc-verification.md new file mode 100644 index 0000000..095e9e6 --- /dev/null +++ b/docs/design/oidc-verification.md @@ -0,0 +1,117 @@ +# OIDC ID-token verification + +Implemented: 2026-09-14. This closes the unsigned-ID-token acceptance gap in +the authentication backend; it is not a claim that every identity-provider or +account-lifecycle feature is complete. + +## Authentication boundary + +`/_/auth/oidc` and `/_/auth/callback/oidc` accept GET only. Authorization Code +with PKCE S256 still uses a five-minute, one-use, Domain-scoped DB challenge. +The challenge now also fixes the configured issuer and client ID, and stores +the SHA-256 of a browser-only random secret. A matching HttpOnly, host-only, +SameSite=Lax cookie is mandatory at callback. HTTPS uses the `__Host-` cookie +prefix, `Secure`, and `/` scope; plain HTTP is retained only for existing local +development deployments. Duplicate cookies fail closed. Starting a second +login in the same browser supersedes the first browser challenge. + +The callback performs these checks before account binding or session creation: + +1. Consume and validate state, browser binding, and unchanged provider identity. +2. Discover the configured HTTPS issuer and require an exact metadata issuer + match. Token, UserInfo, authorization, and JWKS endpoints must be HTTPS. +3. Exchange the code and require a Bearer access token and a signed ID token. +4. Select a public verification key only from that issuer's discovered JWKS. + Verify RS256 or ES256 using Go's cryptographic standard library. The + algorithm must also be advertised in discovery, match the key type, and + match the JWK `alg` when present. `use` and `key_ops` must allow verification. + RSA modulus sizes are 2048–8192 bits; ES256 requires a valid P-256 point and + its 64-byte JOSE signature. Ambiguous matching keys are rejected; omitted + `kid` is allowed only with one suitable key. +5. Require exact issuer, subject, client audience, nonce, and valid integer + `exp`/`iat`; validate optional `nbf`, `azp`, and `at_hash`. Expired tokens are + rejected without grace. Future `iat`/`nbf` permit at most 60 seconds of clock + skew. The access-token hash uses the verified signature algorithm's SHA-256. +6. Only then fetch UserInfo. Require the same subject and a verified email + before resolving the existing external identity or existing local account. + +Both lookup routes require active Domain membership. Email fallback must find +exactly one eligible Principal; duplicate matching emails fail closed instead +of choosing an arbitrary UUID. External subject binding uses a conditional +UPSERT: an existing `(provider type, provider, issuer, subject)` may refresh its +attributes only for the same Principal. A concurrent attempt to bind that +subject to a different Principal is rejected and cannot proceed to session +issuance. + +Provider `email_verified` verifies the provider's claim, not ownership of an +email address previously entered into a local Pages Wiki profile. Local-email +ownership verification and an explicit account-linking approval policy remain +separate requirements; uniqueness checks are not a substitute for them. + +These checks follow [OpenID Connect Core ID-token validation](https://openid.net/specs/openid-connect-core-1_0.html#IDTokenValidation), +with discovery trust rooted in the +[configured issuer metadata](https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata). +Algorithm allowlisting and rejection of ambiguous data implement the relevant +[JWT best-current-practice guidance](https://www.rfc-editor.org/rfc/rfc8725.html). + +The implementation does not follow token-provided `jku`, `jwk`, or `x5u` to +obtain trust. Unsigned/symmetric tokens, encryption, unencoded JWS payloads, +and critical JOSE extensions are unsupported. Top-level duplicate JSON members +(including case variants used by Go struct decoding) and trailing JSON data +are rejected. + +## Resource and rotation policy + +| Resource | Bound / policy | +| --- | --- | +| Provider fetch | 5-second total HTTP timeout, including response body | +| Login / callback | Existing 8-second / 10-second request contexts | +| Concurrent external requests | 8 process-wide OIDC slots | +| Production response headers | 64 KiB | +| JSON response | 1 MiB, oversized/truncated input rejected | +| Compact ID token / access token | 64 KiB / 16 KiB | +| Provider cache | LRU-bounded to 64 exact issuers; public data only | +| Signing-key set | At most 128 keys | +| Discovery and JWKS freshness | Locally capped at five minutes | +| Failed discovery / key-fetch retry | No more than once per 30 seconds | +| Signature failure / unknown key | One immediate JWKS refresh, then at most one forced refresh per 30 seconds | + +Concurrent requests for one provider share the same retrieval. A newly fetched +JWKS replaces the prior set, including removed keys. A failed forced refresh +never authenticates the failing token; other tokens may continue using a +still-fresh cached key. Expired keys are never used as an outage fallback. +With the local five-minute freshness policy, withdrawal of an otherwise valid +cached key is not an instantaneous revocation mechanism. + +All HTTP redirects are rejected, including token exchange and UserInfo, so a +redirect cannot forward a client secret or Bearer token. Provider URLs are +administrator-controlled; private HTTPS identity providers remain supported. +There is no automatic public-network-only SSRF policy or per-provider CA UI. + +## Compatibility limits and follow-up + +- Only RS256 and ES256 are implemented. PS256, EdDSA, encrypted ID tokens, + UserInfo JWTs, and dynamic registration remain separate features. +- The sole trusted audience is the configured client ID. A singleton audience + array is supported; multiple audiences are rejected even when `azp` matches, + because no additional-audience trust configuration currently exists. +- Exact issuer matching intentionally no longer equates trailing-slash + variants. Providers must publish the issuer exactly as configured. +- The discovery document must include `jwks_uri` and supported signing + algorithms. Token responses must include Bearer `token_type`. +- Future work: provider-specific registered signing-algorithm selection, + additional-audience trust only if a concrete provider requires it, explicit + authentication audit/abuse quotas, configurable cache-header handling, and + account-linking policy independent of verified-email matching. +- Deployment restarts invalidate the in-memory public-key cache. Login states + created before browser/provider binding was added must be restarted. + +## Verification + +`go test -race ./internal/server -run '^TestOIDC' -count=1` covers valid RSA and +EC signatures; forged/unsupported/ambiguous signatures; issuer, audience, +nonce, time and access-token-hash failures; key usage/curve constraints; key +rotation and removed keys; refresh coalescing/backoff; cache/response/key-set +bounds; canceled/incomplete response bodies; redirect denial; callback browser +binding and duplicate cookies; provider changes; UserInfo subject mismatches; +successful session issuance; and one-use state replay denial. diff --git a/docs/design/organizer-and-editing-ideas.md b/docs/design/organizer-and-editing-ideas.md new file mode 100644 index 0000000..a4c70f6 --- /dev/null +++ b/docs/design/organizer-and-editing-ideas.md @@ -0,0 +1,94 @@ +# Organizer, task/ticket and HTML editing ideas + +User notes recorded 2026-09-19. **Design backlog; product implementation remains +separate.** The user subsequently requested detailed design and Japanese Wiki +publication. The expanded proposals now live in [the Japanese handbook](ja/index.md), +chapters 12–17, with [decisions and open questions](ja/decisions.md). Original +English notes remain below as source material for later aligned translations. +Primary protocol and FreshRSS/newsboat documentation has been reviewed; exact +client/version interoperability still requires fixtures before implementation. + +## Tasks and tickets + +- [ ] Define lightweight task management: status, assignee, due date, priority, + checklist, dependencies, recurring tasks and links to existing Wiki Pages. +- [ ] Compare task metadata on ordinary Pages with a dedicated extension entity + referencing a Page. Do not make mutable titles or URL Paths durable identity. +- [ ] Evaluate CalDAV task interoperability and client support; decide how tasks + differ from calendar events and how completion/recurrence map to clients. +- [ ] Decide whether ticket management is a task view or a separate extension: + ticket numbers, workflow transitions, queues, labels, discussion, attachments, + assignments, watchers and notification Inbox integration. +- [ ] Keep ACLs, history, audit, search and Domain isolation shared with core + facilities rather than introducing an independent permission system. + +## Organizer: URLs, iCalendar, CalDAV and CardDAV + +- [ ] Separate the browser-facing Wiki URL, stable object identity, calendar item + UID, export URL and DAV resource URL. Renaming a Wiki Path must not silently + duplicate externally synchronized items. +- [ ] Start with calendar/list/agenda views and explicit import/export; evaluate + read-only subscription feeds before bidirectional synchronization. +- [ ] Design timezone/all-day/recurrence/exception handling, conflict resolution, + deletions, revisions, sync cursors, conditional writes and bounded pagination. +- [ ] Evaluate an external calendar connector versus serving a local CalDAV + endpoint; document ownership of canonical data and failure/retry behavior. +- [ ] CardDAV contacts: address books, contact identity, duplicates/merge, + personal/shared access, import/export and links from contacts to Wiki content. +- [ ] Contacts and schedules stay private by default. Scope-specific app tokens, + revocation and audit are prerequisites for external client access. + +## RSS viewer and reader integrations + +- [ ] Evaluate an Organizer RSS/Atom reader: subscriptions/folders, unread/recent + views, search, bookmarks and explicit article-to-Wiki capture with provenance. +- [ ] Compare a built-in reader, integration with FreshRSS, and integration with + newsboat. Review their supported interfaces and deployment requirements before + choosing an API or promising bidirectional interoperability. +- [ ] Decide ownership of subscriptions and read/starred state; define import/ + export (including OPML), synchronization direction, deduplication, conflicts, + offline use, token scope and revocation. Do not assume reader states are portable. +- [ ] Reuse background scheduling, bounded fetch/cache and notification facilities; + define polling budgets, retention, failure backoff and private subscription ACLs. +- [ ] Sanitize feed HTML, block unsafe outbound fetching/SSRF, control remote media, + and require an explicit destination/publication warning when saving into Wiki. + Distinguish incoming feed reading from the existing outgoing blog RSS feed. + +## IMAP ingestion and mail-to-Wiki + +- [ ] Design read-only IMAP ingestion first: account/folder scope, incremental + checkpoints, message deduplication, retry limits and background event scheduling. +- [ ] Preserve original MIME/EML provenance and reuse the existing EML viewer for + safe HTML/text and attachment handling. Never execute active email content. +- [ ] Offer an explicit “Copy to Wiki” operation selecting destination Path and + title, with an optional source-message backlink and attachment copy policy. +- [ ] Importing a message must not delete/move/mark it read remotely by default. + External mutations need separate, explicit configuration and audit. +- [ ] Resolve the confidentiality boundary when copying private mail into an + automatically public Street/Spot: show a disclosure warning, source/attachment + scope and explicit confirmation; no automatic public destination default. +- [ ] Plan credential storage, OAuth/app-password handling, message size quotas, + attachment scanning, quarantine, deduplication and storage retention. + +## HTML editing: do we actually need full WYSIWYG? + +- [ ] Record real editing pain points before choosing an editor engine. Full + WYSIWYG is an open decision, **not a committed implementation**. +- [ ] First evaluate small improvements: reusable HTML-part insertion, tables, + images/captions, callouts, links, code blocks and keyboard-friendly commands. +- [ ] Compare source+preview, selection-based formatting, constrained block editing + and full rich-text editing for fidelity, accessibility, performance and maintenance. +- [ ] Define immutable round-trip fixtures for macros, assets, embedded adapters, + code blocks and arbitrary existing HTML. Editing must not persist expanded macro + projections or destructively rewrite unsupported markup. +- [ ] Keep canonical HTML, editable representation and safe public rendering + distinct. Consider undo/redo, dirty-state warnings, revision conflicts and paste + sanitization before collaboration or full rich-text editing. +- [ ] Prototype behind an explicit opt-in and decide go/no-go from lossless editing + and user value, rather than committing to full WYSIWYG as a prerequisite. + +## Prerequisite order + +Scope/identity/ACL design → extension contracts → small read-only prototypes → +write/conflict handling → external synchronization. Prefer reusable notification, +scheduler, import journal and storage facilities already on the roadmap. diff --git a/docs/design/path-mutation-integrity.md b/docs/design/path-mutation-integrity.md new file mode 100644 index 0000000..37e864a --- /dev/null +++ b/docs/design/path-mutation-integrity.md @@ -0,0 +1,94 @@ +# Recursive Path mutation integrity + +Implemented 2026-09-14. This is a correctness boundary for semantic Path +rename, copy and unlink, not a change to the Address/URI identity model. + +## Authorization and write protocol + +1. Normalize absolute API Paths using the same whitespace and trailing-slash + rules as the Path store. Do not fold case, decode a second time, or interpret + `%`, `_` or `\` as patterns. Reject root mutations. +2. Obtain a server-side `PathMutationSnapshot` containing the normalized root, + Domain, recursive flag and exact ordered Path/Object bindings. Creation time + and primary-link metadata are included so a changed binding is not silently + overwritten. +3. Authorize each captured source Path and, for rename/copy, its computed + destination. The snapshot is an opaque in-process value, never JSON supplied + by a client. Permission failures disclose neither descendants nor preview + metadata. Preview results are taken from this same checked snapshot. +4. Begin a store transaction, enumerate with the identical predicate and compare + the whole binding set with the snapshot **before the first write**. Added, + removed or rebound descendants, and wrong Domain/root/recursive scopes, + reject the operation with HTTP 409. The client must start a fresh operation + to obtain fresh authorization; there is no unchecked automatic retry. +5. Keep revalidation and all writes inside the same SQLite transaction. A writer + that commits after revalidation invalidates a WAL read snapshot: SQLite + rejects its upgrade with `SQLITE_BUSY_SNAPSHOT`, also translated to 409. + After the first write the transaction holds SQLite's write lock. This is not + an assertion of equivalent isolation for a future database backend. + +For multi-selection unlink, validate **all** selected scopes before removing +any binding. Overlapping scopes are deduplicated inside the transaction. No +Object, Revision or Document is deleted by unlink. Rename retains identity and +updates filename Revision metadata and City boundaries transactionally; copy +allocates independent Object/Revision identities while reusing content hashes. + +Local trusted code and the administrative CLI can retain the existing unchecked +`RenamePathsInDomain` / `CopyPathsInDomain` entry points; these still use the +literal bounded enumerator and an atomic transaction. HTTP mutation handlers use +the `Checked` methods exclusively. + +## Object purge is a separate authority boundary + +`object/delete` remains a purge: it removes the Object, its Revisions and all +bindings, not just the current Path. Its HTTP handler now requires POST and a +4 KiB JSON body limit. A store-issued `ObjectDeletionSnapshot` enumerates **all** +bindings across Domains and rejects the request if any binding belongs to a +different Domain. Every local Path needs a delete grant; one allowed alias or +an Object-only grant cannot authorize deleting ungranted aliases. Unknown and +unbound Objects fail closed even for a Domain administrator, because the current +schema cannot prove Domain ownership without a binding. + +The scoped purge revalidates the exact complete binding set in the purge +transaction. A newly added local/foreign alias, removal or rebinding invalidates +the operation with HTTP 409. Paths, tags, Revisions and the Object are deleted +atomically; immutable content-addressed Documents remain for separate retention/ +garbage-collection policy. The old global `DeleteObject` store entry point is +retained for trusted local administrative callers, not HTTP. Tests cover mixed +local grants, shared/unknown/unbound Objects, late alias changes, rollback after +Path deletions and successful full purge while retaining the immutable Document. + +## Bounded, literal enumeration + +The Domain/Path index is queried using separate exact and descendant range arms: +`path = root` and `root + '/' <= path < root + '0'` with binary collation. +This preserves storage case sensitivity and treats SQL wildcard characters +literally. A lexical index order places parents before their descendants without +a full length sort. The root listing special case excludes the exact root from +the descendant arm to avoid duplicates. A query-plan regression checks index +range use and absence of a temporary sort. + +One scope/mutation is limited to 10,000 bindings; the API additionally limits +unlink selections to 1,000 roots and caps cumulative authorization work at +10,000 captured bindings. Oversized operations return HTTP 413, never a partial +success. Split large trees into smaller independently authorized operations. +All mutation endpoints and rename previews require POST and cap JSON bodies at +1 MiB where applicable. + +## Verification and remaining boundaries + +Regression tests cover literal percent/underscore/backslash and case-different +neighbors, normalization, denied descendants and destinations, preview leakage, +second-connection additions/removals/rebinding between authorization and write, +the post-revalidation WAL race, wrong/forged snapshot scope, overlapping deletes, +size caps, index plans and rollback after an injected second write (including +copied Object/Revision rows). + +This slice does not make authorization-policy updates and Path writes share one +transaction. Revocation between the final grant check and the write still needs +a policy-version precondition or a transaction-aware authorization service. +Copying an Object with a very long Revision history can also exceed an acceptable +interactive duration even with the binding cap; a durable authorized background +operation is a follow-up. Cross-Domain or unbound Object purge requires a future +explicit global administrative ownership/retention policy; it is not inferred +from a Domain-scoped request. diff --git a/docs/design/platform-extension-architecture.md b/docs/design/platform-extension-architecture.md new file mode 100644 index 0000000..ffa6df1 --- /dev/null +++ b/docs/design/platform-extension-architecture.md @@ -0,0 +1,168 @@ +# Platform Extension Architecture + +## Purpose + +This document keeps current implementation choices from closing off planned +collaboration, federation, high-availability, content, security, and storage +features. It defines extension boundaries, not permission to bypass existing +identity or authorization rules. + +## Non-negotiable identity boundaries + +Future features attach to stable identities: + +| Feature data | Stable attachment | +| --- | --- | +| semantic navigation | `(domain_uuid, path)` binding | +| content history | Page UUID and immutable Revision UUID | +| payload | Document SHA-256 | +| inline comment | Page UUID + Revision UUID + range/context anchor | +| thread, like, view, quality | Page UUID, optionally Revision UUID | +| City service | Campus/Domain/Zone/Spot UUID | +| notification | event UUID + recipient Principal UUID | +| share | delegated capability ID, never a copied Page | + +Comments, likes, counters, inbox state, quality scores, and diary metadata must +not be inserted into canonical Page HTML as hidden mutable state. Renaming a +Path must not detach them. Creating a Revision must not rewrite their history. + +## Required platform contracts + +### Event and outbox contract + +Every canonical mutation emits a typed event in the same transaction as its +state change. An event has an instance UUID, Domain UUID, monotonic Domain +sequence, event type/version, actor, target typed address, authorization-safe +summary, payload hash, timestamp, and idempotency key. Consumers maintain +their own checkpoint. Notifications, feeds, view aggregation, federation, +search, DR, webhooks, and quality automation consume events rather than adding +callbacks to every write handler. + +The scheduler owns retries, leases, priority, backoff, dead letters, logs, and +resource quotas. Foreground Page reads and writes always outrank extension +jobs. Delivery is at least once; consumers must be idempotent. + +### Authorization contract + +Every new endpoint declares a typed policy target and operation. Effective +permissions can be explained and enumerated without exposing inaccessible +objects. Anonymous access is an explicit positive grant to an anonymous +Principal class. A share token produces a caveat-limited Principal and never +becomes a normal login session. + +Cross-Domain policy sharing uses signed, sequenced records with an authoritative +origin. It may inherit identities, groups, Roles, and selected positive grants; +it never imports local secrets or silently grants access because Domains share +a Campus. Revocation and origin loss are explicit states. + +### Projection and conversion contract + +Viewer, editor, print, preview, transpiler, diagram, widget, and export are +projections of an immutable Revision. Adapter selection uses MIME, filename, +declared capability, Domain policy, and bounded-delivery needs. Adapter output +does not become identity. + +Conversions record source format, compiler/provider ID and version, options, +warnings, source map when available, output MIME, and output Document hash. +External renderers receive bounded content or one-use retrieval capabilities, +not database or unrestricted network access. + +Widgets are registered providers. Document content may request a provider and +resource ID, but may not supply executable JavaScript. Rendering uses a +sandboxed iframe or sanitized server projection with explicit CSP, consent, +origin allowlist, timeout, and privacy policy. + +### Document Store contract + +The canonical interface is content-addressed and supports: + +```text +Stat(sha256) +Open(sha256) / ReadAt(sha256, offset, length) +PutIfAbsent(expected_sha256, stream) +Verify(sha256) +DeleteUnreferenced(sha256, retention proof) +``` + +Filesystem and S3 implementations obey the same contract. Bucket/key URLs are +placement data and never appear in Revision identity. Metadata databases, +credentials, signing keys, sessions, and comments do not belong in this store. + +### Extension manifest contract + +An extension declares stable ID, type, version, PagesWiki compatibility range, +entry point, MIME/extensions, requested capabilities, outbound hosts, resource +limits, configuration schema, migrations, health probe, and signature. Types +include projection, editor, transpiler, diagram, widget, notification, +inspection, storage, search, and theme. + +Install, upgrade, disable, and rollback are explicit administrator operations. +An unavailable extension degrades to a safe built-in projection; it cannot make +canonical Page content unreadable or prevent raw immutable retrieval. + +## Collaboration data model direction + +- `page_activity_events` are append-only canonical facts. +- `principal_recent_views` is private derived state with retention controls. +- `page_metric_buckets` stores aggregated counts, not raw IP history forever. +- `page_reactions` has `(domain_uuid, page_uuid, principal_uuid, reaction)` + identity and an audit event. +- `quality_assessments` records rubric/version and human or machine provenance. +- `comment_threads` attach to Page or Revision; `comment_anchors` retain range, + quoted context hash, and rebase/orphan state. +- `notifications` reference events and store recipient delivery/read state; + notification text is rendered at read time with current authorization. + +Deletion and retention are explicit. A user losing access must stop seeing +notification details even if an older notification row remains. + +## Federation and disaster recovery direction + +Controller desired state is a signed, monotonic manifest journal. DR replicates +the journal, encrypted signing-key material under a documented recovery policy, +and last-known-good snapshots. Promotion creates a new auditable epoch and +fences the former leader. Managed instances pin permitted controller identities +and reject sequence rollback or concurrent epochs. + +Page Documents, metadata, event logs, and controller desired state have separate +backup/replication policies. A Campus manifest is not a database backup. + +## Load balancing and HA constraints + +Application nodes should become disposable after canonical state is externalized: + +- bearer/session validation keys and revocation state are shared or replicated; +- background jobs use leases and idempotency keys; +- caches are disposable and version-keyed; +- uploads stream to canonical storage and do not depend on a later request + reaching the same node; +- WebSockets support drain/reconnect; +- proxy headers are trusted only from configured proxies. + +SQLite remains valid for one writable application node and local replicas or +backups. Concurrent writers must use a metadata backend designed for it or a +fenced leader; a writable SQLite file on NFS is prohibited. + +## Security and privacy constraints + +- External feeds, widgets, diagram services, and scanners use per-provider + outbound allowlists, DNS/IP rebinding defenses, size/time limits, and logs. +- Malware inspection is asynchronous but policy can quarantine download and + adapter access until a required clean verdict exists. +- View history and popularity avoid retaining unnecessary personal data. +- Comments, reactions, shares, and notifications are covered by export, + retention, moderation, abuse, and audit policy. +- Theme packages supply CSS tokens/assets, never privileged script. + +## Compatibility gates for current work + +Before merging a feature, tests must show that it: + +1. preserves Page UUID, Revision UUID, Document hash, and Domain Path semantics; +2. declares authorization targets and anonymous/share behavior; +3. remains bounded for payload, rows, recursion, time, and concurrency; +4. emits versioned events for canonical mutations; +5. tolerates retry and duplicate delivery; +6. degrades safely when an extension or remote service is unavailable; +7. supports migration rollback and mixed-version federation where applicable; +8. does not assume process-local state in an HA-targeted code path. diff --git a/docs/design/projection-adapters.md b/docs/design/projection-adapters.md new file mode 100644 index 0000000..d83a780 --- /dev/null +++ b/docs/design/projection-adapters.md @@ -0,0 +1,467 @@ +# Projection Adapter Design + +## Purpose + +A document address identifies content. It does not select its renderer. +Viewer chooses a projection adapter from document metadata and runtime +capabilities: + +```text +internal address + -> revision metadata + -> effective MIME detection + -> projection adapter selection + -> bounded data delivery + -> Viewer component +``` + +The adapter boundary must remain independent from Semantic Path, Page UUID, +Revision UUID, and raw payload delivery. + +## Current Adapter Contract + +The server registry in `internal/server/content_adapter.go` describes: + +| Field | Meaning | +| --- | --- | +| `ID` | Stable adapter identifier exposed as Viewer metadata | +| `Kind` | Template component used by the current Viewer | +| `Delivery` | HTML, decoded text, raw media, raw frame, or download | +| `NeedsText` | Whether safe character decoding is required | +| `WindowableText` | Whether large input must move to bounded retrieval | +| `Match` | MIME and filename matching predicate | + +Selection is ordered. Specific structured formats must precede generic JSON, +text, and download adapters. + +The initial registry reserves these stable IDs: + +| Adapter | Current projection | Intended projection | +| --- | --- | --- | +| `html` | rendered HTML | rendered HTML | +| `text` | CodeMirror text | windowed text | +| `csv` | bounded table with sticky header | paginated virtualized table | +| `excalidraw` | validated interactive canvas + source fallback | canvas + editor action | +| `nwdiag` | bounded network diagram projection | static SVG preview + hosted/editor action | +| `archive` | ZIP/RAR/7z/TAR entry table + comic mode | archive directory | +| `eml` | decoded headers and body | multipart mail viewer | +| `debian-package` | ar/control metadata | package metadata | +| `pe` | PE/COFF headers and sections | executable metadata | +| `image` | raw media | raw media | +| `audio` | raw media | raw media | +| `video` | raw media | raw media | +| `pdf` | raw frame | PDF viewer | +| `download` | download | download | + +These adapters are built in and versioned with Pages Wiki. They are always +listed by `GET /_/api/v1/adapter`; they are not configuration records and +cannot be deleted by an administrator. + +## Integration Adapter Plugins + +Additional hosted viewers and editors are Domain-scoped integration adapter +plugins. They may run at another FQDN or in a separately deployed container. +They supplement the built-in projection and do not replace document identity, +Raw delivery, or immutable Revision storage. + +Each plugin declares: + +| Field | Meaning | +| --- | --- | +| `id` | Stable lowercase plugin identifier | +| `name` | User-facing name in “Open with” | +| `mode` | hosted `viewer` or hosted `editor` | +| `media_types` | Exact MIME types or suffix-wildcards such as `image/*` | +| `extensions` | Lowercase filename extensions | +| `url_template` | Absolute HTTP(S) URL for the hosted service | +| `enabled` | Whether it is offered at runtime | + +Templates can use `{url}`, `{path}`, and `{filename}`. Substitutions are +URL-encoded. `{url}` is an immutable Revision Raw URL; it never carries a +third-party token. Only `http:` and `https:` templates are accepted. + +Native application launch is not implemented. `vim.exe`, `code.exe`, +`/usr/bin/vim`, custom URL schemes, a local workspace cache, and a Box Edit +style helper remain a future TODO. Legacy `native` records remain visible but +are disabled and are never returned as runtime actions. + +Management and runtime discovery use: + +```text +GET /_/api/v1/adapter +POST /_/api/v1/adapter +POST /_/api/v1/adapter/delete +GET /_/api/v1/adapter?path=/semantic/path +GET /v/open-with?adapter=&path=/semantic/path +``` + +The server revalidates MIME/extension compatibility when `/v/open-with` is +called. A context-menu URL is therefore not an authorization bypass. + +### Hosted Deployment + +A hosted adapter can be deployed beside Pages Wiki without being part of the +Pages Wiki process: + +```text +pages.example.test -> Pages Wiki +code.pages.example.test -> code-server + Pages Wiki adapter gateway +vim.pages.example.test -> vim.wasm adapter +``` + +The current integrated deployment uses one Pages Wiki origin and an internal +Gateway service instead of publishing the Gateway port: + +```text +pages.anya.jp/_/adaptor/code/* -> adaptor-gateway:3000 -> code-server:8080 +pages.anya.jp/_/adaptor/vim/* -> adaptor-gateway:3000 -> vim.wasm assets/API +``` + +`adaptor-gateway:3000` is available only on the Compose network. Pages Wiki +owns the public `/_/adaptor/` route, forwards the prefix to the Gateway, and +retains the prefix in redirects and cookie paths. + +The first implementation opens the configured service in a top-level browser +navigation. Cross-origin iframe embedding is not assumed; a service may opt in +later with an explicit CSP `frame-ancestors` policy. + +`vim.wasm` or a purpose-built Web editor can consume the immutable `{url}` +directly for read-only use. A general code-server container cannot edit an HTTP +Raw URL as a local workspace by itself. It requires an adapter gateway that: + +1. exchanges a short-lived, one-use launch ticket; +2. materializes the selected Revision inside a per-session workspace; +3. opens that workspace in code-server; +4. submits changed bytes as a new Revision with optimistic conflict checking; +5. destroys or expires the workspace. + +This launch and write-back contract is implemented by the reference +`adaptor-gateway` container. An editor URL template must contain `{ticket}`; +the ticket expires after 60 seconds and can be exchanged only once. The +gateway stores the resulting eight-hour session bearer server-side and sends +it in an Authorization header. Saving creates a new Revision. If the base +Revision is no longer current, Pages Wiki returns HTTP 409 and preserves both +versions without silently overwriting either one. + +The reference gateway materializes the selected file and its descendant +documents in an isolated session directory +on a dedicated workspace volume and opens that directory through an internal +code-server instance. code-server is not published on a host port and runs +with authentication disabled only inside the Compose network; the Gateway +requires its HttpOnly adapter session before proxying `/code/`, including +WebSocket traffic. A watcher submits changed target bytes as a new Revision. +Relative hierarchy and a separate optimistic base Revision are retained for +every file. Hosted plugin settings can request a new browser tab and an +HTML/Markdown round trip: HTML becomes Markdown in the workspace and is +rendered back to canonical HTML when saved. +vim.wasm integrates behind this same Gateway contract rather than receiving +Pages Wiki database or Document Store access. The Gateway loads the session +workspace into vim.wasm MEMFS. A `BufWritePost` hook exports the written file, +and the browser sends those bytes through the scoped session API to create a +new Revision. + +vim.wasm, its Worker, Wasm binary, and data archive are served with +`Cross-Origin-Opener-Policy: same-origin`, +`Cross-Origin-Embedder-Policy: require-corp`, and +`Cross-Origin-Resource-Policy: same-origin`. The deployment must also use a +secure context. A trusted HTTPS adapter URL is preferred; loopback development +may use `http://localhost`, which browsers treat as potentially trustworthy. + +```text +POST /_/api/v1/adapter/session/exchange +GET /_/api/v1/adapter/session/workspace +GET /_/api/v1/adapter/session/content +PUT /_/api/v1/adapter/session/content +``` + +Recommended container boundaries are: + +- a dedicated origin and cookie namespace; +- an allowlist of adapter origins in Pages Wiki; +- no direct mount of the Pages Wiki Document Store or SQLite database; +- CPU, memory, process, and workspace quotas per adapter container; +- immutable Revision download through Pages Wiki APIs only; +- write-back through the narrowly scoped adapter session capability only. +- code-server terminal and extension privileges confined to its container; +- only the adapter workspace volume shared with the Gateway. + +## File Context Menu + +Directory, search, and file-manager projections expose the same contextual +operations: open, rename, copy, paste, move, recursive delete, and “Open +with”. Copy/paste uses a browser-local clipboard containing Semantic Paths; +the server performs the actual Domain-scoped copy through +`POST /_/api/v1/path/copy`. + +A copied Page receives new Object and Revision UUIDs. Its immutable Document +hashes are reused, and its Revision history and metadata are preserved. Copy +therefore means an independent Page, not a new Path link to the source. +“Open with” is shown only for adapters matching the resolved latest Revision. + +Fallback rendering is intentional. Recognizing a format and providing an +interactive renderer are separate capabilities. + +PDF page counts and non-ZIP archive listings now use the persistent, bounded +[`projection.metadata.generate` cache](projection-metadata-cache.md). Viewer +requests enqueue missing metadata and render explicit pending/retry states; +decoder subprocesses execute only in the scheduler. Cached entry names remain +plain data and receive authorized, immutable-Revision links at response time. + +## Metadata UI + +Viewer must not reserve a full horizontal row for MIME information. +Document metadata is exposed from the information control at the right of the +breadcrumb bar. It contains: + +- filename +- effective MIME type +- selected adapter +- payload size + +The control must work with both pointer hover and keyboard focus. + +## Web Upload + +`/v/upload` accepts a destination Semantic Path and one file. A destination +ending in `/` appends the uploaded filename. An exact existing Path creates a +new Revision of the existing Page; it never destroys history. Upload stores the +original filename and detected MIME type as Revision metadata. + +The request is bounded to 256 MiB. Specialized resumable upload is a separate +future adapter and must not silently raise this synchronous request limit. + +## Media Interaction + +Image projection opens a modal full-viewport lightbox from the inline preview. +Audio and video projections retain native controls and add a common toolbar for +elapsed time and playback rate. Video additionally exposes Picture-in-Picture +when supported and full-screen projection. Raw media remains Range-capable. + +ZIP entries are exposed through a scoped archive-entry projection. It resolves +the archive by Domain and semantic Path and never accepts a host filesystem +path. Comic mode includes recognized image entries and lazy-loads them in +archive order. + +## Folder Search + +The topbar search form sends the current semantic Path as its scope. SQLite +searches effective Paths and latest Revision filenames inside that segment +boundary and returns at most 100 results. The scope parameter is retained so a +later Domain-wide FTS index can add “all” search without changing the topbar +contract. + +## Children Macro Views + +Macro processing has explicit modes: + +| Mode | `children` behavior | +| --- | --- | +| Authoring HTML → Markdown | Preserve the macro source verbatim | +| Markdown editor preview | Render Markdown to HTML, then expand the macro | +| Saved Viewer projection | Expand from canonical stored HTML | +| Markdown source projection | Preserve authoring source | + +Expansion must never run before an authoring round trip: generated async +projection markup is runtime output and must not replace the macro in the +editor or a subsequent Revision. + +The macro only selects the child Path. Presentation is viewer state rather +than document content: + +```text +{{children}} +{{children:/gallery}} +{{children:/downloads exclude=/downloads/private}} +``` + +The breadcrumb action area exposes thumbnail, detail, and normal-list views. +The selected view is stored locally and applies to every `children` projection +on the page. Legacy `view=`, `mode=`, and `compact` arguments are ignored. +`exclude=` remains part of the macro because it changes the projected set. + +Ctrl/Command-click toggles selection without following the link. Right-clicking +a selected item opens bulk move and recursive-delete actions. Moving a virtual +folder renames its Path prefix, preserving Object and Revision identity. + +The macro initially emits a lightweight placeholder. Viewer fetches the +Domain-scoped `/v/children` projection asynchronously, so Page HTML and other +macros are not blocked by metadata or thumbnail discovery. + +Children are delivered in bounded pages. There is no explicit “More” action: +an IntersectionObserver requests the next page when its sentinel approaches +the viewport, including touch/drag scrolling. The item grid and labels are +painted before any preview payload is requested. + +Icon projection uses generated, immutable thumbnails for images, first-page +PDF previews, video frames, and Excalidraw scenes. Folders, ZIP archives, +Debian packages, audio, plain text, and source code use format-specific SVG +icons. Cache checks are viewport-prioritized. Mutable `path:` raw projections +use a short private cache; immutable `rev:` projections use a one-year +immutable cache and ETag. + +Preview I/O is a background workload. The browser: + +- paints item frames and labels before scheduling preview work; +- starts work during an idle period; +- allows at most two concurrent previews, or one on data-saver/2G links; +- observes only items within 250 px of the viewport; +- cancels queued fetches and active Excalidraw requests on page departure. + +Preview Raw URLs carry `preview=1`. The server isolates those requests behind a +single global preview slot. Normal Viewer navigation, APIs, and non-preview Raw +delivery never wait for this slot. + +File-manager thumbnails no longer use Raw PDF frames or browser video +decoders. They consume only immutable files produced by the persistent +[event scheduler](event-scheduler.md). Until generation succeeds, the icon +projection remains a lightweight format icon. + +## Raw and Derived Projection URLs + +Adapters never construct an alternative identity URL. Raw bytes continue to +use an explicit internal address: + +```text +/v/raw/path:/reports/annual.pdf +/v/raw/uuid: +/v/raw/rev: +``` + +Structured viewers use derived endpoints below `/v//` and carry the +same address forms. Proposed examples: + +```text +/v/text/path:/logs/server.log?offset=0&limit=65536 +/v/csv/rev:?row=0&limit=200 +/v/archive/rev:?path=/usr/bin +/v/deb/rev: +/v/excalidraw/rev: +``` + +Printable projections use the address-model route +`/_/view/print/{path:|uuid:|rev:}` and pin every Raw dependency to the selected +immutable Revision. Text and CSV print output is bounded to 2 MiB; media is +printed from metadata plus its immutable Raw URL without hydrating its body. +Structured formats above the synchronous hydration ceiling degrade to a +download link instead of blocking foreground navigation. + +A mutable `path:` request may resolve to a revision and return its UUID in the +response. Paging requests after the first response must use `rev:` so a +changing current document cannot mix two revisions in one Viewer session. + +## Large Text and JSON + +The current inline text threshold is 2 MiB. Crossing the threshold is recorded +as a requirement for windowed delivery. The complete scalable implementation +must not hydrate or embed the full document merely to render its first screen. + +The text adapter will use: + +1. metadata-only revision lookup; +2. a seekable Document Store reader; +3. byte-window retrieval with a fixed server maximum; +4. UTF boundary repair and explicit byte offsets; +5. line-index checkpoints built asynchronously or lazily; +6. client virtualization for visible lines and minimap summaries. + +JSON uses bounded structural streaming at `/v/json/rev:`. +Expansion fetches a capped direct-child range selected by JSON Pointer. The +request handler streams tokens and never unmarshals the complete payload; +nested containers are revisited lazily from the immutable Document. A future +persistent checkpoint index may accelerate deep pointers without changing the +API or Revision identity. + +Responses should include: + +```text +revision_uuid +document_hash +content_type +total_bytes +offset +next_offset +line_start +line_end +truncated +``` + +Range limits, parse depth, row count, archive entries, and decompressed bytes +must be capped server-side. + +## CSV Viewer + +CSV detection uses MIME type or `.csv`. The derived adapter must: + +- sniff delimiter and quoting from a bounded prefix; +- expose encoding and dialect in metadata; +- paginate rows; +- virtualize columns and rows in the browser; +- preserve the immutable Revision during paging; +- fall back to the text adapter on malformed input. + +## nwdiag network diagrams + +`nwdiag` is a source/document format, not an instruction to execute arbitrary +code. The adapter parses a bounded, version-pinned grammar and produces a +static SVG (or PNG) projection. It must reject oversized graphs, recursive +includes, external image/font imports, unsafe SVG attributes, and unknown +directives rather than forwarding them to a renderer. The source Revision is +immutable and remains available through the plain/source view. + +An optional hosted editor is a separate `viewer`/`editor` adapter. It receives +only an immutable Revision URL and a one-use save ticket, never the browser +session token. Save uses optimistic Revision checks and creates a new source +Revision; rendering is queued and cached by `(document hash, parser version, +theme, renderer version)`. If the renderer or editor is unavailable, the Viewer +shows escaped source and the last verified static projection. A future Kroki +provider may render nwdiag, but network access, origin allowlists, timeout, +resource quotas, and provider version must be explicit. + +## ZIP Viewer + +ZIP projection lists entries without extracting them into the data directory. +Entry paths must be normalized and zip-slip paths rejected. Limits apply to +entry count, nested archives, compression ratio, total expanded size, and +individual previews. Entry download is a derived projection of the containing +Revision and entry path. + +## Debian Package Viewer + +The DEB adapter reads the outer `ar` members and bounded control archive only. +It exposes package name, version, architecture, dependencies, description, +installed size, checksums, and a bounded file list. Maintainer scripts render +as escaped text. No package script is executed. + +## Excalidraw + +`.excalidraw` files are recognized before generic JSON. The renderer validates +a bounded scene graph and produces an isolated canvas projection. + +The preferred projection is the bundled `org.pageswiki.excalidraw-viewer` +plugin. It runs `@excalidraw/excalidraw` in read-only view mode in a separate +container and is routed through `/_/adaptor/excalidraw/`. Pages Wiki passes +only an immutable same-origin `rev:` Raw URL. The plugin rejects mutable, +cross-origin, and over-2-MiB inputs, is framed with a restrictive CSP, and +reports readiness through `postMessage`. A timeout, load failure, or invalid +scene activates the dependency-free built-in Canvas renderer. + +Configuration may provide an editor URL template. The action receives a +read-capable document URL and, only when explicitly authorized, a save callback +or capability. Tokens must not be placed in a third-party URL query string. +Without a configured editor, Viewer offers the internal canvas and source +fallback. + +## Security and Failure Rules + +- Normal HTML displays use the common `controlled-v2` allowlist and application CSP; + saved source remains unchanged. Raw HTML attachment, raw/diagram SVG sandbox, + and registered application frames retain their separate response contracts. + There is no executable authored-HTML mode. See + [HTML projection trust and compatibility](html-projection-trust.md); public + shares and anonymous viewing still require their own authorization gates. +- Archive and package adapters never execute contained files. +- Derived adapters operate on immutable revisions after initial resolution. +- MIME detection is advisory; parser validation is authoritative. +- An unavailable or failed specialized adapter falls back to safe text or + download behavior. +- Adapter errors do not change document identity or stored content. diff --git a/docs/design/projection-metadata-cache.md b/docs/design/projection-metadata-cache.md new file mode 100644 index 0000000..41d3fdc --- /dev/null +++ b/docs/design/projection-metadata-cache.md @@ -0,0 +1,109 @@ +# Deferred PDF and archive metadata + +Implemented: 2026-09-14. PDF page counts and non-ZIP archive listings no longer +run `pdfinfo` or `7z` inside a Viewer, preview, print, or metadata HTTP request. + +## Request and worker contract + +The existing authorized routes expose a metadata mode: + +| Request | Resolution and authorization | +| --- | --- | +| `/v/pdf-page?rev=&metadata=1` | immutable Revision → owning Object's current read authority | +| `/v/archive?path=&rev=&metadata=1` | current Domain Path read authority; supplied Revision must belong to that Path's Object | + +The cache is never addressed by an unauthenticated hash-only public endpoint. +Authorization is checked even for ready/failed cache hits. Responses vary on +`Authorization, Cookie` and use `private, no-store`, so revoked access cannot +be bypassed through a browser-cached metadata response. + +- `202`: `{"status":"pending"}`, with `Retry-After: 2`. +- `200`: `{"status":"ready", "pdf_pages": N}` or bounded archive `entries`. +- `422`: a cached failed projection, with a retry timestamp and `Retry-After`. +- `503`: queue/storage unavailable; raw download is still an independent path. + +A miss enqueues `projection.metadata.generate`, keyed by +`::`. Its payload contains only +the hash, kind (`pdf` or `archive`), and parser version. Active queue entries are +idempotent across requests. Metadata uses the existing scheduler concurrency, +pause, foreground-work reservation, cancellation, logs, and manual retry UI; +it does not create an independent worker pool. Its priority is currently -5, +below ordinary preview jobs, and its max attempts is 1. A failed decoder result +is cached for five minutes to prevent repeated visits from creating a retry +storm; a scheduler manual retry can run it earlier. + +The semantic Viewer and preview use a metadata-only fast path for PDFs and +non-ZIP archives. They do not load the entire Revision body before queueing. +The worker opens the immutable Document Store file directly; there is no +request-time archive copy into a temporary file. Print uses the same metadata +cache for archive tables. Raw PDF iframe delivery remains independent. + +## Persistent cache and bounds + +`projection_metadata` is keyed by `(document_hash, kind, version)`. The payload +contains no semantic Path, Revision UUID, generated entry URL, principal, or +credential. Request-specific archive links are created after authorization and +pin the viewed Revision, so replacing the Page cannot silently extract an entry +from a different archive revision. + +| Boundary | Current limit | +| --- | --- | +| Input Document | 512 MiB, regular Document Store file | +| Decoder wall time | 30 seconds; one-second process wait grace | +| PDF stdout / accepted count | 64 KiB / 1–10,000 pages | +| `7z` stdout | 4 MiB, with partial listing explicitly marked truncated | +| Archive entries | 2,000 | +| Entry name / total name bytes | 4 KiB / 256 KiB; UTF-8, no control characters | +| One persisted result | 1 MiB | +| Aggregate cache | 64 MiB payload/error budget and 2,048 records | + +External commands use `nice -n 15`; `7z` has one decoder thread, no interactive +password prompt, and no shell interpolation. Output is bounded by a writer +that does not expose `bytes.Buffer.ReadFrom` (which would bypass the writer +limit through `io.Copy`). Excess output cancels the process. Cache eviction is +performed transactionally by the background writer, oldest generation first; +foreground hits do not update timestamps or trigger global eviction scans. +Evicted entries can be reconstructed from immutable Documents. + +## Browser behavior + +Pending and failed states are explicit and localized in Japanese and English. +The client polls every 2–10 seconds, stops after 60 pending polls, pauses while +the tab is hidden, and aborts on page exit. A retry button handles a paused queue, +network failure, or cached decoder failure. It does not reload the whole page. +PDF navigation picks up the total as soon as metadata arrives. An asynchronously +loaded archive table is built using DOM text nodes, never filename HTML. Comic +mode initializes once its images arrive and preserves single/spread pages, +keyboard navigation, hidden inactive images, and browser-history behavior. + +ZIP remains the existing in-process central-directory Viewer and comic mode; +its displayed listing is capped at 2,000 entries and its entry URLs now also pin +the Revision. Large ZIP central-directory parsing still needs a later metadata +worker migration if such archives become common. + +## Explicitly deferred work + +- Non-ZIP **entry extraction** still streams through `7z` in the request path, + capped at 128 MiB and 60 seconds. It now treats entry names literally (no + wildcard or `@listfile` expansion), safely formats response filenames, and + cancels the child when the output cap/client disconnect stops draining it. + Persisted, seekable entry projections require their own storage quota, + leases, Range/cache semantics, and archive-bomb policy. +- Listing is the top-level listing reported by `7z`, not an unlimited recursive + traversal of nested archives. Compressed TAR envelopes and nested containers + require a separate bounded expansion/index contract. +- Per-child-process memory/cgroup quotas and hardened decoder isolation remain + deployment work. Input/output/thread/time limits do not imply a hard peak + memory bound inside a native decoder. +- Multi-instance worker leases and cancellation fencing remain scheduler-wide + work; this feature does not claim distributed exactly-once execution. + +## Tests + +Store tests cover key/payload validation, parser-version separation, persistence, +and eviction. Server tests prove that cold Viewer/print/metadata calls do not +invoke tools, repeated requests enqueue one job, cached authorization denial +does not leak metadata or enqueue work, decoder errors are cached, limits are +enforced, and ZIP links retain immutable revisions. Opt-in Chromium tests cover +pending → ready PDF/table/comic UI, cached failure/retry presentation, and +hostile archive filenames rendered as text. diff --git a/docs/design/public-navigation.md b/docs/design/public-navigation.md new file mode 100644 index 0000000..12b1a8b --- /dev/null +++ b/docs/design/public-navigation.md @@ -0,0 +1,116 @@ +# Permission-aware public navigation + +Implemented 2026-09-16. Ordinary approved public Pages are navigable; the isolated, +navigation-free presentation belongs to the future share-URL surface, not normal +public semantic URLs. No share tokens/endpoints are added in this slice. + +## Public surfaces + +- Public Page headers have a Domain home link, breadcrumbs, directory/tree/City + links and login. A parent-folder action and child-directory action make Pages + with descendants traversable even without a `children` macro. Mobile headers + use labelled icons; keyboard focus and a skip-to-content link are provided; + the download button is removed. Existing authorized raw media remains usable. +- `children` is expanded to asynchronously fetched, read-only listings, with + list/detail/icon modes and lazy continuation. `city`, breadcrumbs, locality + links and `spot-pages` use public projections. No private diagram/asset job + or neighbor-relation expansion is triggered on an anonymous request. +- GET/HEAD `/v/children`, `/v/tree[/{path}]`, `/v/browser[/{path}]`, `/v/city` and + `/_/api/v1/city/map` admit absent credentials under enforcing mode. Invalid or + expired credentials still cannot downgrade to anonymous. No new mutation, + governance, search, object-hash/UUID or history route is opened. +- Listings derive from currently approved Path/Object/Revision tuples, using + the same live binding/head/governance/topology predicate as body/raw reads. + A newly created or edited but unapproved child is not discoverable. +- Private/absent parent bodies do not block traversal to public descendants: + their already-disclosed URL segments become structural folders linking to + `/v/tree/{path}`. This does not authorize the parent Page's body or metadata. + Direct semantic requests for a parent (including `/`) also show the safe + directory when it has approved descendants but no approved body. Raw requests + never fall back to folders. If there are no approved descendants, the ordinary + semantic authentication behavior is retained; explicit `/v/browser` and + `/v/tree` roots show an empty public index. Unknown/private branches still fail. +- City topology is filtered to visible branches. Titles/labels are derived from + approved Paths, not private locality prose or placement labels; custom + descriptions, summaries and relations are suppressed. Page counts and portals + use approved Pages only. Unmapped approved Pages remain reachable in the tree. +- Response HTML and JSON remain `private, no-store`. A dedicated public header + does not expose private bookmarks, account state or administrative controls. + Application CSP also covers the public tree and City Map. + +## Navigation UX hardening — 2026-09-16 + +- `/v/browser/{path}` is a dedicated read-only public directory projection, not + the authenticated file manager. Initial entries are server-rendered (120 by + default, maximum 400); pagination links work without JavaScript. `offset`, + bounded `limit` and `exclude` are retained across continuation. A Page with + children has separate open-Page and browse-children links. +- Tree rows use path-component ordering so `/a/x` stays within `/a`, before + `/a-b`. Default all-expanded, per-folder/all collapse, all expand and local + name/Path filtering are available. Matching ancestors remain visible. Arrow + keys and Home/End move focus; left/right collapse/expand or navigate hierarchy. + Filtering is not full-text search and never queries private metadata. +- Children use the authenticated UI's icon buttons in the same order: `▦` + (icon), `☷` (detail), `≡` (list), with matching compact sizing, localized + tooltips and accessible names. Controls expose their active state. Only the view + preference is stored in sessionStorage, not Paths, names or permissions. + At most three fetches run per document; view changes abort old work and + generation checks reject late successes **and errors**. Each fetch times out + after 15 seconds and offers a local retry. Page exit aborts outstanding work. + Lazy continuation replaces its sentinel; no thumbnail-generation job runs. +- Macro placeholders offer a directory link without JavaScript. Directory first + pages work without it; subsequent batches have ordinary links. Unknown or + private names never affect pagination or continuation counts. +- Public City Map has direct exits to directory/tree, while retaining immersive + map navigation. No private search, authoring or planning control is added. +- Regression coverage includes desktop/mobile Chromium, root/folder/Page round + trips, failed-fetch retry, rapidly switched view modes, keyboard/tree prefix + collisions, pagination/exclusions, invalid credentials, mutation denial and + warm-cache publication withdrawal. No existing publication is auto-enabled. + +## Cache and permission boundaries + +`navigation_generation` is a SQLite-backed invalidation sequence. Triggers on +Paths, Revisions, City topology/placement data, configuration/Domain changes, +governance epochs and publication manifests/entries advance it atomically with +the mutation. This observes changes from other connections/processes and the +CLI, not merely HTTP handler callbacks. It is conservative and global: unrelated +Domain changes can invalidate data, rather than risking stale permissions. + +Each Server holds at most eight Domain/kind cache entries with a 30-second +retention limit. Every hit reads the current database generation. Misses are +coalesced per key with cancellable waiters; a generation change while building +rejects the mixed snapshot rather than caching it. Public metadata and generic +Path catalogs are bounded to 20,000 entries / four MiB; tree depth is bounded +to 128 and expanded branch count to 20,000. City uses its existing bounded +metadata-only snapshot. No canonical Page bodies enter this cache. + +Authenticated City/Path data caches contain **data, not permissions**. Each +request reloads its Principal/group/locality filter before projecting cached +data. Group removal must revoke navigation on the next request even when the +data generation has not changed. Anonymous approvals are a separate cache kind; +authenticated filtered responses are never shared with anonymous requests. + +Tree branches are constructed from readable actual Paths. Children filtering +and exclusion happen before pagination, so hidden children do not affect totals, +continuation or empty pages. Detail/icon metadata queries are restricted to the +visible page (at most 400 actual children); private virtual-parent metadata is +not fetched. Icons do not enqueue foreground preview jobs. + +Public pages/tree reload on BFCache restoration. City clears old rendered labels +before revalidation and uses no-store fetches, so a failed refresh does not leave +old authorized labels visible. Existing browser-side City geometry caches remain +geometry-only; no names, grants or Page bodies are persisted there. Already +delivered/in-flight data cannot be recalled; this is next-request invalidation, +not a real-time push revocation protocol. + +## Remaining work + +- [ ] Per-Domain fine-grained data generations to reduce conservative misses; + cache memory accounting and large-site paging beyond bounded first-slice limits. +- [ ] Public dependency/asset/thumbnail manifests and neighbor relations, approved + custom City labels, anonymous search and public named City detail pages. +- [ ] Hierarchical approval requirements and reviewer notification Inbox: + [design and implementation TODO](publication-approval-inbox.md). +- [ ] Dedicated isolated share-URL presentation with purpose-bound credentials; + never reuse public navigation's broader discovery scope for a narrow share. diff --git a/docs/design/publication-approval-inbox.md b/docs/design/publication-approval-inbox.md new file mode 100644 index 0000000..db54b65 --- /dev/null +++ b/docs/design/publication-approval-inbox.md @@ -0,0 +1,148 @@ +# Hierarchical publication approval and reviewer Inbox + +Status: reviewer/approval workflow remains design / implementation TODO. The +recipient-scoped notification Inbox storage and read API are implemented as a +first slice; approval request producers, reviewer UI and decision lifecycle are +not enabled yet. As of +2026-09-19, explicit Street/Spot live-head publication is implemented separately in +[automatic-publication.md](automatic-publication.md). Existing scopes still default +to exact current-revision approval. No reviewer requests, Inbox or implicit opt-in +are introduced by that implementation. + +## Separate audience, approval and revision-following policies + +Public/read/write audience controls answer *who may access*. Approval controls +answer *whether a proposed publication needs review*. Neither grants the other's +authority. In particular, an approval must never bypass an ancestor audience +cap, a user/group restriction, or the current actor's read/publish authority. + +Each Campus → Domain → Quartier → Street → Spot → Page/Path boundary can carry: + +- `approval: inherit | required | not_required`; +- reviewer selection by stable Principal/membership or group UUIDs; +- review quorum (initial implementation: one independent reviewer), expiration + and optional self-approval prohibition (initial default: prohibited). + +`required` is a superior floor: effective approval is required if any ancestor +requires it; a subordinate `not_required` cannot turn it off. With no inherited +floor, the owner may choose `required` or `not_required` within delegated +governance authority. Newly introduced policy defaults preserve today's explicit +approval requirement. Campus policy is a signed, versioned inherited ceiling for +managed instances, not a remotely writable local bypass. + +Reviewer eligibility is also constrained by superior delegation. A subordinate +cannot satisfy required review by appointing an arbitrary reader, itself, or a +group it controls. Reviewers need explicit review authority for this scope and +read authority over every proposed source. A Domain administrator's recovery +override, if added, is a separate explicit, audited action, not a silent quorum +bypass. No approver available means blocked/pending, never automatic approval. + +`not_required` means an authorized publication action can proceed after the +same impact and audience validation without waiting for another person's review. +It does **not** turn every edit/new child public. A future `revision_policy: +frozen | follow_head` must be explicit and separately constrained by ancestors; +the initial implementation keeps exact approved revision tuples. Visibility +tightening and revocation are immediate and must never wait for approval. + +## Request lifecycle and immutable subject + +1. Publisher previews the bounded exact Path/Object/Revision/SHA-256/language + set, dependencies and alias impact. +2. If review is required, create an idempotent `pending` request, an audit event + and a notification outbox record in one reserved SQLite write transaction. +3. Resolve eligible reviewers and deliver an Inbox item via the event queue. + Notification delivery failure retries independently of the pending request. +4. The reviewer opens the Inbox item, re-authenticates as needed, sees a current + permission-filtered impact/diff, then approves, rejects, or requests changes. +5. Approval atomically rechecks current membership/reviewer authority, audience, + all governance and approval-policy versions, source heads/bindings, expiry, + quorum and request generation. Only then activate the publication manifest. + +Terminal states: `approved`, `rejected`, `withdrawn`, `expired`, `superseded`. +An intervening edit, path move, changed audience/policy, or obsolete reviewer +authority makes the old request unusable; it cannot approve a newer head. +Superseded requests keep their audit record and link to an explicitly resubmitted +replacement. Rejection does not grant access or silently change content. +CAS transitions and idempotency prevent double approvals or replay after revoke. + +The requester can withdraw its pending request. Authorized superior governance +can cancel requests for the scope. Approval history cannot be erased by clearing +an Inbox item or deleting its notification. Group changes may reroute undelivered +notifications but do not silently alter the immutable publication subject. + +## Notification Inbox + +- Inbox entries are recipient-specific, with unread/read state, creation time, + event kind, request status and a safe internal deep link. Inbox counts and + queries are scoped to the current Principal and Domain. +- Store request IDs and minimal event metadata, not document text, titles of + unreadable Paths, bearer tokens, preview bodies or unfiltered reviewer lists. +- On listing and opening, recheck live eligibility. If permissions are removed, + show a generic unavailable/resolved item without the protected title or diff. + A notification itself is not a read or approve capability. +- First slice: in-product Inbox only. SMTP/push notifications are separate, + opt-in channels fed by the same durable outbox and disclosure checks. +- Group fan-out is bounded and deduplicated by `(event, recipient, channel)`; + large reviewer groups are delivered in batches. Delivery retries cannot create + multiple requests or make a stale request approvable. +- Cross-instance routing must use the authoritative Domain. Do not copy an + approval request into another Domain and treat it as locally authoritative. + +## Persistence and API status + +- `publication_approval_policies`: scope, mode, reviewer constraints, policy + generation, actor, timestamps; separate from audience/publication intent. +- `publication_requests`: immutable subject digest/manifest, source and policy + versions, requester, state, generation, expiry, idempotency key. +- `publication_decisions`: request, reviewer stable ID, decision, justification, + timestamp; append-only audit, unique reviewer vote per request generation. +- Domain activity outbox and recipient Inbox tables from the notification + roadmap are implemented with indexed `(domain, recipient, unread, created_at, + id)` keyset pagination. `GET /_/api/v1/notifications` lists the current + principal's entries and accepts `unread=1`, `limit`, and `before`; `POST` or + `PATCH /_/api/v1/notifications/read` marks one entry read. Both routes are + authenticated and domain/recipient scoped. Inserts are idempotent by + `(domain, recipient, event, kind)`. + +Suggested handler-owned routes under the existing scope's `.../governance/`: +`approval-policy`, `approval-requests`, and request UUID `/decisions` and +`/withdraw`. Recipient listing/read-state endpoints belong to the common +`/_/api/v1/notifications` namespace, not City or adapter-specific plugins. +Final route names must be registered and verified against the endpoint inventory +at implementation time. GET never approves; mutations use POST/PATCH with the +existing browser-origin guard and strict JSON limits. + +## Implementation order / TODO + +- [x] AP-0: durable recipient Inbox storage, scoped list/read API and keyset + pagination. +- [x] AP-0.5: immutable request subject/generation persistence and bounded + expiry sweep. The scheduler expires only pending requests with an explicit + deadline; reviewer eligibility and decisions are still handler-gated TODO. +- [x] AP-0.75: authenticated request/decision API. `POST + /_/api/v1/publication/requests` accepts a bounded subject manifest and + idempotency key, validates Domain review authority, and optionally creates + recipient-scoped Inbox notifications. `POST + /_/api/v1/publication/requests/{uuid}/decisions` is Domain-scoped, checks the + current reviewer authority, and enforces generation/state CAS. Full policy + inheritance and quorum evaluation remain required before production use. +- [ ] AP-1: schema, inheritance evaluator and scoped policy settings; superior + required floors, reviewer delegation limits and backward-compatible defaults. +- [ ] AP-2: immutable request/decision lifecycle, idempotency/CAS, transactional + revalidation, stale-source handling and audited emergency/revocation rules. +- [ ] AP-3: durable Domain outbox → scheduler queue → deduplicated recipient Inbox; + live authorization checks, bounded fan-out, retention and retry visibility. +- [ ] AP-4: topbar notification indicator, Inbox subpage, request impact/diff + dialog, approve/reject/withdraw UI and Japanese/English strings. +- [ ] AP-5: explicit `not_required` publication path through the same safety + validation; migration must not publish old drafts or pending requests. +- [ ] AP-6: managed-Campus policy inheritance and authoritative-instance routing; + signed generations, unavailable-controller behavior and revocation propagation. +- [ ] Tests: competing approvals/revocations, self-approval, reviewer/group removal, + private Inbox counts/title/diff leakage, expiry, retry deduplication, policy + tightening while queued, source changes, wrong Domain and cache invalidation. + +Navigation-free single-document presentation is reserved for a future share URL +projection (for example `/s/`), not ordinary public Pages. Share tokens remain +purpose-bound credentials with separate scope, expiry and revocation checks; +this design does not authorize a new share endpoint or widen an existing one. diff --git a/docs/design/publication-ja-2026-09-19.json b/docs/design/publication-ja-2026-09-19.json new file mode 100644 index 0000000..cdd9863 --- /dev/null +++ b/docs/design/publication-ja-2026-09-19.json @@ -0,0 +1,310 @@ +{ + "date": "2026-09-19", + "origin": "https://pages.anya.jp", + "prefix": "/lab/pageswiki-dev", + "domain_uuid": "cd659810-3f59-406e-8a57-fb545e82fc75", + "language": "ja", + "publication_policy_changed": false, + "method": "trusted local data/pageswiki-cli; canonical HTML", + "chapters": [ + { + "chapter": "index", + "source": "docs/design/ja/index.md", + "file": "index.html", + "path": "/lab/pageswiki-dev", + "language": "ja", + "source_sha256": "5f3eaf4df3e2091099f9ec9deedee3a71fa868322ecfcc67eb2af7219cc673f3", + "html_sha256": "7ed8fc9f39aacbf22f430f3e9b203d6d98ac3db4973540392d759d17373bc5f0", + "page_uuid": "dacbc4d0-9f0f-4443-8bbe-200770c70e0e", + "revision_uuid": "df55d6d2-021c-4d7c-a497-24536047d532", + "lang": "ja", + "document_hash": "7ed8fc9f39aacbf22f430f3e9b203d6d98ac3db4973540392d759d17373bc5f0" + }, + { + "chapter": "principles", + "source": "docs/design/ja/principles.md", + "file": "principles.html", + "path": "/lab/pageswiki-dev/principles", + "language": "ja", + "source_sha256": "131aca71e57097496bc2bed4e8b38d3dd015c64989924654f4561d2a1e5b3775", + "html_sha256": "7cff0a79c875b0ff67a0d6469e68d83f47d8258b4b31d5a3e9fa0a82f5822848", + "page_uuid": "cea8c4b3-045a-43e7-bbeb-5a3ce7a633e0", + "revision_uuid": "dc4f3841-3867-4222-8f8d-bb53d31eeb24", + "lang": "ja", + "document_hash": "7cff0a79c875b0ff67a0d6469e68d83f47d8258b4b31d5a3e9fa0a82f5822848" + }, + { + "chapter": "address-storage", + "source": "docs/design/ja/address-storage.md", + "file": "address-storage.html", + "path": "/lab/pageswiki-dev/address-storage", + "language": "ja", + "source_sha256": "e7598a970f9ab0719349d380ba080c9e7feb30b1f07d723293f3957854499db9", + "html_sha256": "28741abccb1780e16c74d41932074c021a700bc1f5abc7a7a8e17196453dd698", + "page_uuid": "9da51faf-10d6-4f7e-9747-6f6100295560", + "revision_uuid": "d879d98d-d24f-46de-b78e-060558974230", + "lang": "ja", + "document_hash": "28741abccb1780e16c74d41932074c021a700bc1f5abc7a7a8e17196453dd698" + }, + { + "chapter": "campus-federation", + "source": "docs/design/ja/campus-federation.md", + "file": "campus-federation.html", + "path": "/lab/pageswiki-dev/campus-federation", + "language": "ja", + "source_sha256": "2de24bc908528300c8765bc905234c8ff197a0d94297f345e971920d0bac0276", + "html_sha256": "729986b336f8d5b758615d67fe52abf90fa5701af8f9d83abad3a0c6081c6c06", + "page_uuid": "eaf3cf25-d730-4c94-bbff-1124789fda4a", + "revision_uuid": "78929809-445b-4130-ae84-dbda89e8764f", + "lang": "ja", + "document_hash": "729986b336f8d5b758615d67fe52abf90fa5701af8f9d83abad3a0c6081c6c06" + }, + { + "chapter": "knowledge-city", + "source": "docs/design/ja/knowledge-city.md", + "file": "knowledge-city.html", + "path": "/lab/pageswiki-dev/knowledge-city", + "language": "ja", + "source_sha256": "33f3eb7c3792033c87518235bb2b432a73d2baa8f74eb1d818514a9ce6d6fe86", + "html_sha256": "3c84e7abd419bcd7e41f7f7588fcc4b587810a625c7ba0d7dbc414f9b6142f6f", + "page_uuid": "9d4f04d9-b66d-44c7-88b8-5dd7917effa7", + "revision_uuid": "6f16c576-1b63-4368-8634-2e6a7cd1c2ed", + "lang": "ja", + "document_hash": "3c84e7abd419bcd7e41f7f7588fcc4b587810a625c7ba0d7dbc414f9b6142f6f" + }, + { + "chapter": "auth-permissions", + "source": "docs/design/ja/auth-permissions.md", + "file": "auth-permissions.html", + "path": "/lab/pageswiki-dev/auth-permissions", + "language": "ja", + "source_sha256": "92c8b58327538becd16517cb10db3dcfea53f291d98ac48484b0cf9c46796d9b", + "html_sha256": "6bc3336ec466fc5ca2c050852765d1aa111248f39094740caaf4aeb40de60d1b", + "page_uuid": "e646cf67-22d6-4a1f-897e-efe66fc242ad", + "revision_uuid": "997dbb9d-7440-4890-9410-5bc8de1735a0", + "lang": "ja", + "document_hash": "6bc3336ec466fc5ca2c050852765d1aa111248f39094740caaf4aeb40de60d1b" + }, + { + "chapter": "publication", + "source": "docs/design/ja/publication.md", + "file": "publication.html", + "path": "/lab/pageswiki-dev/publication", + "language": "ja", + "source_sha256": "a983580a95e275fade3ab257db2242135b3123a60ee1675f17b9b5500f7a5b5b", + "html_sha256": "2ac390cf5997f8b069bc3479784c1b7eb3712092529f24d8f603a730dec94e82", + "page_uuid": "d49455d2-0829-4ff2-b32a-0672035f2faf", + "revision_uuid": "f22001a2-744c-4e43-ab08-b3c26bf7a8c9", + "lang": "ja", + "document_hash": "2ac390cf5997f8b069bc3479784c1b7eb3712092529f24d8f603a730dec94e82" + }, + { + "chapter": "viewer-editor", + "source": "docs/design/ja/viewer-editor.md", + "file": "viewer-editor.html", + "path": "/lab/pageswiki-dev/viewer-editor", + "language": "ja", + "source_sha256": "9462bad53b14773f8b4813af291f99e7cdf4bb5f3f728089ed920dc709592ab1", + "html_sha256": "f0e1649c72e9c0247ac09563808e09ebf76c252300f42cff14723079544beac5", + "page_uuid": "6285267f-d17b-4b6b-93a5-af89c4b19f47", + "revision_uuid": "42028860-7497-4888-9682-ca564432154a", + "lang": "ja", + "document_hash": "f0e1649c72e9c0247ac09563808e09ebf76c252300f42cff14723079544beac5" + }, + { + "chapter": "navigation-search", + "source": "docs/design/ja/navigation-search.md", + "file": "navigation-search.html", + "path": "/lab/pageswiki-dev/navigation-search", + "language": "ja", + "source_sha256": "654a25a9f4f014c7a9b099cb484e41ee6839dbe0f25ed8a5d83539a18d3305c6", + "html_sha256": "35a413681b27abd0bc26c3f9c7c363b688a4ab4b83a62c7ed403d75d7eaadcfe", + "page_uuid": "0572ef6f-f00a-4565-90d5-c95197b769f4", + "revision_uuid": "dfdc6851-3994-474a-b2f8-ac064c00c498", + "lang": "ja", + "document_hash": "35a413681b27abd0bc26c3f9c7c363b688a4ab4b83a62c7ed403d75d7eaadcfe" + }, + { + "chapter": "scheduler-resources", + "source": "docs/design/ja/scheduler-resources.md", + "file": "scheduler-resources.html", + "path": "/lab/pageswiki-dev/scheduler-resources", + "language": "ja", + "source_sha256": "285f68793e793235fbd2cca0686b2f65c3bf7229034e2e6ae96893d41937c839", + "html_sha256": "8fcb8de9379684dec1bb767ad8ac4b375fd2a25c42db79253f77d787e9e7d4d2", + "page_uuid": "0cea3054-ed5a-4cf4-90af-e0abe904ff98", + "revision_uuid": "4bf09501-b11b-4e2b-bc40-18570aa0c9b7", + "lang": "ja", + "document_hash": "8fcb8de9379684dec1bb767ad8ac4b375fd2a25c42db79253f77d787e9e7d4d2" + }, + { + "chapter": "blog-diary", + "source": "docs/design/ja/blog-diary.md", + "file": "blog-diary.html", + "path": "/lab/pageswiki-dev/blog-diary", + "language": "ja", + "source_sha256": "5171bd1eda59328ac1ca62c3b43f2e150368684e1673328e96b31c1383255e17", + "html_sha256": "8e884fd4bd442aa767da00eec2089d33f2bec529255e181562cabc5e3ab14a97", + "page_uuid": "f6a7f22f-71f2-4e90-9c57-fd0cb32753ca", + "revision_uuid": "49c6e99c-4e98-44f2-b137-5df33c9344d0", + "lang": "ja", + "document_hash": "8e884fd4bd442aa767da00eec2089d33f2bec529255e181562cabc5e3ab14a97" + }, + { + "chapter": "extensions", + "source": "docs/design/ja/extensions.md", + "file": "extensions.html", + "path": "/lab/pageswiki-dev/extensions", + "language": "ja", + "source_sha256": "9c52fe9b8eba40e7b3eb42b679573e2582f001584b45d0d74a702ca00594f9c5", + "html_sha256": "ab59105ecf94bfac7b754900de42619678e6f954103b0ffc7779afae67850012", + "page_uuid": "e091c8d7-a14d-4e90-8fa1-1c22f5d352a6", + "revision_uuid": "07f6a0c8-3321-4fef-9f62-33ca972cfe2a", + "lang": "ja", + "document_hash": "ab59105ecf94bfac7b754900de42619678e6f954103b0ffc7779afae67850012" + }, + { + "chapter": "organizer", + "source": "docs/design/ja/organizer.md", + "file": "organizer.html", + "path": "/lab/pageswiki-dev/organizer", + "language": "ja", + "source_sha256": "00bb7751c085971a2baa157071da16c14b44030d93ee488d0af0521773e1a533", + "html_sha256": "fcd4f31a7ee4da495492e6813c8d71c27a9f5efd5281f71776abd5d59c8a99aa", + "page_uuid": "087c1163-cba7-4fef-8e97-c2df6ddc27a2", + "revision_uuid": "efb6f683-31ca-4d59-a05e-d644f58ab49d", + "lang": "ja", + "document_hash": "fcd4f31a7ee4da495492e6813c8d71c27a9f5efd5281f71776abd5d59c8a99aa" + }, + { + "chapter": "tasks-tickets", + "source": "docs/design/ja/tasks-tickets.md", + "file": "tasks-tickets.html", + "path": "/lab/pageswiki-dev/tasks-tickets", + "language": "ja", + "source_sha256": "00e9d81d1191124e43cc1cc9eb6664d5e4814901444260012d23d3316cea255e", + "html_sha256": "2049a24fd7fac71e41e5c511c271b5f96346aaa16ea67679cf1502a2687a176a", + "page_uuid": "576ca4d0-24d9-42e1-83eb-484d9f803f4f", + "revision_uuid": "6cc03ec4-2185-4449-ae3a-ff604c9077b5", + "lang": "ja", + "document_hash": "2049a24fd7fac71e41e5c511c271b5f96346aaa16ea67679cf1502a2687a176a" + }, + { + "chapter": "calendar-contacts", + "source": "docs/design/ja/calendar-contacts.md", + "file": "calendar-contacts.html", + "path": "/lab/pageswiki-dev/calendar-contacts", + "language": "ja", + "source_sha256": "6c8a5f246c613ea4b466326c8ab9194dd77614c532bea7ac778b60a5dbceea1f", + "html_sha256": "f5581bf4436b3ae6df44fe1072f45c64721dd70fa2bfba606c8c785615db71f2", + "page_uuid": "480da094-1850-47b0-8d39-f24a93011827", + "revision_uuid": "49acfc6b-ba4b-4788-b7b4-6d6ea02db426", + "lang": "ja", + "document_hash": "f5581bf4436b3ae6df44fe1072f45c64721dd70fa2bfba606c8c785615db71f2" + }, + { + "chapter": "feeds", + "source": "docs/design/ja/feeds.md", + "file": "feeds.html", + "path": "/lab/pageswiki-dev/feeds", + "language": "ja", + "source_sha256": "3c7e74a68c9e331fd35dd4e1373c5868096f7f55a0d3a7438dd47326fa3a399a", + "html_sha256": "890ca59dbed768163bd91d989a70c836f43c898e387591aeb6d5a1691c6f7e35", + "page_uuid": "7fc9f22e-a06a-4512-a720-1ededf162e4c", + "revision_uuid": "61179145-b0a7-4a55-8e34-ca621b9a94fa", + "lang": "ja", + "document_hash": "890ca59dbed768163bd91d989a70c836f43c898e387591aeb6d5a1691c6f7e35" + }, + { + "chapter": "mail", + "source": "docs/design/ja/mail.md", + "file": "mail.html", + "path": "/lab/pageswiki-dev/mail", + "language": "ja", + "source_sha256": "f0a912d5c073b68eed8a4dab09518028014ac0a3bd5afc8fe59cd655f9dc7c0b", + "html_sha256": "18c860a0ca474a4318e225f8986811999abe6da7ddef3833cee403426c029ad2", + "page_uuid": "4588ed2e-b87f-429b-b9f5-57bae3e67fdb", + "revision_uuid": "7797181a-a6c8-4669-86fc-e8e908d025d1", + "lang": "ja", + "document_hash": "18c860a0ca474a4318e225f8986811999abe6da7ddef3833cee403426c029ad2" + }, + { + "chapter": "html-editor", + "source": "docs/design/ja/html-editor.md", + "file": "html-editor.html", + "path": "/lab/pageswiki-dev/html-editor", + "language": "ja", + "source_sha256": "f5034521d8c50300afa42b26c29056c85656383ec1405eb8d7a272b331b0a723", + "html_sha256": "7920a9350fd81bd746ac73dfa396e3a2e1ae3ed71c0d89c5e25f7d8299581e90", + "page_uuid": "0ebab668-6176-450b-ab6b-ae2cec9e6d73", + "revision_uuid": "2ed1c468-7664-4434-a610-6348afa08de5", + "lang": "ja", + "document_hash": "7920a9350fd81bd746ac73dfa396e3a2e1ae3ed71c0d89c5e25f7d8299581e90" + }, + { + "chapter": "operations", + "source": "docs/design/ja/operations.md", + "file": "operations.html", + "path": "/lab/pageswiki-dev/operations", + "language": "ja", + "source_sha256": "53433c4a29875f53799a3900b2d1ba47acc4ff49a0af40453ef40f520d7022b5", + "html_sha256": "0b01154d90e0946448bad3ccba54a17181ed67063934ba3d793b9061dd4fe382", + "page_uuid": "85f484dc-f63a-41b1-8709-45242f5dec18", + "revision_uuid": "1fb7aaa4-cbf6-4254-8a8f-d9256cbda2b5", + "lang": "ja", + "document_hash": "0b01154d90e0946448bad3ccba54a17181ed67063934ba3d793b9061dd4fe382" + }, + { + "chapter": "i18n", + "source": "docs/design/ja/i18n.md", + "file": "i18n.html", + "path": "/lab/pageswiki-dev/i18n", + "language": "ja", + "source_sha256": "1ebbb2e2db6401d3889e3210fcd451c28e4fa7029e2c9bf67cc418660ebfd165", + "html_sha256": "2ef7a464e71c1f3f89021daa559abd1fb95d5a9525c9578fd55bce4716954232", + "page_uuid": "4d5182bd-cc5b-4fbc-8b2a-24c6b2f4906b", + "revision_uuid": "d80b77a0-991b-4469-aa8d-96c19bda319b", + "lang": "ja", + "document_hash": "2ef7a464e71c1f3f89021daa559abd1fb95d5a9525c9578fd55bce4716954232" + }, + { + "chapter": "roadmap", + "source": "docs/design/ja/roadmap.md", + "file": "roadmap.html", + "path": "/lab/pageswiki-dev/roadmap", + "language": "ja", + "source_sha256": "b9884594ad6889c3c6e9b078fe7ba3ac38d475bfb050b4d136f057678491ba7a", + "html_sha256": "1e147c41aaf8f23dbe383601c5a19700a14632217b161809d50572fe2711123e", + "page_uuid": "41ba50fa-7e50-4d9b-bb6e-783e9e696cf4", + "revision_uuid": "2bb94ddc-7dfb-4a1b-94e4-8ced71142725", + "lang": "ja", + "document_hash": "1e147c41aaf8f23dbe383601c5a19700a14632217b161809d50572fe2711123e" + }, + { + "chapter": "decisions", + "source": "docs/design/ja/decisions.md", + "file": "decisions.html", + "path": "/lab/pageswiki-dev/decisions", + "language": "ja", + "source_sha256": "2357efad3e3cdec1020e6b624c6c0a7ccf32fb9981784fd36be753bab39d3c1c", + "html_sha256": "cb733228d0f5ac11a3b4f9972ae11ee27568d536c93436dc42268599c1bad9a4", + "page_uuid": "6d8780e0-41ae-480b-8b51-0407420af7bb", + "revision_uuid": "3c1e073e-908c-426d-afec-6fc481d424d8", + "lang": "ja", + "document_hash": "cb733228d0f5ac11a3b4f9972ae11ee27568d536c93436dc42268599c1bad9a4" + }, + { + "chapter": "sources", + "source": "docs/design/ja/sources.md", + "file": "sources.html", + "path": "/lab/pageswiki-dev/sources", + "language": "ja", + "source_sha256": "3e11b06e33c031fb039eaed0d2c65cc897984c7a5ce3e8aedcf7c1f73b4f04e9", + "html_sha256": "12cc7c61ba7ffabc8c4a712f74e4839931cb37ce28bc2cd9eed28d5ea17b6ea9", + "page_uuid": "b8a630c6-355e-4f85-bd01-010b96b54dcf", + "revision_uuid": "63d5c1ff-7a24-4508-b0b4-8a3a702cdf7c", + "lang": "ja", + "document_hash": "12cc7c61ba7ffabc8c4a712f74e4839931cb37ce28bc2cd9eed28d5ea17b6ea9" + } + ] +} diff --git a/docs/design/revision-language-model.md b/docs/design/revision-language-model.md new file mode 100644 index 0000000..92a71e8 --- /dev/null +++ b/docs/design/revision-language-model.md @@ -0,0 +1,104 @@ +# Revision and Language Projection Detailed Design + +## Status + +Implemented. SQLite `body` remains a transitional compatibility cache while +the canonical payload is read from `documents/sha256/`. + +## Invariants + +```text +Semantic Path != Page UUID +Page UUID != Revision UUID +Revision UUID != Document SHA-256 +Language != Semantic Path +``` + +- A Page is language-neutral. +- A Revision is immutable and belongs to exactly one Page. +- A Revision references exactly one immutable Document payload. +- The same Document hash may be referenced by many Pages, languages, or + Revisions. +- Saving identical content may create a new Revision event without duplicating + the Document payload. + +## Metadata schema + +### `revisions` + +| Column | Constraint | Meaning | +| --- | --- | --- | +| `uuid` | primary key | Revision UUID | +| `object_uuid` | required | Parent Page UUID | +| `document_hash` | required | Lowercase SHA-256 payload hash | +| `lang` | required, default `und` | Canonical BCP 47 tag | +| `body` | transitional | Compatibility copy until filesystem migration | +| `message` | optional | Commit message | +| `created_at_ms` | required | Ordering timestamp | +| `created_at` | transitional | Legacy seconds timestamp | + +`object_uuid` is retained during the broader Object-to-Page vocabulary +migration. New code treats it as Page identity. + +## Save transaction + +1. Validate the Page UUID. +2. Canonicalize the language tag; empty becomes `und`. +3. Hash the canonical payload with SHA-256. +4. Persist the immutable Document if absent. +5. Generate a new Revision UUID. +6. Insert Revision metadata referencing the Document hash. +7. Commit metadata only after Document persistence succeeds. + +During the compatibility phase, step 4 also stores `body` in SQLite. The +content-addressed file under `documents/sha256/` is canonical; removing the compatibility column is a +later schema cleanup and does not change Revision UUIDs or hashes. + +## Language selection + +Candidate order: + +1. Explicit non-canonical language override +2. `Accept-Language` tags in quality order +3. Base tag for each regional tag +4. Owning Campus default +5. System default +6. `und` + +Candidates are canonical BCP 47 tags, deduplicated in order. Selection returns +the newest Revision for the first candidate that exists. + +## Compatibility migration + +For every legacy Revision: + +- preserve its existing `uuid`; +- set `document_hash = sha256(body)`; +- set `lang = und`; +- set `created_at_ms = created_at * 1000`. + +New Revision UUIDs are random UUIDs. Legacy hash-shaped Revision identifiers +remain resolvable indefinitely. + +## API + +Revision save accepts: + +```json +{ + "object_uuid": "page UUID", + "body": "canonical payload", + "message": "manual-save", + "lang": "ja-JP" +} +``` + +Responses include both the Revision UUID and Document hash. + +## Failure behavior + +- Invalid language tags return a client error. +- Unknown Page UUIDs are rejected. +- Missing requested languages fall through; they are not errors. +- If no candidate exists, an empty `und` working projection may be returned by + the Editor, while Viewer returns the existing not-found behavior. diff --git a/docs/design/revision-listing.md b/docs/design/revision-listing.md new file mode 100644 index 0000000..db37ce1 --- /dev/null +++ b/docs/design/revision-listing.md @@ -0,0 +1,34 @@ +# Bounded Revision history + +Implemented 2026-09-14 for `/_/api/v1/revisions/list?uuid=` and +`/r/history/`. Both authorize the Object before loading metadata. +Path-scoped users can use the API through the handler resolver; a Domain-wide +read grant is not additionally required. + +- Default 100, maximum 200 records per response; `limit` outside 1–200 is 400. +- `before=` is an exclusive cursor in the same Object. A missing + or foreign-Object cursor is 400 after Object authorization. +- Order is `created_at_ms DESC, rowid DESC`, preserving insertion order when + timestamps tie. The ascending `(object_uuid, created_at_ms)` index supports + backward keyset scans. Newer writes do not shift subsequent pages. +- Only metadata is selected, never Revision bodies. Message and filename + previews are capped at 4,096 characters each. Queries have a two-second + context and one read snapshot; at most 201 records are materialized. +- The API retains its JSON-array shape. `Link: <...>; rel="next"` and + `X-Next-Cursor` advertise continuation. An empty result is `[]`; HEAD returns + headers without a JSON body. Responses are `private, no-store`. +- History has localized older/newest navigation. Legacy editor history dialogs + link to this browser when another page exists. Messages use DOM text nodes; + they are never interpolated into markup or inline event handlers. + +Restore accepts POST only, and checks source metadata authority before loading +the body. The legacy dialog now uses POST. Reusing immutable Document hashes for +restore without full payload hydration is a separate follow-up; no claim of +streaming or constant-memory large-binary restore is made here. + +Trusted Store/CLI `ListRevisions` remains available for explicit full exports. +Clients that previously assumed the HTTP array contained all history must +follow the next link. A cursor removed by retention expires rather than silently +restarting at the newest revision. Tests cover equal timestamps, concurrent +newer insertion, cancellation, foreign cursors, limits, HEAD, ACL revocation, +localized navigation and escaped messages. diff --git a/docs/design/search-results.md b/docs/design/search-results.md new file mode 100644 index 0000000..498a294 --- /dev/null +++ b/docs/design/search-results.md @@ -0,0 +1,247 @@ +# Bounded, permission-filtered search results + +Implemented: 2026-09-14. + +## City-first results and search options + +Search now places matching Quartiers, Streets and Spots above Page/file hits. +The compact City section remains visible in list/detail/icon modes and shows +the locality kind, highlighted title, literal boundary Path, readable ancestor +context, a description excerpt, matching-source badges and update time. It is +not a file-selection target: Page copy/rename/delete actions cannot accidentally +operate on a City result. The title opens City details; the Path opens its portal +boundary. Quartier/Spot links use their unique names. Street links use +`/v/city/s/{quartier-name}/{street-name}` so repeated names remain unambiguous. +Explicit `uuid:` selectors remain supported. Map locality search submits that +explicit selector and requires read access to the locality and its ancestors. + +`SearchCityInDomain` reads metadata from three bounded SQL streams; it never +loads the full City model, expands Page placements or counts descendants. +Only current-Domain, non-archived localities with valid absolute boundaries and +active same-Domain ancestors are eligible. Scope contains the locality's own +Path; ancestors outside a narrower scope are not added automatically. Every +boundary in the parent chain must pass the same request-scoped read policy +before names or descriptions are exposed. Limits are 1,000 candidates per kind +and 30 readable City results. Ordering is Quartier, Street, Spot; within each +kind name/title matches precede Path matches, followed by stable Path/UUID ties. +Matching is literal substring search over name/title/description/Path, with +SQLite ASCII case-folding and literal Unicode/punctuation handling. + +The HTTP handler shares a two-second deadline between the City and Page queries; +their internal snapshots remain separate read transactions. Existing bounded +Page candidate and optional-excerpt behavior is retained. City/Page results may +therefore observe separate commits during a concurrent edit, not a single +cross-model snapshot. + +Options are a collapsed, keyboard-accessible disclosure. Active/error filters +open it. Inputs outside the topbar associate with the same GET form, so editing +the keyword, pressing Enter or applying filters preserves one copy of each +parameter, scope and locality. Clear filters retains the keyword/scope/locality; +timeout retry retains the selected filters too. No new JavaScript/storage state +or cookie is required for these shareable URL options. + +| Parameter | Meaning | +| --- | --- | +| `file_type` | Empty for all, or `html`, `text`, `image`, `audio`, `video`, `pdf`, `archive`, `csv`, `json`, `code`, `office`, `other` | +| `ext` | One extension, e.g. `py`, `.PDF`, `tar.gz`; normalized to lower case without the leading dot | +| `date_field` | `updated` (default) or `created` | +| `from` | Inclusive starting calendar date, `YYYY-MM-DD` | +| `to` | Inclusive ending calendar date, `YYYY-MM-DD` | + +Specific MIME metadata takes precedence over suffix guesses; generic MIME may +use a known filename suffix, falling back to Path when filename is absent. +Type and extension combine with AND. The classification never loads/sniffs the +Document. Extension filtering uses the stored original filename when present: +an HTML canonical Page with retained `notes.md` metadata can match `ext=md`, +while its type is still HTML. Selecting a type is not selecting an editor mode. + +Page update dates use the latest Revision timestamp, and creation dates use +Object creation, not the time a Path alias was added. City dates use the locality's +own timestamps, not descendant Page activity. Dates use the Domain timezone, +shown alongside the inputs. The ending bound is the next local midnight using +calendar arithmetic, including 23/25-hour daylight-saving dates. Invalid types, +extensions, repeated filter parameters or invalid/reversed dates return a +localized `400` without interpolating user input into SQL. + +File type/extension filters exclude City elements (a Spot containing PDFs is +not itself a PDF). Date filters apply to both classes. Keywords are optional +when a type, extension or date boundary is supplied; selecting only a date-field +kind does not enumerate everything. Every filter runs before each Page +candidate LIMIT, rather than discarding already-limited results afterward. + +Current limits remain deliberate: one file type and one extension at a time, +metadata-based classification, no historical content search, no cross-Domain +City search, and no derived descendant file-type/date facet on a City element. + +## Presentation + +`/v/search` retains the shared list / detail / icon controls, preference storage, +Ctrl/Command selection, and file context menu. Each mode now presents the same +information: + +- Page display name: the current Revision filename's final component, falling + back to the current Path's final component. There is no separate Page-title + field in the current Object schema. +- The complete matching semantic Path, with keywords emphasized independently + of the display name. Link URLs encode literal spaces, `?`, `#`, and `%` as + Path characters rather than treating them as query/fragment syntax. +- Explicit Path / filename / body match-source labels. Multiple sources may + apply to one result. Each readable alias remains a distinct navigable result. +- A short contextual body excerpt for full-text matches. Name-only matches + receive a bounded opening summary when the Revision contains textual data. +- Large or expensive body matches retain their name, Path and match-source + badge, with a localized explanation when the excerpt is omitted. +- In detail mode, content type and update time. Unknown file sizes are no + longer misleadingly displayed as zero. + +List mode is a compact stacked overview; icon mode adds the existing cached / +asynchronous preview; detail mode keeps the dense table. The search submit +button is an accessible icon aligned with its input. Styles use existing theme +variables and adapt to narrower viewports. + +Keywords become typed text segments, rendered using `html/template`-owned +`` elements. No search query, filename, Path, FTS marker, or excerpt is +cast to trusted HTML. HTML excerpts are tokenized to plain text, excluding +script/style content, before Unicode-safe windowing and highlighting. + +## Query and authorization boundary + +The handler builds one request-scoped Path-read filter and validates the scope +with it. `SearchPathsInDomainWithOptions` (or its no-options compatibility wrapper +`SearchPathsInDomainFiltered`) uses that immutable filter during +candidate collection, before any excerpt lookup or preview construction. +Global counts, denied Paths, denied filenames, and denied excerpts are never +included in the rendered data. An all-denied candidate set uses the same empty +state as an ordinary no-match query. + +All search statements use one read-only SQLite transaction, preserving a +consistent current Path / latest Revision snapshot. The three candidate streams +are: + +1. Literal substring matching against current Paths and current filenames. +2. FTS5 body-prefix matching, joined to the latest Revision projection. +3. FTS5 filename-prefix matching, joined to the same projection. + +Each stream is limited to 1,000 candidate Paths in SQL. Full-text streams do not +materialize an unbounded global `IN` list or globally sort all matching +historical Revisions. An index on `latest_revision_index(revision_uuid)` supports +the latest-only join. Explicit `CROSS JOIN` keeps FTS outermost: scan MATCH +once, then seek current Revision metadata and Path bindings through B-tree +indexes. An ordinary JOIN can instead put Paths first and repeat the entire +FTS scan for every Path because the FTS UUID payload column is unindexed. +Domain and segment-aware scope filtering precede each +candidate limit. Prefix bounds use binary Path ranges, not wildcard `LIKE`; +literal `%` and `_` in folder names and queries cannot widen the scope. + +Authorized candidates are deduplicated by Path, then ordered with direct +name/Path matches first and stable length/Path ties. The normal UI displays at +most 100; trusted store callers may request up to 200. Only authorized displayed +rows receive a byte-size preflight, using their FTS integer rowids from the same +snapshot. `octet_length(body)` counts bytes, not Unicode characters; see +[SQLite's function contract](https://www.sqlite.org/lang_corefunc.html#octet_length). +Eligible body excerpts are fetched together with one FTS snippet query restricted +by those rowids, not the unindexed UUID payload column. Name-only textual +summaries use one additional bounded Revision-prefix query. There are no +per-result authorization queries or Document-file stat calls. Existing preview +cache checks run only for displayed authorized results, without scheduling +foreground generation. + +## Explicit bounds and failure behavior + +- Query input: at most 512 bytes and 16 terms. +- Search transaction: two-second context deadline; caller cancellation applies. +- Candidate rows: at most 3,000 total; displayed rows: normally 100. +- Snippet transport: at most 4,096 characters per body excerpt, 1,024 per + name-only summary; display window: approximately 260 Unicode characters. +- Snippet input: at most 64 KiB per document and 1 MiB across unique displayed + Revisions. Multiple authorized aliases share an excerpt and consume its + input budget only once. An oversized body still participates in MATCH. +- Optional snippet time: 400 ms within the overall search context. If spent, + omit the snippet batch but retain the already authorized results. Parent + cancellation still aborts the search; unrelated SQL errors are not swallowed. + These are cooperative SQLite deadlines, not hard process-kill guarantees. +- No total-count query. The 100-result notice depends only on visible rows, + not on hidden candidate counts. A general scope-narrowing hint is always + shown for a submitted query. + +A search-budget timeout returns a themed, localized `503` page with +`Retry-After: 5` and a retry link preserving query/scope/locality. Unexpected +database errors return a generic `500`, without SQL/schema/connection details. +Canceled HTTP requests stop without further rendering. Snippet-only timeout +is a successful results page with explicit omission, not a search failure. + +## Timeout regression and correction (2026-09-14) + +The initial small-fixture tests did not catch a production join-order problem. +Read-only investigation of the current 943 Paths / 1,632 indexed Revisions +reproduced it: a native SQLite body candidate query took 8.21 seconds with the +old Path-first plan and 0.10 seconds with the FTS-first plan, returning the same +36 candidates. Another common prefix exceeded a ten-second diagnostic bound. + +There was a second bottleneck: FTS bodies reach tens of megabytes. +`snippet(...,36)` and a `substr` on its output do **not** limit the tokenizer's +input work. Even smaller documents can have costly prefix-position scans; +the separate input and optional time budgets address both cases. + +The read-only Go Store diagnostic reproduced all four initial query failures +before the correction. With the final code the representative cases returned +57 / 100 / 100 / 7 rows in approximately 86 / 128 / 506 / 72 ms, respectively. +The short, broad prefix used the optional-excerpt fallback. Timings are local +measurements, not service-level guarantees; no production content or credentials +were printed or changed. No schema migration or index rebuild is required by +this correction. + +## Remaining work + +These bounds intentionally trade exhaustive recall for predictable work. A +broad search or many inaccessible leading candidates may omit readable hits +beyond a stream's candidate budget; narrowing the scope is the current remedy. +SQLite may still inspect many FTS postings / historical rows before locating +current in-scope candidates, but the deadline bounds this work. A current-only, +Domain-partitioned FTS projection with a persisted index watermark and genuine +keyset pagination remains a future scaling step, not an implemented claim. + +The current `unicode61` tokenizer and raw-HTML search index are unchanged: +Japanese infix search and exclusion of markup-only matches need a separate +plain-text / language-aware indexing migration. Excerpts already remove HTML +markup safely, but an indexed markup token can still cause a body-source hit +with no visible text excerpt. Independent Page titles and relevance tuning are +also separate features. + +## Regression coverage + +Store tests cover latest-only bodies and current renamed Paths, literal scope +and query punctuation, body/filename source distinction, Domain isolation, +ACL-before-limit behavior, bounded candidates, query bounds, and cancellation. +Query-plan tests require FTS-first candidate collection and rowid-constrained +snippets. A 600-Page / 1,200-Revision fixture checks current-only results, both +match sources and excerpt association under the real search budget. Input-budget +tests cover Unicode byte lengths, total bytes, aliases and retained hits; +deadline tests distinguish optional enrichment from parent cancellation/errors. +Server tests cover hidden-only results, denied scopes, encoded Path links, +Unicode keyword segments, contextual clipping, and malicious source HTML. +An opt-in Chromium test exercises all three display modes, safe highlights, +Ctrl selection, and absence of horizontal page overflow. +HTTP tests also cover themed GET/HEAD failures, sanitized errors, retained retry +parameters and a large-body match beyond the bounded prefix in Japanese/English. + +City/filter regressions cover hidden/foreign/archived ancestors, duplicate Street +names and encoded links, metadata-only single-connection reads, literal scopes, +MIME priority/fallback, combined filters before all three candidate caps, +Object-vs-alias creation times, inclusive millisecond bounds and Japanese/DST +calendar conversion. Chromium checks desktop (1440px) and mobile (390px), with +real City results above Pages, no file selection on City rows, and one set of +form parameters while changing views/options. + +Read-only verification against the existing main DB measured the additional +filter-only cases at approximately 1–6 ms and City metadata lookup at 2 ms; +representative keyword Page searches remained approximately 79–515 ms. These +are local observations, not latency guarantees or authenticated HTTP timings. +This feature adds no schema migration or index rebuild. + +```sh +go test -race ./internal/server ./internal/store -run '^TestSearch' -count=1 +PAGESWIKI_BROWSER_TEST=1 go test ./internal/server -run '^TestSearchResultsChromium$' -count=1 +# Optional: opens an existing DB with mode=ro and query_only, with no migrations. +PAGESWIKI_SEARCH_DIAGNOSTIC_DB=/absolute/path/pages.db go test ./internal/store -run '^TestSearchReadOnlyDatabase$' -count=1 -v +``` diff --git a/docs/design/smtp-magic-link-hardening.md b/docs/design/smtp-magic-link-hardening.md new file mode 100644 index 0000000..4021f5d --- /dev/null +++ b/docs/design/smtp-magic-link-hardening.md @@ -0,0 +1,84 @@ +# SMTP magic-link delivery bounds + +Implemented: 2026-09-14. + +## Request and verification + +`/_/auth/magic-link` accepts POST only and limits the form body to 64 KiB. +Unknown accounts, malformed mailbox values, disabled providers, invalid mail +configuration, and a full delivery queue all receive the same ordinary +submitted-request page. Invalid/oversized form encoding is a generic 400. + +Sender and recipient each pass single-mailbox parsing and explicit CR/LF/NUL +rejection. SMTP envelope addresses use the parsed mailbox, while message +headers use its safely serialized display form. Neither raw user input nor +configured display names are concatenated directly into mail headers. The +SMTP endpoint must be a host plus numeric TCP port; IPv6 brackets are supported. + +The two existing delivery slots are acquired without waiting, before a new +challenge is written. Accepted challenges remain Domain-scoped, hash-only, +one-use tokens with fifteen-minute expiry. Their payload now records the +current recipient email in addition to the safe return Path. + +`/_/auth/magic-link/verify` accepts GET only, consumes the challenge once, and +then checks that the provider remains enabled, the Principal is active or +readonly, Domain membership is active, and the account email still matches +the delivered challenge. Email changes, suspended/quarantined accounts, +suspended/removed membership, disabled providers, and replay are rejected with +one generic invalid/expired response. The common browser-session issuance path +also checks Principal and membership state atomically when inserting a session. +Pending links from the earlier email-unbound challenge format must be requested +again after this change. + +Both endpoints return `Cache-Control: no-store`. No raw SMTP response, +recipient address, password, message body, or login URL is logged. + +## Delivery + +Delivery uses the existing Go SMTP client over an explicitly managed +connection instead of the unbounded convenience `smtp.SendMail` call: + +- Three-second context-aware dial timeout. +- Ten-second total delivery deadline, covering greeting, EHLO, STARTTLS, + authentication, envelope commands, DATA acknowledgement, and QUIT. +- Context cancellation closes the underlying connection immediately. +- At most 256 KiB of inbound connection data, including TLS negotiation, + prevents a malicious multiline SMTP reply from growing without bound. +- Every completion/error path closes the connection and releases the slot. +- STARTTLS is used whenever advertised, with certificate/hostname verification + and TLS 1.2 minimum. Failed advertised TLS never falls back to plaintext. +- Password authentication requires TLS even for a localhost server. PLAIN + authentication is not sent over an unencrypted channel. + +Mailbox serialization and STARTTLS behavior use the Go standard library's +[mail parser](https://pkg.go.dev/net/mail#ParseAddress) and +[SMTP client](https://pkg.go.dev/net/smtp#Client.StartTLS); there is no new +dependency or external mail-service integration. + +## Remaining policy decisions + +Unauthenticated relays without STARTTLS retain the earlier plaintext behavior. +Deployments must provide a trusted local relay or a TLS-capable SMTP endpoint; +transport-wide mandatory TLS / explicit relay exceptions are a future setting. +Implicit SMTPS on port 465, custom CA configuration, OAuth SMTP authentication, +durable retries, delivery status/audit UI, and per-account/source abuse quotas +are not implemented by this hardening slice. Admission slots bound concurrent +work, not request rates. A failed admitted delivery leaves an inaccessible +hashed challenge until normal expiry/cleanup. + +Magic links are bearer challenges intentionally usable on another device; +browser-bound OIDC state cookies are not reused for this flow. A dedicated +confirmation screen to mitigate link-scanner consumption is separate work. + +## Tests + +Local fake SMTP servers verify successful STARTTLS delivery and safe envelope +serialization, refusal of plaintext credentials/untrusted certificates, +timeouts at greeting/EHLO/DATA/QUIT, oversized responses, mailbox/header/link +injection rejection, and background-slot release. HTTP/store fixtures cover +generic request responses, form bounds, full queues, account/membership/email/ +provider changes, active/readonly success, and challenge replay. + +```sh +go test -race ./internal/server -run 'TestSMTP|TestMagicLink' -count=1 +``` diff --git a/docs/design/social-link-cards.md b/docs/design/social-link-cards.md new file mode 100644 index 0000000..9de01bf --- /dev/null +++ b/docs/design/social-link-cards.md @@ -0,0 +1,87 @@ +# Social link cards (OGP / X) + +Implemented 2026-09-14. This is metadata projection, not a public-share or +anonymous-authorization implementation. No visibility settings are changed. + +The next publication-policy design is +[Quartier/Spot ownership and superior audience ceilings](locality-publication-ownership.md). +Child settings may restrict but cannot override a superior restriction. This is +not implemented yet; the current enforcing-domain metadata suppression remains. + +## Supported projections + +Semantic Page/file viewers, all three home layouts, City Map and City details +emit server-rendered Open Graph and `twitter:*` tags in their HTML head. No +JavaScript execution is required by crawlers. Editors, configuration, login, +search, revision/raw endpoints and user-specific utility pages do not acquire +social metadata through this feature. + +- Title: first H1 in canonical HTML, otherwise the Page Path; home uses the + Domain title, City detail uses its title. +- Description: plain text from at most 64 KiB of canonical HTML, reduced to + 200 Unicode characters. Titles are limited to 90 characters. Scripts, styles, + templates, iframes, SVG, noscript and macro syntax are excluded. Expanded + children, bookmarks, private related pages and embedded documents are never + used as description sources. Non-HTML files use filename / Content-Type. +- Default image: `/static/social-card-v1.png`, a fixed 1200×630 PNG book/academy + emblem. Generated once per process using Go primitives; no external service, + native decoder, font download, scheduler or per-Page cache. GET/HEAD and ETag + requests are supported. It contains no Domain or document data. +- Original image documents: PNG/JPEG/GIF/WebP below 5 MiB use their semantic + `/v/raw/path:{path}` image URL and the `summary` card. Other documents use the + default `summary_large_image`. SVG, oversized images and PDFs use the default; + no thumbnail generation is triggered by a crawler. +- Canonical / image URLs: absolute URLs from the configured effective Domain + FQDN (Domain hostname plus Campus FQDN where applicable), using HTTPS. Localhost + and IP development hosts use the direct HTTP/TLS scheme and matching port. + Forwarded Host/Proto and Origin headers are not canonical-identity sources. + Query parameters/fragments, including tokens, never enter card URLs. Literal + `?`, `#`, `%` and Unicode in Page Paths are URL-encoded exactly once. City + details use their current name-based URL, including the parent for Streets. + +## Privacy and operational limits + +The existing authorization middleware applies unchanged, including for the +`Twitterbot` User-Agent. With `authorization_mode=enforcing`, anonymous requests +still redirect to authentication; even authenticated HTML contains no card +metadata and adds `noindex, nofollow, noarchive`. Unknown/error authorization +configuration fails closed. Only existing non-enforcing, anonymously readable +deployments emit content cards. Do **not** disable authorization just to enable +cards; narrower anonymous read policy and revocable shared links remain separate +roadmap work. Existing private/no-store HTML response headers are retained. + +Once a page has been public, a third party may already retain its metadata/image. +Later revocation prevents new anonymous retrieval but cannot recall third-party +caches. Card layout, refresh timing and final display are controlled by each +sharing service. The application can validate its emitted HTML and image URLs, +not guarantee a card in every post. Public DNS/TLS and reverse-proxy crawl access +must also work. No X account posting/API integration is required or performed. + +Canonical HTML is not modified or sanitized by metadata extraction. Normal +document displays now use [inert HTML projections](html-projection-trust.md); +explicit anonymous locality authorization and governance remain separate gates. + +## Verification / next slices + +`social_metadata_test.go` exercises real rendered heads, Japanese/entity-safe +metadata, bounded extraction, Host spoofing, explicit URL encoding, token +omission, private crawler/authenticated requests, policy revocation, every home +layout, City UUID-to-name canonicalization, real raw image retrieval and the +fallback PNG's dimensions/HEAD/ETag contract. + +Future additions: explicit per-Page cover/description settings, approved +Domain-default artwork, precomputed PDF/video/archive cover artifacts, share +projection policy, and a settings preview/diagnostic panel. Do not automatically +fetch arbitrary body image URLs or leak credentials into images. + +Deployment follow-up: main `pages.anya.jp` currently redirects anonymous crawlers +to login (303); its public fallback image is reachable via HTTPS. Managed +`wiki.extpages.anya.jp` emits correct tags/image on its local Host-routed listener, +but public HTTPS currently fails with TLS `unrecognized name`. Its certificate / +reverse-proxy virtual host needs correction before external card retrieval can +work. Neither visibility nor external TLS infrastructure was changed here. + +Protocol reference: [Open Graph basic and structured metadata](https://ogp.me/). +X compatibility uses the established `twitter:card`, `twitter:title`, +`twitter:description`, `twitter:image` and `twitter:image:alt` fields; its old +developer Cards documentation currently redirects to the general documentation. diff --git a/docs/design/system-extensions.md b/docs/design/system-extensions.md new file mode 100644 index 0000000..e70998d --- /dev/null +++ b/docs/design/system-extensions.md @@ -0,0 +1,208 @@ +# システム拡張の詳細設計 + +## 境界と今回の実装 + +連携アダプタはDocument/Revisionを特定のMIMEに応じて編集・表示する。 +システム拡張はナビゲーション、活動、通知、検索、ストレージ、テーマ、監視などの +サービスを提供する。設定・API・実行権限をアダプタのURLテンプレートに混在させない。 + +実装済みの入口: + +- `internal/extensions/registry.go`: バージョン付きの信頼済みビルトインmanifest。 +- `GET /_/api/v1/extension/`: 管理者向けcatalog。書き込み・インストールAPIは未公開。 +- `/-/sys/config?panel=extensions`: 連携アダプタとは独立したシステム拡張一覧。 +- `system.resources`: instanceスコープのバックグラウンド監視。 +- `navigation.bookmarks`: domainスコープのカードと子ページリンク。 +- `content.diary`/`content.blog`: Domain別に有効化する記事メタデータ、カレンダー、 + 最近の記事、カテゴリ一覧。初期版はログイン必須・既存Page登録型。 + [実装範囲と後続タスク](diary-blog-plugins.md)を参照。 + +これは外部プラグインローダーではない。任意Go plugin、JS、シェル、URLからの実行、 +manifestアップロードによる権限付与は未実装・不許可。現在のcapabilities一覧はサービス +境界の宣言であり、既存の認証を置換しない。実際のハンドラは既存のmanage/read権限と +管理者グループを確認する。ビルトインの設定入口を分離した最初の実装である。 + +vim.wasmの動作改善はユーザー指示により保留。この変更でVim本体を変更しない。 + +## Manifest/ライフサイクル契約 + +将来の外部パッケージmanifestに必要な項目: + +| 項目 | 意味 | +| --- | --- | +| id, version, api_version, compatibility | 安定ID、パッケージ版、ホスト契約との互換性 | +| kind, scope | activity/comment/diary/theme/monitor/storage/search/bookmark-source、instance/domain/principal | +| capabilities, outbound_hosts, secret_refs | 要求能力・送信先許可リスト・秘密参照。manifestのみでは許可しない | +| config_schema, migrations | 型付き設定と設定版移行。未知フィールド拒否 | +| events, hooks, checkpoints | 定期ジョブ・購読イベント・再実行位置 | +| runtime, image_digest, signature | 分離プロセス/コンテナ、固定イメージ、署名 | +| timeouts, concurrency, memory, payload_limit | リソース上限。前景処理をブロックしない | +| health, export, retention | 健全性、移行・アンインストール時のデータ保護 | + +設定は `(scope_type, scope_uuid, extension_id, schema_version)` で分離する。 +外部拡張導入時には `system_extension_installations` と `system_extension_config` を追加し、 +installed → configured → enabled → disabled/failed の状態遷移を監査する。 +署名・互換性・要求能力を確認するまで実行しない。アップグレード中は新しいジョブを +止め、checkpointを保持して移行する。無効化はデータ削除を意味しない。 + +設定UIはホスト所有のschema rendererを基本とする。独自UIは固定originのsandbox iframe +と型付きメッセージ契約に限定し、通常のログインBearer/Cookieを渡さない。 +第三者コードはホストプロセス内にロードせず、短命の委譲capabilityでAPIにアクセスする。 + +## ビルトインのリソース監視 + +- 定義ID `builtin.resource.sample`、イベント型 `resource.sample`。 +- 起動時に未登録の場合のみ追加。既定60秒、変更可能範囲30〜86400秒。 +- 既存キューのpriority=100、通常のclaim/履歴/ログ/キャンセルを利用する。 + CPU・メモリ・ファイルシステム情報だけを収集し、外部コマンドや再帰走査をしない。 +- `resource_samples(id, job_uuid UNIQUE, timestamp_ms, payload)` に永続化。 + 同一jobの再実行は重複登録しない。書き込みと期限切れ削除は同一トランザクション。 +- 7日保持。期限切れ削除は収集時に実行する。停止中に過去データを捏造して補間しない。 +- `GET /_/api/v1/queue/resources/history?hours=1|24|168` は最大361点。 + timestamp索引で期間を絞り、バケット内の最終サンプルを返す。平均/最大値ではない。 +- 現在値APIと履歴を区別する。グラフの更新停止やブラウザを閉じる操作は収集を止めない。 + 収集停止は監視イベントのenabledまたはキューのpausedによる。 +- ビルトイン定義は削除不可。無効化と間隔変更は再起動後も維持する。 +- データはこのSQLiteインスタンスのローカル監視。Campus全ノードの集約ではない。 + CPUはホストload average、メモリはGo heap、容量はDocument Storeファイルシステム。 + コンテナのCPU使用率/RSS/cgroup制限として表示しない。 + +既存運用APIと同じインスタンス全体の管理権限を利用する。複数管理主体での厳密な分離は +`instance_operator` 相当の運用権限設計後に移行する。HAではinstance UUID/boot IDを追加し、 +各ノードの収集と中央集約・leaseを分ける。SQLiteファイルの共有マウントで代用しない。 + +### ディスクI/O + +`queue/resources` と `resource.sample` の保存payloadへ +`io: {scope:"process", available, process_id, read_bytes, write_bytes}` を追加。 +Linuxの `/proc/self/io` を読み取り、読み込み・書き込みの累積カウンタを保存する。 +HTTPハンドラで待機や外部コマンド実行、ディレクトリ走査は行わない。 +`process_id` はアプリプロセスごとのランダムUUIDで、コンテナでPIDが再利用されても区別できる。 + +表示速度は同一process_idの隣接サンプルの差分bytes/差分秒。最初のサンプル、 +旧履歴でI/Oフィールドがない場合、取得失敗、再起動、時刻逆転、カウンタ減少、 +JSの安全整数範囲外は欠測にし、0や巨大なスパイクで代用しない。 +ライブカードは画面取得間の速度、履歴は保存サンプル間の平均速度であり、ピーク値ではない。 + +[Linux kernelのproc仕様](https://docs.kernel.org/filesystems/proc.html#proc-pid-io-display-the-io-accounting-fields) +に従うストレージ層の計上値。`rchar/wchar`(キャッシュ等を含むread/write呼び出しの量) +とは区別する。write_bytesはページ変更時の計上で、実デバイスへのflush完了や +cancelled_write_bytes差引後の正味書き込みを意味しない。 +ホスト全体・全コンテナ・外部アダプタ・全ワーカーの合算やデバイス利用率/レイテンシ/IOPS +は今回の対象外。必要に応じてcgroup/デバイス別collectorを別スコープとして追加する。 + +### SNMPの将来オプション + +`monitor.snmp` は別collectorとして設計する。初期候補はSNMPv3 authPriv、読み取り専用、 +対象FQDN/IP・OIDを管理者が許可し、秘密はsecret_refで参照する。SNMPv1/v2cは必要性と +ネットワーク制約を確認するまで既定無効。到達先制限、タイムアウト、再試行間隔、 +最大varbind数、単位変換、Counter32/64の周回、再起動によるカウンタリセットを扱う。 +欠測/認証失敗を0使用率に変換しない。SNMPサーバーの公開やネットワーク探索は今回行わない。 + +## 各拡張のデータと処理 + +| 拡張 | 保存モデル・表示 | 実行・権限と最初の実装単位 | +| --- | --- | --- | +| ランキング/いいね | `page_metric_buckets(domain,page_uuid,bucket,metric)`、`page_reactions(domain,page_uuid,principal,reaction)` | 日別閲覧・いいねを集約。閲覧可能Pageだけ表示し、非公開Pageの件数や順位から漏らさない。bot・連打除外、期間と計算版を固定 | +| 最新編集 | `page_activity_events` と日別/domain別projection | UUID/Revisionを軸に作成・編集・renameを表示。可視Pathを出力時に解決。bodyを再走査しない | +| ユーザー別直近編集 | `(domain,principal,page_uuid,last_edit_at,revision)` projection | actorをクライアント申告にせずサーバーで記録。既定は本人のみ閲覧。現時点のPage権限で再検査 | +| コメント | `comment_threads`、`comments`、`comment_anchors` | スレッドはPage UUID、インラインはRevision+範囲+周辺テキストhash。改訂後に再アンカー/孤立を区別。投稿・編集・モデレーション・通知を別capabilityにする | +| 日記 | `diary_entries(domain,owner,local_date,page_uuid,timezone)` | 専用Pageを通常のRevisionとして作成。日付は設定timezone、同日作成は冪等。`/u/{name}/diary/YYYY/MM/DD` は初期Path案でありrename後もUUID保持 | +| 条件付きテーマ | `theme_rules(domain/principal,priority,condition,theme_id)` | 時刻、曜日、経過時間、OS配色を型付き条件にする。日没はユーザー指定の緯度経度/timezoneで計算し、無断で位置情報を取得しない。CSSテーマIDのみ、任意JS条件は禁止 | +| S3互換 | immutable Document Store provider+配置情報 | `PutIfAbsent/Stat/Open/ReadAt/Verify/DeleteUnreferenced` 契約。sha256 identityを維持し、ETagをhashと決めつけない。署名URLは短命、RangeとGC証明・失敗再試行を検証 | +| WebDAV/SSHFS | external collection connector または検証済みDocument backend | 編集可能な外部ファイルと正本CASを区別。まずread-only参照/取り込み。WebDAVの条件付き更新・Range、SSHのhost key pinを設計。SSHFSマウント・FUSE権限は専用sidecarで管理しWeb要求からmountしない | +| 外部検索 | `search_connectors`+正規化result | PagesWiki/GROWI/PukiWikiは機能検出とAPI契約確認後に個別connector。検索対象domain・資格情報・timeout・最大結果・URL allowlistを設定。外部の権限とローカル権限を混同しない | +| Wikipedia/Google補助検索 | 外部検索リンクまたは契約済み検索API provider | ローカル0件でも自動送信しない。送信クエリを表示してユーザーが選択。まず外部検索リンクから開始し、APIは規約・課金・制限を確認して別実装。無許可スクレイピングはしない | +| Linkding等のブックマーク引用 | `bookmark_sources`、`external_bookmark_items(source,remote_id,url,title,tags,updated_at)` | URL/タイトル/タグ/出典を同期。本文コピーは別の許可付きimport。個人tokenは個人スコープ、共有を明示。セクションsource providerとして注入し、手動リンクを消さない | + +外部検索APIの共通結果は `provider_id, remote_id, title, canonical_url, snippet, +updated_at, source_scope` とし、外部由来を常に表示する。HTMLはサニタイズし、検索結果URLを +サーバー側で無制限にfetchしない。 + +## イベント/API設計 + +## Network and composition extensions (design TODO) + +IPAM, DNS zone/record administration, and inventory/asset management are typed +system extensions, not free-form editor adapters. Their records (`network_prefix`, +`dns_zone`/`dns_record`, `asset_item`) retain ownership, audit history, soft-delete +state, and references to Pages/Assets. Provider writes use dry-run, approval, +idempotency keys, etag/revision checks, secret references, allowlisted origins, +rate limits, and bounded queue jobs; DNS resolution or scanning never runs in a +foreground Page request. Candidate API namespaces are +`/_/api/v1/extension/network.ipam/*`, `network.dns/*`, and +`inventory.assets/*`, pending schema and permission review. + +The CSV macro is a read projection of an authorized immutable Revision, for +example `{{csv:/data/items.csv range=A1:H200 header=true}}`. It must retain the +source Path and Revision/hash in its cache key, cap rows/columns/cell size and +nested macros, and never write rendered HTML back to the Page. RFC 4180-compatible +UTF-8 CSV is the canonical interchange format; ODS is a separate adapter when +multiple sheets, formulas, or styles are required. Malformed or oversized data +falls back to the bounded text adapter. + +Slide projection/editor support is also TODO. A Reveal-compatible adapter may +host HedgeDoc or Slidev behind an explicitly configured origin, CSP, read-only +preview, and explicit import/save operation. A CSS-only editor using scroll-snap, +`:target`, and print CSS provides a JavaScript-free fallback. Remote scripts, +imports, and iframe privileges are never inherited from document content. + +### 日記拡張の追加要件(初期一覧を実装、移行・コメントは未実装) + +日記は主要なシステム拡張として扱い、tDiaryからの移行と日記専用画面を提供する。 + +- カレンダーウィジェットから年月日を選択。最近の日記と最近のコメントを同じ画面に配置。 + 個人日記/共有日記、公開/限定公開の範囲を明示し、各ウィジェットも閲覧権限で絞る。 +- tDiaryインポートは既存のimport session/journalを再利用し、事前解析・プレビュー・ + 日付/タイトル/本文/セクション/コメント/添付画像の対応確認、修正、再実行を分ける。 + 日付・タイムゾーン・旧URLの対応表とインポート元IDを保持し、重複取り込みを防ぐ。 +- 対応するtDiary版、データ形式、記法、添付・コメントの実際の形式は、実装着手時に + 公式仕様とユーザーのサンプルで確認する。Rubyファイルやプラグインをeval/実行せず、 + 宣言的な安全な読み取りと変換のみを行う。対応範囲外はスキップ理由を表示する。 +- 移行コメントは元の著者名・日時を出典として保持し、認証済みローカルユーザーによる + 投稿と偽って結び付けない。非公開内容の公開、HTML由来XSS、通知の大量送信を防止する。 +- 順序は日記モデル+カレンダー/最近の日記 → コメント基盤との接続+最近のコメント + → tDiary取り込みの縦切り。実データを使う前に小規模fixtureでドライランと再実行を検証。 + +以下の共通outboxは日記・コメントの通知や一覧projectionにも利用する。 + +Pageの正本更新と `domain_event_outbox` へのイベント挿入を同一transactionで行う。 +型は `page.created.v1`, `revision.saved.v1`, `path.renamed.v1`, `page.deleted.v1`, +`comment.created.v1`, `reaction.changed.v1` など。actor、domain、Page/Revision UUID、 +domain sequence、payload version、idempotency keyを含める。本文を無条件に複製しない。 + +subscriberごとにcheckpointを持ち、at-least-once配送に対して冪等に集計する。 +最近編集・ランキング・通知をPage表示ハンドラから同期再計算しない。 +イベント実行は `/_/api/v1/event/`、キュー状態は `/_/api/v1/queue/` を引き続き利用する。 +拡張API案は `/_/api/v1/extension/{id}/{operation}`。実装時はoperationごとにtyped policyを +登録する。未知ID/operationをgeneric proxyしてはならない。 + +閲覧イベントは正本更新ではないため、dedupe/rate limit付きの軽量batch ingestionを +分離する。ランキングには匿名化集計を用い、個人閲覧履歴を無期限に保存しない。 + +## Kill switch とリソース観測(設計・実装方針) + +各Domain/instanceの `system_extension_states` に拡張IDごとの有効状態を保存し、未登録は有効と解釈する。設定画面または `POST /_/api/v1/extension/` の `{id, enabled}` で切り替え、反映は次の要求・次のジョブから行う。無効化はデータを削除せず、対応画面は安全な404または組み込みfallbackを返す。CLIにも `pageswiki-cli extension [ID] [on|off]` を用意し、DBのWeb UIが利用できない障害時にも切り戻せるようにする。 + +システム拡張と連携アダプタは、jobのextension ID、開始・終了時刻、CPU時間、最大RSS、読み書きバイト、待ち時間、出力件数、エラー/キャンセルを共通の実行メトリクスへ記録する。foregroundのProjectionはrequest IDとadapter IDをログへ付け、background処理はイベントキューのbounded jobとしてリソース画面へ集計する。上限超過・連続失敗・queue滞留は拡張単位で通知し、ページ表示のレイテンシーを拡張処理が奪わないことをDone条件にする。 + +## 次の実装順序と受入条件 + +以下は追加機能同士の順序。先に [実装状況の是正順序](implementation-status.md#ordered-next-work) +にある認証・更新整合性・重い要求処理の是正を通す。監視画面統合の次の最初の是正として、 +ownerの通常更新による降格防止と、並行削除時の最後のowner保持を実装済み。 + +1. 今回:ビルトインcatalog、管理パネル、監視イベントと履歴、レスポンシブなカード。 +2. outboxと監査actorの統一、domain/principal別の最新編集projection。transaction rollback、 + rename追従、失効権限での非表示をテスト。これを最初の追加システム拡張にする。 +3. diary(カレンダー・最近の日記・tDiary移行設計)と時刻/OS条件テーマ。 + 最近のコメントは次のコメント基盤に接続。日没計算はtimezone/DSTと位置情報同意を検証して追加。 +4. reactions・ランキング・コメント。モデレーション、消去/保持、通知契約を先に固める。 +5. Linkdingのread-only同期、明示操作の外部検索リンク、続いて各Wiki API connector。 +6. S3 Document Store、WebDAV/SSHのread-only collection、SNMP collectorを独立スライスで実装。 +7. 外部パッケージの署名・分離runtime・secret store・権限制限・upgrade/rollbackを備えてから + 第三者プラグインのインストールを公開する。 + +全スライスでdomain越境拒否、再実行の冪等性、入力/応答上限、キャンセル、負荷上限、 +秘密の非表示、停止時の既存Wiki表示への無影響を確認する。未実装機能を有効ボタンだけで +動作済みに見せない。ロードマップの完了チェックは縦断した機能単位で付ける。 diff --git a/docs/design/uri.md b/docs/design/uri.md new file mode 100644 index 0000000..074386b --- /dev/null +++ b/docs/design/uri.md @@ -0,0 +1,72 @@ +# URI Model + +URI prefixes identify access surfaces, not object meaning. Semantic paths, +Page UUIDs, Revisions, and projections remain separate. + +## Canonical namespaces + +| Prefix | Purpose | Status | +| --- | --- | --- | +| `/...` | Language-neutral semantic Viewer path | active | +| `/e/-/...` | Editor for a semantic path | active | +| `/o/uuid:` | Page/Object access by stable UUID | active | +| `/o/path:` | Object resolver through a semantic path | active | +| `/r/history/` | Revision history for a Page UUID | active | +| `/r/view/` | Immutable Revision view | active | +| `/r/diff//` | Revision comparison | active | +| `/l/uuid:` | Semantic path bindings for a Page UUID | active | +| `/v/...` | Explicit non-canonical projection | active | +| `/v/raw/path:/...` | Current Document payload selected through a semantic path | active | +| `/v/raw/uuid:` | Current Document payload selected through a Page UUID | active | +| `/v/raw/rev:` | Immutable Document payload selected through a Revision | active | +| `/v/raw/asset::` | Administrator authoring projection of the current mutable Asset HEAD | active | +| `/_/obj/sha256:` | Authorized immutable Document payload by content identity | active | +| `/_/api/...` | Internal/API surface | active | +| `/:/...` | System command and creation surface | active | +| `/-/...` | System configuration surface | active | +| `/s/...` | Delegated share projection | reserved | +| `/a/...` | Alias projection | reserved | +| `/u/{username}` | User profile and user-Wiki subtree | active | +| `/g/{groupname}` | Group profile and group-Wiki subtree | designed | + +## Rules + +Task CalDAV uses `/_/api/v1/caldav/tasks/` (private home/principal), +`/_/api/v1/caldav/tasks/default/` (fixed VTODO collection) and +`/_/api/v1/caldav/tasks/default/{name}.ics` (resource). These are not Wiki Paths +or VEVENT calendars. App credential management lives below +`/_/api/v1/extension/organizer.tasks/dav-credentials`. +See [scope and interoperability contract](ja/task-caldav.md). + +1. `/...` is the canonical, language-neutral Viewer URL. +2. Editing and projection prefixes must not become Page identity. +3. `/e/foo` is legacy input and redirects to `/e/-/foo`. +4. UUID routes must remain valid after path rename or removal. +5. Revision routes address immutable Revision UUIDs. +6. Explicit language projection, when implemented, uses a non-canonical + namespace and must emit the semantic Viewer URL as canonical. +7. Binary media embedded by Viewer uses the `/v/raw/` projection. It accepts + an explicit internal address and must not invent a parallel `/raw/...` + semantic namespace. +8. `/u/` and `/g/` are reserved profile/Wiki namespaces before the semantic + catch-all. Their immediate `/_/` child is control space, not semantic Page + identity. +9. `/_/obj/sha256:` is reachable only when that Document is referenced + by a readable Path in the current Domain. The hash alone grants no access. +10. Raw and immutable Document responses expose Object, Revision, and Document + identities in `X-PagesWiki-Object-UUID`, `X-PagesWiki-Revision-UUID`, and + `X-PagesWiki-Document-SHA256`; clients must not infer one identity from + another or treat these descriptive headers as authorization. + +## Internal address schemes + +| Scheme | Identity | +| --- | --- | +| `path:` | Mutable semantic reachability | +| `uuid:` | Stable Page/Object identity | +| `rev:` | Immutable Revision identity | +| `sha256:` | Immutable Document content identity | +| `asset:` | Mutable authoring workspace | + +The HTTP `/r/` namespace and internal `rev:` scheme are related but not +interchangeable strings. diff --git a/docs/design/user-space-publication.md b/docs/design/user-space-publication.md new file mode 100644 index 0000000..00be49b --- /dev/null +++ b/docs/design/user-space-publication.md @@ -0,0 +1,76 @@ +# User-space visibility and anonymous publication + +Status: implemented for local `/u/{username}` namespaces. The feature is +opt-in and defaults to the authenticated Domain audience. It does not add user +namespaces to the global anonymous tree. + +## Policy model + +The owner configures the policy at `/u/{username}/_/edit`. Four independent +audiences are stored: + +- profile metadata (display name and profile-facing fields), +- avatar, +- the `/u/{username}` Wiki root document, +- descendant Wiki documents. + +Each audience is `private`, `domain`, or `public`. Descendant Paths can have an +exact policy that narrows the descendant default to `domain` or `private`; an +exact policy also restricts its subtree. It cannot broaden its parent default. +The policy row has a compare-and-swap version, and each successful change is +recorded as an append-only before/after event. + +`public` is valid only while the Domain is enabled, its Campus is enabled, +authorization is enforcing, and the Domain publication ceiling is `public`. +Changing that ceiling to authenticated immediately closes the user-space +projection. Saving an owner policy cannot raise the Domain ceiling. + +## Projection contract + +User-space publication is a deliberate live-head projection. Once the owner +selects `public`, the current language head and future edits under that audience +are visible without a separate immutable publication manifest. The settings UI +therefore describes it as an automatic publication choice. This differs from +the ordinary explicit-Revision approval flow and must not be inferred from a +Domain ceiling alone. + +Anonymous requests resolve through a user-space-specific reader. It: + +1. resolves an active local username and re-evaluates the Domain ceiling; +2. evaluates root/descendant/override visibility; +3. requires one canonical Path binding for the Object; +4. chooses a bounded current language head; +5. builds a bounded navigation snapshot containing only visible user Paths; +6. renders through the normal safe HTML/content projection. + +The same snapshot supplies `/v/children`, `/v/tree/u/{username}` and +`/v/browser/u/{username}`. User spaces remain excluded from the global +anonymous tree. UUID, Revision, document-hash, aliases, reserved `/_/` routes, +and ordinary City publication cannot be used to bypass this reader. The avatar +has its own audience check and is returned with `private, no-store`. + +Authenticated readers are also constrained by the user policy. The owner and a +Domain administrator can recover the namespace; other members cannot read a +`private` root, descendant, avatar, Object or Revision even when a broader +Domain grant exists. Request-local policy caching is permitted, but there is no +process-wide authorization cache, so revocation applies on the next request. + +## Structural changes and bounds + +Exact overrides follow an atomic Path rename, including recursive subtree +rename. A protected override cannot be moved outside its owner's user +namespace, and deleting its Path deletes the stale exact override. The current +limits are 256 saved overrides, 512 rows in the edit listing, the common +navigation entry budget, and the common projection input limit. Exceeding a +bound fails closed. + +## Remaining work + +- Add a paginated override editor for user spaces larger than the current edit + listing budget. +- Decide whether administrators need an audited emergency policy editor; the + current UI intentionally remains owner-only while the Domain ceiling is the + superior control. +- Connect user-space automatic publication to the future human approval policy + without converting existing private/domain policies. +- Add export/restore tooling for policy events and explicit policy-history UI. diff --git a/docs/design/zombie-gc-integrity.md b/docs/design/zombie-gc-integrity.md new file mode 100644 index 0000000..bb65b50 --- /dev/null +++ b/docs/design/zombie-gc-integrity.md @@ -0,0 +1,104 @@ +# Zombie GC: 原子性・Domain 境界・instance maintenance + +更新: 2026-09-14 + +## 修正した問題 + +旧実装は全インスタンスの候補を transaction 外で取得し、その UUID の +Revision/Object を無条件に削除していた。WAL reader の候補取得後に別 connection +が Path/Asset/本文 Revision を追加すると、その変更を無視して削除できた。 +また Domain 管理者の HTTP/config 操作が同じ global purge を呼び出していた。 + +## 候補の定義 + +Object の作成時刻が指定した猶予期間より古く、次の全条件を満たすものに限定する。 + +- **すべての Domain** において Path と Asset 所有者の参照がない。 +- Revision がない、または **全 Revision** の本文 bytes と Document hash が空である。 + 空 Document の SHA-256 は空として扱うが、非空の inline body を上書きしない。 + NUL を含む本文も BLOB byte length で保護する。HEAD だけの判定は禁止する。 +- `revision_document_refs`、City の明示ページ参照・Street inbox・ページ配置 override、 + exact Object capability grant、未期限切れの連携エディタ ticket/session がない。 + +後半の参照は保守的に保護する。Path だけ消しても、意味的に保持している空ページや +編集中のページを自動削除しない。期限切れ editor session の bookkeeping は削除時に清掃する。 + +## 権限境界 + +| 呼び出し元 | 範囲 | +| --- | --- | +| `GET /_/api/v1/gc/zombies/list` | current Domain の作成 provenance がある候補のみ | +| `POST /_/api/v1/gc/zombies/purge` | current Domain の作成 provenance がある候補のみ | +| 設定画面の一覧・`section=zombie-purge` | 同じ Domain 制約 | +| ローカルの trusted CLI/store maintenance | インスタンス全体 | +| ビルトイン 6 時間周期 GC worker | インスタンス全体 | + +HTTP 呼び出しは `object_origins(object_uuid, domain_uuid)` が current Domain に一致する +ことを必須とする。クエリ・フォームの `domain_uuid` で切り替えない。Campus 管理者でも +HTTP から global maintenance に昇格しない。legacy/作成元不明 Object は一覧にも出さず、 +HTTP から削除しない。参照がないこと自体を所有権の証拠にはしない。 + +`CreateObjectInDomain` が記録した provenance を利用する。作成元を記録していない +既存データや旧作成経路を、現在の default Domain に推測で backfill してはならない。 +こうしたデータの整理は trusted instance maintenance の範囲とする。 + +現在 `runEvent` に global GC の event type は登録しない。HTTP から任意の event type +を保存・手動起動しても、`gc.purge` 等は worker で unknown type として失敗し、削除しない。 +将来 GC を scheduler に統合する場合、サーバー内部だけが設定できる trusted origin と、 +Domain provenance を持つ手動 payload の区別を先に設計する必要がある。 + +## 書き込み原子性と上限 + +`BeginTx(ctx)` の直後、`zombie_gc_maintenance` の一行を UPDATE し、SQLite の writer lock +を取得してから候補を選ぶ。同じ write transaction 内で UUID ごとに全条件と provenance を +再検証し、関連 bookkeeping/Revision/Object を削除する。候補抽出から commit まで他 connection +の書き込みが入らない。失敗・キャンセル時にはバッチ全体を rollback し、成功件数を返さない。 + +Domain 一覧は indexed `object_origins(domain_uuid, object_uuid)` から検索を開始する。 +他 Domain の全 Object を走査しない。候補上限は SQL `LIMIT` に置き、Go の後処理 slice +で制限してはならない。各参照検索には Object/Page UUID の lookup index を用意する。 + +- HTTP/config の既定バッチ: 100 件。 +- 最大: 1,000 件。HTTP の `limit=0`・負数・最大値超過は 400。 +- trusted store の旧 `limit=0` は無制限にせず既定 100 件とする。 +- trusted 一覧も最大 1,000 件。継続する purge はローカルから明示的に繰り返す。 +- 検索・削除の context は最長 5 秒。HTTP は request context のキャンセルを継承する。 +- SQLite writer の待機も既存 busy timeout の 5 秒内。重い history の走査が期限に + 達したときは、不完全な候補判定で削除せず失敗する。 + +Foreign key enforcement が無効な legacy connection でも整合性を保つよう、 +`object_origins` 等は明示的に清掃する。Revision の検索 index は既存の transaction 内 +trigger で追従する。CAS 本体のファイル削除はこの GC では行わない。 + +`BindPathInDomain` と Revision の INSERT も、同じ書き込み SQL に +`WHERE EXISTS(SELECT ... FROM objects)` と `RowsAffected` の検証を置く。 +GC が先に commit した場合は `ErrPageNotFound` または安全な書き込み競合失敗となり、 +orphan Path/Revision を作らない。失敗した bind は既存 Path を置換しない。 +`PutAsset` は新規 Object と Asset を同じ transaction で作成しており、別途変更は不要。 + +## global worker の猶予期間 + +既定の **24 時間** と **6 時間ごとの実行** は維持する。今回の変更によって従来より +短い猶予へ移行させない。 + +起動時に、従来の default Domain の `zombie_grace_hours`、24 時間、永続保持済み値、 +operator 環境変数 `PAGESWIKI_ZOMBIE_GC_GRACE_HOURS` の最大値を採用し、 +`zombie_gc_maintenance.grace_seconds` に high-water mark として保存する。 +Domain の UI 設定がその後短縮されても、再起動しても、この値は小さくならない。 +Domain の設定は Domain 内の手動 purge に適用され、稼働中の global worker は変更しない。 + +より長い operator 環境設定は再起動時に継承できる。短縮のための HTTP/API は提供しない。 +従来設定の読み込み失敗・不正な operator 環境設定では global worker を停止しログに残す。 +時間から秒への整数 overflow で削除が早まることも防止する。 + +## 回帰テスト + +- WAL の別 connection が Path・Asset・非空 Revision を未 commit のまま追加し、 + GC を開始した後で commit しても Object が保持される。 +- 作成元が foreign/unknown の Object は管理画面/API から見えず、削除できない。 +- 他 Domain の Path/Asset、過去 Revision、NUL bytes、CAS hash、明示参照を保持する。 +- 既定/最大/不正 limit、キャンセル、途中 SQL failure の完全 rollback。 +- GC の commit 後の bind・Revision 保存は孤立データを作らない。Revision は + テスト専用 SQLite view/scalar による制御で、存在確認直後の削除を時刻依存なく再現する。 +- 手動 event の偽装 type から global GC を実行できない。 +- 長い従来設定、Domain 設定変更、再起動、operator 設定、整数 overflow、設定 read failure。 diff --git a/docs/operations/deployments/2026-09-25-active-notifications-calendar-mobile.md b/docs/operations/deployments/2026-09-25-active-notifications-calendar-mobile.md new file mode 100644 index 0000000..ec6673d --- /dev/null +++ b/docs/operations/deployments/2026-09-25-active-notifications-calendar-mobile.md @@ -0,0 +1,54 @@ +# 本番反映:アクティブ通知・タスク一覧・スマホカレンダー + +実施日:2026-09-25 JST。最終確認:06:00:52 JST。 + +## 対象と結果 + +- Compose `app` / `app2`(`pageswiki` / `pageswiki-ext`)を更新済み。 +- アクティブ通知/Web Push、タスクのインライン編集・サブタスク・日割り工程表、スマートフォン向けカレンダーUIを反映。 +- アダプタゲートウェイ、code-server、Excalidraw、Kroki関連は更新・再起動していない。 +- 新イメージ:`sha256:5e70e0d6789cfa2f558e9d8e3855095709068a023ef939b9bf54fe36846f79dc` +- 旧イメージ:`sha256:2bfab91fe4f8712a25b8e5a6cdb1494b68ccdd9433609b35ce25ae391b98bfe6` +- 旧イメージ保全タグ:`pageswiki-app:rollback-before-active-notifications-20260925` +- app起動:05:59:21 JST。app2起動:05:59:49 JST。両方running・再起動回数0、appのDocker healthはhealthy。 + +## バックアップと反映手順 + +全Goテスト成功後、旧イメージに保全タグを付与。稼働中に `docker compose build app` を完了した。 + +その後2アプリを停止し、DB・WAL・Document Storeを含むdata/data2の停止時点スナップショットをtarへ保存した。外部取り込みカレンダーの本文は調査していない。 + +- 保存先:`.deployment-backups/20260925-active-notifications-calendar-mobile/` +- `data-and-data2.tar`:12,067,358,720 bytes、2,414 entries。 +- ディレクトリ700、アーカイブ600。Compose設定・Dockerfile・.dockerignoreも保全。秘密情報を本記録に転記しない。 +- tar作成終了コード0、アーカイブ一覧の読み取り成功を確認。完全なリストア訓練は未実施。 +- Git/Docker buildからバックアップが除外されていることを確認。 + +バックアップ完了後、`docker compose up -d --no-deps --wait --wait-timeout 180 app app2` で再作成。停止を伴う更新であり、無停止デプロイではない。 + +## 確認結果 + +- ローカル3000/3001の `/health`:両方200。 +- `https://pages.anya.jp/health`、`/`、`/v/plan`:200。 +- 匿名の `/v/plan/tasks/schedule`:303、通知Push API:401。認証を迂回していない。 +- HTTPS配信した `notifications.js`、`notifications-worker.js`、`calendar.js`、`calendar-mobile.css`、`task-inline.js` のSHA-256が作業ツリーと一致。 +- 両DBにnotification_push関連3テーブル、organizer_itemsのparent_uuid/start_on/end_onを確認。 +- 両側の `builtin.notification.push` が有効、30秒間隔。`notification.push.deliver` が各3回成功。 +- 起動以降の確認区間で、fatal/初期化失敗/scheduler claim失敗/DB lock/失敗ジョブのログ該当件数は両方0。 +- Push購読件数は両側0。ジョブの正常実行は確認したが、実端末への配送成功を意味しない。 +- バックアップ後の作業ディスク空きは約72GB。今回バックアップの自動削除・期限設定は行っていない。 + +ユーザの代理ログイン、本番の予定・タスク作成、通知許可の代理操作、外部カレンダーの手動同期は実施していない。認証済みUIの操作検証は合成fixtureで実施済み。 + +## 利用開始・残確認 + +通知ベル →「⚙ 通知設定」でブラウザ通知を有効化し、利用者本人が通知許可を与える。選択した音はページ内通知用、背景/閉タブ時の音はOS設定に従う。タスク期限/計画日のリマインダーは個別タスク側でもONにする。 + +- [ ] Safari/iPhone SE実機:縦横切り替え、キーボード開閉、スクロール、編集操作切り替え。 +- [ ] 明示的に購読した実端末:Web Push受信、閉タブ/背景/前面、ログアウト後停止。 + +## 切り戻し + +旧イメージと停止時点のデータを保全している。ただし旧バイナリで新しいサブタスク/工程日を編集すると、新フィールドを失う可能性がある。また旧バイナリは新Pushイベントを処理できない。単純なイメージ差し替えを自動実行せず、原則forward-fixを優先する。 + +データ復元は反映後の更新を失うため別途確認を得る。復元が必要なら現状態も保存し、全writer停止下でDBとDocument Storeを同じ時点にそろえる。 diff --git a/docs/operations/deployments/2026-09-25-compact-task-ui.md b/docs/operations/deployments/2026-09-25-compact-task-ui.md new file mode 100644 index 0000000..d4e55e7 --- /dev/null +++ b/docs/operations/deployments/2026-09-25-compact-task-ui.md @@ -0,0 +1,46 @@ +# 本番反映:タスク一覧のコンパクトUI + +実施日:2026-09-25 06:17 JST。 + +## 対象 + +- Compose `app` / `app2`(`pageswiki` / `pageswiki-ext`)を更新。 +- PCの1タスク1行表示、共通列見出し、インライン編集、サブタスクの列揃え、スマホのラベル付き入力・44px以上のタッチ領域を反映。 +- CSSは `tasks.css?v=7`、JavaScriptは `task-inline.js?v=2`。 +- 他のサービスは再作成していない。 + +## 差分と事前検証 + +稼働イメージ内と作業ツリーのファイルハッシュを比較。非テストのGoソース、go.mod、go.sum、Dockerfileは一致。static/templatesの差分は次の4ファイルのみ。 + +- `static/css/tasks.css` +- `static/js/task-inline.js` +- `templates/pages/tasks.gohtml` +- `templates/pages/task_schedule.gohtml` + +前段で全Goテスト成功。隔離した合成fixtureを用いたChromiumの1440px、1024px、390px、320px幅検証も成功。列揃え・行高・タッチ領域・子追加・保存競合時のエラー表示と入力保持を確認済み。実機Safariでの検証は別途必要。 + +## 反映手順と切り戻し + +- 旧イメージ:`sha256:5e70e0d6789cfa2f558e9d8e3855095709068a023ef939b9bf54fe36846f79dc` +- 保全タグ:`pageswiki-app:rollback-before-compact-task-ui-20260925` +- 新イメージ:`sha256:e5a7b7877f7c8f8701d0152468b4ee818f9fcb181509f7d223d2c00678c80925` + +旧イメージに保全タグを付け、稼働中に `docker compose build app`。その後 `docker compose up -d --no-deps --wait --wait-timeout 180 app app2` で更新した。 + +UIのみの更新であり、新たなDB migrationはない。data/data2は既存のマウントを保持し、削除・復元・手動編集はしていない。今回、新しいデータ全体バックアップは作成していない。直前の06:00前のデプロイ時バックアップは保全されているが、今回更新時点のスナップショットではない。 + +切り戻し時は上記の旧イメージを利用して2アプリを再作成する。バックエンドとDBモデルは同一のため、このUI変更の取り消しにデータ復元は不要。データ復元を自動実施しない。 + +## 稼働確認 + +- app起動:06:16:47 JST、app2起動:06:17:13 JST。両方running、再起動回数0。 +- appのDocker healthはhealthy。app2はDocker healthcheck未設定のため、HTTPで確認。 +- ローカル3000/3001と `https://pages.anya.jp/health`:すべて200。 +- HTTPSトップページ:200。 +- 未認証の `/v/plan/today`、`/v/plan/tasks`、`/v/plan/tasks/schedule`:303。認証制限を維持。 +- HTTPS配信のtasks.css / task-inline.jsのSHA-256がローカルと一致。両コンテナの対象4ファイルも一致。 +- 06:18:32 JST時点の起動後ログ集計:両方ともpanic/初期化失敗、DBロック/scheduler claim失敗、失敗ジョブの該当件数は0。 +- 再作成中の起動待ちで一時的にHTTPS 502を確認したが、起動完了後は200へ回復。無停止更新ではない。 + +本番ユーザへの代理ログインやタスク作成、外部取り込みカレンダーへのアクセスは行っていない。認証済み操作は合成fixtureで検証し、本番では起動・配信・未認証アクセス制限を確認した。 diff --git a/docs/operations/deployments/2026-09-25-task-daily-notes.md b/docs/operations/deployments/2026-09-25-task-daily-notes.md new file mode 100644 index 0000000..2f88bdf --- /dev/null +++ b/docs/operations/deployments/2026-09-25-task-daily-notes.md @@ -0,0 +1,66 @@ +# 本番反映:日別計画・親子タスク・Wikiメモ + +実施日:2026-09-25 07:07 JST。organizer.tasks 0.7.0。 + +## 対象と反映内容 + +Compose `app` / `app2`(`pageswiki` / `pageswiki-ext`)へ反映。 + +- 持ち越し・明日・任意の日付の計画、期限を変えない再割当て。 +- 親子順のcursorページング、フィルタ対象外の親の補足、別日付の子の展開。 +- 行内のWikiメモ閲覧・編集、プロジェクト配下への原子的な新規作成とUUID紐づけ。 +- 日別画面から作成するカレンダー時間枠の初期日付。 +- CSS v8、task-inline v3、tasks v6、task-planning v3。 + +アダプタゲートウェイ・code-server等の他サービスは再作成していない。 + +## 事前確認・テスト + +稼働イメージとコードをハッシュ比較し、今回の差分がタスク関連バックエンド・UI・拡張バージョンであることを確認。go.mod、go.sum、Dockerfile、migrationは変更なし。 + +- 全Goテスト成功。 +- Chromium fixture(1440/1024/390/320px)の実操作テスト成功。 +- 外部取り込みカレンダーへのアクセス、本番ユーザへの代理ログイン、本番タスク/メモのテスト作成は行っていない。 + +## バックアップと反映 + +- 旧イメージ:`sha256:e5a7b7877f7c8f8701d0152468b4ee818f9fcb181509f7d223d2c00678c80925` +- 保全タグ:`pageswiki-app:rollback-before-task-daily-notes-20260925` +- 新イメージ:`sha256:911c5d4c425dd759bbdcb15b4a559e4160af09e1d92c7f604bbb057520c94acd` + +稼働中に新イメージをビルド。2アプリを停止後、data/data2を同一停止時点でtarへ保存した。 + +- 保存先:`.deployment-backups/20260925-task-daily-notes/` +- `data-and-data2.tar`:12,068,106,240 bytes、2,426 entries。 +- ディレクトリ700、アーカイブと保存したCompose設定等は600。 +- tar作成終了コード0、一覧読み取り終了コード0を確認。復元訓練は未実施。 +- 07:06:50 JSTバックアップ完了。バックアップ後のディスク空きは約60GB、使用率92%。既存バックアップの削除はしていない。 + +`docker compose up -d --no-deps --wait --wait-timeout 180 app app2` により更新。appは07:07:02、app2は07:07:30 JST起動。停止を伴うデプロイであり無停止ではない。 + +## 反映後確認 + +- 両アプリrunning、再起動回数0。appのDocker healthはhealthy、app2はhealthcheck未設定につきHTTPで確認。 +- ローカル3000/3001と本番HTTPSの `/health` は200、HTTPSトップページも200。 +- 未認証の今日・明日・持ち越し・日別画面は303、日別一覧APIとWikiメモAPIは401。 +- HTTPS配信のCSS・3つのJavaScriptが作業ツリーのSHA-256と一致。 +- 両コンテナの変更対象バックエンド・テンプレートのSHA-256も作業ツリーと一致。 +- 認証済みの編集・新規作成操作は合成fixtureで確認。本番では疎通・配信・アクセス制限を確認し、利用者データの変更を伴う試験はしていない。 + +### スケジューラの要フォロー事項 + +app側で07:07:29および07:09:29 JSTに `event scheduler claim failed: database is locked (SQLITE_BUSY)` を確認。app2では同時区間の該当なし。07:09:55 JST時点では両側の通知配信ジョブが複数回succeededとなり、キュー処理の継続を確認。重大な初期化エラー・panic・renderエラー・失敗ジョブのログは確認区間で0。 + +今回 `ClaimDueEvent` 自体は変更していない。この処理はdeferred transactionでSELECT後にUPDATEする既存実装であり、並行writerとのロック競合対策を次の品質改善候補として残す。デプロイ作業に含めて未検証のスケジューラ改修や設定変更は行っていない。単発の起動時だけとは断定しない。 + +- [ ] claim処理の競合を隔離fixtureで再現し、原子的claim/writer予約/限定retryを比較する。本文・外部カレンダーを参照せず、二重実行防止とforeground応答を検証する。 + +最終確認07:10:47 JST:2度目のロック以降もappで2件(最終07:10:29)、app2で3件(最終07:10:31)の通知配信ジョブが成功。HTTPS healthは200。ロックの再発対策は残件だが、スケジューラが停止した状態ではない。 + +## 切り戻しの注意 + +DBスキーマ変更はないが、プロジェクト正本へ `notes_subpath` が追加される。旧バイナリでプロジェクト設定を保存するとこの項目を落とすため、利用開始後はforward-fixを優先する。作成済みメモは通常のWiki Pageで、タスクのpage_uuid紐づけを利用する。 + +旧イメージは保全済み。データ復元は反映後の更新を失うため自動では実施しない。必要時は現状も保存し、全writer停止下でDBとDocument Storeを同じバックアップ時点へ戻すことについて確認を得る。 + +残確認:実機Safari/iPhoneでの入力・操作。バックアップ保持期間と空き容量の管理は別途検討する。 diff --git a/docs/operations/deployments/2026-09-25-task-today.md b/docs/operations/deployments/2026-09-25-task-today.md new file mode 100644 index 0000000..aefacb1 --- /dev/null +++ b/docs/operations/deployments/2026-09-25-task-today.md @@ -0,0 +1,51 @@ +# 本番反映記録:タスク・時間枠・Pomodoro・Today + +実施日:2026-09-25 JST(コンテナ起動時刻は2026-09-24 UTC)。 + +## 対象と結果 + +- Composeサービス `app` / `app2`(`pageswiki` / `pageswiki-ext`)を更新。 +- アダプタゲートウェイ、code-server、Excalidraw、Kroki関連は再起動していない。 +- 旧イメージ:`sha256:69d66a1501f88b57f8b570dad488fef2bae3e3a3183b1e5ef9b5faa69c0b54b7` +- 新イメージ:`sha256:2bfab91fe4f8712a25b8e5a6cdb1494b68ccdd9433609b35ce25ae391b98bfe6` +- 旧イメージ保全タグ:`pageswiki-app:rollback-before-task-today-20260925` +- app起動:04:36:10 JST、app2起動:04:36:37 JST。両コンテナの再起動回数0。 + +## 保全と手順 + +切り替え前に `go test ./...` が成功。旧イメージをタグで保全し、稼働中に `docker compose build app` を完了。 + +切り替え時に両アプリを停止してから、dataとdata2を一緒に非圧縮tarへ保存した。DB・WAL・Document Store・その他のファイルを停止中の状態で保全し、予定の内容を調査したり外部カレンダーへ手動接続したりしていない。 + +- 保存先:プロジェクト直下 `.deployment-backups/20260925-task-today/` +- データ:`data-and-data2.tar`(12,066,856,960 bytes) +- ディレクトリ権限700、アーカイブ権限600。 +- Compose設定、Dockerfile、.dockerignoreも同じ保護ディレクトリに保存。設定の秘密を本書へ転記しない。 +- バックアップをGitとDockerビルドの対象から除外した。 +- tar終了コード正常、アーカイブ一覧を読み取れることを確認(2408 entries)。完全なリストア訓練やDB全件の整合性検査は今回実施していない。 + +保存後、`docker compose up -d --no-deps --wait --wait-timeout 180 app app2` で更新。停止を伴う反映であり、無停止デプロイではない。 + +## 本番で確認した項目 + +- ローカル3000/3001両方の `/health`:200。 +- `https://pages.anya.jp/health` と `/`:200。 +- 匿名の `/v/plan/today`:303。匿名のToday API:401。認証を迂回しない。 +- HTTPSで取得した `task-today.js?v=1` のSHA-256が作業ツリーのファイルと一致。 +- 両DBで `organizer_time_blocks` / `organizer_focus` / `organizer_focus_spans`、時間枠のtitle列を確認。 +- タスク通知・focus終了イベントの登録を確認(既定60秒)。 +- 両インスタンスで `task.activity.publish` / `task.focus.complete` / `task.reminders.deliver` が反映後に各3回成功していることを、ジョブ状態だけで確認。 + +本番で新規のタスク・予定・集中セッションを作成する書き込み試験や、利用者へのなりすましログインは実施していない。認証済みの操作・PC/モバイル表示は、反映前の隔離Chromiumテストで確認済み。 + +## 観測した注意事項 + +メインのイベント取得処理で、04:36:36 JSTにSQLite 517、04:37:36 JSTにSQLITE_BUSYが記録された。スケジューラは次回処理で継続し、04:38台に上記タスクジョブが成功。04:38以降の確認区間ではclaimエラー再発・起動失敗・panicはなし。恒久的に再発しないことを保証する確認ではない。 + +- [ ] 後続品質改善:`ClaimDueEvent`のread→write昇格時の競合、busy時の限定リトライ、claim待ち時間と失敗率を検証する。今回のデプロイ中にスケジューラの実装や運用設定は変更していない。 + +## 切り戻しの判断材料 + +旧イメージと停止時点のデータを保持している。必要時はまず新しい書き込みの有無と旧版のスキーマ/イベント互換性を確認し、切り戻し手順を選ぶ。旧タグを `pageswiki-app` に戻して対象2サービスだけを再作成する方法があるが、今回リハーサルしたものではない。 + +データの復元は切り替え以降の更新を失うため、自動実施しない。必要な場合は現状態も保全し、利用者の確認を得て、全writer停止下でDBとDocument Storeを一緒に扱う。バックアップの削除・自動期限設定も今回行っていない。 diff --git a/docs/operations/deployments/2026-09-26-chroncal-compatibility.md b/docs/operations/deployments/2026-09-26-chroncal-compatibility.md new file mode 100644 index 0000000..acda859 --- /dev/null +++ b/docs/operations/deployments/2026-09-26-chroncal-compatibility.md @@ -0,0 +1,42 @@ +# 本番修正:chroncalのタスクCalDAV互換性 + +2026-09-26 JST。organizer.tasks 0.8.1。01:00 JSTにapp/app2へ反映済み、事後確認完了。 + +## 原因 + +chroncal 0.10.0はaccount endpointの末尾slashを除去してprincipal探索する。 +タスクhomeのslashなし経路はServeMuxの301に入り、Go HTTPクライアントがPROPFINDをGETへ変えて再送し、home GETが405になった。 +前回の修正はslash付き経路の正規化循環のみを防ぎ、逆方向の301を防げていなかった。 + +## 修正 + +- slashなしhomeも明示登録し、home/collectionをslash有無どちらでも直接処理する。返却hrefは従来canonical URIを維持。 +- chroncal/go-webdavの`calendar-data/comp(name=VCALENDAR)/allprop+allcomp`を全件取得として受理。部分選択・expand・time-range制約は従来通り拒否。 +- getlastmodifiedを返す。 +- chroncalは新規PUTでIf-None-Matchを送らないため、完全な新規identityへの無条件作成のみ許可。既存上書きとアーカイブ復活は無条件では不可。transaction内のhref/UID一意性、ETag/CAS、認可は維持。 +- sync-collectionは引き続き未対応。chroncalの405→calendar-queryフォールバックで同期する。差分対応の偽装はしない。 + +## 検証 + +- chroncal 0.10.0実行ファイルで、探索・初回取得・作成・完了・Web側変更取得・削除→アーカイブ・無変更再同期を確認。 +- CLI試験は一時HOME/XDGディレクトリ・DB・fixture資格情報に限定し、ユーザーの既存chroncal設定やOS keyringを参照しない。 +- vdirsyncer/Todoman回帰、slash有無のPROPFIND、部分投影拒否、同時新規作成・無条件上書き拒否を検証。 +- 全Goテスト成功。`git diff --check`成功。 +- 本番ユーザーのタスクや外部カレンダー本文は取得しない。原因確認時の本番ログは探索メソッドとPathのみを参照。 + +## 反映 + +- 対象:app / app2のみ。他のサービスは再作成しない。 +- 旧:`sha256:02bb3d66973501804c6cbe3cd5b4ce7f644b148403eae98f88e5d9c837c667e3` +- 保全:`pageswiki-app:rollback-before-chroncal-fix-20260926` +- 新:`sha256:261e24eb1834454a9a47f70ee135269d465b3a4696048890afc492a332e32809` +- コードのみの修正。DBスキーマ・データ形式は0.8.0と同じ。直前の[0.8.0反映時バックアップ](2026-09-26-task-caldav.md)を保持し、追加フルバックアップやデータ復元は行わない。 +- 旧イメージへ切り戻すとchroncalの互換不具合は再発するが、0.8.0とのデータ互換性は変わらない。 + +## 事後確認 + +- appは01:00:32 JST、app2は01:00:57 JSTに新イメージで起動。両方running、再起動回数0。appのDocker healthはhealthy、独立healthcheckのないapp2は正しいHostで`/health`の200を確認。 +- 公開HTTPSでtask home/default collectionそれぞれslash有無のPROPFINDが、リダイレクトなしの401を返すことを確認。認証前の応答として正常であり、実アカウントの内容は取得していない。 +- app2も`Host: wiki.extpages.anya.jp`でslashなしhomeのPROPFINDが401、リダイレクトなし。 +- 起動後の確認時点では、両コンテナともfatal/DB locked/event job failed/render errorのログ件数は0。過去の障害全般の解消を意味するものではない。 +- 認証付きの探索と変更操作は前述の隔離fixtureで検証。本番資格情報の再発行やクライアント設定の削除は不要。 diff --git a/docs/operations/deployments/2026-09-26-common-caldav.md b/docs/operations/deployments/2026-09-26-common-caldav.md new file mode 100644 index 0000000..7560d2c --- /dev/null +++ b/docs/operations/deployments/2026-09-26-common-caldav.md @@ -0,0 +1,50 @@ +# 本番反映:予定・タスク共通CalDAV + +2026-09-26 JST。`organizer.tasks 0.9.0`/`organizer.calendar 0.2.0`。01:33 JSTにapp/app2へ反映完了、事後確認済み。 + +## 変更 + +[共通CalDAV設計](../../design/ja/caldav-common.md)を参照。 + +- `/_/api/v1/caldav/`で共通principalと許可されたVEVENT/VTODO collectionを探索。 +- 予定/タスク/両方のscope付き専用認証情報、共通管理API、両画面の⇄設定UI。 +- 旧タスクURL/資格情報を維持。旧資格情報に予定の権限を追加しない。 +- CLI filenameとUIDの分離、manifestへの永続化、上限付き完全snapshot、Webビューアのfilename解決。 +- DBは`organizer_dav_scopes`と資格情報削除時のscope削除triggerを追加。既存テーブルの破壊的変更なし。 +- 既存カレンダー正本の一括書換え・外部ソースの手動同期は行わない。 + +## 検証 + +- 全Goテスト成功。 +- 実chroncal 0.10.0:共通探索、予定作成/CLI更新/Web更新取得/削除、タスク双方向同期。 +- vdirsyncer/Todomanの既存タスク回帰。 +- 認証scope、read-only、失効、停止、拡張無効化、ACL取消、同時作成、索引再構築、取得上限。 +- Chromium:カレンダー既存操作とCLI filenameの表示、共通設定UI、タスク4画面サイズ(1440/1024/390/320)、資格情報発行/失効/閉じた後の秘密値消去。 +- JS構文チェック、git diff --check成功。 +- 試験は隔離fixtureと一時HOME/XDG/ブラウザprofileのみ。本番の予定・タスク本文を利用しない。 + +## 反映とバックアップ + +- 対象サービスはapp/app2のみ。 +- 旧image:`sha256:261e24eb1834454a9a47f70ee135269d465b3a4696048890afc492a332e32809` +- 保全tag:`pageswiki-app:rollback-before-common-caldav-20260926` +- 直前の停止時DB・カレンダー正本コピーを`.deployment-backups/20260926-common-caldav/`へ保存する。内容を出力・解析せず、復元は行わない。 +- 他の正本を含む[0.8.0時点の全体バックアップ](2026-09-26-task-caldav.md)も保持。今回の部分コピーを全体バックアップと取り違えない。 +- 新image:`sha256:701a97f47a8cfc8989777f06a168257116bb5b057bb574db490802e3889ae988` +- 01:32:38 JSTに停止時コピー完了。約5.8 GiB。保存先dir700、DB600、カレンダー正本はgroup/other権限を除去。復元訓練は未実施。 + +## 事後確認 + +- appは01:32:42 JST、app2は01:33:11 JSTに新imageで起動。両方running、再起動0。appはDocker health healthy。 +- 公開HTTPS `/health`とapp2の正しいHost `wiki.extpages.anya.jp`でのhealthは200。 +- 共通homeと旧task homeのslash有無、およびtask default collectionはPROPFINDにリダイレクトなしの401を返す。app2の共通homeも同様。これは資格情報なしの正常な認証要求。 +- 公開配信の`task-dav-settings.js`、`calendar.js`、`dav-settings.css`のSHA-256が検証したローカルファイルと一致。 +- 両DBのsqlite_masterで新scope表と削除triggerの存在のみ確認。資格情報や本文の値は取得しない。 +- 起動後の確認範囲で両インスタンスともfatal、DB locked、event job failed、render errorは0件。 +- 認証付きの探索・更新は隔離fixtureでの検証。本番データを試験作成/変更したり、外部取り込みカレンダー本文を取得したりしていない。 + +## 切り戻し注意 + +予定/共通用秘密値のprefixは旧バイナリでは認証不可。旧タスク専用資格情報は継続利用可能。 + +CLIで作った予定のfilename対応は新manifest項目`dav_names`にある。旧バイナリはこれを保持できないため、**反映後にCLIで予定を作成した場合、旧版へ戻してカレンダーを編集しない**。緊急時はカレンダー拡張を無効化して修正版へ進むことを優先する。過去データへの復元は更新喪失を伴う別操作であり、自動実行しない。 diff --git a/docs/operations/deployments/2026-09-26-task-caldav.md b/docs/operations/deployments/2026-09-26-task-caldav.md new file mode 100644 index 0000000..8188309 --- /dev/null +++ b/docs/operations/deployments/2026-09-26-task-caldav.md @@ -0,0 +1,56 @@ +# 本番反映:タスクCalDAV/CLI連携 + +実施日:2026-09-26 JST。organizer.tasks 0.8.0。 +状態:2026-09-26 00:24 JST、本番反映完了。 + +## 対象 + +Compose `app` / `app2`(`pageswiki` / `pageswiki-ext`)。 +タスク専用VTODOコレクション、専用資格情報UI/API、条件付き更新・アーカイブ同期。 +アダプタなど他サービスの再作成は行わない。 + +## 事前確認 + +- 稼働中イメージのソース・静的ファイル・テンプレートとローカルをSHA-256比較。差分は今回のタスクCalDAV関連15ファイルのみ。go.mod、go.sum、Dockerfile変更なし。 +- 全Goテスト成功。最初の実行はサンドボックスのlisten制限で中断し、権限を切り替えた再実行で成功。 +- vdirsyncer/Todomanの実CLI同期試験、Chromiumの1440/1024/390/320px試験を隔離fixtureで再実行し成功。 +- 本番ユーザーの代理ログイン、タスク作成、外部取り込みカレンダーの内容参照は実施しない。 + +## イメージとバックアップ + +- 旧イメージ:`sha256:911c5d4c425dd759bbdcb15b4a559e4160af09e1d92c7f604bbb057520c94acd` +- 旧イメージ保全タグ:`pageswiki-app:rollback-before-task-caldav-20260926` +- 最終イメージ:`sha256:02bb3d66973501804c6cbe3cd5b4ce7f644b148403eae98f88e5d9c837c667e3` +- 初回反映イメージ(下記修正前):`sha256:0e838cfcf410b1d5dcdff9b8985b301be3e6478ba0c434c18d4b7cb6a9c5cc39` +- 停止時バックアップ:`.deployment-backups/20260926-task-caldav/data-and-data2.tar` +- 保存ディレクトリ700、tarと設定コピー600。バックアップ失敗時は旧コンテナを再起動する手順。 +- 00:20:29 JSTバックアップ完了。12,081,100,800 bytes、2,426 entries。tar作成と一覧読み取りの終了コード0。復元訓練は未実施。 +- バックアップ後の空き約49GB、使用率93%。既存バックアップは削除していない。保持期間・容量管理は残課題。 + +## 本番確認で発見・修正した問題 + +初回起動後、共通`NormalizePath`がCalDAV collectionの末尾スラッシュを除去し、ServeMuxが付け直す301循環を確認した。初回CLI fixtureは認証とmuxのみを通っており、この共通middlewareを検証できていなかった。 + +`/_/api/v1/caldav/`配下では末尾スラッシュを保持するよう修正。通常Wiki Pathの正規化は変更しない。GET/OPTIONS/PROPFIND/REPORTの回帰テストを追加し、実CLI試験も本番と同じ`Server.handler()`全体を通す方式へ変更した。これにより既存予定CalDAVのcollectionも循環しなくなる。 + +修正後、全Goテストと実CLI試験を再実行して成功。再ビルド・再反映し、appは00:23:42、app2は00:24:09 JSTに起動。コードのみの再反映でデータ復元は行っていない。 + +## 切り戻しの注意 + +起動時に`organizer_dav_resources`と`organizer_dav_credentials`を追加し、既存タスクのDAV索引を登録する。 +CLI由来の同期ID・リソース名・ICSメタデータは正本TaskRecordの`caldav`に保存する。 +旧バイナリで新形式のタスクを更新するとこのフィールドが失われうるため、利用開始後はforward-fixを優先する。 +緊急時はまず`organizer.tasks`無効化で当該機能を停止する。旧イメージへの切り戻し時はこの互換性制約を考慮する。 +DBとCASを復元する場合は反映後の更新が失われるため、自動復元せず、現状の追加バックアップと確認を経て全writer停止下で行う。 + +## 事後確認 + +- 両インスタンスが最終イメージでrunning、再起動回数0。appはDocker healthがhealthy。app2には独立healthcheckがないためHTTPで確認。 +- ローカル3000/3001と`https://pages.anya.jp/health`は200。 +- 本番HTTPSのタスクDAV home/collectionは未認証401。PROPFINDも401、`WWW-Authenticate: Basic realm="PagesWiki task CalDAV", charset="UTF-8"`。循環リダイレクト解消。 +- 資格情報管理APIは未認証401、タスク画面はログインへの303。 +- 新JSとCSSのHTTPS配信SHA-256はローカルと一致。両コンテナのDAVコード・テンプレート・正規化修正も一致。 +- 両DBはread-onlyでsqlite_masterのみを調べ、追加する2テーブルの存在を確認。外部カレンダー内容は参照していない。 +- app2に`Host: pages.anya.jp`を渡した際の404は配置外ホストのため。実際の配置先`wiki.extpages.anya.jp`ではhealth 200、DAVと資格情報API 401、タスク画面303を確認。 +- 00:25:10 JST時点の再起動後ログ集計では、両側ともfatal/panic、DB locked、失敗ジョブ、renderエラーは0件。これは当該観測区間の結果で、過去に記録したスケジューラの競合課題を解決したという意味ではない。 +- 本番のユーザー代理ログインや資格情報発行、タスク変更は行わない。認証後の操作は隔離した本番同等handlerの実CLI fixtureで確認。 diff --git a/docs/operations/deployments/2026-09-27-default-task-list-name.md b/docs/operations/deployments/2026-09-27-default-task-list-name.md new file mode 100644 index 0000000..b886995 --- /dev/null +++ b/docs/operations/deployments/2026-09-27-default-task-list-name.md @@ -0,0 +1,35 @@ +# 本番反映:既定タスクリストの名前変更 + +2026-09-27、`organizer.tasks 0.11.1`。[仕様・検証](../../design/ja/task-dav-default-list-name.md)。利用者の本番反映依頼に基づき、app/app2のみ更新した。 + +## 変更 + +既定リスト`/_/api/v1/caldav/tasks/default/`のDAV:displaynameをPROPPATCHで変更できる。個人・domain別の設定として保存し、共通home/task home/リスト自身の探索結果へ反映する。タスクの所属、UID、本文、revisionは変えない。実際の表示名は利用者がクライアントから設定するため、本作業では変更しなかった。 + +## イメージと保全 + +- 旧image:`sha256:2f0400639d6a6263292431bba160d2ede457743db6361c8b4ad677395eb5eaf1` +- 旧image保全tag:`pageswiki-app:rollback-before-default-list-name-20260927` +- 新image:`sha256:3ee1b6b5ff24154c05990f02f112db7052b5a9bfb9894e5e9020a55fbb539d8c` +- `docker compose build app app2`成功。直前の名前変更・認可・原子性テスト成功。全Go/実CLI同期試験は実装時に成功済み。 +- 両app停止後、DBと存在するWAL/SHMを`.deployment-backups/20260927-default-task-list-name/`へコピーし、cmpで一致を確認。ディレクトリ700、ファイル600、合計5.8 GiB。 +- 正本全体のバックアップではなく停止時DBの保全。今回の新規表は個人設定用の`organizer_dav_default_lists`。 +- `docker compose up -d --no-deps app app2`で反映。他のサービス・過去backup/imageは変更・削除していない。 + +## 反映確認 + +- appは**12:51:13 JST**、app2は**12:51:41 JST**に新imageで起動。両方running/再起動0。appのDocker healthはhealthy。 +- 公開HTTPS health、app2の正しいHostでのhealthは200。 +- 両方で未認証PROPPATCHは401。認証情報やタスク本文は取得せず、認証済みの名前変更要求も本番には送っていない。 +- 両DBに設定表が存在し、保存名は確認時点で0件。既存タスクや設定名を勝手に変更していない。 +- appはプロジェクト3件、タスク5件、revision25件、リスト対応3件で更新前後一致。app2は全て0件で一致。 +- 両コンテナ内の名前変更handler/設定store/DAV handler/共通home/schema/拡張registryの6ファイルのSHA-256がローカルと一致。 +- 起動後の確認範囲で、event job failed/fatal・panic/database locked/render errorは両方0。以前記録したscheduler claimの競合TODOを解決したという意味ではない。 + +## 利用者確認・運用上の残件 + +Tasks.org側で既定リストの名前変更を再試行する。名前変更・別端末への反映の実機確認は利用者待ち。色・アイコン・通常プロジェクトのPROPPATCHは今回の対象外。 + +作業後のディスクは空き約18 GiB、使用率98%。過去のbackup/imageは削除しておらず、今後の大きな更新前に容量整理が必要。 + +切戻し用imageは保全済み。旧0.11.0では保存名を利用せず既定表示名へ戻るが、追加表は残る。新しい編集を消すDBの無断復元は行わない。 diff --git a/docs/operations/deployments/2026-09-27-onetask.md b/docs/operations/deployments/2026-09-27-onetask.md new file mode 100644 index 0000000..0b58dd5 --- /dev/null +++ b/docs/operations/deployments/2026-09-27-onetask.md @@ -0,0 +1,52 @@ +# 本番反映:OneTask向けCalDAV接続判定互換 + +2026-09-27 10:01 JST。app/app2へ反映済み、事後確認完了。 + +## 追記:10:16〜10:17 JST 接続診断ログ + +- 利用者からOneCalendarで追加成功、その後OneTaskでも追加成功との報告。OneTaskでの同期・更新の実機確認は別途必要。成功に至った順序の因果関係は未確定。 +- CalDAVのアクセスログに応答ステータス、認証方式・結果の固定分類、マスクされた対象種別、request IDを追加。秘密値・本文・実リソース名は記録しない。認証条件・ACL・DBスキーマは変更していない。 +- 旧image:`sha256:62006f4e7d720b7e0aeeb40cbfb10aab8dc6022d58836cc886404bab4fb4f0e5`、保全tag:`pageswiki-app:rollback-before-dav-diagnostics-20260927`。 +- 新image:`sha256:71999001d598732a6e4fa05b8cc4b8d3dc3158679cbaa43895d81bc0390c63f8`。 +- 全Goテスト、秘匿性を含む診断ログ単体テスト、隔離chroncalのタスク/共通CalDAV実機CLI回帰試験成功。 +- app起動10:16:49、app2起動10:17:16 JST。両方running、再起動0、app healthy。両方のhealth200、未認証OPTIONS401を確認。 +- 10:17:27に認証済み共通入口PROPFIND207を観測。MKCALENDARは404で未対応(既存タスクの追加・更新とは別)。アプリ種別はログに含めないため、要求元アプリは断定しない。 +- DB・正本への追加変更がないため新規の大容量DBコピーは作らず、同日10:01のバックアップを保持。旧imageへの切戻しで診断ログ追加のみ撤回可能。 + +## 背景 + +利用者が再試行しても同じcalendar-accessエラーとなった原因を確認したところ、本番両インスタンスは共通CalDAV初版imageのままだった。前回は実装・隔離試験までで本番反映を行っていなかった。今回は依頼済みの本番展開まで完了させる。 + +## 変更・互換性 + +[設計と制限](../../design/ja/caldav-onetask-compatibility.md)を参照。資格情報発行時にOneTask互換モードを明示ONにした場合のみ、`DAV: 1, calendar-access`を返す。既存資格情報を勝手に変更しない。完全なRFC準拠を意味する実装ではなく、OPTIONS接続判定の互換設定。未対応データは引き続き拒否する。 + +本番反映だけでは既存の資格情報の応答は変わらない。利用者は⇄から互換ONの新規資格情報を発行し、OneTaskの接続情報を更新する。掲載されてしまった旧秘密値は失効・再発行を推奨し、作業者はその値を使用しない。 + +## 検証 + +- 前回実装時:OPTIONS gateと後続DAV CRUD・認可試験、chroncal/vdirsyncer回帰、カレンダーとタスク4画面幅のChromium試験成功。 +- 反映直前に全Goテスト、git diff --check、JS構文チェックを再実行して成功。 +- OneTask実機でのアカウント追加・同期完了は未確認。未観測の後続要求には追加対応が必要な可能性がある。 +- 本番の認証情報・予定・タスク・外部カレンダー本文を動作試験に使用しない。 + +## イメージとバックアップ + +- 旧:`sha256:701a97f47a8cfc8989777f06a168257116bb5b057bb574db490802e3889ae988` +- 旧image保全:`pageswiki-app:rollback-before-onetask-20260927` +- 新:`sha256:62006f4e7d720b7e0aeeb40cbfb10aab8dc6022d58836cc886404bab4fb4f0e5` +- app/app2だけを停止・更新。他のサービスは変更しない。 +- 停止時DBコピー:`.deployment-backups/20260927-onetask/`。directory700、DB600。DB表`organizer_dav_compat`と削除triggerの追加のみで、既存カレンダー正本の書換えは行わない。 +- 10:01:12 JSTに約5.8 GiBのコピー完了。 +- このコピーはDBのみであり、全体バックアップではない。復元は未実施。 +- 旧imageへ戻す場合は互換設定が無視され、今回のエラーは再発する。DBの破壊的な巻戻しは不要。 + +## 事後確認 + +- appは10:01:14 JST、app2は10:01:42 JSTに新imageで起動。両方running、再起動0。appはDocker health healthy。 +- 公開HTTPSのhealthと、app2の正しいHost `wiki.extpages.anya.jp`でのhealthが200。 +- 公開JS/CSSのSHA-256がローカルの互換モード実装と一致。両コンテナ内の`dav_capabilities.go`もローカルと一致。 +- 両DBのsqlite_masterから追加表・triggerの存在のみ確認。資格情報の値は取得していない。 +- 共通入口のslash有無で未認証OPTIONSは401、リダイレクトなし。認証付きの互換宣言は隔離試験で検証済みだが、本番の既存資格情報での試験はしていない。 +- 起動後の確認範囲ではfatal・DB locked・event job failed・render errorはいずれも0。 +- 利用者による互換ONの新規資格情報発行とOneTask実機確認が必要。 diff --git a/docs/operations/deployments/2026-09-27-task-lists.md b/docs/operations/deployments/2026-09-27-task-lists.md new file mode 100644 index 0000000..3dde010 --- /dev/null +++ b/docs/operations/deployments/2026-09-27-task-lists.md @@ -0,0 +1,35 @@ +# 本番反映:OneTaskのVTODOリスト作成 + +2026-09-27、`organizer.tasks 0.10.0`。[詳細設計](../../design/ja/caldav-task-lists.md)。 + +## 対象と変更 + +OneTaskの`SyncTaskListsSend`が発行するMKCALENDARに201を返し、そのURIを独立したタスクリストとして保存・探索・同期する。固定リストへの単純aliasにはしない。リストは既存の版付きプロジェクトに対応付ける。認証・scope・ETag・所有者分離・拡張無効化を維持する。 + +app/app2のみ反映。外部カレンダー本文や本番資格情報を試験に使わない。新規作成後のOneTask実機同期成功は利用者確認待ち。 + +## 検証 + +- 全Goテスト成功。 +- OneTaskの提示XML形状で201→PROPFIND→PUT→REPORT/GET→更新→DELETEの隔離試験成功。 +- 不正XML、未対応property/component、並行再作成、権限、既存VEVENT URIとの衝突、リスト分離、索引再構築、Webでの所属変更を検証。 +- chroncalの固定・共通・名前付きリストの同期、vdirsyncer/Todoman回帰成功。 +- タスク/カレンダーのChromium回帰成功。 + +## 保全と切戻し + +- 反映前image:`sha256:71999001d598732a6e4fa05b8cc4b8d3dc3158679cbaa43895d81bc0390c63f8` +- 保全tag:`pageswiki-app:rollback-before-task-lists-20260927` +- 反映image:`sha256:86dfde6d962227cf1e653e3ad5b955847a124f570079fb04a06ae0e5a8373ce5` +- 両appを停止した上でDB/WAL/SHMを`.deployment-backups/20260927-task-lists/`へコピー。ディレクトリ700、ファイル600。これはDBの保全であり正本全体のバックアップではない。移行自体は表追加・索引登録のみで正本文書を書き換えない。 +- 名前付きリスト作成後の切戻しでは先にタスク拡張を停止する。旧バイナリで該当プロジェクトを編集すると未知のdav_collectionが失われ得る。新規タスクを消すようなDB復元は別途承認なしで行わない。 + +## 反映後確認 + +- 2026-09-27 10:44:50 JSTにapp、10:45:17 JSTにapp2が新imageで起動。両方running、再起動0。appのDocker healthはhealthy。 +- 公開HTTPSのhealthとapp2の正しいHostでのhealthは200。未認証共通DAV OPTIONSは401で認証制限を維持。 +- 両DBのsqlite_masterからorganizer_dav_collections表の存在を確認(タスク・予定データは取得しない)。 +- 両コンテナ内のtask_dav_collections.goのSHA-256がローカルと一致。 +- 反映後の確認範囲でfatal、DB locked、event job failed、render errorは0。 +- 停止時DBコピーは5.8 GiB。復元は実施していない。 +- 利用者へ、アカウント再作成なしでOneTaskの再同期を依頼。OneTask実機の最終成功は未確認。 diff --git a/docs/operations/deployments/2026-09-27-task-unification.md b/docs/operations/deployments/2026-09-27-task-unification.md new file mode 100644 index 0000000..565bb39 --- /dev/null +++ b/docs/operations/deployments/2026-09-27-task-unification.md @@ -0,0 +1,53 @@ +# 本番反映:タスク所属統一と上書き同期 + +2026-09-27、`organizer.tasks 0.11.0`。[設計と次段階TODO](../../design/ja/task-dav-project-unification.md)。利用者が端末側の未送信変更を保全したことを確認し、本番反映の依頼を受けて実施。 + +## 反映対象 + +- app/app2のみ更新。他の連携アダプタ等は更新していない。 +- 既定リストはプロジェクトなしに限定し、通常Webプロジェクトも個別のCalDAVリストとして公開。既存MKCALENDARリストのURLは維持。 +- 条件なしPUT/DELETEはトークン別設定なしで受理。版履歴とDB transactionは維持。明示ETagの不一致は412。 +- 競合通知・採否選択は未実装で、次段階TODO。 + +## ビルド・保全 + +- 旧image:`sha256:86dfde6d962227cf1e653e3ad5b955847a124f570079fb04a06ae0e5a8373ce5` +- 旧image保全tag:`pageswiki-app:rollback-before-task-unification-20260927` +- 新image:`sha256:2f0400639d6a6263292431bba160d2ede457743db6361c8b4ad677395eb5eaf1` +- 稼働中に`docker compose build app app2`を完了後、両appを停止。DBと存在するWAL/SHMを`.deployment-backups/20260927-task-unification/`のdata/data2へコピーし、`cmp`で一致を確認。ディレクトリ700、ファイル600。 +- コピーサイズ5.8 GiB。正本全体のバックアップではなく、停止時DBの保全。今回の移行は索引・移行メタデータの変更であり、タスク本文・版を変更しない。 +- `docker compose up -d --no-deps app app2`で反映。 +- 作業後ディスク空き約24 GiB、使用率97%。旧image/過去backupは削除していない。容量整理は別途必要。 + +## 起動・確認 + +- app:2026-09-27 **12:18:23 JST**に新imageで起動。running、healthy、再起動0。 +- app2:同日 **12:18:48 JST**に新imageで起動。running、再起動0(個別Docker healthcheckなし)。 +- 公開`https://pages.anya.jp/health`、app2の正しいHostでのhealthは200。 +- 未認証の共通CalDAV OPTIONS、新しいプロジェクトリストURI、app2のCalDAVは401。認証を迂回しない。 +- 両コンテナの`internal/store/task_dav.go`、`internal/server/task_dav.go`、`internal/extensions/registry.go`のSHA-256はローカルと一致。 +- 移行後のルーティング対応漏れ・不一致はいずれのDBも0。 + +本文を取得しない集計結果: + +| 項目 | app 更新前 → 更新後 | app2 更新前 → 更新後 | +| --- | --- | --- | +| プロジェクト数 | 3 → 3 | 0 → 0 | +| CalDAVリスト対応数 | 1 → 3 | 0 → 0 | +| タスク数 | 5 → 5 | 0 → 0 | +| リビジョン数 | 25 → 25 | 0 → 0 | +| 旧hrefの移行記録数(更新後) | 4 | 0 | + +外部取り込みカレンダー・本番タスクの本文や資格情報は取得せず、認証済みDAVを実データへ発行していない。書き込み動作は前段の隔離テストで検証済み。Tasks.org Desktop実機の再探索・同期は利用者確認待ち。 + +## 観測した警告・後続作業 + +主インスタンスで`event scheduler claim failed: database is locked`が確認時点で5件(03:18:47、03:19:47、03:20:47 UTCの観測)発生。副インスタンスでは未検出。ジョブ実行失敗・fatal・render errorは確認範囲で0。更新後に開始されたジョブの状態集計は主24件・副21件がsucceededで、処理停止は確認していない。**警告を解消したとは扱わない。** + +TODO:`Store.ClaimDueEvent`のdeferred transactionでSELECT後にUPDATEする箇所の書き込み競合を調査する。writer取得・原子的claim・上限付きretryを比較し、二重claimしない隔離並行試験とともに別変更で是正する。今回の移行と因果関係があるとは断定しない。 + +## 再同期と切戻しの注意 + +端末でリストを再探索し、通常Webプロジェクトの新しいリストを同期対象へ追加する。既定リストPagesWiki Tasksは「プロジェクトなし」のみ。古いURLへの未送信書き込みで409 `task_collection_relocated`になった場合は、新しい所属リストを確認して保全済みの変更を反映する。アカウント削除やローカルデータ消去は行っていない。 + +旧版へ戻すと通常プロジェクトが既定リストへ再混在するため、緊急切戻しはまずタスク拡張を停止して判断する。旧DBコピーを無断で戻して反映後の新しい編集を消さない。 diff --git a/go.mod b/go.mod index 261548b..69549d3 100644 --- a/go.mod +++ b/go.mod @@ -1,23 +1,37 @@ module pageswiki -go 1.25 +go 1.25.0 require ( github.com/JohannesKaufmann/html-to-markdown/v2 v2.3.0 + github.com/go-ldap/ldap/v3 v3.4.8 github.com/gomarkdown/markdown v0.0.0-20260417124207-7d523f7318df github.com/google/uuid v1.6.0 + github.com/microcosm-cc/bluemonday v1.0.27 golang.org/x/text v0.22.0 modernc.org/sqlite v1.32.0 ) +require ( + github.com/Azure/go-ntlmssp v0.1.1 // indirect + github.com/SherClockHolmes/webpush-go v1.4.0 + github.com/go-asn1-ber/asn1-ber v1.5.8 // indirect + github.com/golang-jwt/jwt/v5 v5.2.1 // indirect +) + require ( github.com/JohannesKaufmann/dom v0.2.0 // indirect + github.com/aymerick/douceur v0.2.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect + github.com/emersion/go-ical v0.0.0-20250609112844-439c63cef608 + github.com/gorilla/css v1.0.1 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/mattn/go-isatty v0.0.22 // indirect github.com/ncruces/go-strftime v0.1.9 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect - golang.org/x/net v0.35.0 // indirect + github.com/teambition/rrule-go v1.8.2 + golang.org/x/crypto v0.33.0 + golang.org/x/net v0.35.0 golang.org/x/sys v0.30.0 // indirect modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect modernc.org/libc v1.55.3 // indirect diff --git a/go.sum b/go.sum index cd04de0..21e0ba6 100644 --- a/go.sum +++ b/go.sum @@ -1,19 +1,62 @@ +github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= +github.com/Azure/go-ntlmssp v0.1.1 h1:l+FM/EEMb0U9QZE7mKNEDw5Mu3mFiaa2GKOoTSsNDPw= +github.com/Azure/go-ntlmssp v0.1.1/go.mod h1:NYqdhxd/8aAct/s4qSYZEerdPuH1liG2/X9DiVTbhpk= github.com/JohannesKaufmann/dom v0.2.0 h1:1bragmEb19K8lHAqgFgqCpiPCFEZMTXzOIEjuxkUfLQ= github.com/JohannesKaufmann/dom v0.2.0/go.mod h1:57iSUl5RKric4bUkgos4zu6Xt5LMHUnw3TF1l5CbGZo= github.com/JohannesKaufmann/html-to-markdown/v2 v2.3.0 h1:e+ZfpzWc28HIrpIwT+J0wvlK6zkb0ffXHDH9I4QF4lU= github.com/JohannesKaufmann/html-to-markdown/v2 v2.3.0/go.mod h1:CD7yrhaD1dBDORPdjkpBrvnrzVIs9kZM6SRteYYUqdA= +github.com/SherClockHolmes/webpush-go v1.4.0 h1:ocnzNKWN23T9nvHi6IfyrQjkIc0oJWv1B1pULsf9i3s= +github.com/SherClockHolmes/webpush-go v1.4.0/go.mod h1:XSq8pKX11vNV8MJEMwjrlTkxhAj1zKfxmyhdV7Pd6UA= +github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI= +github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4= +github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= +github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/emersion/go-ical v0.0.0-20250609112844-439c63cef608 h1:5XWaET4YAcppq3l1/Yh2ay5VmQjUdq6qhJuucdGbmOY= +github.com/emersion/go-ical v0.0.0-20250609112844-439c63cef608/go.mod h1:BEksegNspIkjCQfmzWgsgbu6KdeJ/4LwUZs7DMBzjzw= +github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= +github.com/go-asn1-ber/asn1-ber v1.5.8 h1:H9AZkK22UOmfX8J84ubyaZxKJZ3FMHVwn8swoMML7iQ= +github.com/go-asn1-ber/asn1-ber v1.5.8/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= +github.com/go-ldap/ldap/v3 v3.4.8 h1:loKJyspcRezt2Q3ZRMq2p/0v8iOurlmeXDPw6fikSvQ= +github.com/go-ldap/ldap/v3 v3.4.8/go.mod h1:qS3Sjlu76eHfHGpUdWkAXQTw4beih+cHsco2jXlIXrk= +github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= +github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/gomarkdown/markdown v0.0.0-20260417124207-7d523f7318df h1:Mwihr/o+v4L5h56rwHLOE20+hh7Okhwno5BHz3zDuao= github.com/gomarkdown/markdown v0.0.0-20260417124207-7d523f7318df/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo= github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= +github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= +github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= +github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= +github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= +github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= +github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= +github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= +github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= +github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= +github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg= +github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= +github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= +github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= +github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8= +github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= +github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= +github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= +github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk= +github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA= github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4= github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -24,20 +67,105 @@ github.com/sebdah/goldie/v2 v2.5.5 h1:rx1mwF95RxZ3/83sdS4Yp7t2C5TCokvWP4TBRbAyEW github.com/sebdah/goldie/v2 v2.5.5/go.mod h1:oZ9fp0+se1eapSRjfYbsV/0Hqhbuu3bJVvKI/NNtssI= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/teambition/rrule-go v1.8.2 h1:lIjpjvWTj9fFUZCmuoVDrKVOtdiyzbzc93qTmRVe/J8= +github.com/teambition/rrule-go v1.8.2/go.mod h1:Ieq5AbrKGciP1V//Wq8ktsTXwSwJHDD5mD/wLBGl3p4= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic= github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= +golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ= modernc.org/cc/v4 v4.21.4/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ= modernc.org/ccgo/v4 v4.19.2 h1:lwQZgvboKD0jBwdaeVCTouxhxAyN6iawF3STraAal8Y= diff --git a/internal/address/model.go b/internal/address/model.go index 8dee52d..4488559 100644 --- a/internal/address/model.go +++ b/internal/address/model.go @@ -8,7 +8,7 @@ const ( SchemePath Scheme = "path" // UUID is described 'uuid:123e4567-e89b-42d3-a456-426614174000' SchemeUUID Scheme = "uuid" - // Revision described 'rev:1' + // Revision is described 'rev:018f6b5d-...' SchemeRevision Scheme = "rev" // Revision is described 'sha256:9a271f2a916b0b6ee6cecb2426f0b3206ef074578be55d9bc94f6f3fe3ab86aa' SchemeSHA256 Scheme = "sha256" diff --git a/internal/calendar/calendar_test.go b/internal/calendar/calendar_test.go new file mode 100644 index 0000000..7679eb5 --- /dev/null +++ b/internal/calendar/calendar_test.go @@ -0,0 +1,247 @@ +package calendar + +import ( + "context" + "database/sql" + "errors" + "os" + "path/filepath" + "strings" + "sync" + "testing" + "time" + + "github.com/google/uuid" + _ "modernc.org/sqlite" +) + +func fixture(t *testing.T) (*Repository, string, string, Calendar) { + t.Helper() + db, e := sql.Open("sqlite", filepath.Join(t.TempDir(), "cache.db")) + if e != nil { + t.Fatal(e) + } + db.SetMaxOpenConns(1) + t.Cleanup(func() { db.Close() }) + r, e := New(t.TempDir(), db) + if e != nil { + t.Fatal(e) + } + domain, actor := uuid.NewString(), uuid.NewString() + c, e := r.Create(context.Background(), domain, actor, "予定") + if e != nil { + t.Fatal(e) + } + return r, domain, actor, c +} +func sample(t *testing.T, uid string, start, end string, allDay bool) Event { + t.Helper() + a, e := time.Parse(time.RFC3339, start) + if e != nil { + t.Fatal(e) + } + b, e := time.Parse(time.RFC3339, end) + if e != nil { + t.Fatal(e) + } + v, e := Build("", Event{UID: uid, Summary: "会議, 東京; test\n次行", Start: a, End: b, AllDay: allDay}) + if e != nil { + t.Fatal(e) + } + return v +} +func TestCalendarICalendarValidation(t *testing.T) { + v := sample(t, "a@example.org", "2026-09-30T23:00:00Z", "2026-10-01T02:00:00Z", false) + long := v + long.Summary = strings.Repeat("日本語", 100) + long, e := Build(v.Data, long) + if e != nil { + t.Fatal(e) + } + for _, line := range strings.Split(long.Data, "\r\n") { + if len(line) > 75 { + t.Fatal("unfolded long output line") + } + } + if !strings.Contains(v.Data, "\r\n") || !strings.Contains(v.Data, `SUMMARY:会議\, 東京\; test\n次行`) { + t.Fatal(v.Data) + } + for _, data := range []string{ + strings.Replace(v.Data, "DTSTART:", "DTSTART;TZID=Asia/Tokyo:", 1), + strings.Replace(v.Data, "20260930T230000Z", "20260930T230000", 1), + strings.Replace(v.Data, "END:VEVENT", "RRULE:FREQ=DAILY\r\nEND:VEVENT", 1), + strings.Replace(v.Data, "END:VEVENT", "UID:duplicate\r\nEND:VEVENT", 1), + strings.Replace(v.Data, "20261001T020000Z", "20260930T220000Z", 1), + strings.Replace(v.Data, "VERSION:2.0", "VERSION:1.0", 1), + v.Data + v.Data, + } { + if _, e := Parse(data); !errors.Is(e, ErrInvalid) { + t.Fatalf("accepted invalid input: %v\n%s", e, data) + } + } + extended := strings.Replace(v.Data, "END:VEVENT", "X-PAGESWIKI-TEST:keep-me\r\nEND:VEVENT", 1) + v, e = Parse(extended) + if e != nil { + t.Fatal(e) + } + v.Summary = "changed" + changed, e := Build(v.Data, v) + if e != nil || !strings.Contains(changed.Data, "X-PAGESWIKI-TEST:keep-me") { + t.Fatal(e, changed.Data) + } +} +func TestCalendarMonthlyCommitIndexAndACL(t *testing.T) { + r, domain, actor, c := fixture(t) + ctx := context.Background() + v := sample(t, "stable", "2026-09-30T23:00:00Z", "2026-10-01T02:00:00Z", false) + if _, e := r.Change(ctx, domain, c.ID, actor, v.UID, "*", &v); e != nil { + t.Fatal(e) + } + lo := time.Date(2026, 10, 1, 0, 0, 0, 0, time.UTC) + items, e := r.Query(ctx, domain, c.ID, actor, lo, lo.Add(24*time.Hour)) + if e != nil || len(items) != 1 { + t.Fatal(items, e) + } + if _, e = r.Event(ctx, domain, c.ID, "", v.UID); !errors.Is(e, ErrMissing) { + t.Fatal("anonymous read", e) + } + if _, e = r.Change(ctx, domain, c.ID, actor, v.UID, "*", &v); !errors.Is(e, ErrConflict) { + t.Fatal("duplicate overwrite", e) + } + moved := sample(t, v.UID, "2026-11-01T01:00:00Z", "2026-11-01T02:00:00Z", false) + if _, e = r.Change(ctx, domain, c.ID, actor, v.UID, v.ETag, &moved); e != nil { + t.Fatal(e) + } + // Simulated lost/discarded cache must reconstruct only the committed manifest. + if _, e = r.DB.Exec(`DELETE FROM calendar_event_cache;DELETE FROM calendar_month_cache;DELETE FROM calendar_index_state`); e != nil { + t.Fatal(e) + } + got, e := r.Event(ctx, domain, c.ID, actor, v.UID) + if e != nil || !got.Start.Equal(moved.Start) { + t.Fatal(got, e) + } + c, e = r.Get(domain, c.ID, actor) + if e != nil { + t.Fatal(e) + } + if len(c.Months) != 1 || c.Months["2026-11"] == "" { + t.Fatal(c.Months) + } + other := uuid.NewString() + c, e = r.Settings(ctx, domain, c.ID, actor, c.Version, c.Name, true, map[string]string{other: "read"}) + if e != nil { + t.Fatal(e) + } + if _, e = r.Event(ctx, domain, c.ID, "", v.UID); e != nil { + t.Fatal(e) + } + if _, e = r.Change(ctx, domain, c.ID, other, v.UID, moved.ETag, nil); !errors.Is(e, ErrForbidden) { + t.Fatal(e) + } + if _, e = r.Settings(ctx, domain, c.ID, other, c.Version, "bad", false, nil); !errors.Is(e, ErrForbidden) { + t.Fatal(e) + } + if _, e = r.Change(ctx, domain, c.ID, actor, v.UID, moved.ETag, nil); e != nil { + t.Fatal(e) + } + if _, e = r.Event(ctx, domain, c.ID, actor, v.UID); !errors.Is(e, ErrMissing) { + t.Fatal(e) + } +} +func TestCalendarConcurrentConditionalWrite(t *testing.T) { + r, domain, actor, c := fixture(t) + ctx := context.Background() + v := sample(t, "race", "2026-09-20T00:00:00Z", "2026-09-21T00:00:00Z", true) + if _, e := r.Change(ctx, domain, c.ID, actor, v.UID, "*", &v); e != nil { + t.Fatal(e) + } + var wg sync.WaitGroup + results := make(chan error, 2) + for _, title := range []string{"one", "two"} { + wg.Add(1) + go func(title string) { + defer wg.Done() + n := v + n.Summary = title + n, e := Build(v.Data, n) + if e == nil { + _, e = r.Change(ctx, domain, c.ID, actor, v.UID, v.ETag, &n) + } + results <- e + }(title) + } + wg.Wait() + close(results) + ok, conflict := 0, 0 + for e := range results { + if e == nil { + ok++ + } else if errors.Is(e, ErrConflict) { + conflict++ + } else { + t.Fatal(e) + } + } + if ok != 1 || conflict != 1 { + t.Fatal(ok, conflict) + } +} + +func TestCalendarDeleteRemovesCanonicalFilesCacheAndDefaults(t *testing.T) { + r, domain, actor, created := fixture(t) + ctx := context.Background() + event := sample(t, "delete-me", "2026-09-22T09:00:00Z", "2026-09-22T10:00:00Z", false) + if _, err := r.Change(ctx, domain, created.ID, actor, event.UID, "*", &event); err != nil { + t.Fatal(err) + } + if err := r.SaveDefaults(ctx, domain, actor, []string{created.ID}); err != nil { + t.Fatal(err) + } + fresh, err := r.Get(domain, created.ID, actor) + if err != nil { + t.Fatal(err) + } + if err = r.Delete(ctx, domain, created.ID, uuid.NewString(), fresh.Version); !errors.Is(err, ErrForbidden) { + t.Fatal("non-owner delete", err) + } + if err = r.Delete(ctx, domain, created.ID, actor, created.Version); !errors.Is(err, ErrConflict) { + t.Fatal("stale delete", err) + } + dir, _ := r.dir(domain, created.ID) + if err = r.Delete(ctx, domain, created.ID, actor, fresh.Version); err != nil { + t.Fatal(err) + } + if _, err = os.Stat(dir); !os.IsNotExist(err) { + t.Fatal("canonical calendar remains", err) + } + if _, err = r.Get(domain, created.ID, actor); !errors.Is(err, ErrMissing) { + t.Fatal("deleted calendar readable", err) + } + defaults, err := r.Defaults(domain, actor) + if err != nil || len(defaults) != 0 { + t.Fatal("deleted default retained", defaults, err) + } + for _, table := range []string{"calendar_event_cache", "calendar_month_cache", "calendar_index_state"} { + var count int + if err = r.DB.QueryRow(`SELECT COUNT(*) FROM `+table+` WHERE domain=? AND calendar=?`, domain, created.ID).Scan(&count); err != nil || count != 0 { + t.Fatal(table, count, err) + } + } +} +func TestCalendarSnapshotsVerified(t *testing.T) { + r, d, a, c := fixture(t) + v := sample(t, "broken", "2026-09-01T00:00:00Z", "2026-09-02T00:00:00Z", true) + if _, e := r.Change(context.Background(), d, c.ID, a, v.UID, "*", &v); e != nil { + t.Fatal(e) + } + c, _ = r.Get(d, c.ID, a) + dir, _ := r.dir(d, c.ID) + for m, h := range c.Months { + if e := os.WriteFile(filepath.Join(dir, m+"."+h+".ics"), []byte("corrupt"), 0600); e != nil { + t.Fatal(e) + } + } + if _, e := r.Event(context.Background(), d, c.ID, a, v.UID); e == nil { + t.Fatal("corrupt snapshot accepted") + } +} diff --git a/internal/calendar/dav.go b/internal/calendar/dav.go new file mode 100644 index 0000000..8eba69f --- /dev/null +++ b/internal/calendar/dav.go @@ -0,0 +1,135 @@ +package calendar + +import ( + "context" + "database/sql" + "encoding/base64" + "strings" +) + +func DAVFilename(c Calendar, uid string) string { + if name := c.DAVNames[uid]; name != "" { + return name + } + return base64.RawURLEncoding.EncodeToString([]byte(uid)) + ".ics" +} + +func ValidDAVFilename(name string) bool { + if len(name) < 5 || len(name) > 700 || !strings.HasSuffix(name, ".ics") { + return false + } + for _, ch := range name { + if !(ch >= 'a' && ch <= 'z' || ch >= 'A' && ch <= 'Z' || ch >= '0' && ch <= '9' || ch == '-' || ch == '_' || ch == '.') { + return false + } + } + return true +} + +func DAVUID(c Calendar, name string) (string, error) { + if !ValidDAVFilename(name) { + return "", ErrMissing + } + for uid, n := range c.DAVNames { + if n == name { + return uid, nil + } + } + b, err := base64.RawURLEncoding.DecodeString(strings.TrimSuffix(name, ".ics")) + if err != nil || len(b) == 0 || len(b) > 512 { + return "", ErrMissing + } + return string(b), nil +} + +// DAVSnapshot is complete or fails; a truncated listing can cause client deletes. +// The metadata lock keeps href mappings and event generations in one snapshot. +func (r *Repository) DAVSnapshot(ctx context.Context, domain, id, actor string, withData bool) (Calendar, []Event, error) { + c, _, unlock, err := r.locked(ctx, domain, id, actor) + if err != nil { + return c, nil, err + } + defer unlock() + cols := "uid,etag,''" + if withData { + cols = "uid,etag,data" + } + rows, err := r.DB.QueryContext(ctx, `SELECT `+cols+` FROM calendar_event_cache WHERE domain=? AND calendar=? ORDER BY uid LIMIT 10001`, domain, id) + if err != nil { + return c, nil, err + } + defer rows.Close() + items := []Event{} + size := 0 + for rows.Next() { + var item Event + if err = rows.Scan(&item.UID, &item.ETag, &item.Data); err != nil { + return c, nil, err + } + size += len(item.Data) + len(item.UID) + len(item.ETag) + if len(items) >= 10000 || size > 32<<20 { + return c, nil, ErrLimit + } + items = append(items, item) + } + return c, items, rows.Err() +} + +// ChangeDAV reserves resource identities in the same manifest commit as the +// monthly snapshots. Existing resources still require an exact strong ETag. +func (r *Repository) ChangeDAV(ctx context.Context, domain, id, actor, name, match string, item *Event, authorize func() error) (Event, bool, error) { + if !ValidDAVFilename(name) { + return Event{}, false, ErrInvalid + } + c, dir, unlock, err := r.lockedWithGuard(ctx, domain, id, actor, func(c Calendar) bool { return c.CanWrite(actor) }) + if err != nil { + return Event{}, false, err + } + defer unlock() + if authorize != nil { + if err = authorize(); err != nil { + return Event{}, false, ErrForbidden + } + } + uid, _ := DAVUID(c, name) + var exists bool + if uid != "" { + if err = r.DB.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM calendar_event_cache WHERE domain=? AND calendar=? AND uid=?)`, domain, id, uid).Scan(&exists); err != nil { + return Event{}, false, err + } + } + if exists { + if match == "" { + return Event{}, false, ErrPreconditionRequired + } + if item != nil && item.UID != uid { + return Event{}, false, ErrConflict + } + } else { + if item == nil { + return Event{}, false, ErrMissing + } + if match != "" && match != "*" { + return Event{}, false, ErrConflict + } + uid = item.UID + var tag string + err = r.DB.QueryRowContext(ctx, `SELECT etag FROM calendar_event_cache WHERE domain=? AND calendar=? AND uid=?`, domain, id, uid).Scan(&tag) + if err == nil { + return Event{}, false, ErrConflict + } + if err != sql.ErrNoRows { + return Event{}, false, err + } + if len(c.DAVNames) >= 10000 { + return Event{}, false, ErrLimit + } + if c.DAVNames == nil { + c.DAVNames = map[string]string{} + } + c.DAVNames[uid] = name + match = "*" + } + result, err := r.changeLocked(ctx, domain, actor, uid, match, item, c, dir) + return result, !exists, err +} diff --git a/internal/calendar/dav_test.go b/internal/calendar/dav_test.go new file mode 100644 index 0000000..26b8487 --- /dev/null +++ b/internal/calendar/dav_test.go @@ -0,0 +1,111 @@ +package calendar + +import ( + "context" + "errors" + "sync" + "testing" + + "github.com/google/uuid" +) + +func TestCalendarDAVIdentityAtomicAndRebuild(t *testing.T) { + r, domain, actor, c := fixture(t) + ctx := context.Background() + item := sample(t, "client@example.test", "2026-10-01T09:00:00Z", "2026-10-01T10:00:00Z", false) + var wg sync.WaitGroup + results := make(chan error, 2) + for i := 0; i < 2; i++ { + wg.Add(1) + go func() { + defer wg.Done() + _, _, err := r.ChangeDAV(ctx, domain, c.ID, actor, "arbitrary.ics", "", &item, nil) + results <- err + }() + } + wg.Wait() + close(results) + success := 0 + for err := range results { + if err == nil { + success++ + } else if !errors.Is(err, ErrPreconditionRequired) { + t.Fatal(err) + } + } + if success != 1 { + t.Fatal(success) + } + // Filename metadata survives an index rebuild and a settings change. + c, err := r.Get(domain, c.ID, actor) + if err != nil { + t.Fatal(err) + } + if _, err = r.Settings(ctx, domain, c.ID, actor, c.Version, "Renamed", false, c.Members); err != nil { + t.Fatal(err) + } + for _, table := range []string{"calendar_event_cache", "calendar_month_cache", "calendar_index_state"} { + if _, err = r.DB.Exec("DELETE FROM " + table); err != nil { + t.Fatal(err) + } + } + c, items, err := r.DAVSnapshot(ctx, domain, c.ID, actor, true) + if err != nil || len(items) != 1 || DAVFilename(c, items[0].UID) != "arbitrary.ics" || items[0].ETag != item.ETag { + t.Fatal(err, items, c.DAVNames) + } + if _, _, err = r.ChangeDAV(ctx, domain, c.ID, actor, "other.ics", "", &item, nil); err != ErrConflict { + t.Fatal("duplicate UID", err) + } + other := sample(t, "other@example.test", "2026-10-01T09:00:00Z", "2026-10-01T10:00:00Z", false) + if _, _, err = r.ChangeDAV(ctx, domain, c.ID, actor, "arbitrary.ics", item.ETag, &other, nil); err != ErrConflict { + t.Fatal("identity changed", err) + } + member := uuid.NewString() + c, err = r.Settings(ctx, domain, c.ID, actor, c.Version, c.Name, false, map[string]string{member: "read"}) + if err != nil { + t.Fatal(err) + } + if _, _, err = r.ChangeDAV(ctx, domain, c.ID, member, "arbitrary.ics", item.ETag, &item, nil); err != ErrForbidden { + t.Fatal("read member wrote", err) + } + c, err = r.Settings(ctx, domain, c.ID, actor, c.Version, c.Name, false, map[string]string{member: "write"}) + if err != nil { + t.Fatal(err) + } + if _, _, err = r.ChangeDAV(ctx, domain, c.ID, member, "arbitrary.ics", item.ETag, &item, nil); err != nil { + t.Fatal(err) + } + c, err = r.Get(domain, c.ID, actor) + if err != nil { + t.Fatal(err) + } + if _, err = r.Settings(ctx, domain, c.ID, actor, c.Version, c.Name, false, map[string]string{}); err != nil { + t.Fatal(err) + } + if _, _, err = r.DAVSnapshot(ctx, domain, c.ID, member, true); err != ErrMissing { + t.Fatal("revoked ACL leaked", err) + } + if _, _, err = r.ChangeDAV(ctx, domain, c.ID, actor, "arbitrary.ics", item.ETag, nil, nil); err != nil { + t.Fatal(err) + } + c, err = r.Get(domain, c.ID, actor) + if err != nil || len(c.DAVNames) != 0 { + t.Fatal("alias retained after delete", err, c.DAVNames) + } +} + +func TestCalendarDAVSnapshotLimit(t *testing.T) { + r, domain, actor, c := fixture(t) + ctx := context.Background() + if _, _, err := r.DAVSnapshot(ctx, domain, c.ID, actor, false); err != nil { + t.Fatal(err) + } + // Synthetic disposable cache only; exceed the collection bound deliberately. + _, err := r.DB.Exec(`WITH RECURSIVE n(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM n WHERE x<10001) INSERT INTO calendar_event_cache(domain,calendar,uid,month,start,end,etag,data) SELECT ?,?,CAST(x AS TEXT),'2026-10',0,0,'"test"','' FROM n`, domain, c.ID) + if err != nil { + t.Fatal(err) + } + if _, items, err := r.DAVSnapshot(ctx, domain, c.ID, actor, false); err != ErrLimit || items != nil { + t.Fatal("returned truncated collection", len(items), err) + } +} diff --git a/internal/calendar/external_feed.go b/internal/calendar/external_feed.go new file mode 100644 index 0000000..9e5b34e --- /dev/null +++ b/internal/calendar/external_feed.go @@ -0,0 +1,719 @@ +package calendar + +import ( + "crypto/sha256" + "encoding/hex" + "fmt" + "io" + "sort" + "strconv" + "strings" + "time" + _ "time/tzdata" + "unicode/utf8" + + ical "github.com/emersion/go-ical" + "github.com/teambition/rrule-go" +) + +type feedTransition struct { + wall time.Time + offset int +} +type feedZone struct { + id string + location *time.Location + transitions []feedTransition + fallback int +} + +func validateExternalRule(option *rrule.ROption, timezone bool) error { + if timezone && option.Freq != rrule.YEARLY { + return fmt.Errorf("%w: VTIMEZONE recurrence must be yearly", ErrInvalid) + } + if option.Freq > rrule.DAILY || len(option.Byhour) > 0 || len(option.Byminute) > 0 || len(option.Bysecond) > 0 { + return fmt.Errorf("%w: sub-daily or expanded-time RRULE is not supported", ErrInvalid) + } + return nil +} + +var windowsZones = map[string]string{ + "UTC": "UTC", "Tokyo Standard Time": "Asia/Tokyo", + "Korea Standard Time": "Asia/Seoul", "China Standard Time": "Asia/Shanghai", + "Singapore Standard Time": "Asia/Singapore", "India Standard Time": "Asia/Kolkata", + "GMT Standard Time": "Europe/London", "W. Europe Standard Time": "Europe/Berlin", + "Central Europe Standard Time": "Europe/Budapest", "Romance Standard Time": "Europe/Paris", + "Eastern Standard Time": "America/New_York", "Central Standard Time": "America/Chicago", + "Mountain Standard Time": "America/Denver", "Pacific Standard Time": "America/Los_Angeles", + "AUS Eastern Standard Time": "Australia/Sydney", "New Zealand Standard Time": "Pacific/Auckland", +} + +func parseWall(value string) (time.Time, error) { + value = strings.TrimSuffix(value, "Z") + layout := "20060102T150405" + if len(value) == 8 { + layout = "20060102" + } + return time.ParseInLocation(layout, value, time.UTC) +} +func parseUTCOffset(raw string) (int, error) { + if len(raw) != 5 && len(raw) != 7 || raw[0] != '+' && raw[0] != '-' { + return 0, fmt.Errorf("%w: invalid TZOFFSET", ErrInvalid) + } + h, e1 := strconv.Atoi(raw[1:3]) + m, e2 := strconv.Atoi(raw[3:5]) + s := 0 + var e3 error + if len(raw) == 7 { + s, e3 = strconv.Atoi(raw[5:7]) + } + if e1 != nil || e2 != nil || e3 != nil || h > 23 || m > 59 || s > 59 { + return 0, fmt.Errorf("%w: invalid TZOFFSET", ErrInvalid) + } + seconds := h*3600 + m*60 + s + if raw[0] == '-' { + seconds = -seconds + } + return seconds, nil +} +func zoneName(raw string) string { return strings.Trim(strings.TrimSpace(raw), `"`) } + +func buildFeedZones(cal *ical.Calendar, from, to time.Time) (map[string]*feedZone, error) { + zones := map[string]*feedZone{} + for _, child := range cal.Children { + if child.Name != "VTIMEZONE" { + continue + } + id, e := child.Props.Text("TZID") + id = zoneName(id) + if e != nil || id == "" || len(id) > 256 || zones[id] != nil { + return nil, fmt.Errorf("%w: invalid or duplicate VTIMEZONE TZID", ErrInvalid) + } + zone := &feedZone{id: id} + iana := id + if mapped := windowsZones[id]; mapped != "" { + iana = mapped + } + if loc, err := time.LoadLocation(iana); err == nil { + zone.location = loc + zones[id] = zone + continue + } + for _, observance := range child.Children { + if observance.Name != "STANDARD" && observance.Name != "DAYLIGHT" { + return nil, fmt.Errorf("%w: unsupported VTIMEZONE component %s", ErrInvalid, observance.Name) + } + startProp, offsetProp := observance.Props.Get("DTSTART"), observance.Props.Get("TZOFFSETTO") + if startProp == nil || offsetProp == nil { + return nil, fmt.Errorf("%w: incomplete VTIMEZONE observance", ErrInvalid) + } + base, err := parseWall(startProp.Value) + if err != nil { + return nil, fmt.Errorf("%w: invalid VTIMEZONE DTSTART", ErrInvalid) + } + offset, err := parseUTCOffset(offsetProp.Value) + if err != nil { + return nil, err + } + if len(zone.transitions) == 0 || base.Before(zone.transitions[0].wall) { + zone.fallback = offset + } + if observance.Props.Get("RDATE") != nil { + return nil, fmt.Errorf("%w: VTIMEZONE RDATE is not yet supported", ErrInvalid) + } + if rule := observance.Props.Get("RRULE"); rule != nil { + option, err := rrule.StrToROption(rule.Value) + if err != nil { + return nil, fmt.Errorf("%w: invalid VTIMEZONE RRULE", ErrInvalid) + } + if err = validateExternalRule(option, true); err != nil { + return nil, err + } + option.Dtstart = base + r, err := rrule.NewRRule(*option) + if err != nil { + return nil, fmt.Errorf("%w: invalid VTIMEZONE RRULE", ErrInvalid) + } + for _, occurrence := range r.Between(from.AddDate(-2, 0, 0), to.AddDate(2, 0, 0), true) { + zone.transitions = append(zone.transitions, feedTransition{wall: occurrence, offset: offset}) + } + } else { + zone.transitions = append(zone.transitions, feedTransition{wall: base, offset: offset}) + } + } + if len(zone.transitions) == 0 { + return nil, fmt.Errorf("%w: empty VTIMEZONE", ErrInvalid) + } + sort.Slice(zone.transitions, func(i, j int) bool { return zone.transitions[i].wall.Before(zone.transitions[j].wall) }) + zones[id] = zone + } + return zones, nil +} + +func (z *feedZone) resolve(wall time.Time) time.Time { + if z.location != nil { + return time.Date(wall.Year(), wall.Month(), wall.Day(), wall.Hour(), wall.Minute(), wall.Second(), wall.Nanosecond(), z.location) + } + offset := z.fallback + for _, transition := range z.transitions { + if transition.wall.After(wall) { + break + } + offset = transition.offset + } + return time.Date(wall.Year(), wall.Month(), wall.Day(), wall.Hour(), wall.Minute(), wall.Second(), wall.Nanosecond(), time.FixedZone(z.id, offset)) +} +func feedTime(prop *ical.Prop, zones map[string]*feedZone) (time.Time, time.Time, bool, error) { + if prop == nil { + return time.Time{}, time.Time{}, false, fmt.Errorf("%w: missing date property", ErrInvalid) + } + wall, err := parseWall(prop.Value) + if err != nil { + return time.Time{}, time.Time{}, false, fmt.Errorf("%w: invalid %s", ErrInvalid, prop.Name) + } + allDay := prop.ValueType() == ical.ValueDate + if allDay { + return wall, wall, true, nil + } + if strings.HasSuffix(prop.Value, "Z") { + return wall, wall, false, nil + } + tzid := zoneName(prop.Params.Get("TZID")) + if tzid == "" { + return time.Time{}, time.Time{}, false, fmt.Errorf("%w: floating %s has no TZID", ErrInvalid, prop.Name) + } + zone := zones[tzid] + if zone == nil { + iana := tzid + if mapped := windowsZones[tzid]; mapped != "" { + iana = mapped + } + loc, e := time.LoadLocation(iana) + if e != nil { + return time.Time{}, time.Time{}, false, fmt.Errorf("%w: unknown TZID %q", ErrInvalid, tzid) + } + zone = &feedZone{id: tzid, location: loc} + zones[tzid] = zone + } + return zone.resolve(wall).UTC(), wall, false, nil +} + +func sanitizeExternalPropertyValue(value string) (string, bool) { + changed := false + var cleaned strings.Builder + for _, r := range value { + if r < 32 && r != '\t' || r == 127 || r >= 0x80 && r <= 0x9f { + changed = true + continue + } + cleaned.WriteRune(r) + } + return cleaned.String(), changed +} + +func cloneExternalEvent(source *ical.Component) (*ical.Component, bool) { + dst := ical.NewComponent("VEVENT") + sanitized := false + for name, values := range source.Props { + for _, value := range values { + p := ical.NewProp(name) + cleaned, changed := sanitizeExternalPropertyValue(value.Value) + p.Value = cleaned + sanitized = sanitized || changed + for key, params := range value.Params { + for _, param := range params { + cleaned, changed := sanitizeExternalPropertyValue(param) + sanitized = sanitized || changed + p.Params.Add(key, cleaned) + } + } + dst.Props.Add(p) + } + } + return dst, sanitized +} +func occurrenceUID(uid string, wall time.Time) string { + suffix := "#" + wall.Format("20060102T150405") + if len(uid)+len(suffix) <= 512 { + return uid + suffix + } + sum := sha256.Sum256([]byte(uid + suffix)) + return "recurrence-" + hex.EncodeToString(sum[:]) +} + +func materializeExternal(source *ical.Component, uid string, start, end time.Time, allDay, recurring bool, wall time.Time, zones map[string]*feedZone) (Event, error) { + dst, sanitized := cloneExternalEvent(source) + for _, name := range []string{"RRULE", "RDATE", "EXDATE", "RECURRENCE-ID", "DURATION"} { + dst.Props.Del(name) + } + if recurring { + dst.Props.SetText("X-PAGESWIKI-SOURCE-UID", uid) + uid = occurrenceUID(uid, wall) + } + dst.Props.SetText("UID", uid) + if sanitized { + dst.Props.SetText("X-PAGESWIKI-SANITIZED", "CONTROL-CHARACTER") + } + for _, pair := range []struct { + name string + time time.Time + }{{"DTSTART", start}, {"DTEND", end}} { + if pair.name == "DTEND" && !end.After(start) { + dst.Props.Del("DTEND") + continue + } + p := ical.NewProp(pair.name) + if allDay { + p.SetDate(pair.time.UTC()) + } else { + p.SetDateTime(pair.time.UTC()) + } + dst.Props.Set(p) + } + for _, name := range []string{"DTSTAMP", "CREATED", "LAST-MODIFIED"} { + p := dst.Props.Get(name) + if p == nil { + continue + } + value, _, date, err := feedTime(p, zones) + if err != nil || date { + return Event{}, fmt.Errorf("%w: invalid %s", ErrInvalid, name) + } + p = ical.NewProp(name) + p.SetDateTime(value.UTC()) + dst.Props.Set(p) + } + data, err := encode(envelope(dst)) + if err != nil { + return Event{}, err + } + return Parse(data) +} + +type externalEventTimes struct { + start, end time.Time + startWall, endWall time.Time + allDay bool +} + +func externalTimes(child *ical.Component, zones map[string]*feedZone) (externalEventTimes, error) { + start, startWall, allDay, err := feedTime(child.Props.Get("DTSTART"), zones) + if err != nil { + return externalEventTimes{}, err + } + microsoftAllDay := false + if prop := child.Props.Get("X-MICROSOFT-CDO-ALLDAYEVENT"); prop != nil { + microsoftAllDay = strings.EqualFold(strings.TrimSpace(prop.Value), "TRUE") + } + if microsoftAllDay && !allDay { + if startWall.Hour() != 0 || startWall.Minute() != 0 || startWall.Second() != 0 { + return externalEventTimes{}, fmt.Errorf("%w: Microsoft all-day DTSTART is not midnight", ErrInvalid) + } + allDay, start = true, startWall + } + end, endWall := start, startWall + if p := child.Props.Get("DTEND"); p != nil { + var endAllDay bool + end, endWall, endAllDay, err = feedTime(p, zones) + if err != nil { + return externalEventTimes{}, err + } + if microsoftAllDay && !endAllDay { + if endWall.Hour() != 0 || endWall.Minute() != 0 || endWall.Second() != 0 { + return externalEventTimes{}, fmt.Errorf("%w: Microsoft all-day DTEND is not midnight", ErrInvalid) + } + endAllDay, end = true, endWall + } + if endAllDay != allDay { + return externalEventTimes{}, fmt.Errorf("%w: invalid DTEND (value type differs from DTSTART)", ErrInvalid) + } + // RFC 5545 defines DTEND as an exclusive boundary. Outlook feeds in + // the wild nevertheless emit DTSTART == DTEND for zero-duration timed + // appointments and, occasionally, for a one-day Microsoft all-day + // appointment. Preserve the former as an instantaneous event (the + // canonical encoder omits DTEND) and normalize only the latter to the + // required exclusive next-day boundary. + if end.Equal(start) && allDay { + end, endWall = start.AddDate(0, 0, 1), startWall.AddDate(0, 0, 1) + } else if end.Before(start) { + return externalEventTimes{}, fmt.Errorf("%w: invalid DTEND (precedes DTSTART)", ErrInvalid) + } + } else if allDay { + end, endWall = start.AddDate(0, 0, 1), startWall.AddDate(0, 0, 1) + } + return externalEventTimes{start: start, end: end, startWall: startWall, endWall: endWall, allDay: allDay}, nil +} + +func occurrenceKey(value time.Time, allDay bool) string { + if allDay { + return "D:" + value.Format("20060102") + } + return "T:" + value.UTC().Format("20060102T150405Z") +} + +type externalDateValue struct { + instant time.Time + wall time.Time +} + +func externalDateList(props []ical.Prop, reference *ical.Prop, zones map[string]*feedZone, allDay bool, property string) ([]externalDateValue, error) { + result := []externalDateValue{} + for _, original := range props { + if original.ValueType() == ical.ValuePeriod || strings.Contains(original.Value, "/") { + return nil, fmt.Errorf("%w: %s PERIOD is not supported", ErrInvalid, property) + } + for _, value := range strings.Split(original.Value, ",") { + p := ical.NewProp(property) + p.Value = strings.TrimSpace(value) + for key, values := range original.Params { + for _, value := range values { + p.Params.Add(key, value) + } + } + if p.Params.Get("TZID") == "" && !strings.HasSuffix(p.Value, "Z") && len(p.Value) != 8 && reference != nil && reference.Params.Get("TZID") != "" { + p.Params.Set("TZID", reference.Params.Get("TZID")) + } + if len(p.Value) == 8 { + p.SetValueType(ical.ValueDate) + } + instant, wall, date, err := feedTime(p, zones) + if err != nil || date != allDay { + return nil, fmt.Errorf("%w: invalid %s", ErrInvalid, property) + } + result = append(result, externalDateValue{instant: instant, wall: wall}) + } + } + return result, nil +} + +func externalOccurrenceBounds(child *ical.Component, base externalEventTimes, wall time.Time, zones map[string]*feedZone) (time.Time, time.Time, error) { + startProp := child.Props.Get("DTSTART") + start := wall.UTC() + if !base.allDay && !strings.HasSuffix(startProp.Value, "Z") { + zone := zones[zoneName(startProp.Params.Get("TZID"))] + if zone == nil { + return time.Time{}, time.Time{}, fmt.Errorf("%w: unresolved recurrence TZID", ErrInvalid) + } + start = zone.resolve(wall).UTC() + } + duration := base.endWall.Sub(base.startWall) + if duration == 0 { + return start, start, nil + } + endWall := wall.Add(duration) + endProp := child.Props.Get("DTEND") + if base.allDay || endProp != nil && strings.HasSuffix(endProp.Value, "Z") { + return start, endWall.UTC(), nil + } + if endProp == nil { + return time.Time{}, time.Time{}, fmt.Errorf("%w: recurring duration is not supported", ErrInvalid) + } + zone := zones[zoneName(endProp.Params.Get("TZID"))] + if zone == nil { + return time.Time{}, time.Time{}, fmt.Errorf("%w: unresolved recurrence DTEND TZID", ErrInvalid) + } + return start, zone.resolve(endWall).UTC(), nil +} + +func externalCancelled(child *ical.Component) bool { + status, _ := child.Props.Text("STATUS") + return strings.EqualFold(status, "CANCELLED") +} + +type externalException struct { + component *ical.Component + wall time.Time + allDay bool +} +type externalOccurrence struct { + wall time.Time + direct *time.Time +} +type externalGroup struct { + uid string + master *ical.Component + exceptions map[string]externalException +} + +// ParseExternalFeed converts a bounded subscription projection into the +// strict UTC/DATE representation used by the canonical calendar store. +func ParseExternalFeed(data []byte, from, to time.Time) ([]Event, error) { + if len(data) > MaxFeed || !to.After(from) || to.Sub(from) > 370*24*time.Hour { + return nil, ErrLimit + } + if !utf8.Valid(data) || strings.ContainsRune(string(data), 0) { + return nil, fmt.Errorf("%w: invalid subscription encoding", ErrInvalid) + } + dec := ical.NewDecoder(strings.NewReader(string(data))) + cal, err := dec.Decode() + if err != nil { + return nil, fmt.Errorf("%w: malformed VCALENDAR", ErrInvalid) + } + if _, err = dec.Decode(); err != io.EOF { + return nil, fmt.Errorf("%w: one VCALENDAR required", ErrInvalid) + } + version, _ := cal.Props.Text("VERSION") + product, _ := cal.Props.Text("PRODID") + method, _ := cal.Props.Text("METHOD") + if len(cal.Props["VERSION"]) != 1 || version != "2.0" || len(cal.Props["PRODID"]) != 1 || product == "" || len(cal.Props["METHOD"]) > 1 || method != "" && !strings.EqualFold(method, "PUBLISH") { + return nil, fmt.Errorf("%w: invalid subscription envelope", ErrInvalid) + } + if scale := cal.Props.Get("CALSCALE"); scale != nil && !strings.EqualFold(scale.Value, "GREGORIAN") { + return nil, fmt.Errorf("%w: unsupported calendar scale", ErrInvalid) + } + zones, err := buildFeedZones(cal, from, to) + if err != nil { + return nil, err + } + groups := map[string]*externalGroup{} + groupOrder := []string{} + for index, child := range cal.Children { + if child.Name == "VTIMEZONE" { + continue + } + if child.Name != "VEVENT" { + return nil, fmt.Errorf("%w: unsupported subscription component %s", ErrInvalid, child.Name) + } + if len(child.Children) > 0 { + return nil, fmt.Errorf("%w: VEVENT %d subcomponents are not yet supported", ErrInvalid, index+1) + } + cancelled := externalCancelled(child) + for _, name := range []string{"UID", "DTSTAMP"} { + if len(child.Props[name]) != 1 { + return nil, fmt.Errorf("%w: VEVENT %d %s must occur exactly once", ErrInvalid, index+1, name) + } + } + if len(child.Props["DTSTART"]) != 1 && !(cancelled && len(child.Props["RECURRENCE-ID"]) == 1) { + return nil, fmt.Errorf("%w: VEVENT %d DTSTART must occur exactly once", ErrInvalid, index+1) + } + if len(child.Props["DTEND"]) > 1 || len(child.Props["RRULE"]) > 1 || child.Props.Get("DURATION") != nil { + return nil, fmt.Errorf("%w: VEVENT %d unsupported or duplicate event duration", ErrInvalid, index+1) + } + uid, err := child.Props.Text("UID") + if err != nil || uid == "" || len(uid) > 512 { + return nil, fmt.Errorf("%w: VEVENT %d invalid UID", ErrInvalid, index+1) + } + if cleaned, changed := sanitizeExternalPropertyValue(uid); changed || cleaned != uid { + return nil, fmt.Errorf("%w: VEVENT %d invalid UID", ErrInvalid, index+1) + } + group := groups[uid] + if group == nil { + group = &externalGroup{uid: uid, exceptions: map[string]externalException{}} + groups[uid] = group + groupOrder = append(groupOrder, uid) + } + recurrenceID := child.Props.Get("RECURRENCE-ID") + if recurrenceID == nil { + if group.master != nil { + return nil, fmt.Errorf("%w: duplicate master VEVENT", ErrInvalid) + } + group.master = child + continue + } + if len(child.Props["RECURRENCE-ID"]) != 1 || recurrenceID.Params.Get("RANGE") != "" || child.Props.Get("RRULE") != nil || child.Props.Get("RDATE") != nil || child.Props.Get("EXDATE") != nil { + return nil, fmt.Errorf("%w: unsupported RECURRENCE-ID form", ErrInvalid) + } + instant, wall, date, err := feedTime(recurrenceID, zones) + if err != nil { + return nil, fmt.Errorf("%w: invalid RECURRENCE-ID", ErrInvalid) + } + key := occurrenceKey(instant, date) + if _, exists := group.exceptions[key]; exists { + return nil, fmt.Errorf("%w: duplicate RECURRENCE-ID", ErrInvalid) + } + group.exceptions[key] = externalException{component: child, wall: wall, allDay: date} + } + + result := []Event{} + seen := map[string]bool{} + totalMaterialized := 0 + appendEvent := func(event Event) error { + if seen[event.UID] { + return fmt.Errorf("%w: duplicate materialized UID", ErrInvalid) + } + seen[event.UID] = true + totalMaterialized += len(event.Data) + if totalMaterialized > MaxFeed || len(result) >= 5000 { + return ErrLimit + } + result = append(result, event) + return nil + } + for groupIndex, uid := range groupOrder { + group := groups[uid] + if group.master == nil { + // Some subscription projections (notably Outlook published ICS) + // contain only modified instances and omit the series master. A + // non-cancelled exception is still a complete VEVENT when it has + // DTSTART; project it as a stable single occurrence. Without the + // master an omitted DTEND cannot inherit a duration and therefore + // remains a zero-duration event. + keys := make([]string, 0, len(group.exceptions)) + for key := range group.exceptions { + keys = append(keys, key) + } + sort.Strings(keys) + for _, key := range keys { + exception := group.exceptions[key] + if externalCancelled(exception.component) { + continue + } + times, e := externalTimes(exception.component, zones) + if e != nil { + return nil, fmt.Errorf("VEVENT group %d orphan recurrence exception timing validation failed: %w", groupIndex+1, e) + } + if exception.allDay != times.allDay { + return nil, fmt.Errorf("%w: orphan RECURRENCE-ID value type differs from DTSTART", ErrInvalid) + } + if !(times.start.Before(to) && (times.end.After(from) || times.end.Equal(times.start) && !times.start.Before(from))) { + continue + } + event, e := materializeExternal(exception.component, uid, times.start, times.end, times.allDay, true, exception.wall, zones) + if e != nil { + return nil, e + } + if e = appendEvent(event); e != nil { + return nil, e + } + } + continue + } + if externalCancelled(group.master) { + continue + } + base, err := externalTimes(group.master, zones) + if err != nil { + return nil, fmt.Errorf("VEVENT group %d master timing validation failed: %w", groupIndex+1, err) + } + duration := base.endWall.Sub(base.startWall) + rule := group.master.Props.Get("RRULE") + recurring := rule != nil || len(group.master.Props["RDATE"]) > 0 || len(group.exceptions) > 0 + occurrences := []externalOccurrence{{wall: base.startWall}} + if rule != nil { + option, e := rrule.StrToROption(rule.Value) + if e != nil { + return nil, fmt.Errorf("%w: invalid RRULE", ErrInvalid) + } + if e = validateExternalRule(option, false); e != nil { + return nil, e + } + option.Dtstart = base.startWall + r, e := rrule.NewRRule(*option) + if e != nil { + return nil, fmt.Errorf("%w: invalid RRULE", ErrInvalid) + } + walls := r.Between(from.Add(-duration-48*time.Hour), to.Add(48*time.Hour), true) + occurrences = make([]externalOccurrence, 0, len(walls)) + for _, wall := range walls { + occurrences = append(occurrences, externalOccurrence{wall: wall}) + } + } + rdates, err := externalDateList(group.master.Props["RDATE"], group.master.Props.Get("DTSTART"), zones, base.allDay, "RDATE") + if err != nil { + return nil, err + } + for _, value := range rdates { + start := value.instant + occurrences = append(occurrences, externalOccurrence{wall: value.wall, direct: &start}) + } + exdates, err := externalDateList(group.master.Props["EXDATE"], group.master.Props.Get("DTSTART"), zones, base.allDay, "EXDATE") + if err != nil { + return nil, err + } + excluded := map[string]bool{} + for _, value := range exdates { + excluded[occurrenceKey(value.instant, base.allDay)] = true + } + sort.Slice(occurrences, func(i, j int) bool { + left, right := occurrences[i].wall, occurrences[j].wall + if occurrences[i].direct != nil { + left = *occurrences[i].direct + } + if occurrences[j].direct != nil { + right = *occurrences[j].direct + } + return left.Before(right) + }) + used := map[string]bool{} + previous := "" + for _, occurrence := range occurrences { + occurrenceWall := occurrence.wall + occurrenceStart, occurrenceEnd, err := externalOccurrenceBounds(group.master, base, occurrenceWall, zones) + if occurrence.direct != nil { + occurrenceStart = *occurrence.direct + occurrenceEnd = occurrenceStart.Add(base.end.Sub(base.start)) + } + if err != nil { + return nil, err + } + key := occurrenceKey(occurrenceStart, base.allDay) + if key == previous { + continue + } + previous = key + exception, hasException := group.exceptions[key] + if excluded[key] && !hasException { + continue + } + source, allDay := group.master, base.allDay + if hasException { + used[key] = true + if exception.allDay != base.allDay { + return nil, fmt.Errorf("%w: RECURRENCE-ID value type differs from master", ErrInvalid) + } + if externalCancelled(exception.component) { + continue + } + times, e := externalTimes(exception.component, zones) + if e != nil { + return nil, fmt.Errorf("VEVENT group %d recurrence exception timing validation failed: %w", groupIndex+1, e) + } + if exception.component.Props.Get("DTEND") == nil && base.end.After(base.start) { + times.end = times.start.Add(base.end.Sub(base.start)) + } + source, allDay, occurrenceStart, occurrenceEnd = exception.component, times.allDay, times.start, times.end + } + if !(occurrenceStart.Before(to) && (occurrenceEnd.After(from) || occurrenceEnd.Equal(occurrenceStart) && !occurrenceStart.Before(from))) { + continue + } + event, e := materializeExternal(source, uid, occurrenceStart, occurrenceEnd, allDay, recurring, occurrenceWall, zones) + if e != nil { + return nil, e + } + if e = appendEvent(event); e != nil { + return nil, e + } + } + // A moved exception can enter the synchronization window even when its + // original occurrence is just outside it. + for key, exception := range group.exceptions { + if used[key] || externalCancelled(exception.component) { + continue + } + times, e := externalTimes(exception.component, zones) + if e != nil { + return nil, fmt.Errorf("VEVENT group %d detached recurrence exception timing validation failed: %w", groupIndex+1, e) + } + if exception.component.Props.Get("DTEND") == nil && base.end.After(base.start) { + times.end = times.start.Add(base.end.Sub(base.start)) + } + if !(times.start.Before(to) && (times.end.After(from) || times.end.Equal(times.start) && !times.start.Before(from))) { + continue + } + event, e := materializeExternal(exception.component, uid, times.start, times.end, times.allDay, true, exception.wall, zones) + if e != nil { + return nil, e + } + if e = appendEvent(event); e != nil { + return nil, e + } + } + } + sort.Slice(result, func(i, j int) bool { + if result[i].Start.Equal(result[j].Start) { + return result[i].UID < result[j].UID + } + return result[i].Start.Before(result[j].Start) + }) + return result, nil +} diff --git a/internal/calendar/external_feed_test.go b/internal/calendar/external_feed_test.go new file mode 100644 index 0000000..eab8b32 --- /dev/null +++ b/internal/calendar/external_feed_test.go @@ -0,0 +1,185 @@ +package calendar + +import ( + "errors" + "strconv" + "strings" + "testing" + "time" +) + +const outlookFixture = "BEGIN:VCALENDAR\r\n" + + "VERSION:2.0\r\nPRODID:-//Microsoft Corporation//Outlook//EN\r\nMETHOD:PUBLISH\r\nX-WR-CALNAME:Outlook\r\n" + + "BEGIN:VTIMEZONE\r\nTZID:Tokyo Standard Time\r\n" + + "BEGIN:STANDARD\r\nDTSTART:16010101T000000\r\nTZOFFSETFROM:+0900\r\nTZOFFSETTO:+0900\r\nRRULE:FREQ=YEARLY;BYMONTH=1;BYDAY=1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\n" + + "BEGIN:VEVENT\r\nUID:outlook-recurring\r\nDTSTAMP:20260901T000000Z\r\n" + + "DTSTART;TZID=\"Tokyo Standard Time\":20260922T090000\r\nDTEND;TZID=\"Tokyo Standard Time\":20260922T100000\r\n" + + "RRULE:FREQ=DAILY;COUNT=3\r\nCLASS:PUBLIC\r\nPRIORITY:5\r\nSEQUENCE:2\r\nSTATUS:CONFIRMED\r\nTRANSP:OPAQUE\r\n" + + "SUMMARY:Outlook recurrence\r\nDESCRIPTION:Synthetic fixture\r\nLOCATION:Tokyo\r\n" + + "X-MICROSOFT-CDO-ALLDAYEVENT:FALSE\r\nX-MICROSOFT-CDO-BUSYSTATUS:BUSY\r\nX-MICROSOFT-DISALLOW-COUNTER:TRUE\r\n" + + "END:VEVENT\r\nEND:VCALENDAR\r\n" + +func TestParseExternalOutlookFeedMaterializesBoundedRecurrence(t *testing.T) { + from := time.Date(2026, 9, 21, 0, 0, 0, 0, time.UTC) + events, err := ParseExternalFeed([]byte(outlookFixture), from, from.AddDate(0, 0, 5)) + if err != nil || len(events) != 3 { + t.Fatal(len(events), err) + } + for i, event := range events { + want := time.Date(2026, 9, 22+i, 0, 0, 0, 0, time.UTC) + if !event.Start.Equal(want) || !event.End.Equal(want.Add(time.Hour)) { + t.Fatalf("occurrence %d = %v..%v", i, event.Start, event.End) + } + if event.UID == "outlook-recurring" || !strings.Contains(event.Data, "X-PAGESWIKI-SOURCE-UID") || !strings.Contains(event.Data, "X-MICROSOFT-CDO-BUSYSTATUS:BUSY") || strings.Contains(event.Data, "RRULE:") || strings.Contains(event.Data, "METHOD:") { + t.Fatal(event.UID, event.Data) + } + } + again, err := ParseExternalFeed([]byte(outlookFixture), from, from.AddDate(0, 0, 5)) + if err != nil || again[0].UID != events[0].UID || again[0].ETag != events[0].ETag { + t.Fatal("materialization is not stable", err) + } +} + +func TestParseExternalFeedAcceptsMultiMegabyteOutlookShape(t *testing.T) { + var feed strings.Builder + feed.WriteString("BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Synthetic Outlook//EN\r\nMETHOD:PUBLISH\r\nX-WR-CALNAME:Large\r\n") + for i := 0; i < 4500; i++ { + feed.WriteString("BEGIN:VEVENT\r\nUID:large-") + feed.WriteString(strconv.Itoa(i)) + feed.WriteString("\r\nDTSTAMP:20260901T000000Z\r\nDTSTART:20260922T090000Z\r\nDTEND:20260922T100000Z\r\nSUMMARY:Large fixture\r\nDESCRIPTION:") + feed.WriteString(strings.Repeat("x", 512)) + feed.WriteString("\r\nX-MICROSOFT-CDO-INSTTYPE:0\r\nEND:VEVENT\r\n") + } + feed.WriteString("END:VCALENDAR\r\n") + if feed.Len() < 2600000 || feed.Len() > MaxFeed { + t.Fatal("bad fixture size", feed.Len()) + } + from := time.Date(2026, 9, 21, 0, 0, 0, 0, time.UTC) + events, err := ParseExternalFeed([]byte(feed.String()), from, from.AddDate(0, 0, 3)) + if err != nil || len(events) != 4500 { + t.Fatal(len(events), err) + } +} + +func TestParseExternalFeedSanitizesOutlookTextControlCharacters(t *testing.T) { + feed := strings.Replace(outlookFixture, "RRULE:FREQ=DAILY;COUNT=3\r\n", "", 1) + feed = strings.Replace(feed, "DESCRIPTION:Synthetic fixture", "DESCRIPTION:Synthetic\vfixture\x7f", 1) + from := time.Date(2026, 9, 21, 0, 0, 0, 0, time.UTC) + events, err := ParseExternalFeed([]byte(feed), from, from.AddDate(0, 0, 5)) + if err != nil || len(events) != 1 { + t.Fatal(events, err) + } + if events[0].Description != "Syntheticfixture" || !strings.Contains(events[0].Data, "X-PAGESWIKI-SANITIZED") || !strings.Contains(events[0].Data, "CONTROL-CHARACTER") || strings.ContainsAny(events[0].Data, "\v\x7f") { + t.Fatal(events[0]) + } +} + +func TestParseExternalFeedCustomTimezoneDST(t *testing.T) { + feed := strings.Replace(outlookFixture, + "TZID:Tokyo Standard Time\r\nBEGIN:STANDARD\r\nDTSTART:16010101T000000\r\nTZOFFSETFROM:+0900\r\nTZOFFSETTO:+0900\r\nRRULE:FREQ=YEARLY;BYMONTH=1;BYDAY=1SU\r\nEND:STANDARD", + "TZID:Custom Zone\r\nBEGIN:DAYLIGHT\r\nDTSTART:20000329T020000\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0200\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nDTSTART:20001025T030000\r\nTZOFFSETFROM:+0200\r\nTZOFFSETTO:+0100\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD", 1) + feed = strings.ReplaceAll(feed, `Tokyo Standard Time`, `Custom Zone`) + feed = strings.Replace(feed, "DTSTART;TZID=\"Custom Zone\":20260922T090000", "DTSTART;TZID=\"Custom Zone\":20260328T090000", 1) + feed = strings.Replace(feed, "DTEND;TZID=\"Custom Zone\":20260922T100000", "DTEND;TZID=\"Custom Zone\":20260328T100000", 1) + from := time.Date(2026, 3, 27, 0, 0, 0, 0, time.UTC) + events, err := ParseExternalFeed([]byte(feed), from, from.AddDate(0, 0, 5)) + if err != nil || len(events) != 3 { + t.Fatal(len(events), err) + } + if events[0].Start.Hour() != 8 || events[1].Start.Hour() != 7 || events[2].Start.Hour() != 7 { + t.Fatal(events[0].Start, events[1].Start, events[2].Start) + } +} + +func TestParseExternalFeedAppliesEXDATEAndRDATE(t *testing.T) { + feed := strings.Replace(outlookFixture, "RRULE:FREQ=DAILY;COUNT=3", "RRULE:FREQ=DAILY;COUNT=3\r\nEXDATE:20260923T000000Z\r\nRDATE;TZID=\"Tokyo Standard Time\":20260925T090000", 1) + from := time.Date(2026, 9, 21, 0, 0, 0, 0, time.UTC) + events, err := ParseExternalFeed([]byte(feed), from, from.AddDate(0, 0, 6)) + if err != nil || len(events) != 3 || events[0].Start.Day() != 22 || events[1].Start.Day() != 24 || events[2].Start.Day() != 25 { + t.Fatal(events, err) + } +} + +func TestParseExternalFeedAppliesMovedAndCancelledExceptions(t *testing.T) { + exceptions := "BEGIN:VEVENT\r\nUID:outlook-recurring\r\nDTSTAMP:20260902T000000Z\r\nRECURRENCE-ID;TZID=\"Tokyo Standard Time\":20260923T090000\r\nDTSTART;TZID=\"Tokyo Standard Time\":20260923T120000\r\nSUMMARY:Moved synthetic occurrence\r\nEND:VEVENT\r\n" + + "BEGIN:VEVENT\r\nUID:outlook-recurring\r\nDTSTAMP:20260902T000000Z\r\nRECURRENCE-ID;TZID=\"Tokyo Standard Time\":20260924T090000\r\nSTATUS:CANCELLED\r\nEND:VEVENT\r\n" + feed := strings.Replace(outlookFixture, "END:VCALENDAR\r\n", exceptions+"END:VCALENDAR\r\n", 1) + from := time.Date(2026, 9, 21, 0, 0, 0, 0, time.UTC) + events, err := ParseExternalFeed([]byte(feed), from, from.AddDate(0, 0, 5)) + if err != nil || len(events) != 2 { + t.Fatal(events, err) + } + if events[1].Summary != "Moved synthetic occurrence" || events[1].Start.Format(time.RFC3339) != "2026-09-23T03:00:00Z" || events[1].End.Format(time.RFC3339) != "2026-09-23T04:00:00Z" || !strings.HasSuffix(events[1].UID, "#20260923T090000") || strings.Contains(events[1].Data, "RECURRENCE-ID") { + t.Fatal(events[1]) + } +} + +func TestParseExternalFeedProjectsOrphanRecurrenceExceptions(t *testing.T) { + feed := "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Synthetic Outlook//EN\r\nMETHOD:PUBLISH\r\n" + + "BEGIN:VEVENT\r\nUID:orphan-series\r\nDTSTAMP:20260901T000000Z\r\nRECURRENCE-ID:20260922T090000Z\r\nDTSTART:20260922T120000Z\r\nDTEND:20260922T130000Z\r\nSUMMARY:Moved orphan fixture\r\nEND:VEVENT\r\n" + + "BEGIN:VEVENT\r\nUID:cancelled-orphan\r\nDTSTAMP:20260901T000000Z\r\nRECURRENCE-ID:20260923T090000Z\r\nSTATUS:CANCELLED\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n" + from := time.Date(2026, 9, 21, 0, 0, 0, 0, time.UTC) + events, err := ParseExternalFeed([]byte(feed), from, from.AddDate(0, 0, 5)) + if err != nil || len(events) != 1 { + t.Fatal(events, err) + } + if events[0].Summary != "Moved orphan fixture" || events[0].Start.Format(time.RFC3339) != "2026-09-22T12:00:00Z" || !strings.HasSuffix(events[0].UID, "#20260922T090000") || strings.Contains(events[0].Data, "RECURRENCE-ID") { + t.Fatal(events[0]) + } + again, err := ParseExternalFeed([]byte(feed), from, from.AddDate(0, 0, 5)) + if err != nil || again[0].UID != events[0].UID || again[0].ETag != events[0].ETag { + t.Fatal("orphan projection is not stable", err) + } +} + +func TestParseExternalFeedRejectsUnboundedSubDailyExpansion(t *testing.T) { + bad := strings.Replace(outlookFixture, "RRULE:FREQ=DAILY;COUNT=3", "RRULE:FREQ=SECONDLY", 1) + from := time.Date(2026, 9, 21, 0, 0, 0, 0, time.UTC) + if events, err := ParseExternalFeed([]byte(bad), from, from.AddDate(0, 0, 5)); !errors.Is(err, ErrInvalid) || events != nil { + t.Fatal(events, err) + } +} + +func TestParseExternalFeedMicrosoftAllDayDateTime(t *testing.T) { + feed := strings.Replace(outlookFixture, "RRULE:FREQ=DAILY;COUNT=3\r\n", "", 1) + feed = strings.Replace(feed, "20260922T090000", "20260922T000000", 1) + feed = strings.Replace(feed, "20260922T100000", "20260923T000000", 1) + feed = strings.Replace(feed, "X-MICROSOFT-CDO-ALLDAYEVENT:FALSE", "X-MICROSOFT-CDO-ALLDAYEVENT:TRUE", 1) + from := time.Date(2026, 9, 21, 0, 0, 0, 0, time.UTC) + events, err := ParseExternalFeed([]byte(feed), from, from.AddDate(0, 0, 5)) + if err != nil || len(events) != 1 || !events[0].AllDay || events[0].Start.Format("2006-01-02") != "2026-09-22" || events[0].End.Format("2006-01-02") != "2026-09-23" { + t.Fatal(events, err) + } +} + +func TestParseExternalFeedAcceptsZeroDurationOutlookEvent(t *testing.T) { + feed := strings.Replace(outlookFixture, "RRULE:FREQ=DAILY;COUNT=3\r\n", "", 1) + feed = strings.Replace(feed, "20260922T100000", "20260922T090000", 1) + from := time.Date(2026, 9, 21, 0, 0, 0, 0, time.UTC) + events, err := ParseExternalFeed([]byte(feed), from, from.AddDate(0, 0, 5)) + if err != nil || len(events) != 1 || !events[0].Start.Equal(events[0].End) || strings.Contains(events[0].Data, "DTEND") { + t.Fatal(events, err) + } +} + +func TestParseExternalFeedNormalizesZeroLengthMicrosoftAllDay(t *testing.T) { + feed := strings.Replace(outlookFixture, "RRULE:FREQ=DAILY;COUNT=3\r\n", "", 1) + feed = strings.Replace(feed, "20260922T090000", "20260922T000000", 1) + feed = strings.Replace(feed, "20260922T100000", "20260922T000000", 1) + feed = strings.Replace(feed, "X-MICROSOFT-CDO-ALLDAYEVENT:FALSE", "X-MICROSOFT-CDO-ALLDAYEVENT:TRUE", 1) + from := time.Date(2026, 9, 21, 0, 0, 0, 0, time.UTC) + events, err := ParseExternalFeed([]byte(feed), from, from.AddDate(0, 0, 5)) + if err != nil || len(events) != 1 || !events[0].AllDay || events[0].End.Sub(events[0].Start) != 24*time.Hour { + t.Fatal(events, err) + } +} + +func TestParseExternalFeedRejectsEndBeforeStartWithoutLeakingValues(t *testing.T) { + feed := strings.Replace(outlookFixture, "RRULE:FREQ=DAILY;COUNT=3\r\n", "", 1) + feed = strings.Replace(feed, "20260922T100000", "20260922T080000", 1) + from := time.Date(2026, 9, 21, 0, 0, 0, 0, time.UTC) + _, err := ParseExternalFeed([]byte(feed), from, from.AddDate(0, 0, 5)) + if !errors.Is(err, ErrInvalid) || !strings.Contains(err.Error(), "precedes DTSTART") || strings.Contains(err.Error(), "20260922") { + t.Fatal(err) + } +} diff --git a/internal/calendar/ical.go b/internal/calendar/ical.go new file mode 100644 index 0000000..cce4fd0 --- /dev/null +++ b/internal/calendar/ical.go @@ -0,0 +1,227 @@ +// Package calendar implements file-backed calendars. SQLite is a disposable index. +package calendar + +import ( + "bytes" + "crypto/sha256" + "encoding/hex" + "errors" + "fmt" + "io" + "strconv" + "strings" + "time" + "unicode/utf8" + + ical "github.com/emersion/go-ical" +) + +const MaxResource = 256 << 10 + +var ErrInvalid = errors.New("invalid or unsupported iCalendar data") + +type Event struct { + UID string `json:"uid"` + Summary string `json:"summary"` + Description string `json:"description"` + Location string `json:"location"` + Start time.Time `json:"start"` + End time.Time `json:"end"` + AllDay bool `json:"all_day"` + ETag string `json:"etag"` + Data string `json:"-"` +} + +func digest(data []byte) string { h := sha256.Sum256(data); return hex.EncodeToString(h[:]) } +func envelope(events ...*ical.Component) *ical.Calendar { + c := ical.NewCalendar() + c.Props.SetText("VERSION", "2.0") + c.Props.SetText("PRODID", "-//PagesWiki//Calendar 1//EN") + c.Children = events + return c +} +func encode(c *ical.Calendar) (string, error) { + var b bytes.Buffer + err := ical.NewEncoder(&b).Encode(c) + if err != nil { + return "", err + } + // RFC 5545 3.1: fold at 75 octets without splitting a UTF-8 sequence. + var out strings.Builder + for _, line := range strings.Split(strings.TrimSuffix(b.String(), "\r\n"), "\r\n") { + limit := 75 + for len(line) > limit { + n := limit + for n > 0 && !utf8.RuneStart(line[n]) { + n-- + } + out.WriteString(line[:n]) + out.WriteString("\r\n ") + line = line[n:] + limit = 74 + } + out.WriteString(line) + out.WriteString("\r\n") + } + return out.String(), nil +} + +// Parse deliberately accepts a declared, lossless subset. Unsupported temporal +// semantics are rejected, never accepted and silently omitted from REPORT. +func Parse(data string) (Event, error) { + bad := func(reason string) (Event, error) { return Event{}, fmt.Errorf("%w: %s", ErrInvalid, reason) } + if len(data) > MaxResource || !utf8.ValidString(data) || strings.ContainsRune(data, 0) { + return bad("size or encoding") + } + for _, ch := range data { + if ch < 32 && ch != '\r' && ch != '\n' && ch != '\t' || ch == 127 { + return bad("control character") + } + } + dec := ical.NewDecoder(strings.NewReader(data)) + c, err := dec.Decode() + if err != nil { + return bad(err.Error()) + } + if _, err = dec.Decode(); err != io.EOF { + return bad("one VCALENDAR required") + } + if len(c.Children) != 1 || c.Children[0].Name != "VEVENT" { + return bad("exactly one VEVENT required; recurrence and VTIMEZONE are not yet supported") + } + if c.Props.Get("METHOD") != nil { + return bad("scheduling METHOD is not supported") + } + v, _ := c.Props.Text("VERSION") + if v != "2.0" { + return bad("VERSION must be 2.0") + } + if product, err := c.Props.Text("PRODID"); err != nil || product == "" { + return bad("PRODID is required") + } + // Collection-level properties cannot be merged losslessly into monthly files. + for name := range c.Props { + if name != "VERSION" && name != "PRODID" && name != "CALSCALE" { + return bad("unsupported VCALENDAR property: " + name) + } + } + if scale, _ := c.Props.Text("CALSCALE"); scale != "" && scale != "GREGORIAN" { + return bad("unsupported calendar scale") + } + e := ical.Event{Component: c.Children[0]} + for _, key := range []string{"RRULE", "RDATE", "EXDATE", "RECURRENCE-ID", "DURATION"} { + if e.Props.Get(key) != nil { + return bad(key + " is not yet supported") + } + } + if len(e.Children) > 0 { + return bad("VALARM delivery is not yet supported") + } + for _, key := range []string{"UID", "DTSTAMP", "DTSTART"} { + if len(e.Props[key]) != 1 { + return bad(key + " must occur exactly once") + } + } + uid, err := e.Props.Text("UID") + if err != nil || uid == "" || len(uid) > 512 || strings.ContainsAny(uid, "\r\n\x00") { + return bad("invalid UID") + } + startProp := e.Props.Get("DTSTART") + allDay := startProp.ValueType() == ical.ValueDate + for _, key := range []string{"DTSTART", "DTEND", "DTSTAMP", "CREATED", "LAST-MODIFIED"} { + p := e.Props.Get(key) + if p == nil { + continue + } + date := p.ValueType() == ical.ValueDate + if p.Params.Get("TZID") != "" || (!date && !strings.HasSuffix(p.Value, "Z")) { + return bad("only UTC DATE-TIME or DATE supported") + } + if (key == "DTEND" && date != allDay) || (key != "DTSTART" && key != "DTEND" && date) { + return bad("inconsistent date types") + } + t, err := p.DateTime(time.UTC) + if err != nil || t.Year() < 1 || t.Year() > 9998 { + return bad("invalid " + key) + } + } + start, err := e.DateTimeStart(time.UTC) + if err != nil { + return bad("invalid DTSTART") + } + end, err := e.DateTimeEnd(time.UTC) + if err != nil || end.Before(start) || (e.Props.Get("DTEND") != nil && !end.After(start)) { + return bad("DTEND must follow DTSTART") + } + if _, err = e.Status(); err != nil { + return bad(err.Error()) + } + // Encoder validates required properties, cardinality and child components. + canonical, err := encode(c) + if err != nil { + return bad(err.Error()) + } + // Normalize the envelope, preserving every accepted event property/parameter. + canonical, err = encode(envelope(e.Component)) + if err != nil { + return bad(err.Error()) + } + result := Event{UID: uid, Start: start, End: end, AllDay: allDay, Data: canonical, ETag: "\"" + digest([]byte(canonical)) + "\""} + for key, dst := range map[string]*string{"SUMMARY": &result.Summary, "DESCRIPTION": &result.Description, "LOCATION": &result.Location} { + s, err := e.Props.Text(key) + if err != nil { + return bad(key) + } + *dst = s + } + return result, nil +} + +func component(data string) (*ical.Component, error) { + c, e := ical.NewDecoder(strings.NewReader(data)).Decode() + if e != nil { + return nil, e + } + return c.Children[0], nil +} + +// Build changes only UI-owned fields. Unknown properties survive browser edits. +func Build(old string, item Event) (Event, error) { + e := ical.NewEvent() + if old != "" { + c, err := component(old) + if err != nil { + return Event{}, err + } + e.Component = c + } + e.Props.SetText("UID", item.UID) + e.Props.SetText("SUMMARY", item.Summary) + e.Props.SetText("DESCRIPTION", item.Description) + e.Props.SetText("LOCATION", item.Location) + e.Props.SetDateTime("DTSTAMP", time.Now().UTC().Truncate(time.Second)) + e.Props.SetDateTime("LAST-MODIFIED", time.Now().UTC().Truncate(time.Second)) + for name, t := range map[string]time.Time{"DTSTART": item.Start, "DTEND": item.End} { + p := ical.NewProp(name) + if item.AllDay { + p.SetDate(t.UTC()) + } else { + p.SetDateTime(t.UTC()) + } + e.Props.Set(p) + } + if old != "" { + n := 0 + if p := e.Props.Get("SEQUENCE"); p != nil { + n, _ = strconv.Atoi(p.Value) + } + p := ical.NewProp("SEQUENCE") + p.Value = strconv.Itoa(n + 1) + e.Props.Set(p) + } + data, err := encode(envelope(e.Component)) + if err != nil { + return Event{}, err + } + return Parse(data) +} diff --git a/internal/calendar/preferences.go b/internal/calendar/preferences.go new file mode 100644 index 0000000..c00b04d --- /dev/null +++ b/internal/calendar/preferences.go @@ -0,0 +1,158 @@ +package calendar + +import ( + "context" + "encoding/json" + "errors" + "os" + "path/filepath" + "strings" + "unicode" + + ical "github.com/emersion/go-ical" + "golang.org/x/text/unicode/norm" +) + +var ErrNameTaken = errors.New("pretty_name is already in use") + +func ValidPrettyName(s string) bool { + if s == "" || len(s) > 120 || norm.NFC.String(s) != s || validID(s) { + return false + } + for _, c := range s { + if !unicode.IsLetter(c) && !unicode.IsDigit(c) && c != '-' && c != '_' { + return false + } + } + return true +} +func (r *Repository) uniqueName(domain, id, name string) error { + entries, e := os.ReadDir(filepath.Join(r.Root, domain)) + if e != nil { + return e + } + for _, entry := range entries { + if !entry.IsDir() || !validID(entry.Name()) || entry.Name() == id { + continue + } + c, e := readMeta(filepath.Join(r.Root, domain, entry.Name())) + if errors.Is(e, ErrMissing) { + continue + } + if e != nil { + return e + } + if strings.EqualFold(c.PrettyName, name) { + return ErrNameTaken + } + } + return nil +} +func renameSnapshots(dir string, c *Calendar) error { + for month, hash := range c.Months { + b, e := os.ReadFile(filepath.Join(dir, month+"."+hash+".ics")) + if e != nil { + return e + } + if digest(b) != hash { + return ErrInvalid + } + cal, e := ical.NewDecoder(strings.NewReader(string(b))).Decode() + if e != nil { + return e + } + cal.Props.SetText("NAME", c.PrettyName) + data, e := encode(cal) + if e != nil { + return e + } + h := digest([]byte(data)) + if e = atomicFile(filepath.Join(dir, month+"."+h+".ics"), []byte(data)); e != nil { + return e + } + c.Months[month] = h + } + return nil +} +func pruneSnapshots(dir string, c Calendar) { + files, _ := filepath.Glob(filepath.Join(dir, "*.ics")) + keep := map[string]bool{} + for month, hash := range c.Months { + keep[month+"."+hash+".ics"] = true + } + for _, file := range files { + if !keep[filepath.Base(file)] { + _ = os.Remove(file) + } + } +} + +// Defaults belong to a principal within a Domain. Persist identities, not names. +// Inaccessible calendars are filtered on every read, never used as grants. +func (r *Repository) Defaults(domain, actor string) ([]string, error) { + if actor == "" { + return []string{}, nil + } + if !validID(domain) || !validID(actor) { + return nil, ErrForbidden + } + b, e := os.ReadFile(filepath.Join(r.Root, domain, "preferences", actor+".json")) + if os.IsNotExist(e) { + return []string{}, nil + } + if e != nil { + return nil, e + } + var ids []string + e = json.Unmarshal(b, &ids) + if e != nil { + return nil, e + } + visible, e := r.List(domain, actor) + if e != nil { + return nil, e + } + allowed := map[string]bool{} + for _, c := range visible { + allowed[c.ID] = true + } + out := []string{} + for _, id := range ids { + if allowed[id] { + out = append(out, id) + } + } + return out, nil +} +func (r *Repository) SaveDefaults(ctx context.Context, domain, actor string, ids []string) error { + if !validID(domain) || !validID(actor) { + return ErrForbidden + } + if len(ids) > 32 { + return ErrInvalid + } + seen := map[string]bool{} + for _, id := range ids { + if seen[id] { + return ErrInvalid + } + seen[id] = true + if _, e := r.Get(domain, id, actor); e != nil { + return e + } + } + dir := filepath.Join(r.Root, domain, "preferences") + if e := os.MkdirAll(dir, 0700); e != nil { + return e + } + unlock, e := lock(ctx, dir) + if e != nil { + return e + } + defer unlock() + b, e := json.Marshal(ids) + if e != nil { + return e + } + return atomicFile(filepath.Join(dir, actor+".json"), b) +} diff --git a/internal/calendar/preferences_test.go b/internal/calendar/preferences_test.go new file mode 100644 index 0000000..2542aa4 --- /dev/null +++ b/internal/calendar/preferences_test.go @@ -0,0 +1,99 @@ +package calendar + +import ( + "context" + "errors" + "github.com/google/uuid" + "os" + "path/filepath" + "strings" + "sync" + "testing" +) + +func TestCalendarPrettyNamesDefaultsAndRename(t *testing.T) { + r, d, a, c := fixture(t) + ctx := context.Background() + c, e := r.Settings(ctx, d, c.ID, a, c.Version, c.Name, false, nil, "work") + if e != nil { + t.Fatal(e) + } + second, e := r.Create(ctx, d, a, "Personal", "personal") + if e != nil { + t.Fatal(e) + } + if _, e = r.Create(ctx, d, a, "Duplicate", "WORK"); !errors.Is(e, ErrNameTaken) { + t.Fatal(e) + } + for _, name := range []string{"", "a,b", "../private", "two words", uuid.NewString()} { + if _, e = r.Create(ctx, d, a, "Invalid", name); !errors.Is(e, ErrInvalid) { + t.Fatal(name, e) + } + } + if e = r.SaveDefaults(ctx, d, a, []string{c.ID, second.ID}); e != nil { + t.Fatal(e) + } + v := sample(t, "meeting", "2026-09-01T09:00:00Z", "2026-09-01T10:00:00Z", false) + if _, e = r.Change(ctx, d, c.ID, a, v.UID, "*", &v); e != nil { + t.Fatal(e) + } + c, e = r.Get(d, c.ID, a) + if e != nil { + t.Fatal(e) + } + c, e = r.Settings(ctx, d, c.ID, a, c.Version, c.Name, false, nil, "office") + if e != nil { + t.Fatal(e) + } + ids, e := r.Defaults(d, a) + if e != nil || len(ids) != 2 || ids[0] != c.ID { + t.Fatal(ids, e) + } + dir, _ := r.dir(d, c.ID) + for m, h := range c.Months { + b, e := os.ReadFile(filepath.Join(dir, m+"."+h+".ics")) + if e != nil || !strings.Contains(string(b), "NAME:office\r\n") { + t.Fatal(string(b), e) + } + } + got, e := r.Event(ctx, d, c.ID, a, v.UID) + if e != nil || got.ETag != v.ETag { + t.Fatal("rename changed event identity", e) + } + other := uuid.NewString() + if e = r.SaveDefaults(ctx, d, other, []string{c.ID}); !errors.Is(e, ErrMissing) { + t.Fatal("private default accepted", e) + } + ids, e = r.Defaults(d, other) + if e != nil || len(ids) != 0 { + t.Fatal(ids, e) + } +} +func TestCalendarConcurrentNameReservation(t *testing.T) { + r, d, a, _ := fixture(t) + var wg sync.WaitGroup + results := make(chan error, 2) + for range 2 { + wg.Add(1) + go func() { + defer wg.Done() + _, e := r.Create(context.Background(), d, a, "Shared", "shared") + results <- e + }() + } + wg.Wait() + close(results) + success, conflict := 0, 0 + for e := range results { + if e == nil { + success++ + } else if errors.Is(e, ErrNameTaken) { + conflict++ + } else { + t.Fatal(e) + } + } + if success != 1 || conflict != 1 { + t.Fatal(success, conflict) + } +} diff --git a/internal/calendar/repository.go b/internal/calendar/repository.go new file mode 100644 index 0000000..a593c11 --- /dev/null +++ b/internal/calendar/repository.go @@ -0,0 +1,723 @@ +package calendar + +import ( + "context" + "database/sql" + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "os" + "path/filepath" + "sort" + "strings" + "syscall" + "time" + + ical "github.com/emersion/go-ical" + "github.com/google/uuid" +) + +var ( + ErrForbidden = errors.New("calendar access denied") + ErrConflict = errors.New("calendar precondition failed") + ErrPreconditionRequired = errors.New("calendar If-Match required") + ErrMissing = errors.New("calendar not found") + ErrLimit = errors.New("calendar result limit exceeded; narrow the time range") +) + +type Calendar struct { + ID string `json:"id"` + Name string `json:"name"` + PrettyName string `json:"pretty_name"` + Source *Source `json:"source,omitempty"` + ReadOnly bool `json:"read_only"` + Owner string `json:"owner"` + Public bool `json:"public"` + Members map[string]string `json:"members"` // principal UUID -> read/write + Months map[string]string `json:"months"` // month -> immutable generation hash + Version string `json:"version"` + DAVNames map[string]string `json:"dav_names,omitempty"` // UID -> client filename; canonical metadata, not a DB-only alias +} + +func (c Calendar) CanRead(actor string) bool { + return c.Public || actor != "" && (actor == c.Owner || c.Members[actor] != "") +} +func (c Calendar) CanWrite(actor string) bool { + return c.Source == nil && actor != "" && (actor == c.Owner || c.Members[actor] == "write") +} + +type Repository struct { + Root string + DB *sql.DB + PublicAllowed func(string) bool +} + +func (r *Repository) canRead(domain string, c Calendar, actor string) bool { + if c.Public && r.PublicAllowed != nil && !r.PublicAllowed(domain) { + c.Public = false + } + return c.CanRead(actor) +} + +func New(root string, db *sql.DB) (*Repository, error) { + if root == "" { + return nil, errors.New("calendar document root unavailable") + } + _, err := db.Exec(`CREATE TABLE IF NOT EXISTS calendar_index_state(domain TEXT NOT NULL,calendar TEXT NOT NULL,version TEXT NOT NULL,PRIMARY KEY(domain,calendar)); + CREATE TABLE IF NOT EXISTS calendar_month_cache(domain TEXT NOT NULL,calendar TEXT NOT NULL,month TEXT NOT NULL,hash TEXT NOT NULL,PRIMARY KEY(domain,calendar,month)); + CREATE TABLE IF NOT EXISTS calendar_event_cache(domain TEXT NOT NULL,calendar TEXT NOT NULL,uid TEXT NOT NULL,month TEXT NOT NULL,start INTEGER NOT NULL,end INTEGER NOT NULL,etag TEXT NOT NULL,data TEXT NOT NULL,PRIMARY KEY(domain,calendar,uid)); + CREATE INDEX IF NOT EXISTS calendar_event_range ON calendar_event_cache(domain,calendar,start,end);`) + return &Repository{Root: root, DB: db}, err +} +func validID(s string) bool { u, err := uuid.Parse(s); return err == nil && u.String() == s } +func (r *Repository) dir(domain, id string) (string, error) { + if !validID(domain) || !validID(id) { + return "", ErrMissing + } + return filepath.Join(r.Root, domain, id), nil +} +func atomicFile(path string, data []byte) error { + f, err := os.CreateTemp(filepath.Dir(path), ".calendar-") + if err != nil { + return err + } + defer os.Remove(f.Name()) + if _, err = f.Write(data); err != nil { + f.Close() + return err + } + if err = f.Sync(); err != nil { + f.Close() + return err + } + if err = f.Close(); err != nil { + return err + } + if err = os.Rename(f.Name(), path); err != nil { + return err + } + d, err := os.Open(filepath.Dir(path)) + if err != nil { + return err + } + defer d.Close() + return d.Sync() +} +func lock(ctx context.Context, dir string) (func(), error) { + ctx, cancel := context.WithTimeout(ctx, 5*time.Second) + defer cancel() + f, err := os.OpenFile(filepath.Join(dir, ".lock"), os.O_CREATE|os.O_RDWR, 0600) + if err != nil { + return nil, err + } + for { + err = syscall.Flock(int(f.Fd()), syscall.LOCK_EX|syscall.LOCK_NB) + if err == nil { + return func() { syscall.Flock(int(f.Fd()), syscall.LOCK_UN); f.Close() }, nil + } + if err != syscall.EWOULDBLOCK && err != syscall.EAGAIN { + f.Close() + return nil, err + } + select { + case <-ctx.Done(): + f.Close() + return nil, ctx.Err() + case <-time.After(10 * time.Millisecond): + } + } +} +func readMeta(dir string) (Calendar, error) { + var c Calendar + b, e := os.ReadFile(filepath.Join(dir, "calendar.json")) + if os.IsNotExist(e) { + return c, ErrMissing + } + if e != nil { + return c, e + } + e = json.Unmarshal(b, &c) + if e != nil { + return c, e + } + c.ReadOnly = c.Source != nil + if c.PrettyName == "" { + c.PrettyName = "calendar-" + c.ID + } // deterministic migration, no read-side writes + if !ValidPrettyName(c.PrettyName) { + return c, ErrInvalid + } + if c.ID != filepath.Base(dir) || !validID(c.ID) || !validID(c.Owner) || !validID(c.Version) || strings.TrimSpace(c.Name) == "" { + return c, ErrInvalid + } + for month, hash := range c.Months { + if _, e = time.Parse("2006-01", month); e != nil { + return c, ErrInvalid + } + if bytes, e := hex.DecodeString(hash); e != nil || len(bytes) != 32 { + return c, ErrInvalid + } + } + if c.Months == nil { + c.Months = map[string]string{} + } + for id, role := range c.Members { + if !validID(id) || (role != "read" && role != "write") { + return c, ErrInvalid + } + } + return c, e +} +func saveMeta(dir string, c *Calendar) error { + c.Version = uuid.NewString() + b, e := json.MarshalIndent(c, "", " ") + if e != nil { + return e + } + return atomicFile(filepath.Join(dir, "calendar.json"), b) +} +func (r *Repository) Create(ctx context.Context, domain, actor, name string, pretty ...string) (Calendar, error) { + c := Calendar{ID: uuid.NewString(), Name: strings.TrimSpace(name), Owner: actor, Members: map[string]string{}, Months: map[string]string{}} + c.PrettyName = "calendar-" + c.ID + if len(pretty) > 0 { + c.PrettyName = pretty[0] + } + if !ValidPrettyName(c.PrettyName) { + return c, ErrInvalid + } + if actor == "" || c.Name == "" || len(c.Name) > 200 { + return c, ErrInvalid + } + dir, e := r.dir(domain, c.ID) + if e != nil { + return c, e + } + parent := filepath.Dir(dir) + if e = os.MkdirAll(parent, 0700); e != nil { + return c, e + } + unlock, e := lock(ctx, parent) + if e != nil { + return c, e + } + defer unlock() + if e = r.uniqueName(domain, c.ID, c.PrettyName); e != nil { + return c, e + } + dirs, e := os.ReadDir(parent) + if e != nil { + return c, e + } + count := 0 + for _, entry := range dirs { + if entry.IsDir() && validID(entry.Name()) { + if _, e := os.Stat(filepath.Join(parent, entry.Name(), "calendar.json")); e == nil { + count++ + } + } + } + if count >= 256 { + return c, ErrLimit + } + if e = os.MkdirAll(dir, 0700); e != nil { + return c, e + } + e = saveMeta(dir, &c) + if e == nil { + for _, path := range []string{parent, r.Root, filepath.Dir(r.Root)} { + f, err := os.Open(path) + if err != nil { + return c, err + } + err = f.Sync() + f.Close() + if err != nil { + return c, err + } + } + } + return c, e +} +func (r *Repository) List(domain, actor string) ([]Calendar, error) { + if !validID(domain) { + return nil, ErrMissing + } + dirs, e := os.ReadDir(filepath.Join(r.Root, domain)) + if os.IsNotExist(e) { + return []Calendar{}, nil + } + if e != nil { + return nil, e + } + out := []Calendar{} + for _, d := range dirs { + if !d.IsDir() || !validID(d.Name()) { + continue + } + c, e := readMeta(filepath.Join(r.Root, domain, d.Name())) + if errors.Is(e, ErrMissing) { + continue + } // interrupted, uncommitted creation + if e != nil { + return nil, e + } + if r.canRead(domain, c, actor) { + out = append(out, c) + } + } + sort.Slice(out, func(i, j int) bool { return out[i].Name < out[j].Name }) + return out, nil +} +func (r *Repository) Get(domain, id, actor string) (Calendar, error) { + dir, e := r.dir(domain, id) + if e != nil { + return Calendar{}, e + } + c, e := readMeta(dir) + if e == nil && !r.canRead(domain, c, actor) { + e = ErrMissing + } + return c, e +} +func (r *Repository) Settings(ctx context.Context, domain, id, actor, version, name string, public bool, members map[string]string, pretty ...string) (Calendar, error) { + dir, e := r.dir(domain, id) + if e != nil { + return Calendar{}, e + } + // Domain lock first, then calendar lock: serialize name reservations. + release, e := lock(ctx, filepath.Dir(dir)) + if e != nil { + return Calendar{}, e + } + defer release() + unlock, e := lock(ctx, dir) + if e != nil { + return Calendar{}, e + } + defer unlock() + c, e := readMeta(dir) + if e != nil { + return c, e + } + if actor == "" || c.Owner != actor { + return c, ErrForbidden + } + if version != c.Version { + return c, ErrConflict + } + nameChanged := len(pretty) > 0 && pretty[0] != c.PrettyName + if nameChanged { + if !ValidPrettyName(pretty[0]) { + return c, ErrInvalid + } + if e = r.uniqueName(domain, id, pretty[0]); e != nil { + return c, e + } + c.PrettyName = pretty[0] + } + if public && r.PublicAllowed != nil && !r.PublicAllowed(domain) { + return c, ErrForbidden + } + if strings.TrimSpace(name) == "" || len(name) > 200 || len(members) > 200 { + return c, ErrInvalid + } + for id, role := range members { + if !validID(id) || (role != "read" && role != "write") { + return c, ErrInvalid + } + } + c.Name = name + c.Public = public + c.Members = members + if nameChanged { + if e = renameSnapshots(dir, &c); e != nil { + return c, e + } + } + e = saveMeta(dir, &c) + if e == nil { + pruneSnapshots(dir, c) + } + return c, e +} + +// Delete removes one complete calendar. The Domain lock serializes deletion +// with creation/pretty-name reservation and the calendar lock serializes it +// with event/source writes. Cache rows are disposable, but deleting them +// before the atomic directory rename means a failed rename can safely rebuild +// them from the still-visible canonical files on the next access. +func (r *Repository) Delete(ctx context.Context, domain, id, actor, version string) error { + dir, err := r.dir(domain, id) + if err != nil { + return err + } + parent := filepath.Dir(dir) + release, err := lock(ctx, parent) + if err != nil { + return err + } + defer release() + unlock, err := lock(ctx, dir) + if os.IsNotExist(err) { + return ErrMissing + } + if err != nil { + return err + } + defer unlock() + c, err := readMeta(dir) + if err != nil { + return err + } + if actor == "" || c.Owner != actor { + return ErrForbidden + } + if version == "" || version != c.Version { + return ErrConflict + } + tx, err := r.DB.BeginTx(ctx, nil) + if err != nil { + return err + } + defer tx.Rollback() + for _, table := range []string{"calendar_event_cache", "calendar_month_cache", "calendar_index_state"} { + if _, err = tx.ExecContext(ctx, `DELETE FROM `+table+` WHERE domain=? AND calendar=?`, domain, id); err != nil { + return err + } + } + if err = tx.Commit(); err != nil { + return err + } + tombstone := filepath.Join(parent, ".deleted-calendar-"+id+"-"+uuid.NewString()) + if err = os.Rename(dir, tombstone); err != nil { + return err + } + if err = syncDirectory(parent); err != nil { + return err + } + if err = os.RemoveAll(tombstone); err != nil { + return err + } + return syncDirectory(parent) +} + +func syncDirectory(path string) error { + dir, err := os.Open(path) + if err != nil { + return err + } + defer dir.Close() + return dir.Sync() +} + +// refresh reconciles only changed monthly generations. A crash after manifest +// commit but before index commit repairs itself on the next request. +func (r *Repository) refresh(ctx context.Context, domain string, c Calendar, dir string) error { + var version string + if err := r.DB.QueryRowContext(ctx, `SELECT version FROM calendar_index_state WHERE domain=? AND calendar=?`, domain, c.ID).Scan(&version); err == nil && version == c.Version { + return nil + } else if err != nil && err != sql.ErrNoRows { + return err + } + tx, e := r.DB.BeginTx(ctx, nil) + if e != nil { + return e + } + defer tx.Rollback() + rows, e := tx.QueryContext(ctx, `SELECT month,hash FROM calendar_month_cache WHERE domain=? AND calendar=?`, domain, c.ID) + if e != nil { + return e + } + known := map[string]string{} + for rows.Next() { + var m, h string + if e = rows.Scan(&m, &h); e != nil { + rows.Close() + return e + } + known[m] = h + } + e = rows.Err() + rows.Close() + if e != nil { + return e + } + for m, h := range known { + if c.Months[m] != h { + if _, e = tx.ExecContext(ctx, `DELETE FROM calendar_event_cache WHERE domain=? AND calendar=? AND month=?`, domain, c.ID, m); e != nil { + return e + } + if _, e = tx.ExecContext(ctx, `DELETE FROM calendar_month_cache WHERE domain=? AND calendar=? AND month=?`, domain, c.ID, m); e != nil { + return e + } + } + } + for m, h := range c.Months { + if known[m] == h { + continue + } + if len(h) != 64 || strings.ContainsAny(h, "/\\") || len(m) != 7 { + return ErrInvalid + } + b, e := os.ReadFile(filepath.Join(dir, m+"."+h+".ics")) + if e != nil { + return e + } + if digest(b) != h { + return fmt.Errorf("calendar snapshot checksum mismatch") + } + cal, e := ical.NewDecoder(strings.NewReader(string(b))).Decode() + if e != nil { + return e + } + for _, child := range cal.Children { + data, e := encode(envelope(child)) + if e != nil { + return e + } + event, e := Parse(data) + if e != nil { + return e + } + if _, e = tx.ExecContext(ctx, `INSERT INTO calendar_event_cache(domain,calendar,uid,month,start,end,etag,data) VALUES(?,?,?,?,?,?,?,?)`, domain, c.ID, event.UID, m, event.Start.Unix(), event.End.Unix(), event.ETag, event.Data); e != nil { + return e + } + } + if _, e = tx.ExecContext(ctx, `INSERT INTO calendar_month_cache(domain,calendar,month,hash) VALUES(?,?,?,?)`, domain, c.ID, m, h); e != nil { + return e + } + } + if _, e = tx.ExecContext(ctx, `INSERT INTO calendar_index_state(domain,calendar,version) VALUES(?,?,?) ON CONFLICT(domain,calendar) DO UPDATE SET version=excluded.version`, domain, c.ID, c.Version); e != nil { + return e + } + return tx.Commit() +} +func (r *Repository) locked(ctx context.Context, domain, id, actor string) (Calendar, string, func(), error) { + return r.lockedWithGuard(ctx, domain, id, actor, nil) +} + +// The guard runs under the metadata lock, BEFORE reading any ICS snapshots. +func (r *Repository) lockedWithGuard(ctx context.Context, domain, id, actor string, guard func(Calendar) bool) (Calendar, string, func(), error) { + dir, e := r.dir(domain, id) + if e != nil { + return Calendar{}, "", nil, e + } + unlock, e := lock(ctx, dir) + if os.IsNotExist(e) { + e = ErrMissing + } + if e != nil { + return Calendar{}, "", nil, e + } + c, e := readMeta(dir) + if e == nil && !r.canRead(domain, c, actor) { + e = ErrMissing + } + if e == nil && guard != nil && !guard(c) { + e = ErrForbidden + } + if e == nil { + e = r.refresh(ctx, domain, c, dir) + } + if e != nil { + unlock() + return c, dir, nil, e + } + return c, dir, unlock, nil +} +func (r *Repository) Query(ctx context.Context, domain, id, actor string, start, end time.Time) ([]Event, error) { + return r.query(ctx, domain, id, actor, start, end, true) +} +func (r *Repository) QueryETags(ctx context.Context, domain, id, actor string, start, end time.Time) ([]Event, error) { + return r.query(ctx, domain, id, actor, start, end, false) +} +func (r *Repository) query(ctx context.Context, domain, id, actor string, start, end time.Time, withData bool) ([]Event, error) { + return r.queryLimit(ctx, domain, id, actor, start, end, withData, 5001) +} + +// Upcoming bounds body parsing for the navigation modal, even in busy calendars. +func (r *Repository) Upcoming(ctx context.Context, domain, id, actor string, start, end time.Time) ([]Event, error) { + return r.queryLimit(ctx, domain, id, actor, start, end, true, 20) +} +func (r *Repository) queryLimit(ctx context.Context, domain, id, actor string, start, end time.Time, withData bool, limit int) ([]Event, error) { + if !end.After(start) || end.Sub(start) > 370*24*time.Hour { + return nil, ErrInvalid + } + _, _, unlock, e := r.locked(ctx, domain, id, actor) + if e != nil { + return nil, e + } + defer unlock() + columns := "uid,etag" + if withData { + columns = "data" + } + rows, e := r.DB.QueryContext(ctx, `SELECT `+columns+` FROM calendar_event_cache WHERE domain=? AND calendar=? AND start? OR (start=end AND start>=?)) ORDER BY start,uid LIMIT ?`, domain, id, end.Unix(), start.Unix(), start.Unix(), limit) + if e != nil { + return nil, e + } + defer rows.Close() + out := []Event{} + for rows.Next() { + if !withData { + var v Event + if e = rows.Scan(&v.UID, &v.ETag); e != nil { + return nil, e + } + out = append(out, v) + continue + } + var data string + if e = rows.Scan(&data); e != nil { + return nil, e + } + v, e := Parse(data) + if e != nil { + return nil, e + } + out = append(out, v) + } + if len(out) > 5000 { + return nil, ErrLimit + } + return out, rows.Err() +} +func (r *Repository) Event(ctx context.Context, domain, id, actor, uid string) (Event, error) { + _, _, unlock, e := r.locked(ctx, domain, id, actor) + if e != nil { + return Event{}, e + } + defer unlock() + var data string + e = r.DB.QueryRowContext(ctx, `SELECT data FROM calendar_event_cache WHERE domain=? AND calendar=? AND uid=?`, domain, id, uid).Scan(&data) + if e == sql.ErrNoRows { + e = ErrMissing + } + if e != nil { + return Event{}, e + } + return Parse(data) +} + +// Change commits a replacement manifest only after every affected month is +// durable. Moving an event across months is atomic, even across process crashes. +func (r *Repository) Change(ctx context.Context, domain, id, actor, uid, match string, item *Event) (Event, error) { + c, dir, unlock, e := r.locked(ctx, domain, id, actor) + if e != nil { + return Event{}, e + } + defer unlock() + return r.changeLocked(ctx, domain, actor, uid, match, item, c, dir) +} + +func (r *Repository) changeLocked(ctx context.Context, domain, actor, uid, match string, item *Event, c Calendar, dir string) (Event, error) { + id := c.ID + if !c.CanWrite(actor) { + return Event{}, ErrForbidden + } + var oldData, oldMonth, oldTag string + e := r.DB.QueryRowContext(ctx, `SELECT data,month,etag FROM calendar_event_cache WHERE domain=? AND calendar=? AND uid=?`, domain, id, uid).Scan(&oldData, &oldMonth, &oldTag) + exists := e == nil + if e != nil && e != sql.ErrNoRows { + return Event{}, e + } + if (exists && match != oldTag) || (!exists && match != "*") { + return Event{}, ErrConflict + } + if !exists && item == nil { + return Event{}, ErrMissing + } + next := Event{} + newMonth := "" + if item != nil { + next, e = Parse(item.Data) + if e != nil { + return Event{}, e + } + if next.UID != uid { + return Event{}, ErrInvalid + } + newMonth = next.Start.Format("2006-01") + } else { + delete(c.DAVNames, uid) + } + months := map[string]bool{} + if oldMonth != "" { + months[oldMonth] = true + } + if newMonth != "" { + months[newMonth] = true + } + for month := range months { + rows, e := r.DB.QueryContext(ctx, `SELECT data FROM calendar_event_cache WHERE domain=? AND calendar=? AND month=? AND uid<>? ORDER BY uid`, domain, id, month, uid) + if e != nil { + return Event{}, e + } + children := []*ical.Component{} + for rows.Next() { + var data string + if e = rows.Scan(&data); e != nil { + rows.Close() + return Event{}, e + } + ch, e := component(data) + if e != nil { + rows.Close() + return Event{}, e + } + children = append(children, ch) + } + e = rows.Err() + rows.Close() + if e != nil { + return Event{}, e + } + if newMonth == month { + ch, e := component(next.Data) + if e != nil { + return Event{}, e + } + children = append(children, ch) + } + if len(children) == 0 { + delete(c.Months, month) + continue + } + if len(children) > 5000 { + return Event{}, fmt.Errorf("monthly event limit exceeded") + } + cal := envelope(children...) + cal.Props.SetText("NAME", c.PrettyName) + data, e := encode(cal) + if e != nil { + return Event{}, e + } + if len(data) > 16<<20 { + return Event{}, fmt.Errorf("monthly calendar size limit exceeded") + } + hash := digest([]byte(data)) + if e = atomicFile(filepath.Join(dir, month+"."+hash+".ics"), []byte(data)); e != nil { + return Event{}, e + } + c.Months[month] = hash + } + if e = saveMeta(dir, &c); e != nil { + return Event{}, e + } + // Only current generations are retained. Interrupted writes are harmless + // unreferenced files; clean them on the next successful commit. + files, _ := filepath.Glob(filepath.Join(dir, "*.ics")) + keep := map[string]bool{} + for month, hash := range c.Months { + keep[month+"."+hash+".ics"] = true + } + for _, file := range files { + if !keep[filepath.Base(file)] { + _ = os.Remove(file) + } + } + // The committed files, not SQLite, determine success. A subsequent read + // reconciles the cache; retries with the old ETag correctly get 412. + return next, nil +} diff --git a/internal/calendar/source.go b/internal/calendar/source.go new file mode 100644 index 0000000..87e03de --- /dev/null +++ b/internal/calendar/source.go @@ -0,0 +1,245 @@ +package calendar + +import ( + "context" + "fmt" + "io" + "os" + "path/filepath" + "sort" + "strings" + "time" + + ical "github.com/emersion/go-ical" +) + +const MaxFeed = 8 << 20 + +type Source struct { + Kind string `json:"kind"` + Credential string `json:"credential,omitempty"` + HasCredential bool `json:"has_credential"` + Resources map[string]RemoteResource `json:"resources,omitempty"` + URL string `json:"url"` + IntervalSeconds int64 `json:"interval_seconds"` + Enabled bool `json:"enabled"` + ETag string `json:"etag,omitempty"` + Modified string `json:"last_modified,omitempty"` + Next int64 `json:"next_at_ms"` + Checked int64 `json:"checked_at_ms"` + Success int64 `json:"success_at_ms"` + Error string `json:"error,omitempty"` +} +type RemoteResource struct { + UID string `json:"uid"` + ETag string `json:"etag"` +} + +func (r *Repository) SourceCalendar(domain, id string) (Calendar, error) { + dir, e := r.dir(domain, id) + if e != nil { + return Calendar{}, e + } + c, e := readMeta(dir) + if e != nil { + return c, e + } + if c.Source == nil { + return c, ErrMissing + } + return c, nil +} + +func ParseFeed(data []byte) ([]Event, error) { + if len(data) > MaxFeed { + return nil, ErrLimit + } + dec := ical.NewDecoder(strings.NewReader(string(data))) + cal, e := dec.Decode() + if e != nil { + return nil, fmt.Errorf("%w: malformed VCALENDAR", ErrInvalid) + } + if _, e = dec.Decode(); e != io.EOF { + return nil, ErrInvalid + } + version, _ := cal.Props.Text("VERSION") + product, _ := cal.Props.Text("PRODID") + if len(cal.Props["VERSION"]) != 1 || version != "2.0" || len(cal.Props["PRODID"]) != 1 || product == "" || cal.Props.Get("METHOD") != nil { + return nil, ErrInvalid + } + if scale := cal.Props.Get("CALSCALE"); scale != nil && (len(cal.Props["CALSCALE"]) != 1 || !strings.EqualFold(scale.Value, "GREGORIAN")) { + return nil, ErrInvalid + } + result := []Event{} + seen := map[string]bool{} + for _, child := range cal.Children { + if child.Name != "VEVENT" { + return nil, fmt.Errorf("%w: source contains unsupported %s", ErrInvalid, child.Name) + } + payload, e := encode(envelope(child)) + if e != nil { + return nil, ErrInvalid + } + event, e := Parse(payload) + if e != nil { + return nil, e + } + if seen[event.UID] { + return nil, fmt.Errorf("%w: duplicate UID or recurrence exception", ErrInvalid) + } + seen[event.UID] = true + result = append(result, event) + if len(result) > 5000 { + return nil, ErrLimit + } + } + return result, nil +} + +func (r *Repository) SetSource(ctx context.Context, domain, id, actor, version string, source Source) (Calendar, error) { + dir, e := r.dir(domain, id) + if e != nil { + return Calendar{}, e + } + unlock, e := lock(ctx, dir) + if e != nil { + return Calendar{}, e + } + defer unlock() + c, e := readMeta(dir) + if e != nil { + return c, e + } + if actor == "" || c.Owner != actor { + return c, ErrForbidden + } + if c.Version != version { + return c, ErrConflict + } + if source.IntervalSeconds < 60 || source.IntervalSeconds > 604800 || source.URL == "" { + return c, ErrInvalid + } + if source.Kind == "" { + source.Kind = "ics" + } + if source.Kind != "ics" && source.Kind != "caldav" { + return c, ErrInvalid + } + if c.Source == nil && len(c.Months) > 0 { + return c, fmt.Errorf("%w: use an empty calendar for an external source", ErrInvalid) + } + if c.Source != nil && c.Source.URL == source.URL && c.Source.Kind == source.Kind && c.Source.Credential == source.Credential { + previous := *c.Source + previous.IntervalSeconds = source.IntervalSeconds + previous.Enabled = source.Enabled + previous.Next = 0 + source = previous + } + c.Source = &source + c.ReadOnly = true + e = saveMeta(dir, &c) + return c, e +} +func (r *Repository) Sources(domain string) ([]Calendar, error) { + if !validID(domain) { + return nil, ErrMissing + } + entries, e := os.ReadDir(filepath.Join(r.Root, domain)) + if os.IsNotExist(e) { + return []Calendar{}, nil + } + if e != nil { + return nil, e + } + out := []Calendar{} + for _, entry := range entries { + if !entry.IsDir() || !validID(entry.Name()) { + continue + } + c, e := readMeta(filepath.Join(r.Root, domain, entry.Name())) + if e != nil { + continue + } + if c.Source != nil { + out = append(out, c) + } + } + return out, nil +} + +// A complete, validated source response replaces the imported snapshot in a +// single manifest commit. Transport/validation failures never erase events. +func (r *Repository) ApplySource(ctx context.Context, domain string, before Calendar, events []Event, etag, modified string, notModified bool, syncErr error, resources ...map[string]RemoteResource) error { + dir, e := r.dir(domain, before.ID) + if e != nil { + return e + } + unlock, e := lock(ctx, dir) + if e != nil { + return e + } + defer unlock() + c, e := readMeta(dir) + if e != nil { + return e + } + if c.Source == nil || c.Version != before.Version { + return ErrConflict + } + if syncErr == nil && !notModified { + // Provider response ordering must not rewrite unchanged monthly files. + events = append([]Event(nil), events...) + sort.Slice(events, func(i, j int) bool { return events[i].UID < events[j].UID }) + months := map[string][]*ical.Component{} + for _, event := range events { + child, e := component(event.Data) + if e != nil { + return e + } + month := event.Start.Format("2006-01") + months[month] = append(months[month], child) + } + hashes := map[string]string{} + for month, children := range months { + if len(children) > 5000 { + return ErrLimit + } + cal := envelope(children...) + cal.Props.SetText("NAME", c.PrettyName) + data, e := encode(cal) + if e != nil { + return e + } + if len(data) > 16<<20 { + return ErrLimit + } + hash := digest([]byte(data)) + if c.Months[month] != hash { + if e = atomicFile(filepath.Join(dir, month+"."+hash+".ics"), []byte(data)); e != nil { + return e + } + } + hashes[month] = hash + } + c.Months = hashes + c.Source.ETag = etag + c.Source.Modified = modified + if len(resources) > 0 { + c.Source.Resources = resources[0] + } + } + now := time.Now() + c.Source.Checked = now.UnixMilli() + c.Source.Next = now.Add(time.Duration(c.Source.IntervalSeconds) * time.Second).UnixMilli() + if syncErr != nil { + c.Source.Error = syncErr.Error() + } else { + c.Source.Error = "" + c.Source.Success = now.UnixMilli() + } + if e = saveMeta(dir, &c); e != nil { + return e + } + pruneSnapshots(dir, c) + return nil +} diff --git a/internal/calendar/source_test.go b/internal/calendar/source_test.go new file mode 100644 index 0000000..0ea2599 --- /dev/null +++ b/internal/calendar/source_test.go @@ -0,0 +1,53 @@ +package calendar + +import ( + "context" + "errors" + "testing" + "time" +) + +func TestCalendarSourceAtomicSnapshotAndFailure(t *testing.T) { + r, d, a, c := fixture(t) + ctx := context.Background() + c, e := r.SetSource(ctx, d, c.ID, a, c.Version, Source{Kind: "ics", URL: "https://example.org/feed.ics", IntervalSeconds: 60, Enabled: true}) + if e != nil { + t.Fatal(e) + } + event := sample(t, "external", "2026-09-22T09:00:00Z", "2026-09-22T10:00:00Z", false) + events, e := ParseFeed([]byte(event.Data)) + if e != nil || len(events) != 1 { + t.Fatal(e) + } + if e = r.ApplySource(ctx, d, c, events, `"tag"`, "", false, nil); e != nil { + t.Fatal(e) + } + c, _ = r.Get(d, c.ID, a) + if _, e = r.Change(ctx, d, c.ID, a, event.UID, event.ETag, nil); !errors.Is(e, ErrForbidden) { + t.Fatal("external calendar editable", e) + } + if e = r.ApplySource(ctx, d, c, nil, "", "", false, errors.New("network failed")); e != nil { + t.Fatal(e) + } + retained, e := r.Event(ctx, d, c.ID, a, event.UID) + if e != nil || retained.UID != event.UID { + t.Fatal("failure erased snapshot", e) + } + c, _ = r.Get(d, c.ID, a) + if c.Source.Error == "" || c.Source.Next <= time.Now().UnixMilli() { + t.Fatal(c.Source) + } + if e = r.ApplySource(ctx, d, c, nil, "", "", true, nil); e != nil { + t.Fatal(e) + } + c, _ = r.Get(d, c.ID, a) + if c.Source.ETag != `"tag"` || c.Source.Error != "" { + t.Fatal(c.Source) + } + if e = r.ApplySource(ctx, d, c, []Event{}, "new", "", false, nil); e != nil { + t.Fatal(e) + } + if _, e = r.Event(ctx, d, c.ID, a, event.UID); !errors.Is(e, ErrMissing) { + t.Fatal("confirmed removal retained", e) + } +} diff --git a/internal/calendar/task_blocks.go b/internal/calendar/task_blocks.go new file mode 100644 index 0000000..ba2bc7d --- /dev/null +++ b/internal/calendar/task_blocks.go @@ -0,0 +1,48 @@ +package calendar + +import ( + "context" + "database/sql" +) + +// PersonalLocal excludes shared, public and imported calendars. In particular, +// a task integration must never load external calendar event contents. +func (c Calendar) PersonalLocal(actor string) bool { + return actor != "" && c.Owner == actor && c.Source == nil && !c.Public && len(c.Members) == 0 +} + +// ReadPersonalLocalIndex permits a bounded metadata projection against the +// refreshed cache. The callback must not call back into this repository. +func (r *Repository) ReadPersonalLocalIndex(ctx context.Context, domain, id, actor string, read func(Calendar) error) error { + c, _, unlock, err := r.lockedWithGuard(ctx, domain, id, actor, func(c Calendar) bool { return c.PersonalLocal(actor) }) + if err != nil { + return err + } + defer unlock() + return read(c) +} + +// TaskBlock gets a current event, or creates it if absent and a draft is supplied. +// Retries NEVER overwrite an event moved/edited in the calendar. Metadata policy +// is checked under the same lock as snapshot access and the eventual commit. +func (r *Repository) TaskBlock(ctx context.Context, domain, id, actor, uid string, draft *Event) (Calendar, Event, error) { + c, dir, unlock, err := r.lockedWithGuard(ctx, domain, id, actor, func(c Calendar) bool { return c.PersonalLocal(actor) }) + if err != nil { + return Calendar{}, Event{}, err + } + defer unlock() + var data string + err = r.DB.QueryRowContext(ctx, `SELECT data FROM calendar_event_cache WHERE domain=? AND calendar=? AND uid=?`, domain, id, uid).Scan(&data) + if err == nil { + event, e := Parse(data) + return c, event, e + } + if err != sql.ErrNoRows { + return c, Event{}, err + } + if draft == nil { + return c, Event{}, ErrMissing + } + event, err := r.changeLocked(ctx, domain, actor, uid, "*", draft, c, dir) + return c, event, err +} diff --git a/internal/calendar/task_blocks_test.go b/internal/calendar/task_blocks_test.go new file mode 100644 index 0000000..ad1758b --- /dev/null +++ b/internal/calendar/task_blocks_test.go @@ -0,0 +1,47 @@ +package calendar + +import ( + "context" + "errors" + "strings" + "testing" + + "github.com/google/uuid" +) + +func TestTaskBlockGuardBeforeSnapshotAccess(t *testing.T) { + for _, mode := range []string{"external", "public", "shared", "other-owner"} { + t.Run(mode, func(t *testing.T) { + r, domain, actor, c := fixture(t) + dir, _ := r.dir(domain, c.ID) + // A deliberately absent snapshot detects ANY attempted refresh. + c.Months["2026-09"] = strings.Repeat("a", 64) + switch mode { + case "external": + c.Source = &Source{Kind: "ics", URL: "https://example.invalid/private.ics"} + case "public": + c.Public = true + case "shared": + c.Members = map[string]string{uuid.NewString(): "read"} + case "other-owner": + actor = "someone-else" + } + if err := saveMeta(dir, &c); err != nil { + t.Fatal(err) + } + _, _, err := r.TaskBlock(context.Background(), domain, c.ID, actor, "fake", nil) + if !errors.Is(err, ErrForbidden) && !errors.Is(err, ErrMissing) { + t.Fatalf("snapshot accessed: %v", err) + } + called := false + err = r.ReadPersonalLocalIndex(context.Background(), domain, c.ID, actor, func(Calendar) error { called = true; return nil }) + if called || (!errors.Is(err, ErrForbidden) && !errors.Is(err, ErrMissing)) { + t.Fatalf("range projection accessed blocked snapshot: %v", err) + } + var n int + if err := r.DB.QueryRow(`SELECT count(*) FROM calendar_index_state`).Scan(&n); err != nil || n != 0 { + t.Fatalf("cache populated %d %v", n, err) + } + }) + } +} diff --git a/internal/db/bootstrap.go b/internal/db/bootstrap.go index de97b2e..fa59d46 100644 --- a/internal/db/bootstrap.go +++ b/internal/db/bootstrap.go @@ -1,7 +1,9 @@ package db import ( + "crypto/sha256" "database/sql" + "encoding/hex" "github.com/google/uuid" ) @@ -28,6 +30,14 @@ func Bootstrap( rootUUID := uuid.NewString() + rootBody := + "

    Pages Wiki

    Bootstrap complete.

    " + + rootBodySum := + sha256.Sum256( + []byte(rootBody), + ) + _, err = database.Exec(` INSERT INTO objects ( uuid, created_at ) VALUES ( ?, strftime('%s','now') )`, rootUUID, @@ -61,18 +71,27 @@ func Bootstrap( uuid, object_uuid, body, + document_hash, + lang, message, + created_at_ms, created_at ) VALUES ( - 'bootstrap-root', ?, - '

    Pages Wiki

    Bootstrap complete.

    ', + ?, + ?, + ?, + 'und', 'bootstrap', + CAST(strftime('%s','now') AS INTEGER) * 1000, strftime('%s','now') ) `, + uuid.NewString(), rootUUID, + rootBody, + hex.EncodeToString(rootBodySum[:]), ) return err diff --git a/internal/db/db.go b/internal/db/db.go index 65137b4..59a3cbe 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -2,12 +2,29 @@ package db import ( "database/sql" + "net/url" + "path/filepath" _ "modernc.org/sqlite" ) func Open(path string) (*sql.DB, error) { - return sql.Open("sqlite", path) + absolutePath, err := filepath.Abs(path) + if err != nil { + return nil, err + } + dsn := (&url.URL{ + Scheme: "file", + Path: absolutePath, + RawQuery: url.Values{ + "_pragma": { + "busy_timeout(5000)", + "journal_mode(WAL)", + "synchronous(NORMAL)", + }, + }.Encode(), + }).String() + return sql.Open("sqlite", dsn) } func Init(db *sql.DB) error { @@ -22,13 +39,18 @@ func Init(db *sql.DB) error { created_at INTEGER NOT NULL ) `, - // revisions: has UUID, object uuid, body, message, created_at + // revisions: immutable event metadata referencing a Document hash ` CREATE TABLE IF NOT EXISTS revisions ( uuid TEXT PRIMARY KEY, object_uuid TEXT NOT NULL, body TEXT NOT NULL, + document_hash TEXT NOT NULL, + lang TEXT NOT NULL DEFAULT 'und', + content_type TEXT NOT NULL DEFAULT 'text/html; charset=utf-8', + filename TEXT NOT NULL DEFAULT '', message TEXT NOT NULL, + created_at_ms INTEGER NOT NULL, created_at INTEGER NOT NULL ) `, @@ -46,6 +68,15 @@ func Init(db *sql.DB) error { object_uuid TEXT NOT NULL, tag TEXT NOT NULL ) + `, + ` + CREATE TABLE IF NOT EXISTS assets ( + address TEXT PRIMARY KEY, + object_uuid TEXT NOT NULL, + head_document_hash TEXT, + created_at_ms INTEGER NOT NULL, + updated_at_ms INTEGER NOT NULL + ) `, } diff --git a/internal/db/migrate.go b/internal/db/migrate.go index a2d0975..a61ee3c 100644 --- a/internal/db/migrate.go +++ b/internal/db/migrate.go @@ -1,6 +1,10 @@ package db -import "database/sql" +import ( + "crypto/sha256" + "database/sql" + "encoding/hex" +) func Migrate( db *sql.DB, @@ -16,6 +20,14 @@ func Migrate( strftime('%s','now') ) ) + `, + + ` + CREATE TABLE IF NOT EXISTS object_origins ( + object_uuid TEXT PRIMARY KEY REFERENCES objects(uuid) ON DELETE CASCADE, + domain_uuid TEXT NOT NULL, + created_at INTEGER NOT NULL + ) `, ` @@ -23,7 +35,12 @@ func Migrate( uuid TEXT PRIMARY KEY, object_uuid TEXT, body TEXT, - message TEXT, + document_hash TEXT, + lang TEXT NOT NULL DEFAULT 'und', + content_type TEXT NOT NULL DEFAULT 'text/html; charset=utf-8', + filename TEXT NOT NULL DEFAULT '', + message TEXT, + created_at_ms INTEGER, created_at INTEGER DEFAULT ( strftime('%s','now') ) @@ -49,6 +66,25 @@ func Migrate( ) ) `, + + ` + CREATE TABLE IF NOT EXISTS assets ( + address TEXT PRIMARY KEY, + object_uuid TEXT NOT NULL, + head_document_hash TEXT, + created_at_ms INTEGER NOT NULL, + updated_at_ms INTEGER NOT NULL + ) + `, + + ` + CREATE TABLE IF NOT EXISTS revision_document_refs ( + revision_uuid TEXT NOT NULL, + document_hash TEXT NOT NULL, + PRIMARY KEY (revision_uuid, document_hash), + FOREIGN KEY (revision_uuid) REFERENCES revisions(uuid) ON DELETE CASCADE + ) + `, } for _, stmt := range stmts { @@ -75,6 +111,29 @@ func Migrate( ` ALTER TABLE revisions ADD COLUMN created_at INTEGER + `, + + ` + ALTER TABLE revisions + ADD COLUMN document_hash TEXT + `, + + ` + ALTER TABLE revisions + ADD COLUMN lang TEXT NOT NULL DEFAULT 'und' + `, + + ` + ALTER TABLE revisions + ADD COLUMN created_at_ms INTEGER + `, + ` + ALTER TABLE revisions + ADD COLUMN content_type TEXT NOT NULL DEFAULT 'text/html; charset=utf-8' + `, + ` + ALTER TABLE revisions + ADD COLUMN filename TEXT NOT NULL DEFAULT '' `, ` @@ -87,5 +146,120 @@ func Migrate( _, _ = db.Exec(stmt) } - return nil + if err := migrateRevisionMetadata(db); err != nil { + return err + } + if _, err := db.Exec(`CREATE INDEX IF NOT EXISTS idx_revision_document_refs_hash ON revision_document_refs(document_hash,revision_uuid)`); err != nil { + return err + } + // Older databases can already carry revision_metadata_v1 without the + // subsequently added index. Ensure it independently of the data backfill. + if _, err := db.Exec(`CREATE INDEX IF NOT EXISTS idx_revisions_object_history ON revisions(object_uuid, created_at_ms)`); err != nil { + return err + } + _, err := db.Exec(`CREATE INDEX IF NOT EXISTS idx_revisions_object_created + ON revisions(object_uuid, created_at_ms DESC)`) + return err +} + +func migrateRevisionMetadata(db *sql.DB) error { + if _, err := db.Exec(` + CREATE TABLE IF NOT EXISTS schema_migrations ( + name TEXT PRIMARY KEY, + applied_at INTEGER NOT NULL + ) + `); err != nil { + return err + } + var applied int + if err := db.QueryRow(` + SELECT EXISTS( + SELECT 1 + FROM schema_migrations + WHERE name = 'revision_metadata_v1' + ) + `).Scan(&applied); err != nil { + return err + } + if applied != 0 { + return nil + } + + rows, err := db.Query(` + SELECT + uuid, + COALESCE(body, '') + FROM revisions + WHERE document_hash IS NULL + OR document_hash = '' + `) + if err != nil { + return err + } + + type legacyRevision struct { + uuid string + body string + } + + var revisions []legacyRevision + + for rows.Next() { + var revision legacyRevision + + if err := rows.Scan(&revision.uuid, &revision.body); err != nil { + rows.Close() + return err + } + + revisions = append(revisions, revision) + } + + if err := rows.Close(); err != nil { + return err + } + + for _, revision := range revisions { + sum := sha256.Sum256([]byte(revision.body)) + documentHash := hex.EncodeToString(sum[:]) + + if _, err := db.Exec(` + UPDATE revisions + SET document_hash = ? + WHERE uuid = ? + `, documentHash, revision.uuid); err != nil { + return err + } + } + + if _, err = db.Exec(` + UPDATE revisions + SET + lang = COALESCE(NULLIF(lang, ''), 'und'), + created_at_ms = COALESCE( + created_at_ms, + COALESCE(created_at, 0) * 1000 + ) + WHERE lang IS NULL + OR lang = '' + OR created_at_ms IS NULL + `); err != nil { + return err + } + + if _, err = db.Exec(` + CREATE INDEX IF NOT EXISTS idx_revisions_object_created + ON revisions ( + object_uuid, + created_at_ms DESC + ) + `); err != nil { + return err + } + + _, err = db.Exec(` + INSERT OR IGNORE INTO schema_migrations (name, applied_at) + VALUES ('revision_metadata_v1', strftime('%s','now')) + `) + return err } diff --git a/internal/db/migrate_test.go b/internal/db/migrate_test.go new file mode 100644 index 0000000..4e3ee5b --- /dev/null +++ b/internal/db/migrate_test.go @@ -0,0 +1,44 @@ +package db + +import ( + "path/filepath" + "testing" +) + +func TestRevisionMetadataMigrationIsRecorded(t *testing.T) { + database, err := Open(filepath.Join(t.TempDir(), "pages.db")) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + + if err := Migrate(database); err != nil { + t.Fatal(err) + } + var applied int + if err := database.QueryRow(` + SELECT count(*) + FROM schema_migrations + WHERE name = 'revision_metadata_v1' + `).Scan(&applied); err != nil { + t.Fatal(err) + } + if applied != 1 { + t.Fatalf("migration marker count = %d, want 1", applied) + } + // Simulate a deployment which applied the data backfill before the index + // was introduced. A completed migration must not skip missing indexes. + if _, err := database.Exec(`DROP INDEX idx_revisions_object_created`); err != nil { + t.Fatal(err) + } + if err := Migrate(database); err != nil { + t.Fatalf("second migration run failed: %v", err) + } + var indexes int + if err := database.QueryRow(`SELECT count(*) FROM sqlite_master WHERE type='index' AND name='idx_revisions_object_created'`).Scan(&indexes); err != nil { + t.Fatal(err) + } + if indexes != 1 { + t.Fatal("missing revision index after migration") + } +} diff --git a/internal/extensions/registry.go b/internal/extensions/registry.go new file mode 100644 index 0000000..41d40f6 --- /dev/null +++ b/internal/extensions/registry.go @@ -0,0 +1,32 @@ +// Package extensions describes trusted system services, separate from MIME +// viewers/editors. The initial registry is built-in only: a manifest is not +// permission to load arbitrary Go, JavaScript, executables, or remote URLs. +package extensions + +type Manifest struct { + ID string `json:"id"` + APIVersion int `json:"api_version"` + Version string `json:"version"` + Kind string `json:"kind"` + Scope string `json:"scope"` + NameKey string `json:"name_key"` + DescriptionKey string `json:"description_key"` + Capabilities []string `json:"capabilities"` + Events []string `json:"events"` + SettingsPanel string `json:"settings_panel"` + Builtin bool `json:"builtin"` + Enabled bool `json:"enabled"` + ResourceClass string `json:"resource_class,omitempty"` +} + +func Catalog() []Manifest { + return []Manifest{ + {ID: "organizer.tasks", APIVersion: 1, Version: "0.11.1", Kind: "tasks", Scope: "domain", NameKey: "tasks.title", DescriptionKey: "tasks.help", Capabilities: []string{"tasks.own.read", "tasks.own.write"}, Events: []string{"organizer.task.changed", "organizer.project.changed"}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "foreground+background+index"}, + {ID: "organizer.calendar", APIVersion: 1, Version: "0.2.0", Kind: "calendar", Scope: "domain", NameKey: "calendar.title", DescriptionKey: "calendar.help", Capabilities: []string{"calendar.read", "calendar.write"}, Events: []string{}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "foreground+index"}, + {ID: "content.diary", APIVersion: 1, Version: "0.1.0", Kind: "diary", Scope: "domain", NameKey: "periodical.diary", DescriptionKey: "periodical.diary_help", Capabilities: []string{"path.read", "path.write", "domain.extensions.manage"}, Events: []string{"periodical.registered", "periodical.removed"}, SettingsPanel: "diary", Builtin: true, Enabled: true, ResourceClass: "foreground+index"}, + {ID: "content.blog", APIVersion: 1, Version: "0.1.0", Kind: "blog", Scope: "domain", NameKey: "periodical.blog", DescriptionKey: "periodical.blog_help", Capabilities: []string{"path.read", "path.write", "domain.extensions.manage"}, Events: []string{"periodical.registered", "periodical.removed"}, SettingsPanel: "blog", Builtin: true, Enabled: true, ResourceClass: "foreground+index"}, + {ID: "system.resources", APIVersion: 1, Version: "1.0.0", Kind: "monitor", Scope: "instance", NameKey: "config.resource_status", DescriptionKey: "extension.resources", Capabilities: []string{"instance.metrics.read", "instance.metrics.store"}, Events: []string{"resource.sample"}, SettingsPanel: "resources", Builtin: true, Enabled: true, ResourceClass: "background+io"}, + {ID: "navigation.bookmarks", APIVersion: 1, Version: "1.0.0", Kind: "navigation", Scope: "domain", NameKey: "home.bookmarks", DescriptionKey: "extension.bookmarks", Capabilities: []string{"domain.bookmarks.manage", "path.read"}, Events: []string{}, SettingsPanel: "bookmarks", Builtin: true, Enabled: true, ResourceClass: "foreground+read"}, + {ID: "sharing.x", APIVersion: 1, Version: "1.0.0", Kind: "sharing", Scope: "domain", NameKey: "extension.share_x", DescriptionKey: "extension.share_x_help", Capabilities: []string{"page.share"}, Events: []string{"share.intent.created"}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "foreground+network"}, + } +} diff --git a/internal/revision/model.go b/internal/revision/model.go index 4824a5f..c895214 100644 --- a/internal/revision/model.go +++ b/internal/revision/model.go @@ -1,8 +1,12 @@ package revision type Revision struct { - UUID string - ObjectUUID string - Message string - CreatedAt int64 + UUID string + ObjectUUID string + DocumentHash string + Language string + ContentType string + Filename string + Message string + CreatedAtMS int64 } diff --git a/internal/server/adapter_gateway_proxy.go b/internal/server/adapter_gateway_proxy.go new file mode 100644 index 0000000..a06cec5 --- /dev/null +++ b/internal/server/adapter_gateway_proxy.go @@ -0,0 +1,42 @@ +package server + +import ( + "net/http" + "net/http/httputil" + "net/url" + "os" + "strings" +) + +const adapterGatewayPrefix = "/_/adaptor" + +func newAdapterGatewayProxy() http.Handler { + origin := strings.TrimSpace(os.Getenv("PAGESWIKI_ADAPTER_GATEWAY_ORIGIN")) + if origin == "" { + origin = "http://adaptor-gateway:3000" + } + target, err := url.Parse(origin) + if err != nil { + return http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { + http.Error(w, "invalid adapter gateway origin", http.StatusBadGateway) + }) + } + proxy := httputil.NewSingleHostReverseProxy(target) + director := proxy.Director + proxy.Director = func(request *http.Request) { + request.URL.Path = strings.TrimPrefix(request.URL.Path, adapterGatewayPrefix) + if request.URL.Path == "" { + request.URL.Path = "/" + } + request.Header.Set("X-Forwarded-Prefix", adapterGatewayPrefix) + if request.Header.Get("X-Forwarded-Proto") == "" { + if request.TLS != nil { + request.Header.Set("X-Forwarded-Proto", "https") + } else { + request.Header.Set("X-Forwarded-Proto", "http") + } + } + director(request) + } + return proxy +} diff --git a/internal/server/adapter_plugins.go b/internal/server/adapter_plugins.go new file mode 100644 index 0000000..cfac687 --- /dev/null +++ b/internal/server/adapter_plugins.go @@ -0,0 +1,477 @@ +package server + +import ( + "database/sql" + "encoding/json" + "errors" + "fmt" + "mime" + "net/http" + "net/url" + "path/filepath" + "regexp" + "sort" + "strings" +) + +const adapterPluginsConfigKey = "projection_adapter_plugins" + +type adapterPlugin struct { + ID string `json:"id"` + Name string `json:"name"` + Mode string `json:"mode"` // hosted viewer or hosted editor + URLTemplate string `json:"url_template"` + MediaTypes []string `json:"media_types,omitempty"` + Extensions []string `json:"extensions,omitempty"` + Enabled bool `json:"enabled"` + NewTab bool `json:"new_tab,omitempty"` + HTMLMarkdown bool `json:"html_markdown,omitempty"` + DefaultEditor bool `json:"default_editor,omitempty"` + Unsupported bool `json:"unsupported,omitempty"` +} + +type adapterAction struct { + ID string `json:"id"` + Name string `json:"name"` + Mode string `json:"mode"` + Builtin bool `json:"builtin"` + OpenURL string `json:"open_url"` + NewTab bool `json:"new_tab,omitempty"` + Default bool `json:"default,omitempty"` +} + +type builtinAdapterInfo struct { + ID string `json:"id"` + Kind string `json:"kind"` + Delivery string `json:"delivery"` + Selectable bool `json:"selectable"` +} + +var adapterIDPattern = regexp.MustCompile(`^[a-z][a-z0-9._-]{1,63}$`) + +func builtinAdapterManifest() []builtinAdapterInfo { + out := make([]builtinAdapterInfo, 0, len(projectionAdapters)) + for _, adapter := range projectionAdapters { + out = append(out, builtinAdapterInfo{ + ID: adapter.ID, Kind: adapter.Kind, + Delivery: string(adapter.Delivery), Selectable: true, + }) + } + return out +} + +func (s *Server) adapterPlugins(domainUUID string) ([]adapterPlugin, error) { + raw, err := s.store.GetConfigInDomain(domainUUID, adapterPluginsConfigKey) + if err != nil || strings.TrimSpace(raw) == "" { + return []adapterPlugin{}, err + } + var plugins []adapterPlugin + if err := json.Unmarshal([]byte(raw), &plugins); err != nil { + return nil, err + } + // Native execution is reserved for a future local-helper protocol. Keep + // legacy records visible, but never advertise or launch them. + for index := range plugins { + validated := plugins[index] + if err := validateAdapterPlugin(&validated); err != nil { + plugins[index].Enabled = false + plugins[index].Unsupported = true + } + } + return plugins, nil +} + +func (s *Server) saveAdapterPlugins(domainUUID string, plugins []adapterPlugin) error { + sort.Slice(plugins, func(i, j int) bool { return plugins[i].ID < plugins[j].ID }) + data, err := json.Marshal(plugins) + if err != nil { + return err + } + return s.store.SetConfigInDomain(domainUUID, adapterPluginsConfigKey, string(data)) +} + +func validateAdapterPlugin(plugin *adapterPlugin) error { + plugin.ID = strings.ToLower(strings.TrimSpace(plugin.ID)) + plugin.Name = strings.TrimSpace(plugin.Name) + plugin.Mode = strings.ToLower(strings.TrimSpace(plugin.Mode)) + plugin.URLTemplate = strings.TrimSpace(plugin.URLTemplate) + if !adapterIDPattern.MatchString(plugin.ID) || plugin.Name == "" { + return errors.New("invalid adapter id or name") + } + switch plugin.Mode { + case "viewer", "editor": + default: + return errors.New("mode must be viewer or editor; native integration is not implemented") + } + if !strings.Contains(plugin.URLTemplate, "{url}") && + !strings.Contains(plugin.URLTemplate, "{path}") && + !strings.Contains(plugin.URLTemplate, "{ticket}") { + return errors.New("URL template must contain {url}, {path}, or {ticket}") + } + if plugin.Mode == "editor" && !strings.Contains(plugin.URLTemplate, "{ticket}") { + return errors.New("hosted editor URL template must contain {ticket}") + } + sample := strings.NewReplacer( + "{url}", "https://example.invalid/v/raw/path:/sample.txt", + "{path}", "/sample.txt", + "{filename}", "sample.txt", + "{ticket}", "pwa_t_sample", + "{origin}", "https://pages.example.invalid", + ).Replace(plugin.URLTemplate) + parsed, err := url.Parse(sample) + if err != nil || (parsed.Scheme != "http" && parsed.Scheme != "https") { + return errors.New("hosted adapter URL must use http or https") + } + for index, extension := range plugin.Extensions { + extension = strings.ToLower(strings.TrimSpace(extension)) + if extension != "" && !strings.HasPrefix(extension, ".") { + extension = "." + extension + } + plugin.Extensions[index] = extension + } + for index, mediaType := range plugin.MediaTypes { + plugin.MediaTypes[index] = strings.ToLower(strings.TrimSpace(mediaType)) + } + return nil +} + +func pluginMatches(plugin adapterPlugin, mediaType, filename string) bool { + if !plugin.Enabled || plugin.Unsupported || plugin.Mode == "native" { + return false + } + if len(plugin.MediaTypes) == 0 && len(plugin.Extensions) == 0 { + return true + } + for _, candidate := range plugin.MediaTypes { + if candidate == mediaType || + (strings.HasSuffix(candidate, "/*") && + strings.HasPrefix(mediaType, strings.TrimSuffix(candidate, "*"))) { + return true + } + } + extension := strings.ToLower(filepath.Ext(filename)) + for _, candidate := range plugin.Extensions { + if extension == candidate { + return true + } + } + return false +} + +func (s *Server) adapterActionsForPath(r *http.Request, semanticPath string) ([]adapterAction, error) { + domainUUID := s.domainUUIDForRequest(r) + objectUUID, err := s.store.ResolvePathInDomain(domainUUID, semanticPath) + if err != nil { + return nil, err + } + revision, err := s.latestRevisionForRequest(r, objectUUID) + if err != nil { + return nil, err + } + mediaType, _, _ := mime.ParseMediaType(revision.ContentType) + filename := revision.Filename + if filename == "" { + filename = filepath.Base(semanticPath) + } + selected := selectProjectionAdapter(contentDescriptor{ + MediaType: strings.ToLower(mediaType), Filename: filename, + SizeBytes: int64(len(revision.Body)), + }) + actions := []adapterAction{ + {ID: selected.ID, Name: selected.ID, Mode: "viewer", Builtin: true, OpenURL: semanticPath}, + {ID: "download", Name: "download", Mode: "viewer", Builtin: true, + OpenURL: rawProjectionURL("rev:" + revision.UUID)}, + } + if selected.NeedsText || selected.ID == "html" || selected.ID == "excalidraw" { + actions = append(actions, adapterAction{ + ID: "editor", Name: "Pages Wiki Editor", Mode: "editor", + Builtin: true, OpenURL: "/e" + semanticPath, + }) + } + plugins, err := s.adapterPlugins(domainUUID) + if err != nil { + return nil, err + } + sort.SliceStable(plugins, func(i, j int) bool { + return plugins[i].DefaultEditor && !plugins[j].DefaultEditor + }) + for _, plugin := range plugins { + if pluginMatches(plugin, strings.ToLower(mediaType), filename) { + actions = append(actions, adapterAction{ + ID: plugin.ID, Name: plugin.Name, Mode: plugin.Mode, + NewTab: plugin.NewTab, + Default: plugin.DefaultEditor, + OpenURL: "/v/open-with?adapter=" + url.QueryEscape(plugin.ID) + + "&path=" + url.QueryEscape(semanticPath), + }) + } + } + return actions, nil +} + +func (s *Server) handleAdapterAPI(w http.ResponseWriter, r *http.Request) { + action := strings.Trim(strings.TrimPrefix(r.URL.Path, "/_/api/v1/adapter"), "/") + domainUUID := s.domainUUIDForRequest(r) + switch action { + case "": + if r.Method == http.MethodGet { + plugins, err := s.adapterPlugins(domainUUID) + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + response := map[string]any{ + "builtin": builtinAdapterManifest(), "plugins": plugins, + } + if path := strings.TrimSpace(r.URL.Query().Get("path")); path != "" { + actions, err := s.adapterActionsForPath(r, path) + if err != nil { + status := 500 + if errors.Is(err, sql.ErrNoRows) { + status = 404 + } + writeEventJSON(w, status, map[string]string{"error": err.Error()}) + return + } + response["actions"] = actions + } + writeEventJSON(w, 200, response) + return + } + if r.Method == http.MethodPost || r.Method == http.MethodPut { + var plugin adapterPlugin + if !decodeEventJSON(w, r, &plugin) { + return + } + if err := validateAdapterPlugin(&plugin); err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + plugins, err := s.adapterPlugins(domainUUID) + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + if plugin.DefaultEditor { + if plugin.Mode != "editor" { + writeEventJSON(w, 400, map[string]string{"error": "only an editor can be the default editor"}) + return + } + for index := range plugins { + plugins[index].DefaultEditor = false + } + } + replaced := false + for index := range plugins { + if plugins[index].ID == plugin.ID { + plugins[index] = plugin + replaced = true + } + } + if !replaced { + plugins = append(plugins, plugin) + } + if err := s.saveAdapterPlugins(domainUUID, plugins); err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, plugin) + return + } + case "delete": + if r.Method == http.MethodPost || r.Method == http.MethodDelete { + var input struct { + ID string `json:"id"` + } + if !decodeEventJSON(w, r, &input) { + return + } + plugins, err := s.adapterPlugins(domainUUID) + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + filtered := plugins[:0] + for _, plugin := range plugins { + if plugin.ID != input.ID { + filtered = append(filtered, plugin) + } + } + if err := s.saveAdapterPlugins(domainUUID, filtered); err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, map[string]bool{"deleted": true}) + return + } + } + writeEventJSON(w, http.StatusMethodNotAllowed, map[string]string{"error": "unsupported adapter operation"}) +} + +func (s *Server) handleOpenWith(w http.ResponseWriter, r *http.Request) { + semanticPath := strings.TrimSpace(r.URL.Query().Get("path")) + adapterID := strings.TrimSpace(r.URL.Query().Get("adapter")) + if semanticPath == "" || adapterID == "" { + http.Error(w, "path and adapter are required", http.StatusBadRequest) + return + } + if s.authorizePathRequest(r, "read", semanticPath) != nil { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + plugins, err := s.adapterPlugins(s.domainUUIDForRequest(r)) + if err != nil { + http.Error(w, err.Error(), 500) + return + } + var selected *adapterPlugin + for index := range plugins { + if plugins[index].ID == adapterID && plugins[index].Enabled { + selected = &plugins[index] + break + } + } + if selected == nil { + http.NotFound(w, r) + return + } + actions, err := s.adapterActionsForPath(r, semanticPath) + if err != nil { + http.Error(w, err.Error(), 404) + return + } + allowed := false + for _, action := range actions { + if action.ID == selected.ID { + allowed = true + } + } + if !allowed { + http.Error(w, "adapter does not support this document", http.StatusBadRequest) + return + } + objectUUID, err := s.store.ResolvePathInDomain(s.domainUUIDForRequest(r), semanticPath) + if err != nil { + http.NotFound(w, r) + return + } + revision, err := s.latestRevisionForRequest(r, objectUUID) + if err != nil { + http.Error(w, err.Error(), 500) + return + } + scheme := "https" + if r.TLS == nil { + scheme = "http" + } + if forwarded := strings.ToLower(strings.TrimSpace( + strings.Split(r.Header.Get("X-Forwarded-Proto"), ",")[0], + )); forwarded == "http" || forwarded == "https" { + scheme = forwarded + } + rawURL := fmt.Sprintf("%s://%s%s", scheme, r.Host, rawProjectionURL("rev:"+revision.UUID)) + filename := revision.Filename + if filename == "" { + filename = filepath.Base(semanticPath) + } + ticket := "" + if selected.Mode == "editor" { + if s.authorizePathRequest(r, "write", semanticPath) != nil { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + principalUUID := "" + if principal, principalErr := s.store.PrincipalForSession(s.domainUUIDForRequest(r), s.authTokenFromRequest(r)); principalErr == nil { + principalUUID = principal.UUID + } + ticket, err = s.store.IssueAdapterTicketForPrincipal( + principalUUID, s.domainUUIDForRequest(r), selected.ID, objectUUID, revision.UUID, semanticPath, + ) + if err != nil { + http.Error(w, err.Error(), 500) + return + } + } + origin := fmt.Sprintf("%s://%s", scheme, r.Host) + target := strings.NewReplacer( + "{url}", url.QueryEscape(rawURL), + "{path}", url.QueryEscape(semanticPath), + "{filename}", url.QueryEscape(filename), + "{ticket}", url.QueryEscape(ticket), + "{origin}", url.QueryEscape(origin), + ).Replace(selected.URLTemplate) + http.Redirect(w, r, target, http.StatusFound) +} + +func (s *Server) handleAdapterPluginConfig(w http.ResponseWriter, r *http.Request) { + domainUUID := s.domainUUIDForRequest(r) + id := strings.TrimSpace(r.URL.Query().Get("id")) + if r.Method == http.MethodPost { + if err := r.ParseForm(); err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + id = strings.TrimSpace(r.FormValue("id")) + } + plugins, err := s.adapterPlugins(domainUUID) + if err != nil { + http.Error(w, err.Error(), 500) + return + } + index := -1 + for candidate := range plugins { + if plugins[candidate].ID == id { + index = candidate + break + } + } + if index < 0 { + http.NotFound(w, r) + return + } + if r.Method == http.MethodPost { + if r.FormValue("connection_fields") == "1" { + plugins[index].Name = strings.TrimSpace(r.FormValue("name")) + plugins[index].Mode = strings.TrimSpace(r.FormValue("mode")) + plugins[index].URLTemplate = strings.TrimSpace(r.FormValue("url_template")) + plugins[index].Enabled = r.FormValue("enabled") != "" + plugins[index].MediaTypes = splitAdapterList(r.FormValue("media_types")) + plugins[index].Extensions = splitAdapterList(r.FormValue("extensions")) + if err := validateAdapterPlugin(&plugins[index]); err != nil { + http.Error(w, err.Error(), 400) + return + } + } + plugins[index].NewTab = boolFormValue(r.FormValue("new_tab")) == "true" + plugins[index].HTMLMarkdown = boolFormValue(r.FormValue("html_markdown")) == "true" + makeDefault := boolFormValue(r.FormValue("default_editor")) == "true" + if makeDefault && plugins[index].Mode != "editor" { + http.Error(w, "only an editor can be the default editor", http.StatusBadRequest) + return + } + if makeDefault { + for candidate := range plugins { + plugins[candidate].DefaultEditor = candidate == index + } + } else { + plugins[index].DefaultEditor = false + } + if err := s.saveAdapterPlugins(domainUUID, plugins); err != nil { + http.Error(w, err.Error(), 500) + return + } + http.Redirect(w, r, "/-/sys/config?panel="+url.QueryEscape("adapter-"+id)+"&saved=1", http.StatusFound) + return + } + http.Redirect(w, r, "/-/sys/config?panel="+url.QueryEscape("adapter-"+id), http.StatusFound) +} + +func splitAdapterList(value string) []string { + var values []string + for _, item := range strings.Split(value, ",") { + if item = strings.TrimSpace(item); item != "" { + values = append(values, item) + } + } + return values +} diff --git a/internal/server/adapter_plugins_test.go b/internal/server/adapter_plugins_test.go new file mode 100644 index 0000000..db6aa5b --- /dev/null +++ b/internal/server/adapter_plugins_test.go @@ -0,0 +1,72 @@ +package server + +import "testing" + +func TestValidateAdapterPlugin(t *testing.T) { + plugin := adapterPlugin{ + ID: "Code.Server", Name: "code-server", Mode: "editor", + URLTemplate: "https://code.example.test/open?ticket={ticket}&origin={origin}", + Extensions: []string{"md", ".txt"}, + Enabled: true, + } + if err := validateAdapterPlugin(&plugin); err != nil { + t.Fatal(err) + } + if plugin.ID != "code.server" || plugin.Extensions[0] != ".md" { + t.Fatalf("normalized plugin = %#v", plugin) + } +} + +func TestWorkspaceFilenamePreservesHierarchyAndMarkdownExtension(t *testing.T) { + if got := workspaceFilename("/guide/install", "/guide", "install.html", true); got != "install.md" { + t.Fatalf("child workspace filename = %q", got) + } + if got := workspaceFilename("/guide/linux/setup", "/guide", "setup.py", false); got != "linux/setup.py" { + t.Fatalf("nested workspace filename = %q", got) + } +} + +func TestValidateAdapterPluginRejectsUnsafeOrUnboundTemplate(t *testing.T) { + tests := []adapterPlugin{ + {ID: "bad.scheme", Name: "Bad", Mode: "viewer", URLTemplate: "javascript:{path}"}, + {ID: "native.todo", Name: "Vim", Mode: "native", URLTemplate: "vim:{path}"}, + {ID: "no.binding", Name: "Bad", Mode: "viewer", URLTemplate: "https://example.invalid/open"}, + {ID: "bad.mode", Name: "Bad", Mode: "execute", URLTemplate: "https://example.invalid/{url}"}, + {ID: "editor.raw", Name: "Bad", Mode: "editor", URLTemplate: "https://example.invalid/{url}"}, + } + for _, plugin := range tests { + if err := validateAdapterPlugin(&plugin); err == nil { + t.Fatalf("plugin unexpectedly accepted: %#v", plugin) + } + } +} + +func TestPluginMatchesMimeWildcardAndExtension(t *testing.T) { + plugin := adapterPlugin{ + Enabled: true, MediaTypes: []string{"image/*"}, Extensions: []string{".drawio"}, + } + if !pluginMatches(plugin, "image/png", "image.bin") { + t.Fatal("MIME wildcard did not match") + } + if !pluginMatches(plugin, "application/xml", "diagram.drawio") { + t.Fatal("extension did not match") + } + if pluginMatches(plugin, "text/plain", "notes.txt") { + t.Fatal("unrelated document matched") + } +} + +func TestPluginMatchesNeverOffersLegacyNativeAdapter(t *testing.T) { + plugin := adapterPlugin{Enabled: true, Mode: "native"} + if pluginMatches(plugin, "text/plain", "notes.txt") { + t.Fatal("legacy native adapter was offered as a runtime action") + } +} + +func TestValidateAdapterPluginRejectsLegacyEditorWithoutTicket(t *testing.T) { + plugin := adapterPlugin{ID: "vscode", Name: "VS Code", Mode: "editor", + URLTemplate: "vscode://file/{url}", Enabled: true} + if err := validateAdapterPlugin(&plugin); err == nil { + t.Fatal("legacy executable URL was accepted") + } +} diff --git a/internal/server/adapter_session_api.go b/internal/server/adapter_session_api.go new file mode 100644 index 0000000..3907ca9 --- /dev/null +++ b/internal/server/adapter_session_api.go @@ -0,0 +1,248 @@ +package server + +import ( + "encoding/base64" + "errors" + "net/http" + "path/filepath" + "strings" + + "pageswiki/internal/compiler" + "pageswiki/internal/render" + "pageswiki/internal/store" +) + +type adapterWorkspaceFile struct { + Path string `json:"path"` + SemanticPath string `json:"semantic_path"` + RevisionUUID string `json:"revision_uuid"` + ContentType string `json:"content_type"` + ContentBase64 string `json:"content_base64"` +} + +func (s *Server) adapterPluginForSession(session *store.AdapterSession) adapterPlugin { + plugins, _ := s.adapterPlugins(session.DomainUUID) + for _, plugin := range plugins { + if plugin.ID == session.PluginID { + return plugin + } + } + return adapterPlugin{} +} + +func workspaceFilename(semanticPath, rootPath, filename string, markdown bool) string { + if semanticPath == rootPath { + filename = filepath.Base(filename) + if filename == "." || filename == "" || filename == "/" { + filename = "index.html" + } + if markdown { + filename = strings.TrimSuffix(filename, filepath.Ext(filename)) + ".md" + } + return filename + } + relative := strings.TrimPrefix(semanticPath, strings.TrimRight(rootPath, "/")+"/") + if filepath.Ext(relative) == "" && filepath.Ext(filename) != "" { + relative += filepath.Ext(filename) + } + if markdown { + relative = strings.TrimSuffix(relative, filepath.Ext(relative)) + ".md" + } + return relative +} + +func (s *Server) workspaceFile(session *store.AdapterSession, semanticPath string, plugin adapterPlugin) (adapterWorkspaceFile, error) { + objectUUID, err := s.store.ResolvePathInDomain(session.DomainUUID, semanticPath) + if err != nil { + return adapterWorkspaceFile{}, err + } + revision, err := s.store.GetLatestRevisionForLanguages(objectUUID, []string{s.getLocale(session.DomainUUID), "und"}) + if err != nil { + return adapterWorkspaceFile{}, err + } + body := revision.Body + markdown := plugin.HTMLMarkdown && strings.HasPrefix(strings.ToLower(revision.ContentType), "text/html") + if markdown { + body, err = compiler.HTMLToMarkdown(body) + if err != nil { + return adapterWorkspaceFile{}, err + } + } + return adapterWorkspaceFile{ + Path: workspaceFilename(semanticPath, session.RootPath, revision.Filename, markdown), + SemanticPath: semanticPath, + RevisionUUID: revision.UUID, ContentType: revision.ContentType, + ContentBase64: base64.StdEncoding.EncodeToString([]byte(body)), + }, nil +} + +func adapterBearer(r *http.Request) string { + value := strings.TrimSpace(r.Header.Get("Authorization")) + if !strings.HasPrefix(value, "Bearer ") { + return "" + } + return strings.TrimSpace(strings.TrimPrefix(value, "Bearer ")) +} + +// authorizeAdapterSession re-checks the current principal on every operation; +// exchanging a ticket must not pin permissions for the lifetime of a session. +func (s *Server) authorizeAdapterSession(r *http.Request, session *store.AdapterSession, capability string, path string) error { + if session.PrincipalUUID == "" { + if mode, _ := s.store.GetConfigInDomain(session.DomainUUID, "authorization_mode"); mode == "enforcing" { + return store.ErrAccessDenied + } + return nil + } + // The session token is intentionally separate from the browser auth token; + // use the principal captured at ticket issuance and re-evaluate its current + // grants on every request. + return s.store.Authorize(store.AuthorizationRequest{DomainUUID: session.DomainUUID, PrincipalUUID: session.PrincipalUUID, Capability: capability, TargetType: "path", TargetID: path}) +} + +func (s *Server) handleAdapterSessionAPI(w http.ResponseWriter, r *http.Request) { + action := strings.Trim(strings.TrimPrefix(r.URL.Path, "/_/api/v1/adapter/session"), "/") + if action == "exchange" && r.Method == http.MethodPost { + var input struct { + Ticket string `json:"ticket"` + } + if !decodeEventJSON(w, r, &input) { + return + } + token, session, err := s.store.ExchangeAdapterTicket(input.Ticket) + if err != nil { + writeEventJSON(w, http.StatusUnauthorized, map[string]string{"error": err.Error()}) + return + } + revision, err := s.store.GetRevision(session.BaseRevisionUUID) + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, map[string]any{ + "session_token": token, "expires_at_ms": session.ExpiresAtMS, + "plugin_id": session.PluginID, + "revision_uuid": revision.UUID, "filename": revision.Filename, + "content_type": revision.ContentType, "lang": revision.Language, + }) + return + } + if action == "content" { + session, err := s.store.GetAdapterSession(adapterBearer(r)) + if err != nil { + writeEventJSON(w, http.StatusUnauthorized, map[string]string{"error": err.Error()}) + return + } + if r.Method == http.MethodGet { + if err := s.authorizeAdapterSession(r, session, "read", session.RootPath); err != nil { + writeEventJSON(w, http.StatusForbidden, map[string]string{"error": "adapter session authorization revoked"}) + return + } + file, err := s.workspaceFile(session, session.RootPath, s.adapterPluginForSession(session)) + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, file) + return + } + if r.Method == http.MethodPut { + if err := s.authorizeAdapterSession(r, session, "write", session.RootPath); err != nil { + writeEventJSON(w, http.StatusForbidden, map[string]string{"error": "adapter session authorization revoked"}) + return + } + var input struct { + ContentBase64 string `json:"content_base64"` + Message string `json:"message"` + Path string `json:"path"` + RevisionUUID string `json:"revision_uuid"` + } + if !decodeEventJSON(w, r, &input) { + return + } + payload, err := base64.StdEncoding.DecodeString(input.ContentBase64) + if err != nil { + writeEventJSON(w, 400, map[string]string{"error": "invalid content_base64"}) + return + } + if len(payload) > 64<<20 { + writeEventJSON(w, 413, map[string]string{"error": "content exceeds 64 MiB"}) + return + } + semanticPath := session.RootPath + if input.Path != "" { + semanticPath = strings.TrimSpace(input.Path) + } + rootPrefix := strings.TrimRight(session.RootPath, "/") + "/" + if semanticPath != session.RootPath && !strings.HasPrefix(semanticPath, rootPrefix) { + writeEventJSON(w, 403, map[string]string{"error": "path is outside the adapter workspace"}) + return + } + if err := s.authorizeAdapterSession(r, session, "write", semanticPath); err != nil { + writeEventJSON(w, http.StatusForbidden, map[string]string{"error": "adapter path authorization revoked"}) + return + } + objectUUID, err := s.store.ResolvePathInDomain(session.DomainUUID, semanticPath) + if err != nil { + writeEventJSON(w, 404, map[string]string{"error": err.Error()}) + return + } + baseRevisionUUID := input.RevisionUUID + if baseRevisionUUID == "" && semanticPath == session.RootPath { + baseRevisionUUID = session.BaseRevisionUUID + } + base, err := s.store.GetRevision(baseRevisionUUID) + if err != nil || base.ObjectUUID != objectUUID { + writeEventJSON(w, 409, map[string]string{"error": "invalid base revision"}) + return + } + plugin := s.adapterPluginForSession(session) + if plugin.HTMLMarkdown && strings.HasPrefix(strings.ToLower(base.ContentType), "text/html") { + payload = []byte(render.Markdown(string(payload))) + } + revision, err := s.store.SaveHostedRevisionAt(session, objectUUID, baseRevisionUUID, payload, input.Message) + if err != nil { + status := 500 + if errors.Is(err, store.ErrRevisionConflict) { + status = http.StatusConflict + } + writeEventJSON(w, status, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, map[string]any{"revision_uuid": revision.UUID, "document_hash": revision.DocumentHash}) + return + } + } + if action == "workspace" && r.Method == http.MethodGet { + session, err := s.store.GetAdapterSession(adapterBearer(r)) + if err != nil { + writeEventJSON(w, http.StatusUnauthorized, map[string]string{"error": err.Error()}) + return + } + if err := s.authorizeAdapterSession(r, session, "read", session.RootPath); err != nil { + writeEventJSON(w, http.StatusForbidden, map[string]string{"error": "adapter session authorization revoked"}) + return + } + paths := []string{session.RootPath} + children, err := s.store.ListChildrenInDomain(session.DomainUUID, session.RootPath) + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + paths = append(paths, children...) + plugin := s.adapterPluginForSession(session) + files := make([]adapterWorkspaceFile, 0, len(paths)) + for _, path := range paths { + file, fileErr := s.workspaceFile(session, path, plugin) + if fileErr == nil { + files = append(files, file) + } + } + payload := map[string]any{"root_path": session.RootPath, "files": files} + if session.PluginID == "vim.wasm" { + payload["vim_settings"] = s.domainVimSettings(session.DomainUUID) + } + writeEventJSON(w, 200, payload) + return + } + writeEventJSON(w, http.StatusMethodNotAllowed, map[string]string{"error": "unsupported adapter session operation"}) +} diff --git a/internal/server/anonymous_browser_test.go b/internal/server/anonymous_browser_test.go new file mode 100644 index 0000000..c6a42a3 --- /dev/null +++ b/internal/server/anonymous_browser_test.go @@ -0,0 +1,109 @@ +package server + +import ( + "context" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "path/filepath" + "strings" + "testing" + "time" + + "pageswiki/internal/store" +) + +func TestAnonymousPublicationChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + s, token, domain := configFixture(t) + s.mux.HandleFunc("/_/api/v1/city/", s.handleCityAPI) + s.mux.HandleFunc("/v/city/", s.handleCityMap) + s.mux.HandleFunc("/", s.handleHome) + admin, e := s.store.PrincipalForSession(domain, token) + if e != nil { + t.Fatal(e) + } + q, e := s.store.CreateZoneAtPath(domain, admin.UUID, "quartier", "", "public", "Public", "", "/public") + if e != nil { + t.Fatal(e) + } + o, e := s.store.CreatePageAtPathInDomain(domain, "/public/page") + if e != nil { + t.Fatal(e) + } + if _, e = s.store.SaveRevisionContent(o, []byte(`

    Public browser sentinel

    {{children}}

    `), "", "und", "text/html", ""); e != nil { + t.Fatal(e) + } + child, e := s.store.CreatePageAtPathInDomain(domain, "/public/page/child") + if e != nil { + t.Fatal(e) + } + if _, e = s.store.SaveRevisionContent(child, []byte("

    Child

    "), "", "und", "text/html", ""); e != nil { + t.Fatal(e) + } + for _, path := range []string{"/public/page/child/grandchild", "/public/page-other"} { + object, err := s.store.CreatePageAtPathInDomain(domain, path) + if err != nil { + t.Fatal(err) + } + if _, err = s.store.SaveRevisionContent(object, []byte("

    Navigation fixture

    "), "", "und", "text/html", ""); err != nil { + t.Fatal(err) + } + } + policy := "public" + for _, node := range []struct{ kind, id string }{{"domain", domain}, {"quartier", q}} { + g, e := s.store.CityGovernance(context.Background(), domain, admin.UUID, node.kind, node.id) + if e != nil { + t.Fatal(e) + } + if _, e = s.store.ChangeCityGovernance(context.Background(), domain, admin.UUID, node.kind, node.id, store.CityGovernanceChange{Epoch: g.Epoch, TopologyVersion: g.TopologyVersion, Policy: &policy, ConfirmRelaxation: true}, false); e != nil { + t.Fatal(e) + } + } + script, e := os.ReadFile("internal/server/testdata/anonymous-publication.js") + if e != nil { + t.Fatal(e) + } + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + if r.Header.Get("Origin") != "" { + r.Header.Set("Origin", "http://localhost") + } + // Fixture authentication only on settings, never on public content. + if strings.HasPrefix(r.URL.Path, "/_/api/v1/city/") && r.URL.Path != "/_/api/v1/city/map" || strings.HasPrefix(r.URL.Path, "/v/city/") { + r.Header.Set("Authorization", "Bearer "+token) + } + if r.Method == "GET" && r.URL.Path == "/v/city/q/public" { + rec := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(rec, r) + for k, v := range rec.Header() { + w.Header()[k] = v + } + w.WriteHeader(rec.Code) + _, _ = w.Write([]byte(strings.Replace(rec.Body.String(), "", browserFixtureScript(rec.Header(), script)+"", 1))) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + for _, width := range []string{"1440", "390"} { + t.Run(width, func(t *testing.T) { + ctx, cancel := context.WithTimeout(context.Background(), 40*time.Second) + defer cancel() + screenshot := "" + if dir := os.Getenv("PAGESWIKI_PUBLIC_NAV_SCREENSHOT_DIR"); dir != "" { + if err := os.MkdirAll(dir, 0700); err != nil { + t.Fatal(err) + } + screenshot = filepath.Join(dir, "public-navigation-"+width+".png") + } + out, err := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", server.URL+"/v/city/q/public", t.TempDir(), screenshot, width).CombinedOutput() + if err != nil { + t.Fatalf("browser %v %s", err, out) + } + }) + } +} diff --git a/internal/server/anonymous_view.go b/internal/server/anonymous_view.go new file mode 100644 index 0000000..1beafb3 --- /dev/null +++ b/internal/server/anonymous_view.go @@ -0,0 +1,164 @@ +package server + +import ( + "context" + "database/sql" + "errors" + "html/template" + "io" + "mime" + "net/http" + "net/url" + "path" + "strings" + "time" + + "pageswiki/internal/store" +) + +type anonymousProjectionKey struct{} + +func isAnonymousProjection(r *http.Request) bool { + value, _ := r.Context().Value(anonymousProjectionKey{}).(bool) + return value +} + +func (s *Server) tryAnonymousProjection(w http.ResponseWriter, r *http.Request) bool { + if r.Method != "GET" && r.Method != "HEAD" { + return false + } + // A bad or expired credential must not fall back to a weaker identity. + if len(r.Header.Values("Authorization")) > 0 { + return false + } + for _, c := range r.Cookies() { + if c.Name == authCookieName { + return false + } + } + if s.servePublicPeriodical(w, r) { + return true + } + if s.servePublicUserSpace(w, r) { + return true + } + if s.servePublicUserNavigation(w, r) { + return true + } + if s.servePublicNavigation(w, r) { + return true + } + semantic := r.URL.Path + raw := strings.HasPrefix(semantic, "/v/raw/path:") + if raw { + semantic = strings.TrimPrefix(semantic, "/v/raw/path:") + } + if !store.PublicSemanticPath(semantic) { + return false + } + v, err := s.store.AnonymousRevision(r.Context(), s.domainUUIDForRequest(r), semantic, s.revisionLanguageCandidates(r)) + if errors.Is(err, sql.ErrNoRows) { + // A structural folder discloses only the already-public descendants, + // never an unapproved Page at the same Path. Raw reads stay exact-only. + if !raw { + publicRequest, navigationErr := s.withPublicNavigation(r) + if navigationErr != nil { + http.Error(w, "navigation unavailable", 503) + return true + } + if publicNavigationFor(publicRequest).hasChildren(semantic) { + s.renderPublicDirectory(w, publicRequest, semantic, true) + return true + } + } + return false + } + if err != nil { + http.Error(w, "publication unavailable", 503) + return true + } + r = r.WithContext(context.WithValue(r.Context(), anonymousProjectionKey{}, true)) + r, err = s.withPublicNavigation(r) + if err != nil { + http.Error(w, "navigation unavailable", 503) + return true + } + if current, ok := publicNavigationFor(r).pages[semantic]; !ok || current.UUID != v.UUID { + http.Error(w, "publication changed; retry", 503) + return true + } + return s.serveAnonymousRevision(w, r, semantic, raw, v) +} + +func (s *Server) serveAnonymousRevision(w http.ResponseWriter, r *http.Request, semantic string, raw bool, v *store.Revision) bool { + reader, err := s.store.OpenDocument(v.DocumentHash) + if err != nil { + http.Error(w, "published document unavailable", 503) + return true + } + defer reader.Close() + w.Header().Set("Cache-Control", "private, no-store") + w.Header().Set("Referrer-Policy", "no-referrer") + w.Header().Set("X-Content-Type-Options", "nosniff") + w.Header().Add("Vary", "Accept-Language") + contentType, _, _ := mime.ParseMediaType(v.ContentType) + filename := path.Base(v.Filename) + if filename == "." || filename == "/" || filename == "" { + filename = path.Base(semantic) + } + if raw { + // Raw authored HTML, SVG and unknown formats are attachments, never + // executable same-origin content. Native passive formats can stream. + inline := contentType == "application/pdf" || contentType == "image/png" || contentType == "image/jpeg" || contentType == "image/gif" || contentType == "image/webp" || strings.HasPrefix(contentType, "audio/") || strings.HasPrefix(contentType, "video/") + disposition := "attachment" + if inline { + disposition = "inline" + } + csp := "default-src 'none'; frame-ancestors 'self'" + if !inline { + csp = "sandbox; " + csp + } + w.Header().Set("Content-Security-Policy", csp) + w.Header().Set("Content-Disposition", mime.FormatMediaType(disposition, map[string]string{"filename": filename})) + if contentType == "" { + contentType = "application/octet-stream" + } + w.Header().Set("Content-Type", contentType) + w.Header().Set("ETag", `"`+v.DocumentHash+`"`) + setDocumentIdentityHeaders(w.Header(), v.ObjectUUID, v.UUID, v.DocumentHash) + http.ServeContent(w, r, filename, time.UnixMilli(v.CreatedAtMS), reader) + return true + } + data := s.publicNavigationData(r, semantic) + data["Title"] = filename + data["RawURL"] = cityPageHref("/v/raw/path:"+semantic) + "?lang=" + url.QueryEscape(v.Language) + switch { + case contentType == "text/html": + body, e := io.ReadAll(io.LimitReader(reader, maxProjectionInput+1)) + if e != nil { + http.Error(w, "published document unavailable", 503) + return true + } + data["HTML"] = template.HTML(s.safeHTMLProjection(r, string(body), semantic, true)) + data["SocialSource"] = string(body) + case contentType == "image/png" || contentType == "image/jpeg" || contentType == "image/gif" || contentType == "image/webp": + data["Media"] = "image" + case contentType == "application/pdf": + data["Media"] = "pdf" + case strings.HasPrefix(contentType, "audio/"): + data["Media"] = "audio" + case strings.HasPrefix(contentType, "video/"): + data["Media"] = "video" + case strings.HasPrefix(contentType, "text/") || contentType == "application/json": + body, e := io.ReadAll(io.LimitReader(reader, 64<<10)) + if e != nil { + http.Error(w, "published document unavailable", 503) + return true + } + data["Text"] = string(body) + } + data["SocialMetadata"] = s.socialMetadataForRequest(r, "anonymous_view.gohtml", data) + w.Header().Set("Content-Type", "text/html; charset=utf-8") + s.render(w, "anonymous_view.gohtml", data) + return true +} diff --git a/internal/server/anonymous_view_test.go b/internal/server/anonymous_view_test.go new file mode 100644 index 0000000..a34e1e6 --- /dev/null +++ b/internal/server/anonymous_view_test.go @@ -0,0 +1,199 @@ +package server + +import ( + "context" + "encoding/json" + "net/http/httptest" + "strings" + "testing" + + "pageswiki/internal/store" +) + +func TestAnonymousApprovedPublication(t *testing.T) { + s, token, domain := configFixture(t) + s.mux.HandleFunc("/_/api/v1/city/", s.handleCityAPI) + s.mux.HandleFunc("/", s.handleHome) + ctx := context.Background() + admin, err := s.store.PrincipalForSession(domain, token) + if err != nil { + t.Fatal(err) + } + q, err := s.store.CreateZoneAtPath(domain, admin.UUID, "quartier", "", "public", "Public", "", "/public") + if err != nil { + t.Fatal(err) + } + st, err := s.store.CreateZoneAtPath(domain, admin.UUID, "street", q, "private", "Private", "", "/public/private") + if err != nil { + t.Fatal(err) + } + create := func(path, body, ct string) (string, *store.Revision) { + t.Helper() + o, e := s.store.CreatePageAtPathInDomain(domain, path) + if e != nil { + t.Fatal(e) + } + v, e := s.store.SaveRevisionContent(o, []byte(body), "", "und", ct, "") + if e != nil { + t.Fatal(e) + } + return o, v + } + object, rev := create("/public/page", "

    Approved page

    {{children:/private}}

    ", "text/html") + create("/public/movie", "FAKE-MEDIA-CONTENT", "video/mp4") + create("/public/private/secret", "

    PRIVATE-SENTINEL

    ", "text/html") + create("/outside", "

    OUTSIDE-SENTINEL

    ", "text/html") + setPolicy := func(kind, id, value string) { + t.Helper() + g, e := s.store.CityGovernance(ctx, domain, admin.UUID, kind, id) + if e != nil { + t.Fatal(e) + } + _, e = s.store.ChangeCityGovernance(ctx, domain, admin.UUID, kind, id, store.CityGovernanceChange{Epoch: g.Epoch, TopologyVersion: g.TopologyVersion, Policy: &value, ConfirmRelaxation: true}, false) + if e != nil { + t.Fatal(e) + } + } + setPolicy("domain", domain, "public") + setPolicy("quartier", q, "public") + setPolicy("street", st, "authenticated_acl") + url := governanceEndpoint("quartier", q) + "/publication" + call := func(method, path, bearer string, body any, headers map[string]string) *httptest.ResponseRecorder { + t.Helper() + b, _ := json.Marshal(body) + r := httptest.NewRequest(method, "http://localhost"+path, strings.NewReader(string(b))) + if bearer != "" { + r.Header.Set("Authorization", bearer) + } + r.Header.Set("Content-Type", "application/json") + for k, v := range headers { + r.Header.Set(k, v) + } + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + return w + } + preview := func() store.LocalityPublication { + t.Helper() + w := call("GET", url, "Bearer "+token, nil, nil) + if w.Code != 200 { + t.Fatalf("preview %d %s", w.Code, w.Body.String()) + } + var p store.LocalityPublication + if err = json.Unmarshal(w.Body.Bytes(), &p); err != nil { + t.Fatal(err) + } + return p + } + approve := func(p store.LocalityPublication) { + t.Helper() + w := call("PATCH", url, "Bearer "+token, store.PublicationChange{PublicationVersion: p.PublicationVersion, Epoch: p.Epoch, TopologyVersion: p.TopologyVersion, ImpactToken: p.ImpactToken, Enabled: true, Confirm: true}, nil) + if w.Code != 200 { + t.Fatalf("approve %d %s", w.Code, w.Body.String()) + } + } + denied := func(path string) { + t.Helper() + w := call("GET", path, "", nil, nil) + if w.Code == 200 || strings.Contains(w.Body.String(), "PRIVATE-SENTINEL") { + t.Fatalf("leaked %s: %d", path, w.Code) + } + } + denied("/public/page") + p := preview() + if !p.Eligible || len(p.Entries) != 2 || len(p.Excluded) != 1 { + t.Fatalf("impact=%+v", p) + } + if w := call("PATCH", url, "Bearer "+token, store.PublicationChange{PublicationVersion: p.PublicationVersion, Epoch: p.Epoch, TopologyVersion: p.TopologyVersion, Enabled: true, Confirm: true}, nil); w.Code != 400 { + t.Fatalf("unapproved=%d", w.Code) + } + approve(p) + w := call("GET", "/public/page", "", nil, nil) + if w.Code != 200 || !strings.Contains(w.Body.String(), "Approved page") || !strings.Contains(w.Body.String(), `property="og:title"`) || strings.Contains(w.Body.String(), "window.stolen") || !strings.Contains(w.Body.String(), "data-children-src") || strings.Contains(w.Body.String(), "auth-menu") || strings.Contains(w.Body.String(), "PRIVATE-SENTINEL") || strings.Contains(w.Body.String(), " download") { + t.Fatalf("public viewer %d %s", w.Code, w.Body.String()) + } + if w.Header().Get("Content-Security-Policy") == "" || !strings.Contains(w.Header().Get("Cache-Control"), "no-store") { + t.Fatal("public CSP/cache missing") + } + for _, path := range []string{"/public/private/secret", "/outside", "/o/uuid:" + object, "/v/raw/uuid:" + object, "/v/raw/rev:" + rev.UUID, "/_/obj/sha256:" + rev.DocumentHash, "/e/public/page", "/v/search?q=Approved"} { + denied(path) + } + for _, bearer := range []string{"Bearer invalid", "Basic invalid"} { + if w = call("GET", "/public/page", bearer, nil, nil); w.Code == 200 { + t.Fatal("invalid credentials downgraded") + } + } + if w = call("GET", "/public/page", "", nil, map[string]string{"Cookie": authCookieName + "=expired"}); w.Code == 200 { + t.Fatal("expired cookie downgraded") + } + if w = call("GET", "/v/raw/path:/public/movie", "", nil, map[string]string{"Range": "bytes=0-3"}); w.Code != 206 || w.Body.String() != "FAKE" { + t.Fatalf("range=%d %s", w.Code, w.Body.String()) + } + if w = call("GET", "/v/raw/path:/public/page", "", nil, nil); w.Code != 200 || !strings.HasPrefix(w.Header().Get("Content-Disposition"), "attachment") { + t.Fatalf("raw HTML unsafe %d", w.Code) + } + if w = call("HEAD", "/v/raw/path:/public/movie", "", nil, nil); w.Code != 200 || w.Body.Len() != 0 { + t.Fatal("raw HEAD") + } + if err = s.store.SetConfigInDomain(domain, "authorization_mode", "legacy"); err == nil { + t.Fatal("publication downgraded to legacy") + } + // A new revision invalidates publication before any conditional 304 check. + if _, err = s.store.SaveRevisionContent(object, []byte("

    NOT-APPROVED

    "), "", "und", "text/html", ""); err != nil { + t.Fatal(err) + } + denied("/public/page") + if w = call("GET", "/v/raw/path:/public/page", "", nil, map[string]string{"If-None-Match": `"` + rev.DocumentHash + `"`}); w.Code == 304 || w.Code == 200 { + t.Fatal("revoked conditional access") + } + approve(preview()) + create("/public/new", "UNAPPROVED-NEW", "text/plain") + denied("/public/new") + // Stale impact token cannot approve intervening edits. + p = preview() + if _, err = s.store.SaveRevisionContent(object, []byte("changed again"), "", "und", "text/html", ""); err != nil { + t.Fatal(err) + } + if w = call("PATCH", url, "Bearer "+token, store.PublicationChange{PublicationVersion: p.PublicationVersion, Epoch: p.Epoch, TopologyVersion: p.TopologyVersion, ImpactToken: p.ImpactToken, Enabled: true, Confirm: true}, nil); w.Code != 400 { + t.Fatalf("stale impact %d", w.Code) + } + approve(preview()) + if _, err = s.store.DB.Exec(`INSERT INTO paths(domain_uuid,path,object_uuid,created_at,is_primary) VALUES(?,?,?,?,0)`, domain, "/alias", object, 0); err != nil { + t.Fatal(err) + } + denied("/public/page") + denied("/alias") + if _, err = s.store.DB.Exec(`DELETE FROM paths WHERE domain_uuid=? AND path='/alias'`, domain); err != nil { + t.Fatal(err) + } + denied("/public/page") + approve(preview()) + setPolicy("domain", domain, "authenticated_acl") + denied("/public/page") + setPolicy("domain", domain, "public") + denied("/public/page") + approve(preview()) + // Revocation is explicit and does not change the ceiling/draft. + p = preview() + if w = call("PATCH", url, "Bearer "+token, store.PublicationChange{PublicationVersion: p.PublicationVersion, Epoch: p.Epoch, TopologyVersion: p.TopologyVersion, Enabled: false}, nil); w.Code != 200 { + t.Fatalf("revoke=%d", w.Code) + } + denied("/public/page") + if w = call("PATCH", url, "Bearer "+token, store.PublicationChange{PublicationVersion: p.PublicationVersion, Epoch: p.Epoch, TopologyVersion: p.TopologyVersion, ImpactToken: p.ImpactToken, Enabled: true, Confirm: true}, nil); w.Code != 409 { + t.Fatal("pre-revocation consent replayed") + } + approve(preview()) + a, e := s.store.LocalityAccess(ctx, domain, admin.UUID, "quartier", q, nil) + if e != nil { + t.Fatal(e) + } + a.Mode = "restricted" + a.Entries = []store.LocalityAccessEntry{{Kind: "user", Name: "admin", Permission: "read_write"}} + if _, e = s.store.LocalityAccess(ctx, domain, admin.UUID, "quartier", q, &a); e != nil { + t.Fatal(e) + } + denied("/public/page") + if p = preview(); p.Eligible || len(p.Entries) != 0 { + t.Fatalf("ACL publicly approved %+v", p) + } +} diff --git a/internal/server/api_handlers.go b/internal/server/api_handlers.go index 191d51e..e09adc0 100644 --- a/internal/server/api_handlers.go +++ b/internal/server/api_handlers.go @@ -2,9 +2,11 @@ package server import ( "encoding/json" + "errors" "net/http" "pageswiki/internal/api" + "pageswiki/internal/store" ) func (s *Server) handleCreateObjectAPI( @@ -29,7 +31,7 @@ func (s *Server) handleCreateObjectAPI( return } - id, err := s.store.CreateObject(req.Kind) + id, err := s.store.CreateObjectInDomain(s.domainUUIDForRequest(r), req.Kind) if err != nil { api.WriteError( @@ -50,19 +52,7 @@ func (s *Server) handleListObjectsAPI( w http.ResponseWriter, r *http.Request, ) { - - objs, err := s.store.ListObjects() - if err != nil { - api.WriteError( - w, - 500, - "list_failed", - err.Error(), - ) - return - } - - _ = json.NewEncoder(w).Encode(objs) + s.serveObjectMetadataList(w, r) } func (s *Server) handleSaveRevisionAPI( @@ -71,9 +61,12 @@ func (s *Server) handleSaveRevisionAPI( ) { var req struct { - ObjectUUID string `json:"object_uuid"` - Body string `json:"body"` - Message string `json:"message"` + ObjectUUID string `json:"object_uuid"` + Body string `json:"body"` + Message string `json:"message"` + Language string `json:"lang"` + ContentType string `json:"content_type"` + Filename string `json:"filename"` } err := json.NewDecoder(r.Body).Decode(&req) @@ -86,17 +79,57 @@ func (s *Server) handleSaveRevisionAPI( ) return } + domainUUID := s.domainUUIDForRequest(r) + if mode, _ := s.store.GetConfigInDomain(domainUUID, "authorization_mode"); mode == "enforcing" { + principal, authErr := s.store.PrincipalForSession(domainUUID, s.authTokenFromRequest(r)) + if authErr != nil { + api.WriteError(w, http.StatusUnauthorized, "authentication_required", "authentication required") + return + } + var revisionCount int + _ = s.store.DB.QueryRow(`SELECT COUNT(*) FROM revisions WHERE object_uuid=?`, req.ObjectUUID).Scan(&revisionCount) + capability := "write" + if revisionCount == 0 { + capability = "create" + } + allowed := false + links, _ := s.store.ListPathLinksInDomain(domainUUID, req.ObjectUUID) + for _, link := range links { + if s.store.Authorize(store.AuthorizationRequest{DomainUUID: domainUUID, PrincipalUUID: principal.UUID, Capability: capability, TargetType: "path", TargetID: link.Path}) == nil { + allowed = true + break + } + } + if !allowed && s.authorizePrincipalObject(domainUUID, principal.UUID, capability, req.ObjectUUID) == nil { + allowed = true + } + if !allowed { + api.WriteError(w, http.StatusForbidden, "forbidden", "forbidden") + return + } + } - _, err = s.store.SaveRevision( - req.ObjectUUID, - req.Body, - req.Message, - ) + revision, err := + s.store.SaveRevisionContent( + req.ObjectUUID, + []byte(req.Body), + req.Message, + req.Language, + req.ContentType, + req.Filename, + ) if err != nil { + status := http.StatusInternalServerError + if errors.Is(err, store.ErrInvalidRevisionLanguage) || + errors.Is(err, store.ErrPageNotFound) || + errors.Is(err, store.ErrEmbeddedAssetUnavailable) { + status = http.StatusBadRequest + } + api.WriteError( w, - 500, + status, "save_failed", err.Error(), ) @@ -104,6 +137,11 @@ func (s *Server) handleSaveRevisionAPI( } _ = json.NewEncoder(w).Encode(map[string]any{ - "status": "ok", + "status": "ok", + "revision_uuid": revision.UUID, + "document_hash": revision.DocumentHash, + "lang": revision.Language, + "content_type": revision.ContentType, + "filename": revision.Filename, }) } diff --git a/internal/server/api_recursive_preview.go b/internal/server/api_recursive_preview.go index dd11333..52fce98 100644 --- a/internal/server/api_recursive_preview.go +++ b/internal/server/api_recursive_preview.go @@ -9,68 +9,17 @@ type renamePreviewResponse struct { Targets []string `json:"targets"` } -func (s *Server) handleRenamePreview( - w http.ResponseWriter, - r *http.Request, -) { - - oldPath := - r.URL.Query().Get( - "old_path", - ) - - rows, err := - s.store.DB.Query(` - SELECT path - FROM paths - WHERE path = ? - OR path LIKE ? - ORDER BY LENGTH(path) ASC - `, - oldPath, - oldPath+"/%", - ) - - if err != nil { - - http.Error( - w, - err.Error(), - 500, - ) - +func (s *Server) handleRenamePreview(w http.ResponseWriter, r *http.Request) { + if !requirePathMutationPost(w, r) { return } - - defer rows.Close() - - var targets []string - - for rows.Next() { - - var p string - - err := rows.Scan(&p) - - if err != nil { - continue - } - - targets = - append( - targets, - p, - ) + snapshot, err := s.authorizedMutationSnapshot(r, "rename", "", r.URL.Query().Get("old_path"), "", true) + if err != nil { + writePathMutationError(w, err) + return } - - w.Header().Set( - "Content-Type", - "application/json", - ) - - json.NewEncoder(w).Encode( - renamePreviewResponse{ - Targets: targets, - }, - ) + // Return the checked set, not a fresh query that could reveal a newly added + // descendant for which the requester has never been authorized. + w.Header().Set("Content-Type", "application/json") + _ = json.NewEncoder(w).Encode(renamePreviewResponse{Targets: snapshot.Paths()}) } diff --git a/internal/server/api_recursive_rename.go b/internal/server/api_recursive_rename.go index 6253d0c..0b7f33e 100644 --- a/internal/server/api_recursive_rename.go +++ b/internal/server/api_recursive_rename.go @@ -1,7 +1,6 @@ package server import ( - "database/sql" "encoding/json" "net/http" ) @@ -16,175 +15,37 @@ type renamePreview struct { Count int `json:"count"` } -func (s *Server) handleRenamePath( - w http.ResponseWriter, - r *http.Request, -) { - +func (s *Server) handleRenamePath(w http.ResponseWriter, r *http.Request) { + if !requirePathMutationPost(w, r) { + return + } var req renamePathRequest - - err := json.NewDecoder( - r.Body, - ).Decode(&req) - + r.Body = http.MaxBytesReader(w, r.Body, 1<<20) + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + req.OldPath = normalizeAuthorizationPath(req.OldPath) + req.NewPath = normalizeAuthorizationPath(req.NewPath) + if req.OldPath == "" || req.NewPath == "" || req.OldPath == "/" || req.NewPath == "/" { + http.Error(w, "invalid path", http.StatusBadRequest) + return + } + snapshot, err := s.authorizedMutationSnapshot(r, "rename", "create", req.OldPath, req.NewPath, req.Recursive) if err != nil { - - http.Error( - w, - err.Error(), - 400, - ) - + writePathMutationError(w, err) return } - - if req.OldPath == "" || - req.NewPath == "" { - - http.Error( - w, - "invalid path", - 400, - ) - + if r.URL.Query().Get("preview") == "1" { + w.Header().Set("Content-Type", "application/json") + _ = json.NewEncoder(w).Encode(renamePreview{Count: len(snapshot.Paths())}) return } - - if req.Recursive { - - var count int - - err := - s.store.DB.QueryRow(` - SELECT COUNT(*) - FROM paths - WHERE path = ? - OR path LIKE ? - `, - req.OldPath, - req.OldPath+"/%", - ).Scan(&count) - - if err != nil { - - http.Error( - w, - err.Error(), - 500, - ) - - return - } - - if r.URL.Query().Get("preview") == "1" { - - w.Header().Set( - "Content-Type", - "application/json", - ) - - json.NewEncoder(w).Encode( - renamePreview{ - Count: count, - }, - ) - - return - } - - tx, err := - s.store.DB.BeginTx( - r.Context(), - &sql.TxOptions{}, - ) - - if err != nil { - - http.Error( - w, - err.Error(), - 500, - ) - - return - } - - _, err = tx.Exec(` - UPDATE paths - SET path = - CASE - WHEN path = ? - THEN ? - ELSE REPLACE( - path, - ? || '/', - ? || '/' - ) - END - WHERE path = ? - OR path LIKE ? - `, - req.OldPath, - req.NewPath, - - req.OldPath, - req.NewPath, - - req.OldPath, - req.OldPath+"/%", - ) - - if err != nil { - - tx.Rollback() - - http.Error( - w, - err.Error(), - 500, - ) - - return - } - - err = tx.Commit() - - if err != nil { - - http.Error( - w, - err.Error(), - 500, - ) - - return - } - - w.WriteHeader(200) - - return - } - - _, err = - s.store.DB.Exec(` - UPDATE paths - SET path = ? - WHERE path = ? - `, - req.NewPath, - req.OldPath, - ) - + count, err := s.store.RenamePathsInDomainChecked(s.domainUUIDForRequest(r), req.OldPath, req.NewPath, req.Recursive, snapshot) if err != nil { - - http.Error( - w, - err.Error(), - 500, - ) - + writePathMutationError(w, err) return } - - w.WriteHeader(200) + w.Header().Set("Content-Type", "application/json") + _ = json.NewEncoder(w).Encode(renamePreview{Count: count}) } diff --git a/internal/server/archive_handler.go b/internal/server/archive_handler.go new file mode 100644 index 0000000..d38dd74 --- /dev/null +++ b/internal/server/archive_handler.go @@ -0,0 +1,121 @@ +package server + +import ( + "archive/zip" + "bytes" + "context" + "io" + "mime" + "net/http" + "os/exec" + "path/filepath" + "strings" + "time" + + "pageswiki/internal/store" +) + +func (s *Server) handleArchiveEntry(w http.ResponseWriter, r *http.Request) { + path := r.URL.Query().Get("path") + entry := r.URL.Query().Get("entry") + metadataOnly := r.URL.Query().Get("metadata") == "1" + if path == "" || (!metadataOnly && entry == "") || len(entry) > 4096 || strings.ContainsAny(entry, "\x00\r\n") { + http.Error(w, "path and entry are required", http.StatusBadRequest) + return + } + if !s.requestCanReadPath(r, path) { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + objectUUID, err := s.store.ResolvePathInDomain(s.domainUUIDForRequest(r), path) + if err != nil { + http.NotFound(w, r) + return + } + var revision *store.Revision + if revisionUUID := r.URL.Query().Get("rev"); revisionUUID != "" { + revision, err = s.store.GetRevisionMetadata(revisionUUID) + } else { + revision, err = s.latestRevisionMetadataForRequest(r, objectUUID) + } + if err != nil || revision.ObjectUUID != objectUUID { + http.NotFound(w, r) + return + } + if metadataOnly { + s.serveMetadataProjection(w, r, revision.DocumentHash, "archive", path, revision.UUID) + return + } + if strings.EqualFold(filepath.Ext(revision.Filename), ".zip") { + hydrated, err := s.store.GetRevision(revision.UUID) + if err != nil { + http.NotFound(w, r) + return + } + s.serveZIPEntry(w, r, hydrated.Body, entry) + return + } + source, err := s.store.DocumentPath(revision.DocumentHash) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + ctx, cancel := context.WithTimeout(r.Context(), 60*time.Second) + defer cancel() + command := exec.CommandContext(ctx, "nice", "-n", "10", + "7z", "x", "-so", "-y", "-spd", "-mmt1", "-p-", "--", source, entry) + stdout, err := command.StdoutPipe() + if err != nil || command.Start() != nil { + http.Error(w, "cannot extract archive entry", http.StatusUnprocessableEntity) + return + } + w.Header().Set("Content-Type", archiveEntryContentType(entry, nil)) + w.Header().Set("Content-Disposition", mime.FormatMediaType("inline", map[string]string{"filename": filepath.Base(entry)})) + w.Header().Set("Cache-Control", "private, max-age=60") + w.Header().Set("Vary", "Authorization, Cookie") + w.Header().Set("X-Content-Type-Options", "nosniff") + n, copyErr := io.Copy(w, io.LimitReader(stdout, 128<<20)) + if copyErr != nil || n == 128<<20 { + // Never wait for a decoder whose output is no longer being drained. + cancel() + } + waitErr := command.Wait() + if copyErr != nil || waitErr != nil { + return + } +} + +func (s *Server) serveZIPEntry( + w http.ResponseWriter, + r *http.Request, + body string, + entry string, +) { + reader, err := zip.NewReader( + bytes.NewReader([]byte(body)), + int64(len(body)), + ) + if err != nil { + http.Error(w, err.Error(), http.StatusUnprocessableEntity) + return + } + for _, file := range reader.File { + if file.Name != entry || file.FileInfo().IsDir() { + continue + } + source, err := file.Open() + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + defer source.Close() + w.Header().Set("Content-Type", archiveEntryContentType(file.Name, nil)) + w.Header().Set("Content-Disposition", mime.FormatMediaType("inline", map[string]string{"filename": filepath.Base(file.Name)})) + w.Header().Set("Cache-Control", "private, max-age=60") + w.Header().Set("Vary", "Authorization, Cookie") + w.Header().Set("X-Content-Type-Options", "nosniff") + _, _ = io.Copy(w, io.LimitReader(source, 128<<20)) + return + } + http.NotFound(w, r) +} diff --git a/internal/server/assets_api.go b/internal/server/assets_api.go new file mode 100644 index 0000000..940720b --- /dev/null +++ b/internal/server/assets_api.go @@ -0,0 +1,179 @@ +package server + +import ( + "encoding/json" + "errors" + "io" + "net/http" + "strings" + + "pageswiki/internal/store" +) + +func (s *Server) handleAssetsAPI(w http.ResponseWriter, r *http.Request) { + domainUUID := s.domainUUIDForRequest(r) + principal := s.requestPrincipal(r) + if principal == nil { + s.authRequired(w, r) + return + } + if !s.canManageAssets(r) { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + w.Header().Set("Content-Type", "application/json; charset=utf-8") + w.Header().Set("Cache-Control", "no-store") + switch r.Method { + case http.MethodGet: + address := strings.TrimSpace(r.URL.Query().Get("address")) + if address == "" { + assets, err := s.store.ListAssets(domainUUID) + if err != nil { + http.Error(w, err.Error(), 500) + return + } + _ = json.NewEncoder(w).Encode(map[string]any{"assets": assets}) + return + } + asset, err := s.store.GetAsset(domainUUID, address) + if err != nil { + http.NotFound(w, r) + return + } + history, err := s.store.ListAssetHistory(domainUUID, address) + if err != nil { + http.Error(w, err.Error(), 500) + return + } + dependencies, err := s.store.ListAssetDependencies(domainUUID, address) + if err != nil { + http.Error(w, err.Error(), 500) + return + } + setAssetETag(w, asset.HeadDocumentHash) + _ = json.NewEncoder(w).Encode(map[string]any{"asset": asset, "history": history, "dependencies": dependencies}) + case http.MethodPost: + if strings.HasPrefix(strings.ToLower(r.Header.Get("Content-Type")), "application/json") { + var input struct { + Action string `json:"action"` + Address string `json:"address"` + HistoryID int64 `json:"history_id"` + } + if err := json.NewDecoder(r.Body).Decode(&input); err != nil { + http.Error(w, err.Error(), 400) + return + } + if input.Action != "restore" { + http.Error(w, "unsupported action", 400) + return + } + expected := parseAssetETag(r.Header.Get("If-Match")) + if expected == "" { + http.Error(w, "If-Match is required", http.StatusPreconditionRequired) + return + } + asset, err := s.store.RestoreAssetHead(domainUUID, input.Address, input.HistoryID, expected, principal.UUID) + if errors.Is(err, store.ErrAssetConflict) { + http.Error(w, "asset HEAD conflict", http.StatusPreconditionFailed) + return + } else if errors.Is(err, store.ErrAssetNotFound) { + http.NotFound(w, r) + return + } else if err != nil { + http.Error(w, err.Error(), 500) + return + } + setAssetETag(w, asset.HeadDocumentHash) + _ = json.NewEncoder(w).Encode(map[string]any{"asset": asset, "restored": true}) + return + } + r.Body = http.MaxBytesReader(w, r.Body, 256<<20) + if err := r.ParseMultipartForm(8 << 20); err != nil { + http.Error(w, err.Error(), 400) + return + } + defer r.MultipartForm.RemoveAll() + address := r.FormValue("address") + file, header, err := r.FormFile("file") + if err != nil { + http.Error(w, "file is required", 400) + return + } + defer file.Close() + payload, err := io.ReadAll(file) + if err != nil { + http.Error(w, err.Error(), 400) + return + } + current, currentErr := s.store.GetAsset(domainUUID, address) + expected := parseAssetETag(r.Header.Get("If-Match")) + if currentErr == nil && expected == "" { + http.Error(w, "If-Match is required", http.StatusPreconditionRequired) + return + } + if errors.Is(currentErr, store.ErrAssetNotFound) && r.Header.Get("If-None-Match") != "*" { + http.Error(w, "If-None-Match: * is required", http.StatusPreconditionRequired) + return + } + contentType := strings.TrimSpace(r.FormValue("content_type")) + if contentType == "" { + contentType = header.Header.Get("Content-Type") + } + filename := strings.TrimSpace(r.FormValue("filename")) + if filename == "" { + filename = header.Filename + } + asset, changed, err := s.store.PutAsset(domainUUID, address, payload, contentType, filename, expected, principal.UUID) + if errors.Is(err, store.ErrAssetConflict) { + http.Error(w, "asset HEAD conflict", http.StatusPreconditionFailed) + return + } + if err != nil { + http.Error(w, err.Error(), 400) + return + } + setAssetETag(w, asset.HeadDocumentHash) + _ = json.NewEncoder(w).Encode(map[string]any{"asset": asset, "changed": changed, "previous": current}) + case http.MethodDelete: + address := strings.TrimSpace(r.URL.Query().Get("address")) + expected := parseAssetETag(r.Header.Get("If-Match")) + if expected == "" { + http.Error(w, "If-Match is required", http.StatusPreconditionRequired) + return + } + if err := s.store.DeleteAsset(domainUUID, address, expected, principal.UUID); errors.Is(err, store.ErrAssetConflict) { + http.Error(w, "asset HEAD conflict", http.StatusPreconditionFailed) + return + } else if errors.Is(err, store.ErrAssetNotFound) { + http.NotFound(w, r) + return + } else if err != nil { + http.Error(w, err.Error(), 500) + return + } + w.WriteHeader(http.StatusNoContent) + default: + w.Header().Set("Allow", "GET, POST, DELETE") + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + } +} + +func (s *Server) canManageAssets(r *http.Request) bool { + principal := s.requestPrincipal(r) + if principal == nil { + return false + } + domainUUID := s.domainUUIDForRequest(r) + domain := s.domainForRequest(r) + return s.store.IsBuiltinGroupAdmin(domainUUID, principal.UUID, "domain_admin") || + (domain != nil && s.store.IsCampusAdmin(domain.CampusUUID, principal.UUID)) +} + +func parseAssetETag(value string) string { + return strings.TrimPrefix(strings.Trim(strings.TrimSpace(value), `"`), "sha256:") +} +func setAssetETag(w http.ResponseWriter, hash string) { + if hash != "" { + w.Header().Set("ETag", `"sha256:`+hash+`"`) + } +} diff --git a/internal/server/auth_admin.go b/internal/server/auth_admin.go new file mode 100644 index 0000000..913cb55 --- /dev/null +++ b/internal/server/auth_admin.go @@ -0,0 +1,99 @@ +package server + +import ( + "context" + "log" + "net/http" + "pageswiki/internal/store" + "time" +) + +func ldapConfigFromForm(r *http.Request) store.AuthProviderConfig { + return store.AuthProviderConfig{ + Kind: "ldap", Enabled: r.FormValue("enabled") == "on", + LDAPURL: r.FormValue("ldap_url"), LDAPBindDN: r.FormValue("ldap_bind_dn"), LDAPBindPassword: r.FormValue("ldap_bind_password"), + LDAPSearchBase: r.FormValue("ldap_search_base"), LDAPSearchFilter: r.FormValue("ldap_search_filter"), + LDAPStartTLS: r.FormValue("ldap_start_tls") == "on", LDAPSkipTLSVerify: r.FormValue("ldap_verify_tls") != "on", LDAPCAPEM: r.FormValue("ldap_ca_pem"), + LDAPUIDAttribute: r.FormValue("ldap_uid_attribute"), LDAPUsernameAttribute: r.FormValue("ldap_username_attribute"), + LDAPEmailAttribute: r.FormValue("ldap_email_attribute"), LDAPDisplayAttribute: r.FormValue("ldap_display_attribute"), + LDAPMatchBy: r.FormValue("ldap_match_by"), LDAPAutoProvision: r.FormValue("ldap_auto_provision") == "on", + } +} + +func (s *Server) handleAuthAdmin(w http.ResponseWriter, r *http.Request) { + domainUUID := s.domainUUIDForRequest(r) + principal := s.requestPrincipal(r) + if principal == nil || !s.store.IsBuiltinGroupAdmin(domainUUID, principal.UUID, "domain_admin") { + http.Error(w, "domain admin required", http.StatusForbidden) + return + } + if r.Method == http.MethodPost { + if err := r.ParseForm(); err != nil { + http.Error(w, err.Error(), 400) + return + } + panel := "auth" + switch r.FormValue("action") { + case "revoke_session": + panel = "auth-sessions" + if err := s.store.RevokeAuthSessionByID(domainUUID, r.FormValue("session_uuid")); err != nil { + http.Error(w, err.Error(), 400) + return + } + case "principal_state": + if err := s.store.SetPrincipalState(domainUUID, r.FormValue("principal_uuid"), r.FormValue("state")); err != nil { + http.Error(w, err.Error(), 400) + return + } + case "create_account": + if _, err := s.store.CreatePasswordAccount(domainUUID, r.FormValue("username"), r.FormValue("password"), r.FormValue("display_name"), r.FormValue("email")); err != nil { + http.Error(w, err.Error(), 400) + return + } + case "save_oidc": + panel = "auth-providers" + err := s.store.SetAuthProviderConfig(domainUUID, store.AuthProviderConfig{Kind: "oidc", Enabled: r.FormValue("enabled") == "on", Issuer: r.FormValue("issuer"), ClientID: r.FormValue("client_id"), ClientSecret: r.FormValue("client_secret"), OIDCMatchBy: r.FormValue("oidc_match_by")}) + if err != nil { + http.Error(w, err.Error(), 400) + return + } + case "save_smtp": + panel = "auth-providers" + err := s.store.SetAuthProviderConfig(domainUUID, store.AuthProviderConfig{Kind: "smtp", Enabled: r.FormValue("enabled") == "on", SMTPAddress: r.FormValue("smtp_address"), SMTPUsername: r.FormValue("smtp_username"), SMTPPassword: r.FormValue("smtp_password"), SMTPFrom: r.FormValue("smtp_from")}) + if err != nil { + http.Error(w, err.Error(), 400) + return + } + case "save_ldap": + panel = "auth-providers" + if err := s.store.SetAuthProviderConfig(domainUUID, ldapConfigFromForm(r)); err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + case "test_ldap": + panel = "auth-providers" + config, err := s.store.AuthProviderConfig(domainUUID, "ldap") + if err == nil && config.Enabled { + select { + case s.ldapSlots <- struct{}{}: + ctx, cancel := context.WithTimeout(r.Context(), 12*time.Second) + _, err = s.authenticateLDAPDirectory(ctx, config, r.FormValue("test_username"), r.FormValue("test_password")) + cancel() + <-s.ldapSlots + default: + err = context.DeadlineExceeded + } + } + if err != nil || !config.Enabled { + log.Printf("LDAP connection test failed domain=%s error=%v", domainUUID, err) + http.Redirect(w, r, "/-/sys/config?panel=auth-providers&ldap_test=failed", http.StatusSeeOther) + return + } + http.Redirect(w, r, "/-/sys/config?panel=auth-providers&ldap_test=ok", http.StatusSeeOther) + return + } + http.Redirect(w, r, "/-/sys/config?panel="+panel+"&saved=1", http.StatusSeeOther) + return + } + http.Redirect(w, r, "/-/sys/config?panel=auth", http.StatusFound) +} diff --git a/internal/server/auth_browser_test.go b/internal/server/auth_browser_test.go new file mode 100644 index 0000000..ce87e6d --- /dev/null +++ b/internal/server/auth_browser_test.go @@ -0,0 +1,54 @@ +package server + +import ( + "context" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "strings" + "testing" + "time" +) + +func TestBrowserCookieLoginLogoutChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + s, apiToken, domain := configFixture(t) + s.mux.HandleFunc("/_/auth/", s.handleAuth) + script, err := os.ReadFile("internal/server/testdata/auth-browser.js") + if err != nil { + t.Fatal(err) + } + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // Real browser cookies and Fetch Metadata: do not inject credentials or + // rewrite Origin/Host. localhost maps to this fixture's default Domain. + if r.Method == "GET" && (strings.HasPrefix(r.URL.Path, "/_/auth/") || r.URL.Path == "/-/sys/config") { + rec := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(rec, r) + for key, values := range rec.Header() { + w.Header()[key] = values + } + w.WriteHeader(rec.Code) + _, _ = w.Write([]byte(strings.Replace(rec.Body.String(), "", "", 1))) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + ctx, cancel := context.WithTimeout(context.Background(), 45*time.Second) + defer cancel() + target := strings.Replace(server.URL, "127.0.0.1", "localhost", 1) + "/_/auth/login?return=%2F-%2Fsys%2Fconfig%3Fpanel%3Dauth" + cmd := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", target, t.TempDir()) + if out, err := cmd.CombinedOutput(); err != nil { + t.Fatalf("cookie browser flow: %v %s", err, out) + } + if _, err := s.store.PrincipalForSession(domain, apiToken); err != nil { + t.Fatalf("browser logout revoked another API session: %v", err) + } + var revoked int + if err := s.store.DB.QueryRow(`SELECT count(*) FROM auth_sessions WHERE revoked_at_ms>0`).Scan(&revoked); err != nil || revoked != 1 { + t.Fatalf("browser revocations=%d %v", revoked, err) + } +} diff --git a/internal/server/auth_external.go b/internal/server/auth_external.go new file mode 100644 index 0000000..04e3581 --- /dev/null +++ b/internal/server/auth_external.go @@ -0,0 +1,301 @@ +package server + +import ( + "context" + "crypto/rand" + "crypto/sha256" + "encoding/base64" + "errors" + "log" + "net/http" + "net/url" + "strconv" + "strings" + "time" +) + +type oidcChallenge struct{ Verifier, Nonce, Return, Issuer, ClientID, BrowserHash string } + +func logOIDCFailure(stage, domainUUID, issuer string, err error) { + host := "invalid" + if parsed, parseErr := url.Parse(issuer); parseErr == nil && parsed.Hostname() != "" { + host = parsed.Hostname() + } + cause := err + for errors.Unwrap(cause) != nil { + cause = errors.Unwrap(cause) + } + log.Printf("OIDC %s failed domain=%s issuer_host=%s cause=%T: %v", stage, domainUUID, host, cause, cause) +} + +func randomURLToken(size int) string { + raw := make([]byte, size) + _, _ = rand.Read(raw) + return base64.RawURLEncoding.EncodeToString(raw) +} + +func externalURL(r *http.Request, path string) string { + scheme := "http" + if requestIsHTTPS(r) { + scheme = "https" + } + return scheme + "://" + r.Host + path +} + +func (s *Server) beginOIDC(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodGet { + w.Header().Set("Allow", http.MethodGet) + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + domainUUID := s.domainUUIDForRequest(r) + config, err := s.store.AuthProviderConfig(domainUUID, "oidc") + if err != nil || !config.Enabled { + http.NotFound(w, r) + return + } + ctx, cancel := context.WithTimeout(r.Context(), 8*time.Second) + defer cancel() + metadata, err := fetchOIDCMetadata(ctx, config.Issuer) + if err != nil { + logOIDCFailure("discovery", domainUUID, config.Issuer, err) + http.Error(w, err.Error(), http.StatusBadGateway) + return + } + verifier, nonce, browser := randomURLToken(32), randomURLToken(24), randomURLToken(32) + browserDigest := sha256.Sum256([]byte(browser)) + state, err := s.store.CreateAuthChallenge(domainUUID, "", "oidc", oidcChallenge{Verifier: verifier, Nonce: nonce, Return: safeReturnPath(r.URL.Query().Get("return")), Issuer: config.Issuer, ClientID: config.ClientID, BrowserHash: base64.RawURLEncoding.EncodeToString(browserDigest[:])}, 5*time.Minute) + if err != nil { + http.Error(w, err.Error(), 500) + return + } + digest := sha256.Sum256([]byte(verifier)) + query := url.Values{"response_type": {"code"}, "client_id": {config.ClientID}, "redirect_uri": {externalURL(r, "/_/auth/callback/oidc")}, "scope": {"openid email profile"}, "state": {state}, "nonce": {nonce}, "code_challenge_method": {"S256"}, "code_challenge": {base64.RawURLEncoding.EncodeToString(digest[:])}} + authorizationURL, _ := url.Parse(metadata.AuthorizationEndpoint) + parameters := authorizationURL.Query() + for key, value := range query { + parameters[key] = value + } + authorizationURL.RawQuery = parameters.Encode() + setOIDCBrowserCookie(w, r, browser, 300) + w.Header().Set("Cache-Control", "no-store") + http.Redirect(w, r, authorizationURL.String(), http.StatusFound) +} + +func (s *Server) completeOIDC(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodGet { + w.Header().Set("Allow", http.MethodGet) + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + w.Header().Set("Cache-Control", "no-store") + domainUUID := s.domainUUIDForRequest(r) + var challenge oidcChallenge + if _, err := s.store.ConsumeAuthChallenge(domainUUID, "oidc", r.URL.Query().Get("state"), &challenge); err != nil { + http.Error(w, "invalid OIDC state", http.StatusBadRequest) + return + } + if !validOIDCBrowserChallenge(oidcBrowserCookie(r), challenge.BrowserHash) { + http.Error(w, "OIDC state belongs to a different browser", http.StatusBadRequest) + return + } + setOIDCBrowserCookie(w, r, "", -1) + config, err := s.store.AuthProviderConfig(domainUUID, "oidc") + if err != nil || !config.Enabled { + http.Error(w, "OIDC is disabled", http.StatusBadRequest) + return + } + if config.Issuer != challenge.Issuer || config.ClientID != challenge.ClientID || r.URL.Query().Get("code") == "" || r.URL.Query().Get("error") != "" { + http.Error(w, "OIDC login must be restarted", http.StatusBadRequest) + return + } + ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second) + defer cancel() + metadata, err := fetchOIDCMetadata(ctx, config.Issuer) + if err != nil { + logOIDCFailure("callback discovery", domainUUID, config.Issuer, err) + http.Error(w, err.Error(), http.StatusBadGateway) + return + } + form := url.Values{"grant_type": {"authorization_code"}, "code": {r.URL.Query().Get("code")}, "redirect_uri": {externalURL(r, "/_/auth/callback/oidc")}, "client_id": {config.ClientID}, "client_secret": {config.ClientSecret}, "code_verifier": {challenge.Verifier}} + var tokens struct { + AccessToken string `json:"access_token"` + IDToken string `json:"id_token"` + TokenType string `json:"token_type"` + } + if tokenErr := oidcVerifier.requestJSON(ctx, http.MethodPost, metadata.TokenEndpoint, form, "", &tokens); tokenErr != nil { + logOIDCFailure("token exchange", domainUUID, config.Issuer, tokenErr) + http.Error(w, "OIDC token exchange failed", http.StatusBadGateway) + return + } + if tokens.AccessToken == "" || len(tokens.AccessToken) > 16<<10 || !strings.EqualFold(tokens.TokenType, "Bearer") { + http.Error(w, "OIDC token exchange failed", http.StatusBadGateway) + return + } + idClaims, err := oidcVerifier.verify(ctx, metadata, tokens.IDToken, config.ClientID, challenge.Nonce, tokens.AccessToken) + if err != nil { + logOIDCFailure("ID-token verification", domainUUID, config.Issuer, err) + http.Error(w, "OIDC ID-token verification failed", http.StatusBadRequest) + return + } + var claims struct { + Sub, Email string + Name string `json:"name"` + DisplayName string `json:"display_name"` + PreferredName string `json:"preferred_username"` + EmailVerified bool `json:"email_verified"` + } + if userinfoErr := oidcVerifier.requestJSON(ctx, http.MethodGet, metadata.UserinfoEndpoint, nil, tokens.AccessToken, &claims); userinfoErr != nil { + logOIDCFailure("UserInfo", domainUUID, config.Issuer, userinfoErr) + http.Error(w, "OIDC identity is not a verified account", http.StatusForbidden) + return + } + if claims.Sub == "" { + http.Error(w, "OIDC identity is not a verified account", http.StatusForbidden) + return + } + if claims.Sub != idClaims.Sub { + http.Error(w, "OIDC subject mismatch", http.StatusForbidden) + return + } + principal, err := s.store.PrincipalByExternalIdentity(domainUUID, "oidc", "oidc", config.Issuer, claims.Sub) + if err != nil { + switch config.OIDCMatchBy { + case "preferred_username": + principal, err = s.store.PrincipalByExternalUsername(domainUUID, claims.PreferredName) + if err != nil { + log.Printf("OIDC local account match failed domain=%s mode=preferred_username present=%t", domainUUID, strings.TrimSpace(claims.PreferredName) != "") + } + case "display_name": + displayName := strings.TrimSpace(claims.Name) + claimSource := "name" + if displayName == "" { + displayName = strings.TrimSpace(claims.DisplayName) + claimSource = "display_name" + } + principal, err = s.store.PrincipalByDisplayName(domainUUID, displayName) + if err != nil { + log.Printf("OIDC local account match failed domain=%s mode=display_name claim=%s present=%t", domainUUID, claimSource, displayName != "") + } + default: + if claims.Email == "" || !claims.EmailVerified { + http.Error(w, "OIDC identity is not a verified account", http.StatusForbidden) + return + } + principal, err = s.store.PrincipalByVerifiedEmail(domainUUID, claims.Email) + } + if err == nil { + err = s.store.BindExternalIdentity(principal.UUID, "oidc", "oidc", config.Issuer, claims.Sub, claims) + } + } + if err != nil { + http.Error(w, "No local account matches the configured OIDC identity field", http.StatusForbidden) + return + } + token, err := s.store.CreateBrowserAuthSession(domainUUID, principal.UUID, 0) + if err != nil { + http.Error(w, err.Error(), 500) + return + } + s.setAuthCookie(w, r, token) + http.Redirect(w, r, challenge.Return, http.StatusSeeOther) +} + +func (s *Server) requestMagicLink(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodPost { + w.Header().Set("Allow", "POST") + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + w.Header().Set("Cache-Control", "no-store") + domainUUID := s.domainUUIDForRequest(r) + r.Body = http.MaxBytesReader(w, r.Body, 64<<10) + if err := r.ParseForm(); err != nil { + http.Error(w, "invalid sign-in request", http.StatusBadRequest) + return + } + config, configErr := s.store.AuthProviderConfig(domainUUID, "smtp") + requested, mailboxErr := smtpMailbox(r.FormValue("email")) + if configErr == nil && config.Enabled && mailboxErr == nil { + principal, principalErr := s.store.PrincipalByVerifiedEmail(domainUUID, requested.Address) + if principalErr == nil { + _, _, _, _, principalErr = smtpMessage(config, principal.Email, externalURL(r, "/_/auth/magic-link/verify")) + } + if principalErr == nil { + select { + case s.smtpSlots <- struct{}{}: + token, err := s.store.CreateAuthChallenge(domainUUID, principal.UUID, "magic-link", magicLinkChallenge{Return: safeReturnPath(r.FormValue("return")), Email: principal.Email}, 15*time.Minute) + if err != nil { + <-s.smtpSlots + break + } + link := externalURL(r, "/_/auth/magic-link/verify?token="+url.QueryEscape(token)) + go func() { + defer func() { <-s.smtpSlots }() + _ = sendMagicLinkSMTP(context.Background(), config, principal.Email, link) + }() + default: + } + } + } + s.renderAuthPage(w, r, map[string]any{"MagicSent": true, "Return": safeReturnPath(r.FormValue("return"))}) +} + +func (s *Server) verifyMagicLink(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodGet { + w.Header().Set("Allow", "GET") + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + w.Header().Set("Cache-Control", "no-store") + domainUUID := s.domainUUIDForRequest(r) + var payload magicLinkChallenge + principalUUID, err := s.store.ConsumeAuthChallenge(domainUUID, "magic-link", r.URL.Query().Get("token"), &payload) + if err != nil { + http.Error(w, "This sign-in link is invalid or expired", http.StatusBadRequest) + return + } + config, configErr := s.store.AuthProviderConfig(domainUUID, "smtp") + var valid bool + stateErr := s.store.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM principals p JOIN domain_memberships m ON m.principal_uuid=p.uuid AND m.domain_uuid=? WHERE p.uuid=? AND p.state IN ('active','readonly') AND m.state='active' AND p.email=?)`, domainUUID, principalUUID, payload.Email).Scan(&valid) + if configErr != nil || !config.Enabled || stateErr != nil || !valid || payload.Email == "" { + http.Error(w, "This sign-in link is invalid or expired", http.StatusBadRequest) + return + } + token, err := s.store.CreateBrowserAuthSession(domainUUID, principalUUID, 0) + if err != nil { + http.Error(w, "This sign-in link is invalid or expired", http.StatusBadRequest) + return + } + s.setAuthCookie(w, r, token) + http.Redirect(w, r, safeReturnPath(payload.Return), http.StatusSeeOther) +} + +func (s *Server) renderAuthPage(w http.ResponseWriter, r *http.Request, data map[string]any) { + domainUUID := s.domainUUIDForRequest(r) + if data == nil { + data = map[string]any{} + } + if config, err := s.store.AuthProviderConfig(domainUUID, "oidc"); err == nil { + data["OIDCEnabled"] = config.Enabled + } + if config, err := s.store.AuthProviderConfig(domainUUID, "smtp"); err == nil { + data["MagicEnabled"] = config.Enabled + } + if config, err := s.store.AuthProviderConfig(domainUUID, "ldap"); err == nil { + data["LDAPEnabled"] = config.Enabled + } + data["Locale"] = s.getLocale(domainUUID) + transparency := s.homeGlassTransparency(domainUUID) + data["HomeGlassTransparency"] = transparency + data["HomeGlassOpacity"] = 100 - transparency + configured, opacity := s.homeWallpaperConfig(domainUUID) + data["HomeWallpaperOpacity"] = strconv.FormatFloat(float64(opacity)/100, 'f', 2, 64) + if configured != "" { + // Only the administrator-selected login wallpaper is exposed; the + // request cannot choose an arbitrary document address. + data["HomeWallpaperURL"] = "/_/auth/wallpaper" + w.Header().Set("Cache-Control", "private, no-store") + } + s.renderWithContext(w, r, "auth.gohtml", data) +} diff --git a/internal/server/auth_handler.go b/internal/server/auth_handler.go new file mode 100644 index 0000000..cdef042 --- /dev/null +++ b/internal/server/auth_handler.go @@ -0,0 +1,406 @@ +package server + +import ( + "crypto/rand" + "crypto/sha256" + "crypto/subtle" + "database/sql" + "encoding/base64" + "errors" + "log" + "net/http" + "net/url" + "strings" + + "pageswiki/internal/store" +) + +const authCookieName = "pageswiki_session" +const mfaChallengeCookieName = "pageswiki_mfa" + +func (s *Server) ensureBootstrapToken(domainUUID string) error { + if value, _ := s.store.GetConfigInDomain(domainUUID, "auth_bootstrap_token_hash"); value != "" { + return nil + } + raw := make([]byte, 24) + if _, err := rand.Read(raw); err != nil { + return err + } + token := base64.RawURLEncoding.EncodeToString(raw) + sum := sha256.Sum256([]byte(token)) + if err := s.store.SetConfigInDomain(domainUUID, "auth_bootstrap_token_hash", base64.RawURLEncoding.EncodeToString(sum[:])); err != nil { + return err + } + log.Printf("AUTH BOOTSTRAP TOKEN domain=%s token=%s (one-time; create the owner at /_/auth/login)", domainUUID, token) + return nil +} + +func (s *Server) validBootstrapToken(domainUUID, token string) bool { + want, err := s.store.GetConfigInDomain(domainUUID, "auth_bootstrap_token_hash") + if err != nil || want == "" { + return false + } + sum := sha256.Sum256([]byte(strings.TrimSpace(token))) + got := base64.RawURLEncoding.EncodeToString(sum[:]) + return subtle.ConstantTimeCompare([]byte(want), []byte(got)) == 1 +} + +func safeReturnPath(value string) string { + value = strings.TrimSpace(value) + parsed, err := url.Parse(value) + if err != nil || !strings.HasPrefix(parsed.Path, "/") || strings.HasPrefix(parsed.Path, "//") || strings.ContainsAny(parsed.Path, "\\\r\n\x00") || parsed.IsAbs() || parsed.Host != "" { + return "/" + } + return parsed.RequestURI() +} + +func requestIsHTTPS(r *http.Request) bool { + if r.TLS != nil { + return true + } + return strings.EqualFold(strings.TrimSpace(strings.Split(r.Header.Get("X-Forwarded-Proto"), ",")[0]), "https") +} + +func (s *Server) setAuthCookie(w http.ResponseWriter, r *http.Request, token string) { + http.SetCookie(w, &http.Cookie{Name: authCookieName, Value: token, Path: "/", HttpOnly: true, Secure: requestIsHTTPS(r), SameSite: http.SameSiteLaxMode, MaxAge: 24 * 60 * 60}) +} + +func (s *Server) authTokenFromRequest(r *http.Request) string { + if headers := r.Header.Values("Authorization"); len(headers) != 0 { + // An explicitly supplied but invalid credential must never fall back to + // an ambient browser session (including unknown credential schemes). + if len(headers) != 1 { + return "" + } + parts := strings.Fields(headers[0]) + if len(parts) != 2 || !strings.EqualFold(parts[0], "Bearer") || len(parts[1]) > 4096 || strings.Contains(parts[1], ",") { + return "" + } + if strings.HasPrefix(parts[1], "pw_browser_") { + return "" + } + return parts[1] + } + var token string + count := 0 + for _, cookie := range r.Cookies() { + if cookie.Name == authCookieName { + token = cookie.Value + count++ + } + } + if count == 1 { + if strings.HasPrefix(token, "pw_api_") { + return "" + } + return token + } + return "" +} + +func (s *Server) handleAuth(w http.ResponseWriter, r *http.Request) { + action := strings.Trim(strings.TrimPrefix(r.URL.Path, "/_/auth"), "/") + domainUUID := s.domainUUIDForRequest(r) + switch action { + case "wallpaper": + s.handleAuthWallpaper(w, r) + return + case "oidc": + s.beginOIDC(w, r) + return + case "ldap": + s.handleLDAPLogin(w, r) + return + case "callback/oidc": + s.completeOIDC(w, r) + return + case "magic-link": + if r.Method == http.MethodPost { + s.requestMagicLink(w, r) + return + } + case "magic-link/verify": + s.verifyMagicLink(w, r) + return + } + if action == "logout" { + s.handleLogout(w, r) + return + } + if action != "login" && action != "setup" && action != "totp" { + http.NotFound(w, r) + return + } + if r.Method != http.MethodGet && r.Method != http.MethodHead && r.Method != http.MethodPost { + w.Header().Set("Allow", "GET, HEAD, POST") + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + count, err := s.store.PrincipalCount() + if err != nil { + http.Error(w, err.Error(), 500) + return + } + setup := count == 0 + if setup { + if err := s.ensureBootstrapToken(domainUUID); err != nil { + http.Error(w, err.Error(), 500) + return + } + } + if r.Method == http.MethodPost { + r.Body = http.MaxBytesReader(w, r.Body, 64<<10) + if err := r.ParseForm(); err != nil { + http.Error(w, err.Error(), 400) + return + } + var principal *store.Principal + mfaLevel := 0 + if action == "setup" && setup && s.validBootstrapToken(domainUUID, r.FormValue("bootstrap_token")) { + principal, err = s.store.BootstrapOwner(domainUUID, r.FormValue("username"), r.FormValue("password"), r.FormValue("display_name"), r.FormValue("email")) + if err == nil { + err = s.store.SetConfigInDomain(domainUUID, "authorization_mode", "enforcing") + if err == nil { + _ = s.store.SetConfigInDomain(domainUUID, "auth_bootstrap_token_hash", "") + } + } + } else if action == "login" && !setup { + principal, err = s.store.AuthenticatePassword(r.FormValue("username"), r.FormValue("password")) + if err == nil && s.store.HasTOTP(principal.UUID) { + challenge, challengeErr := s.store.CreateTOTPLoginChallenge(domainUUID, principal.UUID) + if challengeErr != nil { + err = challengeErr + } else if strings.Contains(r.Header.Get("Accept"), "application/json") { + writeEventJSON(w, http.StatusUnauthorized, map[string]any{"mfa_required": true, "challenge_token": challenge, "method": "totp"}) + return + } else { + http.SetCookie(w, &http.Cookie{Name: mfaChallengeCookieName, Value: challenge, Path: "/_/auth/", HttpOnly: true, Secure: requestIsHTTPS(r), SameSite: http.SameSiteStrictMode, MaxAge: 300}) + s.renderAuthPage(w, r, map[string]any{"MFA": true, "Return": safeReturnPath(r.FormValue("return"))}) + return + } + } + } else if action == "totp" && !setup { + challenge := r.FormValue("challenge_token") + if challenge == "" { + if cookie, cookieErr := r.Cookie(mfaChallengeCookieName); cookieErr == nil { + challenge = cookie.Value + } + } + var principalUUID string + principalUUID, err = s.store.CompleteTOTPLoginChallenge(domainUUID, challenge, r.FormValue("code")) + if err == nil { + principal = &store.Principal{UUID: principalUUID} + mfaLevel = 1 + http.SetCookie(w, &http.Cookie{Name: mfaChallengeCookieName, Path: "/_/auth/", MaxAge: -1, HttpOnly: true, Secure: requestIsHTTPS(r), SameSite: http.SameSiteStrictMode}) + } + } else { + err = store.ErrAccessDenied + } + if err == nil { + var token string + if strings.Contains(r.Header.Get("Accept"), "application/json") { + token, err = s.store.CreateAuthSessionWithMFA(domainUUID, principal.UUID, mfaLevel) + } else { + token, err = s.store.CreateBrowserAuthSession(domainUUID, principal.UUID, mfaLevel) + } + if err == nil { + if strings.Contains(r.Header.Get("Accept"), "application/json") { + writeEventJSON(w, http.StatusOK, map[string]any{"access_token": token, "token_type": "Bearer", "expires_in": 86400}) + return + } + s.setAuthCookie(w, r, token) + http.Redirect(w, r, safeReturnPath(r.FormValue("return")), http.StatusSeeOther) + return + } + } + if action == "totp" { + s.renderAuthPage(w, r, map[string]any{"MFA": true, "Error": translate(s.getLocale(domainUUID), "auth.totp_invalid"), "Return": safeReturnPath(r.FormValue("return"))}) + return + } + s.renderAuthPage(w, r, map[string]any{"Setup": setup, "Error": translate(s.getLocale(domainUUID), "auth.invalid_credentials"), "Return": safeReturnPath(r.FormValue("return"))}) + return + } + s.renderAuthPage(w, r, map[string]any{"Setup": setup, "Return": safeReturnPath(r.URL.Query().Get("return"))}) +} + +func authorizationTargetForRequest(r *http.Request, domainUUID string) (string, string) { + policy := policyForRequest(r) + if policy.Target == targetDomain { + return string(targetDomain), domainUUID + } + path := r.URL.Path + if strings.HasPrefix(path, "/e/") { + return "path", semanticEditorPath(path) + } + return string(targetPath), path +} + +func (s *Server) authorizePathRequest(r *http.Request, capability, path string) error { + domainUUID := s.domainUUIDForRequest(r) + mode, err := s.store.GetConfigInDomain(domainUUID, "authorization_mode") + if err != nil { + return err + } + if mode != "enforcing" { + return nil + } + principal, err := s.store.PrincipalForSession(domainUUID, s.authTokenFromRequest(r)) + if err != nil { + return err + } + return s.store.Authorize(store.AuthorizationRequest{DomainUUID: domainUUID, PrincipalUUID: principal.UUID, Capability: capability, TargetType: "path", TargetID: path}) +} + +func ownUserEditorPath(path, username string) bool { + for _, prefix := range []string{"/e/-/u/", "/e/u/"} { + if strings.HasPrefix(path, prefix) { + owner := strings.Split(strings.TrimPrefix(path, prefix), "/")[0] + return owner == username + } + } + return false +} + +func (s *Server) withAuthorization(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // HTML and dynamic listings contain per-principal data. They must not + // enter shared caches even in legacy mode; immutable projections can + // choose a more specific private cache policy in their own handlers. + if r.URL.Path != "/health" && !strings.HasPrefix(r.URL.Path, "/static/") && !strings.HasPrefix(r.URL.Path, "/o/path:/system/static/") { + w.Header().Set("Cache-Control", "private, no-store") + w.Header().Add("Vary", "Cookie, Authorization") + } + // Runs before handler-owned auth and legacy-mode bypasses, protecting + // login, groups, configuration and upload forms as well as JSON APIs. + if !validBrowserMutationOrigin(r) { + rejectBrowserMutation(w, r) + return + } + // No process-wide principal/policy cache: revocation is observed by the + // next request. Read snapshots never authorize mutating store operations. + r = cacheRequestDomain(withReadPolicyContext(r)) + if r.URL.Path == "/g" || strings.HasPrefix(r.URL.Path, "/g/") { + next.ServeHTTP(w, r) + return + } + if strings.HasPrefix(r.URL.Path, "/_/auth/") || r.URL.Path == "/health" || strings.HasPrefix(r.URL.Path, "/static/") || strings.HasPrefix(r.URL.Path, adapterGatewayPrefix+"/") || strings.HasPrefix(r.URL.Path, "/_/api/v1/adapter/session/") || r.URL.Path == "/_/api/v1/federation/enroll" { + next.ServeHTTP(w, r) + return + } + policy := policyForRequest(r) + // Calendar handlers enforce per-calendar ACLs, including public reads, + // regardless of the domain's legacy/enforcing switch. + if taskRoute(r.URL.Path) || calendarRoute(r.URL.Path) { + next.ServeHTTP(w, r) + return + } + // Compatibility URL for public application assets, not document objects. + // Serve from a confined static FileServer, never from object resolution. + if (r.Method == http.MethodGet || r.Method == http.MethodHead) && strings.HasPrefix(r.URL.Path, "/o/path:/system/static/") { + http.StripPrefix("/o/path:/system/static/", http.FileServer(http.Dir("./static"))).ServeHTTP(w, r) + return + } + if policy.Capability == "deny" { + http.Error(w, "forbidden: endpoint authorization policy is not defined", http.StatusForbidden) + return + } + domainUUID := s.domainUUIDForRequest(r) + mode, configErr := s.store.GetConfigInDomain(domainUUID, "authorization_mode") + if configErr != nil { + http.Error(w, "authorization policy unavailable", http.StatusServiceUnavailable) + return + } + userSpacePath := "" + if store.IsUserSpacePath(r.URL.Path) { + userSpacePath = r.URL.Path + } else if strings.HasPrefix(r.URL.Path, "/v/raw/path:/u/") { + userSpacePath = strings.TrimPrefix(r.URL.Path, "/v/raw/path:") + } else if username := publicUserNavigationUsername(r); username != "" { + if r.URL.Path == "/v/children" { + userSpacePath = r.URL.Query().Get("path") + } else { + userSpacePath = "/u/" + username + } + } + if mode != "enforcing" && userSpacePath == "" { + next.ServeHTTP(w, r) + return + } + token := s.authTokenFromRequest(r) + if token == "" { + if s.tryAnonymousProjection(w, r) { + return + } + s.authRequired(w, r) + return + } + principal, err := s.store.PrincipalForSession(domainUUID, token) + if err != nil { + s.authRequired(w, r) + return + } + if userSpacePath != "" { + allowed, audienceErr := s.store.UserSpaceCanReadAuthenticated(r.Context(), domainUUID, principal.UUID, userSpacePath) + if audienceErr != nil || !allowed { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + } + if mode != "enforcing" { + next.ServeHTTP(w, r) + return + } + if strings.HasPrefix(r.URL.Path, "/-/sys/config") { + domain := s.domainForRequest(r) + if s.store.IsBuiltinGroupAdmin(domainUUID, principal.UUID, "domain_admin") || (domain != nil && s.store.IsCampusAdmin(domain.CampusUUID, principal.UUID)) { + next.ServeHTTP(w, r) + return + } + } + if strings.HasPrefix(r.URL.Path, "/_/api/v1/city/") && r.Method != http.MethodGet && r.Method != http.MethodHead && s.store.IsBuiltinGroupAdmin(domainUUID, principal.UUID, "domain_admin") { + next.ServeHTTP(w, r) + return + } + capability := policy.Capability + if capability == "write" && principal.State == "active" && ownUserEditorPath(r.URL.Path, principal.Username) && s.store.CheckLocalityAccessCaps(domainUUID, principal.UUID, "write", semanticEditorPath(r.URL.Path)) == nil { + next.ServeHTTP(w, r) + return + } + if handled, resolvedErr := s.authorizeResolvedEndpoint(r, principal, policy); handled { + if resolvedErr != nil { + if errors.Is(resolvedErr, store.ErrAccessDenied) { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + http.Error(w, resolvedErr.Error(), http.StatusInternalServerError) + return + } + next.ServeHTTP(w, r) + return + } + targetType, targetID := authorizationTargetForRequest(r, domainUUID) + if capability == "write" && targetType == "path" { + if _, resolveErr := s.store.ResolvePathInDomain(domainUUID, targetID); errors.Is(resolveErr, sql.ErrNoRows) { + capability = "create" + } + } + err = s.store.Authorize(store.AuthorizationRequest{DomainUUID: domainUUID, PrincipalUUID: principal.UUID, Capability: capability, TargetType: targetType, TargetID: targetID}) + if err != nil { + if errors.Is(err, store.ErrAccessDenied) { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + http.Error(w, err.Error(), 500) + return + } + next.ServeHTTP(w, r) + }) +} + +func (s *Server) authRequired(w http.ResponseWriter, r *http.Request) { + if strings.HasPrefix(r.URL.Path, "/_/api/") { + writeEventJSON(w, http.StatusUnauthorized, map[string]string{"error": "authentication required"}) + return + } + http.Redirect(w, r, "/_/auth/login?return="+url.QueryEscape(r.URL.RequestURI()), http.StatusSeeOther) +} diff --git a/internal/server/auth_ldap.go b/internal/server/auth_ldap.go new file mode 100644 index 0000000..5806ff1 --- /dev/null +++ b/internal/server/auth_ldap.go @@ -0,0 +1,253 @@ +package server + +import ( + "context" + "crypto/tls" + "crypto/x509" + "database/sql" + "encoding/base64" + "errors" + "fmt" + "log" + "net" + "net/http" + "net/url" + "strings" + "time" + "unicode/utf8" + + ldap "github.com/go-ldap/ldap/v3" + "pageswiki/internal/store" +) + +type ldapDirectory interface { + Bind(string, string) error + Search(*ldap.SearchRequest) (*ldap.SearchResult, error) + Close() error +} + +type ldapDialFunc func(context.Context, store.AuthProviderConfig) (ldapDirectory, error) + +type ldapIdentity struct { + Subject, Username, Email, DisplayName, DN string +} + +func ldapTLSConfig(config store.AuthProviderConfig) (*tls.Config, error) { + parsed, err := url.Parse(config.LDAPURL) + if err != nil { + return nil, err + } + tlsConfig := &tls.Config{ // #nosec G402 -- opt-out is an explicit administrator setting. + MinVersion: tls.VersionTLS12, + ServerName: parsed.Hostname(), + InsecureSkipVerify: config.LDAPSkipTLSVerify, + } + if config.LDAPCAPEM != "" { + pool, poolErr := x509.SystemCertPool() + if poolErr != nil || pool == nil { + pool = x509.NewCertPool() + } + if !pool.AppendCertsFromPEM([]byte(config.LDAPCAPEM)) { + return nil, errors.New("LDAP CA PEM contains no certificate") + } + tlsConfig.RootCAs = pool + } + return tlsConfig, nil +} + +func dialLDAPDirectory(_ context.Context, config store.AuthProviderConfig) (ldapDirectory, error) { + if err := store.ValidateLDAPProviderConfig(config); err != nil { + return nil, err + } + tlsConfig, err := ldapTLSConfig(config) + if err != nil { + return nil, err + } + conn, err := ldap.DialURL(config.LDAPURL, + ldap.DialWithDialer(&net.Dialer{Timeout: 5 * time.Second, KeepAlive: 30 * time.Second}), + ldap.DialWithTLSConfig(tlsConfig), + ) + if err != nil { + return nil, err + } + conn.SetTimeout(8 * time.Second) + if config.LDAPStartTLS { + if err = conn.StartTLS(tlsConfig); err != nil { + conn.Close() + return nil, err + } + } + return conn, nil +} + +func ldapStableSubject(raw []byte) (string, error) { + if len(raw) == 0 || len(raw) > 4096 { + return "", errors.New("LDAP immutable UID is missing or too large") + } + return "attr:" + base64.RawURLEncoding.EncodeToString(raw), nil +} + +func (s *Server) authenticateLDAPDirectory(ctx context.Context, config store.AuthProviderConfig, login, password string) (ldapIdentity, error) { + login = strings.TrimSpace(login) + if login == "" || len(login) > 512 || password == "" || len(password) > 4096 || config.UUID == "" { + return ldapIdentity{}, store.ErrAccessDenied + } + if err := store.ValidateLDAPProviderConfig(config); err != nil || !config.Enabled { + return ldapIdentity{}, store.ErrAccessDenied + } + dial := s.ldapDial + if dial == nil { + dial = dialLDAPDirectory + } + directory, err := dial(ctx, config) + if err != nil { + return ldapIdentity{}, err + } + defer func() { _ = directory.Close() }() + if config.LDAPBindDN != "" { + if config.LDAPBindPassword == "" { + return ldapIdentity{}, errors.New("LDAP service bind password is unavailable") + } + if err = directory.Bind(config.LDAPBindDN, config.LDAPBindPassword); err != nil { + return ldapIdentity{}, fmt.Errorf("LDAP service bind: %w", err) + } + } + attributes := []string{config.LDAPUIDAttribute, config.LDAPUsernameAttribute, config.LDAPEmailAttribute, config.LDAPDisplayAttribute} + unique := make([]string, 0, len(attributes)) + seen := map[string]bool{} + for _, attribute := range attributes { + key := strings.ToLower(attribute) + if !seen[key] { + seen[key] = true + unique = append(unique, attribute) + } + } + filter := strings.ReplaceAll(config.LDAPSearchFilter, "{{username}}", ldap.EscapeFilter(login)) + request := ldap.NewSearchRequest(config.LDAPSearchBase, ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 2, 6, false, filter, unique, nil) + result, err := directory.Search(request) + if err != nil { + return ldapIdentity{}, fmt.Errorf("LDAP user search: %w", err) + } + if len(result.Entries) != 1 || result.Entries[0].DN == "" { + return ldapIdentity{}, store.ErrAccessDenied + } + entry := result.Entries[0] + subject, err := ldapStableSubject(entry.GetEqualFoldRawAttributeValue(config.LDAPUIDAttribute)) + if err != nil { + return ldapIdentity{}, err + } + identity := ldapIdentity{ + Subject: subject, DN: entry.DN, + Username: strings.ToLower(strings.TrimSpace(entry.GetEqualFoldAttributeValue(config.LDAPUsernameAttribute))), + Email: strings.ToLower(strings.TrimSpace(entry.GetEqualFoldAttributeValue(config.LDAPEmailAttribute))), + DisplayName: strings.TrimSpace(entry.GetEqualFoldAttributeValue(config.LDAPDisplayAttribute)), + } + if identity.Username == "" || !utf8.ValidString(identity.Username) || !utf8.ValidString(identity.DisplayName) || !utf8.ValidString(identity.Email) { + return ldapIdentity{}, errors.New("LDAP identity attributes are invalid") + } + // The successful user bind is the password proof. Never retain or log the + // supplied password, and do not accept a search result alone as login. + if err = directory.Bind(entry.DN, password); err != nil { + return ldapIdentity{}, store.ErrAccessDenied + } + return identity, nil +} + +func (s *Server) authenticateLDAPPrincipal(ctx context.Context, domainUUID, login, password string) (*store.Principal, error) { + config, err := s.store.AuthProviderConfig(domainUUID, "ldap") + if err != nil || !config.Enabled { + return nil, store.ErrAccessDenied + } + identity, err := s.authenticateLDAPDirectory(ctx, config, login, password) + if err != nil { + return nil, err + } + attributes := map[string]string{"dn": identity.DN, "username": identity.Username, "email": identity.Email, "display_name": identity.DisplayName} + principal, err := s.store.PrincipalByExternalIdentity(domainUUID, "ldap", config.UUID, "", identity.Subject) + if err == nil { + if bindErr := s.store.BindExternalIdentity(principal.UUID, "ldap", config.UUID, "", identity.Subject, attributes); bindErr != nil { + return nil, bindErr + } + return principal, nil + } + if !errors.Is(err, sql.ErrNoRows) { + return nil, err + } + switch config.LDAPMatchBy { + case "email": + principal, err = s.store.PrincipalByVerifiedEmail(domainUUID, identity.Email) + default: + principal, err = s.store.PrincipalByExternalUsername(domainUUID, identity.Username) + } + if err == nil { + if err = s.store.BindExternalIdentityIfProviderUnbound(domainUUID, principal.UUID, "ldap", config.UUID, "", identity.Subject, attributes); err != nil { + return nil, err + } + return principal, nil + } + if !errors.Is(err, store.ErrAccessDenied) || !config.LDAPAutoProvision { + return nil, store.ErrAccessDenied + } + return s.store.ProvisionExternalAccount(domainUUID, identity.Username, identity.DisplayName, identity.Email, "ldap", config.UUID, "", identity.Subject, attributes) +} + +func (s *Server) handleLDAPLogin(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodPost { + w.Header().Set("Allow", http.MethodPost) + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + w.Header().Set("Cache-Control", "no-store") + r.Body = http.MaxBytesReader(w, r.Body, 64<<10) + if err := r.ParseForm(); err != nil { + http.Error(w, "invalid sign-in request", http.StatusBadRequest) + return + } + returnPath := safeReturnPath(r.FormValue("return")) + select { + case s.ldapSlots <- struct{}{}: + defer func() { <-s.ldapSlots }() + default: + http.Error(w, "directory authentication is busy", http.StatusServiceUnavailable) + return + } + ctx, cancel := context.WithTimeout(r.Context(), 12*time.Second) + defer cancel() + domainUUID := s.domainUUIDForRequest(r) + principal, err := s.authenticateLDAPPrincipal(ctx, domainUUID, r.FormValue("username"), r.FormValue("password")) + if err != nil { + log.Printf("LDAP login failed domain=%s error=%v", domainUUID, err) + s.renderAuthPage(w, r, map[string]any{"Error": translate(s.getLocale(domainUUID), "auth.invalid_credentials"), "Return": returnPath}) + return + } + if s.store.HasTOTP(principal.UUID) { + challenge, challengeErr := s.store.CreateTOTPLoginChallenge(domainUUID, principal.UUID) + if challengeErr != nil { + http.Error(w, "authentication unavailable", http.StatusServiceUnavailable) + return + } + if strings.Contains(r.Header.Get("Accept"), "application/json") { + writeEventJSON(w, http.StatusUnauthorized, map[string]any{"mfa_required": true, "challenge_token": challenge, "method": "totp"}) + return + } + http.SetCookie(w, &http.Cookie{Name: mfaChallengeCookieName, Value: challenge, Path: "/_/auth/", HttpOnly: true, Secure: requestIsHTTPS(r), SameSite: http.SameSiteStrictMode, MaxAge: 300}) + s.renderAuthPage(w, r, map[string]any{"MFA": true, "Return": returnPath}) + return + } + var token string + if strings.Contains(r.Header.Get("Accept"), "application/json") { + token, err = s.store.CreateAuthSession(domainUUID, principal.UUID) + } else { + token, err = s.store.CreateBrowserAuthSession(domainUUID, principal.UUID, 0) + } + if err != nil { + http.Error(w, "authentication unavailable", http.StatusServiceUnavailable) + return + } + if strings.Contains(r.Header.Get("Accept"), "application/json") { + writeEventJSON(w, http.StatusOK, map[string]any{"access_token": token, "token_type": "Bearer", "expires_in": 86400}) + return + } + s.setAuthCookie(w, r, token) + http.Redirect(w, r, returnPath, http.StatusSeeOther) +} diff --git a/internal/server/auth_ldap_test.go b/internal/server/auth_ldap_test.go new file mode 100644 index 0000000..f71bc6b --- /dev/null +++ b/internal/server/auth_ldap_test.go @@ -0,0 +1,165 @@ +package server + +import ( + "context" + "errors" + "net/http" + "net/http/httptest" + "net/url" + "strings" + "testing" + + ldap "github.com/go-ldap/ldap/v3" + "pageswiki/internal/store" +) + +type fakeLDAPDirectory struct { + result *ldap.SearchResult + searchErr error + userBindErr error + binds [][2]string + searchFilter string +} + +func (f *fakeLDAPDirectory) Bind(dn, password string) error { + f.binds = append(f.binds, [2]string{dn, password}) + if len(f.binds) > 1 { + return f.userBindErr + } + return nil +} + +func (f *fakeLDAPDirectory) Search(request *ldap.SearchRequest) (*ldap.SearchResult, error) { + f.searchFilter = request.Filter + return f.result, f.searchErr +} + +func (f *fakeLDAPDirectory) Close() error { return nil } + +func ldapEntry(uid, username, email, displayName string) *ldap.Entry { + return ldap.NewEntry("uid="+username+",ou=people,dc=example,dc=test", map[string][]string{ + "entryUUID": {uid}, + "uid": {username}, + "mail": {email}, + "displayName": {displayName}, + }) +} + +func configuredLDAPServer(t *testing.T) (*Server, string, store.AuthProviderConfig) { + t.Helper() + s, _, domain := configFixture(t) + config := store.AuthProviderConfig{ + Kind: "ldap", Enabled: true, LDAPURL: "ldaps://directory.example.test:636", + LDAPBindDN: "cn=pageswiki,ou=services,dc=example,dc=test", LDAPBindPassword: "service-secret", + LDAPSearchBase: "ou=people,dc=example,dc=test", LDAPSearchFilter: "(&(objectClass=person)(uid={{username}}))", + LDAPUIDAttribute: "entryUUID", LDAPUsernameAttribute: "uid", LDAPEmailAttribute: "mail", LDAPDisplayAttribute: "displayName", + LDAPMatchBy: "username", + } + if err := s.store.SetAuthProviderConfig(domain, config); err != nil { + t.Fatal(err) + } + config, err := s.store.AuthProviderConfig(domain, "ldap") + if err != nil { + t.Fatal(err) + } + s.ldapSlots = make(chan struct{}, 4) + return s, domain, config +} + +func TestLDAPAuthenticationSearchesSafelyAndBindsAsUser(t *testing.T) { + s, domain, _ := configuredLDAPServer(t) + directory := &fakeLDAPDirectory{result: &ldap.SearchResult{Entries: []*ldap.Entry{ldapEntry("stable-id", "admin", "admin@example.test", "Directory Admin")}}} + s.ldapDial = func(context.Context, store.AuthProviderConfig) (ldapDirectory, error) { return directory, nil } + principal, err := s.authenticateLDAPPrincipal(context.Background(), domain, "admin", "user-secret") + if err != nil || principal.Username != "admin" { + t.Fatalf("LDAP principal = %#v, %v", principal, err) + } + if len(directory.binds) != 2 || directory.binds[0] != [2]string{"cn=pageswiki,ou=services,dc=example,dc=test", "service-secret"} || directory.binds[1][1] != "user-secret" { + t.Fatalf("LDAP binds = %#v", directory.binds) + } + if directory.searchFilter != "(&(objectClass=person)(uid=admin))" { + t.Fatalf("search filter = %q", directory.searchFilter) + } + loaded, err := s.store.AuthProviderConfig(domain, "ldap") + if err != nil { + t.Fatal(err) + } + subject, _ := ldapStableSubject([]byte("stable-id")) + bound, err := s.store.PrincipalByExternalIdentity(domain, "ldap", loaded.UUID, "", subject) + if err != nil || bound.UUID != principal.UUID { + t.Fatalf("immutable LDAP binding = %#v, %v", bound, err) + } +} + +func TestLDAPAuthenticationEscapesFilterAndRejectsAmbiguousOrBadPassword(t *testing.T) { + s, _, config := configuredLDAPServer(t) + directory := &fakeLDAPDirectory{result: &ldap.SearchResult{Entries: []*ldap.Entry{ldapEntry("stable-id", "admin", "", "Admin")}}} + s.ldapDial = func(context.Context, store.AuthProviderConfig) (ldapDirectory, error) { return directory, nil } + login := `admin*)(uid=*)` + if _, err := s.authenticateLDAPDirectory(context.Background(), config, login, "user-secret"); err != nil { + t.Fatal(err) + } + if strings.Contains(directory.searchFilter, login) || !strings.Contains(directory.searchFilter, ldap.EscapeFilter(login)) { + t.Fatalf("LDAP search input was not escaped: %q", directory.searchFilter) + } + + directory.result = &ldap.SearchResult{Entries: []*ldap.Entry{ldapEntry("one", "admin", "", "Admin"), ldapEntry("two", "admin", "", "Admin")}} + directory.binds = nil + if _, err := s.authenticateLDAPDirectory(context.Background(), config, "admin", "user-secret"); !errors.Is(err, store.ErrAccessDenied) { + t.Fatalf("ambiguous directory result accepted: %v", err) + } + if len(directory.binds) != 1 { + t.Fatalf("ambiguous result attempted a user bind: %#v", directory.binds) + } + + directory.result = &ldap.SearchResult{Entries: []*ldap.Entry{ldapEntry("stable-id", "admin", "", "Admin")}} + directory.binds = nil + directory.userBindErr = errors.New("invalid credentials") + if _, err := s.authenticateLDAPDirectory(context.Background(), config, "admin", "wrong"); !errors.Is(err, store.ErrAccessDenied) { + t.Fatalf("bad LDAP password accepted: %v", err) + } +} + +func TestLDAPAutoProvisionUsesImmutableSubjectOnFollowingLogins(t *testing.T) { + s, domain, config := configuredLDAPServer(t) + config.LDAPAutoProvision = true + if err := s.store.SetAuthProviderConfig(domain, config); err != nil { + t.Fatal(err) + } + directory := &fakeLDAPDirectory{result: &ldap.SearchResult{Entries: []*ldap.Entry{ldapEntry("new-stable-id", "directory-user", "directory@example.test", "Directory User")}}} + s.ldapDial = func(context.Context, store.AuthProviderConfig) (ldapDirectory, error) { return directory, nil } + principal, err := s.authenticateLDAPPrincipal(context.Background(), domain, "directory-user", "user-secret") + if err != nil || principal.Username != "directory-user" { + t.Fatalf("provisioned LDAP principal = %#v, %v", principal, err) + } + // Mutable directory attributes may change, but the immutable configured UID + // remains the authoritative identity after first login. + directory.result = &ldap.SearchResult{Entries: []*ldap.Entry{ldapEntry("new-stable-id", "renamed-user", "renamed@example.test", "Renamed User")}} + directory.binds = nil + again, err := s.authenticateLDAPPrincipal(context.Background(), domain, "renamed-user", "user-secret") + if err != nil || again.UUID != principal.UUID { + t.Fatalf("immutable LDAP re-login = %#v, %v", again, err) + } +} + +func TestLDAPLoginHandlerCreatesTypedBrowserSession(t *testing.T) { + s, domain, _ := configuredLDAPServer(t) + directory := &fakeLDAPDirectory{result: &ldap.SearchResult{Entries: []*ldap.Entry{ldapEntry("stable-id", "admin", "admin@example.test", "Admin")}}} + s.ldapDial = func(context.Context, store.AuthProviderConfig) (ldapDirectory, error) { return directory, nil } + form := url.Values{"username": {"admin"}, "password": {"user-secret"}, "return": {"/v/tree/docs"}} + request := httptest.NewRequest(http.MethodPost, "https://localhost/_/auth/ldap", strings.NewReader(form.Encode())) + request.Header.Set("Content-Type", "application/x-www-form-urlencoded") + response := httptest.NewRecorder() + s.handleLDAPLogin(response, request) + if response.Code != http.StatusSeeOther || response.Header().Get("Location") != "/v/tree/docs" { + t.Fatalf("LDAP browser login: %d %s", response.Code, response.Body.String()) + } + cookies := response.Result().Cookies() + if len(cookies) != 1 || cookies[0].Name != authCookieName || !cookies[0].HttpOnly || !cookies[0].Secure || !strings.HasPrefix(cookies[0].Value, "pw_browser_") { + t.Fatalf("LDAP browser cookie: %#v", cookies) + } + principal, err := s.store.PrincipalForSession(domain, cookies[0].Value) + if err != nil || principal.Username != "admin" { + t.Fatalf("LDAP browser session: %#v, %v", principal, err) + } +} diff --git a/internal/server/automatic_publication_test.go b/internal/server/automatic_publication_test.go new file mode 100644 index 0000000..6a686de --- /dev/null +++ b/internal/server/automatic_publication_test.go @@ -0,0 +1,225 @@ +package server + +import ( + "context" + "encoding/json" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "strings" + "testing" + "time" + + "pageswiki/internal/store" +) + +func TestAutomaticPublication(t *testing.T) { + s, token, domain := configFixture(t) + ctx := context.Background() + s.mux.HandleFunc("/", s.handleHome) + s.mux.HandleFunc("/_/api/v1/city/", s.handleCityAPI) + actor, err := s.store.PrincipalForSession(domain, token) + if err != nil { + t.Fatal(err) + } + check := func(err error) { + t.Helper() + if err != nil { + t.Fatal(err) + } + } + q, err := s.store.CreateZoneAtPath(domain, actor.UUID, "quartier", "", "auto", "Auto", "", "/auto") + check(err) + street, err := s.store.CreateZoneAtPath(domain, actor.UUID, "street", q, "street", "Street", "", "/auto/street") + check(err) + spot, err := s.store.CreateSpotAtPath(domain, actor.UUID, street, "spot", "Spot", "", "/auto/street/spot") + check(err) + setAudience := func(kind, id, value string) { + t.Helper() + g, e := s.store.CityGovernance(ctx, domain, actor.UUID, kind, id) + check(e) + _, e = s.store.ChangeCityGovernance(ctx, domain, actor.UUID, kind, id, store.CityGovernanceChange{Epoch: g.Epoch, TopologyVersion: g.TopologyVersion, Policy: &value, ConfirmRelaxation: true}, false) + check(e) + } + setAudience("domain", domain, "public") + setAudience("quartier", q, "public") + change := func(kind, id, mode string) { + t.Helper() + p, e := s.store.AutoPublication(ctx, domain, actor.UUID, kind, id, nil) + check(e) + _, e = s.store.AutoPublication(ctx, domain, actor.UUID, kind, id, &store.AutoPublicationChange{Mode: mode, Version: p.Version, Epoch: p.Epoch, TopologyVersion: p.TopologyVersion, Confirm: true, ImpactToken: p.Impact.ImpactToken}) + check(e) + } + create := func(path, body string) string { + t.Helper() + id, e := s.store.CreatePageAtPathInDomain(domain, path) + check(e) + _, e = s.store.SaveRevisionContent(id, []byte(body), "", "und", "text/html", "") + check(e) + return id + } + get := func(path string) *httptest.ResponseRecorder { + t.Helper() + r := httptest.NewRequest("GET", "http://localhost"+path, nil) + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + return w + } + page := create("/auto/street/first", "

    Original public text

    ") + if w := get("/auto/street/first"); w.Code == 200 { + t.Fatal("default published") + } + preview, err := s.store.AutoPublication(ctx, domain, actor.UUID, "street", street, nil) + check(err) + _, err = s.store.AutoPublication(ctx, domain, actor.UUID, "street", street, &store.AutoPublicationChange{Mode: "automatic", Version: preview.Version, Epoch: preview.Epoch, TopologyVersion: preview.TopologyVersion, ImpactToken: preview.Impact.ImpactToken}) + if err == nil { + t.Fatal("missing confirmation") + } + create("/auto/street/stale-preview", "

    Changed impact

    ") + _, err = s.store.AutoPublication(ctx, domain, actor.UUID, "street", street, &store.AutoPublicationChange{Mode: "automatic", Version: preview.Version, Epoch: preview.Epoch, TopologyVersion: preview.TopologyVersion, Confirm: true, ImpactToken: preview.Impact.ImpactToken}) + if err == nil { + t.Fatal("stale impact accepted") + } + change("street", street, "automatic") + if err := s.store.SetConfigInDomain(domain, "authorization_mode", "legacy"); err == nil { + t.Fatal("automatic scope allowed disabling authorization") + } + if w := get("/auto/street/first"); w.Code != 200 || !strings.Contains(w.Body.String(), "Original public text") { + t.Fatal("existing", w.Code, w.Body.String()) + } + create("/auto/street/second", "

    Future public text

    ") + _, err = s.store.SaveRevisionContent(page, []byte("

    Updated public text

    "), "", "und", "text/html", "") + check(err) + for _, path := range []string{"/auto/street/first", "/auto/street/second"} { + if w := get(path); w.Code != 200 { + t.Fatal("auto head", path, w.Code, w.Body.String()) + } + } + if w := get("/auto/street/first"); !strings.Contains(w.Body.String(), "Updated public text") { + t.Fatal("stale head") + } + create("/auto/streets/not-in-scope", "PRIVATE-BOUNDARY") + if w := get("/auto/streets/not-in-scope"); w.Code == 200 { + t.Fatal("scope escaped") + } + create("/auto/street/spot/child", "

    Spot body

    ") + create("/auto/street/spot", "

    Spot portal

    ") + if w := get("/auto/street/spot"); w.Code != 200 { + t.Fatal("scope root excluded", w.Code) + } + if w := get("/auto/street/spot/child"); w.Code != 200 { + t.Fatal("inherited auto", w.Code) + } + change("spot", spot, "required") + if w := get("/auto/street/spot"); w.Code == 200 { + t.Fatal("scope root escaped manual floor") + } + if w := get("/auto/street/spot/child"); w.Code == 200 { + t.Fatal("manual child did not narrow") + } + change("spot", spot, "inherit") + if w := get("/auto/street/spot/child"); w.Code != 200 { + t.Fatal("inherit did not restore") + } + change("quartier", q, "required") + if w := get("/auto/street/first"); w.Code == 200 { + t.Fatal("superior floor ignored") + } + p, err := s.store.AutoPublication(ctx, domain, actor.UUID, "spot", spot, nil) + check(err) + if p.CanAutomatic { + t.Fatal("subordinate bypass offered") + } + change("quartier", q, "inherit") + setAudience("spot", spot, "authenticated_acl") + if w := get("/auto/street/spot/child"); w.Code == 200 { + t.Fatal("private audience leaked") + } + setAudience("spot", spot, "inherit") + acl, err := s.store.LocalityAccess(ctx, domain, actor.UUID, "spot", spot, nil) + check(err) + acl.Mode = "restricted" + acl.Entries = []store.LocalityAccessEntry{{Kind: "user", Name: actor.Username, Permission: "read_write"}} + acl, err = s.store.LocalityAccess(ctx, domain, actor.UUID, "spot", spot, &acl) + check(err) + if w := get("/auto/street/spot/child"); w.Code == 200 { + t.Fatal("restricted ACL leaked") + } + acl.Mode = "inherit" + acl.Entries = nil + _, err = s.store.LocalityAccess(ctx, domain, actor.UUID, "spot", spot, &acl) + check(err) + aliasPage := create("/auto/street/aliased", "PRIVATE-ALIAS") + _, err = s.store.DB.Exec(`INSERT INTO paths(domain_uuid,path,object_uuid,created_at,is_primary) VALUES(?,'/private-alias',?,0,0)`, domain, aliasPage) + check(err) + if w := get("/auto/street/aliased"); w.Code == 200 { + t.Fatal("aliased object published") + } + // The existing revoke action must stop inherited automatic publication too. + publish, err := s.store.LocalityPublication(ctx, domain, actor.UUID, "spot", spot, nil) + check(err) + _, err = s.store.LocalityPublication(ctx, domain, actor.UUID, "spot", spot, &store.PublicationChange{Epoch: publish.Epoch, TopologyVersion: publish.TopologyVersion, PublicationVersion: publish.PublicationVersion, Enabled: false}) + check(err) + if w := get("/auto/street/spot/child"); w.Code == 200 { + t.Fatal("revoke left automatic publication active") + } + endpoint := "/_/api/v1/city/zones/" + street + "/governance/auto-publication" + if w := get(endpoint); w.Code == 200 { + t.Fatal("anonymous policy API") + } + r := httptest.NewRequest("GET", "http://localhost"+endpoint, nil) + r.Header.Set("Authorization", "Bearer "+token) + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + var state store.AutoPublication + check(json.Unmarshal(w.Body.Bytes(), &state)) + if w.Code != 200 || state.Mode != "automatic" { + t.Fatal("API", w.Code, w.Body.String()) + } + empty, err := s.store.CreateZoneAtPath(domain, actor.UUID, "street", q, "empty", "Empty", "", "/auto/empty") + check(err) + change("street", empty, "automatic") + create("/auto/empty/new", "

    First article in empty scope

    ") + if w := get("/auto/empty/new"); w.Code != 200 { + t.Fatal("empty scope cannot auto publish", w.Code) + } + if os.Getenv("PAGESWIKI_BROWSER_TEST") == "1" { + s.mux.HandleFunc("/v/city/", s.handleCityMap) + script, e := os.ReadFile("internal/server/testdata/automatic-publication.js") + check(e) + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + if r.Header.Get("Origin") != "" { + r.Header.Set("Origin", "http://localhost") + } + if r.URL.Path == "/v/city/s/auto/empty" { + rec := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(rec, r) + for k, v := range rec.Header() { + w.Header()[k] = v + } + w.WriteHeader(rec.Code) + _, _ = w.Write([]byte(strings.Replace(rec.Body.String(), "", browserFixtureScript(rec.Header(), script)+"", 1))) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + for _, width := range []string{"1440", "390"} { + ctx, cancel := context.WithTimeout(ctx, 45*time.Second) + out, e := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", server.URL+"/v/city/s/auto/empty", t.TempDir(), "", width).CombinedOutput() + cancel() + if e != nil { + t.Fatalf("automatic publication UI %s: %v %s", width, e, out) + } + } + } + // Revoking the enabling principal also invalidates the public-navigation cache. + _, err = s.store.DB.Exec(`UPDATE domain_memberships SET state='suspended' WHERE domain_uuid=? AND principal_uuid=?`, domain, actor.UUID) + check(err) + if w := get("/auto/street/first"); w.Code == 200 { + t.Fatal("revoked enabling authority") + } +} diff --git a/internal/server/bookmark_sections.go b/internal/server/bookmark_sections.go new file mode 100644 index 0000000..7e0808c --- /dev/null +++ b/internal/server/bookmark_sections.go @@ -0,0 +1,85 @@ +package server + +import ( + "net/http" + "net/url" + "strconv" + "strings" +) + +type bookmarkSection struct { + Label string + Source string + Links []NavItem +} + +func (s *Server) bookmarkSections(r *http.Request) []bookmarkSection { + sections := []bookmarkSection{} + for i, item := range s.homeBookmarks(s.domainUUIDForRequest(r)) { + if item.Kind == "section" { + section := bookmarkSection{Label: item.Label} + if item.Children { + section.Source = "/v/bookmarks?section=" + strconv.Itoa(i) + } + sections = append(sections, section) + continue + } + if !validHomeBookmarkURL(item.Href) { + continue + } + u, _ := url.Parse(item.Href) + if u.Host == "" && !s.requestCanReadPath(r, u.Path) { + continue + } + if len(sections) == 0 { + sections = append(sections, bookmarkSection{Label: translate(s.getLocale(s.domainUUIDForRequest(r)), "home.bookmarks")}) + } + section := §ions[len(sections)-1] + if section.Source == "" { + section.Links = append(section.Links, item) + } + } + return sections +} + +// A small, keyset-paged listing: no revision bodies, stats, or preview work. +// The section index is resolved against domain config, not a caller's URL. +func (s *Server) handleBookmarkChildren(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodGet { + http.Error(w, "method not allowed", 405) + return + } + items := s.homeBookmarks(s.domainUUIDForRequest(r)) + i, err := strconv.Atoi(r.URL.Query().Get("section")) + if err != nil || i < 0 || i >= len(items) || items[i].Kind != "section" || !items[i].Children { + http.NotFound(w, r) + return + } + u, err := url.Parse(items[i].Href) + if err != nil || u.Host != "" || u.Scheme != "" || !strings.HasPrefix(u.Path, "/") || !s.requestCanReadPath(r, u.Path) { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + names, more, err := s.store.ListBookmarkChildren(r.Context(), s.domainUUIDForRequest(r), u.Path, r.URL.Query().Get("after")) + if err != nil { + http.Error(w, "could not load bookmarks", 500) + return + } + links := []NavItem{} + prefix := strings.TrimRight(u.Path, "/") + "/" + for _, name := range names { + p := prefix + name + if prefix == "/" && (name == "u" || name == "_" || name == "-") { + continue + } + if s.requestCanReadPath(r, p) { + links = append(links, NavItem{Label: name, Href: (&url.URL{Path: p}).String()}) + } + } + next := "" + if more && len(names) > 0 { + next = names[len(names)-1] + } + w.Header().Set("Cache-Control", "no-store") + writeEventJSON(w, 200, map[string]any{"links": links, "next": next}) +} diff --git a/internal/server/bookmarks.go b/internal/server/bookmarks.go new file mode 100644 index 0000000..2edebd0 --- /dev/null +++ b/internal/server/bookmarks.go @@ -0,0 +1,91 @@ +package server + +import ( + "errors" + "net/http" + "net/url" + "path" + "strings" +) + +type homeBookmark struct { + Label string `json:"label"` + Href string `json:"href"` + Kind string `json:"kind,omitempty"` + Children bool `json:"children,omitempty"` +} + +func bookmarksFromForm(r *http.Request) ([]homeBookmark, error) { + labels, targets, kinds := r.Form["bookmark_label"], r.Form["bookmark_target"], r.Form["bookmark_kind"] + if len(labels) > 64 || len(labels) != len(targets) || len(labels) != len(kinds) { + return nil, errors.New("invalid bookmark rows") + } + if children := r.Form["bookmark_children"]; len(children) != 0 && len(children) != len(labels) { + return nil, errors.New("invalid bookmark toggle rows") + } + bookmarks := []homeBookmark{} + sections := 0 + for i, label := range labels { + label, target := strings.TrimSpace(label), strings.TrimSpace(targets[i]) + if label == "" && target == "" { + continue + } + if label == "" || len(label) > 200 || len(target) > 4096 { + return nil, errors.New("invalid bookmark") + } + switch kinds[i] { + case "section": + sections++ + if sections > 16 || strings.ContainsAny(target, "?#\\\r\n") { + return nil, errors.New("invalid bookmark section") + } + children := len(r.Form["bookmark_children"]) > i && r.Form["bookmark_children"][i] == "true" + if children && target == "" { + return nil, errors.New("missing section parent path") + } + if target != "" { + target = (&url.URL{Path: path.Clean("/" + strings.TrimPrefix(target, "/"))}).String() + } + bookmarks = append(bookmarks, homeBookmark{Label: label, Href: target, Kind: "section", Children: children}) + continue + case "path": + if target == "" || strings.ContainsAny(target, "?#\\\r\n") { + return nil, errors.New("invalid bookmark path") + } + target = path.Clean("/" + strings.TrimPrefix(target, "/")) + // Store an escaped local URL so spaces, % and Unicode retain their + // literal semantic Path meaning when the link is opened. + target = (&url.URL{Path: target}).String() + case "url": + if !validHomeBookmarkURL(target) { + return nil, errors.New("invalid bookmark URL") + } + default: + return nil, errors.New("invalid bookmark kind") + } + bookmarks = append(bookmarks, homeBookmark{Label: label, Href: target, Kind: kinds[i]}) + } + return bookmarks, nil +} + +func (s *Server) managedBookmarks(domainUUID string) []homeBookmark { + items := s.homeBookmarks(domainUUID) + var out []homeBookmark + for _, item := range items { + kind := item.Kind + if kind == "" { + kind = "url" + if strings.HasPrefix(item.Href, "/") { + kind = "path" + } + } + target := item.Href + if kind == "path" || kind == "section" { + if u, err := url.Parse(target); err == nil { + target = u.Path + } + } + out = append(out, homeBookmark{Label: item.Label, Href: target, Kind: kind, Children: item.Children}) + } + return out +} diff --git a/internal/server/browser_handler.go b/internal/server/browser_handler.go index 55f8dd1..ab38716 100644 --- a/internal/server/browser_handler.go +++ b/internal/server/browser_handler.go @@ -2,9 +2,44 @@ package server import ( "net/http" + "path/filepath" "strings" + + "pageswiki/internal/store" ) +type browserEntryView struct { + store.BrowserEntry + ThumbnailURL string +} + +func (s *Server) browserEntryViews(entries []store.BrowserEntry) []browserEntryView { + views := make([]browserEntryView, 0, len(entries)) + for _, entry := range entries { + view := browserEntryView{BrowserEntry: entry} + if !entry.IsDir && entry.RevisionUUID != "" { + filename := entry.Filename + if filename == "" { + filename = filepath.Base(entry.Path) + } + adapter := selectProjectionAdapter(contentDescriptor{ + MediaType: strings.ToLower(strings.Split(entry.ContentType, ";")[0]), + Filename: filename, + SizeBytes: int64(entry.Size), + }) + if adapter.ID == "image" { + if cachedURL, cached := s.entryPreviewState(entry, "image", false); cached { + view.ThumbnailURL = cachedURL + } else { + view.ThumbnailURL = rawProjectionURL("rev:"+entry.RevisionUUID) + "?preview=1" + } + } + } + views = append(views, view) + } + return views +} + func (s *Server) handleBrowser( w http.ResponseWriter, r *http.Request, @@ -25,7 +60,8 @@ func (s *Server) handleBrowser( } entries, err := - s.store.ListBrowserEntries( + s.store.ListBrowserEntriesInDomain( + s.domainUUIDForRequest(r), currentPath, ) @@ -33,20 +69,40 @@ func (s *Server) handleBrowser( http.Error(w, err.Error(), 500) return } + visibleEntries := entries[:0] + for _, entry := range entries { + if s.requestCanReadPath(r, entry.Path) { + visibleEntries = append(visibleEntries, entry) + } + } + entries = visibleEntries + var navigatorLinks []store.BrowserNavigationLink + if principal := s.requestPrincipal(r); principal != nil { + if links, linkErr := s.store.ListBrowserNavigationLinks(s.domainUUIDForRequest(r), principal.UUID); linkErr == nil { + for _, link := range links { + if s.requestCanReadPath(r, link.Path) { + navigatorLinks = append(navigatorLinks, link) + } + } + } + } - s.render( + s.renderWithContext( w, + r, "browser.gohtml", map[string]any{ "NavItems": resolveNavItems( - s.getSystemNavItems(), + s.getSystemNavItems(s.domainUUIDForRequest(r)), NavContext{ Path: currentPath, }, ), - "Path": currentPath, - "Breadcrumbs": buildBreadcrumbs(currentPath), - "Entries": entries, + "Path": currentPath, + "Breadcrumbs": buildBreadcrumbs(currentPath), + "Entries": s.browserEntryViews(entries), + "NavigatorLinks": navigatorLinks, + "CanEditNavigator": s.requestPrincipal(r) != nil, }, ) } diff --git a/internal/server/browser_navigation_api.go b/internal/server/browser_navigation_api.go new file mode 100644 index 0000000..7eda2e6 --- /dev/null +++ b/internal/server/browser_navigation_api.go @@ -0,0 +1,108 @@ +package server + +import ( + "database/sql" + "encoding/json" + "errors" + "net/http" + "strings" + + "pageswiki/internal/store" +) + +type browserNavigationInput struct { + UUID string `json:"uuid"` + Label string `json:"label"` + Path string `json:"path"` + IsDir bool `json:"is_directory"` +} + +func (s *Server) handleBrowserNavigationAPI(w http.ResponseWriter, r *http.Request) { + domainUUID := s.domainUUIDForRequest(r) + principal := s.requestPrincipal(r) + if principal == nil || principal.State != "active" { + http.Error(w, "authentication required", http.StatusUnauthorized) + return + } + w.Header().Set("Cache-Control", "private, no-store") + w.Header().Set("Content-Type", "application/json") + + switch r.Method { + case http.MethodGet: + links, err := s.store.ListBrowserNavigationLinks(domainUUID, principal.UUID) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + visible := links[:0] + for _, link := range links { + if s.requestCanReadPath(r, link.Path) { + visible = append(visible, link) + } + } + _ = json.NewEncoder(w).Encode(map[string]any{"links": visible}) + case http.MethodPost: + var input browserNavigationInput + if !decodeBrowserNavigationInput(w, r, &input) { + return + } + input.Path = normalizeAuthorizationPath(input.Path) + if input.Path == "" || input.Path == "/" || !s.requestCanReadPath(r, input.Path) { + http.Error(w, "invalid or forbidden path", http.StatusForbidden) + return + } + link, err := s.store.AddBrowserNavigationLink(domainUUID, principal.UUID, input.Label, input.Path, input.IsDir) + if err != nil { + status := http.StatusBadRequest + if errors.Is(err, store.ErrBrowserNavigationLimit) { + status = http.StatusConflict + } + http.Error(w, err.Error(), status) + return + } + w.WriteHeader(http.StatusCreated) + _ = json.NewEncoder(w).Encode(link) + case http.MethodPatch: + var input browserNavigationInput + if !decodeBrowserNavigationInput(w, r, &input) { + return + } + if err := s.store.RenameBrowserNavigationLink(domainUUID, principal.UUID, strings.TrimSpace(input.UUID), input.Label); err != nil { + writeBrowserNavigationError(w, err) + return + } + _ = json.NewEncoder(w).Encode(map[string]bool{"ok": true}) + case http.MethodDelete: + var input browserNavigationInput + if !decodeBrowserNavigationInput(w, r, &input) { + return + } + if err := s.store.DeleteBrowserNavigationLink(domainUUID, principal.UUID, strings.TrimSpace(input.UUID)); err != nil { + writeBrowserNavigationError(w, err) + return + } + _ = json.NewEncoder(w).Encode(map[string]bool{"ok": true}) + default: + w.Header().Set("Allow", "GET, POST, PATCH, DELETE") + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + } +} + +func decodeBrowserNavigationInput(w http.ResponseWriter, r *http.Request, input *browserNavigationInput) bool { + r.Body = http.MaxBytesReader(w, r.Body, 16<<10) + decoder := json.NewDecoder(r.Body) + decoder.DisallowUnknownFields() + if err := decoder.Decode(input); err != nil { + http.Error(w, "invalid request", http.StatusBadRequest) + return false + } + return true +} + +func writeBrowserNavigationError(w http.ResponseWriter, err error) { + if errors.Is(err, sql.ErrNoRows) { + http.Error(w, "navigator link not found", http.StatusNotFound) + return + } + http.Error(w, err.Error(), http.StatusBadRequest) +} diff --git a/internal/server/browser_navigation_test.go b/internal/server/browser_navigation_test.go new file mode 100644 index 0000000..30f933e --- /dev/null +++ b/internal/server/browser_navigation_test.go @@ -0,0 +1,125 @@ +package server + +import ( + "bytes" + "context" + "encoding/json" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "strings" + "testing" + "time" +) + +func browserNavigationRequest(s *Server, token, method string, body any) *httptest.ResponseRecorder { + var encoded bytes.Buffer + if body != nil { + _ = json.NewEncoder(&encoded).Encode(body) + } + request := httptest.NewRequest(method, "http://localhost/_/api/v1/browser/navigation", &encoded) + request.Header.Set("Authorization", "Bearer "+token) + request.Header.Set("Content-Type", "application/json") + response := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(response, request) + return response +} + +func TestBrowserMarqueeAndNavigatorDragChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + s, token, domain := configFixture(t) + s.mux.HandleFunc("/_/api/v1/browser/navigation", s.handleBrowserNavigationAPI) + s.mux.HandleFunc("/v/browser/", s.handleBrowser) + for _, path := range []string{"/drag/alpha", "/drag/beta"} { + if _, err := s.store.CreatePageAtPathInDomain(domain, path); err != nil { + t.Fatal(err) + } + } + testScript := `` + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + if strings.HasPrefix(r.URL.Path, "/static/") { + s.mux.ServeHTTP(w, r) + return + } + if r.URL.Path == "/v/browser/drag" { + recorded := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(recorded, r) + for key, values := range recorded.Header() { + w.Header()[key] = values + } + w.WriteHeader(recorded.Code) + _, _ = w.Write([]byte(strings.Replace(recorded.Body.String(), "", testScript+"", 1))) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + defer cancel() + command := exec.CommandContext(ctx, "chromium", "--headless", "--no-sandbox", "--disable-gpu", "--disable-background-networking", "--no-proxy-server", "--user-data-dir="+t.TempDir(), "--dump-dom", "--virtual-time-budget=3000", server.URL+"/v/browser/drag") + output, err := command.CombinedOutput() + if body := string(output); err != nil || !strings.Contains(body, `data-browser-interactions="ready"`) { + t.Fatalf("browser interactions: err=%v body=%s", err, body) + } +} + +func TestBrowserNavigatorAPIAndUI(t *testing.T) { + s, token, domain := configFixture(t) + s.mux.HandleFunc("/_/api/v1/browser/navigation", s.handleBrowserNavigationAPI) + s.mux.HandleFunc("/v/browser/", s.handleBrowser) + if _, err := s.store.CreatePageAtPathInDomain(domain, "/docs/page"); err != nil { + t.Fatal(err) + } + + response := browserNavigationRequest(s, token, http.MethodPost, browserNavigationInput{Label: "Docs", Path: "/docs", IsDir: true}) + if response.Code != http.StatusCreated { + t.Fatalf("add navigator link: %d %s", response.Code, response.Body.String()) + } + var link struct { + UUID string `json:"uuid"` + } + if err := json.Unmarshal(response.Body.Bytes(), &link); err != nil || link.UUID == "" { + t.Fatalf("add response: %#v %v", link, err) + } + response = browserNavigationRequest(s, token, http.MethodPatch, browserNavigationInput{UUID: link.UUID, Label: "Documents"}) + if response.Code != http.StatusOK { + t.Fatalf("rename navigator link: %d %s", response.Code, response.Body.String()) + } + + page := configRequest(s, token, http.MethodGet, "/v/browser/", nil) + body := page.Body.String() + for _, expected := range []string{ + `data-navigation-id="` + link.UUID + `"`, + `href="/v/browser/docs"`, + `>Documents`, + `/static/js/browser-interactions.js?v=1`, + `id="selection-marquee"`, + `id="browser-operation-stack"`, + } { + if page.Code != http.StatusOK || !strings.Contains(body, expected) { + t.Fatalf("browser UI missing %q: status=%d body=%s", expected, page.Code, body) + } + } + + response = browserNavigationRequest(s, token, http.MethodDelete, browserNavigationInput{UUID: link.UUID}) + if response.Code != http.StatusOK { + t.Fatalf("delete navigator link: %d %s", response.Code, response.Body.String()) + } +} diff --git a/internal/server/browser_thumbnail_test.go b/internal/server/browser_thumbnail_test.go new file mode 100644 index 0000000..190d34f --- /dev/null +++ b/internal/server/browser_thumbnail_test.go @@ -0,0 +1,99 @@ +package server + +import ( + "context" + "encoding/base64" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "path/filepath" + "strings" + "testing" + "time" +) + +const browserThumbnailPNG = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=" + +func TestBrowserImageThumbnailUsesLazyImmutableRevision(t *testing.T) { + s, token, domain := configFixture(t) + s.mux.HandleFunc("/v/browser/", s.handleBrowser) + s.mux.HandleFunc("/v/raw/", s.handleRawView) + object, err := s.store.CreatePageAtPathInDomain(domain, "/pictures/sample.png") + if err != nil { + t.Fatal(err) + } + png, err := base64.StdEncoding.DecodeString(browserThumbnailPNG) + if err != nil { + t.Fatal(err) + } + revision, err := s.store.SaveRevisionContent(object, png, "test", "und", "image/png", "sample.png") + if err != nil { + t.Fatal(err) + } + s.previewRoot = t.TempDir() + + w := configRequest(s, token, http.MethodGet, "/v/browser/pictures", nil) + body := w.Body.String() + want := `data-preview-src="/v/raw/rev:` + revision.UUID + `?preview=1"` + if w.Code != http.StatusOK || !strings.Contains(body, want) || + !strings.Contains(body, `class="browser-thumbnail children-preview children-preview-pending"`) || + !strings.Contains(body, `/static/js/browser-thumbnails.js?v=1`) { + t.Fatalf("browser thumbnail: status=%d want=%q body=%s", w.Code, want, body) + } + raw := configRequest(s, token, http.MethodGet, "/v/raw/rev:"+revision.UUID+"?preview=1", nil) + if raw.Code != http.StatusOK || raw.Header().Get("Content-Type") != "image/png" { + t.Fatalf("thumbnail source: status=%d type=%q body=%s", raw.Code, raw.Header().Get("Content-Type"), raw.Body.String()) + } + + if err = os.WriteFile(filepath.Join(s.previewRoot, revision.DocumentHash+".jpg"), []byte("cached thumbnail"), 0o644); err != nil { + t.Fatal(err) + } + w = configRequest(s, token, http.MethodGet, "/v/browser/pictures", nil) + if cached := `/v/preview-cache/` + revision.DocumentHash + `.jpg`; w.Code != http.StatusOK || !strings.Contains(w.Body.String(), `data-preview-src="`+cached+`"`) { + t.Fatalf("cached browser thumbnail: status=%d cache=%q body=%s", w.Code, cached, w.Body.String()) + } +} + +func TestBrowserImageThumbnailChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + s, token, domain := configFixture(t) + s.mux.HandleFunc("/v/browser/", s.handleBrowser) + s.mux.HandleFunc("/v/raw/", s.handleRawView) + object, err := s.store.CreatePageAtPathInDomain(domain, "/pictures/browser.png") + if err != nil { + t.Fatal(err) + } + png, err := base64.StdEncoding.DecodeString(browserThumbnailPNG) + if err != nil { + t.Fatal(err) + } + revision, err := s.store.SaveRevisionContent(object, png, "test", "und", "image/png", "browser.png") + if err != nil { + t.Fatal(err) + } + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + if strings.HasPrefix(r.URL.Path, "/static/") { + s.mux.ServeHTTP(w, r) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + defer cancel() + cmd := exec.CommandContext(ctx, "chromium", "--headless", "--no-sandbox", "--disable-gpu", "--disable-background-networking", "--no-proxy-server", "--user-data-dir="+t.TempDir(), "--dump-dom", "--virtual-time-budget=3000", server.URL+"/v/browser/pictures") + out, err := cmd.CombinedOutput() + body := string(out) + scriptReady := strings.Contains(body, `data-browser-thumbnails="ready"`) + previewLoaded := strings.Contains(body, `data-preview-loaded="true"`) + sourceLoaded := strings.Contains(body, `src="/v/raw/rev:`+revision.UUID+`?preview=1"`) + if err != nil || !scriptReady || !previewLoaded || !sourceLoaded { + t.Fatalf("chromium thumbnail: err=%v script=%t preview=%t source=%t", err, scriptReady, previewLoaded, sourceLoaded) + } +} diff --git a/internal/server/calendar_caldav_source.go b/internal/server/calendar_caldav_source.go new file mode 100644 index 0000000..049d29a --- /dev/null +++ b/internal/server/calendar_caldav_source.go @@ -0,0 +1,215 @@ +package server + +import ( + "bytes" + "context" + "encoding/xml" + "errors" + "io" + "net/http" + "net/url" + "pageswiki/internal/calendar" + "path" + "strings" + "time" +) + +type calendarAuthTransport struct { + base http.RoundTripper + origin, user, password string +} + +func (t calendarAuthTransport) RoundTrip(r *http.Request) (*http.Response, error) { + origin, e := url.Parse(t.origin) + if e != nil || !strings.EqualFold(origin.Host, r.URL.Host) || origin.Scheme != r.URL.Scheme { + return nil, errors.New("calendar credential origin mismatch") + } + clone := r.Clone(r.Context()) + clone.SetBasicAuth(t.user, t.password) + return t.base.RoundTrip(clone) +} + +type remoteCalendarObject struct{ href, etag, data string } + +func remoteCalendarReport(ctx context.Context, client *http.Client, address, body string) ([]remoteCalendarObject, error) { + req, e := http.NewRequestWithContext(ctx, "REPORT", address, strings.NewReader(body)) + if e != nil { + return nil, errors.New("invalid CalDAV URL") + } + req.Header.Set("Content-Type", "application/xml; charset=utf-8") + req.Header.Set("Depth", "1") + response, e := client.Do(req) + if e != nil { + return nil, calendarSourceRequestError(e) + } + defer response.Body.Close() + if response.StatusCode != 207 { + return nil, errors.New("external CalDAV REPORT returned " + http.StatusText(response.StatusCode)) + } + b, e := io.ReadAll(io.LimitReader(response.Body, calendar.MaxFeed+1)) + if e != nil || len(b) > calendar.MaxFeed { + return nil, calendar.ErrLimit + } + dec := xml.NewDecoder(bytes.NewReader(b)) + depth, count := 0, 0 + for { + token, e := dec.Token() + if e == io.EOF { + break + } + if e != nil { + return nil, errors.New("invalid CalDAV XML") + } + switch token.(type) { + case xml.Directive: + return nil, errors.New("CalDAV DTD rejected") + case xml.StartElement: + depth++ + count++ + if depth > 16 || count > 100000 { + return nil, calendar.ErrLimit + } + case xml.EndElement: + depth-- + } + } + var root davNode + if xml.Unmarshal(b, &root) != nil || root.XMLName.Space != davNS || root.XMLName.Local != "multistatus" { + return nil, errors.New("invalid CalDAV multistatus") + } + origin, _ := url.Parse(address) + prefix := strings.TrimSuffix(path.Clean(origin.Path), "/") + "/" + seen := map[string]bool{} + out := []remoteCalendarObject{} + for _, row := range root.Children { + if row.XMLName.Space != davNS || row.XMLName.Local != "response" { + return nil, errors.New("unsupported CalDAV report response") + } + href := row.child(davNS, "href") + if href == nil { + return nil, errors.New("CalDAV href missing") + } + u, e := url.Parse(strings.TrimSpace(href.Text)) + if e != nil { + return nil, errors.New("invalid CalDAV href") + } + u = origin.ResolveReference(u) + if !strings.EqualFold(u.Host, origin.Host) || u.Scheme != origin.Scheme || u.User != nil || u.RawQuery != "" || u.Fragment != "" || !strings.HasPrefix(path.Clean(u.Path), prefix) { + return nil, errors.New("CalDAV href outside collection") + } + key := u.EscapedPath() + if seen[key] { + return nil, errors.New("duplicate CalDAV href") + } + seen[key] = true + item := remoteCalendarObject{href: key} + for _, ps := range row.Children { + if ps.XMLName.Space == davNS && ps.XMLName.Local == "status" { + return nil, errors.New("incomplete CalDAV report") + } + if ps.XMLName.Space != davNS || ps.XMLName.Local != "propstat" { + continue + } + status := ps.child(davNS, "status") + props := ps.child(davNS, "prop") + if status == nil || props == nil || !strings.Contains(status.Text, " 200 ") { + return nil, errors.New("CalDAV property unavailable") + } + if tag := props.child(davNS, "getetag"); tag != nil { + item.etag = tag.Text + } + if data := props.child(calNS, "calendar-data"); data != nil { + item.data = data.Text + } + } + if item.etag == "" { + return nil, errors.New("CalDAV ETag missing") + } + out = append(out, item) + if len(out) > 5000 { + return nil, calendar.ErrLimit + } + } + return out, nil +} + +// Materialize a bounded read-only window: 90 days back, 275 days forward. +// REPORT fetches validators; calendar-multiget retrieves only changed resources. +func fetchCalDAVSource(ctx context.Context, client *http.Client, repo *calendar.Repository, domain string, c calendar.Calendar) ([]calendar.Event, map[string]calendar.RemoteResource, error) { + start := time.Now().UTC().Truncate(24*time.Hour).AddDate(0, 0, -90) + end := start.AddDate(0, 0, 365) + query := `` + rows, e := remoteCalendarReport(ctx, client, c.Source.URL, query) + if e != nil { + return nil, nil, e + } + result := []calendar.Event{} + resources := map[string]calendar.RemoteResource{} + missing := []remoteCalendarObject{} + uids := map[string]bool{} + totalBytes := 0 + add := func(row remoteCalendarObject, event calendar.Event) error { + totalBytes += len(event.Data) + if totalBytes > calendar.MaxFeed { + return calendar.ErrLimit + } + if uids[event.UID] { + return errors.New("CalDAV contains duplicate UID or recurrence exceptions") + } + uids[event.UID] = true + result = append(result, event) + resources[row.href] = calendar.RemoteResource{UID: event.UID, ETag: row.etag} + return nil + } + for _, row := range rows { + old, ok := c.Source.Resources[row.href] + if ok && old.ETag == row.etag { + event, e := repo.Event(ctx, domain, c.ID, c.Owner, old.UID) + if e == nil { + if e = add(row, event); e != nil { + return nil, nil, e + } + continue + } + if !errors.Is(e, calendar.ErrMissing) { + return nil, nil, e + } + } + missing = append(missing, row) + } + for offset := 0; offset < len(missing); offset += 100 { + limit := offset + 100 + if limit > len(missing) { + limit = len(missing) + } + wanted := map[string]string{} + var body strings.Builder + body.WriteString(``) + for _, row := range missing[offset:limit] { + wanted[row.href] = row.etag + body.WriteString("" + xmlText(row.href) + "") + } + body.WriteString("") + batch, e := remoteCalendarReport(ctx, client, c.Source.URL, body.String()) + if e != nil { + return nil, nil, e + } + if len(batch) != len(wanted) { + return nil, nil, errors.New("incomplete CalDAV multiget") + } + for _, row := range batch { + tag, ok := wanted[row.href] + if !ok || tag != row.etag { + return nil, nil, errors.New("CalDAV changed during synchronization; retry required") + } + event, e := calendar.Parse(row.data) + if e != nil { + return nil, nil, e + } + if e = add(row, event); e != nil { + return nil, nil, e + } + } + } + return result, resources, nil +} diff --git a/internal/server/calendar_dav.go b/internal/server/calendar_dav.go new file mode 100644 index 0000000..b057254 --- /dev/null +++ b/internal/server/calendar_dav.go @@ -0,0 +1,489 @@ +package server + +import ( + "bytes" + "context" + "encoding/xml" + "fmt" + "io" + "net/http" + "net/url" + "strings" + "time" + + "pageswiki/internal/calendar" +) + +const davNS = "DAV:" +const calNS = "urn:ietf:params:xml:ns:caldav" + +type davNode struct { + XMLName xml.Name + Attrs []xml.Attr `xml:",any,attr"` + Text string `xml:",chardata"` + Children []davNode `xml:",any"` +} + +func (n davNode) child(ns, name string) *davNode { + for i := range n.Children { + if n.Children[i].XMLName.Space == ns && n.Children[i].XMLName.Local == name { + return &n.Children[i] + } + } + return nil +} +func (n davNode) attr(name string) string { + for _, a := range n.Attrs { + if a.Name.Space == "" && a.Name.Local == name { + return a.Value + } + } + return "" +} +func readDAV(w http.ResponseWriter, r *http.Request) (davNode, error) { + b, e := io.ReadAll(http.MaxBytesReader(w, r.Body, 64<<10)) + if e != nil { + return davNode{}, e + } + if len(bytes.TrimSpace(b)) == 0 { + return davNode{}, nil + } + // Reject DTDs and cap nesting before recursive decoding. + d := xml.NewDecoder(bytes.NewReader(b)) + depth, count := 0, 0 + for { + t, e := d.Token() + if e == io.EOF { + break + } + if e != nil { + return davNode{}, e + } + switch t.(type) { + case xml.Directive: + return davNode{}, fmt.Errorf("DTD not allowed") + case xml.StartElement: + depth++ + count++ + if depth > 12 || count > 1000 { + return davNode{}, fmt.Errorf("XML complexity limit") + } + case xml.EndElement: + depth-- + } + } + var n davNode + e = xml.Unmarshal(b, &n) + return n, e +} +func xmlText(s string) string { var b bytes.Buffer; xml.EscapeText(&b, []byte(s)); return b.String() } + +type davResponse struct { + href string + props map[xml.Name]string + status int +} + +func davProperty(ns, key, value string) (xml.Name, string) { + return xml.Name{Space: ns, Local: key}, value +} +func writeDAV(w http.ResponseWriter, rows []davResponse, requested []davNode) { + var b strings.Builder + b.WriteString(``) + for _, row := range rows { + b.WriteString("" + xmlText(row.href) + "") + if row.status != 0 { + fmt.Fprintf(&b, "HTTP/1.1 %d %s", row.status, http.StatusText(row.status)) + } else { + present, missing := strings.Builder{}, strings.Builder{} + props := requested + if len(props) == 0 { + for n := range row.props { + props = append(props, davNode{XMLName: n}) + } + } + for _, prop := range props { + name := prop.XMLName + value, ok := row.props[name] + tag := "p:" + name.Local + piece := "<" + tag + " xmlns:p=\"" + xmlText(name.Space) + "\">" + value + "" + if ok { + present.WriteString(piece) + } else { + missing.WriteString(piece) + } + } + if present.Len() > 0 { + b.WriteString("" + present.String() + "HTTP/1.1 200 OK") + } + if missing.Len() > 0 { + b.WriteString("" + missing.String() + "HTTP/1.1 404 Not Found") + } + } + b.WriteString("") + } + b.WriteString("") + w.Header().Set("Content-Type", "application/xml; charset=utf-8") + w.WriteHeader(207) + io.WriteString(w, b.String()) +} +func eventDAVRow(c calendar.Calendar, e calendar.Event) davResponse { + return davResponse{href: calendarDAV + c.ID + "/" + calendar.DAVFilename(c, e.UID), props: map[xml.Name]string{{Space: davNS, Local: "getetag"}: xmlText(e.ETag), {Space: davNS, Local: "getcontenttype"}: "text/calendar; charset=utf-8", {Space: davNS, Local: "resourcetype"}: "", {Space: calNS, Local: "calendar-data"}: xmlText(e.Data)}} +} +func calendarDAVRow(c calendar.Calendar) davResponse { + return davResponse{href: calendarDAV + c.ID + "/", props: map[xml.Name]string{ + {Space: davNS, Local: "displayname"}: xmlText(c.PrettyName), {Space: davNS, Local: "resourcetype"}: "", + {Space: calNS, Local: "supported-calendar-component-set"}: ``, + {Space: calNS, Local: "supported-calendar-data"}: ``, + {Space: davNS, Local: "supported-report-set"}: ``, + }} +} +func (s *Server) handleCalendarDAV(w http.ResponseWriter, r *http.Request) { + ctx, cancel := context.WithTimeout(r.Context(), 20*time.Second) + defer cancel() + r = r.WithContext(ctx) + w.Header().Set("Cache-Control", "private, no-store") + if strings.TrimSuffix(r.URL.Path, "/") == strings.TrimSuffix(calendarDAV, "/") { + s.handleDAVHome(w, r) + return + } + if r.Method == "MKCALENDAR" { + s.handleTaskMKCalendar(w, r) + return + } + segment := strings.Split(strings.TrimPrefix(r.URL.Path, calendarDAV), "/")[0] + if found, err := s.store.IsTaskDAVCollection(r.Context(), s.domainUUIDForRequest(r), segment); err != nil { + taskError(w, err) + return + } else if found { + s.handleTaskDAVAt(w, r, segment) + return + } + repo, ok := s.calendarReady(w, r) + if !ok { + return + } + domain := s.domainUUIDForRequest(r) + actor, active, _, credential, authenticated := s.davActor(w, r, "calendar", true) + if !authenticated { + return + } + parts := strings.Split(strings.Trim(strings.TrimPrefix(r.URL.Path, calendarDAV), "/"), "/") + root := len(parts) == 1 && parts[0] == "" + s.setDAVCapabilities(w, r, actor, credential) + w.Header().Set("Allow", "OPTIONS, PROPFIND, REPORT, GET, HEAD, PUT, DELETE") + if r.Method == "OPTIONS" { + w.WriteHeader(204) + return + } + var c calendar.Calendar + if !root { + var e error + c, e = repo.Get(domain, parts[0], actor) + if e != nil { + calendarError(w, e) + return + } + } + if len(parts) > 2 { + http.NotFound(w, r) + return + } + if r.Method == "PROPFIND" { + depth := r.Header.Get("Depth") + if depth != "0" && depth != "1" { + http.Error(w, "Depth 0 or 1 required", 403) + return + } + n, e := readDAV(w, r) + if e != nil { + http.Error(w, "invalid XML", 400) + return + } + if n.XMLName.Local != "" && (n.XMLName.Local != "propfind" || n.XMLName.Space != davNS) { + http.Error(w, "invalid PROPFIND", 400) + return + } + var req []davNode + if p := n.child(davNS, "prop"); p != nil { + req = p.Children + } + rows := []davResponse{} + if root { + rows = append(rows, davResponse{href: calendarDAV, props: map[xml.Name]string{{Space: davNS, Local: "resourcetype"}: "", {Space: davNS, Local: "displayname"}: "PagesWiki calendars", {Space: calNS, Local: "calendar-home-set"}: "" + calendarDAV + ""}}) + if depth == "1" { + cs, e := repo.List(domain, actor) + if e != nil { + calendarError(w, e) + return + } + for _, v := range cs { + rows = append(rows, calendarDAVRow(v)) + } + } + } else if len(parts) == 1 { + row := calendarDAVRow(c) + row.props[xml.Name{Space: davNS, Local: "current-user-privilege-set"}] = davPrivileges(active && c.CanWrite(actor)) + rows = append(rows, row) + if depth == "1" { + var items []calendar.Event + withData := false + for _, p := range req { + if !taskDAVFullProperty(p) { + http.Error(w, "unsupported property projection", 403) + return + } + if p.XMLName == (xml.Name{Space: calNS, Local: "calendar-data"}) { + withData = true + } + } + c, items, e = repo.DAVSnapshot(r.Context(), domain, c.ID, actor, withData) + if e != nil { + calendarError(w, e) + return + } + for _, item := range items { + rows = append(rows, eventDAVRow(c, item)) + } + } + } else { + uid, e := calendar.DAVUID(c, parts[1]) + if e != nil { + calendarError(w, e) + return + } + v, e := repo.Event(r.Context(), domain, c.ID, actor, uid) + if e != nil { + calendarError(w, e) + return + } + row := eventDAVRow(c, v) + row.href = r.URL.Path + rows = append(rows, row) + } + writeDAV(w, rows, req) + return + } + if root { + w.WriteHeader(405) + return + } + if r.Method == "REPORT" && len(parts) == 1 { + n, e := readDAV(w, r) + if e != nil { + http.Error(w, "invalid XML", 400) + return + } + if n.XMLName.Space != calNS { + http.Error(w, "unsupported report", 405) + return + } + seen := map[string]int{} + for _, child := range n.Children { + key := child.XMLName.Space + "|" + child.XMLName.Local + seen[key]++ + allowed := child.XMLName.Space == davNS && child.XMLName.Local == "prop" || n.XMLName.Local == "calendar-query" && child.XMLName.Space == calNS && child.XMLName.Local == "filter" || n.XMLName.Local == "calendar-multiget" && child.XMLName.Space == davNS && child.XMLName.Local == "href" + if !allowed || child.XMLName.Local != "href" && seen[key] > 1 { + http.Error(w, "unsupported report element", 403) + return + } + } + p := n.child(davNS, "prop") + if p == nil || len(p.Children) == 0 { + http.Error(w, "explicit properties required", 400) + return + } + for _, prop := range p.Children { + if !taskDAVFullProperty(prop) { + http.Error(w, "calendar-data projection/expansion unsupported", 403) + return + } + } + rows := []davResponse{} + switch n.XMLName.Local { + case "calendar-query": + filter := n.child(calNS, "filter") + if filter == nil || len(filter.Children) != 1 { + http.Error(w, "time-range filter required", 403) + return + } + outer := filter.Children[0] + if outer.XMLName.Space != calNS || outer.XMLName.Local != "comp-filter" || outer.attr("name") != "VCALENDAR" || len(outer.Children) > 1 || taskDAVAttrCount(outer) != 1 || taskDAVAttrCount(*filter) != 0 { + http.Error(w, "unsupported filter", 403) + return + } + inner := davNode{XMLName: xml.Name{Space: calNS, Local: "comp-filter"}} + if len(outer.Children) == 1 { + inner = outer.Children[0] + } + if len(outer.Children) == 1 && (inner.XMLName.Space != calNS || inner.XMLName.Local != "comp-filter" || inner.attr("name") != "VEVENT" || len(inner.Children) > 1 || taskDAVAttrCount(inner) != 1) { + http.Error(w, "unsupported filter", 403) + return + } + if len(inner.Children) == 0 { + withData := false + for _, prop := range p.Children { + if prop.XMLName == (xml.Name{Space: calNS, Local: "calendar-data"}) { + withData = true + } + } + var items []calendar.Event + c, items, e = repo.DAVSnapshot(r.Context(), domain, c.ID, actor, withData) + if e != nil { + calendarError(w, e) + return + } + for _, item := range items { + rows = append(rows, eventDAVRow(c, item)) + } + break + } + tr := inner.Children[0] + if tr.XMLName.Space != calNS || tr.XMLName.Local != "time-range" || len(tr.Children) != 0 || taskDAVAttrCount(tr) != 2 { + http.Error(w, "unsupported filter", 403) + return + } + start, e1 := time.Parse("20060102T150405Z", tr.attr("start")) + end, e2 := time.Parse("20060102T150405Z", tr.attr("end")) + if e1 != nil || e2 != nil { + http.Error(w, "UTC start and end required", 400) + return + } + query := repo.QueryETags + for _, prop := range p.Children { + if prop.XMLName.Space == calNS && prop.XMLName.Local == "calendar-data" { + query = repo.Query + } + } + events, e := query(r.Context(), domain, c.ID, actor, start, end) + if e != nil { + calendarError(w, e) + return + } + for _, event := range events { + rows = append(rows, eventDAVRow(c, event)) + } + case "calendar-multiget": + count := 0 + for _, node := range n.Children { + if node.XMLName.Space != davNS || node.XMLName.Local != "href" { + continue + } + count++ + if count > 200 { + http.Error(w, "too many hrefs", 413) + return + } + u, e := url.Parse(strings.TrimSpace(node.Text)) + prefix := calendarDAV + c.ID + "/" + if e != nil || u.IsAbs() || u.RawQuery != "" || u.Fragment != "" || !strings.HasPrefix(u.Path, prefix) { + http.Error(w, "foreign href", 400) + return + } + uid, e := calendar.DAVUID(c, strings.TrimPrefix(u.Path, prefix)) + if e != nil { + http.Error(w, "invalid href", 400) + return + } + v, e := repo.Event(r.Context(), domain, c.ID, actor, uid) + if e == calendar.ErrMissing { + rows = append(rows, davResponse{href: u.Path, status: 404}) + continue + } + if e != nil { + calendarError(w, e) + return + } + row := eventDAVRow(c, v) + row.href = u.Path + rows = append(rows, row) + } + default: + http.Error(w, "unsupported report", 403) + return + } + writeDAV(w, rows, p.Children) + return + } + if len(parts) != 2 { + w.WriteHeader(405) + return + } + uid, e := calendar.DAVUID(c, parts[1]) + if e != nil && r.Method != "PUT" { + calendarError(w, e) + return + } + switch r.Method { + case "GET", "HEAD": + v, e := repo.Event(r.Context(), domain, c.ID, actor, uid) + if e != nil { + calendarError(w, e) + return + } + w.Header().Set("ETag", v.ETag) + w.Header().Set("Content-Type", "text/calendar; charset=utf-8") + if r.Header.Get("If-None-Match") == v.ETag { + w.WriteHeader(304) + return + } + if r.Method == "GET" { + io.WriteString(w, v.Data) + } + case "PUT", "DELETE": + if !active { + calendarError(w, calendar.ErrForbidden) + return + } + match := r.Header.Get("If-Match") + if match == "" && r.Header.Get("If-None-Match") == "*" && r.Method == "PUT" { + match = "*" + } + if match == "" && r.Method != "PUT" { + http.Error(w, "If-Match or If-None-Match: * required", 428) + return + } + var event *calendar.Event + unchangedRepresentation := false + if r.Method == "PUT" { + if !strings.HasPrefix(strings.ToLower(r.Header.Get("Content-Type")), "text/calendar") { + http.Error(w, "text/calendar required", 415) + return + } + data, e := io.ReadAll(http.MaxBytesReader(w, r.Body, calendar.MaxResource)) + if e != nil { + http.Error(w, "resource too large", 413) + return + } + v, e := calendar.Parse(string(data)) + if e != nil { + calendarError(w, e) + return + } + event = &v + unchangedRepresentation = string(data) == v.Data + } + var authorize func() error + if credential != "" { + authorize = func() error { + return s.store.CheckDAVCredential(r.Context(), domain, actor, credential, true, "calendar") + } + } + v, created, e := repo.ChangeDAV(r.Context(), domain, c.ID, actor, parts[1], match, event, authorize) + if e != nil { + calendarError(w, e) + return + } + if event != nil && unchangedRepresentation { + w.Header().Set("ETag", v.ETag) + } + if created { + w.Header().Set("Location", r.URL.Path) + w.WriteHeader(201) + } else { + w.WriteHeader(204) + } + default: + w.WriteHeader(405) + } +} diff --git a/internal/server/calendar_handler.go b/internal/server/calendar_handler.go new file mode 100644 index 0000000..658296c --- /dev/null +++ b/internal/server/calendar_handler.go @@ -0,0 +1,484 @@ +package server + +import ( + "encoding/base64" + "encoding/json" + "errors" + "net/http" + "path/filepath" + "strings" + "time" + + "github.com/google/uuid" + "pageswiki/internal/calendar" +) + +const calendarAPI = "/_/api/v1/extension/organizer.calendar/" +const calendarDAV = "/_/api/v1/caldav/" +const davCredentialsAPI = "/_/api/v1/caldav-credentials" + +func calendarRoute(path string) bool { + return path == "/v/plan" || strings.HasPrefix(path, "/v/plan/") || strings.HasPrefix(path, "/v/event/") || path == "/v/calendar" || strings.HasPrefix(path, calendarAPI) || strings.HasPrefix(path, calendarDAV) || path == strings.TrimSuffix(calendarDAV, "/") || path == davCredentialsAPI || strings.HasPrefix(path, davCredentialsAPI+"/") +} +func (s *Server) registerCalendarRoutes() { + for _, p := range []string{"/v/plan", "/v/plan/", "/v/event/", "/v/calendar"} { + s.mux.HandleFunc(p, s.handleCalendarPage) + } + s.mux.HandleFunc(calendarAPI, s.handleCalendarAPI) + s.mux.HandleFunc(calendarDAV, s.handleCalendarDAV) + s.mux.HandleFunc(strings.TrimSuffix(calendarDAV, "/"), s.handleCalendarDAV) + s.mux.HandleFunc(davCredentialsAPI, s.handleDAVCredentials) + s.mux.HandleFunc(davCredentialsAPI+"/", s.handleDAVCredentials) +} +func (s *Server) calendars() (*calendar.Repository, error) { + s.calendarOnce.Do(func() { + if s.store.DocumentRoot == "" { + s.calendarErr = errors.New("calendar storage unavailable") + return + } + s.calendarRepo, s.calendarErr = calendar.New(filepath.Join(s.store.DocumentRoot, "calendars"), s.store.DB) + if s.calendarErr == nil { + s.calendarRepo.PublicAllowed = func(domain string) bool { + var allowed bool + err := s.store.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM locality_publication_policies p JOIN domains d ON d.uuid=p.domain_uuid AND d.enabled=1 JOIN config c ON c.domain_uuid=p.domain_uuid AND c.key='authorization_mode' AND c.value='enforcing' WHERE p.domain_uuid=? AND p.node_kind='domain' AND p.node_uuid=p.domain_uuid AND p.policy='public')`, domain).Scan(&allowed) + return err == nil && allowed + } + } + }) + return s.calendarRepo, s.calendarErr +} +func (s *Server) calendarActor(r *http.Request) (string, bool) { + p, e := s.store.PrincipalForSession(s.domainUUIDForRequest(r), s.authTokenFromRequest(r)) + if e != nil { + return "", false + } + return p.UUID, p.State == "active" +} +func (s *Server) calendarReady(w http.ResponseWriter, r *http.Request) (*calendar.Repository, bool) { + if !s.systemExtensionEnabled(s.domainUUIDForRequest(r), "organizer.calendar") { + http.NotFound(w, r) + return nil, false + } + repo, e := s.calendars() + if e != nil { + http.Error(w, "calendar storage unavailable", 503) + return nil, false + } + return repo, true +} +func calendarError(w http.ResponseWriter, e error) { + status := 500 + message := "calendar operation failed" + switch { + case errors.Is(e, calendar.ErrMissing): + status = 404 + message = "calendar or event not found" + case errors.Is(e, calendar.ErrForbidden): + status = 403 + message = e.Error() + case errors.Is(e, calendar.ErrConflict): + status = 412 + message = "The calendar changed. Reload before saving." + case errors.Is(e, calendar.ErrPreconditionRequired): + status = 428 + message = "If-Match required" + case errors.Is(e, calendar.ErrNameTaken): + status = 409 + message = e.Error() + case errors.Is(e, calendar.ErrInvalid): + status = 422 + message = e.Error() + case errors.Is(e, calendar.ErrLimit): + status = 507 + message = e.Error() + } + writeEventJSON(w, status, map[string]string{"error": message}) +} +func calendarHref(id, uid string) string { + return calendarDAV + id + "/" + base64.RawURLEncoding.EncodeToString([]byte(uid)) + ".ics" +} +func calendarUID(filename string) (string, error) { + if !strings.HasSuffix(filename, ".ics") { + return "", calendar.ErrMissing + } + b, e := base64.RawURLEncoding.DecodeString(strings.TrimSuffix(filename, ".ics")) + if e != nil || len(b) == 0 || len(b) > 512 { + return "", calendar.ErrMissing + } + return string(b), nil +} +func decodeCalendarJSON(w http.ResponseWriter, r *http.Request, dst any) bool { + d := json.NewDecoder(http.MaxBytesReader(w, r.Body, calendar.MaxResource)) + d.DisallowUnknownFields() + if e := d.Decode(dst); e != nil { + http.Error(w, "invalid JSON", 400) + return false + } + return true +} +func (s *Server) handleCalendarAPI(w http.ResponseWriter, r *http.Request) { + repo, ok := s.calendarReady(w, r) + if !ok { + return + } + domain := s.domainUUIDForRequest(r) + actor, active := s.calendarActor(r) + path := strings.Trim(strings.TrimPrefix(r.URL.Path, calendarAPI), "/") + parts := strings.Split(path, "/") + if path == "upcoming" { + s.handleCalendarUpcoming(w, r, repo, domain, actor) + return + } + if len(parts) == 3 && parts[0] == "calendars" && parts[2] == "source" { + s.handleCalendarSource(w, r, repo, domain, parts[1], actor, active) + return + } + if path == "preferences" { + if actor == "" { + calendarError(w, calendar.ErrForbidden) + return + } + if r.Method != "PUT" { + w.WriteHeader(405) + return + } + var body struct { + Calendars []string `json:"calendars"` + } + if !decodeCalendarJSON(w, r, &body) { + return + } + if err := repo.SaveDefaults(r.Context(), domain, actor, body.Calendars); err != nil { + calendarError(w, err) + return + } + writeEventJSON(w, 200, map[string]any{"calendars": body.Calendars}) + return + } + if path == "event" && r.Method == "GET" { + cs, e := repo.List(domain, actor) + if e != nil { + calendarError(w, e) + return + } + if len(cs) > 256 { + calendarError(w, calendar.ErrLimit) + return + } + var found *calendar.Event + id := "" + for _, c := range cs { + v, e := repo.Event(r.Context(), domain, c.ID, actor, r.URL.Query().Get("uid")) + if errors.Is(e, calendar.ErrMissing) { + continue + } + if e != nil { + calendarError(w, e) + return + } + if found != nil { + writeEventJSON(w, 409, map[string]string{"error": "UID exists in multiple calendars; select a calendar"}) + return + } + found = &v + id = c.ID + } + if found == nil { + calendarError(w, calendar.ErrMissing) + return + } + writeEventJSON(w, 200, map[string]any{"calendar": id, "event": found}) + return + } + if path == "calendars" { + switch r.Method { + case "GET": + cs, e := repo.List(domain, actor) + if e != nil { + calendarError(w, e) + return + } + for i := range cs { + cs[i].Months = nil + if cs[i].Source != nil { + source := *cs[i].Source + source.HasCredential = source.Credential != "" + source.Credential = "" + source.Resources = nil + cs[i].Source = &source + } + if cs[i].Owner != actor { + cs[i].Source = nil // source URLs may contain private subscription tokens + role := cs[i].Members[actor] + cs[i].Members = map[string]string{} + if actor != "" && role != "" { + cs[i].Members[actor] = role + } + } + } + defaults, e := repo.Defaults(domain, actor) + if e != nil { + calendarError(w, e) + return + } + writeEventJSON(w, 200, map[string]any{"calendars": cs, "actor": actor, "active": active, "public_allowed": repo.PublicAllowed(domain), "defaults": defaults}) + case "POST": + if !active { + calendarError(w, calendar.ErrForbidden) + return + } + var body struct { + Name string `json:"name"` + PrettyName *string `json:"pretty_name"` + } + if !decodeCalendarJSON(w, r, &body) { + return + } + var pretty []string + if body.PrettyName != nil { + if !calendar.ValidPrettyName(*body.PrettyName) { + writeEventJSON(w, 422, map[string]string{"error": "pretty_name: use letters, numbers, - or _ (1–120 UTF-8 bytes; no commas, spaces or UUIDs)"}) + return + } + pretty = []string{*body.PrettyName} + } + c, e := repo.Create(r.Context(), domain, actor, body.Name, pretty...) + if e != nil { + calendarError(w, e) + return + } + writeEventJSON(w, 201, c) + default: + w.Header().Set("Allow", "GET, POST") + w.WriteHeader(405) + } + return + } + if len(parts) == 3 && parts[0] == "calendars" && parts[2] == "settings" { + if r.Method != "PUT" && r.Method != "DELETE" { + w.Header().Set("Allow", "PUT, DELETE") + w.WriteHeader(405) + return + } + if !active { + calendarError(w, calendar.ErrForbidden) + return + } + c, err := repo.Get(domain, parts[1], actor) + if err != nil { + calendarError(w, err) + return + } + if c.Owner != actor { + calendarError(w, calendar.ErrForbidden) + return + } + if r.Method == "DELETE" { + var body struct { + Version string `json:"version"` + } + if !decodeCalendarJSON(w, r, &body) { + return + } + if body.Version == "" || body.Version != c.Version { + calendarError(w, calendar.ErrConflict) + return + } + if err := s.store.CancelEventJobsByTypeKey(calendarSyncType, domain+":"+c.ID); err != nil { + calendarError(w, err) + return + } + if err := repo.Delete(r.Context(), domain, c.ID, actor, body.Version); err != nil { + calendarError(w, err) + return + } + w.WriteHeader(http.StatusNoContent) + return + } + var body struct { + Name string `json:"name"` + Public bool `json:"public"` + Members map[string]string `json:"members"` + Version string `json:"version"` + PrettyName *string `json:"pretty_name"` + } + if !decodeCalendarJSON(w, r, &body) { + return + } + // Only existing local-domain users may be collaborators. + members := map[string]string{} + for id, role := range body.Members { + if _, e := uuid.Parse(id); e != nil { + p, e := s.store.PrincipalByUsername(domain, id) + if e != nil { + http.Error(w, "unknown collaborator", 400) + return + } + id = p.UUID + } + var count int + e := s.store.DB.QueryRowContext(r.Context(), `SELECT COUNT(*) FROM domain_memberships WHERE domain_uuid=? AND principal_uuid=? AND state='active'`, domain, id).Scan(&count) + if e != nil || count != 1 { + http.Error(w, "unknown collaborator", 400) + return + } + members[id] = role + } + body.Members = members + var pretty []string + if body.PrettyName != nil { + if !calendar.ValidPrettyName(*body.PrettyName) { + writeEventJSON(w, 422, map[string]string{"error": "pretty_name: use letters, numbers, - or _ (1–120 UTF-8 bytes; no commas, spaces or UUIDs)"}) + return + } + pretty = []string{*body.PrettyName} + } + c, e := repo.Settings(r.Context(), domain, parts[1], actor, body.Version, body.Name, body.Public, body.Members, pretty...) + if e != nil { + calendarError(w, e) + return + } + c.Months = nil + if c.Source != nil { + c.Source.HasCredential = c.Source.Credential != "" + c.Source.Credential = "" + c.Source.Resources = nil + } + writeEventJSON(w, 200, c) + return + } + if len(parts) == 3 && parts[0] == "calendars" && parts[2] == "events" { + if r.Method == "GET" { + uid := r.URL.Query().Get("uid") + if resource := r.URL.Query().Get("resource"); resource != "" { + c, err := repo.Get(domain, parts[1], actor) + if err != nil { + calendarError(w, err) + return + } + uid, err = calendar.DAVUID(c, resource) + if err != nil { + calendarError(w, err) + return + } + } + v, e := repo.Event(r.Context(), domain, parts[1], actor, uid) + if e != nil { + calendarError(w, e) + return + } + writeEventJSON(w, 200, v) + return + } + if r.Method != "POST" { + w.WriteHeader(405) + return + } + if !active { + calendarError(w, calendar.ErrForbidden) + return + } + var body struct { + UID string `json:"uid"` + Summary string `json:"summary"` + Description string `json:"description"` + Location string `json:"location"` + Start time.Time `json:"start"` + End time.Time `json:"end"` + AllDay bool `json:"all_day"` + ETag string `json:"etag"` + } + if !decodeCalendarJSON(w, r, &body) { + return + } + old := "" + match := "*" + status := 201 + if body.UID != "" { + v, e := repo.Event(r.Context(), domain, parts[1], actor, body.UID) + if e != nil { + calendarError(w, e) + return + } + old = v.Data + match = body.ETag + status = 200 + } else { + body.UID = uuid.NewString() + } + v, e := calendar.Build(old, calendar.Event{UID: body.UID, Summary: body.Summary, Description: body.Description, Location: body.Location, Start: body.Start, End: body.End, AllDay: body.AllDay}) + if e != nil { + calendarError(w, e) + return + } + v, e = repo.Change(r.Context(), domain, parts[1], actor, body.UID, match, &v) + if e != nil { + calendarError(w, e) + return + } + w.Header().Set("Location", calendarHref(parts[1], v.UID)) + w.Header().Set("ETag", v.ETag) + writeEventJSON(w, status, v) + return + } + http.NotFound(w, r) +} + +func (s *Server) handleCalendarPage(w http.ResponseWriter, r *http.Request) { + if r.Method != "GET" && r.Method != "HEAD" { + w.WriteHeader(405) + return + } + if _, ok := s.calendarReady(w, r); !ok { + return + } + if r.URL.Path == "/v/calendar" { + http.Redirect(w, r, "/v/plan", 302) + return + } + actor, _ := s.calendarActor(r) + edit := strings.HasPrefix(r.URL.Path, "/v/event/") || strings.HasSuffix(r.URL.Path, "/new") + if edit && actor == "" { + s.authRequired(w, r) + return + } + // The client parses only these URI shapes; malformed dates must be real 404s. + if !validCalendarViewPath(r.URL.Path) { + http.NotFound(w, r) + return + } + s.renderWithContext(w, r, "calendar.gohtml", map[string]any{"Title": "Calendar", "CalendarActor": actor, "CalendarTimezone": s.getTimezoneName(s.domainUUIDForRequest(r)), "Path": r.URL.Path}) +} +func validCalendarViewPath(path string) bool { + if path == "/v/plan" || path == "/v/plan/" || path == "/v/event/new" { + return true + } + if strings.HasPrefix(path, "/v/plan/event/") { + return len(strings.TrimPrefix(path, "/v/plan/event/")) > 0 + } + if strings.HasPrefix(path, "/v/event/") { + return strings.HasSuffix(path, "/edit") && len(strings.TrimSuffix(strings.TrimPrefix(path, "/v/event/"), "/edit")) > 0 + } + if !strings.HasPrefix(path, "/v/plan/cal/") { + return false + } + p := strings.Split(strings.TrimPrefix(path, "/v/plan/cal/"), "/") + if len(p) == 5 && p[3] == "week" && p[4] == "list" { + p = p[:3] + } + if len(p) > 4 || len(p) < 1 { + return false + } + if len(p) == 4 { + switch p[3] { + case "week", "timeline", "events", "new": + default: + return false + } + p = p[:3] + } + layout := []string{"2006", "2006/01", "2006/01/02"}[len(p)-1] + v := strings.Join(p, "/") + t, e := time.Parse(layout, v) + return e == nil && t.Year() > 0 && t.Year() < 9999 && t.Format(layout) == v +} diff --git a/internal/server/calendar_mobile_test.go b/internal/server/calendar_mobile_test.go new file mode 100644 index 0000000..4602939 --- /dev/null +++ b/internal/server/calendar_mobile_test.go @@ -0,0 +1,50 @@ +package server + +import ( + "context" + "encoding/json" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "pageswiki/internal/calendar" + "testing" + "time" +) + +func TestCalendarMobileChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium mobile fixture") + } + s, token, domain := configFixture(t) + s.registerCalendarRoutes() + if err := s.store.SetConfigInDomain(domain, "timezone", "Asia/Tokyo"); err != nil { + t.Fatal(err) + } + w := calendarRequest(s, token, "POST", calendarAPI+"calendars", `{"name":"Mobile fixture calendar","pretty_name":"mobile"}`, "") + if w.Code != 201 { + t.Fatal(w.Body.String()) + } + var c calendar.Calendar + json.Unmarshal(w.Body.Bytes(), &c) + for _, title := range []string{"Mobile meeting with a readable title", "Overlapping meeting"} { + raw, _ := json.Marshal(map[string]string{"summary": title, "start": "2026-09-22T09:00:00Z", "end": "2026-09-22T10:00:00Z"}) + if w = calendarRequest(s, token, "POST", calendarAPI+"calendars/"+c.ID+"/events", string(raw), ""); w.Code != 201 { + t.Fatal(w.Body.String()) + } + } + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer srv.Close() + ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second) + defer cancel() + cmd := exec.CommandContext(ctx, "node", "internal/server/testdata/calendar-mobile-smoke.mjs", srv.URL, t.TempDir()) + if out, e := cmd.CombinedOutput(); e != nil { + t.Fatalf("mobile calendar: %v %s", e, out) + } else { + t.Log(string(out)) + } +} diff --git a/internal/server/calendar_sync.go b/internal/server/calendar_sync.go new file mode 100644 index 0000000..ea3efcf --- /dev/null +++ b/internal/server/calendar_sync.go @@ -0,0 +1,348 @@ +package server + +import ( + "context" + "crypto/tls" + "crypto/x509" + "encoding/json" + "errors" + "fmt" + "io" + "log" + "net" + "net/http" + "net/netip" + "net/url" + "strings" + "time" + + "pageswiki/internal/calendar" + "pageswiki/internal/store" +) + +const calendarSyncType = "calendar.source.sync" +const calendarSweepType = "calendar.source.sweep" + +var errCalendarSourceBlocked = errors.New("calendar source address blocked: only public HTTPS endpoints are allowed") +var errCalendarSourceDNS = errors.New("calendar source DNS lookup failed") + +// Return only a classified cause, never URL.Error (which can contain tokens). +func calendarSourceRequestError(err error) error { + if errors.Is(err, errCalendarSourceBlocked) { + return errCalendarSourceBlocked + } + if errors.Is(err, errCalendarSourceDNS) { + return errCalendarSourceDNS + } + var cert *tls.CertificateVerificationError + var unknown x509.UnknownAuthorityError + if errors.As(err, &cert) || errors.As(err, &unknown) { + return errors.New("external calendar TLS certificate verification failed") + } + var network net.Error + if errors.Is(err, context.DeadlineExceeded) || (errors.As(err, &network) && network.Timeout()) { + return errors.New("external calendar request timed out") + } + return errors.New("external calendar connection failed (no reachable address, TLS handshake or redirect failure)") +} + +type calendarSyncPayload struct { + Domain string `json:"domain"` + Calendar string `json:"calendar"` + Force bool `json:"force,omitempty"` +} + +func validCalendarSourceURL(raw string) bool { + u, e := url.Parse(raw) + if e != nil || len(raw) > 4096 || u.Scheme != "https" || u.Hostname() == "" || u.User != nil || u.Fragment != "" || (u.Port() != "" && u.Port() != "443") { + return false + } + host := strings.TrimSuffix(strings.ToLower(u.Hostname()), ".") + if host == "localhost" || strings.HasSuffix(host, ".localhost") { + return false + } + if ip, err := netip.ParseAddr(host); err == nil && !publicCalendarIP(ip) { + return false + } + return true +} +func publicCalendarIP(ip netip.Addr) bool { + ip = ip.Unmap() + if !ip.IsGlobalUnicast() || ip.IsPrivate() || ip.IsLoopback() || ip.IsLinkLocalUnicast() { + return false + } + for _, cidr := range []string{"0.0.0.0/8", "100.64.0.0/10", "192.0.0.0/24", "192.0.2.0/24", "198.18.0.0/15", "198.51.100.0/24", "203.0.113.0/24", "240.0.0.0/4", "2001:db8::/32", "64:ff9b::/96", "64:ff9b:1::/48", "2002::/16"} { + if netip.MustParsePrefix(cidr).Contains(ip) { + return false + } + } + return true +} + +// DNS is checked at dial time and the approved address is pinned for this +// connection. No proxy environment or alternate-port bypass is permitted. +func calendarSourceClient() *http.Client { + tr := &http.Transport{TLSHandshakeTimeout: 10 * time.Second, ResponseHeaderTimeout: 25 * time.Second, DisableKeepAlives: true} + tr.DialContext = func(ctx context.Context, network, address string) (net.Conn, error) { + host, port, e := net.SplitHostPort(address) + if e != nil || port != "443" { + return nil, errCalendarSourceBlocked + } + ips, e := net.DefaultResolver.LookupNetIP(ctx, "ip", host) + if e != nil || len(ips) == 0 { + return nil, errCalendarSourceDNS + } + for _, ip := range ips { + if !publicCalendarIP(ip) { + return nil, errCalendarSourceBlocked + } + } + // Try all validated addresses rather than failing on an unreachable + // first IPv6/IPv4 address. Never re-resolve after the safety check. + for _, ip := range ips { + var conn net.Conn + conn, e = (&net.Dialer{Timeout: 2 * time.Second}).DialContext(ctx, "tcp", net.JoinHostPort(ip.String(), port)) + if e == nil { + return conn, nil + } + if ctx.Err() != nil { + return nil, ctx.Err() + } + } + return nil, e + } + return &http.Client{Transport: tr, Timeout: 45 * time.Second, CheckRedirect: func(req *http.Request, via []*http.Request) error { + if len(via) >= 3 || !validCalendarSourceURL(req.URL.String()) { + return errors.New("calendar source redirect blocked") + } + req.Header.Del("Referer") + return nil + }} +} +func fetchCalendarSource(ctx context.Context, client *http.Client, c calendar.Calendar) ([]calendar.Event, string, string, bool, error) { + if c.Source == nil || !validCalendarSourceURL(c.Source.URL) { + return nil, "", "", false, errors.New("invalid calendar source URL") + } + req, e := http.NewRequestWithContext(ctx, "GET", c.Source.URL, nil) + if e != nil { + return nil, "", "", false, errors.New("invalid calendar source URL") + } + req.Header.Set("Accept", "text/calendar") + req.Header.Set("User-Agent", "PagesWiki-Calendar/1") + if c.Source.ETag != "" { + req.Header.Set("If-None-Match", c.Source.ETag) + } + if c.Source.Modified != "" { + req.Header.Set("If-Modified-Since", c.Source.Modified) + } + response, e := client.Do(req) + if e != nil { + return nil, "", "", false, calendarSourceRequestError(e) + } + defer response.Body.Close() + if response.StatusCode == 304 { + if c.Source.Success == 0 { + return nil, "", "", false, errors.New("unexpected 304 before initial synchronization") + } + return nil, "", "", true, nil + } + if response.StatusCode != 200 { + return nil, "", "", false, errors.New("external calendar returned HTTP " + http.StatusText(response.StatusCode)) + } + body, e := io.ReadAll(io.LimitReader(response.Body, calendar.MaxFeed+1)) + if e != nil { + return nil, "", "", false, errors.New("external calendar body could not be read") + } + now := time.Now().UTC().Truncate(24 * time.Hour) + events, e := calendar.ParseExternalFeed(body, now.AddDate(0, 0, -90), now.AddDate(0, 0, 275)) + if e != nil { + e = fmt.Errorf("ICS validation stage failed: %w", e) + } + return events, response.Header.Get("ETag"), response.Header.Get("Last-Modified"), false, e +} +func (s *Server) ensureCalendarSweep() error { + var exists bool + if e := s.store.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM event_definitions WHERE uuid=?)`, calendarSweepType).Scan(&exists); e != nil { + return e + } + if exists { + return nil + } + return s.store.SaveEventDefinition(&store.EventDefinition{UUID: calendarSweepType, Name: "Calendar source synchronization", EventType: calendarSweepType, EventKey: calendarSweepType, Payload: "{}", ScheduleKind: "interval", IntervalSeconds: 60, Enabled: true, Priority: -10, MaxAttempts: 1}) +} +func (s *Server) enqueueCalendarSource(domain, id string, force bool) (bool, error) { + b, _ := json.Marshal(calendarSyncPayload{Domain: domain, Calendar: id, Force: force}) + return s.store.EnqueueEventWithOptions("", calendarSyncType, domain+":"+id, string(b), time.Now(), -10, 1) +} +func (s *Server) sweepCalendarSources() error { + repo, e := s.calendars() + if e != nil { + return e + } + domains, e := s.store.ListDomains() + if e != nil { + return e + } + for _, d := range domains { + if !d.Enabled || !s.systemExtensionEnabled(d.UUID, "organizer.calendar") { + continue + } + cs, e := repo.Sources(d.UUID) + if e != nil { + return e + } + for _, c := range cs { + if c.Source.Enabled && c.Source.Next <= time.Now().UnixMilli() { + if _, e = s.enqueueCalendarSource(d.UUID, c.ID, false); e != nil { + return e + } + } + } + } + return nil +} +func (s *Server) runCalendarSource(job *store.EventJob) error { + var p calendarSyncPayload + if e := json.Unmarshal([]byte(job.Payload), &p); e != nil { + return e + } + if !s.systemExtensionEnabled(p.Domain, "organizer.calendar") { + return nil + } + repo, e := s.calendars() + if e != nil { + return e + } + c, e := repo.SourceCalendar(p.Domain, p.Calendar) + if e != nil { + return e + } + if !c.Source.Enabled || (!p.Force && c.Source.Next > time.Now().UnixMilli()) { + return nil + } + var active bool + e = s.store.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM domain_memberships m JOIN principals p ON p.uuid=m.principal_uuid JOIN domains d ON d.uuid=m.domain_uuid WHERE m.domain_uuid=? AND m.principal_uuid=? AND m.state='active' AND p.state='active' AND d.enabled=1)`, p.Domain, c.Owner).Scan(&active) + if e != nil { + return e + } + if !active { + return errors.New("calendar source owner is inactive") + } + ctx, cancel := context.WithTimeout(context.Background(), 50*time.Second) + defer cancel() + client := calendarSourceClient() + if c.Source.Credential != "" { + user, password, err := s.store.OpenCalendarCredential(p.Domain, c.ID, c.Source.Credential) + if err != nil { + return errors.New("calendar credential unavailable") + } + client.Transport = calendarAuthTransport{base: client.Transport, origin: c.Source.URL, user: user, password: password} + } + var events []calendar.Event + var etag, modified string + var unchanged bool + var syncErr error + var resources map[string]calendar.RemoteResource + if c.Source.Kind == "caldav" { + events, resources, syncErr = fetchCalDAVSource(ctx, client, repo, p.Domain, c) + } else { + events, etag, modified, unchanged, syncErr = fetchCalendarSource(ctx, client, c) + } + if syncErr != nil { + // Deliberately omit source URL, credentials, UID, summary and body. + log.Printf("calendar source synchronization failed domain=%s calendar=%s protocol=%s stage=fetch-validate: %v", p.Domain, p.Calendar, c.Source.Kind, syncErr) + } + if s.store.EventCancellationRequested(job.UUID) { + return errors.New("calendar synchronization cancelled") + } + if e = repo.ApplySource(ctx, p.Domain, c, events, etag, modified, unchanged, syncErr, resources); e != nil { + return e + } + return syncErr +} +func (s *Server) handleCalendarSource(w http.ResponseWriter, r *http.Request, repo *calendar.Repository, domain, id, actor string, active bool) { + if !active { + calendarError(w, calendar.ErrForbidden) + return + } + c, e := repo.Get(domain, id, actor) + if e != nil { + calendarError(w, e) + return + } + if c.Owner != actor { + calendarError(w, calendar.ErrForbidden) + return + } + switch r.Method { + case "PUT": + var body struct { + Kind string `json:"kind"` + Username string `json:"username"` + Password string `json:"password"` + ClearCredential bool `json:"clear_credential"` + URL string `json:"url"` + IntervalSeconds int64 `json:"interval_seconds"` + Enabled bool `json:"enabled"` + Version string `json:"version"` + } + if !decodeCalendarJSON(w, r, &body) { + return + } + body.URL = strings.TrimSpace(body.URL) + if !validCalendarSourceURL(body.URL) { + writeEventJSON(w, 422, map[string]string{"error": "Use a public HTTPS ICS URL (port 443, no URL username/password)."}) + return + } + if body.Kind == "" { + body.Kind = "ics" + } + credential := "" + if c.Source != nil && c.Source.URL == body.URL && !body.ClearCredential { + credential = c.Source.Credential + } + if body.Username != "" || body.Password != "" { + if body.Username == "" || body.Password == "" || strings.Contains(body.Username, ":") || len(body.Username) > 256 || len(body.Password) > 4096 { + writeEventJSON(w, 422, map[string]string{"error": "Supply both username and password (username must not contain a colon)."}) + return + } + credential, e = s.store.SealCalendarCredential(domain, id, body.Username, body.Password) + if e != nil { + calendarError(w, e) + return + } + } + c, e = repo.SetSource(r.Context(), domain, id, actor, body.Version, calendar.Source{Kind: body.Kind, Credential: credential, URL: body.URL, IntervalSeconds: body.IntervalSeconds, Enabled: body.Enabled}) + if e != nil { + calendarError(w, e) + return + } + if body.Enabled { + if _, e = s.enqueueCalendarSource(domain, id, true); e != nil { + calendarError(w, e) + return + } + s.wakeEventScheduler() + } + c.Months = nil + c.Source.HasCredential = c.Source.Credential != "" + c.Source.Credential = "" + c.Source.Resources = nil + writeEventJSON(w, 200, c) + case "POST": + if c.Source == nil || !c.Source.Enabled { + writeEventJSON(w, 409, map[string]string{"error": "Enable a source first"}) + return + } + queued, e := s.enqueueCalendarSource(domain, id, true) + if e != nil { + calendarError(w, e) + return + } + s.wakeEventScheduler() + writeEventJSON(w, 202, map[string]bool{"queued": queued}) + default: + w.Header().Set("Allow", "PUT, POST") + w.WriteHeader(405) + } +} diff --git a/internal/server/calendar_sync_test.go b/internal/server/calendar_sync_test.go new file mode 100644 index 0000000..b3f8c6a --- /dev/null +++ b/internal/server/calendar_sync_test.go @@ -0,0 +1,212 @@ +package server + +import ( + "context" + "encoding/json" + "encoding/xml" + "fmt" + "io" + "net/http" + "net/http/httptest" + "net/netip" + "strings" + "testing" + "time" + + "pageswiki/internal/calendar" +) + +func TestCalendarSourceErrorsDoNotExposeSubscriptionURL(t *testing.T) { + for _, cause := range []error{errCalendarSourceBlocked, errCalendarSourceDNS, context.DeadlineExceeded} { + err := calendarSourceRequestError(fmt.Errorf("https://provider.example/private-token: %w", cause)) + if strings.Contains(err.Error(), "private-token") || strings.Contains(err.Error(), "https://") { + t.Fatal("subscription URL exposed") + } + if cause == errCalendarSourceBlocked && !strings.Contains(err.Error(), "blocked") { + t.Fatal(err) + } + } +} + +type calendarTestTransport func(*http.Request) (*http.Response, error) + +func (f calendarTestTransport) RoundTrip(r *http.Request) (*http.Response, error) { return f(r) } +func sourceResponse(code int, body string) *http.Response { + return &http.Response{StatusCode: code, Header: make(http.Header), Body: io.NopCloser(strings.NewReader(body))} +} + +func TestCalendarSourceSSRFAndConditionalGET(t *testing.T) { + for _, address := range []string{"127.0.0.1", "::1", "::ffff:127.0.0.1", "10.0.0.1", "192.168.1.1", "169.254.169.254", "100.64.0.1", "2001:db8::1", "198.18.0.1", "64:ff9b::7f00:1"} { + if publicCalendarIP(netip.MustParseAddr(address)) { + t.Fatal("allowed", address) + } + } + if !publicCalendarIP(netip.MustParseAddr("8.8.8.8")) { + t.Fatal("public blocked") + } + for _, u := range []string{"http://example.org/a", "https://user:pass@example.org/a", "https://example.org:22/a", "file:///etc/passwd", "https://localhost/a", "https://[::1]/a", "https://127.0.0.1/a"} { + if validCalendarSourceURL(u) { + t.Fatal(u) + } + } + c := calendar.Calendar{Source: &calendar.Source{URL: "https://source.example/feed.ics", ETag: `"etag"`, Success: 1}} + client := &http.Client{Transport: calendarTestTransport(func(r *http.Request) (*http.Response, error) { + if r.Header.Get("If-None-Match") != `"etag"` { + t.Fatal(r.Header) + } + return sourceResponse(304, ""), nil + })} + _, _, _, unchanged, e := fetchCalendarSource(context.Background(), client, c) + if e != nil || !unchanged { + t.Fatal(unchanged, e) + } +} + +func TestFetchCalendarSourceOutlookProjection(t *testing.T) { + feed := "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//Microsoft Corporation//Outlook//EN\r\nMETHOD:PUBLISH\r\nX-WR-CALNAME:Synthetic\r\n" + + "BEGIN:VTIMEZONE\r\nTZID:Tokyo Standard Time\r\nBEGIN:STANDARD\r\nDTSTART:16010101T000000\r\nTZOFFSETFROM:+0900\r\nTZOFFSETTO:+0900\r\nRRULE:FREQ=YEARLY;BYMONTH=1;BYDAY=1SU\r\nEND:STANDARD\r\nEND:VTIMEZONE\r\n" + + "BEGIN:VEVENT\r\nUID:synthetic\r\nDTSTAMP:20260901T000000Z\r\nDTSTART;TZID=\"Tokyo Standard Time\":20260922T090000\r\nDTEND;TZID=\"Tokyo Standard Time\":20260922T100000\r\nRRULE:FREQ=DAILY;COUNT=2\r\nSUMMARY:Synthetic\r\nX-MICROSOFT-CDO-BUSYSTATUS:BUSY\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n" + client := &http.Client{Transport: calendarTestTransport(func(r *http.Request) (*http.Response, error) { + response := sourceResponse(200, feed) + response.Header.Set("ETag", `"outlook"`) + return response, nil + })} + c := calendar.Calendar{Source: &calendar.Source{URL: "https://outlook.example/calendar.ics"}} + events, etag, _, unchanged, err := fetchCalendarSource(context.Background(), client, c) + if err != nil || unchanged || etag != `"outlook"` || len(events) != 2 { + t.Fatal(len(events), etag, unchanged, err) + } + if events[0].Start.Format(time.RFC3339) != "2026-09-22T00:00:00Z" { + t.Fatal(events[0].Start) + } +} +func TestCalendarCalDAVETagsAndCredentialIsolation(t *testing.T) { + s, token, domain := configFixture(t) + s.registerCalendarRoutes() + repo, e := s.calendars() + if e != nil { + t.Fatal(e) + } + owner, e := s.store.PrincipalForSession(domain, token) + if e != nil { + t.Fatal(e) + } + c, e := repo.Create(context.Background(), domain, owner.UUID, "Remote", "remote") + if e != nil { + t.Fatal(e) + } + cipher, e := s.store.SealCalendarCredential(domain, c.ID, "remote-user", "secret-password") + if e != nil { + t.Fatal(e) + } + if strings.Contains(cipher, "secret-password") { + t.Fatal("plaintext secret") + } + if _, _, e = s.store.OpenCalendarCredential(domain, "wrong-calendar", cipher); e == nil { + t.Fatal("credential context bypass") + } + c, e = repo.SetSource(context.Background(), domain, c.ID, owner.UUID, c.Version, calendar.Source{Kind: "caldav", URL: "https://source.example/remote/", IntervalSeconds: 60, Enabled: true, Credential: cipher}) + if e != nil { + t.Fatal(e) + } + event, e := calendar.Build("", calendar.Event{UID: "remote-event", Summary: "Remote", Start: time.Now().UTC().Truncate(time.Hour), End: time.Now().UTC().Truncate(time.Hour).Add(time.Hour)}) + if e != nil { + t.Fatal(e) + } + queries, multigets := 0, 0 + client := &http.Client{Transport: calendarAuthTransport{origin: c.Source.URL, user: "remote-user", password: "secret-password", base: calendarTestTransport(func(r *http.Request) (*http.Response, error) { + user, password, ok := r.BasicAuth() + if !ok || user != "remote-user" || password != "secret-password" { + t.Fatal("Basic auth missing") + } + b, _ := io.ReadAll(r.Body) + withData := strings.Contains(string(b), "calendar-multiget") + if withData { + multigets++ + } else { + queries++ + } + row := eventDAVRow(c, event) + row.href = "/remote/a.ics" + wanted := []davNode{{XMLName: xml.Name{Space: davNS, Local: "getetag"}}} + if withData { + wanted = append(wanted, davNode{XMLName: xml.Name{Space: calNS, Local: "calendar-data"}}) + } + w := httptest.NewRecorder() + writeDAV(w, []davResponse{row}, wanted) + return sourceResponse(207, w.Body.String()), nil + })}} + events, resources, e := fetchCalDAVSource(context.Background(), client, repo, domain, c) + if e != nil || len(events) != 1 { + t.Fatal(events, e) + } + if e = repo.ApplySource(context.Background(), domain, c, events, "", "", false, nil, resources); e != nil { + t.Fatal(e) + } + c, _ = repo.Get(domain, c.ID, owner.UUID) + events, _, e = fetchCalDAVSource(context.Background(), client, repo, domain, c) + if e != nil || len(events) != 1 || queries != 2 || multigets != 1 { + t.Fatal(queries, multigets, e) + } + req, _ := http.NewRequest("GET", "https://other.example/remote/", nil) + if _, e = client.Transport.RoundTrip(req); e == nil { + t.Fatal("credential forwarded to another origin") + } + w := calendarRequest(s, token, "GET", calendarAPI+"calendars", "", "") + if w.Code != 200 || strings.Contains(w.Body.String(), cipher) || strings.Contains(w.Body.String(), "secret-password") || strings.Contains(w.Body.String(), "/remote/a.ics") { + t.Fatal("source secret/cache exposed", w.Code) + } + var payload struct{ Calendars []calendar.Calendar } + if e = json.Unmarshal(w.Body.Bytes(), &payload); e != nil || len(payload.Calendars) != 1 || !payload.Calendars[0].Source.HasCredential { + t.Fatal(e, w.Body.String()) + } +} + +func TestCalendarSourceAPIQueueAndDisable(t *testing.T) { + s, token, domain := configFixture(t) + s.registerCalendarRoutes() + repo, err := s.calendars() + if err != nil { + t.Fatal(err) + } + owner, err := s.store.PrincipalForSession(domain, token) + if err != nil { + t.Fatal(err) + } + c, err := repo.Create(context.Background(), domain, owner.UUID, "Import", "import") + if err != nil { + t.Fatal(err) + } + endpoint := calendarAPI + "calendars/" + c.ID + "/source" + body := func(version string, enabled bool, interval int) string { + b, _ := json.Marshal(map[string]any{"version": version, "url": "https://source.example/feed.ics", "kind": "ics", "enabled": enabled, "interval_seconds": interval}) + return string(b) + } + if w := calendarRequest(s, token, "PUT", endpoint, body(c.Version, true, 59), ""); w.Code != 422 { + t.Fatal(w.Code, w.Body.String()) + } + w := calendarRequest(s, token, "PUT", endpoint, body(c.Version, true, 600), "") + if w.Code != 200 { + t.Fatal(w.Code, w.Body.String()) + } + if w = calendarRequest(s, token, "PUT", endpoint, body(c.Version, true, 600), ""); w.Code != 412 { + t.Fatal("stale config accepted", w.Code) + } + if w = calendarRequest(s, token, "POST", endpoint, "{}", ""); w.Code != 202 { + t.Fatal(w.Code, w.Body.String()) + } + var jobs int + if err = s.store.DB.QueryRow(`SELECT COUNT(*) FROM event_jobs WHERE event_type=?`, calendarSyncType).Scan(&jobs); err != nil || jobs != 1 { + t.Fatal("queue deduplication", jobs, err) + } + c, err = repo.Get(domain, c.ID, owner.UUID) + if err != nil { + t.Fatal(err) + } + if w = calendarRequest(s, token, "PUT", endpoint, body(c.Version, false, 600), ""); w.Code != 200 { + t.Fatal(w.Code, w.Body.String()) + } + if w = calendarRequest(s, token, "POST", endpoint, "{}", ""); w.Code != 409 { + t.Fatal("disabled sync accepted", w.Code) + } +} diff --git a/internal/server/calendar_test.go b/internal/server/calendar_test.go new file mode 100644 index 0000000..c344771 --- /dev/null +++ b/internal/server/calendar_test.go @@ -0,0 +1,235 @@ +package server + +import ( + "context" + "encoding/json" + "errors" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "strings" + "testing" + "time" + + "github.com/google/uuid" + "pageswiki/internal/calendar" +) + +func TestCalendarChromiumSmoke(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + s, token, domain := configFixture(t) + if err := s.store.SetConfigInDomain(domain, "timezone", "Asia/Tokyo"); err != nil { + t.Fatal(err) + } + s.registerCalendarRoutes() + w := calendarRequest(s, token, "POST", calendarAPI+"calendars", `{"name":"Calendar Smoke"}`, "") + if w.Code != 201 { + t.Fatal(w.Body.String()) + } + var c calendar.Calendar + json.Unmarshal(w.Body.Bytes(), &c) + w = calendarRequest(s, token, "POST", calendarAPI+"calendars/"+c.ID+"/events", `{"summary":"Browser meeting","start":"2026-09-22T09:00:00Z","end":"2026-09-22T10:00:00Z"}`, "") + if w.Code != 201 { + t.Fatal(w.Body.String()) + } + var event calendar.Event + json.Unmarshal(w.Body.Bytes(), &event) + // Exercise the Web viewer with a DAV-client filename, not base64url(UID). + native, err := s.calendarRepo.Event(context.Background(), domain, c.ID, c.Owner, event.UID) + if err != nil { + t.Fatal(err) + } + if _, err = s.calendarRepo.Change(context.Background(), domain, c.ID, c.Owner, event.UID, native.ETag, nil); err != nil { + t.Fatal(err) + } + if _, _, err = s.calendarRepo.ChangeDAV(context.Background(), domain, c.ID, c.Owner, "browser-client-event.ics", "", &native, nil); err != nil { + t.Fatal(err) + } + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + for _, route := range []string{"/v/plan/cal/2026/09", "/v/plan/cal/2026/09/22/week", "/v/plan/cal/2026/09/22/timeline", "/v/plan/event/" + event.UID} { + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + cmd := exec.CommandContext(ctx, "chromium", "--headless", "--no-sandbox", "--disable-gpu", "--disable-background-networking", "--no-proxy-server", "--enable-logging=stderr", "--log-level=0", "--user-data-dir="+t.TempDir(), "--dump-dom", "--virtual-time-budget=4000", server.URL+route+"?calendar="+c.ID) + out, e := cmd.CombinedOutput() + cancel() + if e != nil || strings.Contains(string(out), "Uncaught ") || !strings.Contains(string(out), "Browser meeting") { + t.Fatalf("%s: %v %s", route, e, out) + } + } + ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second) + defer cancel() + cmd := exec.CommandContext(ctx, "node", "internal/server/testdata/calendar-browser-smoke.mjs", server.URL+"/v/plan/cal/2026/09?calendar="+c.ID, t.TempDir()) + if out, e := cmd.CombinedOutput(); e != nil { + t.Fatalf("browser interactions: %v %s", e, out) + } else { + t.Log(string(out)) + } +} + +func calendarRequest(s *Server, token, method, path, body, etag string) *httptest.ResponseRecorder { + r := httptest.NewRequest(method, "http://localhost"+path, strings.NewReader(body)) + if token != "" { + r.Header.Set("Authorization", "Bearer "+token) + } + r.Header.Set("Content-Type", "application/json") + if method == "REPORT" || method == "PROPFIND" { + r.Header.Set("Content-Type", "application/xml") + r.Header.Set("Depth", "1") + } + if method == "PUT" && !strings.Contains(path, "settings") { + r.Header.Set("Content-Type", "text/calendar") + } + if etag == "*" { + r.Header.Set("If-None-Match", "*") + } else if etag != "" { + r.Header.Set("If-Match", etag) + } + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + return w +} +func TestCalendarEndToEndDAVAndPublicRevocation(t *testing.T) { + s, token, domain := configFixture(t) + s.registerCalendarRoutes() + if _, err := s.store.DB.Exec(`INSERT INTO locality_publication_policies(domain_uuid,node_kind,node_uuid,policy,actor_uuid,updated_at_ms) VALUES(?,'domain',?,'public','test',0)`, domain, domain); err != nil { + t.Fatal(err) + } + w := calendarRequest(s, token, "POST", calendarAPI+"calendars", `{"name":"Calendar"}`, "") + if w.Code != 201 { + t.Fatal(w.Code, w.Body.String()) + } + var c calendar.Calendar + if e := json.Unmarshal(w.Body.Bytes(), &c); e != nil { + t.Fatal(e) + } + path := calendarAPI + "calendars/" + c.ID + "/events" + w = calendarRequest(s, token, "POST", path, `{"summary":"Meeting","start":"2026-09-30T23:00:00Z","end":"2026-10-01T02:00:00Z"}`, "") + if w.Code != 201 { + t.Fatal(w.Code, w.Body.String()) + } + var event calendar.Event + json.Unmarshal(w.Body.Bytes(), &event) + href := w.Header().Get("Location") + report := `` + w = calendarRequest(s, token, "REPORT", calendarDAV+c.ID+"/", report, "") + if w.Code != 207 || !strings.Contains(w.Body.String(), "Meeting") { + t.Fatal(w.Code, w.Body.String()) + } + w = calendarRequest(s, "", "GET", href, "", "") + if w.Code != 404 { + t.Fatal("private leaked", w.Code) + } + w = calendarRequest(s, token, "GET", href, "", "") + ics := w.Body.String() + if w.Code != 200 { + t.Fatal(w.Code, ics) + } + w = calendarRequest(s, token, "PUT", href, ics, "") + if w.Code != 428 { + t.Fatal(w.Code, w.Body.String()) + } + w = calendarRequest(s, token, "PUT", href, ics, "*") + if w.Code != 412 { + t.Fatal(w.Code, w.Body.String()) + } + c, _ = s.calendarRepo.Get(s.domainUUIDForRequest(httptest.NewRequest("GET", "http://localhost/", nil)), c.ID, c.Owner) + settings := calendarAPI + "calendars/" + c.ID + "/settings" + body, _ := json.Marshal(map[string]any{"name": c.Name, "public": true, "members": map[string]string{}, "version": c.Version}) + w = calendarRequest(s, token, "PUT", settings, string(body), "") + if w.Code != 200 { + t.Fatal(w.Code, w.Body.String()) + } + json.Unmarshal(w.Body.Bytes(), &c) + w = calendarRequest(s, "", "REPORT", calendarDAV+c.ID+"/", report, "") + if w.Code != 207 { + t.Fatal(w.Code, w.Body.String()) + } + w = calendarRequest(s, "", "DELETE", href, "", event.ETag) + if w.Code != 403 { + t.Fatal(w.Code, w.Body.String()) + } + body, _ = json.Marshal(map[string]any{"name": c.Name, "public": false, "members": map[string]string{}, "version": c.Version}) + w = calendarRequest(s, token, "PUT", settings, string(body), "") + if w.Code != 200 { + t.Fatal(w.Code, w.Body.String()) + } + w = calendarRequest(s, "", "GET", href, "", "") + if w.Code != 404 { + t.Fatal("revocation failed", w.Code) + } + // Calendar-level publication cannot override a newly restricted Domain. + body, _ = json.Marshal(map[string]any{"name": c.Name, "public": true, "members": map[string]string{}, "version": func() string { fresh, _ := s.calendarRepo.Get(domain, c.ID, c.Owner); return fresh.Version }()}) + w = calendarRequest(s, token, "PUT", settings, string(body), "") + if w.Code != 200 { + t.Fatal(w.Body.String()) + } + if _, e := s.store.DB.Exec(`UPDATE locality_publication_policies SET policy='authenticated_acl' WHERE domain_uuid=? AND node_kind='domain'`, domain); e != nil { + t.Fatal(e) + } + w = calendarRequest(s, "", "GET", href, "", "") + if w.Code != 404 { + t.Fatal("Domain ceiling bypass", w.Code) + } + // A disabled extension closes both protocols, even for its owner. + if e := s.setSystemExtensionEnabled(domain, "organizer.calendar", false); e != nil { + t.Fatal(e) + } + w = calendarRequest(s, token, "GET", href, "", "") + if w.Code != 404 { + t.Fatal(w.Code) + } + if e := s.setSystemExtensionEnabled(domain, "organizer.calendar", true); e != nil { + t.Fatal(e) + } + for _, p := range []string{"/v/plan", "/v/plan/cal/2026", "/v/plan/cal/2026/09", "/v/plan/cal/2026/09/22/week", "/v/plan/cal/2026/09/22/timeline"} { + w = calendarRequest(s, token, "GET", p, "", "") + if w.Code != 200 || !strings.Contains(w.Body.String(), "calendar-app") { + t.Fatal(p, w.Code, w.Body.String()) + } + } + for _, p := range []string{"/v/plan/cal/2026/02/30", "/v/plan/cal/2026/13", "/v/plan/bogus"} { + w = calendarRequest(s, token, "GET", p, "", "") + if w.Code != 404 { + t.Fatal(p, w.Code) + } + } +} + +func TestCalendarDeleteAPIUsesVersionAndCancelsQueuedSync(t *testing.T) { + s, token, domain := configFixture(t) + s.registerCalendarRoutes() + w := calendarRequest(s, token, "POST", calendarAPI+"calendars", `{"name":"Disposable","pretty_name":"disposable"}`, "") + if w.Code != 201 { + t.Fatal(w.Code, w.Body.String()) + } + var c calendar.Calendar + if err := json.Unmarshal(w.Body.Bytes(), &c); err != nil { + t.Fatal(err) + } + if _, err := s.store.EnqueueEventWithOptions("", calendarSyncType, domain+":"+c.ID, `{}`, time.Now().Add(time.Hour), -10, 1); err != nil { + t.Fatal(err) + } + settings := calendarAPI + "calendars/" + c.ID + "/settings" + w = calendarRequest(s, token, "DELETE", settings, `{"version":"`+uuid.NewString()+`"}`, "") + if w.Code != 412 { + t.Fatal("stale delete", w.Code, w.Body.String()) + } + w = calendarRequest(s, token, "DELETE", settings, `{"version":"`+c.Version+`"}`, "") + if w.Code != 204 || w.Body.Len() != 0 { + t.Fatal(w.Code, w.Body.String()) + } + if _, err := s.calendarRepo.Get(domain, c.ID, c.Owner); !errors.Is(err, calendar.ErrMissing) { + t.Fatal(err) + } + var status string + if err := s.store.DB.QueryRow(`SELECT status FROM event_jobs WHERE event_type=? AND event_key=? ORDER BY created_at_ms DESC LIMIT 1`, calendarSyncType, domain+":"+c.ID).Scan(&status); err != nil || status != "cancelled" { + t.Fatal(status, err) + } +} diff --git a/internal/server/calendar_upcoming.go b/internal/server/calendar_upcoming.go new file mode 100644 index 0000000..bcdd880 --- /dev/null +++ b/internal/server/calendar_upcoming.go @@ -0,0 +1,81 @@ +package server + +import ( + "context" + "net/http" + "net/url" + "pageswiki/internal/calendar" + "sort" + "time" +) + +func (s *Server) handleCalendarUpcoming(w http.ResponseWriter, r *http.Request, repo *calendar.Repository, domain, actor string) { + w.Header().Set("Cache-Control", "private, no-store") + if r.Method != http.MethodGet { + w.Header().Set("Allow", "GET") + w.WriteHeader(405) + return + } + if actor == "" { + calendarError(w, calendar.ErrForbidden) + return + } + cs, err := repo.List(domain, actor) + if err != nil { + calendarError(w, err) + return + } + defaults, err := repo.Defaults(domain, actor) + if err != nil { + calendarError(w, err) + return + } + if len(defaults) == 0 && len(cs) > 0 { + defaults = []string{cs[0].ID} + } + selected := map[string]bool{} + for _, id := range defaults { + selected[id] = true + } + type entry struct { + calendar.Event + Calendar string `json:"calendar"` + Href string `json:"href"` + } + events := []entry{} + ctx, cancel := context.WithTimeout(r.Context(), 5*time.Second) + defer cancel() + // Calendar day boundaries use the configured Domain timezone, including + // 23/25-hour DST days. The browser sends a civil date only as a hint. + location := s.getLocation(domain) + now := time.Now().In(location) + today := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, location) + start := today + if raw := r.URL.Query().Get("date"); raw != "" { + day, e := time.ParseInLocation("2006-01-02", raw, location) + if e != nil || day.Before(today.AddDate(0, 0, -2)) || day.After(today.AddDate(0, 0, 1)) { + calendarError(w, calendar.ErrInvalid) + return + } + start = day + } + end := start.AddDate(0, 0, 31) + for _, c := range cs { + if !selected[c.ID] { + continue + } + items, e := repo.Upcoming(ctx, domain, c.ID, actor, start, end) + if e != nil { + calendarError(w, e) + return + } + for _, event := range items { + events = append(events, entry{Event: event, Calendar: c.Name, Href: "/v/plan/event/" + url.PathEscape(event.UID) + "?calendar=" + url.QueryEscape(c.PrettyName)}) + } + } + sort.SliceStable(events, func(i, j int) bool { return events[i].Start.Before(events[j].Start) }) + if len(events) > 20 { + events = events[:20] + } + writeEventJSON(w, 200, map[string]any{"events": events}) +} diff --git a/internal/server/calendar_upcoming_test.go b/internal/server/calendar_upcoming_test.go new file mode 100644 index 0000000..1659271 --- /dev/null +++ b/internal/server/calendar_upcoming_test.go @@ -0,0 +1,70 @@ +package server + +import ( + "context" + "encoding/json" + "fmt" + "strings" + "testing" + "time" + + "pageswiki/internal/calendar" +) + +func TestCalendarUpcomingDefaultsAndBounds(t *testing.T) { + s, token, domain := configFixture(t) + s.registerCalendarRoutes() + repo, e := s.calendars() + if e != nil { + t.Fatal(e) + } + owner, e := s.store.PrincipalForSession(domain, token) + if e != nil { + t.Fatal(e) + } + c, e := repo.Create(context.Background(), domain, owner.UUID, "Default", "default") + if e != nil { + t.Fatal(e) + } + other, e := repo.Create(context.Background(), domain, owner.UUID, "Other", "other") + if e != nil { + t.Fatal(e) + } + if e = repo.SaveDefaults(context.Background(), domain, owner.UUID, []string{c.ID}); e != nil { + t.Fatal(e) + } + for i := 0; i < 25; i++ { + start := time.Now().UTC().Add(time.Duration(i+1) * time.Hour).Truncate(time.Second) + b, _ := json.Marshal(map[string]any{"summary": fmt.Sprintf("Event %02d", i), "start": start, "end": start.Add(time.Hour)}) + if w := calendarRequest(s, token, "POST", calendarAPI+"calendars/"+c.ID+"/events", string(b), ""); w.Code != 201 { + t.Fatal(w.Code, w.Body.String()) + } + } + start := time.Now().UTC().Add(time.Hour).Truncate(time.Second) + b, _ := json.Marshal(map[string]any{"summary": "Not selected", "start": start, "end": start.Add(time.Hour)}) + if w := calendarRequest(s, token, "POST", calendarAPI+"calendars/"+other.ID+"/events", string(b), ""); w.Code != 201 { + t.Fatal(w.Code, w.Body.String()) + } + w := calendarRequest(s, token, "GET", calendarAPI+"upcoming", "", "") + var result struct { + Events []struct { + calendar.Event + Href string + } + } + if w.Code != 200 || json.Unmarshal(w.Body.Bytes(), &result) != nil || len(result.Events) != 20 { + t.Fatal(w.Code, w.Body.String()) + } + if !strings.Contains(result.Events[0].Href, "calendar=default") || result.Events[0].Summary != "Event 00" || result.Events[19].Summary != "Event 19" { + t.Fatal(result.Events) + } + if !strings.Contains(w.Header().Get("Cache-Control"), "no-store") { + t.Fatal("private response cached") + } + if w = calendarRequest(s, "", "GET", calendarAPI+"upcoming", "", ""); w.Code != 403 { + t.Fatal("anonymous access", w.Code) + } + if w = calendarRequest(s, token, "GET", calendarAPI+"upcoming?date=1900-01-01", "", ""); w.Code != 422 { + t.Fatal("unbounded dates", w.Code) + } +} diff --git a/internal/server/children_path_encoding_test.go b/internal/server/children_path_encoding_test.go new file mode 100644 index 0000000..dc12614 --- /dev/null +++ b/internal/server/children_path_encoding_test.go @@ -0,0 +1,48 @@ +package server + +import ( + "net/url" + "strings" + "testing" + + "golang.org/x/net/html" +) + +func TestChildrenPathsKeepLiteralURLCharacters(t *testing.T) { + s, _, domain := configFixture(t) + path := "/encoding/file ?#%_日本語.txt" + object, err := s.store.CreatePageAtPathInDomain(domain, path) + if err != nil { + t.Fatal(err) + } + if _, err := s.store.SaveRevisionContent(object, []byte("example"), "", "und", "text/plain", "file.txt"); err != nil { + t.Fatal(err) + } + for _, view := range []string{"list", "detail", "icon"} { + rendered, err := s.renderChildrenProjectionFiltered(domain, childrenMacroArgs{TargetPath: "/encoding", View: view, Limit: 100}, func(string) bool { return true }) + if err != nil { + t.Fatal(err) + } + z := html.NewTokenizer(strings.NewReader(rendered)) + found := false + for z.Next() != html.ErrorToken { + token := z.Token() + if token.Data != "a" { + continue + } + for _, attr := range token.Attr { + if attr.Key != "href" { + continue + } + parsed, err := url.Parse(attr.Val) + if err != nil || parsed.Path != path || parsed.RawQuery != "" || parsed.Fragment != "" { + t.Fatalf("%s link=%q (%v)", view, attr.Val, err) + } + found = true + } + } + if !found { + t.Fatalf("%s link missing: %s", view, rendered) + } + } +} diff --git a/internal/server/children_projection.go b/internal/server/children_projection.go new file mode 100644 index 0000000..f4f90b7 --- /dev/null +++ b/internal/server/children_projection.go @@ -0,0 +1,335 @@ +package server + +import ( + "fmt" + "html" + "net/http" + "net/url" + "os" + "path/filepath" + "strconv" + "strings" + "time" + + "pageswiki/internal/store" +) + +func (s *Server) handleChildrenProjection(w http.ResponseWriter, r *http.Request) { + args := parseChildrenMacroArgs("", r.URL.Query().Get("path")) + args.View = r.URL.Query().Get("view") + if args.View == "compact" { + args.View = "icon" + } + if args.View != "icon" && args.View != "detail" { + args.View = "list" + } + args.Excludes = splitExcludePatterns(r.URL.Query().Get("exclude")) + args.Offset, _ = strconv.Atoi(r.URL.Query().Get("offset")) + args.Limit, _ = strconv.Atoi(r.URL.Query().Get("limit")) + if args.Limit <= 0 || args.Limit > 400 { + args.Limit = 120 + } + + rendered, err := s.renderReadableChildren(r, args) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.Header().Set("Cache-Control", "private, no-store") + _, _ = w.Write([]byte(rendered)) +} + +func (s *Server) renderChildrenProjection( + domainUUID string, + args childrenMacroArgs, +) (string, error) { + return s.renderChildrenProjectionFiltered(domainUUID, args, nil) +} + +func (s *Server) renderChildrenProjectionFiltered( + domainUUID string, + args childrenMacroArgs, + allowed func(string) bool, +) (string, error) { + // /u is a profile/user-Wiki namespace, not a root directory entry. Keep it + // reachable by URL while hiding it from every root children projection, + // including asynchronous view switches and cached continuation requests. + if args.TargetPath == "/" && !isExcludedPath("/u", args.Excludes) { + args.Excludes = append(args.Excludes, "/u") + } + if args.View == "list" { + entries, total, err := s.store.ListChildEntriesPageInDomain(domainUUID, args.TargetPath, args.Offset, args.Limit) + if err != nil { + return "", err + } + var body strings.Builder + body.WriteString(`
      `) + for _, entry := range entries { + child := entry.Path + if isExcludedPath(child, args.Excludes) || (allowed != nil && !allowed(child)) { + continue + } + displayName := entry.Title + if displayName == "" { + displayName = childName(args.TargetPath, child) + } + body.WriteString(fmt.Sprintf( + `
    • %s
    • `, + html.EscapeString(child), + html.EscapeString((&url.URL{Path: child}).EscapedPath()), + html.EscapeString(displayName), + )) + } + body.WriteString("
    ") + writeChildrenMore( + &body, + args, + args.Offset+len(entries), + total, + ) + return body.String(), nil + } + + entries, total, err := s.store.ListChildEntriesPageInDomain( + domainUUID, + args.TargetPath, + args.Offset, + args.Limit, + ) + if err != nil { + return "", err + } + var body strings.Builder + if args.View == "icon" { + body.WriteString(`
    `) + } else { + body.WriteString(`
    UUIDCreatedRevisionsMax Body{{ T "config.created" }}{{ T "config.revisions" }}{{ T "config.max_body" }}
    ` + + `` + + ``) + } + for _, entry := range entries { + if isExcludedPath(entry.Path, args.Excludes) || (allowed != nil && !allowed(entry.Path)) { + continue + } + if args.View == "icon" { + body.WriteString(s.renderChildIcon(args.TargetPath, entry)) + continue + } + contentType := entry.ContentType + if entry.IsDir { + contentType = "folder" + } + updated := "—" + if entry.UpdatedAt > 0 { + updated = time.Unix(entry.UpdatedAt, 0).Format("2006-01-02 15:04") + } + displayName := entry.Title + if displayName == "" { + displayName = childName(args.TargetPath, entry.Path) + } + body.WriteString(fmt.Sprintf( + ``, + html.EscapeString(entry.Path), + html.EscapeString((&url.URL{Path: entry.Path}).EscapedPath()), + html.EscapeString(displayName), + html.EscapeString(contentType), + entry.Size, + updated, + )) + } + if args.View == "icon" { + body.WriteString("") + } else { + body.WriteString("
    NameTypeSizeUpdated
    %s%s%d%s
    ") + } + writeChildrenMore(&body, args, args.Offset+len(entries), total) + return body.String(), nil +} + +func writeChildrenMore( + body *strings.Builder, + args childrenMacroArgs, + nextOffset, total int, +) { + if nextOffset >= total { + return + } + query := url.Values{ + "path": {args.TargetPath}, + "view": {args.View}, + "offset": {strconv.Itoa(nextOffset)}, + "limit": {strconv.Itoa(args.Limit)}, + } + if len(args.Excludes) > 0 { + query.Set("exclude", strings.Join(args.Excludes, ",")) + } + body.WriteString(fmt.Sprintf( + `
    `, + html.EscapeString("/v/children?"+query.Encode()), + )) +} + +func childName(parent, child string) string { + return strings.TrimPrefix(strings.TrimPrefix(child, parent), "/") +} + +func (s *Server) renderChildIcon(parent string, entry store.BrowserEntry) string { + path := html.EscapeString(entry.Path) + name := entry.Title + if name == "" { + name = childName(parent, entry.Path) + } + name = html.EscapeString(name) + preview := s.entryPreviewHTML(entry, true) + return fmt.Sprintf( + `%s%s`, + path, + html.EscapeString((&url.URL{Path: entry.Path}).EscapedPath()), + preview, + name, + ) +} + +// entryPreviewHTML is shared by directory listings and search results. Callers +// that render broad result sets can disable enqueueing and rely on the periodic +// preview scheduler, avoiding a burst of database writes during navigation. +func (s *Server) entryPreviewHTML( + entry store.BrowserEntry, + enqueueMissing bool, +) string { + if entry.IsDir { + return childTypeIcon("folder") + } + filename := entry.Filename + if filename == "" { + filename = filepath.Base(entry.Path) + } + adapter := selectProjectionAdapter(contentDescriptor{ + MediaType: strings.ToLower(strings.Split(entry.ContentType, ";")[0]), + Filename: filename, + SizeBytes: int64(entry.Size), + }) + previewURL, cached := s.entryPreviewState(entry, adapter.ID, enqueueMissing) + if cached { + badge := "" + switch adapter.ID { + case "pdf": + badge = "PDF" + case "video": + badge = "▶" + case "excalidraw": + badge = "EX" + case "archive": + badge = "ZIP" + } + badgeHTML := "" + if badge != "" { + badgeHTML = `` + badge + `` + } + return fmt.Sprintf( + `%s`, + html.EscapeString(previewURL), + badgeHTML, + ) + } + switch adapter.ID { + case "image": + return pendingPreviewIcon("image", previewURL, "") + case "video": + return pendingPreviewIcon("video", previewURL, "▶") + case "pdf": + return pendingPreviewIcon("pdf", previewURL, "PDF") + case "excalidraw": + return pendingPreviewIcon("drawing", previewURL, "EX") + case "archive": + return childTypeIcon("archive") + case "debian-package": + return childTypeIcon("package") + case "audio": + return childTypeIcon("audio") + case "text", "csv": + if isProgramFilename(filename) { + return childTypeIcon("code") + } + return childTypeIcon("text") + default: + if isProgramFilename(filename) { + return childTypeIcon("code") + } + switch strings.ToLower(filepath.Ext(filename)) { + case ".txt", ".md", ".log", ".rst": + return childTypeIcon("text") + } + return childTypeIcon("file") + } +} + +func (s *Server) entryPreviewState( + entry store.BrowserEntry, + kind string, + enqueueMissing bool, +) (string, bool) { + if enqueueMissing { + return s.enqueuePreview(entry) + } + switch kind { + case "image", "pdf", "video", "excalidraw", "archive": + default: + return "", false + } + if s.previewRoot == "" || entry.DocumentHash == "" { + return "", false + } + cacheURL := s.previewCacheURL(entry.DocumentHash, kind) + info, err := os.Stat(s.previewCachePath(entry.DocumentHash, kind)) + return cacheURL, err == nil && info.Size() > 0 +} + +func pendingPreviewIcon(kind, cacheURL, badge string) string { + if cacheURL == "" { + return childTypeIcon(kind) + } + badgeHTML := "" + if badge != "" { + badgeHTML = `` + badge + `` + } + return `` + + childTypeIcon(kind) + badgeHTML + `` +} + +func isProgramFilename(filename string) bool { + switch strings.ToLower(filepath.Ext(filename)) { + case ".py", ".sh", ".bash", ".zsh", ".js", ".jsx", ".ts", ".tsx", + ".go", ".rs", ".c", ".h", ".cc", ".cpp", ".java", ".rb", ".php", + ".sql", ".css", ".html", ".yaml", ".yml", ".toml": + return true + default: + return false + } +} + +func childTypeIcon(kind string) string { + paths := map[string]string{ + "folder": ``, + "archive": ``, + "package": ``, + "audio": ``, + "image": ``, + "video": ``, + "pdf": ``, + "drawing": ``, + "code": ``, + "text": ``, + "file": ``, + } + path := paths[kind] + if path == "" { + path = paths["file"] + } + return `` +} diff --git a/internal/server/city_autoplan.go b/internal/server/city_autoplan.go new file mode 100644 index 0000000..16b7d91 --- /dev/null +++ b/internal/server/city_autoplan.go @@ -0,0 +1,184 @@ +package server + +import ( + "crypto/sha256" + "database/sql" + "encoding/hex" + "errors" + "fmt" + "net/url" + "path" + "strings" +) + +type cityAutoPlanItem struct { + Path string `json:"path"` + PageUUID string `json:"page_uuid"` + Quartier, Street, Spot string + QuartierPath, StreetPath, SpotPath string `json:",omitempty"` + Undefined bool `json:"undefined_spot"` + Action string `json:"action"` +} + +func cityAutoName(raw, prefix string) string { + decoded, err := url.PathUnescape(raw) + if err == nil { + raw = decoded + } + name := citySuggestionName(raw) + if len(name) >= 2 { + return name + } + sum := sha256.Sum256([]byte(raw)) + return prefix + "-" + hex.EncodeToString(sum[:4]) +} + +// Names are identifiers, not ownership. In particular Spot names are unique +// across the entire Domain, even when their Streets differ. +func (s *Server) availableCityAutoName(domain, kind, parent, base, boundary string) (string, error) { + for attempt := 0; attempt < 32; attempt++ { + name := base + if attempt > 0 { + sum := sha256.Sum256([]byte(fmt.Sprintf("%s:%s:%d", kind, boundary, attempt))) + stem := base + if len(stem) > 47 { + stem = stem[:47] + } + name = stem + "-" + hex.EncodeToString(sum[:8]) + } + var exists bool + var err error + if kind == "spot" { + err = s.store.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM spots WHERE domain_uuid=? AND name=? AND state!='archived')`, domain, name).Scan(&exists) + } else if kind == "quartier" { + err = s.store.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM zones WHERE domain_uuid=? AND kind='quartier' AND name=? AND state!='archived')`, domain, name).Scan(&exists) + } else { + err = s.store.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM zones WHERE domain_uuid=? AND parent_uuid=? AND name=? AND state!='archived')`, domain, parent, name).Scan(&exists) + } + if err != nil { + return "", err + } + if !exists { + return name, nil + } + } + return "", errors.New("unable to allocate unique generated City name") +} + +func (s *Server) buildCityAutoPlan(domainUUID string) ([]cityAutoPlanItem, error) { + rows, err := s.store.DB.Query(`SELECT p.path,p.object_uuid FROM paths p WHERE p.domain_uuid=? AND p.path LIKE '/%' AND p.path!='/u' AND p.path NOT LIKE '/u/%' + AND NOT EXISTS(SELECT 1 FROM city_page_overrides ov JOIN spots dest ON dest.uuid=ov.spot_uuid AND dest.domain_uuid=ov.domain_uuid AND dest.state!='archived' WHERE ov.domain_uuid=p.domain_uuid AND ov.page_uuid=p.object_uuid) + ORDER BY p.path`, domainUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var out []cityAutoPlanItem + for rows.Next() { + var semanticPath, pageUUID string + if err := rows.Scan(&semanticPath, &pageUUID); err != nil { + return nil, err + } + parts := strings.Split(strings.Trim(semanticPath, "/"), "/") + if len(parts) < 3 || parts[0] == "system" { + continue + } + item := cityAutoPlanItem{Path: semanticPath, PageUUID: pageUUID, Quartier: cityAutoName(parts[0], "quartier"), Street: cityAutoName(parts[1], "street"), QuartierPath: "/" + parts[0], StreetPath: "/" + parts[0] + "/" + parts[1]} + if len(parts) >= 4 { + item.Spot = cityAutoName(parts[2], "spot") + item.SpotPath = item.StreetPath + "/" + parts[2] + } else { + item.Undefined = true + item.Spot = item.Street + "-undefined" + item.SpotPath = item.StreetPath + "/_undefined" + } + item.Action = "create" + if q, e := s.store.CityNodeOverlappingPath(domainUUID, "quartier", "", item.QuartierPath); e == nil { + item.Quartier = q.Name + item.Action = "merge" + if st, e := s.store.CityNodeOverlappingPath(domainUUID, "street", q.UUID, item.StreetPath); e == nil { + item.Street = st.Name + if spot, e := s.store.CityNodeOverlappingPath(domainUUID, "spot", st.UUID, item.SpotPath); e == nil { + item.Spot = spot.Name + } + } + } + out = append(out, item) + } + return out, rows.Err() +} + +func (s *Server) applyCityAutoPlan(domainUUID, actor string) (int, error) { + plan, err := s.buildCityAutoPlan(domainUUID) + if err != nil { + return 0, err + } + quartiers, streets, spots := map[string]string{}, map[string]string{}, map[string]string{} + applied := 0 + for _, item := range plan { + qID := quartiers[item.QuartierPath] + if qID == "" { + if q, e := s.store.CityNodeOverlappingPath(domainUUID, "quartier", "", item.QuartierPath); e == nil { + qID = q.UUID + } else { + if !errors.Is(e, sql.ErrNoRows) { + return applied, e + } + name, err := s.availableCityAutoName(domainUUID, "quartier", "", item.Quartier, item.QuartierPath) + if err != nil { + return applied, err + } + qID, e = s.store.CreateZoneAtPath(domainUUID, actor, "quartier", "", name, item.Quartier, "Generated from URL Paths", item.QuartierPath) + if e != nil { + return applied, e + } + } + quartiers[item.QuartierPath] = qID + } + streetKey := qID + item.StreetPath + streetID := streets[streetKey] + if streetID == "" { + if st, e := s.store.CityNodeOverlappingPath(domainUUID, "street", qID, item.StreetPath); e == nil { + streetID = st.UUID + } else { + if !errors.Is(e, sql.ErrNoRows) { + return applied, e + } + name, err := s.availableCityAutoName(domainUUID, "street", qID, item.Street, item.StreetPath) + if err != nil { + return applied, err + } + streetID, e = s.store.CreateZoneAtPath(domainUUID, actor, "street", qID, name, item.Street, "", item.StreetPath) + if e != nil { + return applied, e + } + } + streets[streetKey] = streetID + } + spotKey := streetID + item.SpotPath + spotID := spots[spotKey] + if spotID == "" { + if spot, e := s.store.CityNodeOverlappingPath(domainUUID, "spot", streetID, item.SpotPath); e == nil { + spotID = spot.UUID + } else { + if !errors.Is(e, sql.ErrNoRows) { + return applied, e + } + name, err := s.availableCityAutoName(domainUUID, "spot", streetID, item.Spot, item.SpotPath) + if err != nil { + return applied, err + } + spotID, e = s.store.CreateSpotAtPath(domainUUID, actor, streetID, name, item.Spot, "Generated from URL Paths", item.SpotPath) + if e != nil { + return applied, e + } + } + spots[spotKey] = spotID + } + if err := s.store.AddSpotPage(domainUUID, actor, spotID, item.PageUUID, item.Path, "primary", path.Base(item.Path)); err != nil && !errors.Is(err, sql.ErrNoRows) { + return applied, err + } + applied++ + } + return applied, nil +} diff --git a/internal/server/city_autoplan_test.go b/internal/server/city_autoplan_test.go new file mode 100644 index 0000000..9362142 --- /dev/null +++ b/internal/server/city_autoplan_test.go @@ -0,0 +1,77 @@ +package server + +import ( + "pageswiki/internal/db" + "pageswiki/internal/store" + "path/filepath" + "testing" +) + +func TestCityAutoPlanUsesFixedURLDepthAndMergesDescendants(t *testing.T) { + database, err := db.Open(filepath.Join(t.TempDir(), "pages.db")) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { database.Close() }) + if err = db.Migrate(database); err != nil { + t.Fatal(err) + } + st := store.New(database) + domain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + for _, p := range []string{"/tech/dev/readme", "/tech/dev/lang/python/page", "/tech/dev/lang/py3/page2"} { + if _, err = st.CreatePageAtPathInDomain(domain.UUID, p); err != nil { + t.Fatal(err) + } + } + srv := &Server{store: st} + plan, err := srv.buildCityAutoPlan(domain.UUID) + if err != nil || len(plan) != 3 { + t.Fatalf("plan=%#v, %v", plan, err) + } + if count, err := srv.applyCityAutoPlan(domain.UUID, "actor"); err != nil || count != 3 { + t.Fatalf("apply count=%d err=%v", count, err) + } + city, err := st.GetCityMap(domain.UUID) + if err != nil { + t.Fatal(err) + } + if len(city.Quartiers) != 1 || len(city.Quartiers[0].Streets) != 1 || len(city.Quartiers[0].Streets[0].Spots) != 2 { + t.Fatalf("city=%#v", city) + } + for _, spot := range city.Quartiers[0].Streets[0].Spots { + if spot.Name == "lang" && len(spot.Pages) != 2 { + t.Fatalf("lang pages=%#v", spot.Pages) + } + } + if err := srv.reconcileCityActivity(domain.UUID); err != nil { + t.Fatal("event-driven reconcile:", err) + } + checkpoint, err := st.ActivityOutboxCheckpoint("city", domain.UUID) + if err != nil || checkpoint.LastSequence == 0 { + t.Fatalf("city checkpoint=%+v err=%v", checkpoint, err) + } +} + +func TestCityAutoPlanSameSpotNameInDifferentStreets(t *testing.T) { + s, _, domain := configFixture(t) + for _, p := range []string{"/alpha/dev/lang/one", "/beta/dev/lang/two", "/alpha/dev/readme", "/beta/dev/readme"} { + if _, e := s.store.CreatePageAtPathInDomain(domain, p); e != nil { + t.Fatal(e) + } + } + for i := 0; i < 2; i++ { + if _, e := s.applyCityAutoPlan(domain, "system:city"); e != nil { + t.Fatal("reconcile", i, e) + } + var spots, names int + if e := s.store.DB.QueryRow(`SELECT count(*),count(DISTINCT name) FROM spots WHERE domain_uuid=? AND state!='archived'`, domain).Scan(&spots, &names); e != nil { + t.Fatal(e) + } + if spots != 4 || names != 4 { + t.Fatal("colliding names merged or duplicated", spots, names) + } + } +} diff --git a/internal/server/city_governance.go b/internal/server/city_governance.go new file mode 100644 index 0000000..b57f494 --- /dev/null +++ b/internal/server/city_governance.go @@ -0,0 +1,129 @@ +package server + +import ( + "database/sql" + "encoding/json" + "errors" + "io" + "net/http" + "strings" + + "pageswiki/internal/store" +) + +func cityGovernanceRoute(path string) bool { + if !strings.HasPrefix(path, "/_/api/v1/city/") { + return false + } + p := strings.Split(strings.TrimPrefix(path, "/_/api/v1/city/"), "/") + return (len(p) == 3 || (len(p) == 4 && (p[3] == "preview" || p[3] == "members" || p[3] == "access" || p[3] == "publication" || p[3] == "auto-publication"))) && (p[0] == "zones" || p[0] == "spots" || p[0] == "domains") && p[1] != "" && p[2] == "governance" +} + +func (s *Server) handleCityGovernance(w http.ResponseWriter, r *http.Request) { + privateCityResponse(w) + p := strings.Split(strings.TrimPrefix(r.URL.Path, "/_/api/v1/city/"), "/") + preview := len(p) == 4 && p[3] == "preview" + members := len(p) == 4 && p[3] == "members" + access := len(p) == 4 && p[3] == "access" + publication := len(p) == 4 && p[3] == "publication" + automatic := len(p) == 4 && p[3] == "auto-publication" + if !((len(p) == 3 || access || publication || automatic) && (r.Method == "GET" || r.Method == "PATCH")) && !(preview && r.Method == "POST") && !(members && r.Method == "GET") { + writeEventJSON(w, 405, map[string]string{"error": "Method not allowed"}) + return + } + principal := s.requestPrincipal(r) + if principal == nil { + writeEventJSON(w, 403, map[string]string{"error": translate(s.getLocale(s.domainUUIDForRequest(r)), "city.governance.denied")}) + return + } + domain := s.domainUUIDForRequest(r) + kind := map[string]string{"spots": "spot", "domains": "domain"}[p[0]] + var err error + if p[0] == "zones" { + err = s.store.DB.QueryRowContext(r.Context(), `SELECT kind FROM zones WHERE uuid=? AND domain_uuid=?`, p[1], domain).Scan(&kind) + } + var result any + if err == nil && automatic { + var change *store.AutoPublicationChange + if r.Method == "PATCH" { + change = &store.AutoPublicationChange{} + decoder := json.NewDecoder(http.MaxBytesReader(w, r.Body, 4096)) + decoder.DisallowUnknownFields() + if decoder.Decode(change) != nil || decoder.Decode(new(any)) != io.EOF { + err = store.ErrGovernanceInvalid + } + } + if err == nil { + result, err = s.store.AutoPublication(r.Context(), domain, principal.UUID, kind, p[1], change) + } + } else if err == nil && publication { + var change *store.PublicationChange + if r.Method == "PATCH" { + change = &store.PublicationChange{} + decoder := json.NewDecoder(http.MaxBytesReader(w, r.Body, 4096)) + decoder.DisallowUnknownFields() + if decoder.Decode(change) != nil || decoder.Decode(new(any)) != io.EOF { + err = store.ErrGovernanceInvalid + } + } + if err == nil { + result, err = s.store.LocalityPublication(r.Context(), domain, principal.UUID, kind, p[1], change) + } + } else if err == nil && access { + var change *store.LocalityAccess + if r.Method == "PATCH" { + change = &store.LocalityAccess{} + decoder := json.NewDecoder(http.MaxBytesReader(w, r.Body, 32<<10)) + decoder.DisallowUnknownFields() + if decoder.Decode(change) != nil || decoder.Decode(new(any)) != io.EOF { + err = store.ErrGovernanceInvalid + } + } + if err == nil { + result, err = s.store.LocalityAccess(r.Context(), domain, principal.UUID, kind, p[1], change) + } + } else if err == nil && members { + result, err = s.store.CityGovernanceMembers(r.Context(), domain, principal.UUID, kind, p[1], r.URL.Query().Get("q")) + } else if err == nil && r.Method == "GET" { + result, err = s.store.CityGovernance(r.Context(), domain, principal.UUID, kind, p[1]) + } else if err == nil { + var change store.CityGovernanceChange + decoder := json.NewDecoder(http.MaxBytesReader(w, r.Body, 16<<10)) + decoder.DisallowUnknownFields() + if decoder.Decode(&change) != nil || decoder.Decode(new(any)) != io.EOF { + err = store.ErrGovernanceInvalid + } else { + result, err = s.store.ChangeCityGovernance(r.Context(), domain, principal.UUID, kind, p[1], change, preview) + } + } + if err != nil { + status, key := 503, "city.governance.unavailable" + switch { + case errors.Is(err, sql.ErrNoRows), errors.Is(err, store.ErrAccessDenied): + status, key = 403, "city.governance.denied" + case errors.Is(err, store.ErrGovernanceConflict): + status, key = 409, err.Error() + case errors.Is(err, store.ErrLocalityAccessEnforcing), errors.Is(err, store.ErrLocalityAccessAlias), errors.Is(err, store.ErrPublicationImpact), errors.Is(err, store.ErrGovernanceCeiling), errors.Is(err, store.ErrGovernanceConfirm), errors.Is(err, store.ErrGovernanceInvalid): + status, key = 400, err.Error() + } + writeEventJSON(w, status, map[string]string{"error": translate(s.getLocale(domain), key)}) + return + } + writeEventJSON(w, 200, result) +} + +func governanceEndpoint(kind, id string) string { + collection := map[string]string{"quartier": "zones", "street": "zones", "spot": "spots", "domain": "domains"}[kind] + return "/_/api/v1/city/" + collection + "/" + id + "/governance" +} + +func (s *Server) governanceForUI(r *http.Request, kind, id string) string { + p := s.requestPrincipal(r) + if p == nil { + return "" + } + if _, err := s.store.CityGovernance(r.Context(), s.domainUUIDForRequest(r), p.UUID, kind, id); err != nil { + return "" + } + return governanceEndpoint(kind, id) +} diff --git a/internal/server/city_governance_browser_test.go b/internal/server/city_governance_browser_test.go new file mode 100644 index 0000000..85859f3 --- /dev/null +++ b/internal/server/city_governance_browser_test.go @@ -0,0 +1,70 @@ +package server + +import ( + "context" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "strings" + "testing" + "time" +) + +func TestCityGovernanceChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + s, token, domain := configFixture(t) + s.mux.HandleFunc("/_/api/v1/city/", s.handleCityAPI) + s.mux.HandleFunc("/v/city", s.handleCityMap) + s.mux.HandleFunc("/v/city/", s.handleCityMap) + q, err := s.store.CreateZoneAtPath(domain, "test", "quartier", "", "life", "Life", "", "/life") + if err != nil { + t.Fatal(err) + } + p, err := s.store.CreatePasswordAccount(domain, "delegate", "a long test password", "Delegate", "") + if err != nil { + t.Fatal(err) + } + script, err := os.ReadFile("internal/server/testdata/city-governance.js") + if err != nil { + t.Fatal(err) + } + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + if r.Header.Get("Origin") != "" { + r.Header.Set("Origin", "http://localhost") + } + if r.Method == "GET" && (r.URL.Path == "/v/city/q/life" || r.URL.Path == "/v/city") { + rec := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(rec, r) + for k, v := range rec.Header() { + w.Header()[k] = v + } + w.WriteHeader(rec.Code) + _, _ = w.Write([]byte(strings.Replace(rec.Body.String(), "", browserFixtureScript(rec.Header(), script)+"", 1))) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + for _, path := range []string{"/v/city/q/life", "/v/city"} { + ctx, cancel := context.WithTimeout(context.Background(), 40*time.Second) + cmd := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", server.URL+path, t.TempDir()) + out, e := cmd.CombinedOutput() + cancel() + if e != nil { + t.Fatalf("%s: %v %s", path, e, out) + } + } + g, err := s.store.CityGovernance(context.Background(), domain, p.UUID, "quartier", q) + if err != nil || len(g.Owners) != 1 || g.Policy != "authenticated_acl" || g.PublicationEnabled { + t.Fatalf("UI persisted %+v %v", g, err) + } + a, err := s.store.LocalityAccess(context.Background(), domain, p.UUID, "quartier", q, nil) + if err != nil || len(a.Entries) != 1 || a.Entries[0].Permission != "read_write" || a.Mode != "restricted" { + t.Fatalf("ACL UI persisted %+v %v", a, err) + } +} diff --git a/internal/server/city_governance_test.go b/internal/server/city_governance_test.go new file mode 100644 index 0000000..cc96144 --- /dev/null +++ b/internal/server/city_governance_test.go @@ -0,0 +1,238 @@ +package server + +import ( + "context" + "encoding/json" + "net/http/httptest" + "strings" + "sync" + "testing" + + "pageswiki/internal/store" +) + +func TestCityGovernanceDelegationAndCaps(t *testing.T) { + s, admin, domain := configFixture(t) + s.mux.HandleFunc("/_/api/v1/city/", s.handleCityAPI) + q, err := s.store.CreateZoneAtPath(domain, "test", "quartier", "", "life", "Life", "", "/life") + if err != nil { + t.Fatal(err) + } + street, err := s.store.CreateZoneAtPath(domain, "test", "street", q, "home", "Home", "", "/life/home") + if err != nil { + t.Fatal(err) + } + spot, err := s.store.CreateSpotAtPath(domain, "test", street, "desk", "Desk", "", "/life/home/desk") + if err != nil { + t.Fatal(err) + } + q2, err := s.store.CreateZoneAtPath(domain, "test", "quartier", "", "work", "Work", "", "/work") + if err != nil { + t.Fatal(err) + } + tokens, members, principals := map[string]string{}, map[string]string{}, map[string]string{} + for _, name := range []string{"quartierowner", "spotowner", "coowner", "outsider"} { + p, e := s.store.CreatePasswordAccount(domain, name, "a long test password", name, "") + if e != nil { + t.Fatal(e) + } + principals[name] = p.UUID + tokens[name], e = s.store.CreateAuthSession(domain, p.UUID) + if e != nil { + t.Fatal(e) + } + var membership string + if e = s.store.DB.QueryRow(`SELECT uuid FROM domain_memberships WHERE domain_uuid=? AND principal_uuid=?`, domain, p.UUID).Scan(&membership); e != nil { + t.Fatal(e) + } + members[name] = membership + // Do not let default author grants accidentally admit the owner API. + if _, e = s.store.DB.Exec(`DELETE FROM auth_capability_grants WHERE role_uuid IN (SELECT role_uuid FROM auth_role_bindings WHERE membership_uuid=?)`, members[name]); e != nil { + t.Fatal(e) + } + } + call := func(token, method, url string, body any) *httptest.ResponseRecorder { + b, _ := json.Marshal(body) + r := httptest.NewRequest(method, "http://localhost"+url, strings.NewReader(string(b))) + r.Header.Set("Authorization", "Bearer "+token) + r.Header.Set("Content-Type", "application/json") + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + return w + } + dURL, qURL, sURL := governanceEndpoint("domain", domain), governanceEndpoint("quartier", q), governanceEndpoint("spot", spot) + read := func(token, url string) store.CityGovernance { + t.Helper() + w := call(token, "GET", url, nil) + if w.Code != 200 { + t.Fatalf("GET %s=%d %s", url, w.Code, w.Body.String()) + } + var g store.CityGovernance + if e := json.Unmarshal(w.Body.Bytes(), &g); e != nil { + t.Fatal(e) + } + return g + } + change := func(token, url, policy string, owners *[]string, confirm bool, code int) store.CityGovernance { + t.Helper() + g := read(token, url) + c := store.CityGovernanceChange{Epoch: g.Epoch, TopologyVersion: g.TopologyVersion, Owners: owners, ConfirmRelaxation: confirm} + if policy != "" { + c.Policy = &policy + } + w := call(token, "PATCH", url, c) + if w.Code != code { + t.Fatalf("PATCH %s=%d want %d: %s", url, w.Code, code, w.Body.String()) + } + if code == 200 { + _ = json.Unmarshal(w.Body.Bytes(), &g) + } + return g + } + if g := read(admin, dURL); g.Policy != "authenticated_acl" || g.DraftEffectivePublic || g.PublicationEnabled { + t.Fatalf("unsafe default: %+v", g) + } + change(admin, qURL, "public", nil, true, 400) + change(admin, dURL, "public", nil, false, 400) + if g := change(admin, dURL, "public", nil, true, 200); g.DraftEffectivePublic { + t.Fatal("Domain ceiling published root") + } + qs := []string{members["quartierowner"]} + change(admin, qURL, "", &qs, false, 200) + qg := read(tokens["quartierowner"], qURL) + if qg.CanAppoint { + t.Fatal("Quartier owner can appoint peers") + } + w := call(tokens["quartierowner"], "PATCH", qURL, store.CityGovernanceChange{Epoch: qg.Epoch, TopologyVersion: qg.TopologyVersion, Owners: &qs}) + if w.Code != 403 { + t.Fatalf("peer appointment=%d", w.Code) + } + if w = call(tokens["quartierowner"], "GET", governanceEndpoint("quartier", q2), nil); w.Code != 403 { + t.Fatal("foreign Quartier accessible") + } + ss := []string{members["spotowner"], members["coowner"]} + change(tokens["quartierowner"], sURL, "", &ss, false, 200) + if g := read(tokens["spotowner"], sURL); len(g.Owners) != 2 || g.CanAppoint { + t.Fatalf("co-owners: %+v", g) + } + if w = call(tokens["spotowner"], "GET", sURL+"/members", nil); w.Code != 403 { + t.Fatal("Spot owner enumerated appointment candidates") + } + if w = call(tokens["outsider"], "GET", sURL, nil); w.Code != 403 { + t.Fatal("outsider governance") + } + if w = call(tokens["spotowner"], "POST", "/_/api/v1/city/spots/"+spot+"/title", map[string]any{"title": "changed"}); w.Code != 403 { + t.Fatal("ownership granted topology write") + } + change(tokens["spotowner"], sURL, "public", nil, true, 200) + change(tokens["quartierowner"], qURL, "authenticated_acl", nil, false, 200) + if g := read(tokens["spotowner"], sURL); g.DraftEffectivePublic || g.SuperiorAllowsPublic || g.Policy != "public" { + t.Fatal("ancestor narrowing did not clamp preserved intent") + } + change(tokens["spotowner"], sURL, "public", nil, true, 400) + change(tokens["quartierowner"], qURL, "inherit", nil, false, 400) + change(tokens["quartierowner"], qURL, "inherit", nil, true, 200) + if !read(tokens["spotowner"], sURL).DraftEffectivePublic { + t.Fatal("intent lost after relaxation") + } + change(tokens["spotowner"], sURL, "authenticated_acl", nil, false, 200) + change(tokens["quartierowner"], qURL, "public", nil, true, 200) + if read(tokens["spotowner"], sURL).DraftEffectivePublic { + t.Fatal("parent bypassed child restriction") + } + // Policy preview changes neither epoch nor persistence, even on relaxation. + g := read(tokens["spotowner"], sURL) + policy := "inherit" + patch := store.CityGovernanceChange{Epoch: g.Epoch, TopologyVersion: g.TopologyVersion, Policy: &policy} + if w = call(tokens["spotowner"], "POST", sURL+"/preview", patch); w.Code != 200 || !strings.Contains(w.Body.String(), `"draft_effective_public":true`) { + t.Fatalf("preview=%d %s", w.Code, w.Body.String()) + } + if after := read(tokens["spotowner"], sURL); after.Epoch != g.Epoch || after.Policy != g.Policy { + t.Fatal("preview persisted") + } + change(tokens["spotowner"], sURL, "inherit", nil, true, 200) + if w = call(tokens["spotowner"], "PATCH", sURL, patch); w.Code != 409 { + t.Fatal("stale epoch accepted") + } + // Same-version writers cannot both commit, even when both are legitimate co-owners. + g = read(tokens["spotowner"], sURL) + policy = "authenticated_acl" + patch = store.CityGovernanceChange{Epoch: g.Epoch, TopologyVersion: g.TopologyVersion, Policy: &policy} + var wg sync.WaitGroup + codes := make(chan int, 2) + for _, name := range []string{"spotowner", "coowner"} { + wg.Add(1) + go func(token string) { defer wg.Done(); codes <- call(token, "PATCH", sURL, patch).Code }(tokens[name]) + } + wg.Wait() + close(codes) + success, conflict := 0, 0 + for c := range codes { + if c == 200 { + success++ + } + if c == 409 { + conflict++ + } + } + if success != 1 || conflict != 1 { + t.Fatalf("concurrent saves: %d success %d conflicts", success, conflict) + } + g = read(tokens["spotowner"], sURL) + patch.Epoch = g.Epoch + patch.TopologyVersion = g.TopologyVersion + if _, err = s.store.DB.Exec(`UPDATE domain_topology_versions SET version=version+1 WHERE domain_uuid=?`, domain); err != nil { + t.Fatal(err) + } + if w = call(tokens["spotowner"], "PATCH", sURL, patch); w.Code != 409 { + t.Fatal("stale topology accepted") + } + // Browser-origin fencing remains ahead of the handler-owned permission path. + r := httptest.NewRequest("PATCH", "http://localhost"+sURL, strings.NewReader(`{}`)) + r.Header.Set("Authorization", "Bearer "+admin) + r.Header.Set("Origin", "https://untrusted.invalid") + r.Header.Set("Sec-Fetch-Site", "cross-site") + w = httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + if w.Code != 403 { + t.Fatal("governance bypassed browser-origin fencing") + } + // Revocation is live and does not depend on an in-memory principal cache. + if _, err = s.store.DB.Exec(`UPDATE principals SET state='suspended' WHERE uuid=?`, principals["spotowner"]); err != nil { + t.Fatal(err) + } + if _, err = s.store.CityGovernance(context.Background(), domain, principals["spotowner"], "spot", spot); err != store.ErrAccessDenied { + t.Fatalf("suspended owner=%v", err) + } + if _, err = s.store.DB.Exec(`UPDATE domain_memberships SET state='suspended' WHERE uuid=?`, members["coowner"]); err != nil { + t.Fatal(err) + } + if _, err = s.store.CityGovernance(context.Background(), domain, principals["coowner"], "spot", spot); err != store.ErrAccessDenied { + t.Fatalf("revoked member=%v", err) + } + bad := []string{members["coowner"]} + change(admin, sURL, "", &bad, false, 400) + bad = []string{"foreign-membership"} + change(admin, sURL, "", &bad, false, 400) + if w = call(admin, "DELETE", sURL, nil); w.Code != 405 { + t.Fatal("unsupported method") + } + if w = call(admin, "GET", governanceEndpoint("domain", "foreign"), nil); w.Code != 403 { + t.Fatal("foreign Domain") + } + var events int + if err = s.store.DB.QueryRow(`SELECT COUNT(*) FROM city_governance_events WHERE domain_uuid=?`, domain).Scan(&events); err != nil || events < 8 { + t.Fatalf("audit events=%d %v", events, err) + } + none := []string{} + change(admin, qURL, "", &none, false, 200) + if w = call(tokens["quartierowner"], "GET", qURL, nil); w.Code != 403 { + t.Fatal("removed ownership remained effective") + } + if _, err = s.store.DB.Exec(`UPDATE groups SET state='suspended' WHERE domain_uuid=? AND builtin_key='domain_admin'`, domain); err != nil { + t.Fatal(err) + } + if w = call(admin, "GET", dURL, nil); w.Code != 403 { + t.Fatal("revoked admin remained authoritative") + } +} diff --git a/internal/server/city_handler.go b/internal/server/city_handler.go new file mode 100644 index 0000000..4e0bbab --- /dev/null +++ b/internal/server/city_handler.go @@ -0,0 +1,409 @@ +package server + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "net/http" + "strconv" + "strings" + + "pageswiki/internal/store" +) + +func cityReadErrorStatus(err error) int { + switch { + case errors.Is(err, store.ErrAccessDenied), errors.Is(err, sql.ErrNoRows), errors.Is(err, store.ErrCityNameAmbiguous): + return http.StatusNotFound + case errors.Is(err, store.ErrCityMapBudget), errors.Is(err, context.DeadlineExceeded), errors.Is(err, context.Canceled): + return http.StatusServiceUnavailable + default: + return http.StatusInternalServerError + } +} + +func (s *Server) handleCityMap(w http.ResponseWriter, r *http.Request) { + privateCityResponse(w) + domainUUID := s.domainUUIDForRequest(r) + principal := s.requestPrincipal(r) + canPlan := principal != nil && (s.store.IsBuiltinGroupAdmin(domainUUID, principal.UUID, "domain_admin") || s.store.Authorize(store.AuthorizationRequest{DomainUUID: domainUUID, PrincipalUUID: principal.UUID, Capability: "manage", TargetType: "domain", TargetID: domainUUID}) == nil) + path := strings.Trim(strings.TrimPrefix(r.URL.Path, "/v/city"), "/") + if path != "" { + parts := strings.Split(path, "/") + kinds := map[string]string{"q": "quartier", "s": "street", "p": "spot"} + kind := "" + if len(parts) == 2 || (len(parts) == 3 && parts[0] == "s") { + kind = kinds[parts[0]] + } + if kind == "" { + http.NotFound(w, r) + return + } + detail, err := s.store.CityNodeContext(r.Context(), domainUUID, kind, strings.Join(parts[1:], "/")) + if err != nil { + status := cityReadErrorStatus(err) + if status == http.StatusNotFound { + http.NotFound(w, r) + return + } + if status == http.StatusServiceUnavailable { + w.Header().Set("Retry-After", "5") + } + http.Error(w, http.StatusText(status), status) + return + } + if !canReadCityNode(detail, s.pathReadFilter(r)) { + http.NotFound(w, r) + return + } + pages := []store.CityPagePlacement{} + if kind == "spot" { + pages, err = s.spotPagesForRequest(r, detail.UUID) + if err != nil { + status := cityReadErrorStatus(err) + if status == http.StatusServiceUnavailable { + w.Header().Set("Retry-After", "5") + } + http.Error(w, http.StatusText(status), status) + return + } + } + pageViews := make([]cityPageView, 0, len(pages)) + for _, page := range pages { + pageViews = append(pageViews, cityPageView{page, cityPageHref(page.Path)}) + } + quartierHref, streetHref := "", "" + if detail.Quartier != nil { + quartierHref = cityDetailHref("quartier", detail.Quartier.Name, "", detail.Quartier.UUID) + } + if detail.Street != nil { + streetHref = cityDetailHref("street", detail.Street.Name, detail.Quartier.Name, detail.Street.UUID) + } + s.renderWithContext(w, r, "city_node.gohtml", map[string]any{"Title": detail.Title, "Node": detail, "Pages": pageViews, "QuartierHref": quartierHref, "StreetHref": streetHref, "MapHref": "/v/city?" + kind + "=" + detail.UUID, "CanPlan": canPlan, "Locale": s.getLocale(domainUUID), "GovernanceEndpoint": s.governanceForUI(r, kind, detail.UUID)}) + return + } + s.renderWithContext(w, r, "city_map.gohtml", map[string]any{"Title": translate(s.getLocale(domainUUID), "city.map"), "CanPlan": canPlan, "Locale": s.getLocale(domainUUID), "GovernanceEndpoint": s.governanceForUI(r, "domain", domainUUID)}) +} + +func (s *Server) handleCityAPI(w http.ResponseWriter, r *http.Request) { + if cityGovernanceRoute(r.URL.Path) { + s.handleCityGovernance(w, r) + return + } + domainUUID := s.domainUUIDForRequest(r) + action := strings.Trim(strings.TrimPrefix(r.URL.Path, "/_/api/v1/city/"), "/") + w.Header().Set("Content-Type", "application/json; charset=utf-8") + if action == "map" && r.Method == http.MethodGet { + privateCityResponse(w) + city, err := s.cityProjectionForRequest(r) + if err != nil { + status := cityReadErrorStatus(err) + if status == http.StatusServiceUnavailable { + w.Header().Set("Retry-After", "5") + } + writeEventJSON(w, status, map[string]string{"error": err.Error()}) + return + } + _ = json.NewEncoder(w).Encode(city) + return + } + parts := strings.Split(action, "/") + if len(parts) == 3 && parts[0] == "spots" && parts[2] == "pages" && r.Method == http.MethodGet { + privateCityResponse(w) + pages, err := s.spotPagesForRequest(r, parts[1]) + if err != nil { + status := cityReadErrorStatus(err) + if status == http.StatusServiceUnavailable { + w.Header().Set("Retry-After", "5") + } + message := http.StatusText(status) + if status == http.StatusNotFound { + message = "Spot not found" + } + writeEventJSON(w, status, map[string]string{"error": message}) + return + } + _ = json.NewEncoder(w).Encode(map[string]any{"pages": pages}) + return + } + principal := s.requestPrincipal(r) + if principal == nil || (!s.store.IsBuiltinGroupAdmin(domainUUID, principal.UUID, "domain_admin") && s.store.Authorize(store.AuthorizationRequest{DomainUUID: domainUUID, PrincipalUUID: principal.UUID, Capability: "manage", TargetType: "domain", TargetID: domainUUID}) != nil) { + writeEventJSON(w, http.StatusForbidden, map[string]string{"error": "domain admin required"}) + return + } + if action == "organize" && r.Method == http.MethodPost { + var request store.CityOrganizeRequest + if json.NewDecoder(http.MaxBytesReader(w, r.Body, 128<<10)).Decode(&request) != nil { + writeEventJSON(w, 400, map[string]string{"error": "city_invalid_selection"}) + return + } + result, err := s.store.OrganizeCity(domainUUID, principal.UUID, request) + if err != nil { + writeCityOrganizeError(w, err) + return + } + writeEventJSON(w, http.StatusOK, result) + return + } + if len(parts) == 3 && (parts[0] == "spots" || parts[0] == "zones") && parts[2] == "title" && r.Method == http.MethodPost { + var request struct { + Kind string `json:"kind"` + Title string `json:"title"` + BaseVersion int64 `json:"base_version"` + } + if json.NewDecoder(http.MaxBytesReader(w, r.Body, 4<<10)).Decode(&request) != nil { + writeEventJSON(w, 400, map[string]string{"error": "city_invalid_title"}) + return + } + if parts[0] == "spots" { + request.Kind = "spot" + } else if request.Kind != "quartier" && request.Kind != "street" { + writeEventJSON(w, 400, map[string]string{"error": "city_invalid_selection"}) + return + } + if err := s.store.RenameCityTitle(domainUUID, principal.UUID, request.Kind, parts[1], request.Title, request.BaseVersion); err != nil { + writeCityOrganizeError(w, err) + return + } + writeEventJSON(w, http.StatusOK, map[string]string{"status": "ok"}) + return + } + if action == "health" && r.Method == http.MethodGet { + health, err := s.store.GetCityHealth(domainUUID) + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + _ = json.NewEncoder(w).Encode(health) + return + } + if action == "events" && r.Method == http.MethodGet { + afterVersion, _ := strconv.ParseInt(r.URL.Query().Get("after_version"), 10, 64) + limit, _ := strconv.Atoi(r.URL.Query().Get("limit")) + events, err := s.store.ListTopologyEvents(domainUUID, afterVersion, limit) + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + _ = json.NewEncoder(w).Encode(map[string]any{"events": events, "count": len(events)}) + return + } + if (action == "plans/preview" || action == "plans/apply") && r.Method == http.MethodPost { + var plan store.CityPlan + if json.NewDecoder(http.MaxBytesReader(w, r.Body, 2<<20)).Decode(&plan) != nil { + writeEventJSON(w, 400, map[string]string{"error": "invalid City plan JSON"}) + return + } + var preview store.CityPlanPreview + var err error + if action == "plans/apply" { + preview, err = s.store.ApplyCityPlan(domainUUID, principal.UUID, plan) + } else { + preview, err = s.store.PreviewCityPlan(domainUUID, plan) + } + if err != nil { + writeEventJSON(w, 409, map[string]any{"error": err.Error(), "preview": preview}) + return + } + _ = json.NewEncoder(w).Encode(preview) + return + } + if action == "autoplan" && r.Method == http.MethodGet { + plan, err := s.buildCityAutoPlan(domainUUID) + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + _ = json.NewEncoder(w).Encode(map[string]any{"items": plan, "count": len(plan)}) + return + } + if action == "autoplan" && r.Method == http.MethodPost { + count, err := s.applyCityAutoPlan(domainUUID, principal.UUID) + if err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, map[string]any{"status": "ok", "applied": count}) + return + } + if action == "zones" && r.Method == http.MethodPost { + var request struct { + Kind string `json:"kind"` + ParentUUID string `json:"parent_uuid"` + Name string `json:"name"` + Title string `json:"title"` + Description string `json:"description"` + PathPrefix string `json:"path_prefix"` + } + if json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&request) != nil { + writeEventJSON(w, 400, map[string]string{"error": "invalid JSON"}) + return + } + id, err := s.store.CreateZoneAtPath(domainUUID, principal.UUID, request.Kind, request.ParentUUID, request.Name, request.Title, request.Description, request.PathPrefix) + if err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, http.StatusCreated, map[string]string{"uuid": id}) + return + } + if action == "spots" && r.Method == http.MethodPost { + var request struct { + StreetUUID string `json:"street_uuid"` + Name string `json:"name"` + Title string `json:"title"` + Summary string `json:"summary"` + PathPrefix string `json:"path_prefix"` + } + if json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&request) != nil { + writeEventJSON(w, 400, map[string]string{"error": "invalid JSON"}) + return + } + id, err := s.store.CreateSpotAtPath(domainUUID, principal.UUID, request.StreetUUID, request.Name, request.Title, request.Summary, request.PathPrefix) + if err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, http.StatusCreated, map[string]string{"uuid": id}) + return + } + if len(parts) == 2 && (parts[0] == "zones" || parts[0] == "spots") && r.Method == http.MethodDelete { + kind := "spot" + if parts[0] == "zones" { + var request struct { + Kind string `json:"kind"` + } + if json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&request) != nil { + writeEventJSON(w, 400, map[string]string{"error": "invalid JSON"}) + return + } + kind = request.Kind + } + if err := s.store.DeleteCityNode(domainUUID, principal.UUID, kind, parts[1]); err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, http.StatusOK, map[string]string{"status": "ok"}) + return + } + if len(parts) == 2 && (parts[0] == "zones" || parts[0] == "spots") && r.Method == http.MethodPatch { + var request struct { + Kind string `json:"kind"` + PathPrefix string `json:"path_prefix"` + } + if json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&request) != nil || strings.TrimSpace(request.PathPrefix) == "" { + writeEventJSON(w, 400, map[string]string{"error": "invalid JSON or Path"}) + return + } + kind := "spot" + if parts[0] == "zones" { + kind = request.Kind + } + if err := s.store.UpdateCityNodePath(domainUUID, principal.UUID, kind, parts[1], request.PathPrefix); err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, http.StatusOK, map[string]string{"status": "ok"}) + return + } + if len(parts) == 3 && parts[0] == "spots" && parts[2] == "pages" && (r.Method == http.MethodPost || r.Method == http.MethodDelete) { + var request struct { + PageUUID string `json:"page_uuid"` + Path string `json:"path"` + EdgeType string `json:"edge_type"` + Label string `json:"label"` + } + if json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&request) != nil { + writeEventJSON(w, 400, map[string]string{"error": "invalid JSON"}) + return + } + var err error + if r.Method == http.MethodDelete { + err = s.store.RemoveSpotPage(domainUUID, principal.UUID, parts[1], request.PageUUID, request.EdgeType) + } else { + err = s.store.AddSpotPage(domainUUID, principal.UUID, parts[1], request.PageUUID, request.Path, request.EdgeType, request.Label) + } + if err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, http.StatusOK, map[string]string{"status": "ok"}) + return + } + if len(parts) == 3 && parts[0] == "spots" && parts[2] == "relations" && r.Method == http.MethodPost { + var request struct { + TargetSpotUUID string `json:"target_spot_uuid"` + RelationType string `json:"relation_type"` + } + if json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&request) != nil { + writeEventJSON(w, 400, map[string]string{"error": "invalid JSON"}) + return + } + if err := s.store.AddSpotRelation(domainUUID, principal.UUID, parts[1], request.TargetSpotUUID, request.RelationType); err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, http.StatusOK, map[string]string{"status": "ok"}) + return + } + if len(parts) == 3 && parts[0] == "spots" && parts[2] == "relations" && r.Method == http.MethodDelete { + var request struct { + TargetSpotUUID string `json:"target_spot_uuid"` + RelationType string `json:"relation_type"` + } + if json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&request) != nil { + writeEventJSON(w, 400, map[string]string{"error": "invalid JSON"}) + return + } + if err := s.store.RemoveSpotRelation(domainUUID, principal.UUID, parts[1], request.TargetSpotUUID, request.RelationType); err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, http.StatusOK, map[string]string{"status": "ok"}) + return + } + if len(parts) == 3 && parts[2] == "move" && r.Method == http.MethodPost { + var request struct { + ParentUUID string `json:"parent_uuid"` + StreetUUID string `json:"street_uuid"` + SortKey int `json:"sort_key"` + } + if json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&request) != nil { + writeEventJSON(w, 400, map[string]string{"error": "invalid JSON"}) + return + } + var err error + if parts[0] == "zones" { + err = s.store.MoveStreet(domainUUID, principal.UUID, parts[1], request.ParentUUID, request.SortKey) + } else if parts[0] == "spots" { + err = s.store.MoveSpot(domainUUID, principal.UUID, parts[1], request.StreetUUID, request.SortKey) + } else { + err = store.ErrAccessDenied + } + if err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, http.StatusOK, map[string]string{"status": "ok"}) + return + } + w.Header().Set("Allow", "GET, POST") + writeEventJSON(w, http.StatusMethodNotAllowed, map[string]string{"error": "method not allowed"}) +} + +func jsonNumber(value int64) string { + return strconv.FormatInt(value, 10) +} + +func writeCityOrganizeError(w http.ResponseWriter, err error) { + status := http.StatusBadRequest + if errors.Is(err, store.ErrCityChanged) { + status = http.StatusConflict + } + if errors.Is(err, sql.ErrNoRows) { + writeEventJSON(w, http.StatusNotFound, map[string]string{"error": "city_invalid_selection"}) + return + } + writeEventJSON(w, status, map[string]string{"error": err.Error()}) +} diff --git a/internal/server/city_labels_browser_test.go b/internal/server/city_labels_browser_test.go new file mode 100644 index 0000000..921b8d2 --- /dev/null +++ b/internal/server/city_labels_browser_test.go @@ -0,0 +1,135 @@ +package server + +import ( + "context" + "fmt" + "io" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "path/filepath" + "strings" + "testing" + "time" +) + +func TestCityLabelsChromium(t *testing.T) { + runCityBrowserFixture(t, "city-labels.js", []string{"/life/home/readme", "/life/work/tools/guide"}, []string{"normal", "popup"}) +} + +func TestCityOrganizerChromium(t *testing.T) { + for _, mode := range []string{"normal", "popup"} { + t.Run(mode, func(t *testing.T) { + runCityBrowserFixture(t, "city-organizer.js", []string{"/life/home/readme", "/life/home/notes", "/life/home/alpha/page", "/life/home/beta/page", "/life/work/tools/guide"}, []string{mode}) + }) + } +} + +func TestCityImmersiveChromium(t *testing.T) { + paths := []string{"/life/home/readme", "/life/home/alpha"} + for i := 0; i < 27; i++ { + paths = append(paths, fmt.Sprintf("/life/home/alpha/page-%02d", i)) + } + for i := 0; i < 7; i++ { + paths = append(paths, fmt.Sprintf("/life/home/spot-%02d/page", i)) + } + runCityBrowserFixture(t, "city-immersive.js", paths, []string{"normal", "popup", "menu", "mobile-light"}) +} + +func TestCityKeyboardChromium(t *testing.T) { + paths := []string{"/life/home/alpha", "/life/home/beta/page", "/life/work/tools/page", "/work/dev/code/page"} + for i := 0; i < 6; i++ { + paths = append(paths, fmt.Sprintf("/life/home/alpha/page-%d", i)) + } + runCityBrowserFixture(t, "city-keyboard.js", paths, []string{"normal", "popup"}) +} + +func TestCityWorkerChromium(t *testing.T) { + runCityBrowserFixture(t, "city-worker.js", []string{"/life/home/alpha/page", "/life/work/tools/page"}, []string{"normal", "popup"}) +} + +func TestCityNamedNavigationChromium(t *testing.T) { + runCityBrowserFixture(t, "city-links.js", []string{"/life/home/alpha/page?#%", "/work/home/beta/page"}, []string{"normal", "popup", "quartier", "street", "spot"}) +} + +func runCityBrowserFixture(t *testing.T, scriptName string, paths, modes []string) { + t.Helper() + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + s, token, domain := configFixture(t) + for _, path := range paths { + if _, err := s.store.CreatePageAtPathInDomain(domain, path); err != nil { + t.Fatal(err) + } + } + if _, err := s.applyCityAutoPlan(domain, "test"); err != nil { + t.Fatal(err) + } + s.mux.HandleFunc("/v/city", s.handleCityMap) + s.mux.HandleFunc("/v/city/", s.handleCityMap) + s.mux.HandleFunc("/v/search", s.handleSearch) + s.mux.HandleFunc("/_/api/v1/city/", s.handleCityAPI) + script, err := os.ReadFile("internal/server/testdata/" + scriptName) + if err != nil { + t.Fatal(err) + } + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + if r.URL.Path == "/static/vendor/city-generator/gen-city.bundle.js" && scriptName != "city-worker.js" { + // Deliberately vertical/diagonal roads: labels must remain horizontal. + // Real template, renderer, styles, data and authorization are retained. + w.Header().Set("Content-Type", "text/javascript") + _, _ = io.WriteString(w, `globalThis.PagesWikiGenCity={generateFabric:async(key,width,height)=>({version:'test',width,height,roads:Array.from({length:24},(_,i)=>[20+(i%6)*12,15+Math.floor(i/6)*18,20+(i%6)*12+(i%2?4:0),30+Math.floor(i/6)*18].map((v,j)=>v*(j%2?height:width)/100)),buildings:[[[25,30],[28,30],[28,34],[25,34]],[[32,50],[35,50],[35,54],[32,54]],[[62,32],[65,32],[65,36],[62,36]],[[78,50],[81,50],[81,54],[78,54]]].map(b=>b.map(p=>[p[0]*width/100,p[1]*height/100]))})};`) + return + } + if r.URL.Path == "/v/city" { + rec := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(rec, r) + for key, values := range rec.Header() { + w.Header()[key] = values + } + w.WriteHeader(rec.Code) + _, _ = io.WriteString(w, strings.Replace(rec.Body.String(), "", browserFixtureScript(rec.Header(), script)+"", 1)) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + for _, mode := range modes { + url := server.URL + "/v/city" + if mode == "popup" { + url += "?popup=1" + } else if mode == "menu" || mode == "mobile-light" { + url += "?fixture=" + mode + } else if mode == "quartier" || mode == "street" || mode == "spot" { + id := map[string]string{"quartier": "life", "street": "life/home", "spot": "alpha"}[mode] + node, err := s.store.CityNode(domain, mode, id) + if err != nil { + t.Fatal(err) + } + url += "?" + mode + "=" + node.UUID + } + ctx, cancel := context.WithTimeout(context.Background(), 35*time.Second) + cmd := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", url, t.TempDir()) + screenshot := "" + if dir := os.Getenv("PAGESWIKI_BROWSER_ARTIFACTS"); dir != "" { + if err := os.MkdirAll(dir, 0755); err != nil { + cancel() + t.Fatal(err) + } + screenshot = filepath.Join(dir, strings.TrimSuffix(scriptName, ".js")+"-"+mode+".png") + } + cmd.Args = append(cmd.Args, screenshot) + if mode == "mobile-light" { + cmd.Args = append(cmd.Args, "390", "844") + } + out, err := cmd.CombinedOutput() + cancel() + if err != nil { + t.Fatalf("%s: %v %s", mode, err, out) + } + } +} diff --git a/internal/server/city_links.go b/internal/server/city_links.go new file mode 100644 index 0000000..03a1a47 --- /dev/null +++ b/internal/server/city_links.go @@ -0,0 +1,40 @@ +package server + +import ( + "net/url" + "strings" + + "pageswiki/internal/store" +) + +// Names identify Streets only within their parent Quartier. UUID references +// remain available for stable identity across renames and moves. +func cityDetailHref(kind, name, quartierName, uuid string) string { + prefix := map[string]string{"quartier": "q", "street": "s", "spot": "p"}[strings.ToLower(kind)] + if prefix == "" { + return "/v/city" + } + ref := "uuid:" + uuid + if name != "" && (prefix != "s" || quartierName != "") { + ref = url.PathEscape(name) + if prefix == "s" { + ref = url.PathEscape(quartierName) + "/" + ref + } + } else { + ref = url.PathEscape(ref) + } + return "/v/city/" + prefix + "/" + ref +} + +func canReadCityNode(node store.CityNodeDetail, allowed func(string) bool) bool { + return allowed(node.PathPrefix) && (node.Quartier == nil || allowed(node.Quartier.PathPrefix)) && (node.Street == nil || allowed(node.Street.PathPrefix)) +} + +func cityPageHref(path string) string { + return (&url.URL{Path: path}).EscapedPath() +} + +type cityPageView struct { + store.CityPagePlacement + Href string +} diff --git a/internal/server/city_links_test.go b/internal/server/city_links_test.go new file mode 100644 index 0000000..fe4db56 --- /dev/null +++ b/internal/server/city_links_test.go @@ -0,0 +1,87 @@ +package server + +import ( + "net/http" + "net/http/httptest" + "strings" + "testing" +) + +func TestCityNamedLinksAndLightweightDetails(t *testing.T) { + s, token, domain := configFixture(t) + s.mux.HandleFunc("/v/city/", s.handleCityMap) + s.mux.HandleFunc("/v/search", s.handleSearch) + for _, path := range []string{"/life/home/alpha/page?#%", "/work/home/beta/page"} { + if _, err := s.store.CreatePageAtPathInDomain(domain, path); err != nil { + t.Fatal(err) + } + } + if _, err := s.applyCityAutoPlan(domain, "test"); err != nil { + t.Fatal(err) + } + call := func(route string) *httptest.ResponseRecorder { + r := httptest.NewRequest(http.MethodGet, "http://localhost"+route, nil) + r.Header.Set("Authorization", "Bearer "+token) + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + return w + } + street, err := s.store.CityNode(domain, "street", "life/home") + if err != nil { + t.Fatal(err) + } + for _, route := range []string{"/v/city/s/life/home", "/v/city/s/work/home", "/v/city/s/uuid:" + street.UUID} { + if w := call(route); w.Code != 200 { + t.Fatalf("%s=%d %s", route, w.Code, w.Body.String()) + } + } + for _, route := range []string{"/v/city/s/home", "/v/city/s/missing/home", "/v/city/q/life/extra"} { + if w := call(route); w.Code != 404 { + t.Fatalf("%s=%d", route, w.Code) + } + } + w := call("/v/city/p/alpha") + for _, wanted := range []string{`href="/v/city/q/life"`, `href="/v/city/s/life/home"`, `href="/life/home/alpha/page%3F%23%25"`, `href="/v/city?spot=`} { + if w.Code != 200 || !strings.Contains(w.Body.String(), wanted) { + t.Fatalf("detail missing %s (%d): %s", wanted, w.Code, w.Body.String()) + } + } + for _, selector := range []string{"life/home", "uuid:" + street.UUID} { + if w := call("/v/search?q=page&locality=street&locality_id=" + selector); w.Code != 200 { + t.Fatalf("locality search %s=%d: %s", selector, w.Code, w.Body.String()) + } + } + r := httptest.NewRequest(http.MethodGet, "http://localhost/v/city", nil) + r.Header.Set("Authorization", "Bearer "+token) + city, err := s.cityProjectionForRequest(cacheRequestDomain(withReadPolicyContext(r))) + if err != nil { + t.Fatal(err) + } + for _, q := range city.Quartiers { + for _, st := range q.Streets { + if st.DetailHref != "/v/city/s/"+q.Name+"/"+st.Name { + t.Fatalf("projection link=%s", st.DetailHref) + } + } + } + macro := s.expandCityMacros("{{city-breadcrumbs}} {{spot-pages}}", "/life/home/alpha/page?#%", domain, func(string) bool { return true }) + if !strings.Contains(macro, `href="/v/city/s/life/home"`) || !strings.Contains(macro, `href="/life/home/alpha/page%3F%23%25"`) { + t.Fatalf("macro=%s", macro) + } + macro = s.expandCityMacros("{{city-breadcrumbs}} {{spot-pages}}", "/life/home/alpha/page?#%", domain, func(p string) bool { return p != "/life" }) + if strings.Contains(macro, "alpha") || strings.Contains(macro, "home") { + t.Fatalf("hidden ancestry leaked=%s", macro) + } + // Detail and breadcrumbs must not enumerate the entire City/Page graph. + if _, err := s.store.DB.Exec(`DROP TABLE spot_pages`); err != nil { + t.Fatal(err) + } + w = call("/v/city/s/life/home") + if w.Code != 200 || !strings.Contains(w.Body.String(), `href="/v/city?street=`+street.UUID+`"`) { + t.Fatalf("lightweight detail=%d %s", w.Code, w.Body.String()) + } + macro = s.expandCityMacros("{{street}}", "/life/home/page", domain, func(string) bool { return true }) + if !strings.Contains(macro, `href="/v/city/s/life/home"`) { + t.Fatalf("lightweight macro=%s", macro) + } +} diff --git a/internal/server/city_organize_test.go b/internal/server/city_organize_test.go new file mode 100644 index 0000000..f58b70c --- /dev/null +++ b/internal/server/city_organize_test.go @@ -0,0 +1,65 @@ +package server + +import ( + "encoding/json" + "net/http" + "net/http/httptest" + "strings" + "testing" +) + +func TestCityOrganizerAPIRequiresAdminAndVersion(t *testing.T) { + s, token, domain := configFixture(t) + s.mux.HandleFunc("/_/api/v1/city/", s.handleCityAPI) + for _, p := range []string{"/life/home/one/page", "/life/home/two/page"} { + if _, err := s.store.CreatePageAtPathInDomain(domain, p); err != nil { + t.Fatal(err) + } + } + if _, err := s.applyCityAutoPlan(domain, "test"); err != nil { + t.Fatal(err) + } + city, err := s.store.GetCityMap(domain) + if err != nil { + t.Fatal(err) + } + one, two := city.Quartiers[0].Streets[0].Spots[0], city.Quartiers[0].Streets[0].Spots[1] + user, err := s.store.CreatePasswordAccount(domain, "reader", "a long test password", "Reader", "") + if err != nil { + t.Fatal(err) + } + readerToken, err := s.store.CreateAuthSession(domain, user.UUID) + if err != nil { + t.Fatal(err) + } + call := func(token, url string, body any) *httptest.ResponseRecorder { + b, _ := json.Marshal(body) + r := httptest.NewRequest(http.MethodPost, "http://localhost"+url, strings.NewReader(string(b))) + r.Header.Set("Authorization", "Bearer "+token) + r.Header.Set("Content-Type", "application/json") + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + return w + } + rename := map[string]any{"title": "Changed", "base_version": city.Version} + merge := map[string]any{"action": "merge", "base_version": city.Version, "spots": []string{one.UUID}, "target_spot_uuid": two.UUID} + for url, body := range map[string]any{"/_/api/v1/city/spots/" + one.UUID + "/title": rename, "/_/api/v1/city/organize": merge} { + if w := call(readerToken, url, body); w.Code != http.StatusForbidden { + t.Fatalf("non-admin: %d %s", w.Code, w.Body.String()) + } + } + if w := call(token, "/_/api/v1/city/spots/"+one.UUID+"/title", rename); w.Code != 200 { + t.Fatalf("rename: %d %s", w.Code, w.Body.String()) + } + if w := call(token, "/_/api/v1/city/organize", merge); w.Code != http.StatusConflict { + t.Fatalf("stale merge: %d %s", w.Code, w.Body.String()) + } + merge["base_version"] = city.Version + 1 + if w := call(token, "/_/api/v1/city/organize", merge); w.Code != 200 { + t.Fatalf("merge: %d %s", w.Code, w.Body.String()) + } + plan, err := s.buildCityAutoPlan(domain) + if err != nil || len(plan) != 1 { + t.Fatalf("manual membership re-inferred: %+v %v", plan, err) + } +} diff --git a/internal/server/city_projection.go b/internal/server/city_projection.go new file mode 100644 index 0000000..f6e2740 --- /dev/null +++ b/internal/server/city_projection.go @@ -0,0 +1,121 @@ +package server + +import ( + "net/http" + + "pageswiki/internal/store" +) + +// City locality metadata requires read permission on its boundary; Page edges +// have their own checks. Never expose a hidden Page via a portal, count, nearby +// relation or editable destination list even when its Spot is visible. +func filterCityProjection(city store.CityMap, allowed func(string) bool) store.CityMap { + result := store.CityMap{DomainUUID: city.DomainUUID, Version: city.Version, Quartiers: []store.CityQuartier{}, Relations: []store.CitySpotRelation{}} + visible := map[string]bool{} + for _, quartier := range city.Quartiers { + if !allowed(quartier.PathPrefix) { + continue + } + quartier.DetailHref = cityDetailHref("quartier", quartier.Name, "", quartier.UUID) + streets := []store.CityStreet{} + for _, street := range quartier.Streets { + if !allowed(street.PathPrefix) { + continue + } + street.DetailHref = cityDetailHref("street", street.Name, quartier.Name, street.UUID) + spots := []store.CitySpot{} + for _, spot := range street.Spots { + if !allowed(spot.PathPrefix) { + continue + } + spot.DetailHref = cityDetailHref("spot", spot.Name, quartier.Name, spot.UUID) + pages := []store.CityPagePlacement{} + unique := map[string]bool{} + spot.PortalPath, spot.PortalPageUUID = "", "" + portalPriority := -1 + for _, page := range spot.Pages { + if page.Path == "" || !allowed(page.Path) { + continue + } + pages = append(pages, page) + unique[page.PageUUID] = true + priority := 0 + if page.EdgeType == "primary" { + priority = 1 + } + if page.Path == spot.PathPrefix { + priority = 2 + } + if priority > portalPriority { + spot.PortalPath, spot.PortalPageUUID = page.Path, page.PageUUID + portalPriority = priority + } + } + spot.Pages, spot.PageCount = pages, len(unique) + visible[spot.UUID] = true + spots = append(spots, spot) + } + street.Spots = spots + streets = append(streets, street) + } + quartier.Streets = streets + result.Quartiers = append(result.Quartiers, quartier) + } + for _, relation := range city.Relations { + if visible[relation.SourceSpotUUID] && visible[relation.TargetSpotUUID] { + result.Relations = append(result.Relations, relation) + } + } + return result +} + +func (s *Server) cityProjectionForRequest(r *http.Request) (store.CityMap, error) { + city, err := s.navigationCity(r.Context(), s.domainUUIDForRequest(r)) + if err != nil { + return city, err + } + return filterCityProjection(city, s.pathReadFilter(r)), nil +} + +func (s *Server) spotPagesForRequest(r *http.Request, spotUUID string) ([]store.CityPagePlacement, error) { + domain := s.domainUUIDForRequest(r) + spot, err := s.store.CityNodeContext(r.Context(), domain, "spot", "uuid:"+spotUUID) + if err != nil { + return nil, err + } + if !canReadCityNode(spot, s.pathReadFilter(r)) { + return nil, store.ErrAccessDenied + } + pages, err := s.store.ListSpotPagesContext(r.Context(), domain, spotUUID) + if err != nil { + return nil, err + } + out := []store.CityPagePlacement{} + allowed := s.pathReadFilter(r) + for _, page := range pages { + if page.Path != "" && allowed(page.Path) { + out = append(out, page) + } + } + return out, nil +} + +func privateCityResponse(w http.ResponseWriter) { + w.Header().Set("Cache-Control", "private, no-store") + w.Header().Add("Vary", "Cookie, Authorization") +} + +func (s *Server) pageSpotAppearancesForRequest(r *http.Request, objectUUID string) ([]store.CitySpotAppearance, error) { + spots, err := s.store.ListPageSpotAppearances(s.domainUUIDForRequest(r), objectUUID) + if err != nil { + return nil, err + } + out := []store.CitySpotAppearance{} + allowed := s.pathReadFilter(r) + for _, spot := range spots { + if allowed(spot.PathPrefix) { + out = append(out, spot) + } + } + return out, nil +} diff --git a/internal/server/city_projection_test.go b/internal/server/city_projection_test.go new file mode 100644 index 0000000..74718af --- /dev/null +++ b/internal/server/city_projection_test.go @@ -0,0 +1,156 @@ +package server + +import ( + "context" + "database/sql" + "encoding/json" + "net/http" + "net/http/httptest" + "strings" + "testing" + + "pageswiki/internal/store" +) + +func TestCityReadErrorsDistinguishMissingFromResourceLimits(t *testing.T) { + for _, test := range []struct { + err error + want int + }{ + {store.ErrAccessDenied, http.StatusNotFound}, {sql.ErrNoRows, http.StatusNotFound}, + {store.ErrCityMapBudget, http.StatusServiceUnavailable}, + {context.DeadlineExceeded, http.StatusServiceUnavailable}, {context.Canceled, http.StatusServiceUnavailable}, + } { + if got := cityReadErrorStatus(test.err); got != test.want { + t.Fatalf("status(%v)=%d want=%d", test.err, got, test.want) + } + } +} + +func TestCityReadPortalPriorityAfterFiltering(t *testing.T) { + spot := store.CitySpot{UUID: "spot", PathPrefix: "/q/s/p", Pages: []store.CityPagePlacement{ + {PageUUID: "guide", Path: "/q/s/p/guide", EdgeType: "guide"}, + {PageUUID: "primary", Path: "/q/s/p/primary", EdgeType: "primary"}, + {PageUUID: "boundary", Path: "/q/s/p", EdgeType: "path"}, + }} + street := store.CityStreet{PathPrefix: "/q/s", Spots: []store.CitySpot{spot}} + quartier := store.CityQuartier{PathPrefix: "/q", Streets: []store.CityStreet{street}} + city := store.CityMap{Quartiers: []store.CityQuartier{quartier}} + for _, test := range []struct{ excluded, want string }{{"", "/q/s/p"}, {"/q/s/p/primary", "/q/s/p"}} { + projected := filterCityProjection(city, func(path string) bool { return path != test.excluded }) + if got := projected.Quartiers[0].Streets[0].Spots[0].PortalPath; got != test.want { + t.Fatalf("portal=%s want=%s", got, test.want) + } + } + city.Quartiers[0].Streets[0].Spots[0].Pages = city.Quartiers[0].Streets[0].Spots[0].Pages[:2] + projected := filterCityProjection(city, func(string) bool { return true }) + if got := projected.Quartiers[0].Streets[0].Spots[0].PortalPath; got != "/q/s/p/primary" { + t.Fatalf("primary Page lost to first visible guide: %s", got) + } +} + +func TestCityReadProjectionHidesPagesLocalitiesPortalsAndRelations(t *testing.T) { + s, _, domain := configFixture(t) + s.mux.HandleFunc("/_/api/v1/city/", s.handleCityAPI) + s.mux.HandleFunc("/v/city/", s.handleCityMap) + for _, path := range []string{"/life/home/alpha/good", "/life/home/alpha/aaa-secret", "/life/home/beta/private", "/secret/vault/lock/private"} { + if _, err := s.store.CreatePageAtPathInDomain(domain, path); err != nil { + t.Fatal(err) + } + } + if _, err := s.applyCityAutoPlan(domain, "test"); err != nil { + t.Fatal(err) + } + user, err := s.store.CreatePasswordAccount(domain, "limited", "a long test password", "Limited", "") + if err != nil { + t.Fatal(err) + } + token, err := s.store.CreateAuthSession(domain, user.UUID) + if err != nil { + t.Fatal(err) + } + var role string + if err := s.store.DB.QueryRow(`SELECT b.role_uuid FROM auth_role_bindings b JOIN domain_memberships m ON m.uuid=b.membership_uuid WHERE m.domain_uuid=? AND m.principal_uuid=?`, domain, user.UUID).Scan(&role); err != nil { + t.Fatal(err) + } + if _, err := s.store.DB.Exec(`DELETE FROM auth_capability_grants WHERE role_uuid=?`, role); err != nil { + t.Fatal(err) + } + for _, p := range []string{"/life", "/life/home", "/life/home/alpha", "/life/home/alpha/good"} { + if _, err := s.store.DB.Exec(`INSERT INTO auth_capability_grants(uuid,role_uuid,capability,target_type,target_id,created_at_ms) VALUES(?,?,'read','path',?,1)`, "grant:"+p, role, p); err != nil { + t.Fatal(err) + } + } + raw, err := s.store.GetCityMap(domain) + if err != nil { + t.Fatal(err) + } + var alpha, beta store.CitySpot + for _, q := range raw.Quartiers { + for _, street := range q.Streets { + for _, p := range street.Spots { + if p.Title == "alpha" { + alpha = p + } + if p.Title == "beta" { + beta = p + } + } + } + } + if err := s.store.AddSpotRelation(domain, "test", alpha.UUID, beta.UUID, "related"); err != nil { + t.Fatal(err) + } + request := func(route string) *http.Request { + r := httptest.NewRequest("GET", "http://localhost"+route, nil) + r.Header.Set("Authorization", "Bearer "+token) + return r + } + call := func(route string) *httptest.ResponseRecorder { + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, request(route)) + return w + } + w := call("/_/api/v1/city/map") + if w.Code != 200 { + t.Fatalf("map=%d %s", w.Code, w.Body.String()) + } + for _, secret := range []string{"aaa-secret", "private", "beta", "vault", "secret"} { + if strings.Contains(w.Body.String(), secret) { + t.Fatalf("hidden metadata %q leaked: %s", secret, w.Body.String()) + } + } + var projected store.CityMap + if err := json.Unmarshal(w.Body.Bytes(), &projected); err != nil { + t.Fatal(err) + } + spot := projected.Quartiers[0].Streets[0].Spots[0] + if spot.PageCount != 1 || len(spot.Pages) != 1 || spot.PortalPath != "/life/home/alpha/good" || len(projected.Relations) != 0 { + t.Fatalf("projection leaked count/portal/relation: %+v", spot) + } + if w.Header().Get("ETag") != "" || w.Header().Get("Cache-Control") != "private, no-store" { + t.Fatal("unscoped City caching") + } + if w := call("/_/api/v1/city/spots/" + beta.UUID + "/pages"); w.Code != 404 { + t.Fatalf("hidden Spot pages=%d", w.Code) + } + if w := call("/v/city/p/beta"); w.Code != 404 { + t.Fatalf("hidden detail=%d", w.Code) + } + if w := call("/v/city/p/alpha"); w.Code != 200 || strings.Contains(w.Body.String(), "aaa-secret") { + t.Fatalf("visible detail=%d %s", w.Code, w.Body.String()) + } + r := cacheRequestDomain(withReadPolicyContext(request("/life/home/alpha/good"))) + macro := s.expandMacrosForRequest(r, `{{spot-pages}} {{nearby}}`, "/life/home/alpha/good", domain) + if strings.Contains(macro, "aaa-secret") || strings.Contains(macro, "beta") || !strings.Contains(macro, "/good") { + t.Fatalf("macro projection=%s", macro) + } + // A new request re-evaluates revoked grants; there is no cross-request cache. + if _, err := s.store.DB.Exec(`DELETE FROM auth_capability_grants WHERE role_uuid=?`, role); err != nil { + t.Fatal(err) + } + w = call("/_/api/v1/city/map") + if w.Code != 200 || strings.Contains(w.Body.String(), "alpha") { + t.Fatalf("revoked projection=%d %s", w.Code, w.Body.String()) + } +} diff --git a/internal/server/compile_handler.go b/internal/server/compile_handler.go index 2f85a22..1512f9a 100644 --- a/internal/server/compile_handler.go +++ b/internal/server/compile_handler.go @@ -8,11 +8,24 @@ import ( ) func (s *Server) compileMarkdownFromPath( + r *http.Request, path string, ) (string, error) { + return s.transpileMarkdownFromPath(r, path, markdownAuthoring) +} + +type markdownTranspileMode string + +const ( + markdownAuthoring markdownTranspileMode = "authoring" + markdownProjection markdownTranspileMode = "projection" +) + +func (s *Server) transpileMarkdownFromPath(r *http.Request, path string, mode markdownTranspileMode) (string, error) { objectUUID, err := - s.store.ResolvePath( + s.store.ResolvePathInDomain( + s.domainUUIDForRequest(r), path, ) @@ -21,7 +34,8 @@ func (s *Server) compileMarkdownFromPath( } latest, err := - s.store.GetLatestRevision( + s.latestRevisionForRequest( + r, objectUUID, ) @@ -29,11 +43,10 @@ func (s *Server) compileMarkdownFromPath( return "", err } - html := - s.expandMacros( - latest.Body, - path, - ) + html := latest.Body + if mode == markdownProjection { + html = s.expandMacrosForRequest(r, html, path, s.domainUUIDForRequest(r)) + } return compiler.HTMLToMarkdown( html, @@ -61,6 +74,7 @@ func (s *Server) handleCompileMarkdown( out, err := s.compileMarkdownFromPath( + r, path, ) diff --git a/internal/server/config_density_test.go b/internal/server/config_density_test.go new file mode 100644 index 0000000..0c7b8d4 --- /dev/null +++ b/internal/server/config_density_test.go @@ -0,0 +1,64 @@ +package server + +import ( + "context" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "path/filepath" + "strings" + "testing" + "time" + + "pageswiki/internal/store" +) + +func TestConfigTableDensityChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + s, token, domain := configFixture(t) + if _, _, err := s.store.PutAsset(domain, "asset:text:density", []byte("test"), "text/plain", strings.Repeat("long-filename-", 30)+".txt", "", ""); err != nil { + t.Fatal(err) + } + event := store.EventDefinition{Name: `A "quoted" event`, EventType: "preview.sweep", EventKey: "density", ScheduleKind: "manual", Enabled: true, MaxAttempts: 1} + if err := s.store.SaveEventDefinition(&event); err != nil { + t.Fatal(err) + } + script, err := os.ReadFile("internal/server/testdata/config-density.js") + if err != nil { + t.Fatal(err) + } + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + if r.Method == "GET" && r.URL.Path == "/-/sys/config" { + rec := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(rec, r) + for key, values := range rec.Header() { + w.Header()[key] = values + } + w.WriteHeader(rec.Code) + _, _ = w.Write([]byte(strings.Replace(rec.Body.String(), "", "", 1))) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + for _, panel := range []string{"auth", "campuses", "extensions"} { + ctx, cancel := context.WithTimeout(context.Background(), 35*time.Second) + cmd := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", server.URL+"/-/sys/config?panel=auth&capture="+panel, t.TempDir()) + if dir := os.Getenv("PAGESWIKI_BROWSER_ARTIFACTS"); dir != "" { + if err := os.MkdirAll(dir, 0755); err != nil { + t.Fatal(err) + } + cmd.Args = append(cmd.Args, filepath.Join(dir, "dense-"+panel+".png")) + } + out, err := cmd.CombinedOutput() + cancel() + if err != nil { + t.Fatalf("%s: %v %s", panel, err, out) + } + } +} diff --git a/internal/server/config_handler.go b/internal/server/config_handler.go index 633712c..6288153 100644 --- a/internal/server/config_handler.go +++ b/internal/server/config_handler.go @@ -2,12 +2,31 @@ package server import ( "encoding/json" + "errors" "net/http" + "net/url" "strconv" "strings" "time" + + "github.com/google/uuid" + systemext "pageswiki/internal/extensions" + "pageswiki/internal/store" ) +func (s *Server) parseBroadcastTime(value string) int64 { + value = strings.TrimSpace(value) + if value == "" { + return 0 + } + for _, layout := range []string{"2006-01-02 15:04", "2006-01-02T15:04"} { + if parsed, err := time.ParseInLocation(layout, value, s.getLocation()); err == nil { + return parsed.UnixMilli() + } + } + return 0 +} + func parseNavItemsFromForm( r *http.Request, ) []NavItem { @@ -54,6 +73,7 @@ func parseNavItemsFromForm( } func (s *Server) saveNavConfig( + domainUUID string, key string, items []NavItem, ) error { @@ -67,7 +87,8 @@ func (s *Server) saveNavConfig( return err } - return s.store.SetConfig( + return s.store.SetConfigInDomain( + domainUUID, key, string(raw), ) @@ -77,9 +98,21 @@ func (s *Server) handleConfig( w http.ResponseWriter, r *http.Request, ) { + domainUUID := s.domainUUIDForRequest(r) + principal := s.requestPrincipal(r) + currentDomain := s.domainForRequest(r) + if principal == nil { + s.authRequired(w, r) + return + } + currentCampusAdmin := currentDomain != nil && s.store.IsCampusAdmin(currentDomain.CampusUUID, principal.UUID) + currentDomainAdmin := s.store.IsBuiltinGroupAdmin(domainUUID, principal.UUID, "domain_admin") + if !currentCampusAdmin && !currentDomainAdmin { + http.Error(w, "forbidden", http.StatusForbidden) + return + } if r.Method == http.MethodPost { - err := r.ParseForm() if err != nil { @@ -91,12 +124,208 @@ func (s *Server) handleConfig( r.FormValue( "section", ) + campusAdminRequired := strings.HasPrefix(section, "campus-") || strings.HasPrefix(section, "domain-") || section == "instance-status" + if campusAdminRequired { + targetCampusUUID := currentDomain.CampusUUID + if section == "domain-create" { + targetCampusUUID = r.FormValue("domain_campus_uuid") + } else if section == "domain-update" || section == "domain-delete" || section == "domain-entry" || section == "domain-projection" { + _ = s.store.DB.QueryRow(`SELECT campus_uuid FROM domains WHERE id=?`, r.FormValue("domain_id")).Scan(&targetCampusUUID) + } else if section != "campus-create" && r.FormValue("campus_id") != "" { + _ = s.store.DB.QueryRow(`SELECT uuid FROM campuses WHERE id=?`, r.FormValue("campus_id")).Scan(&targetCampusUUID) + } + if !s.store.IsCampusAdmin(targetCampusUUID, principal.UUID) { + http.Error(w, "campus admin required", http.StatusForbidden) + return + } + } switch section { + case "external-resource-add": + if !currentDomainAdmin { + http.Error(w, "domain admin required", http.StatusForbidden) + return + } + item, normalizeErr := normalizeExternalResourceApproval(externalResourceApproval{ + Kind: r.FormValue("kind"), URL: r.FormValue("url"), Integrity: r.FormValue("integrity"), + }) + if normalizeErr != nil { + http.Error(w, normalizeErr.Error(), http.StatusBadRequest) + return + } + if item.Kind == "script" && r.FormValue("confirm_script_risk") != "1" { + http.Error(w, "external script risk must be confirmed", http.StatusBadRequest) + return + } + items := s.externalResourcePolicy(domainUUID).items + items = append(items, item) + if err = s.saveExternalResourceApprovals(domainUUID, items); err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + case "external-resource-delete": + if !currentDomainAdmin { + http.Error(w, "domain admin required", http.StatusForbidden) + return + } + kind := strings.ToLower(strings.TrimSpace(r.FormValue("kind"))) + resourceURL, normalizeErr := normalizeExternalResourceURL(r.FormValue("url")) + if normalizeErr != nil { + http.Error(w, normalizeErr.Error(), http.StatusBadRequest) + return + } + items := s.externalResourcePolicy(domainUUID).items + filtered := items[:0] + for _, item := range items { + if item.Kind != kind || item.URL != resourceURL { + filtered = append(filtered, item) + } + } + if err = s.saveExternalResourceApprovals(domainUUID, filtered); err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + case "broadcast": + if !currentDomainAdmin { + http.Error(w, "domain admin required", http.StatusForbidden) + return + } + b := store.Broadcast{UUID: r.FormValue("uuid"), DomainUUID: domainUUID, Title: r.FormValue("title"), Body: r.FormValue("body"), Severity: r.FormValue("severity")} + if b.UUID == "" { + b.UUID = uuid.NewString() + } + b.StartsAtMS = s.parseBroadcastTime(r.FormValue("starts_at")) + b.EndsAtMS = s.parseBroadcastTime(r.FormValue("ends_at")) + if err = s.store.SaveBroadcast(b); err != nil { + http.Error(w, err.Error(), 400) + return + } + if b.StartsAtMS > time.Now().UnixMilli() || (b.EndsAtMS > 0 && b.EndsAtMS <= time.Now().UnixMilli()) { + break + } + principals, listErr := s.store.ListDomainPrincipals(domainUUID) + if listErr != nil { + http.Error(w, listErr.Error(), 500) + return + } + tx, txErr := s.store.DB.BeginTx(r.Context(), nil) + if txErr == nil { + for _, recipient := range principals { + if recipient.State != "active" { + continue + } + if _, _, txErr = s.store.CreateNotificationTx(tx, store.Notification{DomainUUID: domainUUID, RecipientUUID: recipient.UUID, EventUUID: b.UUID, Kind: "broadcast", Href: "/v/notification", Message: b.Title}); txErr != nil { + break + } + } + } + if txErr == nil { + txErr = tx.Commit() + } else if tx != nil { + _ = tx.Rollback() + } + if txErr != nil { + http.Error(w, txErr.Error(), 500) + return + } + case "broadcast-delete": + if !currentDomainAdmin { + http.Error(w, "domain admin required", http.StatusForbidden) + return + } + if err = s.store.DeleteBroadcast(domainUUID, r.FormValue("uuid")); err != nil { + http.Error(w, err.Error(), 500) + return + } + case "bookmarks": + bookmarks, parseErr := bookmarksFromForm(r) + if parseErr != nil { + http.Error(w, translate(s.getLocale(domainUUID), "config.bookmark_invalid"), http.StatusBadRequest) + return + } + encoded, _ := json.Marshal(bookmarks) + if err = s.store.SetConfigInDomain(domainUUID, "home_bookmarks", string(encoded)); err != nil { + http.Error(w, err.Error(), 500) + return + } + + case "groups": + if !currentDomainAdmin { + http.Error(w, "domain admin required", http.StatusForbidden) + return + } + group, createErr := s.store.CreateGroup(domainUUID, principal.UUID, r.FormValue("name"), r.FormValue("display_name"), r.FormValue("description"), r.FormValue("visibility")) + if createErr != nil { + http.Error(w, createErr.Error(), http.StatusBadRequest) + return + } + http.Redirect(w, r, "/g/"+url.PathEscape(group.Name)+"/_/edit", http.StatusSeeOther) + return + + case "extension-toggle": + if !currentDomainAdmin { + http.Error(w, "domain admin required", http.StatusForbidden) + return + } + id := strings.TrimSpace(r.FormValue("extension_id")) + known := false + for _, item := range systemext.Catalog() { + if item.ID == id { + known = true + break + } + } + if !known { + http.Error(w, "unknown extension", http.StatusBadRequest) + return + } + enabled := r.FormValue("enabled") == "on" || r.FormValue("enabled") == "true" + if err = s.setSystemExtensionEnabled(domainUUID, id, enabled); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } case "home": + if controlled, e := s.store.DomainEntryControlled(domainUUID); e != nil || controlled { + http.Error(w, translate(s.getLocale(domainUUID), "periodical.controlled"), http.StatusConflict) + return + } + wallpaperPath, validWallpaperPath := normalizePickerPath(r.FormValue("home_wallpaper_path")) + if !validWallpaperPath { + http.Error(w, "invalid wallpaper path", http.StatusBadRequest) + return + } + wallpaperOpacity := defaultHomeWallpaperOpacity + if raw := strings.TrimSpace(r.FormValue("home_wallpaper_opacity")); raw != "" { + wallpaperOpacity, err = strconv.Atoi(raw) + if err != nil || wallpaperOpacity < 0 || wallpaperOpacity > 100 { + http.Error(w, "invalid wallpaper opacity", http.StatusBadRequest) + return + } + } + glassTransparency := s.homeGlassTransparency(domainUUID) + if raw := strings.TrimSpace(r.FormValue("home_glass_transparency")); raw != "" { + glassTransparency, err = normalizeHomeGlassTransparency(raw) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + } + layout := strings.TrimSpace(r.FormValue("home_layout")) + if layout == "" { + layout = "classic" + } + if layout != "classic" && layout != "search" && layout != "directory" && layout != "diary" && layout != "blog" { + http.Error(w, "invalid home layout", http.StatusBadRequest) + return + } + if err = s.store.SetConfigInDomain(domainUUID, "home_layout", layout); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } - err = s.store.SetConfig( + err = s.store.SetConfigInDomain( + domainUUID, "home_path", strings.TrimSpace( r.FormValue("home_path"), @@ -107,12 +336,23 @@ func (s *Server) handleConfig( http.Error(w, err.Error(), http.StatusInternalServerError) return } + if err = s.store.SetConfigInDomain(domainUUID, "home_wallpaper_path", wallpaperPath); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + if err = s.store.SetConfigInDomain(domainUUID, "home_wallpaper_opacity", strconv.Itoa(wallpaperOpacity)); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + if err = s.store.SetConfigInDomain(domainUUID, "home_glass_transparency", strconv.Itoa(glassTransparency)); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } - err = s.store.SetConfig( - "wiki_name", - strings.TrimSpace( - r.FormValue("wiki_name"), - ), + err = s.store.SetConfigInDomain( + domainUUID, + "virtual_folder_pages", + boolFormValue(r.FormValue("virtual_folder_pages")), ) if err != nil { @@ -120,7 +360,8 @@ func (s *Server) handleConfig( return } - err = s.store.SetConfig( + err = s.store.SetConfigInDomain( + domainUUID, "locale", normalizeLocale( strings.TrimSpace( @@ -152,7 +393,8 @@ func (s *Server) handleConfig( return } - err = s.store.SetConfig( + err = s.store.SetConfigInDomain( + domainUUID, "timezone", timezoneName, ) @@ -163,7 +405,7 @@ func (s *Server) handleConfig( } theme := - s.getTheme() + s.getTheme(domainUUID) if v := strings.TrimSpace(r.FormValue("theme")); v != "" { if isAllowedTheme(v) { @@ -174,7 +416,8 @@ func (s *Server) handleConfig( } } - err = s.store.SetConfig( + err = s.store.SetConfigInDomain( + domainUUID, "theme", theme, ) @@ -204,7 +447,8 @@ func (s *Server) handleConfig( return } - err = s.store.SetConfig( + err = s.store.SetConfigInDomain( + domainUUID, "zombie_grace_hours", graceHours, ) @@ -214,9 +458,25 @@ func (s *Server) handleConfig( return } + case "home-appearance": + if controlled, e := s.store.DomainEntryControlled(domainUUID); e != nil || controlled { + http.Error(w, translate(s.getLocale(domainUUID), "periodical.controlled"), http.StatusConflict) + return + } + glassTransparency, parseErr := normalizeHomeGlassTransparency(r.FormValue("home_glass_transparency")) + if parseErr != nil { + http.Error(w, parseErr.Error(), http.StatusBadRequest) + return + } + if err = s.store.SetConfigInDomain(domainUUID, "home_glass_transparency", strconv.Itoa(glassTransparency)); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + case "nav-home": err = s.saveNavConfig( + domainUUID, "home_nav_items", parseNavItemsFromForm(r), ) @@ -229,6 +489,7 @@ func (s *Server) handleConfig( case "nav-system": err = s.saveNavConfig( + domainUUID, "system_nav_items", parseNavItemsFromForm(r), ) @@ -248,8 +509,26 @@ func (s *Server) handleConfig( if keymap != "vim" { keymap = "default" } + format := strings.TrimSpace(r.FormValue("editor_format_default")) + if format != "markdown" { + format = "html" + } + previewDefault := strings.TrimSpace(r.FormValue("editor_preview_default")) + if previewDefault != "hidden" { + previewDefault = "visible" + } - err = s.store.SetConfig( + if err = s.store.SetConfigInDomain(domainUUID, "editor_format_default", format); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + if err = s.store.SetConfigInDomain(domainUUID, "editor_preview_default", previewDefault); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + err = s.store.SetConfigInDomain( + domainUUID, "editor_keymap", keymap, ) @@ -259,7 +538,8 @@ func (s *Server) handleConfig( return } - err = s.store.SetConfig( + err = s.store.SetConfigInDomain( + domainUUID, "editor_syntax_highlight", boolFormValue( r.FormValue("editor_syntax_highlight"), @@ -271,7 +551,8 @@ func (s *Server) handleConfig( return } - err = s.store.SetConfig( + err = s.store.SetConfigInDomain( + domainUUID, "editor_autocomplete", boolFormValue( r.FormValue("editor_autocomplete"), @@ -283,13 +564,42 @@ func (s *Server) handleConfig( return } - case "district-create": + case "domain-projection": + id, e := strconv.ParseInt(r.FormValue("domain_id"), 10, 64) + if e != nil { + http.Error(w, "invalid domain id", 400) + return + } + if e = s.store.SetPeriodicalProjection(r.Context(), id, principal.UUID, r.FormValue("kind"), r.FormValue("source_uuid"), r.FormValue("prefix")); e != nil { + http.Error(w, translate(s.getLocale(domainUUID), "periodical.projection_invalid"), 400) + return + } + case "domain-entry": + id, e := strconv.ParseInt(r.FormValue("domain_id"), 10, 64) + if e != nil { + http.Error(w, "invalid domain id", 400) + return + } + e = s.store.SetDomainEntry(r.Context(), id, principal.UUID, store.DomainEntrySettings{Layout: r.FormValue("entry_layout"), DiaryEnabled: r.FormValue("diary_enabled") == "1", DiaryPrefix: r.FormValue("diary_prefix"), BlogEnabled: r.FormValue("blog_enabled") == "1", BlogPrefix: r.FormValue("blog_prefix")}) + if e != nil { + if errors.Is(e, store.ErrManifestCapability) { + http.Error(w, translate(s.getLocale(domainUUID), "periodical.capability_required"), 409) + return + } + http.Error(w, "invalid or unauthorized domain entry settings", 400) + return + } + case "domain-create": - err = s.store.CreateDistrict( - r.FormValue("district_name"), - r.FormValue("district_title"), - r.FormValue("district_domain"), - r.FormValue("district_enabled") == "1", + err = s.store.CreateDomain( + r.FormValue("domain_campus_uuid"), + r.FormValue("domain_name"), + r.FormValue("domain_title"), + r.FormValue("domain_host"), + r.FormValue("domain_placement"), + r.FormValue("domain_instance_fqdn"), + r.FormValue("domain_instance_fingerprint"), + r.FormValue("domain_enabled") == "1", ) if err != nil { @@ -297,26 +607,30 @@ func (s *Server) handleConfig( return } - case "district-update": + case "domain-update": id, parseErr := strconv.ParseInt( - r.FormValue("district_id"), + r.FormValue("domain_id"), 10, 64, ) if parseErr != nil { - http.Error(w, "invalid district id", http.StatusBadRequest) + http.Error(w, "invalid domain id", http.StatusBadRequest) return } - err = s.store.UpdateDistrict( + err = s.store.UpdateDomain( id, - r.FormValue("district_name"), - r.FormValue("district_title"), - r.FormValue("district_domain"), - r.FormValue("district_enabled") == "1", + r.FormValue("domain_campus_uuid"), + r.FormValue("domain_name"), + r.FormValue("domain_title"), + r.FormValue("domain_host"), + r.FormValue("domain_placement"), + r.FormValue("domain_instance_fqdn"), + r.FormValue("domain_instance_fingerprint"), + r.FormValue("domain_enabled") == "1", ) if err != nil { @@ -324,21 +638,21 @@ func (s *Server) handleConfig( return } - case "district-delete": + case "domain-delete": id, parseErr := strconv.ParseInt( - r.FormValue("district_id"), + r.FormValue("domain_id"), 10, 64, ) if parseErr != nil { - http.Error(w, "invalid district id", http.StatusBadRequest) + http.Error(w, "invalid domain id", http.StatusBadRequest) return } - err = s.store.DeleteDistrict( + err = s.store.DeleteDomain( id, ) @@ -347,10 +661,151 @@ func (s *Server) handleConfig( return } + case "campus-create": + + err = s.store.CreateCampus( + r.FormValue("campus_name"), + r.FormValue("campus_title"), + r.FormValue("campus_default_lang"), + r.FormValue("campus_authority_mode"), + r.FormValue("campus_fqdn"), + r.FormValue("campus_enabled") == "1", + ) + + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + + case "campus-update": + + id, parseErr := + strconv.ParseInt( + r.FormValue("campus_id"), + 10, + 64, + ) + + if parseErr != nil { + http.Error(w, "invalid campus id", http.StatusBadRequest) + return + } + + err = s.store.UpdateCampus( + id, + r.FormValue("campus_name"), + r.FormValue("campus_title"), + r.FormValue("campus_default_lang"), + r.FormValue("campus_authority_mode"), + r.FormValue("campus_fqdn"), + r.FormValue("campus_enabled") == "1", + ) + + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + + case "campus-delete": + + id, parseErr := + strconv.ParseInt( + r.FormValue("campus_id"), + 10, + 64, + ) + + if parseErr != nil { + http.Error(w, "invalid campus id", http.StatusBadRequest) + return + } + + err = s.store.DeleteCampus(id) + + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + + case "campus-managed-save": + id, parseErr := strconv.ParseInt( + r.FormValue("campus_id"), + 10, + 64, + ) + if parseErr != nil { + http.Error(w, "invalid campus id", http.StatusBadRequest) + return + } + campuses, listErr := s.store.ListCampuses() + if listErr != nil { + http.Error(w, listErr.Error(), http.StatusInternalServerError) + return + } + campus, findErr := managedCampusByID(campuses, id) + if findErr != nil { + http.Error(w, findErr.Error(), http.StatusBadRequest) + return + } + s.probeManagedCampus(campus) + + case "campus-token-issue": + token, issueErr := s.store.IssueCampusToken( + r.FormValue("campus_uuid"), + r.FormValue("token_label"), + ) + if issueErr != nil { + http.Error(w, issueErr.Error(), http.StatusBadRequest) + return + } + w.Header().Set("Content-Type", "text/plain; charset=utf-8") + w.WriteHeader(http.StatusCreated) + _, _ = w.Write([]byte( + "Save this token now; it will not be shown again.\n\n" + + token + "\n", + )) + return + + case "instance-status": + id, parseErr := strconv.ParseInt( + r.FormValue("instance_id"), + 10, + 64, + ) + if parseErr != nil { + http.Error(w, "invalid instance id", http.StatusBadRequest) + return + } + err = s.store.SetFederationInstanceStatus( + id, + r.FormValue("instance_status"), + ) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + + case "campus-token-revoke": + id, parseErr := strconv.ParseInt( + r.FormValue("token_id"), + 10, + 64, + ) + if parseErr != nil { + http.Error(w, "invalid token id", http.StatusBadRequest) + return + } + err = s.store.RevokeCampusToken(id) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + case "zombie-purge": - _, err = s.store.PurgeZombieObjects( - s.getZombieGraceSeconds(), + _, err = s.store.PurgeZombieObjectsInDomain( + r.Context(), domainUUID, + s.getZombieGraceSeconds(domainUUID), 100, ) @@ -359,6 +814,9 @@ func (s *Server) handleConfig( return } + case "scheduler-preview": + s.enqueueAllPreviewEvents() + default: http.Error( @@ -376,10 +834,40 @@ func (s *Server) handleConfig( panel = "objects" } - if strings.HasPrefix(section, "district-") { - panel = "districts" + if strings.HasPrefix(section, "domain-") { + panel = "domains" } + if strings.HasPrefix(section, "campus-") { + panel = "campuses" + } + if section == "instance-status" { + panel = "campuses" + } + if section == "scheduler-preview" { + panel = "scheduler" + } + if section == "broadcast-delete" { + panel = "broadcasts" + } + if section == "broadcast" { + panel = "broadcasts" + } + if section == "extension-toggle" { + panel = "extensions" + } + if strings.HasPrefix(section, "external-resource-") { + panel = "external-resources" + } + + if (section == "bookmarks" || section == "home-appearance") && strings.Contains(r.Header.Get("Accept"), "application/json") { + writeEventJSON(w, 200, map[string]bool{"ok": true}) + return + } + if section == "bookmarks" && r.FormValue("return_home") == "true" { + http.Redirect(w, r, "/", http.StatusSeeOther) + return + } http.Redirect( w, r, @@ -391,7 +879,8 @@ func (s *Server) handleConfig( } homePath, err := - s.store.GetConfig( + s.store.GetConfigInDomain( + s.domainUUIDForRequest(r), "home_path", ) @@ -399,76 +888,215 @@ func (s *Server) handleConfig( http.Error(w, err.Error(), http.StatusInternalServerError) return } + homeWallpaperPath, homeWallpaperOpacity := s.homeWallpaperConfig(s.domainUUIDForRequest(r)) - wikiName, err := - s.store.GetConfig( - "wiki_name", - ) - - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - - if wikiName == "" { - wikiName = "Pages Wiki" - } + wikiName := s.domainForRequest(r).Title zombieGraceHours := - s.getZombieGraceHours() + s.getZombieGraceHours(s.domainUUIDForRequest(r)) - recent, err := - s.store.ListRecentObjects( - 50, - ) + var zombies []store.ZombieObject + if r.URL.Query().Get("panel") == "objects" { + zombies, err = + s.store.ListZombieObjectsInDomain( + r.Context(), s.domainUUIDForRequest(r), + s.getZombieGraceSeconds(s.domainUUIDForRequest(r)), + store.ZombieGCDefaultLimit, + ) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + } + + domains, err := + s.store.ListDomains() if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } + domainEntries, err := s.store.DomainEntryOptions() + if err != nil { + http.Error(w, "entry settings unavailable", 503) + return + } + projections, err := s.store.ListPeriodicalProjections() + if err != nil { + http.Error(w, "projection settings unavailable", 503) + return + } + legacyPeers, err := s.store.CampusLegacyManifestPeers() + if err != nil { + http.Error(w, "instance capabilities unavailable", 503) + return + } - zombies, err := - s.store.ListZombieObjects( - s.getZombieGraceSeconds(), - ) + selectedDomain := s.domainForRequest(r) + requestedDomainUUID := strings.TrimSpace(r.URL.Query().Get("objects_domain")) + if requestedDomainUUID != "" { + for i := range domains { + if domains[i].UUID == requestedDomainUUID { + selectedDomain = &domains[i] + break + } + } + } + selectedCampusUUID := selectedDomain.CampusUUID + requestedCampusUUID := strings.TrimSpace(r.URL.Query().Get("objects_campus")) + if requestedCampusUUID != "" && + requestedCampusUUID != selectedCampusUUID { + for i := range domains { + if domains[i].CampusUUID == requestedCampusUUID { + selectedDomain = &domains[i] + selectedCampusUUID = requestedCampusUUID + break + } + } + } + recent, err := s.store.ListRecentObjectsInDomain( + selectedDomain.UUID, + 50, + ) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + objectsDomainHost, err := s.store.GetDomainEffectiveHost( + selectedDomain.UUID, + ) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } - districts, err := - s.store.ListDistricts() + campuses, err := + s.store.ListCampuses() if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } + campusManaged := map[string]bool{} + campusOnline := map[string]bool{} + var federationInstances []store.FederationInstance + for _, campus := range campuses { + campusManaged[campus.UUID] = + campus.AuthorityMode == "managed" + if campus.AuthorityMode == "managed" { + campusOnline[campus.UUID] = + managedCampusOnline(campus, time.Now()) + } + instances, listErr := s.store.ListFederationInstances( + campus.UUID, + false, + ) + if listErr != nil { + http.Error(w, listErr.Error(), http.StatusInternalServerError) + return + } + federationInstances = append(federationInstances, instances...) + } + campusTokens, err := s.store.ListCampusTokens() + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + authPrincipals, err := s.store.ListDomainPrincipals(s.domainUUIDForRequest(r)) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + authSessions, err := s.store.ListAuthSessions(s.domainUUIDForRequest(r)) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + oidcConfig, _ := s.store.AuthProviderConfig(s.domainUUIDForRequest(r), "oidc") + if oidcConfig.OIDCMatchBy == "" { + oidcConfig.OIDCMatchBy = "email" + } + oidcConfig.ClientSecret = "" + smtpConfig, _ := s.store.AuthProviderConfig(s.domainUUIDForRequest(r), "smtp") + smtpConfig.SMTPPassword = "" + ldapConfig, _ := s.store.AuthProviderConfig(s.domainUUIDForRequest(r), "ldap") + ldapConfig.LDAPBindPassword = "" + plugins, err := s.adapterPlugins(domainUUID) + if err != nil { + http.Error(w, err.Error(), 500) + return + } + groups, err := s.store.ListGroups(domainUUID, principal.UUID) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + broadcasts, err := s.store.ListBroadcasts(r.Context(), domainUUID) + if err != nil { + http.Error(w, err.Error(), 500) + return + } s.renderWithContext( w, r, "config.gohtml", map[string]any{ + "ConfigGroups": configPanelGroups(s.getLocale(domainUUID), plugins), + "Groups": groups, + "Broadcasts": broadcasts, + "ExternalResources": s.externalResourcePolicy(domainUUID).items, + "CanCreateGroups": currentDomainAdmin, + "AdapterPlugins": plugins, + "ManagedBookmarks": s.managedBookmarks(domainUUID), + "SystemExtensions": s.systemExtensionCatalog(domainUUID), + "VimSettings": s.domainVimSettings(domainUUID), "NavItems": resolveNavItems( - s.getSystemNavItems(), + s.getSystemNavItems(s.domainUUIDForRequest(r)), NavContext{}, ), - "HomePath": homePath, - "WikiName": wikiName, - "Locale": s.getLocale(), - "Timezone": s.getTimezoneName(), - "Theme": s.getTheme(), - "ThemeOptions": themeOptions(), - "EditorKeymap": s.getEditorKeymap(), - "EditorSyntax": s.getEditorSyntaxHighlight(), - "EditorAutocomplete": s.getEditorAutocomplete(), - "ZombieGraceHours": zombieGraceHours, - "Objects": recent, - "ZombieObjects": zombies, - "Districts": districts, - "HomeNavItemsConfig": s.getHomeNavItems(), - "SystemNavItemsConfig": s.getSystemNavItems(), + "HomePath": homePath, + "HomeWallpaperPath": homeWallpaperPath, + "HomeWallpaperOpacity": homeWallpaperOpacity, + "HomeGlassTransparency": s.homeGlassTransparency(domainUUID), + "HomeLayout": s.homeLayout(s.domainUUIDForRequest(r)), + "HomeBookmarks": s.homeBookmarksText(s.domainUUIDForRequest(r)), + "VirtualFolderPages": s.getVirtualFolderPages(s.domainUUIDForRequest(r)), + "WikiName": wikiName, + "Locale": s.getLocale(s.domainUUIDForRequest(r)), + "Timezone": s.getTimezoneName(s.domainUUIDForRequest(r)), + "Theme": s.getTheme(s.domainUUIDForRequest(r)), + "ThemeOptions": themeOptions(), + "EditorKeymap": s.getEditorKeymap(s.domainUUIDForRequest(r)), + "EditorFormat": s.getEditorFormat(s.domainUUIDForRequest(r)), + "EditorPreviewDefault": s.getEditorPreviewDefault(s.domainUUIDForRequest(r)), + "EditorSyntax": s.getEditorSyntaxHighlight(s.domainUUIDForRequest(r)), + "EditorAutocomplete": s.getEditorAutocomplete(s.domainUUIDForRequest(r)), + "ZombieGraceHours": zombieGraceHours, + "Objects": recent, + "ZombieObjects": zombies, + "Domains": domains, + "DomainEntries": domainEntries, + "PeriodicalProjections": projections, + "PeriodicalKinds": []string{"diary", "blog"}, + "CampusLegacyPeers": legacyPeers, + "Campuses": campuses, + "CampusManaged": campusManaged, + "CampusOnline": campusOnline, + "FederationInstances": federationInstances, + "CampusTokens": campusTokens, + "AuthPrincipals": authPrincipals, + "AuthSessions": authSessions, + "OIDCConfig": oidcConfig, + "SMTPConfig": smtpConfig, + "LDAPConfig": ldapConfig, + "LDAPTest": r.URL.Query().Get("ldap_test"), + "ObjectsCampusUUID": selectedCampusUUID, + "ObjectsDomainUUID": selectedDomain.UUID, + "ObjectsDomainHost": objectsDomainHost, + "HomeNavItemsConfig": s.getHomeNavItems(s.domainUUIDForRequest(r)), + "SystemNavItemsConfig": s.getSystemNavItems(s.domainUUIDForRequest(r)), }, ) } diff --git a/internal/server/config_panels.go b/internal/server/config_panels.go new file mode 100644 index 0000000..37c9fe4 --- /dev/null +++ b/internal/server/config_panels.go @@ -0,0 +1,26 @@ +package server + +type configPanelLink struct{ ID, Label string } +type configPanelGroup struct { + ID, Label string + Panels []configPanelLink +} + +// The registry is owned by Pages Wiki; adapter data supplies names and IDs, +// never arbitrary templates or executable settings HTML. +func configPanelGroups(locale string, plugins []adapterPlugin) []configPanelGroup { + link := func(id, key string) configPanelLink { return configPanelLink{id, translate(locale, key)} } + groups := []configPanelGroup{ + {"appearance", translate(locale, "config.group_appearance"), []configPanelLink{link("home", "config.home"), link("editor", "config.editor"), link("bookmarks", "home.bookmarks"), link("nav-home", "config.nav_home"), link("nav-system", "config.nav_system")}}, + {"content", translate(locale, "config.group_content"), []configPanelLink{link("objects", "config.objects"), link("assets", "config.assets"), link("external-resources", "config.external_resources"), link("broadcasts", "config.broadcasts")}}, + {"identity", translate(locale, "config.group_identity"), []configPanelLink{link("auth", "auth.accounts"), link("auth-providers", "config.auth_providers"), link("auth-sessions", "auth.sessions"), link("groups", "auth.groups")}}, + {"campus", translate(locale, "config.group_campus"), []configPanelLink{link("campuses", "config.campuses"), link("domains", "config.domains")}}, + {"adapters", translate(locale, "config.group_adapters"), []configPanelLink{link("adapters", "config.adapter_catalog"), link("adapters-builtin", "config.builtin_adapters")}}, + {"operations", translate(locale, "config.group_operations"), []configPanelLink{link("scheduler", "config.execution_status"), link("logs", "config.execution_log"), link("events", "config.event_definitions"), link("queue", "config.queue_settings")}}, + } + for _, plugin := range plugins { + groups[4].Panels = append(groups[4].Panels, configPanelLink{"adapter-" + plugin.ID, plugin.Name}) + } + groups = append(groups, configPanelGroup{"extensions", translate(locale, "extension.title"), []configPanelLink{link("extensions", "extension.catalog"), link("diary", "periodical.diary"), link("blog", "periodical.blog")}}) + return groups +} diff --git a/internal/server/config_panels_test.go b/internal/server/config_panels_test.go new file mode 100644 index 0000000..3a468d2 --- /dev/null +++ b/internal/server/config_panels_test.go @@ -0,0 +1,347 @@ +package server + +import ( + "context" + "encoding/json" + "net/http" + "net/http/httptest" + "net/url" + "os" + "os/exec" + "path/filepath" + "strings" + "testing" + "time" + + "golang.org/x/net/html" + "pageswiki/internal/db" + "pageswiki/internal/store" +) + +func configFixture(t *testing.T) (*Server, string, string) { + t.Helper() + t.Chdir("../..") + database, err := db.Open(t.TempDir() + "/config.db") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { database.Close() }) + if err = db.Migrate(database); err != nil { + t.Fatal(err) + } + st := store.NewWithDocumentRoot(database, t.TempDir()+"/documents") + if err = st.EnsureConfigTable(); err != nil { + t.Fatal(err) + } + domain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + owner, err := st.BootstrapOwner(domain.UUID, "admin", "a long test password", "Test Admin", "") + if err != nil { + t.Fatal(err) + } + token, err := st.CreateAuthSession(domain.UUID, owner.UUID) + if err != nil { + t.Fatal(err) + } + if err = st.SetConfigInDomain(domain.UUID, "authorization_mode", "enforcing"); err != nil { + t.Fatal(err) + } + if err = st.SetConfigInDomain(domain.UUID, "locale", "ja"); err != nil { + t.Fatal(err) + } + s := &Server{store: st, mux: http.NewServeMux()} + s.mustLoadTemplates() + s.registerStaticRoutes() + s.mux.HandleFunc("/-/sys/config", s.handleConfig) + s.mux.HandleFunc("/-/sys/config/auth", s.handleAuthAdmin) + s.mux.HandleFunc("/-/sys/config/adapters", s.handleAdapterPluginConfig) + s.mux.HandleFunc("/_/api/v1/assets", s.handleAssetsAPI) + s.mux.HandleFunc("/_/api/v1/adapter", s.handleAdapterAPI) + s.mux.HandleFunc("/_/api/v1/queue", s.handleQueueAPI) + s.mux.HandleFunc("/_/api/v1/queue/", s.handleQueueAPI) + s.mux.HandleFunc("/_/api/v1/event", s.handleEventAPI) + s.mux.HandleFunc("/_/api/v1/event/", s.handleEventAPI) + s.mux.HandleFunc("/o/path:/system/static/css/", func(w http.ResponseWriter, r *http.Request) { + http.ServeFile(w, r, filepath.Join("static/css", filepath.Base(r.URL.Path))) + }) + if err = s.saveAdapterPlugins(domain.UUID, []adapterPlugin{{ID: "hosted.test", Name: "Test Editor", Mode: "editor", Enabled: true, URLTemplate: "https://editor.example/open?ticket={ticket}"}}); err != nil { + t.Fatal(err) + } + if _, _, err = st.PutAsset(domain.UUID, "asset:image:test", []byte("test"), "image/png", "test.png", "", owner.UUID); err != nil { + t.Fatal(err) + } + return s, token, domain.UUID +} + +func configRequest(s *Server, token, method, path string, form url.Values) *httptest.ResponseRecorder { + r := httptest.NewRequest(method, "http://localhost"+path, strings.NewReader(form.Encode())) + r.Header.Set("Authorization", "Bearer "+token) + if form != nil { + r.Header.Set("Content-Type", "application/x-www-form-urlencoded") + } + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + return w +} + +func TestConfigOIDCAccountMatchingMode(t *testing.T) { + s, token, domain := configFixture(t) + w := configRequest(s, token, http.MethodGet, "/-/sys/config?panel=auth-providers", nil) + if w.Code != http.StatusOK || !strings.Contains(w.Body.String(), `name="oidc_match_by"`) || !strings.Contains(w.Body.String(), `value="email" selected`) { + t.Fatalf("default OIDC matching selector: %d", w.Code) + } + form := url.Values{ + "action": {"save_oidc"}, + "enabled": {"on"}, + "issuer": {"https://id.example.test"}, + "client_id": {"pages"}, + "client_secret": {"secret"}, + "oidc_match_by": {"display_name"}, + } + w = configRequest(s, token, http.MethodPost, "/-/sys/config/auth", form) + if w.Code != http.StatusSeeOther || !strings.Contains(w.Header().Get("Location"), "panel=auth-providers") { + t.Fatalf("save OIDC matching mode: %d %s", w.Code, w.Body.String()) + } + config, err := s.store.AuthProviderConfig(domain, "oidc") + if err != nil || config.OIDCMatchBy != "display_name" { + t.Fatalf("stored OIDC matching mode: %#v %v", config, err) + } + w = configRequest(s, token, http.MethodGet, "/-/sys/config?panel=auth-providers", nil) + if w.Code != http.StatusOK || !strings.Contains(w.Body.String(), `value="display_name" selected`) { + t.Fatalf("selected OIDC matching mode: %d", w.Code) + } + form.Set("oidc_match_by", "preferred_username") + w = configRequest(s, token, http.MethodPost, "/-/sys/config/auth", form) + if w.Code != http.StatusSeeOther { + t.Fatalf("save preferred_username matching mode: %d %s", w.Code, w.Body.String()) + } + config, err = s.store.AuthProviderConfig(domain, "oidc") + if err != nil || config.OIDCMatchBy != "preferred_username" { + t.Fatalf("stored preferred_username matching mode: %#v %v", config, err) + } + w = configRequest(s, token, http.MethodGet, "/-/sys/config?panel=auth-providers", nil) + if w.Code != http.StatusOK || !strings.Contains(w.Body.String(), `value="preferred_username" selected`) { + t.Fatalf("selected preferred_username matching mode: %d", w.Code) + } + form.Set("oidc_match_by", "username") + w = configRequest(s, token, http.MethodPost, "/-/sys/config/auth", form) + if w.Code != http.StatusBadRequest { + t.Fatalf("invalid OIDC matching mode accepted: %d", w.Code) + } +} + +func TestConfigLDAPProviderPanelAndSecretPreservation(t *testing.T) { + s, token, domain := configFixture(t) + w := configRequest(s, token, http.MethodGet, "/-/sys/config?panel=auth-providers", nil) + if w.Code != http.StatusOK || !strings.Contains(w.Body.String(), `name="ldap_search_filter"`) || !strings.Contains(w.Body.String(), `{{username}}`) { + t.Fatalf("LDAP provider panel: %d %s", w.Code, w.Body.String()) + } + form := url.Values{ + "action": {"save_ldap"}, + "enabled": {"on"}, + "ldap_url": {"ldaps://directory.example.test:636"}, + "ldap_bind_dn": {"cn=pageswiki,ou=services,dc=example,dc=test"}, + "ldap_bind_password": {"directory-secret"}, + "ldap_search_base": {"ou=people,dc=example,dc=test"}, + "ldap_search_filter": {"(&(objectClass=person)(uid={{username}}))"}, + "ldap_verify_tls": {"on"}, + "ldap_uid_attribute": {"entryUUID"}, + "ldap_username_attribute": {"uid"}, + "ldap_email_attribute": {"mail"}, + "ldap_display_attribute": {"displayName"}, + "ldap_match_by": {"username"}, + "ldap_auto_provision": {"on"}, + } + w = configRequest(s, token, http.MethodPost, "/-/sys/config/auth", form) + if w.Code != http.StatusSeeOther || !strings.Contains(w.Header().Get("Location"), "panel=auth-providers") { + t.Fatalf("save LDAP provider: %d %s", w.Code, w.Body.String()) + } + config, err := s.store.AuthProviderConfig(domain, "ldap") + if err != nil || config.LDAPBindPassword != "directory-secret" || config.LDAPSkipTLSVerify || !config.LDAPAutoProvision || config.UUID == "" { + t.Fatalf("stored LDAP provider: %#v %v", config, err) + } + form.Set("ldap_bind_password", "") + form.Set("ldap_search_filter", "(mail={{username}})") + w = configRequest(s, token, http.MethodPost, "/-/sys/config/auth", form) + if w.Code != http.StatusSeeOther { + t.Fatalf("update LDAP provider: %d %s", w.Code, w.Body.String()) + } + config, err = s.store.AuthProviderConfig(domain, "ldap") + if err != nil || config.LDAPBindPassword != "directory-secret" || config.LDAPSearchFilter != "(mail={{username}})" { + t.Fatalf("LDAP secret preservation: %#v %v", config, err) + } +} + +func TestAssetsListingAdminAllowedAndMemberDenied(t *testing.T) { + s, token, domain := configFixture(t) + w := configRequest(s, token, "GET", "/_/api/v1/assets", nil) + var data map[string]json.RawMessage + if w.Code != 200 || json.Unmarshal(w.Body.Bytes(), &data) != nil || data["assets"] == nil { + t.Fatalf("asset list: %d %s", w.Code, w.Body.String()) + } + member, err := s.store.CreatePasswordAccount(domain, "reader", "another long password", "Reader", "") + if err != nil { + t.Fatal(err) + } + memberToken, err := s.store.CreateAuthSession(domain, member.UUID) + if err != nil { + t.Fatal(err) + } + w = configRequest(s, memberToken, "GET", "/_/api/v1/assets", nil) + if w.Code != http.StatusForbidden { + t.Fatalf("member can list assets: %d", w.Code) + } +} + +func TestConfigBookmarksSaveAndPanelRegistry(t *testing.T) { + s, token, domain := configFixture(t) + form := url.Values{"section": {"bookmarks"}, "bookmark_label": {"Docs", "External"}, "bookmark_kind": {"path", "url"}, "bookmark_target": {"/docs/100% complete", "https://example.com/help"}} + w := configRequest(s, token, "POST", "/-/sys/config", form) + if w.Code != 302 { + t.Fatalf("save bookmarks: %d %s", w.Code, w.Body.String()) + } + items := s.homeBookmarks(domain) + if len(items) != 2 || items[0].Href != "/docs/100%25%20complete" { + t.Fatalf("bookmarks: %#v", items) + } + form["bookmark_target"][1] = "javascript:alert(1)" + w = configRequest(s, token, "POST", "/-/sys/config", form) + if w.Code != 400 || len(s.homeBookmarks(domain)) != 2 { + t.Fatal("unsafe bookmark accepted or prior state lost") + } + w = configRequest(s, token, "GET", "/-/sys/config?panel=bookmarks", nil) + if w.Code != 200 { + t.Fatalf("config: %d %s", w.Code, w.Body.String()) + } + root, err := html.Parse(strings.NewReader(w.Body.String())) + if err != nil { + t.Fatal(err) + } + ids := map[string]bool{} + var panels []string + var scripts []string + var walk func(*html.Node) + walk = func(n *html.Node) { + if n.Type == html.ElementNode { + if n.Data == "table" { + var class, parentClass string + for _, attr := range n.Attr { + if attr.Key == "class" { + class = attr.Val + } + } + if n.Parent != nil { + for _, attr := range n.Parent.Attr { + if attr.Key == "class" { + parentClass = attr.Val + } + } + } + if (strings.Contains(class, "recent-table") || strings.Contains(class, "config-form-table")) && !strings.Contains(parentClass, "table-scroll") { + t.Errorf("configuration table has no horizontal scroll container: %s", class) + } + } + for _, a := range n.Attr { + if a.Key == "id" { + if ids[a.Val] { + t.Errorf("duplicate ID %s", a.Val) + } + ids[a.Val] = true + } + if a.Key == "data-panel" { + panels = append(panels, a.Val) + } + } + } + if n.Type == html.ElementNode && n.Data == "script" && n.FirstChild != nil { + scripts = append(scripts, n.FirstChild.Data) + } + for c := n.FirstChild; c != nil; c = c.NextSibling { + walk(c) + } + } + walk(root) + for _, panel := range panels { + if !ids["panel-"+panel] { + t.Errorf("missing panel %s", panel) + } + } + if len(panels) < 18 || !ids["panel-adapter-hosted.test"] { + t.Fatalf("incomplete panel registry: %v", panels) + } + if node, err := exec.LookPath("node"); err == nil { + for _, script := range scripts { + cmd := exec.Command(node, "--check") + cmd.Stdin = strings.NewReader(script) + if out, err := cmd.CombinedOutput(); err != nil { + t.Fatalf("invalid inline JS: %s", out) + } + } + } +} + +func TestIntegratedAdapterSettingsPersistAndRedirect(t *testing.T) { + s, token, domain := configFixture(t) + form := url.Values{"id": {"hosted.test"}, "connection_fields": {"1"}, "name": {"Edited"}, "mode": {"editor"}, + "url_template": {"https://editor.example/open?ticket={ticket}"}, "enabled": {"on"}, "new_tab": {"on"}, "html_markdown": {"on"}, "default_editor": {"on"}, "extensions": {".html, .txt"}} + w := configRequest(s, token, "POST", "/-/sys/config/adapters?id=hosted.test", form) + if w.Code != 302 || !strings.Contains(w.Header().Get("Location"), "panel=adapter-hosted.test") { + t.Fatalf("save adapter: %d %s", w.Code, w.Body.String()) + } + plugins, err := s.adapterPlugins(domain) + if err != nil || len(plugins) != 1 || !plugins[0].NewTab || !plugins[0].HTMLMarkdown || !plugins[0].DefaultEditor || plugins[0].Name != "Edited" { + t.Fatalf("plugin=%#v %v", plugins, err) + } +} + +func TestConfigChromiumSmoke(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium smoke test") + } + s, token, _ := configFixture(t) + if err := s.store.EnsureBuiltinResourceEvent(); err != nil { + t.Fatal(err) + } + if err := s.runEvent(&store.EventJob{UUID: "resource-browser", Type: store.ResourceEventType}); err != nil { + t.Fatal(err) + } + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + for _, panel := range []string{"assets", "events", "queue", "scheduler", "logs", "resources", "bookmarks", "adapter-hosted.test", "extensions"} { + t.Run(panel, func(t *testing.T) { + ctx, cancel := context.WithTimeout(context.Background(), 25*time.Second) + defer cancel() + cmd := exec.CommandContext(ctx, "chromium", "--headless", "--no-sandbox", "--disable-gpu", "--disable-background-networking", "--no-proxy-server", "--enable-logging=stderr", "--log-level=0", "--user-data-dir="+t.TempDir(), "--dump-dom", "--virtual-time-budget=1500", server.URL+"/-/sys/config?panel="+panel) + if dir := os.Getenv("PAGESWIKI_BROWSER_ARTIFACTS"); dir != "" { + if err := os.MkdirAll(dir, 0755); err != nil { + t.Fatal(err) + } + cmd.Args = append(cmd.Args, "--window-size=1440,1000", "--screenshot="+filepath.Join(dir, panel+".png")) + } + out, err := cmd.CombinedOutput() + if err != nil { + t.Fatalf("browser: %v %s", err, out) + } + body := string(out) + target, classes := panel, "config-section config-panel active" + if panel == "resources" || panel == "scheduler" { + target, classes = "scheduler", "config-section config-panel execution-dashboard active" + } + if strings.Contains(body, "Uncaught ") || !strings.Contains(body, `id="panel-`+target+`" class="`+classes+`"`) { + t.Fatalf("browser panel failed: %s", body) + } + if panel == "assets" && !strings.Contains(body, `data-asset-copy-hash=`) { + t.Fatalf("assets did not load: %s", body) + } + if panel == "resources" && !strings.Contains(body, `class="chart-line"`) { + t.Fatalf("resource chart did not load: %s", body) + } + }) + } +} diff --git a/internal/server/content_adapter.go b/internal/server/content_adapter.go new file mode 100644 index 0000000..4914a0f --- /dev/null +++ b/internal/server/content_adapter.go @@ -0,0 +1,225 @@ +package server + +import ( + "path/filepath" + "strings" +) + +type projectionDelivery string + +const ( + deliveryHTML projectionDelivery = "html" + deliveryText projectionDelivery = "text" + deliveryRawMedia projectionDelivery = "raw-media" + deliveryRawFrame projectionDelivery = "raw-frame" + deliveryDownload projectionDelivery = "download" +) + +type contentDescriptor struct { + MediaType string + Filename string + SizeBytes int64 +} + +type projectionAdapter struct { + ID string + Kind string + Delivery projectionDelivery + NeedsText bool + WindowableText bool + Match func(contentDescriptor) bool +} + +const inlineTextWindowThreshold = int64(2 << 20) + +var projectionAdapters = []projectionAdapter{ + { + ID: "html", + Kind: "html", + Delivery: deliveryHTML, + Match: mediaTypes("text/html"), + }, + { + ID: "excalidraw", + Kind: "excalidraw", + Delivery: deliveryText, + NeedsText: true, + WindowableText: true, + Match: extensions(".excalidraw"), + }, + { + ID: "csv", + Kind: "csv", + Delivery: deliveryText, + NeedsText: true, + WindowableText: true, + Match: matchAny( + mediaTypes("text/csv", "application/csv"), + extensions(".csv"), + ), + }, + { + ID: "archive", + Kind: "archive", + Delivery: deliveryDownload, + Match: matchAny( + mediaTypes( + "application/zip", "application/x-zip-compressed", + "application/x-rar-compressed", "application/vnd.rar", + "application/x-7z-compressed", "application/x-tar", + "application/gzip", "application/x-xz", + ), + extensions(".zip", ".rar", ".7z", ".tar", ".gz", ".tgz", ".xz", ".txz"), + ), + }, + { + ID: "debian-package", + Kind: "metadata", + Delivery: deliveryDownload, + Match: matchAny( + mediaTypes( + "application/vnd.debian.binary-package", + "application/x-debian-package", + ), + extensions(".deb"), + ), + }, + { + ID: "eml", + Kind: "email", + Delivery: deliveryText, + Match: matchAny( + mediaTypes("message/rfc822"), + extensions(".eml"), + ), + }, + { + ID: "pe", + Kind: "metadata", + Delivery: deliveryDownload, + Match: extensions(".exe", ".dll", ".sys"), + }, + { + ID: "json", + Kind: "json", + Delivery: deliveryText, + WindowableText: true, + Match: matchAny(mediaTypes("application/json", "application/ld+json"), extensions(".json", ".jsonl")), + }, + { + ID: "text", + Kind: "code", + Delivery: deliveryText, + NeedsText: true, + WindowableText: true, + Match: textMediaType, + }, + { + ID: "image", + Kind: "image", + Delivery: deliveryRawMedia, + Match: matchAny( + mediaTypePrefix("image/"), + extensions(".png", ".jpg", ".jpeg", ".gif", ".webp", ".avif", ".svg"), + ), + }, + { + ID: "audio", + Kind: "audio", + Delivery: deliveryRawMedia, + Match: matchAny( + mediaTypePrefix("audio/"), + extensions(".mp3", ".flac", ".wav", ".ogg", ".m4a", ".aac", ".opus"), + ), + }, + { + ID: "video", + Kind: "video", + Delivery: deliveryRawMedia, + Match: matchAny( + mediaTypePrefix("video/"), + extensions(".mp4", ".webm", ".mkv", ".mov", ".m4v", ".ogv"), + ), + }, + { + ID: "pdf", + Kind: "pdf", + Delivery: deliveryRawFrame, + Match: matchAny( + mediaTypes("application/pdf"), + extensions(".pdf"), + ), + }, + { + ID: "download", + Kind: "download", + Delivery: deliveryDownload, + Match: func(contentDescriptor) bool { return true }, + }, +} + +func selectProjectionAdapter(descriptor contentDescriptor) projectionAdapter { + for _, adapter := range projectionAdapters { + if adapter.Match(descriptor) { + return adapter + } + } + return projectionAdapters[len(projectionAdapters)-1] +} + +func mediaTypes(types ...string) func(contentDescriptor) bool { + return func(descriptor contentDescriptor) bool { + for _, candidate := range types { + if descriptor.MediaType == candidate { + return true + } + } + return false + } +} + +func mediaTypePrefix(prefix string) func(contentDescriptor) bool { + return func(descriptor contentDescriptor) bool { + return strings.HasPrefix(descriptor.MediaType, prefix) + } +} + +func extensions(values ...string) func(contentDescriptor) bool { + return func(descriptor contentDescriptor) bool { + extension := strings.ToLower(filepath.Ext(descriptor.Filename)) + for _, candidate := range values { + if extension == candidate { + return true + } + } + return false + } +} + +func matchAny(matchers ...func(contentDescriptor) bool) func(contentDescriptor) bool { + return func(descriptor contentDescriptor) bool { + for _, matcher := range matchers { + if matcher(descriptor) { + return true + } + } + return false + } +} + +func textMediaType(descriptor contentDescriptor) bool { + switch descriptor.MediaType { + case "application/json", + "application/xml", + "application/javascript", + "application/x-javascript", + "application/x-sh", + "application/x-shellscript", + "application/x-yaml", + "application/yaml", + "application/toml": + return true + default: + return strings.HasPrefix(descriptor.MediaType, "text/") + } +} diff --git a/internal/server/content_detect.go b/internal/server/content_detect.go new file mode 100644 index 0000000..4e97021 --- /dev/null +++ b/internal/server/content_detect.go @@ -0,0 +1,188 @@ +package server + +import ( + "bytes" + "encoding/json" + "mime" + "net/http" + "path/filepath" + "strings" + "unicode" + "unicode/utf8" + + "golang.org/x/text/encoding/japanese" + textunicode "golang.org/x/text/encoding/unicode" + "golang.org/x/text/transform" +) + +type detectedText struct { + ContentType string + Text string + IsText bool +} + +func detectRevisionText(data []byte, filename string) detectedText { + if len(data) == 0 { + return detectedText{"text/plain; charset=utf-8", "", true} + } + magicType := http.DetectContentType(data) + if magicType != "application/octet-stream" && + !strings.HasPrefix(magicType, "text/plain") { + return detectedText{ContentType: magicType} + } + + decoded, charset, ok := decodeTextBytes(data) + if !ok { + return detectedText{ContentType: http.DetectContentType(data)} + } + + contentType := detectTextMediaType(decoded, filename) + if strings.HasPrefix(contentType, "text/") || + contentType == "application/json" || + contentType == "application/xml" || + contentType == "application/javascript" || + contentType == "application/x-sh" { + contentType += "; charset=" + charset + } + return detectedText{ + ContentType: contentType, + Text: decoded, + IsText: true, + } +} + +func decodeTextBytes(data []byte) (string, string, bool) { + if bytes.HasPrefix(data, []byte{0xef, 0xbb, 0xbf}) { + return string(data[3:]), "utf-8", true + } + if bytes.HasPrefix(data, []byte{0xff, 0xfe}) { + decoded, _, err := transform.Bytes( + textunicode.UTF16(textunicode.LittleEndian, textunicode.ExpectBOM).NewDecoder(), + data, + ) + return string(decoded), "utf-16le", err == nil + } + if bytes.HasPrefix(data, []byte{0xfe, 0xff}) { + decoded, _, err := transform.Bytes( + textunicode.UTF16(textunicode.BigEndian, textunicode.ExpectBOM).NewDecoder(), + data, + ) + return string(decoded), "utf-16be", err == nil + } + if utf8.Valid(data) { + text := string(data) + return text, "utf-8", looksLikeText(text) + } + if bytes.Contains(data, []byte{0x1b, '$'}) { + if decoded, _, err := transform.Bytes(japanese.ISO2022JP.NewDecoder(), data); err == nil { + text := string(decoded) + return text, "iso-2022-jp", looksLikeText(text) + } + } + for _, candidate := range []struct { + name string + enc transform.Transformer + }{ + {"shift_jis", japanese.ShiftJIS.NewDecoder()}, + {"euc-jp", japanese.EUCJP.NewDecoder()}, + } { + decoded, _, err := transform.Bytes(candidate.enc, data) + if err == nil && looksLikeText(string(decoded)) { + return string(decoded), candidate.name, true + } + } + return "", "", false +} + +func looksLikeText(text string) bool { + if text == "" { + return true + } + var controls, total int + for _, r := range text { + total++ + if r == '\n' || r == '\r' || r == '\t' || r == '\f' { + continue + } + if unicode.IsControl(r) || r == utf8.RuneError { + controls++ + } + } + return controls*100 <= total*2 +} + +func detectTextMediaType(text, filename string) string { + firstLine := text + if newline := strings.IndexByte(firstLine, '\n'); newline >= 0 { + firstLine = firstLine[:newline] + } + lower := strings.ToLower(firstLine) + switch { + case strings.HasPrefix(lower, "#!") && + strings.Contains(lower, "python"): + return "text/x-python" + case strings.HasPrefix(lower, "#!") && + (strings.Contains(lower, "/sh") || + strings.Contains(lower, "bash") || + strings.Contains(lower, "zsh")): + return "application/x-sh" + case strings.HasPrefix(lower, "#!") && + (strings.Contains(lower, "node") || strings.Contains(lower, "deno")): + return "application/javascript" + } + if json.Valid([]byte(text)) { + return "application/json" + } + if strings.HasPrefix(strings.TrimSpace(text), " inlineTextWindowThreshold + if adapter.ID == "json" { + view.JSONURL = "/v/json/rev:" + revision.UUID + } + + if adapter.NeedsText { + if view.Text == "" { + if decoded, _, ok := decodeTextBytes([]byte(revision.Body)); ok { + view.Text = decoded + } else { + view.Text = revision.Body + } + } + view.Language = codeLanguage(contentType, filename, view.Text) + } + structuredContentView(&view, []byte(revision.Body), semanticPath) + if adapter.ID == "eml" { + view.EmailHTML = extractEmailHTML([]byte(revision.Body)) != "" + } + return view +} diff --git a/internal/server/content_view_test.go b/internal/server/content_view_test.go new file mode 100644 index 0000000..9fd453a --- /dev/null +++ b/internal/server/content_view_test.go @@ -0,0 +1,201 @@ +package server + +import ( + "strings" + "testing" + + "pageswiki/internal/store" +) + +func TestRevisionContentViewSelectsSafeAdapters(t *testing.T) { + tests := []struct { + contentType string + kind string + }{ + {"text/html; charset=utf-8", "html"}, + {"text/x-python; charset=utf-8", "code"}, + {"application/x-sh", "code"}, + {"application/json", "json"}, + {"image/png", "image"}, + {"audio/mpeg", "audio"}, + {"video/mp4", "video"}, + {"application/pdf", "pdf"}, + { + "application/vnd.openxmlformats-officedocument.wordprocessingml.document", + "download", + }, + } + for _, test := range tests { + view := revisionContentView( + &store.Revision{ + ContentType: test.contentType, + Filename: "sample", + Body: "", + }, + "/sample", + ) + if view.Kind != test.kind { + t.Errorf( + "Content-Type %q kind = %q, want %q", + test.contentType, + view.Kind, + test.kind, + ) + } + if test.kind == "code" && view.Text == "" { + t.Errorf("code content was not passed to escaped template rendering") + } + } +} + +func TestRevisionContentViewSniffsExtensionlessOctetStream(t *testing.T) { + script := revisionContentView( + &store.Revision{ + ContentType: "application/octet-stream", + Body: "#!/usr/bin/env bash\necho hello\n", + }, + "/run", + ) + if script.Kind != "code" || script.Language != "shell" { + t.Fatalf("script view = %#v", script) + } + if script.Text == "" { + t.Fatal("extensionless script did not expose decoded text") + } + + pdf := revisionContentView( + &store.Revision{ + ContentType: "application/octet-stream", + Body: "%PDF-1.7\n%\x80\x81\x82\n", + }, + "/manual", + ) + if pdf.Kind != "pdf" { + t.Fatalf("PDF kind = %q, want pdf", pdf.Kind) + } +} + +func TestRevisionContentViewSelectsSpecializedAdapterBoundaries(t *testing.T) { + tests := []struct { + name string + contentType string + filename string + adapterID string + kind string + }{ + {"CSV", "text/csv", "report.csv", "csv", "csv"}, + {"ZIP", "application/zip", "bundle.zip", "archive", "archive"}, + { + "DEB", + "application/octet-stream", + "pageswiki.deb", + "debian-package", + "metadata", + }, + { + "Excalidraw", + "application/json", + "diagram.excalidraw", + "excalidraw", + "excalidraw", + }, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + view := revisionContentView( + &store.Revision{ + ContentType: test.contentType, + Filename: test.filename, + Body: "{}", + }, + "/"+test.filename, + ) + if view.AdapterID != test.adapterID || view.Kind != test.kind { + t.Fatalf( + "view adapter/kind = %q/%q, want %q/%q", + view.AdapterID, + view.Kind, + test.adapterID, + test.kind, + ) + } + }) + } +} + +func TestCSVProjectionIsBounded(t *testing.T) { + body := "name,value\n" + strings.Repeat("row,1\n", maxCSVRows+10) + view := revisionContentView(&store.Revision{ContentType: "text/csv", Filename: "report.csv", Body: body}, "/report.csv") + if view.Kind != "csv" || len(view.CSVRows) != maxCSVRows { + t.Fatalf("CSV projection kind/rows = %q/%d", view.Kind, len(view.CSVRows)) + } + if !view.CSVTruncated { + t.Fatal("bounded CSV projection did not report truncation") + } +} + +func TestCodeLanguageStopsWhenDetectionReturnsCurrentMediaType(t *testing.T) { + if language := codeLanguage("text/csv; charset=utf-8", "report.csv", "name,value\na,1\n"); language != "text" { + t.Fatalf("CSV fallback language = %q, want text", language) + } +} + +func TestExcalidrawProjectionValidatesScene(t *testing.T) { + valid := revisionContentView(&store.Revision{ + ContentType: "application/json", Filename: "map.excalidraw", + Body: `{"type":"excalidraw","elements":[{"type":"rectangle","x":1,"y":2,"width":30,"height":20}]}`, + }, "/map.excalidraw") + if valid.Kind != "excalidraw" || !valid.ExcalidrawValid || valid.ExcalidrawElements != 1 { + t.Fatalf("valid scene projection = %#v", valid) + } + + invalid := revisionContentView(&store.Revision{ + ContentType: "application/json", Filename: "map.excalidraw", Body: `{"elements":[]}`, + }, "/map.excalidraw") + if invalid.ExcalidrawValid || invalid.ParseError == "" { + t.Fatalf("invalid scene was accepted: %#v", invalid) + } +} + +func TestExcalidrawProjectionRejectsExcessivePointComplexity(t *testing.T) { + points := strings.Repeat("[0,0],", maxExcalidrawPoints+1) + points = strings.TrimSuffix(points, ",") + view := contentView{} + parseExcalidrawView(&view, []byte(`{"type":"excalidraw","elements":[{"type":"line","x":0,"y":0,"width":1,"height":1,"points":[`+points+`]}]}`)) + if view.ExcalidrawValid || view.ParseError == "" { + t.Fatal("excessive Excalidraw point complexity was accepted") + } +} + +func TestTextAdapterSignalsWindowingForLargeDocuments(t *testing.T) { + view := revisionContentView( + &store.Revision{ + ContentType: "text/plain; charset=utf-8", + Filename: "large.txt", + Body: strings.Repeat("x", int(inlineTextWindowThreshold+1)), + }, + "/large.txt", + ) + if view.AdapterID != "text" { + t.Fatalf("AdapterID = %q, want text", view.AdapterID) + } + if !view.Windowed { + t.Fatal("large text adapter did not request windowed delivery") + } +} + +func TestPreviewUsesViewerAdapterForNonHTMLRevision(t *testing.T) { + view := previewContentView(&store.Revision{ + UUID: "revision-1", + ContentType: "text/plain; charset=utf-8", + Filename: "payload.txt", + Body: "", + }, "/payload.txt") + if view.Kind != "code" { + t.Fatalf("preview kind = %q, want code", view.Kind) + } + if view.Text != "" { + t.Fatalf("preview text = %q", view.Text) + } +} diff --git a/internal/server/csrf.go b/internal/server/csrf.go new file mode 100644 index 0000000..56f717e --- /dev/null +++ b/internal/server/csrf.go @@ -0,0 +1,94 @@ +package server + +import ( + "net/http" + "net/url" + "strings" +) + +// No cross-origin trust/bypass list: adapters and federation use explicit +// server-to-server credentials, while browser editors are same-origin proxies. +var browserOriginProtection http.CrossOriginProtection + +func validBrowserMutationOrigin(r *http.Request) bool { + // Legacy semantic editor entry may allocate an empty Page. Until creation + // is moved entirely into save, subject that navigation to the mutation gate. + navigation := (r.Method == http.MethodGet || r.Method == http.MethodHead) && + (strings.HasPrefix(r.URL.Path, "/e/") || strings.HasPrefix(r.URL.Path, "/o/e/") || r.URL.Path == "/:/new") + if navigation { + copy := r.Clone(r.Context()) + copy.Method = http.MethodPost + r = copy + } + if r.Method == http.MethodGet || r.Method == http.MethodHead || r.Method == http.MethodOptions { + return true + } + if browserOriginProtection.Check(r) != nil { + return false + } + // The standard guard compares hosts for older clients without Fetch + // Metadata. Also require the same scheme, especially an HTTP-origin form + // targeting an HTTPS session. Trusted same-origin Fetch Metadata already + // accounts for TLS termination at the reverse proxy. + if origin := r.Header.Get("Origin"); origin != "" && r.Header.Get("Sec-Fetch-Site") != "same-origin" { + u, err := url.Parse(origin) + scheme := "http" + if requestIsHTTPS(r) { + scheme = "https" + } + if err != nil || u.User != nil || u.Scheme != scheme || u.Host == "" || u.Path != "" || u.RawQuery != "" || u.Fragment != "" { + return false + } + } + // Check legacy clients too when ambient browser credentials are present. + // A CLI must send an explicit Bearer credential, not reuse a browser cookie + // without supplying an Origin. Do not trust X-Forwarded-Host for this test. + _, session := r.Cookie(authCookieName) + _, challenge := r.Cookie(mfaChallengeCookieName) + if session != nil && challenge != nil || len(r.Header.Values("Authorization")) != 0 { + return true + } + if r.Header.Get("Sec-Fetch-Site") == "same-origin" || r.Header.Get("Origin") != "" { + return true // CrossOriginProtection already validated the supplied origin. + } + if navigation && r.Header.Get("Sec-Fetch-Site") == "none" && r.Header.Get("Sec-Fetch-Mode") == "navigate" { + return true // address-bar/bookmark navigation, not an external embedding + } + u, err := url.Parse(r.Referer()) + return err == nil && u.User == nil && (u.Scheme == "http" || u.Scheme == "https") && strings.EqualFold(u.Host, r.Host) && (!requestIsHTTPS(r) || u.Scheme == "https") +} + +func rejectBrowserMutation(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Cache-Control", "no-store") + if strings.HasPrefix(r.URL.Path, "/_/api/") { + writeEventJSON(w, http.StatusForbidden, map[string]string{"error": "cross-origin or unverified browser mutation rejected"}) + return + } + http.Error(w, "forbidden: cross-origin or unverified browser mutation", http.StatusForbidden) +} + +func (s *Server) handleLogout(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Cache-Control", "no-store") + if r.Method == http.MethodGet || r.Method == http.MethodHead { + s.renderAuthPage(w, r, map[string]any{"Logout": true}) + return + } + if r.Method != http.MethodPost { + w.Header().Set("Allow", "GET, HEAD, POST") + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + if token := s.authTokenFromRequest(r); token != "" { + if err := s.store.RevokeAuthSession(token); err != nil { + http.Error(w, "session revocation failed", http.StatusInternalServerError) + return + } + } + if len(r.Header.Values("Authorization")) == 0 { + http.SetCookie(w, &http.Cookie{Name: authCookieName, Path: "/", MaxAge: -1, HttpOnly: true, Secure: requestIsHTTPS(r), SameSite: http.SameSiteLaxMode}) + } else { + writeEventJSON(w, http.StatusOK, map[string]string{"status": "signed_out"}) + return + } + http.Redirect(w, r, "/_/auth/login", http.StatusSeeOther) +} diff --git a/internal/server/csrf_test.go b/internal/server/csrf_test.go new file mode 100644 index 0000000..c6ecf1d --- /dev/null +++ b/internal/server/csrf_test.go @@ -0,0 +1,184 @@ +package server + +import ( + "encoding/json" + "net/http" + "net/http/httptest" + "testing" +) + +func TestBrowserMutationOrigins(t *testing.T) { + for _, tc := range []struct { + name, method, origin, site, referer, authorization string + cookie, allow bool + }{ + {"same_origin", "POST", "https://wiki.example", "same-origin", "", "", true, true}, + {"legacy_same_origin", "POST", "https://wiki.example", "", "", "", true, true}, + {"legacy_cross_scheme", "POST", "http://wiki.example", "", "", "", true, false}, + {"legacy_cross_scheme_login", "POST", "http://wiki.example", "", "", "", false, false}, + {"origin_is_not_url_path", "POST", "https://wiki.example/path", "", "", "", true, false}, + {"foreign_origin", "POST", "https://evil.example", "cross-site", "", "", true, false}, + {"sibling_is_not_trusted", "POST", "https://sibling.wiki.example", "same-site", "", "", true, false}, + {"null_origin", "POST", "null", "", "", "", true, false}, + {"no_origin_cookie", "POST", "", "", "", "", true, false}, + {"same_origin_metadata", "POST", "", "same-origin", "", "", true, true}, + {"old_same_origin_referrer", "POST", "", "", "https://wiki.example/form", "", true, true}, + {"foreign_referrer", "POST", "", "", "https://evil.example/form", "", true, false}, + {"cli_bearer", "POST", "", "", "", "Bearer explicit", false, true}, + {"explicit_bearer_with_cookie", "POST", "", "", "", "Bearer explicit", true, true}, + {"cross_origin_login", "POST", "https://evil.example", "cross-site", "", "", false, false}, + {"machine_enrollment", "POST", "", "", "", "", false, true}, + {"safe_read", "GET", "https://evil.example", "cross-site", "", "", true, true}, + {"cross_origin_delete", "DELETE", "https://evil.example", "cross-site", "", "", true, false}, + } { + t.Run(tc.name, func(t *testing.T) { + r := httptest.NewRequest(tc.method, "https://wiki.example/_/auth/login", nil) + r.Header.Set("Origin", tc.origin) + r.Header.Set("Sec-Fetch-Site", tc.site) + r.Header.Set("Referer", tc.referer) + if tc.authorization != "" { + r.Header.Set("Authorization", tc.authorization) + } + if tc.cookie { + r.AddCookie(&http.Cookie{Name: authCookieName, Value: "browser"}) + } + called := false + w := httptest.NewRecorder() + (&Server{}).withAuthorization(http.HandlerFunc(func(http.ResponseWriter, *http.Request) { called = true })).ServeHTTP(w, r) + if called != tc.allow || (!tc.allow && w.Code != http.StatusForbidden) { + t.Fatalf("allowed=%v status=%d, want %v", called, w.Code, tc.allow) + } + }) + } + // Handler-owned JSON routes receive a parseable denial, before DB access. + r := httptest.NewRequest("POST", "https://wiki.example/_/api/v1/assets", nil) + r.Header.Set("Origin", "https://evil.example") + w := httptest.NewRecorder() + (&Server{}).withAuthorization(http.NotFoundHandler()).ServeHTTP(w, r) + var result map[string]string + if w.Code != 403 || json.Unmarshal(w.Body.Bytes(), &result) != nil || result["error"] == "" { + t.Fatalf("invalid CSRF JSON: %d %s", w.Code, w.Body.String()) + } +} + +func TestExplicitCredentialNeverFallsBackToCookie(t *testing.T) { + s := &Server{} + for _, tc := range []struct{ header, want string }{ + {"Basic secret", ""}, {"Bearer", ""}, {"Bearer a b", ""}, {"Bearer a,b", ""}, {"bearer api-token", "api-token"}, + } { + r := httptest.NewRequest("GET", "http://localhost/", nil) + r.AddCookie(&http.Cookie{Name: authCookieName, Value: "cookie-token"}) + r.Header.Set("Authorization", tc.header) + if got := s.authTokenFromRequest(r); got != tc.want { + t.Fatalf("header=%q got=%q want=%q", tc.header, got, tc.want) + } + } + r := httptest.NewRequest("GET", "http://localhost/", nil) + r.AddCookie(&http.Cookie{Name: authCookieName, Value: "one"}) + r.AddCookie(&http.Cookie{Name: authCookieName, Value: "two"}) + if s.authTokenFromRequest(r) != "" { + t.Fatal("ambiguous cookies accepted") + } +} + +func TestLogoutRequiresPostAndRevokesSelectedCredential(t *testing.T) { + s, token, domain := configFixture(t) + s.mux.HandleFunc("/_/auth/", s.handleAuth) + principal, err := s.store.PrincipalForSession(domain, token) + if err != nil { + t.Fatal(err) + } + cookieToken, err := s.store.CreateBrowserAuthSession(domain, principal.UUID, 0) + if err != nil { + t.Fatal(err) + } + request := func(method, origin, bearer string) *httptest.ResponseRecorder { + r := httptest.NewRequest(method, "http://localhost/_/auth/logout", nil) + r.AddCookie(&http.Cookie{Name: authCookieName, Value: cookieToken}) + if origin != "" { + r.Header.Set("Origin", origin) + } + if bearer != "" { + r.Header.Set("Authorization", "Bearer "+bearer) + } + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + return w + } + if w := request("GET", "", ""); w.Code != 200 { + t.Fatalf("confirmation: %d %s", w.Code, w.Body.String()) + } + if _, err := s.store.PrincipalForSession(domain, cookieToken); err != nil { + t.Fatal("GET revoked session") + } + if w := request("POST", "http://evil.example", ""); w.Code != 403 { + t.Fatalf("CSRF logout accepted: %d", w.Code) + } + if w := request("POST", "", token); w.Code != 200 { + t.Fatalf("bearer logout: %d", w.Code) + } + if _, err := s.store.PrincipalForSession(domain, token); err == nil { + t.Fatal("Bearer token survived logout") + } + if _, err := s.store.PrincipalForSession(domain, cookieToken); err != nil { + t.Fatal("Bearer logout revoked unrelated cookie credential") + } + if w := request("POST", "http://localhost", ""); w.Code != 303 { + t.Fatalf("cookie logout: %d", w.Code) + } + if _, err := s.store.PrincipalForSession(domain, cookieToken); err == nil { + t.Fatal("cookie token survived logout") + } +} + +func TestReturnPathStaysLocal(t *testing.T) { + for _, value := range []string{"https://evil.example", "//evil.example", "/%2fevil.example", "/\\evil.example", "/%00bad"} { + if got := safeReturnPath(value); got != "/" { + t.Fatalf("unsafe return %q -> %q", value, got) + } + } + if got := safeReturnPath("/life/home?q=1"); got != "/life/home?q=1" { + t.Fatal(got) + } +} + +func TestSessionPurposeAndEditorNavigation(t *testing.T) { + s, apiToken, domain := configFixture(t) + principal, err := s.store.PrincipalForSession(domain, apiToken) + if err != nil { + t.Fatal(err) + } + browserToken, err := s.store.CreateBrowserAuthSession(domain, principal.UUID, 0) + if err != nil { + t.Fatal(err) + } + for _, tc := range []struct { + token, transport string + allowed bool + }{ + {apiToken, "bearer", true}, {apiToken, "cookie", false}, + {browserToken, "bearer", false}, {browserToken, "cookie", true}, + } { + r := httptest.NewRequest("GET", "http://localhost/", nil) + if tc.transport == "bearer" { + r.Header.Set("Authorization", "Bearer "+tc.token) + } else { + r.AddCookie(&http.Cookie{Name: authCookieName, Value: tc.token}) + } + _, err := s.store.PrincipalForSession(domain, s.authTokenFromRequest(r)) + if (err == nil) != tc.allowed { + t.Fatalf("%s purpose mismatch: allowed=%v err=%v", tc.transport, tc.allowed, err) + } + } + r := httptest.NewRequest("GET", "https://wiki.example/e/new-page", nil) + r.AddCookie(&http.Cookie{Name: authCookieName, Value: browserToken}) + r.Header.Set("Sec-Fetch-Site", "cross-site") + if validBrowserMutationOrigin(r) { + t.Fatal("legacy editor GET accepted cross-site") + } + r.Header.Set("Sec-Fetch-Site", "none") + r.Header.Set("Sec-Fetch-Mode", "navigate") + if !validBrowserMutationOrigin(r) { + t.Fatal("address-bar editor navigation rejected") + } +} diff --git a/internal/server/dav_capabilities.go b/internal/server/dav_capabilities.go new file mode 100644 index 0000000..4f77952 --- /dev/null +++ b/internal/server/dav_capabilities.go @@ -0,0 +1,17 @@ +package server + +import "net/http" + +// calendar-access normally asserts RFC 4791 conformance, which our limited +// implementation does not provide. Only advertise it for an explicitly opted-in +// compatibility credential (e.g. OneTask's OPTIONS gate); never infer from UA. +func (s *Server) setDAVCapabilities(w http.ResponseWriter, r *http.Request, actor, credential string) { + w.Header().Set("DAV", "1") + if credential == "" { + return + } + if enabled, err := s.store.DAVCalendarAccessCompat(r.Context(), s.domainUUIDForRequest(r), actor, credential); err == nil && enabled { + w.Header().Set("DAV", "1, calendar-access") + w.Header().Set("X-PagesWiki-CalDAV-Profile", "limited-compatibility") + } +} diff --git a/internal/server/dav_capabilities_test.go b/internal/server/dav_capabilities_test.go new file mode 100644 index 0000000..5c29a5c --- /dev/null +++ b/internal/server/dav_capabilities_test.go @@ -0,0 +1,137 @@ +package server + +import ( + "context" + "encoding/base64" + "encoding/json" + "net/http/httptest" + "strings" + "testing" + "time" + + "pageswiki/internal/store" +) + +// Reproduce the reported OPTIONS gate, not a claim to execute the OneTask app. +// Never use real device credentials or imported calendar data in this fixture. +func TestDAVCalendarAccessCompatibility(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + repo, err := s.calendars() + if err != nil { + t.Fatal(err) + } + c, err := repo.Create(ctx, domain, actor, "Synthetic calendar") + if err != nil { + t.Fatal(err) + } + request := func(auth, method, path, body string, h map[string]string, want int) *httptest.ResponseRecorder { + t.Helper() + r := httptest.NewRequest(method, "http://localhost"+path, strings.NewReader(body)) + if auth != "" { + r.Header.Set("Authorization", auth) + } + r.Header.Set("Depth", "1") + r.Header.Set("Content-Type", "text/calendar") + for k, v := range h { + r.Header.Set(k, v) + } + w := httptest.NewRecorder() + s.handler().ServeHTTP(w, r) + if w.Code != want { + t.Fatalf("%s %s: %d want %d %s", method, path, w.Code, want, w.Body) + } + return w + } + issue := func(scope string, write, compat bool) (string, string) { + t.Helper() + b, _ := json.Marshal(map[string]any{"label": "Compatibility fixture", "scope": scope, "write": write, "calendar_access_compat": compat}) + w := request("Bearer "+token, "POST", davCredentialsAPI, string(b), nil, 201) + var result struct { + Username, Password string + Credential store.TaskDAVCredential + } + if err := json.Unmarshal(w.Body.Bytes(), &result); err != nil { + t.Fatal(err) + } + if result.Credential.CalendarAccessCompat != compat { + t.Fatal("compatibility not persisted") + } + return "Basic " + base64.StdEncoding.EncodeToString([]byte(result.Username+":"+result.Password)), result.Username + } + strict, _ := issue("all", true, false) + compat, id := issue("all", true, true) + readOnly, _ := issue("tasks", false, true) + paths := []string{calendarDAV, strings.TrimSuffix(calendarDAV, "/"), taskDAVRoot, strings.TrimSuffix(taskDAVRoot, "/"), taskDAVCollection, strings.TrimSuffix(taskDAVCollection, "/"), calendarDAV + c.ID + "/", calendarDAV + c.ID} + for _, p := range paths { + for _, auth := range []string{strict, "Bearer " + token} { + w := request(auth, "OPTIONS", p, "", map[string]string{"User-Agent": "OneTask"}, 204) + if w.Header().Get("DAV") != "1" || w.Header().Get("X-PagesWiki-CalDAV-Profile") != "" { + t.Fatal("UA or session enabled compatibility", w.Header()) + } + } + w := request(compat, "OPTIONS", p, "", nil, 204) + if w.Header().Get("DAV") != "1, calendar-access" || w.Header().Get("X-PagesWiki-CalDAV-Profile") != "limited-compatibility" || w.Header().Get("Location") != "" { + t.Fatal(p, w.Header()) + } + if strings.Contains(w.Header().Get("DAV"), "calendar-schedule") || strings.Contains(w.Header().Get("Allow"), "MKCALENDAR") { + t.Fatal("unimplemented capability advertised") + } + } + // Follow the accepted gate through authenticated discovery, fetch and writes. + home := request(compat, "PROPFIND", calendarDAV, commonDAVProps, nil, 207) + if !strings.Contains(home.Body.String(), "current-user-principal") || !strings.Contains(home.Body.String(), taskDAVCollection) { + t.Fatal(home.Body) + } + col := request(readOnly, "PROPFIND", taskDAVCollection, commonDAVProps, map[string]string{"Depth": "0"}, 207) + if !strings.Contains(col.Body.String(), "current-user-privilege-set") || strings.Contains(col.Body.String(), "") { + t.Fatal("readonly privileges", col.Body) + } + col = request(compat, "PROPFIND", taskDAVCollection, commonDAVProps, map[string]string{"Depth": "0"}, 207) + if !strings.Contains(col.Body.String(), "") { + t.Fatal("missing write privilege", col.Body) + } + p := taskDAVCollection + "compat.ics" + request(compat, "PUT", p, taskICALFixture, nil, 201) + get := request(compat, "GET", p, "", nil, 200) + request(compat, "PUT", p, taskICALFixture, nil, 204) + get = request(compat, "GET", p, "", nil, 200) + request(readOnly, "PUT", p, taskICALFixture, map[string]string{"If-Match": get.Header().Get("ETag")}, 403) + changed := strings.Replace(taskICALFixture, "SUMMARY:CLI task", "SUMMARY:Compatibility update", 1) + request(compat, "PUT", p, changed, map[string]string{"If-Match": get.Header().Get("ETag")}, 204) + query := strings.Replace(commonDAVQuery, ``, ``, 1) + result := request(compat, "REPORT", taskDAVCollection, query, nil, 207) + if !strings.Contains(result.Body.String(), "Compatibility update") { + t.Fatal(result.Body) + } + // Compatibility never strips unsupported recurrence to make a write succeed. + bad := strings.Replace(changed, "END:VTODO", "RRULE:FREQ=DAILY\r\nEND:VTODO", 1) + get = request(compat, "GET", p, "", nil, 200) + request(compat, "PUT", p, bad, map[string]string{"If-Match": get.Header().Get("ETag")}, 403) + request(compat, "DELETE", p, "", map[string]string{"If-Match": get.Header().Get("ETag")}, 204) + request(readOnly, "OPTIONS", calendarDAV+c.ID+"/", "", nil, 401) + request(compat, "POST", davCredentialsAPI, `{"label":"escalate","calendar_access_compat":true}`, nil, 401) + // Another principal/domain cannot pick up this credential's compatibility. + if enabled, _ := s.store.DAVCalendarAccessCompat(ctx, domain, "someone-else", id); enabled { + t.Fatal("cross-owner flag leaked") + } + if enabled, _ := s.store.DAVCalendarAccessCompat(ctx, "other-domain", actor, id); enabled { + t.Fatal("cross-domain flag leaked") + } + if err = s.store.RevokeTaskDAVCredential(ctx, domain, actor, id); err != nil { + t.Fatal(err) + } + w := request(compat, "OPTIONS", calendarDAV, "", nil, 401) + if w.Header().Get("DAV") != "" { + t.Fatal("revoked credential advertised support") + } + var count int + if err = s.store.DB.QueryRow(`SELECT count(*) FROM organizer_dav_compat WHERE credential_id=?`, id).Scan(&count); err != nil || count != 0 { + t.Fatal("orphan compatibility row", count, err) + } + expired, expiredID := issue("all", true, true) + if _, err = s.store.DB.Exec(`UPDATE organizer_dav_credentials SET expires_ms=? WHERE id=?`, time.Now().Add(-time.Minute).UnixMilli(), expiredID); err != nil { + t.Fatal(err) + } + request(expired, "OPTIONS", calendarDAV, "", nil, 401) +} diff --git a/internal/server/dav_common_test.go b/internal/server/dav_common_test.go new file mode 100644 index 0000000..f9dc447 --- /dev/null +++ b/internal/server/dav_common_test.go @@ -0,0 +1,153 @@ +package server + +import ( + "context" + "encoding/base64" + "net/http/httptest" + "strings" + "testing" + "time" + + "pageswiki/internal/calendar" +) + +const commonDAVProps = `` +const commonDAVQuery = `` + +func TestCommonDAVScopesAndCalendarWrites(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + repo, err := s.calendars() + if err != nil { + t.Fatal(err) + } + c, err := repo.Create(ctx, domain, actor, "Common fixture") + if err != nil { + t.Fatal(err) + } + col := calendarDAV + c.ID + "/" + item, err := calendar.Build("", calendar.Event{UID: "common@example.test", Summary: "Synthetic event", Start: time.Date(2026, 10, 1, 9, 0, 0, 0, time.UTC), End: time.Date(2026, 10, 1, 10, 0, 0, 0, time.UTC)}) + if err != nil { + t.Fatal(err) + } + makeAuth := func(scope string, write bool) (string, string) { + t.Helper() + c, p, e := s.store.CreateDAVCredential(ctx, domain, actor, scope, write, 1, scope) + if e != nil { + t.Fatal(e) + } + return "Basic " + base64.StdEncoding.EncodeToString([]byte(c.ID+":"+p)), c.ID + } + taskAuth, legacyID := makeAuth("tasks", true) + // Simulate a credential from before scope storage existed. + if _, err = s.store.DB.Exec(`DELETE FROM organizer_dav_scopes WHERE credential_id=?`, legacyID); err != nil { + t.Fatal(err) + } + calAuth, _ := makeAuth("calendar", true) + allAuth, allID := makeAuth("all", true) + readAuth, _ := makeAuth("all", false) + req := func(auth, method, path, body string, h map[string]string, want int) *httptest.ResponseRecorder { + t.Helper() + r := httptest.NewRequest(method, "http://localhost"+path, strings.NewReader(body)) + r.Header.Set("Authorization", auth) + r.Header.Set("Depth", "1") + r.Header.Set("Content-Type", "text/calendar") + for k, v := range h { + r.Header.Set(k, v) + } + w := httptest.NewRecorder() + s.handler().ServeHTTP(w, r) + if w.Code != want { + t.Fatalf("%s %s: %d want %d %s", method, path, w.Code, want, w.Body) + } + return w + } + for _, p := range []string{calendarDAV, strings.TrimSuffix(calendarDAV, "/")} { + for _, test := range []struct { + auth string + tasks, cal bool + }{{taskAuth, true, false}, {calAuth, false, true}, {allAuth, true, true}} { + w := req(test.auth, "PROPFIND", p, commonDAVProps, nil, 207) + if strings.Contains(w.Body.String(), taskDAVCollection) != test.tasks || strings.Contains(w.Body.String(), col) != test.cal || w.Header().Get("Location") != "" { + t.Fatal(w.Body) + } + if !strings.Contains(w.Body.String(), "current-user-principal") { + t.Fatal(w.Body) + } + } + } + req(taskAuth, "PROPFIND", col, commonDAVProps, nil, 401) + req(calAuth, "PROPFIND", taskDAVRoot, commonDAVProps, nil, 401) + req(allAuth, "GET", davCredentialsAPI, "", nil, 401) + req(allAuth, "POST", davCredentialsAPI, `{"label":"escalate","scope":"all"}`, nil, 401) + unauth := req(allAuth, "GET", calendarAPI+"calendars", "", nil, 200) + if !strings.Contains(unauth.Body.String(), `"actor":""`) || strings.Contains(unauth.Body.String(), c.ID) { + t.Fatal("DAV credential escaped to JSON API", unauth.Body) + } + path := col + "arbitrary-client-name.ics" + req(readAuth, "PUT", path, item.Data, nil, 403) + req(calAuth, "PUT", path, item.Data, nil, 201) + w := req(allAuth, "GET", path, "", nil, 200) + tag := w.Header().Get("ETag") + req(allAuth, "GET", path, "", map[string]string{"If-None-Match": tag}, 304) + req(allAuth, "PUT", path, item.Data, nil, 428) + req(allAuth, "PUT", col+"duplicate.ics", item.Data, nil, 412) + req(allAuth, "PUT", path, item.Data, map[string]string{"If-Match": `"stale"`}, 412) + updated, err := calendar.Build(item.Data, calendar.Event{UID: item.UID, Summary: "Edited through CLI", Start: item.Start, End: item.End}) + if err != nil { + t.Fatal(err) + } + req(allAuth, "PUT", path, updated.Data, map[string]string{"If-Match": tag}, 204) + for _, method := range []string{"PROPFIND", "REPORT"} { + body := commonDAVProps + if method == "REPORT" { + body = commonDAVQuery + } + w = req(allAuth, method, col, body, nil, 207) + if !strings.Contains(w.Body.String(), path) { + t.Fatal("lost client filename", w.Body) + } + } + // Reject a partial filter instead of silently returning the entire collection. + bad := strings.Replace(commonDAVQuery, `name="VCALENDAR"`, `name="VCALENDAR" test="anyof"`, 1) + req(allAuth, "REPORT", col, bad, nil, 403) + // Canonical URI used by the existing Web UI still resolves after CLI creation. + req("Bearer "+token, "GET", calendarHref(c.ID, item.UID), "", nil, 200) + projected := req("Bearer "+token, "GET", calendarAPI+"calendars/"+c.ID+"/events?resource=arbitrary-client-name.ics", "", nil, 200) + if !strings.Contains(projected.Body.String(), "Edited through CLI") { + t.Fatal("Web viewer projection failed", projected.Body) + } + // ACL revocation and membership checks are independent of the secret's scope. + if _, err = s.store.DB.Exec(`UPDATE principals SET state='suspended' WHERE uuid=?`, actor); err != nil { + t.Fatal(err) + } + req(allAuth, "GET", path, "", nil, 401) + s.store.DB.Exec(`UPDATE principals SET state='active' WHERE uuid=?`, actor) + if err = s.store.RevokeTaskDAVCredential(ctx, domain, actor, allID); err != nil { + t.Fatal(err) + } + req(allAuth, "GET", path, "", nil, 401) + // Permission recheck inside the calendar's locked write path. + _, _, err = repo.ChangeDAV(ctx, domain, c.ID, actor, "arbitrary-client-name.ics", updated.ETag, &updated, func() error { return s.store.CheckDAVCredential(ctx, domain, actor, allID, true, "calendar") }) + if err != calendar.ErrForbidden { + t.Fatal("revoked credential wrote", err) + } + req(calAuth, "DELETE", path, "", map[string]string{"If-Match": updated.ETag}, 204) + req(calAuth, "GET", path, "", nil, 404) + if err = s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.calendar":false}`); err != nil { + t.Fatal(err) + } + w = req(taskAuth, "PROPFIND", calendarDAV, commonDAVProps, nil, 207) + if strings.Contains(w.Body.String(), col) || !strings.Contains(w.Body.String(), taskDAVCollection) { + t.Fatal("disabled calendar exposed", w.Body) + } + req(calAuth, "PROPFIND", col, commonDAVProps, nil, 404) + if err = s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.tasks":false}`); err != nil { + t.Fatal(err) + } + w = req(calAuth, "PROPFIND", calendarDAV, commonDAVProps, nil, 207) + if strings.Contains(w.Body.String(), taskDAVCollection) || !strings.Contains(w.Body.String(), col) { + t.Fatal("disabled tasks exposed", w.Body) + } + req(taskAuth, "PROPFIND", taskDAVRoot, commonDAVProps, nil, 404) +} diff --git a/internal/server/dav_credentials.go b/internal/server/dav_credentials.go new file mode 100644 index 0000000..738e9a1 --- /dev/null +++ b/internal/server/dav_credentials.go @@ -0,0 +1,154 @@ +package server + +import ( + "encoding/xml" + "net/http" + "strings" + + mw "pageswiki/internal/server/middleware" +) + +func (s *Server) davActor(w http.ResponseWriter, r *http.Request, requested string, anonymous bool) (actor string, write bool, scope, credential string, ok bool) { + scope = "all" + if len(r.Header.Values("Authorization")) > 1 { + mw.SetDAVAuthOutcome(r, "multiple_authorization") + w.WriteHeader(401) + return + } + if id, secret, basic := r.BasicAuth(); basic { + var err error + actor, write, scope, err = s.store.AuthenticateDAV(r.Context(), s.domainUUIDForRequest(r), id, secret, requested) + if err == nil { + mw.SetDAVAuthOutcome(r, "basic_accepted") + return actor, write, scope, id, true + } + mw.SetDAVAuthOutcome(r, "basic_rejected") + } else { + actor, write = s.calendarActor(r) + if actor != "" || anonymous && r.Header.Get("Authorization") == "" { + if actor != "" { + mw.SetDAVAuthOutcome(r, "session_accepted") + } else { + mw.SetDAVAuthOutcome(r, "anonymous") + } + return actor, write, scope, "", true + } + if r.Header.Get("Authorization") == "" { + mw.SetDAVAuthOutcome(r, "missing") + } else { + mw.SetDAVAuthOutcome(r, "invalid_authorization") + } + } + w.Header().Set("WWW-Authenticate", `Basic realm="PagesWiki CalDAV", charset="UTF-8"`) + w.WriteHeader(401) + return +} + +func (s *Server) handleDAVHome(w http.ResponseWriter, r *http.Request) { + domain := s.domainUUIDForRequest(r) + tasks := s.systemExtensionEnabled(domain, "organizer.tasks") + calendars := s.systemExtensionEnabled(domain, "organizer.calendar") + if !tasks && !calendars { + http.NotFound(w, r) + return + } + actor, writable, scope, credential, ok := s.davActor(w, r, "", false) + if !ok { + return + } + s.setDAVCapabilities(w, r, actor, credential) + w.Header().Set("Allow", "OPTIONS, PROPFIND") + if r.Method == "OPTIONS" { + w.WriteHeader(204) + return + } + if r.Method != "PROPFIND" { + w.WriteHeader(405) + return + } + if depth := r.Header.Get("Depth"); depth != "0" && depth != "1" { + http.Error(w, "Depth 0 or 1 required", 403) + return + } + n, err := readDAV(w, r) + if err != nil || n.XMLName.Local != "" && n.XMLName != (xml.Name{Space: davNS, Local: "propfind"}) { + http.Error(w, "invalid PROPFIND", 400) + return + } + var req []davNode + if p := n.child(davNS, "prop"); p != nil { + req = p.Children + } + rows := []davResponse{{href: calendarDAV, props: map[xml.Name]string{ + {Space: davNS, Local: "resourcetype"}: "", + {Space: davNS, Local: "displayname"}: "PagesWiki CalDAV", + {Space: davNS, Local: "current-user-principal"}: "" + calendarDAV + "", + {Space: davNS, Local: "principal-URL"}: "" + calendarDAV + "", + {Space: calNS, Local: "calendar-home-set"}: "" + calendarDAV + "", + }}} + rows[0].props[xml.Name{Space: davNS, Local: "current-user-privilege-set"}] = davPrivileges(false) + if writable && tasks && scope != "calendar" { + rows[0].props[xml.Name{Space: davNS, Local: "current-user-privilege-set"}] += "" + } + if r.Header.Get("Depth") == "1" { + if calendars && scope != "tasks" { + repo, err := s.calendars() + if err != nil { + calendarError(w, err) + return + } + items, err := repo.List(domain, actor) + if err != nil { + calendarError(w, err) + return + } + for _, c := range items { + row := calendarDAVRow(c) + row.props[xml.Name{Space: davNS, Local: "current-user-privilege-set"}] = davPrivileges(writable && c.CanWrite(actor)) + rows = append(rows, row) + } + } + if tasks && scope != "calendar" { + row := taskDAVCollectionRow() + title, err := s.store.TaskDAVDefaultTitle(r.Context(), domain, actor) + if err != nil { + taskError(w, err) + return + } + row.props[xml.Name{Space: davNS, Local: "displayname"}] = xmlText(title) + row.props[xml.Name{Space: davNS, Local: "current-user-privilege-set"}] = davPrivileges(writable) + rows = append(rows, row) + if !s.appendTaskDAVCollections(w, r, domain, actor, writable, &rows) { + return + } + } + } + writeDAV(w, rows, req) +} + +func davPrivileges(write bool) string { + value := "" + if write { + value += "" + } + return value +} + +func (s *Server) handleDAVCredentials(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Cache-Control", "private, no-store") + domain := s.domainUUIDForRequest(r) + if !s.systemExtensionEnabled(domain, "organizer.tasks") && !s.systemExtensionEnabled(domain, "organizer.calendar") { + http.NotFound(w, r) + return + } + actor, _ := s.calendarActor(r) // Basic DAV secrets cannot issue/revoke credentials. + if actor == "" { + s.authRequired(w, r) + return + } + parts := []string{"dav-credentials"} + if r.URL.Path != davCredentialsAPI { + parts = append(parts, strings.Split(strings.TrimPrefix(r.URL.Path, davCredentialsAPI+"/"), "/")...) + } + s.handleTaskDAVCredentials(w, r, actor, parts) +} diff --git a/internal/server/diagram_handler.go b/internal/server/diagram_handler.go index d440ca0..267e8e4 100644 --- a/internal/server/diagram_handler.go +++ b/internal/server/diagram_handler.go @@ -4,21 +4,47 @@ import ( "bytes" "crypto/sha256" "encoding/hex" + "errors" "io" "net/http" "os" "path/filepath" "regexp" "strings" + "sync" "time" ) var diagramSourceCache = map[string]diagramCacheEntry{} +var diagramSourceMu sync.Mutex type diagramCacheEntry struct { Type string Source string At time.Time + Domain string + Path string +} + +func (s *Server) diagramCachePath(kind, hash string) string { + root := s.diagramRoot + if root == "" { + root = "/data/cache/diagram" + } + return filepath.Join(root, kind, hash+".svg") +} + +func readDiagramCache(path string) ([]byte, error) { + f, err := os.Open(path) + if err != nil { + return nil, err + } + defer f.Close() + b, err := io.ReadAll(io.LimitReader(f, (4<<20)+1)) + if len(b) > 4<<20 { + return nil, errors.New("diagram cache exceeds limit") + } + return b, err } func diagramHash( @@ -81,6 +107,8 @@ func krokiURL() string { } func (s *Server) renderDiagramsInHTML( + r *http.Request, + path string, html string, ) string { @@ -109,20 +137,35 @@ func (s *Server) renderDiagramsInHTML( htmlUnescapeString( m[2], ) + if len(source) > 32<<10 || path == "" { + return block + } hash := diagramHash( diagramType, - source, + htmlProjectionVersion+"\x00"+s.domainUUIDForRequest(r)+"\x00"+path+"\x00"+source, "svg", ) + diagramSourceMu.Lock() + if len(diagramSourceCache) >= 128 { + oldest, key := time.Now(), "" + for k, v := range diagramSourceCache { + if v.At.Before(oldest) { + oldest, key = v.At, k + } + } + delete(diagramSourceCache, key) + } diagramSourceCache[hash] = diagramCacheEntry{ Type: diagramType, Source: source, At: time.Now(), + Domain: s.domainUUIDForRequest(r), Path: path, } + diagramSourceMu.Unlock() return `
    ` + `` + diagramType + ` diagram` + @@ -153,6 +196,10 @@ func (s *Server) handleCompileDiagram( w http.ResponseWriter, r *http.Request, ) { + // Apply also to disk-cache hits and direct navigation, not only new renders. + w.Header().Set("Content-Security-Policy", "sandbox; default-src 'none'; style-src 'unsafe-inline'; img-src data:") + w.Header().Set("X-Content-Type-Options", "nosniff") + w.Header().Set("Cache-Control", "private, no-store") if r.Method == http.MethodPost { s.handleCompileDiagramPost( @@ -208,14 +255,16 @@ func (s *Server) handleCompileDiagram( return } - cachePath := - filepath.Join( - "/data/cache/diagram", - diagramType, - hash+".svg", - ) + cachePath := s.diagramCachePath(diagramType, hash) - if b, err := os.ReadFile(cachePath); err == nil { + diagramSourceMu.Lock() + entry, ok := diagramSourceCache[hash] + diagramSourceMu.Unlock() + if !ok || entry.Type != diagramType || entry.Domain != s.domainUUIDForRequest(r) || time.Since(entry.At) > 30*time.Minute || !s.pathReadFilter(r)(entry.Path) { + http.NotFound(w, r) + return + } + if b, err := readDiagramCache(cachePath); err == nil { w.Header().Set( "Content-Type", @@ -226,16 +275,9 @@ func (s *Server) handleCompileDiagram( return } - entry, ok := - diagramSourceCache[hash] - - if !ok || entry.Type != diagramType { - http.NotFound(w, r) - return - } - s.renderDiagramSVG( w, + r, diagramType, entry.Source, cachePath, @@ -269,12 +311,12 @@ func (s *Server) handleCompileDiagramPost( io.ReadAll( io.LimitReader( r.Body, - 1024*1024, + (1<<20)+1, ), ) - if err != nil { - http.Error(w, err.Error(), 500) + if err != nil || len(sourceBytes) > 1<<20 { + http.Error(w, "diagram source exceeds limit", http.StatusRequestEntityTooLarge) return } @@ -288,14 +330,9 @@ func (s *Server) handleCompileDiagramPost( "svg", ) - cachePath := - filepath.Join( - "/data/cache/diagram", - diagramType, - hash+".svg", - ) + cachePath := s.diagramCachePath(diagramType, hash) - if b, err := os.ReadFile(cachePath); err == nil { + if b, err := readDiagramCache(cachePath); err == nil { w.Header().Set( "Content-Type", @@ -308,6 +345,7 @@ func (s *Server) handleCompileDiagramPost( s.renderDiagramSVG( w, + r, diagramType, source, cachePath, @@ -316,13 +354,15 @@ func (s *Server) handleCompileDiagramPost( func (s *Server) renderDiagramSVG( w http.ResponseWriter, + r *http.Request, diagramType string, source string, cachePath string, ) { req, err := - http.NewRequest( + http.NewRequestWithContext( + r.Context(), http.MethodPost, krokiURL()+"/"+diagramType+"/svg", bytes.NewBufferString(source), @@ -364,11 +404,11 @@ func (s *Server) renderDiagramSVG( b, err := io.ReadAll( - resp.Body, + io.LimitReader(resp.Body, (4<<20)+1), ) - if err != nil { - http.Error(w, err.Error(), 500) + if err != nil || len(b) > 4<<20 { + http.Error(w, "diagram output unavailable or exceeds limit", http.StatusBadGateway) return } @@ -392,7 +432,7 @@ func (s *Server) renderDiagramSVG( w.Header().Set( "Content-Security-Policy", - "default-src 'none'; style-src 'unsafe-inline'; img-src data:", + "sandbox; default-src 'none'; style-src 'unsafe-inline'; img-src data:", ) _, _ = diff --git a/internal/server/diagram_projection_security_test.go b/internal/server/diagram_projection_security_test.go new file mode 100644 index 0000000..70df943 --- /dev/null +++ b/internal/server/diagram_projection_security_test.go @@ -0,0 +1,91 @@ +package server + +import ( + "io" + "net/http" + "net/http/httptest" + "regexp" + "strings" + "sync" + "sync/atomic" + "testing" +) + +func TestDiagramProjectionCacheIsolation(t *testing.T) { + s, token, domain := configFixture(t) + s.diagramRoot = t.TempDir() + s.mux.HandleFunc("/:/compile/diagram/", s.handleCompileDiagram) + var renders atomic.Int32 + renderer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + renders.Add(1) + _, _ = io.WriteString(w, `diagram`) + })) + defer renderer.Close() + t.Setenv("KROKI_URL", renderer.URL) + r := httptest.NewRequest("GET", "http://localhost/guide", nil) + r.Header.Set("Authorization", "Bearer "+token) + r = cacheRequestDomain(withReadPolicyContext(r)) + input := `
    graph LR; A-->B;
    ` + out := s.safeHTMLProjection(r, input, "/guide", true) + m := regexp.MustCompile(`src="([^"]+\.svg)"`).FindStringSubmatch(out) + if len(m) != 2 { + t.Fatalf("diagram formatting lost: %s", out) + } + other := s.safeHTMLProjection(r, input, "/other", true) + if strings.Contains(other, m[1]) { + t.Fatal("identical diagrams at different Paths share authority references") + } + for i := 0; i < 2; i++ { + w := configRequest(s, token, "GET", m[1], nil) + if w.Code != 200 || !strings.Contains(w.Header().Get("Content-Security-Policy"), "sandbox;") || w.Header().Get("Cache-Control") != "private, no-store" { + t.Fatalf("diagram/cache=%d %s", w.Code, w.Body.String()) + } + } + if renders.Load() != 1 { + t.Fatalf("cache missed: %d", renders.Load()) + } + // Even a populated on-disk cache cannot bypass the requesting reader's + // Path grant or a mismatching Domain provenance record. + reader, err := s.store.CreatePasswordAccount(domain, "diagram-reader", "a long reader password", "Reader", "") + if err != nil { + t.Fatal(err) + } + readerToken, err := s.store.CreateAuthSession(domain, reader.UUID) + if err != nil { + t.Fatal(err) + } + var role string + if err = s.store.DB.QueryRow(`SELECT b.role_uuid FROM auth_role_bindings b JOIN domain_memberships m ON m.uuid=b.membership_uuid WHERE m.principal_uuid=? AND m.domain_uuid=?`, reader.UUID, domain).Scan(&role); err != nil { + t.Fatal(err) + } + if _, err = s.store.DB.Exec(`DELETE FROM auth_capability_grants WHERE role_uuid=?`, role); err != nil { + t.Fatal(err) + } + w := httptest.NewRecorder() + denied := httptest.NewRequest("GET", "http://localhost"+m[1], nil) + denied.Header.Set("Authorization", "Bearer "+readerToken) + s.handleCompileDiagram(w, denied) + if w.Code != 404 { + t.Fatalf("cached hidden diagram=%d", w.Code) + } + hash := strings.TrimSuffix(m[1][strings.LastIndex(m[1], "/")+1:], ".svg") + diagramSourceMu.Lock() + entry := diagramSourceCache[hash] + entry.Domain = "foreign" + diagramSourceCache[hash] = entry + diagramSourceMu.Unlock() + w = httptest.NewRecorder() + s.handleCompileDiagram(w, httptest.NewRequest("GET", "http://localhost"+m[1], nil)) + if w.Code != 404 { + t.Fatal("foreign cached diagram exposed") + } + var wg sync.WaitGroup + for i := 0; i < 8; i++ { + wg.Add(1) + go func() { defer wg.Done(); _ = s.safeHTMLProjection(r, input, "/guide", true) }() + } + wg.Wait() + if strings.Contains(s.safeHTMLProjection(r, `
    `+strings.Repeat("A", 33<<10)+`
    `, "/guide", true), "/:/compile/diagram/") { + t.Fatal("oversized diagram enqueued") + } +} diff --git a/internal/server/district_context.go b/internal/server/district_context.go deleted file mode 100644 index 2c8d706..0000000 --- a/internal/server/district_context.go +++ /dev/null @@ -1,44 +0,0 @@ -package server - -import ( - "net/http" - - "pageswiki/internal/store" -) - -func (s *Server) currentDistrict() *store.District { - - sp, err := - s.store.GetDefaultDistrict() - - if err != nil { - return &store.District{ - ID: 1, - Name: "default", - Title: "Default District", - Enabled: true, - } - } - - return sp -} - -func (s *Server) districtForRequest( - r *http.Request, -) *store.District { - - if r == nil { - return s.currentDistrict() - } - - sp, err := - s.store.GetDistrictByHost( - r.Host, - ) - - if err != nil { - return s.currentDistrict() - } - - return sp -} diff --git a/internal/server/domain_config.go b/internal/server/domain_config.go new file mode 100644 index 0000000..6fe1544 --- /dev/null +++ b/internal/server/domain_config.go @@ -0,0 +1,17 @@ +package server + +func (s *Server) getDomainConfig(key string, domainUUID ...string) string { + var ( + value string + err error + ) + if len(domainUUID) > 0 && domainUUID[0] != "" { + value, err = s.store.GetConfigInDomain(domainUUID[0], key) + } else { + value, err = s.store.GetConfig(key) + } + if err != nil { + return "" + } + return value +} diff --git a/internal/server/domain_context.go b/internal/server/domain_context.go new file mode 100644 index 0000000..4c35c4f --- /dev/null +++ b/internal/server/domain_context.go @@ -0,0 +1,121 @@ +package server + +import ( + "context" + "log" + "net/http" + "sync" + + "pageswiki/internal/store" +) + +type requestDomainKey struct{} +type requestDomainLookup struct { + once sync.Once + host string + domain *store.Domain + err error +} + +func cacheRequestDomain(r *http.Request) *http.Request { + return r.WithContext(context.WithValue(r.Context(), requestDomainKey{}, &requestDomainLookup{host: r.Host})) +} + +func (s *Server) currentDomain() *store.Domain { + + sp, err := + s.store.GetDefaultDomain() + + if err != nil { + return &store.Domain{ + ID: 1, + Name: "default", + Title: "Default Domain", + Enabled: true, + } + } + + return sp +} + +func (s *Server) currentCampus() *store.Campus { + campus, err := + s.store.GetDefaultCampus() + + if err != nil { + return &store.Campus{ + ID: 1, + Name: "default", + Title: "Default Campus", + DefaultLang: "en", + Enabled: true, + } + } + + return campus +} + +func (s *Server) campusForDomain( + domain *store.Domain, +) *store.Campus { + if domain == nil { + return s.currentCampus() + } + + campus, err := + s.store.GetCampusByUUID( + domain.CampusUUID, + ) + + if err != nil { + return s.currentCampus() + } + + return campus +} + +func (s *Server) domainForRequest( + r *http.Request, +) *store.Domain { + domain, _ := s.domainForRequestWithError(r) + return domain +} + +func (s *Server) domainForRequestWithError( + r *http.Request, +) (*store.Domain, error) { + if r == nil { + return s.currentDomain(), nil + } + if cached, ok := r.Context().Value(requestDomainKey{}).(*requestDomainLookup); ok && cached.host == r.Host { + cached.once.Do(func() { cached.domain, cached.err = s.store.GetDomainByHost(r.Host) }) + return cached.domain, cached.err + } + + sp, err := + s.store.GetDomainByHost( + r.Host, + ) + + if err != nil { + return nil, err + } + + return sp, nil +} + +func logDomainLookupError(r *http.Request, err error) { + log.Printf( + "domain lookup failed host=%q: %v", + r.Host, + err, + ) +} + +func (s *Server) domainUUIDForRequest(r *http.Request) string { + domain := s.domainForRequest(r) + if domain == nil { + return "" + } + return domain.UUID +} diff --git a/internal/server/domain_entry_dialog_browser_test.go b/internal/server/domain_entry_dialog_browser_test.go new file mode 100644 index 0000000..18ecfca --- /dev/null +++ b/internal/server/domain_entry_dialog_browser_test.go @@ -0,0 +1,62 @@ +package server + +import ( + "context" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "path/filepath" + "strings" + "testing" + "time" +) + +func TestDomainEntryDialogChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + for _, theme := range []string{"light", "nanoha-dark"} { + for _, width := range []string{"1440", "390"} { + t.Run(theme+"-"+width, func(t *testing.T) { + s, token, domain := configFixture(t) + if err := s.store.SetConfigInDomain(domain, "theme", theme); err != nil { + t.Fatal(err) + } + script, err := os.ReadFile("internal/server/testdata/domain-entry-dialog.js") + if err != nil { + t.Fatal(err) + } + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + if r.URL.Path == "/-/sys/config" { + rec := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(rec, r) + for k, v := range rec.Header() { + w.Header()[k] = v + } + w.WriteHeader(rec.Code) + _, _ = w.Write([]byte(strings.Replace(rec.Body.String(), "", browserFixtureScript(rec.Header(), script)+"", 1))) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + ctx, cancel := context.WithTimeout(context.Background(), 45*time.Second) + defer cancel() + screenshot := "" + if dir := os.Getenv("PAGESWIKI_PERIODICAL_SCREENSHOT_DIR"); dir != "" { + if err := os.MkdirAll(dir, 0700); err != nil { + t.Fatal(err) + } + screenshot = filepath.Join(dir, "domain-entry-"+theme+"-"+width+".png") + } + out, err := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", server.URL+"/-/sys/config?panel=domains", t.TempDir(), screenshot, width).CombinedOutput() + if err != nil { + t.Fatalf("browser %v %s", err, out) + } + }) + } + } +} diff --git a/internal/server/domain_entry_test.go b/internal/server/domain_entry_test.go new file mode 100644 index 0000000..b7b48af --- /dev/null +++ b/internal/server/domain_entry_test.go @@ -0,0 +1,54 @@ +package server + +import ( + "context" + "net/url" + "pageswiki/internal/store" + "strconv" + "strings" + "testing" +) + +func TestDomainEntryConfig(t *testing.T) { + s, token, domain, actor := periodicalFixture(t) + var id int64 + if err := s.store.DB.QueryRow(`SELECT id FROM domains WHERE uuid=?`, domain).Scan(&id); err != nil { + t.Fatal(err) + } + form := url.Values{"section": {"domain-entry"}, "domain_id": {strconv.FormatInt(id, 10)}, "entry_layout": {"diary"}, "diary_enabled": {"1"}, "diary_prefix": {"/"}, "blog_prefix": {"/blog"}} + w := configRequest(s, token, "POST", "/-/sys/config", form) + if w.Code != 302 { + t.Fatal(w.Code, w.Body.String()) + } + if _, err := s.store.DB.Exec(`INSERT INTO federation_instances(uuid,campus_uuid,fqdn,fingerprint,status,last_seen_at,created_at) SELECT 'old-peer',campus_uuid,'old.example.test','sha256:fixture','approved',0,0 FROM domains WHERE uuid=?`, domain); err != nil { + t.Fatal(err) + } + if blocked := configRequest(s, token, "POST", "/-/sys/config", form); blocked.Code != 409 { + t.Fatal("legacy peer not blocked", blocked.Code) + } + if _, err := s.store.DB.Exec(`INSERT INTO federation_instance_capabilities VALUES('old-peer',2)`); err != nil { + t.Fatal(err) + } + if ready := configRequest(s, token, "POST", "/-/sys/config", form); ready.Code != 302 { + t.Fatal("supported peer blocked", ready.Code) + } + if got, _ := s.store.GetConfigInDomain(domain, "home_layout"); got != "diary" { + t.Fatal(got) + } + if w = periodicalRequest(s, token, "POST", "/_/api/v1/extension/content.diary/settings", `{"enabled":false}`); w.Code != 403 { + t.Fatal("override allowed", w.Code) + } + w = configRequest(s, token, "GET", "/-/sys/config?panel=domains", nil) + if w.Code != 200 || !strings.Contains(w.Body.String(), "data-domain-entry-open") { + t.Fatal("missing dialog", w.Code) + } + if err := s.store.SetDomainEntry(context.Background(), id, "unrelated", store.DomainEntrySettings{Layout: "classic", DiaryPrefix: "/diary", BlogPrefix: "/blog"}); err == nil { + t.Fatal("unauthorized settings") + } + if _, err := s.store.DB.Exec(`UPDATE campuses SET authority_mode='managed' WHERE uuid=(SELECT campus_uuid FROM domains WHERE uuid=?)`, domain); err != nil { + t.Fatal(err) + } + if err := s.store.SetDomainEntry(context.Background(), id, actor, store.DomainEntrySettings{Layout: "classic", DiaryPrefix: "/diary", BlogPrefix: "/blog"}); err == nil { + t.Fatal("managed settings override") + } +} diff --git a/internal/server/editor_config.go b/internal/server/editor_config.go index ecb311c..20404d6 100644 --- a/internal/server/editor_config.go +++ b/internal/server/editor_config.go @@ -1,13 +1,9 @@ package server -func (s *Server) getEditorKeymap() string { +func (s *Server) getEditorKeymap(domainUUID ...string) string { - v, err := - s.store.GetConfig( - "editor_keymap", - ) - - if err != nil || v == "" { + v := s.getDomainConfig("editor_keymap", domainUUID...) + if v == "" { return "default" } @@ -19,30 +15,37 @@ func (s *Server) getEditorKeymap() string { } } -func (s *Server) getEditorSyntaxHighlight() bool { +func (s *Server) getEditorSyntaxHighlight(domainUUID ...string) bool { - v, err := - s.store.GetConfig( - "editor_syntax_highlight", - ) - - if err != nil || v == "" { + v := s.getDomainConfig("editor_syntax_highlight", domainUUID...) + if v == "" { return true } return v != "false" } -func (s *Server) getEditorAutocomplete() bool { +func (s *Server) getEditorAutocomplete(domainUUID ...string) bool { - v, err := - s.store.GetConfig( - "editor_autocomplete", - ) - - if err != nil || v == "" { + v := s.getDomainConfig("editor_autocomplete", domainUUID...) + if v == "" { return true } return v != "false" } + +func (s *Server) getEditorFormat(domainUUID ...string) string { + v := s.getDomainConfig("editor_format_default", domainUUID...) + if v == "markdown" { + return "markdown" + } + return "html" +} + +func (s *Server) getEditorPreviewDefault(domainUUID ...string) string { + if s.getDomainConfig("editor_preview_default", domainUUID...) == "hidden" { + return "hidden" + } + return "visible" +} diff --git a/internal/server/editor_path.go b/internal/server/editor_path.go new file mode 100644 index 0000000..23c6591 --- /dev/null +++ b/internal/server/editor_path.go @@ -0,0 +1,14 @@ +package server + +import "strings" + +// Both the compact /e/docs and the historic /e/-/docs edit /docs. +func semanticEditorPath(route string) string { + if route == "/e/-" || route == "/e/-/" { + return "/" + } + if strings.HasPrefix(route, "/e/-/") { + return "/" + strings.TrimPrefix(route, "/e/-/") + } + return "/" + strings.TrimPrefix(route, "/e/") +} diff --git a/internal/server/email_handler.go b/internal/server/email_handler.go new file mode 100644 index 0000000..df0efbd --- /dev/null +++ b/internal/server/email_handler.go @@ -0,0 +1,60 @@ +package server + +import ( + "bytes" + "io" + "mime" + "mime/multipart" + "net/http" + "net/mail" + "strings" +) + +func (s *Server) handleEmailHTML(w http.ResponseWriter, r *http.Request) { + path := r.URL.Query().Get("path") + objectUUID, err := s.store.ResolvePathInDomain(s.domainUUIDForRequest(r), path) + if err != nil { + http.NotFound(w, r) + return + } + revision, err := s.latestRevisionForRequest(r, objectUUID) + if err != nil { + http.NotFound(w, r) + return + } + htmlBody := extractEmailHTML([]byte(revision.Body)) + if htmlBody == "" { + http.NotFound(w, r) + return + } + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.Header().Set("Content-Security-Policy", + "default-src 'none'; img-src data: cid: https: http:; style-src 'unsafe-inline'") + w.Header().Set("X-Content-Type-Options", "nosniff") + _, _ = io.WriteString(w, htmlBody) +} + +func extractEmailHTML(body []byte) string { + message, err := mail.ReadMessage(bytes.NewReader(body)) + if err != nil { + return "" + } + mediaType, params, _ := mime.ParseMediaType(message.Header.Get("Content-Type")) + if mediaType == "text/html" { + return readMailBody(message.Header.Get("Content-Transfer-Encoding"), message.Body) + } + if !strings.HasPrefix(mediaType, "multipart/") || params["boundary"] == "" { + return "" + } + reader := multipart.NewReader(message.Body, params["boundary"]) + for { + part, err := reader.NextPart() + if err != nil { + return "" + } + partType, _, _ := mime.ParseMediaType(part.Header.Get("Content-Type")) + if partType == "text/html" { + return readMailBody(part.Header.Get("Content-Transfer-Encoding"), part) + } + } +} diff --git a/internal/server/endpoint_policy.go b/internal/server/endpoint_policy.go new file mode 100644 index 0000000..4dc379d --- /dev/null +++ b/internal/server/endpoint_policy.go @@ -0,0 +1,217 @@ +package server + +import ( + "net/http" + "strings" +) + +type authorizationTargetKind string + +const ( + targetPath authorizationTargetKind = "path" + targetDomain authorizationTargetKind = "domain" +) + +type endpointPolicy struct { + Name string + Capability string + Target authorizationTargetKind + Resolver endpointTargetResolver +} + +type endpointTargetResolver string + +const ( + resolveNone endpointTargetResolver = "" + resolveHandler endpointTargetResolver = "handler" + resolveObjectURL endpointTargetResolver = "object_url" + resolveRevision endpointTargetResolver = "revision_url" + resolveRaw endpointTargetResolver = "raw_address" + resolveText endpointTargetResolver = "text_revision" + resolvePDF endpointTargetResolver = "pdf_revision" + resolvePreview endpointTargetResolver = "preview_document" + resolveQueryPath endpointTargetResolver = "query_path" + resolveViewPath endpointTargetResolver = "view_path" + resolvePrint endpointTargetResolver = "print_address" + resolveDiff endpointTargetResolver = "revision_diff" +) + +var endpointPolicies = map[string]endpointPolicy{ + "GET /_/api/v1/extension": {Name: "extension.catalog", Capability: "manage", Target: targetDomain, Resolver: resolveHandler}, + "POST /-/sys/config/vim": {Name: "config.vim", Capability: "manage", Target: targetDomain, Resolver: resolveHandler}, + "GET /:/new": {Name: "page.create_form", Capability: "create", Target: targetDomain}, + "GET /v/upload": {Name: "upload.form", Capability: "read", Target: targetDomain}, + "GET /_/api/v1/object/list": {Name: "object.list", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "GET /_/api/v1/path-picker": {Name: "path_picker.list", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "GET /_/api/v1/search/suggest": {Name: "search.suggest", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "GET /_/api/v1/browser/navigation": {Name: "browser.navigation.list", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "HEAD /_/api/v1/object/list": {Name: "object.list", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "GET /_/api/v1/revisions/list": {Name: "revision.list", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "HEAD /_/api/v1/revisions/list": {Name: "revision.list", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "GET /_/api/v1/gc/zombies/list": {Name: "gc.list", Capability: "manage", Target: targetDomain}, + "POST /:/new": {Name: "page.create", Capability: "create", Target: targetDomain}, + "POST /:/compile/markdown": {Name: "render.markdown", Capability: "read", Target: targetDomain}, + "POST /_/api/v1/object/create": {Name: "object.create", Capability: "create", Target: targetDomain}, + "POST /_/api/v1/object/delete": {Name: "object.delete", Capability: "delete", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/revisions/save": {Name: "revision.save", Capability: "write", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/revisions/restore": {Name: "revision.restore", Capability: "write", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/render/markdown": {Name: "render.markdown", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/tag/add": {Name: "tag.add", Capability: "write", Target: targetDomain}, + "POST /_/api/v1/path/bind": {Name: "path.bind", Capability: "link", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/path/rename": {Name: "path.rename", Capability: "rename", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/path/rename-preview": {Name: "path.rename_preview", Capability: "rename", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/path/remove": {Name: "path.remove", Capability: "delete", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/path/copy": {Name: "path.copy", Capability: "create", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/browser/navigation": {Name: "browser.navigation.add", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "PATCH /_/api/v1/browser/navigation": {Name: "browser.navigation.rename", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "DELETE /_/api/v1/browser/navigation": {Name: "browser.navigation.delete", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/gc/zombies/purge": {Name: "gc.purge", Capability: "delete", Target: targetDomain}, + "POST /v/upload": {Name: "document.upload", Capability: "upload", Target: targetDomain, Resolver: resolveHandler}, + "GET /_/api/v1/assets": {Name: "asset.list", Capability: "manage", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/assets": {Name: "asset.create", Capability: "manage", Target: targetDomain, Resolver: resolveHandler}, + "DELETE /_/api/v1/assets": {Name: "asset.delete", Capability: "manage", Target: targetDomain, Resolver: resolveHandler}, + "GET /_/api/v1/notifications": {Name: "notifications.list", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "GET /_/api/v1/notifications/push": {Name: "notifications.push", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/notifications/push": {Name: "notifications.push", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "DELETE /_/api/v1/notifications/push": {Name: "notifications.push", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/notifications/read": {Name: "notifications.read", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "PATCH /_/api/v1/notifications/read": {Name: "notifications.read", Capability: "read", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/publication/requests": {Name: "publication.request", Capability: "manage", Target: targetDomain, Resolver: resolveHandler}, + "POST /_/api/v1/publication/requests/": {Name: "publication.decide", Capability: "manage", Target: targetDomain, Resolver: resolveHandler}, +} + +var mutationPrefixPolicies = []struct { + Prefix string + Policy endpointPolicy +}{ + {Prefix: "/e/", Policy: endpointPolicy{Name: "document.edit", Capability: "write", Target: targetPath}}, + {Prefix: "/-/sys/", Policy: endpointPolicy{Name: "system.manage", Capability: "manage", Target: targetDomain}}, + {Prefix: "/_/api/v1/event", Policy: endpointPolicy{Name: "event.manage", Capability: "manage", Target: targetDomain}}, + {Prefix: "/_/api/v1/queue", Policy: endpointPolicy{Name: "queue.manage", Capability: "manage", Target: targetDomain}}, + {Prefix: "/_/api/v1/adapter", Policy: endpointPolicy{Name: "adapter.manage", Capability: "manage", Target: targetDomain}}, + {Prefix: "/_/api/v1/publication/requests/", Policy: endpointPolicy{Name: "publication.decide", Capability: "manage", Target: targetDomain, Resolver: resolveHandler}}, + {Prefix: "/_/api/v1/city/", Policy: endpointPolicy{Name: "city.mutate", Capability: "write", Target: targetDomain}}, + {Prefix: "/_/api/v1/import/", Policy: endpointPolicy{Name: "import.mutate", Capability: "write", Target: targetDomain}}, + {Prefix: "/v/import", Policy: endpointPolicy{Name: "import.mutate", Capability: "write", Target: targetDomain}}, + {Prefix: "/:/compile/diagram/", Policy: endpointPolicy{Name: "render.diagram", Capability: "read", Target: targetDomain}}, + {Prefix: "/l/", Policy: endpointPolicy{Name: "path.link", Capability: "link", Target: targetDomain, Resolver: resolveHandler}}, +} + +func policyForRequest(r *http.Request) endpointPolicy { + if taskRoute(r.URL.Path) { + return endpointPolicy{Name: "tasks.handler", Capability: "read", Target: targetDomain, Resolver: resolveHandler} + } + if calendarRoute(r.URL.Path) { + return endpointPolicy{Name: "calendar.handler", Capability: "read", Target: targetDomain, Resolver: resolveHandler} + } + if kind, operation := periodicalRoute(r.URL.Path); kind != "" { + if (r.Method == "GET" && operation != "posts") || (r.Method == "POST" && operation != "view" && operation != "plan" && operation != "new") { + capability := "read" + if r.Method == "POST" { + capability = "write" + if operation == "settings" { + capability = "manage" + } + } + return endpointPolicy{Name: "extension." + kind + "." + operation, Capability: capability, Target: targetDomain, Resolver: resolveHandler} + } + return endpointPolicy{Name: "extension.method.undefined", Capability: "deny", Target: targetDomain} + } + if cityGovernanceRoute(r.URL.Path) { + return endpointPolicy{Name: "city.governance", Capability: "manage", Target: targetDomain, Resolver: resolveHandler} + } + cleanPath := strings.TrimSuffix(r.URL.Path, "/") + if policy, ok := endpointPolicies[r.Method+" "+cleanPath]; ok { + return policy + } + // Exact routes are method-closed. This also protects older handlers that do + // not yet carry their own explicit method guard. + for route := range endpointPolicies { + _, declaredPath, ok := strings.Cut(route, " ") + if ok && declaredPath == cleanPath { + return endpointPolicy{Name: "method.undefined", Capability: "deny", Target: targetDomain} + } + } + if r.Method == http.MethodGet || r.Method == http.MethodHead || r.Method == http.MethodOptions { + if resolver, capability := readEndpointResolver(r.URL.Path); resolver != resolveNone { + return endpointPolicy{Name: "derived.read", Capability: capability, Target: targetPath, Resolver: resolver} + } + if strings.HasPrefix(r.URL.Path, "/e/") { + return endpointPolicy{Name: "document.editor", Capability: "write", Target: targetPath} + } + if strings.HasPrefix(r.URL.Path, "/-/sys/") || + strings.HasPrefix(r.URL.Path, "/_/api/v1/event") || + strings.HasPrefix(r.URL.Path, "/_/api/v1/queue") { + return endpointPolicy{Name: "system.read", Capability: "manage", Target: targetDomain} + } + return endpointPolicy{Name: "content.read", Capability: "read", Target: endpointTargetKind(r.URL.Path)} + } + + for _, rule := range mutationPrefixPolicies { + if strings.HasPrefix(r.URL.Path, rule.Prefix) { + return rule.Policy + } + } + if isReservedEndpoint(r.URL.Path) { + return endpointPolicy{Name: "reserved.undefined", Capability: "deny", Target: targetDomain} + } + return endpointPolicy{Name: "document.mutate", Capability: "write", Target: targetPath} +} + +func readEndpointResolver(path string) (endpointTargetResolver, string) { + switch { + case path == "/v/children", path == "/v/tree", strings.HasPrefix(path, "/v/tree/"): + return resolveHandler, "read" + case path == "/v/city", strings.HasPrefix(path, "/v/city/"), strings.HasPrefix(path, "/_/api/v1/city/"): + return resolveHandler, "read" + case path == "/v/bookmarks": + return resolveHandler, "read" + case strings.HasPrefix(path, "/_/obj/"): + return resolveHandler, "read" + case strings.HasPrefix(path, "/v/raw/"): + return resolveRaw, "read" + case strings.HasPrefix(path, "/v/text/"): + return resolveText, "read" + case path == "/v/pdf-page": + return resolvePDF, "read" + case strings.HasPrefix(path, "/v/preview-cache/"): + return resolvePreview, "read" + case path == "/v/archive", path == "/v/email-html": + return resolveQueryPath, "read" + case path == "/v/search", path == "/v/tree", strings.HasPrefix(path, "/v/tree/"): + return resolveHandler, "read" + case strings.HasPrefix(path, "/_/view/print/"): + return resolvePrint, "read" + case strings.HasPrefix(path, "/v/preview"), strings.HasPrefix(path, "/v/plain"), strings.HasPrefix(path, "/v/markdown"): + return resolveViewPath, "read" + case strings.HasPrefix(path, "/o/e/"): + return resolveObjectURL, "write" + case strings.HasPrefix(path, "/l/uuid:"): + return resolveObjectURL, "read" + case strings.HasPrefix(path, "/o/r/"), strings.HasPrefix(path, "/o/"): + return resolveObjectURL, "read" + case strings.HasPrefix(path, "/r/history/"): + return resolveObjectURL, "read" + case strings.HasPrefix(path, "/r/view/"): + return resolveRevision, "read" + case strings.HasPrefix(path, "/r/diff/"): + return resolveDiff, "read" + } + return resolveNone, "" +} + +func endpointTargetKind(path string) authorizationTargetKind { + if isReservedEndpoint(path) { + return targetDomain + } + return targetPath +} + +func isReservedEndpoint(path string) bool { + for _, prefix := range []string{"/_/", "/-/", "/:/", "/o/", "/r/", "/v/", "/l/", "/static/"} { + if strings.HasPrefix(path, prefix) { + return true + } + } + return false +} diff --git a/internal/server/endpoint_policy_test.go b/internal/server/endpoint_policy_test.go new file mode 100644 index 0000000..3606d60 --- /dev/null +++ b/internal/server/endpoint_policy_test.go @@ -0,0 +1,77 @@ +package server + +import ( + "net/http" + "net/http/httptest" + "testing" +) + +func TestPolicyForRequest(t *testing.T) { + tests := []struct { + method, path, capability string + target authorizationTargetKind + }{ + {http.MethodGet, "/guide/delete-is-a-title", "read", targetPath}, + {http.MethodPost, "/guide/delete-is-a-title", "write", targetPath}, + {http.MethodGet, "/e/-/guide", "write", targetPath}, + {http.MethodGet, "/:/new", "create", targetDomain}, + {http.MethodPost, "/:/new", "create", targetDomain}, + {http.MethodGet, "/_/api/v1/object/create", "deny", targetDomain}, + {http.MethodPost, "/_/api/v1/path/rename", "rename", targetDomain}, + {http.MethodPost, "/_/api/v1/render/markdown", "read", targetDomain}, + {http.MethodDelete, "/_/api/v1/assets", "manage", targetDomain}, + {http.MethodGet, "/_/api/v1/assets", "manage", targetDomain}, + {http.MethodGet, "/_/api/v1/notifications", "read", targetDomain}, + {http.MethodPost, "/_/api/v1/notifications/read", "read", targetDomain}, + {http.MethodPatch, "/_/api/v1/notifications/read", "read", targetDomain}, + {http.MethodPost, "/_/api/v1/publication/requests", "manage", targetDomain}, + {http.MethodPost, "/_/api/v1/publication/requests/request-1/decisions", "manage", targetDomain}, + {http.MethodPut, "/_/api/v1/assets", "deny", targetDomain}, + {http.MethodGet, "/_/api/v1/event/jobs", "manage", targetDomain}, + {http.MethodGet, "/_/api/v1/queue", "manage", targetDomain}, + {http.MethodPost, "/_/api/v1/event/run", "manage", targetDomain}, + {http.MethodPost, "/_/api/v1/not-registered/delete", "deny", targetDomain}, + } + for _, tt := range tests { + t.Run(tt.method+" "+tt.path, func(t *testing.T) { + r := httptest.NewRequest(tt.method, tt.path, nil) + got := policyForRequest(r) + if got.Capability != tt.capability || got.Target != tt.target { + t.Fatalf("policy = capability %q target %q; want %q %q", got.Capability, got.Target, tt.capability, tt.target) + } + }) + } +} + +func TestReadEndpointResolvers(t *testing.T) { + tests := []struct { + path string + resolver endpointTargetResolver + capability string + }{ + {"/v/raw/rev:123", resolveRaw, "read"}, + {"/v/text/rev:123", resolveText, "read"}, + {"/v/pdf-page", resolvePDF, "read"}, + {"/v/preview-cache/hash.jpg", resolvePreview, "read"}, + {"/v/preview/docs/page", resolveViewPath, "read"}, + {"/o/e/uuid:123", resolveObjectURL, "write"}, + {"/r/view/revision", resolveRevision, "read"}, + } + for _, tt := range tests { + t.Run(tt.path, func(t *testing.T) { + request := httptest.NewRequest(http.MethodGet, tt.path, nil) + policy := policyForRequest(request) + if policy.Resolver != tt.resolver || policy.Capability != tt.capability { + t.Fatalf("resolver=%q capability=%q; want %q %q", policy.Resolver, policy.Capability, tt.resolver, tt.capability) + } + }) + } +} + +func TestEndpointPoliciesAreNamed(t *testing.T) { + for route, policy := range endpointPolicies { + if policy.Name == "" || policy.Capability == "" || policy.Target == "" { + t.Errorf("incomplete policy for %s: %#v", route, policy) + } + } +} diff --git a/internal/server/endpoint_target.go b/internal/server/endpoint_target.go new file mode 100644 index 0000000..7a44ba5 --- /dev/null +++ b/internal/server/endpoint_target.go @@ -0,0 +1,284 @@ +package server + +import ( + "context" + "errors" + "net/http" + "path/filepath" + "strings" + + "pageswiki/internal/store" +) + +func (s *Server) authorizeResolvedEndpoint(r *http.Request, principal *store.Principal, policy endpointPolicy) (bool, error) { + domainUUID := s.domainUUIDForRequest(r) + switch policy.Resolver { + case resolveNone: + return false, nil + case resolveHandler: + return true, nil + case resolveRaw: + address := strings.TrimPrefix(r.URL.Path, "/v/raw/") + switch { + case strings.HasPrefix(address, "path:"): + return true, s.authorizePrincipalPath(domainUUID, principal.UUID, policy.Capability, strings.TrimPrefix(address, "path:")) + case strings.HasPrefix(address, "uuid:"): + return true, s.authorizePrincipalObject(domainUUID, principal.UUID, policy.Capability, strings.TrimPrefix(address, "uuid:")) + case strings.HasPrefix(address, "rev:"): + return true, s.authorizePrincipalRevision(domainUUID, principal.UUID, policy.Capability, strings.TrimPrefix(address, "rev:")) + case strings.HasPrefix(address, "asset:"): + // Asset HEAD authorization is address-aware and remains in its handler. + return true, nil + default: + return true, store.ErrAccessDenied + } + case resolveText: + address := strings.TrimPrefix(r.URL.Path, "/v/text/") + if !strings.HasPrefix(address, "rev:") { + return true, store.ErrAccessDenied + } + return true, s.authorizePrincipalRevision(domainUUID, principal.UUID, policy.Capability, strings.TrimPrefix(address, "rev:")) + case resolvePDF: + return true, s.authorizePrincipalRevision(domainUUID, principal.UUID, policy.Capability, r.URL.Query().Get("rev")) + case resolvePreview: + name := filepath.Base(strings.TrimPrefix(r.URL.Path, "/v/preview-cache/")) + hash := strings.TrimSuffix(strings.TrimSuffix(name, ".jpg"), ".svg") + return true, s.authorizePrincipalDocument(domainUUID, principal.UUID, policy.Capability, hash) + case resolveQueryPath: + return true, s.authorizePrincipalPath(domainUUID, principal.UUID, policy.Capability, r.URL.Query().Get("path")) + case resolveViewPath: + return true, s.authorizePrincipalPath(domainUUID, principal.UUID, policy.Capability, semanticViewPath(r.URL.Path)) + case resolvePrint: + address := strings.TrimPrefix(r.URL.Path, "/_/view/print/") + return true, s.authorizePrincipalAddress(domainUUID, principal.UUID, policy.Capability, address) + case resolveObjectURL: + return true, s.authorizePrincipalObject(domainUUID, principal.UUID, policy.Capability, objectIDFromRoute(r.URL.Path)) + case resolveRevision: + return true, s.authorizePrincipalRevision(domainUUID, principal.UUID, policy.Capability, strings.TrimPrefix(r.URL.Path, "/r/view/")) + case resolveDiff: + parts := strings.SplitN(strings.TrimPrefix(r.URL.Path, "/r/diff/"), "/", 2) + if len(parts) != 2 { + return true, store.ErrAccessDenied + } + if err := s.authorizePrincipalRevision(domainUUID, principal.UUID, policy.Capability, parts[0]); err != nil { + return true, err + } + return true, s.authorizePrincipalRevision(domainUUID, principal.UUID, policy.Capability, parts[1]) + default: + return true, store.ErrAccessDenied + } +} + +func (s *Server) authorizePrincipalAddress(domainUUID, principalUUID, capability, address string) error { + switch { + case strings.HasPrefix(address, "path:"): + return s.authorizePrincipalPath(domainUUID, principalUUID, capability, strings.TrimPrefix(address, "path:")) + case strings.HasPrefix(address, "uuid:"): + return s.authorizePrincipalObject(domainUUID, principalUUID, capability, strings.TrimPrefix(address, "uuid:")) + case strings.HasPrefix(address, "rev:"): + return s.authorizePrincipalRevision(domainUUID, principalUUID, capability, strings.TrimPrefix(address, "rev:")) + default: + return store.ErrAccessDenied + } +} + +func (s *Server) requestCanReadPath(r *http.Request, path string) bool { + return s.pathReadFilter(r)(path) +} + +func (s *Server) authorizeObjectForRequest(r *http.Request, capability, objectUUID string) error { + domainUUID := s.domainUUIDForRequest(r) + mode, err := s.store.GetConfigInDomain(domainUUID, "authorization_mode") + if err != nil { + return err + } + if mode != "enforcing" { + return nil + } + principal, err := s.store.PrincipalForSession(domainUUID, s.authTokenFromRequest(r)) + if err != nil { + return store.ErrAccessDenied + } + return s.authorizePrincipalObject(domainUUID, principal.UUID, capability, objectUUID) +} + +func normalizeAuthorizationPath(value string) string { + value = strings.TrimSpace(value) + if value == "" || !strings.HasPrefix(value, "/") { + return "" + } + if value != "/" { + value = strings.TrimRight(value, "/") + } + return value +} + +// authorizedMutationSnapshot returns exactly the bindings whose source and +// destination grants were checked. The mutation must pass this opaque snapshot +// to the checked store method, never enumerate the tree for a second time. +func (s *Server) authorizedMutationSnapshot(r *http.Request, sourceCapability, destinationCapability, source, destination string, recursive bool) (*store.PathMutationSnapshot, error) { + source = normalizeAuthorizationPath(source) + if source == "" { + return nil, store.ErrAccessDenied + } + if destinationCapability != "" { + destination = normalizeAuthorizationPath(destination) + if destination == "" { + return nil, store.ErrAccessDenied + } + } + domainUUID := s.domainUUIDForRequest(r) + mode, err := s.store.GetConfigInDomain(domainUUID, "authorization_mode") + if err != nil { + return nil, err + } + var principal *store.Principal + if mode == "enforcing" { + principal, err = s.store.PrincipalForSession(domainUUID, s.authTokenFromRequest(r)) + if err != nil { + return nil, store.ErrAccessDenied + } + } + snapshot, err := s.store.SnapshotPathsInDomain(domainUUID, source, recursive) + if err != nil { + // Do not expose the existence/size of a scope whose root is unreadable. + if principal != nil && (errors.Is(err, store.ErrPathNotFound) || errors.Is(err, store.ErrPathMutationTooLarge)) && s.authorizePrincipalPath(domainUUID, principal.UUID, sourceCapability, source) != nil { + return nil, store.ErrAccessDenied + } + return nil, err + } + if principal == nil { + return snapshot, nil + } + for _, sourcePath := range snapshot.Paths() { + if err := s.authorizePrincipalPath(domainUUID, principal.UUID, sourceCapability, sourcePath); err != nil { + return nil, err + } + if destinationCapability != "" { + destinationPath := destination + strings.TrimPrefix(sourcePath, snapshot.Root()) + if err := s.authorizePrincipalPath(domainUUID, principal.UUID, destinationCapability, destinationPath); err != nil { + return nil, err + } + } + } + return snapshot, nil +} + +func (s *Server) authorizePathTreeForRequest(r *http.Request, capability, root string, recursive bool) error { + _, err := s.authorizedMutationSnapshot(r, capability, "", root, "", recursive) + return err +} + +func (s *Server) authorizePathMoveForRequest(r *http.Request, sourceCapability, destinationCapability, source, destination string, recursive bool) error { + _, err := s.authorizedMutationSnapshot(r, sourceCapability, destinationCapability, source, destination, recursive) + return err +} + +func (s *Server) authorizePrincipalDocument(domainUUID, principalUUID, capability, hash string) error { + if hash == "" { + return store.ErrAccessDenied + } + references, err := s.store.DocumentReferencesInDomain(domainUUID, hash) + if err != nil { + return err + } + for _, reference := range references { + if s.authorizePrincipalPath(domainUUID, principalUUID, capability, reference.Path) == nil { + return nil + } + } + return store.ErrAccessDenied +} + +func (s *Server) authorizePrincipalPath(domainUUID, principalUUID, capability, path string) error { + if path == "" || !strings.HasPrefix(path, "/") { + return store.ErrAccessDenied + } + if store.IsUserSpacePath(path) { + allowed, err := s.store.UserSpaceCanReadAuthenticated(context.Background(), domainUUID, principalUUID, path) + if err != nil || !allowed { + return store.ErrAccessDenied + } + } + return s.store.Authorize(store.AuthorizationRequest{DomainUUID: domainUUID, PrincipalUUID: principalUUID, Capability: capability, TargetType: "path", TargetID: path}) +} + +func (s *Server) authorizePrincipalObject(domainUUID, principalUUID, capability, objectUUID string) error { + if objectUUID == "" { + return store.ErrAccessDenied + } + request := store.AuthorizationRequest{DomainUUID: domainUUID, PrincipalUUID: principalUUID, Capability: capability, TargetType: "object", TargetID: objectUUID} + inScope, err := s.store.ObjectInDomainAuthorityScope(domainUUID, objectUUID) + if err != nil { + return err + } + if !inScope { + return s.store.AuthorizeExactObject(request) + } + links, err := s.store.ListPathLinksInDomain(domainUUID, objectUUID) + if err != nil { + return err + } + for _, link := range links { + if !store.IsUserSpacePath(link.Path) { + continue + } + allowed, audienceErr := s.store.UserSpaceCanReadAuthenticated(context.Background(), domainUUID, principalUUID, link.Path) + if audienceErr != nil || !allowed { + return store.ErrAccessDenied + } + } + if err := s.store.CheckObjectLocalityAccessCaps(domainUUID, principalUUID, capability, objectUUID); err != nil { + return err + } + if err := s.store.Authorize(request); err == nil { + return nil + } else if !errors.Is(err, store.ErrAccessDenied) { + return err + } + if !s.store.ObjectBoundInDomain(domainUUID, objectUUID) { + return store.ErrAccessDenied + } + for _, link := range links { + if s.authorizePrincipalPath(domainUUID, principalUUID, capability, link.Path) == nil { + return nil + } + } + return store.ErrAccessDenied +} + +func (s *Server) authorizePrincipalRevision(domainUUID, principalUUID, capability, revisionUUID string) error { + if revisionUUID == "" { + return store.ErrAccessDenied + } + revision, err := s.store.GetRevisionMetadata(revisionUUID) + if err != nil { + return store.ErrAccessDenied + } + return s.authorizePrincipalObject(domainUUID, principalUUID, capability, revision.ObjectUUID) +} + +func objectIDFromRoute(path string) string { + for _, prefix := range []string{"/o/e/uuid:", "/o/r/uuid:", "/o/uuid:", "/l/uuid:", "/r/history/"} { + if strings.HasPrefix(path, prefix) { + return strings.TrimPrefix(path, prefix) + } + } + return "" +} + +func semanticViewPath(route string) string { + for _, prefix := range []string{"/v/preview", "/v/plain", "/v/markdown", "/v/browser"} { + if strings.HasPrefix(route, prefix) { + path := strings.TrimPrefix(route, prefix) + if path == "" { + return "/" + } + if !strings.HasPrefix(path, "/") { + return "/" + path + } + return path + } + } + return "" +} diff --git a/internal/server/endpoint_target_test.go b/internal/server/endpoint_target_test.go new file mode 100644 index 0000000..d459006 --- /dev/null +++ b/internal/server/endpoint_target_test.go @@ -0,0 +1,88 @@ +package server + +import ( + "errors" + "net/http" + "net/http/httptest" + "testing" + + "pageswiki/internal/db" + "pageswiki/internal/store" +) + +func TestObjectAndRevisionAuthorizationFollowReadableBindings(t *testing.T) { + database, err := db.Open(t.TempDir() + "/endpoint-target.db") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := store.New(database) + if err := st.EnsureConfigTable(); err != nil { + t.Fatal(err) + } + domain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + principal, err := st.BootstrapOwner(domain.UUID, "scoped", "correct horse battery staple", "Scoped", "") + if err != nil { + t.Fatal(err) + } + var roleUUID string + if err := database.QueryRow(`SELECT b.role_uuid FROM auth_role_bindings b JOIN domain_memberships m ON m.uuid=b.membership_uuid WHERE m.domain_uuid=? AND m.principal_uuid=? LIMIT 1`, domain.UUID, principal.UUID).Scan(&roleUUID); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`DELETE FROM auth_capability_grants WHERE role_uuid=?`, roleUUID); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`INSERT INTO auth_capability_grants(uuid,role_uuid,capability,target_type,target_id,created_at_ms) VALUES('scoped-read',?,'read','path','/allowed',1)`, roleUUID); err != nil { + t.Fatal(err) + } + allowedObject, err := st.CreatePageAtPathInDomain(domain.UUID, "/allowed") + if err != nil { + t.Fatal(err) + } + allowedRevision, err := st.SaveRevision(allowedObject, "allowed", "test") + if err != nil { + t.Fatal(err) + } + deniedObject, err := st.CreatePageAtPathInDomain(domain.UUID, "/denied") + if err != nil { + t.Fatal(err) + } + server := &Server{store: st} + if err := server.authorizePrincipalObject(domain.UUID, principal.UUID, "read", allowedObject); err != nil { + t.Fatalf("object through readable binding: %v", err) + } + if err := server.authorizePrincipalRevision(domain.UUID, principal.UUID, "read", allowedRevision); err != nil { + t.Fatalf("revision through readable binding: %v", err) + } + if err := server.authorizePrincipalObject(domain.UUID, principal.UUID, "read", deniedObject); !errors.Is(err, store.ErrAccessDenied) { + t.Fatalf("unreadable object authorization = %v", err) + } + + if _, err := st.CreatePageAtPathInDomain(domain.UUID, "/allowed/child"); err != nil { + t.Fatal(err) + } + token, err := st.CreateAuthSession(domain.UUID, principal.UUID) + if err != nil { + t.Fatal(err) + } + if err := st.SetConfigInDomain(domain.UUID, "authorization_mode", "enforcing"); err != nil { + t.Fatal(err) + } + request := httptest.NewRequest(http.MethodPost, "http://localhost/_/api/v1/path/copy", nil) + request.Header.Set("Authorization", "Bearer "+token) + if err := server.authorizePathTreeForRequest(request, "read", "/allowed", true); !errors.Is(err, store.ErrAccessDenied) { + t.Fatalf("recursive operation crossed an ungranted child: %v", err) + } + if _, err := database.Exec(`INSERT INTO auth_capability_grants(uuid,role_uuid,capability,target_type,target_id,created_at_ms) VALUES('scoped-child-read',?,'read','path','/allowed/child',1)`, roleUUID); err != nil { + t.Fatal(err) + } + if err := server.authorizePathTreeForRequest(request, "read", "/allowed", true); err != nil { + t.Fatalf("fully granted recursive operation: %v", err) + } +} diff --git a/internal/server/event_api.go b/internal/server/event_api.go new file mode 100644 index 0000000..16340d4 --- /dev/null +++ b/internal/server/event_api.go @@ -0,0 +1,296 @@ +package server + +import ( + "encoding/json" + "errors" + "net/http" + "os" + "path/filepath" + "runtime" + "strconv" + "strings" + "syscall" + "time" + + "pageswiki/internal/store" +) + +func writeEventJSON(w http.ResponseWriter, status int, value any) { + w.Header().Set("Content-Type", "application/json; charset=utf-8") + w.Header().Set("Cache-Control", "no-store") + w.WriteHeader(status) + _ = json.NewEncoder(w).Encode(value) +} + +func decodeEventJSON(w http.ResponseWriter, r *http.Request, value any) bool { + r.Body = http.MaxBytesReader(w, r.Body, 1<<20) + if err := json.NewDecoder(r.Body).Decode(value); err != nil { + writeEventJSON(w, http.StatusBadRequest, map[string]string{"error": err.Error()}) + return false + } + return true +} + +func (s *Server) handleEventAPI(w http.ResponseWriter, r *http.Request) { + action := strings.Trim(strings.TrimPrefix(r.URL.Path, "/_/api/v1/event"), "/") + switch action { + case "": + if r.Method == http.MethodGet { + definitions, err := s.store.ListEventDefinitions() + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, map[string]any{"events": definitions}) + return + } + if r.Method == http.MethodPost { + var definition store.EventDefinition + if !decodeEventJSON(w, r, &definition) { + return + } + if err := s.store.SaveEventDefinition(&definition); err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + s.wakeEventScheduler() + writeEventJSON(w, http.StatusCreated, definition) + return + } + case "run": + if r.Method == http.MethodPost { + var input struct { + UUID string `json:"uuid"` + } + if !decodeEventJSON(w, r, &input) { + return + } + queued, err := s.store.RunEventDefinition(input.UUID) + if err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + s.wakeEventScheduler() + writeEventJSON(w, 202, map[string]any{"queued": queued}) + return + } + case "delete": + if r.Method == http.MethodPost || r.Method == http.MethodDelete { + var input struct { + UUID string `json:"uuid"` + } + if !decodeEventJSON(w, r, &input) { + return + } + if err := s.store.DeleteEventDefinition(input.UUID); err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, map[string]bool{"deleted": true}) + return + } + case "logs": + if r.Method == http.MethodGet { + limit, _ := strconv.Atoi(r.URL.Query().Get("limit")) + before, err := strconv.ParseInt(r.URL.Query().Get("before_id"), 10, 64) + if r.URL.Query().Has("before_id") && (err != nil || before < 0) { + writeEventJSON(w, 400, map[string]string{"error": "invalid log cursor"}) + return + } + logs, err := s.store.ListEventLogsBefore(r.URL.Query().Get("job_uuid"), limit, before) + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, map[string]any{"logs": logs}) + return + } + case "logs/trends": + if r.Method == http.MethodGet { + hours, _ := strconv.Atoi(r.URL.Query().Get("hours")) + if hours < 1 || hours > 24*365 { + hours = 24 + } + limit, _ := strconv.Atoi(r.URL.Query().Get("limit")) + trends, err := s.store.ListEventLogTrends(r.Context(), r.URL.Query().Get("event_type"), time.Now().Add(-time.Duration(hours)*time.Hour).UnixMilli(), limit) + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, map[string]any{"trends": trends, "hours": hours}) + return + } + case "policies": + if r.Method == http.MethodGet { + policies, err := s.store.ListEventLogPolicies() + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, map[string]any{"policies": policies}) + return + } + if r.Method == http.MethodPost || r.Method == http.MethodPut { + var policy store.EventLogPolicy + if !decodeEventJSON(w, r, &policy) { + return + } + if err := s.store.SetEventLogPolicy(policy); err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, policy) + return + } + } + w.Header().Set("Allow", "GET, POST, DELETE") + writeEventJSON(w, http.StatusMethodNotAllowed, map[string]string{"error": "unsupported event operation"}) +} + +func (s *Server) handleQueueAPI(w http.ResponseWriter, r *http.Request) { + action := strings.Trim(strings.TrimPrefix(r.URL.Path, "/_/api/v1/queue"), "/") + switch action { + case "jobs": + if r.Method == http.MethodGet { + limit, _ := strconv.Atoi(r.URL.Query().Get("limit")) + jobs, next, err := s.store.EventJobPage(r.Context(), r.URL.Query().Get("status"), r.URL.Query().Get("cursor"), limit) + if err != nil { + code := http.StatusInternalServerError + if errors.Is(err, store.ErrEventJobFilter) { + code = http.StatusBadRequest + } + writeEventJSON(w, code, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, map[string]any{"jobs": jobs, "next_cursor": next}) + return + } + case "": + if r.Method == http.MethodGet { + limit, _ := strconv.Atoi(r.URL.Query().Get("limit")) + jobs, err := s.store.ListEventJobs(limit) + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + stats, err := s.store.EventStats() + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + settings, err := s.store.GetQueueSettings() + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, map[string]any{ + "stats": stats, "settings": settings, "jobs": jobs, + "active_workers": s.schedulerRunning.Load(), + }) + return + } + case "settings": + if r.Method == http.MethodGet { + settings, err := s.store.GetQueueSettings() + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": err.Error()}) + return + } + writeEventJSON(w, 200, settings) + return + } + if r.Method == http.MethodPost || r.Method == http.MethodPut { + var settings store.QueueSettings + if !decodeEventJSON(w, r, &settings) { + return + } + if err := s.store.SetQueueSettings(settings); err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + s.wakeEventScheduler() + writeEventJSON(w, 200, settings) + return + } + case "cancel", "retry": + if r.Method == http.MethodPost { + var input struct { + UUID string `json:"uuid"` + } + if !decodeEventJSON(w, r, &input) { + return + } + var err error + if action == "cancel" { + err = s.store.CancelEventJob(input.UUID) + } else { + err = s.store.RetryEventJob(input.UUID) + } + if err != nil { + writeEventJSON(w, 400, map[string]string{"error": err.Error()}) + return + } + s.wakeEventScheduler() + writeEventJSON(w, 200, map[string]bool{"ok": true}) + return + } + case "resources": + if r.Method == http.MethodGet { + writeEventJSON(w, 200, s.resourceStatus()) + return + } + case "resources/history": + if r.Method == http.MethodGet { + hours, _ := strconv.Atoi(r.URL.Query().Get("hours")) + if hours != 1 && hours != 24 && hours != 168 { + hours = 24 + } + samples, err := s.store.ResourceHistory(r.Context(), hours, time.Now()) + if err != nil { + writeEventJSON(w, 500, map[string]string{"error": "could not load resource history"}) + return + } + writeEventJSON(w, 200, map[string]any{"samples": samples, "hours": hours, "retention_days": 7}) + return + } + } + w.Header().Set("Allow", "GET, POST, PUT") + writeEventJSON(w, http.StatusMethodNotAllowed, map[string]string{"error": "unsupported queue operation"}) +} + +func (s *Server) resourceStatus() map[string]any { + var memory runtime.MemStats + runtime.ReadMemStats(&memory) + root := s.store.DocumentRoot + if root == "" { + root = "." + } + root, _ = filepath.Abs(root) + var fs syscall.Statfs_t + _ = syscall.Statfs(root, &fs) + total := fs.Blocks * uint64(fs.Bsize) + available := fs.Bavail * uint64(fs.Bsize) + loadAverage := "" + if data, err := os.ReadFile("/proc/loadavg"); err == nil { + fields := strings.Fields(string(data)) + if len(fields) >= 3 { + loadAverage = strings.Join(fields[:3], " ") + } + } + stats, _ := s.store.ActiveEventStats() + settings, _ := s.store.GetQueueSettings() + return map[string]any{ + "timestamp_ms": time.Now().UnixMilli(), + "io": readProcessIO(), + "cpu": map[string]any{"logical_cpus": runtime.NumCPU(), "load_average": loadAverage}, + "memory": map[string]any{ + "heap_bytes": memory.HeapAlloc, "go_system_bytes": memory.Sys, + "gc_cycles": memory.NumGC, "goroutines": runtime.NumGoroutine(), + }, + "storage": map[string]any{ + "path": root, "total_bytes": total, "used_bytes": total - available, + "available_bytes": available, + }, + "queue": map[string]any{"stats": map[string]int{"queued": stats.Queued, "running": stats.Running}, "active_workers": s.schedulerRunning.Load(), "paused": settings.Paused}, + } +} diff --git a/internal/server/event_scheduler.go b/internal/server/event_scheduler.go new file mode 100644 index 0000000..63fd8e0 --- /dev/null +++ b/internal/server/event_scheduler.go @@ -0,0 +1,641 @@ +package server + +import ( + "archive/zip" + "context" + "database/sql" + "encoding/json" + "errors" + "fmt" + "html" + "image" + _ "image/gif" + "image/jpeg" + _ "image/png" + "io" + "log" + "net/http" + "os" + "os/exec" + "path/filepath" + "strconv" + "strings" + "time" + + "pageswiki/internal/store" +) + +const previewEventType = "preview.generate" +const previewSweepEventType = "preview.sweep" +const cityReconcileEventType = "city.reconcile" + +var cityActivitySubscription = store.ActivitySubscription{ConsumerID: "city", EventTypes: []string{"page.created", "revision.created", "path.renamed", "path.unlinked", "object.deleted"}} + +type previewEventPayload struct { + RevisionUUID string `json:"revision_uuid"` + DocumentHash string `json:"document_hash"` + ContentType string `json:"content_type"` + Filename string `json:"filename"` + Kind string `json:"kind"` + Page int `json:"page,omitempty"` +} + +type cityReconcilePayload struct { + DomainUUID string `json:"domain_uuid"` +} + +func (s *Server) initializePreviewScheduler() { + if s.store == nil || s.store.DocumentRoot == "" { + return + } + s.previewRoot = filepath.Join(filepath.Dir(s.store.DocumentRoot), "previews") + if err := os.MkdirAll(s.previewRoot, 0755); err != nil { + log.Printf("preview cache initialization failed: %v", err) + s.previewRoot = "" + } +} + +func (s *Server) startEventScheduler() { + if s.store == nil { + return + } + if err := s.store.EnsureBuiltinResourceEvent(); err != nil { + log.Printf("resource monitor initialization failed: %v", err) + } + if err := s.ensureCalendarSweep(); err != nil { + log.Printf("calendar scheduler initialization failed: %v", err) + } + if err := s.store.EnsureTaskActivityBridgeEvent(); err != nil { + log.Printf("task journal bridge initialization failed: %v", err) + } + if err := s.store.EnsureTaskReminderEvent(); err != nil { + log.Printf("task reminder initialization failed: %v", err) + } + if err := s.store.EnsureTaskFocusEvent(); err != nil { + log.Printf("focus timer initialization failed: %v", err) + } + if err := s.store.EnsureNotificationPushEvent(); err != nil { + log.Printf("notification push initialization failed: %v", err) + } + go func() { + initialPreviewSweep := time.NewTimer(5 * time.Second) + defer initialPreviewSweep.Stop() + previewSweep := time.NewTicker(15 * time.Minute) + defer previewSweep.Stop() + dispatch := time.NewTicker(time.Second) + defer dispatch.Stop() + cleanup := time.NewTicker(time.Hour) + defer cleanup.Stop() + activitySweep := time.NewTicker(10 * time.Second) + defer activitySweep.Stop() + for { + select { + case <-initialPreviewSweep.C: + s.enqueueAllPreviewEvents() + case <-previewSweep.C: + s.enqueueAllPreviewEvents() + case <-dispatch.C: + case <-cleanup.C: + if settings, err := s.store.GetQueueSettings(); err == nil { + if err := s.store.PurgeEventHistory(settings.RetentionHours); err != nil { + log.Printf("event history cleanup failed: %v", err) + } + } + case <-activitySweep.C: + if _, err := s.store.ExpireApprovalRequests(context.Background(), time.Now().UnixMilli(), 100); err != nil { + log.Printf("approval request expiry failed: %v", err) + } + s.enqueueCityActivityEvents() + case <-s.schedulerWake: + if _, err := s.store.ExpireApprovalRequests(context.Background(), time.Now().UnixMilli(), 100); err != nil { + log.Printf("approval request expiry failed: %v", err) + } + s.enqueueCityActivityEvents() + } + if _, err := s.store.EnqueueDueDefinitions(time.Now()); err != nil { + log.Printf("event schedule evaluation failed: %v", err) + } + s.runDueEvents() + } + }() +} + +func (s *Server) wakeEventScheduler() { + if s.schedulerWake == nil { + return + } + select { + case s.schedulerWake <- struct{}{}: + default: + } +} + +func (s *Server) runDueEvents() { + for { + settings, err := s.store.GetQueueSettings() + if err != nil { + log.Printf("event scheduler settings failed: %v", err) + return + } + if settings.Paused || s.schedulerRunning.Load() >= int64(settings.Concurrency) { + return + } + // Keep one reserved background slot while foreground work is active. + // A global stop lets long-lived editor/WebSocket requests starve jobs. + if s.foregroundRequests.Load() > 0 && s.schedulerRunning.Load() > 0 { + return + } + job, err := s.store.ClaimDueEvent() + if errors.Is(err, sql.ErrNoRows) || errors.Is(err, context.Canceled) { + return + } + if err != nil { + log.Printf("event scheduler claim failed: %v", err) + return + } + s.schedulerRunning.Add(1) + _ = s.store.AddEventLog(job.UUID, job.EventUUID, "info", "execution started") + go func(job *store.EventJob) { + defer func() { + s.schedulerRunning.Add(-1) + s.wakeEventScheduler() + }() + var runErr error + if s.store.EventCancellationRequested(job.UUID) { + runErr = errors.New("cancelled before execution") + } else { + runErr = s.runEvent(job) + if runErr == nil && s.store.EventCancellationRequested(job.UUID) { + runErr = errors.New("cancelled during execution") + } + } + if finishErr := s.store.FinishEvent(job.UUID, runErr); finishErr != nil { + log.Printf("event scheduler finish failed job=%s: %v", job.UUID, finishErr) + } + if runErr != nil { + log.Printf("event job failed type=%s key=%s: %v", job.Type, job.Key, runErr) + } + }(job) + } +} + +func (s *Server) runEvent(job *store.EventJob) error { + switch job.Type { + case store.NotificationPushEventType: + return s.deliverNotificationPush(job) + case store.TaskFocusEventType: + processed, err := s.store.CompleteTaskFocus(context.Background(), time.Now(), 100) + if err == nil && processed > 0 { + _ = s.store.AddEventLog(job.UUID, job.EventUUID, "info", fmt.Sprintf("focus timers completed=%d", processed)) + } + return err + case store.TaskReminderEventType: + checked, sent, err := s.store.DeliverTaskReminders(context.Background(), time.Now(), 100) + if err == nil && checked > 0 { + _ = s.store.AddEventLog(job.UUID, job.EventUUID, "info", fmt.Sprintf("task reminders checked=%d delivered=%d", checked, sent)) + } + return err + case store.TaskActivityBridgeEventType: + processed, published, err := s.store.PublishTaskActivity(context.Background(), 100) + if err == nil && processed > 0 { + _ = s.store.AddEventLog(job.UUID, job.EventUUID, "info", fmt.Sprintf("journal entries checked=%d published=%d", processed, published)) + } + return err + case calendarSweepType: + return s.sweepCalendarSources() + case calendarSyncType: + return s.runCalendarSource(job) + case metadataProjectionEventType: + var payload metadataProjectionPayload + if err := json.Unmarshal([]byte(job.Payload), &payload); err != nil { + return err + } + return s.generateMetadataProjection(payload) + case store.ResourceEventType: + snapshot := s.resourceStatus() + payload, err := json.Marshal(snapshot) + if err != nil { + return err + } + return s.store.SaveResourceSample(job.UUID, snapshot["timestamp_ms"].(int64), payload) + case previewSweepEventType: + s.enqueueAllPreviewEvents() + return nil + case previewEventType: + var payload previewEventPayload + if err := json.Unmarshal([]byte(job.Payload), &payload); err != nil { + return err + } + return s.generatePreview(payload) + case cityReconcileEventType: + var payload cityReconcilePayload + if err := json.Unmarshal([]byte(job.Payload), &payload); err != nil { + return err + } + return s.reconcileCityActivity(payload.DomainUUID) + case "pdf.page.generate": + var payload previewEventPayload + if err := json.Unmarshal([]byte(job.Payload), &payload); err != nil { + return err + } + return s.generatePDFPage(payload) + case importAnalyzeEventType: + var payload importAnalyzePayload + if err := json.Unmarshal([]byte(job.Payload), &payload); err != nil { + return err + } + return s.analyzeImport(payload) + case importCommitEventType: + var payload importCommitPayload + if err := json.Unmarshal([]byte(job.Payload), &payload); err != nil { + return err + } + return s.commitImport(payload) + default: + return fmt.Errorf("unknown event type %q", job.Type) + } +} + +func (s *Server) enqueueCityActivityEvents() { + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + domains, err := s.store.PendingActivityConsumerDomains(ctx, cityActivitySubscription, 100) + if err != nil { + log.Printf("activity outbox domain scan failed: %v", err) + return + } + for _, domain := range domains { + payload, err := json.Marshal(cityReconcilePayload{DomainUUID: domain}) + if err != nil { + continue + } + _, err = s.store.EnqueueEventWithOptions("", cityReconcileEventType, "city:"+domain, string(payload), time.Now(), -2, 3) + if err != nil { + log.Printf("city activity enqueue failed domain=%s: %v", domain, err) + } + } +} + +func (s *Server) reconcileCityActivity(domainUUID string) error { + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + events, err := s.store.ActivityOutboxForConsumer(ctx, cityActivitySubscription, domainUUID, 500) + if err != nil { + return err + } + if len(events) == 0 { + return nil + } + if _, err := s.applyCityAutoPlan(domainUUID, "system:city"); err != nil { + return err + } + return s.store.CompleteActivityOutboxThrough("city", domainUUID, events[len(events)-1].Sequence) +} + +func (s *Server) generatePDFPage(payload previewEventPayload) error { + if payload.Page < 1 || payload.DocumentHash == "" { + return fmt.Errorf("invalid PDF page job") + } + target := filepath.Join(s.previewRoot, fmt.Sprintf("%s-p%d.jpg", payload.DocumentHash, payload.Page)) + if info, err := os.Stat(target); err == nil && info.Size() > 0 { + return nil + } + source, err := s.store.DocumentPath(payload.DocumentHash) + if err != nil { + return err + } + workDir, err := os.MkdirTemp(s.previewRoot, ".pdf-page-*") + if err != nil { + return err + } + defer os.RemoveAll(workDir) + base := filepath.Join(workDir, "page") + if err := runPreviewCommand("pdftoppm", "-f", strconv.Itoa(payload.Page), "-l", strconv.Itoa(payload.Page), "-singlefile", "-jpeg", "-scale-to", "1600", source, base); err != nil { + return err + } + return os.Rename(base+".jpg", target) +} + +func (s *Server) previewCachePath(hash, kind string) string { + extension := ".jpg" + if kind == "excalidraw" { + extension = ".svg" + } + return filepath.Join(s.previewRoot, hash+extension) +} + +func (s *Server) previewCacheURL(hash, kind string) string { + extension := ".jpg" + if kind == "excalidraw" { + extension = ".svg" + } + return "/v/preview-cache/" + hash + extension +} + +func (s *Server) handlePreviewCache(w http.ResponseWriter, r *http.Request) { + if s.previewRoot == "" { + http.NotFound(w, r) + return + } + name := filepath.Base(strings.TrimPrefix(r.URL.Path, "/v/preview-cache/")) + if name == "." || name == "" || + (!strings.HasSuffix(name, ".jpg") && !strings.HasSuffix(name, ".svg")) { + http.NotFound(w, r) + return + } + path := filepath.Join(s.previewRoot, name) + if _, err := os.Stat(path); err != nil { + http.NotFound(w, r) + return + } + w.Header().Set("Cache-Control", "private, max-age=31536000, immutable") + w.Header().Set("Vary", "Authorization, Cookie") + w.Header().Set("X-Content-Type-Options", "nosniff") + if strings.HasSuffix(name, ".svg") { + w.Header().Set("Content-Security-Policy", "sandbox") + } + http.ServeFile(w, r, path) +} + +func (s *Server) enqueuePreview(entry store.BrowserEntry) (string, bool) { + if s.previewRoot == "" || entry.DocumentHash == "" { + return "", false + } + filename := entry.Filename + if filename == "" { + filename = filepath.Base(entry.Path) + } + adapter := selectProjectionAdapter(contentDescriptor{ + MediaType: strings.ToLower(strings.Split(entry.ContentType, ";")[0]), + Filename: filename, + }) + kind := adapter.ID + if kind != "image" && kind != "pdf" && + kind != "video" && kind != "excalidraw" && kind != "archive" { + return "", false + } + cachePath := s.previewCachePath(entry.DocumentHash, kind) + cacheURL := s.previewCacheURL(entry.DocumentHash, kind) + if info, err := os.Stat(cachePath); err == nil && info.Size() > 0 { + return cacheURL, true + } + payload, err := json.Marshal(previewEventPayload{ + RevisionUUID: entry.RevisionUUID, + DocumentHash: entry.DocumentHash, + ContentType: entry.ContentType, + Filename: filename, + Kind: kind, + }) + if err == nil { + if queued, queueErr := s.store.EnqueueEvent( + previewEventType, + entry.DocumentHash, + string(payload), + time.Now(), + ); queueErr == nil && queued { + s.wakeEventScheduler() + } + } + return cacheURL, false +} + +func (s *Server) enqueueAllPreviewEvents() int { + domains, err := s.store.ListDomains() + if err != nil { + return 0 + } + count := 0 + for _, domain := range domains { + if !domain.Enabled || domain.Placement != "local" { + continue + } + entries, err := s.store.ListPreviewCandidatesInDomain(domain.UUID) + if err != nil { + continue + } + for _, entry := range entries { + if _, cached := s.enqueuePreview(entry); !cached { + count++ + } + } + } + s.wakeEventScheduler() + return count +} + +func (s *Server) generatePreview(payload previewEventPayload) error { + target := s.previewCachePath(payload.DocumentHash, payload.Kind) + if info, err := os.Stat(target); err == nil && info.Size() > 0 { + return nil + } + source, err := s.store.DocumentPath(payload.DocumentHash) + if err != nil { + return err + } + workDir, err := os.MkdirTemp(s.previewRoot, ".job-*") + if err != nil { + return err + } + defer os.RemoveAll(workDir) + + var generated string + switch payload.Kind { + case "image": + generated = filepath.Join(workDir, "preview.jpg") + err = generateImageThumbnail(source, generated) + case "pdf": + generated = filepath.Join(workDir, "preview.jpg") + err = runPreviewCommand( + "pdftoppm", + "-f", "1", "-singlefile", "-jpeg", + "-scale-to", "480", + source, + strings.TrimSuffix(generated, ".jpg"), + ) + case "video": + generated = filepath.Join(workDir, "preview.jpg") + err = runPreviewCommand( + "ffmpeg", "-hide_banner", "-loglevel", "error", + "-ss", "1", "-i", source, + "-frames:v", "1", "-vf", "scale=480:-2", + "-y", generated, + ) + case "excalidraw": + generated = filepath.Join(workDir, "preview.svg") + err = generateExcalidrawSVG(source, generated) + case "archive": + generated = filepath.Join(workDir, "preview.jpg") + err = generateArchiveThumbnail(source, generated, payload.Filename) + default: + return fmt.Errorf("unsupported preview kind %q", payload.Kind) + } + if err != nil { + return err + } + if err := os.Chmod(generated, 0644); err != nil { + return err + } + return os.Rename(generated, target) +} + +func runPreviewCommand(name string, args ...string) error { + ctx, cancel := context.WithTimeout(context.Background(), 90*time.Second) + defer cancel() + command := exec.CommandContext(ctx, "nice", append([]string{"-n", "15", name}, args...)...) + output, err := command.CombinedOutput() + if ctx.Err() != nil { + return ctx.Err() + } + if err != nil { + return fmt.Errorf("%s failed: %w: %s", name, err, strings.TrimSpace(string(output))) + } + return nil +} + +func generateImageThumbnail(source, target string) error { + file, err := os.Open(source) + if err != nil { + return err + } + defer file.Close() + return generateImageThumbnailFromReader(file, target) +} + +func generateArchiveThumbnail(source, target, filename string) error { + if strings.EqualFold(filepath.Ext(filename), ".zip") { + return generateZIPThumbnail(source, target) + } + return store.ErrEventSkipped +} + +func generateZIPThumbnail(source, target string) error { + reader, err := zip.OpenReader(source) + if err != nil { + return err + } + defer reader.Close() + imageCount, fileCount := 0, 0 + for _, file := range reader.File { + if file.FileInfo().IsDir() { + continue + } + fileCount++ + if archiveImageName(file.Name) { + imageCount++ + } + } + if imageCount < 3 || imageCount*2 < fileCount { + return fmt.Errorf("%w: archive is not image-dominant", store.ErrEventSkipped) + } + for _, file := range reader.File { + if file.FileInfo().IsDir() || !archiveImageName(file.Name) { + continue + } + input, err := file.Open() + if err != nil { + return err + } + err = generateImageThumbnailFromReader(input, target) + input.Close() + if err != nil { + return err + } + return nil + } + return fmt.Errorf("%w: archive has no supported comic images", store.ErrEventSkipped) +} + +func archiveImageName(name string) bool { + switch strings.ToLower(filepath.Ext(name)) { + case ".jpg", ".jpeg", ".png", ".gif": + return true + default: + return false + } +} + +func generateImageThumbnailFromReader(input io.Reader, target string) error { + decoded, _, err := image.Decode(input) + if err != nil { + return err + } + bounds := decoded.Bounds() + width, height := bounds.Dx(), bounds.Dy() + if width <= 0 || height <= 0 { + return errors.New("invalid image dimensions") + } + scale := min(480.0/float64(width), 300.0/float64(height), 1) + outWidth := max(1, int(float64(width)*scale)) + outHeight := max(1, int(float64(height)*scale)) + thumbnail := image.NewRGBA(image.Rect(0, 0, outWidth, outHeight)) + for y := 0; y < outHeight; y++ { + for x := 0; x < outWidth; x++ { + sourceX := bounds.Min.X + x*width/outWidth + sourceY := bounds.Min.Y + y*height/outHeight + thumbnail.Set(x, y, decoded.At(sourceX, sourceY)) + } + } + output, err := os.Create(target) + if err != nil { + return err + } + defer output.Close() + return jpeg.Encode(output, thumbnail, &jpeg.Options{Quality: 78}) +} + +func generateExcalidrawSVG(source, target string) error { + data, err := os.ReadFile(source) + if err != nil { + return err + } + var scene struct { + Elements []struct { + Type string `json:"type"` + X float64 `json:"x"` + Y float64 `json:"y"` + Width float64 `json:"width"` + Height float64 `json:"height"` + Text string `json:"text"` + StrokeColor string `json:"strokeColor"` + BackgroundColor string `json:"backgroundColor"` + IsDeleted bool `json:"isDeleted"` + } `json:"elements"` + } + if err := json.Unmarshal(data, &scene); err != nil { + return err + } + var body strings.Builder + body.WriteString(``) + body.WriteString(``) + for _, element := range scene.Elements { + if element.IsDeleted { + continue + } + stroke := element.StrokeColor + if stroke == "" { + stroke = "#1b1b1f" + } + fill := element.BackgroundColor + if fill == "" || fill == "transparent" { + fill = "none" + } + switch element.Type { + case "ellipse": + fmt.Fprintf(&body, + ``, + element.X+element.Width/2, element.Y+element.Height/2, + element.Width/2, element.Height/2, html.EscapeString(fill), html.EscapeString(stroke)) + case "text": + fmt.Fprintf(&body, + `%s`, + element.X, element.Y+20, html.EscapeString(stroke), html.EscapeString(element.Text)) + default: + fmt.Fprintf(&body, + ``, + element.X, element.Y, element.Width, element.Height, + html.EscapeString(fill), html.EscapeString(stroke)) + } + } + body.WriteString("") + return os.WriteFile(target, []byte(body.String()), 0644) +} diff --git a/internal/server/execution_monitor_test.go b/internal/server/execution_monitor_test.go new file mode 100644 index 0000000..d5ec643 --- /dev/null +++ b/internal/server/execution_monitor_test.go @@ -0,0 +1,188 @@ +package server + +import ( + "context" + "encoding/json" + "fmt" + "net/http" + "net/http/httptest" + "net/url" + "os" + "os/exec" + "path/filepath" + "strings" + "testing" + "time" + + "pageswiki/internal/store" +) + +func TestExecutionMonitorChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + s, token, _ := configFixture(t) + seedMonitorJobs(t, s) + if err := s.store.EnsureBuiltinResourceEvent(); err != nil { + t.Fatal(err) + } + if err := s.runEvent(&store.EventJob{UUID: "resource-browser", Type: store.ResourceEventType}); err != nil { + t.Fatal(err) + } + script, err := os.ReadFile("internal/server/testdata/monitor-interactions.js") + if err != nil { + t.Fatal(err) + } + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + if r.Header.Get("Origin") != "" { + r.Header.Set("Origin", "http://localhost") + } + if r.Method == "GET" && r.URL.Path == "/-/sys/config" { + rec := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(rec, r) + for key, values := range rec.Header() { + w.Header()[key] = values + } + w.WriteHeader(rec.Code) + _, _ = w.Write([]byte(strings.Replace(rec.Body.String(), "", "", 1))) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + ctx, cancel := context.WithTimeout(context.Background(), 40*time.Second) + defer cancel() + profile := t.TempDir() + for _, view := range []string{"monitor-interactions", "monitor-dialog"} { + path := server.URL + "/-/sys/config?panel=scheduler" + if view == "monitor-dialog" { + path += "&monitor_dialog=1" + } + cmd := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", path, profile) + if dir := os.Getenv("PAGESWIKI_BROWSER_ARTIFACTS"); dir != "" { + if err := os.MkdirAll(dir, 0755); err != nil { + t.Fatal(err) + } + cmd.Args = append(cmd.Args, filepath.Join(dir, view+".png")) + } + if out, err := cmd.CombinedOutput(); err != nil { + t.Fatalf("%s browser: %v %s", view, err, out) + } + } + var interval int + if err := s.store.DB.QueryRow(`SELECT interval_seconds FROM event_definitions WHERE uuid=?`, store.ResourceEventID).Scan(&interval); err != nil || interval != 120 { + t.Fatalf("monitor dialog setting not saved: %d %v", interval, err) + } +} + +func seedMonitorJobs(t *testing.T, s *Server) { + t.Helper() + now := time.Now().UnixMilli() + for i := 0; i < 65; i++ { + status, at := "succeeded", now + if i == 0 { + status, at = "running", now-3600000 + } + if i == 1 { + status = "queued" + } + if _, err := s.store.DB.Exec(`INSERT INTO event_jobs(uuid,event_type,event_key,payload,status,run_at_ms,started_at_ms,created_at_ms,updated_at_ms) VALUES(?, 'test.monitor', ?, '{}', ?, ?, ?, ?, ?)`, fmt.Sprintf("monitor-%03d", i), fmt.Sprintf("job-%03d", i), status, at, at, at, at); err != nil { + t.Fatal(err) + } + } + for i := 0; i < 105; i++ { + if err := s.store.AddEventLog("monitor-064", "", "info", fmt.Sprintf("entry-%03d ", i)); err != nil { + t.Fatal(err) + } + } +} + +func TestExecutionMonitorFilteringPaginationAndPolicy(t *testing.T) { + s, token, domain := configFixture(t) + seedMonitorJobs(t, s) + if _, err := s.store.DB.Exec(`UPDATE event_jobs SET payload=? WHERE uuid='monitor-000'`, strings.Repeat("large-input", 1000)); err != nil { + t.Fatal(err) + } + page := func(status, cursor string) (jobs []store.EventJob, next string) { + t.Helper() + w := configRequest(s, token, "GET", "/_/api/v1/queue/jobs?limit=10&status="+status+"&cursor="+url.QueryEscape(cursor), nil) + var data struct { + Jobs []store.EventJob `json:"jobs"` + Next string `json:"next_cursor"` + } + if w.Code != 200 || json.Unmarshal(w.Body.Bytes(), &data) != nil { + t.Fatalf("page: %d %s", w.Code, w.Body.String()) + } + return data.Jobs, data.Next + } + jobs, next := page("running", "") + if len(jobs) != 1 || jobs[0].UUID != "monitor-000" || jobs[0].Payload != "" || next != "" { + t.Fatalf("long running hidden: %#v %s", jobs, next) + } + seen := map[string]bool{} + for cursor := ""; ; { + jobs, next = page("history", cursor) + for _, job := range jobs { + if seen[job.UUID] || job.Status != "succeeded" { + t.Fatalf("duplicate or nonterminal job: %#v", job) + } + seen[job.UUID] = true + } + if next == "" { + break + } + cursor = next + } + if len(seen) != 63 { + t.Fatalf("history lost jobs: %d", len(seen)) + } + rows, err := s.store.DB.Query(`EXPLAIN QUERY PLAN SELECT uuid FROM event_jobs INDEXED BY idx_event_jobs_history WHERE status IN ('succeeded','skipped','failed','cancelled') AND (created_at_ms,uuid)<(?,?) ORDER BY created_at_ms DESC,uuid DESC LIMIT 51`, time.Now().UnixMilli()+1, "z") + if err != nil { + t.Fatal(err) + } + for rows.Next() { + var id, parent, unused int + var plan string + if err := rows.Scan(&id, &parent, &unused, &plan); err != nil { + t.Fatal(err) + } + if strings.Contains(plan, "TEMP B-TREE") { + t.Errorf("history sorted entire retention window: %s", plan) + } + } + if err := rows.Close(); err != nil { + t.Fatal(err) + } + for _, query := range []string{"status=bogus", "cursor=broken"} { + if w := configRequest(s, token, "GET", "/_/api/v1/queue/jobs?"+query, nil); w.Code != 400 { + t.Fatalf("invalid query accepted: %d", w.Code) + } + } + var logs struct { + Logs []store.EventLog `json:"logs"` + } + w := configRequest(s, token, "GET", "/_/api/v1/event/logs?job_uuid=monitor-064&limit=100", nil) + if w.Code != 200 || json.Unmarshal(w.Body.Bytes(), &logs) != nil || len(logs.Logs) != 100 { + t.Fatalf("logs: %s", w.Body.String()) + } + last := logs.Logs[99].ID + w = configRequest(s, token, "GET", fmt.Sprintf("/_/api/v1/event/logs?job_uuid=monitor-064&limit=100&before_id=%d", last), nil) + if w.Code != 200 || json.Unmarshal(w.Body.Bytes(), &logs) != nil || len(logs.Logs) != 5 || logs.Logs[0].ID >= last { + t.Fatalf("older logs: %s", w.Body.String()) + } + member, err := s.store.CreatePasswordAccount(domain, "observer", "long observer password", "Observer", "") + if err != nil { + t.Fatal(err) + } + memberToken, err := s.store.CreateAuthSession(domain, member.UUID) + if err != nil { + t.Fatal(err) + } + for _, path := range []string{"/_/api/v1/queue/jobs?status=running", "/_/api/v1/event/logs?job_uuid=monitor-064", "/_/api/v1/queue/resources"} { + if w := configRequest(s, memberToken, "GET", path, nil); w.Code != 403 { + t.Fatalf("member got %s: %d", path, w.Code) + } + } +} diff --git a/internal/server/explorer.go b/internal/server/explorer.go index 2bff353..50f4a32 100644 --- a/internal/server/explorer.go +++ b/internal/server/explorer.go @@ -10,6 +10,7 @@ type ExplorerNode struct { } func (s *Server) buildExplorerTree( + domainUUID string, path string, depth int, ) []ExplorerNode { @@ -19,7 +20,7 @@ func (s *Server) buildExplorerTree( } children, err := - s.store.ListChildren(path) + s.store.ListChildrenInDomain(domainUUID, path) if err != nil { return nil @@ -35,6 +36,7 @@ func (s *Server) buildExplorerTree( node.Children = s.buildExplorerTree( + domainUUID, child, depth+1, ) @@ -52,12 +54,14 @@ func (s *Server) handleExplorer( tree := s.buildExplorerTree( + s.domainUUIDForRequest(r), "/", 0, ) - s.render( + s.renderWithContext( w, + r, "explorer.gohtml", map[string]any{ "Title": "Explorer", diff --git a/internal/server/extension_state.go b/internal/server/extension_state.go new file mode 100644 index 0000000..b1be7fa --- /dev/null +++ b/internal/server/extension_state.go @@ -0,0 +1,43 @@ +package server + +import ( + "encoding/json" + "strings" + + systemext "pageswiki/internal/extensions" +) + +const systemExtensionStateKey = "system_extension_states" + +func (s *Server) systemExtensionEnabled(domainUUID, id string) bool { + raw, err := s.store.GetConfigInDomain(domainUUID, systemExtensionStateKey) + if err != nil || strings.TrimSpace(raw) == "" { + return true + } + var states map[string]bool + if json.Unmarshal([]byte(raw), &states) != nil { + return true + } + enabled, ok := states[id] + return !ok || enabled +} + +func (s *Server) setSystemExtensionEnabled(domainUUID, id string, enabled bool) error { + raw, _ := s.store.GetConfigInDomain(domainUUID, systemExtensionStateKey) + states := map[string]bool{} + _ = json.Unmarshal([]byte(raw), &states) + states[id] = enabled + payload, err := json.Marshal(states) + if err != nil { + return err + } + return s.store.SetConfigInDomain(domainUUID, systemExtensionStateKey, string(payload)) +} + +func (s *Server) systemExtensionCatalog(domainUUID string) []systemext.Manifest { + items := systemext.Catalog() + for i := range items { + items[i].Enabled = s.systemExtensionEnabled(domainUUID, items[i].ID) + } + return items +} diff --git a/internal/server/external_resources.go b/internal/server/external_resources.go new file mode 100644 index 0000000..e28fb70 --- /dev/null +++ b/internal/server/external_resources.go @@ -0,0 +1,137 @@ +package server + +import ( + "encoding/base64" + "encoding/hex" + "encoding/json" + "errors" + "net/url" + "sort" + "strings" +) + +const externalResourceApprovalsConfig = "external_resource_approvals_v1" +const maxExternalResourceApprovals = 128 + +type externalResourceApproval struct { + Kind string `json:"kind"` + URL string `json:"url"` + Integrity string `json:"integrity,omitempty"` +} + +type externalResourcePolicy struct { + items []externalResourceApproval + byKind map[string]map[string]externalResourceApproval +} + +func normalizeExternalResourceURL(raw string) (string, error) { + raw = strings.TrimSpace(raw) + if raw == "" || len(raw) > 2048 || strings.ContainsAny(raw, " \\\r\n\t") { + return "", errors.New("invalid external resource URL") + } + u, err := url.Parse(raw) + if err != nil || !u.IsAbs() || !strings.EqualFold(u.Scheme, "https") || u.Host == "" || u.User != nil || u.Fragment != "" { + return "", errors.New("external resources require an absolute HTTPS URL without credentials or fragments") + } + u.Scheme = "https" + u.Host = strings.ToLower(u.Host) + u.RawFragment = "" + return u.String(), nil +} + +func normalizeExternalResourceIntegrity(raw string) (string, error) { + raw = strings.TrimSpace(raw) + if len(raw) == 64 { + decoded, err := hex.DecodeString(raw) + if err == nil && len(decoded) == 32 { + return "sha256-" + base64.StdEncoding.EncodeToString(decoded), nil + } + } + if !strings.HasPrefix(raw, "sha256-") { + return "", errors.New("SHA-256 integrity is required") + } + decoded, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(raw, "sha256-")) + if err != nil || len(decoded) != 32 { + return "", errors.New("invalid SHA-256 integrity") + } + return "sha256-" + base64.StdEncoding.EncodeToString(decoded), nil +} + +func normalizeExternalResourceApproval(item externalResourceApproval) (externalResourceApproval, error) { + item.Kind = strings.ToLower(strings.TrimSpace(item.Kind)) + if item.Kind != "image" && item.Kind != "stylesheet" && item.Kind != "script" { + return externalResourceApproval{}, errors.New("invalid external resource kind") + } + var err error + item.URL, err = normalizeExternalResourceURL(item.URL) + if err != nil { + return externalResourceApproval{}, err + } + if item.Kind == "image" { + item.Integrity = "" + return item, nil + } + item.Integrity, err = normalizeExternalResourceIntegrity(item.Integrity) + if err != nil { + return externalResourceApproval{}, err + } + return item, nil +} + +func newExternalResourcePolicy(items []externalResourceApproval) externalResourcePolicy { + p := externalResourcePolicy{byKind: map[string]map[string]externalResourceApproval{}} + seen := map[string]bool{} + for _, raw := range items { + item, err := normalizeExternalResourceApproval(raw) + if err != nil { + continue + } + key := item.Kind + "\x00" + item.URL + if seen[key] || len(p.items) >= maxExternalResourceApprovals { + continue + } + seen[key] = true + if p.byKind[item.Kind] == nil { + p.byKind[item.Kind] = map[string]externalResourceApproval{} + } + p.byKind[item.Kind][item.URL] = item + p.items = append(p.items, item) + } + sort.Slice(p.items, func(i, j int) bool { + if p.items[i].Kind == p.items[j].Kind { + return p.items[i].URL < p.items[j].URL + } + return p.items[i].Kind < p.items[j].Kind + }) + return p +} + +func (p externalResourcePolicy) approved(kind, rawURL string) (externalResourceApproval, bool) { + normalized, err := normalizeExternalResourceURL(rawURL) + if err != nil { + return externalResourceApproval{}, false + } + item, ok := p.byKind[kind][normalized] + return item, ok +} + +func (s *Server) externalResourcePolicy(domainUUID string) externalResourcePolicy { + var items []externalResourceApproval + raw := strings.TrimSpace(s.getDomainConfig(externalResourceApprovalsConfig, domainUUID)) + if raw != "" { + _ = json.Unmarshal([]byte(raw), &items) + } + return newExternalResourcePolicy(items) +} + +func (s *Server) saveExternalResourceApprovals(domainUUID string, items []externalResourceApproval) error { + policy := newExternalResourcePolicy(items) + if len(policy.items) != len(items) { + return errors.New("invalid or duplicate external resource approval") + } + raw, err := json.Marshal(policy.items) + if err != nil { + return err + } + return s.store.SetConfigInDomain(domainUUID, externalResourceApprovalsConfig, string(raw)) +} diff --git a/internal/server/external_resources_test.go b/internal/server/external_resources_test.go new file mode 100644 index 0000000..a9f12dd --- /dev/null +++ b/internal/server/external_resources_test.go @@ -0,0 +1,112 @@ +package server + +import ( + "net/http" + "net/http/httptest" + "net/url" + "strings" + "testing" +) + +const externalResourceTestSRI = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" + +func TestExternalResourceApprovalNormalization(t *testing.T) { + item, err := normalizeExternalResourceApproval(externalResourceApproval{ + Kind: " SCRIPT ", URL: "https://CDN.Example.test/app.js?v=1", Integrity: strings.Repeat("00", 32), + }) + if err != nil { + t.Fatal(err) + } + if item.Kind != "script" || item.URL != "https://cdn.example.test/app.js?v=1" || item.Integrity != externalResourceTestSRI { + t.Fatalf("unexpected normalization: %+v", item) + } + for _, raw := range []string{"http://cdn.example.test/app.js", "https://user@cdn.example.test/app.js", "https://cdn.example.test/app.js#fragment", "//cdn.example.test/app.js"} { + if _, err := normalizeExternalResourceURL(raw); err == nil { + t.Fatalf("unsafe URL accepted: %s", raw) + } + } + if _, err := normalizeExternalResourceApproval(externalResourceApproval{Kind: "script", URL: "https://cdn.example.test/app.js"}); err == nil { + t.Fatal("script without SRI accepted") + } +} + +func TestHTMLProjectionAllowsOnlyApprovedExternalResources(t *testing.T) { + s, _, domain := configFixture(t) + items := []externalResourceApproval{ + {Kind: "image", URL: "https://media.example.test/avatar.png"}, + {Kind: "stylesheet", URL: "https://cdn.example.test/profile.css", Integrity: externalResourceTestSRI}, + {Kind: "script", URL: "https://cdn.example.test/profile.js", Integrity: externalResourceTestSRI}, + } + if err := s.saveExternalResourceApprovals(domain, items); err != nil { + t.Fatal(err) + } + body := `` + + `` + + `` + + `` + + `` + + `` + got := s.safeHTMLProjection(httptest.NewRequest(http.MethodGet, "http://localhost/u/anya", nil), body, "/u/anya", true) + for _, want := range []string{ + `src="https://media.example.test/avatar.png"`, + `href="https://cdn.example.test/profile.css"`, + `src="https://cdn.example.test/profile.js"`, + `integrity="` + externalResourceTestSRI + `"`, + `crossorigin="anonymous"`, + } { + if !strings.Contains(got, want) { + t.Fatalf("approved resource missing %q: %s", want, got) + } + } + for _, forbidden := range []string{"not-approved.png", "other.css", "other.js", "sha256-bogus", "onerror", ">alert(1)<"} { + if strings.Contains(got, forbidden) { + t.Fatalf("unapproved resource survived %q: %s", forbidden, got) + } + } + + w := httptest.NewRecorder() + if _, err := setProjectionCSP(w, s.externalResourcePolicy(domain)); err != nil { + t.Fatal(err) + } + csp := w.Header().Get("Content-Security-Policy") + for _, want := range []string{"https://media.example.test", "https://cdn.example.test", "'" + externalResourceTestSRI + "'", "connect-src 'self'"} { + if !strings.Contains(csp, want) { + t.Fatalf("CSP missing %q: %s", want, csp) + } + } +} + +func TestExternalResourceApprovalConfig(t *testing.T) { + s, token, domain := configFixture(t) + page := configRequest(s, token, http.MethodGet, "/-/sys/config?panel=external-resources", nil) + if page.Code != http.StatusOK || !strings.Contains(page.Body.String(), `id="panel-external-resources"`) { + t.Fatalf("config page status=%d body=%s", page.Code, page.Body.String()) + } + w := configRequest(s, token, http.MethodPost, "/-/sys/config", url.Values{ + "section": {"external-resource-add"}, "kind": {"image"}, "url": {"https://media.example.test/avatar.png"}, + }) + if w.Code != http.StatusFound { + t.Fatalf("add status=%d body=%s", w.Code, w.Body.String()) + } + if _, ok := s.externalResourcePolicy(domain).approved("image", "https://media.example.test/avatar.png"); !ok { + t.Fatal("approval was not saved") + } + w = configRequest(s, token, http.MethodPost, "/-/sys/config", url.Values{ + "section": {"external-resource-delete"}, "kind": {"image"}, "url": {"https://media.example.test/avatar.png"}, + }) + if w.Code != http.StatusFound || len(s.externalResourcePolicy(domain).items) != 0 { + t.Fatalf("delete status=%d body=%s", w.Code, w.Body.String()) + } + w = configRequest(s, token, http.MethodPost, "/-/sys/config", url.Values{ + "section": {"external-resource-add"}, "kind": {"script"}, "url": {"https://cdn.example.test/app.js"}, "integrity": {externalResourceTestSRI}, + }) + if w.Code != http.StatusBadRequest { + t.Fatalf("script risk confirmation bypassed: %d", w.Code) + } + w = configRequest(s, token, http.MethodPost, "/-/sys/config", url.Values{ + "section": {"external-resource-add"}, "kind": {"script"}, "url": {"https://cdn.example.test/app.js"}, "integrity": {externalResourceTestSRI}, "confirm_script_risk": {"1"}, + }) + if w.Code != http.StatusFound { + t.Fatalf("confirmed script add status=%d body=%s", w.Code, w.Body.String()) + } +} diff --git a/internal/server/federation_api.go b/internal/server/federation_api.go new file mode 100644 index 0000000..a3b8598 --- /dev/null +++ b/internal/server/federation_api.go @@ -0,0 +1,75 @@ +package server + +import ( + "encoding/json" + "net/http" + "pageswiki/internal/store" + "strings" +) + +type federationEnrollRequest struct { + FQDN string `json:"fqdn"` + Fingerprint string `json:"fingerprint"` + PublicKey string `json:"public_key"` + Signature string `json:"signature"` + ManifestVersion int `json:"manifest_version"` + CapabilitySignature string `json:"capability_signature"` +} + +func (s *Server) handleFederationEnrollAPI( + w http.ResponseWriter, + r *http.Request, +) { + if r.Method != http.MethodPost { + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + authorization := strings.TrimSpace(r.Header.Get("Authorization")) + const bearer = "Bearer " + if !strings.HasPrefix(authorization, bearer) { + http.Error(w, "bearer token is required", http.StatusUnauthorized) + return + } + var request federationEnrollRequest + if err := json.NewDecoder(r.Body).Decode(&request); err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + campus, instance, err := s.store.RegisterFederationInstance( + strings.TrimSpace(strings.TrimPrefix(authorization, bearer)), + request.FQDN, + request.Fingerprint, + request.PublicKey, + request.Signature, + store.FederationCapabilities{ManifestVersion: request.ManifestVersion, Signature: request.CapabilitySignature}, + ) + if err != nil { + http.Error(w, err.Error(), http.StatusUnauthorized) + return + } + domains, err := s.store.ListDomains() + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + filtered := domains[:0] + if instance.Status == "approved" { + for _, domain := range domains { + if domain.CampusUUID == campus.UUID { + filtered = append(filtered, domain) + } + } + } + manifest, err := s.store.BuildSignedCampusManifest(*campus, filtered) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + w.Header().Set("Content-Type", "application/json") + _ = json.NewEncoder(w).Encode(map[string]any{ + "campus": campus, + "instance": instance, + "domains": filtered, + "manifest": manifest, + }) +} diff --git a/internal/server/gc_api.go b/internal/server/gc_api.go index db9426c..bfde307 100644 --- a/internal/server/gc_api.go +++ b/internal/server/gc_api.go @@ -4,115 +4,68 @@ import ( "encoding/json" "net/http" "strconv" + + "pageswiki/internal/store" ) -func (s *Server) handleZombieListAPI( - w http.ResponseWriter, - r *http.Request, -) { - - graceSeconds := int64(86400) - - if v := r.URL.Query().Get("grace_seconds"); v != "" { - - n, err := - strconv.ParseInt( - v, - 10, - 64, - ) - - if err == nil { - graceSeconds = n +func zombieAPIOptions(r *http.Request) (int64, int, error) { + grace := store.ZombieGCDefaultGraceSeconds + limit := store.ZombieGCDefaultLimit + if raw := r.URL.Query().Get("grace_seconds"); raw != "" { + n, err := strconv.ParseInt(raw, 10, 64) + if err != nil || n < 0 { + return 0, 0, store.ErrZombieGCOptions } + grace = n } - - zombies, err := - s.store.ListZombieObjects( - graceSeconds, - ) - - if err != nil { - - http.Error( - w, - err.Error(), - 500, - ) - - return + if raw := r.URL.Query().Get("limit"); raw != "" { + n, err := strconv.Atoi(raw) + if err != nil || n < 1 || n > store.ZombieGCMaxLimit { + return 0, 0, store.ErrZombieGCOptions + } + limit = n } - - w.Header().Set( - "Content-Type", - "application/json", - ) - - json.NewEncoder(w).Encode( - map[string]any{ - "zombies": zombies, - "count": len(zombies), - }, - ) + return grace, limit, nil } -func (s *Server) handleZombiePurgeAPI( - w http.ResponseWriter, - r *http.Request, -) { - - graceSeconds := int64(86400) - limit := 100 - - if v := r.URL.Query().Get("grace_seconds"); v != "" { - - n, err := - strconv.ParseInt( - v, - 10, - 64, - ) - - if err == nil { - graceSeconds = n - } - } - - if v := r.URL.Query().Get("limit"); v != "" { - - n, err := - strconv.Atoi(v) - - if err == nil { - limit = n - } - } - - deleted, err := - s.store.PurgeZombieObjects( - graceSeconds, - limit, - ) - - if err != nil { - - http.Error( - w, - err.Error(), - 500, - ) - +func (s *Server) handleZombieListAPI(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodGet { + w.Header().Set("Allow", http.MethodGet) + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) return } + grace, limit, err := zombieAPIOptions(r) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + zombies, err := s.store.ListZombieObjectsInDomain(r.Context(), s.domainUUIDForRequest(r), grace, limit) + if err != nil { + http.Error(w, "unable to list zombie objects", http.StatusInternalServerError) + return + } + w.Header().Set("Content-Type", "application/json") + w.Header().Set("Cache-Control", "private, no-store") + json.NewEncoder(w).Encode(map[string]any{"zombies": zombies, "count": len(zombies), "limit": limit}) +} - w.Header().Set( - "Content-Type", - "application/json", - ) - - json.NewEncoder(w).Encode( - map[string]any{ - "deleted": deleted, - }, - ) +func (s *Server) handleZombiePurgeAPI(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodPost { + w.Header().Set("Allow", http.MethodPost) + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + grace, limit, err := zombieAPIOptions(r) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + deleted, err := s.store.PurgeZombieObjectsInDomain(r.Context(), s.domainUUIDForRequest(r), grace, limit) + if err != nil { + http.Error(w, "unable to purge zombie objects", http.StatusInternalServerError) + return + } + w.Header().Set("Content-Type", "application/json") + w.Header().Set("Cache-Control", "private, no-store") + json.NewEncoder(w).Encode(map[string]any{"deleted": deleted}) } diff --git a/internal/server/gc_integrity_test.go b/internal/server/gc_integrity_test.go new file mode 100644 index 0000000..ee9462a --- /dev/null +++ b/internal/server/gc_integrity_test.go @@ -0,0 +1,201 @@ +package server + +import ( + "encoding/json" + "math" + "net/http" + "net/http/httptest" + "net/url" + "strconv" + "strings" + "testing" + + "pageswiki/internal/store" +) + +func seedServerZombie(t *testing.T, s *Server, id, domain string) { + t.Helper() + if _, err := s.store.DB.Exec(`INSERT INTO objects(uuid,kind,created_at) VALUES(?,'page',1)`, id); err != nil { + t.Fatal(err) + } + if domain != "" { + if _, err := s.store.DB.Exec(`INSERT INTO object_origins(object_uuid,domain_uuid,created_at) VALUES(?,?,1)`, id, domain); err != nil { + t.Fatal(err) + } + } +} + +func requireServerZombie(t *testing.T, s *Server, id string, want bool) { + t.Helper() + var exists bool + if err := s.store.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM objects WHERE uuid=?)`, id).Scan(&exists); err != nil || exists != want { + t.Fatalf("Object %s exists=%v want=%v err=%v", id, exists, want, err) + } +} + +func TestZombieHTTPAndConfigAreCurrentDomainOnly(t *testing.T) { + for _, operation := range []string{"api", "config"} { + t.Run(operation, func(t *testing.T) { + s, token, domain := configFixture(t) + s.mux.HandleFunc("/_/api/v1/gc/zombies/list", s.handleZombieListAPI) + s.mux.HandleFunc("/_/api/v1/gc/zombies/purge", s.handleZombiePurgeAPI) + seedServerZombie(t, s, "gc-own", domain) + seedServerZombie(t, s, "gc-foreign", "other-domain") + seedServerZombie(t, s, "gc-unknown", "") + listURL := "/_/api/v1/gc/zombies/list?domain_uuid=other-domain&grace_seconds=0" + if operation == "config" { + listURL = "/-/sys/config?panel=objects" + } + w := configRequest(s, token, http.MethodGet, listURL, nil) + if w.Code != http.StatusOK || !strings.Contains(w.Body.String(), "gc-own") || strings.Contains(w.Body.String(), "gc-foreign") || strings.Contains(w.Body.String(), "gc-unknown") { + t.Fatalf("%s scoped listing: %d %s", operation, w.Code, w.Body.String()) + } + if operation == "api" { + w = configRequest(s, token, http.MethodPost, "/_/api/v1/gc/zombies/purge?domain_uuid=other-domain&grace_seconds=0", nil) + if w.Code != http.StatusOK || !strings.Contains(w.Body.String(), `"deleted":1`) { + t.Fatalf("purge API: %d %s", w.Code, w.Body.String()) + } + } else { + w = configRequest(s, token, http.MethodPost, "/-/sys/config?panel=objects", url.Values{"section": {"zombie-purge"}, "domain_uuid": {"other-domain"}}) + if w.Code != http.StatusFound { + t.Fatalf("config purge: %d %s", w.Code, w.Body.String()) + } + } + requireServerZombie(t, s, "gc-own", false) + requireServerZombie(t, s, "gc-foreign", true) + requireServerZombie(t, s, "gc-unknown", true) + }) + } +} + +func TestZombieHTTPRejectsUnboundedOptionsAndNonAdmin(t *testing.T) { + s, token, domain := configFixture(t) + s.mux.HandleFunc("/_/api/v1/gc/zombies/list", s.handleZombieListAPI) + s.mux.HandleFunc("/_/api/v1/gc/zombies/purge", s.handleZombiePurgeAPI) + seedServerZombie(t, s, "gc-kept", domain) + for _, query := range []string{"limit=0", "limit=-1", "limit=1001", "limit=all", "grace_seconds=-1", "grace_seconds=invalid", "grace_seconds=9223372036854775808"} { + for _, endpoint := range []struct{ method, path string }{{http.MethodGet, "list"}, {http.MethodPost, "purge"}} { + w := configRequest(s, token, endpoint.method, "/_/api/v1/gc/zombies/"+endpoint.path+"?"+query, nil) + if w.Code != http.StatusBadRequest { + t.Fatalf("invalid %s %s accepted: %d %s", endpoint.path, query, w.Code, w.Body.String()) + } + } + } + member, err := s.store.CreatePasswordAccount(domain, "gc-reader", "a long reader password", "Reader", "") + if err != nil { + t.Fatal(err) + } + memberToken, err := s.store.CreateAuthSession(domain, member.UUID) + if err != nil { + t.Fatal(err) + } + for _, endpoint := range []struct{ method, path string }{{http.MethodGet, "list"}, {http.MethodPost, "purge"}} { + w := configRequest(s, memberToken, endpoint.method, "/_/api/v1/gc/zombies/"+endpoint.path, nil) + if w.Code != http.StatusForbidden { + t.Fatalf("non-admin %s: %d %s", endpoint.path, w.Code, w.Body.String()) + } + } + requireServerZombie(t, s, "gc-kept", true) +} + +func TestManualEventsCannotInvokeGlobalZombieGC(t *testing.T) { + s, token, domain := configFixture(t) + seedServerZombie(t, s, "gc-own", domain) + seedServerZombie(t, s, "gc-foreign", "foreign") + seedServerZombie(t, s, "gc-unknown", "") + post := func(path string, payload any) *httptest.ResponseRecorder { + raw, err := json.Marshal(payload) + if err != nil { + t.Fatal(err) + } + r := httptest.NewRequest(http.MethodPost, "http://localhost"+path, strings.NewReader(string(raw))) + r.Header.Set("Authorization", "Bearer "+token) + r.Header.Set("Content-Type", "application/json") + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + return w + } + for _, eventType := range []string{"gc.zombies.purge", "zombie.purge", "gc.purge"} { + definition := store.EventDefinition{Name: "Attempt global GC", EventType: eventType, EventKey: eventType, Payload: `{"grace_seconds":0,"domain_uuid":"foreign"}`, ScheduleKind: "manual", Enabled: true} + w := post("/_/api/v1/event", definition) + if w.Code != http.StatusCreated || json.Unmarshal(w.Body.Bytes(), &definition) != nil { + t.Fatalf("definition: %d %s", w.Code, w.Body.String()) + } + w = post("/_/api/v1/event/run", map[string]string{"uuid": definition.UUID}) + if w.Code != http.StatusAccepted { + t.Fatalf("manual trigger: %d %s", w.Code, w.Body.String()) + } + job, err := s.store.ClaimDueEvent() + if err != nil { + t.Fatal(err) + } + runErr := s.runEvent(job) + if runErr == nil || !strings.Contains(runErr.Error(), "unknown event type") { + t.Fatalf("manual GC type became executable: %v", runErr) + } + if err := s.store.FinishEvent(job.UUID, runErr); err != nil { + t.Fatal(err) + } + } + for _, id := range []string{"gc-own", "gc-foreign", "gc-unknown"} { + requireServerZombie(t, s, id, true) + } +} + +func TestZombieMaintenanceRetainsGraceAcrossDomainChangesAndRestart(t *testing.T) { + s, _, domain := configFixture(t) + t.Setenv("PAGESWIKI_ZOMBIE_GC_GRACE_HOURS", "") + if err := s.store.SetConfigInDomain(domain, "zombie_grace_hours", "72"); err != nil { + t.Fatal(err) + } + if grace, err := s.zombieMaintenanceGrace(); err != nil || grace != 72*3600 { + t.Fatalf("legacy grace shortened: %d %v", grace, err) + } + if err := s.store.SetConfigInDomain(domain, "zombie_grace_hours", "0"); err != nil { + t.Fatal(err) + } + if grace, err := (&Server{store: s.store}).zombieMaintenanceGrace(); err != nil || grace != 72*3600 { + t.Fatalf("Domain changed instance retention: %d %v", grace, err) + } + t.Setenv("PAGESWIKI_ZOMBIE_GC_GRACE_HOURS", "168") + if grace, err := s.zombieMaintenanceGrace(); err != nil || grace != 168*3600 { + t.Fatalf("operator extension: %d %v", grace, err) + } + t.Setenv("PAGESWIKI_ZOMBIE_GC_GRACE_HOURS", "24") + if grace, err := (&Server{store: s.store}).zombieMaintenanceGrace(); err != nil || grace != 168*3600 { + t.Fatalf("restart shortened retention: %d %v", grace, err) + } + for _, value := range []string{"invalid", "-1", strconv.FormatInt(math.MaxInt64, 10)} { + t.Setenv("PAGESWIKI_ZOMBIE_GC_GRACE_HOURS", value) + if _, err := s.zombieMaintenanceGrace(); err == nil { + t.Fatalf("invalid operator grace %s accepted", value) + } + } + t.Setenv("PAGESWIKI_ZOMBIE_GC_GRACE_HOURS", "") + if err := s.store.SetConfigInDomain(domain, "zombie_grace_hours", strconv.FormatInt(math.MaxInt64, 10)); err != nil { + t.Fatal(err) + } + if grace := s.getZombieGraceSeconds(domain); grace != math.MaxInt64 { + t.Fatalf("hours overflowed: %d", grace) + } + if grace, err := s.zombieMaintenanceGrace(); err != nil || grace != math.MaxInt64 { + t.Fatalf("legacy long grace overflow: %d %v", grace, err) + } + if _, err := s.store.DB.Exec(`DROP TABLE config`); err != nil { + t.Fatal(err) + } + if _, err := s.zombieMaintenanceGrace(); err == nil { + t.Fatal("config failure silently shortened retention") + } +} + +func TestZombieMaintenanceDefaultIsStill24Hours(t *testing.T) { + s, _, domain := configFixture(t) + t.Setenv("PAGESWIKI_ZOMBIE_GC_GRACE_HOURS", "") + if err := s.store.SetConfigInDomain(domain, "zombie_grace_hours", "0"); err != nil { + t.Fatal(err) + } + if grace, err := s.zombieMaintenanceGrace(); err != nil || grace != store.ZombieGCDefaultGraceSeconds { + t.Fatalf("default retention changed: %d %v", grace, err) + } +} diff --git a/internal/server/gc_worker.go b/internal/server/gc_worker.go index 7b2607f..4b30eee 100644 --- a/internal/server/gc_worker.go +++ b/internal/server/gc_worker.go @@ -1,11 +1,51 @@ package server import ( + "context" + "fmt" "log" + "math" + "os" + "strconv" + "strings" "time" + + "pageswiki/internal/store" ) +// This is deliberately not exposed as a user-editable EventDefinition type. +// Instance maintenance retains the previous grace period (at least 24h), even +// after Domain config changes or a restart. Only the operator environment can +// explicitly increase the persistent retention high-water mark. +func (s *Server) zombieMaintenanceGrace() (int64, error) { + raw, err := s.store.GetConfig("zombie_grace_hours") + if err != nil { + return 0, err // Never shorten retention on a failed legacy config read. + } + grace := store.ZombieGCDefaultGraceSeconds + if hours, err := strconv.ParseInt(raw, 10, 64); err == nil && hours > 0 { + if hours > math.MaxInt64/3600 { + grace = math.MaxInt64 + } else { + grace = max(grace, hours*3600) + } + } + if raw := strings.TrimSpace(os.Getenv("PAGESWIKI_ZOMBIE_GC_GRACE_HOURS")); raw != "" { + hours, err := strconv.ParseInt(raw, 10, 64) + if err != nil || hours < 0 || hours > math.MaxInt64/3600 { + return 0, fmt.Errorf("invalid PAGESWIKI_ZOMBIE_GC_GRACE_HOURS") + } + grace = max(grace, hours*3600) + } + return s.store.RaiseZombieMaintenanceGrace(context.Background(), grace) +} + func (s *Server) startGCWorker() { + grace, err := s.zombieMaintenanceGrace() + if err != nil { + log.Printf("zombie GC maintenance disabled: %v", err) + return + } go func() { @@ -17,10 +57,11 @@ func (s *Server) startGCWorker() { defer ticker.Stop() for { + <-ticker.C deleted, err := s.store.PurgeZombieObjects( - s.getZombieGraceSeconds(), + grace, 100, ) @@ -39,7 +80,6 @@ func (s *Server) startGCWorker() { ) } - <-ticker.C } }() } diff --git a/internal/server/groups_handler.go b/internal/server/groups_handler.go new file mode 100644 index 0000000..819bb06 --- /dev/null +++ b/internal/server/groups_handler.go @@ -0,0 +1,147 @@ +package server + +import ( + "errors" + "net/http" + "strings" + + "pageswiki/internal/store" +) + +func (s *Server) requestPrincipal(r *http.Request) *store.Principal { + domainUUID := s.domainUUIDForRequest(r) + principal, err := s.store.PrincipalForSession(domainUUID, s.authTokenFromRequest(r)) + if err != nil { + return nil + } + return principal +} + +func (s *Server) canManageGroup(domainUUID string, principal *store.Principal, group *store.Group, ownerOnly bool) bool { + if principal == nil { + return false + } + if s.store.Authorize(store.AuthorizationRequest{DomainUUID: domainUUID, PrincipalUUID: principal.UUID, Capability: "manage", TargetType: "domain", TargetID: domainUUID}) == nil { + return true + } + if s.store.IsBuiltinGroupAdmin(domainUUID, principal.UUID, "domain_admin") { + return true + } + role := s.store.GroupMemberRole(group.UUID, principal.UUID) + return role == "owner" || (!ownerOnly && role == "manager") +} + +func (s *Server) handleGroups(w http.ResponseWriter, r *http.Request) { + domainUUID := s.domainUUIDForRequest(r) + principal := s.requestPrincipal(r) + remainder := "" + if r.URL.Path != "/g" { + remainder = strings.Trim(strings.TrimPrefix(r.URL.Path, "/g/"), "/") + } + if remainder == "" { + if r.Method == http.MethodPost { + if principal == nil || !s.store.IsBuiltinGroupAdmin(domainUUID, principal.UUID, "domain_admin") { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + group, err := s.store.CreateGroup(domainUUID, principal.UUID, r.FormValue("name"), r.FormValue("display_name"), r.FormValue("description"), r.FormValue("visibility")) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + http.Redirect(w, r, "/g/"+group.Name+"/_/edit", http.StatusSeeOther) + return + } + groups, err := s.store.ListGroups(domainUUID, func() string { + if principal != nil { + return principal.UUID + } + return "" + }()) + if err != nil { + http.Error(w, err.Error(), 500) + return + } + canCreate := principal != nil && s.store.IsBuiltinGroupAdmin(domainUUID, principal.UUID, "domain_admin") + s.renderWithContext(w, r, "groups.gohtml", map[string]any{"Groups": groups, "CanCreate": canCreate, "Locale": s.getLocale(domainUUID)}) + return + } + parts := strings.Split(remainder, "/") + group, err := s.store.GroupByName(domainUUID, parts[0]) + if err != nil { + http.NotFound(w, r) + return + } + memberRole := "" + if principal != nil { + memberRole = s.store.GroupMemberRole(group.UUID, principal.UUID) + } + visible := group.Visibility == "public" || (group.Visibility == "domain" && principal != nil) || memberRole != "" || s.canManageGroup(domainUUID, principal, group, false) + if !visible { + http.NotFound(w, r) + return + } + if len(parts) >= 3 && parts[1] == "_" && parts[2] == "edit" { + if !s.canManageGroup(domainUUID, principal, group, false) { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + if r.Method == http.MethodPost { + action := r.FormValue("action") + ownerAuthority := s.canManageGroup(domainUUID, principal, group, true) + switch action { + case "add_member": + if r.FormValue("member_role") == "owner" && !ownerAuthority { + err = store.ErrAccessDenied + break + } + err = s.store.AddGroupMemberByUsername(domainUUID, group.UUID, r.FormValue("username"), r.FormValue("member_role")) + case "remove_member": + if role := s.store.GroupMemberRoleByMembership(group.UUID, r.FormValue("membership_uuid")); role != "member" && !ownerAuthority { + err = store.ErrAccessDenied + break + } + err = s.store.RemoveGroupMemberWithAuthority(group.UUID, r.FormValue("membership_uuid"), ownerAuthority) + case "set_permission": + if !ownerAuthority { + err = store.ErrAccessDenied + break + } + err = s.store.SetGroupPermission(group.UUID, r.FormValue("scope_path"), r.FormValue("permission")) + case "set_campus_inheritance": + domain := s.domainForRequest(r) + if group.BuiltinKey != "campus_admin" || domain == nil || !s.store.IsCampusAdmin(domain.CampusUUID, principal.UUID) { + err = store.ErrAccessDenied + break + } + err = s.store.SetCampusAdminInheritance(group.UUID, r.FormValue("inherit_members") == "on") + default: + err = errors.New("invalid group operation") + } + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + http.Redirect(w, r, r.URL.Path+"?saved=1", http.StatusSeeOther) + return + } + members, _ := s.store.ListGroupMembers(group.UUID) + permissions, _ := s.store.ListGroupPermissions(group.UUID) + s.renderWithContext(w, r, "group.gohtml", map[string]any{"Group": group, "Editing": true, "Members": members, "Permissions": permissions, "CanOwn": s.canManageGroup(domainUUID, principal, group, true), "Saved": r.URL.Query().Get("saved") == "1", "Locale": s.getLocale(domainUUID)}) + return + } + if len(parts) == 1 { + s.renderWithContext(w, r, "group.gohtml", map[string]any{"Group": group, "MemberRole": memberRole, "CanManage": s.canManageGroup(domainUUID, principal, group, false), "Locale": s.getLocale(domainUUID)}) + return + } + if principal == nil || s.store.Authorize(store.AuthorizationRequest{DomainUUID: domainUUID, PrincipalUUID: principal.UUID, Capability: "read", TargetType: "path", TargetID: r.URL.Path}) != nil { + mode, _ := s.store.GetConfigInDomain(domainUUID, "authorization_mode") + if mode != "enforcing" { + s.handleSemanticRoute(w, r) + return + } + http.Error(w, "forbidden", http.StatusForbidden) + return + } + s.handleSemanticRoute(w, r) +} diff --git a/internal/server/handlers.go b/internal/server/handlers.go index 874fd06..1e32fa1 100644 --- a/internal/server/handlers.go +++ b/internal/server/handlers.go @@ -10,14 +10,26 @@ func (s *Server) handleHome( w http.ResponseWriter, r *http.Request, ) { + if s.servePublicPeriodical(w, r) { + return + } if r.URL.Path != "/" { s.handleSemanticRoute(w, r) return } + if layout := s.homeLayout(s.domainUUIDForRequest(r)); layout != "classic" { + if layout == "diary" || layout == "blog" { + s.handlePeriodicalView(w, r, layout, "view") + return + } + s.renderSearchHome(w, r, layout) + return + } homePath, err := - s.store.GetConfig( + s.store.GetConfigInDomain( + s.domainUUIDForRequest(r), "home_path", ) @@ -38,7 +50,8 @@ func (s *Server) handleHome( } objectUUID, err := - s.store.ResolvePath( + s.store.ResolvePathInDomain( + s.domainUUIDForRequest(r), homePath, ) @@ -52,9 +65,14 @@ func (s *Server) handleHome( return } + if !s.requestCanReadPath(r, homePath) { + http.Error(w, "forbidden", http.StatusForbidden) + return + } latest, err := - s.store.GetLatestRevision( + s.latestRevisionForRequest( + r, objectUUID, ) @@ -69,18 +87,19 @@ func (s *Server) handleHome( return } - rendered := - s.expandMacros( - latest.Body, - homePath, - ) + contentView := revisionContentView(latest, homePath) + rendered := "" + if contentView.Kind == "html" { + rendered = s.safeHTMLProjection(r, latest.Body, homePath, true) + } - s.render( + s.renderWithContext( w, + r, "page.gohtml", map[string]any{ "NavItems": resolveNavItems( - s.getHomeNavItems(), + s.getHomeNavItems(s.domainUUIDForRequest(r)), NavContext{ Path: homePath, ObjectUUID: objectUUID, @@ -92,6 +111,13 @@ func (s *Server) handleHome( "Path": homePath, "Breadcrumbs": buildBreadcrumbs(homePath), "ObjectUUID": objectUUID, + "ContentView": contentView, + "SocialSource": func() string { + if contentView.Kind == "html" { + return latest.Body + } + return "" + }(), "RenderedHTML": template.HTML( rendered, ), @@ -102,17 +128,19 @@ func (s *Server) handleHome( } rendered := - s.expandMacros( - "{{children:/ exclude=/draft,/-,/_}}", + s.expandMacrosForRequest(r, + "{{children:/ exclude=/draft,/-,/_,/u}}", "/", + s.domainUUIDForRequest(r), ) - s.render( + s.renderWithContext( w, + r, "home.gohtml", map[string]any{ "NavItems": resolveNavItems( - s.getHomeNavItems(), + s.getHomeNavItems(s.domainUUIDForRequest(r)), NavContext{}, ), "RenderedHTML": template.HTML( diff --git a/internal/server/handlers_new.go b/internal/server/handlers_new.go index 8cfe2c5..e00fb4d 100644 --- a/internal/server/handlers_new.go +++ b/internal/server/handlers_new.go @@ -17,7 +17,8 @@ func (s *Server) handleNewPage( ) _, err := - s.store.CreateObject( + s.store.CreatePageAtPathInDomain( + s.domainUUIDForRequest(r), draftPath, ) diff --git a/internal/server/home_layout.go b/internal/server/home_layout.go new file mode 100644 index 0000000..9c9092a --- /dev/null +++ b/internal/server/home_layout.go @@ -0,0 +1,82 @@ +package server + +import ( + "encoding/json" + "errors" + "net/http" + "net/url" + "strconv" + "strings" +) + +const defaultHomeGlassTransparency = 42 + +func normalizeHomeGlassTransparency(raw string) (int, error) { + value, err := strconv.Atoi(strings.TrimSpace(raw)) + if err != nil || value < 0 || value > 85 { + return 0, errors.New("invalid home glass transparency") + } + return value, nil +} + +func (s *Server) homeGlassTransparency(domainUUID string) int { + value, err := normalizeHomeGlassTransparency(s.getDomainConfig("home_glass_transparency", domainUUID)) + if err != nil { + return defaultHomeGlassTransparency + } + return value +} + +func (s *Server) homeLayout(domainUUID string) string { + switch value := s.getDomainConfig("home_layout", domainUUID); value { + case "search", "directory", "diary", "blog": + return value + default: + return "classic" + } +} + +func parseHomeBookmarks(raw string) ([]NavItem, error) { + items := []NavItem{} + for _, line := range strings.Split(raw, "\n") { + if strings.TrimSpace(line) == "" { + continue + } + label, href, ok := strings.Cut(line, "|") + label, href = strings.TrimSpace(label), strings.TrimSpace(href) + if !ok || label == "" || !validHomeBookmarkURL(href) || len(items) >= 64 { + return nil, errors.New("invalid home bookmark") + } + items = append(items, NavItem{Label: label, Href: href}) + } + return items, nil +} + +func validHomeBookmarkURL(href string) bool { + u, err := url.Parse(href) + if err != nil || strings.ContainsAny(href, "\\\r\n") || u.User != nil { + return false + } + if u.Scheme == "http" || u.Scheme == "https" { + return u.Hostname() != "" + } + return u.Scheme == "" && u.Host == "" && strings.HasPrefix(href, "/") && !strings.HasPrefix(href, "//") +} + +func (s *Server) homeBookmarks(domainUUID string) []NavItem { + var items []NavItem + _ = json.Unmarshal([]byte(s.getDomainConfig("home_bookmarks", domainUUID)), &items) + return items +} + +func (s *Server) homeBookmarksText(domainUUID string) string { + var lines []string + for _, item := range s.homeBookmarks(domainUUID) { + lines = append(lines, item.Label+" | "+item.Href) + } + return strings.Join(lines, "\n") +} + +func (s *Server) renderSearchHome(w http.ResponseWriter, r *http.Request, layout string) { + s.renderWithContext(w, r, "search_home.gohtml", map[string]any{"HomeLayout": layout}) +} diff --git a/internal/server/home_layout_test.go b/internal/server/home_layout_test.go new file mode 100644 index 0000000..31b7f75 --- /dev/null +++ b/internal/server/home_layout_test.go @@ -0,0 +1,99 @@ +package server + +import ( + "net/http" + "net/http/httptest" + "strings" + "testing" + + "pageswiki/internal/db" + "pageswiki/internal/server/routes" + "pageswiki/internal/store" +) + +func TestHomeLayoutsAndScopedTreeRoutes(t *testing.T) { + t.Chdir("../..") + database, err := db.Open(t.TempDir() + "/navigation.db") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := store.New(database) + if err := st.EnsureConfigTable(); err != nil { + t.Fatal(err) + } + domain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + s := &Server{store: st} + s.mustLoadTemplates() + for _, path := range []string{"/top", "/docs/child", "/unrelated"} { + object, err := st.CreatePageAtPathInDomain(domain.UUID, path) + if err != nil { + t.Fatal(err) + } + if _, err := st.SaveRevisionContent(object, []byte("

    Home content

    "), "test", "und", "text/html", "page.html"); err != nil { + t.Fatal(err) + } + } + if err := st.SetConfigInDomain(domain.UUID, "home_path", "/top"); err != nil { + t.Fatal(err) + } + if err := st.SetConfigInDomain(domain.UUID, "home_bookmarks", `[{"label":"Documentation","href":"/docs"}]`); err != nil { + t.Fatal(err) + } + mux := http.NewServeMux() + routes.RegisterUIRoutes(mux, routes.UIHandlers{Home: s.handleHome, Tree: s.handleTree, Browser: s.handleBrowser}) + for _, layout := range []string{"classic", "search", "directory"} { + if err := st.SetConfigInDomain(domain.UUID, "home_layout", layout); err != nil { + t.Fatal(err) + } + rr := httptest.NewRecorder() + mux.ServeHTTP(rr, httptest.NewRequest(http.MethodGet, "http://localhost/", nil)) + body := rr.Body.String() + if rr.Code != 200 || strings.Contains(body, "can't evaluate") || !strings.Contains(body, `name="scope" value="/"`) { + t.Fatalf("%s: %d %s", layout, rr.Code, body) + } + if layout == "classic" && !strings.Contains(body, `class="topbar"`) { + t.Fatal("classic topbar missing") + } + if layout != "classic" && strings.Contains(body, `class="topbar"`) { + t.Fatal("search home has topbar") + } + if layout == "directory" && !strings.Contains(body, "Documentation") { + t.Fatal("bookmarks missing") + } + } + rr := httptest.NewRecorder() + mux.ServeHTTP(rr, httptest.NewRequest(http.MethodGet, "http://localhost/v/tree/docs", nil)) + body := rr.Body.String() + if rr.Code != 200 || !strings.Contains(body, `data-path="/docs/child"`) || strings.Contains(body, `data-path="/unrelated"`) || strings.Contains(body, `data-path="/docs"`) { + t.Fatalf("scoped tree: %d %s", rr.Code, body) + } + policy := policyForRequest(httptest.NewRequest(http.MethodGet, "http://localhost/v/tree/docs", nil)) + if policy.Resolver != resolveHandler { + t.Fatalf("scoped tree authorization: %#v", policy) + } + // Directly visiting /top remains a folder-scoped Viewer, not a home layout. + rr = httptest.NewRecorder() + mux.ServeHTTP(rr, httptest.NewRequest(http.MethodGet, "http://localhost/top", nil)) + if rr.Code != 200 || !strings.Contains(rr.Body.String(), `name="scope" value="/top"`) { + t.Fatalf("semantic viewer: %d %s", rr.Code, rr.Body.String()) + } +} + +func TestHomeBookmarksRejectUnsafeLinks(t *testing.T) { + for _, raw := range []string{"bad | javascript:alert(1)", "bad | //evil.test/path", "bad | /\\evil.test", "missing separator"} { + if _, err := parseHomeBookmarks(raw); err == nil { + t.Fatalf("accepted %q", raw) + } + } + items, err := parseHomeBookmarks("Docs | /docs\nExternal | https://example.com/\n") + if err != nil || len(items) != 2 { + t.Fatalf("bookmarks=%#v err=%v", items, err) + } +} diff --git a/internal/server/home_wallpaper.go b/internal/server/home_wallpaper.go new file mode 100644 index 0000000..86c9c65 --- /dev/null +++ b/internal/server/home_wallpaper.go @@ -0,0 +1,170 @@ +package server + +import ( + "bytes" + "crypto/rand" + "math/big" + "mime" + "net/http" + pathpkg "path" + "strconv" + "strings" + "time" + + "pageswiki/internal/store" +) + +const defaultHomeWallpaperOpacity = 28 + +type homeWallpaperView struct { + Path string + URL string + Opacity string +} + +// configuredLoginWallpaper returns only the image selected by the Domain +// administrator as the home/login wallpaper. It intentionally does not use +// the requesting principal's document permissions: choosing an image as the +// login wallpaper makes that one image public on the sign-in surface. +func (s *Server) configuredLoginWallpaper(domainUUID string) *store.Revision { + configured, _ := s.homeWallpaperConfig(domainUUID) + if configured == "" { + return nil + } + if objectUUID, err := s.store.ResolvePathInDomain(domainUUID, configured); err == nil { + revision, revisionErr := s.store.GetLatestRevisionForLanguages(objectUUID, []string{s.getLocale(domainUUID), "und"}) + if revisionErr == nil && imageContentType(revision.ContentType) { + return revision + } + } + entries, err := s.store.ListBrowserEntriesInDomain(domainUUID, configured) + if err != nil { + return nil + } + candidates := make([]store.BrowserEntry, 0, len(entries)) + for _, entry := range entries { + if !entry.IsDir && entry.RevisionUUID != "" && imageContentType(entry.ContentType) { + candidates = append(candidates, entry) + } + } + if len(candidates) == 0 { + return nil + } + index := 0 + if value, randomErr := rand.Int(rand.Reader, big.NewInt(int64(len(candidates)))); randomErr == nil { + index = int(value.Int64()) + } + revision, err := s.store.GetRevision(candidates[index].RevisionUUID) + if err != nil || !imageContentType(revision.ContentType) { + return nil + } + return revision +} + +func (s *Server) handleAuthWallpaper(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodGet && r.Method != http.MethodHead { + w.Header().Set("Allow", "GET, HEAD") + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + revision := s.configuredLoginWallpaper(s.domainUUIDForRequest(r)) + if revision == nil { + http.NotFound(w, r) + return + } + contentType := revision.ContentType + mediaType, _, err := mime.ParseMediaType(contentType) + if err != nil || !strings.HasPrefix(strings.ToLower(mediaType), "image/") { + http.NotFound(w, r) + return + } + filename := strings.TrimSpace(revision.Filename) + if filename == "" { + filename = "wallpaper" + } + w.Header().Set("Cache-Control", "private, no-store") + w.Header().Set("Content-Type", contentType) + w.Header().Set("Content-Disposition", mime.FormatMediaType("inline", map[string]string{"filename": filename})) + w.Header().Set("X-Content-Type-Options", "nosniff") + w.Header().Set("ETag", `"`+revision.DocumentHash+`"`) + if strings.EqualFold(mediaType, "image/svg+xml") { + w.Header().Set("Content-Security-Policy", "default-src 'none'; sandbox") + } + http.ServeContent(w, r, filename, time.UnixMilli(revision.CreatedAtMS), bytes.NewReader([]byte(revision.Body))) +} + +func normalizePickerPath(raw string) (string, bool) { + raw = strings.TrimSpace(raw) + if raw == "" { + return "", true + } + if len(raw) > 4096 || !strings.HasPrefix(raw, "/") || strings.ContainsAny(raw, "\x00\r\n\\") { + return "", false + } + for _, part := range strings.Split(raw, "/") { + if part == "." || part == ".." { + return "", false + } + } + clean := pathpkg.Clean(raw) + if clean == "." || !strings.HasPrefix(clean, "/") { + return "", false + } + return clean, true +} + +func imageContentType(raw string) bool { + mediaType, _, err := mime.ParseMediaType(raw) + return err == nil && strings.HasPrefix(strings.ToLower(mediaType), "image/") +} + +func (s *Server) homeWallpaperConfig(domainUUID string) (string, int) { + path, ok := normalizePickerPath(s.getDomainConfig("home_wallpaper_path", domainUUID)) + if !ok { + path = "" + } + opacity := defaultHomeWallpaperOpacity + if raw := strings.TrimSpace(s.getDomainConfig("home_wallpaper_opacity", domainUUID)); raw != "" { + if parsed, err := strconv.Atoi(raw); err == nil && parsed >= 0 && parsed <= 100 { + opacity = parsed + } + } + return path, opacity +} + +func (s *Server) homeWallpaperForRequest(r *http.Request) homeWallpaperView { + domainUUID := s.domainUUIDForRequest(r) + configured, opacity := s.homeWallpaperConfig(domainUUID) + view := homeWallpaperView{Path: configured, Opacity: strconv.FormatFloat(float64(opacity)/100, 'f', 2, 64)} + if configured == "" { + return view + } + + httpRequest := r + if objectUUID, err := s.store.ResolvePathInDomain(domainUUID, configured); err == nil && s.requestCanReadPath(httpRequest, configured) { + if revision, err := s.latestRevisionMetadataForRequest(httpRequest, objectUUID); err == nil && imageContentType(revision.ContentType) { + view.URL = rawProjectionURL("path:" + configured) + return view + } + } + + entries, err := s.store.ListBrowserEntriesInDomain(domainUUID, configured) + if err != nil { + return view + } + candidates := make([]store.BrowserEntry, 0, len(entries)) + for _, entry := range entries { + if !entry.IsDir && imageContentType(entry.ContentType) && s.requestCanReadPath(httpRequest, entry.Path) { + candidates = append(candidates, entry) + } + } + if len(candidates) == 0 { + return view + } + index := 0 + if value, err := rand.Int(rand.Reader, big.NewInt(int64(len(candidates)))); err == nil { + index = int(value.Int64()) + } + view.URL = rawProjectionURL("path:" + candidates[index].Path) + return view +} diff --git a/internal/server/home_wallpaper_test.go b/internal/server/home_wallpaper_test.go new file mode 100644 index 0000000..47930c2 --- /dev/null +++ b/internal/server/home_wallpaper_test.go @@ -0,0 +1,152 @@ +package server + +import ( + "encoding/json" + "net/http" + "net/http/httptest" + "net/url" + "strings" + "testing" + + "pageswiki/internal/store" +) + +func saveWallpaperFixture(t *testing.T, s *Server, domain, path, contentType string) { + t.Helper() + object, err := s.store.CreatePageAtPathInDomain(domain, path) + if err != nil { + t.Fatal(err) + } + if _, err := s.store.SaveRevisionContent(object, []byte("fixture"), "test", "und", contentType, strings.TrimPrefix(path, "/wallpapers/")); err != nil { + t.Fatal(err) + } +} + +func TestAuthPageUsesConfiguredWallpaperAndGlass(t *testing.T) { + s, _, domain := configFixture(t) + s.mux.HandleFunc("/_/auth/", s.handleAuth) + saveWallpaperFixture(t, s, domain, "/wallpapers/login.jpg", "image/jpeg") + for key, value := range map[string]string{ + "home_wallpaper_path": "/wallpapers/login.jpg", + "home_wallpaper_opacity": "41", + "home_glass_transparency": "47", + } { + if err := s.store.SetConfigInDomain(domain, key, value); err != nil { + t.Fatal(err) + } + } + if err := s.store.SetAuthProviderConfig(domain, store.AuthProviderConfig{Kind: "oidc", Enabled: true, Issuer: "https://id.example.test", ClientID: "pages"}); err != nil { + t.Fatal(err) + } + + request := httptest.NewRequest(http.MethodGet, "http://localhost/_/auth/login", nil) + response := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(response, request) + body := response.Body.String() + for _, expected := range []string{ + `class="auth-page"`, + `--home-glass-opacity:53%`, + `class="home-wallpaper" src="/_/auth/wallpaper"`, + `style="opacity:0.41"`, + `/static/css/auth.css?v=1`, + `class="auth-provider-button"`, + `OpenID Connectでログイン`, + } { + if response.Code != http.StatusOK || !strings.Contains(body, expected) { + t.Fatalf("auth page missing %q: status=%d body=%s", expected, response.Code, body) + } + } + + wallpaper := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(wallpaper, httptest.NewRequest(http.MethodGet, "http://localhost/_/auth/wallpaper?path=/private/ignored", nil)) + if wallpaper.Code != http.StatusOK || wallpaper.Body.String() != "fixture" || wallpaper.Header().Get("Content-Type") != "image/jpeg" || wallpaper.Header().Get("X-Content-Type-Options") != "nosniff" { + t.Fatalf("login wallpaper: status=%d type=%q body=%q", wallpaper.Code, wallpaper.Header().Get("Content-Type"), wallpaper.Body.String()) + } + + method := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(method, httptest.NewRequest(http.MethodPost, "http://localhost/_/auth/wallpaper", nil)) + if method.Code != http.StatusMethodNotAllowed || method.Header().Get("Allow") != "GET, HEAD" { + t.Fatalf("login wallpaper accepted mutation: %d", method.Code) + } +} + +func TestHomeWallpaperFolderPickerAndTheme(t *testing.T) { + s, token, domain := configFixture(t) + s.mux.HandleFunc("/_/api/v1/path-picker", s.handlePathPickerAPI) + saveWallpaperFixture(t, s, domain, "/wallpapers/a.jpg", "image/jpeg") + saveWallpaperFixture(t, s, domain, "/wallpapers/b.png", "image/png") + saveWallpaperFixture(t, s, domain, "/wallpapers/readme.txt", "text/plain") + + form := url.Values{ + "section": {"home"}, + "home_layout": {"search"}, + "home_wallpaper_path": {"/wallpapers"}, + "home_wallpaper_opacity": {"41"}, + "home_glass_transparency": {"47"}, + "locale": {"ja"}, + "timezone": {"Asia/Tokyo"}, + "theme": {"fate-t-dark"}, + "zombie_grace_hours": {"24"}, + "virtual_folder_pages": {"1"}, + } + response := configRequest(s, token, http.MethodPost, "/-/sys/config", form) + if response.Code != http.StatusFound { + t.Fatalf("save: %d %s", response.Code, response.Body.String()) + } + if got := s.getTheme(domain); got != "fate-t-dark" { + t.Fatalf("theme=%q", got) + } + path, opacity := s.homeWallpaperConfig(domain) + if path != "/wallpapers" || opacity != 41 { + t.Fatalf("wallpaper=%q opacity=%d", path, opacity) + } + if got := s.homeGlassTransparency(domain); got != 47 { + t.Fatalf("glass transparency=%d", got) + } + + r := httptest.NewRequest(http.MethodGet, "http://localhost/", nil) + r.Header.Set("Authorization", "Bearer "+token) + view := s.homeWallpaperForRequest(r) + if view.Opacity != "0.41" || (view.URL != "/v/raw/path:/wallpapers/a.jpg" && view.URL != "/v/raw/path:/wallpapers/b.png") { + t.Fatalf("view=%#v", view) + } + homeResponse := httptest.NewRecorder() + s.handleHome(homeResponse, r) + homeBody := homeResponse.Body.String() + if homeResponse.Code != http.StatusOK || !strings.Contains(homeBody, `class="home-wallpaper"`) || !strings.Contains(homeBody, `style="opacity:0.41"`) || !strings.Contains(homeBody, `--home-glass-opacity:53%`) || !strings.Contains(homeBody, `/static/css/theme/fate-t-dark.css`) { + t.Fatalf("home wallpaper render: %d %s", homeResponse.Code, homeBody) + } + settings := configRequest(s, token, http.MethodGet, "/-/sys/config?panel=home", nil) + if settings.Code != http.StatusOK || !strings.Contains(settings.Body.String(), `data-picker-mode="image-or-folder"`) || !strings.Contains(settings.Body.String(), `value="fate-t-dark"`) { + t.Fatalf("wallpaper settings UI: %d", settings.Code) + } + + picker := configRequest(s, token, http.MethodGet, "/_/api/v1/path-picker?path=%2Fwallpapers&mode=image-or-folder", nil) + var listing struct { + Path string `json:"path"` + Entries []pathPickerEntry `json:"entries"` + } + if picker.Code != http.StatusOK || json.Unmarshal(picker.Body.Bytes(), &listing) != nil { + t.Fatalf("picker: %d %s", picker.Code, picker.Body.String()) + } + if listing.Path != "/wallpapers" || len(listing.Entries) != 2 { + t.Fatalf("listing=%#v", listing) + } + + direct := configRequest(s, token, http.MethodGet, "/_/api/v1/path-picker?path=%2Fwallpapers%2Fa.jpg&mode=image-or-folder", nil) + var selected struct { + Path string `json:"path"` + Selected string `json:"selected"` + } + if direct.Code != http.StatusOK || json.Unmarshal(direct.Body.Bytes(), &selected) != nil || selected.Path != "/wallpapers" || selected.Selected != "/wallpapers/a.jpg" { + t.Fatalf("direct picker: %d %s", direct.Code, direct.Body.String()) + } +} + +func TestHomeWallpaperValidation(t *testing.T) { + for _, value := range []string{"relative", "/wallpapers/../private", "/bad\\path", "/bad\npath"} { + if _, ok := normalizePickerPath(value); ok { + t.Fatalf("accepted %q", value) + } + } +} diff --git a/internal/server/html_projection.go b/internal/server/html_projection.go new file mode 100644 index 0000000..97555c2 --- /dev/null +++ b/internal/server/html_projection.go @@ -0,0 +1,331 @@ +package server + +import ( + "context" + "crypto/rand" + "crypto/sha256" + "encoding/base64" + "fmt" + stdhtml "html" + "io" + "net/http" + "net/url" + pathpkg "path" + "regexp" + "strings" + "time" + + "github.com/microcosm-cc/bluemonday" + "golang.org/x/net/html" + "golang.org/x/net/html/atom" +) + +const htmlProjectionVersion = "controlled-v2" +const maxProjectionInput = 1 << 20 +const maxProjectionOutput = 4 << 20 + +var projectionMacroRE = regexp.MustCompile(`\{\{(?:children[^}]*|(?:city-breadcrumbs|spot-pages|quartier|street|spot|nearby|city)(?:\s+[^}]*)?)\}\}`) +var languageClassRE = regexp.MustCompile(`^language-[a-zA-Z0-9_+-]{1,40}$`) + +func projectionPolicy(generated bool) *bluemonday.Policy { + p := bluemonday.NewPolicy() + p.AllowStandardURLs() + p.RequireNoReferrerOnLinks(true) + p.AllowElements("p", "br", "hr", "div", "span", "h1", "h2", "h3", "h4", "h5", "h6", "blockquote", "pre", "code", "b", "strong", "i", "em", "u", "s", "del", "ins", "sub", "sup", "small", "mark", "abbr", "kbd", "samp", "var", "ul", "ol", "li", "dl", "dt", "dd", "table", "thead", "tbody", "tfoot", "tr", "th", "td", "caption", "colgroup", "col", "figure", "figcaption", "details", "summary", "section", "article") + p.AllowAttrs("href").OnElements("a") + p.AllowAttrs("title", "lang", "dir").Globally() + p.AllowAttrs("id").Matching(regexp.MustCompile(`^[^\s]{1,256}$`)).Globally() + p.AllowAttrs("class").Matching(languageClassRE).OnElements("code") + p.AllowAttrs("src", "alt").OnElements("img") + p.AllowAttrs("width", "height", "colspan", "rowspan", "span", "start", "value").Matching(regexp.MustCompile(`^[0-9]{1,4}$`)).OnElements("img", "td", "th", "col", "colgroup", "ol", "li") + p.AllowAttrs("open").Matching(regexp.MustCompile(`^(open)?$`)).OnElements("details") + if generated { + // Only the server's macro renderer can introduce these attributes. The + // authored pass does not allow data-*, arbitrary classes, forms or IDs + // outside the document namespace after tree normalization. + p.AllowElements("nav") + p.AllowAttrs("class", "role", "aria-label").Globally() + p.AllowAttrs("data-children-path", "data-children-exclude", "data-children-src").OnElements("section") + p.AllowAttrs("loading", "referrerpolicy").OnElements("img") + } + return p +} + +var authoredHTMLPolicy = projectionPolicy(false) +var generatedHTMLPolicy = projectionPolicy(true) + +func projectionFallback(body, message string) string { + if len(body) > 64<<10 { + body = body[:64<<10] + } + return `

    ` + stdhtml.EscapeString(message) + `

    ` + stdhtml.EscapeString(body) + `
    ` +} + +func projectionInputOK(ctx context.Context, body string) bool { + if len(body) > maxProjectionInput { + return false + } + z := html.NewTokenizer(strings.NewReader(body)) + z.SetMaxBuf(maxProjectionInput) + depth := 0 + for count := 0; count < 16384; count++ { + if count%128 == 0 && ctx.Err() != nil { + return false + } + switch z.Next() { + case html.ErrorToken: + return z.Err() == io.EOF + case html.StartTagToken: + name, _ := z.TagName() + switch string(name) { + case "br", "hr", "img", "meta", "link", "input", "wbr", "source", "area", "base", "embed", "param", "track", "col": + default: + depth++ + } + if depth > 128 { + return false + } + case html.EndTagToken: + if depth > 0 { + depth-- + } + } + } + return false +} + +func documentAnchor(id string) string { return fmt.Sprintf("pw-doc-%x", sha256.Sum256([]byte(id))) } + +// extractApprovedExternalActiveResources runs before the authored allowlist, +// which intentionally knows nothing about script or link elements. An +// approved element becomes unpredictable text; its canonical server-authored +// tag is restored only after the generated-output allowlist has also run. +func extractApprovedExternalActiveResources(body string, policy externalResourcePolicy) (string, map[string]string) { + var seed [18]byte + if _, err := rand.Read(seed[:]); err != nil { + return body, nil + } + prefix := "PWEXT-" + base64.RawURLEncoding.EncodeToString(seed[:]) + "-" + fragments := map[string]string{} + var output strings.Builder + z := html.NewTokenizer(strings.NewReader(body)) + z.SetMaxBuf(maxProjectionInput) + skippingApprovedScript := false + for { + tokenType := z.Next() + if tokenType == html.ErrorToken { + break + } + if skippingApprovedScript { + if tokenType == html.EndTagToken { + token := z.Token() + if strings.EqualFold(token.Data, "script") { + skippingApprovedScript = false + } + } + continue + } + if tokenType != html.StartTagToken && tokenType != html.SelfClosingTagToken { + output.Write(z.Raw()) + continue + } + token := z.Token() + name := strings.ToLower(token.Data) + attrs := map[string]string{} + for _, attr := range token.Attr { + attrs[strings.ToLower(attr.Key)] = attr.Val + } + kind, resourceURL := "", "" + switch name { + case "script": + kind, resourceURL = "script", attrs["src"] + case "link": + if strings.EqualFold(strings.TrimSpace(attrs["rel"]), "stylesheet") { + kind, resourceURL = "stylesheet", attrs["href"] + } + } + approval, approved := policy.approved(kind, resourceURL) + if !approved { + output.Write(z.Raw()) + continue + } + placeholder := prefix + fmt.Sprint(len(fragments)) + var node *html.Node + if kind == "script" { + node = &html.Node{Type: html.ElementNode, Data: "script", DataAtom: atom.Script, Attr: []html.Attribute{ + {Key: "src", Val: approval.URL}, {Key: "integrity", Val: approval.Integrity}, + {Key: "crossorigin", Val: "anonymous"}, {Key: "defer", Val: "defer"}, + }} + if tokenType == html.StartTagToken { + skippingApprovedScript = true + } + } else { + node = &html.Node{Type: html.ElementNode, Data: "link", DataAtom: atom.Link, Attr: []html.Attribute{ + {Key: "rel", Val: "stylesheet"}, {Key: "href", Val: approval.URL}, + {Key: "integrity", Val: approval.Integrity}, {Key: "crossorigin", Val: "anonymous"}, + }} + } + var fragment strings.Builder + if html.Render(&fragment, node) != nil { + output.Write(z.Raw()) + continue + } + fragments[placeholder] = fragment.String() + output.WriteString(placeholder) + } + return output.String(), fragments +} + +// safeHTMLProjection is the only authored-HTML display boundary. It never +// writes Documents/Revisions and never fetches an external resource. Canonical +// Markdown conversion deliberately does not call it. +func (s *Server) safeHTMLProjection(r *http.Request, body, path string, expand bool) string { + ctx, cancel := context.WithTimeout(r.Context(), 2*time.Second) + defer cancel() + r = r.WithContext(ctx) + fallback := func() string { + return projectionFallback(body, translate(s.getLocale(s.domainUUIDForRequest(r)), "viewer.html_projection_unavailable")) + } + if !projectionInputOK(r.Context(), body) { + return fallback() + } + resourcePolicy := s.externalResourcePolicy(s.domainUUIDForRequest(r)) + body, externalFragments := extractApprovedExternalActiveResources(body, resourcePolicy) + safe := authoredHTMLPolicy.Sanitize(body) + root := &html.Node{Type: html.ElementNode, Data: "div", DataAtom: atom.Div} + nodes, err := html.ParseFragment(strings.NewReader(safe), root) + if err != nil { + return fallback() + } + var output strings.Builder + macros, count := 0, 0 + var emit func(*html.Node, int, bool) bool + emit = func(n *html.Node, depth int, literal bool) bool { + count++ + if count > 16384 || depth > 128 || output.Len() > maxProjectionOutput || r.Context().Err() != nil { + return false + } + if n.Type == html.TextNode { + if !expand || literal { + output.WriteString(stdhtml.EscapeString(n.Data)) + return true + } + at := 0 + for _, loc := range projectionMacroRE.FindAllStringIndex(n.Data, 33) { + if ctx.Err() != nil { + return false + } + macros++ + if macros > 32 { + return false + } + output.WriteString(stdhtml.EscapeString(n.Data[at:loc[0]])) + macro := n.Data[loc[0]:loc[1]] + expanded := macro + // Dispatch exactly one macro. A failed City macro must never + // be reparsed as a nested children request on its raw text. + if isAnonymousProjection(r) { + expanded = s.expandPublicMacro(r, macro, path) + } else if strings.HasPrefix(macro, "{{children") { + expanded = s.expandChildrenMacros(macro, path) + } else { + expanded = s.expandCityMacrosContext(ctx, macro, path, s.domainUUIDForRequest(r), s.pathReadFilter(r)) + } + if expanded == macro { + // Failed/unresolved macros are still authored text. Do not + // promote decoded entities into trusted generated elements. + output.WriteString(stdhtml.EscapeString(macro)) + } else { + output.WriteString(expanded) + } + at = loc[1] + } + output.WriteString(stdhtml.EscapeString(n.Data[at:])) + return true + } + if n.Type != html.ElementNode { + return true + } + attrs := n.Attr[:0] + for _, a := range n.Attr { + switch a.Key { + case "id": + a.Val = documentAnchor(a.Val) + case "href": + if strings.HasPrefix(a.Val, "#") { + a.Val = "#" + documentAnchor(strings.TrimPrefix(a.Val, "#")) + } + case "src": + u, e := url.Parse(a.Val) + if e != nil || strings.ContainsAny(a.Val, "\\\r\n\t") { + continue + } + if u.IsAbs() || u.Host != "" { + approval, ok := resourcePolicy.approved("image", a.Val) + if !ok || n.Data != "img" { + continue + } + a.Val = approval.URL + attrs = append(attrs, a) + continue + } + u.Path = pathpkg.Clean(u.Path) + // Images are passive read projections, not arbitrary authenticated + // GETs against editors, login flows or management endpoints. + if !strings.HasPrefix(u.Path, "/v/raw/") && !strings.HasPrefix(u.Path, "/_/obj/") && !strings.HasPrefix(u.Path, "/static/") && !strings.HasPrefix(u.Path, "/o/path:/system/static/") { + continue + } + u.RawPath = "" + a.Val = u.String() + } + attrs = append(attrs, a) + } + n.Attr = attrs + if n.Data == "img" { + n.Attr = append(n.Attr, html.Attribute{Key: "loading", Val: "lazy"}, html.Attribute{Key: "referrerpolicy", Val: "no-referrer"}) + } + // Render a shallow element to let net/html escape its attributes; never + // interpolate authored attributes into the macro output context. + shallow := &html.Node{Type: html.ElementNode, Data: n.Data, DataAtom: n.DataAtom, Attr: n.Attr} + var tag strings.Builder + if html.Render(&tag, shallow) != nil { + return false + } + opening := tag.String() + closing := "" + void := !strings.HasSuffix(opening, closing) + if !void { + opening = strings.TrimSuffix(opening, closing) + } + output.WriteString(opening) + for child := n.FirstChild; child != nil; child = child.NextSibling { + if !emit(child, depth+1, literal || n.Data == "code" || n.Data == "pre" || n.Data == "a") { + return false + } + } + if !void { + output.WriteString(closing) + } + return true + } + for _, n := range nodes { + if !emit(n, 0, false) { + return fallback() + } + } + if output.Len() > maxProjectionOutput { + return fallback() + } + projected := output.String() + if expand && !isAnonymousProjection(r) { + projected = s.renderDiagramsInHTML(r, path, projected) + } + // A second allowlist pass guards all generated URL/HTML output too. Active + // external resources only exist as random text at this boundary, so macro + // output cannot manufacture an approved script or stylesheet tag. + projected = generatedHTMLPolicy.Sanitize(projected) + for token, fragment := range externalFragments { + projected = strings.ReplaceAll(projected, token, fragment) + } + return projected +} diff --git a/internal/server/html_projection_browser_test.go b/internal/server/html_projection_browser_test.go new file mode 100644 index 0000000..0f3db89 --- /dev/null +++ b/internal/server/html_projection_browser_test.go @@ -0,0 +1,155 @@ +package server + +import ( + "bytes" + "context" + "encoding/json" + "fmt" + "io" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "strings" + "sync/atomic" + "testing" + "time" +) + +func TestHTMLProjectionChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + s, token, domain := configFixture(t) + s.mux.HandleFunc("/", s.handleHome) + s.mux.HandleFunc("/o/", s.handleObjectView) + s.mux.HandleFunc("/r/view/", s.handleRevisionView) + s.mux.HandleFunc("/v/preview/", s.handlePreview) + s.mux.HandleFunc("/_/view/print/", s.handlePrint) + s.mux.HandleFunc("/u/", s.handleUserProfile) + s.mux.HandleFunc("/e/", s.handleEditorRoute) + s.mux.HandleFunc("/_/api/v1/render/markdown", s.handleMarkdownRenderAPI) + s.mux.HandleFunc("/_/api/v1/revisions/save", s.handleSaveRevisionAPI) + s.mux.HandleFunc("/v/children", s.handleChildrenProjection) + body := projectionAttack + `

    {{children:/guide}}

    literal code
    ` + object, err := s.store.CreatePageAtPathInDomain(domain, "/guide") + if err != nil { + t.Fatal(err) + } + if _, err = s.store.CreatePageAtPathInDomain(domain, "/guide/child"); err != nil { + t.Fatal(err) + } + // A path-scoped author writes via the real API; a stronger administrator + // subsequently renders those exact bytes in every normal display surface. + author, err := s.store.CreatePasswordAccount(domain, "writer", "a long writer password", "Writer", "") + if err != nil { + t.Fatal(err) + } + authorToken, err := s.store.CreateAuthSession(domain, author.UUID) + if err != nil { + t.Fatal(err) + } + var role string + if err = s.store.DB.QueryRow(`SELECT b.role_uuid FROM auth_role_bindings b JOIN domain_memberships m ON m.uuid=b.membership_uuid WHERE m.domain_uuid=? AND m.principal_uuid=?`, domain, author.UUID).Scan(&role); err != nil { + t.Fatal(err) + } + if _, err = s.store.DB.Exec(`DELETE FROM auth_capability_grants WHERE role_uuid=?`, role); err != nil { + t.Fatal(err) + } + for _, capability := range []string{"read", "write"} { + if _, err = s.store.DB.Exec(`INSERT INTO auth_capability_grants(uuid,role_uuid,capability,target_type,target_id,created_at_ms) VALUES(?,?,?,'path','/guide',1)`, "writer-"+capability, role, capability); err != nil { + t.Fatal(err) + } + } + payload, _ := json.Marshal(map[string]any{"object_uuid": object, "body": body, "content_type": "text/html", "filename": "guide.html", "lang": "en"}) + request := httptest.NewRequest("POST", "http://localhost/_/api/v1/revisions/save", bytes.NewReader(payload)) + request.Header.Set("Authorization", "Bearer "+authorToken) + request.Header.Set("Content-Type", "application/json") + response := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(response, request) + if w := response; w.Code != 200 { + t.Fatalf("author save=%d %s", w.Code, w.Body.String()) + } + rev, err := s.store.GetLatestRevisionForLanguages(object, []string{"en"}) + if err != nil { + t.Fatal(err) + } + userObject, err := s.store.CreatePageAtPathInDomain(domain, "/u/admin") + if err != nil { + t.Fatal(err) + } + if _, err = s.store.SaveRevisionContent(userObject, []byte(body), "", "en", "text/html", "profile.html"); err != nil { + t.Fatal(err) + } + if err = s.store.SetConfigInDomain(domain, "home_path", "/guide"); err != nil { + t.Fatal(err) + } + routes := []string{"/guide", "/", "/o/uuid:" + object, "/r/view/" + rev.UUID, "/v/preview/guide", "/_/view/print/path:/guide", "/u/admin", "/e/-/guide?edittype=html", "/e/-/guide?edittype=markdown"} + script, err := os.ReadFile("internal/server/testdata/html-projection.js") + if err != nil { + t.Fatal(err) + } + var hits atomic.Int32 + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + switch r.URL.Path { + case "/fixture": + w.Header().Set("Content-Type", "text/html") + _, _ = io.WriteString(w, `

    HTML isolation regression

    `) + return + case "/fixture-state": + w.Header().Set("Content-Type", "application/json") + _ = json.NewEncoder(w).Encode(map[string]any{"routes": routes, "body": rev.Body, "hits": hits.Load()}) + return + case "/sentinel": + hits.Add(1) + w.WriteHeader(204) + return + case "/static/attack.js": + w.Header().Set("Content-Type", "text/javascript") + _, _ = io.WriteString(w, `document.documentElement.dataset.attack='external';fetch('/sentinel',{method:'POST'})`) + return + } + if r.Method == http.MethodGet && (r.URL.Path == "/" || r.URL.Path == "/guide" || strings.HasPrefix(r.URL.Path, "/o/") || strings.HasPrefix(r.URL.Path, "/r/view/") || strings.HasPrefix(r.URL.Path, "/v/preview/") || strings.HasPrefix(r.URL.Path, "/_/view/print/") || strings.HasPrefix(r.URL.Path, "/u/") || strings.HasPrefix(r.URL.Path, "/e/")) { + rec := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(rec, r) + for key, values := range rec.Header() { + w.Header()[key] = values + } + w.WriteHeader(rec.Code) + // Parser-inserted, deliberately unnonced probes test CSP separately + // from sanitizer correctness, without disabling the real headers. + probe := `` + _, _ = io.WriteString(w, strings.Replace(rec.Body.String(), "", probe+"", 1)) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + ctx, cancel := context.WithTimeout(context.Background(), 50*time.Second) + defer cancel() + cmd := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", server.URL+"/fixture", t.TempDir()) + if out, err := cmd.CombinedOutput(); err != nil { + t.Fatalf("browser: %v %s", err, out) + } + if hits.Load() != 0 { + t.Fatalf("authored content issued %d privileged requests", hits.Load()) + } + after, err := s.store.GetRevision(rev.UUID) + if err != nil || after.DocumentHash != rev.DocumentHash || after.Body != rev.Body { + t.Fatal("browser projection altered canonical source") + } + t.Log(fmt.Sprintf("verified %d display/editor routes as a stronger reader", len(routes))) +} + +// Match CSP when installing only fixture-owned code. This does not disable CSP +// and authored corpus nodes never receive the application's nonce. +func TestHTMLProjectionCSPRejectsUnnoncedMarkup(t *testing.T) { + s, token, _ := configFixture(t) + s.mux.HandleFunc("/", s.handleHome) + w := configRequest(s, token, "GET", "/", nil) + if w.Code != 200 || strings.Contains(w.Header().Get("Content-Security-Policy"), "script-src 'self'") { + t.Fatal("unsafe script origin allowlist") + } +} diff --git a/internal/server/html_projection_csp.go b/internal/server/html_projection_csp.go new file mode 100644 index 0000000..755eebe --- /dev/null +++ b/internal/server/html_projection_csp.go @@ -0,0 +1,107 @@ +package server + +import ( + "crypto/rand" + "encoding/base64" + "html/template" + "net/http" + "net/url" + "os" + "path/filepath" + "regexp" + "sort" + "strings" +) + +var trustedScriptTagRE = regexp.MustCompile(`(?i)])`) + +// Only application-owned template files are processed here, before any request +// data or authored HTML exists. Never add nonces by rewriting rendered HTML. +func parseTrustedTemplates(t *template.Template) (*template.Template, error) { + paths, err := filepath.Glob("templates/**/*.gohtml") + if err != nil { + return nil, err + } + for _, path := range paths { + body, err := os.ReadFile(path) + if err != nil { + return nil, err + } + body = trustedScriptTagRE.ReplaceAll(body, []byte(` + +bad URL + + + +
    +
    forged controls
    + +` + +func checkInertProjection(t *testing.T, body string) { + t.Helper() + doc, err := html.Parse(strings.NewReader(body)) + if err != nil { + t.Fatal(err) + } + var walk func(*html.Node) + walk = func(n *html.Node) { + if n.Type == html.ElementNode { + switch n.Data { + case "script", "style", "svg", "math", "iframe", "form", "input", "button", "object", "embed", "base", "meta": + t.Fatalf("active element %s: %s", n.Data, body) + } + for _, a := range n.Attr { + if strings.HasPrefix(a.Key, "on") || a.Key == "style" || a.Key == "name" || a.Key == "srcdoc" { + t.Fatalf("active attr %+v", a) + } + if a.Key == "id" && !strings.HasPrefix(a.Val, "pw-doc-") { + t.Fatalf("unscoped ID %s", a.Val) + } + if (a.Key == "href" || a.Key == "src") && strings.Contains(strings.ToLower(a.Val), "javascript") { + t.Fatalf("active URL %+v", a) + } + } + } + for c := n.FirstChild; c != nil; c = c.NextSibling { + walk(c) + } + } + walk(doc) +} + +func TestHTMLProjectionCorpusAndMacros(t *testing.T) { + s, _, _ := configFixture(t) + r := httptest.NewRequest("GET", "http://localhost/guide", nil) + for _, body := range []string{projectionAttack, `
    `) + default: + out.WriteString(`
      `) + } + for _, item := range page { + href := p.href(item) + name := html.EscapeString(path.Base(item)) + entry, ok := entries[item] + if !ok { + entry = store.BrowserEntry{Path: item, IsDir: !p.allows(item)} + } + switch args.View { + case "icon": + // A private parent shown as a folder links to its filtered tree. + out.WriteString(`` + s.entryPreviewHTML(entry, false) + `` + name + ``) + case "detail": + kind := entry.ContentType + if entry.IsDir { + kind = "folder" + } + out.WriteString(fmt.Sprintf(`
    `, html.EscapeString(item), html.EscapeString(href), name, html.EscapeString(kind), entry.Size)) + default: + out.WriteString(`
  • ` + name + `
  • `) + } + } + switch args.View { + case "icon": + out.WriteString(``) + case "detail": + out.WriteString(`
    %s%s%d
    `) + default: + out.WriteString(``) + } + args.TargetPath = scope + args.Limit = limit + writeChildrenMore(&out, args, end, len(keys)) + return out.String(), nil +} diff --git a/internal/server/render.go b/internal/server/render.go index 240ffc5..0a31a42 100644 --- a/internal/server/render.go +++ b/internal/server/render.go @@ -1,7 +1,11 @@ package server import ( + "html/template" "net/http" + "net/url" + "strings" + "time" ) func mergeTemplateData( @@ -15,7 +19,8 @@ func mergeTemplateData( "WikiName": wikiName, "Theme": theme, "ThemeCSS": sThemeCSS, - "District": nil, + "Campus": nil, + "Domain": nil, } if data == nil { @@ -41,21 +46,85 @@ func (s *Server) render( name string, data any, ) { + domain := s.currentDomain() + campus := s.currentCampus() + if values, ok := data.(map[string]any); ok { + if context, ok := values["Context"].(*RequestContext); ok { + if context.Domain != nil { + domain = context.Domain + } + if context.Campus != nil { + campus = context.Campus + } + } + } + domainUUID := "" + if domain != nil { + domainUUID = domain.UUID + } + nonce := "" + if safeProjectionTemplate(name) { + var err error + nonce, err = setProjectionCSP(w, s.externalResourcePolicy(domainUUID)) + if err != nil { + http.Error(w, "could not secure HTML projection", 500) + return + } + if name == "public_periodical.gohtml" { + if values, ok := data.(map[string]any); ok { + if origin, ok := values["PublicMediaOrigin"].(string); ok { + u, err := url.Parse(origin) + if err == nil && (u.Scheme == "https" || u.Scheme == "http") && u.Host != "" && u.User == nil && u.Path == "" && !strings.ContainsAny(origin, " ;\r\n\t") { + w.Header().Set("Content-Security-Policy", strings.Replace(w.Header().Get("Content-Security-Policy"), "img-src 'self'", "img-src 'self' "+origin, 1)) + } + } + } + } + } + templates, err := s.templates.Clone() + if err != nil { + http.Error(w, err.Error(), 500) + return + } + // Template helpers run for each row/cell. Resolve configuration once per + // render instead of issuing locale/timezone queries for every invocation. + locale := s.getLocale(domainUUID) + location := s.getLocation(domainUUID) + templates = templates.Funcs(template.FuncMap{ + "cspNonce": func() string { return nonce }, + "T": func(key string) string { + return translate(locale, key) + }, + "formatUnix": func(ts int64) string { + return time.Unix(ts, 0). + In(location). + Format("2006-01-02 15:04:05 MST") + }, + "formatUnixMS": func(ts int64) string { + if ts <= 0 { + return "-" + } + return time.UnixMilli(ts).In(location).Format("2006-01-02 15:04") + }, + }) - err := s.templates.ExecuteTemplate( + err = templates.ExecuteTemplate( w, name, func() map[string]any { m := mergeTemplateData( data, - s.getWikiName(), - s.getTheme(), - s.getThemeCSS(), + s.getWikiName(domainUUID), + s.getTheme(domainUUID), + s.getThemeCSS(domainUUID), ) - m["District"] = - s.currentDistrict() + m["Domain"] = domain + m["Campus"] = campus + if _, ok := m["Timezone"]; !ok { + m["Timezone"] = location.String() + } return m }(), diff --git a/internal/server/render_api.go b/internal/server/render_api.go index 66adf91..fc927be 100644 --- a/internal/server/render_api.go +++ b/internal/server/render_api.go @@ -13,16 +13,36 @@ func (s *Server) handleMarkdownRenderAPI( ) { var req struct { - Markdown string `json:"markdown"` + Markdown string `json:"markdown"` + Path string `json:"path"` + Projection bool `json:"projection"` + HTML *string `json:"html"` } - err := json.NewDecoder(r.Body).Decode(&req) + err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 2<<20)).Decode(&req) if err != nil { http.Error(w, err.Error(), 400) return } - _ = json.NewEncoder(w).Encode(map[string]any{ - "html": render.Markdown(req.Markdown), - }) + html := "" + if req.HTML != nil { + if !req.Projection { + http.Error(w, "HTML input requires projection mode", 400) + return + } + html = *req.HTML + } else { + html = render.Markdown(req.Markdown) + } + if req.Projection { + path := req.Path + if path == "" || path[0] != '/' { + path = "/" + } + html = s.safeHTMLProjection(r, html, path, true) + } + w.Header().Set("Content-Type", "application/json; charset=utf-8") + w.Header().Set("Cache-Control", "private, no-store") + _ = json.NewEncoder(w).Encode(map[string]any{"html": html}) } diff --git a/internal/server/request_context.go b/internal/server/request_context.go index 5b62bcc..912f904 100644 --- a/internal/server/request_context.go +++ b/internal/server/request_context.go @@ -7,17 +7,24 @@ import ( ) type RequestContext struct { - District *store.District + Campus *store.Campus + Domain *store.Domain } func (s *Server) BuildRequestContext( r *http.Request, ) *RequestContext { - return &RequestContext{ - District: s.districtForRequest( + domain := + s.domainForRequest( r, + ) + + return &RequestContext{ + Campus: s.campusForDomain( + domain, ), + Domain: domain, } } @@ -36,7 +43,44 @@ func (s *Server) renderWithContext( s.BuildRequestContext( r, ) + data["AuthUser"] = nil + data["AuthIsAdmin"] = false + domainUUID := s.domainUUIDForRequest(r) + data["CalendarEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.calendar") + data["TasksEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.tasks") + if r.URL.Path == "/" { + data["IsHome"] = true + data["BookmarkSections"] = s.bookmarkSections(r) + canConfigureHome := s.canManageAssets(r) + if controlled, err := s.store.DomainEntryControlled(domainUUID); err != nil || controlled { + canConfigureHome = false + } + data["CanManageBookmarks"] = s.canManageAssets(r) + data["CanConfigureHome"] = canConfigureHome + transparency := s.homeGlassTransparency(domainUUID) + data["HomeGlassTransparency"] = transparency + data["HomeGlassOpacity"] = 100 - transparency + wallpaper := s.homeWallpaperForRequest(r) + data["HomeWallpaperURL"] = wallpaper.URL + data["HomeWallpaperOpacity"] = wallpaper.Opacity + if wallpaper.URL != "" { + w.Header().Set("Cache-Control", "private, no-cache") + } + if data["CanManageBookmarks"] == true { + data["ManagedBookmarks"] = s.managedBookmarks(domainUUID) + } + } + if _, ok := data["Locale"]; !ok { + data["Locale"] = s.getLocale(domainUUID) + } + if token := s.authTokenFromRequest(r); token != "" { + if principal, err := s.store.PrincipalForSession(domainUUID, token); err == nil { + data["AuthUser"] = principal + data["AuthIsAdmin"] = s.store.Authorize(store.AuthorizationRequest{DomainUUID: domainUUID, PrincipalUUID: principal.UUID, Capability: "manage", TargetType: "domain", TargetID: domainUUID}) == nil + } + } + data["SocialMetadata"] = s.socialMetadataForRequest(r, name, data) s.render( w, name, diff --git a/internal/server/resource_history_test.go b/internal/server/resource_history_test.go new file mode 100644 index 0000000..1b00c44 --- /dev/null +++ b/internal/server/resource_history_test.go @@ -0,0 +1,146 @@ +package server + +import ( + "database/sql" + "encoding/json" + "fmt" + "net/http/httptest" + "testing" + "time" + + "pageswiki/internal/store" +) + +func TestBackgroundResourceEventPersistenceAndPermissions(t *testing.T) { + s, token, domain := configFixture(t) + if err := s.store.EnsureBuiltinResourceEvent(); err != nil { + t.Fatal(err) + } + // No resource page or HTTP request has run; only the background dispatcher. + job := &store.EventJob{UUID: "resource-test", Type: store.ResourceEventType} + if err := s.runEvent(job); err != nil { + t.Fatal(err) + } + if err := s.runEvent(job); err != nil { + t.Fatal(err) + } + var databasePath string + var seq int + var name string + if err := s.store.DB.QueryRow("PRAGMA database_list").Scan(&seq, &name, &databasePath); err != nil { + t.Fatal(err) + } + other, err := sql.Open("sqlite", databasePath) + if err != nil { + t.Fatal(err) + } + defer other.Close() + reader := &store.Store{DB: other} + history, err := reader.ResourceHistory(t.Context(), 24, time.Now()) + if err != nil || len(history) != 1 { + t.Fatalf("durable history %d %v", len(history), err) + } + var persisted struct { + IO processIOCounters `json:"io"` + } + if json.Unmarshal(history[0], &persisted) != nil || persisted.IO.Scope != "process" || persisted.IO.ProcessID == "" { + t.Fatal("background history did not persist process I/O identity and counters") + } + w := configRequest(s, token, "GET", "/_/api/v1/queue/resources/history?hours=24", nil) + var data struct{ Samples []json.RawMessage } + if w.Code != 200 || json.Unmarshal(w.Body.Bytes(), &data) != nil || len(data.Samples) != 1 { + t.Fatalf("history %d %s", w.Code, w.Body.String()) + } + member, err := s.store.CreatePasswordAccount(domain, "observer", "long observer password", "Observer", "") + if err != nil { + t.Fatal(err) + } + memberToken, err := s.store.CreateAuthSession(domain, member.UUID) + if err != nil { + t.Fatal(err) + } + if w = configRequest(s, memberToken, "GET", "/_/api/v1/queue/resources/history", nil); w.Code != 403 { + t.Fatalf("history exposed to non-admin: %d", w.Code) + } + definitions, err := s.store.ListEventDefinitions() + if err != nil { + t.Fatal(err) + } + var definition store.EventDefinition + for _, item := range definitions { + if item.UUID == store.ResourceEventID { + definition = item + } + } + definition.Enabled = false + definition.IntervalSeconds = 120 + if err := s.store.SaveEventDefinition(&definition); err != nil { + t.Fatal(err) + } + if err := s.store.EnsureBuiltinResourceEvent(); err != nil { + t.Fatal(err) + } + var enabled bool + var interval int + if err := s.store.DB.QueryRow("SELECT enabled,interval_seconds FROM event_definitions WHERE uuid=?", store.ResourceEventID).Scan(&enabled, &interval); err != nil { + t.Fatal(err) + } + if enabled || interval != 120 { + t.Fatal("initialization overwrote monitor settings") + } + definition.IntervalSeconds = 1 + if err := s.store.SaveEventDefinition(&definition); err == nil { + t.Fatal("accepted excessive sampling frequency") + } + if err := s.store.DeleteEventDefinition(store.ResourceEventID); err == nil { + t.Fatal("deleted builtin event") + } +} + +func TestResourceHistoryRetentionAndBoundedProjection(t *testing.T) { + s, _, _ := configFixture(t) + now := time.Now() + if err := s.store.SaveResourceSample("expired", now.Add(-8*24*time.Hour).UnixMilli(), []byte(`{}`)); err != nil { + t.Fatal(err) + } + for i := 0; i < 450; i++ { + if err := s.store.SaveResourceSample(fmt.Sprint(i), now.Add(time.Duration(i-450)*time.Minute).UnixMilli(), []byte(`{}`)); err != nil { + t.Fatal(err) + } + } + var count int + if err := s.store.DB.QueryRow("SELECT COUNT(*) FROM resource_samples WHERE job_uuid='expired'").Scan(&count); err != nil { + t.Fatal(err) + } + if count != 0 { + t.Fatal("expired sample retained") + } + rows, err := s.store.ResourceHistory(t.Context(), 24, now) + if err != nil || len(rows) == 0 || len(rows) > 361 { + t.Fatalf("bounded history %d %v", len(rows), err) + } +} + +func TestSystemExtensionCatalogPolicy(t *testing.T) { + s, token, domain := configFixture(t) + s.mux.HandleFunc("/_/api/v1/extension/", s.handleSystemExtensions) + w := configRequest(s, token, "GET", "/_/api/v1/extension/", nil) + if w.Code != 200 { + t.Fatalf("catalog %d %s", w.Code, w.Body.String()) + } + policy := policyForRequest(httptest.NewRequest("POST", "/_/api/v1/extension/install", nil)) + if policy.Capability != "deny" { + t.Fatal("external plugin installation not denied") + } + member, err := s.store.CreatePasswordAccount(domain, "reader", "long reader password", "Reader", "") + if err != nil { + t.Fatal(err) + } + memberToken, err := s.store.CreateAuthSession(domain, member.UUID) + if err != nil { + t.Fatal(err) + } + if w = configRequest(s, memberToken, "GET", "/_/api/v1/extension/", nil); w.Code != 403 { + t.Fatalf("catalog exposed %d", w.Code) + } +} diff --git a/internal/server/resource_io.go b/internal/server/resource_io.go new file mode 100644 index 0000000..d4f52d2 --- /dev/null +++ b/internal/server/resource_io.go @@ -0,0 +1,52 @@ +package server + +import ( + "os" + "strconv" + "strings" + + "github.com/google/uuid" +) + +// A new process gets a new identity, even when a container reuses PID 1. +var resourceProcessID = uuid.NewString() + +type processIOCounters struct { + Scope string `json:"scope"` + Available bool `json:"available"` + ProcessID string `json:"process_id"` + ReadBytes uint64 `json:"read_bytes"` + WriteBytes uint64 `json:"write_bytes"` +} + +func readProcessIO() processIOCounters { + data, _ := os.ReadFile("/proc/self/io") + return parseProcessIO(string(data)) +} + +func parseProcessIO(data string) processIOCounters { + result := processIOCounters{Scope: "process", ProcessID: resourceProcessID} + read, write := false, false + for _, line := range strings.Split(data, "\n") { + fields := strings.Fields(line) + if len(fields) != 2 { + continue + } + if fields[0] != "read_bytes:" && fields[0] != "write_bytes:" { + continue + } + value, err := strconv.ParseUint(fields[1], 10, 64) + if err != nil { + return result + } + if fields[0] == "read_bytes:" { + result.ReadBytes = value + read = true + } else { + result.WriteBytes = value + write = true + } + } + result.Available = read && write + return result +} diff --git a/internal/server/resource_io_test.go b/internal/server/resource_io_test.go new file mode 100644 index 0000000..fe0ce96 --- /dev/null +++ b/internal/server/resource_io_test.go @@ -0,0 +1,71 @@ +package server + +import ( + "encoding/json" + "os" + "os/exec" + "strings" + "testing" +) + +func TestProcessIOCounters(t *testing.T) { + for _, test := range []struct { + data string + available bool + read, write uint64 + }{ + {"rchar: 999999\nwchar: 99999\nread_bytes: 1024\nwrite_bytes: 2048\ncancelled_write_bytes: 512\n", true, 1024, 2048}, + {"read_bytes: 0\nwrite_bytes: 0\n", true, 0, 0}, + {"", false, 0, 0}, + {"read_bytes: 100\n", false, 100, 0}, + {"read_bytes: -1\nwrite_bytes: 50\n", false, 0, 0}, + } { + result := parseProcessIO(test.data) + if result.Available != test.available || result.ReadBytes != test.read || result.WriteBytes != test.write || result.Scope != "process" || result.ProcessID == "" { + t.Fatalf("parse %q: %#v", test.data, result) + } + } + if parseProcessIO("").ProcessID != parseProcessIO("").ProcessID { + t.Fatal("unstable process identity") + } +} + +func TestResourceIORatesJS(t *testing.T) { + node, err := exec.LookPath("node") + if err != nil { + t.Skip("node is required for JavaScript rate tests") + } + t.Chdir("../..") + script, err := os.ReadFile("static/js/config-panels.js") + if err != nil { + t.Fatal(err) + } + code := `const document={addEventListener(){}};` + string(script) + ` +const assert=require('node:assert/strict'); +const snapshot=(time,read,write,id='process')=>({time,io:{available:true,process_id:id,read_bytes:read,write_bytes:write}}); +assert.deepEqual(resourceIORates(snapshot(1000,100,200),snapshot(3000,2148,4296)),{read:1024,write:2048}); +assert.deepEqual(resourceIORates(snapshot(1000,100,200),snapshot(2000,100,200)),{read:0,write:0}); +for(const [before,after] of [[null,snapshot(1000,1,2)],[{time:0},snapshot(1000,1,2)], +[snapshot(1000,1,2),snapshot(2000,3,4,'restarted')],[snapshot(1000,2,3),snapshot(2000,1,4)], +[snapshot(1000,1,2),snapshot(1000,3,4)],[snapshot(2000,1,2),snapshot(1000,3,4)], +[snapshot(1000,1,2),snapshot(2000,Number.MAX_SAFE_INTEGER+1,4)]]) { + const rate=resourceIORates(before,after);assert.ok(Number.isNaN(rate.read)&&Number.isNaN(rate.write)); +} +` + cmd := exec.Command(node) + cmd.Stdin = strings.NewReader(code) + if out, err := cmd.CombinedOutput(); err != nil { + t.Fatalf("I/O rate JS: %v %s", err, out) + } +} + +func TestResourceSnapshotIncludesIO(t *testing.T) { + s, token, _ := configFixture(t) + w := configRequest(s, token, "GET", "/_/api/v1/queue/resources", nil) + var snapshot struct { + IO processIOCounters `json:"io"` + } + if w.Code != 200 || json.Unmarshal(w.Body.Bytes(), &snapshot) != nil || snapshot.IO.Scope != "process" || snapshot.IO.ProcessID == "" { + t.Fatalf("I/O snapshot: %s", w.Body.String()) + } +} diff --git a/internal/server/revision_api.go b/internal/server/revision_api.go index af8ec06..69f7228 100644 --- a/internal/server/revision_api.go +++ b/internal/server/revision_api.go @@ -2,63 +2,76 @@ package server import ( "encoding/json" + "errors" "net/http" + "net/url" + "strconv" + + "pageswiki/internal/store" ) -func (s *Server) handleRevisionListAPI( - w http.ResponseWriter, - r *http.Request, -) { +func revisionListOptions(r *http.Request) (string, int, error) { + before := r.URL.Query().Get("before") + if len(before) > 128 { + return "", 0, store.ErrRevisionCursor + } + limit := 100 + if raw := r.URL.Query().Get("limit"); raw != "" { + var err error + limit, err = strconv.Atoi(raw) + if err != nil || limit < 1 || limit > 200 { + return "", 0, errors.New("limit must be between 1 and 200") + } + } + return before, limit, nil +} - uuid := r.URL.Query().Get( - "uuid", - ) +func revisionPageURL(r *http.Request, before string) string { + query := r.URL.Query() + query.Del("before") + if before != "" { + query.Set("before", before) + } + return (&url.URL{Path: r.URL.Path, RawQuery: query.Encode()}).String() +} - rows, err := s.store.DB.Query(` - SELECT - uuid, - message, - created_at - FROM revisions - WHERE object_uuid = ? - ORDER BY created_at DESC - `, uuid) - - if err != nil { - http.Error( - w, - err.Error(), - 500, - ) +func (s *Server) handleRevisionListAPI(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json; charset=utf-8") + w.Header().Set("Cache-Control", "private, no-store") + w.Header().Set("Vary", "Authorization, Cookie") + if r.Method != http.MethodGet && r.Method != http.MethodHead { + w.Header().Set("Allow", "GET, HEAD") + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) return } - - defer rows.Close() - - var out []map[string]any - - for rows.Next() { - - var revisionUUID string - var message string - var createdAt int64 - - err := rows.Scan( - &revisionUUID, - &message, - &createdAt, - ) - - if err != nil { - continue + object := r.URL.Query().Get("uuid") + if object == "" || s.authorizeObjectForRequest(r, "read", object) != nil { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + before, limit, err := revisionListOptions(r) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + page, err := s.store.ListRevisionPage(r.Context(), object, before, limit) + if err != nil { + if errors.Is(err, store.ErrRevisionCursor) { + http.Error(w, err.Error(), http.StatusBadRequest) + } else { + http.Error(w, "revision listing unavailable", http.StatusServiceUnavailable) } - - out = append(out, map[string]any{ - "uuid": revisionUUID, - "message": message, - "created_at": createdAt, - }) + return + } + if page.Next != "" { + w.Header().Set("X-Next-Cursor", page.Next) + w.Header().Set("Link", "<"+revisionPageURL(r, page.Next)+">; rel=\"next\"") + } + out := make([]map[string]any, 0, len(page.Items)) + for _, item := range page.Items { + out = append(out, map[string]any{"uuid": item.UUID, "message": item.Message, "created_at": item.CreatedAt, "lang": item.Language, "document_hash": item.DocumentHash}) + } + if r.Method != http.MethodHead { + _ = json.NewEncoder(w).Encode(out) } - - _ = json.NewEncoder(w).Encode(out) } diff --git a/internal/server/revision_browser.go b/internal/server/revision_browser.go index 6ca4325..993ae7a 100644 --- a/internal/server/revision_browser.go +++ b/internal/server/revision_browser.go @@ -1,8 +1,11 @@ package server import ( + "errors" "net/http" "strings" + + "pageswiki/internal/store" ) func (s *Server) handleRevisionBrowser( @@ -15,13 +18,28 @@ func (s *Server) handleRevisionBrowser( "/r/history/", ) - revisions, err := - s.store.ListRevisions( - objectUUID, - ) + if r.Method != http.MethodGet && r.Method != http.MethodHead { + w.Header().Set("Allow", "GET, HEAD") + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + if s.authorizeObjectForRequest(r, "read", objectUUID) != nil { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + before, limit, err := revisionListOptions(r) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + page, err := s.store.ListRevisionPage(r.Context(), objectUUID, before, limit) if err != nil { + if errors.Is(err, store.ErrRevisionCursor) { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } http.Error( w, err.Error(), @@ -31,17 +49,25 @@ func (s *Server) handleRevisionBrowser( return } - s.render( + next := "" + if page.Next != "" { + next = revisionPageURL(r, page.Next) + } + s.renderWithContext( w, + r, "revisions.gohtml", map[string]any{ "NavItems": resolveNavItems( - s.getSystemNavItems(), + s.getSystemNavItems(s.domainUUIDForRequest(r)), NavContext{}, ), - "Title": "Revision History", - "ObjectUUID": objectUUID, - "Revisions": revisions, + "Title": "Revision History", + "ObjectUUID": objectUUID, + "Revisions": page.Items, + "NextURL": next, + "NewestURL": revisionPageURL(r, ""), + "HasPrevious": before != "", }, ) } diff --git a/internal/server/revision_language.go b/internal/server/revision_language.go new file mode 100644 index 0000000..8eb713f --- /dev/null +++ b/internal/server/revision_language.go @@ -0,0 +1,87 @@ +package server + +import ( + "net/http" + "strings" + + "pageswiki/internal/store" + + "golang.org/x/text/language" +) + +func (s *Server) revisionLanguageCandidates( + r *http.Request, +) []string { + var candidates []string + seen := map[string]bool{} + + add := func(raw string) { + raw = strings.TrimSpace(raw) + if raw == "" { + return + } + + tag, err := language.Parse(raw) + if err != nil { + return + } + + canonical := tag.String() + if !seen[canonical] { + candidates = append(candidates, canonical) + seen[canonical] = true + } + + base, _ := tag.Base() + baseTag := base.String() + if baseTag != "und" && !seen[baseTag] { + candidates = append(candidates, baseTag) + seen[baseTag] = true + } + } + + if r != nil { + add(r.URL.Query().Get("lang")) + + tags, _, err := + language.ParseAcceptLanguage( + r.Header.Get("Accept-Language"), + ) + + if err == nil { + for _, tag := range tags { + add(tag.String()) + } + } + } + + domain := + s.domainForRequest( + r, + ) + + campus := + s.campusForDomain( + domain, + ) + + add(campus.DefaultLang) + add(s.getLocale(s.domainUUIDForRequest(r))) + add("und") + + return candidates +} + +func (s *Server) latestRevisionForRequest( + r *http.Request, + objectUUID string, +) (*store.Revision, error) { + return s.store.GetLatestRevisionForLanguages( + objectUUID, + s.revisionLanguageCandidates(r), + ) +} + +func (s *Server) latestRevisionMetadataForRequest(r *http.Request, objectUUID string) (*store.Revision, error) { + return s.store.GetLatestRevisionMetadataForLanguages(objectUUID, s.revisionLanguageCandidates(r)) +} diff --git a/internal/server/revision_listing_test.go b/internal/server/revision_listing_test.go new file mode 100644 index 0000000..c78703c --- /dev/null +++ b/internal/server/revision_listing_test.go @@ -0,0 +1,92 @@ +package server + +import ( + "context" + "encoding/json" + "errors" + "fmt" + "net/http" + "strings" + "testing" + + "pageswiki/internal/store" +) + +func TestRevisionListingKeysetAndScope(t *testing.T) { + s, token, domain := configFixture(t) + object, err := s.store.CreatePageAtPathInDomain(domain, "/history") + if err != nil { + t.Fatal(err) + } + tx, err := s.store.DB.Begin() + if err != nil { + t.Fatal(err) + } + defer tx.Rollback() + for i := 0; i < 205; i++ { + if _, err := tx.Exec(`INSERT INTO revisions(uuid,object_uuid,message,created_at_ms,created_at) VALUES(?,?,?,1000,1)`, fmt.Sprintf("revision-%03d", i), object, ""); err != nil { + t.Fatal(err) + } + } + if _, err := tx.Exec(`INSERT INTO revisions(uuid,object_uuid,created_at_ms,created_at) VALUES('foreign-revision','other-object',1000,1)`); err != nil { + t.Fatal(err) + } + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + s.mux.HandleFunc("/_/api/v1/revisions/list", s.handleRevisionListAPI) + s.mux.HandleFunc("/r/history/", s.handleRevisionBrowser) + first := configRequest(s, token, "GET", "/_/api/v1/revisions/list?uuid="+object+"&limit=100", nil) + var rows []map[string]any + if first.Code != 200 || json.Unmarshal(first.Body.Bytes(), &rows) != nil || len(rows) != 100 { + t.Fatalf("list = %d %s", first.Code, first.Body.String()) + } + if rows[0]["uuid"] != "revision-204" || first.Header().Get("X-Next-Cursor") != "revision-105" { + t.Fatalf("unstable insertion tie/order: %v", rows[0]) + } + if !strings.Contains(first.Header().Get("Link"), `rel="next"`) || first.Header().Get("Cache-Control") != "private, no-store" { + t.Fatalf("headers = %v", first.Header()) + } + if _, err := s.store.DB.Exec(`INSERT INTO revisions(uuid,object_uuid,created_at_ms,created_at) VALUES('new-revision',?,2000,2)`, object); err != nil { + t.Fatal(err) + } + page, err := s.store.ListRevisionPage(context.Background(), object, "revision-105", 100) + if err != nil || len(page.Items) != 100 || page.Items[0].UUID != "revision-104" || page.Next != "revision-005" { + t.Fatalf("keyset after insert = %+v %v", page, err) + } + last, err := s.store.ListRevisionPage(context.Background(), object, page.Next, 100) + if err != nil || len(last.Items) != 5 || last.Next != "" { + t.Fatalf("last page = %+v %v", last, err) + } + if _, err := s.store.ListRevisionPage(context.Background(), object, "foreign-revision", 10); !errors.Is(err, store.ErrRevisionCursor) { + t.Fatalf("foreign cursor = %v", err) + } + ctx, cancel := context.WithCancel(context.Background()) + cancel() + if _, err := s.store.ListRevisionPage(ctx, object, "", 10); !errors.Is(err, context.Canceled) { + t.Fatalf("cancel = %v", err) + } + for _, query := range []string{"&limit=201", "&limit=0", "&limit=abc", "&before=foreign-revision"} { + if w := configRequest(s, token, "GET", "/_/api/v1/revisions/list?uuid="+object+query, nil); w.Code != http.StatusBadRequest { + t.Fatalf("invalid query %s=%d", query, w.Code) + } + } + head := configRequest(s, token, "HEAD", "/_/api/v1/revisions/list?uuid="+object+"&limit=2", nil) + if head.Code != 200 || head.Body.Len() != 0 || head.Header().Get("X-Next-Cursor") == "" { + t.Fatalf("HEAD = %d %s", head.Code, head.Body.String()) + } + view := configRequest(s, token, "GET", "/r/history/"+object+"?limit=2", nil) + if view.Code != 200 || strings.Contains(view.Body.String(), "") || !strings.Contains(view.Body.String(), "以前のリビジョン") { + t.Fatalf("history UI = %d %s", view.Code, view.Body.String()) + } + var principalRole string + if err := s.store.DB.QueryRow(`SELECT role_uuid FROM auth_role_bindings LIMIT 1`).Scan(&principalRole); err != nil { + t.Fatal(err) + } + if _, err := s.store.DB.Exec(`DELETE FROM auth_capability_grants WHERE role_uuid=?`, principalRole); err != nil { + t.Fatal(err) + } + if w := configRequest(s, token, "GET", "/_/api/v1/revisions/list?uuid="+object, nil); w.Code != http.StatusForbidden { + t.Fatalf("revoked grant list=%d", w.Code) + } +} diff --git a/internal/server/revision_restore.go b/internal/server/revision_restore.go index 363de7e..4d1b350 100644 --- a/internal/server/revision_restore.go +++ b/internal/server/revision_restore.go @@ -8,25 +8,19 @@ func (s *Server) handleRestoreRevisionAPI( w http.ResponseWriter, r *http.Request, ) { + if r.Method != http.MethodPost { + w.Header().Set("Allow", "POST") + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } revisionUUID := r.URL.Query().Get("revision") - row := s.store.DB.QueryRow(` - SELECT - object_uuid, - body - FROM revisions - WHERE uuid = ? - `, revisionUUID) - - var objectUUID string - var body string - - err := row.Scan( - &objectUUID, - &body, - ) + metadata, err := + s.store.GetRevisionMetadata( + revisionUUID, + ) if err != nil { http.Error( @@ -36,11 +30,24 @@ func (s *Server) handleRestoreRevisionAPI( ) return } + if s.authorizeObjectForRequest(r, "write", metadata.ObjectUUID) != nil { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + // Authorize metadata before hydrating the potentially large source body. + revision, err := s.store.GetRevision(revisionUUID) + if err != nil { + http.Error(w, "revision unavailable", http.StatusInternalServerError) + return + } - _, err = s.store.SaveRevision( - objectUUID, - body, + _, err = s.store.SaveRevisionContent( + revision.ObjectUUID, + []byte(revision.Body), "restore revision", + revision.Language, + revision.ContentType, + revision.Filename, ) if err != nil { diff --git a/internal/server/revision_routes.go b/internal/server/revision_routes.go index d0e2949..5ac7f7d 100644 --- a/internal/server/revision_routes.go +++ b/internal/server/revision_routes.go @@ -13,13 +13,13 @@ func (s *Server) handleRevisionView( r *http.Request, ) { - hash := strings.TrimPrefix( + revisionUUID := strings.TrimPrefix( r.URL.Path, "/r/view/", ) revision, err := - s.store.GetRevision(hash) + s.store.GetRevision(revisionUUID) if err != nil { @@ -32,19 +32,25 @@ func (s *Server) handleRevisionView( return } - s.render( + contentView := revisionContentView(revision, "") + contentView.RawURL = rawProjectionURL("rev:" + revision.UUID) + rendered := template.HTML("") + if contentView.Kind == "html" { + rendered = template.HTML(s.safeHTMLProjection(r, revision.Body, "", false)) + } + s.renderWithContext( w, + r, "revision_view.gohtml", map[string]any{ "NavItems": resolveNavItems( - s.getSystemNavItems(), + s.getSystemNavItems(s.domainUUIDForRequest(r)), NavContext{}, ), - "Title": "Revision View", - "Revision": revision, - "RenderedHTML": template.HTML( - revision.Body, - ), + "Title": "Revision View", + "Revision": revision, + "ContentView": contentView, + "RenderedHTML": rendered, }, ) } @@ -204,8 +210,9 @@ func (s *Server) handleRevisionDiff( afterRev.Body, ) - s.render( + s.renderWithContext( w, + r, "revision_diff.gohtml", map[string]any{ "Title": "Revision Diff", diff --git a/internal/server/routes/api.go b/internal/server/routes/api.go index 27f5b4d..345ae20 100644 --- a/internal/server/routes/api.go +++ b/internal/server/routes/api.go @@ -3,20 +3,29 @@ package routes import "net/http" type APIHandlers struct { - CreateObject http.HandlerFunc - ListObjects http.HandlerFunc - DeleteObject http.HandlerFunc - SaveRevision http.HandlerFunc - ListRevisions http.HandlerFunc - RestoreRevision http.HandlerFunc - RenderMarkdown http.HandlerFunc - AddTag http.HandlerFunc - BindPath http.HandlerFunc - RenamePath http.HandlerFunc - RenamePreview http.HandlerFunc - RemovePath http.HandlerFunc - ZombieList http.HandlerFunc - ZombiePurge http.HandlerFunc + CreateObject http.HandlerFunc + ListObjects http.HandlerFunc + DeleteObject http.HandlerFunc + SaveRevision http.HandlerFunc + ListRevisions http.HandlerFunc + RestoreRevision http.HandlerFunc + RenderMarkdown http.HandlerFunc + AddTag http.HandlerFunc + BindPath http.HandlerFunc + RenamePath http.HandlerFunc + RenamePreview http.HandlerFunc + RemovePath http.HandlerFunc + CopyPath http.HandlerFunc + ZombieList http.HandlerFunc + ZombiePurge http.HandlerFunc + FederationEnroll http.HandlerFunc + Event http.HandlerFunc + Queue http.HandlerFunc + Adapter http.HandlerFunc + AdapterSession http.HandlerFunc + Notifications http.HandlerFunc + Publication http.HandlerFunc + SearchSuggest http.HandlerFunc } func RegisterAPIRoutes( @@ -83,6 +92,7 @@ func RegisterAPIRoutes( "/_/api/v1/path/remove", h.RemovePath, ) + mux.HandleFunc("/_/api/v1/path/copy", h.CopyPath) mux.HandleFunc( "/_/api/v1/gc/zombies/list", @@ -93,4 +103,20 @@ func RegisterAPIRoutes( "/_/api/v1/gc/zombies/purge", h.ZombiePurge, ) + mux.HandleFunc( + "/_/api/v1/federation/enroll", + h.FederationEnroll, + ) + mux.HandleFunc("/_/api/v1/event", h.Event) + mux.HandleFunc("/_/api/v1/event/", h.Event) + mux.HandleFunc("/_/api/v1/queue", h.Queue) + mux.HandleFunc("/_/api/v1/queue/", h.Queue) + mux.HandleFunc("/_/api/v1/adapter", h.Adapter) + mux.HandleFunc("/_/api/v1/adapter/", h.Adapter) + mux.HandleFunc("/_/api/v1/adapter/session/", h.AdapterSession) + mux.HandleFunc("/_/api/v1/notifications", h.Notifications) + mux.HandleFunc("/_/api/v1/notifications/", h.Notifications) + mux.HandleFunc("/_/api/v1/publication/requests", h.Publication) + mux.HandleFunc("/_/api/v1/publication/requests/", h.Publication) + mux.HandleFunc("/_/api/v1/search/suggest", h.SearchSuggest) } diff --git a/internal/server/routes/ui.go b/internal/server/routes/ui.go index 99e9223..620b2c3 100644 --- a/internal/server/routes/ui.go +++ b/internal/server/routes/ui.go @@ -3,21 +3,38 @@ package routes import "net/http" type UIHandlers struct { - Home http.HandlerFunc - NewPage http.HandlerFunc - SemanticEditor http.HandlerFunc - SemanticPage http.HandlerFunc - RawView http.HandlerFunc - LinkManager http.HandlerFunc - Health http.HandlerFunc - Tree http.HandlerFunc - Browser http.HandlerFunc - Preview http.HandlerFunc - PlainView http.HandlerFunc - MarkdownView http.HandlerFunc - CompileMarkdown http.HandlerFunc - CompileDiagram http.HandlerFunc - Config http.HandlerFunc + Home http.HandlerFunc + NewPage http.HandlerFunc + SemanticEditor http.HandlerFunc + SemanticPage http.HandlerFunc + RawView http.HandlerFunc + TextWindow http.HandlerFunc + LinkManager http.HandlerFunc + Health http.HandlerFunc + Tree http.HandlerFunc + Browser http.HandlerFunc + Preview http.HandlerFunc + PlainView http.HandlerFunc + MarkdownView http.HandlerFunc + CompileMarkdown http.HandlerFunc + CompileDiagram http.HandlerFunc + Config http.HandlerFunc + AdapterConfig http.HandlerFunc + VimConfig http.HandlerFunc + SystemExtensions http.HandlerFunc + Periodical http.HandlerFunc + Upload http.HandlerFunc + Children http.HandlerFunc + Bookmarks http.HandlerFunc + PreviewCache http.HandlerFunc + Search http.HandlerFunc + Archive http.HandlerFunc + EmailHTML http.HandlerFunc + PDFPage http.HandlerFunc + OpenWith http.HandlerFunc + City http.HandlerFunc + Print http.HandlerFunc + Notifications http.HandlerFunc } func handleIfNotNil( @@ -42,17 +59,37 @@ func RegisterUIRoutes( http.Redirect(w, r, "/:/new", http.StatusFound) }) handleIfNotNil(mux, "/e/", h.SemanticEditor) - handleIfNotNil(mux, "/r/", h.RawView) + handleIfNotNil(mux, "/v/bookmarks", h.Bookmarks) + handleIfNotNil(mux, "/v/diary", h.Periodical) + handleIfNotNil(mux, "/v/diary/", h.Periodical) + handleIfNotNil(mux, "/v/blog", h.Periodical) + handleIfNotNil(mux, "/v/blog/", h.Periodical) + handleIfNotNil(mux, "/v/raw/", h.RawView) + handleIfNotNil(mux, "/v/text/", h.TextWindow) handleIfNotNil(mux, "/l/", h.LinkManager) handleIfNotNil(mux, "/health", h.Health) handleIfNotNil(mux, "/v/tree", h.Tree) + handleIfNotNil(mux, "/v/tree/", h.Tree) handleIfNotNil(mux, "/v/browser", h.Browser) handleIfNotNil(mux, "/v/browser/", h.Browser) handleIfNotNil(mux, "/v/preview", h.Preview) handleIfNotNil(mux, "/v/preview/", h.Preview) handleIfNotNil(mux, "/v/plain", h.PlainView) handleIfNotNil(mux, "/v/plain/", h.PlainView) + handleIfNotNil(mux, "/v/upload", h.Upload) + handleIfNotNil(mux, "/v/children", h.Children) + handleIfNotNil(mux, "/v/preview-cache/", h.PreviewCache) + handleIfNotNil(mux, "/v/search", h.Search) + handleIfNotNil(mux, "/v/archive", h.Archive) + handleIfNotNil(mux, "/v/email-html", h.EmailHTML) + handleIfNotNil(mux, "/v/pdf-page", h.PDFPage) + handleIfNotNil(mux, "/v/open-with", h.OpenWith) + handleIfNotNil(mux, "/v/city", h.City) + handleIfNotNil(mux, "/v/city/", h.City) + handleIfNotNil(mux, "/v/notifications", h.Notifications) + handleIfNotNil(mux, "/v/notification", h.Notifications) + handleIfNotNil(mux, "/_/view/print/", h.Print) handleIfNotNil(mux, "/v/markdown", h.MarkdownView) handleIfNotNil(mux, "/v/markdown/", h.MarkdownView) @@ -63,4 +100,7 @@ func RegisterUIRoutes( handleIfNotNil(mux, "/:/compile/diagram/", h.CompileDiagram) handleIfNotNil(mux, "/-/sys/config", h.Config) + handleIfNotNil(mux, "/-/sys/config/adapters", h.AdapterConfig) + handleIfNotNil(mux, "/-/sys/config/vim", h.VimConfig) + handleIfNotNil(mux, "/_/api/v1/extension/", h.SystemExtensions) } diff --git a/internal/server/search_handler.go b/internal/server/search_handler.go new file mode 100644 index 0000000..87e0a30 --- /dev/null +++ b/internal/server/search_handler.go @@ -0,0 +1,259 @@ +package server + +import ( + "context" + "errors" + "html/template" + "net/http" + "net/url" + "path" + "strings" + "time" + "unicode" + + "golang.org/x/net/html" + + "pageswiki/internal/store" +) + +type searchViewResult struct { + store.SearchResult + Name string + Href string + NameParts []searchTextPart + PathParts []searchTextPart + ExcerptParts []searchTextPart + PreviewHTML template.HTML + Updated string +} + +type searchTextPart struct { + Text string + Match bool +} + +// Highlight only creates text segments. html/template, not source text or +// SQLite markers, owns every markup tag in the rendered result. +func highlightSearchText(value, query string) []searchTextPart { + runes := []rune(value) + lower := []rune(strings.ToLower(value)) + matched := make([]bool, len(runes)) + for _, word := range strings.Fields(strings.ToLower(query)) { + needle := []rune(word) + for i := 0; len(needle) > 0 && i+len(needle) <= len(lower); i++ { + if string(lower[i:i+len(needle)]) == word { + for j := i; j < i+len(needle); j++ { + matched[j] = true + } + } + } + } + var parts []searchTextPart + for start := 0; start < len(runes); { + end := start + 1 + for end < len(runes) && matched[end] == matched[start] { + end++ + } + parts = append(parts, searchTextPart{Text: string(runes[start:end]), Match: matched[start]}) + start = end + } + return parts +} + +func searchExcerpt(raw, contentType, query string) string { + if strings.HasPrefix(strings.ToLower(contentType), "text/html") { + tokenizer := html.NewTokenizer(strings.NewReader(raw)) + var text strings.Builder + skip := "" + for { + kind := tokenizer.Next() + if kind == html.ErrorToken { + break + } + token := tokenizer.Token() + if kind == html.StartTagToken && (token.Data == "script" || token.Data == "style") { + skip = token.Data + continue + } + if kind == html.EndTagToken && token.Data == skip { + skip = "" + continue + } + if skip != "" { + continue + } + if kind == html.TextToken { + text.WriteString(token.Data) + } else { + text.WriteByte(' ') + } + } + raw = text.String() + } + raw = strings.Map(func(r rune) rune { + if unicode.IsControl(r) && !unicode.IsSpace(r) { + return -1 + } + return r + }, raw) + runes := []rune(strings.Join(strings.Fields(raw), " ")) + if len(runes) <= 260 { + return string(runes) + } + start := 0 + lower := []rune(strings.ToLower(string(runes))) + for _, term := range strings.Fields(strings.ToLower(query)) { + if index := strings.Index(string(lower), term); index >= 0 { + position := len([]rune(string(lower)[:index])) + start = max(0, position-80) + break + } + } + start = min(start, len(runes)-260) + result := string(runes[start : start+260]) + if start > 0 { + result = "… " + result + } + if start+260 < len(runes) { + result += " …" + } + return result +} + +func (s *Server) handleSearch(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodGet && r.Method != http.MethodHead { + w.Header().Set("Allow", "GET, HEAD") + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + query := strings.TrimSpace(r.URL.Query().Get("q")) + if len(query) > 512 || len(strings.Fields(query)) > 16 { + http.Error(w, translate(s.getLocale(s.domainUUIDForRequest(r)), "search.query_too_long"), http.StatusBadRequest) + return + } + scope := strings.TrimSpace(r.URL.Query().Get("scope")) + localityKind := strings.ToLower(strings.TrimSpace(r.URL.Query().Get("locality"))) + localityID := strings.TrimSpace(r.URL.Query().Get("locality_id")) + if localityKind != "" { + scope = "/" + if localityKind != "domain" { + node, err := s.store.CityNodeContext(r.Context(), s.domainUUIDForRequest(r), localityKind, localityID) + if err != nil || !canReadCityNode(node, s.pathReadFilter(r)) { + http.Error(w, "unknown City locality", http.StatusBadRequest) + return + } + scope = node.PathPrefix + } + } + if scope == "" { + scope = "/" + } + scope = path.Clean("/" + strings.TrimLeft(scope, "/")) + allowed := s.pathReadFilter(r) + if !allowed(scope) { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + domain := s.domainUUIDForRequest(r) + location := s.getLocation(domain) + options, filters, err := parseSearchOptions(r.URL.Query(), location) + if err != nil { + s.renderSearchFailure(w, r, query, scope, localityKind, localityID, err) + return + } + performed := query != "" || options.HasFilters() + var results []searchViewResult + var cityResults []searchCityViewResult + if performed { + // City metadata and Page search share the original request budget. Do + // not build the full City graph or traverse its Page placements here. + ctx, cancel := context.WithTimeout(r.Context(), 2*time.Second) + defer cancel() + city, err := s.store.SearchCityInDomain(ctx, domain, scope, query, 30, allowed, options) + if err != nil { + s.renderSearchFailure(w, r, query, scope, localityKind, localityID, err) + return + } + for _, result := range city { + cityResults = append(cityResults, citySearchResultView(result, query, location)) + } + found, err := s.store.SearchPathsInDomainWithOptions( + ctx, domain, scope, query, 100, allowed, options, + ) + if err != nil { + s.renderSearchFailure(w, r, query, scope, localityKind, localityID, err) + return + } + for _, result := range found { + entry := store.BrowserEntry{ + Path: result.Path, Filename: result.Filename, + ContentType: result.ContentType, Size: int(result.Size), + DocumentHash: result.DocumentHash, + RevisionUUID: result.RevisionUUID, + } + name := path.Base(result.Filename) + if result.Filename == "" { + name = path.Base(result.Path) + } + results = append(results, searchViewResult{ + SearchResult: result, + Name: name, + Href: (&url.URL{Path: result.Path}).EscapedPath(), + NameParts: highlightSearchText(name, query), + PathParts: highlightSearchText(result.Path, query), + ExcerptParts: highlightSearchText(searchExcerpt(result.Excerpt, result.ContentType, query), query), + PreviewHTML: template.HTML(s.entryPreviewHTML(entry, false)), + Updated: time.Unix(result.UpdatedAt, 0).In(location).Format("2006-01-02 15:04"), + }) + } + } + if r.Context().Err() != nil { + return + } + s.renderWithContext(w, r, "search.gohtml", map[string]any{ + "Query": query, "Scope": scope, "Results": results, + "CityResults": cityResults, "CityLimitReached": len(cityResults) >= 30, + "SearchPerformed": performed, "Filters": filters, + "ResetHref": "/v/search?" + searchBaseValues(query, scope, localityKind, localityID).Encode(), + "ScopeHref": (&url.URL{Path: scope}).EscapedPath(), "ResultLimitReached": len(results) >= 100, + "LocalityKind": localityKind, "LocalityID": localityID, + }) +} + +// The store has its own bounded search budget. A timeout there is retryable, +// while a canceled HTTP request should not trigger more configuration reads or +// template work. Never expose database details or the raw error in the page. +func (s *Server) renderSearchFailure(w http.ResponseWriter, r *http.Request, query, scope, localityKind, localityID string, err error) { + if r.Context().Err() != nil || errors.Is(err, context.Canceled) { + return + } + status := http.StatusInternalServerError + title, hint := "search.failed_title", "search.failed_hint" + if errors.Is(err, store.ErrInvalidSearchOptions) { + status = http.StatusBadRequest + title, hint = "search.invalid_filters_title", "search.invalid_filters_hint" + } else if errors.Is(err, context.DeadlineExceeded) { + status = http.StatusServiceUnavailable + title, hint = "search.timeout_title", "search.timeout_hint" + w.Header().Set("Retry-After", "5") + } + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.Header().Set("Cache-Control", "private, no-store") + w.WriteHeader(status) + if r.Method == http.MethodHead { + return + } + retry := searchRetryValues(r, query, scope, localityKind, localityID) + filters := searchFiltersFromValues(r.URL.Query()) + filters.Timezone = s.getTimezoneName(s.domainUUIDForRequest(r)) + filters.Open = true + s.renderWithContext(w, r, "search.gohtml", map[string]any{ + "Query": query, "Scope": scope, + "ScopeHref": (&url.URL{Path: scope}).EscapedPath(), + "LocalityKind": localityKind, "LocalityID": localityID, + "SearchError": true, "SearchErrorTitle": title, "SearchErrorHint": hint, + "SearchPerformed": true, "Filters": filters, + "ResetHref": "/v/search?" + searchBaseValues(query, scope, localityKind, localityID).Encode(), + "RetryHref": "/v/search?" + retry.Encode(), + }) +} diff --git a/internal/server/search_handler_test.go b/internal/server/search_handler_test.go new file mode 100644 index 0000000..1611248 --- /dev/null +++ b/internal/server/search_handler_test.go @@ -0,0 +1,314 @@ +package server + +import ( + "context" + "encoding/json" + "errors" + "fmt" + "html" + "io" + "net/http" + "net/http/httptest" + "net/url" + "os" + "os/exec" + "path/filepath" + "strings" + "testing" + "time" +) + +func searchServerFixture(t *testing.T) (*Server, string, string) { + t.Helper() + s, token, domain := configFixture(t) + s.mux.HandleFunc("/v/search", s.handleSearch) + for _, item := range []struct{ path, body, filename string }{ + {"/docs/nebula guide?#%", `

    Nebula Handbook

    Introduction to the NEBULA and nearby stars.

    <img src=x onerror=alert(1)>

    `, "nebula .html"}, + {"/docs/hidden", "nebula SECRET_EXCERPT", "SECRET_FILENAME.txt"}, + } { + object, err := s.store.CreatePageAtPathInDomain(domain, item.path) + if err != nil { + t.Fatal(err) + } + if _, err := s.store.SaveRevisionContent(object, []byte(item.body), "", "en", "text/html", item.filename); err != nil { + t.Fatal(err) + } + } + principal, err := s.store.PrincipalForSession(domain, token) + if err != nil { + t.Fatal(err) + } + var role string + if err := s.store.DB.QueryRow(`SELECT b.role_uuid FROM auth_role_bindings b JOIN domain_memberships m ON m.uuid=b.membership_uuid WHERE m.domain_uuid=? AND m.principal_uuid=? LIMIT 1`, domain, principal.UUID).Scan(&role); err != nil { + t.Fatal(err) + } + if _, err := s.store.DB.Exec(`DELETE FROM auth_capability_grants WHERE role_uuid=?`, role); err != nil { + t.Fatal(err) + } + for i, path := range []string{"/", "/docs/nebula guide?#%"} { + if _, err := s.store.DB.Exec(`INSERT INTO auth_capability_grants(uuid,role_uuid,capability,target_type,target_id,created_at_ms) VALUES(?,?,'read','path',?,1)`, "search-read-"+string(rune('0'+i)), role, path); err != nil { + t.Fatal(err) + } + } + return s, token, domain +} + +func TestSearchSuggestionsDirectACLAndHeading(t *testing.T) { + s, token, _ := searchServerFixture(t) + s.mux.HandleFunc("/_/api/v1/search/suggest", s.handleSearchSuggestAPI) + response := configRequest(s, token, "GET", "/_/api/v1/search/suggest?q=handbook", nil) + if response.Code != http.StatusOK { + t.Fatalf("suggest: %d %s", response.Code, response.Body.String()) + } + var payload struct { + Items []searchSuggestionItem `json:"items"` + } + if err := json.Unmarshal(response.Body.Bytes(), &payload); err != nil { + t.Fatal(err) + } + if len(payload.Items) != 1 || payload.Items[0].Label != "Nebula Handbook" || payload.Items[0].Path != "/docs/nebula guide?#%" || payload.Items[0].Href != "/docs/nebula%20guide%3F%23%25" { + t.Fatalf("suggestions: %#v", payload.Items) + } + response = configRequest(s, token, "GET", "/_/api/v1/search/suggest?q=Nebula%20Handbook", nil) + if response.Code != http.StatusOK || json.Unmarshal(response.Body.Bytes(), &payload) != nil || len(payload.Items) == 0 || !payload.Items[0].Exact { + t.Fatalf("exact suggestion: %d %s", response.Code, response.Body.String()) + } + response = configRequest(s, token, "GET", "/_/api/v1/search/suggest?q=SECRET", nil) + payload.Items = nil + if response.Code != http.StatusOK || json.Unmarshal(response.Body.Bytes(), &payload) != nil || len(payload.Items) != 0 { + t.Fatalf("hidden suggestion leaked: %d %s", response.Code, response.Body.String()) + } + response = configRequest(s, token, "GET", "/_/api/v1/search/suggest?q=n", nil) + if response.Code != http.StatusOK || !strings.Contains(response.Body.String(), `"items":[]`) { + t.Fatalf("short suggestion query: %d %s", response.Code, response.Body.String()) + } +} + +func TestSearchResultsSafeContextAndACL(t *testing.T) { + s, token, _ := searchServerFixture(t) + response := configRequest(s, token, "GET", "/v/search?q=nebula&scope=/", nil) + if response.Code != http.StatusOK { + t.Fatalf("search: %d %s", response.Code, response.Body.String()) + } + body := response.Body.String() + for _, required := range []string{`class="search-result-name"`, `class="search-result-path"`, `class="search-result-excerpt"`, `data-match-source="path"`, `data-match-source="filename"`, `data-match-source="body"`, `NEBULA`, `/docs/nebula%20guide%3F%23%25`, `<svg onload=alert(1)>`, `data-search-view="list"`} { + if !strings.Contains(body, required) { + t.Errorf("missing search presentation %q", required) + } + } + for _, forbidden := range []string{"SECRET_EXCERPT", "SECRET_FILENAME", "/docs/hidden", "PRIVATE_SCRIPT", "Hello & nebula.

    `, "text/html", "nebula") + if strings.Contains(value, "evil") || strings.Contains(value, "secret") || strings.Contains(value, "<") || !strings.Contains(value, "Hello & nebula") { + t.Fatalf("HTML text extraction: %q", value) + } + long := strings.Repeat("遠い星 ", 100) + "NEBULA nearby context " + strings.Repeat("stars ", 100) + value = searchExcerpt(long, "text/plain", "nebula") + if !strings.Contains(value, "NEBULA") || len([]rune(value)) > 265 { + t.Fatalf("context window: %q", value) + } + parts := highlightSearchText(`日本語 NEBULA ", 1)) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + for _, view := range []struct{ name, width, height string }{{"desktop", "1440", "1000"}, {"mobile", "390", "844"}} { + t.Run(view.name, func(t *testing.T) { + ctx, cancel := context.WithTimeout(context.Background(), 35*time.Second) + defer cancel() + command := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", server.URL+"/v/search?q="+url.QueryEscape("nebula"), t.TempDir()) + screenshot := "" + if dir := os.Getenv("PAGESWIKI_BROWSER_ARTIFACTS"); dir != "" { + if err := os.MkdirAll(dir, 0755); err != nil { + t.Fatal(err) + } + screenshot = filepath.Join(dir, "search-results-"+view.name+".png") + } + command.Args = append(command.Args, screenshot, view.width, view.height) + if out, err := command.CombinedOutput(); err != nil { + t.Fatalf("browser: %v\n%s", err, out) + } + }) + } +} diff --git a/internal/server/search_options.go b/internal/server/search_options.go new file mode 100644 index 0000000..174d1b5 --- /dev/null +++ b/internal/server/search_options.go @@ -0,0 +1,123 @@ +package server + +import ( + "fmt" + "net/http" + "net/url" + "strings" + "time" + + "pageswiki/internal/store" +) + +type searchFilterView struct { + FileType, Extension, DateField, DateFrom, DateTo, Timezone string + Applied, Open bool +} + +func searchFiltersFromValues(values url.Values) searchFilterView { + view := searchFilterView{ + FileType: strings.ToLower(strings.TrimSpace(values.Get("file_type"))), + Extension: strings.TrimPrefix(strings.ToLower(strings.TrimSpace(values.Get("ext"))), "."), + DateField: strings.ToLower(strings.TrimSpace(values.Get("date_field"))), + DateFrom: strings.TrimSpace(values.Get("from")), + DateTo: strings.TrimSpace(values.Get("to")), + } + if view.DateField == "" { + view.DateField = "updated" + } + view.Applied = view.FileType != "" || view.Extension != "" || view.DateFrom != "" || view.DateTo != "" + view.Open = view.Applied + return view +} + +// Dates are calendar dates in the Domain timezone. The ending date is inclusive +// in the UI and becomes the next local midnight, not an assumed 24-hour day. +func parseSearchOptions(values url.Values, location *time.Location) (store.SearchOptions, searchFilterView, error) { + if location == nil { + location = time.UTC + } + view := searchFiltersFromValues(values) + view.Timezone = location.String() + options := store.SearchOptions{FileType: view.FileType, Extension: view.Extension, DateField: view.DateField} + invalid := func() (store.SearchOptions, searchFilterView, error) { + view.Open = true + return options, view, fmt.Errorf("invalid search filter: %w", store.ErrInvalidSearchOptions) + } + for _, key := range []string{"file_type", "ext", "date_field", "from", "to"} { + if len(values[key]) > 1 { + return invalid() + } + } + if view.DateFrom != "" { + from, err := time.ParseInLocation("2006-01-02", view.DateFrom, location) + if err != nil { + return invalid() + } + ms := from.UnixMilli() + options.FromMS = &ms + } + if view.DateTo != "" { + to, err := time.ParseInLocation("2006-01-02", view.DateTo, location) + if err != nil { + return invalid() + } + ms := to.AddDate(0, 0, 1).UnixMilli() + options.BeforeMS = &ms + } + if err := options.Validate(); err != nil { + view.Open = true + return options, view, err + } + return options, view, nil +} + +func searchBaseValues(query, scope, localityKind, localityID string) url.Values { + values := url.Values{"q": {query}, "scope": {scope}} + if localityKind != "" { + values.Set("locality", localityKind) + values.Set("locality_id", localityID) + } + return values +} + +func searchRetryValues(r *http.Request, query, scope, localityKind, localityID string) url.Values { + values := searchBaseValues(query, scope, localityKind, localityID) + for _, key := range []string{"file_type", "ext", "date_field", "from", "to"} { + if value := r.URL.Query().Get(key); value != "" { + values.Set(key, value) + } + } + return values +} + +type searchCityViewResult struct { + store.CitySearchResult + KindKey, Href, PathHref, ContextLabel, Updated string + NameParts, PathParts, ExcerptParts []searchTextPart +} + +func citySearchResultView(result store.CitySearchResult, query string, location *time.Location) searchCityViewResult { + title := result.Title + if title == "" { + title = result.Name + } + context := []string{} + if result.QuartierTitle != "" { + context = append(context, result.QuartierTitle) + } + if result.StreetTitle != "" { + context = append(context, result.StreetTitle) + } + return searchCityViewResult{ + CitySearchResult: result, + KindKey: "city." + result.Kind, + Href: cityDetailHref(result.Kind, result.Name, result.QuartierName, result.UUID), + PathHref: (&url.URL{Path: result.PathPrefix}).EscapedPath(), + ContextLabel: strings.Join(context, " / "), + Updated: time.UnixMilli(result.UpdatedAtMS).In(location).Format("2006-01-02 15:04"), + NameParts: highlightSearchText(title, query), + PathParts: highlightSearchText(result.PathPrefix, query), + ExcerptParts: highlightSearchText(searchExcerpt(result.Description, "text/plain", query), query), + } +} diff --git a/internal/server/search_options_test.go b/internal/server/search_options_test.go new file mode 100644 index 0000000..da7d929 --- /dev/null +++ b/internal/server/search_options_test.go @@ -0,0 +1,156 @@ +package server + +import ( + "context" + "errors" + "html" + "net/http" + "net/http/httptest" + "net/url" + "strings" + "testing" + "time" + + "pageswiki/internal/store" +) + +func TestSearchCalendarDateOptions(t *testing.T) { + for _, spec := range []struct { + zone, date string + hours int64 + }{ + {"Asia/Tokyo", "2026-09-14", 24}, + {"America/New_York", "2026-03-08", 23}, + {"America/New_York", "2026-11-01", 25}, + } { + location, err := time.LoadLocation(spec.zone) + if err != nil { + t.Fatal(err) + } + options, view, err := parseSearchOptions(url.Values{ + "from": {spec.date}, "to": {spec.date}, "ext": {" .PDF "}, "date_field": {"created"}, + }, location) + if err != nil || options.FromMS == nil || options.BeforeMS == nil { + t.Fatalf("calendar date: %+v %v", options, err) + } + if duration := *options.BeforeMS - *options.FromMS; duration != spec.hours*60*60*1000 { + t.Fatalf("%s %s day duration=%d", spec.zone, spec.date, duration) + } + if view.Extension != "pdf" || view.Timezone != spec.zone || !view.Applied || !view.Open || options.DateField != "created" { + t.Fatalf("normalized filter state: %+v %+v", view, options) + } + } + for _, values := range []url.Values{ + {"file_type": {"not-a-type"}}, {"ext": {"pdf,py"}}, {"ext": {"../etc"}}, + {"date_field": {"removed"}}, {"from": {"2026-02-30"}}, + {"from": {"2026-09-15"}, "to": {"2026-09-14"}}, + {"from": {"2026-09-14T00:00:00Z"}}, {"file_type": {"pdf", "image"}}, + } { + if _, view, err := parseSearchOptions(values, time.UTC); !errors.Is(err, store.ErrInvalidSearchOptions) || !view.Open { + t.Fatalf("invalid filter accepted: values=%v view=%+v err=%v", values, view, err) + } + } + options, view, err := parseSearchOptions(url.Values{"date_field": {"created"}}, time.UTC) + if err != nil || options.HasFilters() || view.Applied { + t.Fatalf("date selector alone should not launch an unfiltered listing: %+v %+v %v", options, view, err) + } +} + +func seedSearchCity(t *testing.T, s *Server, token, domain string) string { + t.Helper() + q, err := s.store.CreateZoneAtPath(domain, "test", "quartier", "", "nebula-campus", "Nebula Quartier", "City-only description celestialdistrict", "/city?#%") + if err != nil { + t.Fatal(err) + } + street, err := s.store.CreateZoneAtPath(domain, "test", "street", q, "nebula-way", "Nebula Street", "shared same-name street", "/city?#%/street") + if err != nil { + t.Fatal(err) + } + if _, err := s.store.CreateSpotAtPath(domain, "test", street, "nebula-spot", `Nebula `, "Visible observatory", "/city?#%/street/spot"); err != nil { + t.Fatal(err) + } + if _, err := s.store.CreateZoneAtPath(domain, "test", "quartier", "", "nebula-secret", "CITY_HIDDEN_MARKER", "nebula", "/private-city"); err != nil { + t.Fatal(err) + } + principal, err := s.store.PrincipalForSession(domain, token) + if err != nil { + t.Fatal(err) + } + var role string + if err := s.store.DB.QueryRow(`SELECT b.role_uuid FROM auth_role_bindings b JOIN domain_memberships m ON m.uuid=b.membership_uuid WHERE m.domain_uuid=? AND m.principal_uuid=? LIMIT 1`, domain, principal.UUID).Scan(&role); err != nil { + t.Fatal(err) + } + for _, boundary := range []string{"/city?#%", "/city?#%/street", "/city?#%/street/spot"} { + if _, err := s.store.DB.Exec(`INSERT INTO auth_capability_grants(uuid,role_uuid,capability,target_type,target_id,created_at_ms) VALUES(?,?,'read','path',?,1)`, "city-search:"+boundary, role, boundary); err != nil { + t.Fatal(err) + } + } + return street +} + +func TestSearchCityResultsPrecedePagesAndHaveSafeLinks(t *testing.T) { + s, token, domain := searchServerFixture(t) + seedSearchCity(t, s, token, domain) + response := configRequest(s, token, "GET", "/v/search?q=nebula&scope=/", nil) + body := response.Body.String() + if response.Code != http.StatusOK { + t.Fatalf("City search failed: %d %s", response.Code, body) + } + cityStart, pagesStart := strings.Index(body, `data-city-search-results`), strings.Index(body, `data-search-view=`) + if cityStart < 0 || pagesStart <= cityStart { + t.Fatal("City results are not above Page results") + } + city := body[cityStart:pagesStart] + for _, value := range []string{`data-city-search-kind="quartier"`, `data-city-search-kind="street"`, `data-city-search-kind="spot"`, + `href="/v/city/q/nebula-campus"`, `href="/v/city/s/nebula-campus/nebula-way"`, `href="/v/city/p/nebula-spot"`, + `href="/city%3F%23%25"`, `Nebula`, `<img src=x onerror=alert(1)>`} { + if !strings.Contains(city, value) { + t.Errorf("missing City result element %q", value) + } + } + for _, value := range []string{`data-child-path`, `children-entry`, `CITY_HIDDEN_MARKER`, ` 256 || len(strings.Fields(query)) > 8 { + w.WriteHeader(http.StatusBadRequest) + _ = json.NewEncoder(w).Encode(map[string]string{"error": "query too long"}) + return + } + if utf8.RuneCountInString(query) < 2 { + _ = json.NewEncoder(w).Encode(map[string]any{"items": []searchSuggestionItem{}}) + return + } + ctx, cancel := context.WithTimeout(r.Context(), 700*time.Millisecond) + defer cancel() + domain := s.domainUUIDForRequest(r) + allowed := s.pathReadFilter(r) + pages, err := s.store.SearchPathSuggestionsInDomain(ctx, domain, "/", query, 8, allowed) + if err != nil { + status := http.StatusInternalServerError + if errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled) { + status = http.StatusServiceUnavailable + } + w.WriteHeader(status) + _ = json.NewEncoder(w).Encode(map[string]string{"error": "suggestions unavailable"}) + return + } + items := make([]searchSuggestionItem, 0, 12) + // City metadata is useful but optional enrichment. A slow City query must + // not discard already-authorized Page suggestions. + if city, cityErr := s.store.SearchCityInDomain(ctx, domain, "/", query, 4, allowed, store.SearchOptions{}); cityErr == nil { + for _, result := range city { + items = append(items, citySuggestion(result, query)) + } + } + for _, result := range pages { + items = append(items, pageSuggestion(result, query)) + } + sort.SliceStable(items, func(i, j int) bool { + if items[i].Exact != items[j].Exact { + return items[i].Exact + } + return false + }) + _ = json.NewEncoder(w).Encode(map[string]any{"items": items}) +} diff --git a/internal/server/semantic_handlers.go b/internal/server/semantic_handlers.go index 7461467..db80cd8 100644 --- a/internal/server/semantic_handlers.go +++ b/internal/server/semantic_handlers.go @@ -1,11 +1,41 @@ package server import ( + "context" + "database/sql" + "errors" "html/template" "net/http" + "path" "strings" + "time" + + "pageswiki/internal/store" ) +func (s *Server) renderPageNotFound(w http.ResponseWriter, r *http.Request, missingPath string) { + missingPath = "/" + strings.TrimLeft(path.Clean("/"+missingPath), "/") + query := strings.Trim(strings.TrimSuffix(path.Base(missingPath), "/"), " .") + suggestions := []store.SearchResult{} + if query != "" && query != "." { + ctx, cancel := context.WithTimeout(r.Context(), 350*time.Millisecond) + defer cancel() + if found, err := s.store.SearchPathsInDomainFiltered(ctx, s.domainUUIDForRequest(r), "/", query, 5, s.pathReadFilter(r)); err == nil { + suggestions = found + } + } + w.WriteHeader(http.StatusNotFound) + if r.Method == http.MethodHead { + return + } + s.renderWithContext(w, r, "not_found.gohtml", map[string]any{ + "MissingPath": missingPath, + "SuggestionQuery": query, + "Suggestions": suggestions, + "NavItems": resolveNavItems(s.getSystemNavItems(s.domainUUIDForRequest(r)), NavContext{Path: missingPath}), + }) +} + func (s *Server) handleSemanticRoute( w http.ResponseWriter, r *http.Request, @@ -14,19 +44,68 @@ func (s *Server) handleSemanticRoute( path := r.URL.Path objectUUID, err := - s.store.ResolvePath(path) + s.store.ResolvePathInDomain(s.domainUUIDForRequest(r), path) if err != nil { + if !errors.Is(err, sql.ErrNoRows) { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + domainUUID := s.domainUUIDForRequest(r) + children, childErr := s.store.ListChildPathsInDomain(domainUUID, path) + if childErr != nil { + http.Error(w, childErr.Error(), http.StatusInternalServerError) + return + } + if !s.getVirtualFolderPages(domainUUID) || len(children) == 0 { + s.renderPageNotFound(w, r, path) + return + } - http.NotFound(w, r) - + rendered := s.expandMacrosForRequest(r, + "{{children}}", + path, + domainUUID, + ) + s.renderWithContext( + w, + r, + "page.gohtml", + map[string]any{ + "Title": path, + "Path": path, + "Breadcrumbs": buildBreadcrumbs(path), + "ContentView": contentView{ + Kind: "html", + ContentType: "text/html; charset=utf-8", + }, + "NavItems": resolveNavItems( + s.getSystemNavItems(domainUUID), + NavContext{Path: path}, + ), + "RenderedHTML": template.HTML(rendered), + }, + ) return } - latest, err := - s.store.GetLatestRevision( - objectUUID, - ) + windowedView, useWindowedView, windowedErr := s.windowedContentViewForRequest(r, objectUUID, path) + if windowedErr != nil { + http.Error(w, windowedErr.Error(), http.StatusInternalServerError) + return + } + if useWindowedView { + bs := buildBreadcrumbs(path) + citySpots, _ := s.pageSpotAppearancesForRequest(r, objectUUID) + governanceEndpoint := "" + if len(citySpots) > 0 { + governanceEndpoint = s.governanceForUI(r, "spot", citySpots[0].SpotUUID) + } + s.renderWithContext(w, r, "page.gohtml", map[string]any{"Title": path, "Path": path, "Breadcrumbs": bs, "ObjectUUID": objectUUID, "CitySpots": citySpots, "GovernanceEndpoint": governanceEndpoint, "ContentView": windowedView, "ComicMode": r.URL.Query().Get("comic") == "1", "NavItems": resolveNavItems(s.getSystemNavItems(s.domainUUIDForRequest(r)), NavContext{Path: path, ObjectUUID: objectUUID, ObjectURI: "uuid:" + objectUUID})}) + return + } + + latest, err := s.latestRevisionForRequest(r, objectUUID) if err != nil { @@ -40,25 +119,49 @@ func (s *Server) handleSemanticRoute( } bs := buildBreadcrumbs(path) + citySpots, _ := s.pageSpotAppearancesForRequest(r, objectUUID) + governanceEndpoint := "" + if len(citySpots) > 0 { + governanceEndpoint = s.governanceForUI(r, "spot", citySpots[0].SpotUUID) + } + contentView := revisionContentView(latest, path) + contentView.RawURL = rawProjectionURL("path:" + path) + if contentView.Kind == "pdf" || contentView.Kind == "excalidraw" { + // Native PDF viewers issue several independent Range requests. Pin the + // frame to the immutable Revision so every range resolves to one body. + contentView.RawURL = rawProjectionURL("rev:" + latest.UUID) + contentView.RevisionUUID = latest.UUID + if contentView.Kind == "pdf" { + contentView.PDFPages = s.pdfPageCount(latest.DocumentHash) + } + } - rendered := - s.renderDiagramsInHTML( - s.expandMacros( - latest.Body, - path, - ), - ) + rendered := "" + if contentView.Kind == "html" { + rendered = s.safeHTMLProjection(r, latest.Body, path, true) + } - s.render( + s.renderWithContext( w, + r, "page.gohtml", map[string]any{ - "Title": path, - "Path": path, - "Breadcrumbs": bs, - "ObjectUUID": objectUUID, + "Title": path, + "Path": path, + "Breadcrumbs": bs, + "ObjectUUID": objectUUID, + "CitySpots": citySpots, + "GovernanceEndpoint": governanceEndpoint, + "ContentView": contentView, + "SocialSource": func() string { + if contentView.Kind == "html" { + return latest.Body + } + return "" + }(), + "ComicMode": r.URL.Query().Get("comic") == "1", "NavItems": resolveNavItems( - s.getSystemNavItems(), + s.getSystemNavItems(s.domainUUIDForRequest(r)), NavContext{ Path: path, ObjectUUID: objectUUID, @@ -77,22 +180,18 @@ func (s *Server) handleSemanticEditor( r *http.Request, ) { - path := strings.TrimPrefix( - r.URL.Path, - "/e/-", - ) - - if path == "" { - path = "/" - } + path := semanticEditorPath(r.URL.Path) objectUUID, err := - s.store.ResolvePath(path) - - if err != nil { + s.store.ResolvePathInDomain(s.domainUUIDForRequest(r), path) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + http.Error(w, "could not resolve editor path", http.StatusInternalServerError) + return + } + if errors.Is(err, sql.ErrNoRows) { objectUUID, err = - s.store.CreateObject(path) + s.store.CreatePageAtPathInDomain(s.domainUUIDForRequest(r), path) if err != nil { @@ -107,29 +206,47 @@ func (s *Server) handleSemanticEditor( } latest, err := - s.store.GetLatestRevision( + s.latestRevisionForRequest( + r, objectUUID, ) body := "" + editType := "html" + contentType := "text/html; charset=utf-8" + filename := "" if err == nil { + if latest.UUID != "" { + view := revisionContentView(latest, path) + if view.Kind == "code" { + editType = "code" + } else if view.Kind != "html" { + http.Error( + w, + "this Content-Type is not editable as text", + http.StatusUnsupportedMediaType, + ) + return + } + contentType = latest.ContentType + filename = latest.Filename + } body = latest.Body } - editType := - r.URL.Query().Get( - "edittype", - ) - - if editType == "" { - editType = "html" + requestedEditType := r.URL.Query().Get("edittype") + if editType != "code" && requestedEditType != "" { + editType = requestedEditType + } else if editType != "code" && requestedEditType == "" { + editType = s.getEditorFormat(s.domainUUIDForRequest(r)) } if editType == "markdown" { compiled, err := s.compileMarkdownFromPath( + r, path, ) @@ -145,27 +262,23 @@ func (s *Server) handleSemanticEditor( body = compiled } - renderedBody := - body - - s.render( + s.renderWithContext( w, + r, "editor.gohtml", map[string]any{ - "Title": path, - "Path": path, - "ObjectUUID": objectUUID, - "Body": body, - "RenderedHTML": template.HTML( - s.expandMacros( - renderedBody, - path, - ), - ), - "EditType": editType, - "EditorKeymap": s.getEditorKeymap(), - "EditorSyntax": s.getEditorSyntaxHighlight(), - "EditorAutocomplete": s.getEditorAutocomplete(), + "Title": path, + "Path": path, + "ObjectUUID": objectUUID, + "Body": body, + "EditType": editType, + "PageLanguage": latest.Language, + "PageContentType": contentType, + "PageFilename": filename, + "EditorKeymap": s.getEditorKeymap(s.domainUUIDForRequest(r)), + "EditorPreviewDefault": s.getEditorPreviewDefault(s.domainUUIDForRequest(r)), + "EditorSyntax": s.getEditorSyntaxHighlight(s.domainUUIDForRequest(r)), + "EditorAutocomplete": s.getEditorAutocomplete(s.domainUUIDForRequest(r)), }, ) } diff --git a/internal/server/server.go b/internal/server/server.go index d67206f..a3e6490 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -1,23 +1,42 @@ package server import ( + "database/sql" + "errors" "fmt" "html/template" "log" "net/http" "strings" + "sync" + "sync/atomic" "time" mw "pageswiki/internal/server/middleware" routespkg "pageswiki/internal/server/routes" + "pageswiki/internal/calendar" "pageswiki/internal/store" ) type Server struct { - mux *http.ServeMux - templates *template.Template - store *store.Store + calendarOnce sync.Once + calendarRepo *calendar.Repository + calendarErr error + navigationCache navigationDataCache + mux *http.ServeMux + templates *template.Template + store *store.Store + previewSlots chan struct{} + smtpSlots chan struct{} + ldapSlots chan struct{} + ldapDial ldapDialFunc + previewRoot string + diagramRoot string + importRoot string + schedulerWake chan struct{} + foregroundRequests atomic.Int64 + schedulerRunning atomic.Int64 } func New( @@ -25,9 +44,16 @@ func New( ) *Server { s := &Server{ - mux: http.NewServeMux(), - store: st, + mux: http.NewServeMux(), + store: st, + previewSlots: make(chan struct{}, 1), + smtpSlots: make(chan struct{}, 2), + ldapSlots: make(chan struct{}, 4), + ldapDial: dialLDAPDirectory, + schedulerWake: make(chan struct{}, 1), } + s.initializePreviewScheduler() + s.initializeImportRoot() s.mustLoadTemplates() @@ -74,11 +100,13 @@ func New( s.registerRoutes() s.startGCWorker() + s.startEventScheduler() return s } func (s *Server) registerStaticRoutes() { + s.mux.HandleFunc(socialImagePath, handleSocialImage) staticFS := http.FileServer( http.Dir("./static"), @@ -108,6 +136,7 @@ func (s *Server) registerStaticRoutes() { func (s *Server) mustLoadTemplates() { funcs := template.FuncMap{ + "cspNonce": func() string { return "" }, "parentPath": parentPath, @@ -121,6 +150,10 @@ func (s *Server) mustLoadTemplates() { return a + b }, + "mulFloat": func(a, b float64) float64 { + return a * b + }, + "until": func(n int) []int { out := make([]int, n) @@ -156,13 +189,17 @@ func (s *Server) mustLoadTemplates() { In(s.getLocation()). Format("2006-01-02 15:04") }, + "formatUnixMS": func(ts int64) string { + if ts <= 0 { + return "-" + } + return time.UnixMilli(ts).In(s.getLocation()).Format("2006-01-02 15:04") + }, } tmpl := template.New("").Funcs(funcs) - parsed, err := tmpl.ParseGlob( - "templates/**/*.gohtml", - ) + parsed, err := parseTrustedTemplates(tmpl) if err != nil { panic(err) @@ -172,45 +209,89 @@ func (s *Server) mustLoadTemplates() { } func (s *Server) registerRoutes() { + s.registerCalendarRoutes() + s.registerTaskRoutes() + s.mux.HandleFunc("/_/auth/", s.handleAuth) + s.mux.HandleFunc("/_/auth/profile", s.handleProfile) + s.mux.HandleFunc("/_/obj/", s.handleImmutableObject) + s.mux.HandleFunc("/v/json/", s.handleJSONStructure) + s.mux.HandleFunc("/_/api/v1/assets", s.handleAssetsAPI) + s.mux.HandleFunc("/_/api/v1/path-picker", s.handlePathPickerAPI) + s.mux.HandleFunc("/_/api/v1/browser/navigation", s.handleBrowserNavigationAPI) + s.mux.HandleFunc("/u/", s.handleUserProfile) + s.mux.HandleFunc("/g", s.handleGroups) + s.mux.HandleFunc("/g/", s.handleGroups) + s.mux.HandleFunc("/_/api/v1/city/", s.handleCityAPI) + s.mux.HandleFunc("/v/import", s.handleImport) + s.mux.HandleFunc("/v/import/", s.handleImport) + s.mux.HandleFunc("/_/api/v1/import/", s.handleImportAPI) + s.mux.HandleFunc("/-/sys/config/auth", s.handleAuthAdmin) + s.mux.Handle(adapterGatewayPrefix+"/", newAdapterGatewayProxy()) routespkg.RegisterUIRoutes( s.mux, routespkg.UIHandlers{ - Home: s.handleHome, - NewPage: s.handleNewPage, - SemanticEditor: s.handleEditorRoute, - SemanticPage: s.handleSemanticRoute, - RawView: s.handleRawView, - LinkManager: s.handleLinkManager, - Health: s.handleHealth, - Tree: s.handleTree, - Browser: s.handleBrowser, - Preview: s.handlePreview, - PlainView: s.handlePlainView, - MarkdownView: s.handleMarkdownView, - CompileMarkdown: s.handleCompileMarkdown, - CompileDiagram: s.handleCompileDiagram, - Config: s.handleConfig, + Home: s.handleHome, + NewPage: s.handleNewPage, + SemanticEditor: s.handleEditorRoute, + SemanticPage: s.handleSemanticRoute, + RawView: s.handleRawView, + TextWindow: s.handleTextWindow, + LinkManager: s.handleLinkManager, + Health: s.handleHealth, + Tree: s.handleTree, + Browser: s.handleBrowser, + Preview: s.handlePreview, + PlainView: s.handlePlainView, + MarkdownView: s.handleMarkdownView, + CompileMarkdown: s.handleCompileMarkdown, + CompileDiagram: s.handleCompileDiagram, + Config: s.handleConfig, + AdapterConfig: s.handleAdapterPluginConfig, + VimConfig: s.handleVimSettings, + SystemExtensions: s.handleSystemExtensions, + Periodical: s.handlePeriodical, + Upload: s.handleUpload, + Children: s.handleChildrenProjection, + Bookmarks: s.handleBookmarkChildren, + PreviewCache: s.handlePreviewCache, + Search: s.handleSearch, + Archive: s.handleArchiveEntry, + EmailHTML: s.handleEmailHTML, + PDFPage: s.handlePDFPage, + OpenWith: s.handleOpenWith, + City: s.handleCityMap, + Print: s.handlePrint, + Notifications: s.handleNotificationsPage, }, ) routespkg.RegisterAPIRoutes( s.mux, routespkg.APIHandlers{ - CreateObject: s.handleCreateObjectAPI, - ListObjects: s.handleListObjectsAPI, - DeleteObject: s.handleDeleteObjectAPI, - SaveRevision: s.handleSaveRevisionAPI, - ListRevisions: s.handleRevisionListAPI, - RestoreRevision: s.handleRestoreRevisionAPI, - RenderMarkdown: s.handleMarkdownRenderAPI, - AddTag: s.handleTagAddAPI, - BindPath: s.handleBindPathAPI, - RenamePath: s.handleRenamePath, - RenamePreview: s.handleRenamePreview, - RemovePath: s.handleRemovePathAPI, - ZombieList: s.handleZombieListAPI, - ZombiePurge: s.handleZombiePurgeAPI, + CreateObject: s.handleCreateObjectAPI, + ListObjects: s.handleListObjectsAPI, + DeleteObject: s.handleDeleteObjectAPI, + SaveRevision: s.handleSaveRevisionAPI, + ListRevisions: s.handleRevisionListAPI, + RestoreRevision: s.handleRestoreRevisionAPI, + RenderMarkdown: s.handleMarkdownRenderAPI, + AddTag: s.handleTagAddAPI, + BindPath: s.handleBindPathAPI, + RenamePath: s.handleRenamePath, + RenamePreview: s.handleRenamePreview, + RemovePath: s.handleRemovePathAPI, + CopyPath: s.handleCopyPathAPI, + ZombieList: s.handleZombieListAPI, + ZombiePurge: s.handleZombiePurgeAPI, + FederationEnroll: s.handleFederationEnrollAPI, + Event: s.handleEventAPI, + Queue: s.handleQueueAPI, + Adapter: s.handleAdapterAPI, + AdapterSession: s.handleAdapterSessionAPI, + Notifications: s.handleNotificationsAPI, + Publication: s.handlePublicationApprovalAPI, + SearchSuggest: s.handleSearchSuggestAPI, }, ) } @@ -218,6 +299,54 @@ func (s *Server) registerRoutes() { func (s *Server) handler() http.Handler { var h http.Handler = s.mux + h = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.Path == "/_/api/v1/federation/enroll" || + strings.HasPrefix(r.URL.Path, "/_/api/v1/adapter/session/") || + strings.HasPrefix(r.URL.Path, adapterGatewayPrefix+"/") || + r.URL.Path == "/health" { + s.mux.ServeHTTP(w, r) + return + } + domain, err := s.domainForRequestWithError(r) + if err != nil { + if errors.Is(err, sql.ErrNoRows) { + http.NotFound(w, r) + return + } + logDomainLookupError(r, err) + http.Error( + w, + "domain lookup temporarily unavailable", + http.StatusServiceUnavailable, + ) + return + } + if domain == nil { + http.NotFound(w, r) + return + } + if domain.Placement == "remote" { + http.Error( + w, + "remote domain is not served by this instance", + http.StatusMisdirectedRequest, + ) + return + } + s.mux.ServeHTTP(w, r) + }) + domainHandler := h + h = s.withAuthorization(h) + domainHandler = h + h = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + background := r.URL.Query().Get("preview") == "1" || + strings.HasPrefix(r.URL.Path, "/v/preview-cache/") + if !background { + s.foregroundRequests.Add(1) + defer s.foregroundRequests.Add(-1) + } + domainHandler.ServeHTTP(w, r) + }) h = mw.NormalizePath(h) h = mw.RequestID(h) diff --git a/internal/server/settings_browser_test.go b/internal/server/settings_browser_test.go new file mode 100644 index 0000000..93a9dd7 --- /dev/null +++ b/internal/server/settings_browser_test.go @@ -0,0 +1,87 @@ +package server + +import ( + "context" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "path/filepath" + "strings" + "testing" + "time" +) + +func TestBookmarkAndVimSettingsChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + s, token, domain := configFixture(t) + s.mux.HandleFunc("/", s.handleHome) + s.mux.HandleFunc("/-/sys/config/vim", s.handleVimSettings) + s.mux.HandleFunc("/_/api/v1/path-picker", s.handlePathPickerAPI) + s.mux.HandleFunc("/_/api/v1/search/suggest", s.handleSearchSuggestAPI) + saveWallpaperFixture(t, s, domain, "/wallpapers/browser.jpg", "image/jpeg") + guide, err := s.store.CreatePageAtPathInDomain(domain, "/docs/browser-guide") + if err != nil { + t.Fatal(err) + } + if _, err = s.store.SaveRevision(guide, "

    Browser Guide

    Suggestion fixture.

    ", ""); err != nil { + t.Fatal(err) + } + if err := s.store.SetConfigInDomain(domain, "home_layout", "directory"); err != nil { + t.Fatal(err) + } + if err := s.saveAdapterPlugins(domain, []adapterPlugin{{ID: "vim.wasm", Name: "Vim", Mode: "editor", Enabled: true, URLTemplate: "https://editor.example/open?ticket={ticket}"}}); err != nil { + t.Fatal(err) + } + script, err := os.ReadFile("internal/server/testdata/settings-interactions.js") + if err != nil { + t.Fatal(err) + } + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + if r.Header.Get("Origin") != "" { + r.Header.Set("Origin", "http://localhost") + } + if r.Method == "GET" && (r.URL.Path == "/" || r.URL.Path == "/-/sys/config") { + rec := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(rec, r) + for key, values := range rec.Header() { + w.Header()[key] = values + } + w.WriteHeader(rec.Code) + _, _ = w.Write([]byte(strings.Replace(rec.Body.String(), "", browserFixtureScript(rec.Header(), script)+"", 1))) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + for _, test := range []struct{ name, path string }{{"bookmark-dialog", "/"}, {"path-picker", "/-/sys/config?panel=home&picker_test=1"}, {"vim-settings", "/-/sys/config?panel=adapter-vim.wasm"}} { + ctx, cancel := context.WithTimeout(context.Background(), 45*time.Second) + cmd := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", server.URL+test.path, t.TempDir()) + if dir := os.Getenv("PAGESWIKI_BROWSER_ARTIFACTS"); dir != "" { + if err := os.MkdirAll(dir, 0755); err != nil { + t.Fatal(err) + } + cmd.Args = append(cmd.Args, filepath.Join(dir, test.name+".png")) + } + out, err := cmd.CombinedOutput() + cancel() + if err != nil { + t.Fatalf("%s: %v %s", test.name, err, out) + } + } + items := s.homeBookmarks(domain) + if len(items) != 2 || items[0].Kind != "section" || !items[0].Children || items[0].Href != "/docs" || items[1].Label != "Reference" { + t.Fatalf("saved bookmarks: %#v", items) + } + if got := s.homeGlassTransparency(domain); got != 57 { + t.Fatalf("saved glass transparency: %d", got) + } + vim := s.domainVimSettings(domain) + if !vim.Enabled || vim.Vimrc != "set tabstop=3\n" || vim.ColorName != "uploaded.vim" || !strings.Contains(vim.Colorscheme, "Normal") { + t.Fatalf("saved vim: %#v", vim) + } +} diff --git a/internal/server/smtp_delivery.go b/internal/server/smtp_delivery.go new file mode 100644 index 0000000..93b08a5 --- /dev/null +++ b/internal/server/smtp_delivery.go @@ -0,0 +1,148 @@ +package server + +import ( + "context" + "crypto/tls" + "errors" + "fmt" + "net" + "net/mail" + "net/smtp" + "net/url" + "strconv" + "strings" + "time" + + "pageswiki/internal/store" +) + +const smtpDeliveryTimeout = 10 * time.Second + +type smtpLimitedConn struct { + net.Conn + remaining int +} + +func (c *smtpLimitedConn) Read(buffer []byte) (int, error) { + if c.remaining <= 0 { + return 0, errors.New("SMTP response exceeds the size limit") + } + if len(buffer) > c.remaining { + buffer = buffer[:c.remaining] + } + n, err := c.Conn.Read(buffer) + c.remaining -= n + return n, err +} + +type magicLinkChallenge struct { + Return string `json:"return"` + Email string `json:"email"` +} + +func smtpMailbox(value string) (*mail.Address, error) { + if len(value) == 0 || len(value) > 512 || strings.ContainsAny(value, "\r\n\x00") { + return nil, errors.New("invalid mail address") + } + address, err := mail.ParseAddress(value) + if err != nil || !strings.Contains(address.Address, "@") || strings.ContainsAny(address.Address, "\r\n\x00") { + return nil, errors.New("invalid mail address") + } + return address, nil +} + +func smtpMessage(config store.AuthProviderConfig, recipient, link string) (host, from, to string, message []byte, err error) { + fail := func() (string, string, string, []byte, error) { + return "", "", "", nil, errors.New("invalid SMTP configuration or message") + } + if len(config.SMTPAddress) > 1024 || strings.ContainsAny(config.SMTPAddress, "\r\n\x00 /@") { + return fail() + } + host, port, parseErr := net.SplitHostPort(config.SMTPAddress) + portNumber, portErr := strconv.Atoi(port) + if parseErr != nil || portErr != nil || host == "" || portNumber < 1 || portNumber > 65535 || len(config.SMTPUsername) > 1024 || len(config.SMTPPassword) > 4096 { + return fail() + } + sender, senderErr := smtpMailbox(config.SMTPFrom) + addressee, recipientErr := smtpMailbox(recipient) + parsedLink, linkErr := url.Parse(link) + if senderErr != nil || recipientErr != nil || linkErr != nil || len(link) > 4096 || strings.ContainsAny(link, "\r\n\x00") || parsedLink.Hostname() == "" || parsedLink.User != nil || parsedLink.Fragment != "" || (parsedLink.Scheme != "http" && parsedLink.Scheme != "https") { + return fail() + } + message = []byte(fmt.Sprintf("To: %s\r\nFrom: %s\r\nSubject: Pages Wiki sign-in link\r\nDate: %s\r\nMIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\n\r\n%s\r\n", addressee.String(), sender.String(), time.Now().Format(time.RFC1123Z), link)) + return host, sender.Address, addressee.Address, message, nil +} + +// sendMagicLinkSMTP bounds greeting, EHLO, TLS, AUTH, DATA, and QUIT as well as +// dial time. No provider response, recipient, credential, or login URL is logged. +func sendMagicLinkSMTP(ctx context.Context, config store.AuthProviderConfig, recipient, link string) error { + return sendMagicLinkSMTPWithTLS(ctx, config, recipient, link, nil) +} + +func sendMagicLinkSMTPWithTLS(ctx context.Context, config store.AuthProviderConfig, recipient, link string, tlsOverride *tls.Config) error { + host, sender, addressee, message, err := smtpMessage(config, recipient, link) + if err != nil { + return err + } + ctx, cancel := context.WithTimeout(ctx, smtpDeliveryTimeout) + defer cancel() + connection, err := (&net.Dialer{Timeout: 3 * time.Second}).DialContext(ctx, "tcp", config.SMTPAddress) + if err != nil { + return errors.New("SMTP connection failed") + } + connection = &smtpLimitedConn{Conn: connection, remaining: 256 << 10} + defer connection.Close() + deadline, _ := ctx.Deadline() + if err := connection.SetDeadline(deadline); err != nil { + return errors.New("SMTP connection deadline failed") + } + stop := context.AfterFunc(ctx, func() { _ = connection.Close() }) + defer stop() + client, err := smtp.NewClient(connection, host) + if err != nil { + return errors.New("SMTP greeting failed") + } + defer client.Close() + if err := client.Hello("localhost"); err != nil { + return errors.New("SMTP greeting failed") + } + if available, _ := client.Extension("STARTTLS"); available { + config := &tls.Config{ServerName: host, MinVersion: tls.VersionTLS12} + if tlsOverride != nil { + config = tlsOverride.Clone() + config.ServerName = host + config.MinVersion = max(config.MinVersion, tls.VersionTLS12) + } + if err := client.StartTLS(config); err != nil { + return errors.New("SMTP TLS negotiation failed") + } + } + if config.SMTPUsername != "" { + if _, secure := client.TLSConnectionState(); !secure { + return errors.New("SMTP authentication requires TLS") + } + if err := client.Auth(smtp.PlainAuth("", config.SMTPUsername, config.SMTPPassword, host)); err != nil { + return errors.New("SMTP authentication failed") + } + } + if err := client.Mail(sender); err != nil { + return errors.New("SMTP sender rejected") + } + if err := client.Rcpt(addressee); err != nil { + return errors.New("SMTP recipient rejected") + } + writer, err := client.Data() + if err != nil { + return errors.New("SMTP data rejected") + } + if _, err := writer.Write(message); err != nil { + return errors.New("SMTP delivery failed") + } + if err := writer.Close(); err != nil { + return errors.New("SMTP delivery failed") + } + if err := client.Quit(); err != nil { + return errors.New("SMTP completion failed") + } + return nil +} diff --git a/internal/server/smtp_delivery_test.go b/internal/server/smtp_delivery_test.go new file mode 100644 index 0000000..4f6ce83 --- /dev/null +++ b/internal/server/smtp_delivery_test.go @@ -0,0 +1,357 @@ +package server + +import ( + "bufio" + "context" + "crypto/tls" + "crypto/x509" + "fmt" + "io" + "net" + "net/http" + "net/http/httptest" + "net/textproto" + "net/url" + "strings" + "testing" + "time" + + "pageswiki/internal/store" +) + +type smtpTestDelivery struct { + message string + commands []string + tls bool +} + +func fakeSMTP(t *testing.T, stall string, secure bool) (string, *tls.Config, <-chan smtpTestDelivery) { + t.Helper() + listener, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + t.Fatal(err) + } + certificateServer := httptest.NewTLSServer(http.NotFoundHandler()) + certificate := certificateServer.TLS.Certificates[0] + root, err := x509.ParseCertificate(certificate.Certificate[0]) + if err != nil { + t.Fatal(err) + } + certificateServer.Close() + roots := x509.NewCertPool() + roots.AddCert(root) + done := make(chan smtpTestDelivery, 1) + go func() { + result := smtpTestDelivery{} + defer func() { done <- result; close(done) }() + connection, err := listener.Accept() + if err != nil { + return + } + defer connection.Close() + _ = connection.SetDeadline(time.Now().Add(2 * time.Second)) + pause := func() { _, _ = io.Copy(io.Discard, connection) } + if stall == "greeting" { + pause() + return + } + reader := bufio.NewReader(connection) + _, _ = io.WriteString(connection, "220 localhost test relay\r\n") + for { + line, err := reader.ReadString('\n') + if err != nil { + return + } + line = strings.TrimSpace(line) + result.commands = append(result.commands, line) + switch { + case strings.HasPrefix(line, "EHLO"), strings.HasPrefix(line, "HELO"): + if stall == "ehlo" { + pause() + return + } + if secure && !result.tls { + _, _ = io.WriteString(connection, "250-localhost\r\n250-STARTTLS\r\n250 AUTH PLAIN\r\n") + } else { + _, _ = io.WriteString(connection, "250-localhost\r\n250 AUTH PLAIN\r\n") + } + case line == "STARTTLS": + _, _ = io.WriteString(connection, "220 start TLS\r\n") + upgraded := tls.Server(connection, &tls.Config{Certificates: []tls.Certificate{certificate}, MinVersion: tls.VersionTLS12}) + if err := upgraded.Handshake(); err != nil { + return + } + connection = upgraded + reader = bufio.NewReader(connection) + result.tls = true + case strings.HasPrefix(line, "AUTH"): + _, _ = io.WriteString(connection, "235 authenticated\r\n") + case strings.HasPrefix(line, "MAIL FROM:"), strings.HasPrefix(line, "RCPT TO:"): + _, _ = io.WriteString(connection, "250 accepted\r\n") + case line == "DATA": + if stall == "data" { + pause() + return + } + _, _ = io.WriteString(connection, "354 send data\r\n") + body, err := textproto.NewReader(reader).ReadDotBytes() + if err != nil { + return + } + result.message = string(body) + _, _ = io.WriteString(connection, "250 queued\r\n") + case line == "QUIT": + if stall == "quit" { + pause() + return + } + _, _ = io.WriteString(connection, "221 bye\r\n") + return + default: + _, _ = io.WriteString(connection, "500 unsupported\r\n") + } + } + }() + t.Cleanup(func() { listener.Close() }) + return listener.Addr().String(), &tls.Config{RootCAs: roots, MinVersion: tls.VersionTLS12}, done +} + +func TestSMTPDeliveryTLSAndEnvelope(t *testing.T) { + address, trust, done := fakeSMTP(t, "", true) + config := store.AuthProviderConfig{SMTPAddress: address, SMTPFrom: "Wiki ", SMTPUsername: "user", SMTPPassword: "secret"} + if err := sendMagicLinkSMTPWithTLS(context.Background(), config, "Reader ", "https://pages.example.test/_/auth/magic-link/verify?token=one-use", trust); err != nil { + t.Fatal(err) + } + result := <-done + if !result.tls || !strings.Contains(strings.Join(result.commands, "\n"), "MAIL FROM:") || !strings.Contains(result.message, `To: "Reader" `) || !strings.Contains(result.message, "token=one-use") { + t.Fatalf("unexpected SMTP delivery: %+v", result) + } + if strings.Contains(result.message, "secret") { + t.Fatal("SMTP password leaked into message") + } +} + +func TestSMTPRejectsPlaintextCredentialsAndUntrustedTLS(t *testing.T) { + for _, secure := range []bool{false, true} { + t.Run(fmt.Sprint(secure), func(t *testing.T) { + address, _, done := fakeSMTP(t, "", secure) + config := store.AuthProviderConfig{SMTPAddress: address, SMTPFrom: "wiki@example.test", SMTPUsername: "user", SMTPPassword: "secret"} + if err := sendMagicLinkSMTP(context.Background(), config, "reader@example.test", "https://pages.example.test/link"); err == nil { + t.Fatal("unsafe SMTP authenticated") + } + result := <-done + if strings.Contains(strings.Join(result.commands, "\n"), "AUTH PLAIN") || result.message != "" { + t.Fatal("credentials or login link leaked over unsafe SMTP") + } + }) + } +} + +func TestSMTPDeadlineCoversEntireProtocol(t *testing.T) { + for _, stage := range []string{"greeting", "ehlo", "data", "quit"} { + t.Run(stage, func(t *testing.T) { + address, _, done := fakeSMTP(t, stage, false) + ctx, cancel := context.WithTimeout(context.Background(), 60*time.Millisecond) + defer cancel() + started := time.Now() + if err := sendMagicLinkSMTP(ctx, store.AuthProviderConfig{SMTPAddress: address, SMTPFrom: "wiki@example.test"}, "reader@example.test", "https://pages.example.test/link"); err == nil { + t.Fatal("stalled SMTP succeeded") + } + if time.Since(started) > time.Second { + t.Fatal("SMTP ignored deadline") + } + <-done + }) + } +} + +func TestSMTPMessageRejectsInjection(t *testing.T) { + for _, address := range []string{"a@example.test\r\nBcc: evil@example.test", "a@example.test,b@example.test", "a@example.test\x00", "not-a-mailbox"} { + if _, err := smtpMailbox(address); err == nil { + t.Fatalf("invalid mailbox accepted: %q", address) + } + } + for _, config := range []store.AuthProviderConfig{ + {SMTPAddress: "localhost:25", SMTPFrom: "wiki@example.test\r\nBcc: x@example.test"}, + {SMTPAddress: "localhost:25\r\nDATA", SMTPFrom: "wiki@example.test"}, + {SMTPAddress: "localhost:99999", SMTPFrom: "wiki@example.test"}, + } { + if _, _, _, _, err := smtpMessage(config, "reader@example.test", "https://pages.example.test/link"); err == nil { + t.Fatal("unsafe SMTP message accepted") + } + } + if _, _, _, _, err := smtpMessage(store.AuthProviderConfig{SMTPAddress: "localhost:25", SMTPFrom: "wiki@example.test"}, "reader@example.test", "https://pages.example.test/\r\nBcc:x"); err == nil { + t.Fatal("link injection accepted") + } +} + +func TestSMTPRejectsOversizedGreeting(t *testing.T) { + listener, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + t.Fatal(err) + } + defer listener.Close() + done := make(chan struct{}) + go func() { + defer close(done) + connection, err := listener.Accept() + if err != nil { + return + } + defer connection.Close() + _, _ = io.WriteString(connection, "220 "+strings.Repeat("a", 300<<10)+"\r\n") + }() + ctx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + if err := sendMagicLinkSMTP(ctx, store.AuthProviderConfig{SMTPAddress: listener.Addr().String(), SMTPFrom: "wiki@example.test"}, "reader@example.test", "https://pages.example.test/link"); err == nil { + t.Fatal("unbounded greeting accepted") + } + <-done +} + +func TestMagicLinkLifecycleAndMethods(t *testing.T) { + for _, state := range []string{"active", "readonly", "suspended", "quarantined", "membership suspended", "email changed", "provider disabled", "legacy challenge"} { + t.Run(state, func(t *testing.T) { + s, token, domain := configFixture(t) + principal, err := s.store.PrincipalForSession(domain, token) + if err != nil { + t.Fatal(err) + } + if _, err := s.store.DB.Exec(`UPDATE principals SET email='reader@example.test' WHERE uuid=?`, principal.UUID); err != nil { + t.Fatal(err) + } + config := store.AuthProviderConfig{Kind: "smtp", Enabled: state != "provider disabled", SMTPAddress: "localhost:25", SMTPFrom: "wiki@example.test"} + if err := s.store.SetAuthProviderConfig(domain, config); err != nil { + t.Fatal(err) + } + payload := magicLinkChallenge{Return: "/destination", Email: "reader@example.test"} + if state == "legacy challenge" { + payload.Email = "" + } + challenge, err := s.store.CreateAuthChallenge(domain, principal.UUID, "magic-link", payload, time.Minute) + if err != nil { + t.Fatal(err) + } + if state == "membership suspended" { + _, err = s.store.DB.Exec(`UPDATE domain_memberships SET state='suspended' WHERE principal_uuid=?`, principal.UUID) + } else if state == "email changed" { + _, err = s.store.DB.Exec(`UPDATE principals SET email='new@example.test' WHERE uuid=?`, principal.UUID) + } else if state == "suspended" || state == "quarantined" || state == "readonly" { + _, err = s.store.DB.Exec(`UPDATE principals SET state=? WHERE uuid=?`, state, principal.UUID) + } + if err != nil { + t.Fatal(err) + } + request := httptest.NewRequest("GET", "http://localhost/_/auth/magic-link/verify?token="+url.QueryEscape(challenge), nil) + response := httptest.NewRecorder() + s.verifyMagicLink(response, request) + allowed := state == "active" || state == "readonly" + if allowed && response.Code != http.StatusSeeOther || !allowed && response.Code != http.StatusBadRequest { + t.Fatalf("lifecycle %s: %d %s", state, response.Code, response.Body.String()) + } + if !allowed { + for _, cookie := range response.Result().Cookies() { + if cookie.Name == authCookieName { + t.Fatal("revoked identity received session") + } + } + } + replay := httptest.NewRecorder() + s.verifyMagicLink(replay, request) + if replay.Code != http.StatusBadRequest { + t.Fatal("magic link replay accepted") + } + }) + } + s := &Server{} + for _, test := range []struct { + handler http.HandlerFunc + method, allow string + }{{s.requestMagicLink, "GET", "POST"}, {s.verifyMagicLink, "POST", "GET"}} { + response := httptest.NewRecorder() + test.handler(response, httptest.NewRequest(test.method, "https://localhost/", nil)) + if response.Code != 405 || response.Header().Get("Allow") != test.allow { + t.Fatal("wrong magic-link method accepted") + } + } +} + +func TestMagicLinkRequestBoundsAndGenericResponse(t *testing.T) { + s, _, domain := configFixture(t) + s.smtpSlots = make(chan struct{}, 2) + if _, err := s.store.DB.Exec(`UPDATE principals SET email='reader@example.test'`); err != nil { + t.Fatal(err) + } + if err := s.store.SetAuthProviderConfig(domain, store.AuthProviderConfig{Kind: "smtp", Enabled: true, SMTPAddress: "127.0.0.1:1", SMTPFrom: "wiki@example.test"}); err != nil { + t.Fatal(err) + } + s.smtpSlots <- struct{}{} + s.smtpSlots <- struct{}{} // full admission queue: no challenge should be created + var reference string + for _, email := range []string{"reader@example.test", "missing@example.test", "evil@example.test\r\nBcc: x"} { + request := httptest.NewRequest("POST", "http://localhost/_/auth/magic-link", strings.NewReader(url.Values{"email": {email}}.Encode())) + request.Header.Set("Content-Type", "application/x-www-form-urlencoded") + response := httptest.NewRecorder() + s.requestMagicLink(response, request) + if response.Code != 200 { + t.Fatalf("generic request: %d", response.Code) + } + if reference == "" { + reference = response.Body.String() + } else if reference != response.Body.String() { + t.Fatal("response reveals address validity") + } + } + var count int + if err := s.store.DB.QueryRow(`SELECT COUNT(*) FROM auth_challenges WHERE kind='magic-link'`).Scan(&count); err != nil || count != 0 { + t.Fatal("full delivery slots created unused challenges") + } + request := httptest.NewRequest("POST", "http://localhost/_/auth/magic-link", strings.NewReader("email="+strings.Repeat("x", 65<<10))) + request.Header.Set("Content-Type", "application/x-www-form-urlencoded") + response := httptest.NewRecorder() + s.requestMagicLink(response, request) + if response.Code != 400 { + t.Fatalf("oversized form accepted: %d", response.Code) + } +} + +func TestMagicLinkBackgroundDeliveryReleasesSlot(t *testing.T) { + s, _, domain := configFixture(t) + s.smtpSlots = make(chan struct{}, 2) + address, _, done := fakeSMTP(t, "", false) + if _, err := s.store.DB.Exec(`UPDATE principals SET email='reader@example.test'`); err != nil { + t.Fatal(err) + } + if err := s.store.SetAuthProviderConfig(domain, store.AuthProviderConfig{Kind: "smtp", Enabled: true, SMTPAddress: address, SMTPFrom: "wiki@example.test"}); err != nil { + t.Fatal(err) + } + request := httptest.NewRequest("POST", "http://localhost/_/auth/magic-link", strings.NewReader("email=reader%40example.test&return=%2Fdestination")) + request.Header.Set("Content-Type", "application/x-www-form-urlencoded") + response := httptest.NewRecorder() + s.requestMagicLink(response, request) + if response.Code != 200 { + t.Fatalf("request: %d", response.Code) + } + result := <-done + var link string + for _, word := range strings.Fields(result.message) { + if strings.HasPrefix(word, "http://localhost/_/auth/magic-link/verify?") { + link = word + } + } + if link == "" { + t.Fatal("delivery omitted the magic link") + } + deadline := time.Now().Add(time.Second) + for len(s.smtpSlots) != 0 && time.Now().Before(deadline) { + time.Sleep(time.Millisecond) + } + if len(s.smtpSlots) != 0 { + t.Fatal("delivery worker retained its slot") + } + verified := httptest.NewRecorder() + s.verifyMagicLink(verified, httptest.NewRequest("GET", link, nil)) + if verified.Code != 303 || verified.Header().Get("Location") != "/destination" { + t.Fatalf("delivered link: %d %s", verified.Code, verified.Body.String()) + } +} diff --git a/internal/server/social_image.go b/internal/server/social_image.go new file mode 100644 index 0000000..0e52f90 --- /dev/null +++ b/internal/server/social_image.go @@ -0,0 +1,90 @@ +package server + +import ( + "bytes" + "image" + "image/color" + "image/draw" + "image/png" + "net/http" + "sort" + "sync" + "time" +) + +var socialImageOnce sync.Once +var socialImagePNG []byte + +// A fixed, application-owned book/academy emblem. No document text, external +// fetches, fonts, native decoders, or per-request image-generation work. +func defaultSocialImage() []byte { + socialImageOnce.Do(func() { + im := image.NewRGBA(image.Rect(0, 0, 1200, 630)) + navy, blue, pale, paper, gold := color.RGBA{18, 32, 57, 255}, color.RGBA{49, 111, 202, 255}, color.RGBA{160, 197, 242, 255}, color.RGBA{239, 245, 255, 255}, color.RGBA{223, 188, 124, 255} + rect := func(x, y, w, h int, c color.RGBA) { + draw.Draw(im, image.Rect(x, y, x+w, y+h), image.NewUniform(c), image.Point{}, draw.Src) + } + polygon := func(points []image.Point, c color.RGBA) { + for y := 0; y < 630; y++ { + var xs []int + for i, a := range points { + b := points[(i+1)%len(points)] + if (a.Y <= y && b.Y > y) || (b.Y <= y && a.Y > y) { + xs = append(xs, a.X+(y-a.Y)*(b.X-a.X)/(b.Y-a.Y)) + } + } + sort.Ints(xs) + for i := 0; i+1 < len(xs); i += 2 { + rect(xs[i], y, xs[i+1]-xs[i], 1, c) + } + } + } + rect(0, 0, 1200, 630, navy) + for x := 60; x < 1200; x += 60 { + rect(x, 0, 1, 630, color.RGBA{28, 44, 69, 255}) + } + for y := 45; y < 630; y += 60 { + rect(0, y, 1200, 1, color.RGBA{28, 44, 69, 255}) + } + rect(60, 48, 1080, 3, gold) + rect(60, 579, 1080, 3, gold) + polygon([]image.Point{{350, 173}, {575, 203}, {600, 230}, {625, 203}, {850, 173}, {850, 482}, {625, 504}, {600, 524}, {575, 504}, {350, 482}}, blue) + polygon([]image.Point{{373, 151}, {566, 177}, {589, 202}, {589, 490}, {566, 477}, {373, 454}}, paper) + polygon([]image.Point{{611, 202}, {634, 177}, {827, 151}, {827, 454}, {634, 477}, {611, 490}}, paper) + for y := 317; y <= 421; y += 26 { + polygon([]image.Point{{401, y}, {558, y + 20}, {558, y + 25}, {401, y + 5}}, pale) + polygon([]image.Point{{642, y + 20}, {799, y}, {799, y + 5}, {642, y + 25}}, pale) + } + polygon([]image.Point{{452, 263}, {600, 129}, {748, 263}}, gold) + polygon([]image.Point{{486, 251}, {600, 149}, {714, 251}}, navy) + rect(467, 264, 266, 12, navy) + for _, x := range []int{490, 550, 630, 690} { + rect(x, 283, 18, 82, navy) + } + rect(465, 368, 270, 14, navy) + rect(450, 389, 300, 7, gold) + var out bytes.Buffer + if png.Encode(&out, im) == nil { + socialImagePNG = out.Bytes() + } + }) + return socialImagePNG +} + +func handleSocialImage(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodGet && r.Method != http.MethodHead { + w.Header().Set("Allow", "GET, HEAD") + http.Error(w, "method not allowed", 405) + return + } + data := defaultSocialImage() + if len(data) == 0 { + http.Error(w, "image unavailable", 503) + return + } + w.Header().Set("Content-Type", "image/png") + w.Header().Set("X-Content-Type-Options", "nosniff") + w.Header().Set("Cache-Control", "public, max-age=86400") + w.Header().Set("ETag", `"social-card-v1"`) + http.ServeContent(w, r, "social-card-v1.png", time.Time{}, bytes.NewReader(data)) +} diff --git a/internal/server/social_metadata.go b/internal/server/social_metadata.go new file mode 100644 index 0000000..6d84fb1 --- /dev/null +++ b/internal/server/social_metadata.go @@ -0,0 +1,180 @@ +package server + +import ( + "io" + "net" + "net/http" + "net/url" + "path" + "regexp" + "strings" + "unicode" + + "golang.org/x/net/html" + "pageswiki/internal/store" +) + +const socialImagePath = "/static/social-card-v1.png" + +type socialMetadata struct { + Title, Description, URL, SiteName, Locale string + ShareText string + Image, ImageType, ImageAlt, Card string + ImageWidth, ImageHeight int + NoIndex bool +} + +var socialMacroPattern = regexp.MustCompile(`\{\{[^{}]*\}\}`) + +func socialText(raw string, limit int) string { + raw = strings.Map(func(r rune) rune { + if unicode.IsControl(r) && !unicode.IsSpace(r) { + return -1 + } + return r + }, raw) + runes := []rune(strings.Join(strings.Fields(socialMacroPattern.ReplaceAllString(raw, " ")), " ")) + if len(runes) > limit { + return string(runes[:limit-1]) + "…" + } + return string(runes) +} + +// Parse only a bounded prefix of canonical HTML, never an expanded macro, +// embedded document, script, external image or user-specific projection. +func socialHTML(raw string) (string, string) { + z := html.NewTokenizer(io.LimitReader(strings.NewReader(raw), 64<<10)) + z.SetMaxBuf(64 << 10) + var heading, text strings.Builder + skip, inHeading, headingDone := "", false, false + for { + kind := z.Next() + if kind == html.ErrorToken { + break + } + token := z.Token() + if skip != "" { + if kind == html.EndTagToken && token.Data == skip { + skip = "" + } + continue + } + if kind == html.StartTagToken { + switch token.Data { + case "script", "style", "template", "iframe", "noscript", "svg": + skip = token.Data + continue + } + if token.Data == "h1" && !headingDone { + inHeading = true + } + } + if kind == html.EndTagToken && token.Data == "h1" { + inHeading = false + headingDone = true + } + if kind == html.TextToken { + text.WriteString(token.Data) + if inHeading { + heading.WriteString(token.Data) + } + } else { + text.WriteByte(' ') + } + } + return socialText(heading.String(), 90), socialText(text.String(), 200) +} + +// Configured Domain/Campus identity is authoritative. Never let forwarded Host, +// Origin, query strings or credentials contaminate URLs sent to third parties. +func (s *Server) socialOrigin(r *http.Request) string { + host, err := s.store.GetDomainEffectiveHost(s.domainUUIDForRequest(r)) + if err != nil || host == "" || strings.ContainsAny(host, "/\\?#@ \t\r\n") { + return "" + } + scheme := "https" + if host == "localhost" || net.ParseIP(host) != nil { + if r.TLS == nil { + scheme = "http" + } + if requestHost, port, err := net.SplitHostPort(r.Host); err == nil && requestHost == host { + host = net.JoinHostPort(host, port) + } + if strings.Contains(host, ":") && !strings.HasPrefix(host, "[") && net.ParseIP(host) != nil { + host = "[" + host + "]" + } + } + return (&url.URL{Scheme: scheme, Host: host}).String() +} + +func (s *Server) socialMetadataForRequest(r *http.Request, name string, data map[string]any) *socialMetadata { + switch name { + case "anonymous_view.gohtml", "page.gohtml", "home.gohtml", "search_home.gohtml", "city_map.gohtml", "city_node.gohtml": + default: + return nil + } + domain := s.domainUUIDForRequest(r) + origin := s.socialOrigin(r) + if origin == "" { + return nil + } + mode, err := s.store.GetConfigInDomain(domain, "authorization_mode") + noIndex := err != nil || mode == "enforcing" && !(name == "anonymous_view.gohtml" && isAnonymousProjection(r)) + site := socialText(s.getWikiName(domain), 90) + m := &socialMetadata{Title: site, Description: site, SiteName: site, Locale: "en_US", URL: origin + cityPageHref(r.URL.Path), Image: origin + socialImagePath, ImageType: "image/png", ImageAlt: "Pages Wiki · Knowledge City", ImageWidth: 1200, ImageHeight: 630, Card: "summary_large_image", NoIndex: noIndex} + if strings.HasPrefix(s.getLocale(domain), "ja") { + m.Locale = "ja_JP" + } + if title, ok := data["Title"].(string); ok && title != "" { + m.Title = socialText(title, 90) + } + if source, ok := data["SocialSource"].(string); ok { + title, description := socialHTML(source) + if title != "" { + m.Title = title + } + if description != "" { + m.Description = description + } + } + if view, ok := data["ContentView"].(contentView); ok { + if view.Kind != "html" { + m.Description = socialText(view.Filename+" · "+view.ContentType, 200) + } + mime := strings.ToLower(strings.Split(view.ContentType, ";")[0]) + // Use the semantic address so the image always follows the current + // public document; no private asset/revision URLs or foreground decode. + if view.Kind == "image" && view.SizeBytes > 0 && view.SizeBytes < 5<<20 && (mime == "image/png" || mime == "image/jpeg" || mime == "image/gif" || mime == "image/webp") { + if path, ok := data["Path"].(string); ok && strings.HasPrefix(path, "/") { + m.Image = origin + cityPageHref("/v/raw/path:"+path) + m.ImageType, m.ImageAlt, m.ImageWidth, m.ImageHeight = mime, m.Title, 0, 0 + m.Card = "summary" + } + } + } + if node, ok := data["Node"].(store.CityNodeDetail); ok { + parent := "" + if node.Quartier != nil { + parent = node.Quartier.Name + } + m.URL = origin + cityDetailHref(node.Kind, node.Name, parent, node.UUID) + m.Description = socialText(node.Description, 200) + if m.Description == "" { + m.Description = socialText(node.PathPrefix+" · "+site, 200) + } + } + if r.URL.Path == "/" { + m.Title = site + } + pageTitle := strings.TrimSpace(m.Title) + if pageTitle == "" || pageTitle == site { + candidate := path.Base(strings.TrimSuffix(r.URL.Path, "/")) + if candidate != "." && candidate != "/" && candidate != "" { + pageTitle = candidate + } + } + // The X intent receives the canonical URL separately. Keep ShareText + // limited to the human-readable title so callers do not duplicate it. + m.ShareText = pageTitle + " - " + site + return m +} diff --git a/internal/server/social_metadata_test.go b/internal/server/social_metadata_test.go new file mode 100644 index 0000000..1077426 --- /dev/null +++ b/internal/server/social_metadata_test.go @@ -0,0 +1,247 @@ +package server + +import ( + "bytes" + "image/png" + "net/http" + "net/http/httptest" + "net/url" + "strings" + "testing" + + "golang.org/x/net/html" +) + +func socialTags(t *testing.T, body string) map[string]string { + t.Helper() + doc, err := html.Parse(strings.NewReader(body)) + if err != nil { + t.Fatal(err) + } + out := map[string]string{} + var walk func(*html.Node) + walk = func(n *html.Node) { + if n.Type == html.ElementNode && n.Data == "head" { + for c := n.FirstChild; c != nil; c = c.NextSibling { + attrs := map[string]string{} + for _, a := range c.Attr { + attrs[a.Key] = a.Val + } + if c.Data == "meta" { + key := attrs["property"] + if key == "" { + key = attrs["name"] + } + if _, exists := out[key]; exists { + t.Fatalf("duplicate meta %s", key) + } + out[key] = attrs["content"] + } + if c.Data == "link" && attrs["rel"] == "canonical" { + out["canonical"] = attrs["href"] + } + } + return + } + for c := n.FirstChild; c != nil; c = c.NextSibling { + walk(c) + } + } + walk(doc) + return out +} + +func TestSocialPublicCardsAndPrivacy(t *testing.T) { + s, token, domain := configFixture(t) + s.mux.HandleFunc("/", s.handleHome) + s.mux.HandleFunc("/v/city", s.handleCityMap) + s.mux.HandleFunc("/v/city/", s.handleCityMap) + s.mux.HandleFunc("/v/raw/", s.handleRawView) + path := "/guide/日本語?#%" + object, err := s.store.CreatePageAtPathInDomain(domain, path) + if err != nil { + t.Fatal(err) + } + body := `

    日本語 & "タイトル" <test>

    共有用の短い説明です。

    {{children:/hidden}}` + if _, err = s.store.SaveRevisionContent(object, []byte(body), "", "ja", "text/html", "guide.html"); err != nil { + t.Fatal(err) + } + call := func(route, auth string) *httptest.ResponseRecorder { + r := httptest.NewRequest("GET", "http://localhost"+route, nil) + r.Header.Set("User-Agent", "Twitterbot/1.0") + if auth != "" { + r.Header.Set("Authorization", "Bearer "+auth) + } + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + return w + } + route := (&url.URL{Path: path, RawQuery: "token=DO_NOT_SHARE&comic=1"}).String() + w := call(route, "") + if w.Code != 303 || strings.Contains(w.Body.String(), "共有用") || strings.Contains(w.Body.String(), "og:title") { + t.Fatalf("private crawler response=%d", w.Code) + } + w = call(route, token) + tags := socialTags(t, w.Body.String()) + if w.Code != 200 || tags["robots"] == "" || tags["og:title"] != "" { + t.Fatalf("private authenticated tags=%v status=%d", tags, w.Code) + } + if err = s.store.SetConfigInDomain(domain, "authorization_mode", "legacy"); err != nil { + t.Fatal(err) + } + w = call(route, "") + tags = socialTags(t, w.Body.String()) + if w.Code != 200 || tags["og:title"] != `日本語 & "タイトル" ` || tags["twitter:title"] != tags["og:title"] { + t.Fatalf("public tags=%v status=%d", tags, w.Code) + } + if !strings.Contains(tags["og:description"], "共有用") { + t.Fatalf("description=%s", tags["og:description"]) + } + for _, value := range tags { + for _, secret := range []string{"DO_NOT_SHARE", "SCRIPT_SECRET", "STYLE_SECRET", "TEMPLATE_SECRET", "children", "hidden"} { + if strings.Contains(value, secret) { + t.Fatalf("metadata leaked %s: %s", secret, value) + } + } + } + wantURL := "http://localhost" + cityPageHref(path) + if tags["og:url"] != wantURL || tags["canonical"] != wantURL || tags["og:locale"] != "ja_JP" || tags["twitter:card"] != "summary_large_image" { + t.Fatalf("URL/card tags=%v", tags) + } + imageURL, err := url.Parse(tags["og:image"]) + if err != nil { + t.Fatal(err) + } + imageResponse := call(imageURL.RequestURI(), "") + config, err := png.DecodeConfig(bytes.NewReader(imageResponse.Body.Bytes())) + if err != nil || imageResponse.Code != 200 || config.Width != 1200 || config.Height != 630 { + t.Fatalf("image=%+v %v status=%d", config, err, imageResponse.Code) + } + // Original public image documents use their correctly escaped raw address. + imagePath := "/media/image?#%.png" + imageObject, err := s.store.CreatePageAtPathInDomain(domain, imagePath) + if err != nil { + t.Fatal(err) + } + if _, err = s.store.SaveRevisionContent(imageObject, defaultSocialImage(), "", "ja", "image/png", "image.png"); err != nil { + t.Fatal(err) + } + w = call(cityPageHref(imagePath), "") + tags = socialTags(t, w.Body.String()) + if tags["og:image"] != "http://localhost"+cityPageHref("/v/raw/path:"+imagePath) || tags["twitter:card"] != "summary" { + t.Fatalf("image card=%v", tags) + } + imageURL, _ = url.Parse(tags["og:image"]) + if w = call(imageURL.RequestURI(), ""); w.Code != 200 || !bytes.Equal(w.Body.Bytes(), defaultSocialImage()) { + t.Fatalf("raw image status=%d", w.Code) + } + for _, layout := range []string{"classic", "search", "directory"} { + if err = s.store.SetConfigInDomain(domain, "home_layout", layout); err != nil { + t.Fatal(err) + } + w = call("/", "") + if w.Code != 200 || socialTags(t, w.Body.String())["og:url"] != "http://localhost/" { + t.Fatalf("home %s=%d", layout, w.Code) + } + } + q, err := s.store.CreateZoneAtPath(domain, "actor", "quartier", "", "guide", "Guide", "City description", "/guide") + if err != nil { + t.Fatal(err) + } + w = call("/v/city/q/uuid:"+q, "") + tags = socialTags(t, w.Body.String()) + if w.Code != 200 || tags["og:url"] != "http://localhost/v/city/q/guide" || tags["og:description"] != "City description" { + t.Fatalf("City tags=%v status=%d", tags, w.Code) + } + // Revocation is evaluated anew; public metadata is never cached by principal. + if err = s.store.SetConfigInDomain(domain, "authorization_mode", "enforcing"); err != nil { + t.Fatal(err) + } + if w = call(route, ""); w.Code != 303 { + t.Fatalf("revoked crawler=%d", w.Code) + } +} + +func TestSocialOriginAndBoundedExtraction(t *testing.T) { + s, _, domain := configFixture(t) + if _, err := s.store.DB.Exec(`UPDATE campuses SET fqdn='wiki.example.test' WHERE uuid=(SELECT campus_uuid FROM domains WHERE uuid=?)`, domain); err != nil { + t.Fatal(err) + } + r := httptest.NewRequest("GET", "http://wiki.example.test/", nil) + r.Header.Set("X-Forwarded-Host", "evil.test") + r.Header.Set("X-Forwarded-Proto", "http") + r.Header.Set("Origin", "https://evil.test") + if got := s.socialOrigin(r); got != "https://wiki.example.test" { + t.Fatalf("origin=%s", got) + } + if got := s.socialOrigin(httptest.NewRequest("GET", "http://evil.test/", nil)); got != "" { + t.Fatalf("unknown host=%s", got) + } + title, description := socialHTML(`

    ` + strings.Repeat("あ", 100) + `

    ` + strings.Repeat("い", 1<<20) + `

    OUTSIDE_BOUND

    `) + if len([]rune(title)) > 90 || len([]rune(description)) > 200 || strings.Contains(description, "OUTSIDE_BOUND") { + t.Fatal("unbounded metadata") + } + for _, mime := range []string{"image/svg+xml", "application/pdf"} { + if err := s.store.SetConfigInDomain(domain, "authorization_mode", "legacy"); err != nil { + t.Fatal(err) + } + m := s.socialMetadataForRequest(r, "page.gohtml", map[string]any{"Path": "/test", "ContentView": contentView{Kind: "image", ContentType: mime, SizeBytes: 20}}) + if m.Image != "https://wiki.example.test"+socialImagePath { + t.Fatalf("unsupported image=%s", m.Image) + } + } +} + +func TestSocialMetadataTitleAndShareTextUnderEnforcing(t *testing.T) { + s, _, domain := configFixture(t) + if err := s.store.SetConfigInDomain(domain, "authorization_mode", "enforcing"); err != nil { + t.Fatal(err) + } + r := httptest.NewRequest("GET", "http://localhost/notes/article", nil) + m := s.socialMetadataForRequest(r, "page.gohtml", map[string]any{ + "Title": "Registered article title", + "SocialSource": `

    Visible heading

    summary

    `, + }) + if m == nil { + t.Fatal("missing metadata") + } + if !m.NoIndex { + t.Fatal("enforcing metadata must remain noindex") + } + if m.Title != "Visible heading" { + t.Fatalf("title=%q", m.Title) + } + if m.ShareText != "Visible heading - "+s.getWikiName(domain) { + t.Fatalf("share text=%q", m.ShareText) + } + if strings.Contains(m.ShareText, m.URL) || strings.Contains(m.ShareText, "\n") { + t.Fatalf("share text must not duplicate URL: %q", m.ShareText) + } +} + +func TestSocialImageHTTP(t *testing.T) { + for _, method := range []string{"GET", "HEAD", "POST"} { + r := httptest.NewRequest(method, socialImagePath, nil) + w := httptest.NewRecorder() + handleSocialImage(w, r) + if method == "POST" { + if w.Code != 405 { + t.Fatal(w.Code) + } + continue + } + if w.Code != 200 || w.Header().Get("Content-Type") != "image/png" { + t.Fatalf("%s=%d", method, w.Code) + } + if method == "HEAD" && w.Body.Len() != 0 { + t.Fatal("HEAD body") + } + } + r := httptest.NewRequest("GET", socialImagePath, nil) + r.Header.Set("If-None-Match", `"social-card-v1"`) + w := httptest.NewRecorder() + handleSocialImage(w, r) + if w.Code != http.StatusNotModified || w.Body.Len() != 0 { + t.Fatalf("conditional=%d", w.Code) + } +} diff --git a/internal/server/structured_view.go b/internal/server/structured_view.go new file mode 100644 index 0000000..bebd0c9 --- /dev/null +++ b/internal/server/structured_view.go @@ -0,0 +1,318 @@ +package server + +import ( + "archive/tar" + "archive/zip" + "bufio" + "bytes" + "compress/gzip" + "debug/pe" + "encoding/base64" + "encoding/csv" + "encoding/json" + "fmt" + "io" + "math" + "mime" + "mime/multipart" + "mime/quotedprintable" + "net/mail" + "net/url" + "path/filepath" + "strconv" + "strings" + "unicode/utf8" +) + +type archiveEntryView struct { + Name string `json:"name"` + Size uint64 `json:"size"` + IsDir bool `json:"is_dir"` + IsImage bool `json:"is_image"` + URL string `json:"url,omitempty"` +} + +type metadataView struct { + Name string + Value string +} + +func structuredContentView(view *contentView, body []byte, semanticPath string) { + switch view.AdapterID { + case "csv": + parseCSVView(view, body) + case "excalidraw": + parseExcalidrawView(view, body) + case "archive": + if !strings.EqualFold(filepath.Ext(view.Filename), ".zip") { + view.MetadataStatus = "pending" + view.MetadataURL = metadataProjectionURL("archive", view.RevisionUUID, semanticPath) + break + } + reader, err := zip.NewReader(bytes.NewReader(body), int64(len(body))) + if err != nil { + view.ParseError = err.Error() + return + } + for _, file := range reader.File { + if len(view.ArchiveEntries) >= maxArchiveMetadataEntries { + view.ArchiveTruncated = true + break + } + ext := strings.ToLower(filepath.Ext(file.Name)) + query := url.Values{"path": {semanticPath}, "entry": {file.Name}, "rev": {view.RevisionUUID}} + view.ArchiveEntries = append(view.ArchiveEntries, archiveEntryView{ + Name: file.Name, Size: file.UncompressedSize64, + IsDir: file.FileInfo().IsDir(), + IsImage: ext == ".jpg" || ext == ".jpeg" || ext == ".png" || + ext == ".gif" || ext == ".webp" || ext == ".avif", + URL: "/v/archive?" + query.Encode(), + }) + } + case "eml": + message, err := mail.ReadMessage(bytes.NewReader(body)) + if err != nil { + view.ParseError = err.Error() + return + } + for _, name := range []string{"From", "To", "Cc", "Date", "Subject", "Message-ID"} { + if value := message.Header.Get(name); value != "" { + if decoded, err := new(mime.WordDecoder).DecodeHeader(value); err == nil { + value = decoded + } + view.Metadata = append(view.Metadata, metadataView{name, value}) + } + } + view.Text = emailText(message.Header, message.Body) + case "pe": + file, err := pe.NewFile(bytes.NewReader(body)) + if err != nil { + view.ParseError = err.Error() + return + } + defer file.Close() + view.Metadata = append(view.Metadata, + metadataView{"Machine", fmt.Sprintf("0x%04x", file.FileHeader.Machine)}, + metadataView{"Sections", strconv.Itoa(int(file.FileHeader.NumberOfSections))}, + metadataView{"Timestamp", strconv.FormatUint(uint64(file.FileHeader.TimeDateStamp), 10)}, + metadataView{"Characteristics", fmt.Sprintf("0x%04x", file.FileHeader.Characteristics)}, + ) + for _, section := range file.Sections { + view.Metadata = append(view.Metadata, metadataView{ + "Section " + section.Name, + fmt.Sprintf("virtual=%d raw=%d", section.VirtualSize, section.Size), + }) + } + case "debian-package": + parseDebianPackage(view, body) + } +} + +const ( + maxExcalidrawBytes = 2 << 20 + maxExcalidrawElements = 5000 + maxExcalidrawPoints = 100000 + maxExcalidrawText = 1 << 20 +) + +func parseExcalidrawView(view *contentView, body []byte) { + if len(body) > maxExcalidrawBytes { + view.ParseError = "Excalidraw scene exceeds the 2 MiB interactive limit" + return + } + var scene struct { + Type string `json:"type"` + Elements []json.RawMessage `json:"elements"` + } + if err := json.Unmarshal(body, &scene); err != nil { + view.ParseError = err.Error() + return + } + if scene.Type != "excalidraw" { + view.ParseError = "invalid Excalidraw scene type" + return + } + if len(scene.Elements) > maxExcalidrawElements { + view.ParseError = "Excalidraw scene exceeds the 5000 element limit" + return + } + pointsTotal := 0 + textTotal := 0 + for _, raw := range scene.Elements { + var element struct { + Type string `json:"type"` + X float64 `json:"x"` + Y float64 `json:"y"` + W float64 `json:"width"` + H float64 `json:"height"` + Points [][]float64 `json:"points"` + Text string `json:"text"` + } + if err := json.Unmarshal(raw, &element); err != nil || element.Type == "" || + math.IsNaN(element.X) || math.IsInf(element.X, 0) || + math.IsNaN(element.Y) || math.IsInf(element.Y, 0) || + math.IsNaN(element.W) || math.IsInf(element.W, 0) || + math.IsNaN(element.H) || math.IsInf(element.H, 0) { + view.ParseError = "invalid Excalidraw element" + return + } + pointsTotal += len(element.Points) + textTotal += len(element.Text) + if pointsTotal > maxExcalidrawPoints || textTotal > maxExcalidrawText { + view.ParseError = "Excalidraw scene complexity exceeds the interactive limit" + return + } + for _, point := range element.Points { + if len(point) < 2 || math.IsNaN(point[0]) || math.IsInf(point[0], 0) || + math.IsNaN(point[1]) || math.IsInf(point[1], 0) { + view.ParseError = "invalid Excalidraw point" + return + } + } + } + view.ExcalidrawValid = true + view.ExcalidrawElements = len(scene.Elements) +} + +const ( + maxCSVRows = 500 + maxCSVColumns = 100 + maxCSVCellBytes = 16 << 10 +) + +func parseCSVView(view *contentView, body []byte) { + reader := csv.NewReader(bytes.NewReader(body)) + reader.FieldsPerRecord = -1 + for len(view.CSVRows) < maxCSVRows { + record, err := reader.Read() + if err == io.EOF { + return + } + if err != nil { + // A bounded initial window can end halfway through its final record. + view.CSVTruncated = true + if len(view.CSVRows) == 0 { + view.ParseError = err.Error() + } + return + } + if len(record) > maxCSVColumns { + record = record[:maxCSVColumns] + view.CSVTruncated = true + } + for index, cell := range record { + if len(cell) > maxCSVCellBytes { + prefix := []byte(cell[:maxCSVCellBytes]) + for len(prefix) > 0 && !utf8.Valid(prefix) { + prefix = prefix[:len(prefix)-1] + } + record[index] = string(prefix) + "…" + view.CSVTruncated = true + } + } + view.CSVRows = append(view.CSVRows, record) + } + if _, err := reader.Read(); err != io.EOF { + view.CSVTruncated = true + } +} + +func emailText(header mail.Header, body io.Reader) string { + mediaType, params, _ := mime.ParseMediaType(header.Get("Content-Type")) + if strings.HasPrefix(mediaType, "multipart/") && params["boundary"] != "" { + reader := multipart.NewReader(body, params["boundary"]) + for { + part, err := reader.NextPart() + if err != nil { + break + } + partType, _, _ := mime.ParseMediaType(part.Header.Get("Content-Type")) + if partType == "text/plain" || partType == "text/html" || partType == "" { + return readMailBody(part.Header.Get("Content-Transfer-Encoding"), part) + } + } + return "" + } + return readMailBody(header.Get("Content-Transfer-Encoding"), body) +} + +func readMailBody(encoding string, body io.Reader) string { + switch strings.ToLower(strings.TrimSpace(encoding)) { + case "quoted-printable": + body = quotedprintable.NewReader(body) + case "base64": + body = base64.NewDecoder(base64.StdEncoding, body) + } + payload, _ := io.ReadAll(io.LimitReader(body, 4<<20)) + return string(payload) +} + +func parseDebianPackage(view *contentView, body []byte) { + reader := bufio.NewReader(bytes.NewReader(body)) + magic := make([]byte, 8) + if _, err := io.ReadFull(reader, magic); err != nil || string(magic) != "!\n" { + view.ParseError = "invalid Debian ar archive" + return + } + for { + header := make([]byte, 60) + if _, err := io.ReadFull(reader, header); err != nil { + break + } + name := strings.TrimSpace(strings.TrimSuffix(string(header[:16]), "/")) + size, err := strconv.ParseInt(strings.TrimSpace(string(header[48:58])), 10, 64) + if err != nil || size < 0 { + view.ParseError = "invalid ar member" + return + } + payload := make([]byte, size) + if _, err := io.ReadFull(reader, payload); err != nil { + view.ParseError = err.Error() + return + } + if size%2 != 0 { + _, _ = reader.ReadByte() + } + view.Metadata = append(view.Metadata, metadataView{"Member", fmt.Sprintf("%s (%d bytes)", name, size)}) + if name == "debian-binary" { + view.Metadata = append(view.Metadata, metadataView{"Debian format", strings.TrimSpace(string(payload))}) + } + if name == "control.tar.gz" { + parseDebControl(view, payload) + } + } +} + +func parseDebControl(view *contentView, payload []byte) { + gz, err := gzip.NewReader(bytes.NewReader(payload)) + if err != nil { + return + } + defer gz.Close() + tr := tar.NewReader(gz) + for { + header, err := tr.Next() + if err != nil { + return + } + if strings.TrimPrefix(header.Name, "./") != "control" { + continue + } + control, _ := io.ReadAll(io.LimitReader(tr, 1<<20)) + view.Text = string(control) + message, err := mail.ReadMessage(bytes.NewReader(append(control, '\n', '\n'))) + if err == nil { + for name, values := range message.Header { + view.Metadata = append(view.Metadata, metadataView{name, strings.Join(values, ", ")}) + } + } + return + } +} + +func archiveEntryContentType(name string, data []byte) string { + if byExtension := mime.TypeByExtension(strings.ToLower(filepath.Ext(name))); byExtension != "" { + return byExtension + } + return "application/octet-stream" +} diff --git a/internal/server/system_extensions.go b/internal/server/system_extensions.go new file mode 100644 index 0000000..1d013b8 --- /dev/null +++ b/internal/server/system_extensions.go @@ -0,0 +1,56 @@ +package server + +import ( + "encoding/json" + "net/http" + systemext "pageswiki/internal/extensions" +) + +func (s *Server) handleSystemExtensions(w http.ResponseWriter, r *http.Request) { + domainUUID := s.domainUUIDForRequest(r) + if kind, _ := periodicalRoute(r.URL.Path); kind != "" { + s.handlePeriodical(w, r) + return + } + if r.URL.Path != "/_/api/v1/extension/" { + http.NotFound(w, r) + return + } + if !s.canManageAssets(r) { + http.Error(w, "forbidden", 403) + return + } + if r.Method == http.MethodPost { + var body struct { + ID string `json:"id"` + Enabled *bool `json:"enabled"` + } + if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 32<<10)).Decode(&body); err != nil || body.ID == "" || body.Enabled == nil { + http.Error(w, "id and enabled are required", http.StatusBadRequest) + return + } + known := false + for _, item := range systemext.Catalog() { + if item.ID == body.ID { + known = true + break + } + } + if !known { + http.Error(w, "unknown extension", http.StatusNotFound) + return + } + if err := s.setSystemExtensionEnabled(domainUUID, body.ID, *body.Enabled); err != nil { + http.Error(w, err.Error(), 500) + return + } + writeEventJSON(w, 200, map[string]any{"id": body.ID, "enabled": *body.Enabled}) + return + } + if r.Method != http.MethodGet { + w.Header().Set("Allow", "GET, POST") + http.Error(w, "method not allowed", 405) + return + } + writeEventJSON(w, 200, map[string]any{"api_version": 1, "extensions": s.systemExtensionCatalog(domainUUID), "external_installation": false}) +} diff --git a/internal/server/task_daily_notes_test.go b/internal/server/task_daily_notes_test.go new file mode 100644 index 0000000..2b2ad1f --- /dev/null +++ b/internal/server/task_daily_notes_test.go @@ -0,0 +1,296 @@ +package server + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "net/http/httptest" + "strings" + "testing" + "time" + + "github.com/google/uuid" + "pageswiki/internal/store" +) + +func TestTaskDailyHierarchyPaging(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + save := func(i store.TaskRecord) store.TaskRecord { + t.Helper() + v, e := s.store.SaveTask(ctx, domain, actor, i, i.Version) + if e != nil { + t.Fatal(e) + } + return v + } + parent := save(newTaskRecord("task", "Parent")) + other := save(newTaskRecord("task", "Other")) + child := newTaskRecord("task", "Child") + child.ParentUUID = parent.UUID + child.PlannedOn = "2026-09-26" + child = save(child) + // A newer child must not split the family from its parent across pages. + for id, stamp := range map[string]int{parent.UUID: 1, other.UUID: 2, child.UUID: 3} { + if _, e := s.store.DB.Exec(`UPDATE organizer_items SET created_at_ms=? WHERE uuid=?`, stamp, id); e != nil { + t.Fatal(e) + } + } + q := store.TaskQuery{Kind: "task", View: "all", Today: "2026-09-25", Limit: 1, Hierarchy: true} + ids := []string{} + for { + items, next, e := s.store.ListTasks(ctx, domain, actor, q) + if e != nil { + t.Fatal(e) + } + for _, i := range items { + ids = append(ids, i.UUID) + } + if next == "" { + break + } + q.Before = next + if len(ids) > 4 { + t.Fatal("cursor loop") + } + } + if strings.Join(ids, ",") != strings.Join([]string{other.UUID, parent.UUID, child.UUID}, ",") { + t.Fatal("family ordering", ids) + } + w := taskRequest(s, token, "GET", "items?view=day&date=2026-09-26&hierarchy=1", nil, "") + var body struct{ Items, Parents []store.TaskRecord } + if w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + json.Unmarshal(w.Body.Bytes(), &body) + if len(body.Items) != 1 || body.Items[0].UUID != child.UUID || len(body.Parents) != 1 || body.Parents[0].UUID != parent.UUID || body.Parents[0].Notes != "" { + t.Fatal(w.Body) + } + parent.PlannedOn = "2026-09-24" + parent = save(parent) + q = store.TaskQuery{Kind: "task", View: "carryover", Today: "2026-09-25", Hierarchy: true} + items, _, e := s.store.ListTasks(ctx, domain, actor, q) + if e != nil || len(items) != 1 || items[0].UUID != parent.UUID { + t.Fatal(items, e) + } + parent.PlannedOn = "2026-09-26" + parent = save(parent) + items, _, e = s.store.ListTasks(ctx, domain, actor, q) + if e != nil || len(items) != 0 { + t.Fatal("carryover rescheduling", items, e) + } + child.DueOn = "2026-09-24" + save(child) + items, _, e = s.store.ListTasks(ctx, domain, actor, q) + if e != nil || len(items) != 1 || items[0].DueOn != "2026-09-24" { + t.Fatal("overdue independent of plan", items, e) + } + for _, bad := range []string{"", "2026-02-30", "2026/09/26"} { + if w = taskRequest(s, token, "GET", "items?view=day&date="+bad, nil, ""); w.Code != 422 { + t.Fatal("bad date", bad, w.Code) + } + } + for _, p := range []string{"/v/plan/tasks/carryover", "/v/plan/tasks/tomorrow", "/v/plan/tasks/day/2026/09/26"} { + r := httptest.NewRequest("GET", "http://localhost"+p, nil) + r.Header.Set("Authorization", "Bearer "+token) + w = httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + if w.Code != 200 { + t.Fatal(p, w.Code, w.Body) + } + if strings.HasSuffix(p, "tomorrow") { + date := time.Now().In(s.getLocation(domain)).AddDate(0, 0, 1).Format("2006-01-02") + if !strings.Contains(w.Body.String(), `data-selected-date="`+date+`"`) { + t.Fatal("domain tomorrow date missing") + } + } + } +} + +func TestTaskWikiNotesAtomicCreation(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + save := func(i store.TaskRecord) store.TaskRecord { + t.Helper() + v, e := s.store.SaveTask(ctx, domain, actor, i, i.Version) + if e != nil { + t.Fatal(e) + } + return v + } + root, e := s.store.CreatePageAtPathInDomain(domain, "/projects/wiki") + if e != nil { + t.Fatal(e) + } + project := newTaskRecord("project", "Wiki") + project.PageUUID = root + project.NotesSubpath = "work/notes" + project = save(project) + task := newTaskRecord("task", "実装 ") + task.ProjectUUID = project.UUID + task = save(task) + endpoint := "items/" + task.UUID + "/note" + w := taskRequest(s, token, "GET", endpoint, nil, "") + var result struct { + Item store.TaskRecord + Path, URL string + EditURL string `json:"edit_url"` + Linked, Exists, Writable bool + } + if w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + json.Unmarshal(w.Body.Bytes(), &result) + target := "/projects/wiki/work/notes/実装 " + if result.Path != target || result.Linked || result.Exists || !result.Writable { + t.Fatal(w.Body) + } + if _, e = s.store.ResolvePathInDomain(domain, target); !errors.Is(e, sql.ErrNoRows) { + t.Fatal("GET created a page", e) + } + if w = taskRequest(s, token, "POST", endpoint, map[string]string{"path": target}, ""); w.Code != 428 { + t.Fatal(w.Code) + } + if w = taskRequest(s, token, "POST", endpoint, map[string]string{"path": "/unconfirmed"}, `"1"`); w.Code != 412 { + t.Fatal("unconfirmed target", w.Code, w.Body) + } + // Rejecting the task journal must also roll back the object, path and revision. + if _, e = s.store.DB.Exec(`CREATE TRIGGER reject_task_note BEFORE INSERT ON organizer_changes BEGIN SELECT RAISE(ABORT,'fixture'); END`); e != nil { + t.Fatal(e) + } + w = taskRequest(s, token, "POST", endpoint, map[string]string{"path": target}, `"1"`) + if w.Code != 500 { + t.Fatal("rollback fixture", w.Code, w.Body) + } + if _, e = s.store.ResolvePathInDomain(domain, target); !errors.Is(e, sql.ErrNoRows) { + t.Fatal("orphan note", e) + } + if _, e = s.store.DB.Exec(`DROP TRIGGER reject_task_note`); e != nil { + t.Fatal(e) + } + w = taskRequest(s, token, "POST", endpoint, map[string]string{"path": target}, `"1"`) + if w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + json.Unmarshal(w.Body.Bytes(), &result) + if !result.Linked || result.Item.PageUUID == "" || result.Item.Version != 2 || !strings.HasPrefix(result.EditURL, "/e/-/projects/wiki/") { + t.Fatal(w.Body) + } + rev, e := s.store.GetLatestRevision(result.Item.PageUUID) + if e != nil || rev.Body != "

    実装 <draft>

    \n" { + t.Fatal("note title escaping", rev, e) + } + if w = taskRequest(s, token, "POST", endpoint, map[string]string{"path": target}, `"1"`); w.Code != 412 { + t.Fatal("stale creation retry", w.Code) + } + if _, e = s.store.DB.Exec(`UPDATE paths SET path='/projects/wiki/moved' WHERE domain_uuid=? AND object_uuid=?`, domain, result.Item.PageUUID); e != nil { + t.Fatal(e) + } + w = taskRequest(s, token, "GET", endpoint, nil, "") + json.Unmarshal(w.Body.Bytes(), &result) + if result.Path != "/projects/wiki/moved" { + t.Fatal("UUID did not follow rename", w.Body) + } + if _, e = s.store.DB.Exec(`UPDATE principals SET state='readonly' WHERE uuid=?`, actor); e != nil { + t.Fatal(e) + } + w = taskRequest(s, token, "GET", endpoint, nil, "") + json.Unmarshal(w.Body.Bytes(), &result) + if w.Code != 200 || result.Writable { + t.Fatal("readonly", w.Code, w.Body) + } + if w = taskRequest(s, token, "POST", endpoint, nil, `"2"`); w.Code != 403 { + t.Fatal("readonly write", w.Code) + } +} + +func TestTaskNoteCollisionsAndProjectValidation(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + root, e := s.store.CreatePageAtPathInDomain(domain, "/projects/app") + if e != nil { + t.Fatal(e) + } + project := newTaskRecord("project", "App") + project.PageUUID = root + for _, sub := range []string{"../outside", "/absolute", "a/../b", "a//b", "a/_/edit", "a\nb"} { + bad := project + bad.NotesSubpath = sub + if _, e = s.store.SaveTask(ctx, domain, actor, bad, 0); !errors.Is(e, store.ErrTaskInvalid) { + t.Fatal(sub, e) + } + } + project, e = s.store.SaveTask(ctx, domain, actor, project, 0) + if e != nil { + t.Fatal(e) + } + task := newTaskRecord("task", "API / UI") + task.ProjectUUID = project.UUID + task, e = s.store.SaveTask(ctx, domain, actor, task, 0) + if e != nil { + t.Fatal(e) + } + target := store.TaskNotePath("/projects/app", project, task) + if target != "/projects/app/tasks/API - UI" { + t.Fatal(target) + } + existing, e := s.store.CreatePageAtPathInDomain(domain, target) + if e != nil { + t.Fatal(e) + } + w := taskRequest(s, token, "POST", "items/"+task.UUID+"/note", map[string]string{"path": target}, `"1"`) + if w.Code != 409 { + t.Fatal("collision", w.Code, w.Body) + } + current, e := s.store.GetTask(ctx, domain, actor, task.UUID) + if e != nil || current.PageUUID != "" || current.Version != 1 { + t.Fatal("collision mutated task", current, e) + } + bound, _ := s.store.ResolvePathInDomain(domain, target) + if bound != existing { + t.Fatal("existing page overwritten") + } + missing := newTaskRecord("task", "Unassigned") + missing, e = s.store.SaveTask(ctx, domain, actor, missing, 0) + if e != nil { + t.Fatal(e) + } + if w = taskRequest(s, token, "GET", "items/"+missing.UUID+"/note", nil, ""); w.Code != 422 || !strings.Contains(w.Body.String(), "note_setup") { + t.Fatal(w.Code, w.Body) + } + if w = taskRequest(s, token, "GET", "items/"+uuid.NewString()+"/note", nil, ""); w.Code != 404 { + t.Fatal(w.Code) + } + other, e := s.store.CreatePasswordAccount(domain, "noteother", "a long fixture password", "Other", "") + if e != nil { + t.Fatal(e) + } + otherToken, e := s.store.CreateAuthSession(domain, other.UUID) + if e != nil { + t.Fatal(e) + } + if w = taskRequest(s, otherToken, "GET", "items/"+task.UUID+"/note", nil, ""); w.Code != 404 { + t.Fatal("note ownership", w.Code, w.Body) + } + // Own private tasks do not grant write permission to a Wiki path. + ownProject := newTaskRecord("project", "Other project") + ownProject.PageUUID = root + ownProject, e = s.store.SaveTask(ctx, domain, other.UUID, ownProject, 0) + if e != nil { + t.Fatal(e) + } + ownTask := newTaskRecord("task", "No Wiki permission") + ownTask.ProjectUUID = ownProject.UUID + ownTask, e = s.store.SaveTask(ctx, domain, other.UUID, ownTask, 0) + if e != nil { + t.Fatal(e) + } + w = taskRequest(s, otherToken, "POST", "items/"+ownTask.UUID+"/note", map[string]string{"path": store.TaskNotePath("/projects/app", ownProject, ownTask)}, `"1"`) + if w.Code == 200 { + t.Fatal("task ownership granted Wiki access") + } + if _, e = s.store.ResolvePathInDomain(domain, store.TaskNotePath("/projects/app", ownProject, ownTask)); !errors.Is(e, sql.ErrNoRows) { + t.Fatal("unauthorized note created", e) + } +} diff --git a/internal/server/task_dav.go b/internal/server/task_dav.go new file mode 100644 index 0000000..c3faada --- /dev/null +++ b/internal/server/task_dav.go @@ -0,0 +1,544 @@ +package server + +import ( + "context" + "database/sql" + "encoding/xml" + "errors" + "io" + "mime" + "net/http" + "net/url" + "strings" + "time" + + "github.com/google/uuid" + mw "pageswiki/internal/server/middleware" + "pageswiki/internal/store" +) + +const taskDAVRoot = calendarDAV + "tasks/" +const taskDAVCollection = taskDAVRoot + "default/" + +func taskDAVName(item store.TaskRecord) string { + if item.CalDAV != nil { + return item.CalDAV.Name + } + return item.UUID + ".ics" +} +func taskDAVError(w http.ResponseWriter, status int, condition, message string) { + w.Header().Set("Content-Type", "application/xml; charset=utf-8") + w.WriteHeader(status) + io.WriteString(w, ``+xmlText(message)+``) +} +func taskDAVCollectionRow() davResponse { + return davResponse{href: taskDAVCollection, props: map[xml.Name]string{ + {Space: davNS, Local: "displayname"}: store.DefaultTaskDAVTitle, + {Space: davNS, Local: "resourcetype"}: "", + {Space: calNS, Local: "supported-calendar-component-set"}: ``, + {Space: calNS, Local: "supported-calendar-data"}: ``, + {Space: calNS, Local: "max-resource-size"}: "32768", + {Space: davNS, Local: "supported-report-set"}: ``, + }} +} +func taskDAVRow(item store.TaskRecord, prefixes ...string) (davResponse, error) { + prefix := taskDAVCollection + if len(prefixes) == 1 { + prefix = prefixes[0] + } + data, tag, e := taskICAL(item) + return davResponse{href: prefix + taskDAVName(item), props: map[xml.Name]string{ + {Space: davNS, Local: "resourcetype"}: "", {Space: davNS, Local: "getetag"}: xmlText(tag), {Space: davNS, Local: "getcontenttype"}: "text/calendar; charset=utf-8", {Space: calNS, Local: "calendar-data"}: xmlText(data), + {Space: davNS, Local: "getlastmodified"}: time.UnixMilli(item.UpdatedMS).UTC().Format(http.TimeFormat), + }}, e +} + +func (s *Server) handleTaskDAV(w http.ResponseWriter, r *http.Request) { + if rest, ok := strings.CutPrefix(r.URL.Path, taskDAVRoot+"projects/"); ok { + id := strings.Split(rest, "/")[0] + parsed, err := uuid.Parse(id) + if err != nil || parsed.String() != id { + http.NotFound(w, r) + return + } + s.handleTaskDAVAt(w, r, "tasks/projects/"+id) + return + } + s.handleTaskDAVAt(w, r, "") +} + +func (s *Server) handleTaskDAVAt(w http.ResponseWriter, r *http.Request, collectionPath string) { + if collectionPath != "" { + mw.SetDAVTaskTarget(r, strings.TrimSuffix(r.URL.Path, "/") != calendarDAV+collectionPath) + } + w.Header().Set("Cache-Control", "private, no-store") + domain := s.domainUUIDForRequest(r) + if !s.systemExtensionEnabled(domain, "organizer.tasks") { + http.NotFound(w, r) + return + } + ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second) + defer cancel() + r = r.WithContext(ctx) + actor, write, credential := "", false, "" + if len(r.Header.Values("Authorization")) == 1 { + if user, pass, ok := r.BasicAuth(); ok { + var err error + actor, write, err = s.store.AuthenticateTaskDAV(ctx, domain, user, pass) + if err != nil { + actor = "" + mw.SetDAVAuthOutcome(r, "basic_rejected") + } else { + mw.SetDAVAuthOutcome(r, "basic_accepted") + } + credential = user + } else { + actor, write = s.calendarActor(r) + mw.SetDAVAuthOutcome(r, "invalid_authorization") + if actor != "" { + mw.SetDAVAuthOutcome(r, "session_accepted") + } + } + } else if len(r.Header.Values("Authorization")) == 0 { + actor, write = s.calendarActor(r) + mw.SetDAVAuthOutcome(r, "missing") + if actor != "" { + mw.SetDAVAuthOutcome(r, "session_accepted") + } + } else { + mw.SetDAVAuthOutcome(r, "multiple_authorization") + } + if actor == "" { + w.Header().Set("WWW-Authenticate", `Basic realm="PagesWiki task CalDAV", charset="UTF-8"`) + w.WriteHeader(401) + return + } + s.setDAVCapabilities(w, r, actor, credential) + prefix, project, title := taskDAVCollection, "", store.DefaultTaskDAVTitle + if collectionPath != "" { + v, err := s.store.TaskDAVCollection(ctx, domain, actor, collectionPath) + if err != nil { + taskError(w, err) + return + } + prefix, project, title = calendarDAV+collectionPath+"/", v.UUID, v.Title + } else { + var err error + title, err = s.store.TaskDAVDefaultTitle(ctx, domain, actor) + if err != nil { + taskError(w, err) + return + } + } + w.Header().Set("Allow", "OPTIONS, PROPFIND, REPORT, GET, HEAD, PUT, DELETE") + if collectionPath == "" && strings.TrimSuffix(r.URL.Path, "/") == strings.TrimSuffix(taskDAVCollection, "/") { + w.Header().Set("Allow", "OPTIONS, PROPFIND, PROPPATCH, REPORT, GET, HEAD, PUT, DELETE") + } + if r.Method == "OPTIONS" { + w.WriteHeader(204) + return + } + root := collectionPath == "" && strings.TrimSuffix(r.URL.Path, "/") == strings.TrimSuffix(taskDAVRoot, "/") + collection := strings.TrimSuffix(r.URL.Path, "/") == strings.TrimSuffix(prefix, "/") + name := strings.TrimPrefix(r.URL.Path, prefix) + if !root && !collection && (!strings.HasPrefix(r.URL.Path, prefix) || !store.ValidTaskDAVName(name)) { + http.NotFound(w, r) + return + } + if r.Method == "PROPFIND" || r.Method == "REPORT" { + s.handleTaskDAVListing(w, r, domain, actor, root, collection, name, write, prefix, project, title) + return + } + if r.Method == "PROPPATCH" && collection && project == "" { + if !write { + taskError(w, store.ErrAccessDenied) + return + } + s.handleTaskDAVDefaultProperties(w, r, domain, actor, credential) + return + } + if root || collection { + w.WriteHeader(405) + return + } + item, err := s.store.TaskDAVByName(ctx, domain, actor, name, project) + exists := err == nil && !item.Archived + if err != nil && !errors.Is(err, sql.ErrNoRows) { + taskError(w, err) + return + } + if r.Method == "GET" || r.Method == "HEAD" { + if !exists { + http.NotFound(w, r) + return + } + data, tag, e := taskICAL(item) + if e != nil { + taskError(w, e) + return + } + w.Header().Set("ETag", tag) + w.Header().Set("Content-Type", "text/calendar; charset=utf-8") + if r.Header.Get("If-None-Match") == tag || r.Header.Get("If-None-Match") == "*" { + w.WriteHeader(304) + return + } + if r.Method == "GET" { + io.WriteString(w, data) + } + return + } + if r.Method != "PUT" && r.Method != "DELETE" { + w.WriteHeader(405) + return + } + if !write { + taskError(w, store.ErrAccessDenied) + return + } + mutate := func(v store.TaskRecord) store.TaskRecord { v.Archived = true; return v } + var data *store.TaskDAVData + if r.Method == "PUT" { + contentType, _, e := mime.ParseMediaType(r.Header.Get("Content-Type")) + if e != nil || contentType != "text/calendar" { + w.WriteHeader(415) + return + } + raw, e := io.ReadAll(http.MaxBytesReader(w, r.Body, 32768)) + if e != nil { + w.WriteHeader(413) + return + } + cal, e := parseTaskICAL(string(raw)) + if e != nil { + taskDAVError(w, 403, "valid-calendar-data", e.Error()) + return + } + uid, _ := cal.Children[0].Props.Text("UID") + encoded, e := encodeTaskICAL(cal) + if e != nil { + taskError(w, e) + return + } + data = &store.TaskDAVData{Name: name, UID: uid, Data: encoded} + mutate = func(v store.TaskRecord) store.TaskRecord { + v = taskFromICAL(cal, v) + v.Archived = false + return v + } + } + unconditional := r.Header.Get("If-Match") == "" && r.Header.Get("If-None-Match") == "" + // Accept unconditional client writes as last-committed-writer-wins, without + // weakening the store's CAS transaction. Rebase only DAV fields on each + // retry; never overwrite newer Web-only metadata with a stale task record. + originalID := item.UUID + for attempt := 0; attempt < 8; attempt++ { + if !taskDAVWritePreconditions(w, r, item, exists) { + return + } + if r.Method == "DELETE" && !exists { + http.NotFound(w, r) + return + } + candidate := item + if candidate.UUID == "" { + candidate = store.TaskRecord{UUID: uuid.NewString(), Kind: "task", Bucket: "inbox", ProjectUUID: project} + } + saved, e := s.store.SaveTaskDAV(ctx, domain, actor, mutate(candidate), item.Version, data, credential, project) + if e == nil { + if r.Method == "PUT" { + w.Header().Set("Location", prefix+taskDAVName(saved)) + } + // The representation is normalized: no PUT ETag (RFC 9110). + if r.Method == "PUT" && !exists { + w.WriteHeader(201) + } else { + w.WriteHeader(204) + } + return + } + if unconditional && (errors.Is(e, store.ErrTaskConflict) || item.UUID == "" && errors.Is(e, store.ErrTaskDAVIdentity)) { + fresh, readErr := s.store.TaskDAVByName(ctx, domain, actor, name, project) + if readErr == nil && (originalID == "" || fresh.UUID == originalID) { + item, exists = fresh, !fresh.Archived + originalID = fresh.UUID + continue + } + if readErr != nil && !errors.Is(readErr, sql.ErrNoRows) { + taskError(w, readErr) + return + } + // A concurrent move must not recreate a task in its old collection. + } + if errors.Is(e, store.ErrTaskDAVIdentity) { + taskDAVError(w, 403, "no-uid-conflict", "UID and resource identity must be unique and immutable") + return + } + taskError(w, e) + return + } + http.Error(w, "concurrent task updates; retry synchronization", http.StatusConflict) +} + +func taskDAVWritePreconditions(w http.ResponseWriter, r *http.Request, item store.TaskRecord, exists bool) bool { + match, none := r.Header.Get("If-Match"), r.Header.Get("If-None-Match") + if match == "" && none == "" { + return true + } + tag := "" + if exists { + var err error + _, tag, err = taskICAL(item) + if err != nil { + taskError(w, err) + return false + } + } + matches := func(value string, weak bool) bool { + for _, v := range strings.Split(value, ",") { + v = strings.TrimSpace(v) + if weak { + v = strings.TrimPrefix(v, "W/") + } + if exists && (v == "*" || v == tag) { + return true + } + } + return false + } + if match != "" && !matches(match, false) || none != "" && matches(none, true) { + w.WriteHeader(http.StatusPreconditionFailed) + return false + } + return true +} + +func (s *Server) handleTaskDAVListing(w http.ResponseWriter, r *http.Request, domain, actor string, root, collection bool, name string, writable bool, prefix, project, title string) { + depth := r.Header.Get("Depth") + if r.Method == "REPORT" && depth == "" { + depth = "0" + } + if depth != "0" && depth != "1" { + taskDAVError(w, 403, "supported-filter", "Depth 0 or 1 required") + return + } + n, e := readDAV(w, r) + if e != nil { + http.Error(w, "invalid XML", 400) + return + } + var req []davNode + if p := n.child(davNS, "prop"); p != nil { + req = p.Children + } + for _, p := range req { + if !taskDAVFullProperty(p) { + taskDAVError(w, 403, "supported-calendar-data", "property projections unsupported") + return + } + } + rows := []davResponse{} + collectionRow := taskDAVCollectionRow() + collectionRow.href = prefix + collectionRow.props[xml.Name{Space: davNS, Local: "displayname"}] = xmlText(title) + collectionRow.props[xml.Name{Space: davNS, Local: "current-user-privilege-set"}] = davPrivileges(writable) + collectionRow.props[xml.Name{Space: davNS, Local: "current-user-principal"}] = "" + taskDAVRoot + "" + if r.Method == "PROPFIND" { + if n.XMLName.Local != "" && (n.XMLName.Space != davNS || n.XMLName.Local != "propfind") { + w.WriteHeader(400) + return + } + if root { + rows = append(rows, davResponse{href: taskDAVRoot, props: map[xml.Name]string{ + {Space: davNS, Local: "displayname"}: "PagesWiki Task Home", {Space: davNS, Local: "resourcetype"}: "", + {Space: davNS, Local: "current-user-principal"}: "" + taskDAVRoot + "", {Space: davNS, Local: "principal-URL"}: "" + taskDAVRoot + "", {Space: calNS, Local: "calendar-home-set"}: "" + taskDAVRoot + "", + }}) + if depth == "1" { + rows = append(rows, collectionRow) + if !s.appendTaskDAVCollections(w, r, domain, actor, writable, &rows) { + return + } + } + } else if collection { + rows = append(rows, collectionRow) + if depth == "1" { + items, err := s.store.TaskDAVList(r.Context(), domain, actor, project) + if err != nil { + taskError(w, err) + return + } + for _, item := range items { + if err := r.Context().Err(); err != nil { + taskError(w, err) + return + } + row, err := taskDAVRow(item, prefix) + if err != nil { + taskError(w, err) + return + } + rows = append(rows, row) + } + } + } else { + item, err := s.store.TaskDAVByName(r.Context(), domain, actor, name, project) + if err != nil { + taskError(w, err) + return + } + if item.Archived { + http.NotFound(w, r) + return + } + row, err := taskDAVRow(item, prefix) + if err != nil { + taskError(w, err) + return + } + rows = append(rows, row) + } + writeDAV(w, rows, req) + return + } + if !collection || n.XMLName.Space != calNS { + w.WriteHeader(405) + return + } + if len(req) == 0 { + http.Error(w, "explicit properties required", 400) + return + } + seen := map[xml.Name]int{} + for _, child := range n.Children { + seen[child.XMLName]++ + allowed := child.XMLName.Space == davNS && child.XMLName.Local == "prop" || n.XMLName.Local == "calendar-query" && child.XMLName.Space == calNS && child.XMLName.Local == "filter" || n.XMLName.Local == "calendar-multiget" && child.XMLName.Space == davNS && child.XMLName.Local == "href" + if !allowed || child.XMLName.Local != "href" && seen[child.XMLName] > 1 { + taskDAVError(w, 403, "supported-filter", "unsupported report element") + return + } + } + switch n.XMLName.Local { + case "calendar-query": + filter := n.child(calNS, "filter") + if !taskDAVSimpleFilter(filter) { + taskDAVError(w, 403, "supported-filter", "only VCALENDAR/VTODO component filters supported; time-range and property filters are not supported") + return + } + items, err := s.store.TaskDAVList(r.Context(), domain, actor, project) + if err != nil { + taskError(w, err) + return + } + for _, item := range items { + if err := r.Context().Err(); err != nil { + taskError(w, err) + return + } + row, err := taskDAVRow(item, prefix) + if err != nil { + taskError(w, err) + return + } + rows = append(rows, row) + } + case "calendar-multiget": + count := 0 + for _, child := range n.Children { + if child.XMLName.Space != davNS || child.XMLName.Local != "href" { + continue + } + count++ + if count > 200 { + taskError(w, store.ErrTaskDAVLimit) + return + } + href := strings.TrimSpace(child.Text) + u, err := url.Parse(href) + if err != nil || u.User != nil || u.RawQuery != "" || u.Fragment != "" || (u.Host != "" && !strings.EqualFold(u.Host, r.Host)) || !strings.HasPrefix(u.Path, prefix) || !store.ValidTaskDAVName(strings.TrimPrefix(u.Path, prefix)) { + rows = append(rows, davResponse{href: href, status: 404}) + continue + } + item, err := s.store.TaskDAVByName(r.Context(), domain, actor, strings.TrimPrefix(u.Path, prefix), project) + if errors.Is(err, sql.ErrNoRows) || err == nil && item.Archived { + rows = append(rows, davResponse{href: u.Path, status: 404}) + continue + } + if err != nil { + taskError(w, err) + return + } + row, err := taskDAVRow(item, prefix) + if err != nil { + taskError(w, err) + return + } + rows = append(rows, row) + } + default: + taskDAVError(w, 403, "supported-filter", "unsupported report") + return + } + writeDAV(w, rows, req) +} + +// An explicit VCALENDAR/allprop/allcomp request is the complete resource, not +// a partial projection. go-webdav (including chroncal) uses this representation. +// Keep partial property selection, expansion and recurrence limits unsupported. +func taskDAVFullProperty(p davNode) bool { + if p.XMLName.Space != calNS || p.XMLName.Local != "calendar-data" { + return len(p.Children) == 0 && taskDAVAttrCount(p) == 0 + } + for _, a := range p.Attrs { + if a.Name.Space == "xmlns" || a.Name.Space == "" && a.Name.Local == "xmlns" { + continue + } + if a.Name.Space != "" || !(a.Name.Local == "content-type" && a.Value == "text/calendar" || a.Name.Local == "version" && a.Value == "2.0") { + return false + } + } + if len(p.Children) == 0 { + return true + } + if len(p.Children) != 1 { + return false + } + c := p.Children[0] + if c.XMLName.Space != calNS || c.XMLName.Local != "comp" || c.attr("name") != "VCALENDAR" || taskDAVAttrCount(c) != 1 || len(c.Children) != 2 { + return false + } + seen := map[string]bool{} + for _, n := range c.Children { + if n.XMLName.Space != calNS || (n.XMLName.Local != "allprop" && n.XMLName.Local != "allcomp") || len(n.Children) != 0 || taskDAVAttrCount(n) != 0 || seen[n.XMLName.Local] { + return false + } + seen[n.XMLName.Local] = true + } + return true +} +func taskDAVSimpleFilter(n *davNode) bool { + if n == nil || len(n.Children) != 1 || taskDAVAttrCount(*n) != 0 { + return false + } + c := n.Children[0] + if c.XMLName.Space != calNS || c.XMLName.Local != "comp-filter" || c.attr("name") != "VCALENDAR" || taskDAVAttrCount(c) != 1 { + return false + } + if len(c.Children) == 0 { + return true + } + if len(c.Children) != 1 { + return false + } + v := c.Children[0] + return v.XMLName.Space == calNS && v.XMLName.Local == "comp-filter" && v.attr("name") == "VTODO" && taskDAVAttrCount(v) == 1 && len(v.Children) == 0 +} + +func taskDAVAttrCount(n davNode) int { + count := 0 + for _, a := range n.Attrs { + if a.Name.Space != "xmlns" && !(a.Name.Space == "" && a.Name.Local == "xmlns") { + count++ + } + } + return count +} diff --git a/internal/server/task_dav_chroncal_test.go b/internal/server/task_dav_chroncal_test.go new file mode 100644 index 0000000..6b8e094 --- /dev/null +++ b/internal/server/task_dav_chroncal_test.go @@ -0,0 +1,212 @@ +package server + +import ( + "context" + "io" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "pageswiki/internal/calendar" + "path/filepath" + "strings" + "testing" + "time" + + "github.com/google/uuid" +) + +func TestTaskDAVChroncal(t *testing.T) { + testDAVChroncal(t, false) +} + +func TestCommonDAVChroncal(t *testing.T) { + testDAVChroncal(t, true) +} + +func TestNamedTaskDAVChroncal(t *testing.T) { + testDAVChroncal(t, true, true) +} + +func TestNativeProjectTaskDAVChroncal(t *testing.T) { + testDAVChroncal(t, true, false) +} + +func testDAVChroncal(t *testing.T, common bool, named ...bool) { + bin := os.Getenv("PAGESWIKI_CHRONCAL") + if bin == "" { + t.Skip("opt-in isolated chroncal CLI") + } + s, _, domain, actor := taskFixture(t) + ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second) + defer cancel() + scope := "tasks" + if common { + scope = "all" + } + credential, password, err := s.store.CreateDAVCredential(ctx, domain, actor, "chroncal fixture", true, 1, scope, common) + if err != nil { + t.Fatal(err) + } + var repo *calendar.Repository + var cal calendar.Calendar + var event calendar.Event + if common { + repo, err = s.calendars() + if err != nil { + t.Fatal(err) + } + cal, err = repo.Create(ctx, domain, actor, "Fixture Calendar") + if err != nil { + t.Fatal(err) + } + event, err = calendar.Build("", calendar.Event{UID: "native-fixture@example.test", Summary: "Native calendar meeting", Start: time.Date(2026, 10, 1, 9, 0, 0, 0, time.UTC), End: time.Date(2026, 10, 1, 10, 0, 0, 0, time.UTC)}) + if err != nil { + t.Fatal(err) + } + event, err = repo.Change(ctx, domain, cal.ID, actor, event.UID, "*", &event) + if err != nil { + t.Fatal(err) + } + } + projectID, listName := "", "PagesWiki Tasks" + if len(named) == 1 { + project := newTaskRecord("project", "Native task list") + var e error + if named[0] { + project, e = s.store.CreateTaskDAVCollection(ctx, domain, actor, uuid.NewString(), "Named task list", credential.ID) + } else { + project, e = s.store.SaveTask(ctx, domain, actor, project, 0) + } + if e != nil { + t.Fatal(e) + } + projectID, listName = project.UUID, project.Title + } + nativeRecord := newTaskRecord("task", "Chroncal native task") + nativeRecord.ProjectUUID = projectID + native, err := s.store.SaveTask(ctx, domain, actor, nativeRecord, 0) + if err != nil { + t.Fatal(err) + } + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + body, _ := io.ReadAll(r.Body) + r.Body = io.NopCloser(strings.NewReader(string(body))) + rec := httptest.NewRecorder() + s.handler().ServeHTTP(rec, r) + if rec.Code >= 400 { + t.Logf("fixture %s %s depth=%s if-match=%q if-none-match=%q status=%d body=%s request=%s", r.Method, r.URL.Path, r.Header.Get("Depth"), r.Header.Get("If-Match"), r.Header.Get("If-None-Match"), rec.Code, rec.Body, body) + } + for k, v := range rec.Header() { + w.Header()[k] = v + } + w.WriteHeader(rec.Code) + w.Write(rec.Body.Bytes()) + })) + defer server.Close() + dir := t.TempDir() + run := func(args ...string) string { + t.Helper() + cmd := exec.CommandContext(ctx, bin, append([]string{"--allow-plaintext"}, args...)...) + // Never load the user's chroncal database, settings, credentials or keyring. + cmd.Env = []string{"PATH=" + os.Getenv("PATH"), "HOME=" + dir, "XDG_CONFIG_HOME=" + filepath.Join(dir, "config"), "XDG_DATA_HOME=" + filepath.Join(dir, "data"), "XDG_STATE_HOME=" + filepath.Join(dir, "state"), "XDG_CACHE_HOME=" + filepath.Join(dir, "cache"), "DBUS_SESSION_BUS_ADDRESS=unix:path=" + filepath.Join(dir, "no-keyring"), "CHRONCAL_TEST_PASSWORD=" + password} + out, e := cmd.CombinedOutput() + if e != nil { + t.Fatalf("chroncal %s: %v\n%s", args[0], e, strings.ReplaceAll(string(out), password, "[REDACTED]")) + } + return string(out) + } + endpoint := strings.Replace(server.URL, "127.0.0.1", "localhost", 1) + taskDAVRoot + if common { + endpoint = strings.Replace(server.URL, "127.0.0.1", "localhost", 1) + calendarDAV + } + run("account", "add", "Fixture", "--server", endpoint, "--username", credential.ID, "--auth", "basic", "--allow-insecure", "--password-cmd", "printenv CHRONCAL_TEST_PASSWORD") + if out := run("todo", "list", "--output", "json"); !strings.Contains(out, native.Title) { + t.Fatal("native task not pulled", out) + } + if common { + if out := run("event", "get", event.UID, "--output", "json"); !strings.Contains(out, event.Summary) { + t.Fatal("calendar not pulled", out) + } + run("event", "add", "Chroncal event", "--calendar", cal.PrettyName, "--date", "2026-10-02", "--time", "09:00", "--duration", "1h") + run("sync", "run", "--account", "Fixture") + _, events, e := repo.DAVSnapshot(ctx, domain, cal.ID, actor, true) + if e != nil || len(events) != 2 { + t.Fatal("calendar create not synced", len(events), e) + } + for _, v := range events { + if v.UID == event.UID { + continue + } + run("event", "update", v.UID, "--title", "CLI renamed event") + run("sync", "run", "--account", "Fixture") + v, e = repo.Event(ctx, domain, cal.ID, actor, v.UID) + if e != nil || v.Summary != "CLI renamed event" { + t.Fatal("CLI update not synced", e) + } + updated, e := calendar.Build(v.Data, calendar.Event{UID: v.UID, Summary: "Web calendar rename", Start: time.Date(2026, 10, 2, 10, 0, 0, 0, time.UTC), End: time.Date(2026, 10, 2, 11, 0, 0, 0, time.UTC)}) + if e != nil { + t.Fatal(e) + } + if _, e = repo.Change(ctx, domain, cal.ID, actor, v.UID, v.ETag, &updated); e != nil { + t.Fatal(e) + } + run("sync", "run", "--account", "Fixture") + if out := run("event", "get", v.UID, "--output", "json"); !strings.Contains(out, updated.Summary) { + t.Fatal("calendar change not pulled", out) + } + run("event", "delete", v.UID, "--yes") + run("sync", "run", "--account", "Fixture") + if _, e = repo.Event(ctx, domain, cal.ID, actor, v.UID); e != calendar.ErrMissing { + t.Fatal("calendar delete not synced", e) + } + } + } + run("todo", "add", "Chroncal created task", "--calendar", listName, "--due", "2026-10-01") + run("sync", "run", "--account", "Fixture") + items, e := s.store.TaskDAVList(ctx, domain, actor, projectID) + if e != nil { + t.Fatal(e) + } + found := false + for _, item := range items { + if item.Title == "Chroncal created task" { + found = true + if item.DueOn != "2026-10-01" { + t.Fatal(item.DueOn) + } + } + } + if !found { + t.Fatal("CLI create not synced") + } + run("todo", "complete", native.UUID) + run("sync", "run", "--account", "Fixture") + current, e := s.store.GetTask(ctx, domain, actor, native.UUID) + if e != nil || current.Status != "done" { + t.Fatal("completion not synced", current.Status, e) + } + current.Title = "Web-side rename" + if _, e = s.store.SaveTask(ctx, domain, actor, current, current.Version); e != nil { + t.Fatal(e) + } + run("sync", "run", "--account", "Fixture") + if out := run("todo", "get", native.UUID, "--output", "json"); !strings.Contains(out, current.Title) { + t.Fatal("Web change not pulled", out) + } + run("todo", "delete", native.UUID, "--yes") + run("sync", "run", "--account", "Fixture") + current, e = s.store.GetTask(ctx, domain, actor, native.UUID) + if e != nil || !current.Archived { + t.Fatal("delete must archive", e) + } + before, e := s.store.TaskDAVList(ctx, domain, actor, projectID) + if e != nil || len(before) != 1 { + t.Fatal(e, len(before)) + } + run("sync", "run", "--account", "Fixture") + after, e := s.store.TaskDAVList(ctx, domain, actor, projectID) + if e != nil || len(after) != 1 || after[0].Version != before[0].Version { + t.Fatal("no-op sync changed a version", e) + } +} diff --git a/internal/server/task_dav_client_test.go b/internal/server/task_dav_client_test.go new file mode 100644 index 0000000..1a53833 --- /dev/null +++ b/internal/server/task_dav_client_test.go @@ -0,0 +1,167 @@ +package server + +import ( + "context" + "fmt" + "io" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "path/filepath" + "strings" + "testing" + "time" +) + +// Real third-party interoperability, on a disposable fixture only. Nothing is +// fetched from production or from external calendar subscriptions. +func TestTaskDAVVdirsyncer(t *testing.T) { + bin := os.Getenv("PAGESWIKI_VDIRSYNCER") + if bin == "" { + t.Skip("opt-in vdirsyncer and sibling todo executable") + } + s, _, domain, actor := taskFixture(t) + ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second) + defer cancel() + credential, password, err := s.store.CreateTaskDAVCredential(ctx, domain, actor, "Integration fixture", true, 1) + if err != nil { + t.Fatal(err) + } + native, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "Native task"), 0) + if err != nil { + t.Fatal(err) + } + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + body, _ := io.ReadAll(r.Body) + r.Body = io.NopCloser(strings.NewReader(string(body))) + rec := httptest.NewRecorder() + s.handler().ServeHTTP(rec, r) + if rec.Code >= 400 { + t.Logf("fixture DAV %s %s Depth=%q: %d %s request=%s", r.Method, r.URL.Path, r.Header.Get("Depth"), rec.Code, rec.Body, body) + } + for k, v := range rec.Header() { + w.Header()[k] = v + } + w.WriteHeader(rec.Code) + w.Write(rec.Body.Bytes()) + })) + defer server.Close() + dir := t.TempDir() + local := filepath.Join(dir, "tasks") + if err = os.MkdirAll(filepath.Join(local, "default"), 0700); err != nil { + t.Fatal(err) + } + config := fmt.Sprintf(`[general] +status_path = %q +[pair tasks] +a = "local" +b = "remote" +collections = ["default"] +metadata = ["displayname"] +[storage local] +type = "filesystem" +path = %q +fileext = ".ics" +[storage remote] +type = "caldav" +url = %q +username = %q +password = %q +`, filepath.Join(dir, "status"), local, strings.Replace(server.URL, "127.0.0.1", "localhost", 1)+taskDAVRoot, credential.ID, password) + configPath := filepath.Join(dir, "vdirsyncer.conf") + if err = os.WriteFile(configPath, []byte(config), 0600); err != nil { + t.Fatal(err) + } + run := func(executable string, args ...string) string { + t.Helper() + cmd := exec.CommandContext(ctx, executable, args...) + cmd.Stdin = strings.NewReader("y\ny\ny\n") + out, e := cmd.CombinedOutput() + if e != nil { + t.Fatalf("%s failed: %v\n%s", filepath.Base(executable), e, strings.ReplaceAll(string(out), password, "[REDACTED]")) + } + return string(out) + } + sync := func() { t.Helper(); run(bin, "-c", configPath, "sync") } + run(bin, "-c", configPath, "discover") + sync() + run(bin, "-c", configPath, "metasync") + files, err := filepath.Glob(filepath.Join(local, "default", "*.ics")) + if err != nil || len(files) != 1 { + t.Fatal(files, err) + } + bytes, err := os.ReadFile(files[0]) + if err != nil || !strings.Contains(string(bytes), "SUMMARY:Native task") { + t.Fatal("download", err) + } + // Exercise calendar-query as well as the default PROPFIND listing path. + config += "item_types = [\"VTODO\"]\n" + if err = os.WriteFile(configPath, []byte(config), 0600); err != nil { + t.Fatal(err) + } + run(bin, "-c", configPath, "discover") + todo := filepath.Join(filepath.Dir(bin), "todo") + todoConfig := filepath.Join(dir, "todo.py") + config = fmt.Sprintf("path = %q\ncache_path = %q\ndate_format = '%%Y-%%m-%%d'\ntime_format = '%%H:%%M'\ndefault_list = 'PagesWiki Tasks'\ndefault_due = 0\n", filepath.Join(local, "*"), filepath.Join(dir, "todo.sqlite3")) + if err = os.WriteFile(todoConfig, []byte(config), 0600); err != nil { + t.Fatal(err) + } + run(todo, "-c", todoConfig, "new", "--due", "2026-10-01", "CLI-created task") + sync() + items, err := s.store.TaskDAVList(ctx, domain, actor) + if err != nil || len(items) != 2 { + t.Fatal(len(items), err) + } + found := "" + for _, v := range items { + if v.Title == "CLI-created task" { + found = v.UUID + if v.DueOn != "2026-10-01" { + t.Fatal(v.DueOn) + } + } + } + if found == "" { + t.Fatal("upload missing") + } + // Native task has the first Todoman ID after scanning before creation. + output := run(todo, "-c", todoConfig, "--porcelain", "list") + if !strings.Contains(output, "CLI-created task") { + t.Fatal(output) + } + run(todo, "-c", todoConfig, "done", "1") + sync() + got, err := s.store.GetTask(ctx, domain, actor, native.UUID) + if err != nil || got.Status != "done" { + t.Fatal("CLI completion", got.Status, err) + } + got.Title = "Changed by Web" + if _, err = s.store.SaveTask(ctx, domain, actor, got, got.Version); err != nil { + t.Fatal(err) + } + sync() + bytes, err = os.ReadFile(files[0]) + if err != nil || !strings.Contains(string(bytes), "SUMMARY:Changed by Web") { + t.Fatal("Web change missing locally", err) + } + // Local deletion becomes an archive, not a physical task/history deletion. + if err = os.Remove(files[0]); err != nil { + t.Fatal(err) + } + sync() + got, err = s.store.GetTask(ctx, domain, actor, native.UUID) + if err != nil || !got.Archived { + t.Fatal("CLI delete", err) + } + // A no-op sync must not create another revision. + before, err := s.store.GetTask(ctx, domain, actor, found) + if err != nil { + t.Fatal(err) + } + sync() + after, err := s.store.GetTask(ctx, domain, actor, found) + if err != nil || before.Version != after.Version { + t.Fatal("sync oscillation", before.Version, after.Version, err) + } +} diff --git a/internal/server/task_dav_collections.go b/internal/server/task_dav_collections.go new file mode 100644 index 0000000..cbba750 --- /dev/null +++ b/internal/server/task_dav_collections.go @@ -0,0 +1,115 @@ +package server + +import ( + "encoding/xml" + "errors" + "mime" + "net/http" + "strings" + + "github.com/google/uuid" + mw "pageswiki/internal/server/middleware" + "pageswiki/internal/store" +) + +func (s *Server) appendTaskDAVCollections(w http.ResponseWriter, r *http.Request, domain, actor string, writable bool, rows *[]davResponse) bool { + items, err := s.store.TaskDAVCollections(r.Context(), domain, actor) + if err != nil { + taskError(w, err) + return false + } + for _, item := range items { + row := taskDAVCollectionRow() + row.href = calendarDAV + item.TaskDAVCollectionPath() + "/" + row.props[xml.Name{Space: davNS, Local: "displayname"}] = xmlText(item.Title) + row.props[xml.Name{Space: davNS, Local: "current-user-privilege-set"}] = davPrivileges(writable) + row.props[xml.Name{Space: davNS, Local: "current-user-principal"}] = "" + calendarDAV + "" + *rows = append(*rows, row) + } + return true +} + +// A VTODO collection is a private revisioned project. Do not alias every +// arbitrary client URL to the default list or silently accept VEVENT lists. +func (s *Server) handleTaskMKCalendar(w http.ResponseWriter, r *http.Request) { + mw.SetDAVTaskTarget(r, false) + domain := s.domainUUIDForRequest(r) + if !s.systemExtensionEnabled(domain, "organizer.tasks") { + http.NotFound(w, r) + return + } + actor, write, _, credential, ok := s.davActor(w, r, "tasks", false) + if !ok { + return + } + s.setDAVCapabilities(w, r, actor, credential) + if !write { + taskError(w, store.ErrAccessDenied) + return + } + path := strings.TrimSuffix(strings.TrimPrefix(r.URL.Path, calendarDAV), "/") + id, err := uuid.Parse(path) + if err != nil || id.String() != path { + taskDAVError(w, 403, "calendar-collection-location-ok", "VTODO collections require a UUID directly below the CalDAV home") + return + } + media, _, err := mime.ParseMediaType(r.Header.Get("Content-Type")) + if err != nil || media != "application/xml" && media != "text/xml" { + w.WriteHeader(415) + return + } + n, err := readDAV(w, r) + if err != nil || n.XMLName != (xml.Name{Space: calNS, Local: "mkcalendar"}) || len(n.Children) != 1 { + http.Error(w, "invalid MKCALENDAR", 400) + return + } + set := n.Children[0] + if set.XMLName != (xml.Name{Space: davNS, Local: "set"}) || len(set.Children) != 1 || set.Children[0].XMLName != (xml.Name{Space: davNS, Local: "prop"}) { + http.Error(w, "invalid MKCALENDAR properties", 400) + return + } + title, component := path, false + seen := map[xml.Name]bool{} + for _, p := range set.Children[0].Children { + if seen[p.XMLName] { + http.Error(w, "duplicate property", 400) + return + } + seen[p.XMLName] = true + switch p.XMLName { + case xml.Name{Space: davNS, Local: "displayname"}: + if len(p.Children) != 0 || taskDAVAttrCount(p) != 0 { + http.Error(w, "invalid displayname", 400) + return + } + title = p.Text + case xml.Name{Space: calNS, Local: "supported-calendar-component-set"}: + if taskDAVAttrCount(p) != 0 || len(p.Children) != 1 || p.Children[0].XMLName != (xml.Name{Space: calNS, Local: "comp"}) || p.Children[0].attr("name") != "VTODO" || taskDAVAttrCount(p.Children[0]) != 1 || len(p.Children[0].Children) != 0 { + taskDAVError(w, 403, "supported-calendar-component", "Only VTODO collections are supported by MKCALENDAR") + return + } + component = true + default: + taskDAVError(w, 403, "supported-calendar-data", "Unsupported MKCALENDAR property; no collection was created") + return + } + } + if !component { + taskDAVError(w, 403, "supported-calendar-component", "An explicit VTODO component-set is required") + return + } + _, err = s.store.CreateTaskDAVCollection(r.Context(), domain, actor, path, title, credential) + if errors.Is(err, store.ErrTaskDAVCollectionExists) { + w.Header().Set("Content-Type", "application/xml; charset=utf-8") + w.WriteHeader(405) + w.Write([]byte(``)) + return + } + if err != nil { + taskError(w, err) + return + } + w.Header().Set("Cache-Control", "private, no-cache, no-store") + w.Header().Set("Location", calendarDAV+path+"/") + w.WriteHeader(201) +} diff --git a/internal/server/task_dav_collections_test.go b/internal/server/task_dav_collections_test.go new file mode 100644 index 0000000..f31c33a --- /dev/null +++ b/internal/server/task_dav_collections_test.go @@ -0,0 +1,250 @@ +package server + +import ( + "context" + "encoding/base64" + "net/http/httptest" + "strings" + "sync" + "testing" + + "github.com/google/uuid" +) + +// The exact request shape reported by OneTask, with synthetic identifiers only. +const taskMKCalendarFixture = ` + +テスト + +` + +func TestTaskDAVNamedCollection(t *testing.T) { + s, _, domain, actor := taskFixture(t) + ctx := context.Background() + credential, password, err := s.store.CreateDAVCredential(ctx, domain, actor, "OneTask fixture", true, 1, "all", true) + if err != nil { + t.Fatal(err) + } + auth := "Basic " + base64.StdEncoding.EncodeToString([]byte(credential.ID+":"+password)) + req := func(method, path, body string, headers map[string]string, want int) *httptest.ResponseRecorder { + t.Helper() + r := httptest.NewRequest(method, "http://localhost"+path, strings.NewReader(body)) + r.Header.Set("Authorization", auth) + r.Header.Set("Depth", "1") + r.Header.Set("Content-Type", "application/xml; charset=utf-8") + if method == "PUT" { + r.Header.Set("Content-Type", "text/calendar") + } + for k, v := range headers { + r.Header.Set(k, v) + } + w := httptest.NewRecorder() + s.handler().ServeHTTP(w, r) + if w.Code != want { + t.Fatalf("%s %s: %d want %d %s", method, path, w.Code, want, w.Body) + } + return w + } + id := uuid.NewString() + col := calendarDAV + id + "/" + w := req("MKCALENDAR", col, taskMKCalendarFixture, nil, 201) + if w.Header().Get("Location") != col || !strings.Contains(w.Header().Get("Cache-Control"), "no-cache") { + t.Fatal(w.Header()) + } + req("MKCALENDAR", col, taskMKCalendarFixture, nil, 405) + project, err := s.store.TaskDAVCollection(ctx, domain, actor, id) + if err != nil || project.Title != "テスト" || project.Kind != "project" || project.DAVCollection != id { + t.Fatal(project, err) + } + for _, home := range []string{calendarDAV, taskDAVRoot} { + w = req("PROPFIND", home, "", nil, 207) + if !strings.Contains(w.Body.String(), col) || !strings.Contains(w.Body.String(), "テスト") { + t.Fatal(w.Body) + } + } + for _, path := range []string{col, strings.TrimSuffix(col, "/")} { + req("OPTIONS", path, "", nil, 204) + w = req("PROPFIND", path, "", nil, 207) + if !strings.Contains(w.Body.String(), `name="VTODO"`) { + t.Fatal(w.Body) + } + } + resource := col + "client.ics" + req("PUT", resource, taskICALFixture, nil, 201) + item, err := s.store.TaskDAVByName(ctx, domain, actor, "client.ics", project.UUID) + if err != nil || item.ProjectUUID != project.UUID { + t.Fatal(item, err) + } + // The same filename AND UID in another collection is a different resource. + defaultBody := strings.Replace(taskICALFixture, "SUMMARY:CLI task", "SUMMARY:Default-only task", 1) + req("PUT", taskDAVCollection+"client.ics", defaultBody, nil, 201) + w = req("REPORT", col, commonDAVQuery, nil, 207) + if !strings.Contains(w.Body.String(), resource) || strings.Contains(w.Body.String(), "Default-only task") { + t.Fatal(w.Body) + } + w = req("REPORT", taskDAVCollection, commonDAVQuery, nil, 207) + if strings.Contains(w.Body.String(), resource) || strings.Contains(w.Body.String(), "SUMMARY:CLI task") { + t.Fatal(w.Body) + } + multi := `` + resource + `` + taskDAVCollection + `client.ics` + w = req("REPORT", col, multi, nil, 207) + if strings.Count(w.Body.String(), "404 Not Found") != 1 || strings.Contains(w.Body.String(), "Default-only task") { + t.Fatal(w.Body) + } + get := req("GET", resource, "", nil, 200) + req("PUT", resource, taskICALFixture, nil, 204) + get = req("GET", resource, "", nil, 200) + req("PUT", resource, taskICALFixture, map[string]string{"If-Match": `"stale"`}, 412) + completed := strings.Replace(get.Body.String(), "STATUS:NEEDS-ACTION", "STATUS:COMPLETED", 1) + req("PUT", resource, completed, map[string]string{"If-Match": get.Header().Get("ETag")}, 204) + item, err = s.store.GetTask(ctx, domain, actor, item.UUID) + if err != nil || item.Status != "done" { + t.Fatal(item, err) + } + // Web edits preserve both canonical collection identity and ICS metadata. + project.Title, project.DAVCollection = "Web renamed list", "" + project, err = s.store.SaveTask(ctx, domain, actor, project, project.Version) + if err != nil || project.DAVCollection != id { + t.Fatal(project, err) + } + item.Title = "Web edited task" + item, err = s.store.SaveTask(ctx, domain, actor, item, item.Version) + if err != nil { + t.Fatal(err) + } + get = req("GET", resource, "", nil, 200) + if !strings.Contains(get.Body.String(), "Web edited task") { + t.Fatal(get.Body) + } + // Index rebuild from canonical project/task heads preserves collection hrefs. + if _, err = s.store.DB.Exec(`DELETE FROM organizer_dav_resources; DELETE FROM organizer_dav_collections`); err != nil { + t.Fatal(err) + } + if err = s.store.EnsureTasksSchema(); err != nil { + t.Fatal(err) + } + req("GET", resource, "", nil, 200) + req("DELETE", resource, "", map[string]string{"If-Match": get.Header().Get("ETag")}, 204) + req("GET", resource, "", nil, 404) + // A native Web task follows its project between default and named lists. + native, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "Move between lists"), 0) + if err != nil { + t.Fatal(err) + } + defaultHref := taskDAVCollection + native.UUID + ".ics" + namedHref := col + native.UUID + ".ics" + req("GET", defaultHref, "", nil, 200) + native.ProjectUUID = project.UUID + native, err = s.store.SaveTask(ctx, domain, actor, native, native.Version) + if err != nil { + t.Fatal(err) + } + req("GET", defaultHref, "", nil, 404) + req("GET", namedHref, "", nil, 200) + native.ProjectUUID = "" + if _, err = s.store.SaveTask(ctx, domain, actor, native, native.Version); err != nil { + t.Fatal(err) + } + req("GET", defaultHref, "", nil, 200) + req("GET", namedHref, "", nil, 404) + // Collection DELETE isn't secretly implemented as deleting all its tasks. + req("DELETE", col, "", nil, 405) + // Named task collections keep working with the VEVENT extension disabled. + if err = s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.calendar":false}`); err != nil { + t.Fatal(err) + } + req("PROPFIND", col, "", nil, 207) + req("MKCALENDAR", calendarDAV+uuid.NewString()+"/", taskMKCalendarFixture, nil, 201) +} + +func TestTaskDAVCollectionAuthorizationAndAtomicity(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + col := calendarDAV + uuid.NewString() + "/" + request := func(auth, method, path, body string, want int) { + t.Helper() + w := davTaskRequest(s, auth, method, path, body, map[string]string{"Content-Type": "application/xml"}) + if w.Code != want { + t.Fatalf("%s: %d want %d %s", method, w.Code, want, w.Body) + } + } + issue := func(owner, scope string, write bool) string { + t.Helper() + c, p, e := s.store.CreateDAVCredential(ctx, domain, owner, "fixture", write, 1, scope, true) + if e != nil { + t.Fatal(e) + } + return "Basic " + base64.StdEncoding.EncodeToString([]byte(c.ID+":"+p)) + } + write := issue(actor, "tasks", true) + read := issue(actor, "tasks", false) + calendarOnly := issue(actor, "calendar", true) + request("", "MKCALENDAR", col, taskMKCalendarFixture, 401) + request(read, "MKCALENDAR", col, taskMKCalendarFixture, 403) + request(calendarOnly, "MKCALENDAR", col, taskMKCalendarFixture, 401) + request(write, "MKCALENDAR", col, strings.Replace(taskMKCalendarFixture, "VTODO", "VEVENT", 1), 403) + request(write, "MKCALENDAR", col, strings.Replace(taskMKCalendarFixture, "", "", 1), 403) + request(write, "MKCALENDAR", col, strings.Replace(taskMKCalendarFixture, "テスト", "テストduplicate", 1), 400) + request(write, "MKCALENDAR", col, "`)) + r.Header.Set("Authorization", "Bearer "+token) + r.Header.Set("Depth", "0") + w := httptest.NewRecorder() + s.handler().ServeHTTP(w, r) + if w.Code != 207 || w.Header().Get("Location") != "" { + t.Fatal(p, w.Code, w.Header(), w.Body) + } + } +} + +func TestTaskDAVFullCalendarDataSelection(t *testing.T) { + full := `` + for _, test := range []struct { + data string + want bool + }{ + {full, true}, + {strings.Replace(full, ``, ``, 1), false}, + {strings.Replace(full, ``, ``, 1), false}, + {strings.Replace(full, `VCALENDAR`, `VTODO`, 1), false}, + {strings.Replace(full, ``, ``, 1), false}, + {strings.Replace(full, ``, ``, 1), false}, + } { + var n davNode + if e := xml.Unmarshal([]byte(test.data), &n); e != nil { + t.Fatal(e) + } + if got := taskDAVFullProperty(n); got != test.want { + t.Fatal(test.data, got) + } + } +} + +func TestTaskDAVConditionalCreateCannotOverwrite(t *testing.T) { + s, token, domain, actor := taskFixture(t) + auth := "Bearer " + token + p := taskDAVCollection + "new.ics" + var wg sync.WaitGroup + codes := make(chan int, 2) + for i := 0; i < 2; i++ { + wg.Add(1) + go func() { + defer wg.Done() + codes <- davTaskRequest(s, auth, "PUT", p, taskICALFixture, map[string]string{"If-None-Match": "*"}).Code + }() + } + wg.Wait() + close(codes) + success := 0 + for code := range codes { + if code == 201 { + success++ + } else if code != 403 && code != 412 { + t.Fatal("unsafe concurrent create", code) + } + } + if success != 1 { + t.Fatal(success) + } + item, e := s.store.TaskDAVByName(context.Background(), domain, actor, "new.ics") + if e != nil || item.Version != 1 { + t.Fatal(item.Version, e) + } + get := davTaskRequest(s, auth, "GET", p, "", nil) + if w := davTaskRequest(s, auth, "PUT", p, taskICALFixture, map[string]string{"If-None-Match": "*"}); w.Code != 412 { + t.Fatal("conditional overwrite", w.Code) + } + if w := davTaskRequest(s, auth, "DELETE", p, "", map[string]string{"If-Match": get.Header().Get("ETag")}); w.Code != 204 { + t.Fatal(w.Code) + } + if w := davTaskRequest(s, auth, "PUT", p, taskICALFixture, nil); w.Code != 201 { + t.Fatal("unconditional revive", w.Code) + } +} diff --git a/internal/server/task_dav_projects_test.go b/internal/server/task_dav_projects_test.go new file mode 100644 index 0000000..a608eda --- /dev/null +++ b/internal/server/task_dav_projects_test.go @@ -0,0 +1,230 @@ +package server + +import ( + "context" + "encoding/base64" + "fmt" + "strings" + "sync" + "testing" + + "pageswiki/internal/store" +) + +func TestTaskDAVNativeProjectsAndUpgrade(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + auth := "Bearer " + token + save := func(v store.TaskRecord) store.TaskRecord { + t.Helper() + out, err := s.store.SaveTask(ctx, domain, actor, v, v.Version) + if err != nil { + t.Fatal(err) + } + return out + } + project := save(newTaskRecord("project", "Native project")) + col := calendarDAV + project.TaskDAVCollectionPath() + "/" + child := newTaskRecord("task", "Native project task") + child.ProjectUUID = project.UUID + child = save(child) + loose := save(newTaskRecord("task", "Unassigned task")) + href := col + child.UUID + ".ics" + get := davTaskRequest(s, auth, "GET", href, "", nil) + if get.Code != 200 { + t.Fatal(get.Code, get.Body) + } + for _, home := range []string{calendarDAV, taskDAVRoot} { + w := davTaskRequest(s, auth, "PROPFIND", home, "", nil) + if w.Code != 207 || !strings.Contains(w.Body.String(), col) || !strings.Contains(w.Body.String(), "Native project") { + t.Fatal(w.Code, w.Body) + } + } + w := davTaskRequest(s, auth, "REPORT", taskDAVCollection, commonDAVQuery, nil) + if w.Code != 207 || strings.Contains(w.Body.String(), child.UUID) || !strings.Contains(w.Body.String(), loose.UUID) { + t.Fatal("default must mean no project", w.Code, w.Body) + } + // Simulate a pre-upgrade DB where a native project's task lived in default. + if _, err := s.store.DB.Exec(`DELETE FROM organizer_dav_collections WHERE project_uuid=?`, project.UUID); err != nil { + t.Fatal(err) + } + if _, err := s.store.DB.Exec(`UPDATE organizer_dav_resources SET name=?,uid=? WHERE item_uuid=?`, child.UUID+".ics", child.UUID, child.UUID); err != nil { + t.Fatal(err) + } + for i := 0; i < 2; i++ { + if err := s.store.EnsureTasksSchema(); err != nil { + t.Fatal(err) + } + } + after, err := s.store.GetTask(ctx, domain, actor, child.UUID) + if err != nil || after.Version != child.Version || after.ProjectUUID != project.UUID { + t.Fatal(after, err) + } + if w := davTaskRequest(s, auth, "GET", href, "", nil); w.Code != 200 || w.Header().Get("ETag") != get.Header().Get("ETag") { + t.Fatal("upgrade changed task representation", w.Code, w.Body) + } + oldHref := taskDAVCollection + child.UUID + ".ics" + if w := davTaskRequest(s, auth, "GET", oldHref, "", nil); w.Code != 404 { + t.Fatal(w.Code) + } + if w := davTaskRequest(s, auth, "PUT", oldHref, get.Body.String(), nil); w.Code != 409 || !strings.Contains(w.Body.String(), "task_collection_relocated") { + t.Fatal("stale client recreated relocated task", w.Code, w.Body) + } + // Native collections accept direct-client creates, with matching Web membership. + body := strings.Replace(taskICALFixture, "cli-task@example.test", "native-project-client@example.test", 1) + if w := davTaskRequest(s, auth, "PUT", col+"client.ics", body, nil); w.Code != 201 { + t.Fatal(w.Code, w.Body) + } + created, err := s.store.TaskDAVByName(ctx, domain, actor, "client.ics", project.UUID) + if err != nil || created.ProjectUUID != project.UUID { + t.Fatal(created, err) + } + project.Title = "Renamed native project" + project = save(project) + if project.TaskDAVCollectionPath()+"/" != strings.TrimPrefix(col, calendarDAV) { + t.Fatal("rename changed URI") + } + // The same account/domain scoping applies to newly exposed native projects. + other, err := s.store.CreatePasswordAccount(domain, "native-other", "long fixture password", "Other", "") + if err != nil { + t.Fatal(err) + } + credential, password, err := s.store.CreateDAVCredential(ctx, domain, other.UUID, "other", true, 1, "tasks", false) + if err != nil { + t.Fatal(err) + } + otherAuth := "Basic " + base64.StdEncoding.EncodeToString([]byte(credential.ID+":"+password)) + if w := davTaskRequest(s, otherAuth, "GET", href, "", nil); w.Code != 404 { + t.Fatal(w.Code) + } + if w := davTaskRequest(s, otherAuth, "PROPFIND", calendarDAV, "", nil); w.Code != 207 || strings.Contains(w.Body.String(), col) { + t.Fatal(w.Code, w.Body) + } + project.Archived = true + save(project) + if w := davTaskRequest(s, auth, "GET", href, "", nil); w.Code != 404 { + t.Fatal(w.Code) + } + w = davTaskRequest(s, auth, "REPORT", taskDAVCollection, commonDAVQuery, nil) + if w.Code != 207 || strings.Contains(w.Body.String(), child.UUID) || strings.Contains(w.Body.String(), "client.ics") { + t.Fatal("archived project spilled into default", w.Code, w.Body) + } +} + +func TestTaskDAVUnconditionalWritesRetainHistory(t *testing.T) { + s, _, domain, actor := taskFixture(t) + ctx := context.Background() + // No token-specific compatibility setting; ordinary task credentials work. + c, pass, err := s.store.CreateDAVCredential(ctx, domain, actor, "direct CalDAV", true, 1, "tasks", false) + if err != nil { + t.Fatal(err) + } + auth := "Basic " + base64.StdEncoding.EncodeToString([]byte(c.ID+":"+pass)) + p := taskDAVCollection + "direct.ics" + if w := davTaskRequest(s, auth, "PUT", p, taskICALFixture, nil); w.Code != 201 { + t.Fatal(w.Code, w.Body) + } + item, err := s.store.TaskDAVByName(ctx, domain, actor, "direct.ics") + if err != nil { + t.Fatal(err) + } + item.Bucket, item.PlannedOn, item.Estimate = "backlog", "2026-10-02", 45 + item, err = s.store.SaveTask(ctx, domain, actor, item, item.Version) + if err != nil { + t.Fatal(err) + } + var wg sync.WaitGroup + codes := make(chan int, 4) + for i := 0; i < 4; i++ { + body := strings.Replace(taskICALFixture, "SUMMARY:CLI task", fmt.Sprintf("SUMMARY:Direct update %d", i), 1) + wg.Add(1) + go func() { defer wg.Done(); codes <- davTaskRequest(s, auth, "PUT", p, body, nil).Code }() + } + wg.Wait() + close(codes) + for code := range codes { + if code != 204 { + t.Fatal("unconditional concurrent write", code) + } + } + after, err := s.store.GetTask(ctx, domain, actor, item.UUID) + if err != nil || after.Version != 6 || after.Estimate != 45 || after.PlannedOn != item.PlannedOn || after.Bucket != "backlog" { + t.Fatal(after, err) + } + history, err := s.store.TaskHistory(ctx, domain, actor, item.UUID) + if err != nil || len(history) != 6 { + t.Fatal(history, err) + } + if w := davTaskRequest(s, auth, "PUT", p, taskICALFixture, map[string]string{"If-Match": `"obsolete"`}); w.Code != 412 { + t.Fatal(w.Code) + } + if w := davTaskRequest(s, auth, "DELETE", p, "", nil); w.Code != 204 { + t.Fatal(w.Code, w.Body) + } + if w := davTaskRequest(s, auth, "PUT", p, taskICALFixture, nil); w.Code != 201 { + t.Fatal(w.Code, w.Body) + } + revived, err := s.store.TaskDAVByName(ctx, domain, actor, "direct.ics") + if err != nil || revived.UUID != item.UUID || revived.Version != 8 || revived.Archived { + t.Fatal(revived, err) + } +} + +func TestTaskDAVUnconditionalConcurrentCreate(t *testing.T) { + s, token, domain, actor := taskFixture(t) + auth := "Bearer " + token + p := taskDAVCollection + "concurrent.ics" + var wg sync.WaitGroup + codes := make(chan int, 2) + for i := 0; i < 2; i++ { + wg.Add(1) + go func() { defer wg.Done(); codes <- davTaskRequest(s, auth, "PUT", p, taskICALFixture, nil).Code }() + } + wg.Wait() + close(codes) + counts := map[int]int{} + for code := range codes { + counts[code]++ + } + if counts[201] != 1 || counts[204] != 1 { + t.Fatal(counts) + } + items, err := s.store.TaskDAVList(context.Background(), domain, actor) + if err != nil || len(items) != 1 || items[0].Version != 2 { + t.Fatal(items, err) + } +} + +func TestTaskDAVIndexRebuildRollsBack(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + first, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("project", "First"), 0) + if err != nil { + t.Fatal(err) + } + second, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("project", "Second"), 0) + if err != nil { + t.Fatal(err) + } + item := newTaskRecord("task", "Keep routing") + item.ProjectUUID = first.UUID + item, err = s.store.SaveTask(ctx, domain, actor, item, 0) + if err != nil { + t.Fatal(err) + } + // Corrupt only this isolated fixture's index source to force a uniqueness + // failure after both DELETEs. Existing routing must survive the rollback. + if _, err = s.store.DB.Exec(`UPDATE organizer_items SET data=json_set(data,'$.dav_collection',?) WHERE uuid=?`, first.TaskDAVCollectionPath(), second.UUID); err != nil { + t.Fatal(err) + } + if err = s.store.EnsureTasksSchema(); err == nil { + t.Fatal("expected duplicate route rejection") + } + var count int + if err = s.store.DB.QueryRow(`SELECT count(*) FROM organizer_dav_collections`).Scan(&count); err != nil || count != 2 { + t.Fatal(count, err) + } + if w := davTaskRequest(s, "Bearer "+token, "GET", calendarDAV+first.TaskDAVCollectionPath()+"/"+item.UUID+".ics", "", nil); w.Code != 200 { + t.Fatal(w.Code, w.Body) + } +} diff --git a/internal/server/task_dav_properties.go b/internal/server/task_dav_properties.go new file mode 100644 index 0000000..72779ac --- /dev/null +++ b/internal/server/task_dav_properties.go @@ -0,0 +1,89 @@ +package server + +import ( + "encoding/xml" + "errors" + "fmt" + "io" + "mime" + "net/http" + "strings" + + "pageswiki/internal/store" +) + +// A deliberately bounded PROPPATCH surface: default-list DAV:displayname only. +// Validate the whole instruction sequence before saving anything. Unsupported +// properties fail independently, with 424 for otherwise-valid dependent edits. +func (s *Server) handleTaskDAVDefaultProperties(w http.ResponseWriter, r *http.Request, domain, actor, credential string) { + media, _, err := mime.ParseMediaType(r.Header.Get("Content-Type")) + if err != nil || media != "application/xml" && media != "text/xml" { + w.WriteHeader(http.StatusUnsupportedMediaType) + return + } + if v := r.Header.Get("If-Match"); v != "" && v != "*" || r.Header.Get("If-None-Match") == "*" { + w.WriteHeader(http.StatusPreconditionFailed) + return + } + n, err := readDAV(w, r) + if err != nil || n.XMLName != (xml.Name{Space: davNS, Local: "propertyupdate"}) || len(n.Children) == 0 || taskDAVAttrCount(n) != 0 || strings.TrimSpace(n.Text) != "" { + http.Error(w, "invalid propertyupdate", http.StatusBadRequest) + return + } + var properties []xml.Name + statuses := map[xml.Name]int{} + title := "" + failed := false + for _, instruction := range n.Children { + if instruction.XMLName.Space != davNS || (instruction.XMLName.Local != "set" && instruction.XMLName.Local != "remove") || taskDAVAttrCount(instruction) != 0 || strings.TrimSpace(instruction.Text) != "" || len(instruction.Children) != 1 { + http.Error(w, "invalid property instruction", http.StatusBadRequest) + return + } + prop := instruction.Children[0] + if prop.XMLName != (xml.Name{Space: davNS, Local: "prop"}) || len(prop.Children) == 0 || taskDAVAttrCount(prop) != 0 || strings.TrimSpace(prop.Text) != "" { + http.Error(w, "invalid properties", http.StatusBadRequest) + return + } + for _, p := range prop.Children { + if _, exists := statuses[p.XMLName]; !exists { + properties = append(properties, p.XMLName) + statuses[p.XMLName] = http.StatusOK + } + if instruction.XMLName.Local != "set" || p.XMLName != (xml.Name{Space: davNS, Local: "displayname"}) || len(p.Children) != 0 || taskDAVAttrCount(p) != 0 { + statuses[p.XMLName], failed = http.StatusForbidden, true + continue + } + if !store.ValidTaskDAVTitle(p.Text) { + statuses[p.XMLName], failed = http.StatusConflict, true + continue + } + title = p.Text + } + } + if !failed { + err = s.store.SetTaskDAVDefaultTitle(r.Context(), domain, actor, title, credential) + if errors.Is(err, store.ErrTaskInvalid) { + statuses[xml.Name{Space: davNS, Local: "displayname"}], failed = http.StatusConflict, true + } else if err != nil { + taskError(w, err) + return + } + } + w.Header().Set("Content-Type", "application/xml; charset=utf-8") + w.WriteHeader(http.StatusMultiStatus) + io.WriteString(w, ``+taskDAVCollection+``) + for _, p := range properties { + status := statuses[p] + if failed && status == http.StatusOK { + status = http.StatusFailedDependency + } + io.WriteString(w, ``) + if p.Space == "" { + fmt.Fprintf(w, `<%s/>`, p.Local) + } else { + fmt.Fprintf(w, ``, p.Local, xmlText(p.Space)) + } + fmt.Fprintf(w, `HTTP/1.1 %d %s`, status, http.StatusText(status)) + } + io.WriteString(w, ``) +} diff --git a/internal/server/task_dav_properties_test.go b/internal/server/task_dav_properties_test.go new file mode 100644 index 0000000..7cf3bba --- /dev/null +++ b/internal/server/task_dav_properties_test.go @@ -0,0 +1,170 @@ +package server + +import ( + "context" + "encoding/base64" + "encoding/xml" + "strings" + "testing" + + "pageswiki/internal/store" +) + +func taskDefaultNamePatch(name string) string { + return `` + xmlText(name) + `` +} + +func TestTaskDAVDefaultListRename(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + c, pass, err := s.store.CreateDAVCredential(ctx, domain, actor, "rename", true, 1, "tasks", false) + if err != nil { + t.Fatal(err) + } + auth := "Basic " + base64.StdEncoding.EncodeToString([]byte(c.ID+":"+pass)) + item, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "Keep this task"), 0) + if err != nil { + t.Fatal(err) + } + href := taskDAVCollection + item.UUID + ".ics" + before := davTaskRequest(s, auth, "GET", href, "", nil) + title := "個人 & " + w := davTaskRequest(s, auth, "PROPPATCH", taskDAVCollection, taskDefaultNamePatch(title), map[string]string{"Content-Type": "application/xml; charset=utf-8"}) + if w.Code != 207 || !strings.Contains(w.Body.String(), "200 OK") || !strings.Contains(w.Body.String(), taskDAVCollection) || !strings.Contains(w.Header().Get("Cache-Control"), "no-store") { + t.Fatal(w.Code, w.Header(), w.Body) + } + for _, home := range []string{taskDAVCollection, strings.TrimSuffix(taskDAVCollection, "/"), taskDAVRoot, calendarDAV} { + w = davTaskRequest(s, "Bearer "+token, "PROPFIND", home, commonDAVProps, nil) + if w.Code != 207 || !strings.Contains(w.Body.String(), xmlText(title)) { + t.Fatal(home, w.Code, w.Body) + } + } + after := davTaskRequest(s, auth, "GET", href, "", nil) + if after.Code != 200 || after.Body.String() != before.Body.String() || after.Header().Get("ETag") != before.Header().Get("ETag") { + t.Fatal("rename changed task", after.Code, after.Body) + } + var count int + if err = s.store.DB.QueryRow(`SELECT count(*) FROM organizer_items WHERE kind='project'`).Scan(&count); err != nil || count != 0 { + t.Fatal("default rename created a project", count, err) + } + if err = s.store.EnsureTasksSchema(); err != nil { + t.Fatal(err) + } + if got, err := s.store.TaskDAVDefaultTitle(ctx, domain, actor); err != nil || got != title { + t.Fatal("title lost on schema rebuild", got, err) + } + w = davTaskRequest(s, auth, "OPTIONS", taskDAVCollection, "", nil) + if w.Code != 204 || !strings.Contains(w.Header().Get("Allow"), "PROPPATCH") { + t.Fatal(w.Code, w.Header()) + } + // Do not accidentally add property writes to homes, tasks or named projects. + for _, path := range []string{taskDAVRoot, calendarDAV, href} { + w = davTaskRequest(s, auth, "PROPPATCH", path, taskDefaultNamePatch("Unexpected"), map[string]string{"Content-Type": "text/xml"}) + if w.Code != 405 { + t.Fatal(path, w.Code, w.Body) + } + } +} + +func TestTaskDAVDefaultListRenameAtomicity(t *testing.T) { + s, token, domain, actor := taskFixture(t) + auth := "Bearer " + token + ctx := context.Background() + if err := s.store.SetTaskDAVDefaultTitle(ctx, domain, actor, "Original", ""); err != nil { + t.Fatal(err) + } + for _, test := range []struct { + body string + code int + status string + }{ + {strings.Replace(taskDefaultNamePatch("Changed"), "", `red`, 1), 207, "424 Failed Dependency"}, + {strings.Replace(taskDefaultNamePatch("Changed"), "", `red`, 1), 207, "403 Forbidden"}, + {taskDefaultNamePatch(""), 207, "409 Conflict"}, + {taskDefaultNamePatch(strings.Repeat("x", 301)), 207, "409 Conflict"}, + {taskDefaultNamePatch("new\nline"), 207, "409 Conflict"}, + {``, 207, "403 Forbidden"}, + {`Valid later`, 207, "409 Conflict"}, + {`Changed`, 400, ""}, + {``, 400, ""}, + } { + w := davTaskRequest(s, auth, "PROPPATCH", taskDAVCollection, test.body, map[string]string{"Content-Type": "application/xml"}) + if w.Code != test.code || !strings.Contains(w.Body.String(), test.status) { + t.Fatal(w.Code, w.Body) + } + if w.Code == 207 { + var response davNode + if err := xml.Unmarshal(w.Body.Bytes(), &response); err != nil { + t.Fatal("invalid multistatus XML", err) + } + } + if got, err := s.store.TaskDAVDefaultTitle(ctx, domain, actor); err != nil || got != "Original" { + t.Fatal("partial update", got, err) + } + } + // Supported instructions execute in document order, as one commit. + body := `FirstLast` + w := davTaskRequest(s, auth, "PROPPATCH", taskDAVCollection, body, map[string]string{"Content-Type": "text/xml"}) + if w.Code != 207 || !strings.Contains(w.Body.String(), "200 OK") { + t.Fatal(w.Code, w.Body) + } + if got, err := s.store.TaskDAVDefaultTitle(ctx, domain, actor); err != nil || got != "Last" { + t.Fatal(got, err) + } +} + +func TestTaskDAVDefaultListRenameAuthority(t *testing.T) { + s, _, domain, actor := taskFixture(t) + ctx := context.Background() + issue := func(owner, scope string, write bool) (store.TaskDAVCredential, string) { + t.Helper() + c, p, e := s.store.CreateDAVCredential(ctx, domain, owner, "fixture", write, 1, scope, false) + if e != nil { + t.Fatal(e) + } + return c, "Basic " + base64.StdEncoding.EncodeToString([]byte(c.ID+":"+p)) + } + patch := func(auth string, want int) { + t.Helper() + w := davTaskRequest(s, auth, "PROPPATCH", taskDAVCollection, taskDefaultNamePatch("Private title"), map[string]string{"Content-Type": "application/xml"}) + if w.Code != want { + t.Fatal(w.Code, w.Body) + } + } + _, read := issue(actor, "tasks", false) + _, cal := issue(actor, "calendar", true) + c, write := issue(actor, "tasks", true) + patch("", 401) + patch(read, 403) + patch(cal, 401) + patch(write, 207) + other, e := s.store.CreatePasswordAccount(domain, "default-list-other", "long fixture password", "Other", "") + if e != nil { + t.Fatal(e) + } + _, otherAuth := issue(other.UUID, "tasks", true) + if got, e := s.store.TaskDAVDefaultTitle(ctx, domain, other.UUID); e != nil || got != store.DefaultTaskDAVTitle { + t.Fatal(got, e) + } + w := davTaskRequest(s, otherAuth, "PROPFIND", calendarDAV, commonDAVProps, nil) + if w.Code != 207 || strings.Contains(w.Body.String(), "Private title") { + t.Fatal(w.Code, w.Body) + } + if err := s.store.SetTaskDAVDefaultTitle(ctx, "wrong-domain", actor, "No", c.ID); err == nil { + t.Fatal("cross-domain write accepted") + } + if err := s.store.RevokeTaskDAVCredential(ctx, domain, actor, c.ID); err != nil { + t.Fatal(err) + } + patch(write, 401) + if err := s.store.SetTaskDAVDefaultTitle(ctx, domain, actor, "No", c.ID); err == nil { + t.Fatal("revoked credential accepted by writer") + } + if err := s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.tasks":false}`); err != nil { + t.Fatal(err) + } + patch(otherAuth, 404) + if err := s.store.SetTaskDAVDefaultTitle(ctx, domain, actor, "No", ""); err == nil { + t.Fatal("disabled extension accepted by writer") + } +} diff --git a/internal/server/task_dav_test.go b/internal/server/task_dav_test.go new file mode 100644 index 0000000..c904421 --- /dev/null +++ b/internal/server/task_dav_test.go @@ -0,0 +1,299 @@ +package server + +import ( + "context" + "encoding/base64" + "encoding/json" + "encoding/xml" + "errors" + "net/http/httptest" + "strings" + "sync" + "testing" + "time" + + "pageswiki/internal/store" +) + +func davTaskRequest(s *Server, auth, method, path, body string, headers map[string]string) *httptest.ResponseRecorder { + r := httptest.NewRequest(method, "http://localhost"+path, strings.NewReader(body)) + r.Header.Set("Authorization", auth) + r.Header.Set("Depth", "1") + r.Header.Set("Content-Type", "text/calendar") + for k, v := range headers { + r.Header.Set(k, v) + } + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + return w +} + +const taskICALFixture = "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//CLI test//EN\r\nBEGIN:VTODO\r\nUID:cli-task@example.test\r\nDTSTAMP:20260925T000000Z\r\nSUMMARY:CLI task\r\nDESCRIPTION:Private note\\nSecond line\r\nSTATUS:NEEDS-ACTION\r\nPRIORITY:3\r\nDUE;VALUE=DATE:20261001\r\nCATEGORIES:Test,CLI\r\nX-CLIENT-TEST:retained\r\nEND:VTODO\r\nEND:VCALENDAR\r\n" + +func TestTaskDAVRoundTrip(t *testing.T) { + s, token, domain, actor := taskFixture(t) + auth := "Bearer " + token + ctx := context.Background() + request := func(method, path, body string, h map[string]string, want int) *httptest.ResponseRecorder { + t.Helper() + w := davTaskRequest(s, auth, method, path, body, h) + if w.Code != want { + t.Fatalf("%s %s: %d want %d %s", method, path, w.Code, want, w.Body) + } + return w + } + home := request("PROPFIND", taskDAVRoot, ``, nil, 207) + if !strings.Contains(home.Body.String(), taskDAVCollection) { + t.Fatal(home.Body) + } + p := taskDAVCollection + "client-name.ics" + request("PUT", p, taskICALFixture, map[string]string{"If-None-Match": "*"}, 201) + item, err := s.store.TaskDAVByName(ctx, domain, actor, "client-name.ics") + if err != nil || item.DueOn != "2026-10-01" || item.Notes != "Private note\nSecond line" || item.Priority != 2 { + t.Fatal(item, err) + } + get := request("GET", p, "", nil, 200) + tag := get.Header().Get("ETag") + if tag == "" || !strings.Contains(get.Body.String(), "X-CLIENT-TEST:retained") { + t.Fatal(get.Body) + } + if _, err = parseTaskICAL(get.Body.String()); err != nil { + t.Fatal(err, get.Body) + } + request("GET", p, "", map[string]string{"If-None-Match": tag}, 304) + request("PUT", p, taskICALFixture, nil, 204) + get = request("GET", p, "", nil, 200) + tag = get.Header().Get("ETag") + request("PUT", p, taskICALFixture, map[string]string{"If-Match": `"stale"`}, 412) + request("PUT", p, taskICALFixture, map[string]string{"If-None-Match": "*"}, 412) + request("PUT", taskDAVCollection+"other.ics", taskICALFixture, map[string]string{"If-None-Match": "*"}, 403) + completed := strings.Replace(get.Body.String(), "STATUS:NEEDS-ACTION", "STATUS:COMPLETED", 1) + request("PUT", p, completed, map[string]string{"If-Match": tag}, 204) + item, err = s.store.GetTask(ctx, domain, actor, item.UUID) + if err != nil || item.Status != "done" || item.CompletedMS == 0 { + t.Fatal(item, err) + } + get = request("GET", p, "", nil, 200) + if get.Header().Get("ETag") == tag { + t.Fatal("unchanged etag") + } + tag = get.Header().Get("ETag") + // Web edits preserve UID/name and metadata even if not sent by the UI. + item.Title = "Web title 日本語" + item.CalDAV = nil + if _, err = s.store.SaveTask(ctx, domain, actor, item, item.Version); err != nil { + t.Fatal(err) + } + get = request("GET", p, "", nil, 200) + if !strings.Contains(get.Body.String(), "SUMMARY:Web title 日本語") || !strings.Contains(get.Body.String(), "CATEGORIES:Test,CLI") || get.Header().Get("ETag") == tag { + t.Fatal(get.Body) + } + query := `` + report := request("REPORT", taskDAVCollection, query, nil, 207) + if !strings.Contains(report.Body.String(), "STATUS:COMPLETED") { + t.Fatal("completed tasks missing", report.Body) + } + var n davNode + if err = xml.Unmarshal(report.Body.Bytes(), &n); err != nil { + t.Fatal(err) + } + badFilter := strings.Replace(query, ``, ``, 1) + request("REPORT", taskDAVCollection, badFilter, nil, 403) + multi := `` + p + `` + taskDAVCollection + `missing.icshttps://evil.test` + p + `` + report = request("REPORT", taskDAVCollection, multi, nil, 207) + if strings.Count(report.Body.String(), "404 Not Found") != 2 { + t.Fatal(report.Body) + } + request("DELETE", p, "", map[string]string{"If-Match": get.Header().Get("ETag")}, 204) + request("GET", p, "", nil, 404) + report = request("REPORT", taskDAVCollection, query, nil, 207) + if strings.Contains(report.Body.String(), p) { + t.Fatal("archived task in collection") + } + item, err = s.store.GetTask(ctx, domain, actor, item.UUID) + if err != nil || !item.Archived { + t.Fatal("delete must archive", err) + } + item.Archived = false + if _, err = s.store.SaveTask(ctx, domain, actor, item, item.Version); err != nil { + t.Fatal(err) + } + request("GET", p, "", nil, 200) +} + +func TestTaskDAVCredentialsIsolation(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + w := taskRequest(s, token, "POST", "dav-credentials", map[string]any{"label": "CLI", "write": true, "days": 30}, "") + if w.Code != 201 { + t.Fatal(w.Code, w.Body) + } + var c struct { + Username, Password string + Credential store.TaskDAVCredential + } + if err := json.Unmarshal(w.Body.Bytes(), &c); err != nil { + t.Fatal(err) + } + auth := "Basic " + base64.StdEncoding.EncodeToString([]byte(c.Username+":"+c.Password)) + req := func(method, path, body string, headers map[string]string, want int) { + t.Helper() + w := davTaskRequest(s, auth, method, path, body, headers) + if w.Code != want { + t.Fatal(method, path, w.Code, w.Body) + } + } + req("PROPFIND", taskDAVRoot, "", nil, 207) + req("PUT", taskDAVCollection+"one.ics", taskICALFixture, map[string]string{"If-None-Match": "*"}, 201) + req("GET", tasksAPI+"items", "", nil, 401) + req("POST", tasksAPI+"dav-credentials", `{"label":"escalation","write":true}`, nil, 401) + list := taskRequest(s, token, "GET", "dav-credentials", nil, "") + if list.Code != 200 || strings.Contains(list.Body.String(), c.Password) || strings.Contains(list.Body.String(), "secret_hash") { + t.Fatal(list.Body) + } + var hash string + s.store.DB.QueryRow(`SELECT secret_hash FROM organizer_dav_credentials WHERE id=?`, c.Username).Scan(&hash) + if hash == "" || hash == c.Password { + t.Fatal("credential not hashed") + } + credential, pass, err := s.store.CreateTaskDAVCredential(ctx, domain, actor, "Reader", false, 1) + if err != nil { + t.Fatal(err) + } + auth = "Basic " + base64.StdEncoding.EncodeToString([]byte(credential.ID+":"+pass)) + req("GET", taskDAVCollection+"one.ics", "", nil, 200) + req("PUT", taskDAVCollection+"two.ics", taskICALFixture, map[string]string{"If-None-Match": "*"}, 403) + if err = s.store.RevokeTaskDAVCredential(ctx, domain, actor, credential.ID); err != nil { + t.Fatal(err) + } + req("GET", taskDAVCollection+"one.ics", "", nil, 401) + auth = "Basic " + base64.StdEncoding.EncodeToString([]byte(c.Username+":"+c.Password)) + s.store.DB.Exec(`UPDATE principals SET state='suspended' WHERE uuid=?`, actor) + req("GET", taskDAVCollection+"one.ics", "", nil, 401) + s.store.DB.Exec(`UPDATE principals SET state='active' WHERE uuid=?`, actor) + s.store.DB.Exec(`UPDATE organizer_dav_credentials SET expires_ms=? WHERE id=?`, time.Now().Add(-time.Hour).UnixMilli(), c.Username) + req("GET", taskDAVCollection+"one.ics", "", nil, 401) + // Revocation rechecked inside mutation transaction, not just at HTTP entry. + item, err := s.store.TaskDAVByName(ctx, domain, actor, "one.ics") + if err != nil { + t.Fatal(err) + } + item.Title = "must not save" + if _, err = s.store.SaveTaskDAV(ctx, domain, actor, item, item.Version, nil, c.Username); err != store.ErrAccessDenied { + t.Fatal(err) + } +} + +func TestTaskICALValidationAndFolding(t *testing.T) { + for _, change := range []string{"RRULE:FREQ=DAILY", "DUE:20260925T100000Z", "ATTENDEE:mailto:anyone@example.test", "DURATION:PT1H", "BEGIN:VALARM\r\nACTION:DISPLAY\r\nEND:VALARM", "SUMMARY:duplicate"} { + input := strings.Replace(taskICALFixture, "END:VTODO", change+"\r\nEND:VTODO", 1) + if _, err := parseTaskICAL(input); err == nil { + t.Fatal("accepted", change) + } + } + item := newTaskRecord("task", strings.Repeat("日", 90)) + item.CreatedMS = 1 + item.UpdatedMS = 2 + item.Version = 1 + data, _, err := taskICAL(item) + if err != nil { + t.Fatal(err) + } + for _, line := range strings.Split(data, "\r\n") { + if len(line) > 75 { + t.Fatal("unfolded long line", len(line)) + } + } + if _, err = parseTaskICAL(data); err != nil { + t.Fatal(err) + } + // All-day UI start=due cannot be encoded as invalid RFC VTODO dates. + item.StartOn = "2026-09-25" + item.DueOn = "2026-09-25" + data, _, err = taskICAL(item) + if err != nil { + t.Fatal(err) + } + cal, err := parseTaskICAL(data) + if err != nil { + t.Fatal(err) + } + round := taskFromICAL(cal, item) + if round.StartOn != item.StartOn { + t.Fatal("same-day start lost") + } +} + +func TestTaskDAVPrivateScopeAndConcurrency(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + own, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "Secret task"), 0) + if err != nil { + t.Fatal(err) + } + other, err := s.store.CreatePasswordAccount(domain, "davother", "a sufficiently long password", "Other", "") + if err != nil { + t.Fatal(err) + } + credential, password, err := s.store.CreateTaskDAVCredential(ctx, domain, other.UUID, "Other CLI", true, 1) + if err != nil { + t.Fatal(err) + } + auth := "Basic " + base64.StdEncoding.EncodeToString([]byte(credential.ID+":"+password)) + p := taskDAVCollection + own.UUID + ".ics" + if w := davTaskRequest(s, auth, "GET", p, "", nil); w.Code != 404 { + t.Fatal(w.Code, w.Body) + } + if w := davTaskRequest(s, auth, "PROPFIND", taskDAVCollection, "", nil); w.Code != 207 || strings.Contains(w.Body.String(), "Secret task") { + t.Fatal(w.Code, w.Body) + } + if _, _, err = s.store.AuthenticateTaskDAV(ctx, "wrong-domain", credential.ID, password); !errors.Is(err, store.ErrAccessDenied) { + t.Fatal("cross-domain credential", err) + } + auth = "Bearer " + token + g := davTaskRequest(s, auth, "GET", p, "", nil) + if g.Code != 200 { + t.Fatal(g.Code) + } + body := strings.Replace(g.Body.String(), "SUMMARY:Secret task", "SUMMARY:Changed", 1) + var wg sync.WaitGroup + codes := make(chan int, 2) + for i := 0; i < 2; i++ { + wg.Add(1) + go func() { + defer wg.Done() + codes <- davTaskRequest(s, auth, "PUT", p, body, map[string]string{"If-Match": g.Header().Get("ETag")}).Code + }() + } + wg.Wait() + close(codes) + counts := map[int]int{} + for code := range codes { + counts[code]++ + } + if counts[204] != 1 || counts[412] != 1 { + t.Fatal("CAS", counts) + } + // Extension kill switch applies to discovery, reads and writes alike. + if err = s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.tasks":false}`); err != nil { + t.Fatal(err) + } + if w := davTaskRequest(s, auth, "PROPFIND", taskDAVRoot, "", nil); w.Code != 404 { + t.Fatal(w.Code, w.Body) + } +} + +func TestTaskDAVCollectionNeverTruncates(t *testing.T) { + s, token, domain, actor := taskFixture(t) + // Synthetic DB-only rows exercise the listing guard without expensive CAS writes. + _, err := s.store.DB.Exec(`WITH RECURSIVE n(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM n WHERE x<10001) + INSERT INTO organizer_items(domain_uuid,owner_uuid,uuid,kind,project_uuid,title,status,bucket,due_on,planned_on,review_on,archived,version,created_at_ms,updated_at_ms,data,document_hash) + SELECT ?,?,'fixture-'||x,'task','','Fixture','todo','inbox','','','',0,1,x,x,'{}','' FROM n`, domain, actor) + if err != nil { + t.Fatal(err) + } + w := davTaskRequest(s, "Bearer "+token, "PROPFIND", taskDAVCollection, "", nil) + if w.Code != 507 || strings.Contains(w.Body.String(), "multistatus") { + t.Fatal("partial listing would imply deletions", w.Code, w.Body) + } +} diff --git a/internal/server/task_focus.go b/internal/server/task_focus.go new file mode 100644 index 0000000..b87e79a --- /dev/null +++ b/internal/server/task_focus.go @@ -0,0 +1,54 @@ +package server + +import ( + "encoding/json" + "net/http" + "time" + + "pageswiki/internal/store" +) + +func (s *Server) handleTaskFocus(w http.ResponseWriter, r *http.Request, actor string, active bool, parts []string) { + if len(parts) != 1 { + http.NotFound(w, r) + return + } + domain := s.domainUUIDForRequest(r) + if r.Method == "GET" { + f, err := s.store.LatestTaskFocus(r.Context(), domain, actor) + if err != nil { + taskError(w, err) + return + } + writeEventJSON(w, 200, map[string]any{"item": f, "server_now_ms": time.Now().UnixMilli()}) + return + } + if r.Method != "POST" { + w.WriteHeader(405) + return + } + if !active { + taskError(w, store.ErrAccessDenied) + return + } + var input struct { + UUID string `json:"uuid"` + TaskUUID string `json:"task_uuid"` + Phase string `json:"phase"` + Minutes int64 `json:"minutes"` + Action string `json:"action"` + Version int64 `json:"version"` + } + dec := json.NewDecoder(http.MaxBytesReader(w, r.Body, 4096)) + dec.DisallowUnknownFields() + if err := dec.Decode(&input); err != nil || input.Minutes < 0 || input.Minutes > 180 { + taskError(w, store.ErrTaskInvalid) + return + } + f, err := s.store.ChangeTaskFocus(r.Context(), domain, actor, input.Action, store.TaskFocus{UUID: input.UUID, TaskUUID: input.TaskUUID, Phase: input.Phase, DurationMS: input.Minutes * 60000}, input.Version, time.Now()) + if err != nil { + taskError(w, err) + return + } + writeEventJSON(w, 200, map[string]any{"item": f, "server_now_ms": time.Now().UnixMilli()}) +} diff --git a/internal/server/task_focus_domains_test.go b/internal/server/task_focus_domains_test.go new file mode 100644 index 0000000..efb9d05 --- /dev/null +++ b/internal/server/task_focus_domains_test.go @@ -0,0 +1,85 @@ +package server + +import ( + "context" + "errors" + "testing" + "time" + + "github.com/google/uuid" + "pageswiki/internal/store" +) + +func TestTaskFocusCrossDomainRecovery(t *testing.T) { + s, _, domain, actor := taskFixture(t) + ctx := context.Background() + now := time.Now() + d, err := s.store.GetDomainByUUID(domain) + if err != nil { + t.Fatal(err) + } + if err = s.store.CreateDomain(d.CampusUUID, "focus-other", "Other", "focus-other", "local", "", "", true); err != nil { + t.Fatal(err) + } + domains, err := s.store.ListDomains() + if err != nil { + t.Fatal(err) + } + other := "" + for _, d := range domains { + if d.Name == "focus-other" { + other = d.UUID + } + } + if other == "" { + t.Fatal("missing domain") + } + if _, err = s.store.DB.Exec(`INSERT OR IGNORE INTO domain_memberships(uuid,domain_uuid,principal_uuid,state,created_at_ms) VALUES(?,?,?,'active',0)`, uuid.NewString(), other, actor); err != nil { + t.Fatal(err) + } + f, err := s.store.ChangeTaskFocus(ctx, domain, actor, "start", store.TaskFocus{UUID: uuid.NewString(), Phase: "focus", DurationMS: 60000}, 0, now) + if err != nil { + t.Fatal(err) + } + f, err = s.store.ChangeTaskFocus(ctx, domain, actor, "pause", f, f.Version, now.Add(time.Second)) + if err != nil { + t.Fatal(err) + } + draft := store.TaskFocus{UUID: uuid.NewString(), Phase: "focus", DurationMS: 60000} + if _, err = s.store.ChangeTaskFocus(ctx, other, actor, "start", draft, 0, now); !errors.Is(err, store.ErrTaskConflict) { + t.Fatal("multiple active domains", err) + } + if _, err = s.store.DB.Exec(`UPDATE domain_memberships SET state='suspended' WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil { + t.Fatal(err) + } + if _, err = s.store.ChangeTaskFocus(ctx, other, actor, "start", draft, 0, now.Add(2*time.Second)); err != nil { + t.Fatal("stranded timer blocked start", err) + } + var state, action string + s.store.DB.QueryRow(`SELECT state FROM organizer_focus WHERE uuid=?`, f.UUID).Scan(&state) + s.store.DB.QueryRow(`SELECT action FROM organizer_focus_changes WHERE session_uuid=? ORDER BY version DESC LIMIT 1`, f.UUID).Scan(&action) + if state != "cancelled" || action != "revoked" { + t.Fatal(state, action) + } + latest, err := s.store.LatestTaskFocus(ctx, other, actor) + if err != nil || latest.UUID != draft.UUID { + t.Fatal(latest, err) + } +} + +func TestTaskFocusSchedulePreservesAdminSettings(t *testing.T) { + s, _, _, _ := taskFixture(t) + if err := s.store.EnsureTaskFocusEvent(); err != nil { + t.Fatal(err) + } + if _, err := s.store.DB.Exec(`UPDATE event_definitions SET enabled=0,interval_seconds=120 WHERE uuid='builtin.task.focus'`); err != nil { + t.Fatal(err) + } + if err := s.store.EnsureTaskFocusEvent(); err != nil { + t.Fatal(err) + } + var enabled, interval int + if err := s.store.DB.QueryRow(`SELECT enabled,interval_seconds FROM event_definitions WHERE uuid='builtin.task.focus'`).Scan(&enabled, &interval); err != nil || enabled != 0 || interval != 120 { + t.Fatal(enabled, interval, err) + } +} diff --git a/internal/server/task_focus_test.go b/internal/server/task_focus_test.go new file mode 100644 index 0000000..1bacaca --- /dev/null +++ b/internal/server/task_focus_test.go @@ -0,0 +1,198 @@ +package server + +import ( + "context" + "errors" + "strings" + "sync" + "testing" + "time" + + "github.com/google/uuid" + "pageswiki/internal/store" +) + +func TestTaskFocusLifecycle(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + now := time.Date(2026, 9, 25, 1, 0, 0, 0, time.UTC) + task, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "Secret focus title"), 0) + if err != nil { + t.Fatal(err) + } + f := store.TaskFocus{UUID: uuid.NewString(), TaskUUID: task.UUID, Phase: "focus", DurationMS: 25 * 60000} + initial := f + f, err = s.store.ChangeTaskFocus(ctx, domain, actor, "start", f, 0, now) + if err != nil { + t.Fatal(err) + } + if f.Version != 1 || f.DeadlineMS != now.Add(25*time.Minute).UnixMilli() { + t.Fatal(f) + } + retry, err := s.store.ChangeTaskFocus(ctx, domain, actor, "start", initial, 0, now.Add(time.Minute)) + if err != nil || retry.DeadlineMS != f.DeadlineMS { + t.Fatal("retry reset", retry, err) + } + f, err = s.store.ChangeTaskFocus(ctx, domain, actor, "pause", f, 1, now.Add(10*time.Minute)) + if err != nil || f.RemainingMS != 15*60000 || f.DeadlineMS != 0 { + t.Fatal(f, err) + } + if _, err = s.store.ChangeTaskFocus(ctx, domain, actor, "resume", f, 1, now); !errors.Is(err, store.ErrTaskConflict) { + t.Fatal("stale transition", err) + } + f, err = s.store.ChangeTaskFocus(ctx, domain, actor, "resume", f, 2, now.Add(time.Hour)) + if err != nil || f.DeadlineMS != now.Add(75*time.Minute).UnixMilli() { + t.Fatal(f, err) + } + if n, err := s.store.CompleteTaskFocus(ctx, now.Add(74*time.Minute), 100); err != nil || n != 0 { + t.Fatal(n, err) + } + if n, err := s.store.CompleteTaskFocus(ctx, now.Add(76*time.Minute), 100); err != nil || n != 1 { + t.Fatal(n, err) + } + if n, err := s.store.CompleteTaskFocus(ctx, now.Add(77*time.Minute), 100); err != nil || n != 0 { + t.Fatal(n, err) + } + latest, err := s.store.LatestTaskFocus(ctx, domain, actor) + if err != nil || latest.State != "completed" || latest.Version != 4 { + t.Fatal(latest, err) + } + var notifications, changes int + s.store.DB.QueryRow(`SELECT count(*) FROM notification_inbox WHERE kind=?`, store.TaskFocusEventType).Scan(¬ifications) + s.store.DB.QueryRow(`SELECT count(*) FROM organizer_focus_changes WHERE session_uuid=?`, f.UUID).Scan(&changes) + if notifications != 1 || changes != 4 { + t.Fatal(notifications, changes) + } + fresh, _ := s.store.GetTask(ctx, domain, actor, task.UUID) + if fresh.Status != "todo" || fresh.Version != task.Version { + t.Fatal("timer completed task", fresh) + } + w := taskRequest(s, token, "GET", "focus", nil, "") + if w.Code != 200 || strings.Contains(w.Body.String(), task.Title) || !strings.Contains(w.Body.String(), "server_now_ms") { + t.Fatal(w.Code, w.Body) + } + if _, err = s.store.LatestTaskFocus(ctx, domain, uuid.NewString()); err == nil { + t.Fatal("unauthorized") + } +} + +func TestTaskFocusConcurrencyAndRollback(t *testing.T) { + s, _, domain, actor := taskFixture(t) + ctx := context.Background() + now := time.Now() + var wg sync.WaitGroup + errs := make(chan error, 2) + for i := 0; i < 2; i++ { + wg.Add(1) + go func() { + defer wg.Done() + _, err := s.store.ChangeTaskFocus(ctx, domain, actor, "start", store.TaskFocus{UUID: uuid.NewString(), Phase: "focus", DurationMS: 60000}, 0, now) + errs <- err + }() + } + wg.Wait() + close(errs) + success, conflict := 0, 0 + for err := range errs { + if err == nil { + success++ + } else if errors.Is(err, store.ErrTaskConflict) { + conflict++ + } else { + t.Fatal(err) + } + } + if success != 1 || conflict != 1 { + t.Fatal(success, conflict) + } + if _, err := s.store.DB.Exec(`CREATE TRIGGER fail_focus_notice BEFORE INSERT ON notification_inbox BEGIN SELECT RAISE(ABORT,'synthetic notice failure'); END`); err != nil { + t.Fatal(err) + } + if _, err := s.store.CompleteTaskFocus(ctx, now.Add(2*time.Minute), 100); err == nil { + t.Fatal("failure missing") + } + f, _ := s.store.LatestTaskFocus(ctx, domain, actor) + if f.State != "running" || f.Version != 1 { + t.Fatal("partial completion", f) + } + if _, err := s.store.DB.Exec(`DROP TRIGGER fail_focus_notice`); err != nil { + t.Fatal(err) + } + if _, err := s.store.CompleteTaskFocus(ctx, now.Add(2*time.Minute), 100); err != nil { + t.Fatal(err) + } + if _, err := s.store.ChangeTaskFocus(ctx, domain, actor, "cancel", *f, 1, now); !errors.Is(err, store.ErrTaskConflict) { + t.Fatal("late cancel", err) + } +} + +func TestTaskFocusRevokedAndMissedNotifications(t *testing.T) { + for _, mode := range []string{"cancel", "revoked", "disabled", "missed"} { + t.Run(mode, func(t *testing.T) { + s, _, domain, actor := taskFixture(t) + ctx := context.Background() + now := time.Now() + f, err := s.store.ChangeTaskFocus(ctx, domain, actor, "start", store.TaskFocus{UUID: uuid.NewString(), Phase: "break", DurationMS: 60000}, 0, now) + if err != nil { + t.Fatal(err) + } + switch mode { + case "cancel": + _, err = s.store.ChangeTaskFocus(ctx, domain, actor, "cancel", f, 1, now) + case "revoked": + _, err = s.store.DB.Exec(`UPDATE domain_memberships SET state='suspended' WHERE domain_uuid=? AND principal_uuid=?`, domain, actor) + case "disabled": + _, err = s.store.DB.Exec(`INSERT INTO config(domain_uuid,key,value,updated_at) VALUES(?,'system_extension_states','{"organizer.tasks":false}',0) ON CONFLICT(domain_uuid,key) DO UPDATE SET value=excluded.value`, domain) + case "missed": + now = now.Add(48 * time.Hour) + } + if err != nil { + t.Fatal(err) + } + if _, err = s.store.CompleteTaskFocus(ctx, now.Add(2*time.Minute), 100); err != nil { + t.Fatal(err) + } + var count int + s.store.DB.QueryRow(`SELECT count(*) FROM notification_inbox WHERE kind=?`, store.TaskFocusEventType).Scan(&count) + if count != 0 { + t.Fatal("unwanted notice", count) + } + }) + } +} + +func TestTaskFocusAPI(t *testing.T) { + s, token, domain, actor := taskFixture(t) + input := map[string]any{"uuid": uuid.NewString(), "action": "start", "phase": "focus", "minutes": 25, "version": 0} + w := taskRequest(s, token, "POST", "focus", input, "") + if w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + if w = taskRequest(s, token, "POST", "focus", input, ""); w.Code != 200 { + t.Fatal("retry", w.Code, w.Body) + } + input["action"] = "pause" + input["version"] = 1 + if w = taskRequest(s, token, "POST", "focus", input, ""); w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + if w = taskRequest(s, token, "POST", "focus", input, ""); w.Code != 412 { + t.Fatal(w.Code, w.Body) + } + if _, err := s.store.DB.Exec(`UPDATE principals SET state='readonly' WHERE uuid=?`, actor); err != nil { + t.Fatal(err) + } + input["version"] = 2 + input["action"] = "resume" + if w = taskRequest(s, token, "POST", "focus", input, ""); w.Code != 403 { + t.Fatal(w.Code, w.Body) + } + if w = taskRequest(s, token, "GET", "focus", nil, ""); w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + var n int + s.store.DB.QueryRow(`SELECT count(*) FROM organizer_focus WHERE domain_uuid=?`, domain).Scan(&n) + if n != 1 { + t.Fatal(n) + } +} diff --git a/internal/server/task_hierarchy_test.go b/internal/server/task_hierarchy_test.go new file mode 100644 index 0000000..293bba5 --- /dev/null +++ b/internal/server/task_hierarchy_test.go @@ -0,0 +1,80 @@ +package server + +import ( + "context" + "errors" + "net/http/httptest" + "pageswiki/internal/store" + "testing" +) + +func TestTaskHierarchyAndDaySchedule(t *testing.T) { + s, token, domain, owner := taskFixture(t) + ctx := context.Background() + save := func(i store.TaskRecord) store.TaskRecord { + t.Helper() + v, e := s.store.SaveTask(ctx, domain, owner, i, i.Version) + if e != nil { + t.Fatal(e) + } + return v + } + parent := save(newTaskRecord("task", "Parent")) + child := newTaskRecord("task", "Child") + child.ParentUUID = parent.UUID + child.StartOn = "2026-09-29" + child.EndOn = "2026-10-02" + child = save(child) + bad := newTaskRecord("task", "Grandchild") + bad.ParentUUID = child.UUID + if _, e := s.store.SaveTask(ctx, domain, owner, bad, 0); !errors.Is(e, store.ErrTaskInvalid) { + t.Fatal("grandchild accepted", e) + } + bad = parent + bad.ParentUUID = child.UUID + if _, e := s.store.SaveTask(ctx, domain, owner, bad, parent.Version); !errors.Is(e, store.ErrTaskInvalid) { + t.Fatal("cycle accepted", e) + } + parent.Status = "done" + parent.Archived = true + save(parent) + child.Title = "Independent child" + child = save(child) + if child.Status != "todo" { + t.Fatal("parent completion cascaded") + } + for _, month := range []string{"2026-09", "2026-10"} { + items, partial, e := s.store.TaskSchedule(ctx, domain, owner, month, "") + if e != nil || partial || len(items) != 1 || items[0].UUID != child.UUID || items[0].Notes != "" { + t.Fatalf("schedule %s: %+v %v", month, items, e) + } + } + if items, _, e := s.store.TaskSchedule(ctx, domain, owner, "2026-11", ""); e != nil || len(items) != 0 { + t.Fatal("out of range", e) + } + bad = child + bad.EndOn = "2026-09-01" + if _, e := s.store.SaveTask(ctx, domain, owner, bad, child.Version); !errors.Is(e, store.ErrTaskInvalid) { + t.Fatal("reverse span", e) + } + bad = child + bad.EndOn = "2028-09-01" + if _, e := s.store.SaveTask(ctx, domain, owner, bad, child.Version); !errors.Is(e, store.ErrTaskInvalid) { + t.Fatal("unbounded span", e) + } + family, _, e := s.store.ListTasks(ctx, domain, owner, store.TaskQuery{Kind: "task", View: "family", Parent: parent.UUID, Today: "2026-09-25"}) + if e != nil || len(family) != 1 { + t.Fatal("family", e) + } + w := taskRequest(s, token, "GET", "schedule?month=2026-10", nil, "") + if w.Code != 200 { + t.Fatalf("schedule API %d %s", w.Code, w.Body) + } + r := httptest.NewRequest("GET", "http://localhost/v/plan/tasks/schedule/2026/10", nil) + r.Header.Set("Authorization", "Bearer "+token) + w = httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + if w.Code != 200 { + t.Fatalf("schedule page %d %s", w.Code, w.Body) + } +} diff --git a/internal/server/task_ical.go b/internal/server/task_ical.go new file mode 100644 index 0000000..0822964 --- /dev/null +++ b/internal/server/task_ical.go @@ -0,0 +1,271 @@ +package server + +import ( + "bytes" + "crypto/sha256" + "fmt" + "io" + "strconv" + "strings" + "time" + "unicode/utf8" + + ical "github.com/emersion/go-ical" + "pageswiki/internal/store" +) + +// Deliberately bounded, non-recurring VTODO profile. Unsupported scheduling +// semantics fail explicitly; accepted ancillary properties survive UI edits. +func parseTaskICAL(data string) (*ical.Calendar, error) { + bad := func(reason string) (*ical.Calendar, error) { return nil, fmt.Errorf("invalid VTODO: %s", reason) } + if len(data) > 32768 || !utf8.ValidString(data) { + return bad("size or UTF-8") + } + for _, c := range data { + if c < 32 && c != '\r' && c != '\n' && c != '\t' || c == 127 { + return bad("control character") + } + } + // Bound nesting before invoking the recursive decoder. + depth := 0 + unfolded := strings.ReplaceAll(strings.ReplaceAll(strings.ReplaceAll(data, "\r\n", "\n"), "\n ", ""), "\n\t", "") + for _, line := range strings.Split(unfolded, "\n") { + upper := strings.ToUpper(line) + if strings.HasPrefix(upper, "BEGIN:") { + depth++ + if depth > 2 { + return bad("nested components (including VALARM/VTIMEZONE) unsupported") + } + } + if strings.HasPrefix(upper, "END:") { + depth-- + } + } + dec := ical.NewDecoder(strings.NewReader(data)) + c, err := dec.Decode() + if err != nil { + return bad("syntax") + } + if _, err = dec.Decode(); err != io.EOF { + return bad("exactly one VCALENDAR required") + } + if len(c.Children) != 1 || c.Children[0].Name != "VTODO" || len(c.Children[0].Children) != 0 { + return bad("exactly one VTODO required") + } + for key, props := range c.Props { + if len(props) != 1 || (key != "VERSION" && key != "PRODID" && key != "CALSCALE") { + return bad("unsupported calendar property " + key) + } + } + if v, _ := c.Props.Text("VERSION"); v != "2.0" { + return bad("VERSION") + } + if v, _ := c.Props.Text("PRODID"); v == "" { + return bad("PRODID") + } + if v, _ := c.Props.Text("CALSCALE"); v != "" && v != "GREGORIAN" { + return bad("CALSCALE") + } + v := c.Children[0] + allowed := map[string]bool{"UID": true, "DTSTAMP": true, "SUMMARY": true, "DESCRIPTION": true, "STATUS": true, "PRIORITY": true, "PERCENT-COMPLETE": true, "DTSTART": true, "DUE": true, "CREATED": true, "LAST-MODIFIED": true, "COMPLETED": true, "SEQUENCE": true, "CATEGORIES": true, "URL": true, "LOCATION": true, "CLASS": true, "RELATED-TO": true} + for key, props := range v.Props { + if !allowed[key] && !strings.HasPrefix(key, "X-") { + return bad("unsupported property " + key) + } + if len(props) != 1 && key != "CATEGORIES" && key != "RELATED-TO" && !strings.HasPrefix(key, "X-") { + return bad("duplicate " + key) + } + for _, p := range props { + for param, values := range p.Params { + if len(values) != 1 { + return bad("multiple parameter values") + } + if param != "VALUE" && param != "LANGUAGE" && param != "RELTYPE" { + return bad("unsupported parameter " + param) + } + } + } + } + for _, key := range []string{"UID", "DTSTAMP", "SUMMARY"} { + if len(v.Props[key]) != 1 { + return bad(key + " required") + } + } + uid, e := v.Props.Text("UID") + if e != nil || uid == "" || len(uid) > 512 || strings.ContainsAny(uid, "\r\n\x00") { + return bad("UID") + } + for _, key := range []string{"SUMMARY", "DESCRIPTION", "LOCATION", "CLASS"} { + if _, err = v.Props.Text(key); err != nil { + return bad(key) + } + } + title, _ := v.Props.Text("SUMMARY") + notes, _ := v.Props.Text("DESCRIPTION") + if strings.TrimSpace(title) == "" || len(title) > 300 || strings.ContainsAny(title, "\r\n") || len(notes) > 16384 { + return bad("title or description size") + } + status, _ := v.Props.Text("STATUS") + if status != "" && taskStatusFromICAL(status) == "" { + return bad("STATUS") + } + for key, max := range map[string]int{"PRIORITY": 9, "PERCENT-COMPLETE": 100, "SEQUENCE": 2147483647} { + if p := v.Props.Get(key); p != nil { + n, e := strconv.Atoi(p.Value) + if e != nil || n < 0 || n > max { + return bad(key) + } + } + } + for _, key := range []string{"DTSTART", "DUE", "DTSTAMP", "CREATED", "LAST-MODIFIED", "COMPLETED"} { + p := v.Props.Get(key) + if p == nil { + continue + } + date := p.ValueType() == ical.ValueDate + if (key == "DTSTART" || key == "DUE") && !date { + return bad(key + " currently requires VALUE=DATE (task dates have no time of day)") + } + if key != "DTSTART" && key != "DUE" && (date || !strings.HasSuffix(p.Value, "Z")) { + return bad(key + " requires UTC DATE-TIME") + } + t, e := p.DateTime(time.UTC) + if e != nil || t.Year() < 1 || t.Year() > 9999 { + return bad(key) + } + } + if start, due := v.Props.Get("DTSTART"), v.Props.Get("DUE"); start != nil && due != nil && due.Value <= start.Value { + return bad("DUE must follow DTSTART") + } + if _, err = encodeTaskICAL(c); err != nil { + return bad("property cardinality") + } + return c, nil +} +func taskStatusFromICAL(s string) string { + return map[string]string{"NEEDS-ACTION": "todo", "IN-PROCESS": "doing", "COMPLETED": "done", "CANCELLED": "cancelled"}[s] +} +func taskPriorityFromICAL(n int) int { + if n == 1 { + return 3 + } + if n >= 2 && n <= 4 { + return 2 + } + if n == 0 || n == 5 { + return 1 + } + return 0 +} +func taskFromICAL(c *ical.Calendar, old store.TaskRecord) store.TaskRecord { + previousStart, previousDue := old.StartOn, old.DueOn + p := c.Children[0].Props + old.Title, _ = p.Text("SUMMARY") + old.Notes, _ = p.Text("DESCRIPTION") + status, _ := p.Text("STATUS") + old.Status = taskStatusFromICAL(status) + if old.Status == "" { + old.Status = "todo" + } + old.Priority = 1 + if v := p.Get("PRIORITY"); v != nil { + n, _ := strconv.Atoi(v.Value) + old.Priority = taskPriorityFromICAL(n) + } + old.StartOn, old.DueOn = "", "" + for key, dst := range map[string]*string{"DTSTART": &old.StartOn, "DUE": &old.DueOn} { + if v := p.Get(key); v != nil { + t, _ := v.DateTime(time.UTC) + *dst = t.Format("2006-01-02") + } + } + if old.StartOn == "" && previousStart != "" && previousDue != "" && previousDue <= previousStart && old.DueOn == previousDue { + old.StartOn = previousStart // DTSTART was intentionally absent in this projection. + } + // Clearing a date must also stop the date-specific reminder. + if old.DueOn == "" { + old.NotifyDue = false + } + return old +} +func encodeTaskICAL(c *ical.Calendar) (string, error) { + var b bytes.Buffer + if err := ical.NewEncoder(&b).Encode(c); err != nil { + return "", err + } + var out strings.Builder + for _, line := range strings.Split(strings.TrimSuffix(b.String(), "\r\n"), "\r\n") { + limit := 75 + for len(line) > limit { + n := limit + for n > 0 && !utf8.RuneStart(line[n]) { + n-- + } + out.WriteString(line[:n] + "\r\n ") + line = line[n:] + limit = 74 + } + out.WriteString(line + "\r\n") + } + return out.String(), nil +} +func taskICAL(item store.TaskRecord) (string, string, error) { + c := ical.NewCalendar() + c.Props.SetText("VERSION", "2.0") + c.Props.SetText("PRODID", "-//PagesWiki//Tasks//EN") + v := ical.NewComponent("VTODO") + c.Children = []*ical.Component{v} + uid := item.UUID + if item.CalDAV != nil { + var err error + c, err = parseTaskICAL(item.CalDAV.Data) + if err != nil { + return "", "", err + } + v = c.Children[0] + uid = item.CalDAV.UID + } + p := v.Props + p.SetText("UID", uid) + p.SetText("SUMMARY", item.Title) + p.SetText("DESCRIPTION", item.Notes) + status := map[string]string{"todo": "NEEDS-ACTION", "doing": "IN-PROCESS", "done": "COMPLETED", "cancelled": "CANCELLED"}[item.Status] + previous, _ := p.Text("STATUS") + if previous != status { + delete(p, "PERCENT-COMPLETE") + } + p.SetText("STATUS", status) + if item.Status == "done" { + p.SetText("PERCENT-COMPLETE", "100") + p.SetDateTime("COMPLETED", time.UnixMilli(item.CompletedMS).UTC()) + } else { + delete(p, "COMPLETED") + } + priority := map[int]string{0: "9", 1: "5", 2: "3", 3: "1"}[item.Priority] + if old := p.Get("PRIORITY"); old != nil { + n, _ := strconv.Atoi(old.Value) + if taskPriorityFromICAL(n) == item.Priority { + priority = old.Value + } + } + p.SetText("PRIORITY", priority) + for key, date := range map[string]string{"DTSTART": item.StartOn, "DUE": item.DueOn} { + delete(p, key) + if date != "" { + t, _ := time.Parse("2006-01-02", date) + p.SetDate(key, t) + } + } + // The UI permits same-day or overdue task dates; VTODO requires DUE > DTSTART. + // Omit DTSTART from the projection in that case, keeping UI dates untouched. + if item.StartOn != "" && item.DueOn != "" && item.DueOn <= item.StartOn { + delete(p, "DTSTART") + } + p.SetDateTime("DTSTAMP", time.UnixMilli(item.UpdatedMS).UTC()) + p.SetDateTime("LAST-MODIFIED", time.UnixMilli(item.UpdatedMS).UTC()) + p.SetDateTime("CREATED", time.UnixMilli(item.CreatedMS).UTC()) + p.SetText("SEQUENCE", strconv.FormatInt(item.Version-1, 10)) + data, err := encodeTaskICAL(c) + h := sha256.Sum256([]byte(data)) + return data, fmt.Sprintf(`"%x"`, h), err +} diff --git a/internal/server/task_notes.go b/internal/server/task_notes.go new file mode 100644 index 0000000..8d02f7b --- /dev/null +++ b/internal/server/task_notes.go @@ -0,0 +1,131 @@ +package server + +import ( + "database/sql" + "encoding/json" + "errors" + "io" + "net/http" + "net/url" + "strconv" + + "pageswiki/internal/store" +) + +func (s *Server) handleTaskNote(w http.ResponseWriter, r *http.Request, actor string, active bool, id string) { + if r.Method != "GET" && r.Method != "POST" { + w.Header().Set("Allow", "GET, POST") + w.WriteHeader(405) + return + } + domain := s.domainUUIDForRequest(r) + item, err := s.store.GetTask(r.Context(), domain, actor, id) + if err != nil { + taskError(w, err) + return + } + if item.Kind != "task" { + taskError(w, store.ErrTaskInvalid) + return + } + if r.Method == "POST" { + if !active || item.Archived { + taskError(w, store.ErrAccessDenied) + return + } + if r.Header.Get("If-Match") == "" { + writeEventJSON(w, 428, map[string]string{"error": "precondition"}) + return + } + if r.Header.Get("If-Match") != `"`+strconv.FormatInt(item.Version, 10)+`"` { + taskError(w, store.ErrTaskConflict) + return + } + } + target := s.taskPagePath(r, item.PageUUID) + linked := item.PageUUID != "" + var project store.TaskRecord + var base string + if linked && target == "" { + taskError(w, store.ErrAccessDenied) + return + } + if !linked { + if item.ProjectUUID != "" { + project, err = s.store.GetTask(r.Context(), domain, actor, item.ProjectUUID) + } + if err != nil && !errors.Is(err, sql.ErrNoRows) { + taskError(w, err) + return + } + base = s.taskPagePath(r, project.PageUUID) + if project.Kind != "project" || project.Archived || base == "" { + writeEventJSON(w, 422, map[string]string{"error": "note_setup"}) + return + } + target = store.TaskNotePath(base, project, item) + } + // Task ownership does not bypass Wiki read/create/write permissions. + if s.authorizePathRequest(r, "read", target) != nil { + taskError(w, store.ErrAccessDenied) + return + } + writable := active && !item.Archived && s.authorizePathRequest(r, "write", target) == nil + if !linked { + writable = writable && s.authorizePathRequest(r, "create", target) == nil + } + exists := linked + if !linked { + _, err = s.store.ResolvePathInDomain(domain, target) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + taskError(w, err) + return + } + exists = err == nil + } + if r.Method == "POST" { + if !writable { + taskError(w, store.ErrAccessDenied) + return + } + if !linked { + var input struct { + Path string `json:"path"` + } + decoder := json.NewDecoder(http.MaxBytesReader(w, r.Body, 4096)) + decoder.DisallowUnknownFields() + if decoder.Decode(&input) != nil || decoder.Decode(&struct{}{}) != io.EOF { + taskError(w, store.ErrTaskInvalid) + return + } + if input.Path != target { + taskError(w, store.ErrTaskConflict) + return + } + if exists { + taskError(w, store.ErrTaskNoteExists) + return + } + item, err = s.store.CreateTaskNote(r.Context(), domain, actor, item, item.Version, project, base, target) + if err != nil { + taskError(w, err) + return + } + linked, exists = true, true + } + } + escaped := (&url.URL{Path: target}).EscapedPath() + editURL := "/e/-" + escaped + if linked && writable { + if actions, e := s.adapterActionsForPath(r, target); e == nil { + for _, a := range actions { + if a.Mode == "editor" && a.Default { + editURL = a.OpenURL + break + } + } + } + } + w.Header().Set("ETag", `"`+strconv.FormatInt(item.Version, 10)+`"`) + writeEventJSON(w, 200, map[string]any{"item": item, "path": target, "url": escaped, "edit_url": editURL, "linked": linked, "exists": exists, "writable": writable}) +} diff --git a/internal/server/task_notifications.go b/internal/server/task_notifications.go new file mode 100644 index 0000000..69b4bcb --- /dev/null +++ b/internal/server/task_notifications.go @@ -0,0 +1,38 @@ +package server + +import ( + "net/http" + "pageswiki/internal/store" +) + +func (s *Server) decorateTaskNotification(r *http.Request, n *store.Notification) { + if n.Kind == store.TaskFocusEventType { + n.Href = "" + n.Message = "Timer completed" + if s.getLocale(s.domainUUIDForRequest(r)) == "ja" { + n.Message = "タイマーが終了しました" + } + if s.systemExtensionEnabled(s.domainUUIDForRequest(r), "organizer.tasks") { + n.Href = "/v/plan/today" + } + return + } + if n.Kind != "task.due" && n.Kind != "task.planned" { + return + } + domain := s.domainUUIDForRequest(r) + locale := s.getLocale(domain) + n.Href = "" + n.Message = translate(locale, "tasks.reminder_unavailable") + if !s.systemExtensionEnabled(domain, "organizer.tasks") { + return + } + // The notification has already been fetched under its authenticated + // recipient. Recheck the live task ownership/membership before projecting. + title, err := s.store.TaskReminderTitle(r.Context(), domain, n.RecipientUUID, n.EventUUID) + if err != nil { + return + } + n.Message = translate(locale, "tasks.reminder_"+n.Kind[5:]) + ": " + title + n.Href = "/v/plan/task/" + n.RequestUUID +} diff --git a/internal/server/task_planning.go b/internal/server/task_planning.go new file mode 100644 index 0000000..55d90e1 --- /dev/null +++ b/internal/server/task_planning.go @@ -0,0 +1,175 @@ +package server + +import ( + "encoding/json" + "net/http" + "net/url" + "strings" + "time" + "unicode" + + cal "pageswiki/internal/calendar" + "pageswiki/internal/store" +) + +func (s *Server) handleTaskPlanning(w http.ResponseWriter, r *http.Request, actor string, active bool, parts []string) { + domain := s.domainUUIDForRequest(r) + if !s.systemExtensionEnabled(domain, "organizer.calendar") { + http.NotFound(w, r) + return + } + if r.Method != "GET" && !active { + taskError(w, store.ErrAccessDenied) + return + } + // A live membership check is needed even for an empty calendar picker. + if _, _, err := s.store.ListTasks(r.Context(), domain, actor, store.TaskQuery{Kind: "task", View: "all", Today: time.Now().In(s.getLocation(domain)).Format("2006-01-02"), Limit: 1}); err != nil { + taskError(w, err) + return + } + repo, err := s.calendars() + if err != nil { + taskError(w, err) + return + } + if parts[0] == "calendars" { + if len(parts) != 1 { + http.NotFound(w, r) + return + } + if r.Method != "GET" { + w.WriteHeader(405) + return + } + items, err := repo.List(domain, actor) + if err != nil { + calendarError(w, err) + return + } + out := []map[string]string{} + for _, c := range items { + if c.PersonalLocal(actor) { + out = append(out, map[string]string{"id": c.ID, "name": c.Name, "pretty_name": c.PrettyName}) + } + } + writeEventJSON(w, 200, map[string]any{"items": out, "timezone": s.getTimezoneName(domain)}) + return + } + if len(parts) == 1 && r.Method == "GET" { + items, err := s.store.TaskBlocks(r.Context(), domain, actor, r.URL.Query().Get("task_uuid")) + if err != nil { + taskError(w, err) + return + } + writeEventJSON(w, 200, map[string]any{"items": items}) + return + } + if len(parts) == 2 && r.Method == "DELETE" { + // Tombstone only: unlink is explicitly NOT calendar event deletion. + if err := s.store.SetTaskBlockState(r.Context(), domain, actor, parts[1], "unlinked"); err != nil { + taskError(w, err) + return + } + w.WriteHeader(204) + return + } + if len(parts) == 2 && r.Method == "GET" { + b, err := s.store.GetTaskBlock(r.Context(), domain, actor, parts[1]) + if err != nil { + taskError(w, err) + return + } + c, event, err := repo.TaskBlock(r.Context(), domain, b.CalendarUUID, actor, b.EventUID, nil) + out := map[string]any{"item": b, "available": err == nil} + if err == nil { + out["start"] = event.Start + out["end"] = event.End + out["etag"] = event.ETag + out["href"] = "/v/plan/event/" + url.PathEscape(b.EventUID) + "?calendar=" + url.QueryEscape(c.PrettyName) + } + // No summary, description, imported data, or backend paths are exposed. + writeEventJSON(w, 200, out) + return + } + if len(parts) != 1 || r.Method != "POST" { + w.WriteHeader(405) + return + } + var input struct { + UUID string `json:"uuid"` + TaskUUID string `json:"task_uuid"` + CalendarUUID string `json:"calendar_uuid"` + Version int64 `json:"task_version"` + Start string `json:"start"` + End string `json:"end"` + Timezone string `json:"timezone"` + } + dec := json.NewDecoder(http.MaxBytesReader(w, r.Body, 8192)) + dec.DisallowUnknownFields() + if err := dec.Decode(&input); err != nil { + taskError(w, store.ErrTaskInvalid) + return + } + // RFC3339 is unambiguous on retries, even after Domain timezone changes. + parse := func(value string) (time.Time, error) { + if t, err := time.Parse(time.RFC3339, value); err == nil { + return t, nil + } + loc, err := time.LoadLocation(input.Timezone) + if err != nil || input.Timezone == "" || input.Timezone == "Local" { + return time.Time{}, store.ErrTaskInvalid + } + t, err := time.ParseInLocation("2006-01-02T15:04", value, loc) + if err != nil || t.Format("2006-01-02T15:04") != value { + return time.Time{}, store.ErrTaskInvalid + } + return t, nil + } + start, e1 := parse(input.Start) + end, e2 := parse(input.End) + if e1 != nil || e2 != nil { + taskError(w, store.ErrTaskInvalid) + return + } + c, err := repo.Get(domain, input.CalendarUUID, actor) + if err != nil { + calendarError(w, err) + return + } + if !c.PersonalLocal(actor) { + taskError(w, store.ErrAccessDenied) + return + } + b, err := s.store.ReserveTaskBlock(r.Context(), domain, actor, store.TaskBlock{UUID: input.UUID, TaskUUID: input.TaskUUID, CalendarUUID: input.CalendarUUID, Start: start, End: end}, input.Version) + if err != nil { + taskError(w, err) + return + } + var draft *cal.Event + if b.State == "pending" { + // Only the explicitly approved title snapshot is copied, never notes. + title := strings.Join(strings.Fields(strings.Map(func(r rune) rune { + if unicode.IsControl(r) { + return ' ' + } + return r + }, b.Title)), " ") + event, e := cal.Build("", cal.Event{UID: b.EventUID, Summary: "Focus time(" + title + ")", Start: b.Start, End: b.End}) + if e != nil { + calendarError(w, e) + return + } + draft = &event + } + _, _, err = repo.TaskBlock(r.Context(), domain, b.CalendarUUID, actor, b.EventUID, draft) + if err != nil { + calendarError(w, err) + return + } + if err = s.store.SetTaskBlockState(r.Context(), domain, actor, b.UUID, "active"); err != nil { + taskError(w, err) + return + } + b.State = "active" + writeEventJSON(w, 201, map[string]any{"item": b}) +} diff --git a/internal/server/task_planning_test.go b/internal/server/task_planning_test.go new file mode 100644 index 0000000..57f1563 --- /dev/null +++ b/internal/server/task_planning_test.go @@ -0,0 +1,210 @@ +package server + +import ( + "context" + "encoding/json" + "strings" + "testing" + + "github.com/google/uuid" + cal "pageswiki/internal/calendar" + "pageswiki/internal/store" +) + +func TestTaskPlanningLifecycle(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + repo, err := s.calendars() + if err != nil { + t.Fatal(err) + } + c, err := repo.Create(ctx, domain, actor, "Private focus", "focus") + if err != nil { + t.Fatal(err) + } + task, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "PRIVATE TITLE"), 0) + if err != nil { + t.Fatal(err) + } + input := map[string]any{"uuid": uuid.NewString(), "task_uuid": task.UUID, "task_version": task.Version, "calendar_uuid": c.ID, "start": "2026-09-25T10:00", "end": "2026-09-25T11:00", "timezone": "Asia/Tokyo"} + w := taskRequest(s, token, "POST", "blocks", input, "") + if w.Code != 201 { + t.Fatalf("create: %d %s", w.Code, w.Body) + } + var got struct { + Item store.TaskBlock `json:"item"` + } + if err = json.Unmarshal(w.Body.Bytes(), &got); err != nil { + t.Fatal(err) + } + b := got.Item + if b.Start.Hour() != 1 || b.State != "active" { + t.Fatalf("timezone/state: %+v", b) + } + event, err := repo.Event(ctx, domain, c.ID, actor, b.EventUID) + if err != nil { + t.Fatal(err) + } + if event.Summary != "Focus time("+task.Title+")" { + t.Fatalf("task title missing: %q", event.Summary) + } + if strings.Contains(event.Data, task.Notes) || strings.Contains(event.Data, task.UUID) { + t.Fatal("private task data leaked", event.Data) + } + // Normal calendar editing moves the stable UID across canonical month files. + old := event.ETag + event.Start = event.Start.AddDate(0, 1, 0) + event.End = event.End.AddDate(0, 1, 0) + event, err = cal.Build(event.Data, event) + if err != nil { + t.Fatal(err) + } + if _, err = repo.Change(ctx, domain, c.ID, actor, b.EventUID, old, &event); err != nil { + t.Fatal(err) + } + w = taskRequest(s, token, "POST", "blocks", input, "") + if w.Code != 201 { + t.Fatalf("retry: %d %s", w.Code, w.Body) + } + w = taskRequest(s, token, "GET", "blocks/"+b.UUID, nil, "") + if w.Code != 200 || !strings.Contains(w.Body.String(), `"start":"2026-10-25T01:00:00Z"`) || !strings.Contains(w.Body.String(), "?calendar=focus") { + t.Fatalf("current time: %d %s", w.Code, w.Body) + } + // A deleted active event is NOT resurrected by retries or GET. + fresh, err := repo.Event(ctx, domain, c.ID, actor, b.EventUID) + if err != nil { + t.Fatal(err) + } + if _, err = repo.Change(ctx, domain, c.ID, actor, b.EventUID, fresh.ETag, nil); err != nil { + t.Fatal(err) + } + w = taskRequest(s, token, "POST", "blocks", input, "") + if w.Code != 404 { + t.Fatalf("resurrected: %d %s", w.Code, w.Body) + } + w = taskRequest(s, token, "DELETE", "blocks/"+b.UUID, nil, "") + if w.Code != 204 { + t.Fatal(w.Code, w.Body) + } + w = taskRequest(s, token, "POST", "blocks", input, "") + if w.Code != 412 { + t.Fatal("tombstone replay", w.Code, w.Body) + } + var n int + s.store.DB.QueryRow(`SELECT count(*) FROM organizer_time_blocks`).Scan(&n) + if n != 1 { + t.Fatal("duplicate intents", n) + } +} + +func TestTaskPlanningPartialCommitAndPolicy(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + repo, _ := s.calendars() + c, err := repo.Create(ctx, domain, actor, "Focus") + if err != nil { + t.Fatal(err) + } + task, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "Secret"), 0) + if err != nil { + t.Fatal(err) + } + input := map[string]any{"uuid": uuid.NewString(), "task_uuid": task.UUID, "task_version": task.Version, "calendar_uuid": c.ID, "start": "2026-09-25T10:00:00Z", "end": "2026-09-25T11:00:00Z"} + // Inject a failure AFTER canonical calendar commit, before link activation. + if _, err = s.store.DB.Exec(`CREATE TRIGGER fail_block_activation BEFORE UPDATE ON organizer_time_blocks WHEN NEW.state='active' BEGIN SELECT RAISE(ABORT,'synthetic activation failure'); END`); err != nil { + t.Fatal(err) + } + w := taskRequest(s, token, "POST", "blocks", input, "") + if w.Code != 500 { + t.Fatal(w.Code, w.Body) + } + blocks, err := s.store.TaskBlocks(ctx, domain, actor, task.UUID) + if err != nil || len(blocks) != 1 || blocks[0].State != "pending" { + t.Fatal(blocks, err) + } + if _, err = s.store.DB.Exec(`DROP TRIGGER fail_block_activation`); err != nil { + t.Fatal(err) + } + w = taskRequest(s, token, "POST", "blocks", input, "") + if w.Code != 201 { + t.Fatal(w.Code, w.Body) + } + var count int + s.store.DB.QueryRow(`SELECT count(*) FROM calendar_event_cache WHERE domain=? AND calendar=?`, domain, c.ID).Scan(&count) + if count != 1 { + t.Fatal("duplicate calendar event", count) + } + // Linking does not change task dates/version/status. + fresh, _ := s.store.GetTask(ctx, domain, actor, task.UUID) + if fresh.Version != task.Version || fresh.PlannedOn != "" { + t.Fatal("task mutated", fresh) + } + // Sharing later blocks event reads, but allows unlink without deleting event. + c, _ = repo.Get(domain, c.ID, actor) + c, err = repo.Settings(ctx, domain, c.ID, actor, c.Version, c.Name, false, map[string]string{uuid.NewString(): "read"}) + if err != nil { + t.Fatal(err) + } + w = taskRequest(s, token, "GET", "blocks/"+blocks[0].UUID, nil, "") + if !strings.Contains(w.Body.String(), `"available":false`) { + t.Fatal(w.Body) + } + w = taskRequest(s, token, "POST", "blocks", input, "") + if w.Code != 403 { + t.Fatal(w.Code, w.Body) + } + w = taskRequest(s, token, "DELETE", "blocks/"+blocks[0].UUID, nil, "") + if w.Code != 204 { + t.Fatal(w.Code, w.Body) + } + if _, err = repo.Event(ctx, domain, c.ID, actor, blocks[0].EventUID); err != nil { + t.Fatal("unlink deleted event", err) + } +} + +func TestTaskPlanningValidationAndIsolation(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + repo, _ := s.calendars() + c, _ := repo.Create(ctx, domain, actor, "Focus") + task, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "Secret"), 0) + if err != nil { + t.Fatal(err) + } + input := map[string]any{"uuid": uuid.NewString(), "task_uuid": task.UUID, "task_version": task.Version, "calendar_uuid": c.ID, "start": "2026-03-08T02:30", "end": "2026-03-08T04:30", "timezone": "America/New_York"} + if w := taskRequest(s, token, "POST", "blocks", input, ""); w.Code != 422 { + t.Fatal("DST gap", w.Code, w.Body) + } + input["start"] = "2026-09-25T10:00:00Z" + input["end"] = "2026-09-25T11:00:00Z" + input["task_version"] = task.Version + 1 + if w := taskRequest(s, token, "POST", "blocks", input, ""); w.Code != 412 { + t.Fatal("stale version", w.Code, w.Body) + } + input["task_version"] = task.Version + if w := taskRequest(s, token, "POST", "blocks", input, ""); w.Code != 201 { + t.Fatal(w.Code, w.Body) + } + if _, err = s.store.GetTaskBlock(ctx, domain, uuid.NewString(), input["uuid"].(string)); err == nil { + t.Fatal("other owner access") + } + if _, err = s.store.DB.Exec(`UPDATE principals SET state='readonly' WHERE uuid=?`, actor); err != nil { + t.Fatal(err) + } + if w := taskRequest(s, token, "DELETE", "blocks/"+input["uuid"].(string), nil, ""); w.Code != 403 { + t.Fatal("readonly write", w.Code, w.Body) + } + if w := taskRequest(s, token, "GET", "blocks/"+input["uuid"].(string), nil, ""); w.Code != 200 { + t.Fatal("readonly read", w.Code, w.Body) + } + // A source calendar with no remote request or contents is only metadata. + external, _ := repo.Create(ctx, domain, actor, "Synthetic source") + _, err = repo.SetSource(ctx, domain, external.ID, actor, external.Version, cal.Source{Kind: "ics", URL: "https://example.invalid/calendar.ics", IntervalSeconds: 3600}) + if err != nil { + t.Fatal(err) + } + w := taskRequest(s, token, "GET", "calendars", nil, "") + if w.Code != 200 || strings.Contains(w.Body.String(), external.ID) || strings.Contains(w.Body.String(), "example.invalid") { + t.Fatal("source in picker", w.Code, w.Body) + } +} diff --git a/internal/server/task_reminders_test.go b/internal/server/task_reminders_test.go new file mode 100644 index 0000000..d4e4854 --- /dev/null +++ b/internal/server/task_reminders_test.go @@ -0,0 +1,298 @@ +package server + +import ( + "context" + "encoding/json" + "errors" + "strings" + "sync" + "testing" + "time" + + "pageswiki/internal/store" +) + +func reminderTime(t *testing.T, v string) time.Time { + t.Helper() + at, e := time.Parse(time.RFC3339, v) + if e != nil { + t.Fatal(e) + } + return at +} +func reminderTask() store.TaskRecord { + i := newTaskRecord("task", "Private reminder title") + i.DueOn = "2030-05-01" + i.PlannedOn = i.DueOn + i.NotifyDue = true + i.ReminderTime = "09:00" + return i +} + +func TestTaskReminderDeliveryTimezoneDedupAndInboxProjection(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + if err := s.store.SetConfigInDomain(domain, "timezone", "Asia/Tokyo"); err != nil { + t.Fatal(err) + } + i := reminderTask() + i.NotifyPlanned = true + i.ReminderTimezone = "America/New_York" + i, err := s.store.SaveTask(ctx, domain, actor, i, 0) + if err != nil { + t.Fatal(err) + } + if i.ReminderTimezone != "Asia/Tokyo" { + t.Fatal("trusted supplied timezone", i.ReminderTimezone) + } + before := reminderTime(t, "2030-04-30T23:59:59Z") + fire := before.Add(time.Second) + if n, sent, e := s.store.DeliverTaskReminders(ctx, before, 100); e != nil || n != 0 || sent != 0 { + t.Fatal(n, sent, e) + } + if n, sent, e := s.store.DeliverTaskReminders(ctx, fire, 1); e != nil || n != 1 || sent != 1 { + t.Fatal(n, sent, e) + } + if n, sent, e := s.store.DeliverTaskReminders(ctx, fire, 100); e != nil || n != 1 || sent != 1 { + t.Fatal(n, sent, e) + } + if n, sent, e := s.store.DeliverTaskReminders(ctx, fire, 100); e != nil || n != 0 || sent != 0 { + t.Fatal(n, sent, e) + } + notices, _, err := s.store.ListNotifications(ctx, domain, actor, false, "", 100) + if err != nil || len(notices) != 2 { + t.Fatal(notices, err) + } + for _, n := range notices { + if strings.Contains(n.Message, "Private") { + t.Fatal("title copied to inbox") + } + } + s.mux.HandleFunc("/_/api/v1/notifications", s.handleNotificationsAPI) + w := configRequest(s, token, "GET", "/_/api/v1/notifications", nil) + if w.Code != 200 || !strings.Contains(w.Body.String(), "Private reminder title") || !strings.Contains(w.Body.String(), "タスクの期限通知") { + t.Fatalf("projection %d %s", w.Code, w.Body) + } + i.Title = "New current title" + i, err = s.store.SaveTask(ctx, domain, actor, i, i.Version) + if err != nil { + t.Fatal(err) + } + if _, sent, e := s.store.DeliverTaskReminders(ctx, fire, 100); e != nil || sent != 0 { + t.Fatal("edit redelivered", sent, e) + } + w = configRequest(s, token, "GET", "/_/api/v1/notifications", nil) + if !strings.Contains(w.Body.String(), "New current title") || strings.Contains(w.Body.String(), "Private reminder title") { + t.Fatal(w.Body) + } + i.Status = "done" + i, err = s.store.SaveTask(ctx, domain, actor, i, i.Version) + if err != nil { + t.Fatal(err) + } + w = configRequest(s, token, "GET", "/_/api/v1/notifications", nil) + if strings.Contains(w.Body.String(), "New current title") || strings.Contains(w.Body.String(), "/v/plan/task/") { + t.Fatal("stale notification disclosed task", w.Body) + } + i.Status = "todo" + if _, err = s.store.SaveTask(ctx, domain, actor, i, i.Version); err != nil { + t.Fatal(err) + } + if _, sent, e := s.store.DeliverTaskReminders(ctx, fire, 100); e != nil || sent != 0 { + t.Fatal("reopen redelivered same occurrence", sent, e) + } +} + +func TestTaskRemindersRescheduleCancelSkipAndRevoke(t *testing.T) { + for _, scenario := range []string{"reschedule", "off", "done", "cancelled", "archive", "disabled", "revoked", "expired", "stale-version"} { + t.Run(scenario, func(t *testing.T) { + s, _, domain, actor := taskFixture(t) + ctx := context.Background() + i, err := s.store.SaveTask(ctx, domain, actor, reminderTask(), 0) + if err != nil { + t.Fatal(err) + } + fire := reminderTime(t, "2030-05-01T09:00:00Z") + save := true + switch scenario { + case "reschedule": + i.DueOn = "2030-05-02" + case "off": + i.NotifyDue = false + case "done", "cancelled": + i.Status = scenario + case "archive": + i.Archived = true + case "disabled": + save = false + err = s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.tasks":false}`) + case "revoked": + save = false + _, err = s.store.DB.Exec(`UPDATE domain_memberships SET state='suspended' WHERE domain_uuid=? AND principal_uuid=?`, domain, actor) + case "expired": + save = false + fire = fire.Add(24 * time.Hour) + case "stale-version": + save = false + _, err = s.store.DB.Exec(`UPDATE organizer_reminders SET source_version=0`) + } + if err != nil { + t.Fatal(err) + } + if save { + if _, err = s.store.SaveTask(ctx, domain, actor, i, i.Version); err != nil { + t.Fatal(err) + } + } + if _, sent, e := s.store.DeliverTaskReminders(ctx, fire, 100); e != nil || sent != 0 { + t.Fatal(scenario, sent, e) + } + if scenario == "reschedule" { + if _, sent, e := s.store.DeliverTaskReminders(ctx, fire.Add(24*time.Hour), 100); e != nil || sent != 1 { + t.Fatal("new date", sent, e) + } + } + }) + } +} + +func TestTaskRemindersAtomicFailureParallelDeliveryAndOptIn(t *testing.T) { + s, _, domain, actor := taskFixture(t) + ctx := context.Background() + i := reminderTask() + i.NotifyDue = false + i, err := s.store.SaveTask(ctx, domain, actor, i, 0) + if err != nil { + t.Fatal(err) + } + fire := reminderTime(t, "2030-05-01T09:00:00Z") + if n, _, e := s.store.DeliverTaskReminders(ctx, fire, 100); e != nil || n != 0 { + t.Fatal("implicit opt in", n, e) + } + i.NotifyDue = true + if _, err = s.store.DB.Exec(`CREATE TRIGGER reject_reservation BEFORE INSERT ON organizer_reminders BEGIN SELECT RAISE(ABORT,'test reservation failure'); END`); err != nil { + t.Fatal(err) + } + if _, err = s.store.SaveTask(ctx, domain, actor, i, i.Version); err == nil { + t.Fatal("partial save") + } + got, err := s.store.GetTask(ctx, domain, actor, i.UUID) + if err != nil || got.Version != 1 || got.NotifyDue { + t.Fatal(got, err) + } + if _, err = s.store.DB.Exec(`DROP TRIGGER reject_reservation`); err != nil { + t.Fatal(err) + } + i, err = s.store.SaveTask(ctx, domain, actor, i, i.Version) + if err != nil { + t.Fatal(err) + } + if _, err = s.store.DB.Exec(`CREATE TRIGGER reject_reminder_inbox BEFORE INSERT ON notification_inbox BEGIN SELECT RAISE(ABORT,'test delivery failure'); END`); err != nil { + t.Fatal(err) + } + if _, _, err = s.store.DeliverTaskReminders(ctx, fire, 100); err == nil { + t.Fatal("delivery failure ignored") + } + var state string + if err = s.store.DB.QueryRow(`SELECT state FROM organizer_reminders`).Scan(&state); err != nil || state != "pending" { + t.Fatal(state, err) + } + if _, err = s.store.DB.Exec(`DROP TRIGGER reject_reminder_inbox`); err != nil { + t.Fatal(err) + } + start := make(chan struct{}) + results := make(chan error, 2) + var wg sync.WaitGroup + for j := 0; j < 2; j++ { + wg.Add(1) + go func() { + defer wg.Done() + <-start + _, _, e := s.store.DeliverTaskReminders(ctx, fire, 100) + results <- e + }() + } + close(start) + wg.Wait() + close(results) + for e := range results { + if e != nil { + t.Fatal(e) + } + } + notices, _, err := s.store.ListNotifications(ctx, domain, actor, false, "", 100) + if err != nil || len(notices) != 1 { + t.Fatal(notices, err) + } + other, err := s.store.CreatePasswordAccount(domain, "reminder-other", "long other password", "Other", "") + if err != nil { + t.Fatal(err) + } + if _, err = s.store.TaskReminderTitle(ctx, domain, other.UUID, notices[0].EventUUID); err == nil { + t.Fatal("cross-owner metadata leak") + } +} + +func TestTaskReminderDSTAndValidation(t *testing.T) { + s, _, domain, actor := taskFixture(t) + ctx := context.Background() + if err := s.store.SetConfigInDomain(domain, "timezone", "America/New_York"); err != nil { + t.Fatal(err) + } + i := reminderTask() + i.DueOn = "2030-03-10" + i.ReminderTime = "02:30" + if _, err := s.store.SaveTask(ctx, domain, actor, i, 0); !errors.Is(err, store.ErrTaskInvalid) { + t.Fatal("nonexistent local time accepted", err) + } + i.ReminderTime = "09:00" + i, err := s.store.SaveTask(ctx, domain, actor, i, 0) + if err != nil { + t.Fatal(err) + } + var fire int64 + if err = s.store.DB.QueryRow(`SELECT fire_at_ms FROM organizer_reminders`).Scan(&fire); err != nil { + t.Fatal(err) + } + if fire != reminderTime(t, "2030-03-10T13:00:00Z").UnixMilli() { + t.Fatal("DST offset", fire) + } + for _, clock := range []string{"9:00", "25:00", "09:00:30"} { + i.ReminderTime = clock + if _, err = s.store.SaveTask(ctx, domain, actor, i, i.Version); !errors.Is(err, store.ErrTaskInvalid) { + t.Fatal(clock, err) + } + } + i.ReminderTime = "09:00" + i.DueOn = "" + if _, err = s.store.SaveTask(ctx, domain, actor, i, i.Version); !errors.Is(err, store.ErrTaskInvalid) { + t.Fatal("missing date", err) + } + // Added optional fields preserve legacy JSON create-retry comparisons. + legacy := newTaskRecord("task", "Legacy") + if _, err = s.store.SaveTask(ctx, domain, actor, legacy, 0); err != nil { + t.Fatal(err) + } + if _, err = s.store.SaveTask(ctx, domain, actor, legacy, 0); err != nil { + t.Fatal("legacy retry", err) + } + if err = s.store.EnsureTaskReminderEvent(); err != nil { + t.Fatal(err) + } + if _, err = s.store.DB.Exec(`UPDATE event_definitions SET enabled=0,interval_seconds=300 WHERE uuid='builtin.task.reminders'`); err != nil { + t.Fatal(err) + } + if err = s.store.EnsureTaskReminderEvent(); err != nil { + t.Fatal(err) + } + defs, err := s.store.ListEventDefinitions() + if err != nil { + t.Fatal(err) + } + for _, d := range defs { + if d.UUID == "builtin.task.reminders" && (d.Enabled || d.IntervalSeconds != 300) { + b, _ := json.Marshal(d) + t.Fatal(string(b)) + } + } +} diff --git a/internal/server/task_schedule.go b/internal/server/task_schedule.go new file mode 100644 index 0000000..02216aa --- /dev/null +++ b/internal/server/task_schedule.go @@ -0,0 +1,48 @@ +package server + +import ( + "net/http" + "strings" + "time" + + "pageswiki/internal/store" +) + +func (s *Server) handleTaskScheduleAPI(w http.ResponseWriter, r *http.Request, actor string) { + if r.Method != "GET" { + w.WriteHeader(405) + return + } + month := r.URL.Query().Get("month") + if month == "" { + month = time.Now().In(s.getLocation(s.domainUUIDForRequest(r))).Format("2006-01") + } + items, partial, err := s.store.TaskSchedule(r.Context(), s.domainUUIDForRequest(r), actor, month, r.URL.Query().Get("project")) + if err != nil { + taskError(w, err) + return + } + writeEventJSON(w, 200, map[string]any{"items": items, "partial": partial, "month": month}) +} +func (s *Server) handleTaskSchedulePage(w http.ResponseWriter, r *http.Request, actor string) { + month := time.Now().In(s.getLocation(s.domainUUIDForRequest(r))).Format("2006-01") + suffix := strings.TrimPrefix(r.URL.Path, "/v/plan/tasks/schedule") + if suffix != "" { + parts := strings.Split(strings.TrimPrefix(suffix, "/"), "/") + if len(parts) != 2 { + http.NotFound(w, r) + return + } + month = parts[0] + "-" + parts[1] + v, e := time.Parse("2006-01", month) + if e != nil || v.Year() < 1 || v.Format("2006-01") != month { + http.NotFound(w, r) + return + } + } + if _, _, err := s.store.ListTasks(r.Context(), s.domainUUIDForRequest(r), actor, store.TaskQuery{Kind: "task", View: "all", Today: month + "-01", Limit: 1}); err != nil { + taskError(w, err) + return + } + s.renderWithContext(w, r, "task_schedule.gohtml", map[string]any{"Title": "Task schedule", "TaskMonth": month, "TaskTimezone": s.getTimezoneName(s.domainUUIDForRequest(r)), "Path": r.URL.Path}) +} diff --git a/internal/server/task_today.go b/internal/server/task_today.go new file mode 100644 index 0000000..be7c022 --- /dev/null +++ b/internal/server/task_today.go @@ -0,0 +1,81 @@ +package server + +import ( + "net/http" + "net/url" + "sort" + "time" + + cal "pageswiki/internal/calendar" + "pageswiki/internal/store" +) + +func (s *Server) handleTaskToday(w http.ResponseWriter, r *http.Request, actor string) { + if r.Method != "GET" { + w.WriteHeader(405) + return + } + domain := s.domainUUIDForRequest(r) + now := time.Now() + loc := s.getLocation(domain) + local := now.In(loc) + start := time.Date(local.Year(), local.Month(), local.Day(), 0, 0, 0, 0, loc) + end := start.AddDate(0, 0, 1) + summary, err := s.store.TaskDaySummary(r.Context(), domain, actor, start, end, now) + if err != nil { + taskError(w, err) + return + } + blocks := []store.TaskDayBlock{} + partial, unavailable := false, 0 + enabled := s.systemExtensionEnabled(domain, "organizer.calendar") + if enabled { + ids, more, err := s.store.TaskBlockCalendars(r.Context(), domain, actor) + if err != nil { + taskError(w, err) + return + } + partial = more + repo, err := s.calendars() + if err != nil { + taskError(w, err) + return + } + for _, id := range ids { + err = repo.ReadPersonalLocalIndex(r.Context(), domain, id, actor, func(c cal.Calendar) error { + items, more, e := s.store.TaskDayBlocks(r.Context(), domain, actor, id, start, end) + if e != nil { + return e + } + partial = partial || more + for _, b := range items { + b.Href = "/v/plan/event/" + url.PathEscape(b.EventUID) + "?calendar=" + url.QueryEscape(c.PrettyName) + blocks = append(blocks, b) + } + return nil + }) + if err != nil { + unavailable++ + } + } + } + sort.Slice(blocks, func(i, j int) bool { + if blocks[i].Start == blocks[j].Start { + return blocks[i].UUID < blocks[j].UUID + } + return blocks[i].Start < blocks[j].Start + }) + if len(blocks) > 100 { + blocks = blocks[:100] + partial = true + } + var allocated, busy int64 + var lastEnd int64 + for _, b := range blocks { + a, z := max(b.Start, start.UnixMilli()), min(b.End, end.UnixMilli()) + allocated += max(int64(0), z-a) + busy += max(int64(0), z-max(a, lastEnd)) + lastEnd = max(lastEnd, z) + } + writeEventJSON(w, 200, map[string]any{"date": start.Format("2006-01-02"), "timezone": loc.String(), "summary": summary, "blocks": blocks, "allocated_ms": allocated, "occupied_ms": busy, "overlap_ms": allocated - busy, "blocks_partial": partial, "unavailable_calendars": unavailable, "calendar_enabled": enabled}) +} diff --git a/internal/server/task_today_test.go b/internal/server/task_today_test.go new file mode 100644 index 0000000..fc146ad --- /dev/null +++ b/internal/server/task_today_test.go @@ -0,0 +1,227 @@ +package server + +import ( + "context" + "encoding/json" + "strings" + "testing" + "time" + + "github.com/google/uuid" + cal "pageswiki/internal/calendar" + "pageswiki/internal/store" +) + +func TestTaskTodayCurrentCalendarRangeAndOverlap(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + loc := s.getLocation(domain) + now := time.Now().In(loc) + day := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, loc) + repo, err := s.calendars() + if err != nil { + t.Fatal(err) + } + c, err := repo.Create(ctx, domain, actor, "Focus") + if err != nil { + t.Fatal(err) + } + for i := 0; i < 2; i++ { + task := newTaskRecord("task", "Today private task") + task.PlannedOn = day.Format("2006-01-02") + task.Estimate = 30 + i*15 + task, err = s.store.SaveTask(ctx, domain, actor, task, 0) + if err != nil { + t.Fatal(err) + } + start := day.AddDate(0, 0, -7).Add(10*time.Hour + time.Duration(i)*30*time.Minute) + input := map[string]any{"uuid": uuid.NewString(), "task_uuid": task.UUID, "task_version": task.Version, "calendar_uuid": c.ID, "start": start.Format(time.RFC3339), "end": start.Add(time.Hour).Format(time.RFC3339)} + w := taskRequest(s, token, "POST", "blocks", input, "") + if w.Code != 201 { + t.Fatal(w.Code, w.Body) + } + var got struct { + Item store.TaskBlock `json:"item"` + } + json.Unmarshal(w.Body.Bytes(), &got) + event, err := repo.Event(ctx, domain, c.ID, actor, got.Item.EventUID) + if err != nil { + t.Fatal(err) + } + etag := event.ETag + event.Start = event.Start.AddDate(0, 0, 7) + event.End = event.End.AddDate(0, 0, 7) + event, err = cal.Build(event.Data, event) + if err != nil { + t.Fatal(err) + } + if _, err = repo.Change(ctx, domain, c.ID, actor, event.UID, etag, &event); err != nil { + t.Fatal(err) + } + } + w := taskRequest(s, token, "GET", "today", nil, "") + if w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + var got struct { + Summary store.TaskDaySummary `json:"summary"` + Blocks []store.TaskDayBlock `json:"blocks"` + Allocated int64 `json:"allocated_ms"` + Occupied int64 `json:"occupied_ms"` + Overlap int64 `json:"overlap_ms"` + } + if err = json.Unmarshal(w.Body.Bytes(), &got); err != nil { + t.Fatal(err) + } + if got.Summary.TaskCount != 2 || got.Summary.EstimateMinutes != 75 || len(got.Blocks) != 2 || got.Allocated != 120*60000 || got.Occupied != 90*60000 || got.Overlap != 30*60000 { + t.Fatalf("bad today: %s", w.Body) + } + // Calendar policy is rechecked even with a warm index holding these events. + c, _ = repo.Get(domain, c.ID, actor) + if _, err = repo.Settings(ctx, domain, c.ID, actor, c.Version, c.Name, false, map[string]string{uuid.NewString(): "read"}); err != nil { + t.Fatal(err) + } + w = taskRequest(s, token, "GET", "today", nil, "") + if w.Code != 200 || !strings.Contains(w.Body.String(), `"unavailable_calendars":1`) || strings.Contains(w.Body.String(), "Today private task") { + t.Fatalf("public calendar projection: %d %s", w.Code, w.Body) + } +} + +func TestTaskTodayFocusSpansAcrossMidnightAndPause(t *testing.T) { + s, _, domain, actor := taskFixture(t) + ctx := context.Background() + loc, _ := time.LoadLocation("Asia/Tokyo") + day := time.Date(2026, 9, 25, 0, 0, 0, 0, loc) + f, err := s.store.ChangeTaskFocus(ctx, domain, actor, "start", store.TaskFocus{UUID: uuid.NewString(), Phase: "focus", DurationMS: 60 * 60000}, 0, day.Add(-10*time.Minute)) + if err != nil { + t.Fatal(err) + } + f, err = s.store.ChangeTaskFocus(ctx, domain, actor, "pause", f, f.Version, day.Add(10*time.Minute)) + if err != nil { + t.Fatal(err) + } + f, err = s.store.ChangeTaskFocus(ctx, domain, actor, "resume", f, f.Version, day.Add(time.Hour)) + if err != nil { + t.Fatal(err) + } + // In-progress projection is clipped to now, not its future deadline. + got, err := s.store.TaskDaySummary(ctx, domain, actor, day, day.AddDate(0, 0, 1), day.Add(65*time.Minute)) + if err != nil || got.FocusMS != 15*60000 { + t.Fatal(got, err) + } + if _, err = s.store.ChangeTaskFocus(ctx, domain, actor, "complete", f, f.Version, day.Add(75*time.Minute)); err != nil { + t.Fatal(err) + } + if _, err = s.store.ChangeTaskFocus(ctx, domain, actor, "start", store.TaskFocus{UUID: uuid.NewString(), Phase: "break", DurationMS: 5 * 60000}, 0, day.Add(80*time.Minute)); err != nil { + t.Fatal(err) + } + if _, err = s.store.CompleteTaskFocus(ctx, day.Add(2*time.Hour), 100); err != nil { + t.Fatal(err) + } + got, err = s.store.TaskDaySummary(ctx, domain, actor, day, day.AddDate(0, 0, 1), day.Add(2*time.Hour)) + if err != nil || got.FocusMS != 25*60000 { + t.Fatal(got, err) + } + previous, err := s.store.TaskDaySummary(ctx, domain, actor, day.AddDate(0, 0, -1), day, day.Add(2*time.Hour)) + if err != nil || previous.FocusMS != 10*60000 { + t.Fatal(previous, err) + } + if err = s.store.EnsureTasksSchema(); err != nil { + t.Fatal(err) + } + got, err = s.store.TaskDaySummary(ctx, domain, actor, day, day.AddDate(0, 0, 1), day.Add(2*time.Hour)) + if err != nil || got.FocusMS != 25*60000 { + t.Fatal("schema rerun changed totals", got, err) + } +} + +func TestTaskTodayFocusSpanRollbackAndLateCompletion(t *testing.T) { + s, _, domain, actor := taskFixture(t) + ctx := context.Background() + day := time.Date(2026, 9, 25, 0, 0, 0, 0, time.UTC) + f, err := s.store.ChangeTaskFocus(ctx, domain, actor, "start", store.TaskFocus{UUID: uuid.NewString(), Phase: "focus", DurationMS: 25 * 60000}, 0, day) + if err != nil { + t.Fatal(err) + } + if _, err = s.store.DB.Exec(`CREATE TRIGGER fail_focus_audit BEFORE INSERT ON organizer_focus_changes BEGIN SELECT RAISE(ABORT,'synthetic audit failure'); END`); err != nil { + t.Fatal(err) + } + if _, err = s.store.ChangeTaskFocus(ctx, domain, actor, "pause", f, f.Version, day.Add(5*time.Minute)); err == nil { + t.Fatal("expected audit failure") + } + if _, err = s.store.DB.Exec(`DROP TRIGGER fail_focus_audit`); err != nil { + t.Fatal(err) + } + if _, err = s.store.CompleteTaskFocus(ctx, day.Add(2*time.Hour), 100); err != nil { + t.Fatal(err) + } + got, err := s.store.TaskDaySummary(ctx, domain, actor, day, day.AddDate(0, 0, 1), day.Add(2*time.Hour)) + if err != nil || got.FocusMS != 25*60000 { + t.Fatal("counted pause or scheduler delay", got, err) + } +} + +func TestTaskBlockTitleSnapshotRetry(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + repo, _ := s.calendars() + c, err := repo.Create(ctx, domain, actor, "Focus") + if err != nil { + t.Fatal(err) + } + task, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "レビュー, 日本語; ", 1))) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + width, height := "1440", "1000" + if size == "mobile" { + width, height = "390", "844" + } + if size == "laptop" { + width, height = "1024", "768" + } + if size == "mobile-small" { + width, height = "320", "568" + } + screenshot := "" + if base := os.Getenv("PAGESWIKI_TASK_SCREENSHOT"); base != "" { + screenshot = base + "-" + size + ".png" + } + ctx, cancel := context.WithTimeout(context.Background(), 45*time.Second) + defer cancel() + target := strings.Replace(server.URL, "127.0.0.1", "localhost", 1) + "/v/plan/today" + cmd := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", target, t.TempDir(), screenshot, width, height) + if out, err := cmd.CombinedOutput(); err != nil { + t.Fatalf("task browser %v: %s", err, out) + } + }) + } +} diff --git a/internal/server/tasks_handler.go b/internal/server/tasks_handler.go new file mode 100644 index 0000000..6815972 --- /dev/null +++ b/internal/server/tasks_handler.go @@ -0,0 +1,359 @@ +package server + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "io" + "log" + "net/http" + "path" + "strconv" + "strings" + "time" + + "github.com/google/uuid" + "pageswiki/internal/store" +) + +const tasksAPI = "/_/api/v1/extension/organizer.tasks/" + +func taskRoute(p string) bool { + return strings.HasPrefix(p, tasksAPI) || p == strings.TrimSuffix(taskDAVRoot, "/") || strings.HasPrefix(p, taskDAVRoot) || p == "/v/plan/today" || p == "/v/plan/tasks" || strings.HasPrefix(p, "/v/plan/tasks/") || p == "/v/plan/projects" || strings.HasPrefix(p, "/v/plan/project/") || strings.HasPrefix(p, "/v/plan/task/") +} + +func (s *Server) registerTaskRoutes() { + for _, p := range []string{"/v/plan/today", "/v/plan/tasks", "/v/plan/tasks/", "/v/plan/projects", "/v/plan/project/", "/v/plan/task/"} { + s.mux.HandleFunc(p, s.handleTaskPage) + } + s.mux.HandleFunc(tasksAPI, s.handleTasksAPI) + s.mux.HandleFunc(taskDAVRoot, s.handleTaskDAV) + // Several DAV clients strip trailing slashes. Avoid ServeMux's 301, + // which can turn PROPFIND into GET in their HTTP redirect handling. + s.mux.HandleFunc(strings.TrimSuffix(taskDAVRoot, "/"), s.handleTaskDAV) +} + +func taskError(w http.ResponseWriter, err error) { + status, code := 500, "internal" + switch { + case errors.Is(err, sql.ErrNoRows): + status, code = 404, "not_found" + case errors.Is(err, store.ErrAccessDenied): + status, code = 403, "forbidden" + case errors.Is(err, store.ErrTaskInvalid): + status, code = 422, "invalid" + case errors.Is(err, store.ErrTaskConflict): + status, code = 412, "conflict" + case errors.Is(err, store.ErrTaskDAVIdentity): + status, code = 409, "uid_conflict" + case errors.Is(err, store.ErrTaskDAVRelocated): + status, code = 409, "task_collection_relocated" + case errors.Is(err, store.ErrTaskDAVLimit): + status, code = 507, "limit" + case errors.Is(err, store.ErrTaskNoteExists): + status, code = 409, "note_exists" + case errors.Is(err, context.DeadlineExceeded): + status, code = 503, "busy" + } + if status >= 500 { + log.Printf("task operation failed: %v", err) + } + writeEventJSON(w, status, map[string]string{"error": code}) +} + +func (s *Server) taskReady(w http.ResponseWriter, r *http.Request) (string, bool, bool) { + w.Header().Set("Cache-Control", "private, no-store") + if !s.systemExtensionEnabled(s.domainUUIDForRequest(r), "organizer.tasks") { + http.NotFound(w, r) + return "", false, false + } + actor, active := s.calendarActor(r) + if actor == "" { + s.authRequired(w, r) + return "", false, false + } + return actor, active, true +} + +func (s *Server) handleTaskPage(w http.ResponseWriter, r *http.Request) { + if r.Method != "GET" && r.Method != "HEAD" { + w.WriteHeader(405) + return + } + actor, active, ok := s.taskReady(w, r) + if !ok { + return + } + domain := s.domainUUIDForRequest(r) + if strings.HasPrefix(r.URL.Path, "/v/plan/tasks/schedule") { + s.handleTaskSchedulePage(w, r, actor) + return + } + today := time.Now().In(s.getLocation(domain)).Format("2006-01-02") + selectedDate := today + view, id := "today", "" + switch r.URL.Path { + case "/v/plan/today": + case "/v/plan/tasks": + view = "all" + case "/v/plan/projects": + view = "projects" + case "/v/plan/task/-/new": + view = "new" + default: + if strings.HasPrefix(r.URL.Path, "/v/plan/tasks/") { + view = strings.TrimPrefix(r.URL.Path, "/v/plan/tasks/") + if strings.HasPrefix(view, "day/") { + d, err := time.Parse("2006/01/02", strings.TrimPrefix(view, "day/")) + if err != nil || d.Year() < 1 || d.Format("2006/01/02") != strings.TrimPrefix(view, "day/") { + http.NotFound(w, r) + return + } + selectedDate, view = d.Format("2006-01-02"), "day" + } + switch view { + case "inbox", "backlog", "someday", "review", "done", "archived", "carryover", "day": + case "tomorrow": + selectedDate = time.Now().In(s.getLocation(domain)).AddDate(0, 0, 1).Format("2006-01-02") + view = "day" + default: + http.NotFound(w, r) + return + } + } else { + id = path.Base(r.URL.Path) + if _, err := uuid.Parse(id); err != nil { + http.NotFound(w, r) + return + } + item, err := s.store.GetTask(r.Context(), domain, actor, id) + if err != nil { + taskError(w, err) + return + } + view = "detail" + if strings.HasPrefix(r.URL.Path, "/v/plan/project/") { + view = "project" + } + if (item.Kind == "project") != (view == "project") { + http.NotFound(w, r) + return + } + if r.URL.Path != "/v/plan/"+item.Kind+"/"+id { + http.NotFound(w, r) + return + } + } + } + // Also validate current membership for an empty list / new-item screen. + if _, _, err := s.store.ListTasks(r.Context(), domain, actor, store.TaskQuery{Kind: "task", View: "all", Today: today, Limit: 1}); err != nil { + taskError(w, err) + return + } + s.renderWithContext(w, r, "tasks.gohtml", map[string]any{"Title": "Tasks", "TaskView": view, "TaskID": id, "TaskToday": today, "TaskSelectedDate": selectedDate, "TaskTimezone": s.getTimezoneName(domain), "TaskWritable": active, "Path": r.URL.Path}) +} + +// Resolve a currently readable alias, rather than trusting a stored path. A Wiki +// rename therefore follows the stable UUID; revoked/deleted links disappear. +func (s *Server) taskPagePath(r *http.Request, id string) string { + if id == "" { + return "" + } + rows, err := s.store.DB.QueryContext(r.Context(), `SELECT path FROM paths WHERE domain_uuid=? AND object_uuid=? ORDER BY length(path),path LIMIT 100`, s.domainUUIDForRequest(r), id) + if err != nil { + return "" + } + paths := []string{} + for rows.Next() { + var p string + if rows.Scan(&p) == nil { + paths = append(paths, p) + } + } + rows.Close() + allows := s.pathReadFilter(r) + for _, p := range paths { + if allows(p) { + return p + } + } + return "" +} + +func (s *Server) taskResponse(w http.ResponseWriter, r *http.Request, item store.TaskRecord, status int) { + w.Header().Set("ETag", `"`+strconv.FormatInt(item.Version, 10)+`"`) + writeEventJSON(w, status, map[string]any{"item": item, "page_path": s.taskPagePath(r, item.PageUUID)}) +} + +func (s *Server) handleTasksAPI(w http.ResponseWriter, r *http.Request) { + actor, active, ok := s.taskReady(w, r) + if !ok { + return + } + ctx, cancel := context.WithTimeout(r.Context(), 5*time.Second) + defer cancel() + r = r.WithContext(ctx) + domain := s.domainUUIDForRequest(r) + parts := strings.Split(strings.TrimPrefix(r.URL.Path, tasksAPI), "/") + if len(parts) == 1 && parts[0] == "schedule" { + s.handleTaskScheduleAPI(w, r, actor) + return + } + if len(parts) == 1 && parts[0] == "today" { + s.handleTaskToday(w, r, actor) + return + } + if parts[0] == "dav-credentials" { + s.handleTaskDAVCredentials(w, r, actor, parts) + return + } + if parts[0] == "focus" { + s.handleTaskFocus(w, r, actor, active, parts) + return + } + if parts[0] == "blocks" || parts[0] == "calendars" { + s.handleTaskPlanning(w, r, actor, active, parts) + return + } + if len(parts) < 1 || parts[0] != "items" || len(parts) > 3 { + http.NotFound(w, r) + return + } + id := "" + if len(parts) > 1 { + id = parts[1] + if _, err := uuid.Parse(id); err != nil { + http.NotFound(w, r) + return + } + } + if len(parts) == 3 { + if parts[2] == "note" { + s.handleTaskNote(w, r, actor, active, id) + return + } + if parts[2] != "history" || r.Method != "GET" { + http.NotFound(w, r) + return + } + h, err := s.store.TaskHistory(ctx, domain, actor, id) + if err != nil { + taskError(w, err) + return + } + writeEventJSON(w, 200, map[string]any{"items": h}) + return + } + if r.Method == "GET" { + if id != "" { + item, err := s.store.GetTask(ctx, domain, actor, id) + if err != nil { + taskError(w, err) + return + } + s.taskResponse(w, r, item, 200) + return + } + q := r.URL.Query() + kind, view := q.Get("kind"), q.Get("view") + if kind == "" { + kind = "task" + } + if view == "" { + view = "all" + } + limit, _ := strconv.Atoi(q.Get("limit")) + today := time.Now().In(s.getLocation(domain)).Format("2006-01-02") + selected := today + if view == "day" { + selected = q.Get("date") + } + hierarchy := q.Get("hierarchy") == "1" + items, next, err := s.store.ListTasks(ctx, domain, actor, store.TaskQuery{Kind: kind, View: view, Project: q.Get("project"), Parent: q.Get("parent"), Search: q.Get("q"), Today: selected, Before: q.Get("before"), Limit: limit, Hierarchy: hierarchy}) + if err != nil { + taskError(w, err) + return + } + parents := []store.TaskRecord{} + if hierarchy { + parents, err = s.store.TaskContextParents(ctx, domain, actor, items) + if err != nil { + taskError(w, err) + return + } + } + writeEventJSON(w, 200, map[string]any{"items": items, "parents": parents, "next": next, "today": today}) + return + } + if (r.Method != "POST" || id != "") && (r.Method != "PUT" || id == "") { + w.Header().Set("Allow", "GET, POST, PUT") + w.WriteHeader(405) + return + } + if !active { + taskError(w, store.ErrAccessDenied) + return + } + var body struct { + store.TaskRecord + PagePath *string `json:"page_path"` + } + d := json.NewDecoder(http.MaxBytesReader(w, r.Body, 98304)) + d.DisallowUnknownFields() + if err := d.Decode(&body); err != nil { + taskError(w, store.ErrTaskInvalid) + return + } + if d.Decode(&struct{}{}) != io.EOF { + taskError(w, store.ErrTaskInvalid) + return + } + expected := int64(0) + if id != "" { + tag := r.Header.Get("If-Match") + if tag == "" { + writeEventJSON(w, 428, map[string]string{"error": "precondition"}) + return + } + expected, _ = strconv.ParseInt(strings.Trim(tag, `"`), 10, 64) + if expected < 1 || tag != `"`+strconv.FormatInt(expected, 10)+`"` || body.UUID != id { + taskError(w, store.ErrTaskInvalid) + return + } + } + if body.PagePath != nil { + p := strings.TrimSpace(*body.PagePath) + body.PageUUID = "" + if p != "" { + if !strings.HasPrefix(p, "/") || path.Clean(p) != p || !s.pathReadFilter(r)(p) { + taskError(w, store.ErrAccessDenied) + return + } + var err error + body.PageUUID, err = s.store.ResolvePathInDomain(domain, p) + if err != nil { + taskError(w, store.ErrTaskInvalid) + return + } + } + } else if body.PageUUID != "" { + old, err := s.store.GetTask(ctx, domain, actor, body.UUID) + if err != nil || old.PageUUID != body.PageUUID { + if s.taskPagePath(r, body.PageUUID) == "" { + taskError(w, store.ErrAccessDenied) + return + } + } + } + item, err := s.store.SaveTask(ctx, domain, actor, body.TaskRecord, expected) + if err != nil { + taskError(w, err) + return + } + status := 200 + if id == "" { + status = 201 + } + s.taskResponse(w, r, item, status) +} diff --git a/internal/server/tasks_i18n.go b/internal/server/tasks_i18n.go new file mode 100644 index 0000000..f4817d9 --- /dev/null +++ b/internal/server/tasks_i18n.go @@ -0,0 +1,20 @@ +package server + +func init() { + translations["en"]["tasks.today"] = "Today's tasks" + translations["ja"]["tasks.today"] = "今日のタスク" + translations["en"]["notification.title"] = "Notifications" + translations["ja"]["notification.title"] = "通知" + translations["en"]["notification.all"] = "View all" + translations["ja"]["notification.all"] = "すべて表示" + translations["en"]["tasks.reminder_due"] = "Task due-date reminder" + translations["en"]["tasks.reminder_planned"] = "Task planned-date reminder" + translations["en"]["tasks.reminder_unavailable"] = "Task reminder (completed, changed or unavailable)" + translations["ja"]["tasks.reminder_due"] = "タスクの期限通知" + translations["ja"]["tasks.reminder_planned"] = "タスクの予定日通知" + translations["ja"]["tasks.reminder_unavailable"] = "タスク通知(完了・変更済み、または現在利用できません)" + translations["en"]["tasks.title"] = "Tasks" + translations["en"]["tasks.help"] = "Private tasks, projects, daily planning and backlog review." + translations["ja"]["tasks.title"] = "タスク" + translations["ja"]["tasks.help"] = "個人のタスク・プロジェクト、今日の計画とBacklogの見直し。" +} diff --git a/internal/server/tasks_test.go b/internal/server/tasks_test.go new file mode 100644 index 0000000..3aea54a --- /dev/null +++ b/internal/server/tasks_test.go @@ -0,0 +1,329 @@ +package server + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "net/http/httptest" + "strings" + "sync" + "testing" + + "github.com/google/uuid" + "pageswiki/internal/store" +) + +func taskFixture(t *testing.T) (*Server, string, string, string) { + t.Helper() + s, token, domain := configFixture(t) + s.registerCalendarRoutes() + s.registerTaskRoutes() + p, err := s.store.PrincipalForSession(domain, token) + if err != nil { + t.Fatal(err) + } + return s, token, domain, p.UUID +} + +func taskRequest(s *Server, token, method, suffix string, body any, version string) *httptest.ResponseRecorder { + b, _ := json.Marshal(body) + r := httptest.NewRequest(method, "http://localhost"+tasksAPI+suffix, strings.NewReader(string(b))) + if token != "" { + r.Header.Set("Authorization", "Bearer "+token) + } + r.Header.Set("Content-Type", "application/json") + if version != "" { + r.Header.Set("If-Match", version) + } + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + return w +} + +func newTaskRecord(kind, title string) store.TaskRecord { + return store.TaskRecord{UUID: uuid.NewString(), Kind: kind, Title: title, Notes: "private notes", Status: "todo", Bucket: "inbox", Priority: 1} +} + +func TestTasksConditionalWritesPrivacyAndHistory(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + task := newTaskRecord("task", "Private task") + w := taskRequest(s, token, "POST", "items", task, "") + if w.Code != 201 { + t.Fatalf("create: %d %s", w.Code, w.Body) + } + if w.Header().Get("ETag") != `"1"` || !strings.Contains(w.Header().Get("Cache-Control"), "no-store") { + t.Fatal(w.Header()) + } + if retry := taskRequest(s, token, "POST", "items", task, ""); retry.Code != 201 { + t.Fatalf("retry: %d %s", retry.Code, retry.Body) + } + var count int + s.store.DB.QueryRow(`SELECT count(*) FROM organizer_revisions`).Scan(&count) + if count != 1 { + t.Fatal("retry created revision", count) + } + if w = taskRequest(s, token, "PUT", "items/"+task.UUID, task, ""); w.Code != 428 { + t.Fatal("missing precondition", w.Code) + } + task.Status = "done" + if w = taskRequest(s, token, "PUT", "items/"+task.UUID, task, `"1"`); w.Code != 200 { + t.Fatalf("complete: %d %s", w.Code, w.Body) + } + if w = taskRequest(s, token, "PUT", "items/"+task.UUID, task, `"1"`); w.Code != 412 { + t.Fatal("stale update", w.Code) + } + loaded, err := s.store.GetTask(ctx, domain, actor, task.UUID) + if err != nil || loaded.CompletedMS == 0 || loaded.Version != 2 { + t.Fatalf("loaded %#v %v", loaded, err) + } + loaded.Status = "todo" + loaded, err = s.store.SaveTask(ctx, domain, actor, loaded, 2) + if err != nil || loaded.CompletedMS != 0 { + t.Fatal(loaded, err) + } + h, err := s.store.TaskHistory(ctx, domain, actor, task.UUID) + if err != nil || len(h) != 3 || h[0].Version != 3 { + t.Fatal(h, err) + } + other, err := s.store.CreatePasswordAccount(domain, "taskother", "other long password", "Other", "") + if err != nil { + t.Fatal(err) + } + otherToken, err := s.store.CreateAuthSession(domain, other.UUID) + if err != nil { + t.Fatal(err) + } + for _, suffix := range []string{"items/" + task.UUID, "items/" + task.UUID + "/history"} { + if w = taskRequest(s, otherToken, "GET", suffix, nil, ""); w.Code != 404 { + t.Fatalf("private %s %d %s", suffix, w.Code, w.Body) + } + } + if w = taskRequest(s, otherToken, "POST", "items", task, ""); w.Code != 404 { + t.Fatal("identity collision leaked", w.Code) + } + if w = taskRequest(s, otherToken, "GET", "items?view=all", nil, ""); w.Code != 200 || strings.Contains(w.Body.String(), task.Title) { + t.Fatal("private list leaked", w.Body) + } + if w = taskRequest(s, "", "GET", "items", nil, ""); w.Code == 200 { + t.Fatal("anonymous access") + } + if _, err = s.store.GetTask(ctx, "other-domain", actor, task.UUID); !errors.Is(err, store.ErrAccessDenied) { + t.Fatal("domain boundary", err) + } + if err = s.store.SetPrincipalState(domain, actor, "readonly"); err != nil { + t.Fatal(err) + } + if _, err = s.store.GetTask(ctx, domain, actor, task.UUID); err != nil { + t.Fatal("readonly read", err) + } + if _, err = s.store.SaveTask(ctx, domain, actor, loaded, 3); !errors.Is(err, store.ErrAccessDenied) { + t.Fatal("readonly write", err) + } + if _, err = s.store.DB.Exec(`UPDATE domain_memberships SET state='suspended' WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil { + t.Fatal(err) + } + if _, err = s.store.GetTask(ctx, domain, actor, task.UUID); !errors.Is(err, store.ErrAccessDenied) { + t.Fatal("revoked membership", err) + } +} + +func TestTasksViewsPaginationProjectsAndKillSwitch(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + project, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("project", "Project"), 0) + if err != nil { + t.Fatal(err) + } + for i := 0; i < 7; i++ { + item := newTaskRecord("task", "Task") + item.ProjectUUID = project.UUID + item.DueOn = "2026-09-24" + item.PlannedOn = "2026-09-25" + item.ReviewOn = "2026-09-24" + if _, err = s.store.SaveTask(ctx, domain, actor, item, 0); err != nil { + t.Fatal(err) + } + } + q := store.TaskQuery{Kind: "task", View: "today", Today: "2026-09-24", Limit: 3} + seen := map[string]bool{} + for { + items, next, err := s.store.ListTasks(ctx, domain, actor, q) + if err != nil { + t.Fatal(err) + } + for _, i := range items { + if seen[i.UUID] { + t.Fatal("duplicate page") + } + seen[i.UUID] = true + if i.Notes != "" { + t.Fatal("list includes full notes") + } + } + if next == "" { + break + } + q.Before = next + } + if len(seen) != 7 { + t.Fatal("missing tasks", len(seen)) + } + for _, view := range []string{"inbox", "review", "all"} { + items, _, err := s.store.ListTasks(ctx, domain, actor, store.TaskQuery{Kind: "task", View: view, Today: "2026-09-24", Project: project.UUID}) + if err != nil || len(items) != 7 { + t.Fatal(view, len(items), err) + } + } + item := newTaskRecord("task", "Bad project") + item.ProjectUUID = uuid.NewString() + if _, err = s.store.SaveTask(ctx, domain, actor, item, 0); !errors.Is(err, store.ErrTaskInvalid) { + t.Fatal("missing project", err) + } + project.Archived = true + project, err = s.store.SaveTask(ctx, domain, actor, project, 1) + if err != nil { + t.Fatal(err) + } + item.ProjectUUID = project.UUID + if _, err = s.store.SaveTask(ctx, domain, actor, item, 0); !errors.Is(err, store.ErrTaskInvalid) { + t.Fatal("archived project", err) + } + for _, view := range []string{"/v/plan/today", "/v/plan/tasks/backlog", "/v/plan/projects", "/v/plan/project/" + project.UUID, "/v/plan/task/-/new"} { + w := configRequest(s, token, "GET", view, nil) + if w.Code != 200 || !strings.Contains(w.Body.String(), "tasks-app") { + t.Fatalf("page %s: %d %s", view, w.Code, w.Body) + } + } + if w := configRequest(s, token, "GET", "/v/plan/task/extra/"+project.UUID, nil); w.Code != 404 { + t.Fatal("malformed route", w.Code) + } + if err = s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.tasks":false}`); err != nil { + t.Fatal(err) + } + if w := taskRequest(s, token, "GET", "items", nil, ""); w.Code != 404 { + t.Fatal("disabled read", w.Code) + } + if _, err = s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "Disabled"), 0); !errors.Is(err, store.ErrAccessDenied) { + t.Fatal("disabled store write", err) + } +} + +func TestTasksValidationAtomicityAndWikiReference(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + for _, mutate := range []func(*store.TaskRecord){func(i *store.TaskRecord) { i.Title = " " }, func(i *store.TaskRecord) { i.DueOn = "2026-02-30" }, func(i *store.TaskRecord) { i.Status = "pending" }, func(i *store.TaskRecord) { i.Notes = strings.Repeat("a", 16385) }, func(i *store.TaskRecord) { i.PageUUID = "bad" }} { + item := newTaskRecord("task", "Invalid") + mutate(&item) + if _, err := s.store.SaveTask(ctx, domain, actor, item, 0); !errors.Is(err, store.ErrTaskInvalid) { + t.Fatal("invalid accepted", err) + } + } + // Schema changes and fixtures only: never access imported calendar data. + if _, err := s.store.DB.Exec(`CREATE TRIGGER reject_task_journal BEFORE INSERT ON organizer_changes BEGIN SELECT RAISE(ABORT,'test rollback'); END`); err != nil { + t.Fatal(err) + } + item := newTaskRecord("task", "Rollback") + if _, err := s.store.SaveTask(ctx, domain, actor, item, 0); err == nil { + t.Fatal("expected failure") + } + if _, err := s.store.GetTask(ctx, domain, actor, item.UUID); !errors.Is(err, sql.ErrNoRows) { + t.Fatal("partial head", err) + } + if _, err := s.store.DB.Exec(`DROP TRIGGER reject_task_journal`); err != nil { + t.Fatal(err) + } + // Use a regular Wiki page; task-only body is never inserted into Wiki objects. + _, err := s.store.CreatePageAtPathInDomain(domain, "/tasks-fixture") + if err != nil { + t.Fatal(err) + } + item = newTaskRecord("task", "Linked") + body := map[string]any{} + raw, _ := json.Marshal(item) + json.Unmarshal(raw, &body) + body["page_path"] = "/tasks-fixture" + w := taskRequest(s, token, "POST", "items", body, "") + if w.Code != 201 { + t.Fatalf("link %d %s", w.Code, w.Body) + } + var result struct { + Item store.TaskRecord `json:"item"` + Path string `json:"page_path"` + } + json.Unmarshal(w.Body.Bytes(), &result) + if result.Path != "/tasks-fixture" || result.Item.PageUUID == "" { + t.Fatal(w.Body) + } + if _, err = s.store.DB.Exec(`UPDATE paths SET path='/renamed-fixture' WHERE domain_uuid=? AND object_uuid=?`, domain, result.Item.PageUUID); err != nil { + t.Fatal(err) + } + w = taskRequest(s, token, "GET", "items/"+item.UUID, nil, "") + json.Unmarshal(w.Body.Bytes(), &result) + if result.Path != "/renamed-fixture" { + t.Fatal("rename link did not follow", w.Body) + } + if _, err = s.store.DB.Exec(`DELETE FROM paths WHERE domain_uuid=? AND object_uuid=?`, domain, result.Item.PageUUID); err != nil { + t.Fatal(err) + } + w = taskRequest(s, token, "GET", "items/"+item.UUID, nil, "") + json.Unmarshal(w.Body.Bytes(), &result) + if result.Path != "" { + t.Fatal("removed Wiki page leaked a stale path", w.Body) + } +} + +func TestTasksConcurrentUpdateAndCrossSiteWrite(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + item, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "Concurrent"), 0) + if err != nil { + t.Fatal(err) + } + start := make(chan struct{}) + out := make(chan error, 2) + var wg sync.WaitGroup + for _, title := range []string{"One", "Two"} { + wg.Add(1) + go func(title string) { + defer wg.Done() + <-start + changed := item + changed.Title = title + _, e := s.store.SaveTask(ctx, domain, actor, changed, 1) + out <- e + }(title) + } + close(start) + wg.Wait() + close(out) + success, conflict := 0, 0 + for e := range out { + if e == nil { + success++ + } else if errors.Is(e, store.ErrTaskConflict) { + conflict++ + } else { + t.Fatal(e) + } + } + if success != 1 || conflict != 1 { + t.Fatalf("success=%d conflict=%d", success, conflict) + } + var revisions, changes int + s.store.DB.QueryRow(`SELECT count(*) FROM organizer_revisions WHERE item_uuid=?`, item.UUID).Scan(&revisions) + s.store.DB.QueryRow(`SELECT count(*) FROM organizer_changes WHERE item_uuid=?`, item.UUID).Scan(&changes) + if revisions != 2 || changes != 2 { + t.Fatalf("partial or duplicated revision: %d %d", revisions, changes) + } + r := httptest.NewRequest("POST", "http://localhost"+tasksAPI+"items", strings.NewReader(`{}`)) + r.Header.Set("Authorization", "Bearer "+token) + r.Header.Set("Origin", "https://attacker.example") + r.Header.Set("Sec-Fetch-Site", "cross-site") + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + if w.Code != 403 { + t.Fatalf("cross-site status %d", w.Code) + } +} diff --git a/internal/server/template_funcs.go b/internal/server/template_funcs.go index 229b065..8f02f2c 100644 --- a/internal/server/template_funcs.go +++ b/internal/server/template_funcs.go @@ -10,13 +10,6 @@ func templateFuncMap() template.FuncMap { return template.FuncMap{ - "safeHTML": func( - s string, - ) template.HTML { - - return template.HTML(s) - }, - "formatTime": func( ts int64, ) string { diff --git a/internal/server/testdata/anonymous-publication.js b/internal/server/testdata/anonymous-publication.js new file mode 100644 index 0000000..54700c5 --- /dev/null +++ b/internal/server/testdata/anonymous-publication.js @@ -0,0 +1,65 @@ +window.addEventListener('load',async()=>{ + const wait=async(test,step)=>{for(let i=0;i<150;i++){if(test())return;await new Promise(r=>setTimeout(r,30));}throw new Error(step+': '+document.querySelector('[data-governance-result]')?.textContent);}; + try{ + document.querySelector('[data-governance-open]').click(); + const dialog=document.querySelector('[data-governance-dialog]'),form=dialog.querySelector('[data-publication-form]'),fields=form.querySelector('fieldset'); + await wait(()=>!fields.disabled,'open'); + form.querySelector('[data-publication-preview]').click(); + await wait(()=>!fields.disabled&&form.querySelector('[data-publication-impact] li'),'impact'); + if(!form.querySelector('[data-publication-impact]').textContent.includes('/public/page'))throw new Error('Missing approved Path'); + form.elements.confirm.checked=true;form.requestSubmit(); + await wait(()=>!fields.disabled&&form.querySelector('[data-publication-status]').textContent===form.dataset.enabled,'approve'); + const frame=document.createElement('iframe');frame.src='/public/page';document.body.append(frame); + await new Promise((resolve,reject)=>{frame.onload=resolve;frame.onerror=reject;}); + if(!frame.contentDocument.querySelector('h1')?.textContent.includes('Public browser sentinel')||frame.contentWindow.authoredRan||frame.contentDocument.querySelector('.auth-menu'))throw new Error('Unsafe/broken public projection'); + await wait(()=>frame.contentDocument.querySelector('[data-public-children-body] a[href="/public/page/child"]'),'async children'); + const viewButtons=[...frame.contentDocument.querySelectorAll('.public-children-views button')]; + if(viewButtons.map(button=>button.textContent).join('')!=='▦☷≡'||viewButtons.some(button=>!button.title||button.getAttribute('aria-label')!==button.title))throw new Error('Public view icons / accessible labels'); + if(frame.contentDocument.querySelector('a[download]')||!frame.contentDocument.querySelector('.public-topbar a[href="/v/tree"]'))throw new Error('Public navigation chrome'); + frame.style.width='100%';frame.style.height='600px'; + const navigate=async url=>{await new Promise((resolve,reject)=>{frame.onload=resolve;frame.onerror=reject;frame.src=url;});}; + const doc=()=>frame.contentDocument; + await navigate('/v/tree'); + await wait(()=>doc().querySelector('[data-public-tree-tools]:not([hidden])'),'tree enhancement'); + const row=path=>[...doc().querySelectorAll('[data-public-tree-path]')].find(r=>r.dataset.publicTreePath===path); + doc().querySelector('[data-public-collapse]').click(); + if(!row('/public/page/child').hidden||row('/public').hidden)throw new Error('Tree collapse'); + const link=row('/public').querySelector('.public-tree-name');link.focus(); + link.dispatchEvent(new frame.contentWindow.KeyboardEvent('keydown',{key:'ArrowRight',bubbles:true})); + if(row('/public/page').hidden||!row('/public/page/child').hidden)throw new Error('Tree keyboard expand'); + doc().querySelector('[data-public-expand]').click(); + row('/public/page').querySelector('[data-public-tree-toggle]').click(); + if(!row('/public/page/child').hidden||row('/public/page-other').hidden)throw new Error('Tree prefix collision'); + const filter=doc().querySelector('[data-public-tree-filter]');filter.value='grandchild';filter.dispatchEvent(new frame.contentWindow.Event('input')); + if(row('/public/page/child/grandchild').hidden||row('/public').hidden||!row('/public/page-other').hidden)throw new Error('Tree filter ancestry'); + await navigate('/v/browser/public/page'); + await wait(()=>doc().querySelector('[data-public-children-body] a[href="/public/page/child"]'),'folder listing'); + if(!doc().querySelector('a[href="/public/page"]')||!doc().querySelector('.public-child-folder[href="/v/browser/public/page/child"]'))throw new Error('Page / folder navigation'); + const original=frame.contentWindow.fetch.bind(frame.contentWindow);let fail=true; + frame.contentWindow.fetch=(...args)=>fail?Promise.resolve(new frame.contentWindow.Response('temporary failure',{status:503})):original(...args); + doc().querySelector('[data-view="detail"]').click(); + await wait(()=>doc().querySelector('[data-public-children-body] button'),'children retry'); + fail=false;doc().querySelector('[data-public-children-body] button').click(); + await wait(()=>doc().querySelector('.public-children-details'),'children retry success'); + doc().querySelector('[data-view="list"]').click();doc().querySelector('[data-view="icon"]').click(); + await wait(()=>doc().querySelector('.public-children-icons'),'latest view wins'); + if(doc().querySelector('.public-children-list')||doc().querySelector('[data-view="icon"]').getAttribute('aria-pressed')!=='true')throw new Error('Stale children response'); + await navigate('/public/page'); + await wait(()=>doc().querySelector('.public-children-icons'),'view preference retained'); + if(doc().documentElement.scrollWidth>frame.clientWidth+5)throw new Error('Public navigation horizontal overflow'); + await navigate('/'); + await wait(()=>doc().querySelector('[data-public-children-body] a[href="/v/tree/public"]'),'public home directory'); + const tree=await fetch('/v/tree');if(!tree.ok||!(await tree.text()).includes('/public/page/child'))throw new Error('Public tree'); + const map=await fetch('/_/api/v1/city/map');if(!map.ok||(await map.json()).quartiers.length!==1)throw new Error('Public City'); + await navigate('/v/tree'); + await wait(()=>doc().querySelector('[data-public-tree-tools]:not([hidden])'),'final tree'); + form.querySelector('[data-publication-revoke]').click(); + await wait(()=>!fields.disabled&&form.querySelector('[data-publication-status]').textContent===form.dataset.disabled,'revoke'); + const response=await fetch('/public/page',{redirect:'manual'});if(response.status===200)throw new Error('Revocation failed'); + const children=await fetch('/v/children?path=/public/page');if((await children.text()).includes('/public/page/child'))throw new Error('Stale children cache'); + dialog.close(); + [...document.body.children].forEach(element=>{if(element!==frame)element.style.display='none';}); + document.body.style.margin='0';document.body.style.padding='0';frame.style.border='0';frame.style.height='100vh'; + document.body.dataset.vimReady='true'; + }catch(error){const box=document.createElement('div');box.id='error';box.textContent=error.message;document.body.append(box);} +}); diff --git a/internal/server/testdata/auth-browser.js b/internal/server/testdata/auth-browser.js new file mode 100644 index 0000000..d4be895 --- /dev/null +++ b/internal/server/testdata/auth-browser.js @@ -0,0 +1,36 @@ +;(async () => { + const assert = (value, message) => { if (!value) throw new Error(message) } + const phase = sessionStorage.getItem('auth-flow-phase') || 'login' + if (phase === 'login') { + const form = document.querySelector('form[action="/_/auth/login"]') + assert(form, 'Login form missing') + form.elements.username.value = 'admin' + form.elements.password.value = 'a long test password' + sessionStorage.setItem('auth-flow-phase', 'authenticated') + form.requestSubmit() + return + } + if (phase === 'authenticated') { + assert(location.pathname === '/-/sys/config', 'Cookie login did not return to configuration') + assert(document.querySelector('.auth-user-name')?.textContent.includes('Test Admin'), 'Authenticated account missing') + assert(!document.cookie.includes('pageswiki_session'), 'Session cookie is not HttpOnly') + const confirmation = await fetch('/_/auth/logout') + assert(confirmation.ok && (await confirmation.text()).includes('action="/_/auth/logout"'), 'Logout GET is not confirmation') + const api = await fetch('/_/api/v1/queue') + assert(api.ok, 'Logout GET revoked the browser session') + const form = document.querySelector('.auth-menu-popover form[action="/_/auth/logout"]') + assert(form?.method === 'post', 'Account menu logout is not POST') + sessionStorage.setItem('auth-flow-phase', 'logged-out') + form.requestSubmit() + return + } + assert(location.pathname === '/_/auth/login', 'Logout did not return to login') + const denied = await fetch('/_/api/v1/queue') + assert(denied.status === 401, 'Logged-out cookie still authenticated') + document.body.dataset.vimReady = 'true' +})().catch(error => { + const element = document.createElement('pre') + element.id = 'error' + element.textContent = error.stack || String(error) + document.body.append(element) +}) diff --git a/internal/server/testdata/automatic-publication.js b/internal/server/testdata/automatic-publication.js new file mode 100644 index 0000000..edf1e6a --- /dev/null +++ b/internal/server/testdata/automatic-publication.js @@ -0,0 +1,22 @@ +window.addEventListener('load',async()=>{ + const wait=async(test,label)=>{for(let i=0;i<150;i++){if(test())return;await new Promise(r=>setTimeout(r,30));}throw new Error(label);}; + try { + document.querySelector('[data-governance-open]').click(); + const dialog=document.querySelector('[data-governance-dialog]'); + await wait(()=>!dialog.querySelector('fieldset').disabled,'load'); + const form=dialog.querySelector('[data-auto-publication-form]'),save=form.querySelector('[data-auto-save]'); + const preview=async()=>{form.querySelector('[data-auto-preview]').click();await wait(()=>!save.disabled,'automatic preview');}; + await preview();if(form.elements.mode.value!=='automatic')throw new Error('current mode'); + if(!form.querySelector('[data-auto-impact]').textContent.includes('/auto/empty/new'))throw new Error('impact list'); + form.elements.mode.value='required';form.requestSubmit(); + await wait(()=>!form.querySelector('[data-auto-impact]').textContent,'manual save'); + await preview();if(form.elements.mode.value!=='required')throw new Error('manual persisted'); + if(form.elements.mode.querySelector('[value=automatic]').disabled)throw new Error('automatic eligibility'); + form.elements.mode.value='automatic';form.elements.confirm.checked=true;form.requestSubmit(); + await wait(()=>!form.querySelector('[data-auto-impact]').textContent,'automatic save'); + await preview();if(form.elements.mode.value!=='automatic')throw new Error('automatic persisted'); + form.scrollIntoView({block:'center'}); + if(dialog.scrollWidth>dialog.clientWidth+2)throw new Error('horizontal overflow'); + document.body.dataset.vimReady='true'; + }catch(error){const node=document.createElement('div');node.id='error';node.textContent=error.message;document.body.append(node);} +}); diff --git a/internal/server/testdata/calendar-browser-smoke.mjs b/internal/server/testdata/calendar-browser-smoke.mjs new file mode 100644 index 0000000..9b6d6c6 --- /dev/null +++ b/internal/server/testdata/calendar-browser-smoke.mjs @@ -0,0 +1,176 @@ +import {spawn} from 'node:child_process'; +import {setTimeout as delay} from 'node:timers/promises'; +import {once} from 'node:events'; +const [url,profile]=process.argv.slice(2); +const browser=spawn('chromium',['--headless','--no-sandbox','--disable-gpu','--disable-background-networking','--no-proxy-server','--remote-debugging-port=0','--user-data-dir='+profile,'about:blank']); +let socket; +process.on('SIGTERM',()=>{browser.kill();process.exit(1);}); +try { + const endpoint=await new Promise((resolve,reject)=>{let log='';browser.stderr.on('data',chunk=>{log+=chunk;const m=log.match(/DevTools listening on (ws:\/\/[^\s]+)/);if(m)resolve(m[1]);});browser.on('error',reject);browser.on('exit',code=>reject(new Error('Browser exited '+code)));}); + socket=new WebSocket(endpoint);await new Promise((resolve,reject)=>{socket.onopen=resolve;socket.onerror=reject;}); + let seq=0,gets=0,reports=0;const pending=new Map(),errors=[]; + socket.onmessage=event=>{const m=JSON.parse(event.data),p=pending.get(m.id);if(p){pending.delete(m.id);m.error?p.reject(new Error(JSON.stringify(m.error))):p.resolve(m.result);}if(m.method==='Network.requestWillBeSent'){if(m.params.request.method==='REPORT')reports++;if(m.params.request.url.includes('/events?uid=')||m.params.request.url.includes('/events?resource='))gets++;}if(m.method==='Runtime.exceptionThrown')errors.push(JSON.stringify(m.params));}; + const send=(method,params={},sessionId)=>new Promise((resolve,reject)=>{pending.set(++seq,{resolve,reject});socket.send(JSON.stringify({id:seq,method,params,sessionId}));}); + const {targetId}=await send('Target.createTarget',{url:'about:blank'}),{sessionId}=await send('Target.attachToTarget',{targetId,flatten:true});const call=(method,params={})=>send(method,params,sessionId); + await call('Runtime.enable');await call('Network.enable');await call('Page.enable');await call('Page.navigate',{url}); + const evaluate=async expression=>{const r=await call('Runtime.evaluate',{expression,returnByValue:true,awaitPromise:true});if(r.exceptionDetails)throw new Error(JSON.stringify(r.exceptionDetails));return r.result.value;}; + const wait=async expression=>{for(let i=0;i<150;i++){if(await evaluate(expression))return;await delay(50);}throw new Error('Timed out: '+expression+' '+await evaluate('document.body.innerText'));}; + await wait("document.querySelector('.calendar-event')?.textContent.includes('Browser meeting') && !document.querySelector('#calendar-status').textContent"); + await wait("document.querySelector('#tasks-dav-open')"); + await evaluate("document.querySelector('#tasks-dav-open').click()"); + await wait("document.querySelector('#tasks-dav-dialog').open && document.querySelector('#tasks-dav-dialog thead')"); + if(!await evaluate("(()=>{const d=document.querySelector('#tasks-dav-dialog'),r=d.getBoundingClientRect();return getComputedStyle(d).backgroundColor!=='rgba(0, 0, 0, 0)'&&r.width<=innerWidth&&d.scrollWidth<=d.clientWidth+1&&d.querySelector('form select').value==='calendar'&&d.querySelector(':scope>input').value.endsWith('/_/api/v1/caldav/')})()"))throw Error('Common DAV dialog style/default scope invalid'); + await evaluate("(()=>{const f=document.querySelector('#tasks-dav-dialog form'),c=document.querySelector('#tasks-dav-compat');if(c.checked)throw Error('Compatibility must be opt-in');c.checked=true;f.querySelector('input').value='Calendar browser fixture';f.querySelector('select').value='all';f.requestSubmit()})()"); + await wait("!document.querySelector('#tasks-dav-dialog section').hidden && document.querySelector('#tasks-dav-dialog tbody tr')"); + if(!await evaluate("document.querySelector('#tasks-dav-dialog tbody').textContent.includes('OneTask')"))throw Error('Compatibility mode was not saved'); + await evaluate("window.confirm=()=>true;document.querySelector('#tasks-dav-dialog tbody button').click()"); + await wait("!document.querySelector('#tasks-dav-dialog tbody tr')"); + await evaluate("document.querySelector('#tasks-dav-dialog header button').click()"); + if(!await evaluate("document.querySelector('#tasks-dav-dialog section').hidden&&!document.querySelector('#tasks-dav-dialog section input')"))throw Error('Common DAV secret remained after close'); + if(!await evaluate("getComputedStyle(document.querySelector('#calendar-content')).backdropFilter.includes('blur')"))throw Error('Calendar view glass background was not applied'); + await evaluate("Array.from({length:localStorage.length},(_,i)=>localStorage.key(i)).filter(k=>k?.startsWith('pageswiki.calendar.view.v1:')).forEach(k=>localStorage.removeItem(k))"); + await call('Page.navigate',{url:new URL('/v/plan?calendar='+new URL(url).searchParams.get('calendar'),url).href}); + await wait("document.querySelectorAll('.calendar-time-column').length===7 && !document.querySelector('#calendar-status').textContent"); + await call('Page.navigate',{url}); + await wait("document.querySelector('.calendar-event')?.textContent.includes('Browser meeting') && !document.querySelector('#calendar-status').textContent"); + await call('Page.navigate',{url:new URL('/v/plan?calendar='+new URL(url).searchParams.get('calendar'),url).href}); + await wait("document.querySelector('.calendar-month') && !document.querySelector('#calendar-status').textContent"); + await call('Page.navigate',{url}); + await wait("document.querySelector('.calendar-event')?.textContent.includes('Browser meeting') && !document.querySelector('#calendar-status').textContent"); + const before=gets,reportBefore=reports; + await evaluate("document.querySelector('#calendar-refresh').click()"); + await wait("document.querySelector('#calendar-status').textContent === ''"); + await delay(200); + if(gets!==before||reports<=reportBefore)throw new Error('ETag refresh fetched unchanged event data'); + await evaluate("document.querySelector('#calendar-new').click()"); + await wait("document.querySelector('#calendar-dialog').open"); + if(!await evaluate("(()=>{const d=document.querySelector('#calendar-dialog'),f=document.querySelector('#calendar-form'),fields=document.querySelector('#calendar-fields'),s=getComputedStyle(d);return s.position==='fixed'&&s.backdropFilter.includes('blur')&&getComputedStyle(f).display==='grid'&&getComputedStyle(fields).overflowY==='auto'})()"))throw Error('Calendar editor modal styles were not applied'); + await evaluate("document.querySelector('[name=summary]').value='Created in browser';document.querySelector('#calendar-form').requestSubmit()"); + await wait("location.pathname==='/v/plan/cal/2026/09' && Array.from(document.querySelectorAll('.calendar-event')).some(e=>e.textContent.includes('Created in browser')) && !document.querySelector('#calendar-dialog').open"); + await evaluate("Array.from(document.querySelectorAll('.calendar-event')).find(e=>e.textContent.includes('Created in browser')).click()"); + await wait("document.querySelector('.calendar-detail h2')?.textContent==='Created in browser'"); + await evaluate("document.querySelector('a[href*=\"/edit?\"]').click()"); + await wait("document.querySelector('#calendar-dialog').open"); + await evaluate("document.querySelector('[name=summary]').value='Edited in browser';document.querySelector('#calendar-form').requestSubmit()"); + await wait("document.querySelector('.calendar-detail h2')?.textContent==='Edited in browser' && !document.querySelector('#calendar-dialog').open"); + await evaluate("document.querySelector('#calendar-settings').click()"); + await wait("document.querySelector('#calendar-dialog').open"); + await evaluate("document.querySelector('[name=name]').value='Renamed Calendar';document.querySelector('[name=pretty_name]').value='work';document.querySelector('#calendar-form').requestSubmit()"); + await wait("document.querySelector('#calendar-heading').textContent.includes('Renamed Calendar') && !document.querySelector('#calendar-dialog').open"); + await evaluate("window.confirm=()=>true;document.querySelector('.calendar-detail nav button').click()"); + await wait("location.pathname.includes('/v/plan/cal/') && !document.querySelector('#calendar-status').textContent"); + if(await evaluate("document.querySelector('#calendar-content').textContent.includes('Edited in browser')"))throw new Error('Deleted event remained visible'); + await evaluate("(async()=>{const base='/_/api/v1/extension/organizer.calendar/';const r=await fetch(base+'calendars',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({name:'Personal',pretty_name:'personal'})});if(!r.ok)throw Error(await r.text());const c=await r.json();const event=await fetch(base+'calendars/'+c.id+'/events',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({summary:'Personal meeting',start:'2026-09-22T11:00:00Z',end:'2026-09-22T12:00:00Z'})});if(!event.ok)throw Error(await event.text());})()"); + await call('Page.navigate',{url:new URL('/v/plan/cal/2026/09?calendar=work,personal',url).href}); + await wait("document.querySelector('#calendar-content')?.textContent.includes('Personal meeting') && document.querySelector('#calendar-content')?.textContent.includes('Browser meeting') && !document.querySelector('#calendar-status').textContent"); + if(!await evaluate("Array.from(document.querySelectorAll('.calendar-event')).some(a=>a.href.includes('calendar=work'))&&Array.from(document.querySelectorAll('.calendar-event')).some(a=>a.href.includes('calendar=personal'))"))throw Error('Event links lost source calendar'); + await evaluate("document.querySelector('#calendar-display-settings').click()"); + await wait("document.querySelector('#calendar-dialog').open"); + await evaluate("document.querySelector('[name=save-defaults]').checked=true;document.querySelector('#calendar-form').requestSubmit()"); + await wait("location.search==='' && !document.querySelector('#calendar-dialog').open && document.querySelector('#calendar-content').textContent.includes('Personal meeting')"); + await call('Page.reload'); + await wait("document.querySelector('#calendar-content')?.textContent.includes('Personal meeting') && document.querySelector('#calendar-content')?.textContent.includes('Browser meeting') && !document.querySelector('#calendar-status').textContent"); + if(await evaluate("location.search!==''"))throw Error('Defaults added a calendar query'); + await call('Page.navigate',{url:new URL('/v/plan/cal/2026/09/22?calendar=work',url).href}); + await wait("document.querySelector('.calendar-time-event .calendar-move-handle') && !document.querySelector('#calendar-status').textContent"); + if(!await evaluate("document.querySelector('#calendar-app').dataset.timezone==='Asia/Tokyo'&&parseFloat(document.querySelector('.calendar-time-event').style.top)===1080"))throw Error('Configured calendar timezone was not used by the time grid'); + if(!await evaluate("(()=>{const s=getComputedStyle(document.querySelector('.calendar-time-scroll'));return s.scrollbarWidth==='thin'&&s.scrollbarColor!=='auto'})()"))throw Error('Global theme-aware scrollbar styles were not applied'); + let viewportMetrics=await evaluate("(()=>{const r=document.querySelector('.calendar-time-scroll').getBoundingClientRect(),v=document.querySelector('.calendar-time-view').getBoundingClientRect(),c=document.querySelector('#calendar-content').getBoundingClientRect();return {bottom:r.bottom,height:r.height,viewport:innerHeight,page:document.documentElement.scrollHeight,ratio:v.height/c.height,body:getComputedStyle(document.body).display,app:getComputedStyle(document.querySelector('#calendar-app')).display}})()"); + if(viewportMetrics.bottom>viewportMetrics.viewport+2||viewportMetrics.height<100||viewportMetrics.page>viewportMetrics.viewport+1||Math.abs(viewportMetrics.ratio-.95)>.02)throw Error('Day time grid did not use 95% of the remaining viewport: '+JSON.stringify(viewportMetrics)); + const moveGets=gets,moveReports=reports; + await evaluate("document.querySelector('.calendar-move-handle').dispatchEvent(new KeyboardEvent('keydown',{key:'ArrowDown',bubbles:true}))"); + await wait("document.querySelector('.calendar-time-event')?.dataset.start==='2026-09-22T09:15:00Z' && !document.querySelector('#calendar-status').textContent"); + await delay(100); + await evaluate("document.querySelector('.calendar-move-handle').scrollIntoView({block:'center',inline:'center'})"); + await delay(50); + let point=await evaluate("(()=>{const r=document.querySelector('.calendar-move-handle').getBoundingClientRect();return {x:r.x+r.width/2,y:r.y+r.height/2}})()"); + await call('Input.dispatchMouseEvent',{type:'mousePressed',button:'left',clickCount:1,...point}); + await call('Input.dispatchMouseEvent',{type:'mouseMoved',button:'left',buttons:1,x:point.x,y:point.y+15}); + await call('Input.dispatchMouseEvent',{type:'mouseReleased',button:'left',clickCount:1,x:point.x,y:point.y+15}); + await wait("document.querySelector('.calendar-time-event')?.dataset.start==='2026-09-22T09:30:00Z' && !document.querySelector('#calendar-status').textContent"); + const height=await evaluate("document.querySelector('.calendar-time-column').offsetHeight"); + await evaluate("document.querySelector('[data-calendar-zoom=in]').click()"); + if(await evaluate("document.querySelector('.calendar-time-column').offsetHeight")<=height)throw Error('Zoom did not change scale'); + await evaluate("(()=>{for(let i=0;i<10;i++){const b=document.querySelector('[data-calendar-zoom=in]');if(!b||b.disabled)break;b.click();}})()"); + if(!await evaluate("document.querySelector('.calendar-time-controls span')?.textContent==='400%'&&document.querySelector('.calendar-time-grid')?.dataset.snapMinutes==='5'&&document.querySelector('[data-calendar-zoom=in]').disabled"))throw Error('Maximum zoom or five-minute scale missing'); + await evaluate("(()=>{const s=document.querySelector('.calendar-time-scroll');s.scrollTop=16*240-s.clientHeight/2+30})()"); + point=await evaluate("(()=>{const c=document.querySelector('.calendar-time-column'),r=c.getBoundingClientRect(),x=r.x+r.width/2,y=r.top+16*240,h=document.elementFromPoint(x,y);return {x,y,hit:h?.className||h?.tagName,top:r.top,scroll:c.closest('.calendar-time-scroll').scrollTop}})()"); + if(point.hit!=='calendar-time-column')throw Error('Empty-range test target is not visible: '+JSON.stringify(point)); + await call('Input.dispatchMouseEvent',{type:'mousePressed',button:'left',clickCount:1,...point}); + await call('Input.dispatchMouseEvent',{type:'mouseMoved',button:'left',buttons:1,x:point.x,y:point.y+120}); + await call('Input.dispatchMouseEvent',{type:'mouseReleased',button:'left',clickCount:1,x:point.x,y:point.y+120}); + await wait("document.querySelector('#calendar-dialog').open"); + if(!await evaluate("document.querySelector('[name=start]').value==='2026-09-22T16:00'&&document.querySelector('[name=end]').value==='2026-09-22T16:30'"))throw Error('Empty-range drag did not prefill configured-timezone event range'); + await evaluate("document.querySelector('#calendar-cancel').click()"); + await evaluate("document.querySelector('.calendar-resize-end').dispatchEvent(new KeyboardEvent('keydown',{key:'ArrowDown',bubbles:true}))"); + await wait("document.querySelector('.calendar-time-event')?.dataset.end==='2026-09-22T10:35:00Z' && !document.querySelector('#calendar-status').textContent"); + await evaluate("document.querySelector('.calendar-resize-end').scrollIntoView({block:'center',inline:'center'})"); + await delay(50); + point=await evaluate("(()=>{const r=document.querySelector('.calendar-resize-end').getBoundingClientRect();return {x:r.x+r.width/2,y:r.y+r.height/2}})()"); + await call('Input.dispatchMouseEvent',{type:'mousePressed',button:'left',clickCount:1,...point}); + await call('Input.dispatchMouseEvent',{type:'mouseMoved',button:'left',buttons:1,x:point.x,y:point.y+20}); + await call('Input.dispatchMouseEvent',{type:'mouseReleased',button:'left',clickCount:1,x:point.x,y:point.y+20}); + await wait("document.querySelector('.calendar-time-event')?.dataset.end==='2026-09-22T10:40:00Z' && !document.querySelector('#calendar-status').textContent"); + await evaluate("document.querySelector('.calendar-resize-end').dispatchEvent(new KeyboardEvent('keydown',{key:'ArrowUp',bubbles:true}))"); + await wait("document.querySelector('.calendar-time-event')?.dataset.end==='2026-09-22T10:35:00Z' && !document.querySelector('#calendar-status').textContent"); + await evaluate("document.querySelector('.calendar-resize-start').scrollIntoView({block:'center',inline:'center'})"); + await delay(50); + point=await evaluate("(()=>{const r=document.querySelector('.calendar-resize-start').getBoundingClientRect();return {x:r.x+r.width/2,y:r.y+r.height/2}})()"); + await call('Input.dispatchMouseEvent',{type:'mousePressed',button:'left',clickCount:1,...point}); + await call('Input.dispatchMouseEvent',{type:'mouseMoved',button:'left',buttons:1,x:point.x,y:point.y+20}); + await call('Input.dispatchMouseEvent',{type:'mouseReleased',button:'left',clickCount:1,x:point.x,y:point.y+20}); + await wait("document.querySelector('.calendar-time-event')?.dataset.start==='2026-09-22T09:35:00Z' && !document.querySelector('#calendar-status').textContent"); + await evaluate("document.querySelector('.calendar-resize-start').dispatchEvent(new KeyboardEvent('keydown',{key:'ArrowUp',bubbles:true}))"); + await wait("document.querySelector('.calendar-time-event')?.dataset.start==='2026-09-22T09:30:00Z' && !document.querySelector('#calendar-status').textContent"); + if(gets!==moveGets||reports!==moveReports)throw Error('Time changes reloaded the calendar instead of updating locally'); + await evaluate("(async()=>{const base='/_/api/v1/extension/organizer.calendar/',id=document.querySelector('#calendar-select').value;const r=await fetch(base+'calendars/'+id+'/events',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({summary:'Overlapping meeting',start:'2026-09-22T09:45:00Z',end:'2026-09-22T10:15:00Z'})});if(!r.ok)throw Error(await r.text());document.querySelector('#calendar-refresh').click()})()"); + await wait("Array.from(document.querySelectorAll('.calendar-time-event')).some(e=>e.textContent.includes('Overlapping meeting'))&&!document.querySelector('#calendar-status').textContent"); + if(!await evaluate("(()=>{const cards=Array.from(document.querySelectorAll('.calendar-time-event')).filter(e=>/Browser meeting|Overlapping meeting/.test(e.textContent));return cards.length===2&&cards.every(e=>e.style.width==='50%')})()"))throw Error('Overlapping events did not receive equal lanes'); + await call('Page.navigate',{url:new URL('/v/plan/cal/2026/09/22/week?calendar=work',url).href}); + await wait("document.querySelectorAll('.calendar-time-column').length===7 && !document.querySelector('#calendar-status').textContent"); + viewportMetrics=await evaluate("(()=>{const r=document.querySelector('.calendar-time-scroll').getBoundingClientRect(),v=document.querySelector('.calendar-time-view').getBoundingClientRect(),c=document.querySelector('#calendar-content').getBoundingClientRect();return {bottom:r.bottom,height:r.height,viewport:innerHeight,page:document.documentElement.scrollHeight,ratio:v.height/c.height}})()"); + if(viewportMetrics.bottom>viewportMetrics.viewport+2||viewportMetrics.height<100||viewportMetrics.page>viewportMetrics.viewport+1||Math.abs(viewportMetrics.ratio-.95)>.02)throw Error('Week time grid did not use 95% of the remaining viewport: '+JSON.stringify(viewportMetrics)); + await call('Page.navigate',{url:new URL('/v/plan/cal/2026/09/22/timeline?calendar=work',url).href}); + await wait("Array.from(document.querySelectorAll('.calendar-track[data-start]')).some(e=>e.textContent.includes('Browser meeting')&&e.querySelector('.calendar-timeline-handle')) && !document.querySelector('#calendar-status').textContent"); + await evaluate("Array.from(document.querySelectorAll('.calendar-track[data-start]')).find(e=>e.textContent.includes('Browser meeting')).querySelector('.calendar-timeline-handle').dispatchEvent(new KeyboardEvent('keydown',{key:'ArrowRight',bubbles:true}))"); + await wait("Array.from(document.querySelectorAll('.calendar-track[data-start]')).find(e=>e.textContent.includes('Browser meeting'))?.dataset.start==='2026-09-22T09:45:00Z' && !document.querySelector('#calendar-status').textContent"); + await evaluate("Array.from(document.querySelectorAll('.calendar-track[data-start]')).find(e=>e.textContent.includes('Browser meeting')).querySelector('.calendar-timeline-handle').scrollIntoView({block:'center',inline:'center'})"); + await delay(50); + point=await evaluate("(()=>{const h=Array.from(document.querySelectorAll('.calendar-track[data-start]')).find(e=>e.textContent.includes('Browser meeting')).querySelector('.calendar-timeline-handle'),r=h.getBoundingClientRect();return {x:r.x+r.width/2,y:r.y+r.height/2,step:h.parentNode.getBoundingClientRect().width/24}})()"); + await call('Input.dispatchMouseEvent',{type:'mousePressed',button:'left',clickCount:1,x:point.x,y:point.y}); + await call('Input.dispatchMouseEvent',{type:'mouseMoved',button:'left',buttons:1,x:point.x+point.step,y:point.y}); + await call('Input.dispatchMouseEvent',{type:'mouseReleased',button:'left',clickCount:1,x:point.x+point.step,y:point.y}); + await wait("Array.from(document.querySelectorAll('.calendar-track[data-start]')).find(e=>e.textContent.includes('Browser meeting'))?.dataset.start==='2026-09-22T10:45:00Z' && !document.querySelector('#calendar-status').textContent"); + await call('Page.navigate',{url:new URL('/v/plan/cal/2026/09/22/week/list?calendar=work',url).href}); + await wait("document.querySelectorAll('.calendar-week-heading').length===7 && document.querySelector('#calendar-content').textContent.includes('Browser meeting')"); + await evaluate("document.querySelector('#calendar-new').click()"); + await wait("document.querySelector('#calendar-dialog').open"); + await evaluate("document.querySelector('[name=summary]').value='Inclusive all day';const a=document.querySelector('[name=all_day]');a.checked=true;a.dispatchEvent(new Event('change'));document.querySelector('[name=start]').value='2026-09-22';document.querySelector('[name=end]').value='2026-09-22';document.querySelector('#calendar-form').requestSubmit()"); + await wait("location.pathname.endsWith('/week/list') && Array.from(document.querySelectorAll('.calendar-event')).some(e=>e.textContent.includes('Inclusive all day')) && !document.querySelector('#calendar-dialog').open"); + await evaluate("Array.from(document.querySelectorAll('.calendar-event')).find(e=>e.textContent.includes('Inclusive all day')).click()"); + await wait("document.querySelector('.calendar-detail h2')?.textContent==='Inclusive all day'"); + if(!await evaluate("Array.from(document.querySelectorAll('.calendar-detail dd')).slice(0,2).every(e=>e.textContent==='2026-09-22')"))throw Error('All-day display is not inclusive'); + await evaluate("document.querySelector('a[href*=\"/edit?\"]').click()"); + await wait("document.querySelector('#calendar-dialog').open"); + if(!await evaluate("document.querySelector('[name=end]').value==='2026-09-22'"))throw Error('All-day edit extended date'); + await evaluate("document.querySelector('#calendar-cancel').click();document.querySelector('[data-calendar-upcoming-launch]').click()"); + await wait("document.querySelector('[data-calendar-upcoming-dialog]').matches(':modal') && !document.querySelector('[data-calendar-upcoming-status]').textContent.includes('Loading') && !document.querySelector('[data-calendar-upcoming-status]').textContent.includes('読み込み')"); + if(!await evaluate("getComputedStyle(document.documentElement).overflow==='hidden' && document.querySelector('[data-calendar-upcoming-launch]').nextElementSibling.matches('[data-notification-launch]')"))throw Error('Modal scroll lock or icon order'); + if(!await evaluate("(()=>{const d=document.querySelector('[data-calendar-upcoming-dialog]'),i=d.querySelector('.calendar-upcoming-item'),s=getComputedStyle(d),r=d.getBoundingClientRect();return s.position==='fixed'&&Math.abs(r.height/innerHeight-.95)<.02&&d.querySelector('.calendar-upcoming-list')&&!d.textContent.includes('今日から31日間')&&(!i||(getComputedStyle(i).display==='grid'&&i.children.length===3&&i.children[0].tagName==='TIME'&&i.children[1].tagName==='TIME'))})()"))throw Error('Upcoming modal layout, 95% height, or compact event row is missing'); + await call('Input.dispatchKeyEvent',{type:'keyDown',key:'Escape',code:'Escape',windowsVirtualKeyCode:27}); + await call('Input.dispatchKeyEvent',{type:'keyUp',key:'Escape',code:'Escape',windowsVirtualKeyCode:27}); + await wait("!document.querySelector('[data-calendar-upcoming-dialog]').open"); + await evaluate("document.querySelector('[data-notification-launch]').click()"); + await wait("document.querySelector('[data-notification-dialog]').matches(':modal')"); + await evaluate("document.querySelector('[data-notification-close]').click()"); + const disposable=await evaluate("(async()=>{const r=await fetch('/_/api/v1/extension/organizer.calendar/calendars',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({name:'Disposable Calendar',pretty_name:'disposable'})});if(!r.ok)throw Error(await r.text());return (await r.json()).pretty_name})()"); + await call('Page.navigate',{url:new URL('/v/plan?calendar='+encodeURIComponent(disposable),url).href}); + await wait("document.querySelector('#calendar-heading').textContent.includes('Disposable Calendar')&&!document.querySelector('#calendar-status').textContent"); + await evaluate("document.querySelector('#calendar-settings').click()"); + await wait("document.querySelector('#calendar-dialog').open&&document.querySelector('.calendar-delete-button')"); + await evaluate("window.confirm=()=>true;document.querySelector('.calendar-delete-button').click()"); + await wait("location.pathname==='/v/plan'&&!document.querySelector('#calendar-dialog').open&&!document.querySelector('#calendar-heading').textContent.includes('Disposable Calendar')&&!document.querySelector('#calendar-status').textContent"); + if(!await evaluate("fetch('/_/api/v1/extension/organizer.calendar/calendars').then(r=>r.json()).then(v=>!v.calendars.some(c=>c.pretty_name==='disposable'))"))throw Error('Deleted calendar remained in API'); + if(errors.length)throw new Error(errors.join('\n')); + console.log('Calendar browser CRUD, deletion, settings, navigation and ETag cache passed'); +} finally {socket?.close();const closed=once(browser,'exit');browser.kill();await Promise.race([closed,delay(3000)]);} diff --git a/internal/server/testdata/calendar-mobile-smoke.mjs b/internal/server/testdata/calendar-mobile-smoke.mjs new file mode 100644 index 0000000..adb5e4c --- /dev/null +++ b/internal/server/testdata/calendar-mobile-smoke.mjs @@ -0,0 +1,25 @@ +// Chromium touch/small-viewport regression, not a claim of running iOS Safari. +import {spawn} from 'node:child_process'; +import {writeFile} from 'node:fs/promises'; +import {setTimeout as delay} from 'node:timers/promises'; +const [origin,profile]=process.argv.slice(2); +const browser=spawn('chromium',['--headless','--no-sandbox','--disable-gpu','--disable-background-networking','--no-proxy-server','--remote-debugging-port=0','--user-data-dir='+profile,'about:blank']); +process.on('SIGTERM',()=>{browser.kill();process.exit(1);});let socket; +try{ + const endpoint=await new Promise((resolve,reject)=>{let log='';browser.stderr.on('data',c=>{log+=c;const m=log.match(/DevTools listening on (ws:\/\/[^\s]+)/);if(m)resolve(m[1]);});browser.on('error',reject);});socket=new WebSocket(endpoint);await new Promise(resolve=>socket.onopen=resolve);let seq=0;const pending=new Map(),errors=[];socket.onmessage=e=>{const m=JSON.parse(e.data),p=pending.get(m.id);if(p){pending.delete(m.id);m.error?p.reject(Error(JSON.stringify(m.error))):p.resolve(m.result);}if(m.method==='Runtime.exceptionThrown')errors.push(JSON.stringify(m.params));};const send=(method,params={},sessionId)=>new Promise((resolve,reject)=>{pending.set(++seq,{resolve,reject});socket.send(JSON.stringify({id:seq,method,params,sessionId}));});const {targetId}=await send('Target.createTarget',{url:'about:blank'}),{sessionId}=await send('Target.attachToTarget',{targetId,flatten:true}),call=(method,params={})=>send(method,params,sessionId);await call('Runtime.enable');await call('Page.enable');await call('Emulation.setTouchEmulationEnabled',{enabled:true,maxTouchPoints:1}); + const evaluate=async expression=>{const r=await call('Runtime.evaluate',{expression,returnByValue:true,awaitPromise:true});if(r.exceptionDetails)throw Error(JSON.stringify(r.exceptionDetails));return r.result.value;};const wait=async expr=>{for(let i=0;i<100;i++){if(await evaluate(expr))return;await delay(50);}throw Error('Timed out: '+expr);}; + for(const [width,height] of [[320,568],[375,667],[667,375]]){ + await call('Emulation.setDeviceMetricsOverride',{width,height,deviceScaleFactor:1,mobile:true});await call('Page.navigate',{url:origin+'/v/plan/cal/2026/09/22/week?calendar=mobile'});await wait("document.querySelectorAll('.calendar-time-column').length===7&&!document.querySelector('#calendar-status').textContent");await delay(100); + const metrics=await evaluate("(()=>{const scroll=document.querySelector('.calendar-time-scroll'),column=document.querySelector('.calendar-time-column'),card=document.querySelector('.calendar-time-event'),select=document.querySelector('.calendar-mobile-view'),r=scroll.getBoundingClientRect();return {width:document.documentElement.scrollWidth,viewport:innerWidth,height:r.height,bottom:r.bottom,screen:innerHeight,column:column.clientWidth,touch:getComputedStyle(card).touchAction,view:getComputedStyle(select).display,day:document.querySelector('.calendar-mobile-days [aria-pressed=true]')?.getAttribute('aria-label')}})()"); + if(metrics.width>width+1||metrics.bottom>height+1||metrics.height<80||metrics.column<240||metrics.touch==='none'||metrics.view==='none'||metrics.day!=='2026-09-22')throw Error('Mobile layout '+width+': '+JSON.stringify(metrics)); + await evaluate("document.querySelector('.calendar-mobile-days button:last-child').click()");await wait("document.querySelector('.calendar-mobile-days [aria-pressed=true]')?.getAttribute('aria-label')==='2026-09-27'"); + await evaluate("document.querySelector('.calendar-mobile-days button:nth-child(2)').click()"); + await evaluate("(()=>{const c=document.querySelector('.calendar-time-event');c.dispatchEvent(new PointerEvent('pointerdown',{bubbles:true,pointerId:7,pointerType:'touch',button:0,clientX:150,clientY:200}));if(c.hasPointerCapture(7))throw Error('Touch scroll captured by drag');})()"); + await evaluate("document.querySelector('.calendar-touch-edit').click()");if(!await evaluate("getComputedStyle(document.querySelector('.calendar-time-event')).touchAction==='none'"))throw Error('Explicit gesture mode missing');await evaluate("document.querySelector('.calendar-touch-edit').click()"); + if(width!==667){await evaluate("document.querySelector('.calendar-time-scroll').scrollTop=16*60");await delay(80);const screenshot=await call('Page.captureScreenshot',{format:'png'});await writeFile('/tmp/pageswiki-calendar-'+width+'.png',Buffer.from(screenshot.data,'base64'));} + await evaluate("document.querySelector('#calendar-new').click()");await wait("document.querySelector('#calendar-dialog').open");const editor=await evaluate("(()=>{const d=document.querySelector('#calendar-dialog'),i=d.querySelector('[name=summary]'),r=d.getBoundingClientRect();return {width:d.scrollWidth,client:d.clientWidth,bottom:r.bottom,top:r.top,font:parseFloat(getComputedStyle(i).fontSize)}})()");if(editor.width>editor.client+1||editor.bottom>height+1||editor.top<0||editor.font<16)throw Error('Editor small screen '+JSON.stringify(editor)); + await evaluate("document.querySelector('#calendar-cancel').click();const s=document.querySelector('.calendar-mobile-view');s.value='month';s.dispatchEvent(new Event('change'))");await wait("document.querySelector('.calendar-month')&&!document.querySelector('#calendar-status').textContent");if(!await evaluate("document.documentElement.scrollWidth<=innerWidth+1&&getComputedStyle(document.querySelector('.calendar-mobile-count')).display!=='none'"))throw Error('Compact month counts missing'); + await evaluate("document.querySelector('.calendar-mobile-actions').open=true");await delay(50);await evaluate("document.querySelector('.calendar-mobile-actions [data-source=calendar-settings]').click()");await wait("document.querySelector('#calendar-dialog').open&&document.querySelector('[name=pretty_name]')");await evaluate("document.querySelector('#calendar-cancel').click()"); + } + if(errors.length)throw Error(errors.join('\n'));console.log('320/375 portrait and 667 landscape calendar UI passed'); +}finally{socket?.close();browser.kill();} diff --git a/internal/server/testdata/city-governance.js b/internal/server/testdata/city-governance.js new file mode 100644 index 0000000..2052d0b --- /dev/null +++ b/internal/server/testdata/city-governance.js @@ -0,0 +1,37 @@ +window.addEventListener('load', async () => { + const wait = async (test,step) => { for (let i=0;i<150;i++) { if (test()) return; await new Promise(r=>setTimeout(r,30)); } throw new Error('Governance UI timeout: '+step+' '+document.querySelector('[data-governance-result]')?.textContent); }; + try { + const domain = location.pathname === '/v/city'; + if (domain) document.querySelector('[data-city-menu-open]').click(); + document.querySelector('[data-governance-open]').click(); + const dialog = document.querySelector('[data-governance-dialog]'), form = dialog.querySelector('form'), fields = form.querySelector('fieldset'); + await wait(()=>!fields.disabled,'initial load'); + if (!dialog.open) throw new Error('Settings dialog did not open'); + if (!domain) { + if (!form.elements.policy.querySelector('[value=public]').disabled) throw new Error('Public option ignores superior cap'); + const search = dialog.querySelector('[data-governance-search]'); search.value='delegate'; search.dispatchEvent(new Event('input')); + const select = dialog.querySelector('[data-governance-members]'); await wait(()=>select.options.length===1 && select.options[0].textContent.includes('delegate'),'member search'); + dialog.querySelector('[data-governance-add]').click(); + if (dialog.querySelectorAll('[data-governance-owners] li').length!==1) throw new Error('Owner picker failed'); + } + form.elements.policy.value = domain ? 'public' : 'authenticated_acl'; + if (domain) form.elements.confirm_relaxation.checked=true; + form.requestSubmit(); + await wait(()=>dialog.querySelector('[data-governance-result]').textContent===dialog.dataset.saved,'save'); + if (!domain) { + const acl=dialog.querySelector('[data-access-form]'); acl.elements.mode.value='restricted'; + dialog.querySelector('[data-access-add]').click(); + const row=dialog.querySelector('.city-access-row'); const name=row.querySelector('input'); name.value='delegate';name.dispatchEvent(new Event('input')); + const permission=row.querySelectorAll('select')[1];permission.value='read_write';permission.dispatchEvent(new Event('input')); + acl.elements.confirm.checked=true; acl.requestSubmit(); + await wait(()=>dialog.querySelector('[data-governance-result]').textContent===acl.dataset.saved,'ACL save'); + } + dialog.querySelector('[data-governance-close]').click(); + document.querySelector('[data-governance-open]').click(); await wait(()=>!fields.disabled,'reopen'); + if (form.elements.policy.value !== (domain?'public':'authenticated_acl')) throw new Error('Persisted policy lost'); + if (!domain && dialog.querySelectorAll('[data-governance-owners] li').length!==1) throw new Error('Persisted owners lost'); + if (!domain && (dialog.querySelector('[data-access-form]').elements.mode.value!=='restricted' || dialog.querySelector('.city-access-row input').value!=='delegate')) throw new Error('Persisted ACL lost'); + const rect=dialog.getBoundingClientRect(); if (rect.width<200 || rect.width>window.innerWidth || rect.height>window.innerHeight) throw new Error('Dialog layout overflow'); + dialog.close(); document.body.dataset.vimReady='true'; + } catch(error) { const box=document.createElement('div'); box.id='error'; box.textContent=error.message; document.body.append(box); } +}); diff --git a/internal/server/testdata/city-immersive.js b/internal/server/testdata/city-immersive.js new file mode 100644 index 0000000..44343c5 --- /dev/null +++ b/internal/server/testdata/city-immersive.js @@ -0,0 +1,114 @@ +window.addEventListener('load', async () => { + const wait = async check => { + for (let i = 0; i < 200; i++) { + if (check()) return; + await new Promise(resolve => setTimeout(resolve, 25)); + } + throw new Error('Immersive City did not finish rendering'); + }; + const assert = (value, message) => { if (!value) throw new Error(message); }; + const click = (element, ctrlKey = false) => { + assert(element, 'Missing click target'); + element.dispatchEvent(new MouseEvent('click', {bubbles:true, cancelable:true, ctrlKey})); + }; + const boxesOverlap = (a, b) => a[0] < b[0]+b[2] && b[0] < a[0]+a[2] && a[1] < b[1]+b[3] && b[1] < a[1]+a[3]; + const inspectStreet = () => { + const plots = [...document.querySelectorAll('[data-estate-box]')]; + assert(plots.length <= 6, 'Street exceeded bounded Spot projection'); + plots.forEach((plot, i) => { + const bounds = plot.dataset.estateBox.split(',').map(Number); + for (const other of plots.slice(i+1)) assert(!boxesOverlap(bounds, other.dataset.estateBox.split(',').map(Number)), 'Spot courtyards overlap'); + assert(plot.querySelectorAll('.city-map-page-link').length <= 6, 'Street renders unbounded Page buildings'); + const more = plot.querySelector('.city-estate-more'); + if (more) { + const m = more.getBBox(); + for (const page of plot.querySelectorAll('.city-map-page-link')) { + const p = page.getBBox(); + assert(!boxesOverlap([m.x,m.y,m.width,m.height], [p.x,p.y,p.width,p.height]), 'More Pages badge covers a Page'); + } + } + }); + return plots.map(plot => plot.dataset.cityUuid); + }; + try { + const fixture = new URLSearchParams(location.search).get('fixture'); + if (fixture === 'mobile-light') { + await new Promise((resolve, reject) => { + const style = document.createElement('link'); style.rel = 'stylesheet'; style.href = '/static/css/theme/index-white.css'; + style.onload = resolve; style.onerror = reject; document.head.append(style); + }); + } + const originalURL = location.href, originalHistory = history.length; + const data = await (await fetch('/_/api/v1/city/map')).json(); + const quartier = data.quartiers[0], street = quartier.streets.find(s => s.name === 'home'); + const alpha = street.spots.find(s => s.title === 'alpha'); + await wait(() => document.querySelector('.city-quartier-tile')); + assert(document.querySelector('#city-map').getBoundingClientRect().height > innerHeight * .8, 'Utilities occupy the map'); + assert(document.documentElement.scrollHeight <= innerHeight+1, 'Map has document scrolling'); + assert(!document.querySelector('[data-city-command-menu]').open, 'Utility menu is open on entry'); + click(document.querySelector('.city-quartier-tile')); + await wait(() => document.querySelector('.city-street-tile')); + click(document.querySelector(`[data-city-type="Street"][data-city-uuid="${street.uuid}"]`)); + await wait(() => document.querySelector('[data-estate-box]')); + const seenSpots = new Set(inspectStreet()); + assert(!document.querySelector('[data-city-scene-pager]').hidden, 'Large Street has no pagination'); + click(document.querySelector('[data-city-scene-next]')); + await wait(() => document.querySelector('[data-city-scene-next]').disabled && document.querySelector('[data-estate-box]')); + inspectStreet().forEach(id => seenSpots.add(id)); + const nonempty = street.spots.filter(s => !window.PagesWikiCityEstates.undefinedSpot(s) || s.pages.length); + assert(seenSpots.size === nonempty.length, 'Pagination makes some Spots unreachable'); + click(document.querySelector('[data-city-scene-prev]')); + await wait(() => document.querySelector(`[data-city-uuid="${alpha.uuid}"] .city-spot-entry`)); + click(document.querySelector(`[data-city-uuid="${alpha.uuid}"] .city-spot-entry`)); + await wait(() => document.querySelector('.city-estate-detail .city-map-page-link')); + assert(location.href === originalURL && history.length === originalHistory, 'Opening a Spot navigated to a document'); + assert(document.querySelector('[aria-current="location"]').textContent === alpha.title, 'Breadcrumb omits focused Spot'); + assert(document.querySelector('.city-portal-link').getAttribute('href') === '/life/home/alpha', 'Spot portal URL changed'); + const pageLinks = [...document.querySelectorAll('.city-map-page-link')]; + assert(pageLinks.length === 24, 'Focused Spot must bound Page rendering'); + const seenPages = new Map(pageLinks.map(a => [a.dataset.pageUuid,a.getAttribute('href')])); + click(pageLinks[0], true); + assert(pageLinks[0].classList.contains('city-is-selected') && location.href === originalURL, 'Page building cannot be Ctrl-selected'); + click(pageLinks[0], true); + click(document.querySelector('[data-city-scene-next]')); + await wait(() => document.querySelector('[data-city-scene-next]').disabled && document.querySelectorAll('.city-map-page-link').length < 24); + for (const a of document.querySelectorAll('.city-map-page-link')) seenPages.set(a.dataset.pageUuid,a.getAttribute('href')); + click(document.querySelector('.city-estate-focused > .city-courtyard')); + assert(document.querySelector('[data-city-scene-next]').disabled, 'Empty focused courtyard resets pagination'); + const expected = window.PagesWikiCityEstates.surroundingPages(alpha); + assert(!seenPages.has(alpha.portal_page_uuid), 'Portal duplicates itself as a child Page'); + assert(seenPages.size === expected.length, 'Focused Spot hides Pages permanently'); + expected.forEach(p => assert(seenPages.get(p.page_uuid) === p.path, 'Page building points to the wrong URL')); + click(document.querySelector('[data-city-menu-open]')); + const menu = document.querySelector('[data-city-command-menu]'); + assert(menu.open && menu.contains(document.activeElement), 'Menu did not acquire focus'); + assert(menu.getBoundingClientRect().right <= innerWidth && menu.getBoundingClientRect().bottom <= innerHeight, 'Menu is outside viewport'); + for (const tab of ['directory','planning','settings','guide']) { + click(menu.querySelector(`[data-city-menu-tab="${tab}"]`)); + assert([...menu.querySelectorAll('[data-city-menu-panel]')].filter(p => !p.hidden).length === 1, 'Utility panels overlap'); + assert(!menu.querySelector(`[data-city-menu-panel="${tab}"]`).hidden, 'Wrong utility panel'); + } + click(menu.querySelector('[data-city-menu-tab="planning"]')); + const kind = menu.querySelector('[data-city-create-kind]'); + kind.value = 'spot'; kind.dispatchEvent(new Event('change', {bubbles:true})); + assert([...menu.querySelectorAll('[data-city-create]')].filter(f => !f.hidden).length === 1 && !menu.querySelector('[data-city-create="spot"]').hidden, 'Creation forms are not compact'); + click(menu.querySelector('[data-city-menu-close]')); + assert(!menu.open, 'Menu cannot close'); + // Click outside the courtyard ascends without adding browser history. + click(document.querySelector('#city-map')); + await wait(() => document.querySelector('[data-estate-box]')); + assert(!document.querySelector('.city-estate-detail'), 'Background click does not ascend to Street'); + assert(location.href === originalURL && history.length === originalHistory, 'Map exploration changed URL/history'); + // The menu directory is also a map navigator, including locations whose + // assigned generated-road hit target is too small to pick visually. + click(document.querySelector('[data-city-menu-open]')); + click(menu.querySelector('[data-city-menu-tab="directory"]')); + click(menu.querySelector(`[data-city-jump="spot"][data-city-id="${alpha.uuid}"]`)); + await wait(() => document.querySelectorAll('.city-estate-detail .city-map-page-link').length === 24); + assert(!menu.open && location.href === originalURL, 'Directory jump did not return to the map'); + if (fixture === 'menu' || fixture === 'mobile-light') window.PagesWikiCityMenu.open('planning'); + document.body.dataset.vimReady = 'true'; + } catch (error) { + const box = document.createElement('div'); box.id = 'error'; box.textContent = error.stack || error.message; document.body.append(box); + } +}); diff --git a/internal/server/testdata/city-keyboard.js b/internal/server/testdata/city-keyboard.js new file mode 100644 index 0000000..afc578b --- /dev/null +++ b/internal/server/testdata/city-keyboard.js @@ -0,0 +1,58 @@ +window.addEventListener('load', async () => { + const assert = (condition, message) => { if (!condition) throw new Error(message); }; + const wait = async condition => { for (let i=0;i<200;i++) { if(condition())return;await new Promise(r=>setTimeout(r,25)); } throw new Error('Keyboard scene did not render'); }; + const key = (target, value, options={}) => { const event=new KeyboardEvent('keydown',{key:value,bubbles:true,cancelable:true,...options});target.dispatchEvent(event);return event; }; + const click = (target, options={}) => target.dispatchEvent(new MouseEvent('click',{bubbles:true,cancelable:true,...options})); + const center = element => { const r=element.getBoundingClientRect();return {x:r.left+r.width/2,y:r.top+r.height/2}; }; + try { + const url=location.href, historyLength=history.length; + const data=await(await fetch('/_/api/v1/city/map')).json(); + const quartier=data.quartiers.find(q=>q.name==='life'), street=quartier.streets.find(s=>s.name==='home'), spot=street.spots.find(s=>s.title==='alpha'); + await wait(()=>document.querySelectorAll('.city-quartier-tile').length===2); + const q=document.querySelector(`[data-city-uuid="${quartier.uuid}"]`); + q.focus();key(q,'Enter'); + await wait(()=>document.querySelector(`[data-city-type="Street"][data-city-uuid="${street.uuid}"]`)); + const s=document.querySelector(`[data-city-type="Street"][data-city-uuid="${street.uuid}"]`); + s.focus();key(s,'Enter'); + await wait(()=>document.querySelector(`[data-city-uuid="${spot.uuid}"] .city-spot-entry`)); + let entry=document.querySelector(`[data-city-uuid="${spot.uuid}"] .city-spot-entry`); + for(const [keys,axis,direction] of [[['ArrowLeft','a','h'],'x',-1],[['ArrowRight','d','l'],'x',1],[['ArrowUp','w','k'],'y',-1],[['ArrowDown','s','j'],'y',1]]){ + for(const name of keys){ + entry.focus();const origin=center(entry);const event=key(entry,name); + assert(event.defaultPrevented&&document.activeElement!==entry,`${name} did not move focus`); + assert((center(document.activeElement)[axis]-origin[axis])*direction>0,`${name} moved in the wrong direction`); + } + } + for(const options of [{ctrlKey:true},{metaKey:true},{altKey:true},{isComposing:true},{keyCode:229}]){ + entry.focus();const event=key(entry,'h',options);assert(!event.defaultPrevented&&document.activeElement===entry,'Map consumed a modifier/composition shortcut'); + } + entry.focus();key(entry,'Enter',{ctrlKey:true}); + assert(!document.querySelector('.city-estate-detail'),'Ctrl+Enter activated a Spot'); + for(const tag of ['input','textarea','div']){ + const input=document.createElement(tag);if(tag==='div')input.contentEditable='true';document.body.append(input);input.focus(); + const event=key(input,'w');assert(!event.defaultPrevented&&document.activeElement===input,`${tag} typing was hijacked`);input.remove(); + } + window.PagesWikiCityMenu.open('settings'); + const dialog=document.querySelector('[data-city-command-menu]'), before=document.activeElement; + const modalKey=key(document.body,'h');assert(!modalKey.defaultPrevented&&document.activeElement===before,'Modal key moved map focus'); + assert(dialog.open,'Keyboard closed the utility modal');window.PagesWikiCityMenu.close(); + click(entry,{ctrlKey:true});assert(entry.closest('.city-node').classList.contains('city-is-selected'),'Ctrl multi-selection stopped working');click(entry,{ctrlKey:true}); + // Intercept before the popup's top-window navigation listener. Verify the + // exact activated href without leaving the browser regression fixture. + let captured='';const capture=event=>{const link=event.target.closest?.('.city-map-page-link');if(link){captured=link.getAttribute('href');event.preventDefault();event.stopImmediatePropagation();}}; + window.addEventListener('click',capture,true); + const page=entry.closest('.city-node').querySelector('.city-map-page-link');page.focus();key(page,'Enter'); + assert(captured.startsWith('/life/home/alpha/'),'Keyboard Page activation lost the semantic URL');window.removeEventListener('click',capture,true); + entry.focus();key(entry,'Enter');await wait(()=>document.querySelector('.city-estate-detail .city-map-page-link')); + assert(location.href===url&&history.length===historyLength,'Spot drill-down added browser history'); + key(document.activeElement,'Backspace');await wait(()=>document.querySelector('.city-spot-entry')); + assert(document.activeElement.closest('[data-city-uuid]')?.dataset.cityUuid===spot.uuid,'Parent navigation did not restore Spot focus'); + key(document.activeElement,'Backspace');await wait(()=>document.querySelector('.city-street-tile')); + assert(document.activeElement.dataset.cityUuid===street.uuid,'Parent navigation did not restore Street focus'); + key(document.activeElement,'Backspace');await wait(()=>document.querySelector('.city-quartier-tile')); + assert(document.activeElement.dataset.cityUuid===quartier.uuid,'Parent navigation did not restore Quartier focus'); + assert(key(document.activeElement,'Backspace').defaultPrevented,'Root Backspace was allowed to navigate browser history'); + assert(location.href===url&&history.length===historyLength,'Map keyboard navigation changed browser history'); + document.body.dataset.vimReady='true'; + }catch(error){const box=document.createElement('div');box.id='error';box.textContent=error.stack||error.message;document.body.append(box);} +}); diff --git a/internal/server/testdata/city-labels.js b/internal/server/testdata/city-labels.js new file mode 100644 index 0000000..9906796 --- /dev/null +++ b/internal/server/testdata/city-labels.js @@ -0,0 +1,65 @@ +window.addEventListener('load', async () => { + const wait = async check => { + for (let i = 0; i < 150; i++) { + if (check()) return; + await new Promise(resolve => setTimeout(resolve, 30)); + } + throw new Error('City label fixture did not finish rendering'); + }; + const checkLabels = selector => { + const labels = [...document.querySelectorAll(selector)]; + if (!labels.length) throw new Error('Missing labels: ' + selector); + for (const label of labels) { + const style = getComputedStyle(label), matrix = label.getScreenCTM(); + if (style.display === 'none' || Number(style.opacity) < .99 || !label.textContent.trim()) + throw new Error('Label hidden without hover: ' + label.textContent); + if (label.querySelector('textPath') || !matrix || Math.abs(matrix.b) > .001 || Math.abs(matrix.c) > .001) + throw new Error('Rotated label: ' + label.textContent); + } + }; + const activate = element => element.dispatchEvent(new MouseEvent('click', {bubbles:true})); + const toggleLabels = checked => { + const input = document.querySelector('[data-city-labels]'); + input.checked = checked; + input.dispatchEvent(new Event('change', {bubbles:true})); + }; + try { + await wait(() => document.querySelector('.city-quartier-tile')); + checkLabels('.city-scene-title'); + activate(document.querySelector('.city-quartier-tile')); + await wait(() => document.querySelectorAll('.city-generated-street-label').length === 2); + if (document.querySelector('.city-node:hover')) throw new Error('Fixture must begin without hover'); + checkLabels('.city-generated-street-label'); + // Keyboard focus still highlights a road without hiding its neighbors. + const street = document.querySelector('.city-street-tile'); + const restingStroke = getComputedStyle(street.querySelector('.city-generated-street-hit')).stroke; + street.focus(); + await wait(() => getComputedStyle(street.querySelector('.city-generated-street-hit')).stroke !== restingStroke); + checkLabels('.city-generated-street-label'); + street.blur(); + toggleLabels(false); + if ([...document.querySelectorAll('.city-generated-street-label')].some(label => getComputedStyle(label).display !== 'none')) + throw new Error('Labels toggle does not hide Streets'); + toggleLabels(true); + checkLabels('.city-generated-street-label'); + activate(document.querySelector('.city-street-tile')); + await wait(() => document.querySelector('.city-undefined-page-label')); + checkLabels('.city-generated-street-label,.city-undefined-page-label'); + toggleLabels(false); + if (getComputedStyle(document.querySelector('.city-undefined-page-label')).display !== 'none') + throw new Error('Labels toggle does not hide undefined Pages'); + toggleLabels(true); + activate(document.querySelector('[data-city-level="quartier"]')); + await wait(() => document.querySelectorAll('.city-generated-street-label').length === 2); + activate(document.querySelectorAll('.city-street-tile')[1]); + await wait(() => document.querySelector('.city-spot-point-label')); + checkLabels('.city-generated-street-label,.city-spot-point-label'); + activate(document.querySelector('[data-city-level="quartier"]')); + await wait(() => document.querySelectorAll('.city-generated-street-label').length === 2); + checkLabels('.city-generated-street-label'); + document.body.dataset.vimReady = 'true'; + } catch (error) { + const box = document.createElement('div'); + box.id = 'error'; box.textContent = error.message; document.body.append(box); + } +}); diff --git a/internal/server/testdata/city-links.js b/internal/server/testdata/city-links.js new file mode 100644 index 0000000..654a414 --- /dev/null +++ b/internal/server/testdata/city-links.js @@ -0,0 +1,46 @@ +window.addEventListener('load', async () => { + const assert=(ok,message)=>{if(!ok)throw new Error(message);}; + const wait=async check=>{for(let i=0;i<180;i++){if(check())return;await new Promise(r=>setTimeout(r,25));}throw new Error('City link fixture timed out');}; + const click=element=>element.dispatchEvent(new MouseEvent('click',{bubbles:true,cancelable:true})); + try { + const start=location.href, historyLength=history.length; + const data=await(await fetch('/_/api/v1/city/map')).json(); + const q=data.quartiers.find(q=>q.name==='life'),s=q.streets.find(s=>s.name==='home'),p=s.spots.find(p=>p.name==='alpha'); + const params=new URLSearchParams(location.search),level=['spot','street','quartier'].find(k=>params.has(k)); + await wait(()=>document.querySelector('[data-city-locality-search]').elements.locality.value===(level||'domain')); + const form=document.querySelector('[data-city-locality-search]'); + if(level){ + const target={quartier:q,street:s,spot:p}[level]; + await wait(()=>document.querySelector('[data-city-inspector]').dataset.cityUuid===target.uuid); + assert(form.elements.locality_id.value==='uuid:'+target.uuid,'Initial locality must be an explicit UUID'); + assert(document.querySelector('.city-detail-link').getAttribute('href')===target.detail_href,'Deep link inspector opened wrong node'); + } + const jump=(type,id)=>click(document.querySelector(`[data-city-jump="${type}"][data-city-id="${id}"]`)); + jump('quartier',q.uuid); + await wait(()=>document.querySelector('.city-street-tile')); + const road=document.querySelector(`.city-street-tile[data-city-uuid="${s.uuid}"]`); + road.dispatchEvent(new MouseEvent('contextmenu',{bubbles:true,cancelable:true,clientX:100,clientY:100})); + assert(document.querySelector('.city-context-menu a').getAttribute('href')==='/v/city/s/life/home','Context menu lost parent qualifier'); + jump('street',s.uuid); + assert(document.querySelector('.city-detail-link').getAttribute('href')==='/v/city/s/life/home','Inspector lost parent qualifier'); + assert(form.elements.locality_id.value==='uuid:'+s.uuid,'Search selector is not an explicit UUID'); + const search=await fetch('/v/search?q=page&'+new URLSearchParams(new FormData(form))); + assert(search.ok,'Locality search failed'); + for(const quartier of data.quartiers){ + const street=quartier.streets[0]; + assert(street.detail_href===`/v/city/s/${quartier.name}/home`,'Repeated Street not parent qualified'); + const response=await fetch(street.detail_href),body=await response.text(); + assert(response.ok&&body.includes(street.uuid),'Detail resolved a different Street'); + } + assert((await fetch('/v/city/s/home')).status===404,'Ambiguous legacy name selected an arbitrary Street'); + jump('spot',p.uuid); + await wait(()=>document.querySelector('.city-estate-detail .city-map-page-link')); + for(const a of document.querySelectorAll('.city-map-page-link,[data-city-inspector] li a')){ + const href=new URL(a.getAttribute('href'),location.href); + assert(!href.hash&&!href.search,'Literal Page path interpreted as query/fragment'); + assert(decodeURIComponent(href.pathname)==='/life/home/alpha/page?#%','Page path bytes were lost'); + } + assert(location.href===start&&history.length===historyLength,'Map navigation changed browser history'); + document.body.dataset.vimReady='true'; + }catch(error){const box=document.createElement('div');box.id='error';box.textContent=error.stack||error.message;document.body.append(box);} +}); diff --git a/internal/server/testdata/city-organizer.js b/internal/server/testdata/city-organizer.js new file mode 100644 index 0000000..a5ee144 --- /dev/null +++ b/internal/server/testdata/city-organizer.js @@ -0,0 +1,42 @@ +window.addEventListener('load',async()=>{ + const wait=async check=>{for(let i=0;i<200;i++){if(check())return;const error=document.querySelector('[data-city-organize-error]')?.textContent;if(error&&!error.includes('保存中'))throw new Error(error);await new Promise(r=>setTimeout(r,25));}throw new Error('City organizer timed out');}; + const click=(el,ctrl=false)=>{if(!el)throw new Error('Missing click target');el.dispatchEvent(new MouseEvent('click',{bubbles:true,ctrlKey:ctrl,cancelable:true}));}; + const map=async()=>await(await fetch('/_/api/v1/city/map')).json(); + const spot=(data,title)=>data.quartiers.flatMap(q=>q.streets.flatMap(s=>s.spots)).find(p=>p.title===title); + const enterStreet=async id=>{click(document.querySelector(`[data-city-type="Street"][data-city-uuid="${id}"]`));await wait(()=>document.querySelector('.city-spot-tile'));}; + const submit=()=>document.querySelector('.city-organize-dialog form').requestSubmit(); + try{ + let data=await map();const home=data.quartiers[0].streets.find(s=>s.name==='home'),work=data.quartiers[0].streets.find(s=>s.name==='work'); + await wait(()=>document.querySelector('.city-quartier-tile'));click(document.querySelector('.city-quartier-tile')); + await wait(()=>document.querySelectorAll('.city-generated-street-label').length===2);await enterStreet(home.uuid); + await wait(()=>document.querySelectorAll('.city-undefined-page-link').length===2); + const url=location.href,points=[...document.querySelectorAll('.city-undefined-page-link')]; + click(points[0],true);click(points[1],true); + if(document.querySelectorAll('.city-undefined-page-link.city-is-selected').length!==2||location.href!==url)throw new Error('Ctrl selection navigated or failed'); + click(points[0],true);if(document.querySelectorAll('.city-undefined-page-link.city-is-selected').length!==1)throw new Error('Ctrl toggle failed');click(points[0],true); + click(document.querySelector('.city-selection-bar [data-city-create-selection]')); + const form=document.querySelector('.city-organize-dialog form');form.elements.title.value='まとめたSpot';form.elements.name.value='bundle';form.elements.name.dispatchEvent(new Event('input'));submit(); + await wait(()=>!document.querySelector('.city-organize-dialog')); + data=await map();const bundle=spot(data,'まとめたSpot');if(!bundle||bundle.pages.length!==2||!bundle.pages.every(p=>p.path.startsWith('/life/home/')))throw new Error('Grouping changed URLs or lost Pages'); + await wait(()=>document.querySelector(`[data-city-uuid="${bundle.uuid}"]`)); + // Right-click title edit, preserving identifier and Page URLs. + document.querySelector(`[data-city-uuid="${bundle.uuid}"]`).dispatchEvent(new MouseEvent('contextmenu',{bubbles:true,cancelable:true})); + click(document.querySelector('.city-context-menu [data-city-rename]')); + document.querySelector('.city-organize-dialog input[name="title"]').value='新しい表示名';submit();await wait(()=>!document.querySelector('.city-organize-dialog')); + data=await map();if(spot(data,'新しい表示名')?.uuid!==bundle.uuid||spot(data,'新しい表示名')?.name!=='bundle')throw new Error('Rename changed identity'); + // Whole-Spot merge, using the floating toolbar rather than portal clicks. + for(const title of ['alpha','beta']){const p=spot(data,title);await wait(()=>document.querySelector(`[data-city-uuid="${p.uuid}"]`));click(document.querySelector(`[data-city-uuid="${p.uuid}"]`),true);} + click(document.querySelector('.city-selection-bar [data-city-merge]')); + document.querySelector('.city-organize-dialog select[name="target"]').value=bundle.uuid;submit();await wait(()=>!document.querySelector('.city-organize-dialog')); + data=await map();if(spot(data,'新しい表示名').pages.length!==4||spot(data,'alpha')||spot(data,'beta'))throw new Error('Whole Spot merge failed'); + await wait(()=>document.querySelector(`[data-city-uuid="${bundle.uuid}"]`));click(document.querySelector(`[data-city-uuid="${bundle.uuid}"]`),true); + click(document.querySelector('.city-selection-bar [data-city-move-selection]')); + const move=document.querySelector('.city-organize-dialog form');move.elements.street.value=work.uuid;move.elements.street.dispatchEvent(new Event('change'));submit();await wait(()=>!document.querySelector('.city-organize-dialog')); + data=await map();const moved=data.quartiers[0].streets.find(s=>s.uuid===work.uuid).spots.find(p=>p.uuid===bundle.uuid); + if(!moved||moved.path_prefix!=='/life/work/bundle'||moved.pages.length!==4||!moved.pages.every(p=>p.path.startsWith('/life/home/')))throw new Error('Move lost identity or moved URLs'); + const paths=await(await fetch('/_/api/v1/city/autoplan')).json(); + if(paths.items.some(p=>p.path.startsWith('/life/home/')))throw new Error('Autoplan will undo manual organization'); + click(document.querySelector('[data-city-level="quartier"]'));await wait(()=>document.querySelectorAll('.city-generated-street-label').length===2);await enterStreet(work.uuid); + document.body.dataset.vimReady='true'; + }catch(error){const el=document.createElement('div');el.id='error';el.textContent=error.stack||error.message;document.body.append(el);} +}); diff --git a/internal/server/testdata/city-worker.js b/internal/server/testdata/city-worker.js new file mode 100644 index 0000000..a352de4 --- /dev/null +++ b/internal/server/testdata/city-worker.js @@ -0,0 +1,63 @@ +window.addEventListener('load', async () => { + const assert=(condition,message)=>{if(!condition)throw new Error(message);}; + const wait=async condition=>{for(let i=0;i<240;i++){if(condition())return;await new Promise(r=>setTimeout(r,25));}throw new Error('City worker fixture timed out');}; + const rejectName=async(promise,name)=>{let rejected=false;try{await promise;}catch(error){rejected=true;if(name)assert(error.name===name,`Expected ${name}, got ${error.name}`);}assert(rejected,'Operation unexpectedly resolved');}; + const fabric={generator:'test',version:'test',width:180,height:100,roads:[[10,10,20,20]],buildings:[[[1,1],[1,2],[2,2]]]}; + const WorkerClient=window.PagesWikiCityFabricClient; + class FakeWorker { + constructor(){this.terminated=false;this.message=null;} + postMessage(message){this.message=message;} + terminate(){this.terminated=true;} + result(value=fabric){this.onmessage({data:{id:this.message.id,fabric:value}});} + } + class MemoryStorage { + constructor(){this.values=new Map();} + get length(){return this.values.size;} + key(index){return [...this.values.keys()][index];} + getItem(key){return this.values.get(key)||null;} + setItem(key,value){this.values.set(key,String(value));} + removeItem(key){this.values.delete(key);} + } + try{ + await wait(()=>document.querySelector('.city-quartier-tile')); + assert(window.PagesWikiGenCity instanceof WorkerClient,'Main thread loaded the synchronous generator'); + assert(!document.querySelector('script[src*="gen-city.bundle"]'),'Generator bundle executes in the page'); + const real=new WorkerClient({storage:null}); + const first=await real.generateFabric('deterministic-domain',240,160); + assert(first.generator==='gen-city'&&first.roads.length>0&&first.buildings.length>0,'Real Worker generated no city'); + const second=await new WorkerClient({storage:null}).generateFabric('deterministic-domain',240,160); + assert(JSON.stringify(first)===JSON.stringify(second),'Domain seed is nondeterministic'); + // Force expensive synchronous work inside an actual Worker and ensure that + // main-thread timers continue to run throughout it. + const blob=URL.createObjectURL(new Blob([`onmessage=e=>{const until=performance.now()+180;while(performance.now()ticks++,10); + try{await new WorkerClient({storage:null,workerFactory:()=>new Worker(blob)}).generateFabric('busy');}finally{clearInterval(timer);URL.revokeObjectURL(blob);} + assert(ticks>=5,'Worker computation starved main-thread timers'); + const workers=[], storage=new MemoryStorage(); + const client=new WorkerClient({storage,workerFactory:()=>{const w=new FakeWorker();workers.push(w);return w;}}); + const a=client.generateFabric('a');const aRejected=rejectName(a,'AbortError'); + const b=client.generateFabric('b');await aRejected; + assert(workers[0].terminated,'Superseded Worker stayed alive'); + workers[0].result();assert(client.pending?.key.includes('"b"'),'Stale Worker replaced the active job'); + workers[1].result();await b;assert(workers[1].terminated&&!client.pending,'Completed Worker was not released'); + const count=workers.length;await client.generateFabric('b');assert(workers.length===count,'Memory cache regenerated a stable Domain'); + const warm=new WorkerClient({storage,workerFactory:()=>{throw new Error('Cache miss');}}); + await warm.generateFabric('b'); + const abort=new AbortController(), pending=client.generateFabric('cancel',180,100,{signal:abort.signal}); + const cancelled=rejectName(pending,'AbortError');abort.abort();await cancelled;assert(workers.at(-1).terminated,'Abort did not terminate Worker'); + const timed=new FakeWorker();await rejectName(new WorkerClient({storage:null,timeout:30,workerFactory:()=>timed}).generateFabric('timeout')); + assert(timed.terminated,'Timed-out Worker stayed alive'); + await rejectName(new WorkerClient({storage:null,workerFactory:()=>{throw new Error('Blocked');}}).generateFabric('unsupported')); + const invalid=client.generateFabric('invalid');const invalidRejected=rejectName(invalid);workers.at(-1).result({...fabric,roads:[[Infinity,0,0,0]]});await invalidRejected; + await rejectName(client.generateFabric('too-large',100000,100),'RangeError'); + for(const name of ['c','d','e','f']){const task=client.generateFabric(name);workers.at(-1).result();await task;} + assert(client.memory.size<=3&&storage.length<=3,'Geometry cache grew without a bound'); + const global=window.PagesWikiGenCity, factory=global.workerFactory, lifecycle=new FakeWorker();global.workerFactory=()=>lifecycle; + const task=global.generateFabric('lifecycle-cancelled'), stopped=rejectName(task,'AbortError'); + window.dispatchEvent(new PageTransitionEvent('pagehide',{persisted:true}));await stopped; + assert(lifecycle.terminated&&!global.pending,'Page suspension retained CPU work'); + global.workerFactory=factory;const previous=document.querySelector('.city-quartier-tile');window.dispatchEvent(new PageTransitionEvent('pageshow',{persisted:true})); + await wait(()=>document.querySelector('.city-quartier-tile')&&document.querySelector('.city-quartier-tile')!==previous); + document.body.dataset.vimReady='true'; + }catch(error){const box=document.createElement('div');box.id='error';box.textContent=error.stack||error.message;document.body.append(box);} +}); diff --git a/internal/server/testdata/config-density.js b/internal/server/testdata/config-density.js new file mode 100644 index 0000000..9671702 --- /dev/null +++ b/internal/server/testdata/config-density.js @@ -0,0 +1,26 @@ +window.addEventListener('load', async () => { + const wait=async check=>{for(let i=0;i<150;i++){if(check())return;await new Promise(resolve=>setTimeout(resolve,30));}throw new Error('Table did not load');}; + try { + for(const name of ['campuses','domains','nav-home','nav-system','auth','auth-sessions','events','assets','adapters','extensions']){ + showConfigPanel(name); + const panel=document.getElementById('panel-'+name); + await wait(()=>!panel.querySelector('.recent-table tbody')?.textContent.includes(configMessages.loading)); + for(const table of panel.querySelectorAll('.recent-table')){ + if(!table.closest('.table-scroll'))throw new Error(name+': missing scroll container'); + for(const row of table.querySelectorAll('tbody tr')){ + if(row.getBoundingClientRect().height>42)throw new Error(name+': tall row '+row.getBoundingClientRect().height+' '+row.textContent.slice(0,60)); + for(const cell of row.cells)if(getComputedStyle(cell).whiteSpace!=='nowrap')throw new Error(name+': wrapping cell'); + for(const form of row.querySelectorAll('form'))if(parseFloat(getComputedStyle(form).marginBottom)!==0)throw new Error(name+': form adds row margin'); + } + } + if(['campuses','domains'].includes(name))for(const input of panel.querySelectorAll('input[form]'))if(!input.form)throw new Error('Detached form association'); + } + showConfigPanel('assets'); + await wait(()=>document.querySelector('#asset-list .cell-clip[title$=".txt"]')); + const asset=document.querySelector('#asset-list .cell-clip[title$=".txt"]'); + if(!asset || asset.scrollWidth<=asset.clientWidth || asset.title!==asset.textContent)throw new Error('Long asset name not available through tooltip'); + if(!document.querySelector('#event-definitions .cell-clip[title]')?.title.includes('"'))throw new Error('Quoted title lost'); + showConfigPanel(new URLSearchParams(location.search).get('capture') || 'auth'); + document.body.dataset.vimReady='true'; + }catch(error){const box=document.createElement('div');box.id='error';box.textContent=error.message;document.body.append(box);} +}); diff --git a/internal/server/testdata/domain-entry-dialog.js b/internal/server/testdata/domain-entry-dialog.js new file mode 100644 index 0000000..c4c9924 --- /dev/null +++ b/internal/server/testdata/domain-entry-dialog.js @@ -0,0 +1,29 @@ +addEventListener('load',()=>{ + try { + const button=document.querySelector('[data-domain-entry-open]');button.click(); + const dialog=document.getElementById(button.dataset.domainEntryOpen); + if(!dialog.open||dialog.closest('table,.config-panel'))throw new Error('dialog not isolated'); + const bounds=dialog.getBoundingClientRect(); + if(bounds.width<200||bounds.left<0||bounds.right>innerWidth+1||bounds.top<0||bounds.bottom>innerHeight+1)throw new Error('dialog viewport bounds'); + if(dialog.scrollWidth>dialog.clientWidth+1)throw new Error('horizontal overflow'); + for(const form of dialog.querySelectorAll('form')){ + if(getComputedStyle(form).display!=='block')throw new Error('table form CSS leaked'); + } + for(const p of dialog.querySelectorAll('p'))if(getComputedStyle(p).display!=='block')throw new Error('inline help text'); + const controls=[...dialog.querySelectorAll('input:not([type=hidden]),select')]; + for(let i=0;ibounds.right+1)throw new Error('control overflow'); + for(let j=i+1;jMath.max(r.left,b.left)+1&&Math.min(r.bottom,b.bottom)>Math.max(r.top,b.top)+1)throw new Error('overlapping inputs'); + } + } + dialog.scrollTop=dialog.scrollHeight; + const close=dialog.querySelector('[data-domain-entry-close]'),c=close.getBoundingClientRect(); + if(c.topbounds.bottom)throw new Error('close button not sticky'); + close.click();if(dialog.open)throw new Error('close failed'); + button.click();dialog.scrollTop=0; + document.body.dataset.vimReady='true'; + }catch(error){const p=document.createElement('p');p.id='error';p.textContent=error.message;document.body.append(p);} +}); diff --git a/internal/server/testdata/html-projection.js b/internal/server/testdata/html-projection.js new file mode 100644 index 0000000..3a53b15 --- /dev/null +++ b/internal/server/testdata/html-projection.js @@ -0,0 +1,42 @@ +(async()=>{ + const assert=(ok,message)=>{if(!ok)throw new Error(message)}; + const wait=async check=>{for(let i=0;i<150;i++){if(check())return;await new Promise(r=>setTimeout(r,25))}throw new Error('Projection did not initialize')}; + try{ + const state=await(await fetch('/fixture-state')).json(); + for(const route of state.routes){ + const frame=document.createElement('iframe');frame.width=1000;frame.height=600;document.body.append(frame); + await new Promise((resolve,reject)=>{frame.onload=resolve;frame.onerror=reject;frame.src=route}); + const w=frame.contentWindow,d=frame.contentDocument; + assert(d.body&&!d.body.textContent.startsWith('forbidden'),route+' denied fixture'); + if(route.startsWith('/e/')){ + await wait(()=>d.querySelector('#preview h1')); + assert(w.PagesWikiCodeMirror,'CodeMirror failed under CSP'); + assert(d.querySelector('#preview strong')?.textContent==='Formatting','Editor formatting missing'); + if(route.includes('edittype=html')){ + assert(d.querySelector('#editor').value===state.body,'HTML authoring source changed'); + assert(await w.PagesEditor.getCanonicalHTML()===state.body,'Saving would write sanitized content'); + } + const button=d.querySelector('[data-editor-action=preview]'); + button.click();assert(d.querySelector('#preview').hidden,'Preview toggle stopped working under CSP'); + button.click();assert(!d.querySelector('#preview').hidden,'Preview toggle did not restore'); + let saves=0;w.PagesEditor.saveNow=()=>saves++;d.querySelector('[data-editor-action=save]').click();assert(saves===1,'Save button blocked by CSP'); + const expected=d.querySelector('#preview').innerHTML; + // Force an API failure. The only fallback is text, never innerHTML. + const originalFetch=w.fetch;w.fetch=async()=>{throw new Error('fixture unavailable')}; + await w.PagesEditor.renderPreview();assert(!d.querySelector('#preview script,#preview iframe'),'Unsafe failure fallback');w.fetch=originalFetch; + await w.PagesEditor.renderPreview();assert(d.querySelector('#preview h1'),'Preview did not recover'); + assert(expected.includes('Formatting'),'No safe result before failure'); + } + await new Promise(r=>setTimeout(r,80)); + assert(!d.documentElement.dataset.attack,route+' executed authored code'); + assert(!d.querySelector('.page-html script,.page-html iframe,.page-html form,#preview script,#preview iframe'),route+' kept active author nodes'); + const source=d.querySelector('.page-html,#preview,.preview-content');assert(source?.textContent.includes('Readable heading'),route+' lost safe content'); + assert(!d.querySelector('[data-children-src="/sentinel"]'),route+' accepted forged UI hooks'); + for(const a of source.querySelectorAll('a')){if(a.textContent==='bad URL')a.click()} + assert(!d.documentElement.dataset.cspAttack,route+' CSP did not block parser-inserted probes'); + frame.remove(); + } + assert((await(await fetch('/fixture-state')).json()).hits===0,'Reader-authorized side effect'); + document.body.dataset.vimReady='true'; + }catch(error){const box=document.createElement('div');box.id='error';box.textContent=error.stack||error.message;document.body.append(box)} +})(); diff --git a/internal/server/testdata/monitor-interactions.js b/internal/server/testdata/monitor-interactions.js new file mode 100644 index 0000000..d783cf0 --- /dev/null +++ b/internal/server/testdata/monitor-interactions.js @@ -0,0 +1,75 @@ +window.addEventListener('load', async () => { + const wait = async check => { for(let i=0;i<200;i++){if(check())return;await new Promise(resolve=>setTimeout(resolve,30));}throw new Error('Timed out waiting for monitor UI'); }; + try { + await wait(() => document.querySelector('#scheduler-jobs [data-job-row]')); + if (document.querySelectorAll('#scheduler-jobs [data-job-row]').length !== 1 || !document.querySelector('#scheduler-jobs [data-job-row="monitor-000"]')) throw new Error('Non-running jobs in monitor'); + const dialog = document.getElementById('monitor-settings-dialog'); + const open = document.getElementById('monitor-settings-open'); + const restored = new URLSearchParams(location.search).has('monitor_dialog'); + const period = document.getElementById('resource-history-hours'); + if(period.value !== (restored ? '24' : '1'))throw new Error('History period default/restore failed'); + if(document.getElementById('resource-stat-interval').value !== '1' || document.getElementById('resource-graph-interval').value !== '5')throw new Error('Unexpected polling defaults'); + if(restored && document.getElementById('resource-live').checked)throw new Error('Auto refresh status not restored'); + if(document.querySelector('[data-chart-range], #resource-sample-window, .monitor-header [data-config-panel="logs"]'))throw new Error('Old chart labels or history link remain'); + if(!document.querySelector('#monitor-refresh svg') || !document.querySelector('.monitor-header #resource-time-range'))throw new Error('Missing reload icon or shared time range'); + if (!restored) { + const fetchBefore=window.fetch;let updates=0; + window.fetch=(...args)=>{if(String(args[0])==='/_/api/v1/queue/resources')updates++;return fetchBefore(...args);}; + const range=document.getElementById('resource-time-range').textContent; + await wait(()=>updates>=2); + await wait(()=>document.getElementById('resource-time-range').textContent!==range); + if(!document.querySelector('[data-resource-chart="io"] .io-read') || !document.querySelector('[data-resource-chart="io"] .io-write'))throw new Error('I/O series missing'); + for(const line of document.querySelectorAll('.resource-charts polyline'))if(line.getAttribute('points').split(' ').length>361)throw new Error('Unbounded chart points'); + } + if (dialog.open || dialog.getBoundingClientRect().height) throw new Error('Monitor settings initially visible'); + for (const id of ['resource-monitor-form','resource-history-hours','resource-live']) { + if (!dialog.contains(document.getElementById(id))) throw new Error('Settings outside dialog: ' + id); + } + open.click(); + if (!dialog.open || !dialog.matches(':modal')) throw new Error('Monitor settings did not open modally'); + period.value='24';period.dispatchEvent(new Event('change',{bubbles:true})); + const form = document.getElementById('resource-monitor-form'); + form.elements.interval.value = '120'; form.dispatchEvent(new Event('input',{bubbles:true})); + form.requestSubmit(); + await wait(() => document.getElementById('resource-monitor-result').textContent === '✓'); + const live=document.getElementById('resource-live');live.checked=false;live.dispatchEvent(new Event('change',{bubbles:true})); + document.getElementById('monitor-settings-close').click(); + await wait(() => !dialog.open && document.activeElement === open); + const panel = document.getElementById('panel-scheduler'); + const figures = [...panel.querySelectorAll('.resource-charts figure')]; + const checkRow = () => { + const rects=figures.map(figure=>figure.getBoundingClientRect()); + if(rects.length!==4 || rects.some(rect=>Math.abs(rect.top-rects[0].top)>1))throw new Error('Resource charts are not one row of four'); + }; + checkRow(); panel.style.width='360px'; checkRow(); + const scroll = panel.querySelector('.resource-chart-scroll'); + if(scroll.scrollWidth<=scroll.clientWidth)throw new Error('Narrow charts not horizontally scrollable'); + panel.style.removeProperty('width'); + open.click(); + showConfigPanel('logs'); + if(dialog.open)throw new Error('Settings dialog left open after navigation'); + await wait(() => document.querySelector('#job-history [data-job-row="monitor-064"]')); + if (document.querySelectorAll('#job-history [data-job-row]').length !== 50) throw new Error('Unbounded history'); + document.querySelector('[data-job-logs="monitor-064"]').click(); + await wait(() => document.querySelector('.job-log-detail pre')?.textContent.includes('entry-104 ')); + if (document.querySelector('.job-log-detail unsafe')) throw new Error('Unescaped log content'); + document.querySelector('[data-older-logs]').click(); + await wait(() => document.querySelector('.job-log-detail pre').textContent.includes('entry-000')); + if(document.querySelector('.job-log-detail pre').textContent.includes('entry-104'))throw new Error('Log page accumulated'); + document.getElementById('job-history-more').click(); + await wait(() => document.querySelectorAll('#job-history [data-job-row]').length === 13); + showConfigPanel('resources'); + await wait(() => activeConfigPanel === 'scheduler'); + const cancel = document.querySelector('#scheduler-jobs [data-queue-action="cancel"]');cancel.click(); + await wait(() => document.querySelector('#scheduler-jobs').textContent.includes(configMessages.cancelRequested)); + const realFetch = window.fetch; let requests=0; + window.fetch=(...args)=>{requests++;return realFetch(...args);}; + showConfigPanel('home'); + await new Promise(resolve=>setTimeout(resolve,5200)); + if(requests)throw new Error('Monitor polled after leaving panel'); + showConfigPanel('scheduler'); + await wait(() => document.querySelector('[data-resource-chart="cpu"] .chart-line')); + if(new URLSearchParams(location.search).has('monitor_dialog'))open.click(); + document.body.dataset.vimReady='true'; + } catch(error) {const box=document.createElement('div');box.id='error';box.textContent=error.message;document.body.append(box);} +}); diff --git a/internal/server/testdata/periodicals-browser.js b/internal/server/testdata/periodicals-browser.js new file mode 100644 index 0000000..4845d43 --- /dev/null +++ b/internal/server/testdata/periodicals-browser.js @@ -0,0 +1,85 @@ +window.addEventListener('load',async()=>{ + const wait=async(test,label)=>{for(let i=0;i<180;i++){if(test())return;await new Promise(r=>setTimeout(r,30));}throw new Error(label);}; + try{ + const entryButton=document.querySelector('[data-domain-entry-open]');entryButton.click(); + const entryDialog=document.getElementById(entryButton.dataset.domainEntryOpen); + if(!entryDialog.open)throw new Error('domain entry dialog'); + const entryLayout=entryDialog.querySelector('[name=entry_layout]');entryLayout.value='diary';entryLayout.dispatchEvent(new Event('change')); + if(!entryLayout.form.elements.diary_enabled.checked)throw new Error('entry enables selected plugin'); + entryDialog.querySelector('[data-domain-entry-close]').click(); + const panel=document.querySelector('[data-periodical-settings="diary"]'),settings=panel.querySelector('form'); + await wait(()=>!settings.querySelector('fieldset').disabled,'settings load'); + settings.elements.enabled.checked=true;settings.elements.prefix.value='/journal';settings.requestSubmit(); + await wait(()=>!settings.querySelector('fieldset').disabled&&settings.querySelector('[role=status]').textContent,'enable'); + const frame=document.createElement('iframe');frame.style.width='100%';frame.style.height='800px';document.body.append(frame); + await new Promise(resolve=>{frame.onload=resolve;frame.src='/v/diary?month=2026-09';}); + const doc=()=>frame.contentDocument; + await wait(()=>doc().querySelector('[data-periodical-add]'),'diary enabled'); + if(frame.contentWindow.location.pathname!=='/v/diary/2026/09'||frame.contentWindow.location.search)throw new Error('legacy month redirect'); + const filters=doc().querySelector('[data-periodical-filters]');filters.elements.own.checked=true;filters.requestSubmit(); + await wait(()=>doc().readyState==='complete'&&frame.contentWindow.location.search==='?own','own flag navigation'); + const dayLink=[...doc().querySelectorAll('.periodical-days a')].find(a=>a.getAttribute('href')==='/v/diary/2026/09/18?own'); + if(!dayLink)throw new Error('canonical day URL');dayLink.click(); + await wait(()=>doc().readyState==='complete'&&frame.contentWindow.location.pathname==='/v/diary/2026/09/18','day navigation'); + await new Promise(resolve=>{frame.onload=resolve;frame.src='/v/diary/2026/09';}); + doc().querySelector('[data-periodical-new]').click(); + const planner=doc().querySelector('[data-periodical-planner]'),plan=planner.querySelector('form'); + if(!planner.open)throw new Error('planner dialog'); + plan.elements.date.value='2026-09-17';plan.elements.keyword.value='walk';plan.requestSubmit(); + await wait(()=>!plan.querySelector('[data-planner-result]').hidden,'plan article URL'); + if(plan.querySelector('[data-planner-editor]').getAttribute('href')!=='/e/journal/2026/09/17/walk')throw new Error('planned editor URL'); + plan.querySelector('[data-planner-register]').click(); + if(doc().querySelector('[data-periodical-entry-form]').elements.path.value!=='/journal/2026/09/17/walk')throw new Error('registration path'); + doc().querySelector('[data-periodical-close]').click(); + async function submit(form){const old=doc();form.requestSubmit();await wait(()=>doc()!==old&&doc().readyState==='complete','entry save');} + doc().querySelector('[data-periodical-add]').click(); + let form=doc().querySelector('[data-periodical-entry-form]'); + if(!doc().querySelector('[data-periodical-dialog]').open)throw new Error('register dialog'); + form.elements.path.value='/journal/browser';form.elements.title.value='Calendar entry';form.elements.date.value='2026-09-16';form.elements.category.value='Work'; + await submit(form); + if(!doc().querySelector('.periodical-entries a[href="/journal/browser"]')||!doc().querySelector('.periodical-days .has-entries'))throw new Error('entry/calendar'); + doc().querySelector('[data-periodical-edit]').click();form=doc().querySelector('[data-periodical-entry-form]'); + if(!form.elements.path.readOnly||form.elements.version.value!=='1')throw new Error('metadata identity'); + form.elements.title.value='Edited diary entry';await submit(form); + if(!doc().querySelector('.periodical-entries h2').textContent.includes('Edited diary entry'))throw new Error('metadata edit'); + frame.contentWindow.confirm=()=>true;const old=doc();doc().querySelector('[data-periodical-remove]').click(); + await wait(()=>doc()!==old&&doc().readyState==='complete','unregister'); + if(doc().querySelector('[data-periodical-entry]'))throw new Error('unregister failed'); + doc().querySelector('[data-periodical-compose]').click(); + const compose=doc().querySelector('[data-periodical-composer]'),postForm=compose.querySelector('form'); + if(!compose.open)throw new Error('composer dialog'); + postForm.elements.title.value='Atomic diary';postForm.elements.date.value='2026-09-18';postForm.elements.keyword.value='posted';postForm.elements.body.value='# One step\n\nA **new** entry.'; + const beforePost=doc();postForm.requestSubmit(); + await wait(()=>doc().querySelector('[data-periodical-posted]'),'post sharing actions'); + if(!doc().querySelector('[data-share-x]')||!new URL(doc().querySelector('[data-share-x]').href).searchParams.get('url').endsWith('/journal/2026/09/18/posted'))throw new Error('post share URL'); + doc().querySelector('[data-post-continue]').click(); + await wait(()=>doc()!==beforePost&&doc().readyState==='complete'&&doc().querySelector('[data-periodical-entry]'),'atomic post'); + if(frame.contentWindow.location.pathname!=='/v/diary/2026/09/18'||!doc().querySelector('a[href="/journal/2026/09/18/posted"]'))throw new Error('posted article path'); + const response=await fetch('/_/api/v1/extension/content.blog/settings',{method:'POST',headers:{'Content-Type':'application/json'},body:'{"enabled":true}'});if(!response.ok)throw new Error('blog enable'); + const post=await fetch('/_/api/v1/extension/content.blog/entries',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({path:'/journal/browser',title:'A first blog article',date:'2026-09-16',category:'Work',version:0})});if(!post.ok)throw new Error('blog register'); + await new Promise(resolve=>{frame.onload=resolve;frame.src='/v/blog?category=Work&month=2026-09';}); + await wait(()=>doc().querySelector('[data-periodical-entry]'),'blog category'); + if(frame.contentWindow.location.pathname!=='/v/blog/2026/09'||frame.contentWindow.location.search!=='?category=Work')throw new Error('blog canonical URL'); + if(!doc().querySelector('.periodical-entries h2').textContent.includes('A first blog article'))throw new Error('blog article'); + const calendarPanel=doc().querySelector('.periodical-calendar-panel'); + if(!calendarPanel.querySelector('[data-periodical-filters]')||calendarPanel.querySelector('[data-periodical-filters]').getBoundingClientRect().bottom>calendarPanel.querySelector('.periodical-calendar').getBoundingClientRect().top+1)throw new Error('month selector above calendar'); + const compactRow=doc().querySelector('.periodical-index tbody tr'); + if(!compactRow||compactRow.getBoundingClientRect().height>55)throw new Error('compact date/title row'); + const monthControls=doc().querySelector('.periodical-month-controls'); + if(!monthControls||monthControls.getBoundingClientRect().height>36)throw new Error('single-line month controls'); + for(const control of monthControls.querySelectorAll('input,button,a'))if(!control.getAttribute('aria-label'))throw new Error('month control accessible label'); + if(doc().documentElement.scrollWidth>frame.clientWidth+5)throw new Error('responsive overflow'); + await new Promise(resolve=>{frame.onload=resolve;frame.src='/v/blog/-/new';}); + const newForm=doc().querySelector('.periodical-compose-page form'); + if(!newForm)throw new Error('standalone new article page'); + if(doc().documentElement.scrollWidth>frame.clientWidth+5)throw new Error('new article responsive overflow'); + newForm.elements.title.value='Standalone article';newForm.elements.date.value='2026-09-19';newForm.elements.keyword.value='new-page';newForm.elements.body.value='# Standalone\n\nNew page body.'; + const beforeNew=doc();newForm.requestSubmit(); + await wait(()=>doc().querySelector('[data-periodical-posted]'),'standalone sharing actions'); + if(!doc().querySelector('[data-share-x]')||!doc().querySelector('[data-periodical-posted]').textContent.includes('承認'))throw new Error('publication warning/share'); + doc().querySelector('[data-post-continue]').click(); + await wait(()=>doc()!==beforeNew&&doc().readyState==='complete'&&doc().querySelector('a[href="/blog/2026/09/19/new-page"]'),'standalone article submit'); + [...document.body.children].forEach(element=>{if(element!==frame)element.style.display='none';});document.body.style.margin='0';document.body.style.padding='0';frame.style.border='0';frame.style.height='100vh'; + document.body.dataset.vimReady='true'; + }catch(error){const box=document.createElement('div');box.id='error';box.textContent=error.message;document.body.append(box);} +}); diff --git a/internal/server/testdata/projection-metadata.js b/internal/server/testdata/projection-metadata.js new file mode 100644 index 0000000..b4df260 --- /dev/null +++ b/internal/server/testdata/projection-metadata.js @@ -0,0 +1,58 @@ +(() => { + let sawPending = false + const originalFetch = window.fetch + window.fetch = async (...args) => { + const response = await originalFetch(...args) + if (String(args[0]).includes("metadata=1") && response.status === 202) sawPending = true + return response + } + const wait = async predicate => { + for (let i = 0; i < 600; i++) { + if (predicate()) return + await new Promise(resolve => setTimeout(resolve, 25)) + } + throw Error("metadata UI timed out") + } + const assert = (condition, message) => { if (!condition) throw Error(message) } + window.addEventListener("load", async () => { + try { + const mode = new URLSearchParams(location.search).get("fixture") + if (mode === "failed") { + await wait(() => [...document.querySelectorAll("[data-projection-retry]")].some(button => !button.hidden)) + assert(document.querySelector("[data-projection-status]").textContent.trim(), "failed metadata became an empty final state") + } else if (mode === "pdf") { + const viewer = document.querySelector("[data-pdf-viewer]") + await wait(() => viewer.dataset.pages === "3") + const next = document.querySelector("[data-pdf-next]") + next.click(); next.click(); next.click() + assert(document.querySelector("[data-pdf-status]").textContent === "3 / 3", "PDF count did not update navigation bounds") + assert(viewer.querySelector("img").src.includes("page=3"), "PDF did not retain the requested page") + } else { + const viewer = document.querySelector("[data-archive-metadata]") + await wait(() => viewer.dataset.metadataStatus === "ready") + if (mode === "comic") { + const comic = viewer.querySelector("[data-comic-viewer]") + const pages = [...comic.querySelectorAll("[data-comic-page]")] + assert(pages.length === 3 && pages.filter(page => !page.hidden).length === 1, "pending comic images did not initialize safely") + const before = history.length + comic.querySelector("[data-comic-next]").click() + comic.querySelector("[data-comic-layout]").click() + assert(pages.filter(page => !page.hidden).length === 2, "async comic spread is broken") + assert(history.length === before, "comic navigation polluted browser history") + } else { + const rows = [...viewer.querySelectorAll("[data-archive-entries] tr")] + assert(rows.length === 3, "asynchronous archive table is incomplete") + assert(rows[2].textContent.includes(".png"), "archive filename was not shown as text") + assert(!rows[2].querySelector("img"), "archive filename was interpreted as markup") + assert(rows.every(row => new URL(row.querySelector("a").href).searchParams.has("rev")), "archive links lost immutable revision binding") + } + } + assert(sawPending, "browser did not exercise the asynchronous pending transition") + document.body.dataset.vimReady = "true" + } catch (error) { + const message = document.createElement("pre") + message.id = "error"; message.textContent = error.stack || String(error) + document.body.append(message) + } + }) +})() diff --git a/internal/server/testdata/public-periodical.js b/internal/server/testdata/public-periodical.js new file mode 100644 index 0000000..5f6b10c --- /dev/null +++ b/internal/server/testdata/public-periodical.js @@ -0,0 +1,23 @@ +(async () => { + try { + await new Promise(resolve => setTimeout(resolve, 100)); + const check = (ok, message) => { if (!ok) throw new Error(message); }; + check(document.querySelector('.periodical-site-title').textContent === 'Public Blog', 'Domain branding'); + check(document.querySelector('.periodical-full-article h1').textContent === 'Public registered title & notes', 'Registered title'); + check(document.querySelector('.periodical-body').textContent.includes('Article body'), 'Body rendering'); + check(document.querySelector('a[rel=next]').getAttribute('href') === '/2026/09/18/keyword', 'Next article'); + check(document.querySelector('a[rel=prev]').getAttribute('href') === '/2026/09/16', 'Previous article'); + check(document.querySelector('.periodical-calendar').getBoundingClientRect().width > 100, 'Calendar visibility'); + const monthControls = document.querySelector('.periodical-month-controls'); + check(monthControls && monthControls.getBoundingClientRect().height <= 36, 'Single-line month controls'); + check(monthControls.getBoundingClientRect().bottom <= document.querySelector('.periodical-calendar').getBoundingClientRect().top, 'Month controls above calendar'); + check(document.documentElement.scrollWidth <= innerWidth + 2, 'Horizontal overflow'); + check(!document.querySelector('.periodical-body script'), 'Inert content'); + const feed = await fetch('/rss.xml', {cache: 'no-store'}); + const xml = new DOMParser().parseFromString(await feed.text(), 'application/xml'); + check(feed.ok && !xml.querySelector('parsererror') && xml.querySelectorAll('item').length === 3, 'RSS'); + document.body.dataset.vimReady = 'true'; + } catch (error) { + const element = document.createElement('pre'); element.id = 'error'; element.textContent = error.stack; document.body.append(element); + } +})(); diff --git a/internal/server/testdata/search-results.js b/internal/server/testdata/search-results.js new file mode 100644 index 0000000..a657b1a --- /dev/null +++ b/internal/server/testdata/search-results.js @@ -0,0 +1,67 @@ +window.addEventListener('load', async () => { + try { + const assert = (condition, message) => { if (!condition) throw new Error(message); }; + const results = document.querySelector('[data-search-view]'); + assert(results, 'Search results missing'); + const form = document.querySelector('#search-form'); + assert(form, 'Shared search form missing'); + const initial = new FormData(form); + assert(initial.get('q')?.includes('nebula'), 'Search query not preserved'); + for (const name of ['q', 'scope', 'file_type', 'ext', 'date_field', 'from', 'to']) { + assert(initial.getAll(name).length === 1, 'Search parameter missing or duplicated: ' + name); + } + const options = document.querySelector('.search-options'); + assert(options?.querySelector('summary'), 'Accessible search options disclosure missing'); + const saved = {}; + for (const [name, value] of Object.entries({file_type:'pdf', ext:'pdf', date_field:'created', from:'2026-01-01', to:'2026-01-31'})) { + const control = form.elements.namedItem(name); + assert(control?.form === form, 'Filter does not belong to the search form: ' + name); + saved[name] = control.value; + control.value = value; + } + const filtered = new FormData(form); + assert(filtered.get('file_type') === 'pdf' && filtered.get('ext') === 'pdf', 'File filter was not submitted'); + assert(filtered.get('date_field') === 'created' && filtered.get('from') === '2026-01-01' && filtered.get('to') === '2026-01-31', 'Date filter was not submitted'); + assert(filtered.get('q') === initial.get('q') && filtered.get('scope') === initial.get('scope'), 'Filters lost the query or folder scope'); + for (const [name, value] of Object.entries(saved)) form.elements.namedItem(name).value = value; + const city = document.querySelector('[data-city-search-results]'); + if (city) { + assert(city.compareDocumentPosition(results) & Node.DOCUMENT_POSITION_FOLLOWING, 'City results must precede pages'); + assert(!city.querySelector('.children-entry,[data-child-path]'), 'City result is exposed to file operations'); + assert(city.querySelector('[data-city-search-kind] .search-result-name mark'), 'City name highlight missing'); + assert(city.querySelector('.search-result-path')?.getAttribute('href')?.startsWith('/'), 'City boundary Path link missing'); + assert(city.querySelector('.search-result-name')?.getAttribute('href')?.startsWith('/v/city/'), 'City details link missing'); + assert(!city.querySelector('script,[onload],[onerror]'), 'City source HTML became executable markup'); + } + for (const mode of ['list', 'detail', 'icon']) { + const button = document.querySelector(`[data-children-view="${mode}"]`); + button.click(); + assert(results.dataset.searchView === mode, 'View switch failed: ' + mode); + const panel = results.querySelector('.search-view-' + mode); + assert(getComputedStyle(panel).display !== 'none', 'Selected mode is hidden: ' + mode); + assert(panel.querySelector('.search-result-name')?.textContent.includes('nebula'), 'Page name missing'); + assert(panel.querySelector('.search-result-path')?.textContent.includes('/docs/nebula guide?#%'), 'Full Path missing'); + assert(panel.querySelector('.search-result-excerpt mark')?.textContent === 'NEBULA', 'Context highlight missing'); + assert(panel.querySelector('[data-match-source="body"]'), 'Match source missing'); + assert(panel.querySelector('.search-result-name').closest('a').getAttribute('href').includes('%3F%23%25'), 'Path URL was not encoded'); + if (city) assert(getComputedStyle(city).display !== 'none', 'View switching hid City results: ' + mode); + } + assert(!results.querySelector('script,[onload],[onerror]'), 'Source HTML became executable markup'); + assert(!results.textContent.includes('SECRET_EXCERPT'), 'Unreadable snippet leaked'); + document.querySelector('[data-children-view="list"]').click(); + const row = results.querySelector('.search-view-list .children-entry'); + row.dispatchEvent(new MouseEvent('click', {bubbles:true, cancelable:true, ctrlKey:true})); + assert(row.classList.contains('children-selected'), 'Ctrl selection stopped working'); + if (city) { + const cityRow = city.querySelector('[data-city-search-kind]'); + cityRow.dispatchEvent(new MouseEvent('click', {bubbles:true, cancelable:true, ctrlKey:true})); + assert(!cityRow.classList.contains('children-selected'), 'City result became a selectable file'); + } + options.open = true; + assert(document.documentElement.scrollWidth <= innerWidth, 'Search introduces horizontal page scrolling'); + document.body.dataset.vimReady = '1'; + console.log('Vim initialized'); + } catch (error) { + const box = document.createElement('div'); box.id = 'error'; box.textContent = error.stack || error.message; document.body.append(box); + } +}); diff --git a/internal/server/testdata/settings-interactions.js b/internal/server/testdata/settings-interactions.js new file mode 100644 index 0000000..5c48281 --- /dev/null +++ b/internal/server/testdata/settings-interactions.js @@ -0,0 +1,91 @@ +window.addEventListener('load', async () => { + const pause = () => new Promise(resolve=>setTimeout(resolve,30)); + const set = (input,value) => {input.value=value;input.dispatchEvent(new Event('input',{bubbles:true}));}; + try { + if (location.pathname === '/') { + const account=document.querySelector('.home-account'); + if(account&&getComputedStyle(account).position!=='absolute')throw new Error('Home navigation lost its anchored position'); + const wikiTitle=document.querySelector('.home-wiki-title'),titleRect=wikiTitle?.getBoundingClientRect(); + if(!wikiTitle||document.querySelector('.home-search h1')||parseFloat(getComputedStyle(wikiTitle).fontSize)>17||titleRect.left>48)throw new Error('Home title was not moved to the upper-left navigation'); + const shortcuts={browser:'/v/browser',tree:'/v/tree',city:'/v/city',calendar:'/v/plan',blog:'/v/blog',diary:'/v/diary'}; + for(const [name,href] of Object.entries(shortcuts)){ + const link=document.querySelector(`[data-home-shortcut="${name}"]`); + if(!link||link.getAttribute('href')!==href||!link.querySelector('svg')||link.textContent.trim()||!link.getAttribute('aria-label')||link.hasAttribute('target'))throw new Error('Home direct icon shortcut failed: '+name); + } + const shortcutStyle=getComputedStyle(document.querySelector('.home-shortcuts')); + if(shortcutStyle.backdropFilter!=='none'||parseFloat(shortcutStyle.borderTopWidth)!==0||shortcutStyle.backgroundColor!=='rgba(0, 0, 0, 0)')throw new Error('Home shortcut icons retained a glass enclosure'); + const pager=document.querySelector('[data-home-pager]'); + if(!pager||pager.dataset.homePage!=='search')throw new Error('Home search page was not the initial page'); + const searchInput=document.getElementById('home-search-input'); + set(searchInput,'Browser Guide'); + for(let i=0;i<100&&!document.querySelector('.home-search-suggestion[href="/docs/browser-guide"]');i++)await pause(); + const directSuggestion=document.querySelector('.home-search-suggestion[href="/docs/browser-guide"]'); + if(!directSuggestion||directSuggestion.querySelector('strong')?.textContent!=='Browser Guide'||searchInput.getAttribute('aria-expanded')!=='true')throw new Error('Top-page direct search suggestion missing'); + const suggestionPanel=document.getElementById('home-search-suggestions'),suggestionRect=suggestionPanel.getBoundingClientRect(); + if(!getComputedStyle(suggestionPanel).backdropFilter.includes('blur')||suggestionRect.bottom>innerHeight+1||suggestionRect.right>innerWidth+1)throw new Error('Top-page suggestion panel style or viewport fit failed'); + set(searchInput,''); + const appearanceOpen=document.querySelector('[data-home-appearance-open]'),appearanceDialog=document.querySelector('[data-home-appearance-dialog]'); + appearanceOpen.click(); + if(!appearanceDialog.open||!getComputedStyle(appearanceDialog).backdropFilter.includes('blur'))throw new Error('Home appearance dialog did not open'); + const glassInput=appearanceDialog.querySelector('[name=home_glass_transparency]');set(glassInput,'57'); + if(getComputedStyle(document.body).getPropertyValue('--home-glass-opacity').trim()!=='43%')throw new Error('Home glass live preview failed'); + appearanceDialog.querySelector('form').requestSubmit(); + for(let i=0;i<100&&appearanceDialog.open;i++)await pause(); + if(appearanceDialog.open||getComputedStyle(document.body).getPropertyValue('--home-glass-opacity').trim()!=='43%')throw new Error('Home glass setting was not saved'); + pager.dispatchEvent(new WheelEvent('wheel',{deltaY:80,bubbles:true,cancelable:true})); + for(let i=0;i<20&&pager.dataset.homePage!=='bookmarks';i++)await pause(); + if(pager.dataset.homePage!=='bookmarks'||document.querySelector('[data-home-pager-page="bookmarks"]').inert)throw new Error('Home bookmark page transition failed'); + const dialog=document.querySelector('[data-bookmark-dialog]'); + if(dialog.open)throw new Error('Bookmark dialog initially open'); + document.querySelector('[data-bookmark-open]').click(); + if(!dialog.open)throw new Error('Settings button failed'); + if(!getComputedStyle(dialog).backdropFilter.includes('blur'))throw new Error('Top-page modal glass style missing'); + if(!sessionStorage.getItem('bookmarkSaved')) { + document.querySelector('.bookmark-editor-toolbar button').click(); + let card=document.querySelector('.bookmark-editor-card'); + set(card.querySelector('.bookmark-card-head input'),'Guides'); + card.lastElementChild.click(); + let fields=card.querySelectorAll('.bookmark-link-row input'); + // Rendering replaces the card after adding a link. + card=document.querySelector('.bookmark-editor-card');fields=card.querySelectorAll('.bookmark-link-row input'); + set(fields[0],'Reference');set(fields[1],'/docs/child'); + const toggle=card.querySelector('[type=checkbox]');toggle.checked=true;toggle.dispatchEvent(new Event('change',{bubbles:true})); + card=document.querySelector('.bookmark-editor-card');set(card.querySelector('.bookmark-section-options input:not([type=checkbox])'),'/docs'); + sessionStorage.setItem('bookmarkSaved','1');document.getElementById('bookmark-form').requestSubmit();return; + } + if(document.querySelector('.bookmark-card-head input').value!=='Guides')throw new Error('Bookmark save not reflected'); + const bookmarkCard=document.querySelector('.bookmark-section'); + if(!bookmarkCard||!getComputedStyle(bookmarkCard).backdropFilter.includes('blur'))throw new Error('Top-page bookmark glass style missing'); + const searchBar=document.querySelector('.home-search form,.topbar-search'); + if(!searchBar||!getComputedStyle(searchBar).backdropFilter.includes('blur'))throw new Error('Top-page search glass style missing'); + dialog.querySelector('[data-bookmark-close]').click();if(dialog.open)throw new Error('Close button failed'); + document.querySelector('[data-bookmark-open]').click();document.body.dataset.vimReady='true'; + } else if (new URLSearchParams(location.search).has('picker_test')) { + const open=document.querySelector('[data-picker-target="home-wallpaper-path"]'); + const dialog=document.querySelector('[data-path-picker-dialog]'); + open.click(); + for(let i=0;i<100&&!dialog.querySelector('[data-path="/wallpapers"]');i++)await pause(); + const folder=dialog.querySelector('[data-path="/wallpapers"]'); + if(!dialog.open||!folder||getComputedStyle(dialog).display!=='grid')throw new Error('Path picker did not open with themed layout'); + folder.click(); + for(let i=0;i<100&&!dialog.querySelector('[data-path="/wallpapers/browser.jpg"]');i++)await pause(); + const image=dialog.querySelector('[data-path="/wallpapers/browser.jpg"]'); + if(!image)throw new Error('Image picker did not list the wallpaper'); + image.click();dialog.querySelector('[data-path-picker-select]').click(); + if(document.getElementById('home-wallpaper-path').value!=='/wallpapers/browser.jpg'||dialog.open)throw new Error('Path picker selection was not applied'); + document.body.dataset.vimReady='true'; + } else { + const form=document.getElementById('vim-settings-form'); + for(const [kind,name,text] of [['vimrc','.vimrc','set tabstop=3\n'],['colorscheme','uploaded.vim','hi Normal guifg=#abcdef\n']]){ + const dt=new DataTransfer();dt.items.add(new File([text],name,{type:'text/plain'})); + const input=form.querySelector(`[data-vim-upload="${kind}"]`);input.files=dt.files;input.dispatchEvent(new Event('change',{bubbles:true})); + for(let i=0;i<100&&form.elements[kind].value!==text;i++)await pause(); + if(form.elements[kind].value!==text)throw new Error('Upload failed: '+kind); + } + form.requestSubmit(); + for(let i=0;i<100&&document.getElementById('vim-settings-status').textContent!==form.dataset.saved;i++)await pause(); + if(document.getElementById('vim-settings-status').textContent!==form.dataset.saved)throw new Error('Vim settings save failed'); + document.body.dataset.vimReady='true'; + } + }catch(error){const box=document.createElement('div');box.id='error';box.textContent=error.message;document.body.append(box);} +}); diff --git a/internal/server/testdata/tasks-browser.js b/internal/server/testdata/tasks-browser.js new file mode 100644 index 0000000..eb5b670 --- /dev/null +++ b/internal/server/testdata/tasks-browser.js @@ -0,0 +1,175 @@ +window.addEventListener('load', async () => { + const $=id=>document.getElementById('tasks-'+id); + const wait=async fn=>{for(let i=0;i<100;i++){if(fn())return;await new Promise(r=>setTimeout(r,50));}throw Error('Timed out: '+fn);}; + const value=(name,text)=>{const n=document.querySelector('#tasks-form [name="'+name+'"]');if(!n)throw Error('Missing field '+name);n.value=text;n.dispatchEvent(new Event('input',{bubbles:true}));}; + try { + if (!sessionStorage.getItem('focus-reload')) { + $('dav-open').click(); await wait(()=>$('dav-dialog').open&&$('dav-dialog').querySelector('thead')); + const dav=$('dav-dialog'),form=dav.querySelector('form');if($('dav-compat').checked)throw Error('Compatibility must be opt-in');$('dav-compat').checked=true;form.querySelector('input').value='Browser CLI fixture';form.querySelectorAll('select')[0].value='all';form.querySelectorAll('select')[1].value='write';form.requestSubmit(); + await wait(()=>!dav.querySelector('section').hidden&&dav.querySelector('tbody tr')); + if(!dav.querySelector('section input:last-child')||!dav.querySelector('section').textContent.includes('パスワード'))throw Error('DAV credential issue failed'); + if(!dav.querySelector('tbody').textContent.includes('OneTask'))throw Error('Compatibility setting not persisted'); + const r=dav.getBoundingClientRect();if(r.width>innerWidth+1||r.height>innerHeight+1||dav.scrollWidth>dav.clientWidth+1)throw Error('DAV dialog overflow'); + window.confirm=()=>true;await wait(()=>!form.querySelector('button').disabled);dav.querySelector('tbody button').click();await wait(()=>!dav.querySelector('tbody tr')); + dav.querySelector('header button').click();if(!dav.querySelector('section').hidden||dav.querySelector('section input'))throw Error('DAV password retained after close'); + } + if(sessionStorage.getItem('focus-reload')){ + await wait(()=>$('focus').dataset.state==='paused'); + const f=await fetch('/_/api/v1/extension/organizer.tasks/focus').then(r=>r.json()); + if(f.item.uuid!==sessionStorage.getItem('focus-reload')||f.item.version!==2)throw Error('Timer failed to restore'); + await wait(()=>$('day').querySelector('strong').textContent==='25分'&&$('day-blocks').textContent.includes('Changed elsewhere')); + $('day').querySelector('details').open=true; + // Inline edits preserve notes and support independently dated children. + await wait(()=>$('list').querySelector('[data-action=add-child]')); + const row=$('list').querySelector('.task-inline-row'); + const editInline=async(name,text)=>{const input=row.querySelector('[name="'+name+'"]');input.value=text;input.dispatchEvent(new Event('input',{bubbles:true}));input.dispatchEvent(new Event('change',{bubbles:true}));await wait(()=>!window.PagesWikiTaskRows.hasDirty()&&!row.hasAttribute('aria-busy'));}; + await editInline('start_on','2026-09-25');await editInline('end_on','2026-09-28'); + row.querySelector('[data-action=add-child]').click();const capture=row.querySelector('.task-child-capture');capture.querySelector('input').value='Independent child';capture.querySelector('input').dispatchEvent(new Event('input',{bubbles:true}));capture.requestSubmit();await wait(()=>row.querySelector('.task-inline-children .task-inline-row')); + const child=row.querySelector('.task-inline-children .task-inline-row');if(child.querySelector('[data-action=add-child]'))throw Error('Nested subtasks should be bounded'); + // Dense desktop rows keep editable fields on a single baseline, including children. + const fields=['title','status','planned_on','due_on','review_on','start_on','end_on']; + const controls=fields.map(name=>row.querySelector('[name="'+name+'"]')); + if(innerWidth>=1024){ + const first=controls[0].getBoundingClientRect(); + for(const control of controls){ + const r=control.getBoundingClientRect(); + if(Math.abs(r.top-first.top)>1||r.height>36)throw Error('Desktop task fields must fit one compact line'); + const nested=child.querySelector('[name="'+control.name+'"]').getBoundingClientRect(); + if(Math.abs(nested.left-r.left)>1||Math.abs(nested.width-r.width)>1)throw Error('Subtask columns are misaligned'); + } + const action=row.querySelector('[data-action=detail]').getBoundingClientRect(); + if(Math.abs((action.top+action.height/2)-(first.top+first.height/2))>1)throw Error('Desktop actions wrapped'); + if(getComputedStyle(document.querySelector('.task-inline-header')).display==='none')throw Error('Desktop column headings missing'); + if(row.querySelector('.task-inline-status').getBoundingClientRect().height>1)throw Error('Successful save added another row'); + }else{ + for(const control of [...controls,...row.querySelectorAll(':scope > .tasks-actions button,:scope > .tasks-actions a,:scope > .task-inline-main button')]){ + const r=control.getBoundingClientRect(); + if(r.height<44||r.width<44)throw Error('Mobile task touch target is too small'); + if(parseFloat(getComputedStyle(control).fontSize)<16)throw Error('Mobile input may trigger Safari zoom'); + } + if(getComputedStyle(document.querySelector('.task-inline-header')).display!=='none')throw Error('Mobile should use local field labels'); + if(child.scrollWidth>child.clientWidth+1)throw Error('Subtask mobile overflow'); + } + if(row.querySelector('[data-action=children]').getAttribute('aria-expanded')!=='true')throw Error('Subtask expansion state missing'); + // A failed inline save remains visible and keeps the typed value. + const latest=await fetch('/_/api/v1/extension/organizer.tasks/items/'+row.dataset.taskId).then(r=>r.json()); + const concurrent=await fetch('/_/api/v1/extension/organizer.tasks/items/'+row.dataset.taskId,{method:'PUT',headers:{'Content-Type':'application/json','If-Match':'"'+latest.item.version+'"'},body:JSON.stringify({...latest.item,notes:'Concurrent notes kept'})}); + if(!concurrent.ok)throw Error('Concurrent fixture update failed'); + const title=row.querySelector('[name=title]');title.value='Keep my inline draft';title.dispatchEvent(new Event('input',{bubbles:true}));title.dispatchEvent(new Event('change',{bubbles:true})); + const rowStatus=row.querySelector(':scope > .task-inline-status'); + await wait(()=>rowStatus.dataset.state==='error'&&!row.hasAttribute('aria-busy')); + if(title.value!=='Keep my inline draft'||rowStatus.getBoundingClientRect().height<16||!window.PagesWikiTaskRows.hasDirty())throw Error('Inline conflict hidden or discarded'); + window.confirm=()=>true;row.querySelector('[data-action=reload]').click();await wait(()=>!window.PagesWikiTaskRows.hasDirty()); + const schedule=await fetch('/_/api/v1/extension/organizer.tasks/schedule?month=2026-09').then(r=>r.json());if(schedule.items.length!==1||schedule.items[0].start_on!=='2026-09-25')throw Error('Schedule failed'); + document.querySelector('[data-tasks-today-launch]').click();await wait(()=>document.querySelector('[data-tasks-today-list]').textContent.includes('Changed elsewhere'));document.querySelector('[data-tasks-today-close]').click(); + // No OS permission prompt is triggered automatically. Test in-page notification paths. + Object.defineProperty(document,'hasFocus',{configurable:true,value:()=>true}); + await fetch('/__notification-fixture',{method:'POST'});window.dispatchEvent(new Event('focus')); + await wait(()=>document.querySelector('.notification-toast')?.textContent.includes('Browser notification fixture')); + document.querySelector('[data-notification-launch]').click();await wait(()=>document.querySelector('[data-notification-dialog] .notification-item')); + const auto=document.querySelectorAll('.notification-settings input[type=checkbox]')[1];auto.checked=true;auto.dispatchEvent(new Event('change'));document.querySelector('[data-notification-close]').click(); + await new Promise(resolve=>setTimeout(resolve,50));await fetch('/__notification-fixture',{method:'POST'});document.activeElement?.blur();document.dispatchEvent(new Event('visibilitychange'));await wait(()=>document.querySelector('[data-notification-dialog]').open);await wait(()=>document.querySelector('[data-notification-dialog] .notification-item')); + const modal=document.querySelector('[data-notification-dialog]');if(modal.scrollWidth>modal.clientWidth+1)throw Error('Notification settings overflow');modal.close(); + // Leave a clean, expanded hierarchy for visual review. + await wait(()=>$('list').querySelector('[data-action=children]')); + const current=$('list').querySelector('.task-inline-row'),expand=current.querySelector('[data-action=children]'); + if(expand.getAttribute('aria-expanded')!=='true')expand.click(); + await wait(()=>current.querySelector('.task-inline-children .task-inline-row')); + document.querySelectorAll('.notification-toast button').forEach(button=>button.click()); + if(innerWidth<1024)current.scrollIntoView({block:'start'}); + if(document.documentElement.scrollWidth>innerWidth+1)throw Error('Focus toolbar horizontal overflow'); + // A real daily page groups filtered children beneath their parent and + // opens a newly-created Wiki document through the row's memo actions. + const taskAPI='/_/api/v1/extension/organizer.tasks/items'; + const today=$('app').dataset.today,date=new Date(today+'T12:00:00Z');date.setUTCDate(date.getUTCDate()+1);const tomorrow=date.toISOString().slice(0,10); + const make=async(title,extra={})=>{const response=await fetch(taskAPI,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({uuid:crypto.randomUUID(),kind:'task',title,notes:'Private short notes',status:'todo',bucket:'inbox',priority:1,project_uuid:'__TASK_PROJECT_UUID__',...extra})});if(!response.ok)throw Error('Task fixture create failed');return (await response.json()).item;}; + const plannedParent=await make('Tomorrow parent',{planned_on:tomorrow}); + const plannedChild=await make('Tomorrow child',{parent_uuid:plannedParent.uuid}); + const frame=document.createElement('iframe');frame.style.cssText='position:fixed;inset:0;width:100%;height:100%;z-index:10000;background:var(--bg)';frame.src='/v/plan/tasks/tomorrow';document.body.append(frame); + const inFrame=selector=>frame.contentDocument?.querySelector(selector); + await wait(()=>inFrame('[data-task-id="'+plannedParent.uuid+'"]')); + let parentRow=inFrame('[data-task-id="'+plannedParent.uuid+'"]'); + parentRow.querySelector('[data-action=children]').click(); + await wait(()=>inFrame('[data-task-id="'+plannedChild.uuid+'"]')); + if(!parentRow.contains(inFrame('[data-task-id="'+plannedChild.uuid+'"]')))throw Error('Planned parent cannot expand unscheduled children'); + // Giving a child its own plan must not duplicate it as a top-level row. + const childDate=inFrame('[data-task-id="'+plannedChild.uuid+'"] [name=planned_on]');childDate.value=tomorrow;childDate.dispatchEvent(new frame.contentWindow.Event('input',{bubbles:true}));childDate.dispatchEvent(new frame.contentWindow.Event('change',{bubbles:true})); + await wait(()=>!frame.contentWindow.PagesWikiTaskRows.hasDirty()); + frame.contentDocument.getElementById('tasks-refresh').click(); + await wait(()=>inFrame('[data-task-id="'+plannedChild.uuid+'"]')); + if(frame.contentDocument.querySelectorAll('[data-task-id="'+plannedChild.uuid+'"]').length!==1||!inFrame('[data-task-id="'+plannedParent.uuid+'"]').contains(inFrame('[data-task-id="'+plannedChild.uuid+'"]')))throw Error('Child grouping duplicated or detached'); + inFrame('[data-task-id="'+plannedChild.uuid+'"] [data-action=plan]').click(); + await wait(()=>inFrame('#tasks-plan-dialog')?.open&&inFrame('#tasks-plan-dialog [name=start]')?.value.startsWith(tomorrow)&&!inFrame('#tasks-plan-dialog button[type=submit]').disabled); + inFrame('#tasks-plan-dialog header button').click(); + // New tasks created on a selected day get that day, not today. + frame.contentDocument.getElementById('tasks-quick-title').value='Created on tomorrow'; + frame.contentDocument.getElementById('tasks-capture').requestSubmit(); + await wait(()=>Array.from(frame.contentDocument.querySelectorAll('input[name=title]')).some(n=>n.value==='Created on tomorrow')); + const dayData=await fetch(taskAPI+'?view=day&date='+tomorrow).then(r=>r.json()); + if(!dayData.items.some(i=>i.title==='Created on tomorrow'&&i.planned_on===tomorrow))throw Error('Daily quick capture used the wrong date'); + frame.contentWindow.confirm=()=>true; + inFrame('[data-task-id="'+plannedChild.uuid+'"] [data-action=note-edit]').click(); + await wait(()=>frame.contentWindow.location.pathname.startsWith('/e/-/projects/browser/notes/')); + const note=await fetch(taskAPI+'/'+plannedChild.uuid+'/note').then(r=>r.json()); + if(!note.linked||note.path!=='/projects/browser/notes/Tomorrow child')throw Error('Memo edit did not create/link the Wiki page'); + frame.src='/v/plan/tasks/tomorrow'; + await wait(()=>inFrame('[data-task-id="'+plannedChild.uuid+'"] [data-action=note-view]')); + inFrame('[data-task-id="'+plannedChild.uuid+'"] [data-action=note-view]').click(); + await wait(()=>decodeURIComponent(frame.contentWindow.location.pathname)==='/projects/browser/notes/Tomorrow child'); + await wait(()=>frame.contentDocument.body.textContent.includes('Tomorrow child')); + const yesterday=new Date(today+'T12:00:00Z');yesterday.setUTCDate(yesterday.getUTCDate()-1); + const carried=await make('Carry to tomorrow',{planned_on:yesterday.toISOString().slice(0,10)}); + frame.src='/v/plan/tasks/carryover'; + await wait(()=>inFrame('[data-task-id="'+carried.uuid+'"]')); + const targetDate=inFrame('.task-date-nav input');targetDate.value=tomorrow;targetDate.dispatchEvent(new frame.contentWindow.Event('change',{bubbles:true})); + inFrame('[data-task-id="'+carried.uuid+'"] [data-action=schedule-day]').click(); + await wait(()=>!inFrame('[data-task-id="'+carried.uuid+'"]')); + const rescheduled=await fetch(taskAPI+'/'+carried.uuid).then(r=>r.json()); + if(rescheduled.item.planned_on!==tomorrow||rescheduled.item.due_on)throw Error('Carryover action changed deadline or used wrong day'); + frame.remove(); + document.body.dataset.vimReady='true';return; + } + await wait(()=>$('status').textContent.includes('ありません')); + $('quick-title').value='Write the first task';$('capture').requestSubmit(); + await wait(()=>$('list').querySelector('[data-action=detail]')); + $('list').querySelector('[data-action=detail]').click(); + await wait(()=>document.querySelector('[name="page_path"]')); + value('notes','Preserve these private notes');value('status','doing');value('estimate_minutes','25'); + const notify=document.querySelector('[name="notify_planned"]');if(!notify||notify.checked)throw Error('Reminder must default off');notify.click();value('reminder_time','10:30');$('form').requestSubmit(); + await wait(()=>!$('dialog').open);await wait(()=>$('list').textContent.includes('25 min')); + const delivered=await fetch('/__task-reminder-fixture',{method:'POST'});if(!delivered.ok)throw Error('Fixture delivery failed'); + document.dispatchEvent(new Event('visibilitychange')); + await wait(()=>!document.querySelector('[data-notification-badge]').hidden); + document.querySelector('[data-notification-launch]').click(); + await wait(()=>document.querySelector('[data-notification-dialog] [data-notifications-list]').textContent.includes('Write the first task')); + if(!document.querySelector('[data-notification-badge]').hidden)throw Error('Badge remained after opening Inbox'); + document.querySelector('[data-notification-close]').click(); + $('list').querySelector('button').click(); + await wait(()=>!$('list').children.length); + const res=await fetch('/_/api/v1/extension/organizer.tasks/items?view=done');const done=await res.json();if(done.items.length!==1)throw Error('Completion missing'); + const detail=await fetch('/_/api/v1/extension/organizer.tasks/items/'+done.items[0].uuid).then(r=>r.json());if(detail.item.notes!=='Preserve these private notes')throw Error('Notes lost on quick completion');if(!detail.item.notify_planned||detail.item.reminder_time!=='10:30'||!detail.item.reminder_timezone)throw Error('Reminder settings lost'); + const undo=await fetch('/_/api/v1/extension/organizer.tasks/items/'+detail.item.uuid,{method:'PUT',headers:{'Content-Type':'application/json','If-Match':'"'+detail.item.version+'"'},body:JSON.stringify({...detail.item,status:'todo'})});if(!undo.ok)throw Error('Reopen failed'); + $('refresh').click();await wait(()=>$('list').querySelector('[data-action=detail]'));$('list').querySelector('[data-action=detail]').click();await wait(()=>document.querySelector('[name="page_path"]')); + // A background edit must not silently overwrite an already-open form. + const fresh=await fetch('/_/api/v1/extension/organizer.tasks/items/'+detail.item.uuid).then(r=>r.json()); + await fetch('/_/api/v1/extension/organizer.tasks/items/'+detail.item.uuid,{method:'PUT',headers:{'Content-Type':'application/json','If-Match':'"'+fresh.item.version+'"'},body:JSON.stringify({...fresh.item,title:'Changed elsewhere'})}); + value('title','Unsaved local title');$('form').requestSubmit();await wait(()=>$('error').textContent.includes('別の画面')); + if(document.querySelector('#tasks-form [name="title"]').value!=='Unsaved local title')throw Error('Conflict lost input'); + window.confirm=()=>true;$('close').click();$('refresh').click();await wait(()=>$('list').querySelector('input[name=title]')?.value==='Changed elsewhere'); + if(document.documentElement.scrollWidth>innerWidth+1)throw Error('Horizontal page overflow'); + // Validate responsive modal dimensions and save an inspectable screenshot. + $('list').querySelector('[data-action=detail]').click();await wait(()=>document.querySelector('[name="page_path"]')); + const rect=$('dialog').getBoundingClientRect();if(rect.width>innerWidth+1||rect.height>innerHeight+1)throw Error('Modal overflow'); + $('plan-open').click();await wait(()=>$('plan-dialog').open&&$('plan-dialog').querySelector('select').options.length&&!$('plan-dialog').querySelector('button[type=submit]').disabled); + const pf=$('plan-dialog').querySelector('form'),date=$('app').dataset.today;pf.querySelector('[name=start]').value=date+'T10:00';pf.querySelector('[name=end]').value=date+'T11:00';pf.requestSubmit(); + await wait(()=>$('plan-list').querySelector('a')); + if(!$('plan-list').querySelector('a').href.includes('/v/plan/event/'))throw Error('Calendar event link missing'); + if($('plan-dialog').scrollWidth>$('plan-dialog').clientWidth+1)throw Error('Planning dialog overflow'); + const planningRect=$('plan-dialog').getBoundingClientRect();if(planningRect.width>innerWidth+1||planningRect.height>innerHeight+1)throw Error('Planning modal outside viewport'); + $('plan-dialog').querySelector('header button').click();$('close').click(); + await wait(()=>!$('focus').querySelector('[data-action=start]').disabled); + $('focus').querySelector('[data-action=start]').click();await wait(()=>$('focus').dataset.state==='running'&&!$('focus').querySelector('[data-action=pause]').disabled); + $('focus').querySelector('[data-action=pause]').click();await wait(()=>$('focus').dataset.state==='paused'); + const f=await fetch('/_/api/v1/extension/organizer.tasks/focus').then(r=>r.json());sessionStorage.setItem('focus-reload',f.item.uuid);location.reload(); + } catch(e) {const out=document.createElement('pre');out.id='error';out.textContent=e.stack||e.message;document.body.append(out);} +}); diff --git a/internal/server/testdata/vim-browser-smoke.mjs b/internal/server/testdata/vim-browser-smoke.mjs new file mode 100644 index 0000000..89cf789 --- /dev/null +++ b/internal/server/testdata/vim-browser-smoke.mjs @@ -0,0 +1,53 @@ +// Real-time CDP smoke test: virtual-time screenshots finish before Wasm +// compilation on a worker. No credentials or production workspace are used. +import {spawn} from 'node:child_process'; +import {writeFile} from 'node:fs/promises'; +import {setTimeout as delay} from 'node:timers/promises'; + +const [url, profile, screenshot, width = '1440', height = '1000'] = process.argv.slice(2); +const browser = spawn('chromium', ['--headless', '--no-sandbox', '--disable-gpu', '--disable-background-networking', '--no-proxy-server', '--remote-debugging-port=0', `--user-data-dir=${profile}`, 'about:blank']); +process.on('SIGTERM', () => { browser.kill(); process.exit(1); }); +let socket; +try { + const endpoint = await new Promise((resolve, reject) => { + let log = ''; + browser.stderr.on('data', chunk => { + log += chunk; + const match = log.match(/DevTools listening on (ws:\/\/[^\s]+)/); + if (match) resolve(match[1]); + }); + browser.on('error', reject); + browser.on('exit', code => reject(new Error(`Browser exited ${code}: ${log}`))); + }); + socket = new WebSocket(endpoint); + await new Promise((resolve, reject) => { socket.onopen = resolve; socket.onerror = reject; }); + let id = 0; + const pending = new Map(); + socket.onmessage = event => { + const message = JSON.parse(event.data), pair = pending.get(message.id); + if (pair) { pending.delete(message.id); message.error ? pair.reject(new Error(JSON.stringify(message.error))) : pair.resolve(message.result); } + }; + const send = (method, params = {}, sessionId) => new Promise((resolve, reject) => { + pending.set(++id, {resolve, reject}); socket.send(JSON.stringify({id, method, params, sessionId})); + }); + const {targetId} = await send('Target.createTarget', {url: 'about:blank'}); + const {sessionId} = await send('Target.attachToTarget', {targetId, flatten: true}); + const call = (method, params) => send(method, params, sessionId); + await call('Page.enable'); + await call('Emulation.setDeviceMetricsOverride', {width: Number(width), height: Number(height), deviceScaleFactor: 1, mobile: false}); + await call('Page.navigate', {url}); + let ready = false; + for (let attempt = 0; attempt < 150; attempt++) { + const {result} = await call('Runtime.evaluate', {expression: `JSON.stringify({ready: document.body?.dataset.vimReady, error: document.querySelector('#error:not([hidden])')?.textContent})`, returnByValue: true}); + const state = JSON.parse(result.value || '{}'); + if (state.error) throw new Error(state.error); + if (state.ready) { ready = true; break; } + await delay(200); + } + if (screenshot) { + const {data} = await call('Page.captureScreenshot', {format: 'png'}); + await writeFile(screenshot, Buffer.from(data, 'base64')); + } + if (!ready) throw new Error('Vim startup timed out'); + console.log('Vim initialized and exported startup report'); +} finally { socket?.close(); browser.kill(); } diff --git a/internal/server/text_window.go b/internal/server/text_window.go new file mode 100644 index 0000000..9389e98 --- /dev/null +++ b/internal/server/text_window.go @@ -0,0 +1,52 @@ +package server + +import ( + "encoding/json" + "net/http" + "strconv" + "strings" + "unicode/utf8" +) + +func (s *Server) handleTextWindow(w http.ResponseWriter, r *http.Request) { + address := strings.TrimPrefix(r.URL.Path, "/v/text/") + if !strings.HasPrefix(address, "rev:") { + http.Error(w, "bounded text paging requires an immutable rev: address", http.StatusBadRequest) + return + } + revision, err := s.store.GetRevisionMetadata(strings.TrimPrefix(address, "rev:")) + if err != nil { + http.NotFound(w, r) + return + } + if !s.store.ObjectBoundInDomain(s.domainUUIDForRequest(r), revision.ObjectUUID) { + http.NotFound(w, r) + return + } + offset, _ := strconv.ParseInt(r.URL.Query().Get("offset"), 10, 64) + limit, _ := strconv.ParseInt(r.URL.Query().Get("limit"), 10, 64) + window, err := s.store.ReadDocumentWindow(revision.DocumentHash, offset, limit) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + data := window.Data + actualOffset := window.Offset + for len(data) > 0 && !utf8.RuneStart(data[0]) { + data, actualOffset = data[1:], actualOffset+1 + } + rawLength := len(data) + data = []byte(strings.ToValidUTF8(string(data), "\uFFFD")) + nextOffset := actualOffset + int64(rawLength) + w.Header().Set("Content-Type", "application/json; charset=utf-8") + w.Header().Set("Cache-Control", "private, max-age=31536000, immutable") + w.Header().Set("Vary", "Authorization, Cookie") + w.Header().Set("ETag", `"`+revision.DocumentHash+`-`+strconv.FormatInt(actualOffset, 10)+`-`+strconv.FormatInt(int64(len(data)), 10)+`"`) + _ = json.NewEncoder(w).Encode(map[string]any{ + "revision_uuid": revision.UUID, "document_hash": revision.DocumentHash, + "content_type": revision.ContentType, "total_bytes": window.TotalBytes, + "offset": actualOffset, "next_offset": nextOffset, + "line_start": nil, "line_end": nil, + "truncated": nextOffset < window.TotalBytes, "text": string(data), + }) +} diff --git a/internal/server/text_window_test.go b/internal/server/text_window_test.go new file mode 100644 index 0000000..569c31c --- /dev/null +++ b/internal/server/text_window_test.go @@ -0,0 +1,92 @@ +package server + +import ( + "encoding/json" + "net/http" + "net/http/httptest" + "strings" + "testing" + + "pageswiki/internal/db" + "pageswiki/internal/store" +) + +func TestTextWindowIsBoundedUTF8AndDomainScoped(t *testing.T) { + database, err := db.Open(t.TempDir() + "/pages.db") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := store.New(database) + domain, _ := st.GetDefaultDomain() + objectUUID, err := st.CreatePageAtPathInDomain(domain.UUID, "/large.txt") + if err != nil { + t.Fatal(err) + } + revision, err := st.SaveRevisionContent(objectUUID, []byte(strings.Repeat("日本語\n", 100000)), "test", "und", "text/plain; charset=utf-8", "large.txt") + if err != nil { + t.Fatal(err) + } + request := httptest.NewRequest(http.MethodGet, "http://localhost/v/text/rev:"+revision.UUID+"?offset=1&limit=1024", nil) + response := httptest.NewRecorder() + (&Server{store: st}).handleTextWindow(response, request) + if response.Code != http.StatusOK { + t.Fatalf("status=%d body=%s", response.Code, response.Body.String()) + } + var payload struct { + Text string `json:"text"` + Offset int64 `json:"offset"` + NextOffset int64 `json:"next_offset"` + Truncated bool `json:"truncated"` + } + if err := json.Unmarshal(response.Body.Bytes(), &payload); err != nil { + t.Fatal(err) + } + if !strings.HasPrefix(payload.Text, "本語") || payload.Offset <= 1 || payload.NextOffset <= payload.Offset || !payload.Truncated { + t.Fatalf("payload=%+v", payload) + } + if _, err := database.Exec(`DELETE FROM paths WHERE domain_uuid=? AND object_uuid=?`, domain.UUID, objectUUID); err != nil { + t.Fatal(err) + } + denied := httptest.NewRecorder() + (&Server{store: st}).handleTextWindow(denied, request) + if denied.Code != http.StatusNotFound { + t.Fatalf("unbound revision status=%d, want 404", denied.Code) + } +} + +func TestSemanticViewerSelectsImmutableWindowWithoutHydratingTail(t *testing.T) { + database, err := db.Open(t.TempDir() + "/viewer.db") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := store.New(database) + domain, _ := st.GetDefaultDomain() + objectUUID, err := st.CreatePageAtPathInDomain(domain.UUID, "/huge.txt") + if err != nil { + t.Fatal(err) + } + body := strings.Repeat("line of bounded text\n", 120000) + "SHOULD_NOT_BE_IN_INITIAL_HTML" + revision, err := st.SaveRevisionContent(objectUUID, []byte(body), "test", "und", "text/plain; charset=utf-8", "huge.txt") + if err != nil { + t.Fatal(err) + } + request := httptest.NewRequest(http.MethodGet, "http://localhost/huge.txt", nil) + view, selected, err := (&Server{store: st}).windowedContentViewForRequest(request, objectUUID, "/huge.txt") + if err != nil || !selected { + t.Fatalf("selected=%v err=%v view=%+v", selected, err, view) + } + if strings.Contains(view.Text, "SHOULD_NOT_BE_IN_INITIAL_HTML") || int64(len(view.Text)) >= view.SizeBytes { + t.Fatal("large text tail was hydrated into initial Viewer window") + } + if view.WindowURL != "/v/text/rev:"+revision.UUID || view.NextOffset <= 0 || !view.Windowed { + t.Fatalf("windowed view=%+v", view) + } +} diff --git a/internal/server/theme.go b/internal/server/theme.go index 72de511..3429f0c 100644 --- a/internal/server/theme.go +++ b/internal/server/theme.go @@ -24,6 +24,12 @@ func builtinThemeOptions() []ThemeOption { {ID: "amber-crt", Label: "Amber CRT", CSS: "/static/css/theme/amber-crt.css"}, {ID: "lain-dark", Label: "Lain Dark", CSS: "/static/css/theme/lain-dark.css"}, {ID: "nanoha-dark", Label: "Nanoha Dark", CSS: "/static/css/theme/nanoha-dark.css"}, + {ID: "fate-t-dark", Label: "Fate.T. (Fate Testarossa) Dark", CSS: "/static/css/theme/fate-t-dark.css"}, + {ID: "index-white", Label: "Index White", CSS: "/static/css/theme/index-white.css"}, + {ID: "index-dark", Label: "Index Dark", CSS: "/static/css/theme/index-dark.css"}, + {ID: "railgun-white", Label: "Railgun White", CSS: "/static/css/theme/railgun-white.css"}, + {ID: "railgun-dark", Label: "Railgun Dark", CSS: "/static/css/theme/railgun-dark.css"}, + {ID: "accelerator-dark", Label: "Accelerator Dark", CSS: "/static/css/theme/accelerator-dark.css"}, } } @@ -85,9 +91,9 @@ func isAllowedTheme(theme string) bool { return ok } -func (s *Server) getTheme() string { - theme, err := s.store.GetConfig("theme") - if err != nil || theme == "" { +func (s *Server) getTheme(domainUUID ...string) string { + theme := s.getDomainConfig("theme", domainUUID...) + if theme == "" { return "dark" } @@ -98,8 +104,8 @@ func (s *Server) getTheme() string { return theme } -func (s *Server) getThemeCSS() string { - opt, ok := findTheme(s.getTheme()) +func (s *Server) getThemeCSS(domainUUID ...string) string { + opt, ok := findTheme(s.getTheme(domainUUID...)) if !ok { return "/static/css/theme/dark.css" } diff --git a/internal/server/timezone.go b/internal/server/timezone.go index f6e9246..afd8f20 100644 --- a/internal/server/timezone.go +++ b/internal/server/timezone.go @@ -2,18 +2,14 @@ package server import "time" -func (s *Server) getTimezoneName() string { +func (s *Server) getTimezoneName(domainUUID ...string) string { - tz, err := - s.store.GetConfig( - "timezone", - ) - - if err != nil || tz == "" { + tz := s.getDomainConfig("timezone", domainUUID...) + if tz == "" { return "UTC" } - _, err = time.LoadLocation(tz) + _, err := time.LoadLocation(tz) if err != nil { return "UTC" @@ -22,11 +18,11 @@ func (s *Server) getTimezoneName() string { return tz } -func (s *Server) getLocation() *time.Location { +func (s *Server) getLocation(domainUUID ...string) *time.Location { loc, err := time.LoadLocation( - s.getTimezoneName(), + s.getTimezoneName(domainUUID...), ) if err != nil { diff --git a/internal/server/tree_handler.go b/internal/server/tree_handler.go index 1e3efbb..bcd06b7 100644 --- a/internal/server/tree_handler.go +++ b/internal/server/tree_handler.go @@ -2,12 +2,12 @@ package server import ( "net/http" + "path" "strings" - - "pageswiki/internal/store" ) type TreeViewNode struct { + Href string Name string Path string Depth int @@ -21,8 +21,8 @@ func (s *Server) handleTree( r *http.Request, ) { - tree, err := - s.store.BuildPathTree() + rootPath := path.Clean("/" + strings.TrimPrefix(r.URL.Path, "/v/tree")) + readable, err := s.readableNavigation(r) if err != nil { @@ -35,44 +35,50 @@ func (s *Server) handleTree( return } - var flattened []store.FlatTreeNode - - store.FlattenTree( - tree, - 0, - &flattened, - ) - var nodes []TreeViewNode - - for _, n := range flattened { - + visible := []publicTreeNode{} + for _, n := range publicTreeNodes(readable, rootPath) { + if n.Path != "/u" && !strings.HasPrefix(n.Path, "/u/") { + visible = append(visible, n) + } + } + visibleChildren := make(map[string]int) + for _, n := range visible { + if n.Path != "/" { + visibleChildren[parentPath(n.Path)]++ + } + } + for _, n := range visible { nodes = append( nodes, TreeViewNode{ + Href: n.Href, Name: n.Name, - Path: n.FullPath, - Depth: n.Depth, - IsDir: n.IsDir, - ChildCount: n.ChildCount, + Path: n.Path, + Depth: n.Depth + 1, + IsDir: n.IsDir || visibleChildren[n.Path] > 0, + ChildCount: visibleChildren[n.Path], IsDraft: strings.HasPrefix( - n.FullPath, + n.Path, "/draft/", ), }, ) } - s.render( + s.renderWithContext( w, + r, "tree.gohtml", map[string]any{ "NavItems": resolveNavItems( - s.getSystemNavItems(), - NavContext{}, + s.getSystemNavItems(s.domainUUIDForRequest(r)), + NavContext{Path: rootPath}, ), - "Nodes": nodes, + "Nodes": nodes, + "Path": rootPath, + "Breadcrumbs": buildBreadcrumbs(rootPath), }, ) } diff --git a/internal/server/upload_handler.go b/internal/server/upload_handler.go new file mode 100644 index 0000000..a7a4813 --- /dev/null +++ b/internal/server/upload_handler.go @@ -0,0 +1,129 @@ +package server + +import ( + "database/sql" + "errors" + "io" + "mime" + "net/http" + "path/filepath" + "strings" + + "pageswiki/internal/store" +) + +const maxWebUploadBytes = int64(256 << 20) + +func (s *Server) handleUpload(w http.ResponseWriter, r *http.Request) { + if r.Method == http.MethodGet { + s.renderWithContext(w, r, "upload.gohtml", map[string]any{ + "Title": translate( + s.getLocale(s.domainUUIDForRequest(r)), + "upload.title", + ), + "NavItems": resolveNavItems( + s.getSystemNavItems(s.domainUUIDForRequest(r)), + NavContext{}, + ), + "SuggestedPath": r.URL.Query().Get("path"), + }) + return + } + if r.Method != http.MethodPost { + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + + r.Body = http.MaxBytesReader(w, r.Body, maxWebUploadBytes+(1<<20)) + if err := r.ParseMultipartForm(32 << 20); err != nil { + http.Error(w, err.Error(), http.StatusRequestEntityTooLarge) + return + } + file, header, err := r.FormFile("file") + if err != nil { + http.Error(w, "file is required", http.StatusBadRequest) + return + } + defer file.Close() + + payload, err := io.ReadAll(io.LimitReader(file, maxWebUploadBytes+1)) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + if int64(len(payload)) > maxWebUploadBytes { + http.Error(w, "file is too large", http.StatusRequestEntityTooLarge) + return + } + + originalName := filepath.Base(strings.TrimSpace(header.Filename)) + if originalName == "." || originalName == "/" || originalName == "" { + http.Error(w, "invalid filename", http.StatusBadRequest) + return + } + targetPath := strings.TrimSpace(r.FormValue("path")) + if targetPath == "" { + targetPath = "/" + originalName + } else if strings.HasSuffix(targetPath, "/") { + targetPath += originalName + } + if !strings.HasPrefix(targetPath, "/") { + targetPath = "/" + targetPath + } + + domainUUID := s.domainUUIDForRequest(r) + mode, _ := s.store.GetConfigInDomain(domainUUID, "authorization_mode") + var principal *store.Principal + if mode == "enforcing" { + var authErr error + principal, authErr = s.store.PrincipalForSession(domainUUID, s.authTokenFromRequest(r)) + if authErr != nil || s.store.Authorize(store.AuthorizationRequest{DomainUUID: domainUUID, PrincipalUUID: principal.UUID, Capability: "upload", TargetType: "path", TargetID: targetPath}) != nil { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + } + objectUUID, err := s.store.ResolvePathInDomain(domainUUID, targetPath) + if err == nil && mode == "enforcing" { + // upload and write-once grants never overwrite an existing object. + if s.store.Authorize(store.AuthorizationRequest{DomainUUID: domainUUID, PrincipalUUID: principal.UUID, Capability: "write", TargetType: "path", TargetID: targetPath}) != nil { + http.Error(w, "existing files cannot be overwritten", http.StatusForbidden) + return + } + } + if errors.Is(err, sql.ErrNoRows) { + objectUUID, err = s.store.CreatePageAtPathInDomain(domainUUID, targetPath) + } + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + + contentType := strings.TrimSpace(header.Header.Get("Content-Type")) + if mediaType, _, parseErr := mime.ParseMediaType(contentType); parseErr != nil || + mediaType == "application/octet-stream" { + detected := detectRevisionText(payload, originalName) + if detected.ContentType != "" { + contentType = detected.ContentType + } + } + if contentType == "" { + contentType = "application/octet-stream" + } + language := s.campusForDomain(s.domainForRequest(r)).DefaultLang + if strings.TrimSpace(language) == "" { + language = "und" + } + if _, err := s.store.SaveRevisionContent( + objectUUID, + payload, + "web upload: "+originalName, + language, + contentType, + originalName, + ); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + http.Redirect(w, r, targetPath, http.StatusSeeOther) +} diff --git a/internal/server/upload_handler_test.go b/internal/server/upload_handler_test.go new file mode 100644 index 0000000..3994a57 --- /dev/null +++ b/internal/server/upload_handler_test.go @@ -0,0 +1,95 @@ +package server + +import ( + "bytes" + "mime/multipart" + "net/http" + "net/http/httptest" + "testing" + + "pageswiki/internal/db" + "pageswiki/internal/store" +) + +func TestWebUploadCreatesAndRevisesSpecifiedPath(t *testing.T) { + database, err := db.Open(t.TempDir() + "/pages.db") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := store.New(database) + campus, err := st.GetDefaultCampus() + if err != nil { + t.Fatal(err) + } + srv := &Server{store: st} + + upload := func(payload string) *httptest.ResponseRecorder { + t.Helper() + var body bytes.Buffer + writer := multipart.NewWriter(&body) + if err := writer.WriteField("path", "/uploads/manual"); err != nil { + t.Fatal(err) + } + part, err := writer.CreateFormFile("file", "manual.txt") + if err != nil { + t.Fatal(err) + } + if _, err := part.Write([]byte(payload)); err != nil { + t.Fatal(err) + } + if err := writer.Close(); err != nil { + t.Fatal(err) + } + request := httptest.NewRequest(http.MethodPost, "/v/upload", &body) + request.Host = campus.FQDN + request.Header.Set("Content-Type", writer.FormDataContentType()) + response := httptest.NewRecorder() + srv.handleUpload(response, request) + return response + } + + for _, payload := range []string{"first", "second"} { + response := upload(payload) + if response.Code != http.StatusSeeOther { + t.Fatalf("upload status = %d, body=%q", response.Code, response.Body.String()) + } + if location := response.Header().Get("Location"); location != "/uploads/manual" { + t.Fatalf("redirect = %q", location) + } + } + + objectUUID, err := st.ResolvePathInDomain( + mustServerDomainUUID(t, st), + "/uploads/manual", + ) + if err != nil { + t.Fatal(err) + } + revisions, err := st.ListRevisions(objectUUID) + if err != nil { + t.Fatal(err) + } + if len(revisions) != 2 { + t.Fatalf("revision count = %d, want 2", len(revisions)) + } + latest, err := st.GetRevision(revisions[0].UUID) + if err != nil { + t.Fatal(err) + } + if latest.Body != "second" || latest.Filename != "manual.txt" { + t.Fatalf("latest upload = body %q filename %q", latest.Body, latest.Filename) + } +} + +func mustServerDomainUUID(t *testing.T, st *store.Store) string { + t.Helper() + domain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + return domain.UUID +} diff --git a/internal/server/user_space_public.go b/internal/server/user_space_public.go new file mode 100644 index 0000000..7678bec --- /dev/null +++ b/internal/server/user_space_public.go @@ -0,0 +1,189 @@ +package server + +import ( + "context" + "database/sql" + "errors" + "html/template" + "io" + "net/http" + "path" + "strings" + + "pageswiki/internal/store" +) + +func userSpaceTarget(raw string) (username, semantic string, isRaw bool) { + semantic = raw + if strings.HasPrefix(semantic, "/v/raw/path:") { + semantic = strings.TrimPrefix(semantic, "/v/raw/path:") + isRaw = true + } + if !store.IsUserSpacePath(semantic) { + return "", semantic, isRaw + } + return store.UserSpaceUsername(semantic), semantic, isRaw +} + +func (s *Server) withUserPublicNavigation(r *http.Request, username string) (*http.Request, error) { + pages, err := s.store.PublicUserSpaceNavigation(r.Context(), s.domainUUIDForRequest(r), username) + if err != nil { + return r, err + } + return s.withPublishedNavigation(r, pages) +} + +func publicUserNavigationUsername(r *http.Request) string { + var scope string + switch { + case r.URL.Path == "/v/children": + scope = r.URL.Query().Get("path") + case strings.HasPrefix(r.URL.Path, "/v/tree/"): + scope = "/" + strings.TrimPrefix(r.URL.Path, "/v/tree/") + case strings.HasPrefix(r.URL.Path, "/v/browser/"): + scope = "/" + strings.TrimPrefix(r.URL.Path, "/v/browser/") + default: + return "" + } + return store.UserSpaceUsername(path.Clean(scope)) +} + +func (s *Server) servePublicUserNavigation(w http.ResponseWriter, r *http.Request) bool { + username := publicUserNavigationUsername(r) + if username == "" { + return false + } + publicRequest, err := s.withUserPublicNavigation(r, username) + if errors.Is(err, sql.ErrNoRows) { + return false + } + if err != nil { + http.Error(w, "user navigation unavailable", http.StatusServiceUnavailable) + return true + } + snapshot := publicNavigationFor(publicRequest) + root := "/u/" + username + if snapshot == nil || !snapshot.branches[root] { + return false + } + s.renderPublicNavigationRoute(w, publicRequest) + return true +} + +func (s *Server) servePublicUserSpace(w http.ResponseWriter, r *http.Request) bool { + username, semantic, raw := userSpaceTarget(r.URL.Path) + if username == "" { + return false + } + root := "/u/" + username + if strings.HasPrefix(semantic, root+"/_/") { + if semantic == root+"/_/avatar" && !raw { + return s.servePublicUserAvatar(w, r, username) + } + return false + } + owner, err := s.store.PrincipalByUsername(s.domainUUIDForRequest(r), username) + if errors.Is(err, sql.ErrNoRows) { + return false + } + if err != nil { + http.Error(w, "user space unavailable", http.StatusServiceUnavailable) + return true + } + policy, err := s.store.UserSpacePolicy(r.Context(), s.domainUUIDForRequest(r), owner.UUID) + if err != nil || !policy.DomainAllowsPublic { + return false + } + if semantic == root && !raw { + if policy.ProfileVisibility != "public" && policy.RootVisibility != "public" { + return false + } + return s.servePublicUserProfile(w, r, owner, policy) + } + v, err := s.store.PublicUserSpaceRevision(r.Context(), s.domainUUIDForRequest(r), username, semantic, s.revisionLanguageCandidates(r)) + if errors.Is(err, sql.ErrNoRows) { + return false + } + if err != nil { + http.Error(w, "user publication unavailable", http.StatusServiceUnavailable) + return true + } + publicRequest, err := s.withUserPublicNavigation(r, username) + if err != nil { + http.Error(w, "user navigation unavailable", http.StatusServiceUnavailable) + return true + } + if current, ok := publicNavigationFor(publicRequest).pages[semantic]; !ok || current.UUID != v.UUID { + http.Error(w, "publication changed; retry", http.StatusServiceUnavailable) + return true + } + return s.serveAnonymousRevision(w, publicRequest, semantic, raw, v) +} + +func (s *Server) servePublicUserAvatar(w http.ResponseWriter, r *http.Request, username string) bool { + owner, err := s.store.PrincipalByUsername(s.domainUUIDForRequest(r), username) + if err != nil { + return false + } + policy, err := s.store.UserSpacePolicy(r.Context(), s.domainUUIDForRequest(r), owner.UUID) + if err != nil || !policy.DomainAllowsPublic || policy.AvatarVisibility != "public" { + return false + } + contentType, data, err := s.store.PrincipalAvatar(owner.UUID) + if err != nil || len(data) == 0 { + http.NotFound(w, r) + return true + } + w.Header().Set("Content-Type", contentType) + w.Header().Set("Cache-Control", "private, no-store") + w.Header().Set("X-Content-Type-Options", "nosniff") + w.Header().Set("Content-Security-Policy", "default-src 'none'; frame-ancestors 'self'") + w.Header().Add("Vary", "Cookie, Authorization") + if r.Method != http.MethodHead { + _, _ = w.Write(data) + } + return true +} + +func (s *Server) servePublicUserProfile(w http.ResponseWriter, r *http.Request, owner *store.Principal, policy store.UserSpacePolicy) bool { + publicRequest, err := s.withUserPublicNavigation(r, owner.Username) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + http.Error(w, "user navigation unavailable", http.StatusServiceUnavailable) + return true + } + if publicNavigationFor(publicRequest) == nil { + publicRequest = publicRequest.WithContext(context.WithValue(publicRequest.Context(), anonymousProjectionKey{}, true)) + publicRequest = publicRequest.WithContext(context.WithValue(publicRequest.Context(), publicNavigationKey{}, &publicNavigationSnapshot{pages: map[string]store.Revision{}, branches: map[string]bool{}})) + } + display := *owner + if policy.ProfileVisibility != "public" { + display.DisplayName = owner.Username + display.Email = "" + } + display.HasAvatar = owner.HasAvatar && policy.AvatarVisibility == "public" + rendered := "" + root := "/u/" + owner.Username + if policy.RootVisibility == "public" { + if revision, revisionErr := s.store.PublicUserSpaceRevision(publicRequest.Context(), s.domainUUIDForRequest(publicRequest), owner.Username, root, s.revisionLanguageCandidates(publicRequest)); revisionErr == nil { + if view := revisionContentView(revision, root); view.Kind == "html" { + reader, openErr := s.store.OpenDocument(revision.DocumentHash) + if openErr == nil { + body, readErr := io.ReadAll(io.LimitReader(reader, maxProjectionInput+1)) + reader.Close() + if readErr == nil { + rendered = s.safeHTMLProjection(publicRequest, string(body), root, true) + } + } + } + } + } + snapshot := publicNavigationFor(publicRequest) + w.Header().Set("Content-Type", "text/html; charset=utf-8") + s.renderWithContext(w, publicRequest, "profile.gohtml", map[string]any{ + "Principal": display, "Editing": false, "PublicProfile": true, + "Handle": owner.Username + "@" + profileHost(publicRequest), "RenderedHTML": template.HTML(rendered), + "PublicHasChildren": snapshot != nil && snapshot.hasChildren(root), + "PublicChildrenHref": cityPageHref("/v/browser" + root), "Locale": s.getLocale(s.domainUUIDForRequest(publicRequest)), + }) + return true +} diff --git a/internal/server/user_space_public_test.go b/internal/server/user_space_public_test.go new file mode 100644 index 0000000..df21d16 --- /dev/null +++ b/internal/server/user_space_public_test.go @@ -0,0 +1,211 @@ +package server + +import ( + "context" + "database/sql" + "errors" + "net/http" + "net/http/httptest" + "net/url" + "strings" + "testing" + + "pageswiki/internal/store" +) + +func enableDomainPublicCeiling(t *testing.T, s *Server, domain, actor string) { + t.Helper() + g, err := s.store.CityGovernance(context.Background(), domain, actor, "domain", domain) + if err != nil { + t.Fatal(err) + } + policy := "public" + _, err = s.store.ChangeCityGovernance(context.Background(), domain, actor, "domain", domain, store.CityGovernanceChange{Epoch: g.Epoch, TopologyVersion: g.TopologyVersion, Policy: &policy, ConfirmRelaxation: true}, false) + if err != nil { + t.Fatal(err) + } +} + +func createUserSpacePage(t *testing.T, s *Server, domain, target, body string) { + t.Helper() + object, err := s.store.CreatePageAtPathInDomain(domain, target) + if err != nil { + t.Fatal(err) + } + if _, err = s.store.SaveRevisionContent(object, []byte(body), "", "en", "text/html; charset=utf-8", target+".html"); err != nil { + t.Fatal(err) + } +} + +func TestUserSpacePolicyAndPublicRevision(t *testing.T) { + s, token, domain := configFixture(t) + owner, err := s.store.PrincipalForSession(domain, token) + if err != nil { + t.Fatal(err) + } + createUserSpacePage(t, s, domain, "/u/admin", "

    Public profile Wiki

    ") + createUserSpacePage(t, s, domain, "/u/admin/public", "

    public child

    ") + createUserSpacePage(t, s, domain, "/u/admin/private", "

    private child

    ") + proposal := store.UserSpacePolicy{PrincipalUUID: owner.UUID, Username: owner.Username, ProfileVisibility: "public", AvatarVisibility: "public", RootVisibility: "public", DescendantVisibility: "public"} + if _, err = s.store.SaveUserSpacePolicy(context.Background(), domain, owner.UUID, proposal); !errors.Is(err, store.ErrGovernanceCeiling) { + t.Fatalf("public without ceiling: %v", err) + } + enableDomainPublicCeiling(t, s, domain, owner.UUID) + proposal.Overrides = []store.UserSpacePathPolicy{{Path: "/u/admin/private", Visibility: "private"}} + saved, err := s.store.SaveUserSpacePolicy(context.Background(), domain, owner.UUID, proposal) + if err != nil || saved.Version != 1 { + t.Fatalf("save=%+v err=%v", saved, err) + } + if _, err = s.store.PublicUserSpaceRevision(context.Background(), domain, "admin", "/u/admin", []string{"en"}); err != nil { + t.Fatal(err) + } + if _, err = s.store.PublicUserSpaceRevision(context.Background(), domain, "admin", "/u/admin/public", []string{"en"}); err != nil { + t.Fatal(err) + } + if _, err = s.store.PublicUserSpaceRevision(context.Background(), domain, "admin", "/u/admin/private", []string{"en"}); !errors.Is(err, sql.ErrNoRows) { + t.Fatalf("private child published: %v", err) + } + if _, err = s.store.RenamePathsInDomain(domain, "/u/admin/private", "/u/admin/renamed-private", false); err != nil { + t.Fatal(err) + } + reloaded, err := s.store.UserSpacePolicy(context.Background(), domain, owner.UUID) + if err != nil || len(reloaded.Overrides) != 1 || reloaded.Overrides[0].Path != "/u/admin/renamed-private" { + t.Fatalf("override did not follow rename: %+v err=%v", reloaded.Overrides, err) + } + if _, err = s.store.PublicUserSpaceRevision(context.Background(), domain, "admin", "/u/admin/renamed-private", []string{"en"}); !errors.Is(err, sql.ErrNoRows) { + t.Fatalf("renamed private child published: %v", err) + } + if _, err = s.store.RenamePathsInDomain(domain, "/u/admin/renamed-private", "/outside", false); err == nil { + t.Fatal("protected override moved outside its owner namespace") + } + if _, err = s.store.SaveUserSpacePolicy(context.Background(), domain, owner.UUID, proposal); !errors.Is(err, store.ErrGovernanceConflict) { + t.Fatalf("stale save: %v", err) + } + publicObject, err := s.store.ResolvePathInDomain(domain, "/u/admin/public") + if err != nil { + t.Fatal(err) + } + if err = s.store.BindPathInDomain(domain, "/alias", publicObject); err != nil { + t.Fatal(err) + } + if _, err = s.store.PublicUserSpaceRevision(context.Background(), domain, "admin", "/u/admin/public", []string{"en"}); !errors.Is(err, sql.ErrNoRows) { + t.Fatalf("aliased object published: %v", err) + } + governance, err := s.store.CityGovernance(context.Background(), domain, owner.UUID, "domain", domain) + if err != nil { + t.Fatal(err) + } + closed := "authenticated_acl" + if _, err = s.store.ChangeCityGovernance(context.Background(), domain, owner.UUID, "domain", domain, store.CityGovernanceChange{Epoch: governance.Epoch, TopologyVersion: governance.TopologyVersion, Policy: &closed}, false); err != nil { + t.Fatal(err) + } + if _, err = s.store.PublicUserSpaceRevision(context.Background(), domain, "admin", "/u/admin", []string{"en"}); !errors.Is(err, sql.ErrNoRows) { + t.Fatalf("domain ceiling revocation did not close user space: %v", err) + } +} + +func TestPublicUserSpaceHTTP(t *testing.T) { + s, token, domain := configFixture(t) + owner, err := s.store.PrincipalForSession(domain, token) + if err != nil { + t.Fatal(err) + } + enableDomainPublicCeiling(t, s, domain, owner.UUID) + createUserSpacePage(t, s, domain, "/u/admin", `

    Public profile Wiki

    {{children}}

    `) + createUserSpacePage(t, s, domain, "/u/admin/public", "

    Public child

    ") + createUserSpacePage(t, s, domain, "/u/admin/private", "

    Private child

    ") + if err = s.store.SetPrincipalAvatar(owner.UUID, "image/png", []byte("not-a-real-image")); err != nil { + t.Fatal(err) + } + _, err = s.store.SaveUserSpacePolicy(context.Background(), domain, owner.UUID, store.UserSpacePolicy{ + PrincipalUUID: owner.UUID, Username: owner.Username, ProfileVisibility: "public", AvatarVisibility: "public", RootVisibility: "public", DescendantVisibility: "public", + Overrides: []store.UserSpacePathPolicy{{Path: "/u/admin/private", Visibility: "private"}}, + }) + if err != nil { + t.Fatal(err) + } + s.mux.HandleFunc("/u/", s.handleUserProfile) + s.mux.HandleFunc("/v/children", s.handleChildrenProjection) + call := func(target string, authenticated bool) *httptest.ResponseRecorder { + r := httptest.NewRequest(http.MethodGet, "http://localhost"+target, nil) + if authenticated { + r.Header.Set("Authorization", "Bearer "+token) + } + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + return w + } + if w := call("/u/admin", false); w.Code != http.StatusOK || !strings.Contains(w.Body.String(), "Public profile Wiki") || !strings.Contains(w.Body.String(), "Test Admin") { + t.Fatalf("public profile status=%d body=%s", w.Code, w.Body.String()) + } else if !strings.Contains(w.Body.String(), `data-children-src="/v/children?path=%2Fu%2Fadmin"`) { + t.Fatalf("profile children projection missing: %s", w.Body.String()) + } + if w := call("/u/admin/public", false); w.Code != http.StatusOK || !strings.Contains(w.Body.String(), "Public child") { + t.Fatalf("public child status=%d body=%s", w.Code, w.Body.String()) + } + if w := call("/u/admin/private", false); w.Code != http.StatusSeeOther { + t.Fatalf("private child status=%d body=%s", w.Code, w.Body.String()) + } + if w := call("/v/raw/path:/u/admin/public", false); w.Code != http.StatusOK || !strings.Contains(w.Body.String(), "Public child") { + t.Fatalf("public raw status=%d body=%s", w.Code, w.Body.String()) + } + if w := call("/v/raw/path:/u/admin/private", false); w.Code != http.StatusSeeOther { + t.Fatalf("private raw status=%d body=%s", w.Code, w.Body.String()) + } + if w := call("/v/children?path=/u/admin", false); w.Code != http.StatusOK || !strings.Contains(w.Body.String(), "/u/admin/public") || strings.Contains(w.Body.String(), "/u/admin/private") { + t.Fatalf("children status=%d body=%s", w.Code, w.Body.String()) + } + if w := call("/u/admin/_/avatar", false); w.Code != http.StatusOK || w.Header().Get("Content-Type") != "image/png" { + t.Fatalf("avatar status=%d", w.Code) + } + if w := call("/u/admin/_/edit", true); w.Code != http.StatusOK || !strings.Contains(w.Body.String(), `name="profile_visibility"`) { + t.Fatalf("settings status=%d body=%s", w.Code, w.Body.String()) + } + reader, err := s.store.CreatePasswordAccount(domain, "reader", "long enough test password", "Reader", "") + if err != nil { + t.Fatal(err) + } + readerToken, err := s.store.CreateAuthSession(domain, reader.UUID) + if err != nil { + t.Fatal(err) + } + r := httptest.NewRequest(http.MethodGet, "http://localhost/v/children?path=/u/admin", nil) + r.Header.Set("Authorization", "Bearer "+readerToken) + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + if w.Code != http.StatusOK || !strings.Contains(w.Body.String(), "/u/admin/public") || strings.Contains(w.Body.String(), "/u/admin/private") { + t.Fatalf("authenticated children audience status=%d body=%s", w.Code, w.Body.String()) + } + privateObject, err := s.store.ResolvePathInDomain(domain, "/u/admin/private") + if err != nil { + t.Fatal(err) + } + privateRevision, err := s.store.GetLatestRevision(privateObject) + if err != nil { + t.Fatal(err) + } + if err = s.authorizePrincipalObject(domain, reader.UUID, "read", privateObject); !errors.Is(err, store.ErrAccessDenied) { + t.Fatalf("private user object authorization=%v", err) + } + if err = s.authorizePrincipalRevision(domain, reader.UUID, "read", privateRevision.UUID); !errors.Is(err, store.ErrAccessDenied) { + t.Fatalf("private user revision authorization=%v", err) + } + form := url.Values{ + "action": {"visibility"}, + "visibility_version": {"1"}, + "profile_visibility": {"public"}, + "avatar_visibility": {"public"}, + "root_visibility": {"public"}, + "descendant_visibility": {"public"}, + "visibility_path": {"/u/admin/private"}, + "visibility_value": {"private"}, + } + r = httptest.NewRequest(http.MethodPost, "http://localhost/u/admin/_/edit", strings.NewReader(form.Encode())) + r.Header.Set("Authorization", "Bearer "+token) + r.Header.Set("Content-Type", "application/x-www-form-urlencoded") + w = httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + if w.Code != http.StatusSeeOther || w.Header().Get("Location") != "/u/admin/_/edit?visibility=saved" { + t.Fatalf("urlencoded visibility save status=%d location=%q body=%s", w.Code, w.Header().Get("Location"), w.Body.String()) + } +} diff --git a/internal/server/vim_settings.go b/internal/server/vim_settings.go new file mode 100644 index 0000000..3377114 --- /dev/null +++ b/internal/server/vim_settings.go @@ -0,0 +1,79 @@ +package server + +import ( + "encoding/json" + "net/http" + "net/url" + "strconv" + "strings" + "unicode/utf8" +) + +// Executable editor configuration is admin-owned Domain config, not a Page +// or a workspace file. Only a newly authorized Vim session receives it. +type vimSettings struct { + Enabled bool `json:"enabled"` + FontSize int `json:"font_size"` + Vimrc string `json:"vimrc"` + Colorscheme string `json:"colorscheme"` + ColorName string `json:"color_name"` +} + +func (s *Server) domainVimSettings(domain string) vimSettings { + settings := vimSettings{FontSize: 16} + _ = json.Unmarshal([]byte(s.getDomainConfig("vim_wasm_settings", domain)), &settings) + if settings.FontSize < 10 || settings.FontSize > 32 { + settings.FontSize = 16 + } + return settings +} + +func (s *Server) handleVimSettings(w http.ResponseWriter, r *http.Request) { + principal := s.requestPrincipal(r) + if principal == nil || principal.State != "active" || !s.canManageAssets(r) { + http.Error(w, "forbidden", http.StatusForbidden) + return + } + if r.Method != http.MethodPost { + w.Header().Set("Allow", "POST") + http.Error(w, "method not allowed", 405) + return + } + if origin := r.Header.Get("Origin"); origin != "" { + u, err := url.Parse(origin) + if err != nil || !strings.EqualFold(u.Host, r.Host) { + http.Error(w, "invalid origin", 403) + return + } + } + r.Body = http.MaxBytesReader(w, r.Body, 2<<20) + if err := r.ParseForm(); err != nil { + http.Error(w, "invalid settings request", 400) + return + } + settings := vimSettings{Enabled: r.FormValue("vim_enabled") == "on", Vimrc: r.FormValue("vimrc"), Colorscheme: r.FormValue("colorscheme"), ColorName: strings.TrimSpace(r.FormValue("color_name"))} + settings.FontSize, _ = strconv.Atoi(r.FormValue("font_size")) + if r.FormValue("reset") == "true" { + settings = vimSettings{FontSize: 16} + } + if settings.FontSize < 10 || settings.FontSize > 32 || len(settings.ColorName) > 200 || strings.ContainsAny(settings.ColorName, "/\\\r\n\x00") { + http.Error(w, translate(s.getLocale(s.domainUUIDForRequest(r)), "vim.invalid"), 400) + return + } + for _, value := range []string{settings.Vimrc, settings.Colorscheme} { + if len(value) > 65536 || !utf8.ValidString(value) || strings.ContainsRune(value, 0) { + http.Error(w, translate(s.getLocale(s.domainUUIDForRequest(r)), "vim.invalid"), 400) + return + } + } + encoded, _ := json.Marshal(settings) + if err := s.store.SetConfigInDomain(s.domainUUIDForRequest(r), "vim_wasm_settings", string(encoded)); err != nil { + http.Error(w, "could not save settings", 500) + return + } + if strings.Contains(r.Header.Get("Accept"), "application/json") { + writeEventJSON(w, 200, map[string]bool{"ok": true}) + return + } + http.Redirect(w, r, "/-/sys/config?panel=adapter-vim.wasm", http.StatusSeeOther) +} diff --git a/internal/server/vim_settings_test.go b/internal/server/vim_settings_test.go new file mode 100644 index 0000000..16f8a74 --- /dev/null +++ b/internal/server/vim_settings_test.go @@ -0,0 +1,76 @@ +package server + +import ( + "net/http/httptest" + "net/url" + "strings" + "testing" +) + +func TestDomainVimSettingsValidationAndAccess(t *testing.T) { + s, token, domain := configFixture(t) + s.mux.HandleFunc("/-/sys/config/vim", s.handleVimSettings) + form := url.Values{"font_size": {"19"}, "vim_enabled": {"on"}, "vimrc": {"set tabstop=2\n"}, "colorscheme": {"hi Normal guifg=#abcdef\n"}, "color_name": {"custom.vim"}} + w := configRequest(s, token, "POST", "/-/sys/config/vim", form) + if w.Code != 303 { + t.Fatalf("save %d %s", w.Code, w.Body.String()) + } + settings := s.domainVimSettings(domain) + if !settings.Enabled || settings.FontSize != 19 || settings.Vimrc != form.Get("vimrc") || settings.Colorscheme != form.Get("colorscheme") { + t.Fatalf("settings %#v", settings) + } + if got := s.domainVimSettings("other-domain"); got.Enabled || got.Vimrc != "" || got.FontSize != 16 { + t.Fatalf("cross-domain %#v", got) + } + for _, bad := range []struct{ key, value string }{{"font_size", "999"}, {"vimrc", strings.Repeat("x", 65537)}, {"colorscheme", "bad\x00text"}, {"color_name", "../../bad.vim"}, {"vimrc", string([]byte{0xff})}} { + old := form.Get(bad.key) + form.Set(bad.key, bad.value) + w = configRequest(s, token, "POST", "/-/sys/config/vim", form) + if w.Code != 400 { + t.Fatalf("accepted %s: %d", bad.key, w.Code) + } + if s.domainVimSettings(domain) != settings { + t.Fatal("invalid request overwrote settings") + } + form.Set(bad.key, old) + } + member, err := s.store.CreatePasswordAccount(domain, "member", "a long member password", "Member", "") + if err != nil { + t.Fatal(err) + } + memberToken, err := s.store.CreateAuthSession(domain, member.UUID) + if err != nil { + t.Fatal(err) + } + if w = configRequest(s, memberToken, "POST", "/-/sys/config/vim", form); w.Code != 403 { + t.Fatalf("member %d", w.Code) + } + r := httptest.NewRequest("POST", "http://localhost/-/sys/config/vim", strings.NewReader(form.Encode())) + r.Header.Set("Authorization", "Bearer "+token) + r.Header.Set("Origin", "https://evil.example") + r.Header.Set("Content-Type", "application/x-www-form-urlencoded") + w = httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + if w.Code != 403 { + t.Fatalf("cross-origin %d", w.Code) + } + form.Set("reset", "true") + w = configRequest(s, token, "POST", "/-/sys/config/vim", form) + if w.Code != 303 || s.domainVimSettings(domain).Vimrc != "" { + t.Fatal("reset failed") + } + owner, err := s.store.PrincipalForSession(domain, token) + if err != nil { + t.Fatal(err) + } + if err := s.store.SetPrincipalState(domain, owner.UUID, "readonly"); err != nil { + t.Fatal(err) + } + readonlyToken, err := s.store.CreateAuthSession(domain, owner.UUID) + if err != nil { + t.Fatal(err) + } + if w = configRequest(s, readonlyToken, "POST", "/-/sys/config/vim", form); w.Code != 403 { + t.Fatalf("readonly admin mutation: %d", w.Code) + } +} diff --git a/internal/server/vimwasm_browser_test.go b/internal/server/vimwasm_browser_test.go new file mode 100644 index 0000000..c36682b --- /dev/null +++ b/internal/server/vimwasm_browser_test.go @@ -0,0 +1,113 @@ +package server + +import ( + "context" + "encoding/base64" + "encoding/json" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "path/filepath" + "strings" + "testing" + "time" +) + +// Exercise the real pinned Wasm binary, font metrics and pure-Vimscript plugin +// against an isolated fake workspace; never writes to a production session. +func TestVimWasmChromiumSmoke(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + t.Chdir("../..") + if _, err := os.Stat("assets/vimwasm/node_modules/vim-wasm/vim.wasm"); err != nil { + t.Skip("npm ci in assets/vimwasm required") + } + report := make(chan string, 2) + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Cross-Origin-Opener-Policy", "same-origin") + w.Header().Set("Cross-Origin-Embedder-Policy", "require-corp") + w.Header().Set("Cross-Origin-Resource-Policy", "same-origin") + switch r.URL.Path { + case "/api/session": + writeEventJSON(w, 200, map[string]any{"initial": "one.txt", "vim_settings": vimSettings{Enabled: true, FontSize: 19, Vimrc: "colorscheme uploaded\nset tabstop=2\n", ColorName: "uploaded.vim", Colorscheme: "let g:colors_name='test_upload'\nhi Normal guifg=#abcdef guibg=#171d2b\n"}, "files": []map[string]string{{"path": "one.txt", "content": "Hello Vim"}, {"path": "nested/two.txt", "content": "Second buffer"}}}) + case "/api/save": + var body struct { + Content string `json:"content_base64"` + } + if err := json.NewDecoder(r.Body).Decode(&body); err != nil { + http.Error(w, err.Error(), 400) + return + } + data, err := base64.StdEncoding.DecodeString(body.Content) + if err != nil { + http.Error(w, err.Error(), 400) + return + } + select { + case report <- string(data): + default: + } + writeEventJSON(w, 200, map[string]bool{"ok": true}) + case "/app.js": + data, err := os.ReadFile("assets/vimwasm/app/app.js") + if err != nil { + http.Error(w, err.Error(), 500) + return + } + w.Header().Set("Content-Type", "text/javascript") + script := strings.Replace(string(data), "vim.focus()", `vim.focus(); void vim.cmdline("call writefile([&guifont,exists(':Files'),argc(),v:errmsg,&tabstop,get(g:,'colors_name','')],'/work/check.txt')").then(() => vim.cmdline("export /work/check.txt")).then(() => vim.cmdline("call setline(1, 'Edited by regression') | write"))`, 1) + script = strings.Replace(script, "if (!save.ok)", "document.body.dataset.vimSaves = String(Number(document.body.dataset.vimSaves || 0) + 1); if (document.body.dataset.vimSaves === '2') document.body.dataset.vimReady = 'true'; if (!save.ok)", 1) + _, _ = w.Write([]byte(script)) + case "/HackNerdFont-Regular.ttf": + http.ServeFile(w, r, "static/fonts/hack/HackNerdFont-Regular.ttf") + default: + if strings.HasPrefix(r.URL.Path, "/vendor/") { + http.ServeFile(w, r, filepath.Join("assets/vimwasm/node_modules/vim-wasm", filepath.Base(r.URL.Path))) + } else { + http.FileServer(http.Dir("assets/vimwasm/app")).ServeHTTP(w, r) + } + } + })) + defer server.Close() + for _, safe := range []bool{false, true} { + ctx, cancel := context.WithTimeout(context.Background(), 45*time.Second) + defer cancel() + target := server.URL + if safe { + target += "/?safe=1" + } + cmd := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", target, t.TempDir()) + if dir := os.Getenv("PAGESWIKI_BROWSER_ARTIFACTS"); dir != "" { + if err := os.MkdirAll(dir, 0755); err != nil { + t.Fatal(err) + } + cmd.Args = append(cmd.Args, filepath.Join(dir, "vim.png")) + } + out, err := cmd.CombinedOutput() + if err != nil || strings.Contains(string(out), "Uncaught ") { + t.Fatalf("vim browser: %v %s", err, out) + } + select { + case result := <-report: + expected := "PagesWikiHack:h19\n2\n2\n\n2\ntest_upload\n" + if safe { + expected = "PagesWikiHack:h16\n2\n2\n\n4\n" + } + if (!safe && result != expected) || (safe && !strings.HasPrefix(result, expected)) { + t.Fatalf("vim startup report: %q\n%s", result, out) + } + default: + t.Fatalf("Vim never exported startup report: %s", out) + } + select { + case result := <-report: + if !strings.HasPrefix(result, "Edited by regression") { + t.Fatalf("write-back: %q", result) + } + case <-time.After(3 * time.Second): + t.Fatal("BufWritePost did not export the edited file") + } + } +} diff --git a/internal/server/virtual_folder.go b/internal/server/virtual_folder.go new file mode 100644 index 0000000..c2fd24e --- /dev/null +++ b/internal/server/virtual_folder.go @@ -0,0 +1,5 @@ +package server + +func (s *Server) getVirtualFolderPages(domainUUID ...string) bool { + return s.getDomainConfig("virtual_folder_pages", domainUUID...) == "true" +} diff --git a/internal/server/virtual_folder_test.go b/internal/server/virtual_folder_test.go new file mode 100644 index 0000000..e705438 --- /dev/null +++ b/internal/server/virtual_folder_test.go @@ -0,0 +1,43 @@ +package server + +import ( + "testing" + + "pageswiki/internal/db" + "pageswiki/internal/store" +) + +func TestVirtualFolderPagesAreDomainScopedAndOptIn(t *testing.T) { + database, err := db.Open(t.TempDir() + "/pages.db") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + + st := store.New(database) + if err := st.EnsureConfigTable(); err != nil { + t.Fatal(err) + } + domain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + srv := &Server{store: st} + + if srv.getVirtualFolderPages(domain.UUID) { + t.Fatal("virtual folder pages must be disabled by default") + } + if err := st.SetConfigInDomain( + domain.UUID, + "virtual_folder_pages", + "true", + ); err != nil { + t.Fatal(err) + } + if !srv.getVirtualFolderPages(domain.UUID) { + t.Fatal("enabled domain did not expose virtual folder pages") + } +} diff --git a/internal/server/wiki_name.go b/internal/server/wiki_name.go index a632e56..0f6f8f2 100644 --- a/internal/server/wiki_name.go +++ b/internal/server/wiki_name.go @@ -1,15 +1,11 @@ package server -func (s *Server) getWikiName() string { - - name, err := - s.store.GetConfig( - "wiki_name", - ) - - if err != nil || name == "" { - return "Pages Wiki" +func (s *Server) getWikiName(domainUUID ...string) string { + if len(domainUUID) > 0 && domainUUID[0] != "" { + domain, err := s.store.GetDomainByUUID(domainUUID[0]) + if err == nil && domain.Title != "" { + return domain.Title + } } - - return name + return s.currentDomain().Title } diff --git a/internal/server/zombie_config.go b/internal/server/zombie_config.go index 1b5d951..6e9457d 100644 --- a/internal/server/zombie_config.go +++ b/internal/server/zombie_config.go @@ -1,15 +1,14 @@ package server -import "strconv" +import ( + "math" + "strconv" +) -func (s *Server) getZombieGraceHours() int64 { +func (s *Server) getZombieGraceHours(domainUUID ...string) int64 { - raw, err := - s.store.GetConfig( - "zombie_grace_hours", - ) - - if err != nil || raw == "" { + raw := s.getDomainConfig("zombie_grace_hours", domainUUID...) + if raw == "" { return 24 } @@ -27,7 +26,10 @@ func (s *Server) getZombieGraceHours() int64 { return n } -func (s *Server) getZombieGraceSeconds() int64 { - - return s.getZombieGraceHours() * 60 * 60 +func (s *Server) getZombieGraceSeconds(domainUUID ...string) int64 { + hours := s.getZombieGraceHours(domainUUID...) + if hours > math.MaxInt64/3600 { + return math.MaxInt64 + } + return hours * 3600 } diff --git a/internal/store/activity_outbox.go b/internal/store/activity_outbox.go new file mode 100644 index 0000000..ca3edde --- /dev/null +++ b/internal/store/activity_outbox.go @@ -0,0 +1,303 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "strings" + "time" + + "github.com/google/uuid" +) + +// ActivityOutboxEvent is the small, immutable envelope written together with +// a source mutation. Payloads are deliberately opaque to the store; consumers +// must re-authorize the referenced object when they project it. +type ActivityOutboxEvent struct { + UUID string + DomainUUID string + EventType string + ActorUUID string + TargetKind string + TargetUUID string + Payload string + IdempotencyKey string +} + +type ActivityOutboxRecord struct { + UUID string `json:"uuid"` + DomainUUID string `json:"domain_uuid"` + Sequence int64 `json:"sequence"` + EventType string `json:"event_type"` + ActorUUID string `json:"actor_uuid,omitempty"` + TargetKind string `json:"target_kind,omitempty"` + TargetUUID string `json:"target_uuid,omitempty"` + Payload string `json:"payload,omitempty"` + IdempotencyKey string `json:"idempotency_key"` + Status string `json:"status"` + Attempts int `json:"attempts"` + NextAttemptMS int64 `json:"next_attempt_ms"` + LastError string `json:"last_error,omitempty"` + CreatedAtMS int64 `json:"created_at_ms"` + ClaimedAtMS int64 `json:"claimed_at_ms,omitempty"` +} + +type ActivityOutboxCheckpoint struct { + ConsumerID string `json:"consumer_id"` + DomainUUID string `json:"domain_uuid"` + LastSequence int64 `json:"last_sequence"` + UpdatedAtMS int64 `json:"updated_at_ms"` +} + +var ErrActivityOutboxInput = errors.New("invalid activity outbox event") + +func (s *Store) EnsureActivityOutboxSchema() error { + statements := []string{ + `CREATE TABLE IF NOT EXISTS activity_outbox ( + uuid TEXT PRIMARY KEY, + domain_uuid TEXT NOT NULL, + sequence INTEGER NOT NULL, + event_type TEXT NOT NULL, + actor_uuid TEXT NOT NULL DEFAULT '', + target_kind TEXT NOT NULL DEFAULT '', + target_uuid TEXT NOT NULL DEFAULT '', + payload TEXT NOT NULL DEFAULT '', + idempotency_key TEXT NOT NULL, + status TEXT NOT NULL DEFAULT 'pending', + attempts INTEGER NOT NULL DEFAULT 0, + next_attempt_ms INTEGER NOT NULL, + last_error TEXT NOT NULL DEFAULT '', + created_at_ms INTEGER NOT NULL, + claimed_at_ms INTEGER NOT NULL DEFAULT 0, + UNIQUE(domain_uuid, sequence), + UNIQUE(domain_uuid, idempotency_key) + )`, + `CREATE INDEX IF NOT EXISTS idx_activity_outbox_pending + ON activity_outbox(status, next_attempt_ms, domain_uuid, sequence)`, + `CREATE INDEX IF NOT EXISTS idx_activity_outbox_target + ON activity_outbox(domain_uuid, target_uuid, sequence)`, + `CREATE TABLE IF NOT EXISTS activity_outbox_checkpoints ( + consumer_id TEXT NOT NULL, + domain_uuid TEXT NOT NULL, + last_sequence INTEGER NOT NULL DEFAULT 0, + updated_at_ms INTEGER NOT NULL, + PRIMARY KEY(consumer_id, domain_uuid) + )`, + } + for _, statement := range statements { + if _, err := s.DB.Exec(statement); err != nil { + return err + } + } + return s.ensureActivitySubscriptions() +} + +// AppendActivityOutboxTx must be called using the transaction that commits the +// source mutation. Repeated idempotency keys return the original envelope and +// never create a second Domain sequence number. +func (s *Store) AppendActivityOutboxTx(tx *sql.Tx, event ActivityOutboxEvent) (ActivityOutboxRecord, bool, error) { + event.DomainUUID = strings.TrimSpace(event.DomainUUID) + event.EventType = strings.TrimSpace(event.EventType) + event.IdempotencyKey = strings.TrimSpace(event.IdempotencyKey) + if event.DomainUUID == "" || event.EventType == "" || event.IdempotencyKey == "" { + return ActivityOutboxRecord{}, false, ErrActivityOutboxInput + } + if event.UUID == "" { + event.UUID = uuid.NewString() + } + var existing ActivityOutboxRecord + err := scanActivityOutbox(tx.QueryRow(`SELECT `+activityOutboxColumns+` + FROM activity_outbox WHERE domain_uuid=? AND idempotency_key=?`, event.DomainUUID, event.IdempotencyKey), &existing) + if err == nil { + return existing, false, nil + } + if !errors.Is(err, sql.ErrNoRows) { + return ActivityOutboxRecord{}, false, err + } + var sequence int64 + if err := tx.QueryRow(`SELECT COALESCE(MAX(last_sequence),0)+1 FROM activity_outbox_heads WHERE domain_uuid=?`, event.DomainUUID).Scan(&sequence); err != nil { + return ActivityOutboxRecord{}, false, err + } + now := time.Now().UnixMilli() + if _, err := tx.Exec(`INSERT INTO activity_outbox + (uuid,domain_uuid,sequence,event_type,actor_uuid,target_kind,target_uuid,payload,idempotency_key,status,attempts,next_attempt_ms,last_error,created_at_ms,claimed_at_ms) + VALUES(?,?,?,?,?,?,?,?,?,'pending',0,?,'',?,0)`, event.UUID, event.DomainUUID, sequence, event.EventType, + event.ActorUUID, event.TargetKind, event.TargetUUID, event.Payload, event.IdempotencyKey, now, now); err != nil { + return ActivityOutboxRecord{}, false, err + } + var created ActivityOutboxRecord + if err := scanActivityOutbox(tx.QueryRow(`SELECT `+activityOutboxColumns+` FROM activity_outbox WHERE uuid=?`, event.UUID), &created); err != nil { + return ActivityOutboxRecord{}, false, err + } + return created, true, nil +} + +// appendActivityOutboxIfAvailable keeps lightweight legacy fixtures (which +// intentionally construct only a subset of the schema) usable while every +// normal Store created through New has the outbox table. +func (s *Store) appendActivityOutboxIfAvailable(tx *sql.Tx, event ActivityOutboxEvent) error { + var present int + if err := tx.QueryRow(`SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='activity_outbox'`).Scan(&present); err != nil { + return err + } + if present == 0 { + return nil + } + _, _, err := s.AppendActivityOutboxTx(tx, event) + return err +} + +func (s *Store) appendRevisionActivityOutboxIfAvailable(tx *sql.Tx, revision *Revision) error { + var domainUUID string + err := tx.QueryRow(`SELECT domain_uuid FROM paths WHERE object_uuid=? ORDER BY is_primary DESC, path LIMIT 1`, revision.ObjectUUID).Scan(&domainUUID) + if errors.Is(err, sql.ErrNoRows) { + return nil + } + if err != nil { + // Asset-only or legacy fixtures may not have a path for the object. + return nil + } + payload, err := json.Marshal(map[string]any{ + "revision_uuid": revision.UUID, "object_uuid": revision.ObjectUUID, + "document_hash": revision.DocumentHash, "content_type": revision.ContentType, + "filename": revision.Filename, + }) + if err != nil { + return err + } + return s.appendActivityOutboxIfAvailable(tx, ActivityOutboxEvent{ + DomainUUID: domainUUID, EventType: "revision.created", TargetKind: "revision", TargetUUID: revision.UUID, + Payload: string(payload), IdempotencyKey: "revision.created:" + revision.UUID, + }) +} + +const activityOutboxColumns = `uuid,domain_uuid,sequence,event_type,actor_uuid,target_kind,target_uuid,payload,idempotency_key,status,attempts,next_attempt_ms,last_error,created_at_ms,claimed_at_ms` + +func scanActivityOutbox(scanner interface{ Scan(...any) error }, out *ActivityOutboxRecord) error { + return scanner.Scan(&out.UUID, &out.DomainUUID, &out.Sequence, &out.EventType, &out.ActorUUID, &out.TargetKind, + &out.TargetUUID, &out.Payload, &out.IdempotencyKey, &out.Status, &out.Attempts, &out.NextAttemptMS, + &out.LastError, &out.CreatedAtMS, &out.ClaimedAtMS) +} + +// PendingActivityOutbox returns a bounded page for a worker or repair command. +// Claiming is intentionally separate so consumers can use their own lease and +// authorization policy without making reads of the source object implicit. +// Deprecated: this is a legacy-status inspection, not consumer pending work. +// New workers must use ActivityOutboxForConsumer and their own checkpoint. +func (s *Store) PendingActivityOutbox(ctx context.Context, domainUUID string, limit int) ([]ActivityOutboxRecord, error) { + if limit < 1 || limit > 500 { + limit = 100 + } + rows, err := s.DB.QueryContext(ctx, `SELECT `+activityOutboxColumns+` FROM activity_outbox + WHERE status='pending' AND next_attempt_ms<=? AND (?='' OR domain_uuid=?) + ORDER BY domain_uuid,sequence LIMIT ?`, time.Now().UnixMilli(), domainUUID, domainUUID, limit) + if err != nil { + return nil, err + } + defer rows.Close() + items := make([]ActivityOutboxRecord, 0, limit) + for rows.Next() { + var item ActivityOutboxRecord + if err := scanActivityOutbox(rows, &item); err != nil { + return nil, err + } + items = append(items, item) + } + return items, rows.Err() +} + +// ActivityOutboxAfter reads the immutable Domain sequence independently for +// each consumer. It intentionally includes every status: a consumer's +// checkpoint, rather than a shared job status, is the delivery contract. +func (s *Store) ActivityOutboxAfter(ctx context.Context, domainUUID string, afterSequence int64, limit int) ([]ActivityOutboxRecord, error) { + if strings.TrimSpace(domainUUID) == "" || afterSequence < 0 { + return nil, ErrActivityOutboxInput + } + if limit < 1 || limit > 500 { + limit = 100 + } + rows, err := s.DB.QueryContext(ctx, `SELECT `+activityOutboxColumns+` FROM activity_outbox + WHERE domain_uuid=? AND sequence>? ORDER BY sequence LIMIT ?`, domainUUID, afterSequence, limit) + if err != nil { + return nil, err + } + defer rows.Close() + items := make([]ActivityOutboxRecord, 0, limit) + for rows.Next() { + var item ActivityOutboxRecord + if err := scanActivityOutbox(rows, &item); err != nil { + return nil, err + } + items = append(items, item) + } + return items, rows.Err() +} + +func (s *Store) ActivityOutboxCheckpoint(consumerID, domainUUID string) (ActivityOutboxCheckpoint, error) { + consumerID, domainUUID = strings.TrimSpace(consumerID), strings.TrimSpace(domainUUID) + if consumerID == "" || domainUUID == "" { + return ActivityOutboxCheckpoint{}, ErrActivityOutboxInput + } + var checkpoint ActivityOutboxCheckpoint + err := s.DB.QueryRow(`SELECT consumer_id,domain_uuid,last_sequence,updated_at_ms FROM activity_outbox_checkpoints WHERE consumer_id=? AND domain_uuid=?`, consumerID, domainUUID). + Scan(&checkpoint.ConsumerID, &checkpoint.DomainUUID, &checkpoint.LastSequence, &checkpoint.UpdatedAtMS) + if errors.Is(err, sql.ErrNoRows) { + return ActivityOutboxCheckpoint{ConsumerID: consumerID, DomainUUID: domainUUID}, nil + } + return checkpoint, err +} + +// AdvanceActivityOutboxCheckpointTx is monotonic and safe to call after an +// idempotently completed consumer action. A stale retry can never move the +// checkpoint backwards. +func (s *Store) AdvanceActivityOutboxCheckpointTx(tx *sql.Tx, consumerID, domainUUID string, sequence int64) error { + consumerID, domainUUID = strings.TrimSpace(consumerID), strings.TrimSpace(domainUUID) + if consumerID == "" || domainUUID == "" || sequence < 0 { + return ErrActivityOutboxInput + } + now := time.Now().UnixMilli() + _, err := tx.Exec(`INSERT INTO activity_outbox_checkpoints(consumer_id,domain_uuid,last_sequence,updated_at_ms) + VALUES(?,?,?,?) ON CONFLICT(consumer_id,domain_uuid) DO UPDATE SET + last_sequence=CASE WHEN excluded.last_sequence>last_sequence THEN excluded.last_sequence ELSE last_sequence END, + updated_at_ms=CASE WHEN excluded.last_sequence>last_sequence THEN excluded.updated_at_ms ELSE updated_at_ms END`, consumerID, domainUUID, sequence, now) + return err +} + +func (s *Store) AdvanceActivityOutboxCheckpoint(consumerID, domainUUID string, sequence int64) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + if err := s.AdvanceActivityOutboxCheckpointTx(tx, consumerID, domainUUID, sequence); err != nil { + return err + } + return tx.Commit() +} + +// Deprecated: use PendingActivityConsumerDomains; a shared status cannot +// represent delivery to independent subscribers. +func (s *Store) PendingActivityOutboxDomains(ctx context.Context) ([]string, error) { + rows, err := s.DB.QueryContext(ctx, `SELECT DISTINCT domain_uuid FROM activity_outbox WHERE status='pending' ORDER BY domain_uuid LIMIT 100`) + if err != nil { + return nil, err + } + defer rows.Close() + domains := make([]string, 0) + for rows.Next() { + var domain string + if err := rows.Scan(&domain); err != nil { + return nil, err + } + domains = append(domains, domain) + } + return domains, rows.Err() +} + +// CompleteActivityOutboxThrough acknowledges only this consumer. The legacy +// per-event status is not a delivery receipt for any other subscriber. +// A failed projection must not call this. +func (s *Store) CompleteActivityOutboxThrough(consumerID, domainUUID string, sequence int64) error { + return s.AdvanceActivityOutboxCheckpoint(consumerID, domainUUID, sequence) +} diff --git a/internal/store/activity_outbox_test.go b/internal/store/activity_outbox_test.go new file mode 100644 index 0000000..a7d4364 --- /dev/null +++ b/internal/store/activity_outbox_test.go @@ -0,0 +1,198 @@ +package store + +import ( + "context" + "database/sql" + "testing" + + _ "modernc.org/sqlite" + "pageswiki/internal/db" +) + +func TestActivityOutboxIdempotencyAndDomainSequence(t *testing.T) { + db, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + defer db.Close() + s := &Store{DB: db} + if err := s.EnsureActivityOutboxSchema(); err != nil { + t.Fatal(err) + } + tx, err := db.Begin() + if err != nil { + t.Fatal(err) + } + first, created, err := s.AppendActivityOutboxTx(tx, ActivityOutboxEvent{ + DomainUUID: "domain-a", EventType: "page.updated", ActorUUID: "actor-a", + TargetKind: "page", TargetUUID: "page-a", Payload: `{"revision":"r1"}`, IdempotencyKey: "request-1", + }) + if err != nil || !created || first.Sequence != 1 { + t.Fatalf("first append=%+v created=%v err=%v", first, created, err) + } + second, created, err := s.AppendActivityOutboxTx(tx, ActivityOutboxEvent{ + DomainUUID: "domain-a", EventType: "page.updated", ActorUUID: "actor-a", TargetUUID: "page-a", + IdempotencyKey: "request-1", + }) + if err != nil || created || second.UUID != first.UUID || second.Sequence != first.Sequence { + t.Fatalf("duplicate append=%+v created=%v err=%v", second, created, err) + } + if _, _, err := s.AppendActivityOutboxTx(tx, ActivityOutboxEvent{DomainUUID: "domain-a", EventType: "page.updated", IdempotencyKey: "request-2"}); err != nil { + t.Fatal(err) + } + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + items, err := s.PendingActivityOutbox(context.Background(), "domain-a", 10) + if err != nil || len(items) != 2 || items[0].Sequence != 1 || items[1].Sequence != 2 { + t.Fatalf("pending=%+v err=%v", items, err) + } + if _, err := s.PendingActivityOutbox(context.Background(), "domain-a", 0); err != nil { + t.Fatal(err) + } +} + +func TestActivityOutboxRejectsMissingIdentity(t *testing.T) { + db, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + defer db.Close() + s := &Store{DB: db} + if err := s.EnsureActivityOutboxSchema(); err != nil { + t.Fatal(err) + } + tx, err := db.Begin() + if err != nil { + t.Fatal(err) + } + defer tx.Rollback() + if _, _, err := s.AppendActivityOutboxTx(tx, ActivityOutboxEvent{DomainUUID: "domain-a", EventType: "page.updated"}); err != ErrActivityOutboxInput { + t.Fatalf("err=%v", err) + } +} + +func TestActivityOutboxConsumerCheckpointIsMonotonic(t *testing.T) { + db, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + defer db.Close() + s := &Store{DB: db} + if err := s.EnsureActivityOutboxSchema(); err != nil { + t.Fatal(err) + } + tx, err := db.Begin() + if err != nil { + t.Fatal(err) + } + for i := 0; i < 3; i++ { + if _, _, err := s.AppendActivityOutboxTx(tx, ActivityOutboxEvent{DomainUUID: "domain-a", EventType: "test.event", IdempotencyKey: "event-" + string(rune('a'+i))}); err != nil { + t.Fatal(err) + } + } + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + items, err := s.ActivityOutboxAfter(context.Background(), "domain-a", 0, 10) + if err != nil || len(items) != 3 || items[2].Sequence != 3 { + t.Fatalf("items=%+v err=%v", items, err) + } + if err := s.AdvanceActivityOutboxCheckpoint("city", "domain-a", 3); err != nil { + t.Fatal(err) + } + if err := s.AdvanceActivityOutboxCheckpoint("city", "domain-a", 1); err != nil { + t.Fatal(err) + } + checkpoint, err := s.ActivityOutboxCheckpoint("city", "domain-a") + if err != nil || checkpoint.LastSequence != 3 { + t.Fatalf("checkpoint=%+v err=%v", checkpoint, err) + } + items, err = s.ActivityOutboxAfter(context.Background(), "domain-a", checkpoint.LastSequence, 10) + if err != nil || len(items) != 0 { + t.Fatalf("after checkpoint=%+v err=%v", items, err) + } +} + +func TestPageAndRevisionMutationsAppendOutboxInSourceTransactions(t *testing.T) { + database, err := db.Open(t.TempDir() + "/pages.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + s := NewWithDocumentRoot(database, t.TempDir()+"/documents") + domain, err := s.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + objectUUID, err := s.CreatePageAtPathInDomain(domain.UUID, "/outbox/page") + if err != nil { + t.Fatal(err) + } + if _, err := s.SaveRevisionContent(objectUUID, []byte("

    outbox

    "), "test", "en", "text/html", "page.html"); err != nil { + t.Fatal(err) + } + var created, revisions int + if err := database.QueryRow(`SELECT COUNT(*) FROM activity_outbox WHERE event_type='page.created' AND target_uuid=?`, objectUUID).Scan(&created); err != nil { + t.Fatal(err) + } + if err := database.QueryRow(`SELECT COUNT(*) FROM activity_outbox WHERE event_type='revision.created' AND target_kind='revision'`).Scan(&revisions); err != nil { + t.Fatal(err) + } + if created != 1 || revisions != 1 { + t.Fatalf("outbox page=%d revisions=%d", created, revisions) + } +} + +func TestPathMutationsAppendOutbox(t *testing.T) { + database, err := db.Open(t.TempDir() + "/paths.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + s := NewWithDocumentRoot(database, t.TempDir()+"/documents") + domain, err := s.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + object, err := s.CreatePageAtPathInDomain(domain.UUID, "/outbox/rename") + if err != nil { + t.Fatal(err) + } + if _, err := s.RenamePathsInDomain(domain.UUID, "/outbox/rename", "/outbox/renamed", false); err != nil { + t.Fatal(err) + } + snapshot, err := s.SnapshotPathsInDomain(domain.UUID, "/outbox/renamed", false) + if err != nil { + t.Fatal(err) + } + if _, err := s.RemovePathsInDomainChecked(domain.UUID, []*PathMutationSnapshot{snapshot}); err != nil { + t.Fatal(err) + } + other, err := s.CreatePageAtPathInDomain(domain.UUID, "/outbox/delete") + if err != nil { + t.Fatal(err) + } + deletion, err := s.SnapshotObjectDeletionInDomain(domain.UUID, other) + if err != nil { + t.Fatal(err) + } + if err := s.DeleteObjectInDomainChecked(domain.UUID, other, deletion); err != nil { + t.Fatal(err) + } + for _, eventType := range []string{"path.renamed", "path.unlinked", "object.deleted"} { + var count int + if err := database.QueryRow(`SELECT COUNT(*) FROM activity_outbox WHERE event_type=?`, eventType).Scan(&count); err != nil { + t.Fatal(err) + } + if count != 1 { + t.Fatalf("event %s count=%d object=%s", eventType, count, object) + } + } +} diff --git a/internal/store/activity_subscriptions.go b/internal/store/activity_subscriptions.go new file mode 100644 index 0000000..dedd531 --- /dev/null +++ b/internal/store/activity_subscriptions.go @@ -0,0 +1,127 @@ +package store + +import ( + "context" + "strings" +) + +// Subscriptions are trusted worker configuration, never request parameters. +// Changing the type set requires a NEW consumer ID: its cursor may already +// have passed old events of a newly added type. +type ActivitySubscription struct { + ConsumerID string + EventTypes []string +} + +func (sub ActivitySubscription) filter() (string, []any, error) { + if strings.TrimSpace(sub.ConsumerID) == "" || len(sub.ConsumerID) > 100 || len(sub.EventTypes) == 0 || len(sub.EventTypes) > 16 { + return "", nil, ErrActivityOutboxInput + } + args := make([]any, 0, len(sub.EventTypes)) + marks := make([]string, 0, len(sub.EventTypes)) + for _, typ := range sub.EventTypes { + if strings.TrimSpace(typ) == "" || len(typ) > 100 { + return "", nil, ErrActivityOutboxInput + } + args = append(args, typ) + marks = append(marks, "?") + } + return strings.Join(marks, ","), args, nil +} + +// Only the initial upgrade scans the old journal. Thereafter the INSERT +// trigger updates a small per-Domain/type watermark in the source transaction. +func (s *Store) ensureActivitySubscriptions() error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + for _, q := range []string{ + `CREATE TABLE IF NOT EXISTS activity_outbox_heads(domain_uuid TEXT NOT NULL,event_type TEXT NOT NULL,last_sequence INTEGER NOT NULL,PRIMARY KEY(domain_uuid,event_type))`, + `CREATE INDEX IF NOT EXISTS idx_activity_heads_type ON activity_outbox_heads(event_type,domain_uuid,last_sequence)`, + `CREATE INDEX IF NOT EXISTS idx_activity_outbox_subscription ON activity_outbox(domain_uuid,event_type,sequence)`, + `CREATE TABLE IF NOT EXISTS activity_outbox_migrations(name TEXT PRIMARY KEY)`, + `CREATE TRIGGER IF NOT EXISTS activity_outbox_advance_head AFTER INSERT ON activity_outbox BEGIN + INSERT INTO activity_outbox_heads(domain_uuid,event_type,last_sequence) VALUES(NEW.domain_uuid,NEW.event_type,NEW.sequence) + ON CONFLICT(domain_uuid,event_type) DO UPDATE SET last_sequence=MAX(last_sequence,excluded.last_sequence); END`, + } { + if _, err = tx.Exec(q); err != nil { + return err + } + } + var migrated bool + if err = tx.QueryRow(`SELECT EXISTS(SELECT 1 FROM activity_outbox_migrations WHERE name='typed-heads-v1')`).Scan(&migrated); err != nil { + return err + } + if !migrated { + if _, err = tx.Exec(`INSERT INTO activity_outbox_heads(domain_uuid,event_type,last_sequence) SELECT domain_uuid,event_type,MAX(sequence) FROM activity_outbox GROUP BY domain_uuid,event_type ON CONFLICT(domain_uuid,event_type) DO UPDATE SET last_sequence=MAX(last_sequence,excluded.last_sequence)`); err != nil { + return err + } + if _, err = tx.Exec(`INSERT INTO activity_outbox_migrations(name) VALUES('typed-heads-v1')`); err != nil { + return err + } + } + return tx.Commit() +} + +// PendingActivityConsumerDomains does not scan event history or rely on the +// legacy shared status. Acknowledgment by another consumer cannot hide work. +func (s *Store) PendingActivityConsumerDomains(ctx context.Context, sub ActivitySubscription, limit int) ([]string, error) { + marks, args, err := sub.filter() + if err != nil { + return nil, err + } + if limit < 1 || limit > 100 { + limit = 100 + } + args = append([]any{sub.ConsumerID}, args...) + args = append(args, limit) + rows, err := s.DB.QueryContext(ctx, `SELECT h.domain_uuid FROM activity_outbox_heads h LEFT JOIN activity_outbox_checkpoints c ON c.domain_uuid=h.domain_uuid AND c.consumer_id=? WHERE h.event_type IN (`+marks+`) AND h.last_sequence>COALESCE(c.last_sequence,0) GROUP BY h.domain_uuid ORDER BY COALESCE(c.updated_at_ms,0),h.domain_uuid LIMIT ?`, args...) + if err != nil { + return nil, err + } + defer rows.Close() + out := []string{} + for rows.Next() { + var domain string + if err = rows.Scan(&domain); err != nil { + return nil, err + } + out = append(out, domain) + } + return out, rows.Err() +} + +// The SQL limit is applied per type first, so unrelated floods and SQLite's +// final multi-type ordering cannot materialize an unbounded pending backlog. +func (s *Store) ActivityOutboxForConsumer(ctx context.Context, sub ActivitySubscription, domain string, limit int) ([]ActivityOutboxRecord, error) { + _, _, err := sub.filter() + if err != nil || domain == "" { + return nil, ErrActivityOutboxInput + } + if limit < 1 || limit > 500 { + limit = 100 + } + queries := []string{} + args := []any{} + for _, typ := range sub.EventTypes { + queries = append(queries, `SELECT * FROM (SELECT `+activityOutboxColumns+` FROM activity_outbox WHERE domain_uuid=? AND event_type=? AND sequence>COALESCE((SELECT last_sequence FROM activity_outbox_checkpoints WHERE consumer_id=? AND domain_uuid=?),0) ORDER BY sequence LIMIT ?)`) + args = append(args, domain, typ, sub.ConsumerID, domain, limit) + } + args = append(args, limit) + rows, err := s.DB.QueryContext(ctx, strings.Join(queries, " UNION ")+` ORDER BY sequence LIMIT ?`, args...) + if err != nil { + return nil, err + } + defer rows.Close() + items := []ActivityOutboxRecord{} + for rows.Next() { + var item ActivityOutboxRecord + if err = scanActivityOutbox(rows, &item); err != nil { + return nil, err + } + items = append(items, item) + } + return items, rows.Err() +} diff --git a/internal/store/activity_subscriptions_test.go b/internal/store/activity_subscriptions_test.go new file mode 100644 index 0000000..cd0070f --- /dev/null +++ b/internal/store/activity_subscriptions_test.go @@ -0,0 +1,178 @@ +package store + +import ( + "context" + "database/sql" + "fmt" + "testing" + + _ "modernc.org/sqlite" +) + +func subscriptionFixture(t *testing.T) *Store { + t.Helper() + db, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + db.SetMaxOpenConns(1) + t.Cleanup(func() { db.Close() }) + s := &Store{DB: db} + if err = s.EnsureActivityOutboxSchema(); err != nil { + t.Fatal(err) + } + return s +} + +func appendSubscriptionEvent(t *testing.T, s *Store, domain, typ, key string) ActivityOutboxRecord { + t.Helper() + tx, err := s.DB.Begin() + if err != nil { + t.Fatal(err) + } + defer tx.Rollback() + e, _, err := s.AppendActivityOutboxTx(tx, ActivityOutboxEvent{DomainUUID: domain, EventType: typ, IdempotencyKey: key}) + if err != nil { + t.Fatal(err) + } + if err = tx.Commit(); err != nil { + t.Fatal(err) + } + return e +} + +func TestActivitySubscriptionsIndependentFilteringAndPagination(t *testing.T) { + s := subscriptionFixture(t) + ctx := context.Background() + city := ActivitySubscription{ConsumerID: "city", EventTypes: []string{"page.created", "revision.created"}} + other := ActivitySubscription{ConsumerID: "other.v1", EventTypes: []string{"page.created"}} + tasks := ActivitySubscription{ConsumerID: "tasks.v1", EventTypes: []string{"organizer.task.changed"}} + appendSubscriptionEvent(t, s, "d", "organizer.task.changed", "t1") + if ds, err := s.PendingActivityConsumerDomains(ctx, city, 100); err != nil || len(ds) != 0 { + t.Fatal(ds, err) + } + p1 := appendSubscriptionEvent(t, s, "d", "page.created", "p1") + appendSubscriptionEvent(t, s, "other-domain", "organizer.task.changed", "o1") + p2 := appendSubscriptionEvent(t, s, "d", "revision.created", "p2") + p3 := appendSubscriptionEvent(t, s, "d", "page.created", "p3") + for _, sub := range []ActivitySubscription{city, other, tasks} { + ds, err := s.PendingActivityConsumerDomains(ctx, sub, 100) + if err != nil || len(ds) == 0 { + t.Fatal(sub, ds, err) + } + } + page, err := s.ActivityOutboxForConsumer(ctx, city, "d", 2) + if err != nil || len(page) != 2 || page[0].UUID != p1.UUID || page[1].UUID != p2.UUID { + t.Fatal(page, err) + } + if err = s.CompleteActivityOutboxThrough("city", "d", p2.Sequence); err != nil { + t.Fatal(err) + } + page, err = s.ActivityOutboxForConsumer(ctx, city, "d", 2) + if err != nil || len(page) != 1 || page[0].UUID != p3.UUID { + t.Fatal(page, err) + } + if err = s.CompleteActivityOutboxThrough("city", "d", p3.Sequence); err != nil { + t.Fatal(err) + } + if ds, err := s.PendingActivityConsumerDomains(ctx, city, 100); err != nil || len(ds) != 0 { + t.Fatal(ds, err) + } + // One subscriber finishing never acknowledges work for another one. + page, err = s.ActivityOutboxForConsumer(ctx, other, "d", 10) + if err != nil || len(page) != 2 { + t.Fatal(page, err) + } + page, err = s.ActivityOutboxForConsumer(ctx, tasks, "d", 10) + if err != nil || len(page) != 1 { + t.Fatal(page, err) + } + if err = s.CompleteActivityOutboxThrough("city", "d", p1.Sequence); err != nil { + t.Fatal(err) + } + cp, err := s.ActivityOutboxCheckpoint("city", "d") + if err != nil || cp.LastSequence != p3.Sequence { + t.Fatal(cp, err) + } + // Old shared processed flags also must not hide events from a late consumer. + if _, err = s.DB.Exec(`UPDATE activity_outbox SET status='processed'`); err != nil { + t.Fatal(err) + } + page, err = s.ActivityOutboxForConsumer(ctx, other, "d", 10) + if err != nil || len(page) != 2 { + t.Fatal(page, err) + } + if ds, err := s.PendingActivityConsumerDomains(ctx, other, 100); err != nil || len(ds) != 1 { + t.Fatal(ds, err) + } +} + +func TestActivitySubscriptionWatermarksMigrationRollbackAndSequence(t *testing.T) { + s := subscriptionFixture(t) + for i := 0; i < 5; i++ { + appendSubscriptionEvent(t, s, "d", "page.created", fmt.Sprint(i)) + } + // Emulate a pre-upgrade database, including a processed legacy event. + for _, q := range []string{`DROP TRIGGER activity_outbox_advance_head`, `DROP TABLE activity_outbox_heads`, `DELETE FROM activity_outbox_migrations`, `UPDATE activity_outbox SET status='processed'`} { + if _, err := s.DB.Exec(q); err != nil { + t.Fatal(err) + } + } + if err := s.EnsureActivityOutboxSchema(); err != nil { + t.Fatal(err) + } + if err := s.EnsureActivityOutboxSchema(); err != nil { + t.Fatal("idempotent migration", err) + } + sub := ActivitySubscription{ConsumerID: "late", EventTypes: []string{"page.created"}} + if domains, err := s.PendingActivityConsumerDomains(context.Background(), sub, 100); err != nil || len(domains) != 1 { + t.Fatal(domains, err) + } + tx, err := s.DB.Begin() + if err != nil { + t.Fatal(err) + } + if _, _, err = s.AppendActivityOutboxTx(tx, ActivityOutboxEvent{DomainUUID: "d", EventType: "rollback", IdempotencyKey: "rollback"}); err != nil { + t.Fatal(err) + } + tx.Rollback() + var count int + if err = s.DB.QueryRow(`SELECT count(*) FROM activity_outbox_heads WHERE event_type='rollback'`).Scan(&count); err != nil || count != 0 { + t.Fatal(count, err) + } + // A future retention implementation must preserve watermarks. No automatic + // retention is introduced here; this verifies sequence allocation safety. + if _, err = s.DB.Exec(`DELETE FROM activity_outbox WHERE domain_uuid='d'`); err != nil { + t.Fatal(err) + } + next := appendSubscriptionEvent(t, s, "d", "page.created", "next") + if next.Sequence != 6 { + t.Fatal(next) + } +} + +func TestActivitySubscriptionSkipsUnrelatedFlood(t *testing.T) { + s := subscriptionFixture(t) + tx, err := s.DB.Begin() + if err != nil { + t.Fatal(err) + } + for i := 0; i < 1200; i++ { + if _, _, err = s.AppendActivityOutboxTx(tx, ActivityOutboxEvent{DomainUUID: "d", EventType: "organizer.task.changed", IdempotencyKey: fmt.Sprint(i)}); err != nil { + t.Fatal(err) + } + } + if err = tx.Commit(); err != nil { + t.Fatal(err) + } + want := appendSubscriptionEvent(t, s, "d", "page.created", "page") + items, err := s.ActivityOutboxForConsumer(context.Background(), ActivitySubscription{ConsumerID: "city", EventTypes: []string{"page.created"}}, "d", 1) + if err != nil || len(items) != 1 || items[0].UUID != want.UUID { + t.Fatal(items, err) + } + for _, sub := range []ActivitySubscription{{ConsumerID: "empty"}, {EventTypes: []string{"page.created"}}, {ConsumerID: "bad", EventTypes: []string{""}}} { + if _, err = s.PendingActivityConsumerDomains(context.Background(), sub, 1); err != ErrActivityOutboxInput { + t.Fatal("invalid subscription", err) + } + } +} diff --git a/internal/store/adapter_sessions.go b/internal/store/adapter_sessions.go new file mode 100644 index 0000000..21dbcb4 --- /dev/null +++ b/internal/store/adapter_sessions.go @@ -0,0 +1,171 @@ +package store + +import ( + "crypto/rand" + "crypto/sha256" + "database/sql" + "encoding/base64" + "encoding/hex" + "errors" + "time" +) + +var ( + ErrAdapterTicketInvalid = errors.New("adapter launch ticket is invalid or expired") + ErrAdapterSessionInvalid = errors.New("adapter session is invalid or expired") + ErrRevisionConflict = errors.New("document changed after the hosted editor session started") +) + +type AdapterSession struct { + PrincipalUUID string + DomainUUID string + PluginID string + ObjectUUID string + BaseRevisionUUID string + RootPath string + SessionHash string + ExpiresAtMS int64 +} + +func adapterSecret(prefix string) (string, string, error) { + raw := make([]byte, 32) + if _, err := rand.Read(raw); err != nil { + return "", "", err + } + token := prefix + base64.RawURLEncoding.EncodeToString(raw) + hash := sha256.Sum256([]byte(token)) + return token, hex.EncodeToString(hash[:]), nil +} + +func (s *Store) EnsureAdapterSessionsSchema() error { + _, err := s.DB.Exec(`CREATE TABLE IF NOT EXISTS adapter_sessions ( + ticket_hash TEXT PRIMARY KEY, session_hash TEXT NOT NULL DEFAULT '', + domain_uuid TEXT NOT NULL, plugin_id TEXT NOT NULL, object_uuid TEXT NOT NULL, + principal_uuid TEXT NOT NULL DEFAULT '', + base_revision_uuid TEXT NOT NULL, ticket_expires_at_ms INTEGER NOT NULL, + session_expires_at_ms INTEGER NOT NULL DEFAULT 0, exchanged_at_ms INTEGER NOT NULL DEFAULT 0, + created_at_ms INTEGER NOT NULL + )`) + if err != nil { + return err + } + _, _ = s.DB.Exec(`ALTER TABLE adapter_sessions ADD COLUMN root_path TEXT NOT NULL DEFAULT ''`) + _, _ = s.DB.Exec(`ALTER TABLE adapter_sessions ADD COLUMN principal_uuid TEXT NOT NULL DEFAULT ''`) + _, err = s.DB.Exec(`CREATE UNIQUE INDEX IF NOT EXISTS idx_adapter_session_hash + ON adapter_sessions(session_hash) WHERE session_hash != ''`) + return err +} + +func (s *Store) IssueAdapterTicket(domainUUID, pluginID, objectUUID, revisionUUID, rootPath string) (string, error) { + return s.issueAdapterTicket("", domainUUID, pluginID, objectUUID, revisionUUID, rootPath) +} + +func (s *Store) IssueAdapterTicketForPrincipal(principalUUID, domainUUID, pluginID, objectUUID, revisionUUID, rootPath string) (string, error) { + return s.issueAdapterTicket(principalUUID, domainUUID, pluginID, objectUUID, revisionUUID, rootPath) +} + +func (s *Store) issueAdapterTicket(principalUUID, domainUUID, pluginID, objectUUID, revisionUUID, rootPath string) (string, error) { + token, hash, err := adapterSecret("pwa_t_") + if err != nil { + return "", err + } + now := time.Now().UnixMilli() + _, _ = s.DB.Exec(`DELETE FROM adapter_sessions WHERE + (ticket_expires_at_ms < ? AND exchanged_at_ms=0) OR + (session_expires_at_ms > 0 AND session_expires_at_ms < ?)`, now, now) + _, err = s.DB.Exec(`INSERT INTO adapter_sessions + (ticket_hash,domain_uuid,plugin_id,object_uuid,principal_uuid,base_revision_uuid,root_path,ticket_expires_at_ms,created_at_ms) + VALUES(?,?,?,?,?,?,?,?,?)`, hash, domainUUID, pluginID, objectUUID, principalUUID, revisionUUID, rootPath, now+60_000, now) + return token, err +} + +func secretHash(token string) string { + hash := sha256.Sum256([]byte(token)) + return hex.EncodeToString(hash[:]) +} + +func (s *Store) ExchangeAdapterTicket(ticket string) (string, *AdapterSession, error) { + tx, err := s.DB.Begin() + if err != nil { + return "", nil, err + } + defer tx.Rollback() + now := time.Now().UnixMilli() + var session AdapterSession + var exchanged int64 + err = tx.QueryRow(`SELECT principal_uuid,domain_uuid,plugin_id,object_uuid,base_revision_uuid,root_path, + ticket_expires_at_ms,exchanged_at_ms FROM adapter_sessions WHERE ticket_hash=?`, + secretHash(ticket)).Scan(&session.PrincipalUUID, &session.DomainUUID, &session.PluginID, &session.ObjectUUID, + &session.BaseRevisionUUID, &session.RootPath, &session.ExpiresAtMS, &exchanged) + if errors.Is(err, sql.ErrNoRows) || err == nil && (exchanged != 0 || session.ExpiresAtMS < now) { + return "", nil, ErrAdapterTicketInvalid + } + if err != nil { + return "", nil, err + } + token, hash, err := adapterSecret("pwa_s_") + if err != nil { + return "", nil, err + } + session.SessionHash = hash + session.ExpiresAtMS = now + int64((8*time.Hour)/time.Millisecond) + result, err := tx.Exec(`UPDATE adapter_sessions SET session_hash=?,session_expires_at_ms=?, + exchanged_at_ms=? WHERE ticket_hash=? AND exchanged_at_ms=0`, hash, session.ExpiresAtMS, + now, secretHash(ticket)) + if err != nil { + return "", nil, err + } + count, _ := result.RowsAffected() + if count != 1 { + return "", nil, ErrAdapterTicketInvalid + } + if err := tx.Commit(); err != nil { + return "", nil, err + } + return token, &session, nil +} + +func (s *Store) GetAdapterSession(token string) (*AdapterSession, error) { + var session AdapterSession + err := s.DB.QueryRow(`SELECT principal_uuid,domain_uuid,plugin_id,object_uuid,base_revision_uuid,root_path, + session_hash,session_expires_at_ms FROM adapter_sessions WHERE session_hash=?`, + secretHash(token)).Scan(&session.PrincipalUUID, &session.DomainUUID, &session.PluginID, &session.ObjectUUID, + &session.BaseRevisionUUID, &session.RootPath, &session.SessionHash, &session.ExpiresAtMS) + if errors.Is(err, sql.ErrNoRows) || err == nil && session.ExpiresAtMS < time.Now().UnixMilli() { + return nil, ErrAdapterSessionInvalid + } + return &session, err +} + +func (s *Store) SaveHostedRevision(session *AdapterSession, payload []byte, message string) (*Revision, error) { + return s.SaveHostedRevisionAt(session, session.ObjectUUID, session.BaseRevisionUUID, payload, message) +} + +func (s *Store) SaveHostedRevisionAt(session *AdapterSession, objectUUID, baseRevisionUUID string, payload []byte, message string) (*Revision, error) { + s.revisionWriteMu.Lock() + defer s.revisionWriteMu.Unlock() + base, err := s.GetRevision(baseRevisionUUID) + if err != nil { + return nil, err + } + if base.ObjectUUID != objectUUID { + return nil, ErrAdapterSessionInvalid + } + latest, err := s.GetLatestRevisionForLanguages(objectUUID, []string{base.Language}) + if err != nil { + return nil, err + } + if latest.UUID != baseRevisionUUID { + return nil, ErrRevisionConflict + } + revision, err := s.saveRevisionContentUnlocked(objectUUID, payload, message, + base.Language, base.ContentType, base.Filename) + if err == nil && objectUUID == session.ObjectUUID { + _, err = s.DB.Exec(`UPDATE adapter_sessions SET base_revision_uuid=? WHERE session_hash=?`, + revision.UUID, session.SessionHash) + if err == nil { + session.BaseRevisionUUID = revision.UUID + } + } + return revision, err +} diff --git a/internal/store/adapter_sessions_test.go b/internal/store/adapter_sessions_test.go new file mode 100644 index 0000000..a18084f --- /dev/null +++ b/internal/store/adapter_sessions_test.go @@ -0,0 +1,92 @@ +package store_test + +import ( + "errors" + "testing" + + "pageswiki/internal/db" + "pageswiki/internal/store" +) + +func TestAdapterTicketIsOneUseAndHostedSaveDetectsConflict(t *testing.T) { + database, err := db.Open(t.TempDir() + "/pages.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := store.New(database) + domain := mustDefaultDomainUUID(t, st) + objectUUID, err := st.CreatePageAtPath("/hosted.txt") + if err != nil { + t.Fatal(err) + } + base, err := st.SaveRevisionContent(objectUUID, []byte("base"), "base", "und", "text/plain", "hosted.txt") + if err != nil { + t.Fatal(err) + } + ticket, err := st.IssueAdapterTicket(domain, "hosted.test", objectUUID, base.UUID, "/notes") + if err != nil { + t.Fatal(err) + } + sessionToken, session, err := st.ExchangeAdapterTicket(ticket) + if err != nil || sessionToken == "" { + t.Fatalf("exchange = %q, %v", sessionToken, err) + } + if _, _, err := st.ExchangeAdapterTicket(ticket); !errors.Is(err, store.ErrAdapterTicketInvalid) { + t.Fatalf("second exchange error = %v", err) + } + loaded, err := st.GetAdapterSession(sessionToken) + if err != nil || loaded.BaseRevisionUUID != base.UUID { + t.Fatalf("session = %#v, %v", loaded, err) + } + if _, err := st.SaveHostedRevision(session, []byte("hosted"), "hosted save"); err != nil { + t.Fatal(err) + } + + otherTicket, err := st.IssueAdapterTicket(domain, "hosted.test", objectUUID, base.UUID, "/notes") + if err != nil { + t.Fatal(err) + } + _, stale, err := st.ExchangeAdapterTicket(otherTicket) + if err != nil { + t.Fatal(err) + } + if _, err := st.SaveHostedRevision(stale, []byte("stale"), "stale save"); !errors.Is(err, store.ErrRevisionConflict) { + t.Fatalf("stale save error = %v", err) + } +} + +func TestAdapterSessionBindsIssuingPrincipal(t *testing.T) { + database, err := db.Open(t.TempDir() + "/pages.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := store.New(database) + domain := mustDefaultDomainUUID(t, st) + objectUUID, err := st.CreatePageAtPath("/bound.txt") + if err != nil { + t.Fatal(err) + } + base, err := st.SaveRevisionContent(objectUUID, []byte("base"), "base", "und", "text/plain", "bound.txt") + if err != nil { + t.Fatal(err) + } + ticket, err := st.IssueAdapterTicketForPrincipal("principal-1", domain, "hosted.test", objectUUID, base.UUID, "/bound.txt") + if err != nil { + t.Fatal(err) + } + _, session, err := st.ExchangeAdapterTicket(ticket) + if err != nil { + t.Fatal(err) + } + if session.PrincipalUUID != "principal-1" { + t.Fatalf("principal binding = %q", session.PrincipalUUID) + } +} diff --git a/internal/store/asset_freeze.go b/internal/store/asset_freeze.go new file mode 100644 index 0000000..726ea97 --- /dev/null +++ b/internal/store/asset_freeze.go @@ -0,0 +1,124 @@ +package store + +import ( + "bytes" + "database/sql" + "errors" + "fmt" + "io" + "strings" + + "golang.org/x/net/html" +) + +var ErrEmbeddedAssetUnavailable = errors.New("embedded asset is unavailable") + +// freezeEmbeddedAssets resolves mutable asset: HEADs only in HTML embedding +// attributes. Plain text and code examples containing asset: remain unchanged. +func (s *Store) freezeEmbeddedAssets(objectUUID string, payload []byte, contentType string) ([]byte, []string, error) { + return freezeEmbeddedAssetsFrom(s.DB, objectUUID, payload, contentType) +} + +func freezeEmbeddedAssetsFrom(q interface{ QueryRow(string, ...any) *sql.Row }, objectUUID string, payload []byte, contentType string) ([]byte, []string, error) { + if !strings.HasPrefix(strings.ToLower(strings.TrimSpace(contentType)), "text/html") { + return payload, nil, nil + } + z := html.NewTokenizer(bytes.NewReader(payload)) + var output bytes.Buffer + seen := map[string]bool{} + resolved := map[string]string{} + var hashes []string + resolve := func(address string) (string, error) { + if hash := resolved[address]; hash != "" { + return hash, nil + } + var hash string + err := q.QueryRow(`SELECT COALESCE(a.head_document_hash,'') FROM assets a JOIN paths p ON p.domain_uuid=a.domain_uuid WHERE p.object_uuid=? AND a.address=? ORDER BY COALESCE(p.is_primary,0) DESC LIMIT 1`, objectUUID, address).Scan(&hash) + if err != nil || !validDocumentHash(hash) { + if errors.Is(err, sql.ErrNoRows) || err == nil { + return "", fmt.Errorf("%w: %s", ErrEmbeddedAssetUnavailable, address) + } + return "", err + } + resolved[address] = hash + if !seen[hash] { + seen[hash] = true + hashes = append(hashes, hash) + } + return hash, nil + } + for { + typeOfToken := z.Next() + if typeOfToken == html.ErrorToken { + if errors.Is(z.Err(), io.EOF) { + return output.Bytes(), hashes, nil + } + return nil, nil, z.Err() + } + if typeOfToken != html.StartTagToken && typeOfToken != html.SelfClosingTagToken { + output.Write(z.Raw()) + continue + } + token := z.Token() + changed := false + assetRef := tokenAttribute(token.Attr, "asset-ref") + legacyImmutableRef := tokenAttribute(token.Attr, "immutable-ref") + if assetRef == "" && strings.HasPrefix(legacyImmutableRef, "asset:") { + assetRef = legacyImmutableRef + } + if strings.HasPrefix(assetRef, "asset:") { + hash, err := resolve(assetRef) + if err != nil { + return nil, nil, err + } + setTokenAttribute(&token, "asset-ref", assetRef) + setTokenAttribute(&token, "immutable-ref", "sha256:"+hash) + changed = true + } + for _, name := range []string{"src", "href", "poster", "data"} { + provenanceName := "data-pageswiki-asset-" + name + address := tokenAttribute(token.Attr, provenanceName) + if address == "" { + candidate := tokenAttribute(token.Attr, name) + if strings.HasPrefix(candidate, "asset:") { + address = candidate + } + } + if !strings.HasPrefix(address, "asset:") { + continue + } + hash, err := resolve(address) + if err != nil { + return nil, nil, err + } + setTokenAttribute(&token, provenanceName, address) + setTokenAttribute(&token, name, "/_/obj/sha256:"+hash) + changed = true + } + if changed { + output.WriteString(token.String()) + } else { + output.Write(z.Raw()) + } + } +} + +func tokenAttribute(attributes []html.Attribute, name string) string { + for _, attribute := range attributes { + if strings.EqualFold(attribute.Key, name) { + return strings.TrimSpace(attribute.Val) + } + } + return "" +} + +func setTokenAttribute(token *html.Token, name, value string) { + for index := range token.Attr { + if strings.EqualFold(token.Attr[index].Key, name) { + token.Attr[index].Key = name + token.Attr[index].Val = value + return + } + } + token.Attr = append(token.Attr, html.Attribute{Key: name, Val: value}) +} diff --git a/internal/store/asset_freeze_test.go b/internal/store/asset_freeze_test.go new file mode 100644 index 0000000..eeea2df --- /dev/null +++ b/internal/store/asset_freeze_test.go @@ -0,0 +1,84 @@ +package store + +import ( + "errors" + "strings" + "testing" + + "pageswiki/internal/db" +) + +func TestSaveRevisionFreezesEmbeddedAssetHeads(t *testing.T) { + database, err := db.Open(t.TempDir() + "/assets.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := New(database) + domain, _ := st.GetDefaultDomain() + assetObject, _ := st.CreatePageAtPathInDomain(domain.UUID, "/media/logo.png") + assetRevision, err := st.SaveRevisionContent(assetObject, []byte("image bytes"), "asset", "und", "image/png", "logo.png") + if err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`INSERT INTO assets(domain_uuid,address,object_uuid,head_document_hash,content_type,filename,size_bytes,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,?,?,?,?)`, domain.UUID, "asset:image:logo", assetObject, assetRevision.DocumentHash, "image/png", "logo.png", 11, 1, 1); err != nil { + t.Fatal(err) + } + pageObject, _ := st.CreatePageAtPathInDomain(domain.UUID, "/guide") + body := `

    Example asset:image:logo

    ` + revision, err := st.SaveRevisionContent(pageObject, []byte(body), "page", "und", "text/html; charset=utf-8", "") + if err != nil { + t.Fatal(err) + } + if !strings.Contains(revision.Body, `src="/_/obj/sha256:`+assetRevision.DocumentHash+`"`) || + !strings.Contains(revision.Body, `data-pageswiki-asset-src="asset:image:logo"`) || + !strings.Contains(revision.Body, `asset-ref="asset:image:logo"`) || + !strings.Contains(revision.Body, `immutable-ref="sha256:`+assetRevision.DocumentHash+`"`) { + t.Fatalf("asset references were not frozen: %s", revision.Body) + } + if !strings.Contains(revision.Body, "Example asset:image:logo") { + t.Fatalf("plain text asset address was changed: %s", revision.Body) + } + references, err := st.DocumentReferencesInDomain(domain.UUID, assetRevision.DocumentHash) + if err != nil { + t.Fatal(err) + } + foundGuide := false + for _, reference := range references { + foundGuide = foundGuide || reference.Path == "/guide" + } + if !foundGuide { + t.Fatalf("embedded Document is not authorized through containing Page: %#v", references) + } + nextAssetRevision, err := st.SaveRevisionContent(assetObject, []byte("new image bytes"), "asset", "und", "image/png", "logo.png") + if err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`UPDATE assets SET head_document_hash=? WHERE domain_uuid=? AND address=?`, nextAssetRevision.DocumentHash, domain.UUID, "asset:image:logo"); err != nil { + t.Fatal(err) + } + resaved, err := st.SaveRevisionContent(pageObject, []byte(revision.Body), "resave", "und", "text/html", "") + if err != nil { + t.Fatal(err) + } + if !strings.Contains(resaved.Body, `src="/_/obj/sha256:`+nextAssetRevision.DocumentHash+`"`) || !strings.Contains(resaved.Body, `asset-ref="asset:image:logo"`) { + t.Fatalf("resave did not follow Asset HEAD while retaining provenance: %s", resaved.Body) + } +} + +func TestSaveRevisionRejectsUnavailableEmbeddedAsset(t *testing.T) { + database, _ := db.Open(t.TempDir() + "/assets.db") + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := New(database) + objectUUID, _ := st.CreatePageAtPath("/guide") + _, err := st.SaveRevisionContent(objectUUID, []byte(``), "page", "und", "text/html", "") + if !errors.Is(err, ErrEmbeddedAssetUnavailable) { + t.Fatalf("error=%v, want ErrEmbeddedAssetUnavailable", err) + } +} diff --git a/internal/store/assets.go b/internal/store/assets.go new file mode 100644 index 0000000..485b9ba --- /dev/null +++ b/internal/store/assets.go @@ -0,0 +1,361 @@ +package store + +import ( + "database/sql" + "errors" + "fmt" + "strings" + "time" + + "github.com/google/uuid" +) + +var ( + ErrAssetNotFound = errors.New("asset not found") + ErrAssetConflict = errors.New("asset HEAD conflict") +) + +type Asset struct { + DomainUUID string `json:"domain_uuid"` + Address string `json:"address"` + ObjectUUID string `json:"object_uuid"` + HeadDocumentHash string `json:"head_document_hash"` + ContentType string `json:"content_type"` + Filename string `json:"filename"` + SizeBytes int64 `json:"size_bytes"` + CreatedAtMS int64 `json:"created_at_ms"` + UpdatedAtMS int64 `json:"updated_at_ms"` + ReferenceCount int `json:"reference_count"` +} + +type AssetHistory struct { + ID int64 `json:"id"` + Action string `json:"action"` + DocumentHash string `json:"document_hash"` + ContentType string `json:"content_type"` + Filename string `json:"filename"` + SizeBytes int64 `json:"size_bytes"` + ActorUUID string `json:"actor_uuid"` + CreatedAtMS int64 `json:"created_at_ms"` +} + +type AssetDependency struct { + DocumentHash string `json:"document_hash"` + RevisionUUID string `json:"revision_uuid"` + ObjectUUID string `json:"object_uuid"` + Path string `json:"path"` + CreatedAtMS int64 `json:"created_at_ms"` +} + +func (s *Store) EnsureAssetsSchema() error { + columns, err := assetTableColumns(s.DB, "assets") + if err != nil { + return err + } + if len(columns) == 0 { + if _, err = s.DB.Exec(assetTableSQL); err != nil { + return err + } + } else if !columns["domain_uuid"] { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + if _, err = tx.Exec(`ALTER TABLE assets RENAME TO assets_legacy`); err != nil { + return err + } + if _, err = tx.Exec(assetTableSQL); err != nil { + return err + } + if _, err = tx.Exec(` + INSERT INTO assets(domain_uuid,address,object_uuid,head_document_hash,content_type,filename,size_bytes,created_at_ms,updated_at_ms) + SELECT COALESCE((SELECT uuid FROM domains WHERE name='default' ORDER BY id LIMIT 1),(SELECT uuid FROM domains ORDER BY id LIMIT 1)),address,object_uuid,head_document_hash,'application/octet-stream','',0,created_at_ms,updated_at_ms + FROM assets_legacy + `); err != nil { + return err + } + if _, err = tx.Exec(`DROP TABLE assets_legacy`); err != nil { + return err + } + if err = tx.Commit(); err != nil { + return err + } + } else if _, err = s.DB.Exec(assetTableSQL); err != nil { + return err + } + _, err = s.DB.Exec(`CREATE TABLE IF NOT EXISTS asset_head_history( + id INTEGER PRIMARY KEY AUTOINCREMENT,domain_uuid TEXT NOT NULL,address TEXT NOT NULL, + action TEXT NOT NULL DEFAULT 'put', + document_hash TEXT NOT NULL,content_type TEXT NOT NULL DEFAULT 'application/octet-stream', + filename TEXT NOT NULL DEFAULT '',size_bytes INTEGER NOT NULL DEFAULT 0, + actor_uuid TEXT NOT NULL DEFAULT '',created_at_ms INTEGER NOT NULL + )`) + _, _ = s.DB.Exec(`ALTER TABLE asset_head_history ADD COLUMN action TEXT NOT NULL DEFAULT 'put'`) + if err != nil { + return err + } + _, err = s.DB.Exec(`CREATE INDEX IF NOT EXISTS idx_asset_history_domain_address_hash ON asset_head_history(domain_uuid,address,document_hash)`) + if err != nil { + return err + } + return err +} + +const assetTableSQL = `CREATE TABLE IF NOT EXISTS assets( + domain_uuid TEXT NOT NULL,address TEXT NOT NULL,object_uuid TEXT NOT NULL, + head_document_hash TEXT,content_type TEXT NOT NULL DEFAULT 'application/octet-stream', + filename TEXT NOT NULL DEFAULT '',size_bytes INTEGER NOT NULL DEFAULT 0, + created_at_ms INTEGER NOT NULL,updated_at_ms INTEGER NOT NULL, + PRIMARY KEY(domain_uuid,address),UNIQUE(object_uuid) +)` + +func assetTableColumns(db *sql.DB, table string) (map[string]bool, error) { + rows, err := db.Query(`PRAGMA table_info(` + table + `)`) + if err != nil { + return nil, err + } + defer rows.Close() + out := map[string]bool{} + for rows.Next() { + var cid, notnull, pk int + var name, kind string + var defaultValue any + if err := rows.Scan(&cid, &name, &kind, ¬null, &defaultValue, &pk); err != nil { + return nil, err + } + out[name] = true + } + return out, rows.Err() +} + +func (s *Store) ListAssets(domainUUID string) ([]Asset, error) { + rows, err := s.DB.Query(`SELECT a.domain_uuid,a.address,a.object_uuid,COALESCE(a.head_document_hash,''),a.content_type,a.filename,a.size_bytes,a.created_at_ms,a.updated_at_ms,(SELECT COUNT(DISTINCT x.revision_uuid) FROM revision_document_refs x JOIN revisions r ON r.uuid=x.revision_uuid WHERE x.document_hash IN (SELECT document_hash FROM asset_head_history h WHERE h.domain_uuid=a.domain_uuid AND h.address=a.address UNION SELECT a.head_document_hash) AND EXISTS(SELECT 1 FROM paths p WHERE p.domain_uuid=a.domain_uuid AND p.object_uuid=r.object_uuid)) FROM assets a WHERE a.domain_uuid=? ORDER BY a.updated_at_ms DESC,a.address`, domainUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var assets []Asset + for rows.Next() { + var a Asset + if err := rows.Scan(&a.DomainUUID, &a.Address, &a.ObjectUUID, &a.HeadDocumentHash, &a.ContentType, &a.Filename, &a.SizeBytes, &a.CreatedAtMS, &a.UpdatedAtMS, &a.ReferenceCount); err != nil { + return nil, err + } + assets = append(assets, a) + } + return assets, rows.Err() +} + +func (s *Store) GetAsset(domainUUID, address string) (*Asset, error) { + var a Asset + err := s.DB.QueryRow(`SELECT a.domain_uuid,a.address,a.object_uuid,COALESCE(a.head_document_hash,''),a.content_type,a.filename,a.size_bytes,a.created_at_ms,a.updated_at_ms,(SELECT COUNT(DISTINCT x.revision_uuid) FROM revision_document_refs x JOIN revisions r ON r.uuid=x.revision_uuid WHERE x.document_hash IN (SELECT document_hash FROM asset_head_history h WHERE h.domain_uuid=a.domain_uuid AND h.address=a.address UNION SELECT a.head_document_hash) AND EXISTS(SELECT 1 FROM paths p WHERE p.domain_uuid=a.domain_uuid AND p.object_uuid=r.object_uuid)) FROM assets a WHERE a.domain_uuid=? AND a.address=?`, domainUUID, address).Scan(&a.DomainUUID, &a.Address, &a.ObjectUUID, &a.HeadDocumentHash, &a.ContentType, &a.Filename, &a.SizeBytes, &a.CreatedAtMS, &a.UpdatedAtMS, &a.ReferenceCount) + if errors.Is(err, sql.ErrNoRows) { + return nil, ErrAssetNotFound + } + return &a, err +} + +func (s *Store) GetAssetByHeadHash(domainUUID, hash string) (*Asset, error) { + hash = strings.ToLower(strings.TrimSpace(hash)) + if !validDocumentHash(hash) { + return nil, ErrAssetNotFound + } + var a Asset + err := s.DB.QueryRow(`SELECT a.domain_uuid,a.address,a.object_uuid,COALESCE(a.head_document_hash,''),a.content_type,a.filename,a.size_bytes,a.created_at_ms,a.updated_at_ms,(SELECT COUNT(DISTINCT x.revision_uuid) FROM revision_document_refs x JOIN revisions r ON r.uuid=x.revision_uuid WHERE x.document_hash IN (SELECT document_hash FROM asset_head_history h WHERE h.domain_uuid=a.domain_uuid AND h.address=a.address UNION SELECT a.head_document_hash) AND EXISTS(SELECT 1 FROM paths p WHERE p.domain_uuid=a.domain_uuid AND p.object_uuid=r.object_uuid)) FROM assets a WHERE a.domain_uuid=? AND a.head_document_hash=? LIMIT 1`, domainUUID, hash).Scan(&a.DomainUUID, &a.Address, &a.ObjectUUID, &a.HeadDocumentHash, &a.ContentType, &a.Filename, &a.SizeBytes, &a.CreatedAtMS, &a.UpdatedAtMS, &a.ReferenceCount) + if errors.Is(err, sql.ErrNoRows) { + return nil, ErrAssetNotFound + } + return &a, err +} + +func normalizeAssetAddress(address string) (string, error) { + address = strings.TrimSpace(address) + parts := strings.SplitN(address, ":", 3) + if len(parts) != 3 || parts[0] != "asset" || strings.TrimSpace(parts[1]) == "" || strings.TrimSpace(parts[2]) == "" { + return "", fmt.Errorf("invalid asset address") + } + return address, nil +} + +func (s *Store) PutAsset(domainUUID, address string, payload []byte, contentType, filename, expectedHash, actorUUID string) (*Asset, bool, error) { + if s.DocumentRoot == "" { + return nil, false, errors.New("Asset writes require a configured Document Store") + } + address, err := normalizeAssetAddress(address) + if err != nil { + return nil, false, err + } + current, getErr := s.GetAsset(domainUUID, address) + if getErr != nil && !errors.Is(getErr, ErrAssetNotFound) { + return nil, false, getErr + } + if getErr == nil && expectedHash == "" { + return nil, false, ErrAssetConflict + } + if strings.TrimSpace(contentType) == "" { + contentType = "application/octet-stream" + } + filename = strings.TrimSpace(filename) + if expectedHash != "" && (getErr != nil || current.HeadDocumentHash != strings.Trim(expectedHash, "\"")) { + return nil, false, ErrAssetConflict + } + hash := revisionHash(string(payload)) + if getErr == nil && current.HeadDocumentHash == hash && current.ContentType == contentType && current.Filename == filename { + return current, false, nil + } + if err := s.persistDocument(hash, string(payload)); err != nil { + return nil, false, err + } + if strings.TrimSpace(contentType) == "" { + contentType = "application/octet-stream" + } + filename = strings.TrimSpace(filename) + now := time.Now().UnixMilli() + tx, err := s.DB.Begin() + if err != nil { + return nil, false, err + } + defer tx.Rollback() + if getErr != nil { + objectUUID := uuid.NewString() + if _, err = tx.Exec(`INSERT INTO objects(uuid,kind,created_at) VALUES(?,'asset',?)`, objectUUID, now/1000); err != nil { + return nil, false, err + } + _, err = tx.Exec(`INSERT INTO assets(domain_uuid,address,object_uuid,head_document_hash,content_type,filename,size_bytes,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,?,?,?,?)`, domainUUID, address, objectUUID, hash, contentType, filename, len(payload), now, now) + } else { + var result sql.Result + result, err = tx.Exec(`UPDATE assets SET head_document_hash=?,content_type=?,filename=?,size_bytes=?,updated_at_ms=? WHERE domain_uuid=? AND address=? AND head_document_hash=?`, hash, contentType, filename, len(payload), now, domainUUID, address, current.HeadDocumentHash) + if err == nil { + if n, _ := result.RowsAffected(); n != 1 { + return nil, false, ErrAssetConflict + } + } + } + if err != nil { + return nil, false, err + } + if _, err = tx.Exec(`INSERT INTO asset_head_history(domain_uuid,address,action,document_hash,content_type,filename,size_bytes,actor_uuid,created_at_ms) VALUES(?,?,'put',?,?,?,?,?,?)`, domainUUID, address, hash, contentType, filename, len(payload), actorUUID, now); err != nil { + return nil, false, err + } + if err = tx.Commit(); err != nil { + return nil, false, err + } + a, err := s.GetAsset(domainUUID, address) + return a, true, err +} + +func (s *Store) ListAssetHistory(domainUUID, address string) ([]AssetHistory, error) { + rows, err := s.DB.Query(`SELECT id,action,document_hash,content_type,filename,size_bytes,actor_uuid,created_at_ms FROM asset_head_history WHERE domain_uuid=? AND address=? ORDER BY id DESC LIMIT 100`, domainUUID, address) + if err != nil { + return nil, err + } + defer rows.Close() + var out []AssetHistory + for rows.Next() { + var x AssetHistory + if err := rows.Scan(&x.ID, &x.Action, &x.DocumentHash, &x.ContentType, &x.Filename, &x.SizeBytes, &x.ActorUUID, &x.CreatedAtMS); err != nil { + return nil, err + } + out = append(out, x) + } + return out, rows.Err() +} + +func (s *Store) ListAssetDependencies(domainUUID, address string) ([]AssetDependency, error) { + rows, err := s.DB.Query(` + SELECT DISTINCT x.document_hash,r.uuid,r.object_uuid,p.path, + COALESCE(r.created_at_ms,COALESCE(r.created_at,0)*1000) + FROM (SELECT domain_uuid,address,document_hash FROM asset_head_history + UNION SELECT domain_uuid,address,head_document_hash FROM assets) h + JOIN revision_document_refs x ON x.document_hash=h.document_hash + JOIN revisions r ON r.uuid=x.revision_uuid + JOIN paths p ON p.domain_uuid=h.domain_uuid AND p.object_uuid=r.object_uuid + WHERE h.domain_uuid=? AND h.address=? + ORDER BY COALESCE(r.created_at_ms,COALESCE(r.created_at,0)*1000) DESC,p.path + LIMIT 500 + `, domainUUID, address) + if err != nil { + return nil, err + } + defer rows.Close() + var out []AssetDependency + for rows.Next() { + var x AssetDependency + if err := rows.Scan(&x.DocumentHash, &x.RevisionUUID, &x.ObjectUUID, &x.Path, &x.CreatedAtMS); err != nil { + return nil, err + } + out = append(out, x) + } + return out, rows.Err() +} + +func (s *Store) RestoreAssetHead(domainUUID, address string, historyID int64, expectedHash, actorUUID string) (*Asset, error) { + current, err := s.GetAsset(domainUUID, address) + if err != nil { + return nil, err + } + if expectedHash == "" || current.HeadDocumentHash != strings.Trim(expectedHash, "\"") { + return nil, ErrAssetConflict + } + var historical AssetHistory + err = s.DB.QueryRow(`SELECT id,action,document_hash,content_type,filename,size_bytes,actor_uuid,created_at_ms FROM asset_head_history WHERE domain_uuid=? AND address=? AND id=?`, domainUUID, address, historyID).Scan(&historical.ID, &historical.Action, &historical.DocumentHash, &historical.ContentType, &historical.Filename, &historical.SizeBytes, &historical.ActorUUID, &historical.CreatedAtMS) + if errors.Is(err, sql.ErrNoRows) { + return nil, ErrAssetNotFound + } + if err != nil { + return nil, err + } + reader, err := s.OpenDocument(historical.DocumentHash) + if err != nil { + return nil, err + } + _ = reader.Close() + now := time.Now().UnixMilli() + tx, err := s.DB.Begin() + if err != nil { + return nil, err + } + defer tx.Rollback() + result, err := tx.Exec(`UPDATE assets SET head_document_hash=?,content_type=?,filename=?,size_bytes=?,updated_at_ms=? WHERE domain_uuid=? AND address=? AND head_document_hash=?`, historical.DocumentHash, historical.ContentType, historical.Filename, historical.SizeBytes, now, domainUUID, address, current.HeadDocumentHash) + if err != nil { + return nil, err + } + affected, _ := result.RowsAffected() + if affected != 1 { + return nil, ErrAssetConflict + } + if _, err = tx.Exec(`INSERT INTO asset_head_history(domain_uuid,address,action,document_hash,content_type,filename,size_bytes,actor_uuid,created_at_ms) VALUES(?,?,'restore',?,?,?,?,?,?)`, domainUUID, address, historical.DocumentHash, historical.ContentType, historical.Filename, historical.SizeBytes, actorUUID, now); err != nil { + return nil, err + } + if err = tx.Commit(); err != nil { + return nil, err + } + return s.GetAsset(domainUUID, address) +} + +func (s *Store) DeleteAsset(domainUUID, address, expectedHash, actorUUID string) error { + a, err := s.GetAsset(domainUUID, address) + if err != nil { + return err + } + if expectedHash == "" || a.HeadDocumentHash != strings.Trim(expectedHash, "\"") { + return ErrAssetConflict + } + now := time.Now().UnixMilli() + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + if _, err = tx.Exec(`INSERT INTO asset_head_history(domain_uuid,address,action,document_hash,content_type,filename,size_bytes,actor_uuid,created_at_ms) VALUES(?,?,'delete',?,?,?,?,?,?)`, domainUUID, address, a.HeadDocumentHash, a.ContentType, a.Filename, a.SizeBytes, actorUUID, now); err != nil { + return err + } + result, err := tx.Exec(`DELETE FROM assets WHERE domain_uuid=? AND address=? AND head_document_hash=?`, domainUUID, address, a.HeadDocumentHash) + if err != nil { + return err + } + if n, _ := result.RowsAffected(); n != 1 { + return ErrAssetConflict + } + return tx.Commit() +} diff --git a/internal/store/assets_test.go b/internal/store/assets_test.go new file mode 100644 index 0000000..9e536e8 --- /dev/null +++ b/internal/store/assets_test.go @@ -0,0 +1,130 @@ +package store + +import ( + "errors" + "testing" + + "pageswiki/internal/db" +) + +func TestDomainAssetsUseOptimisticHeadsAndHistory(t *testing.T) { + database, err := db.Open(t.TempDir() + "/assets.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := NewWithDocumentRoot(database, t.TempDir()+"/documents") + domain, _ := st.GetDefaultDomain() + asset, changed, err := st.PutAsset(domain.UUID, "asset:image:logo", []byte("one"), "image/png", "logo.png", "", "actor") + if err != nil || !changed { + t.Fatalf("create changed=%v err=%v", changed, err) + } + if asset.ContentType != "image/png" || asset.SizeBytes != 3 { + t.Fatalf("asset=%#v", asset) + } + byHash, err := st.GetAssetByHeadHash(domain.UUID, asset.HeadDocumentHash) + if err != nil || byHash.Address != asset.Address { + t.Fatalf("GetAssetByHeadHash=%#v err=%v", byHash, err) + } + if _, _, err = st.PutAsset(domain.UUID, "asset:image:logo", []byte("two"), "image/png", "logo.png", "wrong", "actor"); !errors.Is(err, ErrAssetConflict) { + t.Fatalf("conflict err=%v", err) + } + updated, changed, err := st.PutAsset(domain.UUID, "asset:image:logo", []byte("two"), "image/png", "logo.png", asset.HeadDocumentHash, "actor") + if err != nil || !changed || updated.HeadDocumentHash == asset.HeadDocumentHash { + t.Fatalf("update=%#v changed=%v err=%v", updated, changed, err) + } + history, err := st.ListAssetHistory(domain.UUID, asset.Address) + if err != nil || len(history) != 2 { + t.Fatalf("history=%#v err=%v", history, err) + } + restored, err := st.RestoreAssetHead(domain.UUID, asset.Address, history[1].ID, updated.HeadDocumentHash, "actor") + if err != nil || restored.HeadDocumentHash != asset.HeadDocumentHash { + t.Fatalf("restored=%#v err=%v", restored, err) + } + pageObject, err := st.CreatePageAtPathInDomain(domain.UUID, "/guide") + if err != nil { + t.Fatal(err) + } + if _, err = st.SaveRevisionContent(pageObject, []byte(``), "embed", "und", "text/html", ""); err != nil { + t.Fatal(err) + } + dependencies, err := st.ListAssetDependencies(domain.UUID, asset.Address) + if err != nil || len(dependencies) != 1 || dependencies[0].Path != "/guide" { + t.Fatalf("dependencies=%#v err=%v", dependencies, err) + } + if err = st.DeleteAsset(domain.UUID, asset.Address, updated.HeadDocumentHash, "actor"); !errors.Is(err, ErrAssetConflict) { + t.Fatalf("stale delete err=%v", err) + } + if err = st.DeleteAsset(domain.UUID, asset.Address, restored.HeadDocumentHash, "actor"); err != nil { + t.Fatal(err) + } + history, err = st.ListAssetHistory(domain.UUID, asset.Address) + if err != nil || len(history) != 4 || history[0].Action != "delete" || history[1].Action != "restore" { + t.Fatalf("delete history=%#v err=%v", history, err) + } +} + +func TestAssetReferencesAreDomainScopedAndIncludeHistoricalHeads(t *testing.T) { + database, err := db.Open(t.TempDir() + "/assets.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err = db.Migrate(database); err != nil { + t.Fatal(err) + } + st := NewWithDocumentRoot(database, t.TempDir()+"/documents") + domain, _ := st.GetDefaultDomain() + asset, _, err := st.PutAsset(domain.UUID, "asset:image:logo", []byte("old"), "image/png", "old.png", "", "actor") + if err != nil { + t.Fatal(err) + } + page, err := st.CreatePageAtPathInDomain(domain.UUID, "/local") + if err != nil { + t.Fatal(err) + } + if _, err = st.SaveRevisionContent(page, []byte(``), "embed", "und", "text/html", ""); err != nil { + t.Fatal(err) + } + if err = st.CreateDomain(domain.CampusUUID, "other", "Other", "other", "local", "", "", true); err != nil { + t.Fatal(err) + } + domains, err := st.ListDomains() + if err != nil { + t.Fatal(err) + } + for _, d := range domains { + if d.UUID == domain.UUID { + continue + } + other, err := st.CreatePageAtPathInDomain(d.UUID, "/other") + if err != nil { + t.Fatal(err) + } + rev, err := st.SaveRevisionContent(other, []byte("other"), "test", "und", "text/plain", "") + if err != nil { + t.Fatal(err) + } + if _, err = database.Exec(`INSERT INTO revision_document_refs(revision_uuid,document_hash) VALUES(?,?)`, rev.UUID, asset.HeadDocumentHash); err != nil { + t.Fatal(err) + } + } + updated, _, err := st.PutAsset(domain.UUID, asset.Address, []byte("new"), "image/png", "new.png", asset.HeadDocumentHash, "actor") + if err != nil { + t.Fatal(err) + } + if updated.ReferenceCount != 1 { + t.Fatalf("reference count=%d; want one historical local revision", updated.ReferenceCount) + } + deps, err := st.ListAssetDependencies(domain.UUID, asset.Address) + if err != nil || len(deps) != 1 || deps[0].Path != "/local" { + t.Fatalf("dependencies=%#v err=%v", deps, err) + } + meta, changed, err := st.PutAsset(domain.UUID, asset.Address, []byte("new"), "image/jpeg", "corrected.jpg", updated.HeadDocumentHash, "actor") + if err != nil || !changed || meta.Filename != "corrected.jpg" || meta.HeadDocumentHash != updated.HeadDocumentHash { + t.Fatalf("metadata correction=%#v %v", meta, err) + } +} diff --git a/internal/store/auth.go b/internal/store/auth.go new file mode 100644 index 0000000..01157c2 --- /dev/null +++ b/internal/store/auth.go @@ -0,0 +1,551 @@ +package store + +import ( + "crypto/rand" + "crypto/sha256" + "database/sql" + "encoding/base64" + "errors" + "fmt" + "regexp" + "strings" + "time" + + "github.com/google/uuid" + "golang.org/x/crypto/argon2" +) + +var ErrAccessDenied = errors.New("access denied") +var authUsernamePattern = regexp.MustCompile(`^[a-z0-9][a-z0-9_-]{1,63}$`) + +type Principal struct { + UUID, Username, DisplayName, Email, State string + HasAvatar bool +} + +type AuthorizationRequest struct { + DomainUUID, PrincipalUUID, Capability, TargetType, TargetID string +} + +type AuthSessionInfo struct { + UUID, PrincipalUUID, DisplayName string + AuthTimeMS, ExpiresAtMS, LastSeenAtMS int64 + MFALevel int +} + +func authToken() (string, string, error) { + raw := make([]byte, 32) + if _, err := rand.Read(raw); err != nil { + return "", "", err + } + token := base64.RawURLEncoding.EncodeToString(raw) + hash := sha256.Sum256([]byte(token)) + return token, base64.RawURLEncoding.EncodeToString(hash[:]), nil +} + +func HashPassword(password string) (string, error) { + if len(password) < 12 || len(password) > 1024 { + return "", errors.New("password must be between 12 and 1024 characters") + } + salt := make([]byte, 16) + if _, err := rand.Read(salt); err != nil { + return "", err + } + hash := argon2.IDKey([]byte(password), salt, 3, 64*1024, 2, 32) + return fmt.Sprintf("$argon2id$v=19$m=65536,t=3,p=2$%s$%s", base64.RawStdEncoding.EncodeToString(salt), base64.RawStdEncoding.EncodeToString(hash)), nil +} + +func VerifyPassword(encoded, password string) bool { + parts := strings.Split(encoded, "$") + if len(parts) != 6 || parts[1] != "argon2id" { + return false + } + var memory uint32 + var iterations uint32 + var parallel uint8 + if _, err := fmt.Sscanf(parts[3], "m=%d,t=%d,p=%d", &memory, &iterations, ¶llel); err != nil { + return false + } + salt, err1 := base64.RawStdEncoding.DecodeString(parts[4]) + expected, err2 := base64.RawStdEncoding.DecodeString(parts[5]) + if err1 != nil || err2 != nil || memory > 256*1024 || iterations > 10 || parallel > 8 { + return false + } + actual := argon2.IDKey([]byte(password), salt, iterations, memory, parallel, uint32(len(expected))) + var mismatch byte + for i := range expected { + mismatch |= expected[i] ^ actual[i] + } + return mismatch == 0 +} + +func (s *Store) PrincipalCount() (int, error) { + var count int + err := s.DB.QueryRow(`SELECT COUNT(*) FROM principals`).Scan(&count) + return count, err +} + +func (s *Store) BootstrapOwner(domainUUID, username, password, displayName, email string) (*Principal, error) { + username = strings.ToLower(strings.TrimSpace(username)) + if !authUsernamePattern.MatchString(username) { + return nil, errors.New("username must be 2-64 lowercase letters, digits, underscores, or hyphens") + } + encoded, err := HashPassword(password) + if err != nil { + return nil, err + } + tx, err := s.DB.Begin() + if err != nil { + return nil, err + } + defer tx.Rollback() + var count int + if err = tx.QueryRow(`SELECT COUNT(*) FROM principals`).Scan(&count); err != nil || count != 0 { + if err == nil { + err = errors.New("owner already exists") + } + return nil, err + } + now := time.Now().UnixMilli() + principalID, membershipID, roleID := uuid.NewString(), uuid.NewString(), uuid.NewString() + if strings.TrimSpace(displayName) == "" { + displayName = username + } + queries := []struct { + q string + args []any + }{ + {`INSERT INTO principals(uuid,display_name,email,state,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,?)`, []any{principalID, displayName, strings.TrimSpace(email), "active", now, now}}, + {`INSERT INTO principal_identities(uuid,principal_uuid,provider_type,subject,created_at_ms) VALUES(?,?,?,?,?)`, []any{uuid.NewString(), principalID, "password", username, now}}, + {`INSERT INTO auth_credentials(uuid,principal_uuid,kind,identifier,secret_hash,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,?,?)`, []any{uuid.NewString(), principalID, "password", username, encoded, now, now}}, + {`INSERT INTO domain_memberships(uuid,domain_uuid,principal_uuid,state,created_at_ms) VALUES(?,?,?,?,?)`, []any{membershipID, domainUUID, principalID, "active", now}}, + {`INSERT INTO auth_roles(uuid,domain_uuid,name,description,created_at_ms) VALUES(?,?,?,?,?)`, []any{roleID, domainUUID, "owner", "Domain owner", now}}, + {`INSERT INTO auth_role_bindings(membership_uuid,role_uuid,created_at_ms) VALUES(?,?,?)`, []any{membershipID, roleID, now}}, + } + for _, item := range queries { + if _, err = tx.Exec(item.q, item.args...); err != nil { + return nil, err + } + } + for _, capability := range []string{"read", "write", "rename", "delete", "link", "manage", "delegate"} { + if _, err = tx.Exec(`INSERT INTO auth_capability_grants(uuid,role_uuid,capability,target_type,target_id,created_at_ms) VALUES(?,?,?,?,?,?)`, uuid.NewString(), roleID, capability, "domain", domainUUID, now); err != nil { + return nil, err + } + } + if err = tx.Commit(); err != nil { + return nil, err + } + if err = s.EnsureBuiltinAdminGroups(); err != nil { + return nil, err + } + return &Principal{UUID: principalID, DisplayName: displayName, Email: email, State: "active"}, nil +} + +func (s *Store) AuthenticatePassword(identifier, password string) (*Principal, error) { + identifier = strings.ToLower(strings.TrimSpace(identifier)) + var p Principal + var encoded string + err := s.DB.QueryRow(`SELECT p.uuid,p.display_name,p.email,p.state,c.secret_hash FROM auth_credentials c JOIN principals p ON p.uuid=c.principal_uuid WHERE c.kind='password' AND c.identifier=? AND c.enabled=1`, identifier).Scan(&p.UUID, &p.DisplayName, &p.Email, &p.State, &encoded) + if err != nil || (p.State != "active" && p.State != "readonly") || !VerifyPassword(encoded, password) { + return nil, ErrAccessDenied + } + return &p, nil +} + +func (s *Store) CreateAuthSession(domainUUID, principalUUID string) (string, error) { + return s.CreateAuthSessionWithMFA(domainUUID, principalUUID, 0) +} +func (s *Store) CreateAuthSessionWithMFA(domainUUID, principalUUID string, mfaLevel int) (string, error) { + return s.createTypedAuthSession(domainUUID, principalUUID, mfaLevel, "pw_api_") +} + +func (s *Store) CreateBrowserAuthSession(domainUUID, principalUUID string, mfaLevel int) (string, error) { + return s.createTypedAuthSession(domainUUID, principalUUID, mfaLevel, "pw_browser_") +} + +func (s *Store) createTypedAuthSession(domainUUID, principalUUID string, mfaLevel int, prefix string) (string, error) { + raw, _, err := authToken() + if err != nil { + return "", err + } + // The purpose prefix is inside the hashed credential, so removing or + // changing it cannot turn a browser token into an API token or vice versa. + token := prefix + raw + sum := sha256.Sum256([]byte(token)) + hash := base64.RawURLEncoding.EncodeToString(sum[:]) + now := time.Now().UnixMilli() + result, err := s.DB.Exec(`INSERT INTO auth_sessions(uuid,token_hash,principal_uuid,domain_uuid,auth_time_ms,expires_at_ms,last_seen_at_ms,mfa_level) + SELECT ?,?,p.uuid,m.domain_uuid,?,?,?,? FROM principals p JOIN domain_memberships m ON m.principal_uuid=p.uuid + WHERE p.uuid=? AND p.state IN ('active','readonly') AND m.domain_uuid=? AND m.state='active'`, + uuid.NewString(), hash, now, now+int64((24*time.Hour)/time.Millisecond), now, mfaLevel, principalUUID, domainUUID) + if err != nil { + return "", err + } + if count, err := result.RowsAffected(); err != nil || count != 1 { + return "", ErrAccessDenied + } + return token, nil +} +func (s *Store) PrincipalForSession(domainUUID, token string) (*Principal, error) { + sum := sha256.Sum256([]byte(token)) + hash := base64.RawURLEncoding.EncodeToString(sum[:]) + var p Principal + err := s.DB.QueryRow(`SELECT p.uuid,COALESCE((SELECT subject FROM principal_identities i WHERE i.principal_uuid=p.uuid AND i.provider_type='password' LIMIT 1),p.uuid),p.display_name,p.email,p.state,length(p.avatar)>0 FROM auth_sessions s JOIN principals p ON p.uuid=s.principal_uuid + JOIN domain_memberships m ON m.principal_uuid=p.uuid AND m.domain_uuid=s.domain_uuid AND m.state='active' + WHERE s.token_hash=? AND s.domain_uuid=? AND s.revoked_at_ms=0 AND s.expires_at_ms>?`, hash, domainUUID, time.Now().UnixMilli()).Scan(&p.UUID, &p.Username, &p.DisplayName, &p.Email, &p.State, &p.HasAvatar) + if err != nil || (p.State != "active" && p.State != "readonly") { + return nil, ErrAccessDenied + } + return &p, nil +} + +func (s *Store) PrincipalByUsername(domainUUID, username string) (*Principal, error) { + username = strings.ToLower(strings.TrimSpace(username)) + var p Principal + err := s.DB.QueryRow(`SELECT p.uuid,i.subject,p.display_name,p.email,p.state,length(p.avatar)>0 FROM principal_identities i JOIN principals p ON p.uuid=i.principal_uuid JOIN domain_memberships m ON m.principal_uuid=p.uuid AND m.domain_uuid=? WHERE i.provider_type='password' AND i.subject=?`, domainUUID, username).Scan(&p.UUID, &p.Username, &p.DisplayName, &p.Email, &p.State, &p.HasAvatar) + return &p, err +} + +func (s *Store) SetPrincipalAvatar(principalUUID, contentType string, data []byte) error { + _, err := s.DB.Exec(`UPDATE principals SET avatar=?,avatar_content_type=?,updated_at_ms=? WHERE uuid=?`, data, contentType, time.Now().UnixMilli(), principalUUID) + return err +} +func (s *Store) PrincipalAvatar(principalUUID string) (string, []byte, error) { + var contentType string + var data []byte + err := s.DB.QueryRow(`SELECT avatar_content_type,avatar FROM principals WHERE uuid=?`, principalUUID).Scan(&contentType, &data) + return contentType, data, err +} +func (s *Store) RevokeAuthSession(token string) error { + sum := sha256.Sum256([]byte(token)) + _, err := s.DB.Exec(`UPDATE auth_sessions SET revoked_at_ms=? WHERE token_hash=?`, time.Now().UnixMilli(), base64.RawURLEncoding.EncodeToString(sum[:])) + return err +} + +func (s *Store) ListDomainPrincipals(domainUUID string) ([]Principal, error) { + rows, err := s.DB.Query(`SELECT p.uuid,p.display_name,p.email,p.state FROM domain_memberships m JOIN principals p ON p.uuid=m.principal_uuid WHERE m.domain_uuid=? ORDER BY lower(p.display_name),p.uuid`, domainUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var out []Principal + for rows.Next() { + var p Principal + if err := rows.Scan(&p.UUID, &p.DisplayName, &p.Email, &p.State); err != nil { + return nil, err + } + out = append(out, p) + } + return out, rows.Err() +} +func (s *Store) ListAuthSessions(domainUUID string) ([]AuthSessionInfo, error) { + rows, err := s.DB.Query(`SELECT s.uuid,s.principal_uuid,p.display_name,s.auth_time_ms,s.expires_at_ms,s.last_seen_at_ms,s.mfa_level FROM auth_sessions s JOIN principals p ON p.uuid=s.principal_uuid WHERE s.domain_uuid=? AND s.revoked_at_ms=0 AND s.expires_at_ms>? ORDER BY s.last_seen_at_ms DESC`, domainUUID, time.Now().UnixMilli()) + if err != nil { + return nil, err + } + defer rows.Close() + var out []AuthSessionInfo + for rows.Next() { + var item AuthSessionInfo + if err := rows.Scan(&item.UUID, &item.PrincipalUUID, &item.DisplayName, &item.AuthTimeMS, &item.ExpiresAtMS, &item.LastSeenAtMS, &item.MFALevel); err != nil { + return nil, err + } + out = append(out, item) + } + return out, rows.Err() +} +func (s *Store) RevokeAuthSessionByID(domainUUID, sessionUUID string) error { + result, err := s.DB.Exec(`UPDATE auth_sessions SET revoked_at_ms=? WHERE domain_uuid=? AND uuid=? AND revoked_at_ms=0`, time.Now().UnixMilli(), domainUUID, sessionUUID) + if err != nil { + return err + } + count, _ := result.RowsAffected() + if count == 0 { + return sql.ErrNoRows + } + return nil +} +func (s *Store) SetPrincipalState(domainUUID, principalUUID, state string) error { + if state != "active" && state != "readonly" && state != "suspended" && state != "quarantined" { + return errors.New("invalid principal state") + } + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + result, err := tx.Exec(`UPDATE principals SET state=?,updated_at_ms=? WHERE uuid=? AND EXISTS(SELECT 1 FROM domain_memberships WHERE domain_uuid=? AND principal_uuid=?)`, state, time.Now().UnixMilli(), principalUUID, domainUUID, principalUUID) + if err != nil { + return err + } + count, _ := result.RowsAffected() + if count == 0 { + return sql.ErrNoRows + } + if state != "active" { + if _, err = tx.Exec(`UPDATE auth_sessions SET revoked_at_ms=? WHERE principal_uuid=?`, time.Now().UnixMilli(), principalUUID); err != nil { + return err + } + } + if err = projectCampusAdminMembershipsTx(tx); err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) UpdatePrincipalProfile(principalUUID, displayName, email string) error { + displayName = strings.TrimSpace(displayName) + email = strings.TrimSpace(email) + if displayName == "" { + return errors.New("display name is required") + } + _, err := s.DB.Exec(`UPDATE principals SET display_name=?,email=?,updated_at_ms=? WHERE uuid=?`, displayName, email, time.Now().UnixMilli(), principalUUID) + return err +} + +func (s *Store) CreatePasswordAccount(domainUUID, username, password, displayName, email string) (*Principal, error) { + username = strings.ToLower(strings.TrimSpace(username)) + if !authUsernamePattern.MatchString(username) { + return nil, errors.New("username must be 2-64 lowercase letters, digits, underscores, or hyphens") + } + encoded, err := HashPassword(password) + if err != nil { + return nil, err + } + tx, err := s.DB.Begin() + if err != nil { + return nil, err + } + defer tx.Rollback() + now := time.Now().UnixMilli() + p := &Principal{UUID: uuid.NewString(), DisplayName: strings.TrimSpace(displayName), Email: strings.TrimSpace(email), State: "active"} + if p.DisplayName == "" { + p.DisplayName = username + } + membershipID := uuid.NewString() + roleID := "" + err = tx.QueryRow(`SELECT uuid FROM auth_roles WHERE domain_uuid=? AND name='member'`, domainUUID).Scan(&roleID) + if errors.Is(err, sql.ErrNoRows) { + roleID = uuid.NewString() + if _, err = tx.Exec(`INSERT INTO auth_roles(uuid,domain_uuid,name,description,created_at_ms) VALUES(?,?,?,?,?)`, roleID, domainUUID, "member", "Domain member", now); err != nil { + return nil, err + } + if _, err = tx.Exec(`INSERT INTO auth_capability_grants(uuid,role_uuid,capability,target_type,target_id,created_at_ms) VALUES(?,?,?,?,?,?)`, uuid.NewString(), roleID, "read", "domain", domainUUID, now); err != nil { + return nil, err + } + } else if err != nil { + return nil, err + } + queries := []struct { + q string + args []any + }{{`INSERT INTO principals(uuid,display_name,email,state,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,?)`, []any{p.UUID, p.DisplayName, p.Email, p.State, now, now}}, {`INSERT INTO principal_identities(uuid,principal_uuid,provider_type,subject,created_at_ms) VALUES(?,?,?,?,?)`, []any{uuid.NewString(), p.UUID, "password", username, now}}, {`INSERT INTO auth_credentials(uuid,principal_uuid,kind,identifier,secret_hash,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,?,?)`, []any{uuid.NewString(), p.UUID, "password", username, encoded, now, now}}, {`INSERT INTO domain_memberships(uuid,domain_uuid,principal_uuid,state,created_at_ms) VALUES(?,?,?,?,?)`, []any{membershipID, domainUUID, p.UUID, "active", now}}, {`INSERT INTO auth_role_bindings(membership_uuid,role_uuid,created_at_ms) VALUES(?,?,?)`, []any{membershipID, roleID, now}}} + for _, item := range queries { + if _, err = tx.Exec(item.q, item.args...); err != nil { + return nil, err + } + } + if err = tx.Commit(); err != nil { + return nil, err + } + return p, nil +} + +func (s *Store) EnsureAuthSchema() error { + statements := []string{ + `CREATE TABLE IF NOT EXISTS principals ( + uuid TEXT PRIMARY KEY, display_name TEXT NOT NULL DEFAULT '', + email TEXT NOT NULL DEFAULT '', state TEXT NOT NULL DEFAULT 'active', + avatar BLOB NOT NULL DEFAULT X'', avatar_content_type TEXT NOT NULL DEFAULT '', + created_at_ms INTEGER NOT NULL, updated_at_ms INTEGER NOT NULL)`, + `CREATE TABLE IF NOT EXISTS principal_identities ( + uuid TEXT PRIMARY KEY, principal_uuid TEXT NOT NULL, provider_type TEXT NOT NULL, + provider_uuid TEXT NOT NULL DEFAULT '', issuer TEXT NOT NULL DEFAULT '', + subject TEXT NOT NULL, attributes_json TEXT NOT NULL DEFAULT '{}', + created_at_ms INTEGER NOT NULL, + UNIQUE(provider_type, provider_uuid, issuer, subject))`, + `CREATE TABLE IF NOT EXISTS auth_credentials ( + uuid TEXT PRIMARY KEY, principal_uuid TEXT NOT NULL, kind TEXT NOT NULL, + identifier TEXT NOT NULL DEFAULT '', secret_hash TEXT NOT NULL, + parameters_json TEXT NOT NULL DEFAULT '{}', enabled INTEGER NOT NULL DEFAULT 1, + created_at_ms INTEGER NOT NULL, updated_at_ms INTEGER NOT NULL, + UNIQUE(kind, identifier))`, + `CREATE TABLE IF NOT EXISTS domain_memberships ( + uuid TEXT PRIMARY KEY, domain_uuid TEXT NOT NULL, principal_uuid TEXT NOT NULL, + state TEXT NOT NULL DEFAULT 'active', created_at_ms INTEGER NOT NULL, + UNIQUE(domain_uuid, principal_uuid))`, + `CREATE TABLE IF NOT EXISTS auth_roles ( + uuid TEXT PRIMARY KEY, domain_uuid TEXT NOT NULL, name TEXT NOT NULL, + description TEXT NOT NULL DEFAULT '', created_at_ms INTEGER NOT NULL, + UNIQUE(domain_uuid, name))`, + `CREATE TABLE IF NOT EXISTS auth_role_bindings ( + membership_uuid TEXT NOT NULL, role_uuid TEXT NOT NULL, created_at_ms INTEGER NOT NULL, + PRIMARY KEY(membership_uuid, role_uuid))`, + `CREATE TABLE IF NOT EXISTS auth_capability_grants ( + uuid TEXT PRIMARY KEY, role_uuid TEXT NOT NULL, capability TEXT NOT NULL, + target_type TEXT NOT NULL, target_id TEXT NOT NULL DEFAULT '*', + created_at_ms INTEGER NOT NULL, + UNIQUE(role_uuid, capability, target_type, target_id))`, + `CREATE TABLE IF NOT EXISTS auth_sessions ( + uuid TEXT PRIMARY KEY, token_hash TEXT NOT NULL UNIQUE, principal_uuid TEXT NOT NULL, + domain_uuid TEXT NOT NULL, auth_time_ms INTEGER NOT NULL, expires_at_ms INTEGER NOT NULL, + last_seen_at_ms INTEGER NOT NULL, mfa_level INTEGER NOT NULL DEFAULT 0, + revoked_at_ms INTEGER NOT NULL DEFAULT 0)`, + `CREATE TABLE IF NOT EXISTS auth_challenges ( + uuid TEXT PRIMARY KEY, domain_uuid TEXT NOT NULL, principal_uuid TEXT NOT NULL DEFAULT '', + kind TEXT NOT NULL, token_hash TEXT NOT NULL UNIQUE, payload_json TEXT NOT NULL DEFAULT '{}', + expires_at_ms INTEGER NOT NULL, consumed_at_ms INTEGER NOT NULL DEFAULT 0, + attempt_count INTEGER NOT NULL DEFAULT 0, + created_at_ms INTEGER NOT NULL)`, + `CREATE TABLE IF NOT EXISTS auth_providers ( + uuid TEXT PRIMARY KEY, domain_uuid TEXT NOT NULL, kind TEXT NOT NULL, + config_json TEXT NOT NULL DEFAULT '{}', secret_encrypted TEXT NOT NULL DEFAULT '', + enabled INTEGER NOT NULL DEFAULT 0, created_at_ms INTEGER NOT NULL, + updated_at_ms INTEGER NOT NULL, UNIQUE(domain_uuid,kind))`, + `CREATE TABLE IF NOT EXISTS groups ( + uuid TEXT PRIMARY KEY, domain_uuid TEXT NOT NULL, name TEXT NOT NULL, + display_name TEXT NOT NULL DEFAULT '', description TEXT NOT NULL DEFAULT '', + visibility TEXT NOT NULL DEFAULT 'members', state TEXT NOT NULL DEFAULT 'active', + builtin_key TEXT NOT NULL DEFAULT '', inherit_members INTEGER NOT NULL DEFAULT 0, + created_at_ms INTEGER NOT NULL, updated_at_ms INTEGER NOT NULL, + UNIQUE(domain_uuid,name))`, + `CREATE TABLE IF NOT EXISTS group_members ( + group_uuid TEXT NOT NULL, membership_uuid TEXT NOT NULL, + member_role TEXT NOT NULL DEFAULT 'member', source TEXT NOT NULL DEFAULT 'local', + created_at_ms INTEGER NOT NULL, PRIMARY KEY(group_uuid,membership_uuid))`, + `CREATE TABLE IF NOT EXISTS auth_group_role_bindings ( + group_uuid TEXT NOT NULL, role_uuid TEXT NOT NULL, created_at_ms INTEGER NOT NULL, + PRIMARY KEY(group_uuid,role_uuid))`, + `CREATE TABLE IF NOT EXISTS group_permissions ( + uuid TEXT PRIMARY KEY, group_uuid TEXT NOT NULL, scope_path TEXT NOT NULL, + permission TEXT NOT NULL, created_at_ms INTEGER NOT NULL, + UNIQUE(group_uuid,scope_path))`, + `CREATE TABLE IF NOT EXISTS auth_group_mappings ( + uuid TEXT PRIMARY KEY, domain_uuid TEXT NOT NULL, provider_type TEXT NOT NULL, + provider_uuid TEXT NOT NULL, external_group TEXT NOT NULL, group_uuid TEXT NOT NULL, + mode TEXT NOT NULL DEFAULT 'additive', enabled INTEGER NOT NULL DEFAULT 1, + UNIQUE(domain_uuid,provider_type,provider_uuid,external_group))`, + `CREATE TABLE IF NOT EXISTS auth_audit_log ( + id INTEGER PRIMARY KEY AUTOINCREMENT, domain_uuid TEXT NOT NULL DEFAULT '', + principal_uuid TEXT NOT NULL DEFAULT '', event TEXT NOT NULL, outcome TEXT NOT NULL, + target_type TEXT NOT NULL DEFAULT '', target_id TEXT NOT NULL DEFAULT '', + request_id TEXT NOT NULL DEFAULT '', detail_json TEXT NOT NULL DEFAULT '{}', + created_at_ms INTEGER NOT NULL)`, + } + for _, statement := range statements { + if _, err := s.DB.Exec(statement); err != nil { + return err + } + } + _, _ = s.DB.Exec(`ALTER TABLE principals ADD COLUMN avatar BLOB NOT NULL DEFAULT X''`) + _, _ = s.DB.Exec(`ALTER TABLE principals ADD COLUMN avatar_content_type TEXT NOT NULL DEFAULT ''`) + _, _ = s.DB.Exec(`ALTER TABLE auth_challenges ADD COLUMN attempt_count INTEGER NOT NULL DEFAULT 0`) + _, _ = s.DB.Exec(`ALTER TABLE groups ADD COLUMN builtin_key TEXT NOT NULL DEFAULT ''`) + _, _ = s.DB.Exec(`ALTER TABLE groups ADD COLUMN inherit_members INTEGER NOT NULL DEFAULT 0`) + if err := s.ensureLocalityAccessSchema(); err != nil { + return err + } + return s.ensureCampusAdminInheritanceSchema() +} + +func (s *Store) Authorize(request AuthorizationRequest) error { + request.Capability = strings.ToLower(strings.TrimSpace(request.Capability)) + request.TargetType = strings.ToLower(strings.TrimSpace(request.TargetType)) + base := s.authorizeGrant(request, false) + if base != nil && !errors.Is(base, ErrAccessDenied) { + return base + } + switch request.Capability { + case "read", "write", "create", "upload", "rename", "link", "delete": + default: + return base + } + if request.TargetType == "object" { + if err := s.CheckObjectLocalityAccessCaps(request.DomainUUID, request.PrincipalUUID, request.Capability, request.TargetID); err != nil { + return err + } + } + if request.TargetType != "path" { + return base + } + p, err := loadLocalityAccess(s.DB, request.DomainUUID, request.PrincipalUUID) + if err != nil { + return err + } + if p.decide(request.TargetID, request.Capability, base == nil) { + return nil + } + return ErrAccessDenied +} + +// AuthorizeExactObject excludes broad Domain/wildcard grants. Global identity +// alone must not extend a Domain administrator's authority to another Domain. +func (s *Store) AuthorizeExactObject(request AuthorizationRequest) error { + if request.TargetType != "object" || request.TargetID == "" || request.TargetID == "*" { + return ErrAccessDenied + } + request.Capability = strings.ToLower(strings.TrimSpace(request.Capability)) + switch request.Capability { + case "read", "write", "create", "upload", "rename", "link", "delete": + if err := s.CheckObjectLocalityAccessCaps(request.DomainUUID, request.PrincipalUUID, request.Capability, request.TargetID); err != nil { + return err + } + } + return s.authorizeGrant(request, true) +} + +func (s *Store) authorizeGrant(request AuthorizationRequest, exactObject bool) error { + return authorizeGrantFrom(s.DB, request, exactObject) +} + +type authQueryer interface { + pathQueryer + QueryRow(string, ...any) *sql.Row +} + +func authorizeGrantFrom(q authQueryer, request AuthorizationRequest, exactObject bool) error { + request.Capability = strings.ToLower(strings.TrimSpace(request.Capability)) + request.TargetType = strings.ToLower(strings.TrimSpace(request.TargetType)) + if request.DomainUUID == "" || request.PrincipalUUID == "" || request.Capability == "" { + return ErrAccessDenied + } + target := `((g.target_type=? AND (g.target_id=? OR g.target_id='*')) OR (g.target_type='domain' AND g.target_id=?))` + args := []any{request.DomainUUID, request.PrincipalUUID, request.Capability, request.Capability, request.Capability, request.TargetType, request.TargetID} + if exactObject { + target = `(g.target_type=? AND g.target_id=?)` + } else { + args = append(args, request.DomainUUID) + } + var allowed int + err := q.QueryRow(`SELECT EXISTS( + SELECT 1 FROM principals p + JOIN domain_memberships m ON m.principal_uuid=p.uuid AND m.domain_uuid=? + JOIN auth_role_bindings b ON b.membership_uuid=m.uuid + JOIN auth_roles r ON r.uuid=b.role_uuid AND r.domain_uuid=m.domain_uuid + JOIN auth_capability_grants g ON g.role_uuid=r.uuid + WHERE p.uuid=? AND (p.state='active' OR (p.state='readonly' AND ?='read')) AND m.state='active' + AND (g.capability=? OR (? IN ('create','upload') AND g.capability='write')) + AND `+target+`)`, args...).Scan(&allowed) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return err + } + if allowed == 0 { + if request.TargetType == "path" { + groupAllowed, groupErr := groupPermissionAllowsFrom(q, request.DomainUUID, request.PrincipalUUID, request.Capability, request.TargetID) + if groupErr != nil { + return groupErr + } + if groupAllowed { + return nil + } + } + return ErrAccessDenied + } + return nil +} + +func (s *Store) PurgeExpiredAuthArtifacts() error { + now := time.Now().UnixMilli() + _, err := s.DB.Exec(`DELETE FROM auth_challenges WHERE expires_at_ms0`, now) + return err +} diff --git a/internal/store/auth_external.go b/internal/store/auth_external.go new file mode 100644 index 0000000..b1dd12b --- /dev/null +++ b/internal/store/auth_external.go @@ -0,0 +1,467 @@ +package store + +import ( + "crypto/sha256" + "database/sql" + "encoding/base64" + "encoding/json" + "errors" + "net/url" + "regexp" + "strings" + "time" + + ldap "github.com/go-ldap/ldap/v3" + "github.com/google/uuid" +) + +type AuthProviderConfig struct { + UUID string `json:"-"` + Kind string `json:"kind"` + Enabled bool `json:"enabled"` + Issuer string `json:"issuer,omitempty"` + ClientID string `json:"client_id,omitempty"` + ClientSecret string `json:"client_secret,omitempty"` + OIDCMatchBy string `json:"oidc_match_by,omitempty"` + SMTPAddress string `json:"smtp_address,omitempty"` + SMTPUsername string `json:"smtp_username,omitempty"` + SMTPPassword string `json:"smtp_password,omitempty"` + SMTPFrom string `json:"smtp_from,omitempty"` + LDAPURL string `json:"ldap_url,omitempty"` + LDAPBindDN string `json:"ldap_bind_dn,omitempty"` + LDAPBindPassword string `json:"ldap_bind_password,omitempty"` + LDAPSearchBase string `json:"ldap_search_base,omitempty"` + LDAPSearchFilter string `json:"ldap_search_filter,omitempty"` + LDAPStartTLS bool `json:"ldap_start_tls,omitempty"` + LDAPSkipTLSVerify bool `json:"ldap_skip_tls_verify,omitempty"` + LDAPCAPEM string `json:"ldap_ca_pem,omitempty"` + LDAPUIDAttribute string `json:"ldap_uid_attribute,omitempty"` + LDAPUsernameAttribute string `json:"ldap_username_attribute,omitempty"` + LDAPEmailAttribute string `json:"ldap_email_attribute,omitempty"` + LDAPDisplayAttribute string `json:"ldap_display_attribute,omitempty"` + LDAPMatchBy string `json:"ldap_match_by,omitempty"` + LDAPAutoProvision bool `json:"ldap_auto_provision,omitempty"` +} + +var ldapAttributePattern = regexp.MustCompile(`^[A-Za-z0-9][A-Za-z0-9.-]*(;[A-Za-z0-9-]+)*$`) + +func normalizeLDAPProviderConfig(config *AuthProviderConfig) { + config.LDAPURL = strings.TrimSpace(config.LDAPURL) + config.LDAPBindDN = strings.TrimSpace(config.LDAPBindDN) + config.LDAPSearchBase = strings.TrimSpace(config.LDAPSearchBase) + config.LDAPSearchFilter = strings.TrimSpace(config.LDAPSearchFilter) + if config.LDAPSearchFilter == "" { + config.LDAPSearchFilter = "(uid={{username}})" + } + defaults := map[*string]string{ + &config.LDAPUIDAttribute: "uid", &config.LDAPUsernameAttribute: "uid", + &config.LDAPEmailAttribute: "mail", &config.LDAPDisplayAttribute: "displayName", + } + for target, fallback := range defaults { + *target = strings.TrimSpace(*target) + if *target == "" { + *target = fallback + } + } + config.LDAPMatchBy = strings.ToLower(strings.TrimSpace(config.LDAPMatchBy)) + if config.LDAPMatchBy == "" { + config.LDAPMatchBy = "username" + } + config.LDAPCAPEM = strings.TrimSpace(config.LDAPCAPEM) +} + +// ValidateLDAPProviderConfig checks only administrator-controlled connection +// metadata. It never opens the configured network endpoint. +func ValidateLDAPProviderConfig(config AuthProviderConfig) error { + normalizeLDAPProviderConfig(&config) + if !config.Enabled && config.LDAPURL == "" { + return nil + } + if len(config.LDAPURL) > 2048 || len(config.LDAPBindDN) > 2048 || len(config.LDAPSearchBase) > 2048 || len(config.LDAPSearchFilter) > 2048 || len(config.LDAPCAPEM) > 64<<10 { + return errors.New("LDAP setting exceeds its size limit") + } + parsed, err := url.Parse(config.LDAPURL) + if err != nil || (parsed.Scheme != "ldap" && parsed.Scheme != "ldaps") || parsed.Hostname() == "" || parsed.User != nil || (parsed.Path != "" && parsed.Path != "/") || parsed.RawQuery != "" || parsed.Fragment != "" { + return errors.New("LDAP URL must be ldap://host[:port] or ldaps://host[:port]") + } + if parsed.Scheme == "ldaps" && config.LDAPStartTLS { + return errors.New("StartTLS cannot be combined with an ldaps URL") + } + if config.LDAPSearchBase == "" || strings.Count(config.LDAPSearchFilter, "{{username}}") == 0 { + return errors.New("LDAP search base and a filter containing {{username}} are required") + } + if _, err := ldap.ParseDN(config.LDAPSearchBase); err != nil { + return errors.New("invalid LDAP search base DN") + } + if config.LDAPBindDN != "" { + if _, err := ldap.ParseDN(config.LDAPBindDN); err != nil { + return errors.New("invalid LDAP service bind DN") + } + } + if _, err := ldap.CompileFilter(strings.ReplaceAll(config.LDAPSearchFilter, "{{username}}", "validation-user")); err != nil { + return errors.New("invalid LDAP search filter") + } + for _, attribute := range []string{config.LDAPUIDAttribute, config.LDAPUsernameAttribute, config.LDAPEmailAttribute, config.LDAPDisplayAttribute} { + if !ldapAttributePattern.MatchString(attribute) || len(attribute) > 128 { + return errors.New("invalid LDAP attribute mapping") + } + } + if config.LDAPMatchBy != "username" && config.LDAPMatchBy != "email" { + return errors.New("unsupported LDAP account matching field") + } + return nil +} + +func externalIdentityPayload(attributes any) (string, error) { + payload, err := json.Marshal(attributes) + if err != nil || len(payload) > 64<<10 { + if err == nil { + err = errors.New("external identity attributes exceed 64 KiB") + } + return "", err + } + return string(payload), nil +} + +// BindExternalIdentityIfProviderUnbound performs the first-login bootstrap +// without allowing a recreated external account with the same mutable username +// or email to replace an identity already bound from this provider. +func (s *Store) BindExternalIdentityIfProviderUnbound(domainUUID, principalUUID, providerType, providerUUID, issuer, subject string, attributes any) error { + if domainUUID == "" || principalUUID == "" || providerType == "" || providerUUID == "" || strings.TrimSpace(subject) == "" { + return ErrAccessDenied + } + payload, err := externalIdentityPayload(attributes) + if err != nil { + return err + } + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + if _, err = tx.Exec(`UPDATE principals SET updated_at_ms=updated_at_ms WHERE uuid=?`, principalUUID); err != nil { + return err + } + var eligible, alreadyBound bool + if err = tx.QueryRow(`SELECT EXISTS(SELECT 1 FROM principals p JOIN domain_memberships m ON m.principal_uuid=p.uuid AND m.domain_uuid=? AND m.state='active' WHERE p.uuid=? AND p.state IN ('active','readonly'))`, domainUUID, principalUUID).Scan(&eligible); err != nil || !eligible { + return ErrAccessDenied + } + if err = tx.QueryRow(`SELECT EXISTS(SELECT 1 FROM principal_identities WHERE principal_uuid=? AND provider_type=? AND provider_uuid=?)`, principalUUID, providerType, providerUUID).Scan(&alreadyBound); err != nil || alreadyBound { + return ErrAccessDenied + } + if _, err = tx.Exec(`INSERT INTO principal_identities(uuid,principal_uuid,provider_type,provider_uuid,issuer,subject,attributes_json,created_at_ms) VALUES(?,?,?,?,?,?,?,?)`, uuid.NewString(), principalUUID, providerType, providerUUID, issuer, subject, payload, time.Now().UnixMilli()); err != nil { + return ErrAccessDenied + } + return tx.Commit() +} + +// ProvisionExternalAccount creates a normal Domain member with a local +// username identity but no local password credential, and binds the immutable +// directory identity in the same transaction. +func (s *Store) ProvisionExternalAccount(domainUUID, username, displayName, email, providerType, providerUUID, issuer, subject string, attributes any) (*Principal, error) { + username = strings.ToLower(strings.TrimSpace(username)) + if !authUsernamePattern.MatchString(username) || domainUUID == "" || providerType == "" || providerUUID == "" || strings.TrimSpace(subject) == "" { + return nil, ErrAccessDenied + } + payload, err := externalIdentityPayload(attributes) + if err != nil { + return nil, err + } + now := time.Now().UnixMilli() + p := &Principal{UUID: uuid.NewString(), Username: username, DisplayName: strings.TrimSpace(displayName), Email: strings.TrimSpace(email), State: "active"} + if p.DisplayName == "" { + p.DisplayName = username + } + tx, err := s.DB.Begin() + if err != nil { + return nil, err + } + defer tx.Rollback() + roleID := "" + err = tx.QueryRow(`SELECT uuid FROM auth_roles WHERE domain_uuid=? AND name='member'`, domainUUID).Scan(&roleID) + if errors.Is(err, sql.ErrNoRows) { + roleID = uuid.NewString() + if _, err = tx.Exec(`INSERT INTO auth_roles(uuid,domain_uuid,name,description,created_at_ms) VALUES(?,?,?,?,?)`, roleID, domainUUID, "member", "Domain member", now); err != nil { + return nil, err + } + if _, err = tx.Exec(`INSERT INTO auth_capability_grants(uuid,role_uuid,capability,target_type,target_id,created_at_ms) VALUES(?,?,?,?,?,?)`, uuid.NewString(), roleID, "read", "domain", domainUUID, now); err != nil { + return nil, err + } + } else if err != nil { + return nil, err + } + membershipID := uuid.NewString() + for _, item := range []struct { + query string + args []any + }{ + {`INSERT INTO principals(uuid,display_name,email,state,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,?)`, []any{p.UUID, p.DisplayName, p.Email, p.State, now, now}}, + {`INSERT INTO principal_identities(uuid,principal_uuid,provider_type,subject,created_at_ms) VALUES(?,?,?,?,?)`, []any{uuid.NewString(), p.UUID, "password", username, now}}, + {`INSERT INTO principal_identities(uuid,principal_uuid,provider_type,provider_uuid,issuer,subject,attributes_json,created_at_ms) VALUES(?,?,?,?,?,?,?,?)`, []any{uuid.NewString(), p.UUID, providerType, providerUUID, issuer, subject, payload, now}}, + {`INSERT INTO domain_memberships(uuid,domain_uuid,principal_uuid,state,created_at_ms) VALUES(?,?,?,?,?)`, []any{membershipID, domainUUID, p.UUID, "active", now}}, + {`INSERT INTO auth_role_bindings(membership_uuid,role_uuid,created_at_ms) VALUES(?,?,?)`, []any{membershipID, roleID, now}}, + } { + if _, err = tx.Exec(item.query, item.args...); err != nil { + return nil, ErrAccessDenied + } + } + if err = tx.Commit(); err != nil { + return nil, err + } + return p, nil +} + +func (s *Store) SetAuthProviderConfig(domainUUID string, config AuthProviderConfig) error { + config.Kind = strings.ToLower(strings.TrimSpace(config.Kind)) + if config.Kind != "oidc" && config.Kind != "smtp" && config.Kind != "ldap" { + return errors.New("unsupported authentication provider") + } + if config.Kind == "oidc" { + config.OIDCMatchBy = strings.ToLower(strings.TrimSpace(config.OIDCMatchBy)) + if config.OIDCMatchBy == "" { + config.OIDCMatchBy = "email" + } + if config.OIDCMatchBy != "email" && config.OIDCMatchBy != "display_name" && config.OIDCMatchBy != "preferred_username" { + return errors.New("unsupported OIDC account matching field") + } + } + if config.Kind == "ldap" { + normalizeLDAPProviderConfig(&config) + if err := ValidateLDAPProviderConfig(config); err != nil { + return err + } + } + secret := config.ClientSecret + if config.Kind == "smtp" { + secret = config.SMTPPassword + } else if config.Kind == "ldap" { + secret = config.LDAPBindPassword + } + config.ClientSecret, config.SMTPPassword, config.LDAPBindPassword = "", "", "" + payload, err := json.Marshal(config) + if err != nil { + return err + } + encrypted := "" + if secret != "" { + encrypted, err = s.encryptAuthSecret([]byte(secret)) + if err != nil { + return err + } + } else { + _ = s.DB.QueryRow(`SELECT secret_encrypted FROM auth_providers WHERE domain_uuid=? AND kind=?`, domainUUID, config.Kind).Scan(&encrypted) + } + _, err = s.DB.Exec(`INSERT INTO auth_providers(uuid,domain_uuid,kind,config_json,secret_encrypted,enabled,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,?,?,?) ON CONFLICT(domain_uuid,kind) DO UPDATE SET config_json=excluded.config_json,secret_encrypted=excluded.secret_encrypted,enabled=excluded.enabled,updated_at_ms=excluded.updated_at_ms`, uuid.NewString(), domainUUID, config.Kind, string(payload), encrypted, config.Enabled, time.Now().UnixMilli(), time.Now().UnixMilli()) + return err +} + +func (s *Store) AuthProviderConfig(domainUUID, kind string) (AuthProviderConfig, error) { + var config AuthProviderConfig + var payload, encrypted string + var enabled bool + err := s.DB.QueryRow(`SELECT uuid,config_json,secret_encrypted,enabled FROM auth_providers WHERE domain_uuid=? AND kind=?`, domainUUID, kind).Scan(&config.UUID, &payload, &encrypted, &enabled) + if err != nil { + return config, err + } + if err := json.Unmarshal([]byte(payload), &config); err != nil { + return config, err + } + config.Enabled = enabled + if kind == "oidc" { + config.OIDCMatchBy = strings.ToLower(strings.TrimSpace(config.OIDCMatchBy)) + if config.OIDCMatchBy != "display_name" && config.OIDCMatchBy != "preferred_username" { + // Missing legacy values and unrecognized values both fail back to the + // stricter verified-email bootstrap policy. + config.OIDCMatchBy = "email" + } + } + if kind == "ldap" { + normalizeLDAPProviderConfig(&config) + } + if encrypted != "" { + secret, err := s.decryptAuthSecret(encrypted) + if err != nil { + return config, err + } + if kind == "oidc" { + config.ClientSecret = string(secret) + } else if kind == "smtp" { + config.SMTPPassword = string(secret) + } else if kind == "ldap" { + config.LDAPBindPassword = string(secret) + } + } + return config, nil +} + +// PrincipalByExternalUsername resolves the OIDC preferred_username claim to +// the local password username while enforcing the same account and Domain +// membership state checks as the other external-login bootstrap strategies. +func (s *Store) PrincipalByExternalUsername(domainUUID, username string) (*Principal, error) { + username = strings.ToLower(strings.TrimSpace(username)) + if username == "" || domainUUID == "" { + return nil, ErrAccessDenied + } + rows, err := s.DB.Query(`SELECT p.uuid,i.subject,p.display_name,p.email,p.state,length(p.avatar)>0 + FROM principal_identities i JOIN principals p ON p.uuid=i.principal_uuid + JOIN domain_memberships m ON m.principal_uuid=p.uuid AND m.domain_uuid=? AND m.state='active' + WHERE i.provider_type='password' AND i.subject=? AND p.state IN ('active','readonly') LIMIT 2`, domainUUID, username) + if err != nil { + return nil, err + } + defer rows.Close() + var found *Principal + for rows.Next() { + if found != nil { + return nil, ErrAccessDenied + } + var principal Principal + if err := rows.Scan(&principal.UUID, &principal.Username, &principal.DisplayName, &principal.Email, &principal.State, &principal.HasAvatar); err != nil { + return nil, err + } + found = &principal + } + if err := rows.Err(); err != nil { + return nil, err + } + if found == nil { + return nil, ErrAccessDenied + } + return found, nil +} + +func (s *Store) PrincipalByVerifiedEmail(domainUUID, email string) (*Principal, error) { + email = strings.ToLower(strings.TrimSpace(email)) + if email == "" || domainUUID == "" { + return nil, ErrAccessDenied + } + rows, err := s.DB.Query(`SELECT p.uuid,COALESCE((SELECT subject FROM principal_identities i WHERE i.principal_uuid=p.uuid AND i.provider_type='password' LIMIT 1),p.uuid),p.display_name,p.email,p.state,length(p.avatar)>0 FROM principals p JOIN domain_memberships m ON m.principal_uuid=p.uuid AND m.domain_uuid=? AND m.state='active' WHERE lower(p.email)=? AND p.state IN ('active','readonly') LIMIT 2`, domainUUID, email) + if err != nil { + return nil, err + } + defer rows.Close() + var found *Principal + for rows.Next() { + if found != nil { + return nil, ErrAccessDenied + } + var p Principal + if err := rows.Scan(&p.UUID, &p.Username, &p.DisplayName, &p.Email, &p.State, &p.HasAvatar); err != nil { + return nil, err + } + found = &p + } + if err := rows.Err(); err != nil { + return nil, err + } + if found == nil { + return nil, ErrAccessDenied + } + return found, nil +} + +// PrincipalByDisplayName deliberately requires an exact, unique match inside +// the active Domain membership. Display names are mutable and not identifiers; +// this is only a first-login bootstrap before the provider issuer+sub binding +// becomes authoritative. +func (s *Store) PrincipalByDisplayName(domainUUID, displayName string) (*Principal, error) { + displayName = strings.TrimSpace(displayName) + if displayName == "" || domainUUID == "" { + return nil, ErrAccessDenied + } + rows, err := s.DB.Query(`SELECT p.uuid, + COALESCE((SELECT subject FROM principal_identities i WHERE i.principal_uuid=p.uuid AND i.provider_type='password' LIMIT 1),p.uuid), + p.display_name,p.email,p.state,length(p.avatar)>0 + FROM principals p JOIN domain_memberships m + ON m.principal_uuid=p.uuid AND m.domain_uuid=? AND m.state='active' + WHERE p.display_name=? AND p.state IN ('active','readonly') LIMIT 2`, domainUUID, displayName) + if err != nil { + return nil, err + } + defer rows.Close() + var found *Principal + for rows.Next() { + if found != nil { + return nil, ErrAccessDenied + } + var principal Principal + if err := rows.Scan(&principal.UUID, &principal.Username, &principal.DisplayName, &principal.Email, &principal.State, &principal.HasAvatar); err != nil { + return nil, err + } + found = &principal + } + if err := rows.Err(); err != nil { + return nil, err + } + if found == nil { + return nil, ErrAccessDenied + } + return found, nil +} + +func (s *Store) BindExternalIdentity(principalUUID, providerType, providerUUID, issuer, subject string, attributes any) error { + if strings.TrimSpace(subject) == "" || strings.TrimSpace(principalUUID) == "" { + return ErrAccessDenied + } + payload, err := json.Marshal(attributes) + if err != nil { + return err + } + now := time.Now().UnixMilli() + result, err := s.DB.Exec(`INSERT INTO principal_identities(uuid,principal_uuid,provider_type,provider_uuid,issuer,subject,attributes_json,created_at_ms) VALUES(?,?,?,?,?,?,?,?) ON CONFLICT(provider_type,provider_uuid,issuer,subject) DO UPDATE SET attributes_json=excluded.attributes_json WHERE principal_identities.principal_uuid=excluded.principal_uuid`, uuid.NewString(), principalUUID, providerType, providerUUID, issuer, subject, string(payload), now) + if err != nil { + return err + } + changed, err := result.RowsAffected() + if err != nil { + return err + } + if changed != 1 { + return ErrAccessDenied + } + return nil +} + +func (s *Store) PrincipalByExternalIdentity(domainUUID, providerType, providerUUID, issuer, subject string) (*Principal, error) { + var p Principal + err := s.DB.QueryRow(`SELECT p.uuid,COALESCE((SELECT subject FROM principal_identities x WHERE x.principal_uuid=p.uuid AND x.provider_type='password' LIMIT 1),p.uuid),p.display_name,p.email,p.state,length(p.avatar)>0 FROM principal_identities i JOIN principals p ON p.uuid=i.principal_uuid JOIN domain_memberships m ON m.principal_uuid=p.uuid AND m.domain_uuid=? AND m.state='active' WHERE i.provider_type=? AND i.provider_uuid=? AND i.issuer=? AND i.subject=? AND p.state IN ('active','readonly')`, domainUUID, providerType, providerUUID, issuer, subject).Scan(&p.UUID, &p.Username, &p.DisplayName, &p.Email, &p.State, &p.HasAvatar) + return &p, err +} + +func (s *Store) CreateAuthChallenge(domainUUID, principalUUID, kind string, payload any, lifetime time.Duration) (string, error) { + token, hash, err := authToken() + if err != nil { + return "", err + } + encoded, _ := json.Marshal(payload) + now := time.Now().UnixMilli() + _, err = s.DB.Exec(`INSERT INTO auth_challenges(uuid,domain_uuid,principal_uuid,kind,token_hash,payload_json,expires_at_ms,created_at_ms) VALUES(?,?,?,?,?,?,?,?)`, uuid.NewString(), domainUUID, principalUUID, kind, hash, string(encoded), now+lifetime.Milliseconds(), now) + return token, err +} + +func (s *Store) ConsumeAuthChallenge(domainUUID, kind, token string, payload any) (string, error) { + hash := hashAuthToken(token) + var id, principalUUID, encoded string + var expires int64 + err := s.DB.QueryRow(`SELECT uuid,principal_uuid,payload_json,expires_at_ms FROM auth_challenges WHERE domain_uuid=? AND kind=? AND token_hash=? AND consumed_at_ms=0`, domainUUID, kind, hash).Scan(&id, &principalUUID, &encoded, &expires) + if err != nil || expires < time.Now().UnixMilli() { + return "", ErrAccessDenied + } + result, err := s.DB.Exec(`UPDATE auth_challenges SET consumed_at_ms=? WHERE uuid=? AND consumed_at_ms=0`, time.Now().UnixMilli(), id) + if err != nil { + return "", err + } + changed, _ := result.RowsAffected() + if changed != 1 { + return "", ErrAccessDenied + } + if payload != nil && json.Unmarshal([]byte(encoded), payload) != nil { + return "", ErrAccessDenied + } + return principalUUID, nil +} + +func hashAuthToken(token string) string { + sum := sha256.Sum256([]byte(token)) + return base64.RawURLEncoding.EncodeToString(sum[:]) +} diff --git a/internal/store/auth_external_binding_test.go b/internal/store/auth_external_binding_test.go new file mode 100644 index 0000000..f864af9 --- /dev/null +++ b/internal/store/auth_external_binding_test.go @@ -0,0 +1,177 @@ +package store + +import ( + "database/sql" + "errors" + "strings" + "testing" +) + +func externalBindingFixture(t *testing.T) *Store { + t.Helper() + database, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + database.SetMaxOpenConns(1) + t.Cleanup(func() { database.Close() }) + st := &Store{DB: database, authKey: make([]byte, 32)} + if err := st.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`INSERT INTO principals(uuid,display_name,email,state,created_at_ms,updated_at_ms) VALUES('first','First User','same@example.test','active',1,1),('second','Second User','SAME@example.test','readonly',1,1); + INSERT INTO principal_identities(uuid,principal_uuid,provider_type,subject,created_at_ms) VALUES('i1','first','password','first',1),('i2','second','password','second',1); + INSERT INTO domain_memberships(uuid,domain_uuid,principal_uuid,state,created_at_ms) VALUES('m1','domain','first','active',1),('m2','domain','second','suspended',1),('m3','other','second','active',1)`); err != nil { + t.Fatal(err) + } + return st +} + +func TestExternalUsernameLookupRequiresActiveAccountAndMembership(t *testing.T) { + st := externalBindingFixture(t) + principal, err := st.PrincipalByExternalUsername("domain", " FIRST ") + if err != nil || principal.UUID != "first" || principal.Username != "first" { + t.Fatalf("active username: %#v %v", principal, err) + } + if _, err := st.PrincipalByExternalUsername("domain", "second"); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("suspended membership resolved username: %v", err) + } + if _, err := st.DB.Exec(`UPDATE principals SET state='quarantined' WHERE uuid='second'`); err != nil { + t.Fatal(err) + } + if _, err := st.PrincipalByExternalUsername("other", "second"); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("quarantined account resolved username: %v", err) + } + if _, err := st.PrincipalByExternalUsername("domain", " "); !errors.Is(err, ErrAccessDenied) { + t.Fatal("empty username resolved account") + } +} + +func TestExternalDisplayNameLookupRequiresExactUniqueActiveMembership(t *testing.T) { + st := externalBindingFixture(t) + principal, err := st.PrincipalByDisplayName("domain", " First User ") + if err != nil || principal.UUID != "first" { + t.Fatalf("unique active display name: %#v %v", principal, err) + } + if _, err := st.PrincipalByDisplayName("domain", "first user"); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("case-insensitive display name unexpectedly matched: %v", err) + } + if _, err := st.DB.Exec(`UPDATE principals SET display_name='First User' WHERE uuid='second'; UPDATE domain_memberships SET state='active' WHERE uuid='m2'`); err != nil { + t.Fatal(err) + } + if principal, err := st.PrincipalByDisplayName("domain", "First User"); !errors.Is(err, ErrAccessDenied) || principal != nil { + t.Fatalf("ambiguous display name selected an arbitrary account: %#v %v", principal, err) + } + if _, err := st.DB.Exec(`UPDATE domain_memberships SET state='suspended' WHERE uuid='m2'`); err != nil { + t.Fatal(err) + } + if principal, err := st.PrincipalByDisplayName("domain", "First User"); err != nil || principal.UUID != "first" { + t.Fatalf("inactive duplicate blocked unique active account: %#v %v", principal, err) + } + if _, err := st.PrincipalByDisplayName("domain", " "); !errors.Is(err, ErrAccessDenied) { + t.Fatal("empty display name resolved account") + } +} + +func TestExternalEmailLookupRequiresUniqueActiveMembership(t *testing.T) { + st := externalBindingFixture(t) + principal, err := st.PrincipalByVerifiedEmail("domain", " SAME@example.test ") + if err != nil || principal.UUID != "first" { + t.Fatalf("unique active account: %#v %v", principal, err) + } + if _, err := st.DB.Exec(`UPDATE domain_memberships SET state='active' WHERE uuid='m2'`); err != nil { + t.Fatal(err) + } + if principal, err := st.PrincipalByVerifiedEmail("domain", "same@example.test"); !errors.Is(err, ErrAccessDenied) || principal != nil { + t.Fatalf("ambiguous email selected an arbitrary account: %#v %v", principal, err) + } + if _, err := st.DB.Exec(`UPDATE domain_memberships SET state='suspended' WHERE domain_uuid='domain'`); err != nil { + t.Fatal(err) + } + if _, err := st.PrincipalByVerifiedEmail("domain", "same@example.test"); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("suspended membership resolved email: %v", err) + } + if _, err := st.PrincipalByVerifiedEmail("other", "same@example.test"); err != nil { + t.Fatalf("readonly active member rejected: %v", err) + } + if _, err := st.DB.Exec(`UPDATE principals SET state='quarantined' WHERE uuid='second'`); err != nil { + t.Fatal(err) + } + if _, err := st.PrincipalByVerifiedEmail("other", "same@example.test"); !errors.Is(err, ErrAccessDenied) { + t.Fatal("quarantined account resolved email") + } + if _, err := st.PrincipalByVerifiedEmail("domain", " "); !errors.Is(err, ErrAccessDenied) { + t.Fatal("empty email resolved account") + } +} + +func TestExternalIdentityConflictCannotRebindPrincipal(t *testing.T) { + st := externalBindingFixture(t) + bind := func(principal, marker string) error { + return st.BindExternalIdentity(principal, "oidc", "provider", "https://issuer.example.test", "subject", map[string]string{"marker": marker}) + } + if err := bind("first", "initial"); err != nil { + t.Fatal(err) + } + if err := bind("second", "attacker"); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("different principal rebind succeeded: %v", err) + } + var owner, attributes string + if err := st.DB.QueryRow(`SELECT principal_uuid,attributes_json FROM principal_identities WHERE provider_type='oidc'`).Scan(&owner, &attributes); err != nil { + t.Fatal(err) + } + if owner != "first" || strings.Contains(attributes, "attacker") { + t.Fatal("rejected rebind changed owner or attributes") + } + if err := bind("first", "refreshed"); err != nil { + t.Fatalf("same principal refresh rejected: %v", err) + } + principal, err := st.PrincipalByExternalIdentity("domain", "oidc", "provider", "https://issuer.example.test", "subject") + if err != nil || principal.UUID != "first" { + t.Fatalf("bound principal: %#v %v", principal, err) + } + if _, err := st.DB.Exec(`UPDATE domain_memberships SET state='suspended' WHERE uuid='m1'`); err != nil { + t.Fatal(err) + } + if _, err := st.PrincipalByExternalIdentity("domain", "oidc", "provider", "https://issuer.example.test", "subject"); err == nil { + t.Fatal("suspended membership resolved external identity") + } +} + +func TestExternalIdentityConcurrentBindingHasOneWinner(t *testing.T) { + st := externalBindingFixture(t) + start := make(chan struct{}) + type result struct { + principal string + err error + } + results := make(chan result, 2) + for _, principal := range []string{"first", "second"} { + go func(principal string) { + <-start + results <- result{principal, st.BindExternalIdentity(principal, "oidc", "provider", "https://issuer.example.test", "race", map[string]string{"principal": principal})} + }(principal) + } + close(start) + winner, failures := "", 0 + for range 2 { + result := <-results + if result.err == nil { + if winner != "" { + t.Fatal("two accounts accepted the same external subject") + } + winner = result.principal + } else if errors.Is(result.err, ErrAccessDenied) { + failures++ + } else { + t.Fatal(result.err) + } + } + if winner == "" || failures != 1 { + t.Fatal("binding did not have exactly one accepted owner") + } + var actual string + if err := st.DB.QueryRow(`SELECT principal_uuid FROM principal_identities WHERE subject='race'`).Scan(&actual); err != nil || actual != winner { + t.Fatalf("binding winner was not persisted: %q %v", actual, err) + } +} diff --git a/internal/store/auth_ldap_test.go b/internal/store/auth_ldap_test.go new file mode 100644 index 0000000..8fe6c07 --- /dev/null +++ b/internal/store/auth_ldap_test.go @@ -0,0 +1,111 @@ +package store + +import ( + "errors" + "strings" + "testing" +) + +func validLDAPProviderConfig() AuthProviderConfig { + return AuthProviderConfig{ + Kind: "ldap", + Enabled: true, + LDAPURL: "ldaps://directory.example.test:636", + LDAPBindDN: "cn=pageswiki,ou=services,dc=example,dc=test", + LDAPBindPassword: "directory-secret", + LDAPSearchBase: "ou=people,dc=example,dc=test", + LDAPSearchFilter: "(&(objectClass=person)(uid={{username}}))", + LDAPUIDAttribute: "entryUUID", + LDAPUsernameAttribute: "uid", + LDAPEmailAttribute: "mail", + LDAPDisplayAttribute: "displayName", + LDAPMatchBy: "username", + } +} + +func TestLDAPProviderValidationAndEncryptedSecret(t *testing.T) { + st := externalBindingFixture(t) + config := validLDAPProviderConfig() + if err := ValidateLDAPProviderConfig(config); err != nil { + t.Fatal(err) + } + if err := st.SetAuthProviderConfig("domain", config); err != nil { + t.Fatal(err) + } + var encrypted string + if err := st.DB.QueryRow(`SELECT secret_encrypted FROM auth_providers WHERE domain_uuid='domain' AND kind='ldap'`).Scan(&encrypted); err != nil { + t.Fatal(err) + } + if encrypted == "" || strings.Contains(encrypted, config.LDAPBindPassword) { + t.Fatal("LDAP bind password was stored in plaintext") + } + loaded, err := st.AuthProviderConfig("domain", "ldap") + if err != nil || loaded.UUID == "" || loaded.LDAPBindPassword != config.LDAPBindPassword || loaded.LDAPUIDAttribute != "entryUUID" { + t.Fatalf("loaded LDAP provider: %#v, %v", loaded, err) + } + providerUUID := loaded.UUID + config.LDAPBindPassword = "" + config.LDAPSearchFilter = "(mail={{username}})" + if err := st.SetAuthProviderConfig("domain", config); err != nil { + t.Fatal(err) + } + loaded, err = st.AuthProviderConfig("domain", "ldap") + if err != nil || loaded.UUID != providerUUID || loaded.LDAPBindPassword != "directory-secret" || loaded.LDAPSearchFilter != "(mail={{username}})" { + t.Fatalf("LDAP secret preservation: %#v, %v", loaded, err) + } + + invalid := []AuthProviderConfig{ + func() AuthProviderConfig { c := config; c.LDAPURL = "https://directory.example.test"; return c }(), + func() AuthProviderConfig { c := config; c.LDAPURL = "ldap://user@directory.example.test"; return c }(), + func() AuthProviderConfig { c := config; c.LDAPSearchFilter = "(uid=constant)"; return c }(), + func() AuthProviderConfig { c := config; c.LDAPSearchFilter = "(&(uid={{username}})"; return c }(), + func() AuthProviderConfig { c := config; c.LDAPSearchBase = "not a valid DN,"; return c }(), + func() AuthProviderConfig { c := config; c.LDAPUIDAttribute = "entry UUID"; return c }(), + func() AuthProviderConfig { c := config; c.LDAPStartTLS = true; return c }(), + } + for index, item := range invalid { + if err := ValidateLDAPProviderConfig(item); err == nil { + t.Fatalf("invalid LDAP configuration %d was accepted", index) + } + } +} + +func TestLDAPExternalProvisioningHasNoLocalPassword(t *testing.T) { + st := externalBindingFixture(t) + principal, err := st.ProvisionExternalAccount( + "domain", "directory-user", "Directory User", "directory@example.test", + "ldap", "provider", "", "attr:c3RhYmxl", + map[string]string{"dn": "uid=directory-user,ou=people,dc=example,dc=test"}, + ) + if err != nil { + t.Fatal(err) + } + if principal.Username != "directory-user" { + t.Fatalf("provisioned principal: %#v", principal) + } + if _, err := st.AuthenticatePassword("directory-user", "any password is invalid"); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("LDAP-only account acquired a local password: %v", err) + } + resolved, err := st.PrincipalByExternalIdentity("domain", "ldap", "provider", "", "attr:c3RhYmxl") + if err != nil || resolved.UUID != principal.UUID { + t.Fatalf("LDAP identity lookup: %#v, %v", resolved, err) + } + var roleName string + if err := st.DB.QueryRow(`SELECT r.name FROM auth_role_bindings b JOIN auth_roles r ON r.uuid=b.role_uuid JOIN domain_memberships m ON m.uuid=b.membership_uuid WHERE m.domain_uuid='domain' AND m.principal_uuid=?`, principal.UUID).Scan(&roleName); err != nil || roleName != "member" { + t.Fatalf("default role = %q, %v", roleName, err) + } +} + +func TestLDAPBootstrapBindingCannotBeReplacedByMutableLogin(t *testing.T) { + st := externalBindingFixture(t) + if err := st.BindExternalIdentityIfProviderUnbound("domain", "first", "ldap", "provider", "", "attr:b25l", map[string]string{"username": "first"}); err != nil { + t.Fatal(err) + } + if err := st.BindExternalIdentityIfProviderUnbound("domain", "first", "ldap", "provider", "", "attr:dHdv", map[string]string{"username": "first"}); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("second immutable LDAP subject replaced the first: %v", err) + } + resolved, err := st.PrincipalByExternalIdentity("domain", "ldap", "provider", "", "attr:b25l") + if err != nil || resolved.UUID != "first" { + t.Fatalf("original LDAP binding = %#v, %v", resolved, err) + } +} diff --git a/internal/store/auth_session_state_test.go b/internal/store/auth_session_state_test.go new file mode 100644 index 0000000..f9ab5c3 --- /dev/null +++ b/internal/store/auth_session_state_test.go @@ -0,0 +1,66 @@ +package store + +import ( + "database/sql" + "errors" + "testing" +) + +func TestSessionIssuanceRequiresCurrentPrincipalAndMembership(t *testing.T) { + database, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + database.SetMaxOpenConns(1) + t.Cleanup(func() { _ = database.Close() }) + s := &Store{DB: database} + if err := s.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + p, err := s.BootstrapOwner("domain", "admin", "a long test password", "Admin", "") + if err != nil { + t.Fatal(err) + } + for _, test := range []struct { + state, membership string + allowed bool + }{ + {"active", "active", true}, {"readonly", "active", true}, + {"suspended", "active", false}, {"quarantined", "active", false}, + {"active", "suspended", false}, + } { + if _, err := database.Exec(`UPDATE principals SET state=? WHERE uuid=?`, test.state, p.UUID); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`UPDATE domain_memberships SET state=? WHERE principal_uuid=?`, test.membership, p.UUID); err != nil { + t.Fatal(err) + } + for _, browser := range []bool{false, true} { + var token string + if browser { + token, err = s.CreateBrowserAuthSession("domain", p.UUID, 0) + } else { + token, err = s.CreateAuthSession("domain", p.UUID) + } + if test.allowed && (err != nil || token == "") || !test.allowed && (!errors.Is(err, ErrAccessDenied) || token != "") { + t.Fatalf("state=%s membership=%s browser=%v: token issued=%v err=%v", test.state, test.membership, browser, token != "", err) + } + } + } + if _, err := database.Exec(`UPDATE principals SET state='active'; UPDATE domain_memberships SET state='active'`); err != nil { + t.Fatal(err) + } + token, err := s.CreateAuthSession("domain", p.UUID) + if err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`DELETE FROM domain_memberships WHERE principal_uuid=?`, p.UUID); err != nil { + t.Fatal(err) + } + if _, err := s.PrincipalForSession("domain", token); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("removed membership still authenticated: %v", err) + } + if token, err := s.CreateAuthSession("domain", p.UUID); token != "" || !errors.Is(err, ErrAccessDenied) { + t.Fatalf("session issued without membership: %v", err) + } +} diff --git a/internal/store/auth_test.go b/internal/store/auth_test.go new file mode 100644 index 0000000..a955fa2 --- /dev/null +++ b/internal/store/auth_test.go @@ -0,0 +1,342 @@ +package store + +import ( + "database/sql" + "errors" + "testing" + "time" + + _ "modernc.org/sqlite" +) + +func TestAuthorizeUsesDomainScopedPositiveRoleGrant(t *testing.T) { + database, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database} + if err := st.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + now := time.Now().UnixMilli() + statements := []string{ + `INSERT INTO principals(uuid,state,created_at_ms,updated_at_ms) VALUES('p','active',?,?)`, + `INSERT INTO domain_memberships(uuid,domain_uuid,principal_uuid,state,created_at_ms) VALUES('m','d','p','active',?)`, + `INSERT INTO auth_roles(uuid,domain_uuid,name,created_at_ms) VALUES('r','d','editor',?)`, + `INSERT INTO auth_role_bindings(membership_uuid,role_uuid,created_at_ms) VALUES('m','r',?)`, + `INSERT INTO auth_capability_grants(uuid,role_uuid,capability,target_type,target_id,created_at_ms) VALUES('g','r','write','spot','auth-api',?)`, + } + for index, statement := range statements { + args := []any{now} + if index == 0 { + args = []any{now, now} + } + if _, err := st.DB.Exec(statement, args...); err != nil { + t.Fatal(err) + } + } + if err := st.Authorize(AuthorizationRequest{DomainUUID: "d", PrincipalUUID: "p", Capability: "write", TargetType: "spot", TargetID: "auth-api"}); err != nil { + t.Fatal(err) + } + denied := []AuthorizationRequest{ + {DomainUUID: "other", PrincipalUUID: "p", Capability: "write", TargetType: "spot", TargetID: "auth-api"}, + {DomainUUID: "d", PrincipalUUID: "p", Capability: "delete", TargetType: "spot", TargetID: "auth-api"}, + {DomainUUID: "d", PrincipalUUID: "p", Capability: "write", TargetType: "spot", TargetID: "other"}, + } + for _, request := range denied { + if err := st.Authorize(request); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("request %#v: %v", request, err) + } + } +} + +func TestPasswordBootstrapSessionAndRevocation(t *testing.T) { + database, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database} + if err := st.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + principal, err := st.BootstrapOwner("domain-1", "Owner", "correct horse battery staple", "Owner", "owner@example.test") + if err != nil { + t.Fatal(err) + } + if _, err := st.AuthenticatePassword("owner", "wrong password value"); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("wrong password: %v", err) + } + authenticated, err := st.AuthenticatePassword("owner", "correct horse battery staple") + if err != nil || authenticated.UUID != principal.UUID { + t.Fatalf("authentication = %#v, %v", authenticated, err) + } + token, err := st.CreateAuthSession("domain-1", principal.UUID) + if err != nil { + t.Fatal(err) + } + if loaded, err := st.PrincipalForSession("domain-1", token); err != nil || loaded.UUID != principal.UUID { + t.Fatalf("session = %#v, %v", loaded, err) + } + if _, err := st.PrincipalForSession("domain-2", token); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("cross-domain session: %v", err) + } + if err := st.RevokeAuthSession(token); err != nil { + t.Fatal(err) + } + if _, err := st.PrincipalForSession("domain-1", token); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("revoked session: %v", err) + } +} + +func TestUsernameRejectsDotAndAvatarIsMutableMetadata(t *testing.T) { + database, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database} + if err := st.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + if _, err := st.BootstrapOwner("d", "alice.example", "correct horse battery staple", "Alice", ""); err == nil { + t.Fatal("username containing a dot was accepted") + } + principal, err := st.BootstrapOwner("d", "alice", "correct horse battery staple", "Alice", "") + if err != nil { + t.Fatal(err) + } + avatar := []byte{0x89, 'P', 'N', 'G'} + if err := st.SetPrincipalAvatar(principal.UUID, "image/png", avatar); err != nil { + t.Fatal(err) + } + contentType, loaded, err := st.PrincipalAvatar(principal.UUID) + if err != nil || contentType != "image/png" || string(loaded) != string(avatar) { + t.Fatalf("avatar = %q %v %v", contentType, loaded, err) + } +} + +func TestTOTPEnrollmentEncryptionAndReplayProtection(t *testing.T) { + database, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database, authKey: make([]byte, 32)} + if err := st.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + principal, err := st.BootstrapOwner("d", "alice", "correct horse battery staple", "Alice", "") + if err != nil { + t.Fatal(err) + } + secret, err := st.BeginTOTPEnrollment(principal.UUID) + if err != nil { + t.Fatal(err) + } + var stored string + if err := database.QueryRow(`SELECT secret_hash FROM auth_credentials WHERE kind='totp-pending'`).Scan(&stored); err != nil { + t.Fatal(err) + } + if stored == secret { + t.Fatal("TOTP seed was stored in plaintext") + } + code, err := totpCode(secret, time.Now().Unix()/30) + if err != nil { + t.Fatal(err) + } + if err := st.ConfirmTOTPEnrollment(principal.UUID, code); err != nil { + t.Fatal(err) + } + if !st.HasTOTP(principal.UUID) { + t.Fatal("TOTP was not enabled") + } + if err := st.VerifyTOTP(principal.UUID, code); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("replayed code = %v", err) + } +} + +func TestTOTPLoginChallengeExpiresAfterFiveInvalidAttempts(t *testing.T) { + database, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database, authKey: make([]byte, 32)} + if err := st.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + principal, err := st.BootstrapOwner("d", "alice", "correct horse battery staple", "Alice", "") + if err != nil { + t.Fatal(err) + } + secret, err := st.BeginTOTPEnrollment(principal.UUID) + if err != nil { + t.Fatal(err) + } + code, err := totpCode(secret, time.Now().Unix()/30) + if err != nil { + t.Fatal(err) + } + if err := st.ConfirmTOTPEnrollment(principal.UUID, code); err != nil { + t.Fatal(err) + } + challenge, err := st.CreateTOTPLoginChallenge("d", principal.UUID) + if err != nil { + t.Fatal(err) + } + for attempt := 1; attempt <= 5; attempt++ { + if _, err := st.CompleteTOTPLoginChallenge("d", challenge, "invalid"); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("attempt %d = %v", attempt, err) + } + } + var attempts int + var consumedAt int64 + if err := database.QueryRow(`SELECT attempt_count,consumed_at_ms FROM auth_challenges WHERE kind='totp-login'`).Scan(&attempts, &consumedAt); err != nil { + t.Fatal(err) + } + if attempts != 5 || consumedAt == 0 { + t.Fatalf("challenge state = attempts %d, consumed_at_ms %d", attempts, consumedAt) + } +} + +func TestExternalProviderSecretsAndMagicChallenge(t *testing.T) { + database, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database, authKey: make([]byte, 32)} + if err := st.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + config := AuthProviderConfig{Kind: "oidc", Enabled: true, Issuer: "https://id.example.test", ClientID: "pages", ClientSecret: "not-plaintext"} + if err := st.SetAuthProviderConfig("d", config); err != nil { + t.Fatal(err) + } + var encrypted string + if err := database.QueryRow(`SELECT secret_encrypted FROM auth_providers WHERE domain_uuid='d' AND kind='oidc'`).Scan(&encrypted); err != nil { + t.Fatal(err) + } + if encrypted == "" || encrypted == config.ClientSecret { + t.Fatal("provider secret was not encrypted") + } + loaded, err := st.AuthProviderConfig("d", "oidc") + if err != nil || loaded.ClientSecret != config.ClientSecret || !loaded.Enabled || loaded.OIDCMatchBy != "email" { + t.Fatalf("provider = %#v, %v", loaded, err) + } + config.ClientSecret = "" + config.OIDCMatchBy = "display_name" + if err := st.SetAuthProviderConfig("d", config); err != nil { + t.Fatal(err) + } + loaded, err = st.AuthProviderConfig("d", "oidc") + if err != nil || loaded.OIDCMatchBy != "display_name" || loaded.ClientSecret != "not-plaintext" { + t.Fatalf("display-name provider = %#v, %v", loaded, err) + } + config.OIDCMatchBy = "username" + if err := st.SetAuthProviderConfig("d", config); err == nil { + t.Fatal("unsupported OIDC matching field was accepted") + } + token, err := st.CreateAuthChallenge("d", "principal", "magic-link", map[string]string{"return": "/docs"}, time.Minute) + if err != nil { + t.Fatal(err) + } + var payload map[string]string + principal, err := st.ConsumeAuthChallenge("d", "magic-link", token, &payload) + if err != nil || principal != "principal" || payload["return"] != "/docs" { + t.Fatalf("challenge = %q %#v, %v", principal, payload, err) + } + if _, err := st.ConsumeAuthChallenge("d", "magic-link", token, nil); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("reused challenge = %v", err) + } +} + +func TestGroupPermissionProfilesAndAdministrationRoles(t *testing.T) { + database, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database, authKey: make([]byte, 32)} + if err := st.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + owner, err := st.BootstrapOwner("d", "owner", "correct horse battery staple", "Owner", "owner@example.test") + if err != nil { + t.Fatal(err) + } + member, err := st.CreatePasswordAccount("d", "member", "correct horse battery staple", "Member", "member@example.test") + if err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`DELETE FROM auth_role_bindings WHERE membership_uuid IN (SELECT uuid FROM domain_memberships WHERE domain_uuid='d' AND principal_uuid=?)`, member.UUID); err != nil { + t.Fatal(err) + } + group, err := st.CreateGroup("d", owner.UUID, "writers", "Writers", "", "members") + if err != nil { + t.Fatal(err) + } + if err := st.AddGroupMemberByUsername("d", group.UUID, "member", "member"); err != nil { + t.Fatal(err) + } + if role := st.GroupMemberRole(group.UUID, owner.UUID); role != "owner" { + t.Fatalf("owner role = %q", role) + } + if role := st.GroupMemberRole(group.UUID, member.UUID); role != "member" { + t.Fatalf("member role = %q", role) + } + if err := st.SetGroupPermission(group.UUID, "/drop", "upload_only"); err != nil { + t.Fatal(err) + } + allowed := func(capability, path string) bool { + return st.Authorize(AuthorizationRequest{DomainUUID: "d", PrincipalUUID: member.UUID, Capability: capability, TargetType: "path", TargetID: path}) == nil + } + if !allowed("upload", "/drop/file.txt") || allowed("read", "/drop/file.txt") || allowed("write", "/drop/file.txt") { + t.Fatal("upload-only permission did not remain upload-only") + } + if err := st.SetGroupPermission(group.UUID, "/once", "read_write_once"); err != nil { + t.Fatal(err) + } + if !allowed("read", "/once/a") || !allowed("create", "/once/a") || !allowed("upload", "/once/a") || allowed("write", "/once/a") || allowed("delete", "/once/a") { + t.Fatal("read/write-once permission capabilities are incorrect") + } + if err := st.SetGroupPermission(group.UUID, "/work", "read_write"); err != nil { + t.Fatal(err) + } + if !allowed("read", "/work/a") || !allowed("write", "/work/a") || !allowed("rename", "/work/a") || allowed("delete", "/work/a") { + t.Fatal("read/write permission capabilities are incorrect") + } +} + +func TestBuiltinCampusAndDomainAdminProjection(t *testing.T) { + database, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + if _, err := database.Exec(`CREATE TABLE domains(uuid TEXT PRIMARY KEY,campus_uuid TEXT,enabled INTEGER NOT NULL DEFAULT 1); INSERT INTO domains(uuid,campus_uuid) VALUES('d1','c1'),('d2','c1')`); err != nil { + t.Fatal(err) + } + st := &Store{DB: database, authKey: make([]byte, 32)} + if err := st.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + if err := st.EnsureBuiltinAdminGroups(); err != nil { + t.Fatal(err) + } + owner, err := st.BootstrapOwner("d1", "owner", "correct horse battery staple", "Owner", "") + if err != nil { + t.Fatal(err) + } + if !st.IsBuiltinGroupAdmin("d1", owner.UUID, "domain_admin") { + t.Fatal("bootstrap owner was not migrated to domain_admin") + } + if !st.IsCampusAdmin("c1", owner.UUID) || !st.IsBuiltinGroupAdmin("d2", owner.UUID, "campus_admin") { + t.Fatal("campus_admin was not projected to the sibling Domain") + } + if st.IsBuiltinGroupAdmin("d2", owner.UUID, "domain_admin") { + t.Fatal("domain_admin was unexpectedly inherited") + } +} diff --git a/internal/store/auth_totp.go b/internal/store/auth_totp.go new file mode 100644 index 0000000..d468223 --- /dev/null +++ b/internal/store/auth_totp.go @@ -0,0 +1,211 @@ +package store + +import ( + "crypto/aes" + "crypto/cipher" + "crypto/hmac" + "crypto/rand" + "crypto/sha1" + "crypto/sha256" + "encoding/base32" + "encoding/base64" + "encoding/binary" + "encoding/json" + "errors" + "fmt" + "net/url" + "strings" + "time" + + "github.com/google/uuid" +) + +func (s *Store) encryptAuthSecret(plain []byte) (string, error) { + block, err := aes.NewCipher(s.authKey) + if err != nil { + return "", err + } + gcm, err := cipher.NewGCM(block) + if err != nil { + return "", err + } + nonce := make([]byte, gcm.NonceSize()) + if _, err = rand.Read(nonce); err != nil { + return "", err + } + sealed := gcm.Seal(nonce, nonce, plain, nil) + return base64.RawStdEncoding.EncodeToString(sealed), nil +} +func (s *Store) decryptAuthSecret(encoded string) ([]byte, error) { + sealed, err := base64.RawStdEncoding.DecodeString(encoded) + if err != nil { + return nil, err + } + block, err := aes.NewCipher(s.authKey) + if err != nil { + return nil, err + } + gcm, err := cipher.NewGCM(block) + if err != nil || len(sealed) < gcm.NonceSize() { + return nil, errors.New("invalid encrypted secret") + } + return gcm.Open(nil, sealed[:gcm.NonceSize()], sealed[gcm.NonceSize():], nil) +} + +func (s *Store) BeginTOTPEnrollment(principalUUID string) (string, error) { + raw := make([]byte, 20) + if _, err := rand.Read(raw); err != nil { + return "", err + } + secret := base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(raw) + encrypted, err := s.encryptAuthSecret([]byte(secret)) + if err != nil { + return "", err + } + now := time.Now().UnixMilli() + _, err = s.DB.Exec(`INSERT INTO auth_credentials(uuid,principal_uuid,kind,identifier,secret_hash,parameters_json,enabled,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,'{}',0,?,?) ON CONFLICT(kind,identifier) DO UPDATE SET secret_hash=excluded.secret_hash,parameters_json='{}',enabled=0,updated_at_ms=excluded.updated_at_ms`, uuid.NewString(), principalUUID, "totp-pending", principalUUID, encrypted, now, now) + return secret, err +} +func totpCode(secret string, counter int64) (string, error) { + key, err := base32.StdEncoding.WithPadding(base32.NoPadding).DecodeString(strings.ToUpper(secret)) + if err != nil { + return "", err + } + buf := make([]byte, 8) + binary.BigEndian.PutUint64(buf, uint64(counter)) + mac := hmac.New(sha1.New, key) + _, _ = mac.Write(buf) + sum := mac.Sum(nil) + offset := sum[len(sum)-1] & 15 + value := (uint32(sum[offset])&0x7f)<<24 | uint32(sum[offset+1])<<16 | uint32(sum[offset+2])<<8 | uint32(sum[offset+3]) + return fmt.Sprintf("%06d", value%1000000), nil +} +func verifyTOTPCode(secret, code string, last int64) (int64, bool) { + code = strings.TrimSpace(code) + now := time.Now().Unix() / 30 + for delta := int64(-1); delta <= 1; delta++ { + counter := now + delta + if counter <= last { + continue + } + expected, err := totpCode(secret, counter) + if err == nil && hmac.Equal([]byte(expected), []byte(code)) { + return counter, true + } + } + return 0, false +} +func (s *Store) confirmTOTP(principalUUID, kind, code string) (int64, error) { + var encrypted, params string + err := s.DB.QueryRow(`SELECT secret_hash,parameters_json FROM auth_credentials WHERE principal_uuid=? AND kind=? AND identifier=?`, principalUUID, kind, principalUUID).Scan(&encrypted, ¶ms) + if err != nil { + return 0, err + } + plain, err := s.decryptAuthSecret(encrypted) + if err != nil { + return 0, err + } + var state struct { + LastCounter int64 `json:"last_counter"` + } + _ = json.Unmarshal([]byte(params), &state) + counter, ok := verifyTOTPCode(string(plain), code, state.LastCounter) + if !ok { + return 0, ErrAccessDenied + } + return counter, nil +} +func (s *Store) ConfirmTOTPEnrollment(principalUUID, code string) error { + counter, err := s.confirmTOTP(principalUUID, "totp-pending", code) + if err != nil { + return err + } + params, _ := json.Marshal(map[string]int64{"last_counter": counter}) + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + _, _ = tx.Exec(`DELETE FROM auth_credentials WHERE principal_uuid=? AND kind='totp'`, principalUUID) + _, err = tx.Exec(`UPDATE auth_credentials SET kind='totp',enabled=1,parameters_json=?,updated_at_ms=? WHERE principal_uuid=? AND kind='totp-pending'`, string(params), time.Now().UnixMilli(), principalUUID) + if err != nil { + return err + } + return tx.Commit() +} +func (s *Store) HasTOTP(principalUUID string) bool { + var exists int + _ = s.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM auth_credentials WHERE principal_uuid=? AND kind='totp' AND enabled=1)`, principalUUID).Scan(&exists) + return exists != 0 +} +func (s *Store) PendingTOTPSecret(principalUUID string) string { + var encrypted string + if s.DB.QueryRow(`SELECT secret_hash FROM auth_credentials WHERE principal_uuid=? AND kind='totp-pending'`, principalUUID).Scan(&encrypted) != nil { + return "" + } + plain, err := s.decryptAuthSecret(encrypted) + if err != nil { + return "" + } + return string(plain) +} +func (s *Store) VerifyTOTP(principalUUID, code string) error { + counter, err := s.confirmTOTP(principalUUID, "totp", code) + if err != nil { + return err + } + params, _ := json.Marshal(map[string]int64{"last_counter": counter}) + result, err := s.DB.Exec(`UPDATE auth_credentials SET parameters_json=?,updated_at_ms=? WHERE principal_uuid=? AND kind='totp' AND CAST(COALESCE(json_extract(parameters_json,'$.last_counter'),0) AS INTEGER)= 5 { + return "", ErrAccessDenied + } + if err = s.VerifyTOTP(principalUUID, code); err != nil { + _, _ = s.DB.Exec(`UPDATE auth_challenges SET attempt_count=attempt_count+1,consumed_at_ms=CASE WHEN attempt_count+1>=5 THEN ? ELSE consumed_at_ms END WHERE uuid=? AND consumed_at_ms=0`, time.Now().UnixMilli(), challengeUUID) + return "", err + } + result, err := s.DB.Exec(`UPDATE auth_challenges SET consumed_at_ms=? WHERE uuid=? AND consumed_at_ms=0`, time.Now().UnixMilli(), challengeUUID) + if err != nil { + return "", err + } + changed, _ := result.RowsAffected() + if changed != 1 { + return "", ErrAccessDenied + } + return principalUUID, nil +} diff --git a/internal/store/automatic_publication.go b/internal/store/automatic_publication.go new file mode 100644 index 0000000..69aa3a6 --- /dev/null +++ b/internal/store/automatic_publication.go @@ -0,0 +1,320 @@ +package store + +import ( + "context" + "crypto/sha256" + "database/sql" + "encoding/hex" + "encoding/json" + "errors" + "strings" + "time" +) + +type autoPublicationRule struct { + Kind, ID, Mode, Scope, Actor string + Version int64 +} + +func autoContains(scope, path string) bool { return scope == path || cityPathContains(scope, path) } + +type AutoPublication struct { + Mode string `json:"mode"` + Version int64 `json:"version"` + Epoch int64 `json:"epoch"` + TopologyVersion int64 `json:"topology_version"` + CanAutomatic bool `json:"can_automatic"` + Active bool `json:"active"` + PreviewComplete bool `json:"preview_complete"` + Impact LocalityPublication `json:"impact"` +} +type AutoPublicationChange struct { + Mode string `json:"mode"` + Version int64 `json:"version"` + Epoch int64 `json:"epoch"` + TopologyVersion int64 `json:"topology_version"` + Confirm bool `json:"confirm"` + ImpactToken string `json:"impact_token"` +} + +func autoScope(ctx context.Context, tx *sql.Tx, domain, kind, id string) (string, error) { + if kind == "domain" { + if id != domain { + return "", ErrGovernanceInvalid + } + return "/", nil + } + table := "zones" + if kind == "spot" { + table = "spots" + } + var scope string + err := tx.QueryRowContext(ctx, `SELECT path_prefix FROM `+table+` WHERE domain_uuid=? AND uuid=? AND state!='archived'`, domain, id).Scan(&scope) + return scope, err +} +func autoRules(ctx context.Context, tx *sql.Tx, domain string) ([]autoPublicationRule, error) { + rows, err := tx.QueryContext(ctx, `SELECT node_kind,node_uuid,mode,scope_path,actor_uuid,version FROM locality_auto_publication WHERE domain_uuid=? ORDER BY node_kind,node_uuid LIMIT 129`, domain) + if err != nil { + return nil, err + } + defer rows.Close() + out := []autoPublicationRule{} + for rows.Next() { + var p autoPublicationRule + if err = rows.Scan(&p.Kind, &p.ID, &p.Mode, &p.Scope, &p.Actor, &p.Version); err != nil { + return nil, err + } + out = append(out, p) + } + if len(out) > 128 { + return nil, ErrNavigationBudget + } + return out, rows.Err() +} +func requireManualPublication(ctx context.Context, tx *sql.Tx, domain, actor, kind, id string) error { + scope, err := autoScope(ctx, tx, domain, kind, id) + if err != nil { + return err + } + _, err = tx.ExecContext(ctx, `INSERT INTO locality_auto_publication VALUES(?,?,?,'required',?,?,1) ON CONFLICT(domain_uuid,node_kind,node_uuid) DO UPDATE SET mode='required',scope_path=excluded.scope_path,actor_uuid=excluded.actor_uuid,version=version+1`, domain, kind, id, scope, actor) + return err +} +func (s *Store) AutoPublication(ctx context.Context, domain, actor, kind, id string, change *AutoPublicationChange) (AutoPublication, error) { + ctx, cancel := context.WithTimeout(ctx, 3*time.Second) + defer cancel() + state := AutoPublication{Mode: "inherit"} + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return state, err + } + defer tx.Rollback() + if change != nil { + if _, err = tx.ExecContext(ctx, `INSERT INTO city_governance_epochs VALUES(?,0) ON CONFLICT(domain_uuid) DO UPDATE SET version=version`, domain); err != nil { + return state, err + } + } + g, err := governanceSnapshot(ctx, tx, domain, actor, kind, id) + if err != nil { + return state, err + } + scope, err := autoScope(ctx, tx, domain, kind, id) + if err != nil { + return state, err + } + rules, err := autoRules(ctx, tx, domain) + if err != nil { + return state, err + } + state.Epoch, state.TopologyVersion = g.Epoch, g.TopologyVersion + state.CanAutomatic = (kind == "street" || kind == "spot") && g.DraftEffectivePublic && PublicSemanticPath(scope) + blockedScopes := []string{} + for _, rule := range rules { + if rule.Kind == kind && rule.ID == id { + state.Mode, state.Version = rule.Mode, rule.Version + state.Active = rule.Mode == "automatic" && rule.Scope == scope + if state.Active && rule.Actor != actor { + _, e := governanceSnapshot(ctx, tx, domain, rule.Actor, kind, id) + if errors.Is(e, sql.ErrNoRows) || errors.Is(e, ErrAccessDenied) { + state.Active = false + } else if e != nil { + return state, e + } + } + } + if rule.Mode == "required" && !(rule.Kind == kind && rule.ID == id) { + parent, e := autoScope(ctx, tx, domain, rule.Kind, rule.ID) + if e != nil && !errors.Is(e, sql.ErrNoRows) { + return state, e + } + if e == nil { + blockedScopes = append(blockedScopes, parent) + if autoContains(parent, scope) { + state.CanAutomatic = false + } + } + } + } + state.Active = state.Active && state.CanAutomatic + if change != nil && (change.Epoch != state.Epoch || change.TopologyVersion != state.TopologyVersion || change.Version != state.Version) { + return state, ErrGovernanceConflict + } + if change == nil || change.Mode != "required" { + state.Impact, err = publicationImpact(ctx, tx, domain, actor, kind, id, g) + if err != nil { + if change == nil && errors.Is(err, ErrPublicationImpact) { + state.CanAutomatic = false + return state, nil + } + return state, err + } + state.PreviewComplete = true + visible := []PublicationEntry{} + for _, entry := range state.Impact.Entries { + blocked := false + for _, scope := range blockedScopes { + if autoContains(scope, entry.Path) { + blocked = true + break + } + } + if blocked { + state.Impact.Excluded = append(state.Impact.Excluded, entry.Path) + } else { + visible = append(visible, entry) + } + } + state.Impact.Entries = visible + input, _ := json.Marshal(struct { + Impact string + Rules []autoPublicationRule + }{state.Impact.ImpactToken, rules}) + hash := sha256.Sum256(input) + state.Impact.ImpactToken = hex.EncodeToString(hash[:]) + } + if change == nil { + return state, nil + } + if change.Mode != "automatic" && change.Mode != "required" && change.Mode != "inherit" { + return state, ErrGovernanceInvalid + } + if change.Mode == "automatic" { + if !state.CanAutomatic { + return state, ErrGovernanceCeiling + } + if !change.Confirm || change.ImpactToken == "" || change.ImpactToken != state.Impact.ImpactToken { + return state, ErrPublicationImpact + } + if err = installPublicationGuards(ctx, tx); err != nil { + return state, err + } + } + if change.Mode == "inherit" && (!change.Confirm || change.ImpactToken == "" || change.ImpactToken != state.Impact.ImpactToken) { + return state, ErrPublicationImpact + } + before, _ := json.Marshal(state) + _, err = tx.ExecContext(ctx, `INSERT INTO locality_auto_publication VALUES(?,?,?,?,?,?,1) ON CONFLICT(domain_uuid,node_kind,node_uuid) DO UPDATE SET mode=excluded.mode,scope_path=excluded.scope_path,actor_uuid=excluded.actor_uuid,version=version+1`, domain, kind, id, change.Mode, scope, actor) + if err != nil { + return state, err + } + state.Mode = change.Mode + state.Version++ + state.Active = change.Mode == "automatic" + state.Impact.ImpactToken = "" + after, _ := json.Marshal(state) + _, err = tx.ExecContext(ctx, `INSERT INTO city_governance_events(domain_uuid,epoch,actor_uuid,node_kind,node_uuid,before_json,after_json,created_at_ms) VALUES(?,?,?,?,?,?,?,?)`, domain, g.Epoch, actor, kind, id, string(before), string(after), time.Now().UnixMilli()) + if err != nil { + return state, err + } + return state, tx.Commit() +} + +// Evaluate live heads, audience, publisher authority and literal Path boundaries +// in one read transaction. No request mutates approval manifests or source content. +func (s *Store) automaticPublicPages(ctx context.Context, domain, onlyPath string) ([]PublishedNavigationPage, error) { + tx, err := s.DB.BeginTx(ctx, &sql.TxOptions{ReadOnly: true}) + if err != nil { + return nil, err + } + defer tx.Rollback() + var live bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM domains d JOIN campuses c ON c.uuid=d.campus_uuid JOIN config cfg ON cfg.domain_uuid=d.uuid AND cfg.key='authorization_mode' AND cfg.value='enforcing' WHERE d.uuid=? AND d.enabled=1 AND c.enabled=1)`, domain).Scan(&live); err != nil { + return nil, err + } + if !live { + return nil, nil + } + rules, err := autoRules(ctx, tx, domain) + if err != nil { + return nil, err + } + blocked := []string{} + for _, rule := range rules { + if rule.Mode == "required" { + scope, e := autoScope(ctx, tx, domain, rule.Kind, rule.ID) + if errors.Is(e, sql.ErrNoRows) { + continue + } + if e != nil { + return nil, e + } + blocked = append(blocked, scope) + } + } + deny := func(p string) bool { + for _, scope := range blocked { + if autoContains(scope, p) { + return true + } + } + return false + } + if onlyPath != "" && deny(onlyPath) { + return nil, nil + } + entries := map[string]PublicationEntry{} + for _, rule := range rules { + if rule.Mode != "automatic" || (rule.Kind != "street" && rule.Kind != "spot") { + continue + } + if onlyPath != "" && !autoContains(rule.Scope, onlyPath) { + continue + } + g, e := governanceSnapshot(ctx, tx, domain, rule.Actor, rule.Kind, rule.ID) + if errors.Is(e, sql.ErrNoRows) || errors.Is(e, ErrAccessDenied) || errors.Is(e, ErrGovernanceInvalid) { + continue + } + if e != nil { + return nil, e + } + current, e := autoScope(ctx, tx, domain, rule.Kind, rule.ID) + if e != nil { + return nil, e + } + if current != rule.Scope || !g.DraftEffectivePublic || deny(current) { + continue + } + p, e := publicationImpactBounded(ctx, tx, domain, rule.Actor, rule.Kind, rule.ID, g, MaxNavigationEntries, onlyPath) + if errors.Is(e, ErrAccessDenied) { + continue + } + if e != nil { + return nil, e + } + for _, entry := range p.Entries { + if !deny(entry.Path) { + entries[entry.Revision] = entry + } + if len(entries) > MaxNavigationEntries { + return nil, ErrNavigationBudget + } + } + } + if len(entries) == 0 { + return nil, nil + } + args := []any{} + for id := range entries { + args = append(args, id) + } + rows, err := tx.QueryContext(ctx, `SELECT uuid,object_uuid,document_hash,COALESCE(NULLIF(lang,''),'und'),COALESCE(NULLIF(content_type,''),'text/html; charset=utf-8'),COALESCE(filename,''),created_at_ms FROM revisions WHERE uuid IN (`+strings.TrimSuffix(strings.Repeat("?,", len(args)), ",")+`) ORDER BY created_at_ms DESC,uuid`, args...) + if err != nil { + return nil, err + } + defer rows.Close() + out := []PublishedNavigationPage{} + size := 0 + for rows.Next() { + var p PublishedNavigationPage + v := &p.Revision + if err = rows.Scan(&v.UUID, &v.ObjectUUID, &v.DocumentHash, &v.Language, &v.ContentType, &v.Filename, &v.CreatedAtMS); err != nil { + return nil, err + } + p.Path = entries[v.UUID].Path + size += len(p.Path) + len(v.Filename) + len(v.ContentType) + if size > 4<<20 { + return nil, ErrNavigationBudget + } + out = append(out, p) + } + return out, rows.Err() +} diff --git a/internal/store/bookmark_children.go b/internal/store/bookmark_children.go new file mode 100644 index 0000000..5d1cb6d --- /dev/null +++ b/internal/store/bookmark_children.go @@ -0,0 +1,36 @@ +package store + +import ( + "context" + "strings" +) + +func (s *Store) ListBookmarkChildren(ctx context.Context, domain, parent, after string) ([]string, bool, error) { + prefix := strings.TrimRight(parent, "/") + "/" + rows, err := s.DB.QueryContext(ctx, `WITH relative AS ( + SELECT substr(path, length(?) + 1) AS suffix FROM paths + WHERE domain_uuid=? AND path>=? AND path ? ORDER BY name LIMIT 81`, prefix, domain, prefix, strings.TrimSuffix(prefix, "/")+"0", after) + if err != nil { + return nil, false, err + } + defer rows.Close() + names := []string{} + for rows.Next() { + var name string + if err := rows.Scan(&name); err != nil { + return nil, false, err + } + names = append(names, name) + } + if err := rows.Err(); err != nil { + return nil, false, err + } + more := len(names) > 80 + if more { + names = names[:80] + } + return names, more, nil +} diff --git a/internal/store/bootstrap_campus.go b/internal/store/bootstrap_campus.go new file mode 100644 index 0000000..99033ad --- /dev/null +++ b/internal/store/bootstrap_campus.go @@ -0,0 +1,86 @@ +package store + +import ( + "database/sql" + "errors" +) + +// RemoveUnusedBootstrapCampus removes the pristine Campus and Domain created +// for a new standalone installation. It waits until another enabled Domain +// exists, so an enrolling instance remains administrable while approval is +// pending. +func (s *Store) RemoveUnusedBootstrapCampus() (bool, error) { + tx, err := s.DB.Begin() + if err != nil { + return false, err + } + defer tx.Rollback() + + var campusID int64 + var campusUUID string + err = tx.QueryRow(` + SELECT id, uuid + FROM campuses + WHERE name = 'default' + AND authority_mode = 'standalone' + AND fqdn = 'localhost' + LIMIT 1 + `).Scan(&campusID, &campusUUID) + if err != nil { + if errors.Is(err, sql.ErrNoRows) { + return false, nil + } + return false, err + } + + var otherDomains int + if err := tx.QueryRow(` + SELECT count(*) + FROM domains + WHERE campus_uuid != ? AND enabled = 1 + `, campusUUID).Scan(&otherDomains); err != nil { + return false, err + } + if otherDomains == 0 { + return false, nil + } + + var pathCount int + if err := tx.QueryRow(` + SELECT count(*) + FROM paths + WHERE domain_uuid IN ( + SELECT uuid FROM domains WHERE campus_uuid = ? + ) + `, campusUUID).Scan(&pathCount); err != nil { + return false, err + } + if pathCount != 0 { + return false, errors.New( + "default Campus has Paths and cannot be removed automatically", + ) + } + + if _, err := tx.Exec(` + DELETE FROM config + WHERE domain_uuid IN ( + SELECT uuid FROM domains WHERE campus_uuid = ? + ) + `, campusUUID); err != nil { + return false, err + } + if _, err := tx.Exec(` + DELETE FROM domains WHERE campus_uuid = ? + `, campusUUID); err != nil { + return false, err + } + if _, err := tx.Exec(` + DELETE FROM campuses WHERE id = ? + `, campusID); err != nil { + return false, err + } + if err := tx.Commit(); err != nil { + return false, err + } + return true, nil +} diff --git a/internal/store/broadcasts.go b/internal/store/broadcasts.go new file mode 100644 index 0000000..995eeda --- /dev/null +++ b/internal/store/broadcasts.go @@ -0,0 +1,110 @@ +package store + +import ( + "context" + "strings" + "time" + + "github.com/google/uuid" +) + +type Broadcast struct { + UUID string `json:"uuid"` + DomainUUID string `json:"domain_uuid"` + Title string `json:"title"` + Body string `json:"body"` + Severity string `json:"severity"` + StartsAtMS int64 `json:"starts_at_ms"` + EndsAtMS int64 `json:"ends_at_ms"` + CreatedAtMS int64 `json:"created_at_ms"` + UpdatedAtMS int64 `json:"updated_at_ms"` +} + +func (s *Store) EnsureBroadcastSchema() error { + _, err := s.DB.Exec(`CREATE TABLE IF NOT EXISTS broadcasts (uuid TEXT PRIMARY KEY,domain_uuid TEXT NOT NULL,title TEXT NOT NULL,body TEXT NOT NULL,severity TEXT NOT NULL DEFAULT 'info' CHECK(severity IN ('info','success','warning','critical')),starts_at_ms INTEGER NOT NULL DEFAULT 0,ends_at_ms INTEGER NOT NULL DEFAULT 0,created_at_ms INTEGER NOT NULL,updated_at_ms INTEGER NOT NULL)`) + if err != nil { + return err + } + _, err = s.DB.Exec(`CREATE INDEX IF NOT EXISTS idx_broadcast_active ON broadcasts(domain_uuid,starts_at_ms,ends_at_ms,updated_at_ms DESC)`) + return err +} + +const broadcastColumns = `uuid,domain_uuid,title,body,severity,starts_at_ms,ends_at_ms,created_at_ms,updated_at_ms` + +func scanBroadcast(scanner interface{ Scan(...any) error }, b *Broadcast) error { + return scanner.Scan(&b.UUID, &b.DomainUUID, &b.Title, &b.Body, &b.Severity, &b.StartsAtMS, &b.EndsAtMS, &b.CreatedAtMS, &b.UpdatedAtMS) +} + +func (s *Store) ListActiveBroadcasts(ctx context.Context, domain string, nowMS int64) ([]Broadcast, error) { + if nowMS == 0 { + nowMS = time.Now().UnixMilli() + } + rows, err := s.DB.QueryContext(ctx, `SELECT `+broadcastColumns+` FROM broadcasts WHERE domain_uuid=? AND (starts_at_ms=0 OR starts_at_ms<=?) AND (ends_at_ms=0 OR ends_at_ms>?) ORDER BY severity DESC,updated_at_ms DESC LIMIT 20`, domain, nowMS, nowMS) + if err != nil { + return nil, err + } + defer rows.Close() + out := []Broadcast{} + for rows.Next() { + var b Broadcast + if err := scanBroadcast(rows, &b); err != nil { + return nil, err + } + out = append(out, b) + } + return out, rows.Err() +} +func (s *Store) ListBroadcasts(ctx context.Context, domain string) ([]Broadcast, error) { + rows, err := s.DB.QueryContext(ctx, `SELECT `+broadcastColumns+` FROM broadcasts WHERE domain_uuid=? ORDER BY updated_at_ms DESC LIMIT 100`, domain) + if err != nil { + return nil, err + } + defer rows.Close() + out := []Broadcast{} + for rows.Next() { + var b Broadcast + if err := scanBroadcast(rows, &b); err != nil { + return nil, err + } + out = append(out, b) + } + return out, rows.Err() +} +func (s *Store) SaveBroadcast(b Broadcast) error { + b.DomainUUID = strings.TrimSpace(b.DomainUUID) + b.Title = strings.TrimSpace(b.Title) + b.Body = strings.TrimSpace(b.Body) + if b.UUID == "" { + b.UUID = uuid.NewString() + } + if b.Severity != "success" && b.Severity != "warning" && b.Severity != "critical" { + b.Severity = "info" + } + now := time.Now().UnixMilli() + if b.CreatedAtMS == 0 { + b.CreatedAtMS = now + } + b.UpdatedAtMS = now + _, err := s.DB.Exec(`INSERT INTO broadcasts(`+broadcastColumns+`) VALUES(?,?,?,?,?,?,?,?,?) ON CONFLICT(uuid) DO UPDATE SET title=excluded.title,body=excluded.body,severity=excluded.severity,starts_at_ms=excluded.starts_at_ms,ends_at_ms=excluded.ends_at_ms,updated_at_ms=excluded.updated_at_ms`, b.UUID, b.DomainUUID, b.Title, b.Body, b.Severity, b.StartsAtMS, b.EndsAtMS, b.CreatedAtMS, b.UpdatedAtMS) + return err +} +func (s *Store) DeleteBroadcast(domain, id string) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + if _, err = tx.Exec(`DELETE FROM notification_inbox WHERE domain_uuid=? AND event_uuid=? AND kind='broadcast'`, domain, id); err != nil { + return err + } + if _, err = tx.Exec(`DELETE FROM broadcasts WHERE domain_uuid=? AND uuid=?`, domain, id); err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) GetBroadcast(ctx context.Context, domain, id string) (Broadcast, error) { + var b Broadcast + err := scanBroadcast(s.DB.QueryRowContext(ctx, `SELECT `+broadcastColumns+` FROM broadcasts WHERE domain_uuid=? AND uuid=?`, domain, id), &b) + return b, err +} diff --git a/internal/store/browser.go b/internal/store/browser.go index 8a43755..61d833e 100644 --- a/internal/store/browser.go +++ b/internal/store/browser.go @@ -1,191 +1,129 @@ package store import ( - "path" - "sort" + "io" + "os" "strings" + + "golang.org/x/net/html" ) type BrowserEntry struct { - Name string - Path string - ObjectUUID string - IsDir bool - Size int - UpdatedAt int64 - ChildCount int + Name string + Path string + ObjectUUID string + IsDir bool + Size int + UpdatedAt int64 + ChildCount int + ContentType string + Filename string + DocumentHash string + RevisionUUID string + Title string +} + +func firstHTMLHeading(source string) string { + t := html.NewTokenizer(strings.NewReader(source)) + in := false + var out strings.Builder + for { + kind := t.Next() + if kind == html.ErrorToken { + if t.Err() == io.EOF { + break + } + break + } + tok := t.Token() + if kind == html.StartTagToken && strings.EqualFold(tok.Data, "h1") { + in = true + continue + } + if kind == html.EndTagToken && strings.EqualFold(tok.Data, "h1") { + break + } + if in && kind == html.TextToken { + out.WriteString(tok.Data) + } + } + return strings.TrimSpace(out.String()) } func normalizeBrowserPath(p string) string { p = strings.TrimSpace(p) - if p == "" { return "/" } - if !strings.HasPrefix(p, "/") { p = "/" + p } - if p != "/" { p = strings.TrimRight(p, "/") } - return p } -func (s *Store) ListBrowserEntries( - parent string, -) ([]BrowserEntry, error) { - - parent = normalizeBrowserPath(parent) - - rows, err := s.DB.Query(` - WITH latest AS ( - SELECT - r.object_uuid, - r.body, - r.created_at, - ROW_NUMBER() OVER ( - PARTITION BY r.object_uuid - ORDER BY r.created_at DESC - ) AS rn - FROM revisions r - ) - SELECT - p.path, - p.object_uuid, - COALESCE(LENGTH(latest.body), 0), - COALESCE(latest.created_at, 0) - FROM paths p - LEFT JOIN latest - ON latest.object_uuid = p.object_uuid - AND latest.rn = 1 - WHERE p.path = ? - OR p.path LIKE ? - ORDER BY p.path ASC - `, - parent, - func() string { - if parent == "/" { - return "/%" - } - return parent + "/%" - }(), - ) - +func (s *Store) ListBrowserEntries(parent string) ([]BrowserEntry, error) { + domainUUID, err := s.defaultDomainUUID() if err != nil { return nil, err } + return s.ListBrowserEntriesInDomain(domainUUID, parent) +} - defer rows.Close() - - dirMap := map[string]*BrowserEntry{} - var files []BrowserEntry - - prefix := parent - if prefix != "/" { - prefix += "/" - } - - for rows.Next() { - - var fullPath string - var objectUUID string - var size int - var updatedAt int64 - - err := rows.Scan( - &fullPath, - &objectUUID, - &size, - &updatedAt, +func (s *Store) ListBrowserEntriesInDomain(domainUUID, parent string) ([]BrowserEntry, error) { + parent = normalizeBrowserPath(parent) + prefix := strings.TrimRight(parent, "/") + "/" + // Collapse descendants before consulting revisions. A folder listing must + // not rank every revision of every document in the subtree. Binary ranges + // keep prefix matching literal (including %, _) and use the Path index. + rows, err := s.DB.Query(` + WITH relative AS ( + SELECT substr(path, length(?) + 1) AS name, object_uuid + FROM paths WHERE domain_uuid=? AND path >= ? AND path < ? AND path != ? + ), children AS ( + SELECT CASE WHEN instr(name,'/')=0 THEN name ELSE substr(name,1,instr(name,'/')-1) END AS name, + MAX(CASE WHEN instr(name,'/')=0 THEN object_uuid ELSE '' END) AS object_uuid, + MAX(instr(name,'/')>0) AS is_dir, + SUM(instr(name,'/')>0) AS child_count + FROM relative WHERE name != '' GROUP BY 1 ) - - if err != nil { + SELECT c.name,c.object_uuid,c.is_dir,c.child_count, + COALESCE(length(CAST(r.body AS BLOB)),0),COALESCE(r.created_at,0), + COALESCE(r.content_type,''),COALESCE(r.filename,''), + COALESCE(r.document_hash,''),COALESCE(r.uuid,''), + COALESCE(substr(CAST(r.body AS TEXT),1,65536),'') + FROM children c LEFT JOIN revisions r ON r.rowid=( + SELECT head.rowid FROM revisions head + WHERE c.is_dir=0 AND head.object_uuid=c.object_uuid + ORDER BY head.created_at_ms DESC, head.rowid DESC LIMIT 1 + ) + ORDER BY c.is_dir DESC,c.name ASC + `, prefix, domainUUID, prefix, strings.TrimSuffix(prefix, "/")+"0", parent) + if err != nil { + return nil, err + } + defer rows.Close() + var out []BrowserEntry + for rows.Next() { + var entry BrowserEntry + if err := rows.Scan(&entry.Name, &entry.ObjectUUID, &entry.IsDir, &entry.ChildCount, + &entry.Size, &entry.UpdatedAt, &entry.ContentType, &entry.Filename, &entry.DocumentHash, &entry.RevisionUUID, &entry.Title); err != nil { return nil, err } - - if fullPath == parent { - continue + if !entry.IsDir { + entry.Title = firstHTMLHeading(entry.Title) } - - rel := "" - - if parent == "/" { - rel = strings.TrimPrefix(fullPath, "/") - } else { - rel = strings.TrimPrefix(fullPath, prefix) - } - - rel = strings.Trim(rel, "/") - - if rel == "" { - continue - } - - parts := strings.Split(rel, "/") - - if len(parts) > 1 { - - name := parts[0] - dirPath := path.Join(parent, name) - - if !strings.HasPrefix(dirPath, "/") { - dirPath = "/" + dirPath - } - - if dirPath == "." { - dirPath = "/" - } - - ent, ok := dirMap[dirPath] - - if !ok { - ent = &BrowserEntry{ - Name: name, - Path: dirPath, - IsDir: true, + entry.Path = prefix + entry.Name + if !entry.IsDir && s.DocumentRoot != "" && entry.DocumentHash != "" { + if filename, err := s.DocumentPath(entry.DocumentHash); err == nil { + if info, err := os.Stat(filename); err == nil { + entry.Size = int(info.Size()) } - dirMap[dirPath] = ent } - - ent.ChildCount++ - - continue } - - files = append( - files, - BrowserEntry{ - Name: parts[0], - Path: fullPath, - ObjectUUID: objectUUID, - IsDir: false, - Size: size, - UpdatedAt: updatedAt, - }, - ) + out = append(out, entry) } - - var out []BrowserEntry - - for _, d := range dirMap { - out = append(out, *d) - } - - out = append(out, files...) - - sort.SliceStable( - out, - func(i, j int) bool { - if out[i].IsDir != out[j].IsDir { - return out[i].IsDir - } - - return out[i].Name < out[j].Name - }, - ) - - return out, nil + return out, rows.Err() } diff --git a/internal/store/browser_navigation.go b/internal/store/browser_navigation.go new file mode 100644 index 0000000..c04afb0 --- /dev/null +++ b/internal/store/browser_navigation.go @@ -0,0 +1,198 @@ +package store + +import ( + "database/sql" + "errors" + "strings" + "time" + + "github.com/google/uuid" +) + +const MaxBrowserNavigationLinks = 64 + +var ErrBrowserNavigationLimit = errors.New("browser navigator link limit reached") + +type BrowserNavigationLink struct { + UUID string `json:"uuid"` + Label string `json:"label"` + Path string `json:"path"` + IsDir bool `json:"is_directory"` + Position int `json:"position"` + UpdatedAt int64 `json:"updated_at_ms"` +} + +func (s *Store) EnsureBrowserNavigationSchema() error { + _, err := s.DB.Exec(`CREATE TABLE IF NOT EXISTS browser_navigation_links ( + uuid TEXT PRIMARY KEY, + domain_uuid TEXT NOT NULL, + principal_uuid TEXT NOT NULL, + label TEXT NOT NULL, + path TEXT NOT NULL, + is_directory INTEGER NOT NULL DEFAULT 0, + position INTEGER NOT NULL DEFAULT 0, + created_at_ms INTEGER NOT NULL, + updated_at_ms INTEGER NOT NULL, + UNIQUE(domain_uuid, principal_uuid, path) + )`) + if err != nil { + return err + } + _, _ = s.DB.Exec(`ALTER TABLE browser_navigation_links ADD COLUMN is_directory INTEGER NOT NULL DEFAULT 0`) + _, err = s.DB.Exec(`CREATE INDEX IF NOT EXISTS idx_browser_navigation_owner + ON browser_navigation_links(domain_uuid, principal_uuid, position, created_at_ms)`) + return err +} + +func (s *Store) ListBrowserNavigationLinks(domainUUID, principalUUID string) ([]BrowserNavigationLink, error) { + rows, err := s.DB.Query(`SELECT uuid,label,path,is_directory,position,updated_at_ms + FROM browser_navigation_links + WHERE domain_uuid=? AND principal_uuid=? + ORDER BY position,created_at_ms,uuid`, domainUUID, principalUUID) + if err != nil { + return nil, err + } + defer rows.Close() + links := make([]BrowserNavigationLink, 0) + for rows.Next() { + var link BrowserNavigationLink + if err := rows.Scan(&link.UUID, &link.Label, &link.Path, &link.IsDir, &link.Position, &link.UpdatedAt); err != nil { + return nil, err + } + links = append(links, link) + } + return links, rows.Err() +} + +func (s *Store) AddBrowserNavigationLink(domainUUID, principalUUID, label, path string, isDir bool) (*BrowserNavigationLink, error) { + label = strings.TrimSpace(label) + path = normalizePath(path) + if domainUUID == "" || principalUUID == "" || label == "" || len(label) > 120 || path == "/" || len(path) > 2048 { + return nil, errors.New("invalid browser navigator link") + } + tx, err := s.DB.Begin() + if err != nil { + return nil, err + } + defer tx.Rollback() + var link BrowserNavigationLink + err = tx.QueryRow(`SELECT uuid,label,path,is_directory,position,updated_at_ms + FROM browser_navigation_links + WHERE domain_uuid=? AND principal_uuid=? AND path=?`, domainUUID, principalUUID, path). + Scan(&link.UUID, &link.Label, &link.Path, &link.IsDir, &link.Position, &link.UpdatedAt) + if err == nil { + return &link, nil + } + if !errors.Is(err, sql.ErrNoRows) { + return nil, err + } + var count, position int + if err := tx.QueryRow(`SELECT COUNT(*),COALESCE(MAX(position),-1)+1 + FROM browser_navigation_links WHERE domain_uuid=? AND principal_uuid=?`, domainUUID, principalUUID). + Scan(&count, &position); err != nil { + return nil, err + } + if count >= MaxBrowserNavigationLinks { + return nil, ErrBrowserNavigationLimit + } + now := time.Now().UnixMilli() + link = BrowserNavigationLink{UUID: uuid.NewString(), Label: label, Path: path, IsDir: isDir, Position: position, UpdatedAt: now} + if _, err := tx.Exec(`INSERT INTO browser_navigation_links + (uuid,domain_uuid,principal_uuid,label,path,is_directory,position,created_at_ms,updated_at_ms) + VALUES(?,?,?,?,?,?,?,?,?)`, link.UUID, domainUUID, principalUUID, link.Label, link.Path, link.IsDir, link.Position, now, now); err != nil { + return nil, err + } + if err := tx.Commit(); err != nil { + return nil, err + } + return &link, nil +} + +func (s *Store) RenameBrowserNavigationLink(domainUUID, principalUUID, id, label string) error { + label = strings.TrimSpace(label) + if label == "" || len(label) > 120 { + return errors.New("invalid browser navigator label") + } + result, err := s.DB.Exec(`UPDATE browser_navigation_links SET label=?,updated_at_ms=? + WHERE uuid=? AND domain_uuid=? AND principal_uuid=?`, label, time.Now().UnixMilli(), id, domainUUID, principalUUID) + if err != nil { + return err + } + count, _ := result.RowsAffected() + if count != 1 { + return sql.ErrNoRows + } + return nil +} + +func (s *Store) DeleteBrowserNavigationLink(domainUUID, principalUUID, id string) error { + result, err := s.DB.Exec(`DELETE FROM browser_navigation_links + WHERE uuid=? AND domain_uuid=? AND principal_uuid=?`, id, domainUUID, principalUUID) + if err != nil { + return err + } + count, _ := result.RowsAffected() + if count != 1 { + return sql.ErrNoRows + } + return nil +} + +// renameBrowserNavigationPathsTx keeps a user's saved navigator targets aligned +// with semantic Path mutations. If the destination was already saved, the +// existing destination link wins and the now-duplicate source link is removed. +func renameBrowserNavigationPathsTx(tx *sql.Tx, domainUUID, oldPath, newPath string, recursive bool) error { + var tableExists bool + if err := tx.QueryRow(`SELECT EXISTS( + SELECT 1 FROM sqlite_master WHERE type='table' AND name='browser_navigation_links' + )`).Scan(&tableExists); err != nil { + return err + } + if !tableExists { + return nil + } + rows, err := tx.Query(`SELECT uuid,principal_uuid,path + FROM browser_navigation_links + WHERE domain_uuid=? AND (path=? OR (? AND path>=? AND path 0 { + return errors.New("campus is referenced by domains") + } + + var enabledCount int + if err := s.DB.QueryRow(` + SELECT count(*) + FROM campuses + WHERE enabled = 1 + AND id != ? + `, id).Scan(&enabledCount); err != nil { + return err + } + if enabledCount == 0 { + return errors.New("at least one enabled campus is required") + } + } + + enabledValue := 0 + if enabled { + enabledValue = 1 + } + + _, err = s.DB.Exec(` + UPDATE campuses + SET + name = ?, + title = ?, + default_lang = ?, + authority_mode = ?, + fqdn = ?, + enabled = ? + WHERE id = ? + `, + name, + title, + defaultLang, + authorityMode, + fqdn, + enabledValue, + id, + ) + + return err +} + +func (s *Store) DeleteCampus( + id int64, +) error { + var targetEnabled int + var authorityMode string + if err := s.DB.QueryRow(` + SELECT enabled, authority_mode + FROM campuses + WHERE id = ? + `, id).Scan(&targetEnabled, &authorityMode); err != nil { + return err + } + var count int + if err := s.DB.QueryRow(` + SELECT count(*) + FROM campuses + `).Scan(&count); err != nil { + return err + } + if count <= 1 { + return errors.New("at least one campus is required") + } + + if targetEnabled != 0 { + var enabledCount int + if err := s.DB.QueryRow(` + SELECT count(*) + FROM campuses + WHERE enabled = 1 + AND id != ? + `, id).Scan(&enabledCount); err != nil { + return err + } + if enabledCount == 0 { + return errors.New("at least one enabled campus is required") + } + } + if authorityMode == "managed" { + return s.deleteManagedCampus(id) + } + + var domainCount int + if err := s.DB.QueryRow(` + SELECT count(*) + FROM domains + WHERE campus_uuid = ( + SELECT uuid + FROM campuses + WHERE id = ? + ) + `, id).Scan(&domainCount); err != nil { + return err + } + if domainCount > 0 { + return errors.New("campus is referenced by domains") + } + + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + + var campusUUID string + if err := tx.QueryRow(` + SELECT uuid FROM campuses WHERE id = ? + `, id).Scan(&campusUUID); err != nil { + return err + } + if _, err := tx.Exec(` + DELETE FROM federation_instances WHERE campus_uuid = ? + `, campusUUID); err != nil { + return err + } + if _, err := tx.Exec(` + DELETE FROM campus_tokens WHERE campus_uuid = ? + `, campusUUID); err != nil { + return err + } + result, err := tx.Exec(` + DELETE FROM campuses WHERE id = ? + `, id) + if err != nil { + return err + } + + affected, err := result.RowsAffected() + if err != nil { + return err + } + if affected == 0 { + return sql.ErrNoRows + } + return tx.Commit() +} + +func normalizeCampusName(name string) string { + name = strings.TrimSpace(strings.ToLower(name)) + return strings.ReplaceAll(name, " ", "-") +} + +func normalizeCampusLanguage(raw string) (string, error) { + raw = strings.TrimSpace(raw) + if raw == "" { + raw = "en" + } + tag, err := language.Parse(raw) + if err != nil { + return "", errors.New("invalid campus default language") + } + return tag.String(), nil +} + +func normalizeCampusAuthority(mode, fqdn string) (string, string, error) { + mode = strings.ToLower(strings.TrimSpace(mode)) + fqdn = normalizeDomainHost(fqdn) + if mode == "" { + mode = "standalone" + } + switch mode { + case "standalone", "controller": + case "managed": + default: + return "", "", errors.New("invalid campus authority mode") + } + if fqdn == "" { + return "", "", errors.New("campus FQDN is required") + } + if !strings.Contains(fqdn, ".") && fqdn != "localhost" { + return "", "", errors.New("invalid campus FQDN") + } + return mode, fqdn, nil +} + +func (s *Store) ensureCampusFQDNAvailable(id int64, fqdn string) error { + var count int + if err := s.DB.QueryRow(` + SELECT count(*) FROM campuses + WHERE id != ? AND lower(fqdn) = lower(?) + `, id, fqdn).Scan(&count); err != nil { + return err + } + if count > 0 { + return errors.New("campus FQDN already exists") + } + + if err := s.DB.QueryRow(` + WITH effective_hosts AS ( + SELECT lower( + CASE + WHEN d.domain = '' THEN + CASE WHEN c.id = ? THEN ? ELSE c.fqdn END + WHEN instr(d.domain, '.') > 0 THEN d.domain + ELSE d.domain || '.' || + CASE WHEN c.id = ? THEN ? ELSE c.fqdn END + END + ) AS host + FROM domains d + JOIN campuses c ON c.uuid = d.campus_uuid + ) + SELECT count(*) FROM ( + SELECT host FROM effective_hosts + GROUP BY host HAVING count(*) > 1 + ) + `, id, fqdn, id, fqdn).Scan(&count); err != nil { + return err + } + if count > 0 { + return errors.New("campus FQDN conflicts with a domain host") + } + return nil +} + +func scanCampus(row interface { + Scan(dest ...any) error +}) (*Campus, error) { + var campus Campus + var enabled int + err := row.Scan( + &campus.ID, + &campus.UUID, + &campus.Name, + &campus.Title, + &campus.DefaultLang, + &campus.AuthorityMode, + &campus.FQDN, + &campus.Transport, + &campus.LastContactAt, + &campus.LastContactError, + &enabled, + &campus.CreatedAt, + ) + if err != nil { + return nil, err + } + campus.Enabled = enabled != 0 + return &campus, nil +} diff --git a/internal/store/campuses_test.go b/internal/store/campuses_test.go new file mode 100644 index 0000000..abdef69 --- /dev/null +++ b/internal/store/campuses_test.go @@ -0,0 +1,630 @@ +package store_test + +import ( + "database/sql" + "errors" + "testing" + + "pageswiki/internal/db" + "pageswiki/internal/store" +) + +func newTopologyStore(t *testing.T) *store.Store { + t.Helper() + + database, err := db.Open(t.TempDir() + "/pages.db") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { + _ = database.Close() + }) + + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + + return store.New(database) +} + +func TestDefaultDomainBelongsToDefaultCampus(t *testing.T) { + st := newTopologyStore(t) + + campus, err := st.GetDefaultCampus() + if err != nil { + t.Fatal(err) + } + domain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + + if campus.Name != "default" { + t.Fatalf("default campus name = %q", campus.Name) + } + if domain.CampusUUID != campus.UUID { + t.Fatalf( + "default domain campus UUID = %q, want %q", + domain.CampusUUID, + campus.UUID, + ) + } +} + +func TestCampusDomainOwnershipAndDeletion(t *testing.T) { + st := newTopologyStore(t) + + if err := st.CreateCampus( + "Engineering", + "Engineering Campus", + "ja", + "standalone", + "example.test", + true, + ); err != nil { + t.Fatal(err) + } + + campuses, err := st.ListCampuses() + if err != nil { + t.Fatal(err) + } + var engineering store.Campus + for _, campus := range campuses { + if campus.Name == "engineering" { + engineering = campus + break + } + } + if engineering.UUID == "" { + t.Fatal("engineering campus was not created") + } + if engineering.DefaultLang != "ja" { + t.Fatalf("default language = %q", engineering.DefaultLang) + } + + if err := st.CreateDomain( + engineering.UUID, + "docs", + "Documentation", + "docs", + "local", + "", + "", + true, + ); err != nil { + t.Fatal(err) + } + + domain, err := st.GetDomainByHost("docs.example.test") + if err != nil { + t.Fatal(err) + } + if domain.CampusUUID != engineering.UUID { + t.Fatalf( + "domain campus UUID = %q, want %q", + domain.CampusUUID, + engineering.UUID, + ) + } + + if err := st.DeleteCampus(engineering.ID); err == nil { + t.Fatal("referenced campus deletion succeeded") + } +} + +func TestCannotDisableLastEnabledCampus(t *testing.T) { + st := newTopologyStore(t) + + campus, err := st.GetDefaultCampus() + if err != nil { + t.Fatal(err) + } + + err = st.UpdateCampus( + campus.ID, + campus.Name, + campus.Title, + campus.DefaultLang, + campus.AuthorityMode, + campus.FQDN, + false, + ) + if err == nil { + t.Fatal("last enabled campus was disabled") + } +} + +func TestPathsAreIsolatedByDomain(t *testing.T) { + st := newTopologyStore(t) + + campus, err := st.GetDefaultCampus() + if err != nil { + t.Fatal(err) + } + defaultDomain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + if err := st.CreateDomain( + campus.UUID, + "engineering", + "Engineering", + "engineering.example.test", + "local", + "", + "", + true, + ); err != nil { + t.Fatal(err) + } + engineering, err := st.GetDomainByHost("engineering.example.test") + if err != nil { + t.Fatal(err) + } + + defaultObject, err := st.CreatePageAtPathInDomain( + defaultDomain.UUID, + "/handbook", + ) + if err != nil { + t.Fatal(err) + } + engineeringObject, err := st.CreatePageAtPathInDomain( + engineering.UUID, + "/handbook", + ) + if err != nil { + t.Fatal(err) + } + if defaultObject == engineeringObject { + t.Fatal("separate Page creation reused an Object UUID") + } + + resolvedDefault, err := st.ResolvePathInDomain( + defaultDomain.UUID, + "/handbook", + ) + if err != nil { + t.Fatal(err) + } + resolvedEngineering, err := st.ResolvePathInDomain( + engineering.UUID, + "/handbook", + ) + if err != nil { + t.Fatal(err) + } + if resolvedDefault != defaultObject { + t.Fatalf("default Domain resolved %q", resolvedDefault) + } + if resolvedEngineering != engineeringObject { + t.Fatalf("engineering Domain resolved %q", resolvedEngineering) + } + + if err := st.BindPathInDomain( + engineering.UUID, + "/shared", + defaultObject, + ); err != nil { + t.Fatal(err) + } + shared, err := st.ResolvePathInDomain(engineering.UUID, "/shared") + if err != nil { + t.Fatal(err) + } + if shared != defaultObject { + t.Fatalf("cross-Domain MagicPage resolved %q", shared) + } + + defaultRecent, err := st.ListRecentObjectsInDomain( + defaultDomain.UUID, + 20, + ) + if err != nil { + t.Fatal(err) + } + if len(defaultRecent) != 1 || + defaultRecent[0].UUID != defaultObject { + t.Fatalf("default Domain recent Objects = %#v", defaultRecent) + } + engineeringRecent, err := st.ListRecentObjectsInDomain( + engineering.UUID, + 20, + ) + if err != nil { + t.Fatal(err) + } + if len(engineeringRecent) != 2 { + t.Fatalf( + "engineering Domain recent Object count = %d", + len(engineeringRecent), + ) + } +} + +func TestChildPathsIncludeSyntheticImmediateDirectoriesAndInvalidateCache( + t *testing.T, +) { + st := newTopologyStore(t) + domain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + objectUUID, err := st.CreatePageAtPathInDomain( + domain.UUID, + "/guides/go/install", + ) + if err != nil { + t.Fatal(err) + } + children, err := st.ListChildPathsInDomain(domain.UUID, "/guides") + if err != nil { + t.Fatal(err) + } + if len(children) != 1 || children[0] != "/guides/go" { + t.Fatalf("synthetic children = %#v", children) + } + if err := st.BindPathInDomain( + domain.UUID, + "/guides/rust/install", + objectUUID, + ); err != nil { + t.Fatal(err) + } + children, err = st.ListChildPathsInDomain(domain.UUID, "/guides") + if err != nil { + t.Fatal(err) + } + if len(children) != 2 || + children[0] != "/guides/go" || + children[1] != "/guides/rust" { + t.Fatalf("children after cache invalidation = %#v", children) + } +} + +func TestLegacyPathsMigrateToDefaultDomain(t *testing.T) { + database, err := db.Open(t.TempDir() + "/pages.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(` + INSERT INTO objects (uuid, kind, created_at) + VALUES ('legacy-page', 'page', 1); + INSERT INTO paths (path, object_uuid, created_at) + VALUES ('/legacy', 'legacy-page', 1); + `); err != nil { + t.Fatal(err) + } + + st := store.New(database) + domain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + + var domainUUID, objectUUID string + if err := database.QueryRow(` + SELECT domain_uuid, object_uuid + FROM paths + WHERE path = '/legacy' + `).Scan(&domainUUID, &objectUUID); err != nil { + t.Fatal(err) + } + if domainUUID != domain.UUID { + t.Fatalf("migrated Domain UUID = %q, want %q", domainUUID, domain.UUID) + } + if objectUUID != "legacy-page" { + t.Fatalf("migrated Object UUID = %q", objectUUID) + } +} + +func TestRemoteDomainHasNoLocalPathNamespace(t *testing.T) { + st := newTopologyStore(t) + campus, err := st.GetDefaultCampus() + if err != nil { + t.Fatal(err) + } + if err := st.CreateDomain( + campus.UUID, + "remote-docs", + "Remote Docs", + "remote.example.test", + "remote", + "", + "", + true, + ); err != nil { + t.Fatal(err) + } + remote, err := st.GetDomainByHost("remote.example.test") + if err != nil { + t.Fatal(err) + } + if remote.Placement != "remote" { + t.Fatalf("placement = %q", remote.Placement) + } + if _, err := st.CreatePageAtPathInDomain( + remote.UUID, + "/must-not-exist", + ); err == nil { + t.Fatal("created a Page path in a remote Domain") + } +} + +func TestManagedCampusRequiresFQDN(t *testing.T) { + st := newTopologyStore(t) + if err := st.CreateCampus( + "managed", + "Managed Campus", + "ja", + "managed", + "", + true, + ); err == nil { + t.Fatal("managed Campus without an FQDN was created") + } +} + +func TestControllerCampusRequiresDomainInstanceFQDN(t *testing.T) { + st := newTopologyStore(t) + if err := st.CreateCampus( + "controller", + "Controller Campus", + "en", + "controller", + "campus.example.test", + true, + ); err != nil { + t.Fatal(err) + } + var controller store.Campus + campuses, err := st.ListCampuses() + if err != nil { + t.Fatal(err) + } + for _, campus := range campuses { + if campus.Name == "controller" { + controller = campus + break + } + } + + if err := st.CreateDomain( + controller.UUID, + "controlled", + "Controlled", + "controlled", + "remote", + "", + "", + true, + ); err == nil { + t.Fatal("controller Domain without instance FQDN was created") + } + token, err := st.IssueCampusToken(controller.UUID, "test") + if err != nil { + t.Fatal(err) + } + fingerprint, publicKey, signature := + registrationProof(t, "node.example.test", token) + _, instance, err := st.RegisterFederationInstance( + token, + "node.example.test", + fingerprint, + publicKey, + signature, + ) + if err != nil { + t.Fatal(err) + } + if err := st.SetFederationInstanceStatus( + instance.ID, + "approved", + ); err != nil { + t.Fatal(err) + } + if err := st.CreateDomain( + controller.UUID, + "controlled", + "Controlled", + "controlled", + "remote", + "node.example.test", + fingerprint, + true, + ); err != nil { + t.Fatal(err) + } + domain, err := st.GetDomainByHost( + "controlled.campus.example.test", + ) + if err != nil { + t.Fatal(err) + } + if domain.InstanceFQDN != "node.example.test" { + t.Fatalf("instance FQDN = %q", domain.InstanceFQDN) + } + if domain.InstanceFingerprint != fingerprint { + t.Fatalf("instance fingerprint = %q", domain.InstanceFingerprint) + } + if err := st.SetFederationInstanceStatus( + instance.ID, + "revoked", + ); err != nil { + t.Fatal(err) + } + disabled, err := st.GetDomainByUUID(domain.UUID) + if err != nil { + t.Fatal(err) + } + if disabled.Enabled { + t.Fatal("Domain remained enabled after its instance was revoked") + } +} + +func TestDomainHostResolutionUsesCampusFQDNWithoutFallback(t *testing.T) { + st := newTopologyStore(t) + defaultDomain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + + resolved, err := st.GetDomainByHost("localhost") + if err != nil { + t.Fatal(err) + } + if resolved.UUID != defaultDomain.UUID { + t.Fatalf("localhost resolved Domain %q", resolved.UUID) + } + + if _, err := st.GetDomainByHost("unknown.example.test"); !errors.Is( + err, + sql.ErrNoRows, + ) { + t.Fatalf("unknown Host error = %v, want sql.ErrNoRows", err) + } +} + +func TestConfigIsIsolatedByDomain(t *testing.T) { + st := newTopologyStore(t) + if err := st.EnsureConfigTable(); err != nil { + t.Fatal(err) + } + campus, err := st.GetDefaultCampus() + if err != nil { + t.Fatal(err) + } + defaultDomain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + if err := st.CreateDomain( + campus.UUID, + "second", + "Second", + "second.localhost", + "local", + "", + "", + true, + ); err != nil { + t.Fatal(err) + } + second, err := st.GetDomainByHost("second.localhost") + if err != nil { + t.Fatal(err) + } + + if err := st.SetConfigInDomain( + defaultDomain.UUID, + "wiki_name", + "Default Wiki", + ); err != nil { + t.Fatal(err) + } + if err := st.SetConfigInDomain( + second.UUID, + "wiki_name", + "Second Wiki", + ); err != nil { + t.Fatal(err) + } + + defaultName, err := st.GetConfigInDomain(defaultDomain.UUID, "wiki_name") + if err != nil { + t.Fatal(err) + } + secondName, err := st.GetConfigInDomain(second.UUID, "wiki_name") + if err != nil { + t.Fatal(err) + } + if defaultName != "Default Wiki" || secondName != "Second Wiki" { + t.Fatalf("config values = %q, %q", defaultName, secondName) + } +} + +func TestNewDomainInheritsCampusDefaultLanguage(t *testing.T) { + st := newTopologyStore(t) + if err := st.EnsureConfigTable(); err != nil { + t.Fatal(err) + } + if err := st.CreateCampus( + "japanese", + "Japanese Campus", + "ja-JP", + "standalone", + "ja.example.test", + true, + ); err != nil { + t.Fatal(err) + } + var campus store.Campus + campuses, err := st.ListCampuses() + if err != nil { + t.Fatal(err) + } + for _, candidate := range campuses { + if candidate.Name == "japanese" { + campus = candidate + break + } + } + if err := st.CreateDomain( + campus.UUID, + "docs-ja", + "Japanese Documentation", + "docs.ja.example.test", + "local", + "", + "", + true, + ); err != nil { + t.Fatal(err) + } + domain, err := st.GetDomainByHost("docs.ja.example.test") + if err != nil { + t.Fatal(err) + } + locale, err := st.GetConfigInDomain(domain.UUID, "locale") + if err != nil { + t.Fatal(err) + } + if locale != "ja" { + t.Fatalf("Domain locale = %q, want ja", locale) + } +} + +func TestLegacyConfigMigratesToDefaultDomain(t *testing.T) { + st := newTopologyStore(t) + if _, err := st.DB.Exec(` + CREATE TABLE config ( + key TEXT PRIMARY KEY, + value TEXT NOT NULL, + updated_at INTEGER NOT NULL + ); + INSERT INTO config (key, value, updated_at) + VALUES ('wiki_name', 'Legacy Wiki', 1); + `); err != nil { + t.Fatal(err) + } + if err := st.EnsureConfigTable(); err != nil { + t.Fatal(err) + } + domain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + value, err := st.GetConfigInDomain(domain.UUID, "wiki_name") + if err != nil { + t.Fatal(err) + } + if value != "Legacy Wiki" { + t.Fatalf("migrated config = %q", value) + } +} diff --git a/internal/store/city.go b/internal/store/city.go new file mode 100644 index 0000000..54fe187 --- /dev/null +++ b/internal/store/city.go @@ -0,0 +1,783 @@ +package store + +import ( + "database/sql" + "errors" + "regexp" + "strings" + "time" + + "github.com/google/uuid" +) + +var cityNamePattern = regexp.MustCompile(`^[a-z0-9][a-z0-9_-]{1,63}$`) + +type CitySpot struct { + DetailHref string `json:"detail_href,omitempty"` + UUID string `json:"uuid"` + Name string `json:"name"` + Title string `json:"title"` + Summary string `json:"summary"` + State string `json:"state"` + SortKey int `json:"sort_key"` + PageCount int `json:"page_count"` + Pages []CityPagePlacement `json:"pages"` + PathPrefix string `json:"path_prefix"` + PortalPath string `json:"portal_path"` + PortalPageUUID string `json:"portal_page_uuid"` +} +type CityStreet struct { + DetailHref string `json:"detail_href,omitempty"` + UUID string `json:"uuid"` + Name string `json:"name"` + Title string `json:"title"` + Description string `json:"description"` + State string `json:"state"` + SortKey int `json:"sort_key"` + Spots []CitySpot `json:"spots"` + PathPrefix string `json:"path_prefix"` +} +type CityQuartier struct { + DetailHref string `json:"detail_href,omitempty"` + UUID string `json:"uuid"` + Name string `json:"name"` + Title string `json:"title"` + Description string `json:"description"` + State string `json:"state"` + SortKey int `json:"sort_key"` + Streets []CityStreet `json:"streets"` + PathPrefix string `json:"path_prefix"` +} +type CityMap struct { + DomainUUID string `json:"domain_uuid"` + Version int64 `json:"version"` + Quartiers []CityQuartier `json:"quartiers"` + Relations []CitySpotRelation `json:"relations"` +} + +type CitySpotRelation struct { + SourceSpotUUID string `json:"source_spot_uuid"` + TargetSpotUUID string `json:"target_spot_uuid"` + RelationType string `json:"relation_type"` + Weight float64 `json:"weight"` +} + +type CityPagePlacement struct { + PageUUID string `json:"page_uuid"` + Path string `json:"path"` + EdgeType string `json:"edge_type"` + Label string `json:"label"` + SortKey int `json:"sort_key"` + Featured bool `json:"featured"` + Source string `json:"source"` +} + +type CitySpotAppearance struct { + SpotUUID, SpotName, SpotTitle, EdgeType, Label, Source, PathPrefix string +} + +type CityNodeDetail struct { + UUID, DomainUUID, Kind, ParentUUID, Name, Title, Description, State string + PathPrefix string + SortKey, Version int + Quartier *CityNodeAncestor `json:"quartier,omitempty"` + Street *CityNodeAncestor `json:"street,omitempty"` +} + +func (s *Store) EnsureCitySchema() error { + statements := []string{ + `CREATE TABLE IF NOT EXISTS domain_topology_versions (domain_uuid TEXT PRIMARY KEY,version INTEGER NOT NULL DEFAULT 1,updated_at_ms INTEGER NOT NULL)`, + `CREATE TABLE IF NOT EXISTS zones (uuid TEXT PRIMARY KEY,domain_uuid TEXT NOT NULL,kind TEXT NOT NULL,parent_uuid TEXT,name TEXT NOT NULL,title TEXT NOT NULL DEFAULT '',description TEXT NOT NULL DEFAULT '',path_prefix TEXT NOT NULL DEFAULT '',charter_json TEXT NOT NULL DEFAULT '{}',policy_json TEXT NOT NULL DEFAULT '{}',state TEXT NOT NULL DEFAULT 'draft',sort_key INTEGER NOT NULL DEFAULT 0,version INTEGER NOT NULL DEFAULT 1,created_at_ms INTEGER NOT NULL,updated_at_ms INTEGER NOT NULL,UNIQUE(domain_uuid,parent_uuid,name))`, + `CREATE UNIQUE INDEX IF NOT EXISTS idx_zones_quartier_name ON zones(domain_uuid,name) WHERE kind='quartier'`, + `CREATE INDEX IF NOT EXISTS idx_zones_parent ON zones(domain_uuid,parent_uuid,sort_key,name)`, + `CREATE TABLE IF NOT EXISTS spots (uuid TEXT PRIMARY KEY,domain_uuid TEXT NOT NULL,name TEXT NOT NULL,title TEXT NOT NULL DEFAULT '',summary TEXT NOT NULL DEFAULT '',path_prefix TEXT NOT NULL DEFAULT '',charter_json TEXT NOT NULL DEFAULT '{}',schema_json TEXT NOT NULL DEFAULT '{}',landing_json TEXT NOT NULL DEFAULT '{}',state TEXT NOT NULL DEFAULT 'draft',version INTEGER NOT NULL DEFAULT 1,created_at_ms INTEGER NOT NULL,updated_at_ms INTEGER NOT NULL,UNIQUE(domain_uuid,name))`, + `CREATE TABLE IF NOT EXISTS street_spots (street_uuid TEXT NOT NULL,spot_uuid TEXT NOT NULL UNIQUE,sort_key INTEGER NOT NULL DEFAULT 0,section TEXT NOT NULL DEFAULT '',created_at_ms INTEGER NOT NULL,PRIMARY KEY(street_uuid,spot_uuid))`, + `CREATE TABLE IF NOT EXISTS spot_pages (spot_uuid TEXT NOT NULL,page_uuid TEXT NOT NULL,edge_type TEXT NOT NULL DEFAULT 'primary',label TEXT NOT NULL DEFAULT '',sort_key INTEGER NOT NULL DEFAULT 0,featured INTEGER NOT NULL DEFAULT 0,source TEXT NOT NULL DEFAULT 'local',created_at_ms INTEGER NOT NULL,PRIMARY KEY(spot_uuid,page_uuid,edge_type))`, + `CREATE TABLE IF NOT EXISTS spot_relations (source_spot_uuid TEXT NOT NULL,target_spot_uuid TEXT NOT NULL,relation_type TEXT NOT NULL,weight REAL NOT NULL DEFAULT 1.0,created_at_ms INTEGER NOT NULL,PRIMARY KEY(source_spot_uuid,target_spot_uuid,relation_type))`, + `CREATE INDEX IF NOT EXISTS idx_spot_relations_target ON spot_relations(target_spot_uuid,source_spot_uuid,relation_type)`, + `CREATE TABLE IF NOT EXISTS street_inbox_pages (street_uuid TEXT NOT NULL,page_uuid TEXT NOT NULL,created_at_ms INTEGER NOT NULL,PRIMARY KEY(street_uuid,page_uuid))`, + `CREATE TABLE IF NOT EXISTS city_page_overrides (domain_uuid TEXT NOT NULL,page_uuid TEXT NOT NULL,spot_uuid TEXT NOT NULL,PRIMARY KEY(domain_uuid,page_uuid))`, + `CREATE INDEX IF NOT EXISTS idx_city_page_overrides_spot ON city_page_overrides(domain_uuid,spot_uuid,page_uuid)`, + `CREATE TABLE IF NOT EXISTS topology_events (id INTEGER PRIMARY KEY AUTOINCREMENT,domain_uuid TEXT NOT NULL,topology_version INTEGER NOT NULL,actor_principal_uuid TEXT NOT NULL DEFAULT '',operation TEXT NOT NULL,target_type TEXT NOT NULL,target_uuid TEXT NOT NULL,before_json TEXT NOT NULL DEFAULT '{}',after_json TEXT NOT NULL DEFAULT '{}',request_id TEXT NOT NULL DEFAULT '',created_at_ms INTEGER NOT NULL)`, + } + for _, statement := range statements { + if _, err := s.DB.Exec(statement); err != nil { + return err + } + } + if err := ensureCityColumn(s.DB, "zones", "path_prefix", "TEXT NOT NULL DEFAULT ''"); err != nil { + return err + } + if err := ensureCityColumn(s.DB, "spots", "path_prefix", "TEXT NOT NULL DEFAULT ''"); err != nil { + return err + } + return s.ensureCityGovernanceSchema() +} + +func ensureCityColumn(db *sql.DB, table, column, declaration string) error { + rows, err := db.Query(`PRAGMA table_info(` + table + `)`) + if err != nil { + return err + } + found := false + for rows.Next() { + var cid int + var name, kind string + var notnull, pk int + var defaultValue any + if err := rows.Scan(&cid, &name, &kind, ¬null, &defaultValue, &pk); err != nil { + rows.Close() + return err + } + found = found || name == column + } + if err := rows.Close(); err != nil { + return err + } + if found { + return nil + } + _, err = db.Exec(`ALTER TABLE ` + table + ` ADD COLUMN ` + column + ` ` + declaration) + return err +} + +func cityPathContains(parent, child string) bool { + parent, child = normalizePath(parent), normalizePath(child) + if parent == "/" { + return child != "/" + } + return child != parent && strings.HasPrefix(child, parent+"/") +} + +func validateCityPathPrefix(tx *sql.Tx, domainUUID, kind, pathPrefix string) (string, error) { + pathPrefix = normalizePath(pathPrefix) + if pathPrefix == "/" && kind != "quartier" { + return "", errors.New("only a Quartier may bind the Domain root") + } + var conflicts int + table := "zones" + if kind == "spot" { + table = "spots" + } + query := `SELECT COUNT(*) FROM ` + table + ` CROSS JOIN (SELECT ? AS candidate) input WHERE domain_uuid=? AND state!='archived' AND ` + cityPathOverlapSQL("path_prefix", "input.candidate") + if kind != "spot" { + query += ` AND kind=?` + } + args := []any{pathPrefix, domainUUID} + if kind != "spot" { + args = append(args, kind) + } + if err := tx.QueryRow(query, args...).Scan(&conflicts); err != nil { + return "", err + } + if conflicts > 0 { + return "", errors.New("City Path boundaries of the same level must not overlap") + } + return pathPrefix, nil +} + +type cityPathBoundary struct{ id, kind, parent, path string } + +func validateCityBoundaryChanges(items []cityPathBoundary, changed map[string]bool) error { + byID := make(map[string]cityPathBoundary, len(items)) + for _, item := range items { + byID[item.id] = item + } + for i, item := range items { + for j := i + 1; j < len(items); j++ { + other := items[j] + if (changed[item.id] || changed[other.id]) && item.kind == other.kind && (item.path == other.path || cityPathContains(item.path, other.path) || cityPathContains(other.path, item.path)) { + return errors.New("City Path boundaries of the same level must not overlap") + } + } + if item.kind == "street" && (changed[item.id] || changed[item.parent]) { + parent, ok := byID[item.parent] + if !ok || parent.kind != "quartier" || !cityPathContains(parent.path, item.path) { + return errors.New("Street Path must be a strict descendant of its Quartier Path") + } + } + if item.kind == "spot" && (changed[item.id] || changed[item.parent]) { + parent, ok := byID[item.parent] + if !ok || parent.kind != "street" || !cityPathContains(parent.path, item.path) { + return errors.New("Spot Path must be a strict descendant of its Street Path") + } + } + } + return nil +} + +func loadCityBoundaries(tx *sql.Tx, domainUUID string) ([]cityPathBoundary, error) { + rows, err := tx.Query(`SELECT uuid,kind,COALESCE(parent_uuid,''),path_prefix FROM zones WHERE domain_uuid=? AND state!='archived' UNION ALL SELECT s.uuid,'spot',COALESCE(ss.street_uuid,''),s.path_prefix FROM spots s LEFT JOIN street_spots ss ON ss.spot_uuid=s.uuid WHERE s.domain_uuid=? AND s.state!='archived'`, domainUUID, domainUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var items []cityPathBoundary + for rows.Next() { + var item cityPathBoundary + if err := rows.Scan(&item.id, &item.kind, &item.parent, &item.path); err != nil { + return nil, err + } + item.path = normalizePath(item.path) + items = append(items, item) + } + return items, rows.Err() +} + +func renameCityPathPrefixesTx(tx *sql.Tx, domainUUID, oldPath, newPath string) (int, error) { + items, err := loadCityBoundaries(tx, domainUUID) + if err != nil { + return 0, err + } + changed := make(map[string]string) + changedIDs := make(map[string]bool) + for i := range items { + if items[i].path == oldPath || strings.HasPrefix(items[i].path, oldPath+"/") { + items[i].path = newPath + strings.TrimPrefix(items[i].path, oldPath) + changed[items[i].id] = items[i].path + changedIDs[items[i].id] = true + } + } + if len(changed) == 0 { + return 0, nil + } + if err := validateCityBoundaryChanges(items, changedIDs); err != nil { + return 0, err + } + now := time.Now().UnixMilli() + for _, item := range items { + path, ok := changed[item.id] + if !ok { + continue + } + table := "zones" + if item.kind == "spot" { + table = "spots" + } + if _, err := tx.Exec(`UPDATE `+table+` SET path_prefix=?,version=version+1,updated_at_ms=? WHERE uuid=? AND domain_uuid=?`, path, now, item.id, domainUUID); err != nil { + return 0, err + } + } + return len(changed), nil +} + +func (s *Store) UpdateCityNodePath(domainUUID, actor, kind, id, pathPrefix string) error { + pathPrefix = normalizePath(pathPrefix) + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + items, err := loadCityBoundaries(tx, domainUUID) + if err != nil { + return err + } + found := false + changed := map[string]bool{id: true} + for i := range items { + if items[i].id == id && items[i].kind == kind { + items[i].path, found = pathPrefix, true + } + } + if !found { + return sql.ErrNoRows + } + if err := validateCityBoundaryChanges(items, changed); err != nil { + return err + } + table := "zones" + if kind == "spot" { + table = "spots" + } + result, err := tx.Exec(`UPDATE `+table+` SET path_prefix=?,version=version+1,updated_at_ms=? WHERE uuid=? AND domain_uuid=? AND state!='archived'`, pathPrefix, time.Now().UnixMilli(), id, domainUUID) + if err != nil { + return err + } + if changed, _ := result.RowsAffected(); changed != 1 { + return sql.ErrNoRows + } + if err := bumpTopologyVersion(tx, domainUUID, actor, "city.node.path_updated", kind, id); err != nil { + return err + } + return tx.Commit() +} + +func normalizeCityName(name string) (string, error) { + name = strings.ToLower(strings.TrimSpace(name)) + if !cityNamePattern.MatchString(name) { + return "", errors.New("city name must be 2-64 lowercase letters, digits, underscores, or hyphens") + } + return name, nil +} + +func bumpTopologyVersion(tx *sql.Tx, domainUUID, actor, operation, targetType, targetUUID string) error { + now := time.Now().UnixMilli() + _, err := tx.Exec(`INSERT INTO domain_topology_versions(domain_uuid,version,updated_at_ms) VALUES(?,2,?) ON CONFLICT(domain_uuid) DO UPDATE SET version=version+1,updated_at_ms=excluded.updated_at_ms`, domainUUID, now) + if err != nil { + return err + } + var version int64 + if err := tx.QueryRow(`SELECT version FROM domain_topology_versions WHERE domain_uuid=?`, domainUUID).Scan(&version); err != nil { + return err + } + _, err = tx.Exec(`INSERT INTO topology_events(domain_uuid,topology_version,actor_principal_uuid,operation,target_type,target_uuid,created_at_ms) VALUES(?,?,?,?,?,?,?)`, domainUUID, version, actor, operation, targetType, targetUUID, now) + return err +} + +func (s *Store) CreateZone(domainUUID, actor, kind, parentUUID, name, title, description string) (string, error) { + pathPrefix := "/" + strings.ToLower(strings.TrimSpace(name)) + if strings.EqualFold(kind, "street") { + var parentPath string + if s.DB.QueryRow(`SELECT path_prefix FROM zones WHERE uuid=? AND domain_uuid=?`, parentUUID, domainUUID).Scan(&parentPath) == nil { + pathPrefix = normalizePath(parentPath) + "/" + strings.ToLower(strings.TrimSpace(name)) + } + } + return s.CreateZoneAtPath(domainUUID, actor, kind, parentUUID, name, title, description, pathPrefix) +} + +func (s *Store) CreateZoneAtPath(domainUUID, actor, kind, parentUUID, name, title, description, pathPrefix string) (string, error) { + name, err := normalizeCityName(name) + if err != nil { + return "", err + } + kind = strings.ToLower(strings.TrimSpace(kind)) + if kind != "quartier" && kind != "street" { + return "", errors.New("zone kind must be quartier or street") + } + if strings.TrimSpace(title) == "" { + title = name + } + tx, err := s.DB.Begin() + if err != nil { + return "", err + } + defer tx.Rollback() + if strings.TrimSpace(pathPrefix) == "" { + pathPrefix = "/" + name + } + pathPrefix, err = validateCityPathPrefix(tx, domainUUID, kind, pathPrefix) + if err != nil { + return "", err + } + if kind == "quartier" { + parentUUID = "" + } else { + var parentKind, parentPath string + if err := tx.QueryRow(`SELECT kind,path_prefix FROM zones WHERE uuid=? AND domain_uuid=? AND state!='archived'`, parentUUID, domainUUID).Scan(&parentKind, &parentPath); err != nil || parentKind != "quartier" { + return "", errors.New("street parent must be an active Quartier") + } + if !cityPathContains(parentPath, pathPrefix) { + return "", errors.New("Street Path must be a strict descendant of its Quartier Path") + } + } + id, now := uuid.NewString(), time.Now().UnixMilli() + var parent any + if parentUUID == "" { + parent = nil + } else { + parent = parentUUID + } + // Archived nodes retain their UUID and audit history, but must not reserve + // a human-facing name forever. Move an old conflicting name aside before + // inserting the replacement node. + if kind == "quartier" { + if _, err := tx.Exec(`UPDATE zones SET name=name||'~archived-'||substr(uuid,1,8),updated_at_ms=? WHERE domain_uuid=? AND kind=? AND parent_uuid IS NULL AND name=? AND state='archived'`, time.Now().UnixMilli(), domainUUID, kind, name); err != nil { + return "", err + } + } else { + if _, err := tx.Exec(`UPDATE zones SET name=name||'~archived-'||substr(uuid,1,8),updated_at_ms=? WHERE domain_uuid=? AND kind=? AND parent_uuid=? AND name=? AND state='archived'`, time.Now().UnixMilli(), domainUUID, kind, parentUUID, name); err != nil { + return "", err + } + } + if _, err := tx.Exec(`INSERT INTO zones(uuid,domain_uuid,kind,parent_uuid,name,title,description,path_prefix,state,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,?,?,?,'draft',?,?)`, id, domainUUID, kind, parent, name, strings.TrimSpace(title), strings.TrimSpace(description), pathPrefix, now, now); err != nil { + return "", err + } + if err := bumpTopologyVersion(tx, domainUUID, actor, "city.zone.created", kind, id); err != nil { + return "", err + } + return id, tx.Commit() +} + +func (s *Store) CreateSpot(domainUUID, actor, streetUUID, name, title, summary string) (string, error) { + pathPrefix := "/" + strings.ToLower(strings.TrimSpace(name)) + var streetPath string + if s.DB.QueryRow(`SELECT path_prefix FROM zones WHERE uuid=? AND domain_uuid=?`, streetUUID, domainUUID).Scan(&streetPath) == nil { + pathPrefix = normalizePath(streetPath) + "/" + strings.ToLower(strings.TrimSpace(name)) + } + return s.CreateSpotAtPath(domainUUID, actor, streetUUID, name, title, summary, pathPrefix) +} + +func (s *Store) CreateSpotAtPath(domainUUID, actor, streetUUID, name, title, summary, pathPrefix string) (string, error) { + name, err := normalizeCityName(name) + if err != nil { + return "", err + } + if strings.TrimSpace(title) == "" { + title = name + } + tx, err := s.DB.Begin() + if err != nil { + return "", err + } + defer tx.Rollback() + if strings.TrimSpace(pathPrefix) == "" { + pathPrefix = "/" + name + } + pathPrefix, err = validateCityPathPrefix(tx, domainUUID, "spot", pathPrefix) + if err != nil { + return "", err + } + var kind, streetPath string + if err := tx.QueryRow(`SELECT kind,path_prefix FROM zones WHERE uuid=? AND domain_uuid=? AND state!='archived'`, streetUUID, domainUUID).Scan(&kind, &streetPath); err != nil || kind != "street" { + return "", errors.New("spot placement must be an active Street") + } + if !cityPathContains(streetPath, pathPrefix) { + return "", errors.New("Spot Path must be a strict descendant of its Street Path") + } + id, now := uuid.NewString(), time.Now().UnixMilli() + if _, err := tx.Exec(`UPDATE spots SET name=name||'~archived-'||substr(uuid,1,8),updated_at_ms=? WHERE domain_uuid=? AND name=? AND state='archived'`, now, domainUUID, name); err != nil { + return "", err + } + if _, err := tx.Exec(`INSERT INTO spots(uuid,domain_uuid,name,title,summary,path_prefix,state,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,?,'draft',?,?)`, id, domainUUID, name, strings.TrimSpace(title), strings.TrimSpace(summary), pathPrefix, now, now); err != nil { + return "", err + } + if _, err := tx.Exec(`INSERT INTO street_spots(street_uuid,spot_uuid,created_at_ms) VALUES(?,?,?)`, streetUUID, id, now); err != nil { + return "", err + } + if err := bumpTopologyVersion(tx, domainUUID, actor, "city.spot.created", "spot", id); err != nil { + return "", err + } + return id, tx.Commit() +} + +func (s *Store) AddSpotPage(domainUUID, actor, spotUUID, pageUUID, path, edgeType, label string) error { + edgeType = strings.ToLower(strings.TrimSpace(edgeType)) + valid := map[string]bool{"primary": true, "guide": true, "reference": true, "example": true, "attachment": true, "related": true} + if !valid[edgeType] { + return errors.New("invalid SpotPage edge type") + } + if pageUUID == "" { + var err error + pageUUID, err = s.ResolvePathInDomain(domainUUID, path) + if err != nil { + return err + } + } + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + var validTarget int + if err := tx.QueryRow(`SELECT EXISTS(SELECT 1 FROM spots WHERE uuid=? AND domain_uuid=? AND state!='archived') AND EXISTS(SELECT 1 FROM paths WHERE domain_uuid=? AND object_uuid=?)`, spotUUID, domainUUID, domainUUID, pageUUID).Scan(&validTarget); err != nil || validTarget == 0 { + return errors.New("Spot and Page must belong to the current Domain") + } + _, err = tx.Exec(`INSERT INTO spot_pages(spot_uuid,page_uuid,edge_type,label,created_at_ms) VALUES(?,?,?,?,?) ON CONFLICT(spot_uuid,page_uuid,edge_type) DO UPDATE SET label=excluded.label`, spotUUID, pageUUID, edgeType, strings.TrimSpace(label), time.Now().UnixMilli()) + if err != nil { + return err + } + if err := bumpTopologyVersion(tx, domainUUID, actor, "city.spot_page.added", "spot", spotUUID); err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) RemoveSpotPage(domainUUID, actor, spotUUID, pageUUID, edgeType string) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + result, err := tx.Exec(`DELETE FROM spot_pages WHERE spot_uuid=? AND page_uuid=? AND edge_type=? AND EXISTS(SELECT 1 FROM spots WHERE uuid=? AND domain_uuid=?)`, spotUUID, pageUUID, edgeType, spotUUID, domainUUID) + if err != nil { + return err + } + changed, _ := result.RowsAffected() + if changed == 0 { + return sql.ErrNoRows + } + if err := bumpTopologyVersion(tx, domainUUID, actor, "city.spot_page.removed", "spot", spotUUID); err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) ListSpotPages(domainUUID, spotUUID string) ([]CityPagePlacement, error) { + return listSpotPages(s.DB, domainUUID, spotUUID, -1) +} + +type cityQuerier interface { + Query(string, ...any) (*sql.Rows, error) +} + +func listSpotPages(db cityQuerier, domainUUID, spotUUID string, limit int) ([]CityPagePlacement, error) { + rows, err := db.Query(`SELECT page_uuid,path,edge_type,label,sort_key,featured,source FROM ( + SELECT sp.page_uuid AS page_uuid,COALESCE((SELECT path FROM paths WHERE domain_uuid=? AND object_uuid=sp.page_uuid ORDER BY is_primary DESC,path LIMIT 1),'') AS path,sp.edge_type AS edge_type,sp.label AS label,sp.sort_key AS sort_key,sp.featured AS featured,sp.source AS source + FROM spot_pages sp JOIN spots s ON s.uuid=sp.spot_uuid AND s.domain_uuid=? WHERE sp.spot_uuid=? + AND EXISTS(SELECT 1 FROM paths local WHERE local.domain_uuid=s.domain_uuid AND local.object_uuid=sp.page_uuid) + UNION ALL + SELECT p.object_uuid,MIN(p.path),'path','',0,0,'path' FROM paths p JOIN spots s ON s.uuid=? AND s.domain_uuid=p.domain_uuid AND s.state!='archived' + WHERE p.domain_uuid=? AND `+cityPathScopeSQL("s.path_prefix", "p.path")+` + AND NOT EXISTS(SELECT 1 FROM city_page_overrides ov JOIN spots dest ON dest.uuid=ov.spot_uuid AND dest.domain_uuid=ov.domain_uuid AND dest.state!='archived' WHERE ov.domain_uuid=p.domain_uuid AND ov.page_uuid=p.object_uuid AND ov.spot_uuid!=s.uuid) + AND NOT EXISTS(SELECT 1 FROM spot_pages explicit WHERE explicit.spot_uuid=s.uuid AND explicit.page_uuid=p.object_uuid) + GROUP BY p.object_uuid + ) ORDER BY featured DESC,sort_key,edge_type,path LIMIT ?`, domainUUID, domainUUID, spotUUID, spotUUID, domainUUID, limit) + if err != nil { + return nil, err + } + defer rows.Close() + var out []CityPagePlacement + for rows.Next() { + var item CityPagePlacement + if err := rows.Scan(&item.PageUUID, &item.Path, &item.EdgeType, &item.Label, &item.SortKey, &item.Featured, &item.Source); err != nil { + return nil, err + } + out = append(out, item) + } + return out, rows.Err() +} + +func (s *Store) ListPageSpotAppearances(domainUUID, pageUUID string) ([]CitySpotAppearance, error) { + rows, err := s.DB.Query(`SELECT uuid,name,title,edge_type,label,source,path_prefix FROM ( + SELECT s.uuid,s.name,s.title,sp.edge_type,sp.label,sp.source,s.path_prefix FROM spot_pages sp JOIN spots s ON s.uuid=sp.spot_uuid AND s.domain_uuid=? AND s.state!='archived' WHERE sp.page_uuid=? + UNION ALL + SELECT s.uuid,s.name,s.title,'path','','path',s.path_prefix FROM spots s JOIN paths p ON p.domain_uuid=s.domain_uuid AND p.object_uuid=? AND `+cityPathScopeSQL("s.path_prefix", "p.path")+` + WHERE s.domain_uuid=? AND s.state!='archived' AND NOT EXISTS(SELECT 1 FROM spot_pages explicit WHERE explicit.spot_uuid=s.uuid AND explicit.page_uuid=?) + AND NOT EXISTS(SELECT 1 FROM city_page_overrides ov JOIN spots dest ON dest.uuid=ov.spot_uuid AND dest.domain_uuid=ov.domain_uuid AND dest.state!='archived' WHERE ov.domain_uuid=p.domain_uuid AND ov.page_uuid=p.object_uuid AND ov.spot_uuid!=s.uuid) + ) ORDER BY lower(title),edge_type`, domainUUID, pageUUID, pageUUID, domainUUID, pageUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var out []CitySpotAppearance + for rows.Next() { + var item CitySpotAppearance + if err := rows.Scan(&item.SpotUUID, &item.SpotName, &item.SpotTitle, &item.EdgeType, &item.Label, &item.Source, &item.PathPrefix); err != nil { + return nil, err + } + out = append(out, item) + } + return out, rows.Err() +} + +func (s *Store) AddSpotRelation(domainUUID, actor, sourceUUID, targetUUID, relationType string) error { + relationType = strings.ToLower(strings.TrimSpace(relationType)) + valid := map[string]bool{"related": true, "depends_on": true, "supersedes": true, "implements": true, "learn_before": true, "operated_by": true} + if !valid[relationType] || sourceUUID == targetUUID { + return errors.New("invalid Spot relation") + } + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + var count int + if err := tx.QueryRow(`SELECT COUNT(*) FROM spots WHERE domain_uuid=? AND uuid IN (?,?) AND state!='archived'`, domainUUID, sourceUUID, targetUUID).Scan(&count); err != nil || count != 2 { + return errors.New("both Spots must belong to the current Domain") + } + if _, err := tx.Exec(`INSERT INTO spot_relations(source_spot_uuid,target_spot_uuid,relation_type,created_at_ms) VALUES(?,?,?,?) ON CONFLICT DO NOTHING`, sourceUUID, targetUUID, relationType, time.Now().UnixMilli()); err != nil { + return err + } + if err := bumpTopologyVersion(tx, domainUUID, actor, "city.spot_relation.added", "spot", sourceUUID); err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) RemoveSpotRelation(domainUUID, actor, sourceUUID, targetUUID, relationType string) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + result, err := tx.Exec(`DELETE FROM spot_relations WHERE source_spot_uuid=? AND target_spot_uuid=? AND relation_type=? AND EXISTS(SELECT 1 FROM spots WHERE uuid=? AND domain_uuid=?)`, sourceUUID, targetUUID, relationType, sourceUUID, domainUUID) + if err != nil { + return err + } + changed, _ := result.RowsAffected() + if changed == 0 { + return sql.ErrNoRows + } + if err := bumpTopologyVersion(tx, domainUUID, actor, "city.spot_relation.removed", "spot", sourceUUID); err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) MoveStreet(domainUUID, actor, streetUUID, quartierUUID string, sortKey int) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + var parentKind, parentPath, streetPath string + if err := tx.QueryRow(`SELECT kind,path_prefix FROM zones WHERE uuid=? AND domain_uuid=? AND state!='archived'`, quartierUUID, domainUUID).Scan(&parentKind, &parentPath); err != nil || parentKind != "quartier" { + return errors.New("destination must be an active Quartier") + } + if err := tx.QueryRow(`SELECT path_prefix FROM zones WHERE uuid=? AND domain_uuid=? AND kind='street' AND state!='archived'`, streetUUID, domainUUID).Scan(&streetPath); err != nil { + return err + } + if !cityPathContains(parentPath, streetPath) { + return errors.New("Street Path is outside the destination Quartier Path; change its boundary first") + } + result, err := tx.Exec(`UPDATE zones SET parent_uuid=?,sort_key=?,version=version+1,updated_at_ms=? WHERE uuid=? AND domain_uuid=? AND kind='street' AND state!='archived'`, quartierUUID, sortKey, time.Now().UnixMilli(), streetUUID, domainUUID) + if err != nil { + return err + } + changed, _ := result.RowsAffected() + if changed != 1 { + return sql.ErrNoRows + } + if err := bumpTopologyVersion(tx, domainUUID, actor, "city.street.moved", "street", streetUUID); err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) MoveSpot(domainUUID, actor, spotUUID, streetUUID string, sortKey int) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + var kind, streetPath string + if err := tx.QueryRow(`SELECT kind,path_prefix FROM zones WHERE uuid=? AND domain_uuid=? AND state!='archived'`, streetUUID, domainUUID).Scan(&kind, &streetPath); err != nil || kind != "street" { + return errors.New("destination must be an active Street") + } + var spotDomain, spotPath string + if err := tx.QueryRow(`SELECT domain_uuid,path_prefix FROM spots WHERE uuid=? AND state!='archived'`, spotUUID).Scan(&spotDomain, &spotPath); err != nil || spotDomain != domainUUID { + return errors.New("Spot must belong to the current Domain") + } + if !cityPathContains(streetPath, spotPath) { + return errors.New("Spot Path is outside the destination Street Path; change its boundary first") + } + result, err := tx.Exec(`UPDATE street_spots SET street_uuid=?,sort_key=? WHERE spot_uuid=?`, streetUUID, sortKey, spotUUID) + if err != nil { + return err + } + changed, _ := result.RowsAffected() + if changed != 1 { + return sql.ErrNoRows + } + if _, err := tx.Exec(`UPDATE spots SET version=version+1,updated_at_ms=? WHERE uuid=?`, time.Now().UnixMilli(), spotUUID); err != nil { + return err + } + if err := bumpTopologyVersion(tx, domainUUID, actor, "city.spot.moved", "spot", spotUUID); err != nil { + return err + } + return tx.Commit() +} + +// DeleteCityNode archives a City element and removes topology edges which can +// no longer be reached. Deleting a zone recursively archives its descendants; +// documents themselves are never deleted. +func (s *Store) DeleteCityNode(domainUUID, actor, kind, id string) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + now := time.Now().UnixMilli() + var changed int64 + switch kind { + case "spot": + result, err := tx.Exec(`UPDATE spots SET state='archived',version=version+1,updated_at_ms=? WHERE uuid=? AND domain_uuid=? AND state!='archived'`, now, id, domainUUID) + if err != nil { + return err + } + changed, _ = result.RowsAffected() + if changed > 0 { + _, _ = tx.Exec(`DELETE FROM street_spots WHERE spot_uuid=?`, id) + _, _ = tx.Exec(`DELETE FROM spot_pages WHERE spot_uuid=?`, id) + _, _ = tx.Exec(`DELETE FROM spot_relations WHERE source_spot_uuid=? OR target_spot_uuid=?`, id, id) + } + case "street", "quartier": + var actual string + if err := tx.QueryRow(`SELECT kind FROM zones WHERE uuid=? AND domain_uuid=? AND state!='archived'`, id, domainUUID).Scan(&actual); err != nil || actual != kind { + return sql.ErrNoRows + } + streetIDs := []string{} + if kind == "street" { + streetIDs = append(streetIDs, id) + } else { + rows, err := tx.Query(`SELECT uuid FROM zones WHERE domain_uuid=? AND kind='street' AND parent_uuid=? AND state!='archived'`, domainUUID, id) + if err != nil { + return err + } + for rows.Next() { + var streetID string + if err := rows.Scan(&streetID); err != nil { + rows.Close() + return err + } + streetIDs = append(streetIDs, streetID) + } + if err := rows.Close(); err != nil { + return err + } + } + for _, streetID := range streetIDs { + _, err = tx.Exec(`DELETE FROM spot_pages WHERE spot_uuid IN (SELECT spot_uuid FROM street_spots WHERE street_uuid=?)`, streetID) + if err != nil { + return err + } + _, err = tx.Exec(`DELETE FROM spot_relations WHERE source_spot_uuid IN (SELECT spot_uuid FROM street_spots WHERE street_uuid=?) OR target_spot_uuid IN (SELECT spot_uuid FROM street_spots WHERE street_uuid=?)`, streetID, streetID) + if err != nil { + return err + } + _, err = tx.Exec(`UPDATE spots SET state='archived',version=version+1,updated_at_ms=? WHERE uuid IN (SELECT spot_uuid FROM street_spots WHERE street_uuid=?) AND domain_uuid=?`, now, streetID, domainUUID) + if err != nil { + return err + } + _, err = tx.Exec(`DELETE FROM street_spots WHERE street_uuid=?`, streetID) + if err != nil { + return err + } + } + if kind == "quartier" { + _, err = tx.Exec(`UPDATE zones SET state='archived',version=version+1,updated_at_ms=? WHERE domain_uuid=? AND kind='street' AND parent_uuid=? AND state!='archived'`, now, domainUUID, id) + if err != nil { + return err + } + } + result, err := tx.Exec(`UPDATE zones SET state='archived',version=version+1,updated_at_ms=? WHERE uuid=? AND domain_uuid=? AND kind=? AND state!='archived'`, now, id, domainUUID, kind) + if err != nil { + return err + } + changed, _ = result.RowsAffected() + default: + return errors.New("invalid City element kind") + } + if changed == 0 { + return sql.ErrNoRows + } + if err := bumpTopologyVersion(tx, domainUUID, actor, "city.node.deleted", kind, id); err != nil { + return err + } + return tx.Commit() +} + +// CityNodeOverlappingPath resolves the active locality which already owns an +// exact, ancestor, or descendant boundary. parentUUID scopes Streets and Spots +// so an import cannot silently move a locality across its planned parent. +func (s *Store) CityNodeOverlappingPath(domainUUID, kind, parentUUID, pathPrefix string) (CityNodeDetail, error) { + pathPrefix = normalizePath(pathPrefix) + var detail CityNodeDetail + if kind == "spot" { + query := `SELECT s.uuid,s.domain_uuid,'spot',ss.street_uuid,s.name,s.title,s.summary,s.state,s.path_prefix,ss.sort_key,s.version FROM spots s JOIN street_spots ss ON ss.spot_uuid=s.uuid + JOIN zones st ON st.uuid=ss.street_uuid AND st.domain_uuid=s.domain_uuid AND st.kind='street' AND st.state!='archived' + CROSS JOIN (SELECT ? AS candidate) input WHERE s.domain_uuid=? AND ss.street_uuid=? AND s.state!='archived' AND ` + cityPathOverlapSQL("s.path_prefix", "input.candidate") + + ` ORDER BY CASE WHEN s.path_prefix=input.candidate THEN 0 WHEN ` + cityPathScopeSQL("s.path_prefix", "input.candidate") + ` THEN 1 ELSE 2 END,LENGTH(s.path_prefix),s.uuid LIMIT 1` + err := s.DB.QueryRow(query, pathPrefix, domainUUID, parentUUID).Scan(&detail.UUID, &detail.DomainUUID, &detail.Kind, &detail.ParentUUID, &detail.Name, &detail.Title, &detail.Description, &detail.State, &detail.PathPrefix, &detail.SortKey, &detail.Version) + return detail, err + } + query := `SELECT uuid,domain_uuid,kind,COALESCE(parent_uuid,''),name,title,description,state,path_prefix,sort_key,version FROM zones CROSS JOIN (SELECT ? AS candidate) input WHERE domain_uuid=? AND kind=? AND state!='archived' AND ` + cityPathOverlapSQL("path_prefix", "input.candidate") + args := []any{pathPrefix, domainUUID, kind} + if kind == "street" { + query += ` AND parent_uuid=?` + args = append(args, parentUUID) + } + query += ` ORDER BY CASE WHEN path_prefix=input.candidate THEN 0 WHEN ` + cityPathScopeSQL("path_prefix", "input.candidate") + ` THEN 1 ELSE 2 END,LENGTH(path_prefix),uuid LIMIT 1` + err := s.DB.QueryRow(query, args...).Scan(&detail.UUID, &detail.DomainUUID, &detail.Kind, &detail.ParentUUID, &detail.Name, &detail.Title, &detail.Description, &detail.State, &detail.PathPrefix, &detail.SortKey, &detail.Version) + return detail, err +} diff --git a/internal/store/city_governance.go b/internal/store/city_governance.go new file mode 100644 index 0000000..513cde6 --- /dev/null +++ b/internal/store/city_governance.go @@ -0,0 +1,347 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "strings" + "time" +) + +var ( + ErrGovernanceConflict = errors.New("city.governance.conflict") + ErrGovernanceInvalid = errors.New("city.governance.invalid") + ErrGovernanceCeiling = errors.New("city.governance.ceiling_error") + ErrGovernanceConfirm = errors.New("city.governance.confirm_error") +) + +type LocalityPolicy struct { + Kind string `json:"kind"` + UUID string `json:"uuid"` + Policy string `json:"policy"` +} + +type LocalityOwner struct { + MembershipUUID string `json:"membership_uuid"` + Username string `json:"username"` + DisplayName string `json:"display_name"` + Active bool `json:"active"` +} + +type CityGovernance struct { + PublicationVersion int64 `json:"publication_version"` + Kind string `json:"kind"` + UUID string `json:"uuid"` + Epoch int64 `json:"epoch"` + TopologyVersion int64 `json:"topology_version"` + Policy string `json:"policy"` + Chain []LocalityPolicy `json:"chain"` + Owners []LocalityOwner `json:"owners"` + CanAppoint bool `json:"can_appoint"` + SuperiorAllowsPublic bool `json:"superior_allows_public"` + DraftEffectivePublic bool `json:"draft_effective_public"` + PublicationEnabled bool `json:"publication_enabled"` // This node's separately approved manifest only. + ImpactComplete bool `json:"impact_complete"` // This endpoint does not enumerate Page impact; use /publication. +} + +type CityGovernanceChange struct { + Epoch int64 `json:"epoch"` + TopologyVersion int64 `json:"topology_version"` + Policy *string `json:"policy,omitempty"` + Owners *[]string `json:"owners,omitempty"` + ConfirmRelaxation bool `json:"confirm_relaxation"` +} + +func (s *Store) ensureCityGovernanceSchema() error { + for _, query := range []string{ + `CREATE TABLE IF NOT EXISTS city_governance_epochs(domain_uuid TEXT PRIMARY KEY,version INTEGER NOT NULL DEFAULT 0)`, + `CREATE TABLE IF NOT EXISTS locality_publication_policies(domain_uuid TEXT NOT NULL,node_kind TEXT NOT NULL CHECK(node_kind IN ('domain','quartier','street','spot')),node_uuid TEXT NOT NULL,policy TEXT NOT NULL CHECK(policy IN ('inherit','public','authenticated_acl')),actor_uuid TEXT NOT NULL,updated_at_ms INTEGER NOT NULL,PRIMARY KEY(domain_uuid,node_kind,node_uuid))`, + `CREATE TABLE IF NOT EXISTS city_owner_bindings(domain_uuid TEXT NOT NULL,node_kind TEXT NOT NULL CHECK(node_kind IN ('quartier','spot')),node_uuid TEXT NOT NULL,membership_uuid TEXT NOT NULL,actor_uuid TEXT NOT NULL,created_at_ms INTEGER NOT NULL,PRIMARY KEY(domain_uuid,node_kind,node_uuid,membership_uuid))`, + `CREATE INDEX IF NOT EXISTS idx_city_owner_member ON city_owner_bindings(domain_uuid,membership_uuid,node_kind,node_uuid)`, + `CREATE TABLE IF NOT EXISTS city_governance_events(id INTEGER PRIMARY KEY AUTOINCREMENT,domain_uuid TEXT NOT NULL,epoch INTEGER NOT NULL,actor_uuid TEXT NOT NULL,node_kind TEXT NOT NULL,node_uuid TEXT NOT NULL,before_json TEXT NOT NULL,after_json TEXT NOT NULL,created_at_ms INTEGER NOT NULL)`, + `CREATE INDEX IF NOT EXISTS idx_city_governance_events ON city_governance_events(domain_uuid,epoch)`, + } { + if _, err := s.DB.Exec(query); err != nil { + return err + } + } + return s.ensurePublicationSchema() +} + +// EvaluateLocalityPublication combines ceilings with intent. A public Domain +// merely allows publication: it never publishes its root or arbitrary Pages. +func EvaluateLocalityPublication(chain []LocalityPolicy) (allows, published bool) { + allows = true + for i, p := range chain { + if i == 0 && p.Policy == "inherit" { + return false, false + } + switch p.Policy { + case "authenticated_acl": + allows = false + case "public": + if i > 0 { + published = true + } + case "inherit": + default: + return false, false + } + } + return allows, allows && published +} + +// All authority, parentage and policy reads use this one snapshot. Mutation +// callers acquire SQLite's write reservation before entering this function. +func governanceSnapshot(ctx context.Context, tx *sql.Tx, domain, actor, kind, id string) (g CityGovernance, err error) { + g = CityGovernance{Kind: kind, UUID: id, Owners: []LocalityOwner{}} + var membership string + err = tx.QueryRowContext(ctx, `SELECT m.uuid FROM domain_memberships m JOIN principals p ON p.uuid=m.principal_uuid AND p.state='active' JOIN domains d ON d.uuid=m.domain_uuid AND d.enabled=1 WHERE m.domain_uuid=? AND m.principal_uuid=? AND m.state='active'`, domain, actor).Scan(&membership) + if err == sql.ErrNoRows { + return g, ErrAccessDenied + } + if err != nil { + return g, err + } + var admin bool + err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM groups g JOIN group_members gm ON gm.group_uuid=g.uuid WHERE g.domain_uuid=? AND g.builtin_key='domain_admin' AND g.state='active' AND gm.membership_uuid=? AND gm.member_role IN ('owner','manager'))`, domain, membership).Scan(&admin) + if err != nil { + return g, err + } + var q, street, parent, nodePath, streetPath, quartierPath string + switch kind { + case "domain": + if id != domain { + return g, sql.ErrNoRows + } + case "quartier", "street": + err = tx.QueryRowContext(ctx, `SELECT COALESCE(parent_uuid,''),path_prefix FROM zones WHERE uuid=? AND domain_uuid=? AND kind=? AND state!='archived'`, id, domain, kind).Scan(&parent, &nodePath) + if kind == "quartier" { + q = id + if parent != "" { + return g, ErrGovernanceInvalid + } + } else { + q = parent + street = id + streetPath = nodePath + } + case "spot": + err = tx.QueryRowContext(ctx, `SELECT st.uuid,st.parent_uuid,s.path_prefix,st.path_prefix FROM spots s JOIN street_spots ss ON ss.spot_uuid=s.uuid JOIN zones st ON st.uuid=ss.street_uuid AND st.domain_uuid=s.domain_uuid AND st.kind='street' AND st.state!='archived' WHERE s.uuid=? AND s.domain_uuid=? AND s.state!='archived'`, id, domain).Scan(&street, &q, &nodePath, &streetPath) + default: + return g, ErrGovernanceInvalid + } + if err != nil { + return g, err + } + if q != "" { + if err = tx.QueryRowContext(ctx, `SELECT path_prefix FROM zones WHERE uuid=? AND domain_uuid=? AND kind='quartier' AND state!='archived' AND COALESCE(parent_uuid,'')=''`, q, domain).Scan(&quartierPath); err != nil { + return g, err + } + } + if kind != "domain" && (q == "" || quartierPath == "" || nodePath == "" || (street != "" && (streetPath == "" || !cityPathContains(quartierPath, streetPath))) || (kind == "spot" && !cityPathContains(streetPath, nodePath))) { + return g, ErrGovernanceInvalid + } + var qOwner, own bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM city_owner_bindings WHERE domain_uuid=? AND node_kind='quartier' AND node_uuid=? AND membership_uuid=?), EXISTS(SELECT 1 FROM city_owner_bindings WHERE domain_uuid=? AND node_kind=? AND node_uuid=? AND membership_uuid=?)`, domain, q, membership, domain, kind, id, membership).Scan(&qOwner, &own); err != nil { + return g, err + } + if !admin && !qOwner && !(kind == "spot" && own) { + return g, ErrAccessDenied + } + g.CanAppoint = (kind == "quartier" && admin) || (kind == "spot" && (admin || qOwner)) + g.Chain = []LocalityPolicy{{Kind: "domain", UUID: domain, Policy: "authenticated_acl"}} + if q != "" { + g.Chain = append(g.Chain, LocalityPolicy{Kind: "quartier", UUID: q, Policy: "inherit"}) + } + if street != "" { + g.Chain = append(g.Chain, LocalityPolicy{Kind: "street", UUID: street, Policy: "inherit"}) + } + if kind == "spot" { + g.Chain = append(g.Chain, LocalityPolicy{Kind: "spot", UUID: id, Policy: "inherit"}) + } + for i := range g.Chain { + p := &g.Chain[i] + err = tx.QueryRowContext(ctx, `SELECT policy FROM locality_publication_policies WHERE domain_uuid=? AND node_kind=? AND node_uuid=?`, domain, p.Kind, p.UUID).Scan(&p.Policy) + if err != nil && err != sql.ErrNoRows { + return g, err + } + if p.Policy != "public" && p.Policy != "authenticated_acl" && p.Policy != "inherit" || p.Kind == "domain" && p.Policy == "inherit" { + return g, ErrGovernanceInvalid + } + } + g.Policy = g.Chain[len(g.Chain)-1].Policy + g.SuperiorAllowsPublic, _ = EvaluateLocalityPublication(g.Chain[:len(g.Chain)-1]) + _, g.DraftEffectivePublic = EvaluateLocalityPublication(g.Chain) + if err = tx.QueryRowContext(ctx, `SELECT COALESCE((SELECT version FROM city_governance_epochs WHERE domain_uuid=?),0),COALESCE((SELECT version FROM domain_topology_versions WHERE domain_uuid=?),1)`, domain, domain).Scan(&g.Epoch, &g.TopologyVersion); err != nil { + return g, err + } + if err = tx.QueryRowContext(ctx, `SELECT COALESCE((SELECT version FROM locality_publication_versions WHERE domain_uuid=? AND node_kind=? AND node_uuid=?),0)`, domain, kind, id).Scan(&g.PublicationVersion); err != nil { + return g, err + } + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM locality_publication_manifests m WHERE domain_uuid=? AND node_kind=? AND node_uuid=? AND epoch=? AND topology_version=? AND EXISTS(SELECT 1 FROM locality_publication_entries e WHERE e.domain_uuid=m.domain_uuid AND e.node_kind=m.node_kind AND e.node_uuid=m.node_uuid))`, domain, kind, id, g.Epoch, g.TopologyVersion).Scan(&g.PublicationEnabled); err != nil { + return g, err + } + rows, err := tx.QueryContext(ctx, `SELECT m.uuid,COALESCE((SELECT subject FROM principal_identities WHERE principal_uuid=p.uuid AND provider_type='password' LIMIT 1),p.uuid),p.display_name,(p.state='active' AND m.state='active') FROM city_owner_bindings b JOIN domain_memberships m ON m.uuid=b.membership_uuid AND m.domain_uuid=b.domain_uuid JOIN principals p ON p.uuid=m.principal_uuid WHERE b.domain_uuid=? AND b.node_kind=? AND b.node_uuid=? ORDER BY m.uuid LIMIT 33`, domain, kind, id) + if err != nil { + return g, err + } + defer rows.Close() + for rows.Next() { + var o LocalityOwner + if err = rows.Scan(&o.MembershipUUID, &o.Username, &o.DisplayName, &o.Active); err != nil { + return g, err + } + g.Owners = append(g.Owners, o) + } + if len(g.Owners) > 32 { + return g, ErrGovernanceInvalid + } + return g, rows.Err() +} + +func (s *Store) CityGovernance(ctx context.Context, domain, actor, kind, id string) (CityGovernance, error) { + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + tx, err := s.DB.BeginTx(ctx, &sql.TxOptions{ReadOnly: true}) + if err != nil { + return CityGovernance{}, err + } + defer tx.Rollback() + return governanceSnapshot(ctx, tx, domain, actor, kind, id) +} + +// Candidate lookup exposes only active local display identities, never emails, +// credentials or foreign memberships. It is scoped to appointment authority. +func (s *Store) CityGovernanceMembers(ctx context.Context, domain, actor, kind, id, search string) ([]LocalityOwner, error) { + if len(search) > 80 { + return nil, ErrGovernanceInvalid + } + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + tx, err := s.DB.BeginTx(ctx, &sql.TxOptions{ReadOnly: true}) + if err != nil { + return nil, err + } + defer tx.Rollback() + g, err := governanceSnapshot(ctx, tx, domain, actor, kind, id) + if err != nil { + return nil, err + } + if !g.CanAppoint { + return nil, ErrAccessDenied + } + rows, err := tx.QueryContext(ctx, `SELECT m.uuid,COALESCE((SELECT subject FROM principal_identities WHERE principal_uuid=p.uuid AND provider_type='password' LIMIT 1),p.uuid) username,p.display_name FROM domain_memberships m JOIN principals p ON p.uuid=m.principal_uuid AND p.state='active' WHERE m.domain_uuid=? AND m.state='active' AND (?='' OR instr(lower(p.display_name),?)>0 OR EXISTS(SELECT 1 FROM principal_identities i WHERE i.principal_uuid=p.uuid AND i.provider_type='password' AND instr(lower(i.subject),?)>0)) ORDER BY p.display_name,m.uuid LIMIT 30`, domain, search, strings.ToLower(search), strings.ToLower(search)) + if err != nil { + return nil, err + } + defer rows.Close() + result := []LocalityOwner{} + for rows.Next() { + o := LocalityOwner{Active: true} + if err = rows.Scan(&o.MembershipUUID, &o.Username, &o.DisplayName); err != nil { + return nil, err + } + result = append(result, o) + } + return result, rows.Err() +} + +func (s *Store) ChangeCityGovernance(ctx context.Context, domain, actor, kind, id string, change CityGovernanceChange, preview bool) (CityGovernance, error) { + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return CityGovernance{}, err + } + defer tx.Rollback() + // Reserve the writer before authority reads: revocation cannot commit + // between validation and mutation. Preview rolls back this short reservation. + if _, err = tx.ExecContext(ctx, `INSERT INTO city_governance_epochs(domain_uuid,version) VALUES(?,0) ON CONFLICT(domain_uuid) DO UPDATE SET version=version`, domain); err != nil { + return CityGovernance{}, err + } + g, err := governanceSnapshot(ctx, tx, domain, actor, kind, id) + if err != nil { + return g, err + } + if change.Epoch != g.Epoch || change.TopologyVersion != g.TopologyVersion { + return g, ErrGovernanceConflict + } + before, _ := json.Marshal(g) + if change.Policy == nil && change.Owners == nil { + return g, ErrGovernanceInvalid + } + if change.Policy != nil { + p := *change.Policy + if p != "inherit" && p != "public" && p != "authenticated_acl" || (kind == "domain" && p == "inherit") { + return g, ErrGovernanceInvalid + } + if p == "public" && !g.SuperiorAllowsPublic { + return g, ErrGovernanceCeiling + } + if p != g.Policy && (p == "public" || g.Policy == "authenticated_acl") && !change.ConfirmRelaxation && !preview { + return g, ErrGovernanceConfirm + } + g.Policy = p + g.Chain[len(g.Chain)-1].Policy = p + _, g.DraftEffectivePublic = EvaluateLocalityPublication(g.Chain) + } + if change.Owners != nil { + if !g.CanAppoint { + return g, ErrAccessDenied + } + if len(*change.Owners) > 32 { + return g, ErrGovernanceInvalid + } + seen := map[string]bool{} + proposed := []LocalityOwner{} + for _, member := range *change.Owners { + if seen[member] { + return g, ErrGovernanceInvalid + } + seen[member] = true + o := LocalityOwner{MembershipUUID: member, Active: true} + err = tx.QueryRowContext(ctx, `SELECT COALESCE((SELECT subject FROM principal_identities WHERE principal_uuid=p.uuid AND provider_type='password' LIMIT 1),p.uuid),p.display_name FROM domain_memberships m JOIN principals p ON p.uuid=m.principal_uuid AND p.state='active' WHERE m.uuid=? AND m.domain_uuid=? AND m.state='active'`, member, domain).Scan(&o.Username, &o.DisplayName) + if err == sql.ErrNoRows { + return g, ErrGovernanceInvalid + } + if err != nil { + return g, err + } + proposed = append(proposed, o) + } + g.Owners = proposed + } + if preview { + return g, nil + } + now := time.Now().UnixMilli() + if change.Policy != nil { + if _, err = tx.ExecContext(ctx, `INSERT INTO locality_publication_policies(domain_uuid,node_kind,node_uuid,policy,actor_uuid,updated_at_ms) VALUES(?,?,?,?,?,?) ON CONFLICT(domain_uuid,node_kind,node_uuid) DO UPDATE SET policy=excluded.policy,actor_uuid=excluded.actor_uuid,updated_at_ms=excluded.updated_at_ms`, domain, kind, id, g.Policy, actor, now); err != nil { + return g, err + } + } + if change.Owners != nil { + if _, err = tx.ExecContext(ctx, `DELETE FROM city_owner_bindings WHERE domain_uuid=? AND node_kind=? AND node_uuid=?`, domain, kind, id); err != nil { + return g, err + } + for _, member := range *change.Owners { + if _, err = tx.ExecContext(ctx, `INSERT INTO city_owner_bindings VALUES(?,?,?,?,?,?)`, domain, kind, id, member, actor, now); err != nil { + return g, err + } + } + } + if _, err = tx.ExecContext(ctx, `UPDATE city_governance_epochs SET version=version+1 WHERE domain_uuid=?`, domain); err != nil { + return g, err + } + g, err = governanceSnapshot(ctx, tx, domain, actor, kind, id) + if err != nil { + return g, err + } + after, _ := json.Marshal(g) + if _, err = tx.ExecContext(ctx, `INSERT INTO city_governance_events(domain_uuid,epoch,actor_uuid,node_kind,node_uuid,before_json,after_json,created_at_ms) VALUES(?,?,?,?,?,?,?,?)`, domain, g.Epoch, actor, kind, id, string(before), string(after), now); err != nil { + return g, err + } + return g, tx.Commit() +} diff --git a/internal/store/city_governance_test.go b/internal/store/city_governance_test.go new file mode 100644 index 0000000..8dc3d7b --- /dev/null +++ b/internal/store/city_governance_test.go @@ -0,0 +1,26 @@ +package store + +import "testing" + +func TestLocalityPublicationCeilingIntersection(t *testing.T) { + for _, domain := range []string{"public", "authenticated_acl"} { + for _, q := range []string{"inherit", "public", "authenticated_acl"} { + for _, st := range []string{"inherit", "public", "authenticated_acl"} { + for _, spot := range []string{"inherit", "public", "authenticated_acl"} { + chain := []LocalityPolicy{{Kind: "domain", Policy: domain}, {Kind: "quartier", Policy: q}, {Kind: "street", Policy: st}, {Kind: "spot", Policy: spot}} + allows, published := EvaluateLocalityPublication(chain) + wantCap := domain == "public" && q != "authenticated_acl" && st != "authenticated_acl" && spot != "authenticated_acl" + wantPublic := wantCap && (q == "public" || st == "public" || spot == "public") + if allows != wantCap || published != wantPublic { + t.Fatalf("chain=%+v result=%v,%v", chain, allows, published) + } + } + } + } + } + for _, policy := range []string{"inherit", "invalid", ""} { + if allows, published := EvaluateLocalityPublication([]LocalityPolicy{{Kind: "domain", Policy: policy}, {Kind: "spot", Policy: "public"}}); allows || published { + t.Fatal("invalid Domain policy failed open") + } + } +} diff --git a/internal/store/city_operations.go b/internal/store/city_operations.go new file mode 100644 index 0000000..eb8dc08 --- /dev/null +++ b/internal/store/city_operations.go @@ -0,0 +1,159 @@ +package store + +import ( + "context" + "database/sql" + "errors" + "time" +) + +// CityHealth is a cheap, synchronous topology summary. Expensive content and +// link checks are intentionally left to scheduler jobs; navigation must not +// wait for them. +type CityHealth struct { + DomainUUID string `json:"domain_uuid"` + TopologyVersion int64 `json:"topology_version"` + Quartiers int `json:"quartiers"` + Streets int `json:"streets"` + Spots int `json:"spots"` + EmptySpots int `json:"empty_spots"` + UnconsolidatedPages int `json:"unconsolidated_pages"` + OrphanPages int `json:"orphan_pages"` + BrokenRelations int `json:"broken_relations"` + GeneratedAtMS int64 `json:"generated_at_ms"` +} + +type TopologyEvent struct { + ID int64 `json:"id"` + DomainUUID string `json:"domain_uuid"` + TopologyVersion int64 `json:"topology_version"` + ActorPrincipalUUID string `json:"actor_principal_uuid"` + Operation string `json:"operation"` + TargetType string `json:"target_type"` + TargetUUID string `json:"target_uuid"` + BeforeJSON string `json:"before_json"` + AfterJSON string `json:"after_json"` + RequestID string `json:"request_id"` + CreatedAtMS int64 `json:"created_at_ms"` +} + +type CityPathContext struct { + Quartier *CityNodeDetail `json:"quartier,omitempty"` + Street *CityNodeDetail `json:"street,omitempty"` + Spot *CityNodeDetail `json:"spot,omitempty"` +} + +func (s *Store) GetCityHealth(domainUUID string) (CityHealth, error) { + health := CityHealth{DomainUUID: domainUUID, TopologyVersion: 1, GeneratedAtMS: time.Now().UnixMilli()} + ctx, cancel := context.WithTimeout(context.Background(), cityReadTimeout) + defer cancel() + tx, err := s.DB.BeginTx(ctx, &sql.TxOptions{ReadOnly: true}) + if err != nil { + return health, err + } + defer tx.Rollback() + if err := tx.QueryRowContext(ctx, `SELECT version FROM domain_topology_versions WHERE domain_uuid=?`, domainUUID).Scan(&health.TopologyVersion); err != nil && !errors.Is(err, sql.ErrNoRows) { + return health, err + } + queries := []struct { + target *int + query string + args []any + }{ + {&health.Quartiers, `SELECT COUNT(*) FROM zones WHERE domain_uuid=? AND kind='quartier' AND state!='archived'`, []any{domainUUID}}, + {&health.Streets, `SELECT COUNT(*) FROM zones WHERE domain_uuid=? AND kind='street' AND state!='archived'`, []any{domainUUID}}, + {&health.Spots, `SELECT COUNT(*) FROM spots WHERE domain_uuid=? AND state!='archived'`, []any{domainUUID}}, + {&health.EmptySpots, `SELECT COUNT(*) FROM spots s WHERE s.domain_uuid=? AND s.state!='archived' AND NOT EXISTS(SELECT 1 FROM spot_pages sp JOIN paths p ON p.object_uuid=sp.page_uuid AND p.domain_uuid=s.domain_uuid WHERE sp.spot_uuid=s.uuid) AND NOT EXISTS(SELECT 1 FROM paths p WHERE p.domain_uuid=s.domain_uuid AND ` + cityPathScopeSQL("s.path_prefix", "p.path") + `)`, []any{domainUUID}}, + {&health.UnconsolidatedPages, `SELECT COUNT(DISTINCT p.object_uuid) FROM paths p JOIN zones st ON st.domain_uuid=p.domain_uuid AND st.kind='street' AND st.state!='archived' AND ` + cityPathScopeSQL("st.path_prefix", "p.path") + ` WHERE p.domain_uuid=? AND NOT EXISTS(SELECT 1 FROM spots s JOIN street_spots ss ON ss.spot_uuid=s.uuid AND ss.street_uuid=st.uuid WHERE s.domain_uuid=st.domain_uuid AND s.state!='archived' AND ` + cityPathScopeSQL("s.path_prefix", "p.path") + `)`, []any{domainUUID}}, + {&health.OrphanPages, `SELECT COUNT(DISTINCT p.object_uuid) FROM paths p WHERE p.domain_uuid=? AND NOT ` + cityPathScopeSQL("'/u'", "p.path") + ` AND NOT EXISTS(SELECT 1 FROM spot_pages sp JOIN spots s ON s.uuid=sp.spot_uuid AND s.domain_uuid=p.domain_uuid AND s.state!='archived' WHERE sp.page_uuid=p.object_uuid) AND NOT EXISTS(SELECT 1 FROM spots s WHERE s.domain_uuid=p.domain_uuid AND s.state!='archived' AND ` + cityPathScopeSQL("s.path_prefix", "p.path") + `)`, []any{domainUUID}}, + {&health.BrokenRelations, `SELECT COUNT(*) FROM spot_relations r JOIN spots source ON source.uuid=r.source_spot_uuid AND source.domain_uuid=? WHERE source.state!='archived' AND NOT EXISTS(SELECT 1 FROM spots target WHERE target.uuid=r.target_spot_uuid AND target.domain_uuid=? AND target.state!='archived')`, []any{domainUUID, domainUUID}}, + } + for _, item := range queries { + if err := tx.QueryRowContext(ctx, item.query, item.args...).Scan(item.target); err != nil { + return health, err + } + } + return health, nil +} + +func (s *Store) ListTopologyEvents(domainUUID string, afterVersion int64, limit int) ([]TopologyEvent, error) { + if limit < 1 { + limit = 50 + } + if limit > 200 { + limit = 200 + } + rows, err := s.DB.Query(`SELECT id,domain_uuid,topology_version,actor_principal_uuid,operation,target_type,target_uuid,before_json,after_json,request_id,created_at_ms FROM topology_events WHERE domain_uuid=? AND topology_version>? ORDER BY topology_version DESC,id DESC LIMIT ?`, domainUUID, afterVersion, limit) + if err != nil { + return nil, err + } + defer rows.Close() + events := []TopologyEvent{} + for rows.Next() { + var event TopologyEvent + if err := rows.Scan(&event.ID, &event.DomainUUID, &event.TopologyVersion, &event.ActorPrincipalUUID, &event.Operation, &event.TargetType, &event.TargetUUID, &event.BeforeJSON, &event.AfterJSON, &event.RequestID, &event.CreatedAtMS); err != nil { + return nil, err + } + events = append(events, event) + } + return events, rows.Err() +} + +func (s *Store) ResolveCityLocalityPath(domainUUID, kind, id string) (string, error) { + return s.ResolveCityLocalityPathContext(context.Background(), domainUUID, kind, id) +} + +func (s *Store) ResolveCityLocalityPathContext(ctx context.Context, domainUUID, kind, id string) (string, error) { + if kind == "domain" || kind == "" { + return "/", nil + } + node, err := s.CityNodeContext(ctx, domainUUID, kind, id) + if err != nil { + return "", err + } + return node.PathPrefix, nil +} + +func (s *Store) ResolveCityPathContext(domainUUID, path string) (CityPathContext, error) { + return s.ResolveCityPathContextWithContext(context.Background(), domainUUID, path) +} + +func (s *Store) ResolveCityPathContextWithContext(parent context.Context, domainUUID, path string) (CityPathContext, error) { + path = normalizePath(path) + result := CityPathContext{} + ctx, cancel := context.WithTimeout(parent, cityReadTimeout) + defer cancel() + tx, err := s.DB.BeginTx(ctx, &sql.TxOptions{ReadOnly: true}) + if err != nil { + return result, err + } + defer tx.Rollback() + var q CityNodeDetail + err = tx.QueryRowContext(ctx, `SELECT uuid,domain_uuid,kind,COALESCE(parent_uuid,''),name,title,description,state,path_prefix,sort_key,version FROM zones CROSS JOIN (SELECT ? AS candidate) input WHERE domain_uuid=? AND kind='quartier' AND state!='archived' AND `+cityPathScopeSQL("path_prefix", "input.candidate")+` ORDER BY length(path_prefix) DESC,uuid LIMIT 1`, path, domainUUID).Scan(&q.UUID, &q.DomainUUID, &q.Kind, &q.ParentUUID, &q.Name, &q.Title, &q.Description, &q.State, &q.PathPrefix, &q.SortKey, &q.Version) + if err != nil && err != sql.ErrNoRows { + return result, err + } + if err == sql.ErrNoRows { + return result, nil + } + result.Quartier = &q + var street CityNodeDetail + err = tx.QueryRowContext(ctx, `SELECT uuid,domain_uuid,kind,COALESCE(parent_uuid,''),name,title,description,state,path_prefix,sort_key,version FROM zones CROSS JOIN (SELECT ? AS candidate) input WHERE domain_uuid=? AND kind='street' AND parent_uuid=? AND state!='archived' AND `+cityPathScopeSQL("path_prefix", "input.candidate")+` ORDER BY length(path_prefix) DESC,uuid LIMIT 1`, path, domainUUID, q.UUID).Scan(&street.UUID, &street.DomainUUID, &street.Kind, &street.ParentUUID, &street.Name, &street.Title, &street.Description, &street.State, &street.PathPrefix, &street.SortKey, &street.Version) + if err != nil && err != sql.ErrNoRows { + return result, err + } + if err == sql.ErrNoRows { + return result, nil + } + result.Street = &street + var spot CityNodeDetail + err = tx.QueryRowContext(ctx, `SELECT s.uuid,s.domain_uuid,'spot','',s.name,s.title,s.summary,s.state,s.path_prefix,ss.sort_key,s.version FROM spots s JOIN street_spots ss ON ss.spot_uuid=s.uuid CROSS JOIN (SELECT ? AS candidate) input WHERE s.domain_uuid=? AND ss.street_uuid=? AND s.state!='archived' AND `+cityPathScopeSQL("s.path_prefix", "input.candidate")+` ORDER BY length(s.path_prefix) DESC,s.uuid LIMIT 1`, path, domainUUID, street.UUID).Scan(&spot.UUID, &spot.DomainUUID, &spot.Kind, &spot.ParentUUID, &spot.Name, &spot.Title, &spot.Description, &spot.State, &spot.PathPrefix, &spot.SortKey, &spot.Version) + if err != nil && err != sql.ErrNoRows { + return result, err + } + if err == nil { + spot.ParentUUID = street.UUID + result.Spot = &spot + } + return result, nil +} diff --git a/internal/store/city_operations_test.go b/internal/store/city_operations_test.go new file mode 100644 index 0000000..b1f914b --- /dev/null +++ b/internal/store/city_operations_test.go @@ -0,0 +1,63 @@ +package store + +import ( + "context" + "database/sql" + "errors" + "testing" + + _ "modernc.org/sqlite" +) + +func TestCityHealthAndTopologyEventsAreDomainScoped(t *testing.T) { + db, err := sql.Open("sqlite", "file:city-operations-test?mode=memory&cache=shared") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = db.Close() }) + st := &Store{DB: db} + ctx, cancel := context.WithCancel(context.Background()) + cancel() + if _, err := st.ResolveCityPathContextWithContext(ctx, "d1", "/life"); !errors.Is(err, context.Canceled) { + t.Fatalf("cancelled locality read: %v", err) + } + if err := st.EnsureCitySchema(); err != nil { + t.Fatal(err) + } + if _, err := db.Exec(`CREATE TABLE paths(domain_uuid TEXT,path TEXT,object_uuid TEXT,is_primary INTEGER DEFAULT 0)`); err != nil { + t.Fatal(err) + } + q, err := st.CreateZoneAtPath("d1", "actor", "quartier", "", "life", "Life", "", "/life") + if err != nil { + t.Fatal(err) + } + street, err := st.CreateZoneAtPath("d1", "actor", "street", q, "home", "Home", "", "/life/home") + if err != nil { + t.Fatal(err) + } + if _, err := st.CreateSpotAtPath("d1", "actor", street, "kitchen", "Kitchen", "", "/life/home/kitchen"); err != nil { + t.Fatal(err) + } + if _, err := st.CreateZoneAtPath("d2", "actor2", "quartier", "", "work", "Work", "", "/work"); err != nil { + t.Fatal(err) + } + health, err := st.GetCityHealth("d1") + if err != nil { + t.Fatal(err) + } + if health.Quartiers != 1 || health.Streets != 1 || health.Spots != 1 || health.EmptySpots != 1 { + t.Fatalf("unexpected health: %+v", health) + } + events, err := st.ListTopologyEvents("d1", 0, 20) + if err != nil { + t.Fatal(err) + } + if len(events) != 3 { + t.Fatalf("events=%d, want 3", len(events)) + } + for _, event := range events { + if event.DomainUUID != "d1" { + t.Fatalf("cross-domain event leaked: %+v", event) + } + } +} diff --git a/internal/store/city_organize.go b/internal/store/city_organize.go new file mode 100644 index 0000000..5ba6be8 --- /dev/null +++ b/internal/store/city_organize.go @@ -0,0 +1,375 @@ +package store + +import ( + "database/sql" + "encoding/json" + "errors" + "fmt" + "path" + "strings" + "time" + "unicode/utf8" + + "github.com/google/uuid" +) + +var ErrCityChanged = errors.New("city_changed") + +type CityPageSelection struct { + SpotUUID string `json:"spot_uuid"` + PageUUID string `json:"page_uuid"` +} +type CityNewSpot struct { + StreetUUID string `json:"street_uuid"` + Name string `json:"name"` + Title string `json:"title"` + PathPrefix string `json:"path_prefix"` +} +type CityOrganizeRequest struct { + BaseVersion int64 `json:"base_version"` + Action string `json:"action"` // merge or move; neither moves document URLs + Spots []string `json:"spots"` + Pages []CityPageSelection `json:"pages"` + TargetSpotUUID string `json:"target_spot_uuid"` + NewSpot *CityNewSpot `json:"new_spot,omitempty"` + StreetUUID string `json:"street_uuid,omitempty"` + PathPrefix string `json:"path_prefix,omitempty"` // optional single-Spot move boundary +} +type CityOrganizeResult struct { + TargetSpotUUID string `json:"target_spot_uuid"` + Pages int `json:"pages"` +} + +func checkCityVersion(tx *sql.Tx, domain string, expected int64) error { + var version int64 = 1 + err := tx.QueryRow(`SELECT version FROM domain_topology_versions WHERE domain_uuid=?`, domain).Scan(&version) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return err + } + if expected < 1 || expected != version { + return ErrCityChanged + } + return nil +} + +func recordCityOrganize(tx *sql.Tx, domain, actor, operation, kind, id string, before, after any) error { + if err := bumpTopologyVersion(tx, domain, actor, operation, kind, id); err != nil { + return err + } + b, err := json.Marshal(before) + if err != nil { + return err + } + a, err := json.Marshal(after) + if err != nil { + return err + } + _, err = tx.Exec(`UPDATE topology_events SET before_json=?,after_json=? WHERE domain_uuid=? AND topology_version=(SELECT version FROM domain_topology_versions WHERE domain_uuid=?)`, string(b), string(a), domain, domain) + return err +} + +// RenameCityTitle changes only the display title. UUIDs, name routes and Paths +// deliberately remain stable; renaming document URLs is a separate operation. +func (s *Store) RenameCityTitle(domain, actor, kind, id, title string, baseVersion int64) error { + title = strings.TrimSpace(title) + if title == "" || utf8.RuneCountInString(title) > 160 { + return errors.New("city_invalid_title") + } + if kind != "quartier" && kind != "street" && kind != "spot" { + return errors.New("city_invalid_selection") + } + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + if err = checkCityVersion(tx, domain, baseVersion); err != nil { + return err + } + table, condition := "zones", " AND kind=?" + args := []any{id, domain, kind} + if kind == "spot" { + table, condition, args = "spots", "", []any{id, domain} + } + var old string + if err = tx.QueryRow(`SELECT title FROM `+table+` WHERE uuid=? AND domain_uuid=? AND state!='archived'`+condition, args...).Scan(&old); err != nil { + return err + } + if old == title { + return nil + } + if _, err = tx.Exec(`UPDATE `+table+` SET title=?,version=version+1,updated_at_ms=? WHERE uuid=? AND domain_uuid=?`, title, time.Now().UnixMilli(), id, domain); err != nil { + return err + } + if err = recordCityOrganize(tx, domain, actor, "city.title.changed", kind, id, map[string]string{"title": old}, map[string]string{"title": title}); err != nil { + return err + } + return tx.Commit() +} + +func activeCitySpot(tx *sql.Tx, domain, id string) error { + var found int + return tx.QueryRow(`SELECT 1 FROM spots s JOIN street_spots ss ON ss.spot_uuid=s.uuid JOIN zones z ON z.uuid=ss.street_uuid AND z.domain_uuid=s.domain_uuid AND z.kind='street' AND z.state!='archived' WHERE s.uuid=? AND s.domain_uuid=? AND s.state!='archived'`, id, domain).Scan(&found) +} + +// OrganizeCity changes City membership only, atomically. Document Paths, +// revisions and payloads are never renamed or removed by this operation. +func (s *Store) OrganizeCity(domain, actor string, req CityOrganizeRequest) (CityOrganizeResult, error) { + out := CityOrganizeResult{} + if len(req.Spots)+len(req.Pages) == 0 || len(req.Spots)+len(req.Pages) > 200 || (req.Action != "merge" && req.Action != "move") { + return out, errors.New("city_invalid_selection") + } + if req.Action == "merge" && ((req.TargetSpotUUID == "") == (req.NewSpot == nil)) { + return out, errors.New("city_invalid_target") + } + if req.Action == "move" && (len(req.Pages) > 0 || req.StreetUUID == "" || req.NewSpot != nil || req.TargetSpotUUID != "" || (req.PathPrefix != "" && len(req.Spots) != 1)) { + return out, errors.New("city_invalid_target") + } + tx, err := s.DB.Begin() + if err != nil { + return out, err + } + defer tx.Rollback() + if err = checkCityVersion(tx, domain, req.BaseVersion); err != nil { + return out, err + } + whole := map[string]bool{} + selected := map[string]map[string]bool{} + for _, id := range req.Spots { + if id == "" || whole[id] { + return out, errors.New("city_invalid_selection") + } + whole[id] = true + selected[id] = nil + } + for _, p := range req.Pages { + if p.PageUUID == "" || p.SpotUUID == "" || whole[p.SpotUUID] { + return out, errors.New("city_invalid_selection") + } + if selected[p.SpotUUID] == nil { + selected[p.SpotUUID] = map[string]bool{} + } + selected[p.SpotUUID][p.PageUUID] = true + } + if whole[req.TargetSpotUUID] || selected[req.TargetSpotUUID] != nil { + return out, errors.New("city_invalid_target") + } + // Bound expansion as well as selection count. No truncated merge is applied. + placements := map[string][]CityPagePlacement{} + sourceBoundaries := map[string]map[string]string{} + uniquePages := map[string]bool{} + total := 0 + for id, pages := range selected { + if err = activeCitySpot(tx, domain, id); err != nil { + return out, err + } + var oldPath, oldStreet string + if err = tx.QueryRow(`SELECT s.path_prefix,ss.street_uuid FROM spots s JOIN street_spots ss ON ss.spot_uuid=s.uuid WHERE s.uuid=? AND s.domain_uuid=?`, id, domain).Scan(&oldPath, &oldStreet); err != nil { + return out, err + } + sourceBoundaries[id] = map[string]string{"path_prefix": oldPath, "street_uuid": oldStreet} + items, e := listSpotPages(tx, domain, id, 2001) + if e != nil { + return out, e + } + if len(items) > 2000 { + return out, errors.New("city_too_many_pages") + } + found := map[string]bool{} + for _, item := range items { + if !whole[id] && !pages[item.PageUUID] { + continue + } + if item.Path == "" { + return out, errors.New("city_invalid_selection") + } + placements[id] = append(placements[id], item) + found[item.PageUUID] = true + uniquePages[item.PageUUID] = true + total++ + } + if total > 2000 { + return out, errors.New("city_too_many_pages") + } + for page := range pages { + if !found[page] { + return out, errors.New("city_invalid_selection") + } + } + } + out.Pages = len(uniquePages) + now := time.Now().UnixMilli() + if req.Action == "move" { + var streetPath string + if err = tx.QueryRow(`SELECT path_prefix FROM zones WHERE uuid=? AND domain_uuid=? AND kind='street' AND state!='archived'`, req.StreetUUID, domain).Scan(&streetPath); err != nil { + return out, err + } + boundaries, e := loadCityBoundaries(tx, domain) + if e != nil { + return out, e + } + for i := range boundaries { + if whole[boundaries[i].id] { + boundaries[i].parent = req.StreetUUID + boundaries[i].path = normalizePath(streetPath + "/" + path.Base(boundaries[i].path)) + if req.PathPrefix != "" { + boundaries[i].path = normalizePath(req.PathPrefix) + } + } + } + if err = validateCityBoundaryChanges(boundaries, whole); err != nil { + return out, err + } + for _, b := range boundaries { + if whole[b.id] { + if _, err = tx.Exec(`UPDATE spots SET path_prefix=?,version=version+1,updated_at_ms=? WHERE uuid=? AND domain_uuid=?`, b.path, now, b.id, domain); err != nil { + return out, err + } + if _, err = tx.Exec(`UPDATE street_spots SET street_uuid=? WHERE spot_uuid=?`, req.StreetUUID, b.id); err != nil { + return out, err + } + } + } + } else { + out.TargetSpotUUID = req.TargetSpotUUID + if req.NewSpot != nil { + n := req.NewSpot + name, e := normalizeCityName(n.Name) + if e != nil { + return out, e + } + if strings.TrimSpace(n.Title) == "" || utf8.RuneCountInString(n.Title) > 160 || strings.TrimSpace(n.PathPrefix) == "" { + return out, errors.New("city_invalid_title") + } + boundaries, e := loadCityBoundaries(tx, domain) + if e != nil { + return out, e + } + // Sources will be archived in this same transaction, so their old + // boundaries need not conflict with a replacement's boundary. + kept := boundaries[:0] + for _, b := range boundaries { + if !whole[b.id] { + kept = append(kept, b) + } + } + id := uuid.NewString() + kept = append(kept, cityPathBoundary{id: id, kind: "spot", parent: n.StreetUUID, path: normalizePath(n.PathPrefix)}) + if err = validateCityBoundaryChanges(kept, map[string]bool{id: true}); err != nil { + return out, err + } + var collision int + if err = tx.QueryRow(`SELECT COUNT(*) FROM spots WHERE domain_uuid=? AND name=?`, domain, name).Scan(&collision); err != nil { + return out, err + } + if collision != 0 { + return out, errors.New("city_name_conflict") + } + if _, err = tx.Exec(`INSERT INTO spots(uuid,domain_uuid,name,title,path_prefix,state,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,'draft',?,?)`, id, domain, name, strings.TrimSpace(n.Title), normalizePath(n.PathPrefix), now, now); err != nil { + return out, err + } + if _, err = tx.Exec(`INSERT INTO street_spots(street_uuid,spot_uuid,created_at_ms) VALUES(?,?,?)`, n.StreetUUID, id, now); err != nil { + return out, err + } + out.TargetSpotUUID = id + } else if err = activeCitySpot(tx, domain, out.TargetSpotUUID); err != nil { + return out, err + } + } + for source, items := range placements { + dest := out.TargetSpotUUID + if req.Action == "move" { + dest = source + } + for _, item := range items { + edge := item.EdgeType + if edge == "path" { + edge = "primary" + } + if _, err = tx.Exec(`INSERT INTO spot_pages(spot_uuid,page_uuid,edge_type,label,sort_key,featured,source,created_at_ms) VALUES(?,?,?,?,?,?,'organizer',?) ON CONFLICT(spot_uuid,page_uuid,edge_type) DO UPDATE SET label=CASE WHEN spot_pages.label='' THEN excluded.label ELSE spot_pages.label END,featured=MAX(spot_pages.featured,excluded.featured)`, dest, item.PageUUID, edge, item.Label, item.SortKey, item.Featured, now); err != nil { + return out, err + } + if _, err = tx.Exec(`INSERT INTO city_page_overrides(domain_uuid,page_uuid,spot_uuid) VALUES(?,?,?) ON CONFLICT(domain_uuid,page_uuid) DO UPDATE SET spot_uuid=excluded.spot_uuid`, domain, item.PageUUID, dest); err != nil { + return out, err + } + if req.Action == "merge" && !whole[source] { + if _, err = tx.Exec(`DELETE FROM spot_pages WHERE spot_uuid=? AND page_uuid=?`, source, item.PageUUID); err != nil { + return out, err + } + } + } + } + if req.Action == "merge" && len(whole) > 0 { + // Redirect graph relations in one pass; internal/self edges disappear, + // duplicate relations retain the greater weight. No unrelated edges change. + placeholders := strings.TrimSuffix(strings.Repeat("?,", len(req.Spots)), ",") + args := []any{domain, domain} + for _, id := range req.Spots { + args = append(args, id) + } + for _, id := range req.Spots { + args = append(args, id) + } + rows, e := tx.Query(`SELECT r.source_spot_uuid,r.target_spot_uuid,r.relation_type,r.weight FROM spot_relations r JOIN spots a ON a.uuid=r.source_spot_uuid JOIN spots b ON b.uuid=r.target_spot_uuid WHERE a.domain_uuid=? AND b.domain_uuid=? AND (r.source_spot_uuid IN (`+placeholders+`) OR r.target_spot_uuid IN (`+placeholders+`)) LIMIT 2001`, args...) + if e != nil { + return out, e + } + relations := []CitySpotRelation{} + for rows.Next() { + var r CitySpotRelation + if e = rows.Scan(&r.SourceSpotUUID, &r.TargetSpotUUID, &r.RelationType, &r.Weight); e != nil { + rows.Close() + return out, e + } + if whole[r.SourceSpotUUID] || whole[r.TargetSpotUUID] { + relations = append(relations, r) + } + } + e = rows.Err() + rows.Close() + if e != nil { + return out, e + } + if len(relations) > 2000 { + return out, errors.New("city_too_many_relations") + } + for _, r := range relations { + if _, err = tx.Exec(`DELETE FROM spot_relations WHERE source_spot_uuid=? AND target_spot_uuid=? AND relation_type=?`, r.SourceSpotUUID, r.TargetSpotUUID, r.RelationType); err != nil { + return out, err + } + } + for _, r := range relations { + if whole[r.SourceSpotUUID] { + r.SourceSpotUUID = out.TargetSpotUUID + } + if whole[r.TargetSpotUUID] { + r.TargetSpotUUID = out.TargetSpotUUID + } + if r.SourceSpotUUID == r.TargetSpotUUID { + continue + } + if _, err = tx.Exec(`INSERT INTO spot_relations(source_spot_uuid,target_spot_uuid,relation_type,weight,created_at_ms) VALUES(?,?,?,?,?) ON CONFLICT(source_spot_uuid,target_spot_uuid,relation_type) DO UPDATE SET weight=MAX(spot_relations.weight,excluded.weight)`, r.SourceSpotUUID, r.TargetSpotUUID, r.RelationType, r.Weight, now); err != nil { + return out, err + } + } + for id := range whole { + if _, err = tx.Exec(`UPDATE spots SET state='archived',version=version+1,updated_at_ms=? WHERE uuid=? AND domain_uuid=?`, now, id, domain); err != nil { + return out, err + } + if _, err = tx.Exec(`DELETE FROM street_spots WHERE spot_uuid=?`, id); err != nil { + return out, err + } + if _, err = tx.Exec(`DELETE FROM spot_pages WHERE spot_uuid=?`, id); err != nil { + return out, err + } + // Includes earlier manual placements whose Page has since disappeared. + if _, err = tx.Exec(`UPDATE city_page_overrides SET spot_uuid=? WHERE domain_uuid=? AND spot_uuid=?`, out.TargetSpotUUID, domain, id); err != nil { + return out, err + } + } + } + if err = recordCityOrganize(tx, domain, actor, "city.organize."+req.Action, "spot", out.TargetSpotUUID, map[string]any{"request": req, "placements": placements, "boundaries": sourceBoundaries}, out); err != nil { + return out, fmt.Errorf("record City operation: %w", err) + } + return out, tx.Commit() +} diff --git a/internal/store/city_organize_test.go b/internal/store/city_organize_test.go new file mode 100644 index 0000000..553f5ee --- /dev/null +++ b/internal/store/city_organize_test.go @@ -0,0 +1,223 @@ +package store + +import ( + "database/sql" + "errors" + "path/filepath" + "testing" +) + +func cityOrganizeFixture(t *testing.T) (*Store, string, string, string, string) { + t.Helper() + db, err := sql.Open("sqlite", filepath.Join(t.TempDir(), "city.db")) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { db.Close() }) + s := &Store{DB: db} + if err = s.EnsureCitySchema(); err != nil { + t.Fatal(err) + } + if _, err = db.Exec(`CREATE TABLE paths(domain_uuid TEXT,path TEXT,object_uuid TEXT,is_primary INTEGER DEFAULT 0); INSERT INTO paths VALUES('d','/life/home/one/page','p1',1),('d','/life/home/two/page','p2',1),('d','/life/home/readme','p3',1),('other','/private','secret',1)`); err != nil { + t.Fatal(err) + } + q, err := s.CreateZoneAtPath("d", "actor", "quartier", "", "life", "Life", "", "/life") + if err != nil { + t.Fatal(err) + } + home, err := s.CreateZoneAtPath("d", "actor", "street", q, "home", "Home", "", "/life/home") + if err != nil { + t.Fatal(err) + } + work, err := s.CreateZoneAtPath("d", "actor", "street", q, "work", "Work", "", "/life/work") + if err != nil { + t.Fatal(err) + } + one, err := s.CreateSpotAtPath("d", "actor", home, "one", "One", "", "/life/home/one") + if err != nil { + t.Fatal(err) + } + two, err := s.CreateSpotAtPath("d", "actor", home, "two", "Two", "", "/life/home/two") + if err != nil { + t.Fatal(err) + } + target, err := s.CreateSpotAtPath("d", "actor", work, "target", "Target", "", "/life/work/target") + if err != nil { + t.Fatal(err) + } + return s, one, two, target, work +} +func cityTestVersion(t *testing.T, s *Store) int64 { + t.Helper() + var version int64 + if err := s.DB.QueryRow(`SELECT version FROM domain_topology_versions WHERE domain_uuid='d'`).Scan(&version); err != nil { + t.Fatal(err) + } + return version +} + +func TestCityRenameTitlePreservesIdentityAndChecksVersion(t *testing.T) { + s, one, _, _, _ := cityOrganizeFixture(t) + v := cityTestVersion(t, s) + if err := s.RenameCityTitle("d", "actor", "spot", one, "新しい表示名", v); err != nil { + t.Fatal(err) + } + n, err := s.CityNode("d", "spot", "one") + if err != nil || n.Title != "新しい表示名" || n.UUID != one || n.PathPrefix != "/life/home/one" { + t.Fatalf("%+v %v", n, err) + } + if err = s.RenameCityTitle("d", "actor", "spot", one, "stale", v); !errors.Is(err, ErrCityChanged) { + t.Fatalf("stale: %v", err) + } + v = cityTestVersion(t, s) + if err = s.RenameCityTitle("d", "actor", "spot", one, "新しい表示名", v); err != nil || cityTestVersion(t, s) != v { + t.Fatalf("no-op: %v", err) + } + if err = s.RenameCityTitle("other", "actor", "spot", one, "wrong domain", 1); err == nil { + t.Fatal("cross-domain rename") + } +} + +func TestCityMergePreservesPagesAndRelationsAtomically(t *testing.T) { + s, one, two, target, work := cityOrganizeFixture(t) + third, err := s.CreateSpotAtPath("d", "actor", work, "third", "Third", "", "/life/work/third") + if err != nil { + t.Fatal(err) + } + for _, edge := range [][2]string{{one, two}, {one, third}, {two, third}, {third, two}} { + if err = s.AddSpotRelation("d", "actor", edge[0], edge[1], "related"); err != nil { + t.Fatal(err) + } + } + v := cityTestVersion(t, s) + out, err := s.OrganizeCity("d", "actor", CityOrganizeRequest{BaseVersion: v, Action: "merge", Spots: []string{one, two}, TargetSpotUUID: target}) + if err != nil || out.Pages != 2 || out.TargetSpotUUID != target { + t.Fatalf("%+v %v", out, err) + } + if cityTestVersion(t, s) != v+1 { + t.Fatal("merge must have a single topology commit") + } + pages, err := s.ListSpotPages("d", target) + if err != nil || len(pages) != 2 { + t.Fatalf("pages=%+v %v", pages, err) + } + for _, p := range pages { + if p.Path != "/life/home/one/page" && p.Path != "/life/home/two/page" { + t.Fatalf("URL moved: %+v", p) + } + } + var archived, relations, self, paths int + s.DB.QueryRow(`SELECT COUNT(*) FROM spots WHERE state='archived'`).Scan(&archived) + s.DB.QueryRow(`SELECT COUNT(*) FROM spot_relations`).Scan(&relations) + s.DB.QueryRow(`SELECT COUNT(*) FROM spot_relations WHERE source_spot_uuid=target_spot_uuid`).Scan(&self) + s.DB.QueryRow(`SELECT COUNT(*) FROM paths`).Scan(&paths) + if archived != 2 || relations != 2 || self != 0 || paths != 4 { + t.Fatalf("archived=%d relations=%d self=%d paths=%d", archived, relations, self, paths) + } + if _, err = s.OrganizeCity("d", "actor", CityOrganizeRequest{BaseVersion: v, Action: "merge", Spots: []string{one, two}, TargetSpotUUID: target}); !errors.Is(err, ErrCityChanged) { + t.Fatal("repeat must not reapply", err) + } +} + +func TestCityCreateFromUndefinedAndRejectInvalidSelection(t *testing.T) { + s, one, _, _, work := cityOrganizeFixture(t) + var home string + s.DB.QueryRow(`SELECT street_uuid FROM street_spots WHERE spot_uuid=?`, one).Scan(&home) + undefined, err := s.CreateSpotAtPath("d", "actor", home, "home-undefined", "Undefined", "", "/life/home/_undefined") + if err != nil { + t.Fatal(err) + } + if err = s.AddSpotPage("d", "actor", undefined, "p3", "", "primary", "Readme"); err != nil { + t.Fatal(err) + } + v := cityTestVersion(t, s) + req := CityOrganizeRequest{BaseVersion: v, Action: "merge", Pages: []CityPageSelection{{undefined, "p3"}}, NewSpot: &CityNewSpot{StreetUUID: work, Name: "collected", Title: "Collected", PathPrefix: "/life/work/collected"}} + bad := req + bad.Pages = []CityPageSelection{{undefined, "secret"}} + if _, err = s.OrganizeCity("d", "actor", bad); err == nil { + t.Fatal("accepted a Page outside selection/domain") + } + if cityTestVersion(t, s) != v { + t.Fatal("failed mutation changed version") + } + out, err := s.OrganizeCity("d", "actor", req) + if err != nil { + t.Fatal(err) + } + pages, err := s.ListSpotPages("d", out.TargetSpotUUID) + if err != nil || len(pages) != 1 || pages[0].Path != "/life/home/readme" { + t.Fatalf("%+v %v", pages, err) + } + left, err := s.ListSpotPages("d", undefined) + if err != nil || len(left) != 0 { + t.Fatalf("source still has moved Page: %+v %v", left, err) + } + var ov string + s.DB.QueryRow(`SELECT spot_uuid FROM city_page_overrides WHERE domain_uuid='d' AND page_uuid='p3'`).Scan(&ov) + if ov != out.TargetSpotUUID { + t.Fatal("missing manual inference override") + } +} + +func TestCityMovePreservesUUIDAndInferredMembers(t *testing.T) { + s, one, two, _, work := cityOrganizeFixture(t) + out, err := s.OrganizeCity("d", "actor", CityOrganizeRequest{BaseVersion: cityTestVersion(t, s), Action: "move", Spots: []string{one, two}, StreetUUID: work}) + if err != nil || out.Pages != 2 { + t.Fatalf("%+v %v", out, err) + } + for _, id := range []string{one, two} { + n, err := s.CityNode("d", "spot", "uuid:"+id) + if err != nil || !cityPathContains("/life/work", n.PathPrefix) { + t.Fatalf("%+v %v", n, err) + } + pages, err := s.ListSpotPages("d", id) + if err != nil || len(pages) != 1 || !cityPathContains("/life/home", pages[0].Path) { + t.Fatalf("lost old membership: %+v %v", pages, err) + } + } +} + +func TestCityOrganizeRollbackOnBoundaryAndCrossDomainErrors(t *testing.T) { + s, one, two, target, work := cityOrganizeFixture(t) + v := cityTestVersion(t, s) + requests := []CityOrganizeRequest{ + {Action: "merge", Spots: []string{one}, TargetSpotUUID: one}, + {Action: "merge", Spots: []string{one, "absent"}, TargetSpotUUID: target}, + {Action: "merge", Spots: []string{one}, NewSpot: &CityNewSpot{StreetUUID: work, Name: "invalid", Title: "Invalid", PathPrefix: "/life/home/elsewhere"}}, + {Action: "move", Spots: []string{one, two}, StreetUUID: target}, // Spot cannot be a parent. + {Action: "move", Spots: []string{one}, StreetUUID: work, PathPrefix: "/life/work/target"}, + } + for _, req := range requests { + req.BaseVersion = v + if _, err := s.OrganizeCity("d", "actor", req); err == nil { + t.Fatalf("accepted %+v", req) + } + if cityTestVersion(t, s) != v { + t.Fatal("failed operation left partial writes") + } + } + if _, err := s.OrganizeCity("other", "actor", CityOrganizeRequest{BaseVersion: 1, Action: "merge", Spots: []string{one}, TargetSpotUUID: target}); err == nil { + t.Fatal("cross-domain merge") + } +} + +func TestCityMergeRollsBackAfterPartialWrites(t *testing.T) { + s, one, two, target, _ := cityOrganizeFixture(t) + v := cityTestVersion(t, s) + if _, err := s.DB.Exec(`CREATE TRIGGER fail_archive BEFORE UPDATE OF state ON spots WHEN NEW.state='archived' BEGIN SELECT RAISE(ABORT,'test failure'); END`); err != nil { + t.Fatal(err) + } + if _, err := s.OrganizeCity("d", "actor", CityOrganizeRequest{BaseVersion: v, Action: "merge", Spots: []string{one, two}, TargetSpotUUID: target}); err == nil { + t.Fatal("injected failure was ignored") + } + pages, err := s.ListSpotPages("d", target) + if err != nil || len(pages) != 0 { + t.Fatalf("partial transfer: %+v %v", pages, err) + } + var overrides, archived int + s.DB.QueryRow(`SELECT COUNT(*) FROM city_page_overrides`).Scan(&overrides) + s.DB.QueryRow(`SELECT COUNT(*) FROM spots WHERE state='archived'`).Scan(&archived) + if overrides != 0 || archived != 0 || cityTestVersion(t, s) != v { + t.Fatalf("partial state: %d %d", overrides, archived) + } +} diff --git a/internal/store/city_plan.go b/internal/store/city_plan.go new file mode 100644 index 0000000..f8ea6c0 --- /dev/null +++ b/internal/store/city_plan.go @@ -0,0 +1,181 @@ +package store + +import ( + "database/sql" + "encoding/json" + "errors" + "strings" + "time" +) + +type CityPlanOperation struct { + Action string `json:"action"` // set_path, move_street, move_spot + Kind string `json:"kind,omitempty"` + UUID string `json:"uuid"` + PathPrefix string `json:"path_prefix,omitempty"` + ParentUUID string `json:"parent_uuid,omitempty"` + StreetUUID string `json:"street_uuid,omitempty"` + SortKey int `json:"sort_key,omitempty"` +} + +type CityPlan struct { + BaseVersion int64 `json:"base_version"` + RequestID string `json:"request_id,omitempty"` + Operations []CityPlanOperation `json:"operations"` +} + +type CityPlanPreview struct { + DomainUUID string `json:"domain_uuid"` + BaseVersion int64 `json:"base_version"` + Before []map[string]any `json:"before"` + After []map[string]any `json:"after"` + Valid bool `json:"valid"` +} + +func (s *Store) PreviewCityPlan(domainUUID string, plan CityPlan) (CityPlanPreview, error) { + tx, err := s.DB.Begin() + if err != nil { + return CityPlanPreview{}, err + } + defer tx.Rollback() + return validateCityPlan(tx, domainUUID, plan) +} + +func (s *Store) ApplyCityPlan(domainUUID, actor string, plan CityPlan) (CityPlanPreview, error) { + tx, err := s.DB.Begin() + if err != nil { + return CityPlanPreview{}, err + } + defer tx.Rollback() + preview, err := validateCityPlan(tx, domainUUID, plan) + if err != nil { + return preview, err + } + now := time.Now().UnixMilli() + for _, operation := range plan.Operations { + switch operation.Action { + case "set_path": + table := "zones" + if operation.Kind == "spot" { + table = "spots" + } + if _, err := tx.Exec(`UPDATE `+table+` SET path_prefix=?,version=version+1,updated_at_ms=? WHERE uuid=? AND domain_uuid=? AND state!='archived'`, normalizePath(operation.PathPrefix), now, operation.UUID, domainUUID); err != nil { + return preview, err + } + case "move_street": + if _, err := tx.Exec(`UPDATE zones SET parent_uuid=?,sort_key=?,version=version+1,updated_at_ms=? WHERE uuid=? AND domain_uuid=? AND kind='street' AND state!='archived'`, operation.ParentUUID, operation.SortKey, now, operation.UUID, domainUUID); err != nil { + return preview, err + } + case "move_spot": + if _, err := tx.Exec(`UPDATE street_spots SET street_uuid=?,sort_key=? WHERE spot_uuid=?`, operation.StreetUUID, operation.SortKey, operation.UUID); err != nil { + return preview, err + } + if _, err := tx.Exec(`UPDATE spots SET version=version+1,updated_at_ms=? WHERE uuid=? AND domain_uuid=?`, now, operation.UUID, domainUUID); err != nil { + return preview, err + } + } + } + beforeJSON, _ := json.Marshal(preview.Before) + afterJSON, _ := json.Marshal(preview.After) + if _, err := tx.Exec(`INSERT INTO domain_topology_versions(domain_uuid,version,updated_at_ms) VALUES(?,2,?) ON CONFLICT(domain_uuid) DO UPDATE SET version=version+1,updated_at_ms=excluded.updated_at_ms`, domainUUID, now); err != nil { + return preview, err + } + var version int64 + if err := tx.QueryRow(`SELECT version FROM domain_topology_versions WHERE domain_uuid=?`, domainUUID).Scan(&version); err != nil { + return preview, err + } + if _, err := tx.Exec(`INSERT INTO topology_events(domain_uuid,topology_version,actor_principal_uuid,operation,target_type,target_uuid,before_json,after_json,request_id,created_at_ms) VALUES(?,?,?,?,?,?,?,?,?,?)`, domainUUID, version, actor, "city.plan.applied", "plan", plan.RequestID, string(beforeJSON), string(afterJSON), plan.RequestID, now); err != nil { + return preview, err + } + preview.BaseVersion = version + return preview, tx.Commit() +} + +func validateCityPlan(tx *sql.Tx, domainUUID string, plan CityPlan) (CityPlanPreview, error) { + preview := CityPlanPreview{DomainUUID: domainUUID, Before: []map[string]any{}, After: []map[string]any{}} + var version int64 = 1 + _ = tx.QueryRow(`SELECT version FROM domain_topology_versions WHERE domain_uuid=?`, domainUUID).Scan(&version) + preview.BaseVersion = version + if plan.BaseVersion != 0 && plan.BaseVersion != version { + return preview, errors.New("topology version changed; preview the plan again") + } + if len(plan.Operations) == 0 || len(plan.Operations) > 500 { + return preview, errors.New("a City plan requires 1-500 operations") + } + items, err := loadCityBoundaries(tx, domainUUID) + if err != nil { + return preview, err + } + byID := make(map[string]*cityPathBoundary, len(items)) + for i := range items { + byID[items[i].id] = &items[i] + } + changed := map[string]bool{} + seen := map[string]bool{} + for index := range plan.Operations { + op := &plan.Operations[index] + op.Action = strings.ToLower(strings.TrimSpace(op.Action)) + op.Kind = strings.ToLower(strings.TrimSpace(op.Kind)) + item := byID[op.UUID] + if item == nil { + return preview, errors.New("City plan references an unknown node") + } + key := op.Action + ":" + op.UUID + if seen[key] { + return preview, errors.New("City plan contains a duplicate operation") + } + seen[key] = true + switch op.Action { + case "set_path": + if op.Kind == "" { + op.Kind = item.kind + } + if op.Kind != item.kind { + return preview, errors.New("City plan node kind does not match") + } + before := item.path + item.path = normalizePath(op.PathPrefix) + if item.path == "/" && item.kind != "quartier" { + return preview, errors.New("only a Quartier may bind the Domain root") + } + changed[item.id] = true + preview.Before = append(preview.Before, map[string]any{"action": op.Action, "kind": item.kind, "uuid": item.id, "path_prefix": before}) + preview.After = append(preview.After, map[string]any{"action": op.Action, "kind": item.kind, "uuid": item.id, "path_prefix": item.path}) + case "move_street": + if item.kind != "street" || byID[op.ParentUUID] == nil || byID[op.ParentUUID].kind != "quartier" { + return preview, errors.New("move_street requires a Street and destination Quartier") + } + preview.Before = append(preview.Before, map[string]any{"action": op.Action, "uuid": item.id, "parent_uuid": item.parent}) + item.parent = op.ParentUUID + preview.After = append(preview.After, map[string]any{"action": op.Action, "uuid": item.id, "parent_uuid": item.parent, "sort_key": op.SortKey}) + case "move_spot": + if item.kind != "spot" || byID[op.StreetUUID] == nil || byID[op.StreetUUID].kind != "street" { + return preview, errors.New("move_spot requires a Spot and destination Street") + } + preview.Before = append(preview.Before, map[string]any{"action": op.Action, "uuid": item.id, "street_uuid": item.parent}) + item.parent = op.StreetUUID + preview.After = append(preview.After, map[string]any{"action": op.Action, "uuid": item.id, "street_uuid": item.parent, "sort_key": op.SortKey}) + default: + return preview, errors.New("unsupported City plan operation") + } + } + if err := validateCityBoundaryChanges(items, changed); err != nil { + return preview, err + } + for _, item := range items { + if item.kind == "street" { + parent := byID[item.parent] + if parent == nil || parent.kind != "quartier" || !cityPathContains(parent.path, item.path) { + return preview, errors.New("Street Path must be a strict descendant of its Quartier Path") + } + } + if item.kind == "spot" { + parent := byID[item.parent] + if parent == nil || parent.kind != "street" || !cityPathContains(parent.path, item.path) { + return preview, errors.New("Spot Path must be a strict descendant of its Street Path") + } + } + } + preview.Valid = true + return preview, nil +} diff --git a/internal/store/city_plan_test.go b/internal/store/city_plan_test.go new file mode 100644 index 0000000..b62d19e --- /dev/null +++ b/internal/store/city_plan_test.go @@ -0,0 +1,46 @@ +package store + +import ( + "database/sql" + "testing" + + _ "modernc.org/sqlite" +) + +func TestCityPlanPreviewApplyAndVersionGuard(t *testing.T) { + db, err := sql.Open("sqlite", "file:city-plan-test?mode=memory&cache=shared") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = db.Close() }) + st := &Store{DB: db} + if err := st.EnsureCitySchema(); err != nil { + t.Fatal(err) + } + q, _ := st.CreateZoneAtPath("d", "actor", "quartier", "", "life", "Life", "", "/life") + street, _ := st.CreateZoneAtPath("d", "actor", "street", q, "home", "Home", "", "/life/home") + spot, _ := st.CreateSpotAtPath("d", "actor", street, "kitchen", "Kitchen", "", "/life/home/kitchen") + plan := CityPlan{RequestID: "req-1", Operations: []CityPlanOperation{ + {Action: "set_path", Kind: "spot", UUID: spot, PathPrefix: "/life/home/cooking"}, + }} + preview, err := st.PreviewCityPlan("d", plan) + if err != nil || !preview.Valid { + t.Fatalf("preview=%+v err=%v", preview, err) + } + plan.BaseVersion = preview.BaseVersion + applied, err := st.ApplyCityPlan("d", "actor", plan) + if err != nil || !applied.Valid || applied.BaseVersion <= plan.BaseVersion { + t.Fatalf("apply=%+v err=%v", applied, err) + } + node, err := st.CityNode("d", "spot", "uuid:"+spot) + if err != nil || node.PathPrefix != "/life/home/cooking" { + t.Fatalf("node=%+v err=%v", node, err) + } + if _, err := st.ApplyCityPlan("d", "actor", plan); err == nil { + t.Fatal("stale plan was applied") + } + events, err := st.ListTopologyEvents("d", plan.BaseVersion, 10) + if err != nil || len(events) != 1 || events[0].BeforeJSON == "{}" || events[0].AfterJSON == "{}" { + t.Fatalf("events=%+v err=%v", events, err) + } +} diff --git a/internal/store/city_read.go b/internal/store/city_read.go new file mode 100644 index 0000000..4ffdda3 --- /dev/null +++ b/internal/store/city_read.go @@ -0,0 +1,232 @@ +package store + +import ( + "context" + "database/sql" + "errors" + "fmt" + "time" +) + +const ( + cityReadTimeout = 2 * time.Second + MaxCityMapNodes = 4096 + MaxCityMapPagePlacements = 20000 + MaxCityMapRelations = 8192 +) + +var ErrCityMapBudget = errors.New("City map exceeds the bounded projection budget") + +// These helpers accept only SQL expressions owned by this package, never user +// input. Binary segment ranges preserve literal %, _, case and Unicode. The +// normalized root '/' covers all absolute Paths; an empty legacy boundary +// covers none. Paths and UUIDs are not rewritten to manufacture SQL patterns. +func cityPathScopeSQL(parent, child string) string { + return `(` + parent + `!='' AND (` + child + ` COLLATE BINARY = ` + parent + ` OR (` + child + ` COLLATE BINARY >= rtrim(` + parent + `,'/')||'/' AND ` + child + ` COLLATE BINARY < rtrim(` + parent + `,'/')||'0')))` +} + +func cityPathOverlapSQL(left, right string) string { + return `(` + cityPathScopeSQL(left, right) + ` OR ` + cityPathScopeSQL(right, left) + `)` +} + +type cityReadQuery struct { + ctx context.Context + tx *sql.Tx +} + +func (q cityReadQuery) Query(query string, args ...any) (*sql.Rows, error) { + return q.tx.QueryContext(q.ctx, query, args...) +} + +// visit always closes its cursor before its caller issues the next query. +// Visitors only scan/collect; they must not start another database operation. +func (q cityReadQuery) visit(query string, args []any, scan func(*sql.Rows) error) error { + rows, err := q.Query(query, args...) + if err != nil { + return err + } + defer rows.Close() + for rows.Next() { + if err := scan(rows); err != nil { + return err + } + } + if err := rows.Err(); err != nil { + return err + } + return rows.Close() +} + +func (s *Store) GetCityMap(domainUUID string) (CityMap, error) { + return s.GetCityMapContext(context.Background(), domainUUID) +} + +// ListSpotPagesContext is the bounded HTTP/read projection. The existing +// ListSpotPages remains available to trusted callers that need a complete set. +func (s *Store) ListSpotPagesContext(parent context.Context, domainUUID, spotUUID string) ([]CityPagePlacement, error) { + ctx, cancel := context.WithTimeout(parent, cityReadTimeout) + defer cancel() + tx, err := s.DB.BeginTx(ctx, &sql.TxOptions{ReadOnly: true}) + if err != nil { + return nil, err + } + defer tx.Rollback() + pages, err := listSpotPages(cityReadQuery{ctx: ctx, tx: tx}, domainUUID, spotUUID, MaxCityMapPagePlacements+1) + if err != nil { + return nil, err + } + if len(pages) > MaxCityMapPagePlacements { + return nil, fmt.Errorf("%w: more than %d Page placements", ErrCityMapBudget, MaxCityMapPagePlacements) + } + return pages, nil +} + +// GetCityMapContext reads one consistent topology/Page snapshot using exactly +// one connection. Bulk topology cursors are closed before Page queries. Limits +// reject a partial model instead of silently showing misleading counts/links. +func (s *Store) GetCityMapContext(parent context.Context, domainUUID string) (CityMap, error) { + empty := CityMap{DomainUUID: domainUUID, Version: 1, Quartiers: []CityQuartier{}, Relations: []CitySpotRelation{}} + ctx, cancel := context.WithTimeout(parent, cityReadTimeout) + defer cancel() + tx, err := s.DB.BeginTx(ctx, &sql.TxOptions{ReadOnly: true}) + if err != nil { + return empty, err + } + defer tx.Rollback() + result, err := readCityMapTx(cityReadQuery{ctx: ctx, tx: tx}, domainUUID) + if err != nil { + return empty, err + } + return result, nil +} + +func readCityMapTx(query cityReadQuery, domainUUID string) (CityMap, error) { + result := CityMap{DomainUUID: domainUUID, Version: 1, Quartiers: []CityQuartier{}, Relations: []CitySpotRelation{}} + err := query.tx.QueryRowContext(query.ctx, `SELECT version FROM domain_topology_versions WHERE domain_uuid=?`, domainUUID).Scan(&result.Version) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return result, err + } + nodes := 0 + checkNode := func() error { + nodes++ + if nodes > MaxCityMapNodes { + return fmt.Errorf("%w: more than %d locality nodes", ErrCityMapBudget, MaxCityMapNodes) + } + return nil + } + quartiers := map[string]int{} + err = query.visit(`SELECT uuid,name,title,description,state,sort_key,path_prefix FROM zones WHERE domain_uuid=? AND kind='quartier' AND state!='archived' ORDER BY sort_key,lower(title),name,uuid LIMIT ?`, []any{domainUUID, MaxCityMapNodes + 1}, func(rows *sql.Rows) error { + if err := checkNode(); err != nil { + return err + } + q := CityQuartier{Streets: []CityStreet{}} + if err := rows.Scan(&q.UUID, &q.Name, &q.Title, &q.Description, &q.State, &q.SortKey, &q.PathPrefix); err != nil { + return err + } + quartiers[q.UUID] = len(result.Quartiers) + result.Quartiers = append(result.Quartiers, q) + return nil + }) + if err != nil { + return result, err + } + type streetIndex struct{ quartier, street int } + streets := map[string]streetIndex{} + err = query.visit(`SELECT st.parent_uuid,st.uuid,st.name,st.title,st.description,st.state,st.sort_key,st.path_prefix + FROM zones st JOIN zones q ON q.uuid=st.parent_uuid AND q.domain_uuid=st.domain_uuid AND q.kind='quartier' AND q.state!='archived' + WHERE st.domain_uuid=? AND st.kind='street' AND st.state!='archived' ORDER BY st.sort_key,lower(st.title),st.name,st.uuid LIMIT ?`, []any{domainUUID, MaxCityMapNodes - nodes + 1}, func(rows *sql.Rows) error { + if err := checkNode(); err != nil { + return err + } + var parent string + st := CityStreet{Spots: []CitySpot{}} + if err := rows.Scan(&parent, &st.UUID, &st.Name, &st.Title, &st.Description, &st.State, &st.SortKey, &st.PathPrefix); err != nil { + return err + } + q, ok := quartiers[parent] + if !ok { + return errors.New("City snapshot has an inconsistent Street parent") + } + streets[st.UUID] = streetIndex{q, len(result.Quartiers[q].Streets)} + result.Quartiers[q].Streets = append(result.Quartiers[q].Streets, st) + return nil + }) + if err != nil { + return result, err + } + spots := map[string]bool{} + err = query.visit(`SELECT ss.street_uuid,p.uuid,p.name,p.title,p.summary,p.state,ss.sort_key,p.path_prefix + FROM street_spots ss JOIN spots p ON p.uuid=ss.spot_uuid + JOIN zones st ON st.uuid=ss.street_uuid AND st.domain_uuid=p.domain_uuid AND st.kind='street' AND st.state!='archived' + JOIN zones q ON q.uuid=st.parent_uuid AND q.domain_uuid=st.domain_uuid AND q.kind='quartier' AND q.state!='archived' + WHERE p.domain_uuid=? AND p.state!='archived' ORDER BY ss.sort_key,lower(p.title),p.name,p.uuid LIMIT ?`, []any{domainUUID, MaxCityMapNodes - nodes + 1}, func(rows *sql.Rows) error { + if err := checkNode(); err != nil { + return err + } + var parent string + spot := CitySpot{Pages: []CityPagePlacement{}} + if err := rows.Scan(&parent, &spot.UUID, &spot.Name, &spot.Title, &spot.Summary, &spot.State, &spot.SortKey, &spot.PathPrefix); err != nil { + return err + } + index, ok := streets[parent] + if !ok { + return errors.New("City snapshot has an inconsistent Spot parent") + } + street := &result.Quartiers[index.quartier].Streets[index.street] + street.Spots = append(street.Spots, spot) + spots[spot.UUID] = true + return nil + }) + if err != nil { + return result, err + } + pageCount := 0 + for qi := range result.Quartiers { + for si := range result.Quartiers[qi].Streets { + for pi := range result.Quartiers[qi].Streets[si].Spots { + spot := &result.Quartiers[qi].Streets[si].Spots[pi] + pages, err := listSpotPages(query, domainUUID, spot.UUID, MaxCityMapPagePlacements-pageCount+1) + if err != nil { + return result, err + } + pageCount += len(pages) + if pageCount > MaxCityMapPagePlacements { + return result, fmt.Errorf("%w: more than %d Page placements", ErrCityMapBudget, MaxCityMapPagePlacements) + } + if len(pages) == 0 { + continue + } + spot.Pages = pages + unique := map[string]bool{} + portal := pages[0] + for _, page := range pages { + unique[page.PageUUID] = true + if page.Path == spot.PathPrefix || (portal.Path != spot.PathPrefix && page.EdgeType == "primary" && portal.EdgeType != "primary") { + portal = page + } + } + spot.PageCount = len(unique) + spot.PortalPath, spot.PortalPageUUID = portal.Path, portal.PageUUID + } + } + } + relations := 0 + err = query.visit(`SELECT r.source_spot_uuid,r.target_spot_uuid,r.relation_type,r.weight FROM spot_relations r + JOIN spots a ON a.uuid=r.source_spot_uuid AND a.domain_uuid=? AND a.state!='archived' + JOIN spots b ON b.uuid=r.target_spot_uuid AND b.domain_uuid=? AND b.state!='archived' + ORDER BY r.relation_type,r.source_spot_uuid,r.target_spot_uuid LIMIT ?`, []any{domainUUID, domainUUID, MaxCityMapRelations + 1}, func(rows *sql.Rows) error { + relations++ + if relations > MaxCityMapRelations { + return fmt.Errorf("%w: more than %d relations", ErrCityMapBudget, MaxCityMapRelations) + } + var relation CitySpotRelation + if err := rows.Scan(&relation.SourceSpotUUID, &relation.TargetSpotUUID, &relation.RelationType, &relation.Weight); err != nil { + return err + } + if spots[relation.SourceSpotUUID] && spots[relation.TargetSpotUUID] { + result.Relations = append(result.Relations, relation) + } + return nil + }) + return result, err +} diff --git a/internal/store/city_read_test.go b/internal/store/city_read_test.go new file mode 100644 index 0000000..240c03b --- /dev/null +++ b/internal/store/city_read_test.go @@ -0,0 +1,341 @@ +package store + +import ( + "context" + "database/sql" + "errors" + "fmt" + "strings" + "testing" + "time" + + "pageswiki/internal/db" +) + +func cityReadFixture(t *testing.T) *Store { + t.Helper() + database, err := db.Open(t.TempDir() + "/city.db") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database} + if err := st.EnsureCitySchema(); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`CREATE TABLE paths(domain_uuid TEXT,path TEXT,object_uuid TEXT,is_primary INTEGER DEFAULT 0,PRIMARY KEY(domain_uuid,path)); CREATE INDEX city_test_path_object ON paths(domain_uuid,object_uuid)`); err != nil { + t.Fatal(err) + } + return st +} + +func cityReadTopology(t *testing.T, st *Store, domain, path string) (string, string, string) { + t.Helper() + q, err := st.CreateZoneAtPath(domain, "actor", "quartier", "", "quarter", "Quarter", "", path) + if err != nil { + t.Fatal(err) + } + base := strings.TrimRight(normalizePath(path), "/") + street, err := st.CreateZoneAtPath(domain, "actor", "street", q, "street", "Street", "", base+"/home") + if err != nil { + t.Fatal(err) + } + spot, err := st.CreateSpotAtPath(domain, "actor", street, "spot", "Spot", "", base+"/home/kitchen") + if err != nil { + t.Fatal(err) + } + return q, street, spot +} + +func cityTestExec(t *testing.T, st *Store, query string, args ...any) { + t.Helper() + if _, err := st.DB.Exec(query, args...); err != nil { + t.Fatal(err) + } +} + +func assertCityReadConnectionReturned(t *testing.T, st *Store) { + t.Helper() + // database/sql may finish its cancellation-triggered rollback on another + // goroutine after a caller observes the deadline. Reacquiring the only + // connection tests the actual leak contract without a racy Stats snapshot. + ctx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + conn, err := st.DB.Conn(ctx) + if err != nil { + t.Fatalf("City read leaked its sole connection: %v", err) + } + _ = conn.Close() +} + +func TestCityReadSingleConnectionAndSnapshot(t *testing.T) { + st := cityReadFixture(t) + q, street, spot := cityReadTopology(t, st, "d", "/life") + cityTestExec(t, st, `INSERT INTO paths VALUES('d','/life/home/kitchen','portal',1),('d','/life/home/kitchen/page','page',1)`) + if err := st.AddSpotPage("d", "actor", spot, "portal", "", "primary", "Portal"); err != nil { + t.Fatal(err) + } + if err := st.AddSpotPage("d", "actor", spot, "portal", "", "reference", "Reference"); err != nil { + t.Fatal(err) + } + st.DB.SetMaxOpenConns(1) + ctx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + city, err := st.GetCityMapContext(ctx, "d") + if err != nil { + t.Fatalf("single connection read failed: %v", err) + } + got := city.Quartiers[0].Streets[0].Spots[0] + if got.UUID != spot || got.PageCount != 2 || len(got.Pages) != 3 || got.PortalPath != "/life/home/kitchen" { + t.Fatalf("deduplicated snapshot = %#v", got) + } + assertCityReadConnectionReturned(t, st) + st.DB.SetMaxOpenConns(2) + tx, err := st.DB.BeginTx(ctx, &sql.TxOptions{ReadOnly: true}) + if err != nil { + t.Fatal(err) + } + defer tx.Rollback() + var before int64 + if err := tx.QueryRow(`SELECT version FROM domain_topology_versions WHERE domain_uuid='d'`).Scan(&before); err != nil { + t.Fatal(err) + } + // Commit after the reader pins the snapshot, before topology/Page loading. + writer, err := st.DB.Begin() + if err != nil { + t.Fatal(err) + } + if _, err = writer.Exec(`UPDATE zones SET title='New title' WHERE uuid IN (?,?); UPDATE paths SET path='/changed' WHERE object_uuid='page'; UPDATE domain_topology_versions SET version=version+1 WHERE domain_uuid='d'`, q, street); err != nil { + _ = writer.Rollback() + t.Fatal(err) + } + if err := writer.Commit(); err != nil { + t.Fatal(err) + } + old, err := readCityMapTx(cityReadQuery{ctx: ctx, tx: tx}, "d") + if err != nil || old.Version != before || old.Quartiers[0].Title != "Quarter" || old.Quartiers[0].Streets[0].Spots[0].PageCount != 2 { + t.Fatalf("mixed concurrent snapshot: %#v, %v", old, err) + } + _ = tx.Rollback() + current, err := st.GetCityMap("d") + if err != nil || current.Version != before+1 || current.Quartiers[0].Title != "New title" || current.Quartiers[0].Streets[0].Spots[0].PageCount != 1 { + t.Fatalf("new snapshot missing commit: %#v, %v", current, err) + } +} + +func TestCityReadRejectsBudgetAndReleasesConnection(t *testing.T) { + for _, budget := range []string{"nodes", "pages", "relations"} { + t.Run(budget, func(t *testing.T) { + st := cityReadFixture(t) + _, street, spot := cityReadTopology(t, st, "d", "/life") + switch budget { + case "nodes": + cityTestExec(t, st, `WITH RECURSIVE n(i) AS (SELECT 1 UNION ALL SELECT i+1 FROM n WHERE i, or +// /. Qualified lookup and parent checks happen in +// the same SQL snapshot, without enumerating the City or opening nested cursors. +func (s *Store) CityNodeContext(parent context.Context, domainUUID, kind, id string) (detail CityNodeDetail, lookupErr error) { + id = strings.ToLower(strings.TrimSpace(id)) + if kind != "quartier" && kind != "street" && kind != "spot" { + return detail, sql.ErrNoRows + } + if id == "" || len(id) > 256 || strings.ContainsAny(id, "\\\x00") { + return detail, sql.ErrNoRows + } + parts := strings.Split(id, "/") + if len(parts) > 1 && (kind != "street" || len(parts) != 2) { + return detail, sql.ErrNoRows + } + for _, part := range parts { + if part == "" || part == "." || part == ".." { + return detail, sql.ErrNoRows + } + } + ctx, cancel := context.WithTimeout(parent, cityReadTimeout) + defer cancel() + defer func() { + if lookupErr != nil && ctx.Err() != nil { + lookupErr = ctx.Err() + } + }() + from := "zones n" + columns := `n.uuid,n.domain_uuid,n.kind,COALESCE(n.parent_uuid,''),n.name,n.title,n.description,n.state,n.path_prefix,n.sort_key,n.version` + ancestors := `,'','','','','','','',''` + where := `n.domain_uuid=? AND n.state!='archived' AND n.kind=?` + args := []any{domainUUID, kind} + if kind == "street" { + from += ` JOIN zones q ON q.uuid=n.parent_uuid AND q.domain_uuid=n.domain_uuid AND q.kind='quartier' AND q.state!='archived'` + ancestors = `,q.uuid,q.name,q.title,q.path_prefix,'','','',''` + } else if kind == "spot" { + from = `spots n JOIN street_spots ss ON ss.spot_uuid=n.uuid + JOIN zones st ON st.uuid=ss.street_uuid AND st.domain_uuid=n.domain_uuid AND st.kind='street' AND st.state!='archived' + JOIN zones q ON q.uuid=st.parent_uuid AND q.domain_uuid=st.domain_uuid AND q.kind='quartier' AND q.state!='archived'` + columns = `n.uuid,n.domain_uuid,'spot',st.uuid,n.name,n.title,n.summary,n.state,n.path_prefix,ss.sort_key,n.version` + ancestors = `,q.uuid,q.name,q.title,q.path_prefix,st.uuid,st.name,st.title,st.path_prefix` + where = `n.domain_uuid=? AND n.state!='archived'` + args = []any{domainUUID} + } + if len(parts) == 2 { + // A qualified URL is name based. Explicit UUID selectors use the short + // /s/uuid:... route instead of mixing two different identity models. + where += " AND q.name=? AND n.name=?" + args = append(args, parts[0], parts[1]) + } else if strings.HasPrefix(id, "uuid:") { + where += " AND n.uuid=?" + args = append(args, strings.TrimPrefix(id, "uuid:")) + } else { + where += " AND n.name=?" + args = append(args, id) + } + rows, err := s.DB.QueryContext(ctx, `SELECT `+columns+ancestors+` FROM `+from+` WHERE `+where+` LIMIT 2`, args...) + if err != nil { + return detail, err + } + defer rows.Close() + count := 0 + for rows.Next() { + var node CityNodeDetail + var q, st CityNodeAncestor + if err := rows.Scan(&node.UUID, &node.DomainUUID, &node.Kind, &node.ParentUUID, + &node.Name, &node.Title, &node.Description, &node.State, &node.PathPrefix, + &node.SortKey, &node.Version, &q.UUID, &q.Name, &q.Title, &q.PathPrefix, + &st.UUID, &st.Name, &st.Title, &st.PathPrefix); err != nil { + return CityNodeDetail{}, err + } + count++ + if count > 1 { + return CityNodeDetail{}, ErrCityNameAmbiguous + } + if q.UUID != "" { + node.Quartier = &q + } + if st.UUID != "" { + node.Street = &st + } + detail = node + } + if err := rows.Err(); err != nil { + return CityNodeDetail{}, err + } + if count == 0 { + return CityNodeDetail{}, sql.ErrNoRows + } + return detail, nil +} diff --git a/internal/store/city_reference_test.go b/internal/store/city_reference_test.go new file mode 100644 index 0000000..bac3e21 --- /dev/null +++ b/internal/store/city_reference_test.go @@ -0,0 +1,74 @@ +package store + +import ( + "context" + "database/sql" + "errors" + "testing" +) + +func TestCityQualifiedReferences(t *testing.T) { + st := cityReadFixture(t) + st.DB.SetMaxOpenConns(1) + q, street, spot := cityReadTopology(t, st, "d", "/life") + other, err := st.CreateZoneAtPath("d", "actor", "quartier", "", "other", "Other", "", "/other") + if err != nil { + t.Fatal(err) + } + sibling, err := st.CreateZoneAtPath("d", "actor", "street", other, "street", "Other Street", "", "/other/home") + if err != nil { + t.Fatal(err) + } + for _, test := range []struct{ kind, id, want string }{ + {"street", "quarter/street", street}, {"street", "other/street", sibling}, + {"street", "uuid:" + street, street}, {"quartier", "quarter", q}, {"spot", "spot", spot}, + } { + node, err := st.CityNode("d", test.kind, test.id) + if err != nil || node.UUID != test.want { + t.Fatalf("%s/%s=%+v %v", test.kind, test.id, node, err) + } + if test.kind == "spot" && (node.Quartier == nil || node.Quartier.UUID != q || node.Street == nil || node.Street.UUID != street) { + t.Fatalf("missing ancestry: %+v", node) + } + } + if _, err := st.CityNode("d", "street", "street"); !errors.Is(err, ErrCityNameAmbiguous) { + t.Fatalf("ambiguous=%v", err) + } + for _, id := range []string{"quarter//street", "quarter/street/extra", "../street", "quarter/..", street, "uuid:", "other/missing"} { + if _, err := st.CityNode("d", "street", id); !errors.Is(err, sql.ErrNoRows) { + t.Fatalf("malformed %q=%v", id, err) + } + } + if _, err := st.CityNode("foreign", "street", "quarter/street"); !errors.Is(err, sql.ErrNoRows) { + t.Fatalf("foreign=%v", err) + } + ctx, cancel := context.WithCancel(context.Background()) + cancel() + if _, err := st.CityNodeContext(ctx, "d", "street", "quarter/street"); !errors.Is(err, context.Canceled) { + t.Fatalf("cancellation=%v", err) + } + // Bare UUID-looking names remain names, not identity selectors. + cityTestExec(t, st, `UPDATE zones SET name=? WHERE uuid=?`, street, sibling) + node, err := st.CityNode("d", "street", street) + if err != nil || node.UUID != sibling { + t.Fatalf("UUID-looking name=%+v %v", node, err) + } + node, err = st.CityNode("d", "street", "street") + if err != nil || node.UUID != street { + t.Fatalf("unique legacy name=%+v %v", node, err) + } + cityTestExec(t, st, `UPDATE zones SET name='renamed' WHERE uuid=?`, q) + if _, err := st.CityNode("d", "street", "quarter/street"); !errors.Is(err, sql.ErrNoRows) { + t.Fatalf("old parent URL=%v", err) + } + if node, err := st.CityNode("d", "street", "renamed/street"); err != nil || node.UUID != street { + t.Fatalf("renamed parent=%+v %v", node, err) + } + cityTestExec(t, st, `UPDATE zones SET state='archived' WHERE uuid=?`, q) + for _, test := range []struct{ kind, id string }{{"street", "uuid:" + street}, {"spot", "spot"}} { + if _, err := st.CityNode("d", test.kind, test.id); !errors.Is(err, sql.ErrNoRows) { + t.Fatalf("archived ancestor=%v", err) + } + } + assertCityReadConnectionReturned(t, st) +} diff --git a/internal/store/city_search.go b/internal/store/city_search.go new file mode 100644 index 0000000..0f26530 --- /dev/null +++ b/internal/store/city_search.go @@ -0,0 +1,206 @@ +package store + +import ( + "context" + "database/sql" + "errors" + "sort" + "strings" + "time" +) + +const ( + CitySearchCandidateLimit = 1000 // Per locality kind, before authorization. + CitySearchResultLimit = 30 + citySearchTimeout = 2 * time.Second +) + +// CitySearchResult describes a locality, not its contained Pages. Description +// is a bounded plain-text excerpt around the match and is never trusted HTML. +type CitySearchResult struct { + UUID, Kind, Name, Title, Description, PathPrefix string + QuartierTitle, StreetTitle, QuartierName string + CreatedAtMS, UpdatedAtMS int64 + NameMatch, PathMatch, DescriptionMatch bool +} + +type citySearchCandidate struct { + CitySearchResult + quartierPath, streetPath string +} + +// SearchCityInDomain searches locality metadata only. It does not construct a +// CityMap, expand descendants, read Page bodies, or count hidden localities. +// Scope selects a locality's own boundary, not an ancestor of the scope. Every +// boundary in its parent chain must be readable before the result is exposed. +func (s *Store) SearchCityInDomain(parent context.Context, domainUUID, scope, query string, limit int, allowed func(string) bool, options SearchOptions) (found []CitySearchResult, searchErr error) { + if err := options.Validate(); err != nil { + return nil, err + } + query = strings.TrimSpace(query) + if len(query) > 512 || len(strings.Fields(query)) > 16 { + return nil, errors.New("search query is too long") + } + // File filters are intentionally not applied to locality metadata: a Spot + // containing a PDF is not itself a PDF and must not claim to match one. + if allowed == nil || options.FileType != "" || options.Extension != "" || (query == "" && !options.HasFilters()) { + return nil, nil + } + if limit <= 0 || limit > CitySearchResultLimit { + limit = CitySearchResultLimit + } + ctx, cancel := context.WithTimeout(parent, citySearchTimeout) + defer cancel() + defer func() { + if searchErr != nil && ctx.Err() != nil { + searchErr = ctx.Err() + } + }() + tx, err := s.DB.BeginTx(ctx, &sql.TxOptions{ReadOnly: true}) + if err != nil { + return nil, err + } + defer tx.Rollback() + scope = normalizePath(scope) + prefix, upper := strings.TrimRight(scope, "/")+"/", strings.TrimRight(scope, "/")+"0" + args := []any{ + sql.Named("domain", domainUUID), sql.Named("scope", scope), + sql.Named("prefix", prefix), sql.Named("upper", upper), + sql.Named("query", query), sql.Named("limit", CitySearchCandidateLimit), + } + dateColumn := "n.updated_at_ms" + if options.DateField == "created" { + dateColumn = "n.created_at_ms" + } + dateWhere := "" + if options.FromMS != nil { + dateWhere += " AND " + dateColumn + ">=:from_ms" + args = append(args, sql.Named("from_ms", *options.FromMS)) + } + if options.BeforeMS != nil { + dateWhere += " AND " + dateColumn + "<:before_ms" + args = append(args, sql.Named("before_ms", *options.BeforeMS)) + } + candidates := make([]citySearchCandidate, 0) + for _, kind := range []string{"quartier", "street", "spot"} { + rows, err := tx.QueryContext(ctx, citySearchSQL(kind, dateWhere), args...) + if err != nil { + return nil, err + } + for rows.Next() { + var candidate citySearchCandidate + candidate.Kind = kind + if err := rows.Scan(&candidate.UUID, &candidate.Name, &candidate.Title, &candidate.Description, + &candidate.PathPrefix, &candidate.CreatedAtMS, &candidate.UpdatedAtMS, + &candidate.NameMatch, &candidate.PathMatch, &candidate.DescriptionMatch, + &candidate.QuartierTitle, &candidate.StreetTitle, &candidate.quartierPath, &candidate.streetPath, &candidate.QuartierName); err != nil { + rows.Close() + return nil, err + } + candidates = append(candidates, candidate) + } + err = rows.Err() + closeErr := rows.Close() + if err != nil { + return nil, err + } + if closeErr != nil { + return nil, closeErr + } + } + // Release the sole read connection before calling authorization, which may + // itself need a database connection. HTTP normally passes its cached policy. + if err := tx.Rollback(); err != nil && !errors.Is(err, sql.ErrTxDone) { + return nil, err + } + sort.SliceStable(candidates, func(i, j int) bool { + a, b := candidates[i], candidates[j] + if a.Kind != b.Kind { + return citySearchKindOrder(a.Kind) < citySearchKindOrder(b.Kind) + } + if a.NameMatch != b.NameMatch { + return a.NameMatch + } + if a.PathMatch != b.PathMatch { + return a.PathMatch + } + if a.PathPrefix != b.PathPrefix { + return a.PathPrefix < b.PathPrefix + } + return a.UUID < b.UUID + }) + readable := make(map[string]bool) + canRead := func(path string) bool { + if value, exists := readable[path]; exists { + return value + } + value := allowed(path) + readable[path] = value + return value + } + for _, candidate := range candidates { + if err := ctx.Err(); err != nil { + return nil, err + } + if !canRead(candidate.PathPrefix) || (candidate.quartierPath != "" && !canRead(candidate.quartierPath)) || (candidate.streetPath != "" && !canRead(candidate.streetPath)) { + continue + } + found = append(found, candidate.CitySearchResult) + if len(found) == limit { + break + } + } + if err := ctx.Err(); err != nil { + return nil, err + } + return found, nil +} + +func citySearchKindOrder(kind string) int { + switch kind { + case "quartier": + return 0 + case "street": + return 1 + default: + return 2 + } +} + +// All interpolated SQL fragments are package-owned constants. User input is +// bound, so %, _, quotes and backslashes are literal substring characters. +func citySearchSQL(kind, dateWhere string) string { + from, description := "zones n", "n.description" + parentColumns := "'','','','',''" + where := "n.kind='quartier'" + switch kind { + case "street": + from += ` JOIN zones q ON q.uuid=n.parent_uuid AND q.domain_uuid=n.domain_uuid AND q.kind='quartier' AND q.state!='archived'` + parentColumns = "substr(COALESCE(NULLIF(q.title,''),q.name),1,256),'',q.path_prefix,'',q.name" + where = "n.kind='street' AND " + citySearchAbsolutePathSQL("q.path_prefix") + case "spot": + from = `spots n JOIN street_spots ss ON ss.spot_uuid=n.uuid + JOIN zones st ON st.uuid=ss.street_uuid AND st.domain_uuid=n.domain_uuid AND st.kind='street' AND st.state!='archived' + JOIN zones q ON q.uuid=st.parent_uuid AND q.domain_uuid=st.domain_uuid AND q.kind='quartier' AND q.state!='archived'` + description = "n.summary" + parentColumns = "substr(COALESCE(NULLIF(q.title,''),q.name),1,256),substr(COALESCE(NULLIF(st.title,''),st.name),1,256),q.path_prefix,st.path_prefix,q.name" + where = citySearchAbsolutePathSQL("q.path_prefix") + " AND " + citySearchAbsolutePathSQL("st.path_prefix") + } + nameMatch := `(:query!='' AND (instr(lower(n.name),lower(:query))>0 OR instr(lower(n.title),lower(:query))>0))` + pathMatch := `(:query!='' AND instr(lower(n.path_prefix),lower(:query))>0)` + descriptionMatch := `(:query!='' AND instr(lower(` + description + `),lower(:query))>0)` + return `SELECT n.uuid,substr(n.name,1,256),substr(n.title,1,256), + substr(` + description + `,max(1,instr(lower(` + description + `),lower(:query))-160),512), + n.path_prefix,n.created_at_ms,n.updated_at_ms,` + nameMatch + `,` + pathMatch + `,` + descriptionMatch + `,` + parentColumns + ` + FROM ` + from + ` WHERE n.domain_uuid=:domain AND n.state!='archived' AND ` + where + ` + AND ` + citySearchAbsolutePathSQL("n.path_prefix") + ` + AND (n.path_prefix COLLATE BINARY=:scope OR (n.path_prefix COLLATE BINARY>=:prefix AND n.path_prefix COLLATE BINARY<:upper)) + AND (:query='' OR ` + nameMatch + ` OR ` + pathMatch + ` OR ` + descriptionMatch + `)` + dateWhere + ` + ORDER BY ` + nameMatch + ` DESC,` + pathMatch + ` DESC,n.path_prefix COLLATE BINARY,n.uuid LIMIT :limit` +} + +func citySearchAbsolutePathSQL(column string) string { + // Keep authorization paths intact rather than truncating them. Malformed + // legacy boundaries and impractically large metadata are not navigable hits. + return `(substr(` + column + `,1,1)='/' AND length(` + column + `)<=4096 AND instr(` + column + `,char(0))=0)` +} diff --git a/internal/store/city_search_test.go b/internal/store/city_search_test.go new file mode 100644 index 0000000..11139fa --- /dev/null +++ b/internal/store/city_search_test.go @@ -0,0 +1,247 @@ +package store + +import ( + "context" + "errors" + "fmt" + "reflect" + "strings" + "testing" + "time" +) + +func citySearchAllowAll(string) bool { return true } + +func citySearchInsertZone(t *testing.T, st *Store, id, domain, kind, parent, name, title, description, path string) { + t.Helper() + cityTestExec(t, st, `INSERT INTO zones(uuid,domain_uuid,kind,parent_uuid,name,title,description,path_prefix,state,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,?,?,?,'active',1000,2000)`, id, domain, kind, parent, name, title, description, path) +} + +func citySearchInsertSpot(t *testing.T, st *Store, id, domain, street, name, title, description, path string) { + t.Helper() + cityTestExec(t, st, `INSERT INTO spots(uuid,domain_uuid,name,title,summary,path_prefix,state,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,?,'active',1000,2000)`, id, domain, name, title, description, path) + cityTestExec(t, st, `INSERT INTO street_spots(street_uuid,spot_uuid,created_at_ms) VALUES(?,?,1000)`, street, id) +} + +func citySearchIDs(results []CitySearchResult) []string { + ids := make([]string, len(results)) + for i, result := range results { + ids[i] = result.UUID + } + return ids +} + +func TestCitySearchMetadataRankingAndMatchSources(t *testing.T) { + st := cityReadFixture(t) + // No Page table remains: this search must not expand a CityMap or bodies. + cityTestExec(t, st, `DROP TABLE paths`) + citySearchInsertZone(t, st, "q-description", "d", "quartier", "", "description", "Description", "needle in charter", "/a-description") + citySearchInsertZone(t, st, "q-path", "d", "quartier", "", "path", "Path", "", "/b-needle") + citySearchInsertZone(t, st, "q-title", "d", "quartier", "", "title", "NeEdLe quartier", "", "/c-title") + citySearchInsertZone(t, st, "street", "d", "street", "q-title", "needle-street", "Street", "", "/c-title/street") + citySearchInsertSpot(t, st, "spot", "d", "street", "spot", "Spot", strings.Repeat("前", 500)+"needle 日本語", "/c-title/street/spot") + results, err := st.SearchCityInDomain(context.Background(), "d", "/", "NEEDLE", 30, citySearchAllowAll, SearchOptions{}) + if err != nil { + t.Fatal(err) + } + if got, want := citySearchIDs(results), []string{"q-title", "q-path", "q-description", "street", "spot"}; !reflect.DeepEqual(got, want) { + t.Fatalf("ranked hits = %v, want %v", got, want) + } + if !results[0].NameMatch || results[0].PathMatch || results[0].DescriptionMatch || !results[1].PathMatch || !results[2].DescriptionMatch { + t.Fatalf("match sources = %#v", results) + } + spot := results[4] + if spot.Kind != "spot" || spot.QuartierTitle != "NeEdLe quartier" || spot.StreetTitle != "Street" || !strings.Contains(spot.Description, "needle 日本語") || len([]rune(spot.Description)) > 512 { + t.Fatalf("spot metadata/excerpt = %#v", spot) + } + if spot.CreatedAtMS != 1000 || spot.UpdatedAtMS != 2000 { + t.Fatalf("timestamps = %#v", spot) + } +} + +func TestCitySearchScopeUsesLiteralBoundaries(t *testing.T) { + st := cityReadFixture(t) + citySearchInsertZone(t, st, "literal", "d", "quartier", "", "literal", "日本語 %_", "a'b\\c", "/Life_%/日本語") + citySearchInsertZone(t, st, "child", "d", "street", "literal", "child", "日本語 %_", "", "/Life_%/日本語/child") + citySearchInsertZone(t, st, "sibling", "d", "quartier", "", "sibling", "日本語", "", "/Life_%/日本語-other") + citySearchInsertZone(t, st, "lower", "d", "quartier", "", "lower", "日本語 %_", "", "/life_%/日本語") + citySearchInsertZone(t, st, "wildcard", "d", "quartier", "", "wildcard", "日本語", "", "/Life-xyz/日本語") + for _, tt := range []struct { + scope, query string + ids []string + }{ + {"/Life_%/日本語", "日本語", []string{"literal", "child"}}, + {"/Life_%/日本語/child", "日本語", []string{"child"}}, + {"/Life_%/日本語/child/deeper", "日本語", []string{}}, + {"/Life_%/日本語", "%_", []string{"literal", "child"}}, + {"/Life_%/日本語", "a'b\\c", []string{"literal"}}, + {"/", "' OR 1=1 --", []string{}}, + } { + t.Run(tt.scope+"_"+tt.query, func(t *testing.T) { + results, err := st.SearchCityInDomain(context.Background(), "d", tt.scope, tt.query, 30, citySearchAllowAll, SearchOptions{}) + if err != nil || !reflect.DeepEqual(citySearchIDs(results), tt.ids) { + t.Fatalf("hits = %v, %v; want %v", citySearchIDs(results), err, tt.ids) + } + }) + } +} + +func TestCitySearchRequiresReadableActiveSameDomainAncestors(t *testing.T) { + st := cityReadFixture(t) + citySearchInsertZone(t, st, "q-one", "d", "quartier", "", "one", "needle One", "", "/one") + citySearchInsertZone(t, st, "q-two", "d", "quartier", "", "two", "needle Two", "", "/two") + // Street names are only unique within their Quartier. Keep both hits and + // their distinct UUID/context instead of deduplicating by name. + citySearchInsertZone(t, st, "st-one", "d", "street", "q-one", "same-name", "needle Street", "", "/one/street") + citySearchInsertZone(t, st, "st-two", "d", "street", "q-two", "same-name", "needle Street", "", "/two/street") + citySearchInsertSpot(t, st, "spot-one", "d", "st-one", "one-spot", "needle Spot", "", "/one/street/spot") + citySearchInsertSpot(t, st, "spot-two", "d", "st-two", "two-spot", "needle Spot", "", "/two/street/spot") + citySearchInsertZone(t, st, "foreign-q", "foreign", "quartier", "", "foreign", "needle Foreign", "", "/foreign") + citySearchInsertZone(t, st, "cross-street", "d", "street", "foreign-q", "cross", "needle Cross", "", "/foreign/street") + citySearchInsertSpot(t, st, "cross-spot", "d", "cross-street", "cross-spot", "needle Cross", "", "/foreign/street/spot") + citySearchInsertSpot(t, st, "foreign-spot", "foreign", "st-one", "foreign-spot", "needle Foreign", "", "/one/street/foreign") + citySearchInsertZone(t, st, "archived-q", "d", "quartier", "", "archived", "needle Archived", "", "/archived") + citySearchInsertZone(t, st, "archived-child", "d", "street", "archived-q", "archived-child", "needle Child", "", "/archived/child") + citySearchInsertSpot(t, st, "archived-spot", "d", "archived-child", "archived-spot", "needle Child", "", "/archived/child/spot") + cityTestExec(t, st, `UPDATE zones SET state='archived' WHERE uuid='archived-q'`) + for i, path := range []string{"", "relative", strings.Repeat("/", 4097)} { + id := fmt.Sprintf("invalid-%d", i) + citySearchInsertZone(t, st, id, "d", "quartier", "", id, "needle Invalid", "", path) + citySearchInsertZone(t, st, id+"-child", "d", "street", id, id+"-child", "needle Invalid", "", "/invalid-child/"+id) + } + search := func(allowed func(string) bool, limit int) []CitySearchResult { + t.Helper() + results, err := st.SearchCityInDomain(context.Background(), "d", "/", "needle", limit, allowed, SearchOptions{}) + if err != nil { + t.Fatal(err) + } + return results + } + all := search(citySearchAllowAll, 30) + if got, want := citySearchIDs(all), []string{"q-one", "q-two", "st-one", "st-two", "spot-one", "spot-two"}; !reflect.DeepEqual(got, want) { + t.Fatalf("active same-domain metadata = %v, want %v", got, want) + } + if all[2].QuartierTitle != "needle One" || all[3].QuartierTitle != "needle Two" { + t.Fatalf("same-name context lost: %#v", all) + } + // The child alone being readable must not disclose an unreadable ancestor. + visible := search(func(path string) bool { return path != "/one" && path != "/two/street" }, 30) + if got, want := citySearchIDs(visible), []string{"q-two"}; !reflect.DeepEqual(got, want) { + t.Fatalf("parent ACL filter = %v, want %v", got, want) + } + visible = search(func(path string) bool { return strings.HasPrefix(path, "/two") }, 1) + if got, want := citySearchIDs(visible), []string{"q-two"}; !reflect.DeepEqual(got, want) { + t.Fatalf("ACL must precede visible limit: %v, want %v", got, want) + } + cityTestExec(t, st, `UPDATE zones SET title='' WHERE uuid IN ('q-one','st-one'); UPDATE zones SET state='archived' WHERE uuid='st-two'; UPDATE spots SET state='archived' WHERE uuid='spot-one'`) + results, err := st.SearchCityInDomain(context.Background(), "d", "/", "", 30, citySearchAllowAll, SearchOptions{FromMS: new(int64)}) + if err != nil || !reflect.DeepEqual(citySearchIDs(results), []string{"q-one", "q-two", "st-one"}) || results[2].QuartierTitle != "one" { + t.Fatalf("own/parent archived and title fallback: %#v, %v", results, err) + } +} + +func TestCitySearchDateFiltersAndFileExclusion(t *testing.T) { + st := cityReadFixture(t) + citySearchInsertZone(t, st, "quarter", "d", "quartier", "", "quarter", "Quarter", "", "/quarter") + from, before := int64(1000), int64(2000) + for _, tt := range []struct { + name string + query string + options SearchOptions + want int + }{ + {"no query or filters", "", SearchOptions{}, 0}, + {"date field alone", "", SearchOptions{DateField: "created"}, 0}, + {"created inclusive from", "", SearchOptions{DateField: "created", FromMS: &from, BeforeMS: &before}, 1}, + {"updated exclusive before", "", SearchOptions{FromMS: &from, BeforeMS: &before}, 0}, + {"updated inclusive from", "", SearchOptions{FromMS: &before}, 1}, + {"keyword and date", "quarter", SearchOptions{BeforeMS: &before}, 0}, + {"file type", "quarter", SearchOptions{FileType: "pdf"}, 0}, + {"extension", "quarter", SearchOptions{Extension: "py"}, 0}, + } { + t.Run(tt.name, func(t *testing.T) { + results, err := st.SearchCityInDomain(context.Background(), "d", "/", tt.query, 30, citySearchAllowAll, tt.options) + if err != nil || len(results) != tt.want { + t.Fatalf("hits = %v, %v; want %d", citySearchIDs(results), err, tt.want) + } + }) + } + for _, options := range []SearchOptions{ + {DateField: "updated_at_ms); DROP TABLE zones;--"}, + {FromMS: &before, BeforeMS: &from}, + {FromMS: &from, BeforeMS: &from}, + } { + if _, err := st.SearchCityInDomain(context.Background(), "d", "/", "quarter", 30, citySearchAllowAll, options); !errors.Is(err, ErrInvalidSearchOptions) { + t.Fatalf("invalid options = %#v: %v", options, err) + } + } +} + +func TestCitySearchBoundedCandidatesAndFiltersBeforeCap(t *testing.T) { + st := cityReadFixture(t) + cityTestExec(t, st, `WITH RECURSIVE n(i) AS (SELECT 1 UNION ALL SELECT i+1 FROM n WHERE i<=?) + INSERT INTO zones(uuid,domain_uuid,kind,parent_uuid,name,title,path_prefix,state,created_at_ms,updated_at_ms) + SELECT printf('q-%04d',i),'d','quartier','',printf('q-%04d',i),'needle',printf('/q-%04d',i),'active',1000,1000 FROM n`, CitySearchCandidateLimit) + allowedCalls := 0 + results, err := st.SearchCityInDomain(context.Background(), "d", "/", "needle", 30, func(path string) bool { + allowedCalls++ + return path == fmt.Sprintf("/q-%04d", CitySearchCandidateLimit+1) + }, SearchOptions{}) + if err != nil || len(results) != 0 || allowedCalls != CitySearchCandidateLimit { + t.Fatalf("candidate budget: got %v, calls=%d, err=%v", citySearchIDs(results), allowedCalls, err) + } + cityTestExec(t, st, `UPDATE zones SET updated_at_ms=3000 WHERE uuid=?`, fmt.Sprintf("q-%04d", CitySearchCandidateLimit+1)) + from := int64(2000) + results, err = st.SearchCityInDomain(context.Background(), "d", "/", "", 30, citySearchAllowAll, SearchOptions{FromMS: &from}) + if err != nil || len(results) != 1 { + t.Fatalf("date filter must run before cap: %v, %v", citySearchIDs(results), err) + } + results, err = st.SearchCityInDomain(context.Background(), "d", "/", "needle", 10000, citySearchAllowAll, SearchOptions{}) + if err != nil || len(results) != CitySearchResultLimit { + t.Fatalf("visible budget: got %d, %v", len(results), err) + } +} + +func TestCitySearchCancellationFailureAndConnectionRelease(t *testing.T) { + st := cityReadFixture(t) + citySearchInsertZone(t, st, "quarter", "d", "quartier", "", "quarter", "needle", "", "/quarter") + st.DB.SetMaxOpenConns(1) + ctx, cancel := context.WithCancel(context.Background()) + cancel() + if _, err := st.SearchCityInDomain(ctx, "d", "/", "needle", 30, citySearchAllowAll, SearchOptions{}); !errors.Is(err, context.Canceled) { + t.Fatalf("canceled search = %v", err) + } + ctx, cancel = context.WithTimeout(context.Background(), time.Second) + defer cancel() + results, err := st.SearchCityInDomain(ctx, "d", "/", "needle", 30, func(string) bool { + // Authorization is outside the search transaction, even with pool=1. + var value int + if err := st.DB.QueryRowContext(ctx, `SELECT 1`).Scan(&value); err != nil { + t.Errorf("authorization cannot use released read connection: %v", err) + return false + } + return value == 1 + }, SearchOptions{}) + if err != nil || len(results) != 1 { + t.Fatalf("single-connection search = %v, %v", results, err) + } + assertCityReadConnectionReturned(t, st) + cancelContext, stop := context.WithCancel(context.Background()) + defer stop() + results, err = st.SearchCityInDomain(cancelContext, "d", "/", "needle", 1, func(string) bool { stop(); return true }, SearchOptions{}) + if !errors.Is(err, context.Canceled) || len(results) != 0 { + t.Fatalf("cancellation during authorization returned partial success: %#v, %v", results, err) + } + cityTestExec(t, st, `DROP TABLE spots`) + results, err = st.SearchCityInDomain(context.Background(), "d", "/", "needle", 30, citySearchAllowAll, SearchOptions{}) + if err == nil || len(results) != 0 { + t.Fatalf("failed query must not return partial success: %v, %v", results, err) + } + assertCityReadConnectionReturned(t, st) + if _, err := st.SearchCityInDomain(context.Background(), "d", "/", strings.Repeat("a", 513), 30, citySearchAllowAll, SearchOptions{}); err == nil { + t.Fatal("oversized query accepted") + } + if _, err := st.SearchCityInDomain(context.Background(), "d", "/", strings.Repeat("word ", 17), 30, citySearchAllowAll, SearchOptions{}); err == nil { + t.Fatal("too many query terms accepted") + } +} diff --git a/internal/store/city_test.go b/internal/store/city_test.go new file mode 100644 index 0000000..3550340 --- /dev/null +++ b/internal/store/city_test.go @@ -0,0 +1,355 @@ +package store + +import ( + "database/sql" + "strings" + "testing" + + _ "modernc.org/sqlite" +) + +func TestCityMapTopologyAndVersion(t *testing.T) { + database, err := sql.Open("sqlite", "file:city-map-test?mode=memory&cache=shared") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database} + if err := st.EnsureCitySchema(); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`CREATE TABLE paths(domain_uuid TEXT,path TEXT,object_uuid TEXT,is_primary INTEGER DEFAULT 0); INSERT INTO paths(domain_uuid,path,object_uuid,is_primary) VALUES('d','/guide','page-1',1)`); err != nil { + t.Fatal(err) + } + quartier, err := st.CreateZone("d", "actor", "quartier", "ignored", "technology", "Technology", "") + if err != nil { + t.Fatal(err) + } + if _, err := st.CreateZone("d", "actor", "street", "missing", "invalid", "Invalid", ""); err == nil { + t.Fatal("Street without a Quartier was accepted") + } + street, err := st.CreateZone("d", "actor", "street", quartier, "platform", "Platform", "") + if err != nil { + t.Fatal(err) + } + spot, err := st.CreateSpot("d", "actor", street, "pageswiki", "Pages Wiki", "Semantic knowledge system") + if err != nil { + t.Fatal(err) + } + secondSpot, err := st.CreateSpot("d", "actor", street, "architecture", "Architecture", "") + if err != nil { + t.Fatal(err) + } + if err := st.AddSpotPage("d", "actor", spot, "page-1", "", "primary", "Guide"); err != nil { + t.Fatal(err) + } + if err := st.AddSpotPage("d", "actor", secondSpot, "page-1", "", "reference", ""); err != nil { + t.Fatal(err) + } + if err := st.AddSpotRelation("d", "actor", spot, secondSpot, "depends_on"); err != nil { + t.Fatal(err) + } + byName, err := st.CityNode("d", "spot", "pageswiki") + if err != nil || byName.UUID != spot { + t.Fatalf("spot name address = %#v, %v", byName, err) + } + byUUID, err := st.CityNode("d", "spot", "uuid:"+spot) + if err != nil || byUUID.UUID != spot { + t.Fatalf("spot UUID address = %#v, %v", byUUID, err) + } + city, err := st.GetCityMap("d") + if err != nil { + t.Fatal(err) + } + if city.Version != 8 || len(city.Quartiers) != 1 || len(city.Quartiers[0].Streets) != 1 || len(city.Quartiers[0].Streets[0].Spots) != 2 || city.Quartiers[0].Streets[0].Spots[0].UUID != secondSpot && city.Quartiers[0].Streets[0].Spots[1].UUID != spot || len(city.Relations) != 1 { + t.Fatalf("city map = %#v", city) + } + var portalSpot CitySpot + for _, item := range city.Quartiers[0].Streets[0].Spots { + if item.UUID == spot { + portalSpot = item + break + } + } + if portalSpot.PortalPath != "/guide" || portalSpot.PortalPageUUID != "page-1" { + t.Fatalf("spot portal = %#v", portalSpot) + } + appearances, err := st.ListPageSpotAppearances("d", "page-1") + if err != nil || len(appearances) != 2 { + t.Fatalf("MagicPage appearances = %#v, %v", appearances, err) + } + var events int + if err := database.QueryRow(`SELECT COUNT(*) FROM topology_events WHERE domain_uuid='d'`).Scan(&events); err != nil || events != 7 { + t.Fatalf("events = %d, %v", events, err) + } + secondQuartier, err := st.CreateZone("d", "actor", "quartier", "", "operations", "Operations", "") + if err != nil { + t.Fatal(err) + } + secondStreet, err := st.CreateZone("d", "actor", "street", secondQuartier, "service", "Service", "") + if err != nil { + t.Fatal(err) + } + if err := st.MoveStreet("d", "actor", street, secondQuartier, 10); err == nil { + t.Fatal("Street moved outside its Quartier Path boundary") + } + if err := st.MoveStreet("d", "actor", street, quartier, 10); err != nil { + t.Fatal(err) + } + if err := st.MoveSpot("d", "actor", spot, secondStreet, 20); err == nil { + t.Fatal("Spot moved outside its Street Path boundary") + } + if err := st.MoveSpot("d", "actor", spot, street, 20); err != nil { + t.Fatal(err) + } + if err := st.RemoveSpotRelation("d", "actor", spot, secondSpot, "depends_on"); err != nil { + t.Fatal(err) + } + if err := st.RemoveSpotPage("d", "actor", secondSpot, "page-1", "reference"); err != nil { + t.Fatal(err) + } + final, err := st.GetCityMap("d") + if err != nil || final.Version != 14 || len(final.Relations) != 0 { + t.Fatalf("final city = %#v, %v", final, err) + } +} + +func TestDeleteCityNodeRecursivelyArchivesTopology(t *testing.T) { + database, err := sql.Open("sqlite", "file:city-delete-test?mode=memory&cache=shared") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database} + if err := st.EnsureCitySchema(); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`CREATE TABLE paths(domain_uuid TEXT,path TEXT,object_uuid TEXT,is_primary INTEGER DEFAULT 0); INSERT INTO paths(domain_uuid,path,object_uuid,is_primary) VALUES('d','/kept','page-kept',1)`); err != nil { + t.Fatal(err) + } + quartier, err := st.CreateZone("d", "actor", "quartier", "", "delete-me", "Delete me", "") + if err != nil { + t.Fatal(err) + } + street, err := st.CreateZone("d", "actor", "street", quartier, "nested-street", "Nested", "") + if err != nil { + t.Fatal(err) + } + spot, err := st.CreateSpot("d", "actor", street, "nested-spot", "Nested", "") + if err != nil { + t.Fatal(err) + } + if err := st.AddSpotPage("d", "actor", spot, "page-kept", "", "primary", "Kept page"); err != nil { + t.Fatal(err) + } + city, err := st.GetCityMap("d") + if err != nil || len(city.Quartiers[0].Streets[0].Spots[0].Pages) != 1 { + t.Fatalf("page graph = %#v, %v", city, err) + } + if err := st.DeleteCityNode("d", "actor", "quartier", quartier); err != nil { + t.Fatal(err) + } + city, err = st.GetCityMap("d") + if err != nil || len(city.Quartiers) != 0 { + t.Fatalf("deleted map = %#v, %v", city, err) + } + var paths, edges int + if err := database.QueryRow(`SELECT COUNT(*) FROM paths WHERE object_uuid='page-kept'`).Scan(&paths); err != nil { + t.Fatal(err) + } + if err := database.QueryRow(`SELECT COUNT(*) FROM spot_pages WHERE spot_uuid=?`, spot).Scan(&edges); err != nil { + t.Fatal(err) + } + if paths != 1 || edges != 0 { + t.Fatalf("document paths=%d graph edges=%d", paths, edges) + } +} + +func TestArchivedCityNamesCanBeReused(t *testing.T) { + database, err := sql.Open("sqlite", "file:city-name-reuse-test?mode=memory&cache=shared") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database} + if err := st.EnsureCitySchema(); err != nil { + t.Fatal(err) + } + quartier, err := st.CreateZoneAtPath("d", "actor", "quartier", "", "life", "Life", "", "/life") + if err != nil { + t.Fatal(err) + } + street, err := st.CreateZoneAtPath("d", "actor", "street", quartier, "home", "Home", "", "/life/home") + if err != nil { + t.Fatal(err) + } + spot, err := st.CreateSpotAtPath("d", "actor", street, "portal", "Portal", "", "/life/home/portal") + if err != nil { + t.Fatal(err) + } + if err := st.DeleteCityNode("d", "actor", "spot", spot); err != nil { + t.Fatal(err) + } + if _, err := st.CreateSpotAtPath("d", "actor", street, "portal", "New portal", "", "/life/home/new-portal"); err != nil { + t.Fatalf("reusing archived Spot name: %v", err) + } + if err := st.DeleteCityNode("d", "actor", "street", street); err != nil { + t.Fatal(err) + } + if _, err := st.CreateZoneAtPath("d", "actor", "street", quartier, "home", "New home", "", "/life/new-home"); err != nil { + t.Fatalf("reusing archived Street name: %v", err) + } +} + +func TestCityPathBoundariesInferPrimarySpot(t *testing.T) { + database, err := sql.Open("sqlite", "file:city-path-test?mode=memory&cache=shared") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database} + if err := st.EnsureCitySchema(); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`CREATE TABLE paths(domain_uuid TEXT,path TEXT,object_uuid TEXT,is_primary INTEGER DEFAULT 0); INSERT INTO paths VALUES('d','/life/home/kitchen/recipe','recipe-page',1)`); err != nil { + t.Fatal(err) + } + quartier, err := st.CreateZoneAtPath("d", "actor", "quartier", "", "life", "Life", "", "/life") + if err != nil { + t.Fatal(err) + } + if _, err := st.CreateZoneAtPath("d", "actor", "street", quartier, "outside", "Outside", "", "/work/outside"); err == nil { + t.Fatal("accepted Street outside Quartier boundary") + } + street, err := st.CreateZoneAtPath("d", "actor", "street", quartier, "home", "Home", "", "/life/home") + if err != nil { + t.Fatal(err) + } + spot, err := st.CreateSpotAtPath("d", "actor", street, "kitchen", "Kitchen", "", "/life/home/kitchen") + if err != nil { + t.Fatal(err) + } + if _, err := st.CreateSpotAtPath("d", "actor", street, "overlap", "Overlap", "", "/life/home/kitchen/sub"); err == nil { + t.Fatal("accepted overlapping Spot boundary") + } + pages, err := st.ListSpotPages("d", spot) + if err != nil || len(pages) != 1 || pages[0].PageUUID != "recipe-page" || pages[0].Source != "path" { + t.Fatalf("inferred pages=%#v, %v", pages, err) + } + appearances, err := st.ListPageSpotAppearances("d", "recipe-page") + if err != nil || len(appearances) != 1 || appearances[0].SpotUUID != spot || appearances[0].Source != "path" { + t.Fatalf("inferred appearances=%#v, %v", appearances, err) + } + city, err := st.GetCityMap("d") + if err != nil { + t.Fatal(err) + } + portal := city.Quartiers[0].Streets[0].Spots[0] + if portal.PortalPath != "/life/home/kitchen/recipe" || portal.PortalPageUUID != "recipe-page" { + t.Fatalf("inferred spot portal = %#v", portal) + } +} + +func TestCityDetailsPathAndRecursiveRenameStayInSync(t *testing.T) { + database, err := sql.Open("sqlite", "file:city-path-rename-test?mode=memory&cache=shared") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database} + if err := st.EnsureCitySchema(); err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`CREATE TABLE domains(uuid TEXT PRIMARY KEY,placement TEXT,enabled INTEGER); INSERT INTO domains VALUES('d','local',1); CREATE TABLE paths(domain_uuid TEXT,path TEXT,object_uuid TEXT,created_at INTEGER DEFAULT 0,is_primary INTEGER DEFAULT 0,PRIMARY KEY(domain_uuid,path)); CREATE TABLE revisions(uuid TEXT,object_uuid TEXT,body TEXT,document_hash TEXT,lang TEXT,content_type TEXT,filename TEXT,message TEXT,created_at_ms INTEGER,created_at INTEGER); INSERT INTO paths(domain_uuid,path,object_uuid) VALUES('d','/life/home/page','page-1')`); err != nil { + t.Fatal(err) + } + quartier, err := st.CreateZoneAtPath("d", "actor", "quartier", "", "life", "Life", "", "/life") + if err != nil { + t.Fatal(err) + } + street, err := st.CreateZoneAtPath("d", "actor", "street", quartier, "home", "Home", "", "/life/home") + if err != nil { + t.Fatal(err) + } + spot, err := st.CreateSpotAtPath("d", "actor", street, "page", "Page", "", "/life/home/page") + if err != nil { + t.Fatal(err) + } + if err := st.UpdateCityNodePath("d", "actor", "spot", spot, "/life/home/portal"); err != nil { + t.Fatal(err) + } + if _, err := st.RenamePathsInDomain("d", "/life", "/living", true); err != nil { + t.Fatal(err) + } + for kind, id := range map[string]string{"quartier": quartier, "street": street, "spot": spot} { + detail, err := st.CityNode("d", kind, "uuid:"+id) + if err != nil { + t.Fatal(err) + } + if !strings.HasPrefix(detail.PathPrefix, "/living") { + t.Fatalf("%s path did not follow rename: %q", kind, detail.PathPrefix) + } + } +} + +func TestSpotPathCanBeRepairedWithUnrelatedUnsetBoundaries(t *testing.T) { + database, err := sql.Open("sqlite", "file:city-legacy-boundary-test?mode=memory&cache=shared") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database} + if err := st.EnsureCitySchema(); err != nil { + t.Fatal(err) + } + quartier, err := st.CreateZoneAtPath("d", "actor", "quartier", "", "life", "Life", "", "/life") + if err != nil { + t.Fatal(err) + } + street, err := st.CreateZoneAtPath("d", "actor", "street", quartier, "home", "Home", "", "/life/home") + if err != nil { + t.Fatal(err) + } + spot, err := st.CreateSpotAtPath("d", "actor", street, "portal", "Portal", "", "/life/home/portal") + if err != nil { + t.Fatal(err) + } + if _, err := database.Exec(`UPDATE zones SET path_prefix=''`); err != nil { + t.Fatal(err) + } + if err := st.UpdateCityNodePath("d", "actor", "spot", spot, "/moved-portal"); err != nil { + t.Fatalf("unrelated unset boundaries blocked Spot move: %v", err) + } + detail, err := st.CityNode("d", "spot", "uuid:"+spot) + if err != nil || detail.PathPrefix != "/moved-portal" { + t.Fatalf("moved Spot = %#v, %v", detail, err) + } +} + +func TestCityNodeOverlappingPathFindsExistingMergeTarget(t *testing.T) { + database, err := sql.Open("sqlite", "file:city-overlap-merge-test?mode=memory&cache=shared") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { database.Close() }) + st := &Store{DB: database} + if err := st.EnsureCitySchema(); err != nil { + t.Fatal(err) + } + q, err := st.CreateZoneAtPath("d", "actor", "quartier", "", "tech", "Tech", "", "/tech") + if err != nil { + t.Fatal(err) + } + street, err := st.CreateZoneAtPath("d", "actor", "street", q, "dev", "Dev", "", "/tech/dev") + if err != nil { + t.Fatal(err) + } + spot, err := st.CreateSpotAtPath("d", "actor", street, "lang", "Lang", "", "/tech/dev/lang") + if err != nil { + t.Fatal(err) + } + got, err := st.CityNodeOverlappingPath("d", "spot", street, "/tech/dev/lang/python") + if err != nil || got.UUID != spot { + t.Fatalf("merge target = %#v, %v", got, err) + } +} diff --git a/internal/store/config.go b/internal/store/config.go index fcc3754..11f9e7c 100644 --- a/internal/store/config.go +++ b/internal/store/config.go @@ -3,62 +3,123 @@ package store import "database/sql" func (s *Store) EnsureConfigTable() error { - - _, err := s.DB.Exec(` - CREATE TABLE IF NOT EXISTS config ( - key TEXT PRIMARY KEY, - value TEXT NOT NULL, - updated_at INTEGER NOT NULL - ) - `) - - return err -} - -func (s *Store) GetConfig( - key string, -) (string, error) { - - var value string - - err := s.DB.QueryRow(` - SELECT value - FROM config - WHERE key = ? - `, key).Scan(&value) - - if err == sql.ErrNoRows { - return "", nil + domain, err := s.GetDefaultDomain() + if err != nil { + return err } + _, err = s.DB.Exec(` + CREATE TABLE IF NOT EXISTS config ( + domain_uuid TEXT NOT NULL, + key TEXT NOT NULL, + value TEXT NOT NULL, + updated_at INTEGER NOT NULL, + PRIMARY KEY (domain_uuid, key) + ) + `) + if err != nil { + return err + } + + columns, err := tableColumns(s.DB, "config") + if err != nil { + return err + } + if columns["domain_uuid"] { + return nil + } + + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + + if _, err = tx.Exec(` + CREATE TABLE config_domain_scoped ( + domain_uuid TEXT NOT NULL, + key TEXT NOT NULL, + value TEXT NOT NULL, + updated_at INTEGER NOT NULL, + PRIMARY KEY (domain_uuid, key) + ) + `); err != nil { + return err + } + if _, err = tx.Exec(` + INSERT INTO config_domain_scoped (domain_uuid, key, value, updated_at) + SELECT ?, key, value, updated_at FROM config + `, domain.UUID); err != nil { + return err + } + if _, err = tx.Exec(`DROP TABLE config`); err != nil { + return err + } + if _, err = tx.Exec(` + ALTER TABLE config_domain_scoped RENAME TO config + `); err != nil { + return err + } + return tx.Commit() +} + +func tableColumns(db *sql.DB, table string) (map[string]bool, error) { + rows, err := db.Query(`PRAGMA table_info(` + table + `)`) + if err != nil { + return nil, err + } + defer rows.Close() + columns := map[string]bool{} + for rows.Next() { + var cid, notNull, primaryKey int + var name, kind string + var defaultValue any + if err := rows.Scan( + &cid, &name, &kind, ¬Null, &defaultValue, &primaryKey, + ); err != nil { + return nil, err + } + columns[name] = true + } + return columns, rows.Err() +} + +func (s *Store) GetConfig(key string) (string, error) { + domainUUID, err := s.defaultDomainUUID() if err != nil { return "", err } - - return value, nil + return s.GetConfigInDomain(domainUUID, key) } -func (s *Store) SetConfig( - key string, - value string, -) error { +func (s *Store) GetConfigInDomain(domainUUID, key string) (string, error) { + var value string + err := s.DB.QueryRow(` + SELECT value FROM config + WHERE domain_uuid = ? AND key = ? + `, domainUUID, key).Scan(&value) + if err == sql.ErrNoRows { + return "", nil + } + return value, err +} +func (s *Store) SetConfig(key, value string) error { + domainUUID, err := s.defaultDomainUUID() + if err != nil { + return err + } + return s.SetConfigInDomain(domainUUID, key, value) +} + +func (s *Store) SetConfigInDomain(domainUUID, key, value string) error { _, err := s.DB.Exec(` - INSERT INTO config ( - key, - value, - updated_at - ) - VALUES ( - ?, - ?, - strftime('%s','now') - ) - ON CONFLICT(key) + INSERT INTO config (domain_uuid, key, value, updated_at) + VALUES (?, ?, ?, strftime('%s','now')) + ON CONFLICT(domain_uuid, key) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at - `, key, value) - + `, domainUUID, key, value) return err } diff --git a/internal/store/create_object.go b/internal/store/create_object.go index 7fceba0..3e1ef62 100644 --- a/internal/store/create_object.go +++ b/internal/store/create_object.go @@ -5,7 +5,7 @@ import ( ) func (s *Store) CreateObject( - path string, + kind string, ) (string, error) { objectUUID := @@ -14,24 +14,7 @@ func (s *Store) CreateObject( _, err := s.DB.Exec(` INSERT INTO objects ( uuid, - created_at - ) - VALUES ( - ?, - strftime('%s','now') - ) - `, - objectUUID, - ) - - if err != nil { - return "", err - } - - _, err = s.DB.Exec(` - INSERT INTO paths ( - path, - object_uuid, + kind, created_at ) VALUES ( @@ -39,8 +22,8 @@ func (s *Store) CreateObject( strftime('%s','now') ) `, - path, objectUUID, + kind, ) if err != nil { diff --git a/internal/store/delete_object.go b/internal/store/delete_object.go index 1d4deba..613ab08 100644 --- a/internal/store/delete_object.go +++ b/internal/store/delete_object.go @@ -1,5 +1,7 @@ package store +import "database/sql" + func (s *Store) DeleteObject( objectUUID string, ) error { @@ -10,46 +12,26 @@ func (s *Store) DeleteObject( if err != nil { return err } - - _, err = tx.Exec(` - DELETE FROM paths - WHERE object_uuid = ? - `, objectUUID) - - if err != nil { - tx.Rollback() + defer tx.Rollback() + if err := deleteObjectTx(tx, objectUUID); err != nil { return err } - - _, err = tx.Exec(` - DELETE FROM tags - WHERE object_uuid = ? - `, objectUUID) - - if err != nil { - tx.Rollback() + if err := tx.Commit(); err != nil { return err } - - _, err = tx.Exec(` - DELETE FROM revisions - WHERE object_uuid = ? - `, objectUUID) - - if err != nil { - tx.Rollback() - return err - } - - _, err = tx.Exec(` - DELETE FROM objects - WHERE uuid = ? - `, objectUUID) - - if err != nil { - tx.Rollback() - return err + s.InvalidatePathCaches() + return nil +} + +func deleteObjectTx(tx *sql.Tx, objectUUID string) error { + for _, table := range []string{"paths", "tags", "revisions", "objects"} { + column := "object_uuid" + if table == "objects" { + column = "uuid" + } + if _, err := tx.Exec(`DELETE FROM `+table+` WHERE `+column+` = ?`, objectUUID); err != nil { + return err + } } - - return tx.Commit() + return nil } diff --git a/internal/store/districts.go b/internal/store/districts.go deleted file mode 100644 index 57d1869..0000000 --- a/internal/store/districts.go +++ /dev/null @@ -1,469 +0,0 @@ -package store - -import ( - "database/sql" - "errors" - "strings" - "time" - - "github.com/google/uuid" -) - -type District struct { - ID int64 - UUID string - Name string - Title string - Domain string - Enabled bool - CreatedAt int64 -} - -func (s *Store) EnsureDistrictsSchema() error { - - _, err := s.DB.Exec(` - CREATE TABLE IF NOT EXISTS districts ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - uuid TEXT NOT NULL UNIQUE, - name TEXT NOT NULL UNIQUE, - title TEXT NOT NULL, - domain TEXT NOT NULL DEFAULT '', - enabled INTEGER NOT NULL DEFAULT 1, - created_at INTEGER NOT NULL - ) - `) - - if err != nil { - return err - } - - return s.EnsureAtLeastOneDistrict() -} - -func (s *Store) EnsureAtLeastOneDistrict() error { - - var count int - - err := s.DB.QueryRow(` - SELECT count(*) - FROM districts - `).Scan(&count) - - if err != nil { - return err - } - - if count > 0 { - return nil - } - - _, err = s.DB.Exec(` - INSERT INTO districts ( - uuid, - name, - title, - domain, - enabled, - created_at - ) - VALUES (?, 'default', 'Default District', '', 1, ?) - `, - uuid.NewString(), - time.Now().Unix(), - ) - - return err -} - -func (s *Store) GetDefaultDistrict() (*District, error) { - - row := s.DB.QueryRow(` - SELECT - id, - uuid, - name, - title, - domain, - enabled, - created_at - FROM districts - WHERE enabled = 1 - ORDER BY - CASE WHEN name = 'default' THEN 0 ELSE 1 END, - id - LIMIT 1 - `) - - return scanDistrict(row) -} - -func (s *Store) GetDistrictByHost( - host string, -) (*District, error) { - - host = - normalizeDistrictHost( - host, - ) - - if host == "" { - return s.GetDefaultDistrict() - } - - subdomain := - host - - if i := strings.IndexByte(host, '.'); i > 0 { - subdomain = host[:i] - } - - row := s.DB.QueryRow(` - SELECT - id, - uuid, - name, - title, - domain, - enabled, - created_at - FROM districts - WHERE enabled = 1 - AND ( - lower(domain) = ? - OR lower(domain) = ? - OR lower(name) = ? - ) - ORDER BY - CASE WHEN lower(domain) = ? THEN 0 ELSE 1 END, - id - LIMIT 1 - `, - host, - subdomain, - subdomain, - host, - ) - - d, err := - scanDistrict( - row, - ) - - if errors.Is(err, sql.ErrNoRows) { - return s.GetDefaultDistrict() - } - - return d, err -} - -func (s *Store) ListDistricts() ([]District, error) { - - rows, err := s.DB.Query(` - SELECT - id, - uuid, - name, - title, - domain, - enabled, - created_at - FROM districts - ORDER BY - CASE WHEN name = 'default' THEN 0 ELSE 1 END, - name, - id - `) - - if err != nil { - return nil, err - } - - defer rows.Close() - - var out []District - - for rows.Next() { - d, err := - scanDistrict( - rows, - ) - - if err != nil { - return nil, err - } - - out = append( - out, - *d, - ) - } - - return out, rows.Err() -} - -func (s *Store) CreateDistrict( - name string, - title string, - domain string, - enabled bool, -) error { - - name = - normalizeDistrictName( - name, - ) - - title = - strings.TrimSpace( - title, - ) - - domain = - normalizeDistrictHost( - domain, - ) - - if name == "" { - return errors.New("district name is required") - } - - if title == "" { - title = name - } - - if err := s.ensureDistrictUnique(0, name, domain); err != nil { - return err - } - - enabledValue := 0 - - if enabled { - enabledValue = 1 - } - - _, err := s.DB.Exec(` - INSERT INTO districts ( - uuid, - name, - title, - domain, - enabled, - created_at - ) - VALUES (?, ?, ?, ?, ?, ?) - `, - uuid.NewString(), - name, - title, - domain, - enabledValue, - time.Now().Unix(), - ) - - return err -} - -func (s *Store) UpdateDistrict( - id int64, - name string, - title string, - domain string, - enabled bool, -) error { - - name = - normalizeDistrictName( - name, - ) - - title = - strings.TrimSpace( - title, - ) - - domain = - normalizeDistrictHost( - domain, - ) - - if id <= 0 { - return errors.New("district id is required") - } - - if name == "" { - return errors.New("district name is required") - } - - if title == "" { - title = name - } - - if err := s.ensureDistrictUnique(id, name, domain); err != nil { - return err - } - - enabledValue := 0 - - if enabled { - enabledValue = 1 - } - - _, err := s.DB.Exec(` - UPDATE districts - SET - name = ?, - title = ?, - domain = ?, - enabled = ? - WHERE id = ? - `, - name, - title, - domain, - enabledValue, - id, - ) - - return err -} - -func (s *Store) CountDistricts() (int, error) { - - var count int - - err := s.DB.QueryRow(` - SELECT count(*) - FROM districts - `).Scan(&count) - - return count, err -} - -func (s *Store) DeleteDistrict( - id int64, -) error { - - count, err := - s.CountDistricts() - - if err != nil { - return err - } - - if count <= 1 { - return sql.ErrNoRows - } - - _, err = s.DB.Exec(` - DELETE FROM districts - WHERE id = ? - `, id) - - return err -} - -func scanDistrict(row interface { - Scan(dest ...any) error -}) (*District, error) { - - var d District - var enabled int - - err := row.Scan( - &d.ID, - &d.UUID, - &d.Name, - &d.Title, - &d.Domain, - &enabled, - &d.CreatedAt, - ) - - if err != nil { - return nil, err - } - - d.Enabled = enabled != 0 - - return &d, nil -} - -func normalizeDistrictName( - name string, -) string { - - name = - strings.TrimSpace( - strings.ToLower( - name, - ), - ) - - name = - strings.ReplaceAll( - name, - " ", - "-", - ) - - return name -} - -func normalizeDistrictHost( - host string, -) string { - - host = - strings.TrimSpace( - strings.ToLower( - host, - ), - ) - - if host == "" { - return "" - } - - if i := strings.IndexByte(host, ':'); i > 0 { - host = host[:i] - } - - return strings.Trim( - host, - ".", - ) -} - -func (s *Store) ensureDistrictUnique( - excludeID int64, - name string, - domain string, -) error { - - var count int - - err := s.DB.QueryRow(` - SELECT count(*) - FROM districts - WHERE id != ? - AND ( - lower(name) = ? - OR (? != '' AND lower(domain) = ?) - ) - `, - excludeID, - name, - domain, - domain, - ).Scan(&count) - - if err != nil { - return err - } - - if count > 0 { - return errors.New("district name or domain already exists") - } - - return nil -} diff --git a/internal/store/document_store.go b/internal/store/document_store.go new file mode 100644 index 0000000..26451c2 --- /dev/null +++ b/internal/store/document_store.go @@ -0,0 +1,425 @@ +package store + +import ( + "bytes" + "crypto/sha256" + "database/sql" + "encoding/hex" + "errors" + "fmt" + "io" + "os" + "path/filepath" + "strings" +) + +type memoryDocumentReader struct { + *bytes.Reader +} + +func (memoryDocumentReader) Close() error { return nil } + +var ( + ErrInvalidDocumentHash = errors.New("invalid Document SHA-256") + ErrDocumentHashMismatch = errors.New( + "Document payload does not match SHA-256", + ) +) + +func MigrateLegacyDocumentRoot( + dataDir string, +) (string, error) { + documentRoot := + filepath.Join( + dataDir, + "documents", + ) + + legacyRoot := + filepath.Join( + dataDir, + ".documents", + ) + + _, documentErr := + os.Stat( + documentRoot, + ) + + _, legacyErr := + os.Stat( + legacyRoot, + ) + + documentExists := + documentErr == nil + + legacyExists := + legacyErr == nil + + if documentErr != nil && + !errors.Is(documentErr, os.ErrNotExist) { + return "", documentErr + } + + if legacyErr != nil && + !errors.Is(legacyErr, os.ErrNotExist) { + return "", legacyErr + } + + if documentExists && legacyExists { + return "", errors.New( + "both documents and legacy .documents directories exist", + ) + } + + if legacyExists { + if err := os.Rename( + legacyRoot, + documentRoot, + ); err != nil { + return "", err + } + } + + return documentRoot, nil +} + +func validDocumentHash(hash string) bool { + if len(hash) != sha256.Size*2 { + return false + } + + decoded, err := + hex.DecodeString( + hash, + ) + + return err == nil && len(decoded) == sha256.Size +} + +func (s *Store) documentPath( + hash string, +) (string, error) { + hash = + strings.ToLower( + strings.TrimSpace( + hash, + ), + ) + + if !validDocumentHash(hash) { + return "", ErrInvalidDocumentHash + } + + if s.DocumentRoot == "" { + return "", nil + } + + return filepath.Join( + s.DocumentRoot, + "sha256", + hash[:2], + hash, + ), nil +} + +func (s *Store) DocumentPath(hash string) (string, error) { + return s.documentPath(hash) +} + +// OpenDocument opens an immutable content-addressed Document. Callers must +// perform authorization through a referencing object before invoking it. +func (s *Store) OpenDocument(hash string) (io.ReadSeekCloser, error) { + path, err := s.documentPath(hash) + if err != nil { + return nil, err + } + if path != "" { + return os.Open(path) + } + var body string + if err := s.DB.QueryRow(`SELECT COALESCE(body,'') FROM revisions WHERE document_hash=? ORDER BY rowid DESC LIMIT 1`, strings.ToLower(strings.TrimSpace(hash))).Scan(&body); err != nil { + return nil, err + } + return memoryDocumentReader{bytes.NewReader([]byte(body))}, nil +} + +type DocumentReference struct { + Revision *Revision + Path string +} + +// DocumentReferencesInDomain returns bounded semantic references for a +// Document. The HTTP layer still evaluates read permission for each Path. +func (s *Store) DocumentReferencesInDomain(domainUUID, hash string) ([]DocumentReference, error) { + hash = strings.ToLower(strings.TrimSpace(hash)) + if !validDocumentHash(hash) { + return nil, sql.ErrNoRows + } + rows, err := s.DB.Query(` + SELECT r.uuid,r.object_uuid,COALESCE(r.document_hash,''), + COALESCE(NULLIF(r.lang,''),'und'), + COALESCE(NULLIF(r.content_type,''),'application/octet-stream'), + COALESCE(r.filename,''),'',COALESCE(r.message,''), + COALESCE(r.created_at,0), + COALESCE(r.created_at_ms,COALESCE(r.created_at,0)*1000),p.path + FROM revisions r + JOIN paths p ON p.object_uuid=r.object_uuid AND p.domain_uuid=? + WHERE r.document_hash=? OR EXISTS ( + SELECT 1 FROM revision_document_refs x + WHERE x.revision_uuid=r.uuid AND x.document_hash=? + ) + ORDER BY COALESCE(r.created_at_ms,r.created_at*1000) DESC, + COALESCE(p.is_primary,0) DESC,p.path,r.rowid DESC + LIMIT 256 + `, domainUUID, hash, hash) + if err != nil { + return nil, err + } + defer rows.Close() + var references []DocumentReference + for rows.Next() { + revision := &Revision{} + var path string + if err := rows.Scan(&revision.UUID, &revision.ObjectUUID, &revision.DocumentHash, + &revision.Language, &revision.ContentType, &revision.Filename, &revision.Body, + &revision.Message, &revision.CreatedAt, &revision.CreatedAtMS, &path); err != nil { + return nil, err + } + if revision.DocumentHash != hash { + // The containing Revision supplies authorization. The referenced + // Document has independent payload metadata and is detected at serve time. + revision.DocumentHash = hash + revision.ContentType = "application/octet-stream" + revision.Filename = hash + } + references = append(references, DocumentReference{Revision: revision, Path: path}) + } + if err := rows.Err(); err != nil { + return nil, err + } + if len(references) == 0 { + return nil, sql.ErrNoRows + } + return references, nil +} + +func (s *Store) persistDocument( + expectedHash string, + body string, +) error { + if s.DocumentRoot == "" { + return nil + } + + actualHash := + revisionHash( + body, + ) + + if !strings.EqualFold(expectedHash, actualHash) { + return fmt.Errorf( + "%w: expected %s, got %s", + ErrDocumentHashMismatch, + expectedHash, + actualHash, + ) + } + + path, err := + s.documentPath( + actualHash, + ) + + if err != nil { + return err + } + + if existing, err := os.ReadFile(path); err == nil { + if revisionHash(string(existing)) != actualHash { + return fmt.Errorf( + "%w: corrupt existing file %s", + ErrDocumentHashMismatch, + path, + ) + } + + return nil + } else if !errors.Is(err, os.ErrNotExist) { + return err + } + + dir := + filepath.Dir( + path, + ) + + if err := os.MkdirAll(dir, 0755); err != nil { + return err + } + + temp, err := + os.CreateTemp( + dir, + ".document-*", + ) + + if err != nil { + return err + } + + tempPath := + temp.Name() + + defer os.Remove(tempPath) + + if err := temp.Chmod(0644); err != nil { + temp.Close() + return err + } + + if _, err := temp.WriteString(body); err != nil { + temp.Close() + return err + } + + if err := temp.Sync(); err != nil { + temp.Close() + return err + } + + if err := temp.Close(); err != nil { + return err + } + + if err := os.Rename(tempPath, path); err != nil { + return err + } + + return nil +} + +func (s *Store) readDocument( + hash string, +) (string, error) { + if s.DocumentRoot == "" { + return "", os.ErrNotExist + } + + path, err := + s.documentPath( + hash, + ) + + if err != nil { + return "", err + } + + payload, err := + os.ReadFile( + path, + ) + + if err != nil { + return "", err + } + + body := + string( + payload, + ) + + if revisionHash(body) != strings.ToLower(hash) { + return "", fmt.Errorf( + "%w: corrupt file %s", + ErrDocumentHashMismatch, + path, + ) + } + + return body, nil +} + +func (s *Store) EnsureDocumentStore() error { + if s.DocumentRoot == "" { + return nil + } + + if err := os.MkdirAll( + filepath.Join( + s.DocumentRoot, + "sha256", + ), + 0755, + ); err != nil { + return err + } + + rows, err := s.DB.Query(` + SELECT + document_hash, + COALESCE(body, '') + FROM revisions + WHERE document_hash IS NOT NULL + AND document_hash != '' + `) + + if err != nil { + return err + } + + for rows.Next() { + var hash string + var body string + + if err := rows.Scan(&hash, &body); err != nil { + rows.Close() + return err + } + + if err := s.persistDocument(hash, body); err != nil { + rows.Close() + return err + } + } + + if err := rows.Err(); err != nil { + rows.Close() + return err + } + + return rows.Close() +} + +func (s *Store) hydrateRevision( + revision *Revision, +) (*Revision, error) { + if revision == nil || s.DocumentRoot == "" { + return revision, nil + } + + body, err := + s.readDocument( + revision.DocumentHash, + ) + + if errors.Is(err, os.ErrNotExist) { + if err := s.persistDocument( + revision.DocumentHash, + revision.Body, + ); err != nil { + return nil, err + } + + body = + revision.Body + } else if err != nil { + return nil, err + } + + revision.Body = + body + + return revision, nil +} diff --git a/internal/store/document_store_test.go b/internal/store/document_store_test.go new file mode 100644 index 0000000..f8fceef --- /dev/null +++ b/internal/store/document_store_test.go @@ -0,0 +1,278 @@ +package store_test + +import ( + "crypto/sha256" + "encoding/hex" + "os" + "path/filepath" + "testing" + + "pageswiki/internal/db" + "pageswiki/internal/store" +) + +func TestDocumentStoreIsCanonicalRevisionPayload(t *testing.T) { + root := t.TempDir() + database, err := db.Open(filepath.Join(root, "pages.db")) + if err != nil { + t.Fatal(err) + } + defer database.Close() + + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + + documentRoot := + filepath.Join( + root, + "documents", + ) + + st := + store.NewWithDocumentRoot( + database, + documentRoot, + ) + + pageUUID, err := st.CreatePageAtPath("/document-store") + if err != nil { + t.Fatal(err) + } + + body := "

    canonical Document

    " + + revision, err := + st.SaveRevisionForLanguage( + pageUUID, + body, + "save", + "en", + ) + if err != nil { + t.Fatal(err) + } + + sum := sha256.Sum256([]byte(body)) + expectedHash := hex.EncodeToString(sum[:]) + + if revision.DocumentHash != expectedHash { + t.Fatalf( + "Document hash = %q, want %q", + revision.DocumentHash, + expectedHash, + ) + } + + documentPath := + filepath.Join( + documentRoot, + "sha256", + expectedHash[:2], + expectedHash, + ) + + payload, err := os.ReadFile(documentPath) + if err != nil { + t.Fatal(err) + } + + if string(payload) != body { + t.Fatalf("Document payload = %q", string(payload)) + } + + _, err = database.Exec(` + UPDATE revisions + SET body = 'corrupt compatibility cache' + WHERE uuid = ? + `, revision.UUID) + if err != nil { + t.Fatal(err) + } + + loaded, err := st.GetRevision(revision.UUID) + if err != nil { + t.Fatal(err) + } + + if loaded.Body != body { + t.Fatalf("loaded canonical payload = %q", loaded.Body) + } +} + +func TestBinaryRevisionPreservesContentMetadataAndPayload(t *testing.T) { + root := t.TempDir() + database, err := db.Open(filepath.Join(root, "pages.db")) + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := store.NewWithDocumentRoot( + database, + filepath.Join(root, "documents"), + ) + pageUUID, err := st.CreatePageAtPath("/pixel.png") + if err != nil { + t.Fatal(err) + } + payload := []byte{0x89, 'P', 'N', 'G', 0x00, 0xff} + revision, err := st.SaveRevisionContent( + pageUUID, + payload, + "upload", + "und", + "image/png", + "pixel.png", + ) + if err != nil { + t.Fatal(err) + } + loaded, err := st.GetRevision(revision.UUID) + if err != nil { + t.Fatal(err) + } + if loaded.ContentType != "image/png" || + loaded.Filename != "pixel.png" || + string([]byte(loaded.Body)) != string(payload) { + t.Fatalf("loaded binary Revision = %#v", loaded) + } +} + +func TestDocumentStoreBackfillsExistingRevisions(t *testing.T) { + root := t.TempDir() + database, err := db.Open(filepath.Join(root, "pages.db")) + if err != nil { + t.Fatal(err) + } + defer database.Close() + + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + + legacyStore := store.New(database) + + pageUUID, err := legacyStore.CreatePageAtPath("/legacy-document") + if err != nil { + t.Fatal(err) + } + + revision, err := + legacyStore.SaveRevisionForLanguage( + pageUUID, + "legacy payload", + "legacy", + "und", + ) + if err != nil { + t.Fatal(err) + } + + documentRoot := + filepath.Join( + root, + "documents", + ) + + store.NewWithDocumentRoot( + database, + documentRoot, + ) + + documentPath := + filepath.Join( + documentRoot, + "sha256", + revision.DocumentHash[:2], + revision.DocumentHash, + ) + + payload, err := os.ReadFile(documentPath) + if err != nil { + t.Fatal(err) + } + + if string(payload) != revision.Body { + t.Fatalf("backfilled payload = %q", string(payload)) + } +} + +func TestLegacyDocumentRootIsRenamed(t *testing.T) { + dataDir := t.TempDir() + legacyRoot := + filepath.Join( + dataDir, + ".documents", + ) + + if err := os.MkdirAll( + filepath.Join( + legacyRoot, + "sha256", + ), + 0755, + ); err != nil { + t.Fatal(err) + } + + documentRoot, err := + store.MigrateLegacyDocumentRoot( + dataDir, + ) + if err != nil { + t.Fatal(err) + } + + expectedRoot := + filepath.Join( + dataDir, + "documents", + ) + + if documentRoot != expectedRoot { + t.Fatalf( + "Document root = %q, want %q", + documentRoot, + expectedRoot, + ) + } + + if _, err := os.Stat(legacyRoot); !os.IsNotExist(err) { + t.Fatalf("legacy root still exists: %v", err) + } + + if _, err := os.Stat( + filepath.Join( + documentRoot, + "sha256", + ), + ); err != nil { + t.Fatal(err) + } +} + +func TestDocumentRootMigrationRejectsSplitStores(t *testing.T) { + dataDir := t.TempDir() + + for _, name := range []string{ + ".documents", + "documents", + } { + if err := os.Mkdir( + filepath.Join( + dataDir, + name, + ), + 0755, + ); err != nil { + t.Fatal(err) + } + } + + if _, err := store.MigrateLegacyDocumentRoot(dataDir); err == nil { + t.Fatal("split Document roots were accepted") + } +} diff --git a/internal/store/document_window.go b/internal/store/document_window.go new file mode 100644 index 0000000..36aaf2b --- /dev/null +++ b/internal/store/document_window.go @@ -0,0 +1,96 @@ +package store + +import ( + "errors" + "io" + "os" +) + +const MaxDocumentWindowBytes int64 = 256 << 10 + +type DocumentWindow struct { + Data []byte + Offset int64 + NextOffset int64 + TotalBytes int64 + Truncated bool +} + +func (s *Store) ReadDocumentWindow(documentHash string, offset, limit int64) (DocumentWindow, error) { + if offset < 0 { + return DocumentWindow{}, errors.New("negative Document offset") + } + if limit < 1 { + limit = 64 << 10 + } + if limit > MaxDocumentWindowBytes { + limit = MaxDocumentWindowBytes + } + if s.DocumentRoot != "" { + path, err := s.DocumentPath(documentHash) + if err != nil { + return DocumentWindow{}, err + } + file, err := os.Open(path) + if err != nil { + return DocumentWindow{}, err + } + defer file.Close() + info, err := file.Stat() + if err != nil { + return DocumentWindow{}, err + } + if offset > info.Size() { + offset = info.Size() + } + data := make([]byte, minInt64(limit, info.Size()-offset)) + n, err := file.ReadAt(data, offset) + if err != nil && !errors.Is(err, io.EOF) { + return DocumentWindow{}, err + } + data = data[:n] + return DocumentWindow{Data: data, Offset: offset, NextOffset: offset + int64(n), TotalBytes: info.Size(), Truncated: offset+int64(n) < info.Size()}, nil + } + var body string + if err := s.DB.QueryRow(`SELECT COALESCE(body,'') FROM revisions WHERE document_hash=? ORDER BY rowid DESC LIMIT 1`, documentHash).Scan(&body); err != nil { + return DocumentWindow{}, err + } + total := int64(len(body)) + if offset > total { + offset = total + } + end := offset + limit + if end > total { + end = total + } + return DocumentWindow{Data: []byte(body[offset:end]), Offset: offset, NextOffset: end, TotalBytes: total, Truncated: end < total}, nil +} + +func minInt64(a, b int64) int64 { + if a < b { + return a + } + return b +} + +func (s *Store) GetRevisionMetadata(revisionUUID string) (*Revision, error) { + row := s.DB.QueryRow(`SELECT uuid,object_uuid,COALESCE(document_hash,''),COALESCE(NULLIF(lang,''),'und'),COALESCE(NULLIF(content_type,''),'text/html; charset=utf-8'),COALESCE(filename,''),'',COALESCE(message,''),COALESCE(created_at,0),COALESCE(created_at_ms,COALESCE(created_at,0)*1000) FROM revisions WHERE uuid=?`, revisionUUID) + return scanRevision(row) +} + +func (s *Store) DocumentSize(documentHash string) (int64, error) { + if s.DocumentRoot != "" { + path, err := s.DocumentPath(documentHash) + if err != nil { + return 0, err + } + info, err := os.Stat(path) + if err != nil { + return 0, err + } + return info.Size(), nil + } + var size int64 + err := s.DB.QueryRow(`SELECT length(COALESCE(body,'')) FROM revisions WHERE document_hash=? ORDER BY rowid DESC LIMIT 1`, documentHash).Scan(&size) + return size, err +} diff --git a/internal/store/document_window_test.go b/internal/store/document_window_test.go new file mode 100644 index 0000000..1a07747 --- /dev/null +++ b/internal/store/document_window_test.go @@ -0,0 +1,35 @@ +package store_test + +import ( + "bytes" + "testing" + + "pageswiki/internal/store" +) + +func TestDocumentWindowIsBoundedAndSeekable(t *testing.T) { + st := newTopologyStore(t) + st.DocumentRoot = t.TempDir() + if err := st.EnsureDocumentStore(); err != nil { + t.Fatal(err) + } + object, err := st.CreatePageAtPathInDomain(mustDefaultDomainUUID(t, st), "/large.txt") + if err != nil { + t.Fatal(err) + } + payload := bytes.Repeat([]byte("abcdef"), 100000) + revision, err := st.SaveRevisionContent(object, payload, "test", "und", "text/plain", "large.txt") + if err != nil { + t.Fatal(err) + } + window, err := st.ReadDocumentWindow(revision.DocumentHash, 123, store.MaxDocumentWindowBytes*2) + if err != nil { + t.Fatal(err) + } + if int64(len(window.Data)) != store.MaxDocumentWindowBytes || window.Offset != 123 || !window.Truncated || window.TotalBytes != int64(len(payload)) { + t.Fatalf("window=%+v length=%d", window, len(window.Data)) + } + if !bytes.Equal(window.Data[:12], payload[123:135]) { + t.Fatal("window did not seek to requested offset") + } +} diff --git a/internal/store/domain_entry.go b/internal/store/domain_entry.go new file mode 100644 index 0000000..8bacc78 --- /dev/null +++ b/internal/store/domain_entry.go @@ -0,0 +1,179 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "time" +) + +var ErrManifestCapability = errors.New("all approved Campus instances must announce manifest v2 support before saving entry settings") + +func (s *Store) CampusLegacyManifestPeers() (map[string]int, error) { + rows, err := s.DB.Query(`SELECT i.campus_uuid,count(*) FROM federation_instances i LEFT JOIN federation_instance_capabilities c ON c.instance_uuid=i.uuid WHERE i.status='approved' AND COALESCE(c.manifest_version,1)<2 GROUP BY i.campus_uuid`) + if err != nil { + return nil, err + } + defer rows.Close() + out := map[string]int{} + for rows.Next() { + var id string + var n int + if err = rows.Scan(&id, &n); err != nil { + return nil, err + } + out[id] = n + } + return out, rows.Err() +} + +// A deliberately narrow allowlist; never federate arbitrary config or secrets. +type DomainEntrySettings struct { + Layout string `json:"layout"` + DiaryEnabled bool `json:"diary_enabled"` + DiaryPrefix string `json:"diary_prefix"` + BlogEnabled bool `json:"blog_enabled"` + BlogPrefix string `json:"blog_prefix"` +} + +func (e DomainEntrySettings) valid() bool { + switch e.Layout { + case "classic", "search", "directory", "diary", "blog": + default: + return false + } + if e.Layout == "diary" && !e.DiaryEnabled || e.Layout == "blog" && !e.BlogEnabled { + return false + } + for _, prefix := range []string{e.DiaryPrefix, e.BlogPrefix} { + if _, err := PeriodicalPath(prefix, "2000-01-01", ""); err != nil { + return false + } + } + return true +} + +func (s *Store) ListDomainEntrySettings() (map[string]DomainEntrySettings, error) { + rows, err := s.DB.Query(`SELECT domain_uuid,settings_json FROM domain_entry_settings`) + if err != nil { + return nil, err + } + defer rows.Close() + out := map[string]DomainEntrySettings{} + for rows.Next() { + var id, raw string + if err = rows.Scan(&id, &raw); err != nil { + return nil, err + } + var e DomainEntrySettings + if err = json.Unmarshal([]byte(raw), &e); err != nil { + return nil, err + } + out[id] = e + } + return out, rows.Err() +} + +func (s *Store) DomainEntryControlled(domain string) (bool, error) { + var exists bool + err := s.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM domain_entry_settings WHERE domain_uuid=?)`, domain).Scan(&exists) + return exists, err +} + +// Populate the dialog with effective local values before control is first enabled. +// One metadata query avoids issuing five config reads for every Domain row. +func (s *Store) DomainEntryOptions() (map[string]DomainEntrySettings, error) { + entries, err := s.ListDomainEntrySettings() + if err != nil { + return nil, err + } + rows, err := s.DB.Query(`SELECT d.uuid,COALESCE(c.value,'classic'),COALESCE(ds.enabled,0),COALESCE(dp.prefix,'/diary'),COALESCE(bs.enabled,0),COALESCE(bp.prefix,'/blog') FROM domains d LEFT JOIN config c ON c.domain_uuid=d.uuid AND c.key='home_layout' LEFT JOIN periodical_settings ds ON ds.domain_uuid=d.uuid AND ds.kind='diary' LEFT JOIN periodical_settings bs ON bs.domain_uuid=d.uuid AND bs.kind='blog' LEFT JOIN periodical_prefixes dp ON dp.domain_uuid=d.uuid AND dp.kind='diary' LEFT JOIN periodical_prefixes bp ON bp.domain_uuid=d.uuid AND bp.kind='blog'`) + if err != nil { + return nil, err + } + defer rows.Close() + for rows.Next() { + var id string + var e DomainEntrySettings + if err = rows.Scan(&id, &e.Layout, &e.DiaryEnabled, &e.DiaryPrefix, &e.BlogEnabled, &e.BlogPrefix); err != nil { + return nil, err + } + if _, ok := entries[id]; !ok { + entries[id] = e + } + } + return entries, rows.Err() +} + +func saveDomainEntryTx(tx *sql.Tx, domain string, e DomainEntrySettings, apply bool) error { + if !e.valid() { + return ErrPeriodicalInvalid + } + raw, _ := json.Marshal(e) + if _, err := tx.Exec(`INSERT INTO domain_entry_settings(domain_uuid,settings_json) VALUES(?,?) ON CONFLICT(domain_uuid) DO UPDATE SET settings_json=excluded.settings_json`, domain, string(raw)); err != nil { + return err + } + if !apply { + return nil + } + if _, err := tx.Exec(`INSERT INTO config(domain_uuid,key,value,updated_at) VALUES(?,'home_layout',?,strftime('%s','now')) ON CONFLICT(domain_uuid,key) DO UPDATE SET value=excluded.value,updated_at=excluded.updated_at`, domain, e.Layout); err != nil { + return err + } + for _, item := range []struct { + kind, prefix string + enabled bool + }{{"diary", e.DiaryPrefix, e.DiaryEnabled}, {"blog", e.BlogPrefix, e.BlogEnabled}} { + if _, err := tx.Exec(`INSERT INTO periodical_settings(domain_uuid,kind,enabled) VALUES(?,?,?) ON CONFLICT(domain_uuid,kind) DO UPDATE SET enabled=excluded.enabled`, domain, item.kind, item.enabled); err != nil { + return err + } + if _, err := tx.Exec(`INSERT INTO periodical_prefixes(domain_uuid,kind,prefix) VALUES(?,?,?) ON CONFLICT(domain_uuid,kind) DO UPDATE SET prefix=excluded.prefix`, domain, item.kind, item.prefix); err != nil { + return err + } + } + return nil +} + +func (s *Store) SetDomainEntry(ctx context.Context, id int64, actor string, e DomainEntrySettings) error { + if !e.valid() { + return ErrPeriodicalInvalid + } + ctx, cancel := context.WithTimeout(ctx, 3*time.Second) + defer cancel() + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return err + } + defer tx.Rollback() + if _, err = tx.ExecContext(ctx, `UPDATE domains SET title=title WHERE id=?`, id); err != nil { + return err + } + var domain, campus, mode, placement string + if err = tx.QueryRowContext(ctx, `SELECT d.uuid,d.campus_uuid,c.authority_mode,d.placement FROM domains d JOIN campuses c ON c.uuid=d.campus_uuid WHERE d.id=?`, id).Scan(&domain, &campus, &mode, &placement); err != nil { + return err + } + if mode == "managed" { + return ErrAccessDenied + } + var allowed bool + err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM groups g JOIN domains d ON d.uuid=g.domain_uuid AND d.enabled=1 JOIN group_members gm ON gm.group_uuid=g.uuid JOIN domain_memberships m ON m.uuid=gm.membership_uuid AND m.domain_uuid=g.domain_uuid JOIN principals p ON p.uuid=m.principal_uuid WHERE d.campus_uuid=? AND g.builtin_key='campus_admin' AND g.state='active' AND m.principal_uuid=? AND m.state='active' AND p.state='active' AND gm.member_role IN ('owner','manager'))`, campus, actor).Scan(&allowed) + if err != nil { + return err + } + if !allowed { + return ErrAccessDenied + } + // Campus manifests are shared with every approved instance, not just the + // selected Domain destination. Do not strand an older peer on a v2 payload. + var incompatible bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM federation_instances i LEFT JOIN federation_instance_capabilities c ON c.instance_uuid=i.uuid WHERE i.campus_uuid=? AND i.status='approved' AND COALESCE(c.manifest_version,1)<2)`, campus).Scan(&incompatible); err != nil { + return err + } + if incompatible { + return ErrManifestCapability + } + if err = saveDomainEntryTx(tx, domain, e, placement == "local"); err != nil { + return err + } + return tx.Commit() +} diff --git a/internal/store/domain_entry_test.go b/internal/store/domain_entry_test.go new file mode 100644 index 0000000..8307790 --- /dev/null +++ b/internal/store/domain_entry_test.go @@ -0,0 +1,87 @@ +package store + +import ( + "context" + "encoding/json" + "testing" +) + +func TestDomainEntrySignedManifest(t *testing.T) { + controller, campus, domains := manifestFixture(t) + node := manifestIntegrityStore(t) + old := buildManifest(t, controller, campus, domains) + if old.SchemaVersion != 1 { + t.Fatal("legacy version changed") + } + e := DomainEntrySettings{Layout: "diary", DiaryEnabled: true, DiaryPrefix: "/", BlogPrefix: "/blog"} + put := func(id string, e DomainEntrySettings) { + t.Helper() + raw, _ := json.Marshal(e) + if _, err := controller.DB.Exec(`INSERT INTO domain_entry_settings VALUES(?,?) ON CONFLICT(domain_uuid) DO UPDATE SET settings_json=excluded.settings_json`, id, string(raw)); err != nil { + t.Fatal(err) + } + } + put(domains[0].UUID, e) + put(domains[1].UUID, e) + put("unrelated", e) + m := buildManifest(t, controller, campus, domains) + if m.SchemaVersion != 2 || m.Revision <= old.Revision || len(m.DomainEntries) != 2 { + t.Fatalf("bad v2 %+v", m) + } + if err := applyManifest(node, m); err != nil { + t.Fatal(err) + } + if layout, err := node.GetConfigInDomain(domains[0].UUID, "home_layout"); err != nil || layout != "diary" { + t.Fatal(layout, err) + } + if on, err := node.PeriodicalEnabled(context.Background(), domains[0].UUID, "diary"); err != nil || !on { + t.Fatal(on, err) + } + if prefix, err := node.PeriodicalPrefix(context.Background(), domains[0].UUID, "diary"); err != nil || prefix != "/" { + t.Fatal(prefix, err) + } + if on, err := node.PeriodicalEnabled(context.Background(), domains[1].UUID, "diary"); err != nil || on { + t.Fatal("remote projection activated", on, err) + } + if err := applyManifest(node, m); err != nil { + t.Fatal("duplicate", err) + } + if err := applyManifest(node, old); err == nil { + t.Fatal("replay accepted") + } + e.Layout = "blog" + e.BlogEnabled = true + put(domains[0].UUID, e) + newer := buildManifest(t, controller, campus, domains) + if newer.Revision <= m.Revision { + t.Fatal("settings change did not advance revision") + } + if _, err := node.DB.Exec(`CREATE TRIGGER fail_entry BEFORE UPDATE ON periodical_prefixes BEGIN SELECT RAISE(ABORT,'fixture'); END`); err != nil { + t.Fatal(err) + } + if err := applyManifest(node, newer); err == nil { + t.Fatal("partial apply") + } + if layout, _ := node.GetConfigInDomain(domains[0].UUID, "home_layout"); layout != "diary" { + t.Fatal("rollback", layout) + } + var revision int64 + if err := node.DB.QueryRow(`SELECT applied_revision FROM federation_manifest_state WHERE campus_uuid=?`, campus.UUID).Scan(&revision); err != nil || revision != m.Revision { + t.Fatal("checkpoint advanced", revision, err) + } + if _, err := node.DB.Exec(`DROP TRIGGER fail_entry`); err != nil { + t.Fatal(err) + } + if err := applyManifest(node, newer); err != nil { + t.Fatal(err) + } + newer.DomainEntries[domains[0].UUID] = DomainEntrySettings{Layout: "diary", DiaryEnabled: true, DiaryPrefix: "/../escape", BlogPrefix: "/blog"} + tampered := newer + if err := applyManifest(node, tampered); err == nil { + t.Fatal("unsigned settings accepted") + } + newer = signTestManifest(t, controller, newer) + if err := applyManifest(node, newer); err == nil { + t.Fatal("invalid signed prefix accepted") + } +} diff --git a/internal/store/domain_links.go b/internal/store/domain_links.go new file mode 100644 index 0000000..af1ed37 --- /dev/null +++ b/internal/store/domain_links.go @@ -0,0 +1,48 @@ +package store + +import ( + "errors" + "net/url" + "strings" +) + +// DomainLink renders an address relative only when it remains in the source +// Domain. Cross-Domain and cross-instance addresses always carry an origin. +func (s *Store) DomainLink(sourceDomainUUID, destinationDomainUUID, address, scheme string) (string, error) { + address = strings.TrimSpace(address) + if address == "" { + return "", errors.New("link address is required") + } + isObjectAddress := false + for _, prefix := range []string{"uuid:", "rev:", "asset:"} { + isObjectAddress = isObjectAddress || strings.HasPrefix(address, prefix) + } + if parsed, err := url.Parse(address); !isObjectAddress && err == nil && parsed.IsAbs() { + return parsed.String(), nil + } + if !strings.HasPrefix(address, "/") { + for _, prefix := range []string{"uuid:", "rev:", "asset:"} { + if strings.HasPrefix(address, prefix) { + address = "/o/" + address + break + } + } + } + if !strings.HasPrefix(address, "/") { + return "", errors.New("semantic links must be root-relative") + } + if sourceDomainUUID == destinationDomainUUID { + return address, nil + } + if scheme == "" { + scheme = "https" + } + if scheme != "https" && scheme != "http" { + return "", errors.New("link scheme must be http or https") + } + host, err := s.GetDomainEffectiveHost(destinationDomainUUID) + if err != nil { + return "", err + } + return (&url.URL{Scheme: scheme, Host: host, Path: address}).String(), nil +} diff --git a/internal/store/domain_links_test.go b/internal/store/domain_links_test.go new file mode 100644 index 0000000..b056942 --- /dev/null +++ b/internal/store/domain_links_test.go @@ -0,0 +1,38 @@ +package store + +import ( + "database/sql" + "testing" + + _ "modernc.org/sqlite" +) + +func TestDomainLinkRequiresAbsoluteCrossDomainOrigin(t *testing.T) { + db, err := sql.Open("sqlite", "file:domain-links-test?mode=memory&cache=shared") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = db.Close() }) + if _, err := db.Exec(` + CREATE TABLE campuses(id INTEGER PRIMARY KEY,uuid TEXT,name TEXT,title TEXT,default_lang TEXT,authority_mode TEXT,fqdn TEXT,controller_transport TEXT,last_contact_at INTEGER,last_contact_error TEXT,enabled INTEGER,created_at INTEGER); + CREATE TABLE domains(id INTEGER PRIMARY KEY,uuid TEXT,name TEXT,title TEXT,domain TEXT,enabled INTEGER,created_at INTEGER,campus_uuid TEXT,placement TEXT,instance_fqdn TEXT,instance_fingerprint TEXT); + INSERT INTO campuses VALUES(1,'campus','main','Main','en','standalone','example.test','https',0,'',1,0); + INSERT INTO domains VALUES(1,'source','source','Source','',1,0,'campus','local','',''); + INSERT INTO domains VALUES(2,'dest','dest','Destination','engineering',1,0,'campus','local','',''); + `); err != nil { + t.Fatal(err) + } + st := &Store{DB: db} + local, err := st.DomainLink("source", "source", "/guide", "https") + if err != nil || local != "/guide" { + t.Fatalf("local=%q err=%v", local, err) + } + remote, err := st.DomainLink("source", "dest", "/guide", "https") + if err != nil || remote != "https://engineering.example.test/guide" { + t.Fatalf("remote=%q err=%v", remote, err) + } + object, err := st.DomainLink("source", "dest", "uuid:abc", "https") + if err != nil || object != "https://engineering.example.test/o/uuid:abc" { + t.Fatalf("object=%q err=%v", object, err) + } +} diff --git a/internal/store/domain_paths.go b/internal/store/domain_paths.go new file mode 100644 index 0000000..0d6c00d --- /dev/null +++ b/internal/store/domain_paths.go @@ -0,0 +1,134 @@ +package store + +import ( + "database/sql" + "errors" +) + +func (s *Store) EnsureDomainPathsSchema() error { + defaultDomain, err := s.GetDefaultDomain() + if err != nil { + return err + } + + if _, err := s.DB.Exec(` + CREATE TABLE IF NOT EXISTS paths ( + domain_uuid TEXT NOT NULL, + path TEXT NOT NULL, + object_uuid TEXT NOT NULL, + created_at INTEGER NOT NULL, + is_primary INTEGER NOT NULL DEFAULT 0, + PRIMARY KEY (domain_uuid, path) + ) + `); err != nil { + return err + } + + columns, err := pathTableColumns(s.DB) + if err != nil { + return err + } + if columns["domain_uuid"] { + _, err = s.DB.Exec(` + UPDATE paths + SET domain_uuid = ? + WHERE domain_uuid IS NULL OR domain_uuid = '' + `, defaultDomain.UUID) + return err + } + + hasPrimary := columns["is_primary"] + primaryExpr := "0" + if hasPrimary { + primaryExpr = "COALESCE(is_primary, 0)" + } + + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + + if _, err = tx.Exec(` + CREATE TABLE paths_domain_scoped ( + domain_uuid TEXT NOT NULL, + path TEXT NOT NULL, + object_uuid TEXT NOT NULL, + created_at INTEGER NOT NULL, + is_primary INTEGER NOT NULL DEFAULT 0, + PRIMARY KEY (domain_uuid, path) + ) + `); err != nil { + return err + } + + if _, err = tx.Exec(` + INSERT INTO paths_domain_scoped ( + domain_uuid, path, object_uuid, created_at, is_primary + ) + SELECT ?, path, object_uuid, COALESCE(created_at, 0), `+ + primaryExpr+` + FROM paths + `, defaultDomain.UUID); err != nil { + return err + } + + if _, err = tx.Exec(`DROP TABLE paths`); err != nil { + return err + } + if _, err = tx.Exec(` + ALTER TABLE paths_domain_scoped RENAME TO paths + `); err != nil { + return err + } + if _, err = tx.Exec(` + CREATE INDEX idx_paths_object_uuid + ON paths(object_uuid) + `); err != nil { + return err + } + + return tx.Commit() +} + +func pathTableColumns(db *sql.DB) (map[string]bool, error) { + rows, err := db.Query(`PRAGMA table_info(paths)`) + if err != nil { + return nil, err + } + defer rows.Close() + + columns := map[string]bool{} + for rows.Next() { + var cid int + var name, kind string + var notNull, primaryKey int + var defaultValue any + if err := rows.Scan( + &cid, + &name, + &kind, + ¬Null, + &defaultValue, + &primaryKey, + ); err != nil { + return nil, err + } + columns[name] = true + } + if err := rows.Err(); err != nil { + return nil, err + } + if len(columns) == 0 { + return nil, errors.New("paths table is missing") + } + return columns, nil +} + +func (s *Store) defaultDomainUUID() (string, error) { + domain, err := s.GetDefaultDomain() + if err != nil { + return "", err + } + return domain.UUID, nil +} diff --git a/internal/store/domains.go b/internal/store/domains.go new file mode 100644 index 0000000..7646503 --- /dev/null +++ b/internal/store/domains.go @@ -0,0 +1,842 @@ +package store + +import ( + "database/sql" + "errors" + "strings" + "time" + + "github.com/google/uuid" +) + +type Domain struct { + ID int64 + UUID string + CampusUUID string + Name string + Title string + Domain string + Placement string + InstanceFQDN string + InstanceFingerprint string + Enabled bool + CreatedAt int64 +} + +func (s *Store) EnsureDomainsSchema() error { + + var legacyTable int + var domainsTable int + + if err := s.DB.QueryRow(` + SELECT count(*) + FROM sqlite_master + WHERE type = 'table' + AND name = 'districts' + `).Scan(&legacyTable); err != nil { + return err + } + + if err := s.DB.QueryRow(` + SELECT count(*) + FROM sqlite_master + WHERE type = 'table' + AND name = 'domains' + `).Scan(&domainsTable); err != nil { + return err + } + + if legacyTable > 0 && domainsTable == 0 { + if _, err := s.DB.Exec(` + ALTER TABLE districts RENAME TO domains + `); err != nil { + return err + } + } else if legacyTable > 0 { + if _, err := s.DB.Exec(` + INSERT OR IGNORE INTO domains ( + id, + uuid, + name, + title, + domain, + enabled, + created_at + ) + SELECT + id, + uuid, + name, + title, + domain, + enabled, + created_at + FROM districts + `); err != nil { + return err + } + } + + _, err := s.DB.Exec(` + CREATE TABLE IF NOT EXISTS domains ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + uuid TEXT NOT NULL UNIQUE, + name TEXT NOT NULL UNIQUE, + title TEXT NOT NULL, + domain TEXT NOT NULL DEFAULT '', + enabled INTEGER NOT NULL DEFAULT 1, + created_at INTEGER NOT NULL, + campus_uuid TEXT, + placement TEXT NOT NULL DEFAULT 'local', + instance_fqdn TEXT NOT NULL DEFAULT '', + instance_fingerprint TEXT NOT NULL DEFAULT '' + ) + `) + + if err != nil { + return err + } + _, _ = s.DB.Exec(`ALTER TABLE domains ADD COLUMN placement TEXT NOT NULL DEFAULT 'local'`) + _, _ = s.DB.Exec(`ALTER TABLE domains ADD COLUMN instance_fqdn TEXT NOT NULL DEFAULT ''`) + _, _ = s.DB.Exec(`ALTER TABLE domains ADD COLUMN instance_fingerprint TEXT NOT NULL DEFAULT ''`) + + // Keep the default title aligned with the current terminology while + // preserving titles that users have customized. + if _, err := s.DB.Exec(` + UPDATE domains + SET title = 'Default Domain' + WHERE name = 'default' + AND title = 'Default District' + `); err != nil { + return err + } + + return s.EnsureAtLeastOneDomain() +} + +func (s *Store) EnsureAtLeastOneDomain() error { + + var count int + + err := s.DB.QueryRow(` + SELECT count(*) + FROM domains + `).Scan(&count) + + if err != nil { + return err + } + + if count > 0 { + return nil + } + + _, err = s.DB.Exec(` + INSERT INTO domains ( + uuid, + name, + title, + domain, + enabled, + created_at + ) + VALUES (?, 'default', 'Default Domain', '', 1, ?) + `, + uuid.NewString(), + time.Now().Unix(), + ) + + return err +} + +func (s *Store) GetDefaultDomain() (*Domain, error) { + + row := s.DB.QueryRow(` + SELECT + id, + uuid, + name, + title, + domain, + enabled, + created_at, + COALESCE(campus_uuid, ''), + COALESCE(placement, 'local'), + COALESCE(instance_fqdn, ''), + COALESCE(instance_fingerprint, '') + FROM domains + WHERE enabled = 1 + ORDER BY + CASE WHEN name = 'default' THEN 0 ELSE 1 END, + id + LIMIT 1 + `) + + return scanDomain(row) +} + +func (s *Store) GetDomainByHost( + host string, +) (*Domain, error) { + + host = + normalizeDomainHost( + host, + ) + + row := s.DB.QueryRow(` + SELECT + d.id, + d.uuid, + d.name, + d.title, + d.domain, + d.enabled, + d.created_at, + COALESCE(d.campus_uuid, ''), + COALESCE(d.placement, 'local'), + COALESCE(d.instance_fqdn, ''), + COALESCE(d.instance_fingerprint, '') + FROM domains d + JOIN campuses c ON c.uuid = d.campus_uuid + WHERE d.enabled = 1 + AND c.enabled = 1 + AND lower( + CASE + WHEN d.domain = '' THEN c.fqdn + WHEN instr(d.domain, '.') > 0 THEN d.domain + ELSE d.domain || '.' || c.fqdn + END + ) = ? + ORDER BY d.id + LIMIT 1 + `, host) + + return scanDomain(row) +} + +func (s *Store) GetDomainByUUID(domainUUID string) (*Domain, error) { + row := s.DB.QueryRow(` + SELECT + id, uuid, name, title, domain, enabled, created_at, + COALESCE(campus_uuid, ''), + COALESCE(placement, 'local'), + COALESCE(instance_fqdn, ''), + COALESCE(instance_fingerprint, '') + FROM domains + WHERE uuid = ? + LIMIT 1 + `, domainUUID) + return scanDomain(row) +} + +func (s *Store) GetDomainEffectiveHost(domainUUID string) (string, error) { + var host string + err := s.DB.QueryRow(` + SELECT lower( + CASE + WHEN d.domain = '' THEN c.fqdn + WHEN instr(d.domain, '.') > 0 THEN d.domain + ELSE d.domain || '.' || c.fqdn + END + ) + FROM domains d + JOIN campuses c ON c.uuid = d.campus_uuid + WHERE d.uuid = ? + `, domainUUID).Scan(&host) + return host, err +} + +func (s *Store) ListDomains() ([]Domain, error) { + + rows, err := s.DB.Query(` + SELECT + id, + uuid, + name, + title, + domain, + enabled, + created_at, + COALESCE(campus_uuid, ''), + COALESCE(placement, 'local'), + COALESCE(instance_fqdn, ''), + COALESCE(instance_fingerprint, '') + FROM domains + ORDER BY + CASE WHEN name = 'default' THEN 0 ELSE 1 END, + name, + id + `) + + if err != nil { + return nil, err + } + + defer rows.Close() + + var out []Domain + + for rows.Next() { + d, err := + scanDomain( + rows, + ) + + if err != nil { + return nil, err + } + + out = append( + out, + *d, + ) + } + + return out, rows.Err() +} + +func (s *Store) CreateDomain( + campusUUID string, + name string, + title string, + domain string, + placement string, + instanceFQDN string, + instanceFingerprint string, + enabled bool, +) error { + + name = + normalizeDomainName( + name, + ) + + title = + strings.TrimSpace( + title, + ) + + domain = + normalizeDomainHost( + domain, + ) + + if name == "" { + return errors.New("domain name is required") + } + + if title == "" { + title = name + } + + if err := s.ensureCampusExists(campusUUID); err != nil { + return err + } + placement, err := normalizeDomainPlacement(placement) + if err != nil { + return err + } + instanceFQDN, instanceFingerprint, err = s.normalizeDomainInstance( + campusUUID, + instanceFQDN, + instanceFingerprint, + ) + if err != nil { + return err + } + if err := s.ensureDomainUnique(0, campusUUID, name, domain); err != nil { + return err + } + + enabledValue := 0 + + if enabled { + enabledValue = 1 + } + + domainUUID := uuid.NewString() + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + _, err = tx.Exec(` + INSERT INTO domains ( + uuid, + name, + title, + domain, + enabled, + created_at, + campus_uuid, + placement, + instance_fqdn, + instance_fingerprint + ) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + `, + domainUUID, + name, + title, + domain, + enabledValue, + time.Now().Unix(), + campusUUID, + placement, + instanceFQDN, + instanceFingerprint, + ) + if err != nil { + return err + } + + var hasConfigTable int + if err := tx.QueryRow(` + SELECT count(*) FROM sqlite_master + WHERE type = 'table' AND name = 'config' + `).Scan(&hasConfigTable); err != nil { + return err + } + if hasConfigTable != 0 { + if _, err := tx.Exec(` + INSERT INTO config (domain_uuid, key, value, updated_at) + SELECT ?, 'locale', + CASE + WHEN lower(default_lang) LIKE 'ja%' THEN 'ja' + ELSE 'en' + END, + strftime('%s','now') + FROM campuses + WHERE uuid = ? + ON CONFLICT(domain_uuid, key) DO NOTHING + `, domainUUID, campusUUID); err != nil { + return err + } + } + if err := tx.Commit(); err != nil { + return err + } + return s.EnsureBuiltinAdminGroups() +} + +func (s *Store) UpdateDomain( + id int64, + campusUUID string, + name string, + title string, + domain string, + placement string, + instanceFQDN string, + instanceFingerprint string, + enabled bool, +) error { + + name = + normalizeDomainName( + name, + ) + + title = + strings.TrimSpace( + title, + ) + + domain = + normalizeDomainHost( + domain, + ) + + if id <= 0 { + return errors.New("domain id is required") + } + + if name == "" { + return errors.New("domain name is required") + } + + if title == "" { + title = name + } + + if err := s.ensureCampusExists(campusUUID); err != nil { + return err + } + placement, err := normalizeDomainPlacement(placement) + if err != nil { + return err + } + instanceFQDN, instanceFingerprint, err = s.normalizeDomainInstance( + campusUUID, + instanceFQDN, + instanceFingerprint, + ) + if err != nil { + return err + } + if placement == "remote" { + var pathCount int + if err := s.DB.QueryRow(` + SELECT count(*) + FROM paths + WHERE domain_uuid = ( + SELECT uuid FROM domains WHERE id = ? + ) + `, id).Scan(&pathCount); err != nil { + return err + } + if pathCount > 0 { + return errors.New("domain with local paths cannot become remote") + } + } + + if err := s.ensureDomainUnique(id, campusUUID, name, domain); err != nil { + return err + } + + enabledValue := 0 + + if enabled { + enabledValue = 1 + } + + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + _, err = tx.Exec(` + UPDATE domains + SET + name = ?, + title = ?, + domain = ?, + enabled = ?, + campus_uuid = ?, + placement = ?, + instance_fqdn = ?, + instance_fingerprint = ? + WHERE id = ? + `, + name, + title, + domain, + enabledValue, + campusUUID, + placement, + instanceFQDN, + instanceFingerprint, + id, + ) + + if err != nil { + return err + } + if err = projectCampusAdminMembershipsTx(tx); err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) CountDomains() (int, error) { + + var count int + + err := s.DB.QueryRow(` + SELECT count(*) + FROM domains + `).Scan(&count) + + return count, err +} + +func (s *Store) DeleteDomain( + id int64, +) error { + var authorityMode string + if err := s.DB.QueryRow(` + SELECT c.authority_mode + FROM domains d + JOIN campuses c ON c.uuid = d.campus_uuid + WHERE d.id = ? + `, id).Scan(&authorityMode); err != nil { + return err + } + if authorityMode == "managed" { + return errors.New("managed campus topology is read-only") + } + + count, err := + s.CountDomains() + + if err != nil { + return err + } + + if count <= 1 { + return sql.ErrNoRows + } + + var pathCount int + if err := s.DB.QueryRow(` + SELECT count(*) + FROM paths + WHERE domain_uuid = ( + SELECT uuid FROM domains WHERE id = ? + ) + `, id).Scan(&pathCount); err != nil { + return err + } + if pathCount > 0 { + return errors.New("domain is referenced by paths") + } + + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + if _, err = tx.Exec(` + DELETE FROM config + WHERE domain_uuid = (SELECT uuid FROM domains WHERE id = ?) + `, id); err != nil { + return err + } + if _, err = tx.Exec(`DELETE FROM domains WHERE id = ?`, id); err != nil { + return err + } + if err = projectCampusAdminMembershipsTx(tx); err != nil { + return err + } + return tx.Commit() +} + +func scanDomain(row interface { + Scan(dest ...any) error +}) (*Domain, error) { + + var d Domain + var enabled int + + err := row.Scan( + &d.ID, + &d.UUID, + &d.Name, + &d.Title, + &d.Domain, + &enabled, + &d.CreatedAt, + &d.CampusUUID, + &d.Placement, + &d.InstanceFQDN, + &d.InstanceFingerprint, + ) + + if err != nil { + return nil, err + } + + d.Enabled = enabled != 0 + + return &d, nil +} + +func normalizeDomainPlacement(placement string) (string, error) { + placement = strings.ToLower(strings.TrimSpace(placement)) + if placement == "" { + placement = "local" + } + switch placement { + case "local": + case "remote": + default: + return "", errors.New("invalid domain placement") + } + return placement, nil +} + +func (s *Store) normalizeDomainInstance( + campusUUID string, + instanceFQDN string, + instanceFingerprint string, +) (string, string, error) { + var authorityMode, campusFQDN string + if err := s.DB.QueryRow(` + SELECT authority_mode, fqdn + FROM campuses + WHERE uuid = ? + `, campusUUID).Scan(&authorityMode, &campusFQDN); err != nil { + return "", "", err + } + instanceFQDN = normalizeDomainHost(instanceFQDN) + if instanceFQDN == "" { + if authorityMode == "controller" { + return "", "", errors.New( + "controller campus domain requires an instance FQDN", + ) + } + instanceFQDN = campusFQDN + } + if !strings.Contains(instanceFQDN, ".") && + instanceFQDN != "localhost" { + return "", "", errors.New("invalid instance FQDN") + } + instanceFingerprint = strings.ToLower(strings.TrimSpace(instanceFingerprint)) + if authorityMode == "controller" { + var count int + if err := s.DB.QueryRow(` + SELECT count(*) FROM federation_instances + WHERE campus_uuid = ? + AND fqdn = ? + AND fingerprint = ? + AND status = 'approved' + `, campusUUID, instanceFQDN, instanceFingerprint).Scan(&count); err != nil { + return "", "", err + } + if count == 0 { + return "", "", errors.New( + "controller domain requires an approved instance fingerprint", + ) + } + } + return instanceFQDN, instanceFingerprint, nil +} + +func (s *Store) ensureCampusExists(campusUUID string) error { + if strings.TrimSpace(campusUUID) == "" { + return errors.New("campus UUID is required") + } + + var authorityMode string + err := s.DB.QueryRow(` + SELECT COALESCE(authority_mode, 'standalone') + FROM campuses + WHERE uuid = ? + `, campusUUID).Scan(&authorityMode) + if err != nil { + if errors.Is(err, sql.ErrNoRows) { + return errors.New("campus does not exist") + } + return err + } + if authorityMode == "managed" { + return errors.New("managed campus topology is read-only") + } + + return nil +} + +func (s *Store) ensureLocalDomain(domainUUID string) error { + var placement string + err := s.DB.QueryRow(` + SELECT COALESCE(placement, 'local') + FROM domains + WHERE uuid = ? AND enabled = 1 + `, domainUUID).Scan(&placement) + if err != nil { + return err + } + if placement != "local" { + return errors.New("remote domain has no local path namespace") + } + return nil +} + +func normalizeDomainName( + name string, +) string { + + name = + strings.TrimSpace( + strings.ToLower( + name, + ), + ) + + name = + strings.ReplaceAll( + name, + " ", + "-", + ) + + return name +} + +func normalizeDomainHost( + host string, +) string { + + host = + strings.TrimSpace( + strings.ToLower( + host, + ), + ) + + if host == "" { + return "" + } + + if i := strings.IndexByte(host, ':'); i > 0 { + host = host[:i] + } + + return strings.Trim( + host, + ".", + ) +} + +func (s *Store) ensureDomainUnique( + excludeID int64, + campusUUID string, + name string, + domain string, +) error { + var campusFQDN string + if err := s.DB.QueryRow(` + SELECT fqdn FROM campuses WHERE uuid = ? + `, campusUUID).Scan(&campusFQDN); err != nil { + return err + } + effectiveHost := domain + if effectiveHost == "" { + effectiveHost = campusFQDN + } else if !strings.Contains(effectiveHost, ".") { + effectiveHost += "." + campusFQDN + } + + var count int + + err := s.DB.QueryRow(` + SELECT count(*) + FROM domains d + JOIN campuses c ON c.uuid = d.campus_uuid + WHERE d.id != ? + AND ( + lower(d.name) = ? + OR lower( + CASE + WHEN d.domain = '' THEN c.fqdn + WHEN instr(d.domain, '.') > 0 THEN d.domain + ELSE d.domain || '.' || c.fqdn + END + ) = ? + ) + `, + excludeID, + name, + effectiveHost, + ).Scan(&count) + + if err != nil { + return err + } + + if count > 0 { + return errors.New("domain name or host already exists") + } + + return nil +} diff --git a/internal/store/domains_test.go b/internal/store/domains_test.go new file mode 100644 index 0000000..4096d94 --- /dev/null +++ b/internal/store/domains_test.go @@ -0,0 +1,90 @@ +package store_test + +import ( + "testing" + + "pageswiki/internal/db" + "pageswiki/internal/store" +) + +func TestLegacyDistrictsMigrateToDomains(t *testing.T) { + database, err := db.Open(t.TempDir() + "/pages.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + + _, err = database.Exec(` + CREATE TABLE districts ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + uuid TEXT NOT NULL UNIQUE, + name TEXT NOT NULL UNIQUE, + title TEXT NOT NULL, + domain TEXT NOT NULL DEFAULT '', + enabled INTEGER NOT NULL DEFAULT 1, + created_at INTEGER NOT NULL + ); + + INSERT INTO districts ( + uuid, + name, + title, + domain, + enabled, + created_at + ) + VALUES ( + 'legacy-domain', + 'default', + 'Default District', + 'docs', + 1, + 1 + ); + `) + if err != nil { + t.Fatal(err) + } + + st := store.New(database) + + domain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + + if domain.UUID != "legacy-domain" { + t.Fatalf("migrated UUID = %q", domain.UUID) + } + + if domain.Title != "Default Domain" { + t.Fatalf("migrated title = %q", domain.Title) + } + + campus, err := st.GetDefaultCampus() + if err != nil { + t.Fatal(err) + } + if domain.CampusUUID != campus.UUID { + t.Fatalf( + "migrated campus UUID = %q, want %q", + domain.CampusUUID, + campus.UUID, + ) + } + + var domainsTable int + err = database.QueryRow(` + SELECT count(*) + FROM sqlite_master + WHERE type = 'table' + AND name = 'domains' + `).Scan(&domainsTable) + if err != nil { + t.Fatal(err) + } + + if domainsTable != 1 { + t.Fatalf("domains table count = %d", domainsTable) + } +} diff --git a/internal/store/event_job_listing.go b/internal/store/event_job_listing.go new file mode 100644 index 0000000..d324579 --- /dev/null +++ b/internal/store/event_job_listing.go @@ -0,0 +1,83 @@ +package store + +import ( + "context" + "encoding/base64" + "encoding/json" + "errors" + "strings" +) + +var ErrEventJobFilter = errors.New("invalid job status or cursor") + +type eventJobCursor struct { + Time int64 `json:"time"` + UUID string `json:"uuid"` +} + +// EventJobPage filters before limiting so long-running jobs cannot be hidden by +// newer completed work. Keyset pagination avoids scanning an increasing OFFSET. +func (s *Store) EventJobPage(ctx context.Context, status, cursor string, limit int) ([]EventJob, string, error) { + if limit < 1 || limit > 100 { + limit = 50 + } + // Listing is metadata-only: import and preview payloads can be large and + // must not be read or sent for each dashboard refresh. + columns := strings.Replace(eventJobColumns, "payload,", "'' AS payload,", 1) + table := "event_jobs" + if status == "history" { + // SQLite otherwise prefers the status index for IN and sorts all + // completed rows before LIMIT. This partial index already has the order. + table += " INDEXED BY idx_event_jobs_history" + } + query := `SELECT ` + columns + ` FROM ` + table + ` WHERE 1=1` + args := []any{} + switch status { + case "": + case "history": + query += ` AND status IN ('succeeded','skipped','failed','cancelled')` + case "running", "queued", "succeeded", "skipped", "failed", "cancelled": + query += ` AND status=?` + args = append(args, status) + default: + return nil, "", ErrEventJobFilter + } + if cursor != "" { + if len(cursor) > 344 { + return nil, "", ErrEventJobFilter + } + var c eventJobCursor + data, err := base64.RawURLEncoding.DecodeString(cursor) + if err != nil || len(data) > 256 || json.Unmarshal(data, &c) != nil || c.Time <= 0 || c.UUID == "" { + return nil, "", ErrEventJobFilter + } + query += ` AND (created_at_ms,uuid) < (?,?)` + args = append(args, c.Time, c.UUID) + } + query += ` ORDER BY created_at_ms DESC,uuid DESC LIMIT ?` + args = append(args, limit+1) + rows, err := s.DB.QueryContext(ctx, query, args...) + if err != nil { + return nil, "", err + } + defer rows.Close() + jobs := make([]EventJob, 0) + for rows.Next() { + job, err := scanEventJob(rows) + if err != nil { + return nil, "", err + } + jobs = append(jobs, *job) + } + if err := rows.Err(); err != nil { + return nil, "", err + } + next := "" + if len(jobs) > limit { + jobs = jobs[:limit] + last := jobs[len(jobs)-1] + data, _ := json.Marshal(eventJobCursor{last.CreatedAt, last.UUID}) + next = base64.RawURLEncoding.EncodeToString(data) + } + return jobs, next, nil +} diff --git a/internal/store/event_jobs.go b/internal/store/event_jobs.go new file mode 100644 index 0000000..66ac905 --- /dev/null +++ b/internal/store/event_jobs.go @@ -0,0 +1,801 @@ +package store + +import ( + "context" + "database/sql" + "errors" + "fmt" + "strings" + "time" + + "github.com/google/uuid" +) + +type EventJob struct { + UUID string `json:"uuid"` + EventUUID string `json:"event_uuid,omitempty"` + Type string `json:"event_type"` + Key string `json:"event_key"` + Payload string `json:"payload,omitempty"` + Status string `json:"status"` + Priority int `json:"priority"` + Attempts int `json:"attempts"` + MaxAttempts int `json:"max_attempts"` + RunAtMS int64 `json:"run_at_ms"` + StartedAtMS int64 `json:"started_at_ms,omitempty"` + FinishedAtMS int64 `json:"finished_at_ms,omitempty"` + CancelRequested bool `json:"cancel_requested"` + Error string `json:"error,omitempty"` + CreatedAt int64 `json:"created_at_ms"` + UpdatedAt int64 `json:"updated_at_ms"` +} + +type EventDefinition struct { + UUID string `json:"uuid"` + Name string `json:"name"` + EventType string `json:"event_type"` + EventKey string `json:"event_key"` + Payload string `json:"payload"` + ScheduleKind string `json:"schedule_kind"` + IntervalSeconds int64 `json:"interval_seconds"` + NextRunAtMS int64 `json:"next_run_at_ms"` + Enabled bool `json:"enabled"` + Priority int `json:"priority"` + MaxAttempts int `json:"max_attempts"` + CreatedAtMS int64 `json:"created_at_ms"` + UpdatedAtMS int64 `json:"updated_at_ms"` +} + +type EventLog struct { + ID int64 `json:"id"` + JobUUID string `json:"job_uuid"` + EventUUID string `json:"event_uuid,omitempty"` + EventType string `json:"event_type,omitempty"` + Level string `json:"level"` + Message string `json:"message"` + CreatedAtMS int64 `json:"created_at_ms"` +} + +type EventLogPolicy struct { + EventType string `json:"event_type"` + RetentionHours int `json:"retention_hours"` + AggregateAfterHours int `json:"aggregate_after_hours"` + BucketSeconds int `json:"bucket_seconds"` + MaxRows int `json:"max_rows"` +} + +type EventLogTrend struct { + EventType string `json:"event_type"` + BucketStartMS int64 `json:"bucket_start_ms"` + Level string `json:"level"` + Count int64 `json:"count"` + FirstAtMS int64 `json:"first_at_ms"` + LastAtMS int64 `json:"last_at_ms"` + SampleMessage string `json:"sample_message,omitempty"` +} + +type QueueSettings struct { + Paused bool `json:"paused"` + Concurrency int `json:"concurrency"` + MaxDepth int `json:"max_depth"` + RetryBaseSeconds int `json:"retry_base_seconds"` + RetentionHours int `json:"retention_hours"` +} + +type EventJobStats struct { + Queued int `json:"queued"` + Running int `json:"running"` + Succeeded int `json:"succeeded"` + Skipped int `json:"skipped"` + Failed int `json:"failed"` + Cancelled int `json:"cancelled"` +} + +var ErrEventSkipped = errors.New("event is not applicable") + +func (s *Store) EnsureEventJobsSchema() error { + if _, err := s.DB.Exec(` + CREATE TABLE IF NOT EXISTS event_jobs ( + uuid TEXT PRIMARY KEY, + event_type TEXT NOT NULL, + event_key TEXT NOT NULL, + payload TEXT NOT NULL, + status TEXT NOT NULL, + attempts INTEGER NOT NULL DEFAULT 0, + run_at_ms INTEGER NOT NULL, + error TEXT NOT NULL DEFAULT '', + created_at_ms INTEGER NOT NULL, + updated_at_ms INTEGER NOT NULL + ) + `); err != nil { + return err + } + for _, statement := range []string{ + `ALTER TABLE event_jobs ADD COLUMN event_uuid TEXT NOT NULL DEFAULT ''`, + `ALTER TABLE event_jobs ADD COLUMN priority INTEGER NOT NULL DEFAULT 0`, + `ALTER TABLE event_jobs ADD COLUMN max_attempts INTEGER NOT NULL DEFAULT 3`, + `ALTER TABLE event_jobs ADD COLUMN started_at_ms INTEGER NOT NULL DEFAULT 0`, + `ALTER TABLE event_jobs ADD COLUMN finished_at_ms INTEGER NOT NULL DEFAULT 0`, + `ALTER TABLE event_jobs ADD COLUMN cancel_requested INTEGER NOT NULL DEFAULT 0`, + } { + _, _ = s.DB.Exec(statement) + } + statements := []string{ + `CREATE INDEX IF NOT EXISTS idx_event_jobs_listing ON event_jobs (created_at_ms DESC, uuid DESC)`, + `CREATE INDEX IF NOT EXISTS idx_event_jobs_status_listing ON event_jobs (status, created_at_ms DESC, uuid DESC)`, + `CREATE INDEX IF NOT EXISTS idx_event_jobs_history ON event_jobs (created_at_ms DESC, uuid DESC) WHERE status IN ('succeeded','skipped','failed','cancelled')`, + `CREATE INDEX IF NOT EXISTS idx_event_jobs_due + ON event_jobs (status, priority DESC, run_at_ms, created_at_ms)`, + `CREATE TABLE IF NOT EXISTS event_definitions ( + uuid TEXT PRIMARY KEY, name TEXT NOT NULL, event_type TEXT NOT NULL, + event_key TEXT NOT NULL, payload TEXT NOT NULL DEFAULT '', + schedule_kind TEXT NOT NULL DEFAULT 'manual', + interval_seconds INTEGER NOT NULL DEFAULT 0, + next_run_at_ms INTEGER NOT NULL DEFAULT 0, + enabled INTEGER NOT NULL DEFAULT 1, priority INTEGER NOT NULL DEFAULT 0, + max_attempts INTEGER NOT NULL DEFAULT 3, + created_at_ms INTEGER NOT NULL, updated_at_ms INTEGER NOT NULL + )`, + `CREATE INDEX IF NOT EXISTS idx_event_definitions_due + ON event_definitions (enabled, next_run_at_ms)`, + `CREATE TABLE IF NOT EXISTS event_logs ( + id INTEGER PRIMARY KEY AUTOINCREMENT, job_uuid TEXT NOT NULL, + event_uuid TEXT NOT NULL DEFAULT '', level TEXT NOT NULL, + message TEXT NOT NULL, created_at_ms INTEGER NOT NULL + )`, + `CREATE INDEX IF NOT EXISTS idx_event_logs_job + ON event_logs (job_uuid, created_at_ms DESC)`, + `CREATE INDEX IF NOT EXISTS idx_event_logs_job_id ON event_logs (job_uuid, id DESC)`, + `CREATE TABLE IF NOT EXISTS event_log_policies ( + event_type TEXT PRIMARY KEY, + retention_hours INTEGER NOT NULL DEFAULT 168, + aggregate_after_hours INTEGER NOT NULL DEFAULT 24, + bucket_seconds INTEGER NOT NULL DEFAULT 60, + max_rows INTEGER NOT NULL DEFAULT 5000 + )`, + `INSERT OR IGNORE INTO event_log_policies(event_type,retention_hours,aggregate_after_hours,bucket_seconds,max_rows) + VALUES('*',168,24,60,5000)`, + `CREATE TABLE IF NOT EXISTS event_log_buckets ( + event_type TEXT NOT NULL, + bucket_start_ms INTEGER NOT NULL, + level TEXT NOT NULL, + count INTEGER NOT NULL DEFAULT 0, + first_at_ms INTEGER NOT NULL, + last_at_ms INTEGER NOT NULL, + sample_message TEXT NOT NULL DEFAULT '', + PRIMARY KEY(event_type,bucket_start_ms,level) + )`, + `CREATE INDEX IF NOT EXISTS idx_event_log_buckets_time ON event_log_buckets(event_type,bucket_start_ms DESC)`, + `CREATE TABLE IF NOT EXISTS event_queue_settings ( + id INTEGER PRIMARY KEY CHECK (id = 1), paused INTEGER NOT NULL DEFAULT 0, + concurrency INTEGER NOT NULL DEFAULT 1, + max_depth INTEGER NOT NULL DEFAULT 10000, + retry_base_seconds INTEGER NOT NULL DEFAULT 30, + retention_hours INTEGER NOT NULL DEFAULT 168 + )`, + `INSERT OR IGNORE INTO event_queue_settings + (id, paused, concurrency, max_depth, retry_base_seconds, retention_hours) + VALUES (1, 0, 1, 10000, 30, 168)`, + } + for _, statement := range statements { + if _, err := s.DB.Exec(statement); err != nil { + return err + } + } + now := time.Now().UnixMilli() + if _, err := s.DB.Exec(`UPDATE event_jobs SET status='queued', + error=CASE WHEN error='' THEN 'execution interrupted by process restart' ELSE error END, + run_at_ms=?, started_at_ms=0, updated_at_ms=? + WHERE status='running'`, now, now); err != nil { + return err + } + return nil +} + +func (s *Store) EnqueueEvent(eventType, eventKey, payload string, runAt time.Time) (bool, error) { + return s.EnqueueEventWithOptions("", eventType, eventKey, payload, runAt, 0, 3) +} + +func (s *Store) EnqueueEventWithOptions(eventUUID, eventType, eventKey, payload string, runAt time.Time, priority, maxAttempts int) (bool, error) { + settings, err := s.GetQueueSettings() + if err != nil { + return false, err + } + var depth int + if err := s.DB.QueryRow(`SELECT COUNT(*) FROM event_jobs WHERE status IN ('queued','running')`).Scan(&depth); err != nil { + return false, err + } + if depth >= settings.MaxDepth { + return false, fmt.Errorf("event queue is full (%d)", settings.MaxDepth) + } + if maxAttempts < 1 { + maxAttempts = 1 + } + now := time.Now().UnixMilli() + result, err := s.DB.Exec(` + INSERT INTO event_jobs ( + uuid, event_uuid, event_type, event_key, payload, status, priority, + attempts, max_attempts, run_at_ms, error, created_at_ms, updated_at_ms + ) + SELECT ?, ?, ?, ?, ?, 'queued', ?, 0, ?, ?, '', ?, ? + WHERE NOT EXISTS ( + SELECT 1 FROM event_jobs WHERE event_type = ? AND event_key = ? + AND status IN ('queued', 'running') + )`, + uuid.NewString(), eventUUID, eventType, eventKey, payload, priority, + maxAttempts, runAt.UnixMilli(), now, now, eventType, eventKey, + ) + if err != nil { + return false, err + } + count, err := result.RowsAffected() + return count > 0, err +} + +func scanEventJob(scanner interface{ Scan(...any) error }) (*EventJob, error) { + var job EventJob + var cancelled int + err := scanner.Scan( + &job.UUID, &job.EventUUID, &job.Type, &job.Key, &job.Payload, + &job.Status, &job.Priority, &job.Attempts, &job.MaxAttempts, + &job.RunAtMS, &job.StartedAtMS, &job.FinishedAtMS, &cancelled, + &job.Error, &job.CreatedAt, &job.UpdatedAt, + ) + job.CancelRequested = cancelled != 0 + return &job, err +} + +const eventJobColumns = `uuid, event_uuid, event_type, event_key, payload, + status, priority, attempts, max_attempts, run_at_ms, started_at_ms, + finished_at_ms, cancel_requested, error, created_at_ms, updated_at_ms` + +func (s *Store) ClaimDueEvent() (*EventJob, error) { + tx, err := s.DB.Begin() + if err != nil { + return nil, err + } + defer tx.Rollback() + job, err := scanEventJob(tx.QueryRow(` + SELECT `+eventJobColumns+` FROM event_jobs + WHERE status = 'queued' AND run_at_ms <= ? + ORDER BY priority DESC, run_at_ms, created_at_ms LIMIT 1`, + time.Now().UnixMilli())) + if err != nil { + return nil, err + } + now := time.Now().UnixMilli() + result, err := tx.Exec(` + UPDATE event_jobs SET status='running', attempts=attempts+1, + started_at_ms=?, updated_at_ms=? WHERE uuid=? AND status='queued'`, + now, now, job.UUID) + if err != nil { + return nil, err + } + count, err := result.RowsAffected() + if err != nil || count != 1 { + return nil, sql.ErrNoRows + } + if err := tx.Commit(); err != nil { + return nil, err + } + job.Status, job.Attempts, job.StartedAtMS = "running", job.Attempts+1, now + return job, nil +} + +func (s *Store) FinishEvent(uuid string, runErr error) error { + job, err := scanEventJob(s.DB.QueryRow(`SELECT `+eventJobColumns+` FROM event_jobs WHERE uuid=?`, uuid)) + if err != nil { + return err + } + status, message := "succeeded", "" + if runErr != nil { + message = runErr.Error() + if errors.Is(runErr, ErrEventSkipped) { + status = "skipped" + } else if job.CancelRequested { + status = "cancelled" + } else if job.Attempts < job.MaxAttempts { + settings, settingsErr := s.GetQueueSettings() + if settingsErr != nil { + return settingsErr + } + delay := time.Duration(settings.RetryBaseSeconds) * time.Second + for i := 1; i < job.Attempts; i++ { + delay *= 2 + if delay >= 24*time.Hour { + delay = 24 * time.Hour + break + } + } + _, err = s.DB.Exec(`UPDATE event_jobs SET status='queued', error=?, + run_at_ms=?, finished_at_ms=0, updated_at_ms=? WHERE uuid=?`, + message, time.Now().Add(delay).UnixMilli(), time.Now().UnixMilli(), uuid) + _ = s.AddEventLog(uuid, job.EventUUID, "warning", "execution failed; retry scheduled: "+message) + return err + } else { + status = "failed" + } + } + now := time.Now().UnixMilli() + _, err = s.DB.Exec(`UPDATE event_jobs SET status=?, error=?, + finished_at_ms=?, updated_at_ms=? WHERE uuid=?`, + status, message, now, now, uuid) + level := "info" + if status == "failed" { + level = "error" + } + _ = s.AddEventLog(uuid, job.EventUUID, level, status+func() string { + if message != "" { + return ": " + message + } + return "" + }()) + return err +} + +func (s *Store) EventStats() (EventJobStats, error) { + return s.eventStats(`SELECT status, COUNT(*) FROM event_jobs GROUP BY status`) +} + +// Live monitoring must not count the entire retained execution history every +// few seconds. The status index restricts this to the active queue. +func (s *Store) ActiveEventStats() (EventJobStats, error) { + return s.eventStats(`SELECT status, COUNT(*) FROM event_jobs WHERE status IN ('queued','running') GROUP BY status`) +} + +func (s *Store) eventStats(query string) (EventJobStats, error) { + var stats EventJobStats + rows, err := s.DB.Query(query) + if err != nil { + return stats, err + } + defer rows.Close() + for rows.Next() { + var status string + var count int + if err := rows.Scan(&status, &count); err != nil { + return stats, err + } + switch status { + case "queued": + stats.Queued = count + case "running": + stats.Running = count + case "succeeded": + stats.Succeeded = count + case "skipped": + stats.Skipped = count + case "failed": + stats.Failed = count + case "cancelled": + stats.Cancelled = count + } + } + return stats, rows.Err() +} + +func (s *Store) ListEventJobs(limit int) ([]EventJob, error) { + if limit < 1 || limit > 500 { + limit = 100 + } + rows, err := s.DB.Query(`SELECT `+eventJobColumns+` FROM event_jobs ORDER BY created_at_ms DESC LIMIT ?`, limit) + if err != nil { + return nil, err + } + defer rows.Close() + out := make([]EventJob, 0) + for rows.Next() { + job, err := scanEventJob(rows) + if err != nil { + return nil, err + } + out = append(out, *job) + } + return out, rows.Err() +} + +func (s *Store) CancelEventJob(jobUUID string) error { + result, err := s.DB.Exec(`UPDATE event_jobs SET + status=CASE WHEN status='queued' THEN 'cancelled' ELSE status END, + cancel_requested=1, finished_at_ms=CASE WHEN status='queued' THEN ? ELSE finished_at_ms END, + updated_at_ms=? WHERE uuid=? AND status IN ('queued','running')`, + time.Now().UnixMilli(), time.Now().UnixMilli(), jobUUID) + if err != nil { + return err + } + count, _ := result.RowsAffected() + if count == 0 { + return sql.ErrNoRows + } + return s.AddEventLog(jobUUID, "", "warning", "cancellation requested") +} + +// CancelEventJobsByTypeKey is used when the resource that owns queued work is +// deleted. Historical jobs are retained; queued jobs become cancelled and a +// running worker observes cancel_requested before committing its result. +func (s *Store) CancelEventJobsByTypeKey(eventType, eventKey string) error { + now := time.Now().UnixMilli() + _, err := s.DB.Exec(`UPDATE event_jobs SET + status=CASE WHEN status='queued' THEN 'cancelled' ELSE status END, + cancel_requested=1, + finished_at_ms=CASE WHEN status='queued' THEN ? ELSE finished_at_ms END, + updated_at_ms=? + WHERE event_type=? AND event_key=? AND status IN ('queued','running')`, + now, now, eventType, eventKey) + return err +} + +func (s *Store) RetryEventJob(jobUUID string) error { + result, err := s.DB.Exec(`UPDATE event_jobs SET status='queued', attempts=0, + cancel_requested=0, error='', run_at_ms=?, started_at_ms=0, + finished_at_ms=0, updated_at_ms=? WHERE uuid=? + AND status IN ('failed','cancelled','skipped')`, + time.Now().UnixMilli(), time.Now().UnixMilli(), jobUUID) + if err != nil { + return err + } + count, _ := result.RowsAffected() + if count == 0 { + return sql.ErrNoRows + } + return s.AddEventLog(jobUUID, "", "info", "manually requeued") +} + +func (s *Store) EventCancellationRequested(jobUUID string) bool { + var requested int + err := s.DB.QueryRow(`SELECT cancel_requested FROM event_jobs WHERE uuid=?`, jobUUID).Scan(&requested) + return err == nil && requested != 0 +} + +func (s *Store) PurgeEventHistory(retentionHours int) error { + if retentionHours < 1 { + return errors.New("retention hours must be positive") + } + cutoff := time.Now().Add(-time.Duration(retentionHours) * time.Hour).UnixMilli() + // Keep explicit event policies authoritative. The wildcard policy and + // unknown jobs use the queue-level retention as their fallback. + if _, err := s.DB.Exec(`DELETE FROM event_logs AS l WHERE l.created_at_ms < ? AND NOT EXISTS ( + SELECT 1 FROM event_jobs j JOIN event_log_policies p ON p.event_type=j.event_type + WHERE (j.uuid=l.job_uuid OR (j.event_uuid<>'' AND j.event_uuid=l.event_uuid)) + )`, cutoff); err != nil { + return err + } + if _, err := s.DB.Exec(`DELETE FROM event_log_buckets AS b WHERE b.bucket_start_ms < ? AND NOT EXISTS ( + SELECT 1 FROM event_log_policies p WHERE p.event_type=b.event_type AND p.event_type<>'*' + )`, cutoff); err != nil { + return err + } + policies, err := s.ListEventLogPolicies() + if err != nil { + return err + } + now := time.Now() + for _, policy := range policies { + if policy.EventType == "*" { + continue + } + policyCutoff := now.Add(-time.Duration(policy.RetentionHours) * time.Hour).UnixMilli() + if policy.AggregateAfterHours > 0 { + aggregateCutoff := now.Add(-time.Duration(policy.AggregateAfterHours) * time.Hour).UnixMilli() + if aggregateCutoff > policyCutoff { + policyCutoff = aggregateCutoff + } + } + if _, err := s.DB.Exec(`DELETE FROM event_logs AS l WHERE l.created_at_ms < ? AND EXISTS ( + SELECT 1 FROM event_jobs j WHERE (j.uuid=l.job_uuid OR (j.event_uuid<>'' AND j.event_uuid=l.event_uuid)) AND j.event_type=?)`, policyCutoff, policy.EventType); err != nil { + return err + } + if policy.MaxRows > 0 { + if _, err := s.DB.Exec(`DELETE FROM event_logs WHERE id IN ( + SELECT l.id FROM event_logs l JOIN event_jobs j ON (j.uuid=l.job_uuid OR (j.event_uuid<>'' AND j.event_uuid=l.event_uuid)) + WHERE j.event_type=? ORDER BY l.created_at_ms DESC,l.id DESC LIMIT -1 OFFSET ?)`, policy.EventType, policy.MaxRows); err != nil { + return err + } + } + if _, err := s.DB.Exec(`DELETE FROM event_log_buckets WHERE event_type=? AND bucket_start_ms < ?`, policy.EventType, now.Add(-time.Duration(policy.RetentionHours)*time.Hour).UnixMilli()); err != nil { + return err + } + } + _, err = s.DB.Exec(`DELETE FROM event_jobs WHERE updated_at_ms < ? + AND status IN ('succeeded','skipped','failed','cancelled')`, cutoff) + return err +} + +func (s *Store) GetQueueSettings() (QueueSettings, error) { + var q QueueSettings + var paused int + err := s.DB.QueryRow(`SELECT paused, concurrency, max_depth, + retry_base_seconds, retention_hours FROM event_queue_settings WHERE id=1`). + Scan(&paused, &q.Concurrency, &q.MaxDepth, &q.RetryBaseSeconds, &q.RetentionHours) + q.Paused = paused != 0 + return q, err +} + +func (s *Store) SetQueueSettings(q QueueSettings) error { + if q.Concurrency < 1 || q.Concurrency > 32 || q.MaxDepth < 1 || + q.RetryBaseSeconds < 1 || q.RetentionHours < 1 { + return errors.New("invalid queue settings") + } + _, err := s.DB.Exec(`UPDATE event_queue_settings SET paused=?, concurrency=?, + max_depth=?, retry_base_seconds=?, retention_hours=? WHERE id=1`, + q.Paused, q.Concurrency, q.MaxDepth, q.RetryBaseSeconds, q.RetentionHours) + return err +} + +func (s *Store) AddEventLog(jobUUID, eventUUID, level, message string) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + eventType := "unknown" + _ = tx.QueryRow(`SELECT event_type FROM event_jobs WHERE uuid=? OR event_uuid=? ORDER BY CASE WHEN uuid=? THEN 0 ELSE 1 END LIMIT 1`, jobUUID, eventUUID, jobUUID).Scan(&eventType) + if eventType == "" { + eventType = "unknown" + } + policy := EventLogPolicy{EventType: "*", RetentionHours: 168, AggregateAfterHours: 24, BucketSeconds: 60, MaxRows: 5000} + var specific EventLogPolicy + if err := scanEventLogPolicy(tx.QueryRow(`SELECT event_type,retention_hours,aggregate_after_hours,bucket_seconds,max_rows FROM event_log_policies WHERE event_type=?`, eventType), &specific); err == nil { + policy = specific + } else { + _ = scanEventLogPolicy(tx.QueryRow(`SELECT event_type,retention_hours,aggregate_after_hours,bucket_seconds,max_rows FROM event_log_policies WHERE event_type='*'`), &policy) + } + now := time.Now().UnixMilli() + if _, err := tx.Exec(`INSERT INTO event_logs(job_uuid,event_uuid,level,message,created_at_ms) VALUES(?,?,?,?,?)`, jobUUID, eventUUID, level, message, now); err != nil { + return err + } + bucket := int64(policy.BucketSeconds) + if bucket < 1 { + bucket = 60 + } + bucketStart := now - (now % (bucket * 1000)) + if _, err := tx.Exec(`INSERT INTO event_log_buckets(event_type,bucket_start_ms,level,count,first_at_ms,last_at_ms,sample_message) + VALUES(?,?,?,1,?,?,?) ON CONFLICT(event_type,bucket_start_ms,level) DO UPDATE SET count=count+1,last_at_ms=excluded.last_at_ms`, eventType, bucketStart, level, now, now, message); err != nil { + return err + } + return tx.Commit() +} + +func scanEventLogPolicy(scanner interface{ Scan(...any) error }, policy *EventLogPolicy) error { + return scanner.Scan(&policy.EventType, &policy.RetentionHours, &policy.AggregateAfterHours, &policy.BucketSeconds, &policy.MaxRows) +} + +func (s *Store) ListEventLogPolicies() ([]EventLogPolicy, error) { + rows, err := s.DB.Query(`SELECT event_type,retention_hours,aggregate_after_hours,bucket_seconds,max_rows FROM event_log_policies ORDER BY event_type`) + if err != nil { + return nil, err + } + defer rows.Close() + items := make([]EventLogPolicy, 0) + for rows.Next() { + var item EventLogPolicy + if err := scanEventLogPolicy(rows, &item); err != nil { + return nil, err + } + items = append(items, item) + } + return items, rows.Err() +} + +func (s *Store) SetEventLogPolicy(policy EventLogPolicy) error { + policy.EventType = strings.TrimSpace(policy.EventType) + if policy.EventType == "" || policy.RetentionHours < 1 || policy.RetentionHours > 24*3650 || + policy.AggregateAfterHours < 0 || policy.AggregateAfterHours > 24*3650 || policy.BucketSeconds < 10 || policy.BucketSeconds > 86400 || + policy.MaxRows < 100 || policy.MaxRows > 10000000 { + return errors.New("invalid event log policy") + } + _, err := s.DB.Exec(`INSERT INTO event_log_policies(event_type,retention_hours,aggregate_after_hours,bucket_seconds,max_rows) + VALUES(?,?,?,?,?) ON CONFLICT(event_type) DO UPDATE SET retention_hours=excluded.retention_hours, + aggregate_after_hours=excluded.aggregate_after_hours,bucket_seconds=excluded.bucket_seconds,max_rows=excluded.max_rows`, + policy.EventType, policy.RetentionHours, policy.AggregateAfterHours, policy.BucketSeconds, policy.MaxRows) + return err +} + +func (s *Store) ListEventLogTrends(ctx context.Context, eventType string, sinceMS int64, limit int) ([]EventLogTrend, error) { + if limit < 1 || limit > 2000 { + limit = 500 + } + if sinceMS < 0 { + sinceMS = 0 + } + query := `SELECT event_type,bucket_start_ms,level,count,first_at_ms,last_at_ms,sample_message FROM event_log_buckets WHERE bucket_start_ms>=?` + args := []any{sinceMS} + if strings.TrimSpace(eventType) != "" { + query += ` AND event_type=?` + args = append(args, strings.TrimSpace(eventType)) + } + query += ` ORDER BY bucket_start_ms DESC,event_type,level LIMIT ?` + args = append(args, limit) + rows, err := s.DB.QueryContext(ctx, query, args...) + if err != nil { + return nil, err + } + defer rows.Close() + items := make([]EventLogTrend, 0, limit) + for rows.Next() { + var item EventLogTrend + if err := rows.Scan(&item.EventType, &item.BucketStartMS, &item.Level, &item.Count, &item.FirstAtMS, &item.LastAtMS, &item.SampleMessage); err != nil { + return nil, err + } + items = append(items, item) + } + return items, rows.Err() +} + +func (s *Store) ListEventLogs(jobUUID string, limit int) ([]EventLog, error) { + return s.ListEventLogsBefore(jobUUID, limit, 0) +} + +func (s *Store) ListEventLogsBefore(jobUUID string, limit int, beforeID int64) ([]EventLog, error) { + if limit < 1 || limit > 1000 { + limit = 200 + } + query := `SELECT l.id,l.job_uuid,l.event_uuid,COALESCE(j.event_type,''),l.level,l.message,l.created_at_ms FROM event_logs l LEFT JOIN event_jobs j ON j.uuid=l.job_uuid WHERE 1=1` + args := []any{} + if jobUUID != "" { + query += ` AND job_uuid=?` + args = append(args, jobUUID) + } + if beforeID > 0 { + query += ` AND id < ?` + args = append(args, beforeID) + } + query += ` ORDER BY id DESC LIMIT ?` + args = append(args, limit) + rows, err := s.DB.Query(query, args...) + if err != nil { + return nil, err + } + defer rows.Close() + out := make([]EventLog, 0) + for rows.Next() { + var item EventLog + if err := rows.Scan(&item.ID, &item.JobUUID, &item.EventUUID, &item.EventType, &item.Level, &item.Message, &item.CreatedAtMS); err != nil { + return nil, err + } + out = append(out, item) + } + return out, rows.Err() +} + +func validateEventDefinition(event EventDefinition) error { + if event.UUID == ResourceEventID || event.EventType == ResourceEventType { + if event.UUID != ResourceEventID || event.EventType != ResourceEventType || event.ScheduleKind != "interval" || event.IntervalSeconds < 30 || event.IntervalSeconds > 86400 { + return errors.New("builtin resource monitoring requires its fixed ID and an interval of 30–86400 seconds") + } + } + event.ScheduleKind = strings.ToLower(strings.TrimSpace(event.ScheduleKind)) + if event.Name == "" || event.EventType == "" { + return errors.New("name and event_type are required") + } + switch event.ScheduleKind { + case "manual": + case "once": + if event.NextRunAtMS <= 0 { + return errors.New("next_run_at_ms is required for once schedule") + } + case "interval": + if event.IntervalSeconds < 1 { + return errors.New("interval_seconds must be positive") + } + default: + return errors.New("schedule_kind must be manual, once, or interval") + } + return nil +} + +func (s *Store) SaveEventDefinition(event *EventDefinition) error { + if err := validateEventDefinition(*event); err != nil { + return err + } + now := time.Now().UnixMilli() + if event.UUID == "" { + event.UUID = uuid.NewString() + event.CreatedAtMS = now + } + if event.MaxAttempts < 1 { + event.MaxAttempts = 3 + } + if event.ScheduleKind == "interval" && event.NextRunAtMS == 0 { + event.NextRunAtMS = time.Now().Add(time.Duration(event.IntervalSeconds) * time.Second).UnixMilli() + } + event.UpdatedAtMS = now + _, err := s.DB.Exec(`INSERT INTO event_definitions + (uuid,name,event_type,event_key,payload,schedule_kind,interval_seconds, + next_run_at_ms,enabled,priority,max_attempts,created_at_ms,updated_at_ms) + VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?) + ON CONFLICT(uuid) DO UPDATE SET name=excluded.name,event_type=excluded.event_type, + event_key=excluded.event_key,payload=excluded.payload,schedule_kind=excluded.schedule_kind, + interval_seconds=excluded.interval_seconds,next_run_at_ms=excluded.next_run_at_ms, + enabled=excluded.enabled,priority=excluded.priority,max_attempts=excluded.max_attempts, + updated_at_ms=excluded.updated_at_ms`, + event.UUID, event.Name, event.EventType, event.EventKey, event.Payload, + event.ScheduleKind, event.IntervalSeconds, event.NextRunAtMS, event.Enabled, + event.Priority, event.MaxAttempts, event.CreatedAtMS, event.UpdatedAtMS) + return err +} + +func (s *Store) ListEventDefinitions() ([]EventDefinition, error) { + rows, err := s.DB.Query(`SELECT uuid,name,event_type,event_key,payload,schedule_kind, + interval_seconds,next_run_at_ms,enabled,priority,max_attempts,created_at_ms,updated_at_ms + FROM event_definitions ORDER BY name`) + if err != nil { + return nil, err + } + defer rows.Close() + out := make([]EventDefinition, 0) + for rows.Next() { + var item EventDefinition + var enabled int + if err := rows.Scan(&item.UUID, &item.Name, &item.EventType, &item.EventKey, + &item.Payload, &item.ScheduleKind, &item.IntervalSeconds, &item.NextRunAtMS, + &enabled, &item.Priority, &item.MaxAttempts, &item.CreatedAtMS, &item.UpdatedAtMS); err != nil { + return nil, err + } + item.Enabled = enabled != 0 + out = append(out, item) + } + return out, rows.Err() +} + +func (s *Store) DeleteEventDefinition(eventUUID string) error { + if eventUUID == ResourceEventID { + return errors.New("disable the builtin resource event instead of deleting it") + } + _, err := s.DB.Exec(`DELETE FROM event_definitions WHERE uuid=?`, eventUUID) + return err +} + +func (s *Store) RunEventDefinition(eventUUID string) (bool, error) { + var event EventDefinition + var enabled int + err := s.DB.QueryRow(`SELECT uuid,name,event_type,event_key,payload,schedule_kind, + interval_seconds,next_run_at_ms,enabled,priority,max_attempts,created_at_ms,updated_at_ms + FROM event_definitions WHERE uuid=?`, eventUUID).Scan( + &event.UUID, &event.Name, &event.EventType, &event.EventKey, &event.Payload, + &event.ScheduleKind, &event.IntervalSeconds, &event.NextRunAtMS, &enabled, + &event.Priority, &event.MaxAttempts, &event.CreatedAtMS, &event.UpdatedAtMS) + if err != nil { + return false, err + } + return s.EnqueueEventWithOptions(event.UUID, event.EventType, + event.EventKey+":"+uuid.NewString(), event.Payload, time.Now(), event.Priority, event.MaxAttempts) +} + +func (s *Store) EnqueueDueDefinitions(now time.Time) (int, error) { + rows, err := s.DB.Query(`SELECT uuid FROM event_definitions WHERE enabled=1 + AND schedule_kind IN ('once','interval') AND next_run_at_ms>0 AND next_run_at_ms<=?`, + now.UnixMilli()) + if err != nil { + return 0, err + } + var ids []string + for rows.Next() { + var id string + if err := rows.Scan(&id); err != nil { + rows.Close() + return 0, err + } + ids = append(ids, id) + } + rows.Close() + count := 0 + for _, id := range ids { + queued, err := s.RunEventDefinition(id) + if err != nil { + return count, err + } + if queued { + count++ + } + _, err = s.DB.Exec(`UPDATE event_definitions SET + next_run_at_ms=CASE schedule_kind WHEN 'once' THEN 0 + ELSE ? + interval_seconds*1000 END, + enabled=CASE schedule_kind WHEN 'once' THEN 0 ELSE enabled END, + updated_at_ms=? WHERE uuid=?`, now.UnixMilli(), now.UnixMilli(), id) + if err != nil { + return count, err + } + } + return count, nil +} diff --git a/internal/store/event_log_policy_test.go b/internal/store/event_log_policy_test.go new file mode 100644 index 0000000..5087a41 --- /dev/null +++ b/internal/store/event_log_policy_test.go @@ -0,0 +1,77 @@ +package store + +import ( + "context" + "database/sql" + "testing" + + _ "modernc.org/sqlite" +) + +func TestEventLogPolicyAggregatesTrendsAndListsEventType(t *testing.T) { + db, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + defer db.Close() + s := &Store{DB: db} + if err := s.EnsureEventJobsSchema(); err != nil { + t.Fatal(err) + } + if err := s.SetEventLogPolicy(EventLogPolicy{EventType: "preview.test", RetentionHours: 24, AggregateAfterHours: 0, BucketSeconds: 60, MaxRows: 100}); err != nil { + t.Fatal(err) + } + if _, err := db.Exec(`INSERT INTO event_jobs(uuid,event_uuid,event_type,event_key,payload,status,run_at_ms,created_at_ms,updated_at_ms) VALUES('job-1','event-1','preview.test','key','{}','running',1,1,1)`); err != nil { + t.Fatal(err) + } + if err := s.AddEventLog("job-1", "event-1", "warning", "first"); err != nil { + t.Fatal(err) + } + if err := s.AddEventLog("job-1", "event-1", "warning", "second"); err != nil { + t.Fatal(err) + } + trends, err := s.ListEventLogTrends(context.Background(), "preview.test", 0, 10) + if err != nil || len(trends) != 1 || trends[0].EventType != "preview.test" || trends[0].Count != 2 { + t.Fatalf("trends=%+v err=%v", trends, err) + } + logs, err := s.ListEventLogs("job-1", 10) + if err != nil || len(logs) != 2 || logs[0].EventType != "preview.test" { + t.Fatalf("logs=%+v err=%v", logs, err) + } +} + +func TestPurgeEventHistoryUsesPerEventRetentionAndRowCap(t *testing.T) { + db, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + defer db.Close() + s := &Store{DB: db} + if err := s.EnsureEventJobsSchema(); err != nil { + t.Fatal(err) + } + if err := s.SetEventLogPolicy(EventLogPolicy{EventType: "short.event", RetentionHours: 1, AggregateAfterHours: 1, BucketSeconds: 60, MaxRows: 100}); err != nil { + t.Fatal(err) + } + if _, err := db.Exec(`INSERT INTO event_jobs(uuid,event_uuid,event_type,event_key,payload,status,run_at_ms,created_at_ms,updated_at_ms) VALUES('job-short','event-short','short.event','key','{}','succeeded',1,1,1)`); err != nil { + t.Fatal(err) + } + for i := 0; i < 3; i++ { + if err := s.AddEventLog("job-short", "event-short", "info", "message"); err != nil { + t.Fatal(err) + } + } + if _, err := db.Exec(`UPDATE event_logs SET created_at_ms=1`); err != nil { + t.Fatal(err) + } + if err := s.PurgeEventHistory(168); err != nil { + t.Fatal(err) + } + var count int + if err := db.QueryRow(`SELECT COUNT(*) FROM event_logs WHERE job_uuid='job-short'`).Scan(&count); err != nil { + t.Fatal(err) + } + if count != 0 { + t.Fatalf("expired event logs remain: %d", count) + } +} diff --git a/internal/store/federation.go b/internal/store/federation.go new file mode 100644 index 0000000..f0c3041 --- /dev/null +++ b/internal/store/federation.go @@ -0,0 +1,595 @@ +package store + +import ( + "crypto/ed25519" + "crypto/rand" + "crypto/sha256" + "database/sql" + "encoding/base64" + "encoding/hex" + "errors" + "log" + "strings" + "time" + + "github.com/google/uuid" +) + +type FederationInstance struct { + ID int64 + UUID string + CampusUUID string + FQDN string + Fingerprint string + Status string + LastSeenAt int64 + CreatedAt int64 +} + +type CampusToken struct { + ID int64 + CampusUUID string + Label string + Revoked bool + CreatedAt int64 + LastUsedAt int64 +} + +func (s *Store) ApplyManagedCampusSnapshot( + campus Campus, + domains []Domain, + localInstanceFQDN string, + transport string, +) error { + if campus.UUID == "" || campus.FQDN == "" { + return errors.New("invalid managed campus snapshot") + } + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + if _, err := tx.Exec(`UPDATE federation_manifest_state SET applied_at=applied_at WHERE campus_uuid=?`, campus.UUID); err != nil { + return err + } + var pinned int + if err := tx.QueryRow(`SELECT COUNT(*) FROM federation_manifest_state WHERE campus_uuid=?`, campus.UUID).Scan(&pinned); err != nil { + return err + } + if pinned != 0 { + return errors.New("unsigned snapshot rejected for a pinned Campus") + } + if err := applyManagedCampusSnapshotTx(tx, campus, domains, localInstanceFQDN, transport); err != nil { + return err + } + return tx.Commit() +} + +// applyManagedCampusSnapshotTx never commits independently: signed manifests, +// their checkpoint and the inherited administrator projection share one commit. +func applyManagedCampusSnapshotTx(tx *sql.Tx, campus Campus, domains []Domain, localInstanceFQDN, transport string) error { + if campus.UUID == "" || campus.FQDN == "" { + return errors.New("invalid managed campus snapshot") + } + var authority string + err := tx.QueryRow(`SELECT authority_mode FROM campuses WHERE uuid=?`, campus.UUID).Scan(&authority) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return err + } + if err == nil && authority != "managed" { + return errors.New("managed Campus snapshot cannot replace a local authority") + } + seen := make(map[string]bool, len(domains)) + for _, domain := range domains { + if domain.UUID == "" || domain.CampusUUID != campus.UUID || seen[domain.UUID] { + return errors.New("invalid managed domain snapshot") + } + seen[domain.UUID] = true + var owner string + err := tx.QueryRow(`SELECT campus_uuid FROM domains WHERE uuid=?`, domain.UUID).Scan(&owner) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return err + } + if err == nil && owner != campus.UUID { + return errors.New("managed Campus snapshot cannot claim another Campus Domain") + } + } + now := time.Now().Unix() + _, err = tx.Exec(` + INSERT INTO campuses ( + uuid, name, title, default_lang, authority_mode, + fqdn, controller_transport, last_contact_at, + last_contact_error, enabled, created_at + ) + VALUES (?, ?, ?, ?, 'managed', ?, ?, ?, '', 1, ?) + ON CONFLICT(uuid) DO UPDATE SET + name = excluded.name, + title = excluded.title, + default_lang = excluded.default_lang, + authority_mode = 'managed', + fqdn = excluded.fqdn, + controller_transport = excluded.controller_transport, + last_contact_at = excluded.last_contact_at, + last_contact_error = '', + enabled = 1 + `, campus.UUID, campus.Name, campus.Title, campus.DefaultLang, + campus.FQDN, transport, now, now) + if err != nil { + return err + } + if _, err = tx.Exec(` + UPDATE domains SET enabled = 0 WHERE campus_uuid = ? + `, campus.UUID); err != nil { + return err + } + var hasConfigTable int + if err := tx.QueryRow(` + SELECT count(*) FROM sqlite_master + WHERE type = 'table' AND name = 'config' + `).Scan(&hasConfigTable); err != nil { + return err + } + for _, domain := range domains { + if domain.UUID == "" || domain.CampusUUID != campus.UUID { + return errors.New("invalid managed domain snapshot") + } + placement := "remote" + if normalizeDomainHost(domain.InstanceFQDN) == + normalizeDomainHost(localInstanceFQDN) { + placement = "local" + } + _, err = tx.Exec(` + INSERT INTO domains ( + uuid, name, title, domain, enabled, created_at, + campus_uuid, placement, instance_fqdn, + instance_fingerprint + ) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + ON CONFLICT(uuid) DO UPDATE SET + name = excluded.name, + title = excluded.title, + domain = excluded.domain, + enabled = excluded.enabled, + campus_uuid = excluded.campus_uuid, + placement = excluded.placement, + instance_fqdn = excluded.instance_fqdn, + instance_fingerprint = excluded.instance_fingerprint + `, domain.UUID, domain.Name, domain.Title, domain.Domain, + boolToInt(domain.Enabled), domain.CreatedAt, campus.UUID, + placement, domain.InstanceFQDN, + domain.InstanceFingerprint) + if err != nil { + return err + } + if hasConfigTable != 0 { + if _, err = tx.Exec(` + INSERT INTO config (domain_uuid, key, value, updated_at) + VALUES ( + ?, 'locale', + CASE + WHEN lower(?) LIKE 'ja%' THEN 'ja' + ELSE 'en' + END, + strftime('%s','now') + ) + ON CONFLICT(domain_uuid, key) DO NOTHING + `, domain.UUID, campus.DefaultLang); err != nil { + return err + } + } + } + if err = projectCampusAdminMembershipsTx(tx); err != nil { + return err + } + return nil +} + +func boolToInt(value bool) int { + if value { + return 1 + } + return 0 +} + +func (s *Store) RecordCampusContact( + campusUUID string, + contactError string, +) error { + lastContactAt := time.Now().Unix() + if contactError != "" { + lastContactAt = 0 + } + _, err := s.DB.Exec(` + UPDATE campuses + SET last_contact_at = ?, last_contact_error = ? + WHERE uuid = ? AND authority_mode = 'managed' + `, lastContactAt, contactError, campusUUID) + return err +} + +func (s *Store) deleteManagedCampus(id int64) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + var campusUUID string + if err := tx.QueryRow(` + SELECT uuid FROM campuses + WHERE id = ? AND authority_mode = 'managed' + `, id).Scan(&campusUUID); err != nil { + return err + } + var configTable int + if err := tx.QueryRow(` + SELECT count(*) FROM sqlite_master + WHERE type = 'table' AND name = 'config' + `).Scan(&configTable); err != nil { + return err + } + if configTable > 0 { + if _, err := tx.Exec(` + DELETE FROM config + WHERE domain_uuid IN ( + SELECT uuid FROM domains WHERE campus_uuid = ? + ) + `, campusUUID); err != nil { + return err + } + } + if _, err := tx.Exec(` + DELETE FROM paths + WHERE domain_uuid IN ( + SELECT uuid FROM domains WHERE campus_uuid = ? + ) + `, campusUUID); err != nil { + return err + } + if _, err := tx.Exec(` + DELETE FROM domains WHERE campus_uuid = ? + `, campusUUID); err != nil { + return err + } + if _, err := tx.Exec(` + DELETE FROM campuses WHERE id = ? + `, id); err != nil { + return err + } + if err = projectCampusAdminMembershipsTx(tx); err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) EnsureFederationSchema() error { + _, err := s.DB.Exec(` + CREATE TABLE IF NOT EXISTS campus_tokens ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + campus_uuid TEXT NOT NULL, + token_hash TEXT NOT NULL UNIQUE, + label TEXT NOT NULL DEFAULT '', + revoked INTEGER NOT NULL DEFAULT 0, + created_at INTEGER NOT NULL, + last_used_at INTEGER NOT NULL DEFAULT 0 + ); + CREATE TABLE IF NOT EXISTS federation_instances ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + uuid TEXT NOT NULL UNIQUE, + campus_uuid TEXT NOT NULL, + fqdn TEXT NOT NULL, + fingerprint TEXT NOT NULL, + status TEXT NOT NULL DEFAULT 'pending', + last_seen_at INTEGER NOT NULL, + created_at INTEGER NOT NULL, + UNIQUE(campus_uuid, fqdn, fingerprint) + ); + CREATE INDEX IF NOT EXISTS idx_federation_instances_campus + ON federation_instances(campus_uuid, status, fqdn); + CREATE TABLE IF NOT EXISTS federation_instance_capabilities ( + instance_uuid TEXT PRIMARY KEY, manifest_version INTEGER NOT NULL + ); + CREATE TABLE IF NOT EXISTS federation_manifest_versions ( + campus_uuid TEXT PRIMARY KEY, + revision INTEGER NOT NULL, + manifest_hash TEXT NOT NULL, + updated_at INTEGER NOT NULL + ); + CREATE TABLE IF NOT EXISTS federation_manifest_state ( + campus_uuid TEXT PRIMARY KEY, + controller_public_key TEXT NOT NULL, + controller_fingerprint TEXT NOT NULL, + applied_revision INTEGER NOT NULL, + manifest_json TEXT NOT NULL, + applied_at INTEGER NOT NULL + ); + `) + return err +} + +func (s *Store) IssueCampusToken(campusUUID, label string) (string, error) { + campus, err := s.GetCampusByUUID(campusUUID) + if err != nil { + return "", err + } + if campus.AuthorityMode != "controller" { + return "", errors.New("campus is not a controller") + } + raw := make([]byte, 32) + if _, err := rand.Read(raw); err != nil { + return "", err + } + token := "pwc_" + base64.RawURLEncoding.EncodeToString(raw) + hash := sha256.Sum256([]byte(token)) + _, err = s.DB.Exec(` + INSERT INTO campus_tokens ( + campus_uuid, token_hash, label, created_at + ) + VALUES (?, ?, ?, ?) + `, campusUUID, hex.EncodeToString(hash[:]), strings.TrimSpace(label), time.Now().Unix()) + if err != nil { + return "", err + } + return token, nil +} + +func (s *Store) ListCampusTokens() ([]CampusToken, error) { + rows, err := s.DB.Query(` + SELECT id, campus_uuid, label, revoked, created_at, last_used_at + FROM campus_tokens + ORDER BY created_at DESC, id DESC + `) + if err != nil { + return nil, err + } + defer rows.Close() + var out []CampusToken + for rows.Next() { + var token CampusToken + var revoked int + if err := rows.Scan( + &token.ID, &token.CampusUUID, &token.Label, &revoked, + &token.CreatedAt, &token.LastUsedAt, + ); err != nil { + return nil, err + } + token.Revoked = revoked != 0 + out = append(out, token) + } + return out, rows.Err() +} + +func (s *Store) RevokeCampusToken(id int64) error { + result, err := s.DB.Exec(` + UPDATE campus_tokens SET revoked = 1 WHERE id = ? + `, id) + if err != nil { + return err + } + affected, err := result.RowsAffected() + if err != nil { + return err + } + if affected == 0 { + return sql.ErrNoRows + } + return nil +} + +func (s *Store) RegisterFederationInstance( + token, fqdn, fingerprint, publicKeyRaw, signatureRaw string, + capabilities ...FederationCapabilities, +) (*Campus, *FederationInstance, error) { + fqdn = normalizeDomainHost(fqdn) + fingerprint = strings.ToLower(strings.TrimSpace(fingerprint)) + if fqdn == "" || fingerprint == "" { + return nil, nil, errors.New("FQDN and fingerprint are required") + } + publicKey, err := base64.RawStdEncoding.DecodeString(publicKeyRaw) + if err != nil || len(publicKey) != ed25519.PublicKeySize { + return nil, nil, errors.New("invalid instance public key") + } + publicHash := sha256.Sum256(publicKey) + expectedFingerprint := "sha256:" + hex.EncodeToString(publicHash[:]) + if fingerprint != expectedFingerprint { + return nil, nil, errors.New("instance fingerprint does not match public key") + } + version := 1 + if len(capabilities) > 1 { + return nil, nil, errors.New("invalid capabilities") + } + if len(capabilities) == 1 { + c := capabilities[0] + if c.ManifestVersion != 0 && c.ManifestVersion != 1 && c.ManifestVersion != 2 { + return nil, nil, errors.New("unsupported manifest capability") + } + if c.ManifestVersion == 2 { + proof, e := base64.RawStdEncoding.DecodeString(c.Signature) + if e != nil || !ed25519.Verify(publicKey, []byte(FederationCapabilityMessage(fqdn, token)), proof) { + return nil, nil, errors.New("invalid capability signature") + } + version = 2 + } + } + signature, err := base64.RawStdEncoding.DecodeString(signatureRaw) + if err != nil || !ed25519.Verify( + ed25519.PublicKey(publicKey), + []byte(fqdn+"\n"+strings.TrimSpace(token)), + signature, + ) { + return nil, nil, errors.New("invalid instance proof-of-possession") + } + hash := sha256.Sum256([]byte(strings.TrimSpace(token))) + tokenHash := hex.EncodeToString(hash[:]) + + var campusUUID string + err = s.DB.QueryRow(` + SELECT campus_tokens.campus_uuid + FROM campus_tokens + JOIN campuses + ON campuses.uuid = campus_tokens.campus_uuid + AND campuses.authority_mode = 'controller' + WHERE campus_tokens.token_hash = ? + AND campus_tokens.revoked = 0 + `, tokenHash).Scan(&campusUUID) + if err != nil { + if errors.Is(err, sql.ErrNoRows) { + return nil, nil, errors.New("invalid or revoked campus token") + } + return nil, nil, err + } + + now := time.Now().Unix() + var exactIdentityCount, otherFingerprintCount int + if err := s.DB.QueryRow(` + SELECT + COALESCE(sum(CASE WHEN fingerprint = ? THEN 1 ELSE 0 END), 0), + COALESCE(sum(CASE WHEN fingerprint != ? THEN 1 ELSE 0 END), 0) + FROM federation_instances + WHERE campus_uuid = ? AND fqdn = ? + `, fingerprint, fingerprint, campusUUID, fqdn).Scan( + &exactIdentityCount, + &otherFingerprintCount, + ); err != nil { + return nil, nil, err + } + if exactIdentityCount == 0 && otherFingerprintCount > 0 { + log.Printf( + "WARNING federation instance fingerprint changed: campus=%s fqdn=%s new_fingerprint=%s", + campusUUID, + fqdn, + fingerprint, + ) + } + tx, err := s.DB.Begin() + if err != nil { + return nil, nil, err + } + defer tx.Rollback() + if _, err = tx.Exec(` + UPDATE campus_tokens SET last_used_at = ? WHERE token_hash = ? + `, now, tokenHash); err != nil { + return nil, nil, err + } + if _, err = tx.Exec(` + INSERT INTO federation_instances ( + uuid, campus_uuid, fqdn, fingerprint, status, + last_seen_at, created_at + ) + VALUES (?, ?, ?, ?, 'pending', ?, ?) + ON CONFLICT(campus_uuid, fqdn, fingerprint) + DO UPDATE SET last_seen_at = excluded.last_seen_at + `, uuid.NewString(), campusUUID, fqdn, fingerprint, now, now); err != nil { + return nil, nil, err + } + if _, err = tx.Exec(`INSERT INTO federation_instance_capabilities(instance_uuid,manifest_version) SELECT uuid,? FROM federation_instances WHERE campus_uuid=? AND fqdn=? AND fingerprint=? ON CONFLICT(instance_uuid) DO UPDATE SET manifest_version=excluded.manifest_version`, version, campusUUID, fqdn, fingerprint); err != nil { + return nil, nil, err + } + if err = tx.Commit(); err != nil { + return nil, nil, err + } + + campus, err := s.GetCampusByUUID(campusUUID) + if err != nil { + return nil, nil, err + } + instance, err := s.GetFederationInstance(campusUUID, fqdn, fingerprint) + return campus, instance, err +} + +type FederationCapabilities struct { + ManifestVersion int + Signature string +} + +func FederationCapabilityMessage(fqdn, token string) string { + return normalizeDomainHost(fqdn) + "\n" + strings.TrimSpace(token) + "\nmanifest=2" +} + +func (s *Store) GetFederationInstance( + campusUUID, fqdn, fingerprint string, +) (*FederationInstance, error) { + row := s.DB.QueryRow(` + SELECT id, uuid, campus_uuid, fqdn, fingerprint, status, + last_seen_at, created_at + FROM federation_instances + WHERE campus_uuid = ? AND fqdn = ? AND fingerprint = ? + `, campusUUID, fqdn, fingerprint) + var instance FederationInstance + err := row.Scan( + &instance.ID, &instance.UUID, &instance.CampusUUID, + &instance.FQDN, &instance.Fingerprint, &instance.Status, + &instance.LastSeenAt, &instance.CreatedAt, + ) + return &instance, err +} + +func (s *Store) ListFederationInstances( + campusUUID string, + approvedOnly bool, +) ([]FederationInstance, error) { + query := ` + SELECT id, uuid, campus_uuid, fqdn, fingerprint, status, + last_seen_at, created_at + FROM federation_instances + WHERE campus_uuid = ?` + if approvedOnly { + query += ` AND status = 'approved'` + } + query += ` ORDER BY fqdn, created_at` + rows, err := s.DB.Query(query, campusUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var out []FederationInstance + for rows.Next() { + var instance FederationInstance + if err := rows.Scan( + &instance.ID, &instance.UUID, &instance.CampusUUID, + &instance.FQDN, &instance.Fingerprint, &instance.Status, + &instance.LastSeenAt, &instance.CreatedAt, + ); err != nil { + return nil, err + } + out = append(out, instance) + } + return out, rows.Err() +} + +func (s *Store) SetFederationInstanceStatus(id int64, status string) error { + if status != "approved" && status != "revoked" { + return errors.New("invalid instance status") + } + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + result, err := tx.Exec(` + UPDATE federation_instances SET status = ? WHERE id = ? + `, status, id) + if err != nil { + return err + } + affected, err := result.RowsAffected() + if err != nil { + return err + } + if affected == 0 { + return sql.ErrNoRows + } + if status == "revoked" { + if _, err := tx.Exec(` + UPDATE domains + SET enabled = 0 + WHERE (campus_uuid, instance_fqdn, instance_fingerprint) = ( + SELECT campus_uuid, fqdn, fingerprint + FROM federation_instances + WHERE id = ? + ) + `, id); err != nil { + return err + } + } + return tx.Commit() +} diff --git a/internal/store/federation_capabilities_test.go b/internal/store/federation_capabilities_test.go new file mode 100644 index 0000000..c9c73b3 --- /dev/null +++ b/internal/store/federation_capabilities_test.go @@ -0,0 +1,53 @@ +package store + +import ( + "crypto/ed25519" + "crypto/rand" + "crypto/sha256" + "encoding/base64" + "encoding/hex" + "testing" +) + +func TestFederationCapabilityProof(t *testing.T) { + st := manifestIntegrityStore(t) + if err := st.CreateCampus("caps", "Caps", "en", "controller", "caps.example.test", true); err != nil { + t.Fatal(err) + } + var campus string + if err := st.DB.QueryRow(`SELECT uuid FROM campuses WHERE name='caps'`).Scan(&campus); err != nil { + t.Fatal(err) + } + token, err := st.IssueCampusToken(campus, "fixture") + if err != nil { + t.Fatal(err) + } + pub, priv, err := ed25519.GenerateKey(rand.Reader) + if err != nil { + t.Fatal(err) + } + sum := sha256.Sum256(pub) + fp := "sha256:" + hex.EncodeToString(sum[:]) + fqdn := "node.example.test" + enc := base64.RawStdEncoding.EncodeToString + proof := enc(ed25519.Sign(priv, []byte(fqdn+"\n"+token))) + cap := FederationCapabilities{ManifestVersion: 2, Signature: enc(ed25519.Sign(priv, []byte(FederationCapabilityMessage(fqdn, token))))} + _, node, err := st.RegisterFederationInstance(token, fqdn, fp, enc(pub), proof, cap) + if err != nil { + t.Fatal(err) + } + var version int + if err = st.DB.QueryRow(`SELECT manifest_version FROM federation_instance_capabilities WHERE instance_uuid=?`, node.UUID).Scan(&version); err != nil || version != 2 { + t.Fatal(version, err) + } + cap.Signature = proof + if _, _, err = st.RegisterFederationInstance(token, fqdn, fp, enc(pub), proof, cap); err == nil { + t.Fatal("legacy proof accepted as capability proof") + } + if _, _, err = st.RegisterFederationInstance(token, fqdn, fp, enc(pub), proof); err != nil { + t.Fatal(err) + } + if err = st.DB.QueryRow(`SELECT manifest_version FROM federation_instance_capabilities WHERE instance_uuid=?`, node.UUID).Scan(&version); err != nil || version != 1 { + t.Fatal("downgrade not recorded", version, err) + } +} diff --git a/internal/store/federation_manifest.go b/internal/store/federation_manifest.go new file mode 100644 index 0000000..8ff7fb0 --- /dev/null +++ b/internal/store/federation_manifest.go @@ -0,0 +1,199 @@ +package store + +import ( + "crypto/ed25519" + "crypto/sha256" + "database/sql" + "encoding/base64" + "encoding/hex" + "encoding/json" + "errors" + "sort" + "strings" + "time" +) + +type CampusManifestPayload struct { + SchemaVersion int `json:"schema_version"` + Revision int64 `json:"revision"` + Campus Campus `json:"campus"` + Domains []Domain `json:"domains"` + DomainEntries map[string]DomainEntrySettings `json:"domain_entries,omitempty"` +} + +type SignedCampusManifest struct { + CampusManifestPayload + ControllerPublicKey string `json:"controller_public_key"` + ControllerFingerprint string `json:"controller_fingerprint"` + Signature string `json:"signature"` +} + +func (s *Store) federationSigningKey() ed25519.PrivateKey { + seed := s.authKey + if len(seed) != ed25519.SeedSize { + sum := sha256.Sum256(seed) + seed = sum[:] + } + return ed25519.NewKeyFromSeed(seed) +} + +func (s *Store) BuildSignedCampusManifest(campus Campus, domains []Domain) (SignedCampusManifest, error) { + if campus.AuthorityMode != "controller" || campus.UUID == "" { + return SignedCampusManifest{}, errors.New("Campus is not a controller") + } + filtered := make([]Domain, 0, len(domains)) + seen := make(map[string]bool, len(domains)) + for _, domain := range domains { + if domain.CampusUUID == campus.UUID { + if domain.UUID == "" || seen[domain.UUID] { + return SignedCampusManifest{}, errors.New("duplicate or missing Domain identity in Campus manifest") + } + seen[domain.UUID] = true + filtered = append(filtered, domain) + } + } + sort.Slice(filtered, func(i, j int) bool { return filtered[i].UUID < filtered[j].UUID }) + entries, err := s.ListDomainEntrySettings() + if err != nil { + return SignedCampusManifest{}, err + } + for id := range entries { + if !seen[id] { + delete(entries, id) + } + } + content, err := json.Marshal(struct { + Campus Campus `json:"campus"` + Domains []Domain `json:"domains"` + Entries map[string]DomainEntrySettings `json:"domain_entries,omitempty"` + }{campus, filtered, entries}) + if err != nil { + return SignedCampusManifest{}, err + } + hash := sha256.Sum256(content) + hashText := hex.EncodeToString(hash[:]) + var revision int64 + // Allocate against the current row inside one write statement. A separate + // SELECT/UPSERT can sign different payloads with the same revision. + err = s.DB.QueryRow(`INSERT INTO federation_manifest_versions(campus_uuid,revision,manifest_hash,updated_at) + VALUES(?,1,?,?) ON CONFLICT(campus_uuid) DO UPDATE SET + revision=CASE WHEN federation_manifest_versions.manifest_hash=excluded.manifest_hash + THEN federation_manifest_versions.revision ELSE federation_manifest_versions.revision+1 END, + manifest_hash=excluded.manifest_hash, + updated_at=CASE WHEN federation_manifest_versions.manifest_hash=excluded.manifest_hash + THEN federation_manifest_versions.updated_at ELSE excluded.updated_at END + WHERE federation_manifest_versions.revision<9223372036854775807 OR federation_manifest_versions.manifest_hash=excluded.manifest_hash + RETURNING revision`, campus.UUID, hashText, time.Now().Unix()).Scan(&revision) + if err != nil { + return SignedCampusManifest{}, err + } + payload := CampusManifestPayload{SchemaVersion: 1, Revision: revision, Campus: campus, Domains: filtered} + if len(entries) > 0 { + payload.SchemaVersion = 2 + payload.DomainEntries = entries + } + encoded, err := json.Marshal(payload) + if err != nil { + return SignedCampusManifest{}, err + } + privateKey := s.federationSigningKey() + publicKey := privateKey.Public().(ed25519.PublicKey) + fingerprint := sha256.Sum256(publicKey) + return SignedCampusManifest{ + CampusManifestPayload: payload, + ControllerPublicKey: base64.RawStdEncoding.EncodeToString(publicKey), + ControllerFingerprint: "sha256:" + hex.EncodeToString(fingerprint[:]), + Signature: base64.RawStdEncoding.EncodeToString(ed25519.Sign(privateKey, encoded)), + }, nil +} + +func verifyCampusManifest(manifest SignedCampusManifest) ([]byte, error) { + if (manifest.SchemaVersion != 1 && manifest.SchemaVersion != 2) || manifest.Revision < 1 || manifest.Campus.UUID == "" || (manifest.SchemaVersion == 1 && len(manifest.DomainEntries) > 0) { + return nil, errors.New("invalid Campus manifest metadata") + } + publicKey, err := base64.RawStdEncoding.DecodeString(manifest.ControllerPublicKey) + if err != nil || len(publicKey) != ed25519.PublicKeySize { + return nil, errors.New("invalid controller public key") + } + fingerprint := sha256.Sum256(publicKey) + if manifest.ControllerFingerprint != "sha256:"+hex.EncodeToString(fingerprint[:]) { + return nil, errors.New("controller fingerprint does not match public key") + } + signature, err := base64.RawStdEncoding.DecodeString(manifest.Signature) + if err != nil { + return nil, errors.New("invalid Campus manifest signature") + } + payload, err := json.Marshal(manifest.CampusManifestPayload) + if err != nil || !ed25519.Verify(ed25519.PublicKey(publicKey), payload, signature) { + return nil, errors.New("Campus manifest signature verification failed") + } + seen := make(map[string]bool, len(manifest.Domains)) + for _, domain := range manifest.Domains { + if domain.UUID == "" || seen[domain.UUID] || domain.CampusUUID != manifest.Campus.UUID || strings.ContainsAny(domain.Domain, "/:\\") || strings.ContainsAny(domain.InstanceFQDN, "/:\\") { + return nil, errors.New("Campus manifest contains an invalid Domain hostname") + } + seen[domain.UUID] = true + } + for id, e := range manifest.DomainEntries { + if !seen[id] || !e.valid() { + return nil, errors.New("invalid Domain entry settings") + } + } + return payload, nil +} + +func (s *Store) ApplySignedManagedCampusManifest(manifest SignedCampusManifest, expectedCampusUUID, localInstanceFQDN, transport string) error { + payload, err := verifyCampusManifest(manifest) + if err != nil { + return err + } + if expectedCampusUUID != "" && manifest.Campus.UUID != expectedCampusUUID { + return errors.New("Campus controller identity changed") + } + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + // Reserve SQLite's writer before checking the pin/checkpoint, even when the + // Campus has no state yet. Concurrent first pins and duplicate deliveries + // then serialize without a stale read-to-write upgrade or unchecked retry. + if _, err := tx.Exec(`UPDATE federation_manifest_state SET applied_at=applied_at WHERE campus_uuid=?`, manifest.Campus.UUID); err != nil { + return err + } + var pinnedFingerprint, previousPayload string + var appliedRevision int64 + err = tx.QueryRow(`SELECT controller_fingerprint,applied_revision,manifest_json FROM federation_manifest_state WHERE campus_uuid=?`, manifest.Campus.UUID).Scan(&pinnedFingerprint, &appliedRevision, &previousPayload) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return err + } + if err == nil { + if pinnedFingerprint != manifest.ControllerFingerprint { + return errors.New("Campus controller signing identity changed") + } + if manifest.Revision < appliedRevision { + return errors.New("Campus manifest replay rejected") + } + if manifest.Revision == appliedRevision { + if previousPayload == string(payload) { + return nil + } + return errors.New("Campus manifest revision was reused with different content") + } + } + if err := applyManagedCampusSnapshotTx(tx, manifest.Campus, manifest.Domains, localInstanceFQDN, transport); err != nil { + return err + } + for _, d := range manifest.Domains { + if e, ok := manifest.DomainEntries[d.UUID]; ok { + if err := saveDomainEntryTx(tx, d.UUID, e, normalizeDomainHost(d.InstanceFQDN) == normalizeDomainHost(localInstanceFQDN)); err != nil { + return err + } + } + } + _, err = tx.Exec(`INSERT INTO federation_manifest_state(campus_uuid,controller_public_key,controller_fingerprint,applied_revision,manifest_json,applied_at) VALUES(?,?,?,?,?,?) ON CONFLICT(campus_uuid) DO UPDATE SET controller_public_key=excluded.controller_public_key,controller_fingerprint=excluded.controller_fingerprint,applied_revision=excluded.applied_revision,manifest_json=excluded.manifest_json,applied_at=excluded.applied_at`, manifest.Campus.UUID, manifest.ControllerPublicKey, manifest.ControllerFingerprint, manifest.Revision, string(payload), time.Now().Unix()) + if err != nil { + return err + } + return tx.Commit() +} diff --git a/internal/store/federation_manifest_integrity_test.go b/internal/store/federation_manifest_integrity_test.go new file mode 100644 index 0000000..e87e67c --- /dev/null +++ b/internal/store/federation_manifest_integrity_test.go @@ -0,0 +1,421 @@ +package store + +import ( + "bytes" + "crypto/ed25519" + "crypto/sha256" + "encoding/base64" + "encoding/hex" + "encoding/json" + "fmt" + "math" + "sort" + "strings" + "testing" + + "pageswiki/internal/db" +) + +func manifestIntegrityStore(t *testing.T) *Store { + t.Helper() + database, err := db.Open(t.TempDir() + "/manifest.db") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := New(database) + if err := st.EnsureConfigTable(); err != nil { + t.Fatal(err) + } + return st +} + +func manifestFixture(t *testing.T) (*Store, Campus, []Domain) { + t.Helper() + controller := manifestIntegrityStore(t) + controller.authKey = bytes.Repeat([]byte{1}, ed25519.SeedSize) + campus := Campus{UUID: "manifest-campus", Name: "controller", Title: "Controller", DefaultLang: "ja", AuthorityMode: "controller", FQDN: "controller.example.test", Enabled: true} + domains := []Domain{ + {UUID: "managed-a", CampusUUID: campus.UUID, Name: "managed-a", Title: "Managed A", Domain: "a", InstanceFQDN: "local.example.test", Enabled: true}, + {UUID: "managed-b", CampusUUID: campus.UUID, Name: "managed-b", Title: "Managed B", Domain: "b", InstanceFQDN: "other.example.test", Enabled: true}, + } + return controller, campus, domains +} + +func buildManifest(t *testing.T, controller *Store, campus Campus, domains []Domain) SignedCampusManifest { + t.Helper() + manifest, err := controller.BuildSignedCampusManifest(campus, domains) + if err != nil { + t.Fatal(err) + } + return manifest +} + +func signTestManifest(t *testing.T, controller *Store, manifest SignedCampusManifest) SignedCampusManifest { + t.Helper() + payload, err := json.Marshal(manifest.CampusManifestPayload) + if err != nil { + t.Fatal(err) + } + private := controller.federationSigningKey() + public := private.Public().(ed25519.PublicKey) + fingerprint := sha256.Sum256(public) + manifest.ControllerPublicKey = base64.RawStdEncoding.EncodeToString(public) + manifest.ControllerFingerprint = "sha256:" + hex.EncodeToString(fingerprint[:]) + manifest.Signature = base64.RawStdEncoding.EncodeToString(ed25519.Sign(private, payload)) + return manifest +} + +func applyManifest(st *Store, manifest SignedCampusManifest) error { + return st.ApplySignedManagedCampusManifest(manifest, manifest.Campus.UUID, "local.example.test", "https") +} + +func manifestState(t *testing.T, st *Store) string { + t.Helper() + var result []string + for _, table := range []string{"campuses", "domains", "config", "federation_manifest_state", "campus_admin_grants", "campus_admin_membership_origins", "domain_memberships", "group_members", "auth_sessions"} { + rows, err := st.DB.Query(`SELECT * FROM ` + table) + if err != nil { + t.Fatal(err) + } + columns, err := rows.Columns() + if err != nil { + rows.Close() + t.Fatal(err) + } + for rows.Next() { + values := make([]any, len(columns)) + pointers := make([]any, len(columns)) + for i := range values { + pointers[i] = &values[i] + } + if err := rows.Scan(pointers...); err != nil { + rows.Close() + t.Fatal(err) + } + encoded, err := json.Marshal(values) + if err != nil { + rows.Close() + t.Fatal(err) + } + result = append(result, table+":"+string(encoded)) + } + if err := rows.Err(); err != nil { + rows.Close() + t.Fatal(err) + } + rows.Close() + } + sort.Strings(result) + return strings.Join(result, "\n") +} + +func TestManifestRevisionAllocationIsAtomic(t *testing.T) { + controller, campus, domains := manifestFixture(t) + const count = 20 + type result struct { + manifest SignedCampusManifest + err error + } + for _, identical := range []bool{true, false} { + start := make(chan struct{}) + results := make(chan result, count) + for i := 0; i < count; i++ { + go func(i int) { + <-start + copy := campus + if !identical { + copy.Title = fmt.Sprintf("Concurrent %d", i) + } + manifest, err := controller.BuildSignedCampusManifest(copy, domains) + results <- result{manifest, err} + }(i) + } + close(start) + seen := map[int64]bool{} + for range count { + result := <-results + if result.err != nil { + t.Fatal(result.err) + } + if _, err := verifyCampusManifest(result.manifest); err != nil { + t.Fatal(err) + } + if identical && result.manifest.Revision != 1 { + t.Fatalf("identical payload allocated revision %d", result.manifest.Revision) + } + if !identical && seen[result.manifest.Revision] { + t.Fatalf("different contents reused revision %d", result.manifest.Revision) + } + seen[result.manifest.Revision] = true + } + if !identical { + for revision := int64(2); revision <= count+1; revision++ { + if !seen[revision] { + t.Fatalf("allocation lost revision %d", revision) + } + } + } + } +} + +func TestManifestRevisionAllocationCanonicalOrderAndOverflow(t *testing.T) { + controller, campus, domains := manifestFixture(t) + first := buildManifest(t, controller, campus, domains) + reordered := buildManifest(t, controller, campus, []Domain{domains[1], domains[0]}) + if first.Revision != reordered.Revision || first.Signature != reordered.Signature { + t.Fatal("Domain ordering changed manifest identity") + } + if _, err := controller.DB.Exec(`UPDATE federation_manifest_versions SET revision=? WHERE campus_uuid=?`, int64(math.MaxInt64), campus.UUID); err != nil { + t.Fatal(err) + } + campus.Title = "Overflow" + if _, err := controller.BuildSignedCampusManifest(campus, domains); err == nil { + t.Fatal("manifest sequence overflow accepted") + } + var revision int64 + if err := controller.DB.QueryRow(`SELECT revision FROM federation_manifest_versions WHERE campus_uuid=?`, campus.UUID).Scan(&revision); err != nil || revision != math.MaxInt64 { + t.Fatalf("overflow corrupted revision: %d, %v", revision, err) + } + if _, err := controller.DB.Exec(`DROP TABLE federation_manifest_versions`); err != nil { + t.Fatal(err) + } + if _, err := controller.BuildSignedCampusManifest(campus, domains); err == nil { + t.Fatal("database error reset manifest sequence") + } +} + +func TestConcurrentManifestDuplicatesAndReplayNeverRegress(t *testing.T) { + controller, campus, domains := manifestFixture(t) + managed := manifestIntegrityStore(t) + first := buildManifest(t, controller, campus, domains) + campus.Title = "New generation" + latest := buildManifest(t, controller, campus, domains[:1]) + const count = 24 + start := make(chan struct{}) + results := make(chan error, count) + for i := 0; i < count; i++ { + go func(i int) { + <-start + manifest := first + if i%2 == 0 { + manifest = latest + } + results <- applyManifest(managed, manifest) + }(i) + } + close(start) + for range count { + if err := <-results; err != nil && !strings.Contains(err.Error(), "replay") { + t.Fatal(err) + } + } + var revision int64 + var payload string + if err := managed.DB.QueryRow(`SELECT applied_revision,manifest_json FROM federation_manifest_state WHERE campus_uuid=?`, campus.UUID).Scan(&revision, &payload); err != nil { + t.Fatal(err) + } + if revision != latest.Revision || !strings.Contains(payload, "New generation") { + t.Fatalf("concurrent application regressed checkpoint: %d, %s", revision, payload) + } + stored, err := managed.GetCampusByUUID(campus.UUID) + if err != nil || stored.Title != latest.Campus.Title { + t.Fatalf("checkpoint and Campus disagree: %#v, %v", stored, err) + } + before := manifestState(t, managed) + if err := applyManifest(managed, latest); err != nil { + t.Fatal(err) + } + if after := manifestState(t, managed); after != before { + t.Fatal("duplicate manifest reapplied mutable snapshot effects") + } + if err := applyManifest(managed, first); err == nil { + t.Fatal("stale manifest accepted") + } +} + +func TestConcurrentFirstManifestPinsAndConflictsSerialize(t *testing.T) { + for _, kind := range []string{"key", "payload"} { + t.Run(kind, func(t *testing.T) { + controller, campus, domains := manifestFixture(t) + managed := manifestIntegrityStore(t) + first := buildManifest(t, controller, campus, domains) + second := first + if kind == "key" { + other := manifestIntegrityStore(t) + other.authKey = bytes.Repeat([]byte{2}, ed25519.SeedSize) + second = signTestManifest(t, other, second) + } else { + second.Campus.Title = "Same revision, different content" + second = signTestManifest(t, controller, second) + } + start := make(chan struct{}) + results := make(chan error, 2) + for _, manifest := range []SignedCampusManifest{first, second} { + go func(manifest SignedCampusManifest) { <-start; results <- applyManifest(managed, manifest) }(manifest) + } + close(start) + success := 0 + for range 2 { + err := <-results + if err == nil { + success++ + } else if !strings.Contains(err.Error(), "identity changed") && !strings.Contains(err.Error(), "reused") { + t.Fatal(err) + } + } + if success != 1 { + t.Fatalf("competing first %s manifests succeeded %d times", kind, success) + } + }) + } +} + +func TestManifestSnapshotCheckpointAndProjectionRollbackTogether(t *testing.T) { + for _, stage := range []string{"initial-checkpoint", "updated-checkpoint", "projection"} { + t.Run(stage, func(t *testing.T) { + controller, campus, domains := manifestFixture(t) + managed := manifestIntegrityStore(t) + manifest := buildManifest(t, controller, campus, domains) + trigger := `CREATE TRIGGER reject_checkpoint BEFORE INSERT ON federation_manifest_state BEGIN SELECT RAISE(ABORT,'injected checkpoint failure'); END` + if stage != "initial-checkpoint" { + if err := applyManifest(managed, manifest); err != nil { + t.Fatal(err) + } + campus.Title = "Must roll back" + manifest = buildManifest(t, controller, campus, domains[:1]) + trigger = `CREATE TRIGGER reject_checkpoint BEFORE UPDATE ON federation_manifest_state WHEN NEW.applied_revision!=OLD.applied_revision BEGIN SELECT RAISE(ABORT,'injected checkpoint failure'); END` + } + if stage == "projection" { + if _, err := managed.DB.Exec(`INSERT INTO campus_admin_grants VALUES('test-group','test-member','campus_admin_inherit:test','member',1)`); err != nil { + t.Fatal(err) + } + trigger = `CREATE TRIGGER reject_checkpoint BEFORE DELETE ON campus_admin_grants BEGIN SELECT RAISE(ABORT,'injected projection failure'); END` + } + before := manifestState(t, managed) + if _, err := managed.DB.Exec(trigger); err != nil { + t.Fatal(err) + } + if err := applyManifest(managed, manifest); err == nil { + t.Fatal("injected application failure was ignored") + } + if after := manifestState(t, managed); after != before { + t.Fatalf("snapshot/projection/checkpoint did not roll back atomically:\nbefore:\n%s\nafter:\n%s", before, after) + } + if _, err := managed.DB.Exec(`DROP TRIGGER reject_checkpoint`); err != nil { + t.Fatal(err) + } + if err := applyManifest(managed, manifest); err != nil { + t.Fatalf("retry after rolled-back checkpoint failed: %v", err) + } + }) + } +} + +func TestManagedSnapshotCannotTakeOverOtherAuthority(t *testing.T) { + for _, collision := range []string{"standalone-campus", "controller-campus", "foreign-domain"} { + t.Run(collision, func(t *testing.T) { + controller, campus, domains := manifestFixture(t) + managed := manifestIntegrityStore(t) + local, err := managed.GetDefaultCampus() + if err != nil { + t.Fatal(err) + } + if collision == "foreign-domain" { + domain, err := managed.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + domains[0].UUID = domain.UUID + } else { + campus.UUID, campus.Name = local.UUID, local.Name + for i := range domains { + domains[i].CampusUUID = campus.UUID + } + if collision == "controller-campus" { + if _, err := managed.DB.Exec(`UPDATE campuses SET authority_mode='controller' WHERE uuid=?`, local.UUID); err != nil { + t.Fatal(err) + } + } + } + manifest := buildManifest(t, controller, campus, domains) + before := manifestState(t, managed) + if err := applyManifest(managed, manifest); err == nil { + t.Fatal("valid signature authorized cross-authority takeover") + } + if after := manifestState(t, managed); after != before { + t.Fatal("rejected takeover changed local authority") + } + }) + } +} + +func TestManagedCampusBootstrapUpgradeAndUnsignedDowngrade(t *testing.T) { + controller, campus, domains := manifestFixture(t) + managed := manifestIntegrityStore(t) + // Legacy enrollment still works until a signed checkpoint has pinned a key. + if err := managed.ApplyManagedCampusSnapshot(campus, nil, "local.example.test", "http"); err != nil { + t.Fatal(err) + } + pending := buildManifest(t, controller, campus, nil) + if err := applyManifest(managed, pending); err != nil { + t.Fatalf("legacy-to-signed upgrade failed: %v", err) + } + approved := buildManifest(t, controller, campus, domains) + if err := applyManifest(managed, approved); err != nil { + t.Fatalf("approved enrollment did not deploy Domains: %v", err) + } + for _, domain := range domains { + stored, err := managed.GetDomainByUUID(domain.UUID) + if err != nil || !stored.Enabled || stored.CampusUUID != campus.UUID { + t.Fatalf("managed Domain not deployed: %#v, %v", stored, err) + } + wantPlacement := "remote" + if domain.InstanceFQDN == "local.example.test" { + wantPlacement = "local" + } + if stored.Placement != wantPlacement { + t.Fatalf("placement=%s, want %s", stored.Placement, wantPlacement) + } + locale, err := managed.GetConfigInDomain(domain.UUID, "locale") + if err != nil || locale != "ja" { + t.Fatalf("inherited locale=%s, %v", locale, err) + } + } + before := manifestState(t, managed) + if err := managed.ApplyManagedCampusSnapshot(campus, nil, "local.example.test", "http"); err == nil { + t.Fatal("unsigned fallback bypassed pinned controller signature") + } + if after := manifestState(t, managed); after != before { + t.Fatal("unsigned downgrade modified managed state") + } +} + +func TestManifestApplyUsesOneConnectionAndFailsClosedOnStateErrors(t *testing.T) { + controller, campus, domains := manifestFixture(t) + managed := manifestIntegrityStore(t) + managed.DB.SetMaxOpenConns(1) + first := buildManifest(t, controller, campus, domains) + if err := applyManifest(managed, first); err != nil { + t.Fatalf("transactional projection failed with a one-connection pool: %v", err) + } + campus.Title = "Must not apply without checkpoint table" + latest := buildManifest(t, controller, campus, domains[:1]) + if _, err := managed.DB.Exec(`ALTER TABLE federation_manifest_state RENAME TO unavailable_manifest_state`); err != nil { + t.Fatal(err) + } + if err := applyManifest(managed, latest); err == nil { + t.Fatal("state-table error was treated as a first enrollment") + } + stored, err := managed.GetCampusByUUID(campus.UUID) + if err != nil || stored.Title != first.Campus.Title { + t.Fatalf("checkpoint read error partially changed Campus: %#v, %v", stored, err) + } + domain, err := managed.GetDomainByUUID(domains[1].UUID) + if err != nil || !domain.Enabled { + t.Fatalf("checkpoint read error disabled a Domain: %#v, %v", domain, err) + } +} diff --git a/internal/store/federation_manifest_test.go b/internal/store/federation_manifest_test.go new file mode 100644 index 0000000..46f32cd --- /dev/null +++ b/internal/store/federation_manifest_test.go @@ -0,0 +1,46 @@ +package store_test + +import ( + "testing" + + "pageswiki/internal/store" +) + +func TestSignedCampusManifestRejectsTamperAndReplay(t *testing.T) { + st := newTopologyStore(t) + if err := st.CreateCampus("controller", "Controller", "en", "controller", "controller.example.test", true); err != nil { + t.Fatal(err) + } + var campus store.Campus + for _, candidate := range mustCampuses(t, st) { + if candidate.Name == "controller" { + campus = candidate + } + } + domain := store.Domain{UUID: "domain-1", CampusUUID: campus.UUID, Name: "docs", Title: "Docs", Domain: "docs", Placement: "remote", InstanceFQDN: "node.example.test", InstanceFingerprint: "sha256:test", Enabled: true} + manifest, err := st.BuildSignedCampusManifest(campus, []store.Domain{domain}) + if err != nil { + t.Fatal(err) + } + managed := newTopologyStore(t) + if err := managed.ApplySignedManagedCampusManifest(manifest, campus.UUID, "node.example.test", "https"); err != nil { + t.Fatal(err) + } + if err := managed.ApplySignedManagedCampusManifest(manifest, campus.UUID, "node.example.test", "https"); err != nil { + t.Fatalf("idempotent manifest failed: %v", err) + } + tampered := manifest + tampered.Campus.Title = "Tampered" + if err := managed.ApplySignedManagedCampusManifest(tampered, campus.UUID, "node.example.test", "https"); err == nil { + t.Fatal("tampered manifest was accepted") + } +} + +func mustCampuses(t *testing.T, st *store.Store) []store.Campus { + t.Helper() + campuses, err := st.ListCampuses() + if err != nil { + t.Fatal(err) + } + return campuses +} diff --git a/internal/store/federation_test.go b/internal/store/federation_test.go new file mode 100644 index 0000000..81fab2d --- /dev/null +++ b/internal/store/federation_test.go @@ -0,0 +1,286 @@ +package store_test + +import ( + "crypto/ed25519" + "crypto/rand" + "crypto/sha256" + "encoding/base64" + "encoding/hex" + "strings" + "testing" + + "pageswiki/internal/store" +) + +func registrationProof( + t *testing.T, + fqdn string, + token string, +) (string, string, string) { + t.Helper() + publicKey, privateKey, err := ed25519.GenerateKey(rand.Reader) + if err != nil { + t.Fatal(err) + } + sum := sha256.Sum256(publicKey) + return "sha256:" + hex.EncodeToString(sum[:]), + base64.RawStdEncoding.EncodeToString(publicKey), + base64.RawStdEncoding.EncodeToString( + ed25519.Sign(privateKey, []byte(fqdn+"\n"+token)), + ) +} + +func TestCampusTokenIsHashedAndFingerprintChangeIsPending(t *testing.T) { + st := newTopologyStore(t) + if err := st.CreateCampus( + "federated", + "Federated Campus", + "en", + "controller", + "federated.example.test", + true, + ); err != nil { + t.Fatal(err) + } + var campus store.Campus + campuses, err := st.ListCampuses() + if err != nil { + t.Fatal(err) + } + for _, candidate := range campuses { + if candidate.Name == "federated" { + campus = candidate + } + } + token, err := st.IssueCampusToken(campus.UUID, "node enrollment") + if err != nil { + t.Fatal(err) + } + var storedHash string + if err := st.DB.QueryRow(` + SELECT token_hash FROM campus_tokens WHERE campus_uuid = ? + `, campus.UUID).Scan(&storedHash); err != nil { + t.Fatal(err) + } + if storedHash == token || strings.Contains(storedHash, token) { + t.Fatal("plain enrollment token was persisted") + } + + firstFingerprint, firstPublicKey, firstSignature := + registrationProof(t, "node.example.test", token) + _, first, err := st.RegisterFederationInstance( + token, + "node.example.test", + firstFingerprint, + firstPublicKey, + firstSignature, + ) + if err != nil { + t.Fatal(err) + } + if err := st.SetFederationInstanceStatus(first.ID, "approved"); err != nil { + t.Fatal(err) + } + replacementFingerprint, replacementPublicKey, replacementSignature := + registrationProof(t, "node.example.test", token) + _, replacement, err := st.RegisterFederationInstance( + token, + "node.example.test", + replacementFingerprint, + replacementPublicKey, + replacementSignature, + ) + if err != nil { + t.Fatal(err) + } + if replacement.Status != "pending" { + t.Fatalf("replacement status = %q", replacement.Status) + } + if replacement.ID == first.ID { + t.Fatal("changed fingerprint reused the approved instance identity") + } + tokens, err := st.ListCampusTokens() + if err != nil { + t.Fatal(err) + } + if len(tokens) != 1 { + t.Fatalf("token count = %d", len(tokens)) + } + if err := st.RevokeCampusToken(tokens[0].ID); err != nil { + t.Fatal(err) + } + revokedFingerprint, revokedPublicKey, revokedSignature := + registrationProof(t, "revoked.example.test", token) + if _, _, err := st.RegisterFederationInstance( + token, + "revoked.example.test", + revokedFingerprint, + revokedPublicKey, + revokedSignature, + ); err == nil { + t.Fatal("revoked token registered an instance") + } +} + +func TestDeletingControllerCampusRemovesFederationCredentials(t *testing.T) { + st := newTopologyStore(t) + if err := st.CreateCampus( + "controller-delete", + "Controller to delete", + "en", + "controller", + "delete.example.test", + true, + ); err != nil { + t.Fatal(err) + } + campuses, err := st.ListCampuses() + if err != nil { + t.Fatal(err) + } + var controller store.Campus + for _, campus := range campuses { + if campus.Name == "controller-delete" { + controller = campus + break + } + } + token, err := st.IssueCampusToken(controller.UUID, "delete test") + if err != nil { + t.Fatal(err) + } + fingerprint, publicKey, signature := + registrationProof(t, "node.delete.example.test", token) + if _, _, err := st.RegisterFederationInstance( + token, + "node.delete.example.test", + fingerprint, + publicKey, + signature, + ); err != nil { + t.Fatal(err) + } + + if err := st.DeleteCampus(controller.ID); err != nil { + t.Fatal(err) + } + var tokenCount, instanceCount int + if err := st.DB.QueryRow(` + SELECT count(*) FROM campus_tokens WHERE campus_uuid = ? + `, controller.UUID).Scan(&tokenCount); err != nil { + t.Fatal(err) + } + if err := st.DB.QueryRow(` + SELECT count(*) FROM federation_instances WHERE campus_uuid = ? + `, controller.UUID).Scan(&instanceCount); err != nil { + t.Fatal(err) + } + if tokenCount != 0 || instanceCount != 0 { + t.Fatalf( + "federation records remain: tokens=%d instances=%d", + tokenCount, + instanceCount, + ) + } + if _, _, err := st.RegisterFederationInstance( + token, + "node.delete.example.test", + fingerprint, + publicKey, + signature, + ); err == nil || !strings.Contains(err.Error(), "invalid or revoked") { + t.Fatalf("deleted Campus token error = %v", err) + } +} + +func TestManagedCampusSnapshotIsInheritedAndReadOnly(t *testing.T) { + st := newTopologyStore(t) + campus := store.Campus{ + UUID: "managed-campus-uuid", + Name: "external-campus", + Title: "External Campus", + DefaultLang: "ja", + FQDN: "campus.example.test", + } + domains := []store.Domain{ + { + UUID: "managed-local-domain", + CampusUUID: campus.UUID, + Name: "managed-local", + Title: "Managed Local", + Domain: "local", + Enabled: true, + InstanceFQDN: "node.example.test", + InstanceFingerprint: "sha256:node", + }, + { + UUID: "managed-remote-domain", + CampusUUID: campus.UUID, + Name: "managed-remote", + Title: "Managed Remote", + Domain: "remote", + Enabled: true, + InstanceFQDN: "other.example.test", + InstanceFingerprint: "sha256:other", + }, + } + if err := st.ApplyManagedCampusSnapshot( + campus, + domains, + "node.example.test", + "https", + ); err != nil { + t.Fatal(err) + } + inherited, err := st.GetCampusByUUID(campus.UUID) + if err != nil { + t.Fatal(err) + } + if inherited.AuthorityMode != "managed" || + inherited.Title != campus.Title || + inherited.DefaultLang != "ja" { + t.Fatalf("inherited Campus = %#v", inherited) + } + local, err := st.GetDomainByUUID("managed-local-domain") + if err != nil { + t.Fatal(err) + } + remote, err := st.GetDomainByUUID("managed-remote-domain") + if err != nil { + t.Fatal(err) + } + if local.Placement != "local" || remote.Placement != "remote" { + t.Fatalf( + "managed placements = %q, %q", + local.Placement, + remote.Placement, + ) + } + if err := st.UpdateCampus( + inherited.ID, + "changed", + "Changed", + "en", + "managed", + inherited.FQDN, + true, + ); err == nil { + t.Fatal("managed Campus was edited locally") + } + if err := st.RecordCampusContact(campus.UUID, "connection refused"); err != nil { + t.Fatal(err) + } + contact, err := st.GetCampusByUUID(campus.UUID) + if err != nil { + t.Fatal(err) + } + if contact.LastContactError != "connection refused" { + t.Fatalf("contact error = %q", contact.LastContactError) + } + if err := st.DeleteCampus(inherited.ID); err != nil { + t.Fatal(err) + } + if _, err := st.GetCampusByUUID(campus.UUID); err == nil { + t.Fatal("managed Campus was not deleted") + } +} diff --git a/internal/store/groups.go b/internal/store/groups.go new file mode 100644 index 0000000..7060a76 --- /dev/null +++ b/internal/store/groups.go @@ -0,0 +1,384 @@ +package store + +import ( + "errors" + "regexp" + "strings" + "time" + + "github.com/google/uuid" +) + +var groupNamePattern = regexp.MustCompile(`^[a-z0-9][a-z0-9_-]{1,63}$`) + +type Group struct { + UUID, DomainUUID, Name, DisplayName, Description, Visibility, State, BuiltinKey string + InheritMembers bool + CreatedAtMS, UpdatedAtMS int64 +} + +type GroupMember struct { + MembershipUUID, PrincipalUUID, Username, DisplayName, MemberRole, Source string +} + +type GroupPermission struct { + UUID, GroupUUID, ScopePath, Permission string +} + +var groupPermissions = map[string]map[string]bool{ + "read": {"read": true}, + "read_write_once": {"read": true, "create": true, "upload": true}, + "read_write": {"read": true, "create": true, "write": true, "upload": true, "rename": true, "link": true}, + "upload_only": {"upload": true}, +} + +func NormalizeGroupPermission(value string) (string, error) { + value = strings.ToLower(strings.TrimSpace(value)) + if _, ok := groupPermissions[value]; !ok { + return "", errors.New("invalid group permission") + } + return value, nil +} + +func normalizeGroupName(name string) (string, error) { + name = strings.ToLower(strings.TrimSpace(name)) + if !groupNamePattern.MatchString(name) || name == "new" || name == "sys" || name == "campus_admin" || name == "domain_admin" { + return "", errors.New("group name must be 2-64 lowercase letters, digits, underscores, or hyphens") + } + return name, nil +} + +func (s *Store) EnsureBuiltinAdminGroups() error { + now := time.Now().UnixMilli() + var hasDomains int + if err := s.DB.QueryRow(`SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='domains'`).Scan(&hasDomains); err != nil || hasDomains == 0 { + return err + } + rows, err := s.DB.Query(`SELECT uuid FROM domains`) + if err != nil { + return err + } + var domains []string + for rows.Next() { + var id string + if err := rows.Scan(&id); err != nil { + rows.Close() + return err + } + domains = append(domains, id) + } + rows.Close() + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + for _, domainUUID := range domains { + for _, key := range []string{"campus_admin", "domain_admin"} { + _, err = tx.Exec(`INSERT INTO groups(uuid,domain_uuid,name,display_name,description,visibility,state,builtin_key,inherit_members,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,'members','active',?,?,?,?) ON CONFLICT(domain_uuid,name) DO UPDATE SET builtin_key=excluded.builtin_key`, uuid.NewString(), domainUUID, key, strings.ReplaceAll(key, "_", " "), "Built-in administrative group", key, key == "campus_admin", now, now) + if err != nil { + return err + } + } + _, err = tx.Exec(`INSERT OR IGNORE INTO group_members(group_uuid,membership_uuid,member_role,source,created_at_ms) SELECT g.uuid,m.uuid,'owner','migration',? FROM groups g JOIN domain_memberships m ON m.domain_uuid=g.domain_uuid JOIN auth_role_bindings b ON b.membership_uuid=m.uuid JOIN auth_roles r ON r.uuid=b.role_uuid JOIN auth_capability_grants c ON c.role_uuid=r.uuid AND c.capability='manage' AND c.target_type='domain' WHERE g.domain_uuid=? AND g.builtin_key='domain_admin'`, now, domainUUID) + if err != nil { + return err + } + } + if err = seedCampusAdminRoleGrantsTx(tx, now); err != nil { + return err + } + if err = projectCampusAdminMembershipsTx(tx); err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) IsBuiltinGroupAdmin(domainUUID, principalUUID, key string) bool { + var allowed int + _ = s.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM groups g JOIN domains d ON d.uuid=g.domain_uuid AND d.enabled=1 JOIN group_members gm ON gm.group_uuid=g.uuid JOIN domain_memberships m ON m.uuid=gm.membership_uuid AND m.domain_uuid=g.domain_uuid JOIN principals p ON p.uuid=m.principal_uuid WHERE g.domain_uuid=? AND g.builtin_key=? AND g.state='active' AND m.principal_uuid=? AND m.state='active' AND p.state='active' AND gm.member_role IN ('owner','manager'))`, domainUUID, key, principalUUID).Scan(&allowed) + return allowed != 0 +} + +func (s *Store) IsCampusAdmin(campusUUID, principalUUID string) bool { + var allowed int + _ = s.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM groups g JOIN domains d ON d.uuid=g.domain_uuid AND d.enabled=1 JOIN group_members gm ON gm.group_uuid=g.uuid JOIN domain_memberships m ON m.uuid=gm.membership_uuid AND m.domain_uuid=g.domain_uuid JOIN principals p ON p.uuid=m.principal_uuid WHERE d.campus_uuid=? AND g.builtin_key='campus_admin' AND g.state='active' AND m.principal_uuid=? AND m.state='active' AND p.state='active' AND gm.member_role IN ('owner','manager'))`, campusUUID, principalUUID).Scan(&allowed) + return allowed != 0 +} + +func (s *Store) SetCampusAdminInheritance(groupUUID string, enabled bool) error { + value := 0 + if enabled { + value = 1 + } + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + result, err := tx.Exec(`UPDATE groups SET inherit_members=?,updated_at_ms=? WHERE uuid=? AND builtin_key='campus_admin'`, value, time.Now().UnixMilli(), groupUUID) + if err != nil { + return err + } + changed, _ := result.RowsAffected() + if changed != 1 { + return errors.New("campus_admin group not found") + } + if err = projectCampusAdminMembershipsTx(tx); err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) CreateGroup(domainUUID, ownerPrincipalUUID, name, displayName, description, visibility string) (*Group, error) { + name, err := normalizeGroupName(name) + if err != nil { + return nil, err + } + if visibility != "public" && visibility != "domain" && visibility != "members" { + visibility = "members" + } + if strings.TrimSpace(displayName) == "" { + displayName = name + } + now := time.Now().UnixMilli() + group := &Group{UUID: uuid.NewString(), DomainUUID: domainUUID, Name: name, DisplayName: strings.TrimSpace(displayName), Description: strings.TrimSpace(description), Visibility: visibility, State: "active", CreatedAtMS: now, UpdatedAtMS: now} + tx, err := s.DB.Begin() + if err != nil { + return nil, err + } + defer tx.Rollback() + var membershipUUID string + if err := tx.QueryRow(`SELECT uuid FROM domain_memberships WHERE domain_uuid=? AND principal_uuid=? AND state='active'`, domainUUID, ownerPrincipalUUID).Scan(&membershipUUID); err != nil { + return nil, err + } + if _, err = tx.Exec(`INSERT INTO groups(uuid,domain_uuid,name,display_name,description,visibility,state,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,?,?,?,?)`, group.UUID, domainUUID, group.Name, group.DisplayName, group.Description, group.Visibility, group.State, now, now); err != nil { + return nil, err + } + if _, err = tx.Exec(`INSERT INTO group_members(group_uuid,membership_uuid,member_role,source,created_at_ms) VALUES(?,?, 'owner','local',?)`, group.UUID, membershipUUID, now); err != nil { + return nil, err + } + return group, tx.Commit() +} + +func (s *Store) GroupByName(domainUUID, name string) (*Group, error) { + var group Group + err := s.DB.QueryRow(`SELECT uuid,domain_uuid,name,display_name,description,visibility,state,builtin_key,inherit_members,created_at_ms,updated_at_ms FROM groups WHERE domain_uuid=? AND name=? AND state!='archived'`, domainUUID, strings.ToLower(strings.TrimSpace(name))).Scan(&group.UUID, &group.DomainUUID, &group.Name, &group.DisplayName, &group.Description, &group.Visibility, &group.State, &group.BuiltinKey, &group.InheritMembers, &group.CreatedAtMS, &group.UpdatedAtMS) + return &group, err +} + +func (s *Store) GroupByUUID(domainUUID, groupUUID string) (*Group, error) { + var group Group + err := s.DB.QueryRow(`SELECT uuid,domain_uuid,name,display_name,description,visibility,state,builtin_key,inherit_members,created_at_ms,updated_at_ms FROM groups WHERE domain_uuid=? AND uuid=?`, domainUUID, groupUUID).Scan(&group.UUID, &group.DomainUUID, &group.Name, &group.DisplayName, &group.Description, &group.Visibility, &group.State, &group.BuiltinKey, &group.InheritMembers, &group.CreatedAtMS, &group.UpdatedAtMS) + return &group, err +} + +func (s *Store) ListGroups(domainUUID, principalUUID string) ([]Group, error) { + rows, err := s.DB.Query(`SELECT DISTINCT g.uuid,g.domain_uuid,g.name,g.display_name,g.description,g.visibility,g.state,g.builtin_key,g.inherit_members,g.created_at_ms,g.updated_at_ms FROM groups g LEFT JOIN group_members gm ON gm.group_uuid=g.uuid LEFT JOIN domain_memberships m ON m.uuid=gm.membership_uuid AND m.principal_uuid=? WHERE g.domain_uuid=? AND g.state!='archived' AND (g.visibility='public' OR (?!='' AND g.visibility='domain') OR m.uuid IS NOT NULL) ORDER BY lower(g.display_name),g.name`, principalUUID, domainUUID, principalUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var groups []Group + for rows.Next() { + var group Group + if err := rows.Scan(&group.UUID, &group.DomainUUID, &group.Name, &group.DisplayName, &group.Description, &group.Visibility, &group.State, &group.BuiltinKey, &group.InheritMembers, &group.CreatedAtMS, &group.UpdatedAtMS); err != nil { + return nil, err + } + groups = append(groups, group) + } + return groups, rows.Err() +} + +func (s *Store) GroupMemberRole(groupUUID, principalUUID string) string { + var role string + _ = s.DB.QueryRow(`SELECT gm.member_role FROM group_members gm JOIN domain_memberships m ON m.uuid=gm.membership_uuid WHERE gm.group_uuid=? AND m.principal_uuid=? AND m.state='active'`, groupUUID, principalUUID).Scan(&role) + return role +} + +func (s *Store) GroupMemberRoleByMembership(groupUUID, membershipUUID string) string { + var role string + _ = s.DB.QueryRow(`SELECT member_role FROM group_members WHERE group_uuid=? AND membership_uuid=?`, groupUUID, membershipUUID).Scan(&role) + return role +} + +func (s *Store) ListGroupMembers(groupUUID string) ([]GroupMember, error) { + rows, err := s.DB.Query(`SELECT m.uuid,p.uuid,COALESCE((SELECT subject FROM principal_identities i WHERE i.principal_uuid=p.uuid AND i.provider_type='password' LIMIT 1),p.uuid),p.display_name,gm.member_role,gm.source FROM group_members gm JOIN domain_memberships m ON m.uuid=gm.membership_uuid JOIN principals p ON p.uuid=m.principal_uuid WHERE gm.group_uuid=? ORDER BY CASE gm.member_role WHEN 'owner' THEN 0 WHEN 'manager' THEN 1 ELSE 2 END,lower(p.display_name)`, groupUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var members []GroupMember + for rows.Next() { + var member GroupMember + if err := rows.Scan(&member.MembershipUUID, &member.PrincipalUUID, &member.Username, &member.DisplayName, &member.MemberRole, &member.Source); err != nil { + return nil, err + } + members = append(members, member) + } + return members, rows.Err() +} + +func (s *Store) AddGroupMemberByUsername(domainUUID, groupUUID, username, role string) error { + if role != "owner" && role != "manager" && role != "member" { + return errors.New("invalid group member role") + } + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + // Serialize before the identity lookup as well as the ownership check. + if _, err = tx.Exec(`UPDATE groups SET updated_at_ms=updated_at_ms WHERE uuid=? AND domain_uuid=?`, groupUUID, domainUUID); err != nil { + return err + } + var membershipUUID, builtinKey string + err = tx.QueryRow(`SELECT m.uuid,g.builtin_key FROM domain_memberships m JOIN principal_identities i ON i.principal_uuid=m.principal_uuid AND i.provider_type='password' JOIN groups g ON g.uuid=? AND g.domain_uuid=m.domain_uuid WHERE m.domain_uuid=? AND i.subject=? AND m.state='active'`, groupUUID, domainUUID, strings.ToLower(strings.TrimSpace(username))).Scan(&membershipUUID, &builtinKey) + if err != nil { + return err + } + // Ordinary add/update is not an ownership-transfer API. Keep this check in + // the write itself, including when another request just promoted the member. + result, err := tx.Exec(`INSERT INTO group_members(group_uuid,membership_uuid,member_role,source,created_at_ms) VALUES(?,?,?,'local',?) ON CONFLICT(group_uuid,membership_uuid) DO UPDATE SET member_role=excluded.member_role,source=excluded.source WHERE group_members.member_role!='owner' OR excluded.member_role='owner'`, groupUUID, membershipUUID, role, time.Now().UnixMilli()) + if err != nil { + return err + } + if count, err := result.RowsAffected(); err != nil { + return err + } else if count == 0 { + return errors.New("owner role cannot be downgraded by a member update") + } + if builtinKey == "campus_admin" { + if _, err = tx.Exec(`DELETE FROM campus_admin_grants WHERE group_uuid=? AND membership_uuid=? AND substr(source,1,21)!='campus_admin_inherit:'`, groupUUID, membershipUUID); err != nil { + return err + } + if _, err = tx.Exec(`INSERT INTO campus_admin_grants(group_uuid,membership_uuid,source,member_role,created_at_ms) VALUES(?,?,'local',?,?)`, groupUUID, membershipUUID, role, time.Now().UnixMilli()); err != nil { + return err + } + if err = projectCampusAdminMembershipsTx(tx); err != nil { + return err + } + } + // An explicit local grant adopts a previously projected Domain membership. + if _, err = tx.Exec(`DELETE FROM campus_admin_membership_origins WHERE membership_uuid=?`, membershipUUID); err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) RemoveGroupMember(groupUUID, membershipUUID string) error { + return s.RemoveGroupMemberWithAuthority(groupUUID, membershipUUID, true) +} + +func (s *Store) RemoveGroupMemberWithAuthority(groupUUID, membershipUUID string, ownerAuthority bool) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + if _, err = tx.Exec(`UPDATE groups SET updated_at_ms=updated_at_ms WHERE uuid=?`, groupUUID); err != nil { + return err + } + var builtinKey string + if err = tx.QueryRow(`SELECT builtin_key FROM groups WHERE uuid=?`, groupUUID).Scan(&builtinKey); err != nil { + return err + } + if builtinKey == "campus_admin" { + // Inherited-only entries can only be revoked at their source. Inherited + // owners do not satisfy the guard for removing the last independent owner. + var allowed int + if err = tx.QueryRow(`SELECT EXISTS(SELECT 1 FROM campus_admin_grants grant + WHERE grant.group_uuid=? AND grant.membership_uuid=? + AND substr(grant.source,1,21)!='campus_admin_inherit:' + AND (? OR NOT EXISTS(SELECT 1 FROM group_members gm WHERE gm.group_uuid=grant.group_uuid + AND gm.membership_uuid=grant.membership_uuid AND gm.member_role!='member')) + AND (NOT EXISTS(SELECT 1 FROM campus_admin_grants mine WHERE mine.group_uuid=grant.group_uuid + AND mine.membership_uuid=grant.membership_uuid AND mine.member_role='owner' + AND substr(mine.source,1,21)!='campus_admin_inherit:') + OR EXISTS(SELECT 1 FROM campus_admin_grants other WHERE other.group_uuid=grant.group_uuid + AND other.membership_uuid!=grant.membership_uuid AND other.member_role='owner' + AND substr(other.source,1,21)!='campus_admin_inherit:')) + )`, groupUUID, membershipUUID, ownerAuthority).Scan(&allowed); err != nil { + return err + } + if allowed == 0 { + return errors.New("member removal requires a local grant, sufficient authority, and at least one remaining local owner; inherited grants must be revoked at their source") + } + if _, err = tx.Exec(`DELETE FROM campus_admin_grants WHERE group_uuid=? AND membership_uuid=? AND substr(source,1,21)!='campus_admin_inherit:'`, groupUUID, membershipUUID); err != nil { + return err + } + if err = projectCampusAdminMembershipsTx(tx); err != nil { + return err + } + return tx.Commit() + } + // A single SQLite write serializes the check and deletion. A manager cannot + // delete a member concurrently promoted to owner/manager by another request. + result, err := tx.Exec(`DELETE FROM group_members WHERE group_uuid=? AND membership_uuid=? + AND (? OR member_role='member') + AND (member_role!='owner' OR EXISTS ( + SELECT 1 FROM group_members other WHERE other.group_uuid=? AND other.membership_uuid!=? AND other.member_role='owner' + ))`, groupUUID, membershipUUID, ownerAuthority, groupUUID, membershipUUID) + if err != nil { + return err + } + if count, err := result.RowsAffected(); err != nil { + return err + } else if count == 0 { + return errors.New("member removal requires sufficient authority and at least one remaining owner") + } + return tx.Commit() +} + +func (s *Store) SetGroupPermission(groupUUID, scopePath, permission string) error { + permission, err := NormalizeGroupPermission(permission) + if err != nil { + return err + } + scopePath = "/" + strings.Trim(strings.TrimSpace(scopePath), "/") + if scopePath == "//" { + scopePath = "/" + } + _, err = s.DB.Exec(`INSERT INTO group_permissions(uuid,group_uuid,scope_path,permission,created_at_ms) VALUES(?,?,?,?,?) ON CONFLICT(group_uuid,scope_path) DO UPDATE SET permission=excluded.permission`, uuid.NewString(), groupUUID, scopePath, permission, time.Now().UnixMilli()) + return err +} + +func (s *Store) ListGroupPermissions(groupUUID string) ([]GroupPermission, error) { + rows, err := s.DB.Query(`SELECT uuid,group_uuid,scope_path,permission FROM group_permissions WHERE group_uuid=? ORDER BY scope_path`, groupUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var out []GroupPermission + for rows.Next() { + var item GroupPermission + if err := rows.Scan(&item.UUID, &item.GroupUUID, &item.ScopePath, &item.Permission); err != nil { + return nil, err + } + out = append(out, item) + } + return out, rows.Err() +} + +func (s *Store) groupPermissionAllows(domainUUID, principalUUID, capability, targetPath string) (bool, error) { + return groupPermissionAllowsFrom(s.DB, domainUUID, principalUUID, capability, targetPath) +} + +func groupPermissionAllowsFrom(q pathQueryer, domainUUID, principalUUID, capability, targetPath string) (bool, error) { + rows, err := q.Query(`SELECT gp.scope_path,gp.permission FROM group_permissions gp JOIN groups g ON g.uuid=gp.group_uuid AND g.domain_uuid=? AND g.state='active' JOIN group_members gm ON gm.group_uuid=g.uuid JOIN domain_memberships m ON m.uuid=gm.membership_uuid AND m.principal_uuid=? AND m.state='active' JOIN principals p ON p.uuid=m.principal_uuid AND (p.state='active' OR (p.state='readonly' AND ?='read'))`, domainUUID, principalUUID, capability) + if err != nil { + return false, err + } + defer rows.Close() + for rows.Next() { + var scope, permission string + if err := rows.Scan(&scope, &permission); err != nil { + return false, err + } + inside := targetPath == scope || scope == "/" || strings.HasPrefix(targetPath, strings.TrimRight(scope, "/")+"/") + if inside && groupPermissions[permission][capability] { + return true, nil + } + } + return false, rows.Err() +} diff --git a/internal/store/groups_inheritance.go b/internal/store/groups_inheritance.go new file mode 100644 index 0000000..fb8d325 --- /dev/null +++ b/internal/store/groups_inheritance.go @@ -0,0 +1,186 @@ +package store + +import ( + "database/sql" + "time" +) + +// campusAdminInheritancePrefix is deliberately not a LIKE pattern: underscore +// is a wildcard in SQL LIKE. Derived grants must never become projection roots. +const campusAdminInheritancePrefix = "campus_admin_inherit:" + +func (s *Store) ensureCampusAdminInheritanceSchema() error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + for _, statement := range []string{ + `CREATE TABLE IF NOT EXISTS campus_admin_grants ( + group_uuid TEXT NOT NULL, membership_uuid TEXT NOT NULL, + source TEXT NOT NULL, member_role TEXT NOT NULL, + created_at_ms INTEGER NOT NULL, + PRIMARY KEY(group_uuid,membership_uuid,source))`, + `CREATE INDEX IF NOT EXISTS campus_admin_grants_membership ON campus_admin_grants(membership_uuid)`, + `CREATE TABLE IF NOT EXISTS campus_admin_membership_origins ( + membership_uuid TEXT PRIMARY KEY, domain_uuid TEXT NOT NULL, + principal_uuid TEXT NOT NULL, UNIQUE(domain_uuid,principal_uuid))`, + `CREATE TABLE IF NOT EXISTS campus_admin_migrations (key TEXT PRIMARY KEY)`, + } { + if _, err = tx.Exec(statement); err != nil { + return err + } + } + // Only the old direct grants are authoritative. Copying old inherited rows + // would perpetuate cycles from the former insert-only implementation. Do not + // infer ownership of old Domain memberships: their origin was not recorded. + if _, err = tx.Exec(`INSERT OR IGNORE INTO campus_admin_grants + (group_uuid,membership_uuid,source,member_role,created_at_ms) + SELECT gm.group_uuid,gm.membership_uuid,gm.source,gm.member_role,gm.created_at_ms + FROM group_members gm JOIN groups g ON g.uuid=gm.group_uuid + WHERE g.builtin_key='campus_admin' AND substr(gm.source,1,21)!='campus_admin_inherit:' + AND NOT EXISTS(SELECT 1 FROM campus_admin_migrations WHERE key='direct-grants-v1')`); err != nil { + return err + } + if _, err = tx.Exec(`INSERT OR IGNORE INTO campus_admin_migrations(key) VALUES('direct-grants-v1')`); err != nil { + return err + } + return tx.Commit() +} + +// seedCampusAdminRoleGrantsTx is the one-time migration of each independent +// Domain administrator binding. A later explicit group removal must not be +// undone by restarting the server or creating another Domain. +func seedCampusAdminRoleGrantsTx(tx *sql.Tx, now int64) error { + const candidates = `SELECT DISTINCT g.uuid AS group_uuid,m.uuid AS membership_uuid + FROM groups g JOIN domain_memberships m ON m.domain_uuid=g.domain_uuid + JOIN auth_role_bindings b ON b.membership_uuid=m.uuid + JOIN auth_roles r ON r.uuid=b.role_uuid AND r.domain_uuid=m.domain_uuid + JOIN auth_capability_grants c ON c.role_uuid=r.uuid + AND c.capability='manage' AND c.target_type='domain' + AND (c.target_id=m.domain_uuid OR c.target_id='*') + WHERE g.builtin_key='campus_admin'` + if _, err := tx.Exec(`INSERT OR IGNORE INTO campus_admin_grants + (group_uuid,membership_uuid,source,member_role,created_at_ms) + SELECT group_uuid,membership_uuid,'migration','owner',? FROM (`+candidates+`) + WHERE NOT EXISTS(SELECT 1 FROM campus_admin_migrations + WHERE key='role:'||group_uuid||':'||membership_uuid)`, now); err != nil { + return err + } + _, err := tx.Exec(`INSERT OR IGNORE INTO campus_admin_migrations(key) + SELECT 'role:'||group_uuid||':'||membership_uuid FROM (` + candidates + `)`) + return err +} + +func (s *Store) ProjectCampusAdminMemberships() error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + if err = projectCampusAdminMembershipsTx(tx); err != nil { + return err + } + return tx.Commit() +} + +// projectCampusAdminMembershipsTx materializes effective group membership from +// independent roots, never from its own output. The caller's mutation and this +// reconciliation commit together, so revocation has no observable stale window. +func projectCampusAdminMembershipsTx(tx *sql.Tx) error { + var hasDomains int + if err := tx.QueryRow(`SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='domains'`).Scan(&hasDomains); err != nil || hasDomains == 0 { + return err + } + now := time.Now().UnixMilli() + // These statements also obtain a write lock before reading projection input. + if _, err := tx.Exec(`DELETE FROM campus_admin_grants WHERE substr(source,1,21)='campus_admin_inherit:'`); err != nil { + return err + } + const roots = `SELECT src.uuid AS source_group_uuid,origin.uuid AS source_domain_uuid, + origin.campus_uuid,srcm.principal_uuid,MIN(grant.created_at_ms) AS created_at_ms, + CASE MAX(CASE grant.member_role WHEN 'owner' THEN 3 WHEN 'manager' THEN 2 ELSE 1 END) + WHEN 3 THEN 'owner' WHEN 2 THEN 'manager' ELSE 'member' END AS member_role + FROM campus_admin_grants grant + JOIN groups src ON src.uuid=grant.group_uuid AND src.builtin_key='campus_admin' + AND src.state='active' AND src.inherit_members=1 + JOIN domains origin ON origin.uuid=src.domain_uuid AND origin.enabled=1 + JOIN domain_memberships srcm ON srcm.uuid=grant.membership_uuid + AND srcm.domain_uuid=src.domain_uuid AND srcm.state='active' + JOIN principals p ON p.uuid=srcm.principal_uuid AND p.state='active' + WHERE substr(grant.source,1,21)!='campus_admin_inherit:' + GROUP BY src.uuid,origin.uuid,origin.campus_uuid,srcm.principal_uuid` + // Record exactly the memberships this projection creates. Existing local + // memberships (including deliberately suspended ones) are never reactivated. + if _, err := tx.Exec(`INSERT OR IGNORE INTO campus_admin_membership_origins + (membership_uuid,domain_uuid,principal_uuid) + SELECT lower(hex(randomblob(4)))||'-'||lower(hex(randomblob(2)))||'-4'||substr(lower(hex(randomblob(2))),2)||'-a'||substr(lower(hex(randomblob(2))),2)||'-'||lower(hex(randomblob(6))),domain_uuid,principal_uuid FROM ( + SELECT DISTINCT dst.uuid AS domain_uuid,root.principal_uuid FROM (` + roots + `) root + JOIN domains dst ON dst.campus_uuid=root.campus_uuid AND dst.uuid!=root.source_domain_uuid AND dst.enabled=1 + JOIN groups dstg ON dstg.domain_uuid=dst.uuid AND dstg.builtin_key='campus_admin' AND dstg.state='active' + WHERE NOT EXISTS(SELECT 1 FROM domain_memberships m + WHERE m.domain_uuid=dst.uuid AND m.principal_uuid=root.principal_uuid))`); err != nil { + return err + } + if _, err := tx.Exec(`INSERT OR IGNORE INTO domain_memberships + (uuid,domain_uuid,principal_uuid,state,created_at_ms) + SELECT membership_uuid,domain_uuid,principal_uuid,'active',? + FROM campus_admin_membership_origins`, now); err != nil { + return err + } + if _, err := tx.Exec(`INSERT INTO campus_admin_grants + (group_uuid,membership_uuid,source,member_role,created_at_ms) + SELECT dstg.uuid,dstm.uuid,'campus_admin_inherit:'||root.source_group_uuid,root.member_role,root.created_at_ms + FROM (` + roots + `) root + JOIN domains dst ON dst.campus_uuid=root.campus_uuid AND dst.uuid!=root.source_domain_uuid AND dst.enabled=1 + JOIN groups dstg ON dstg.domain_uuid=dst.uuid AND dstg.builtin_key='campus_admin' AND dstg.state='active' + JOIN domain_memberships dstm ON dstm.domain_uuid=dst.uuid AND dstm.principal_uuid=root.principal_uuid + AND dstm.state='active'`); err != nil { + return err + } + if _, err := tx.Exec(`DELETE FROM group_members WHERE + group_uuid IN (SELECT uuid FROM groups WHERE builtin_key='campus_admin') + OR substr(source,1,21)='campus_admin_inherit:'`); err != nil { + return err + } + // The strongest remaining grant wins. Prefer the independent local source + // on ties; weaker local grants remain in provenance and reappear on revoke. + if _, err := tx.Exec(`INSERT INTO group_members(group_uuid,membership_uuid,member_role,source,created_at_ms) + SELECT group_uuid,membership_uuid,member_role,source,created_at_ms FROM ( + SELECT grant.*,ROW_NUMBER() OVER(PARTITION BY grant.group_uuid,grant.membership_uuid + ORDER BY CASE grant.member_role WHEN 'owner' THEN 3 WHEN 'manager' THEN 2 ELSE 1 END DESC, + CASE WHEN substr(grant.source,1,21)='campus_admin_inherit:' THEN 1 ELSE 0 END, + grant.source) AS rank + FROM campus_admin_grants grant JOIN groups g ON g.uuid=grant.group_uuid + JOIN domains d ON d.uuid=g.domain_uuid + JOIN domain_memberships m ON m.uuid=grant.membership_uuid AND m.domain_uuid=g.domain_uuid + ) WHERE rank=1`); err != nil { + return err + } + // A newly added independent group/role grant adopts an inherited membership + // as local. Revocation must not delete that membership, binding, or session. + if _, err := tx.Exec(`DELETE FROM campus_admin_membership_origins WHERE + EXISTS(SELECT 1 FROM auth_role_bindings b WHERE b.membership_uuid=campus_admin_membership_origins.membership_uuid) + OR EXISTS(SELECT 1 FROM group_members gm WHERE gm.membership_uuid=campus_admin_membership_origins.membership_uuid + AND substr(gm.source,1,21)!='campus_admin_inherit:') + OR EXISTS(SELECT 1 FROM campus_admin_grants grant WHERE grant.membership_uuid=campus_admin_membership_origins.membership_uuid + AND substr(grant.source,1,21)!='campus_admin_inherit:')`); err != nil { + return err + } + const noGrants = `NOT EXISTS(SELECT 1 FROM group_members gm + WHERE gm.membership_uuid=origin.membership_uuid) + AND NOT EXISTS(SELECT 1 FROM auth_role_bindings b WHERE b.membership_uuid=origin.membership_uuid)` + if _, err := tx.Exec(`UPDATE auth_sessions SET revoked_at_ms=? WHERE revoked_at_ms=0 AND EXISTS( + SELECT 1 FROM campus_admin_membership_origins origin + WHERE origin.domain_uuid=auth_sessions.domain_uuid AND origin.principal_uuid=auth_sessions.principal_uuid + AND `+noGrants+`)`, now); err != nil { + return err + } + if _, err := tx.Exec(`DELETE FROM domain_memberships WHERE uuid IN ( + SELECT origin.membership_uuid FROM campus_admin_membership_origins origin WHERE ` + noGrants + `)`); err != nil { + return err + } + _, err := tx.Exec(`DELETE FROM campus_admin_membership_origins WHERE + NOT EXISTS(SELECT 1 FROM domain_memberships m WHERE m.uuid=campus_admin_membership_origins.membership_uuid)`) + return err +} diff --git a/internal/store/groups_inheritance_test.go b/internal/store/groups_inheritance_test.go new file mode 100644 index 0000000..bd93e0e --- /dev/null +++ b/internal/store/groups_inheritance_test.go @@ -0,0 +1,392 @@ +package store + +import ( + "database/sql" + "errors" + "strings" + "testing" +) + +func campusInheritanceFixture(t *testing.T) (*Store, map[string]string) { + t.Helper() + database, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + database.SetMaxOpenConns(1) + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database, authKey: make([]byte, 32)} + if _, err := database.Exec(`CREATE TABLE domains(uuid TEXT PRIMARY KEY,campus_uuid TEXT,enabled INTEGER NOT NULL DEFAULT 1); + INSERT INTO domains(uuid,campus_uuid) VALUES('d1','c1'),('d2','c1'),('d3','c1'),('outside','c2')`); err != nil { + t.Fatal(err) + } + if err := st.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + if err := st.EnsureBuiltinAdminGroups(); err != nil { + t.Fatal(err) + } + groups := map[string]string{} + for _, domain := range []string{"d1", "d2", "d3", "outside"} { + group, err := st.GroupByName(domain, "campus_admin") + if err != nil { + t.Fatal(err) + } + groups[domain] = group.UUID + } + return st, groups +} + +func campusLocalIdentity(t *testing.T, st *Store, domain, name string) string { + t.Helper() + if _, err := st.DB.Exec(`INSERT OR IGNORE INTO principals(uuid,display_name,state,created_at_ms,updated_at_ms) VALUES(?,?,'active',1,1)`, name, name); err != nil { + t.Fatal(err) + } + if _, err := st.DB.Exec(`INSERT OR IGNORE INTO principal_identities(uuid,principal_uuid,provider_type,subject,created_at_ms) VALUES(?,?,'password',?,1)`, name, name, name); err != nil { + t.Fatal(err) + } + if _, err := st.DB.Exec(`INSERT OR IGNORE INTO domain_memberships(uuid,domain_uuid,principal_uuid,state,created_at_ms) VALUES(?,?,?,'active',1)`, domain+":"+name, domain, name); err != nil { + t.Fatal(err) + } + var id string + if err := st.DB.QueryRow(`SELECT uuid FROM domain_memberships WHERE domain_uuid=? AND principal_uuid=?`, domain, name).Scan(&id); err != nil { + t.Fatal(err) + } + return id +} + +func requireCampusMember(t *testing.T, st *Store, domain, principal string, want bool) { + t.Helper() + var got bool + if err := st.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM domain_memberships WHERE domain_uuid=? AND principal_uuid=?)`, domain, principal).Scan(&got); err != nil { + t.Fatal(err) + } + if got != want { + t.Fatalf("membership %s/%s = %v, want %v", domain, principal, got, want) + } +} + +func TestCampusAdminDisableRevokesDerivedMembershipsAndSessions(t *testing.T) { + st, groups := campusInheritanceFixture(t) + campusLocalIdentity(t, st, "d1", "alice") + if err := st.AddGroupMemberByUsername("d1", groups["d1"], "alice", "owner"); err != nil { + t.Fatal(err) + } + if !st.IsBuiltinGroupAdmin("d2", "alice", "campus_admin") { + t.Fatal("missing inherited administrative access") + } + requireCampusMember(t, st, "outside", "alice", false) + if err := st.SetGroupPermission(groups["d2"], "/secret", "read_write"); err != nil { + t.Fatal(err) + } + req := AuthorizationRequest{DomainUUID: "d2", PrincipalUUID: "alice", Capability: "read", TargetType: "path", TargetID: "/secret/page"} + if err := st.Authorize(req); err != nil { + t.Fatal(err) + } + token, err := st.CreateAuthSession("d2", "alice") + if err != nil { + t.Fatal(err) + } + var before string + if err := st.DB.QueryRow(`SELECT uuid||':'||created_at_ms FROM domain_memberships WHERE domain_uuid='d2' AND principal_uuid='alice'`).Scan(&before); err != nil { + t.Fatal(err) + } + for range 3 { + if err := st.ProjectCampusAdminMemberships(); err != nil { + t.Fatal(err) + } + } + var after string + if err := st.DB.QueryRow(`SELECT uuid||':'||created_at_ms FROM domain_memberships WHERE domain_uuid='d2' AND principal_uuid='alice'`).Scan(&after); err != nil || before != after { + t.Fatalf("projection changed identity: before=%s after=%s err=%v", before, after, err) + } + for range 2 { + if err := st.SetCampusAdminInheritance(groups["d1"], false); err != nil { + t.Fatal(err) + } + } + for _, domain := range []string{"d2", "d3"} { + requireCampusMember(t, st, domain, "alice", false) + if st.IsBuiltinGroupAdmin(domain, "alice", "campus_admin") { + t.Fatal("inherited administrative access survived disable") + } + } + if !st.IsBuiltinGroupAdmin("d1", "alice", "campus_admin") { + t.Fatal("disable removed independent source rights") + } + if err := st.Authorize(req); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("derived group permission survived: %v", err) + } + if _, err := st.PrincipalForSession("d2", token); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("derived-only session survived: %v", err) + } + if err := st.SetCampusAdminInheritance(groups["d1"], true); err != nil { + t.Fatal(err) + } + if !st.IsBuiltinGroupAdmin("d2", "alice", "campus_admin") { + t.Fatal("re-enable did not restore derived grants") + } + if _, err := st.PrincipalForSession("d2", token); !errors.Is(err, ErrAccessDenied) { + t.Fatalf("re-enable revived a revoked session: %v", err) + } +} + +func TestCampusAdminMultipleRootsAndLocalRolePreservation(t *testing.T) { + t.Run("multiple roots do not amplify", func(t *testing.T) { + st, groups := campusInheritanceFixture(t) + campusLocalIdentity(t, st, "d1", "alice") + for _, domain := range []string{"d1", "d2"} { + if err := st.AddGroupMemberByUsername(domain, groups[domain], "alice", "owner"); err != nil { + t.Fatal(err) + } + } + for range 3 { + if err := st.ProjectCampusAdminMemberships(); err != nil { + t.Fatal(err) + } + } + var count int + if err := st.DB.QueryRow(`SELECT COUNT(*) FROM campus_admin_grants WHERE source=?`, campusAdminInheritancePrefix+groups["d3"]).Scan(&count); err != nil || count != 0 { + t.Fatalf("derived-only Domain became a root: count=%d err=%v", count, err) + } + if err := st.SetCampusAdminInheritance(groups["d1"], false); err != nil { + t.Fatal(err) + } + if !st.IsBuiltinGroupAdmin("d3", "alice", "campus_admin") { + t.Fatal("revoking first root lost independently granted second root") + } + if err := st.SetCampusAdminInheritance(groups["d2"], false); err != nil { + t.Fatal(err) + } + requireCampusMember(t, st, "d3", "alice", false) + for _, domain := range []string{"d1", "d2"} { + if !st.IsBuiltinGroupAdmin(domain, "alice", "campus_admin") { + t.Fatalf("lost direct grant in %s", domain) + } + } + }) + t.Run("weaker local role reappears", func(t *testing.T) { + st, groups := campusInheritanceFixture(t) + campusLocalIdentity(t, st, "d1", "alice") + campusLocalIdentity(t, st, "d2", "alice") + if err := st.AddGroupMemberByUsername("d2", groups["d2"], "alice", "member"); err != nil { + t.Fatal(err) + } + if err := st.AddGroupMemberByUsername("d1", groups["d1"], "alice", "owner"); err != nil { + t.Fatal(err) + } + if role := st.GroupMemberRole(groups["d2"], "alice"); role != "owner" { + t.Fatalf("effective role = %s, want owner", role) + } + if err := st.SetCampusAdminInheritance(groups["d1"], false); err != nil { + t.Fatal(err) + } + if role := st.GroupMemberRole(groups["d2"], "alice"); role != "member" { + t.Fatalf("local role after revoke = %s, want member", role) + } + if st.IsBuiltinGroupAdmin("d2", "alice", "campus_admin") { + t.Fatal("local member retained inherited administration") + } + }) +} + +func TestCampusAdminPreservesIndependentRoleBindingAndSession(t *testing.T) { + st, groups := campusInheritanceFixture(t) + campusLocalIdentity(t, st, "d1", "alice") + if err := st.AddGroupMemberByUsername("d1", groups["d1"], "alice", "owner"); err != nil { + t.Fatal(err) + } + for _, statement := range []string{ + `INSERT INTO auth_roles(uuid,domain_uuid,name,created_at_ms) VALUES('reader','d2','reader',1)`, + `INSERT INTO auth_capability_grants(uuid,role_uuid,capability,target_type,target_id,created_at_ms) VALUES('read-grant','reader','read','domain','d2',1)`, + `INSERT INTO auth_role_bindings(membership_uuid,role_uuid,created_at_ms) SELECT uuid,'reader',1 FROM domain_memberships WHERE domain_uuid='d2' AND principal_uuid='alice'`, + } { + if _, err := st.DB.Exec(statement); err != nil { + t.Fatal(err) + } + } + token, err := st.CreateAuthSession("d2", "alice") + if err != nil { + t.Fatal(err) + } + if err := st.SetCampusAdminInheritance(groups["d1"], false); err != nil { + t.Fatal(err) + } + requireCampusMember(t, st, "d2", "alice", true) + if st.IsBuiltinGroupAdmin("d2", "alice", "campus_admin") { + t.Fatal("independent read binding preserved inherited administrative access") + } + if err := st.Authorize(AuthorizationRequest{DomainUUID: "d2", PrincipalUUID: "alice", Capability: "read", TargetType: "domain", TargetID: "d2"}); err != nil { + t.Fatalf("lost independent reader binding: %v", err) + } + if _, err := st.PrincipalForSession("d2", token); err != nil { + t.Fatalf("revoked independently authorized session: %v", err) + } +} + +func TestCampusAdminSourceRemovalAndIdentitySuspension(t *testing.T) { + t.Run("source member removal", func(t *testing.T) { + st, groups := campusInheritanceFixture(t) + aliceID := campusLocalIdentity(t, st, "d1", "alice") + campusLocalIdentity(t, st, "d1", "bob") + for _, name := range []string{"alice", "bob"} { + if err := st.AddGroupMemberByUsername("d1", groups["d1"], name, "owner"); err != nil { + t.Fatal(err) + } + } + if err := st.RemoveGroupMember(groups["d1"], aliceID); err != nil { + t.Fatal(err) + } + requireCampusMember(t, st, "d2", "alice", false) + if !st.IsBuiltinGroupAdmin("d2", "bob", "campus_admin") { + t.Fatal("source removal revoked another principal") + } + if st.IsCampusAdmin("c1", "alice") { + t.Fatal("source removal left campus authority") + } + }) + for _, change := range []string{"suspended", "quarantined", "readonly", "archived group", "removed Domain", "disabled Domain", "moved Domain", "suspended membership"} { + t.Run(change, func(t *testing.T) { + st, groups := campusInheritanceFixture(t) + campusLocalIdentity(t, st, "d1", "alice") + if err := st.AddGroupMemberByUsername("d1", groups["d1"], "alice", "owner"); err != nil { + t.Fatal(err) + } + var err error + switch change { + case "archived group": + _, err = st.DB.Exec(`UPDATE groups SET state='archived' WHERE uuid=?`, groups["d1"]) + case "removed Domain": + _, err = st.DB.Exec(`DELETE FROM domains WHERE uuid='d1'`) + case "disabled Domain": + _, err = st.DB.Exec(`UPDATE domains SET enabled=0 WHERE uuid='d1'`) + case "moved Domain": + _, err = st.DB.Exec(`UPDATE domains SET campus_uuid='c2' WHERE uuid='d1'`) + case "suspended membership": + _, err = st.DB.Exec(`UPDATE domain_memberships SET state='suspended' WHERE domain_uuid='d1' AND principal_uuid='alice'`) + default: + err = st.SetPrincipalState("d1", "alice", change) + } + if err != nil { + t.Fatal(err) + } + if err := st.ProjectCampusAdminMemberships(); err != nil { + t.Fatal(err) + } + requireCampusMember(t, st, "d2", "alice", false) + if st.IsBuiltinGroupAdmin("d2", "alice", "campus_admin") { + t.Fatal("invalid source retained derived administrative access") + } + }) + } +} + +func TestCampusAdminRevocationFailureRollsBackSourceMutation(t *testing.T) { + for _, change := range []string{"disable", "remove", "suspend"} { + t.Run(change, func(t *testing.T) { + st, groups := campusInheritanceFixture(t) + aliceID := campusLocalIdentity(t, st, "d1", "alice") + campusLocalIdentity(t, st, "d1", "bob") + for _, name := range []string{"alice", "bob"} { + if err := st.AddGroupMemberByUsername("d1", groups["d1"], name, "owner"); err != nil { + t.Fatal(err) + } + } + if _, err := st.DB.Exec(`CREATE TRIGGER fail_projection BEFORE DELETE ON group_members + WHEN substr(OLD.source,1,21)='campus_admin_inherit:' + BEGIN SELECT RAISE(ABORT,'injected projection failure'); END`); err != nil { + t.Fatal(err) + } + var err error + switch change { + case "disable": + err = st.SetCampusAdminInheritance(groups["d1"], false) + case "remove": + err = st.RemoveGroupMember(groups["d1"], aliceID) + case "suspend": + err = st.SetPrincipalState("d1", "alice", "suspended") + } + if err == nil || !strings.Contains(err.Error(), "injected projection failure") { + t.Fatalf("expected injected failure, got %v", err) + } + group, err := st.GroupByName("d1", "campus_admin") + if err != nil || !group.InheritMembers { + t.Fatalf("source inheritance update did not roll back: %+v %v", group, err) + } + for _, domain := range []string{"d1", "d2"} { + if !st.IsBuiltinGroupAdmin(domain, "alice", "campus_admin") { + t.Fatalf("partial revocation in %s", domain) + } + } + }) + } +} + +func TestCampusAdminLegacyProjectionDoesNotReseedDerivedRoots(t *testing.T) { + st, groups := campusInheritanceFixture(t) + for _, domain := range []string{"d1", "d2", "d3"} { + member := campusLocalIdentity(t, st, domain, "alice") + source := "local" + if domain == "d2" { + source = campusAdminInheritancePrefix + groups["d1"] + } else if domain == "d3" { + source = campusAdminInheritancePrefix + groups["d2"] + } + if _, err := st.DB.Exec(`INSERT INTO group_members(group_uuid,membership_uuid,member_role,source,created_at_ms) VALUES(?,?,'owner',?,1)`, groups[domain], member, source); err != nil { + t.Fatal(err) + } + } + if _, err := st.DB.Exec(`DROP TABLE campus_admin_grants; DROP TABLE campus_admin_membership_origins; DROP TABLE campus_admin_migrations`); err != nil { + t.Fatal(err) + } + if err := st.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + if err := st.EnsureBuiltinAdminGroups(); err != nil { + t.Fatal(err) + } + if err := st.SetCampusAdminInheritance(groups["d1"], false); err != nil { + t.Fatal(err) + } + for _, domain := range []string{"d2", "d3"} { + if st.IsBuiltinGroupAdmin(domain, "alice", "campus_admin") { + t.Fatal("legacy derived source survived revocation") + } + // Old versions did not record whether these were local memberships. + // Preserve ambiguous identity records, but never their derived grants. + requireCampusMember(t, st, domain, "alice", true) + } +} + +func TestCampusAdminExplicitRemovalSurvivesBootstrapMigration(t *testing.T) { + st, groups := campusInheritanceFixture(t) + owner, err := st.BootstrapOwner("d1", "original", "correct horse battery staple", "Original", "") + if err != nil { + t.Fatal(err) + } + campusLocalIdentity(t, st, "d1", "replacement") + if err := st.AddGroupMemberByUsername("d1", groups["d1"], "replacement", "owner"); err != nil { + t.Fatal(err) + } + var membership string + if err := st.DB.QueryRow(`SELECT uuid FROM domain_memberships WHERE domain_uuid='d1' AND principal_uuid=?`, owner.UUID).Scan(&membership); err != nil { + t.Fatal(err) + } + if err := st.RemoveGroupMember(groups["d1"], membership); err != nil { + t.Fatal(err) + } + for range 2 { + if err := st.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + if err := st.EnsureBuiltinAdminGroups(); err != nil { + t.Fatal(err) + } + } + if st.IsCampusAdmin("c1", owner.UUID) { + t.Fatal("bootstrap role migration recreated an explicitly removed campus grant") + } + if !st.IsBuiltinGroupAdmin("d1", owner.UUID, "domain_admin") { + t.Fatal("campus revoke destroyed independent Domain administration") + } +} diff --git a/internal/store/groups_integrity_test.go b/internal/store/groups_integrity_test.go new file mode 100644 index 0000000..720bd8c --- /dev/null +++ b/internal/store/groups_integrity_test.go @@ -0,0 +1,79 @@ +package store + +import ( + "database/sql" + "sync" + "testing" +) + +func TestGroupOwnerIntegrity(t *testing.T) { + database, err := sql.Open("sqlite", t.TempDir()+"/groups.db?_pragma=busy_timeout(5000)") + if err != nil { + t.Fatal(err) + } + defer database.Close() + st := &Store{DB: database, authKey: make([]byte, 32)} + if err := st.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + owner, err := st.BootstrapOwner("d", "owner", "correct horse battery staple", "Owner", "") + if err != nil { + t.Fatal(err) + } + second, err := st.CreatePasswordAccount("d", "second", "correct horse battery staple", "Second", "") + if err != nil { + t.Fatal(err) + } + group, err := st.CreateGroup("d", owner.UUID, "team", "Team", "", "members") + if err != nil { + t.Fatal(err) + } + for _, role := range []string{"member", "manager"} { + if err := st.AddGroupMemberByUsername("d", group.UUID, "owner", role); err == nil { + t.Fatalf("owner downgraded to %s", role) + } + } + if err := st.AddGroupMemberByUsername("other", group.UUID, "owner", "owner"); err == nil { + t.Fatal("cross-domain member accepted") + } + var firstID, secondID string + if err := database.QueryRow(`SELECT uuid FROM domain_memberships WHERE domain_uuid='d' AND principal_uuid=?`, owner.UUID).Scan(&firstID); err != nil { + t.Fatal(err) + } + if err := database.QueryRow(`SELECT uuid FROM domain_memberships WHERE domain_uuid='d' AND principal_uuid=?`, second.UUID).Scan(&secondID); err != nil { + t.Fatal(err) + } + if err := st.RemoveGroupMember(group.UUID, firstID); err == nil { + t.Fatal("last owner removed") + } + if err := st.AddGroupMemberByUsername("d", group.UUID, "second", "owner"); err != nil { + t.Fatal(err) + } + if err := st.RemoveGroupMemberWithAuthority(group.UUID, secondID, false); err == nil { + t.Fatal("manager removed an owner") + } + // Two concurrent removals must not both pass a previously read owner count. + var wg sync.WaitGroup + start := make(chan struct{}) + results := make(chan error, 2) + for _, id := range []string{firstID, secondID} { + wg.Add(1) + go func(id string) { defer wg.Done(); <-start; results <- st.RemoveGroupMember(group.UUID, id) }(id) + } + close(start) + wg.Wait() + close(results) + success := 0 + for err := range results { + if err == nil { + success++ + } + } + var owners int + if err := database.QueryRow(`SELECT COUNT(*) FROM group_members WHERE group_uuid=? AND member_role='owner'`, group.UUID).Scan(&owners); err != nil { + t.Fatal(err) + } + if success != 1 || owners != 1 { + t.Fatalf("concurrent removal: succeeded=%d owners=%d", success, owners) + } +} diff --git a/internal/store/imports.go b/internal/store/imports.go new file mode 100644 index 0000000..06562a1 --- /dev/null +++ b/internal/store/imports.go @@ -0,0 +1,308 @@ +package store + +import ( + "database/sql" + "errors" + "strings" + "time" + + "github.com/google/uuid" +) + +type ImportSession struct { + UUID, DomainUUID, ActorUUID, ArchiveName, ArchivePath, TargetPrefix string + Status, Error string + TotalFiles, MarkdownFiles int + CreatedAtMS, UpdatedAtMS int64 +} + +type ImportItem struct { + Sequence int `json:"sequence"` + SourcePath string `json:"source_path"` + TargetPath string `json:"target_path"` + Size int64 `json:"size"` + ContentType string `json:"content_type"` + Title string `json:"title"` + Quartier, Street, Spot string + Confidence float64 + Selected bool + Imported bool +} + +func (s *Store) EnsureImportSchema() error { + statements := []string{ + `CREATE TABLE IF NOT EXISTS import_sessions(uuid TEXT PRIMARY KEY,domain_uuid TEXT NOT NULL,actor_uuid TEXT NOT NULL DEFAULT '',archive_name TEXT NOT NULL,archive_path TEXT NOT NULL,target_prefix TEXT NOT NULL DEFAULT '/',status TEXT NOT NULL DEFAULT 'queued',total_files INTEGER NOT NULL DEFAULT 0,markdown_files INTEGER NOT NULL DEFAULT 0,error TEXT NOT NULL DEFAULT '',created_at_ms INTEGER NOT NULL,updated_at_ms INTEGER NOT NULL)`, + `CREATE TABLE IF NOT EXISTS import_items(session_uuid TEXT NOT NULL,sequence INTEGER NOT NULL,source_path TEXT NOT NULL,target_path TEXT NOT NULL,size INTEGER NOT NULL DEFAULT 0,content_type TEXT NOT NULL DEFAULT '',title TEXT NOT NULL DEFAULT '',suggested_quartier TEXT NOT NULL DEFAULT '',suggested_street TEXT NOT NULL DEFAULT '',suggested_spot TEXT NOT NULL DEFAULT '',confidence REAL NOT NULL DEFAULT 0,selected INTEGER NOT NULL DEFAULT 1,PRIMARY KEY(session_uuid,sequence))`, + `CREATE TABLE IF NOT EXISTS import_journal(session_uuid TEXT NOT NULL,sequence INTEGER NOT NULL,path TEXT NOT NULL,object_uuid TEXT NOT NULL,created_at_ms INTEGER NOT NULL,PRIMARY KEY(session_uuid,sequence))`, + `CREATE TABLE IF NOT EXISTS import_city_journal(session_uuid TEXT NOT NULL,kind TEXT NOT NULL,node_uuid TEXT NOT NULL,created_at_ms INTEGER NOT NULL,PRIMARY KEY(session_uuid,kind,node_uuid))`, + `CREATE TABLE IF NOT EXISTS import_city_edges(session_uuid TEXT NOT NULL,spot_uuid TEXT NOT NULL,page_uuid TEXT NOT NULL,created_at_ms INTEGER NOT NULL,PRIMARY KEY(session_uuid,spot_uuid,page_uuid))`, + `CREATE INDEX IF NOT EXISTS idx_import_sessions_domain ON import_sessions(domain_uuid,created_at_ms DESC)`, + } + for _, statement := range statements { + if _, err := s.DB.Exec(statement); err != nil { + return err + } + } + _ = ensureImportColumn(s.DB, "import_journal", "completed", "INTEGER NOT NULL DEFAULT 0") + return nil +} + +func ensureImportColumn(db *sql.DB, table, column, declaration string) error { + rows, err := db.Query(`PRAGMA table_info(` + table + `)`) + if err != nil { + return err + } + found := false + for rows.Next() { + var cid, notnull, pk int + var name, kind string + var defaultValue any + if err := rows.Scan(&cid, &name, &kind, ¬null, &defaultValue, &pk); err != nil { + rows.Close() + return err + } + if name == column { + found = true + } + } + rows.Close() + if found { + return nil + } + _, err = db.Exec(`ALTER TABLE ` + table + ` ADD COLUMN ` + column + ` ` + declaration) + return err +} + +func (s *Store) CreateImportSession(domainUUID, actor, archiveName, archivePath, targetPrefix string) (string, error) { + id, now := uuid.NewString(), time.Now().UnixMilli() + _, err := s.DB.Exec(`INSERT INTO import_sessions(uuid,domain_uuid,actor_uuid,archive_name,archive_path,target_prefix,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,?,?,?)`, id, domainUUID, actor, archiveName, archivePath, targetPrefix, now, now) + return id, err +} + +func (s *Store) ImportSession(domainUUID, id string) (ImportSession, error) { + var x ImportSession + err := s.DB.QueryRow(`SELECT uuid,domain_uuid,actor_uuid,archive_name,archive_path,target_prefix,status,total_files,markdown_files,error,created_at_ms,updated_at_ms FROM import_sessions WHERE domain_uuid=? AND uuid=?`, domainUUID, id).Scan(&x.UUID, &x.DomainUUID, &x.ActorUUID, &x.ArchiveName, &x.ArchivePath, &x.TargetPrefix, &x.Status, &x.TotalFiles, &x.MarkdownFiles, &x.Error, &x.CreatedAtMS, &x.UpdatedAtMS) + return x, err +} + +func (s *Store) ListImportSessions(domainUUID string) ([]ImportSession, error) { + rows, err := s.DB.Query(`SELECT uuid,domain_uuid,actor_uuid,archive_name,archive_path,target_prefix,status,total_files,markdown_files,error,created_at_ms,updated_at_ms FROM import_sessions WHERE domain_uuid=? ORDER BY created_at_ms DESC LIMIT 50`, domainUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var out []ImportSession + for rows.Next() { + var x ImportSession + if err := rows.Scan(&x.UUID, &x.DomainUUID, &x.ActorUUID, &x.ArchiveName, &x.ArchivePath, &x.TargetPrefix, &x.Status, &x.TotalFiles, &x.MarkdownFiles, &x.Error, &x.CreatedAtMS, &x.UpdatedAtMS); err != nil { + return nil, err + } + out = append(out, x) + } + return out, rows.Err() +} + +func (s *Store) ReplaceImportItems(sessionUUID string, items []ImportItem) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + if _, err = tx.Exec(`DELETE FROM import_items WHERE session_uuid=?`, sessionUUID); err != nil { + return err + } + markdown := 0 + for _, x := range items { + if x.ContentType == "text/markdown" { + markdown++ + } + if _, err = tx.Exec(`INSERT INTO import_items(session_uuid,sequence,source_path,target_path,size,content_type,title,suggested_quartier,suggested_street,suggested_spot,confidence) VALUES(?,?,?,?,?,?,?,?,?,?,?)`, sessionUUID, x.Sequence, x.SourcePath, x.TargetPath, x.Size, x.ContentType, x.Title, x.Quartier, x.Street, x.Spot, x.Confidence); err != nil { + return err + } + } + _, err = tx.Exec(`UPDATE import_sessions SET status='ready',total_files=?,markdown_files=?,error='',updated_at_ms=? WHERE uuid=?`, len(items), markdown, time.Now().UnixMilli(), sessionUUID) + if err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) FailImportSession(id string, failure error) { + _, _ = s.DB.Exec(`UPDATE import_sessions SET status='failed',error=?,updated_at_ms=? WHERE uuid=?`, failure.Error(), time.Now().UnixMilli(), id) +} +func (s *Store) MarkImportAnalyzing(id string) { + _, _ = s.DB.Exec(`UPDATE import_sessions SET status='analyzing',updated_at_ms=? WHERE uuid=?`, time.Now().UnixMilli(), id) +} + +func (s *Store) ListImportItems(sessionUUID string) ([]ImportItem, error) { + rows, err := s.DB.Query(`SELECT i.sequence,i.source_path,i.target_path,i.size,i.content_type,i.title,i.suggested_quartier,i.suggested_street,i.suggested_spot,i.confidence,i.selected,COALESCE(j.completed,0) FROM import_items i LEFT JOIN import_journal j ON j.session_uuid=i.session_uuid AND j.sequence=i.sequence WHERE i.session_uuid=? ORDER BY i.sequence`, sessionUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var out []ImportItem + for rows.Next() { + var x ImportItem + var selected, imported int + if err := rows.Scan(&x.Sequence, &x.SourcePath, &x.TargetPath, &x.Size, &x.ContentType, &x.Title, &x.Quartier, &x.Street, &x.Spot, &x.Confidence, &selected, &imported); err != nil { + return nil, err + } + x.Selected = selected != 0 + x.Imported = imported != 0 + if x.ContentType == "text/markdown" { + x.TargetPath = strings.TrimSuffix(strings.TrimSuffix(x.TargetPath, ".md"), ".markdown") + } + out = append(out, x) + } + return out, rows.Err() +} + +func (s *Store) UpdateImportPlan(domainUUID, sessionUUID string, items []ImportItem) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + var status string + if err := tx.QueryRow(`SELECT status FROM import_sessions WHERE uuid=? AND domain_uuid=?`, sessionUUID, domainUUID).Scan(&status); err != nil { + return err + } + if status != "ready" && status != "failed" { + return errors.New("import plan is not editable") + } + for _, x := range items { + x.Quartier, x.Street, x.Spot = strings.TrimSpace(x.Quartier), strings.TrimSpace(x.Street), strings.TrimSpace(x.Spot) + if x.Street != "" && x.Quartier == "" { + return errors.New("Street requires a Quartier") + } + if x.Spot != "" && x.Street == "" { + return errors.New("Spot requires a Street") + } + if x.Spot == x.Street { + x.Spot = "" + } + for _, name := range []string{x.Quartier, x.Street, x.Spot} { + if name != "" { + if _, err := normalizeCityName(name); err != nil { + return err + } + } + } + if strings.TrimSpace(x.TargetPath) == "" || normalizePath(x.TargetPath) == "/" { + return errors.New("import target Path must identify a document") + } + var contentType string + if err := tx.QueryRow(`SELECT content_type FROM import_items WHERE session_uuid=? AND sequence=?`, sessionUUID, x.Sequence).Scan(&contentType); err != nil { + return err + } + target := normalizePath(x.TargetPath) + if contentType == "text/markdown" { + target = strings.TrimSuffix(strings.TrimSuffix(target, ".md"), ".markdown") + } + result, err := tx.Exec(`UPDATE import_items SET target_path=?,suggested_quartier=?,suggested_street=?,suggested_spot=?,selected=? WHERE session_uuid=? AND sequence=? AND NOT EXISTS(SELECT 1 FROM import_journal j WHERE j.session_uuid=import_items.session_uuid AND j.sequence=import_items.sequence AND j.completed=1)`, target, x.Quartier, x.Street, x.Spot, x.Selected, sessionUUID, x.Sequence) + if err != nil { + return err + } + if n, _ := result.RowsAffected(); n != 1 { + continue + } + } + _, err = tx.Exec(`UPDATE import_sessions SET updated_at_ms=? WHERE uuid=?`, time.Now().UnixMilli(), sessionUUID) + if err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) QueueImportCommit(domainUUID, sessionUUID string) error { + result, err := s.DB.Exec(`UPDATE import_sessions SET status='queued_import',error='',updated_at_ms=? WHERE uuid=? AND domain_uuid=? AND status IN ('ready','failed')`, time.Now().UnixMilli(), sessionUUID, domainUUID) + if err != nil { + return err + } + if n, _ := result.RowsAffected(); n != 1 { + return errors.New("import is not ready") + } + return nil +} +func (s *Store) MarkImportStatus(id, status string) { + _, _ = s.DB.Exec(`UPDATE import_sessions SET status=?,updated_at_ms=? WHERE uuid=?`, status, time.Now().UnixMilli(), id) +} +func (s *Store) AddImportJournal(sessionUUID string, sequence int, path, objectUUID string) error { + _, err := s.DB.Exec(`INSERT INTO import_journal(session_uuid,sequence,path,object_uuid,created_at_ms,completed) VALUES(?,?,?,?,?,0)`, sessionUUID, sequence, path, objectUUID, time.Now().UnixMilli()) + return err +} +func (s *Store) CompleteImportJournal(sessionUUID string, sequence int) error { + _, err := s.DB.Exec(`UPDATE import_journal SET completed=1 WHERE session_uuid=? AND sequence=?`, sessionUUID, sequence) + return err +} +func (s *Store) AddImportCityJournal(sessionUUID, kind, nodeUUID string) error { + _, err := s.DB.Exec(`INSERT OR IGNORE INTO import_city_journal(session_uuid,kind,node_uuid,created_at_ms) VALUES(?,?,?,?)`, sessionUUID, kind, nodeUUID, time.Now().UnixMilli()) + return err +} +func (s *Store) AddImportCityEdge(sessionUUID, spotUUID, pageUUID string) error { + _, err := s.DB.Exec(`INSERT OR IGNORE INTO import_city_edges(session_uuid,spot_uuid,page_uuid,created_at_ms) VALUES(?,?,?,?)`, sessionUUID, spotUUID, pageUUID, time.Now().UnixMilli()) + return err +} + +type ImportCityJournalEntry struct{ Kind, UUID string } + +func (s *Store) ImportCityJournal(sessionUUID string) ([]ImportCityJournalEntry, error) { + rows, err := s.DB.Query(`SELECT kind,node_uuid FROM import_city_journal WHERE session_uuid=? ORDER BY CASE kind WHEN 'spot' THEN 1 WHEN 'street' THEN 2 ELSE 3 END`, sessionUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var out []ImportCityJournalEntry + for rows.Next() { + var x ImportCityJournalEntry + if err := rows.Scan(&x.Kind, &x.UUID); err != nil { + return nil, err + } + out = append(out, x) + } + return out, rows.Err() +} + +type ImportCityEdge struct{ SpotUUID, PageUUID string } + +func (s *Store) ImportCityEdges(sessionUUID string) ([]ImportCityEdge, error) { + rows, err := s.DB.Query(`SELECT spot_uuid,page_uuid FROM import_city_edges WHERE session_uuid=?`, sessionUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var out []ImportCityEdge + for rows.Next() { + var x ImportCityEdge + if err := rows.Scan(&x.SpotUUID, &x.PageUUID); err != nil { + return nil, err + } + out = append(out, x) + } + return out, rows.Err() +} + +type ImportJournalEntry struct { + Sequence int + Path, ObjectUUID string + Completed bool +} + +func (s *Store) ImportJournal(sessionUUID string) ([]ImportJournalEntry, error) { + rows, err := s.DB.Query(`SELECT sequence,path,object_uuid,completed FROM import_journal WHERE session_uuid=? ORDER BY sequence`, sessionUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var out []ImportJournalEntry + for rows.Next() { + var x ImportJournalEntry + var completed int + if err := rows.Scan(&x.Sequence, &x.Path, &x.ObjectUUID, &completed); err != nil { + return nil, err + } + x.Completed = completed != 0 + out = append(out, x) + } + return out, rows.Err() +} diff --git a/internal/store/list_children.go b/internal/store/list_children.go index 9c3ab50..6dd9bd5 100644 --- a/internal/store/list_children.go +++ b/internal/store/list_children.go @@ -1,20 +1,43 @@ package store -import "strings" +import ( + "fmt" + "os" + "strings" +) func (s *Store) ListChildPaths( parent string, ) ([]string, error) { + domainUUID, err := s.defaultDomainUUID() + if err != nil { + return nil, err + } + return s.ListChildPathsInDomain(domainUUID, parent) +} +func (s *Store) ListChildPathsInDomain( + domainUUID string, + parent string, +) ([]string, error) { + parent = strings.TrimRight(parent, "/") if parent == "/" { parent = "" } + cacheKey := domainUUID + "\x00" + parent + s.pathCacheMu.RLock() + cached, ok := s.childCache[cacheKey] + s.pathCacheMu.RUnlock() + if ok { + return append([]string(nil), cached...), nil + } rows, err := s.DB.Query(` SELECT path FROM paths + WHERE domain_uuid = ? ORDER BY path ASC - `) + `, domainUUID) if err != nil { return nil, err @@ -23,6 +46,7 @@ func (s *Store) ListChildPaths( defer rows.Close() var out []string + seen := map[string]bool{} for rows.Next() { @@ -71,18 +95,167 @@ func (s *Store) ListChildPaths( continue } - if strings.Contains( - trimmed, - "/", - ) { - continue + if slash := strings.Index(trimmed, "/"); slash >= 0 { + trimmed = trimmed[:slash] } - out = append( - out, - path, - ) + child := parent + "/" + trimmed + if !seen[child] { + seen[child] = true + out = append(out, child) + } } + s.pathCacheMu.Lock() + s.childCache[cacheKey] = append([]string(nil), out...) + s.pathCacheMu.Unlock() return out, nil } + +func (s *Store) InvalidatePathCaches() { + s.pathCacheMu.Lock() + s.childCache = map[string][]string{} + s.pathCacheMu.Unlock() +} + +// ListChildEntriesPageInDomain uses the cached direct-child index first, then +// fetches metadata only for the requested page. Virtual folders therefore do +// not require a Revision scan, and very large directories remain bounded. +func (s *Store) ListChildEntriesPageInDomain( + domainUUID, parent string, + offset, limit int, +) ([]BrowserEntry, int, error) { + children, err := s.ListChildPathsInDomain(domainUUID, parent) + if err != nil { + return nil, 0, err + } + total := len(children) + if offset < 0 { + offset = 0 + } + if limit <= 0 || limit > 400 { + limit = 120 + } + if offset >= total { + return []BrowserEntry{}, total, nil + } + end := offset + limit + if end > total { + end = total + } + + page := children[offset:end] + entries, _, err := s.ListSelectedChildEntriesInDomain(domainUUID, parent, page) + return entries, total, err +} + +// The caller supplies a permission-filtered page, so hidden entries do not +// consume pagination slots and private virtual-parent metadata is never read. +func (s *Store) ListSelectedChildEntriesInDomain(domainUUID, parent string, page []string) ([]BrowserEntry, int, error) { + total := len(page) + if total == 0 { + return []BrowserEntry{}, 0, nil + } + if total > 400 { + return nil, 0, ErrNavigationBudget + } + var values strings.Builder + args := make([]any, 0, len(page)*2+1) + for index, child := range page { + if index > 0 { + values.WriteByte(',') + } + values.WriteString("(?,?)") + args = append(args, child, index) + } + args = append(args, domainUUID) + query := fmt.Sprintf(` + WITH requested(path, ord) AS (VALUES %s), + resolved AS ( + SELECT + requested.path, + requested.ord, + COALESCE(paths.object_uuid, '') AS object_uuid + FROM requested + LEFT JOIN paths + ON paths.domain_uuid = ? + AND paths.path = requested.path + ), + latest AS ( + SELECT + r.object_uuid, + r.uuid AS revision_uuid, + COALESCE(r.document_hash, '') AS document_hash, + COALESCE(r.created_at, 0) AS updated_at, + COALESCE(NULLIF(r.content_type, ''), 'application/octet-stream') AS content_type, + COALESCE(r.filename, '') AS filename, + COALESCE(substr(CAST(r.body AS TEXT), 1, 65536), '') AS source_prefix, + ROW_NUMBER() OVER ( + PARTITION BY r.object_uuid + ORDER BY COALESCE(r.created_at_ms, r.created_at * 1000) DESC, r.rowid DESC + ) AS rn + FROM revisions r + JOIN resolved + ON resolved.object_uuid = r.object_uuid + ) + SELECT + resolved.path, + resolved.object_uuid, + COALESCE(latest.revision_uuid, ''), + COALESCE(latest.document_hash, ''), + COALESCE(latest.updated_at, 0), + COALESCE(latest.content_type, ''), + COALESCE(latest.filename, ''), + COALESCE(latest.source_prefix, '') + FROM resolved + LEFT JOIN latest + ON latest.object_uuid = resolved.object_uuid + AND latest.rn = 1 + ORDER BY resolved.ord + `, values.String()) + rows, err := s.DB.Query(query, args...) + if err != nil { + return nil, total, err + } + defer rows.Close() + + entries := make([]BrowserEntry, 0, len(page)) + for rows.Next() { + var entry BrowserEntry + var documentHash string + var sourcePrefix string + if err := rows.Scan( + &entry.Path, + &entry.ObjectUUID, + &entry.RevisionUUID, + &documentHash, + &entry.UpdatedAt, + &entry.ContentType, + &entry.Filename, + &sourcePrefix, + ); err != nil { + return nil, total, err + } + entry.Name = strings.TrimPrefix( + strings.TrimPrefix(entry.Path, strings.TrimRight(parent, "/")), + "/", + ) + entry.IsDir = entry.ObjectUUID == "" + entry.DocumentHash = documentHash + if !entry.IsDir { + entry.Title = firstHTMLHeading(sourcePrefix) + } + if documentHash != "" && s.DocumentRoot != "" { + if path, pathErr := s.documentPath(documentHash); pathErr == nil { + if info, statErr := os.Stat(path); statErr == nil { + entry.Size = int(info.Size()) + } + } + } + entries = append(entries, entry) + } + if err := rows.Err(); err != nil { + return nil, total, err + } + return entries, total, nil +} diff --git a/internal/store/locality_access.go b/internal/store/locality_access.go new file mode 100644 index 0000000..96a69c3 --- /dev/null +++ b/internal/store/locality_access.go @@ -0,0 +1,378 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "strings" + "time" +) + +var ErrLocalityAccessEnforcing = errors.New("city.access.enforcing_error") +var ErrLocalityAccessAlias = errors.New("city.access.alias_error") + +type LocalityAccessEntry struct { + Kind string `json:"kind"` + Name string `json:"name"` + Permission string `json:"permission"` + ID string `json:"id,omitempty"` +} +type LocalityAccess struct { + AuthorityRank int `json:"authority_rank"` + Epoch int64 `json:"epoch"` + TopologyVersion int64 `json:"topology_version"` + Mode string `json:"mode"` + Entries []LocalityAccessEntry `json:"entries"` + GrantsAccess bool `json:"grants_access"` + ScopePath string `json:"scope_path"` +} + +func (s *Store) ensureLocalityAccessSchema() error { + for _, query := range []string{ + `CREATE TABLE IF NOT EXISTS locality_access_policies(domain_uuid TEXT NOT NULL,node_kind TEXT NOT NULL,node_uuid TEXT NOT NULL,scope_path TEXT NOT NULL,grants_access INTEGER NOT NULL CHECK(grants_access IN (0,1)),actor_uuid TEXT NOT NULL,authority_rank INTEGER NOT NULL CHECK(authority_rank BETWEEN 1 AND 3),PRIMARY KEY(domain_uuid,node_kind,node_uuid))`, + `CREATE INDEX IF NOT EXISTS idx_locality_access_scope ON locality_access_policies(domain_uuid,scope_path)`, + `CREATE TABLE IF NOT EXISTS locality_access_entries(domain_uuid TEXT NOT NULL,node_kind TEXT NOT NULL,node_uuid TEXT NOT NULL,subject_kind TEXT NOT NULL CHECK(subject_kind IN ('user','group')),subject_uuid TEXT NOT NULL,subject_name TEXT NOT NULL,permission TEXT NOT NULL CHECK(permission IN ('read','read_write')),PRIMARY KEY(domain_uuid,node_kind,node_uuid,subject_kind,subject_uuid))`, + } { + if _, err := s.DB.Exec(query); err != nil { + return err + } + } + return nil +} + +type localityAccessLayer struct{ read, write, grant bool } +type localityAccessSnapshot struct { + admin bool + paths map[string][]localityAccessLayer +} + +func (p *localityAccessSnapshot) decide(path, capability string, basis bool) bool { + if !strings.HasPrefix(path, "/") { + return false + } + if p == nil || p.admin { + return basis + } + grant := false + for at := path; ; { + for _, layer := range p.paths[at] { + allowed := layer.write + if capability == "read" { + allowed = layer.read + } + if !allowed { + return false + } + if layer.grant && (capability == "read" || capability == "write" || capability == "create" || capability == "upload") { + grant = true + } + } + if at == "/" { + break + } + i := strings.LastIndex(at, "/") + if i <= 0 { + at = "/" + } else { + at = at[:i] + } + } + return basis || grant +} + +func (s *Store) CheckLocalityAccessCaps(domain, principal, capability, path string) error { + p, err := loadLocalityAccess(s.DB, domain, principal) + if err != nil { + return err + } + if !p.decide(path, capability, true) { + return ErrAccessDenied + } + return nil +} + +func (s *Store) CheckObjectLocalityAccessCaps(domain, principal, capability, object string) error { + // An exceptional foreign Object grant must not bypass the source Domain's + // restricted audience. Cross-Domain delegation of these new ACLs is not + // implemented. Check before the local administrator/empty-policy shortcut. + var foreign bool + if err := s.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM locality_access_policies WHERE domain_uuid!=?)`, domain).Scan(&foreign); err != nil { + return err + } + if foreign { + if err := s.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM paths p JOIN locality_access_policies a ON a.domain_uuid=p.domain_uuid WHERE p.object_uuid=? AND p.domain_uuid!=? AND `+cityPathScopeSQL("a.scope_path", "p.path")+`)`, object, domain).Scan(&foreign); err != nil { + return err + } + if foreign { + return ErrAccessDenied + } + } + p, err := loadLocalityAccess(s.DB, domain, principal) + if err != nil { + return err + } + if p.admin || len(p.paths) == 0 { + return nil + } + rows, err := s.DB.Query(`SELECT path FROM paths WHERE domain_uuid=? AND object_uuid=? LIMIT 10001`, domain, object) + if err != nil { + return err + } + defer rows.Close() + count := 0 + for rows.Next() { + count++ + if count > 10000 { + return ErrAccessDenied + } + var path string + if err = rows.Scan(&path); err != nil { + return err + } + if !p.decide(path, capability, true) { + return ErrAccessDenied + } + } + return rows.Err() +} + +// Until namespace impact/approval exists, protected bindings cannot be removed, +// retargeted or aliased. New objects may still be created and inherit the ACL. +// These SQLite guards cover CLI/import/background writers, not only HTTP. +func installLocalityAccessGuards(ctx context.Context, tx *sql.Tx) error { + scope := func(candidate string) string { + return `EXISTS(SELECT 1 FROM locality_access_policies a WHERE a.domain_uuid=OLD.domain_uuid AND ` + cityPathScopeSQL("a.scope_path", candidate) + `)` + } + statements := []string{ + `CREATE TRIGGER IF NOT EXISTS locality_access_config_update BEFORE UPDATE ON config WHEN OLD.key='authorization_mode' AND (NEW.key!=OLD.key OR NEW.domain_uuid!=OLD.domain_uuid OR NEW.value!='enforcing') AND EXISTS(SELECT 1 FROM locality_access_policies WHERE domain_uuid=OLD.domain_uuid) BEGIN SELECT RAISE(ABORT,'locality_access_requires_enforcing'); END`, + `CREATE TRIGGER IF NOT EXISTS locality_access_config_delete BEFORE DELETE ON config WHEN OLD.key='authorization_mode' AND EXISTS(SELECT 1 FROM locality_access_policies WHERE domain_uuid=OLD.domain_uuid) BEGIN SELECT RAISE(ABORT,'locality_access_requires_enforcing'); END`, + `CREATE TRIGGER IF NOT EXISTS locality_access_config_insert BEFORE INSERT ON config WHEN NEW.key='authorization_mode' AND NEW.value!='enforcing' AND EXISTS(SELECT 1 FROM locality_access_policies WHERE domain_uuid=NEW.domain_uuid) BEGIN SELECT RAISE(ABORT,'locality_access_requires_enforcing'); END`, + `CREATE TRIGGER IF NOT EXISTS locality_access_path_delete BEFORE DELETE ON paths WHEN ` + scope("OLD.path") + ` BEGIN SELECT RAISE(ABORT,'locality_access_protected_namespace'); END`, + `CREATE TRIGGER IF NOT EXISTS locality_access_path_update BEFORE UPDATE OF path,object_uuid,domain_uuid ON paths WHEN (OLD.path!=NEW.path OR OLD.object_uuid!=NEW.object_uuid OR OLD.domain_uuid!=NEW.domain_uuid) AND (` + scope("OLD.path") + ` OR EXISTS(SELECT 1 FROM locality_access_policies a WHERE a.domain_uuid=NEW.domain_uuid AND ` + cityPathScopeSQL("a.scope_path", "NEW.path") + `) OR EXISTS(SELECT 1 FROM paths p JOIN locality_access_policies a ON a.domain_uuid=p.domain_uuid WHERE p.object_uuid=NEW.object_uuid AND ` + cityPathScopeSQL("a.scope_path", "p.path") + `)) BEGIN SELECT RAISE(ABORT,'locality_access_protected_namespace'); END`, + `CREATE TRIGGER IF NOT EXISTS locality_access_path_insert BEFORE INSERT ON paths WHEN (EXISTS(SELECT 1 FROM revisions WHERE object_uuid=NEW.object_uuid) OR EXISTS(SELECT 1 FROM paths WHERE object_uuid=NEW.object_uuid)) AND (EXISTS(SELECT 1 FROM locality_access_policies a WHERE a.domain_uuid=NEW.domain_uuid AND ` + cityPathScopeSQL("a.scope_path", "NEW.path") + `) OR EXISTS(SELECT 1 FROM paths p JOIN locality_access_policies a ON a.domain_uuid=p.domain_uuid WHERE p.object_uuid=NEW.object_uuid AND ` + cityPathScopeSQL("a.scope_path", "p.path") + `)) BEGIN SELECT RAISE(ABORT,'locality_access_protected_namespace'); END`, + } + for _, table := range []string{"zones", "spots"} { + columns := "path_prefix,state" + if table == "zones" { + columns += ",parent_uuid" + } + statements = append(statements, `CREATE TRIGGER IF NOT EXISTS locality_access_`+table+`_structure BEFORE UPDATE OF `+columns+` ON `+table+` WHEN EXISTS(SELECT 1 FROM locality_access_policies WHERE domain_uuid=OLD.domain_uuid) BEGIN SELECT RAISE(ABORT,'locality_access_protected_namespace'); END`, + `CREATE TRIGGER IF NOT EXISTS locality_access_`+table+`_delete BEFORE DELETE ON `+table+` WHEN EXISTS(SELECT 1 FROM locality_access_policies WHERE domain_uuid=OLD.domain_uuid) BEGIN SELECT RAISE(ABORT,'locality_access_protected_namespace'); END`) + } + for _, op := range []string{"INSERT", "DELETE", "UPDATE"} { + ref := "OLD" + if op == "INSERT" { + ref = "NEW" + } + statements = append(statements, `CREATE TRIGGER IF NOT EXISTS locality_access_street_spots_`+strings.ToLower(op)+` BEFORE `+op+` ON street_spots WHEN EXISTS(SELECT 1 FROM spots s JOIN locality_access_policies a ON a.domain_uuid=s.domain_uuid WHERE s.uuid=`+ref+`.spot_uuid) BEGIN SELECT RAISE(ABORT,'locality_access_protected_namespace'); END`) + } + for _, query := range statements { + if _, err := tx.ExecContext(ctx, query); err != nil { + return err + } + } + return nil +} + +func loadLocalityAccess(q pathQueryer, domain, principal string) (*localityAccessSnapshot, error) { + p := &localityAccessSnapshot{paths: map[string][]localityAccessLayer{}} + rows, err := q.Query(`SELECT a.scope_path,a.grants_access, + EXISTS(SELECT 1 FROM locality_access_entries e JOIN domain_memberships m ON m.domain_uuid=e.domain_uuid AND m.principal_uuid=? AND m.state='active' JOIN principals u ON u.uuid=m.principal_uuid AND u.state IN ('active','readonly') WHERE e.domain_uuid=a.domain_uuid AND e.node_kind=a.node_kind AND e.node_uuid=a.node_uuid AND ((e.subject_kind='user' AND e.subject_uuid=m.uuid) OR (e.subject_kind='group' AND EXISTS(SELECT 1 FROM groups g JOIN group_members gm ON gm.group_uuid=g.uuid AND gm.membership_uuid=m.uuid WHERE g.uuid=e.subject_uuid AND g.domain_uuid=m.domain_uuid AND g.state='active')))), + EXISTS(SELECT 1 FROM locality_access_entries e JOIN domain_memberships m ON m.domain_uuid=e.domain_uuid AND m.principal_uuid=? AND m.state='active' JOIN principals u ON u.uuid=m.principal_uuid AND u.state='active' WHERE e.domain_uuid=a.domain_uuid AND e.node_kind=a.node_kind AND e.node_uuid=a.node_uuid AND e.permission='read_write' AND ((e.subject_kind='user' AND e.subject_uuid=m.uuid) OR (e.subject_kind='group' AND EXISTS(SELECT 1 FROM groups g JOIN group_members gm ON gm.group_uuid=g.uuid AND gm.membership_uuid=m.uuid WHERE g.uuid=e.subject_uuid AND g.domain_uuid=m.domain_uuid AND g.state='active')))), + EXISTS(SELECT 1 FROM groups g JOIN group_members gm ON gm.group_uuid=g.uuid JOIN domain_memberships m ON m.uuid=gm.membership_uuid AND m.domain_uuid=g.domain_uuid AND m.state='active' JOIN principals u ON u.uuid=m.principal_uuid AND u.state='active' WHERE g.domain_uuid=a.domain_uuid AND g.builtin_key='domain_admin' AND g.state='active' AND gm.member_role IN ('owner','manager') AND m.principal_uuid=?) + FROM locality_access_policies a WHERE a.domain_uuid=? LIMIT 4097`, principal, principal, principal, domain) + if err != nil { + return nil, err + } + defer rows.Close() + count := 0 + for rows.Next() { + count++ + if count > 4096 { + return nil, ErrGovernanceInvalid + } + var path string + var layer localityAccessLayer + var admin bool + if err = rows.Scan(&path, &layer.grant, &layer.read, &layer.write, &admin); err != nil { + return nil, err + } + p.admin = admin + p.paths[path] = append(p.paths[path], layer) + } + return p, rows.Err() +} + +func readLocalityAccess(ctx context.Context, tx *sql.Tx, domain, kind, id string, g CityGovernance) (LocalityAccess, error) { + a := LocalityAccess{Epoch: g.Epoch, TopologyVersion: g.TopologyVersion, Mode: "inherit", Entries: []LocalityAccessEntry{}} + err := tx.QueryRowContext(ctx, `SELECT scope_path,grants_access,authority_rank FROM locality_access_policies WHERE domain_uuid=? AND node_kind=? AND node_uuid=?`, domain, kind, id).Scan(&a.ScopePath, &a.GrantsAccess, &a.AuthorityRank) + if err == sql.ErrNoRows { + return a, nil + } + if err != nil { + return a, err + } + a.Mode = "restricted" + rows, err := tx.QueryContext(ctx, `SELECT e.subject_kind,e.subject_uuid,CASE WHEN e.subject_kind='user' THEN COALESCE((SELECT i.subject FROM domain_memberships m JOIN principal_identities i ON i.principal_uuid=m.principal_uuid AND i.provider_type='password' WHERE m.uuid=e.subject_uuid AND m.domain_uuid=e.domain_uuid LIMIT 1),e.subject_name) ELSE COALESCE((SELECT name FROM groups WHERE uuid=e.subject_uuid AND domain_uuid=e.domain_uuid),e.subject_name) END,e.permission FROM locality_access_entries e WHERE e.domain_uuid=? AND e.node_kind=? AND e.node_uuid=? ORDER BY e.subject_kind,e.subject_name LIMIT 65`, domain, kind, id) + if err != nil { + return a, err + } + defer rows.Close() + for rows.Next() { + var entry LocalityAccessEntry + if err = rows.Scan(&entry.Kind, &entry.ID, &entry.Name, &entry.Permission); err != nil { + return a, err + } + a.Entries = append(a.Entries, entry) + } + if len(a.Entries) > 64 { + return a, ErrGovernanceInvalid + } + return a, rows.Err() +} + +func (s *Store) LocalityAccess(ctx context.Context, domain, actor, kind, id string, change *LocalityAccess) (LocalityAccess, error) { + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return LocalityAccess{}, err + } + defer tx.Rollback() + if change != nil { + if _, err = tx.ExecContext(ctx, `INSERT INTO city_governance_epochs(domain_uuid,version) VALUES(?,0) ON CONFLICT(domain_uuid) DO UPDATE SET version=version`, domain); err != nil { + return LocalityAccess{}, err + } + } + g, err := governanceSnapshot(ctx, tx, domain, actor, kind, id) + if err != nil { + return LocalityAccess{}, err + } + before, err := readLocalityAccess(ctx, tx, domain, kind, id, g) + if err != nil || change == nil { + return before, err + } + if change.Epoch != g.Epoch || change.TopologyVersion != g.TopologyVersion { + return before, ErrGovernanceConflict + } + if change.Mode != "inherit" && change.Mode != "restricted" || len(change.Entries) > 64 || change.Mode == "inherit" && len(change.Entries) > 0 { + return before, ErrGovernanceInvalid + } + var admin bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM groups g JOIN group_members gm ON gm.group_uuid=g.uuid JOIN domain_memberships m ON m.uuid=gm.membership_uuid AND m.domain_uuid=g.domain_uuid WHERE g.domain_uuid=? AND g.builtin_key='domain_admin' AND g.state='active' AND gm.member_role IN ('owner','manager') AND m.principal_uuid=? AND m.state='active')`, domain, actor).Scan(&admin); err != nil { + return before, err + } + path := "/" + if kind != "domain" { + table := "zones" + if kind == "spot" { + table = "spots" + } + if err = tx.QueryRowContext(ctx, `SELECT path_prefix FROM `+table+` WHERE uuid=? AND domain_uuid=?`, id, domain).Scan(&path); err != nil { + return before, err + } + } + if change.Mode == "restricted" { + var mode string + if err = tx.QueryRowContext(ctx, `SELECT value FROM config WHERE domain_uuid=? AND key='authorization_mode'`, domain).Scan(&mode); err != nil { + return before, err + } + if mode != "enforcing" { + return before, ErrLocalityAccessEnforcing + } + var crossAlias bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM paths p JOIN paths other ON other.object_uuid=p.object_uuid CROSS JOIN (SELECT ? AS scope) input WHERE p.domain_uuid=? AND `+cityPathScopeSQL("input.scope", "p.path")+` AND (other.domain_uuid!=p.domain_uuid OR NOT `+cityPathScopeSQL("input.scope", "other.path")+`))`, path, domain).Scan(&crossAlias); err != nil { + return before, err + } + if crossAlias { + return before, ErrLocalityAccessAlias + } + } + entries := append([]LocalityAccessEntry{}, change.Entries...) + rank := 1 + if kind == "quartier" || kind == "street" || g.CanAppoint { + rank = 2 + } + if admin { + rank = 3 + } + grant := admin + if before.AuthorityRank > rank && before.Mode == "restricted" && change.Mode != "restricted" { + return before, ErrGovernanceCeiling + } + seen := map[string]bool{} + for i := range entries { + e := &entries[i] + previousID := e.ID + e.Name = strings.ToLower(strings.TrimSpace(e.Name)) + if (e.Kind != "user" && e.Kind != "group") || (e.Permission != "read" && e.Permission != "read_write") || len(e.Name) > 64 || e.Name == "" { + return before, ErrGovernanceInvalid + } + if e.Kind == "user" { + err = tx.QueryRowContext(ctx, `SELECT m.uuid FROM domain_memberships m JOIN principals p ON p.uuid=m.principal_uuid AND p.state IN ('active','readonly') JOIN principal_identities i ON i.principal_uuid=p.uuid AND i.provider_type='password' WHERE m.domain_uuid=? AND m.state='active' AND i.subject=?`, domain, e.Name).Scan(&e.ID) + } else { + err = tx.QueryRowContext(ctx, `SELECT uuid FROM groups WHERE domain_uuid=? AND name=? AND state='active'`, domain, e.Name).Scan(&e.ID) + } + if err != nil { + return before, ErrGovernanceInvalid + } + if previousID != "" && previousID != e.ID { + return before, ErrGovernanceInvalid + } + key := e.Kind + ":" + e.ID + if seen[key] { + return before, ErrGovernanceInvalid + } + seen[key] = true + } + if before.AuthorityRank > rank && before.Mode == "restricted" { + for _, e := range entries { + allowed := false + for _, old := range before.Entries { + if old.Kind == e.Kind && old.ID == e.ID && (old.Permission == "read_write" || e.Permission == "read") { + allowed = true + break + } + } + if !allowed { + return before, ErrGovernanceCeiling + } + } + rank = before.AuthorityRank + grant = before.GrantsAccess + } + if _, err = tx.ExecContext(ctx, `DELETE FROM locality_access_entries WHERE domain_uuid=? AND node_kind=? AND node_uuid=?`, domain, kind, id); err != nil { + return before, err + } + if _, err = tx.ExecContext(ctx, `DELETE FROM locality_access_policies WHERE domain_uuid=? AND node_kind=? AND node_uuid=?`, domain, kind, id); err != nil { + return before, err + } + if change.Mode == "restricted" { + if err = installLocalityAccessGuards(ctx, tx); err != nil { + return before, err + } + if _, err = tx.ExecContext(ctx, `INSERT INTO locality_access_policies VALUES(?,?,?,?,?,?,?)`, domain, kind, id, path, grant, actor, rank); err != nil { + return before, err + } + for _, e := range entries { + if _, err = tx.ExecContext(ctx, `INSERT INTO locality_access_entries VALUES(?,?,?,?,?,?,?)`, domain, kind, id, e.Kind, e.ID, e.Name, e.Permission); err != nil { + return before, err + } + } + } + if _, err = tx.ExecContext(ctx, `UPDATE city_governance_epochs SET version=version+1 WHERE domain_uuid=?`, domain); err != nil { + return before, err + } + g.Epoch++ + after, err := readLocalityAccess(ctx, tx, domain, kind, id, g) + if err != nil { + return before, err + } + b, _ := json.Marshal(before) + a, _ := json.Marshal(after) + if _, err = tx.ExecContext(ctx, `INSERT INTO city_governance_events(domain_uuid,epoch,actor_uuid,node_kind,node_uuid,before_json,after_json,created_at_ms) VALUES(?,?,?,?,?,?,?,?)`, domain, g.Epoch, actor, kind, id, string(b), string(a), time.Now().UnixMilli()); err != nil { + return before, err + } + return after, tx.Commit() +} diff --git a/internal/store/locality_publication.go b/internal/store/locality_publication.go new file mode 100644 index 0000000..62bf9b7 --- /dev/null +++ b/internal/store/locality_publication.go @@ -0,0 +1,380 @@ +package store + +import ( + "context" + "crypto/sha256" + "database/sql" + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "sort" + "strings" + "time" +) + +var ErrPublicationImpact = errors.New("city.publication.impact_error") + +// Publication is an explicit, bounded approval of current immutable content, +// not a permission to publish future revisions or newly created descendants. +type PublicationEntry struct { + Path string `json:"path"` + Object string `json:"object_uuid"` + Revision string `json:"revision_uuid"` + Hash string `json:"sha256"` + Language string `json:"lang"` +} +type LocalityPublication struct { + PublicationVersion int64 `json:"publication_version"` + Epoch int64 `json:"epoch"` + TopologyVersion int64 `json:"topology_version"` + Enabled bool `json:"enabled"` + Eligible bool `json:"eligible"` + ImpactToken string `json:"impact_token"` + Entries []PublicationEntry `json:"entries"` + Excluded []string `json:"excluded"` +} +type PublicationChange struct { + PublicationVersion int64 `json:"publication_version"` + Epoch int64 `json:"epoch"` + TopologyVersion int64 `json:"topology_version"` + ImpactToken string `json:"impact_token"` + Enabled bool `json:"enabled"` + Confirm bool `json:"confirm"` +} + +func (s *Store) ensurePublicationSchema() error { + for _, query := range []string{ + `CREATE TABLE IF NOT EXISTS locality_publication_versions(domain_uuid TEXT NOT NULL,node_kind TEXT NOT NULL,node_uuid TEXT NOT NULL,version INTEGER NOT NULL,PRIMARY KEY(domain_uuid,node_kind,node_uuid))`, + `CREATE TABLE IF NOT EXISTS locality_publication_manifests(domain_uuid TEXT NOT NULL,node_kind TEXT NOT NULL,node_uuid TEXT NOT NULL,epoch INTEGER NOT NULL,topology_version INTEGER NOT NULL,actor_uuid TEXT NOT NULL,created_at_ms INTEGER NOT NULL,PRIMARY KEY(domain_uuid,node_kind,node_uuid))`, + `CREATE TABLE IF NOT EXISTS locality_publication_entries(domain_uuid TEXT NOT NULL,node_kind TEXT NOT NULL,node_uuid TEXT NOT NULL,path TEXT NOT NULL,object_uuid TEXT NOT NULL,revision_uuid TEXT NOT NULL,document_hash TEXT NOT NULL,lang TEXT NOT NULL,PRIMARY KEY(domain_uuid,node_kind,node_uuid,path,lang))`, + `CREATE INDEX IF NOT EXISTS idx_publication_path ON locality_publication_entries(domain_uuid,path)`, + `CREATE INDEX IF NOT EXISTS idx_publication_object ON locality_publication_entries(object_uuid,lang)`, + `CREATE INDEX IF NOT EXISTS idx_publication_revision ON locality_publication_entries(revision_uuid)`, + `CREATE TABLE IF NOT EXISTS locality_auto_publication(domain_uuid TEXT NOT NULL,node_kind TEXT NOT NULL,node_uuid TEXT NOT NULL,mode TEXT NOT NULL CHECK(mode IN ('inherit','required','automatic')),scope_path TEXT NOT NULL,actor_uuid TEXT NOT NULL,version INTEGER NOT NULL,PRIMARY KEY(domain_uuid,node_kind,node_uuid))`, + } { + if _, err := s.DB.Exec(query); err != nil { + return err + } + } + return s.ensureNavigationSchema() +} + +func installPublicationGuards(ctx context.Context, tx *sql.Tx) error { + statements := []string{ + `CREATE TRIGGER IF NOT EXISTS auto_publication_config_update BEFORE UPDATE ON config WHEN OLD.key='authorization_mode' AND (NEW.key!=OLD.key OR NEW.domain_uuid!=OLD.domain_uuid OR NEW.value!='enforcing') AND EXISTS(SELECT 1 FROM locality_auto_publication WHERE domain_uuid=OLD.domain_uuid AND mode='automatic') BEGIN SELECT RAISE(ABORT,'publication_requires_enforcing'); END`, + `CREATE TRIGGER IF NOT EXISTS auto_publication_config_delete BEFORE DELETE ON config WHEN OLD.key='authorization_mode' AND EXISTS(SELECT 1 FROM locality_auto_publication WHERE domain_uuid=OLD.domain_uuid AND mode='automatic') BEGIN SELECT RAISE(ABORT,'publication_requires_enforcing'); END`, + `CREATE TRIGGER IF NOT EXISTS auto_publication_config_insert BEFORE INSERT ON config WHEN NEW.key='authorization_mode' AND NEW.value!='enforcing' AND EXISTS(SELECT 1 FROM locality_auto_publication WHERE domain_uuid=NEW.domain_uuid AND mode='automatic') BEGIN SELECT RAISE(ABORT,'publication_requires_enforcing'); END`, + `CREATE TRIGGER IF NOT EXISTS publication_revision_insert AFTER INSERT ON revisions BEGIN DELETE FROM locality_publication_entries WHERE object_uuid=NEW.object_uuid AND lang=COALESCE(NULLIF(NEW.lang,''),'und'); END`, + `CREATE TRIGGER IF NOT EXISTS publication_revision_update AFTER UPDATE ON revisions BEGIN DELETE FROM locality_publication_entries WHERE revision_uuid=OLD.uuid; END`, + `CREATE TRIGGER IF NOT EXISTS publication_revision_delete AFTER DELETE ON revisions BEGIN DELETE FROM locality_publication_entries WHERE revision_uuid=OLD.uuid; END`, + `CREATE TRIGGER IF NOT EXISTS publication_path_insert AFTER INSERT ON paths BEGIN DELETE FROM locality_publication_entries WHERE object_uuid=NEW.object_uuid; END`, + `CREATE TRIGGER IF NOT EXISTS publication_path_delete AFTER DELETE ON paths BEGIN DELETE FROM locality_publication_entries WHERE object_uuid=OLD.object_uuid; END`, + `CREATE TRIGGER IF NOT EXISTS publication_path_update AFTER UPDATE ON paths BEGIN DELETE FROM locality_publication_entries WHERE object_uuid IN (OLD.object_uuid,NEW.object_uuid); END`, + `CREATE TRIGGER IF NOT EXISTS publication_config_update BEFORE UPDATE ON config WHEN OLD.key='authorization_mode' AND (NEW.key!=OLD.key OR NEW.domain_uuid!=OLD.domain_uuid OR NEW.value!='enforcing') AND EXISTS(SELECT 1 FROM locality_publication_manifests WHERE domain_uuid=OLD.domain_uuid) BEGIN SELECT RAISE(ABORT,'publication_requires_enforcing'); END`, + `CREATE TRIGGER IF NOT EXISTS publication_config_delete BEFORE DELETE ON config WHEN OLD.key='authorization_mode' AND EXISTS(SELECT 1 FROM locality_publication_manifests WHERE domain_uuid=OLD.domain_uuid) BEGIN SELECT RAISE(ABORT,'publication_requires_enforcing'); END`, + `CREATE TRIGGER IF NOT EXISTS publication_config_insert BEFORE INSERT ON config WHEN NEW.key='authorization_mode' AND NEW.value!='enforcing' AND EXISTS(SELECT 1 FROM locality_publication_manifests WHERE domain_uuid=NEW.domain_uuid) BEGIN SELECT RAISE(ABORT,'publication_requires_enforcing'); END`, + } + for _, table := range []string{"zones", "spots"} { + for _, op := range []string{"INSERT", "UPDATE", "DELETE"} { + ref := "OLD" + if op == "INSERT" { + ref = "NEW" + } + statements = append(statements, `CREATE TRIGGER IF NOT EXISTS publication_`+table+`_`+strings.ToLower(op)+` AFTER `+op+` ON `+table+` BEGIN DELETE FROM locality_publication_manifests WHERE domain_uuid=`+ref+`.domain_uuid; DELETE FROM locality_publication_entries WHERE domain_uuid=`+ref+`.domain_uuid; END`) + } + } + for _, op := range []string{"INSERT", "UPDATE", "DELETE"} { + ref := "OLD" + if op == "INSERT" { + ref = "NEW" + } + statements = append(statements, `CREATE TRIGGER IF NOT EXISTS publication_street_spots_`+strings.ToLower(op)+` AFTER `+op+` ON street_spots BEGIN DELETE FROM locality_publication_manifests WHERE domain_uuid=(SELECT domain_uuid FROM spots WHERE uuid=`+ref+`.spot_uuid); DELETE FROM locality_publication_entries WHERE domain_uuid=(SELECT domain_uuid FROM spots WHERE uuid=`+ref+`.spot_uuid); END`) + } + for _, q := range statements { + if _, err := tx.ExecContext(ctx, q); err != nil { + return err + } + } + return nil +} + +func publicationImpact(ctx context.Context, tx *sql.Tx, domain, actor, kind, id string, g CityGovernance) (LocalityPublication, error) { + return publicationImpactBounded(ctx, tx, domain, actor, kind, id, g, 512, "") +} + +func publicationImpactBounded(ctx context.Context, tx *sql.Tx, domain, actor, kind, id string, g CityGovernance, limit int, onlyPath string) (LocalityPublication, error) { + p := LocalityPublication{PublicationVersion: g.PublicationVersion, Epoch: g.Epoch, TopologyVersion: g.TopologyVersion, Entries: []PublicationEntry{}, Excluded: []string{}} + var mode string + if err := tx.QueryRowContext(ctx, `SELECT value FROM config WHERE domain_uuid=? AND key='authorization_mode'`, domain).Scan(&mode); err != nil { + return p, err + } + if mode != "enforcing" { + return p, ErrAccessDenied + } + if err := tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM locality_publication_manifests m WHERE domain_uuid=? AND node_kind=? AND node_uuid=? AND epoch=? AND topology_version=? AND EXISTS(SELECT 1 FROM locality_publication_entries e WHERE e.domain_uuid=m.domain_uuid AND e.node_kind=m.node_kind AND e.node_uuid=m.node_uuid))`, domain, kind, id, g.Epoch, g.TopologyVersion).Scan(&p.Enabled); err != nil { + return p, err + } + // A Domain ceiling is never a publication grant. + if kind == "domain" || !g.DraftEffectivePublic { + return p, nil + } + scope := "" + table := "zones" + if kind == "spot" { + table = "spots" + } + if err := tx.QueryRowContext(ctx, `SELECT path_prefix FROM `+table+` WHERE domain_uuid=? AND uuid=?`, domain, id).Scan(&scope); err != nil { + return p, err + } + policy, err := loadReadPathPolicy(cityReadQuery{ctx, tx}, domain, actor) + if err != nil { + return p, err + } + // Literal segment predicates: '%' and '_' are valid names, never wildcards. + rows, err := tx.QueryContext(ctx, `SELECT p.path,p.object_uuid, + (EXISTS(SELECT 1 FROM locality_access_policies a WHERE a.domain_uuid=p.domain_uuid AND `+cityPathScopeSQL("a.scope_path", "p.path")+`) + OR EXISTS(SELECT 1 FROM locality_publication_policies a JOIN zones z ON z.uuid=a.node_uuid AND z.domain_uuid=a.domain_uuid AND z.state!='archived' WHERE a.domain_uuid=p.domain_uuid AND a.node_kind IN ('quartier','street') AND a.policy='authenticated_acl' AND `+cityPathScopeSQL("z.path_prefix", "p.path")+`) + OR EXISTS(SELECT 1 FROM locality_publication_policies a JOIN spots z ON z.uuid=a.node_uuid AND z.domain_uuid=a.domain_uuid AND z.state!='archived' WHERE a.domain_uuid=p.domain_uuid AND a.node_kind='spot' AND a.policy='authenticated_acl' AND `+cityPathScopeSQL("z.path_prefix", "p.path")+`) + OR EXISTS(SELECT 1 FROM paths other WHERE other.object_uuid=p.object_uuid AND (other.domain_uuid!=p.domain_uuid OR other.path!=p.path))) + FROM paths p CROSS JOIN (SELECT ? AS scope) input WHERE p.domain_uuid=? AND `+cityPathScopeSQL("input.scope", "p.path")+` AND (?='' OR p.path=?) ORDER BY p.path LIMIT ?`, scope, domain, onlyPath, onlyPath, limit+1) + if err != nil { + return p, err + } + type candidate struct { + path, object string + excluded bool + } + candidates := []candidate{} + for rows.Next() { + var c candidate + if err = rows.Scan(&c.path, &c.object, &c.excluded); err != nil { + break + } + candidates = append(candidates, c) + } + if err == nil { + err = rows.Err() + } + rows.Close() + if err != nil { + return p, err + } + if len(candidates) > limit { + return p, ErrPublicationImpact + } + objects := map[string]string{} + args := []any{} + for _, c := range candidates { + if !policy.Allows(c.path) { + return p, ErrAccessDenied + } + if c.excluded || !PublicSemanticPath(c.path) { + p.Excluded = append(p.Excluded, c.path) + continue + } + objects[c.object] = c.path + args = append(args, c.object) + } + if len(args) > 0 { + // Read all scoped language heads in one metadata-only window query, + // rather than repeating an authorization/head query for every Page. + marks := strings.TrimSuffix(strings.Repeat("?,", len(args)), ",") + rows, err = tx.QueryContext(ctx, `SELECT object_uuid,uuid,document_hash,lang FROM ( + SELECT object_uuid,uuid,COALESCE(document_hash,'') AS document_hash,COALESCE(NULLIF(lang,''),'und') AS lang, + ROW_NUMBER() OVER(PARTITION BY object_uuid,COALESCE(NULLIF(lang,''),'und') ORDER BY created_at_ms DESC,rowid DESC) AS head + FROM revisions WHERE object_uuid IN (`+marks+`)) WHERE head=1 ORDER BY object_uuid,lang LIMIT `+fmt.Sprint(limit*4+1), args...) + if err != nil { + return p, err + } + counts := map[string]int{} + for rows.Next() { + var e PublicationEntry + if err = rows.Scan(&e.Object, &e.Revision, &e.Hash, &e.Language); err != nil { + break + } + e.Path = objects[e.Object] + counts[e.Object]++ + if len(e.Hash) != 64 || counts[e.Object] > 32 || len(p.Entries) >= limit*4 { + err = ErrPublicationImpact + break + } + p.Entries = append(p.Entries, e) + } + if err == nil { + err = rows.Err() + } + rows.Close() + if err != nil { + return p, err + } + } + sort.Slice(p.Entries, func(i, j int) bool { + a, b := p.Entries[i], p.Entries[j] + if a.Path != b.Path { + return a.Path < b.Path + } + return a.Language < b.Language + }) + p.Eligible = len(p.Entries) > 0 + if limit != 512 { + return p, nil + } + // Include actor/domain/node identity to make approvals non-transferable. + b, _ := json.Marshal(struct { + Domain, Actor, Kind, ID string + Epoch, Topology int64 + PublicationVersion int64 + Entries []PublicationEntry + Excluded []string + }{domain, actor, kind, id, g.Epoch, g.TopologyVersion, g.PublicationVersion, p.Entries, p.Excluded}) + hash := sha256.Sum256(b) + p.ImpactToken = hex.EncodeToString(hash[:]) + return p, nil +} + +func (s *Store) LocalityPublication(ctx context.Context, domain, actor, kind, id string, change *PublicationChange) (LocalityPublication, error) { + ctx, cancel := context.WithTimeout(ctx, 3*time.Second) + defer cancel() + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return LocalityPublication{}, err + } + defer tx.Rollback() + if change != nil { + if _, err = tx.ExecContext(ctx, `INSERT INTO city_governance_epochs(domain_uuid,version) VALUES(?,0) ON CONFLICT(domain_uuid) DO UPDATE SET version=version`, domain); err != nil { + return LocalityPublication{}, err + } + } + g, err := governanceSnapshot(ctx, tx, domain, actor, kind, id) + if err != nil { + return LocalityPublication{}, err + } + if change != nil && (change.Epoch != g.Epoch || change.TopologyVersion != g.TopologyVersion || change.PublicationVersion != g.PublicationVersion) { + return LocalityPublication{}, ErrGovernanceConflict + } + // Revocation must work even when content is now unreadable or over budget. + p := LocalityPublication{PublicationVersion: g.PublicationVersion, Epoch: g.Epoch, TopologyVersion: g.TopologyVersion, Entries: []PublicationEntry{}, Excluded: []string{}} + if change == nil || change.Enabled { + p, err = publicationImpact(ctx, tx, domain, actor, kind, id, g) + if err != nil { + return p, err + } + } + if change == nil { + return p, nil + } + if change.Enabled && (!change.Confirm || !p.Eligible || change.ImpactToken == "" || change.ImpactToken != p.ImpactToken) { + return p, ErrPublicationImpact + } + var old bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM locality_publication_manifests WHERE domain_uuid=? AND node_kind=? AND node_uuid=?)`, domain, kind, id).Scan(&old); err != nil { + return p, err + } + for _, table := range []string{"locality_publication_entries", "locality_publication_manifests"} { + if _, err = tx.ExecContext(ctx, `DELETE FROM `+table+` WHERE domain_uuid=? AND node_kind=? AND node_uuid=?`, domain, kind, id); err != nil { + return p, err + } + } + if change.Enabled { + if err = installPublicationGuards(ctx, tx); err != nil { + return p, err + } + if _, err = tx.ExecContext(ctx, `INSERT INTO locality_publication_manifests VALUES(?,?,?,?,?,?,?)`, domain, kind, id, g.Epoch, g.TopologyVersion, actor, time.Now().UnixMilli()); err != nil { + return p, err + } + for _, e := range p.Entries { + if _, err = tx.ExecContext(ctx, `INSERT INTO locality_publication_entries VALUES(?,?,?,?,?,?,?,?)`, domain, kind, id, e.Path, e.Object, e.Revision, e.Hash, e.Language); err != nil { + return p, err + } + } + } + if !change.Enabled { + if err = requireManualPublication(ctx, tx, domain, actor, kind, id); err != nil { + return p, err + } + } + p.Enabled = change.Enabled + if _, err = tx.ExecContext(ctx, `INSERT INTO locality_publication_versions VALUES(?,?,?,1) ON CONFLICT(domain_uuid,node_kind,node_uuid) DO UPDATE SET version=version+1`, domain, kind, id); err != nil { + return p, err + } + p.PublicationVersion++ + after, _ := json.Marshal(map[string]any{"publication": change.Enabled, "impact_token": p.ImpactToken, "entries": len(p.Entries)}) + before, _ := json.Marshal(map[string]bool{"publication": old}) + if _, err = tx.ExecContext(ctx, `INSERT INTO city_governance_events(domain_uuid,epoch,actor_uuid,node_kind,node_uuid,before_json,after_json,created_at_ms) VALUES(?,?,?,?,?,?,?,?)`, domain, g.Epoch, actor, kind, id, string(before), string(after), time.Now().UnixMilli()); err != nil { + return p, err + } + // Reconfirmation needs a fresh impact token, even if content is unchanged. + p.Eligible = false + p.ImpactToken = "" + return p, tx.Commit() +} + +// Explicitly exclude every application/user/group/editor namespace. Public +// projections must never turn an arbitrary reserved handler into a document. +func PublicSemanticPath(path string) bool { + if !strings.HasPrefix(path, "/") || strings.ContainsAny(path, "\\\x00\r\n") || strings.Contains(path, "//") { + return false + } + for _, segment := range strings.Split(path, "/") { + if segment == "." || segment == ".." { + return false + } + } + first := strings.Split(strings.TrimPrefix(path, "/"), "/")[0] + switch first { + case "_", "-", ":", "o", "r", "v", "l", "e", "s", "u", "g", "static", "health", "new": + return false + } + return true +} + +// Lookup is metadata-only and Path-indexed. The manifest is fenced by current +// governance/topology epochs, live binding, and the current language head. +func (s *Store) AnonymousRevision(ctx context.Context, domain, path string, languages []string) (*Revision, error) { + if !PublicSemanticPath(path) { + return nil, sql.ErrNoRows + } + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + rows, err := s.DB.QueryContext(ctx, `SELECT DISTINCT r.uuid,r.object_uuid,r.document_hash,COALESCE(NULLIF(r.lang,''),'und'),COALESCE(NULLIF(r.content_type,''),'text/html; charset=utf-8'),COALESCE(r.filename,''),r.created_at_ms + `+anonymousRevisionFromSQL+` AND e.path=? + ORDER BY r.created_at_ms DESC,r.uuid LIMIT 33`, domain, path) + if err != nil { + return nil, err + } + items := []*Revision{} + for rows.Next() { + v := &Revision{} + if err = rows.Scan(&v.UUID, &v.ObjectUUID, &v.DocumentHash, &v.Language, &v.ContentType, &v.Filename, &v.CreatedAtMS); err != nil { + rows.Close() + return nil, err + } + items = append(items, v) + } + if err = rows.Err(); err != nil { + rows.Close() + return nil, err + } + rows.Close() + if len(items) == 0 { + pages, e := s.automaticPublicPages(ctx, domain, path) + if e != nil { + return nil, e + } + for i := range pages { + items = append(items, &pages[i].Revision) + } + } + if len(items) == 0 || len(items) > 32 { + return nil, sql.ErrNoRows + } + for _, lang := range languages { + for _, v := range items { + if v.Language == lang { + return v, nil + } + } + } + return items[0], nil +} diff --git a/internal/store/navigation.go b/internal/store/navigation.go new file mode 100644 index 0000000..ef47872 --- /dev/null +++ b/internal/store/navigation.go @@ -0,0 +1,142 @@ +package store + +import ( + "context" + "errors" + "fmt" + "time" +) + +const MaxNavigationEntries = 20000 + +var ErrNavigationBudget = errors.New("navigation snapshot exceeds its bounded budget") + +// A database-backed generation observes other processes and CLI writes too. +// It invalidates data caches, never caches a Principal's authorization result. +func (s *Store) ensureNavigationSchema() error { + if _, err := s.DB.Exec(`CREATE TABLE IF NOT EXISTS navigation_generation(id INTEGER PRIMARY KEY CHECK(id=1),version INTEGER NOT NULL); INSERT OR IGNORE INTO navigation_generation VALUES(1,1)`); err != nil { + return err + } + for _, table := range []string{"locality_auto_publication", "locality_publication_policies", "locality_access_policies", "locality_access_entries", "city_owner_bindings", "user_space_policies", "user_space_path_policies", "principals", "domain_memberships", "group_members", "groups", "group_permissions", "auth_roles", "auth_role_bindings", "auth_capability_grants", "campuses", "paths", "revisions", "domains", "config", "zones", "spots", "street_spots", "spot_pages", "spot_relations", "street_inbox_pages", "city_page_overrides", "domain_topology_versions", "city_governance_epochs", "locality_publication_entries", "locality_publication_manifests"} { + var exists bool + if err := s.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM sqlite_master WHERE type='table' AND name=?)`, table).Scan(&exists); err != nil { + return err + } + if !exists { + continue + } + for _, op := range []string{"INSERT", "UPDATE", "DELETE"} { + condition := "" + switch table { + case "principals", "domain_memberships", "group_members", "groups", "group_permissions", "auth_roles", "auth_role_bindings", "auth_capability_grants", "city_owner_bindings": + condition = " WHEN EXISTS(SELECT 1 FROM locality_auto_publication WHERE mode='automatic')" + } + q := fmt.Sprintf(`CREATE TRIGGER IF NOT EXISTS navigation_%s_%s AFTER %s ON %s%s BEGIN UPDATE navigation_generation SET version=version+1 WHERE id=1; END`, table, op, op, table, condition) + if _, err := s.DB.Exec(q); err != nil { + return err + } + } + } + return nil +} + +func (s *Store) NavigationGeneration(ctx context.Context) (int64, error) { + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + var version int64 + err := s.DB.QueryRowContext(ctx, `SELECT version FROM navigation_generation WHERE id=1`).Scan(&version) + return version, err +} + +func (s *Store) NavigationPaths(ctx context.Context, domain string) ([]string, error) { + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + rows, err := s.DB.QueryContext(ctx, `SELECT path FROM paths WHERE domain_uuid=? ORDER BY path LIMIT ?`, domain, MaxNavigationEntries+1) + if err != nil { + return nil, err + } + defer rows.Close() + out := []string{} + bytes := 0 + for rows.Next() { + var p string + if err = rows.Scan(&p); err != nil { + return nil, err + } + out = append(out, p) + bytes += len(p) + if len(out) > MaxNavigationEntries || bytes > 4<<20 { + return nil, ErrNavigationBudget + } + } + return out, rows.Err() +} + +type PublishedNavigationPage struct { + Path string + Revision Revision +} + +func (s *Store) PublicNavigation(ctx context.Context, domain string) ([]PublishedNavigationPage, error) { + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + // Same live binding/head/epoch checks as AnonymousRevision. No canonical + // bodies, historical revisions, unapproved names or private child counts. + rows, err := s.DB.QueryContext(ctx, `SELECT DISTINCT e.path,r.uuid,r.object_uuid,r.document_hash,COALESCE(NULLIF(r.lang,''),'und'),COALESCE(NULLIF(r.content_type,''),'text/html; charset=utf-8'),COALESCE(r.filename,''),r.created_at_ms `+anonymousRevisionFromSQL+` + ORDER BY e.path,r.created_at_ms DESC,r.uuid LIMIT ?`, domain, MaxNavigationEntries+1) + if err != nil { + return nil, err + } + defer rows.Close() + out := []PublishedNavigationPage{} + bytes := 0 + for rows.Next() { + var p PublishedNavigationPage + v := &p.Revision + if err = rows.Scan(&p.Path, &v.UUID, &v.ObjectUUID, &v.DocumentHash, &v.Language, &v.ContentType, &v.Filename, &v.CreatedAtMS); err != nil { + return nil, err + } + if !PublicSemanticPath(p.Path) { + continue + } + out = append(out, p) + bytes += len(p.Path) + len(v.Filename) + len(v.ContentType) + if len(out) > MaxNavigationEntries || bytes > 4<<20 { + return nil, ErrNavigationBudget + } + } + if err = rows.Err(); err != nil { + return nil, err + } + rows.Close() + automatic, err := s.automaticPublicPages(ctx, domain, "") + if err != nil { + return nil, err + } + seen := map[string]bool{} + for _, p := range out { + seen[p.Path+"\x00"+p.Revision.Language] = true + } + for _, p := range automatic { + key := p.Path + "\x00" + p.Revision.Language + if seen[key] { + continue + } + seen[key] = true + out = append(out, p) + bytes += len(p.Path) + len(p.Revision.Filename) + len(p.Revision.ContentType) + if len(out) > MaxNavigationEntries || bytes > 4<<20 { + return nil, ErrNavigationBudget + } + } + return out, nil +} + +const anonymousRevisionFromSQL = `FROM locality_publication_entries e JOIN locality_publication_manifests m ON m.domain_uuid=e.domain_uuid AND m.node_kind=e.node_kind AND m.node_uuid=e.node_uuid + JOIN paths p ON p.domain_uuid=e.domain_uuid AND p.path=e.path AND p.object_uuid=e.object_uuid + JOIN revisions r ON r.uuid=e.revision_uuid AND r.object_uuid=e.object_uuid AND r.document_hash=e.document_hash AND COALESCE(NULLIF(r.lang,''),'und')=e.lang + JOIN domains d ON d.uuid=e.domain_uuid AND d.enabled=1 + WHERE e.domain_uuid=? AND m.epoch=COALESCE((SELECT version FROM city_governance_epochs WHERE domain_uuid=e.domain_uuid),0) + AND m.topology_version=COALESCE((SELECT version FROM domain_topology_versions WHERE domain_uuid=e.domain_uuid),1) + AND (SELECT value FROM config WHERE domain_uuid=e.domain_uuid AND key='authorization_mode')='enforcing' + AND r.uuid=(SELECT head.uuid FROM revisions head WHERE head.object_uuid=r.object_uuid AND COALESCE(NULLIF(head.lang,''),'und')=e.lang ORDER BY head.created_at_ms DESC,head.rowid DESC LIMIT 1)` diff --git a/internal/store/notification_push.go b/internal/store/notification_push.go new file mode 100644 index 0000000..d66d871 --- /dev/null +++ b/internal/store/notification_push.go @@ -0,0 +1,155 @@ +package store + +import ( + "context" + "crypto/sha256" + "database/sql" + "encoding/base64" + "errors" + "strings" + "time" +) + +const NotificationPushEventType = "notification.push.deliver" + +func (s *Store) ensureNotificationPushSchema() error { + _, err := s.DB.Exec(`CREATE TABLE IF NOT EXISTS notification_push_keys(id INTEGER PRIMARY KEY CHECK(id=1),private_key TEXT NOT NULL,public_key TEXT NOT NULL); + CREATE TABLE IF NOT EXISTS notification_push_subscriptions( + id TEXT PRIMARY KEY,domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,session_hash TEXT NOT NULL, + subscription TEXT NOT NULL,expires_at_ms INTEGER NOT NULL,foreground_until_ms INTEGER NOT NULL DEFAULT 0); + CREATE INDEX IF NOT EXISTS notification_push_owner ON notification_push_subscriptions(domain_uuid,owner_uuid); + CREATE INDEX IF NOT EXISTS notification_push_expiry ON notification_push_subscriptions(expires_at_ms); + CREATE TABLE IF NOT EXISTS notification_push_queue( + subscription_id TEXT NOT NULL,notification_uuid TEXT NOT NULL,created_at_ms INTEGER NOT NULL,next_at_ms INTEGER NOT NULL, + attempts INTEGER NOT NULL DEFAULT 0,lease_until_ms INTEGER NOT NULL DEFAULT 0,PRIMARY KEY(subscription_id,notification_uuid)); + CREATE INDEX IF NOT EXISTS notification_push_due ON notification_push_queue(next_at_ms,lease_until_ms); + CREATE INDEX IF NOT EXISTS notification_push_age ON notification_push_queue(created_at_ms); + CREATE TRIGGER IF NOT EXISTS notification_push_enqueue AFTER INSERT ON notification_inbox BEGIN + INSERT OR IGNORE INTO notification_push_queue(subscription_id,notification_uuid,created_at_ms,next_at_ms) + SELECT id,NEW.uuid,NEW.created_at_ms,NEW.created_at_ms FROM notification_push_subscriptions + WHERE domain_uuid=NEW.domain_uuid AND owner_uuid=NEW.recipient_uuid AND expires_at_ms>NEW.created_at_ms; + END;`) + return err +} + +func (s *Store) EnsureNotificationPushEvent() error { + now := time.Now().UnixMilli() + _, err := s.DB.Exec(`INSERT OR IGNORE INTO event_definitions(uuid,name,event_type,event_key,payload,schedule_kind,interval_seconds,next_run_at_ms,enabled,priority,max_attempts,created_at_ms,updated_at_ms) VALUES('builtin.notification.push','Browser notifications',?,'local','{}','interval',30,?,1,-3,3,?,?)`, NotificationPushEventType, now, now, now) + return err +} + +// Never stores the browser's bearer token. Delivery is bound to its revocable session. +func (s *Store) SaveNotificationPush(ctx context.Context, domain, owner, token, endpoint, subscription string, focused bool) error { + sum := sha256.Sum256([]byte(token)) + hash := base64.RawURLEncoding.EncodeToString(sum[:]) + sum = sha256.Sum256([]byte(endpoint)) + id := base64.RawURLEncoding.EncodeToString(sum[:]) + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return err + } + defer tx.Rollback() + if _, err = tx.ExecContext(ctx, `UPDATE domain_memberships SET state=state WHERE domain_uuid=? AND principal_uuid=?`, domain, owner); err != nil { + return err + } + var count int + if err = tx.QueryRowContext(ctx, `SELECT COUNT(*) FROM notification_push_subscriptions WHERE domain_uuid=? AND owner_uuid=? AND id<>? AND expires_at_ms>?`, domain, owner, id, time.Now().UnixMilli()).Scan(&count); err != nil { + return err + } + if count >= 8 { + return ErrNotificationInput + } + until := int64(0) + if focused { + until = time.Now().Add(90 * time.Second).UnixMilli() + } + result, err := tx.ExecContext(ctx, `INSERT INTO notification_push_subscriptions(id,domain_uuid,owner_uuid,session_hash,subscription,expires_at_ms,foreground_until_ms) VALUES(?,?,?,?,?,?,?) ON CONFLICT(id) DO UPDATE SET session_hash=excluded.session_hash,subscription=excluded.subscription,expires_at_ms=excluded.expires_at_ms,foreground_until_ms=excluded.foreground_until_ms WHERE domain_uuid=excluded.domain_uuid AND owner_uuid=excluded.owner_uuid`, id, domain, owner, hash, subscription, time.Now().Add(30*24*time.Hour).UnixMilli(), until) + if err != nil { + return err + } + n, _ := result.RowsAffected() + if n != 1 { + return ErrNotificationInput + } + return tx.Commit() +} + +func (s *Store) DeleteNotificationPush(ctx context.Context, domain, owner, endpoint string) error { + sum := sha256.Sum256([]byte(endpoint)) + id := base64.RawURLEncoding.EncodeToString(sum[:]) + _, err := s.DB.ExecContext(ctx, `DELETE FROM notification_push_subscriptions WHERE id=? AND domain_uuid=? AND owner_uuid=?`, id, domain, owner) + return err +} + +type NotificationPushDelivery struct { + ID, Notification, Domain, Owner, Subscription string + Focused bool + Attempt int +} + +func (s *Store) AcknowledgeNotificationPush(ctx context.Context, domain, owner, endpoint string, ids []string) error { + if len(ids) == 0 { + return nil + } + if len(ids) > 30 { + return ErrNotificationInput + } + sum := sha256.Sum256([]byte(endpoint)) + id := base64.RawURLEncoding.EncodeToString(sum[:]) + args := []any{id, domain, owner} + for _, v := range ids { + args = append(args, v) + } + _, err := s.DB.ExecContext(ctx, `DELETE FROM notification_push_queue WHERE subscription_id IN (SELECT id FROM notification_push_subscriptions WHERE id=? AND domain_uuid=? AND owner_uuid=?) AND notification_uuid IN (`+strings.TrimSuffix(strings.Repeat("?,", len(ids)), ",")+`)`, args...) + return err +} +func (s *Store) DeferFocusedNotificationPush(ctx context.Context, d *NotificationPushDelivery) error { + _, err := s.DB.ExecContext(ctx, `UPDATE notification_push_queue SET attempts=attempts-1,lease_until_ms=0,next_at_ms=? WHERE subscription_id=? AND notification_uuid=? AND attempts=?`, time.Now().Add(time.Minute).UnixMilli(), d.ID, d.Notification, d.Attempt) + return err +} + +func (s *Store) ClaimNotificationPush(ctx context.Context) (*NotificationPushDelivery, error) { + now := time.Now().UnixMilli() + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return nil, err + } + defer tx.Rollback() + // Atomic claim across scheduler workers/processes. Outbound I/O is never inside this transaction. + var d NotificationPushDelivery + err = tx.QueryRowContext(ctx, `UPDATE notification_push_queue SET lease_until_ms=?,attempts=attempts+1 WHERE (subscription_id,notification_uuid)=(SELECT subscription_id,notification_uuid FROM notification_push_queue WHERE next_at_ms<=? AND lease_until_ms<=? ORDER BY next_at_ms LIMIT 1) RETURNING subscription_id,notification_uuid,attempts`, now+60000, now, now).Scan(&d.ID, &d.Notification, &d.Attempt) + if errors.Is(err, sql.ErrNoRows) { + return nil, nil + } + if err != nil { + return nil, err + } + err = tx.QueryRowContext(ctx, `SELECT s.domain_uuid,s.owner_uuid,s.subscription,s.foreground_until_ms>? FROM notification_push_subscriptions s + JOIN auth_sessions a ON a.token_hash=s.session_hash AND a.domain_uuid=s.domain_uuid AND a.principal_uuid=s.owner_uuid + JOIN principals p ON p.uuid=s.owner_uuid JOIN domain_memberships m ON m.domain_uuid=s.domain_uuid AND m.principal_uuid=s.owner_uuid + JOIN domains d ON d.uuid=s.domain_uuid JOIN notification_inbox n ON n.uuid=? AND n.domain_uuid=s.domain_uuid AND n.recipient_uuid=s.owner_uuid + WHERE s.id=? AND s.expires_at_ms>? AND a.expires_at_ms>? AND a.revoked_at_ms=0 AND p.state IN ('active','readonly') AND m.state='active' AND d.enabled=1 AND COALESCE(d.placement,'local')='local' AND n.status='unread' AND n.created_at_ms>?`, now, d.Notification, d.ID, now, now, now-24*60*60*1000).Scan(&d.Domain, &d.Owner, &d.Subscription, &d.Focused) + if errors.Is(err, sql.ErrNoRows) { + d.Subscription = "" + } else if err != nil { + return nil, err + } + if err = tx.Commit(); err != nil { + return nil, err + } + return &d, nil +} + +func (s *Store) FinishNotificationPush(ctx context.Context, d *NotificationPushDelivery, retry, expired bool) error { + if expired { + if _, err := s.DB.ExecContext(ctx, `DELETE FROM notification_push_subscriptions WHERE id=?`, d.ID); err != nil { + return err + } + } + if retry && d.Attempt < 5 { + _, err := s.DB.ExecContext(ctx, `UPDATE notification_push_queue SET next_at_ms=?,lease_until_ms=0 WHERE subscription_id=? AND notification_uuid=? AND attempts=?`, time.Now().Add(time.Duration(1< 100 { + limit = 50 + } + query := `SELECT ` + notificationColumns + ` FROM notification_inbox WHERE domain_uuid=? AND recipient_uuid=?` + args := []any{domainUUID, recipientUUID} + if unreadOnly { + query += ` AND status='unread'` + } + if before != "" { + query += ` AND (created_at_ms,uuid)<(SELECT created_at_ms,uuid FROM notification_inbox WHERE uuid=? AND domain_uuid=? AND recipient_uuid=?)` + args = append(args, before, domainUUID, recipientUUID) + } + query += ` ORDER BY created_at_ms DESC,uuid DESC LIMIT ?` + args = append(args, limit+1) + rows, err := s.DB.QueryContext(ctx, query, args...) + if err != nil { + return nil, "", err + } + defer rows.Close() + items := make([]Notification, 0, limit) + for rows.Next() { + var item Notification + if err := scanNotification(rows, &item); err != nil { + return nil, "", err + } + items = append(items, item) + } + if err := rows.Err(); err != nil { + return nil, "", err + } + next := "" + if len(items) > limit { + items = items[:limit] + next = items[len(items)-1].UUID + } + return items, next, nil +} + +func (s *Store) MarkNotificationRead(domainUUID, recipientUUID, notificationUUID string) error { + if domainUUID == "" || recipientUUID == "" || notificationUUID == "" { + return ErrNotificationInput + } + result, err := s.DB.Exec(`UPDATE notification_inbox SET status='read',read_at_ms=? WHERE uuid=? AND domain_uuid=? AND recipient_uuid=? AND status='unread'`, time.Now().UnixMilli(), notificationUUID, domainUUID, recipientUUID) + if err != nil { + return err + } + if count, _ := result.RowsAffected(); count == 0 { + var exists int + if err := s.DB.QueryRow(`SELECT COUNT(*) FROM notification_inbox WHERE uuid=? AND domain_uuid=? AND recipient_uuid=?`, notificationUUID, domainUUID, recipientUUID).Scan(&exists); err != nil { + return err + } + if exists == 0 { + return sql.ErrNoRows + } + } + return nil +} + +func (s *Store) GetNotification(ctx context.Context, domainUUID, recipientUUID, notificationUUID string) (Notification, error) { + var item Notification + if strings.TrimSpace(domainUUID) == "" || strings.TrimSpace(recipientUUID) == "" || strings.TrimSpace(notificationUUID) == "" { + return item, ErrNotificationInput + } + err := scanNotification(s.DB.QueryRowContext(ctx, `SELECT `+notificationColumns+` FROM notification_inbox WHERE domain_uuid=? AND recipient_uuid=? AND uuid=?`, domainUUID, recipientUUID, notificationUUID), &item) + return item, err +} diff --git a/internal/store/notifications_test.go b/internal/store/notifications_test.go new file mode 100644 index 0000000..0b9a7d8 --- /dev/null +++ b/internal/store/notifications_test.go @@ -0,0 +1,83 @@ +package store + +import ( + "context" + "database/sql" + "errors" + "testing" + + _ "modernc.org/sqlite" +) + +func TestNotificationInboxIsScopedAndIdempotent(t *testing.T) { + db, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + defer db.Close() + s := &Store{DB: db} + if err := s.EnsureNotificationSchema(); err != nil { + t.Fatal(err) + } + tx, err := db.Begin() + if err != nil { + t.Fatal(err) + } + first, inserted, err := s.CreateNotificationTx(tx, Notification{DomainUUID: "domain-1", RecipientUUID: "user-1", EventUUID: "event-1", Kind: "approval.request", RequestUUID: "request-1", Href: "/-/inbox/request-1", Message: "review"}) + if err != nil || !inserted { + t.Fatalf("create first = %+v inserted=%v err=%v", first, inserted, err) + } + second, inserted, err := s.CreateNotificationTx(tx, Notification{DomainUUID: "domain-1", RecipientUUID: "user-1", EventUUID: "event-1", Kind: "approval.request", Message: "duplicate"}) + if err != nil || inserted || second.UUID != first.UUID || second.Message != "review" { + t.Fatalf("duplicate = %+v inserted=%v err=%v", second, inserted, err) + } + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + items, next, err := s.ListNotifications(context.Background(), "domain-1", "user-1", true, "", 10) + if err != nil || len(items) != 1 || next != "" || items[0].Status != "unread" { + t.Fatalf("list = %+v next=%q err=%v", items, next, err) + } + if err := s.MarkNotificationRead("domain-1", "user-2", first.UUID); !errors.Is(err, sql.ErrNoRows) { + t.Fatalf("cross-recipient mark error=%v, want sql.ErrNoRows", err) + } + if err := s.MarkNotificationRead("domain-1", "user-1", first.UUID); err != nil { + t.Fatal(err) + } + items, _, err = s.ListNotifications(context.Background(), "domain-1", "user-1", true, "", 10) + if err != nil || len(items) != 0 { + t.Fatalf("unread after mark = %+v err=%v", items, err) + } +} + +func TestNotificationKeysetCursor(t *testing.T) { + db, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + defer db.Close() + s := &Store{DB: db} + if err := s.EnsureNotificationSchema(); err != nil { + t.Fatal(err) + } + for i, event := range []string{"event-1", "event-2", "event-3"} { + tx, err := db.Begin() + if err != nil { + t.Fatal(err) + } + if _, _, err := s.CreateNotificationTx(tx, Notification{UUID: "notification-" + event, DomainUUID: "domain-1", RecipientUUID: "user-1", EventUUID: event, Kind: "kind", CreatedAtMS: int64(100 - i)}); err != nil { + t.Fatal(err) + } + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + } + page, cursor, err := s.ListNotifications(context.Background(), "domain-1", "user-1", false, "", 2) + if err != nil || len(page) != 2 || cursor == "" { + t.Fatalf("first page = %+v cursor=%q err=%v", page, cursor, err) + } + page, next, err := s.ListNotifications(context.Background(), "domain-1", "user-1", false, cursor, 2) + if err != nil || len(page) != 1 || next != "" || page[0].EventUUID != "event-3" { + t.Fatalf("second page = %+v cursor=%q err=%v", page, next, err) + } +} diff --git a/internal/store/object_deletion_snapshot.go b/internal/store/object_deletion_snapshot.go new file mode 100644 index 0000000..099fff1 --- /dev/null +++ b/internal/store/object_deletion_snapshot.go @@ -0,0 +1,119 @@ +package store + +import ( + "encoding/json" + + "github.com/google/uuid" +) + +// ObjectDeletionSnapshot proves the full current binding set belongs to one +// Domain. It is issued by the store, not accepted as client-provided metadata. +// Each Path still needs the caller's delete grant; one allowed alias is never +// sufficient authority to destroy an Object through all its other aliases. +type ObjectDeletionSnapshot struct { + domainUUID string + objectUUID string + bindings []pathRename +} + +func (snapshot *ObjectDeletionSnapshot) Paths() []string { + paths := make([]string, len(snapshot.bindings)) + for i, binding := range snapshot.bindings { + paths[i] = binding.OldPath + } + return paths +} + +func objectDeletionBindings(q pathQueryer, domainUUID, objectUUID string) ([]pathRename, error) { + rows, err := q.Query(`SELECT domain_uuid, path, object_uuid, created_at, COALESCE(is_primary,0) + FROM paths WHERE object_uuid=? AND EXISTS(SELECT 1 FROM objects WHERE uuid=?) + ORDER BY domain_uuid, path COLLATE BINARY LIMIT ?`, objectUUID, objectUUID, MaxPathMutationPaths+1) + if err != nil { + return nil, err + } + defer rows.Close() + var bindings []pathRename + for rows.Next() { + var binding pathRename + var bindingDomain string + if err := rows.Scan(&bindingDomain, &binding.OldPath, &binding.ObjectUUID, &binding.CreatedAt, &binding.IsPrimary); err != nil { + return nil, err + } + if bindingDomain != domainUUID { + return nil, ErrAccessDenied + } + bindings = append(bindings, binding) + } + if err := rows.Err(); err != nil { + return nil, err + } + if len(bindings) == 0 { + // Objects do not have an owner Domain column. Without any binding the + // current Domain cannot prove authority, including for an administrator. + return nil, ErrAccessDenied + } + if len(bindings) > MaxPathMutationPaths { + return nil, ErrPathMutationTooLarge + } + return bindings, nil +} + +func (s *Store) SnapshotObjectDeletionInDomain(domainUUID, objectUUID string) (*ObjectDeletionSnapshot, error) { + bindings, err := objectDeletionBindings(s.DB, domainUUID, objectUUID) + if err != nil { + return nil, err + } + return &ObjectDeletionSnapshot{domainUUID: domainUUID, objectUUID: objectUUID, bindings: bindings}, nil +} + +// DeleteObjectInDomainChecked is a purge, not an unlink. It rejects shared and +// unbound Objects and revalidates every authorized binding in the same +// transaction as the Object/Revision deletion. The global DeleteObject API is +// retained solely for trusted local administrative code. +func (s *Store) DeleteObjectInDomainChecked(domainUUID, objectUUID string, snapshot *ObjectDeletionSnapshot) error { + if snapshot == nil || snapshot.domainUUID != domainUUID || snapshot.objectUUID != objectUUID || len(snapshot.bindings) == 0 { + return ErrPathSnapshotChanged + } + if err := s.ensureLocalDomain(domainUUID); err != nil { + return err + } + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + bindings, err := objectDeletionBindings(tx, domainUUID, objectUUID) + if err == ErrAccessDenied { + return ErrPathSnapshotChanged + } + if err != nil { + return err + } + if len(bindings) != len(snapshot.bindings) { + return ErrPathSnapshotChanged + } + for i, binding := range bindings { + if snapshot.bindings[i] != binding { + return ErrPathSnapshotChanged + } + } + if err := deleteObjectTx(tx, objectUUID); err != nil { + return pathMutationTransactionError(err) + } + operationID := uuid.NewString() + payload, err := json.Marshal(map[string]any{"operation_uuid": operationID, "object_uuid": objectUUID, "count": len(bindings)}) + if err != nil { + return err + } + if err := s.appendActivityOutboxIfAvailable(tx, ActivityOutboxEvent{ + DomainUUID: domainUUID, EventType: "object.deleted", TargetKind: "object", TargetUUID: objectUUID, + Payload: string(payload), IdempotencyKey: "object.deleted:" + operationID, + }); err != nil { + return err + } + if err := tx.Commit(); err != nil { + return pathMutationTransactionError(err) + } + s.InvalidatePathCaches() + return nil +} diff --git a/internal/store/object_deletion_snapshot_test.go b/internal/store/object_deletion_snapshot_test.go new file mode 100644 index 0000000..6de21b5 --- /dev/null +++ b/internal/store/object_deletion_snapshot_test.go @@ -0,0 +1,135 @@ +package store_test + +import ( + "errors" + "io" + "reflect" + "testing" + + "pageswiki/internal/db" + "pageswiki/internal/store" +) + +func TestObjectDeletionSnapshotRejectsSharedUnknownAndUnbound(t *testing.T) { + st, domain, _ := pathSnapshotFixture(t) + object := makeSnapshotPage(t, st, domain, "/allowed") + if _, err := st.DB.Exec(`INSERT INTO paths(domain_uuid,path,object_uuid,created_at) VALUES('foreign-domain','/remote',?,1)`, object); err != nil { + t.Fatal(err) + } + unbound, err := st.CreateObject("page") + if err != nil { + t.Fatal(err) + } + for _, object := range []string{object, unbound, "unknown-object"} { + if _, err := st.SnapshotObjectDeletionInDomain(domain, object); !errors.Is(err, store.ErrAccessDenied) { + t.Fatalf("unproven Domain purge accepted for %s: %v", object, err) + } + } +} + +func TestObjectDeletionSnapshotRejectsConcurrentBindingChanges(t *testing.T) { + for _, change := range []string{"local-alias", "foreign-alias", "removed-alias", "rebound-alias"} { + t.Run(change, func(t *testing.T) { + st, domain, filename := pathSnapshotFixture(t) + object := makeSnapshotPage(t, st, domain, "/allowed") + if _, err := st.SaveRevision(object, "keep", "original"); err != nil { + t.Fatal(err) + } + snapshot, err := st.SnapshotObjectDeletionInDomain(domain, object) + if err != nil { + t.Fatal(err) + } + writer, err := db.Open(filename) + if err != nil { + t.Fatal(err) + } + defer writer.Close() + switch change { + case "local-alias": + _, err = writer.Exec(`INSERT INTO paths(domain_uuid,path,object_uuid,created_at) VALUES(?,'/unchecked',?,1)`, domain, object) + case "foreign-alias": + _, err = writer.Exec(`INSERT INTO paths(domain_uuid,path,object_uuid,created_at) VALUES('foreign-domain','/unchecked',?,1)`, object) + case "removed-alias": + _, err = writer.Exec(`DELETE FROM paths WHERE domain_uuid=? AND path='/allowed'`, domain) + case "rebound-alias": + _, err = writer.Exec(`UPDATE paths SET object_uuid='different-object' WHERE domain_uuid=? AND path='/allowed'`, domain) + } + if err != nil { + t.Fatal(err) + } + before := pathMutationState(t, st) + if err := st.DeleteObjectInDomainChecked(domain, object, snapshot); !errors.Is(err, store.ErrPathSnapshotChanged) { + t.Fatalf("stale Object purge snapshot accepted: %v", err) + } + if after := pathMutationState(t, st); !reflect.DeepEqual(before, after) { + t.Fatalf("denied purge changed Objects/Paths/Revisions: before %#v, after %#v", before, after) + } + }) + } +} + +func TestCheckedObjectPurgeIsAtomicAndPreservesDocuments(t *testing.T) { + st, domain, _ := pathSnapshotFixture(t) + object := makeSnapshotPage(t, st, domain, "/one") + if err := st.BindPathInDomain(domain, "/two", object); err != nil { + t.Fatal(err) + } + revision, err := st.SaveRevision(object, "keep immutable content", "original") + if err != nil { + t.Fatal(err) + } + metadata, err := st.GetRevisionMetadata(revision) + if err != nil { + t.Fatal(err) + } + snapshot, err := st.SnapshotObjectDeletionInDomain(domain, object) + if err != nil { + t.Fatal(err) + } + if !reflect.DeepEqual(snapshot.Paths(), []string{"/one", "/two"}) { + t.Fatalf("snapshot omitted alias: %#v", snapshot.Paths()) + } + before := pathMutationState(t, st) + if _, err := st.DB.Exec(`CREATE TRIGGER reject_object_purge BEFORE DELETE ON revisions BEGIN SELECT RAISE(ABORT,'injected failure'); END`); err != nil { + t.Fatal(err) + } + if err := st.DeleteObjectInDomainChecked(domain, object, snapshot); err == nil { + t.Fatal("injected purge failure ignored") + } + if after := pathMutationState(t, st); !reflect.DeepEqual(before, after) { + t.Fatalf("failed purge leaked an earlier Path deletion: before %#v, after %#v", before, after) + } + if _, err := st.DB.Exec(`DROP TRIGGER reject_object_purge`); err != nil { + t.Fatal(err) + } + if err := st.DeleteObjectInDomainChecked(domain, "different-object", snapshot); !errors.Is(err, store.ErrPathSnapshotChanged) { + t.Fatalf("snapshot used for another Object: %v", err) + } + if err := st.DeleteObjectInDomainChecked(domain, object, snapshot); err != nil { + t.Fatal(err) + } + for _, path := range []string{"/one", "/two"} { + if st.PathExistsInDomain(domain, path) { + t.Fatalf("purge retained alias: %s", path) + } + } + var objectCount, revisionCount int + if err := st.DB.QueryRow(`SELECT COUNT(*) FROM objects WHERE uuid=?`, object).Scan(&objectCount); err != nil { + t.Fatal(err) + } + if err := st.DB.QueryRow(`SELECT COUNT(*) FROM revisions WHERE uuid=?`, revision).Scan(&revisionCount); err != nil { + t.Fatal(err) + } + if objectCount != 0 || revisionCount != 0 { + t.Fatalf("purge silently became unlink: Objects=%d, Revisions=%d", objectCount, revisionCount) + } + document, err := st.OpenDocument(metadata.DocumentHash) + if err != nil { + t.Fatalf("purge removed the immutable shared Document: %v", err) + } + defer document.Close() + body, err := io.ReadAll(document) + if err != nil || string(body) != "keep immutable content" { + t.Fatalf("purge changed Document content: %q, %v", body, err) + } +} diff --git a/internal/store/object_listing.go b/internal/store/object_listing.go new file mode 100644 index 0000000..fd6e7dc --- /dev/null +++ b/internal/store/object_listing.go @@ -0,0 +1,220 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "strings" + "time" +) + +const ObjectListCandidateLimit = 400 +const objectListBindingLimit = 8000 + +var ErrObjectListBudget = errors.New("object listing authorization exceeds the bounded request budget") + +type ObjectListPosition struct { + CreatedAt int64 `json:"created_at"` + UUID string `json:"uuid"` +} + +type objectListCursor struct { + Purpose string `json:"purpose"` + Domain string `json:"domain"` + Principal string `json:"principal"` + Expires int64 `json:"expires"` + Position ObjectListPosition `json:"position"` +} + +func (s *Store) EnsureObjectListingSchema() error { + var available bool + if err := s.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM sqlite_master WHERE type='table' AND name='objects') AND EXISTS(SELECT 1 FROM sqlite_master WHERE type='table' AND name='paths')`).Scan(&available); err != nil { + return err + } + // Domain-only migration fixtures/installations may not have installed the + // Object schema yet. Their migration must not depend on the listing index. + if !available { + return nil + } + _, err := s.DB.Exec(`CREATE INDEX IF NOT EXISTS idx_objects_metadata_page ON objects(COALESCE(created_at,0) DESC,uuid ASC); + CREATE INDEX IF NOT EXISTS idx_paths_object_domain_page ON paths(object_uuid,domain_uuid,path)`) + return err +} + +// Cursors are encrypted: a denied-only page must not expose a hidden Object's +// UUID or timestamp through a base64-encoded pagination bookmark. +func (s *Store) EncodeObjectListCursor(domain, principal string, position ObjectListPosition) (string, error) { + raw, err := json.Marshal(objectListCursor{Purpose: "object-metadata-v1", Domain: domain, Principal: principal, Expires: time.Now().Add(15 * time.Minute).Unix(), Position: position}) + if err != nil { + return "", err + } + encoded, err := s.encryptAuthSecret(raw) + return strings.NewReplacer("+", "-", "/", "_").Replace(encoded), err +} + +func (s *Store) DecodeObjectListCursor(encoded, domain, principal string) (*ObjectListPosition, error) { + if encoded == "" { + return nil, nil + } + if len(encoded) > 2048 { + return nil, errors.New("invalid object-list cursor") + } + raw, err := s.decryptAuthSecret(strings.NewReplacer("-", "+", "_", "/").Replace(encoded)) + var cursor objectListCursor + if err != nil || json.Unmarshal(raw, &cursor) != nil || cursor.Purpose != "object-metadata-v1" || cursor.Domain != domain || cursor.Principal != principal || cursor.Expires <= time.Now().Unix() || cursor.Position.UUID == "" || len(cursor.Position.UUID) > 128 || cursor.Position.CreatedAt < 0 { + return nil, errors.New("invalid object-list cursor") + } + return &cursor.Position, nil +} + +// LoadObjectListReadGrants adds direct Object authority to the separate Path +// filter. Broad grants apply only to candidates already scoped by live Domain +// bindings, never to globally identified Objects in another Domain. +func (s *Store) LoadObjectListReadGrants(ctx context.Context, domain, principal string) (map[string]bool, bool, error) { + exact := make(map[string]bool) + rows, err := s.DB.QueryContext(ctx, `SELECT g.target_type,g.target_id FROM principals p + JOIN domain_memberships m ON m.principal_uuid=p.uuid AND m.domain_uuid=? AND m.state='active' + JOIN auth_role_bindings b ON b.membership_uuid=m.uuid + JOIN auth_roles r ON r.uuid=b.role_uuid AND r.domain_uuid=m.domain_uuid + JOIN auth_capability_grants g ON g.role_uuid=r.uuid AND g.capability='read' + WHERE p.uuid=? AND p.state IN ('active','readonly') AND g.target_type IN ('domain','object') LIMIT 4097`, domain, principal) + if err != nil { + return nil, false, err + } + defer rows.Close() + broad, count := false, 0 + for rows.Next() { + count++ + if count > 4096 { + return nil, false, ErrObjectListBudget + } + var kind, target string + if err := rows.Scan(&kind, &target); err != nil { + return nil, false, err + } + if kind == "domain" && target == domain || kind == "object" && target == "*" { + broad = true + } else if kind == "object" { + exact[target] = true + } + } + return exact, broad, rows.Err() +} + +// ListObjectMetadataPage consumes at most 400 Object candidates and 8,000 +// binding rows. The next position advances even when no candidate is readable. +// Paths stay internal and are never included in the returned metadata. +func (s *Store) ListObjectMetadataPage(ctx context.Context, domain string, after *ObjectListPosition, limit int, allowedPath func(string) bool, exact map[string]bool, broad bool) ([]Object, *ObjectListPosition, error) { + if limit <= 0 || limit > 200 { + limit = 100 + } + if !broad && allowedPath == nil { + return nil, nil, ErrAccessDenied + } + tx, err := s.DB.BeginTx(ctx, &sql.TxOptions{ReadOnly: true}) + if err != nil { + return nil, nil, err + } + defer tx.Rollback() + type branch struct { + predicate string + args []any + } + branches := []branch{{args: []any{domain}}} + if after != nil { + // Separate the equality and older-time ranges so SQLite can seek by + // UUID within large same-second import batches instead of re-scanning + // every earlier UUID in that timestamp on each page. + branches = []branch{ + {` AND COALESCE(o.created_at,0)=? AND o.uuid>?`, []any{domain, after.CreatedAt, after.UUID}}, + {` AND COALESCE(o.created_at,0) ObjectListCandidateLimit + if more { + candidates = candidates[:ObjectListCandidateLimit] + } + visible := make(map[string]bool) + args := []any{domain} + for _, object := range candidates { + if broad || exact[object.UUID] { + visible[object.UUID] = true + } else { + args = append(args, object.UUID) + } + } + if len(args) > 1 { + rows, err := tx.QueryContext(ctx, `SELECT object_uuid,path FROM paths WHERE domain_uuid=? AND object_uuid IN (`+strings.TrimRight(strings.Repeat("?,", len(args)-1), ",")+`) LIMIT 8001`, args...) + if err != nil { + return nil, nil, err + } + count := 0 + for rows.Next() { + count++ + if count > objectListBindingLimit { + rows.Close() + return nil, nil, ErrObjectListBudget + } + var id, path string + if err := rows.Scan(&id, &path); err != nil { + rows.Close() + return nil, nil, err + } + if allowedPath(path) { + visible[id] = true + } + if len(visible) == len(candidates) { + break + } + } + err = rows.Err() + rows.Close() + if err != nil { + return nil, nil, err + } + } + out := make([]Object, 0, min(limit, len(candidates))) + var next *ObjectListPosition + for i, object := range candidates { + if visible[object.UUID] { + out = append(out, object) + } + if len(out) == limit { + if i+1 < len(candidates) || more { + next = &ObjectListPosition{CreatedAt: object.CreatedAt, UUID: object.UUID} + } + return out, next, nil + } + } + if more && len(candidates) != 0 { + last := candidates[len(candidates)-1] + next = &ObjectListPosition{CreatedAt: last.CreatedAt, UUID: last.UUID} + } + return out, next, nil +} diff --git a/internal/store/object_listing_test.go b/internal/store/object_listing_test.go new file mode 100644 index 0000000..03c43a0 --- /dev/null +++ b/internal/store/object_listing_test.go @@ -0,0 +1,110 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "fmt" + "strings" + "testing" + "time" +) + +func objectListingFixture(t *testing.T) *Store { + t.Helper() + database, err := sql.Open("sqlite", t.TempDir()+"/objects.db") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { database.Close() }) + if _, err := database.Exec(`CREATE TABLE objects(uuid TEXT PRIMARY KEY,kind TEXT,created_at INTEGER); + CREATE TABLE paths(domain_uuid TEXT,path TEXT,object_uuid TEXT); + INSERT INTO objects VALUES('a','page',100),('b','page',100),('c','page',NULL),('d','page',NULL),('unbound','page',200),('foreign','page',300); + INSERT INTO paths VALUES('local','/hidden-a','a'),('local','/readable-b','b'),('local','/readable-c','c'),('local','/readable-d','d'),('other','/private','foreign')`); err != nil { + t.Fatal(err) + } + st := &Store{DB: database, authKey: []byte(strings.Repeat("x", 32))} + if err := st.EnsureObjectListingSchema(); err != nil { + t.Fatal(err) + } + return st +} + +func TestObjectMetadataPageScopeNullKeysAndCancellation(t *testing.T) { + st := objectListingFixture(t) + ctx := context.Background() + allowed := func(path string) bool { return strings.HasPrefix(path, "/readable-") } + objects, next, err := st.ListObjectMetadataPage(ctx, "local", nil, 1, allowed, nil, false) + if err != nil || len(objects) != 1 || objects[0].UUID != "b" || next == nil { + t.Fatalf("filtered page: %#v %#v %v", objects, next, err) + } + objects, next, err = st.ListObjectMetadataPage(ctx, "local", next, 1, allowed, nil, false) + if err != nil || len(objects) != 1 || objects[0].UUID != "c" || next == nil || next.CreatedAt != 0 { + t.Fatalf("NULL timestamp page: %#v %#v %v", objects, next, err) + } + objects, next, err = st.ListObjectMetadataPage(ctx, "local", next, 1, allowed, nil, false) + if err != nil || len(objects) != 1 || objects[0].UUID != "d" || next != nil { + t.Fatalf("NULL timestamp continuation: %#v %#v %v", objects, next, err) + } + objects, _, err = st.ListObjectMetadataPage(ctx, "local", nil, 100, nil, map[string]bool{"foreign": true}, true) + if err != nil || len(objects) != 4 { + t.Fatalf("Domain scope: %#v %v", objects, err) + } + canceled, cancel := context.WithCancel(ctx) + cancel() + if _, _, err := st.ListObjectMetadataPage(canceled, "local", nil, 100, nil, nil, true); err == nil { + t.Fatal("canceled listing succeeded") + } +} + +func TestObjectMetadataBindingBudgetFailsClosed(t *testing.T) { + st := objectListingFixture(t) + tx, err := st.DB.Begin() + if err != nil { + t.Fatal(err) + } + for i := 0; i < objectListBindingLimit; i++ { + if _, err := tx.Exec(`INSERT INTO paths VALUES('local',?,'a')`, fmt.Sprintf("/aliases/%05d", i)); err != nil { + tx.Rollback() + t.Fatal(err) + } + } + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + if _, _, err := st.ListObjectMetadataPage(context.Background(), "local", nil, 100, func(string) bool { return false }, nil, false); !errors.Is(err, ErrObjectListBudget) { + t.Fatalf("unbounded aliases not rejected: %v", err) + } + objects, _, err := st.ListObjectMetadataPage(context.Background(), "local", nil, 100, func(string) bool { return false }, map[string]bool{"a": true}, false) + if err != nil || len(objects) != 1 || objects[0].UUID != "a" { + t.Fatalf("exact grant unnecessarily enumerated aliases: %#v %v", objects, err) + } +} + +func TestObjectListCursorExpiryPurposeAndPersistence(t *testing.T) { + st := objectListingFixture(t) + position := ObjectListPosition{CreatedAt: 100, UUID: "a"} + encoded, err := st.EncodeObjectListCursor("local", "reader", position) + if err != nil { + t.Fatal(err) + } + copyStore := &Store{authKey: append([]byte(nil), st.authKey...)} + decoded, err := copyStore.DecodeObjectListCursor(encoded, "local", "reader") + if err != nil || *decoded != position { + t.Fatalf("cursor cannot survive same-key instance restart: %#v %v", decoded, err) + } + for _, cursor := range []objectListCursor{ + {Purpose: "object-metadata-v1", Domain: "local", Principal: "reader", Expires: time.Now().Add(-time.Second).Unix(), Position: position}, + {Purpose: "another-encrypted-message", Domain: "local", Principal: "reader", Expires: time.Now().Add(time.Minute).Unix(), Position: position}, + } { + raw, _ := json.Marshal(cursor) + encrypted, err := st.encryptAuthSecret(raw) + if err != nil { + t.Fatal(err) + } + if _, err := st.DecodeObjectListCursor(strings.NewReplacer("+", "-", "/", "_").Replace(encrypted), "local", "reader"); err == nil { + t.Fatal("expired/wrong-purpose cursor accepted") + } + } +} diff --git a/internal/store/object_scope.go b/internal/store/object_scope.go new file mode 100644 index 0000000..94ccf47 --- /dev/null +++ b/internal/store/object_scope.go @@ -0,0 +1,43 @@ +package store + +import ( + "github.com/google/uuid" +) + +// CreateObjectInDomain records provenance atomically for the API's create, +// save, then bind workflow. It does not turn globally unique Objects into +// Domain-local identities, nor infer ownership of legacy unbound Objects. +func (s *Store) CreateObjectInDomain(domainUUID, kind string) (string, error) { + if err := s.ensureLocalDomain(domainUUID); err != nil { + return "", err + } + id := uuid.NewString() + tx, err := s.DB.Begin() + if err != nil { + return "", err + } + defer tx.Rollback() + if _, err := tx.Exec(`INSERT INTO objects(uuid,kind,created_at) VALUES(?,?,strftime('%s','now'))`, id, kind); err != nil { + return "", err + } + if _, err := tx.Exec(`INSERT INTO object_origins(object_uuid,domain_uuid,created_at) VALUES(?,?,strftime('%s','now'))`, id, domainUUID); err != nil { + return "", err + } + if err := tx.Commit(); err != nil { + return "", err + } + return id, nil +} + +// ObjectInDomainAuthorityScope allows broad Domain grants only through a live +// binding, or through recorded creation provenance while there are NO bindings. +// Moving the last binding to another Domain never leaves source authority. +func (s *Store) ObjectInDomainAuthorityScope(domainUUID, objectUUID string) (bool, error) { + var allowed bool + err := s.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM objects o WHERE o.uuid=? AND ( + EXISTS(SELECT 1 FROM paths p WHERE p.object_uuid=o.uuid AND p.domain_uuid=?) OR ( + NOT EXISTS(SELECT 1 FROM paths p WHERE p.object_uuid=o.uuid) AND + EXISTS(SELECT 1 FROM object_origins x WHERE x.object_uuid=o.uuid AND x.domain_uuid=?)) + ))`, objectUUID, domainUUID, domainUUID).Scan(&allowed) + return allowed, err +} diff --git a/internal/store/objects.go b/internal/store/objects.go index 1d0bfcf..0d3e7a6 100644 --- a/internal/store/objects.go +++ b/internal/store/objects.go @@ -44,3 +44,27 @@ func (s *Store) ListObjects() ([]Object, error) { return out, nil } + +// ListObjectsInDomain returns only Objects with a live semantic binding in the +// requested Domain. Authorization of each returned Object remains an HTTP +// layer concern because direct Object grants are also supported. +func (s *Store) ListObjectsInDomain(domainUUID string) ([]Object, error) { + rows, err := s.DB.Query(` + SELECT o.uuid, COALESCE(o.kind,''), o.created_at + FROM objects o + WHERE EXISTS (SELECT 1 FROM paths p WHERE p.domain_uuid=? AND p.object_uuid=o.uuid) + ORDER BY o.created_at DESC, o.uuid`, domainUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var out []Object + for rows.Next() { + var object Object + if err := rows.Scan(&object.UUID, &object.Kind, &object.CreatedAt); err != nil { + return nil, err + } + out = append(out, object) + } + return out, rows.Err() +} diff --git a/internal/store/path_links.go b/internal/store/path_links.go index 56f2c84..88d95ee 100644 --- a/internal/store/path_links.go +++ b/internal/store/path_links.go @@ -19,18 +19,29 @@ func (s *Store) EnsurePathLinkColumns() error { func (s *Store) ListPathLinks( objectUUID string, ) ([]PathLink, error) { + domainUUID, err := s.defaultDomainUUID() + if err != nil { + return nil, err + } + return s.ListPathLinksInDomain(domainUUID, objectUUID) +} +func (s *Store) ListPathLinksInDomain( + domainUUID string, + objectUUID string, +) ([]PathLink, error) { rows, err := s.DB.Query(` SELECT path, created_at, COALESCE(is_primary, 0) FROM paths - WHERE object_uuid = ? + WHERE domain_uuid = ? + AND object_uuid = ? ORDER BY is_primary DESC, path ASC - `, objectUUID) + `, domainUUID, objectUUID) if err != nil { return nil, err @@ -67,21 +78,33 @@ func (s *Store) AddPathLink( objectUUID string, path string, ) error { + domainUUID, err := s.defaultDomainUUID() + if err != nil { + return err + } + return s.AddPathLinkInDomain(domainUUID, objectUUID, path) +} +func (s *Store) AddPathLinkInDomain(domainUUID, objectUUID, path string) error { + if err := s.ensureLocalDomain(domainUUID); err != nil { + return err + } _, err := s.DB.Exec(` INSERT INTO paths ( + domain_uuid, path, object_uuid, created_at, is_primary ) VALUES ( + ?, ?, ?, strftime('%s','now'), 0 ) - `, path, objectUUID) + `, domainUUID, normalizePath(path), objectUUID) return err } @@ -90,12 +113,23 @@ func (s *Store) DeletePathLink( objectUUID string, path string, ) error { + domainUUID, err := s.defaultDomainUUID() + if err != nil { + return err + } + return s.DeletePathLinkInDomain(domainUUID, objectUUID, path) +} +func (s *Store) DeletePathLinkInDomain(domainUUID, objectUUID, path string) error { + if err := s.ensureLocalDomain(domainUUID); err != nil { + return err + } _, err := s.DB.Exec(` DELETE FROM paths - WHERE object_uuid = ? + WHERE domain_uuid = ? + AND object_uuid = ? AND path = ? - `, objectUUID, path) + `, domainUUID, objectUUID, normalizePath(path)) return err } @@ -104,7 +138,17 @@ func (s *Store) SetPrimaryPathLink( objectUUID string, path string, ) error { + domainUUID, err := s.defaultDomainUUID() + if err != nil { + return err + } + return s.SetPrimaryPathLinkInDomain(domainUUID, objectUUID, path) +} +func (s *Store) SetPrimaryPathLinkInDomain(domainUUID, objectUUID, path string) error { + if err := s.ensureLocalDomain(domainUUID); err != nil { + return err + } tx, err := s.DB.Begin() if err != nil { @@ -114,8 +158,9 @@ func (s *Store) SetPrimaryPathLink( _, err = tx.Exec(` UPDATE paths SET is_primary = 0 - WHERE object_uuid = ? - `, objectUUID) + WHERE domain_uuid = ? + AND object_uuid = ? + `, domainUUID, objectUUID) if err != nil { tx.Rollback() @@ -125,9 +170,10 @@ func (s *Store) SetPrimaryPathLink( _, err = tx.Exec(` UPDATE paths SET is_primary = 1 - WHERE object_uuid = ? + WHERE domain_uuid = ? + AND object_uuid = ? AND path = ? - `, objectUUID, path) + `, domainUUID, objectUUID, normalizePath(path)) if err != nil { tx.Rollback() diff --git a/internal/store/path_mutation.go b/internal/store/path_mutation.go index 73ad563..b6236ac 100644 --- a/internal/store/path_mutation.go +++ b/internal/store/path_mutation.go @@ -1,32 +1,391 @@ package store -func (s *Store) RenamePath( - oldPath string, - newPath string, -) error { +import ( + "database/sql" + "encoding/json" + "errors" + "path/filepath" + "strings" + "time" - _, err := s.DB.Exec(` - UPDATE paths - SET path = ? - WHERE path = ? - `, - newPath, - oldPath, - ) + "github.com/google/uuid" +) +var ( + ErrPathNotFound = errors.New("semantic path does not exist") + ErrPathConflict = errors.New("destination semantic path already exists") +) + +type pathRename struct { + OldPath string + NewPath string + ObjectUUID string + CreatedAt int64 + IsPrimary int +} + +func (s *Store) RenamePath(oldPath, newPath string) error { + domainUUID, err := s.defaultDomainUUID() + if err != nil { + return err + } + _, err = s.RenamePathsInDomain(domainUUID, oldPath, newPath, false) return err } -func (s *Store) RemovePath( - path string, -) error { - - _, err := s.DB.Exec(` - DELETE FROM paths - WHERE path = ? - `, - path, - ) - +func (s *Store) RenamePathInDomain(domainUUID, oldPath, newPath string) error { + _, err := s.RenamePathsInDomain(domainUUID, oldPath, newPath, false) return err } + +// RenamePathsInDomain performs rename as an atomic link/unlink operation. +// Page identity and Revision history remain stable while Path reachability +// changes. When a file-like basename changes, a new immutable Revision records +// the corresponding filename metadata. +func (s *Store) RenamePathsInDomain( + domainUUID, oldPath, newPath string, + recursive bool, +) (int, error) { + return s.renamePathsInDomain(domainUUID, oldPath, newPath, recursive, nil) +} + +// RenamePathsInDomainChecked requires the exact store snapshot authorized by +// the caller. Trusted local tools can use RenamePathsInDomain without grants. +func (s *Store) RenamePathsInDomainChecked(domainUUID, oldPath, newPath string, recursive bool, snapshot *PathMutationSnapshot) (int, error) { + if snapshot == nil { + return 0, ErrPathSnapshotChanged + } + count, err := s.renamePathsInDomain(domainUUID, oldPath, newPath, recursive, snapshot) + return count, pathMutationTransactionError(err) +} + +func (s *Store) renamePathsInDomain(domainUUID, oldPath, newPath string, recursive bool, snapshot *PathMutationSnapshot) (int, error) { + if err := s.ensureLocalDomain(domainUUID); err != nil { + return 0, err + } + oldPath = normalizePath(oldPath) + newPath = normalizePath(newPath) + if oldPath == "/" || newPath == "/" || oldPath == newPath { + return 0, ErrPathConflict + } + if recursive && strings.HasPrefix(newPath+"/", oldPath+"/") { + return 0, ErrPathConflict + } + + tx, err := s.DB.Begin() + if err != nil { + return 0, err + } + defer tx.Rollback() + + renames, err := listMutationPaths(tx, domainUUID, oldPath, recursive) + if err != nil { + return 0, err + } + if snapshot != nil { + if err := snapshot.validate(domainUUID, oldPath, recursive, renames); err != nil { + return 0, err + } + } + if len(renames) == 0 { + return 0, ErrPathNotFound + } + for i := range renames { + renames[i].NewPath = newPath + strings.TrimPrefix(renames[i].OldPath, oldPath) + } + + sourcePaths := make(map[string]bool, len(renames)) + for _, item := range renames { + sourcePaths[item.OldPath] = true + } + for _, item := range renames { + var exists int + if err := tx.QueryRow(` + SELECT COUNT(*) FROM paths + WHERE domain_uuid = ? AND path = ? + `, domainUUID, item.NewPath).Scan(&exists); err != nil { + return 0, err + } + if exists > 0 && !sourcePaths[item.NewPath] { + return 0, ErrPathConflict + } + } + + // Link all destinations before unlinking sources. Temporary source rows + // remain valid until the transaction commits. + for _, item := range renames { + if _, err := tx.Exec(` + INSERT INTO paths ( + domain_uuid, path, object_uuid, created_at, is_primary + ) VALUES (?, ?, ?, ?, ?) + `, domainUUID, item.NewPath, item.ObjectUUID, item.CreatedAt, item.IsPrimary); err != nil { + return 0, err + } + } + if err := renameUserSpacePathPoliciesTx(tx, domainUUID, oldPath, newPath, recursive); err != nil { + return 0, err + } + for _, item := range renames { + if _, err := tx.Exec(` + DELETE FROM paths WHERE domain_uuid = ? AND path = ? + `, domainUUID, item.OldPath); err != nil { + return 0, err + } + } + if err := renameBrowserNavigationPathsTx(tx, domainUUID, oldPath, newPath, recursive); err != nil { + return 0, err + } + + renamedObjects := map[string][2]string{} + for _, item := range renames { + oldName := filepath.Base(item.OldPath) + newName := filepath.Base(item.NewPath) + if oldName != newName && filepath.Ext(oldName) != "" { + renamedObjects[item.ObjectUUID] = [2]string{oldName, newName} + } + } + for objectUUID, names := range renamedObjects { + if err := cloneLatestRevisionFilenames( + tx, + objectUUID, + names[0], + names[1], + ); err != nil { + return 0, err + } + } + if recursive { + changed, err := renameCityPathPrefixesTx(tx, domainUUID, oldPath, newPath) + if err != nil { + return 0, err + } + if changed > 0 { + if err := bumpTopologyVersion(tx, domainUUID, "system:path-rename", "city.paths.renamed", "path", oldPath); err != nil { + return 0, err + } + } + } + operationID := uuid.NewString() + payload, err := json.Marshal(map[string]any{ + "operation_uuid": operationID, "old_path": oldPath, "new_path": newPath, + "recursive": recursive, "count": len(renames), + }) + if err != nil { + return 0, err + } + if err := s.appendActivityOutboxIfAvailable(tx, ActivityOutboxEvent{ + DomainUUID: domainUUID, EventType: "path.renamed", TargetKind: "path", + Payload: string(payload), IdempotencyKey: "path.renamed:" + operationID, + }); err != nil { + return 0, err + } + + if err := tx.Commit(); err != nil { + return 0, err + } + s.InvalidatePathCaches() + return len(renames), nil +} + +func cloneLatestRevisionFilenames( + tx *sql.Tx, + objectUUID, oldName, newName string, +) error { + rows, err := tx.Query(` + WITH ranked AS ( + SELECT + uuid, object_uuid, body, document_hash, lang, content_type, + filename, message, created_at_ms, created_at, + ROW_NUMBER() OVER ( + PARTITION BY COALESCE(NULLIF(lang, ''), 'und') + ORDER BY COALESCE(created_at_ms, created_at * 1000) DESC, rowid DESC + ) AS rn + FROM revisions + WHERE object_uuid = ? + ) + SELECT + COALESCE(body, ''), COALESCE(document_hash, ''), + COALESCE(NULLIF(lang, ''), 'und'), + COALESCE(NULLIF(content_type, ''), 'application/octet-stream'), + COALESCE(filename, ''), COALESCE(message, '') + FROM ranked WHERE rn = 1 + `, objectUUID) + if err != nil { + return err + } + type latestRevision struct { + body, hash, lang, contentType, filename, message string + } + var revisions []latestRevision + for rows.Next() { + var revision latestRevision + if err := rows.Scan( + &revision.body, + &revision.hash, + &revision.lang, + &revision.contentType, + &revision.filename, + &revision.message, + ); err != nil { + rows.Close() + return err + } + if revision.filename == "" || revision.filename == oldName { + revisions = append(revisions, revision) + } + } + if err := rows.Err(); err != nil { + rows.Close() + return err + } + if err := rows.Close(); err != nil { + return err + } + now := time.Now() + for index, revision := range revisions { + createdAtMS := now.UnixMilli() + int64(index) + if _, err := tx.Exec(` + INSERT INTO revisions ( + uuid, object_uuid, body, document_hash, lang, content_type, + filename, message, created_at_ms, created_at + ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + `, + uuid.NewString(), + objectUUID, + revision.body, + revision.hash, + revision.lang, + revision.contentType, + newName, + "rename filename: "+oldName+" -> "+newName, + createdAtMS, + createdAtMS/1000, + ); err != nil { + return err + } + } + return nil +} + +func (s *Store) RemovePath(path string) error { + domainUUID, err := s.defaultDomainUUID() + if err != nil { + return err + } + return s.RemovePathInDomain(domainUUID, path) +} + +func (s *Store) RemovePathInDomain(domainUUID, path string) error { + if err := s.ensureLocalDomain(domainUUID); err != nil { + return err + } + _, err := s.DB.Exec(` + DELETE FROM paths WHERE domain_uuid = ? AND path = ? + `, domainUUID, normalizePath(path)) + if err == nil { + s.InvalidatePathCaches() + } + return err +} + +// CopyPathsInDomain duplicates a Page or a virtual-folder subtree. Document +// blobs remain content-addressed and are reused, while Object and Revision +// identities are newly allocated so later edits do not affect the source. +func (s *Store) CopyPathsInDomain( + domainUUID, sourcePath, destinationPath string, + recursive bool, +) (int, error) { + return s.copyPathsInDomain(domainUUID, sourcePath, destinationPath, recursive, nil) +} + +func (s *Store) CopyPathsInDomainChecked(domainUUID, sourcePath, destinationPath string, recursive bool, snapshot *PathMutationSnapshot) (int, error) { + if snapshot == nil { + return 0, ErrPathSnapshotChanged + } + count, err := s.copyPathsInDomain(domainUUID, sourcePath, destinationPath, recursive, snapshot) + return count, pathMutationTransactionError(err) +} + +func (s *Store) copyPathsInDomain(domainUUID, sourcePath, destinationPath string, recursive bool, snapshot *PathMutationSnapshot) (int, error) { + if err := s.ensureLocalDomain(domainUUID); err != nil { + return 0, err + } + sourcePath = normalizePath(sourcePath) + destinationPath = normalizePath(destinationPath) + if sourcePath == "/" || destinationPath == "/" || sourcePath == destinationPath { + return 0, ErrPathConflict + } + if recursive && strings.HasPrefix(destinationPath+"/", sourcePath+"/") { + return 0, ErrPathConflict + } + tx, err := s.DB.Begin() + if err != nil { + return 0, err + } + defer tx.Rollback() + paths, err := listMutationPaths(tx, domainUUID, sourcePath, recursive) + if err != nil { + return 0, err + } + if snapshot != nil { + if err := snapshot.validate(domainUUID, sourcePath, recursive, paths); err != nil { + return 0, err + } + } + if len(paths) == 0 { + return 0, ErrPathNotFound + } + for i := range paths { + paths[i].NewPath = destinationPath + strings.TrimPrefix(paths[i].OldPath, sourcePath) + } + for _, item := range paths { + var exists int + if err := tx.QueryRow(`SELECT COUNT(*) FROM paths WHERE domain_uuid=? AND path=?`, + domainUUID, item.NewPath).Scan(&exists); err != nil { + return 0, err + } + if exists != 0 { + return 0, ErrPathConflict + } + } + objectCopies := map[string]string{} + for _, item := range paths { + newObjectUUID := objectCopies[item.ObjectUUID] + if newObjectUUID == "" { + newObjectUUID = uuid.NewString() + objectCopies[item.ObjectUUID] = newObjectUUID + if _, err := tx.Exec(` + INSERT INTO objects (uuid, kind, created_at) + SELECT ?, kind, ? FROM objects WHERE uuid=?`, + newObjectUUID, time.Now().Unix(), item.ObjectUUID); err != nil { + return 0, err + } + if _, err := tx.Exec(` + INSERT INTO revisions ( + uuid, object_uuid, body, document_hash, lang, content_type, + filename, message, created_at_ms, created_at + ) + SELECT lower(hex(randomblob(4))) || '-' || lower(hex(randomblob(2))) || '-4' || + substr(lower(hex(randomblob(2))),2) || '-' || + substr('89ab',abs(random()) % 4 + 1,1) || + substr(lower(hex(randomblob(2))),2) || '-' || lower(hex(randomblob(6))), + ?, body, document_hash, lang, content_type, filename, + message, created_at_ms, created_at + FROM revisions WHERE object_uuid=?`, + newObjectUUID, item.ObjectUUID); err != nil { + return 0, err + } + } + if _, err := tx.Exec(` + INSERT INTO paths(domain_uuid,path,object_uuid,created_at,is_primary) + VALUES(?,?,?,?,?)`, + domainUUID, item.NewPath, newObjectUUID, time.Now().Unix(), item.IsPrimary); err != nil { + return 0, err + } + } + if err := tx.Commit(); err != nil { + return 0, err + } + s.InvalidatePathCaches() + return len(paths), nil +} diff --git a/internal/store/path_snapshot.go b/internal/store/path_snapshot.go new file mode 100644 index 0000000..27073f5 --- /dev/null +++ b/internal/store/path_snapshot.go @@ -0,0 +1,184 @@ +package store + +import ( + "database/sql" + "encoding/json" + "errors" + "strings" + + "github.com/google/uuid" +) + +var ( + ErrPathSnapshotChanged = errors.New("semantic paths changed during authorization; retry the operation") + ErrPathMutationTooLarge = errors.New("too many semantic paths in one operation") +) + +// MaxPathMutationPaths bounds both authorization work and a single mutation. +// Larger trees should be submitted as independently authorized smaller subtrees. +const MaxPathMutationPaths = 10000 + +// PathMutationSnapshot is issued by the store, never decoded from client input. +// Its private bindings are the exact set on which the handler checks grants. +// Checking them again inside the write transaction prevents new descendants, +// removed entries, or replaced Object bindings from escaping those checks. +type PathMutationSnapshot struct { + domainUUID string + root string + recursive bool + bindings []pathRename +} + +func (snapshot *PathMutationSnapshot) Root() string { return snapshot.root } + +func (snapshot *PathMutationSnapshot) Paths() []string { + paths := make([]string, len(snapshot.bindings)) + for i, binding := range snapshot.bindings { + paths[i] = binding.OldPath + } + return paths +} + +type pathQueryer interface { + Query(string, ...any) (*sql.Rows, error) +} + +func pathMutationTransactionError(err error) error { + var sqliteError interface{ Code() int } + if errors.As(err, &sqliteError) && sqliteError.Code() == 517 { // SQLITE_BUSY_SNAPSHOT + return ErrPathSnapshotChanged + } + return err +} + +// Binary half-open ranges are literal and case-sensitive like paths.path. +// '/' followed by any suffix sorts before '0', its next ASCII character. +// Unlike LIKE, neither percent, underscore, backslash nor case changes can +// expand the requested subtree. The range can use the Domain/Path index. +func listMutationPaths(q pathQueryer, domainUUID, root string, recursive bool) ([]pathRename, error) { + prefix := strings.TrimRight(root, "/") + "/" + upper := strings.TrimSuffix(prefix, "/") + "0" + query := ` + SELECT path, object_uuid, created_at, COALESCE(is_primary, 0) + FROM paths WHERE domain_uuid = ? AND path = ?` + args := []any{domainUUID, root} + if recursive { + // Separate indexed arms avoid the Domain-wide scan SQLite may choose + // for an OR with a runtime recursive flag. Lexical order is stable and + // puts each parent before its children without a full length sort. + query += ` UNION ALL + SELECT path, object_uuid, created_at, COALESCE(is_primary, 0) + FROM paths WHERE domain_uuid = ? + AND path >= ? COLLATE BINARY AND path < ? COLLATE BINARY AND path != ?` + args = append(args, domainUUID, prefix, upper, root) + } + query += ` ORDER BY path COLLATE BINARY LIMIT ?` + args = append(args, MaxPathMutationPaths+1) + rows, err := q.Query(query, args...) + if err != nil { + return nil, err + } + defer rows.Close() + var bindings []pathRename + for rows.Next() { + var item pathRename + if err := rows.Scan(&item.OldPath, &item.ObjectUUID, &item.CreatedAt, &item.IsPrimary); err != nil { + return nil, err + } + bindings = append(bindings, item) + } + if err := rows.Err(); err != nil { + return nil, err + } + if len(bindings) > MaxPathMutationPaths { + return nil, ErrPathMutationTooLarge + } + return bindings, nil +} + +func (s *Store) SnapshotPathsInDomain(domainUUID, root string, recursive bool) (*PathMutationSnapshot, error) { + root = normalizePath(root) + bindings, err := listMutationPaths(s.DB, domainUUID, root, recursive) + if err != nil { + return nil, err + } + if len(bindings) == 0 { + return nil, ErrPathNotFound + } + return &PathMutationSnapshot{domainUUID: domainUUID, root: root, recursive: recursive, bindings: bindings}, nil +} + +func (snapshot *PathMutationSnapshot) validate(domainUUID, root string, recursive bool, bindings []pathRename) error { + if snapshot == nil || snapshot.domainUUID != domainUUID || snapshot.root != root || snapshot.recursive != recursive || len(snapshot.bindings) != len(bindings) { + return ErrPathSnapshotChanged + } + for i, binding := range bindings { + if snapshot.bindings[i] != binding { + return ErrPathSnapshotChanged + } + } + return nil +} + +// RemovePathsInDomainChecked unlinks the authorized bindings atomically. It +// deliberately retains Objects, Revisions and content-addressed Documents. +// Every scope is revalidated before the first DELETE, including overlapping +// selections. SQLite rejects an upgrade of a stale read snapshot to a write; +// do not retry this transaction without taking and authorizing a new snapshot. +func (s *Store) RemovePathsInDomainChecked(domainUUID string, snapshots []*PathMutationSnapshot) (int, error) { + if err := s.ensureLocalDomain(domainUUID); err != nil { + return 0, err + } + if len(snapshots) == 0 { + return 0, ErrPathNotFound + } + tx, err := s.DB.Begin() + if err != nil { + return 0, err + } + defer tx.Rollback() + bindings := map[string]pathRename{} + for _, snapshot := range snapshots { + if snapshot == nil || snapshot.domainUUID != domainUUID || snapshot.root == "/" { + return 0, ErrPathSnapshotChanged + } + current, err := listMutationPaths(tx, domainUUID, snapshot.root, snapshot.recursive) + if err != nil { + return 0, err + } + if err := snapshot.validate(domainUUID, snapshot.root, snapshot.recursive, current); err != nil { + return 0, err + } + for _, binding := range current { + bindings[binding.OldPath] = binding + } + if len(bindings) > MaxPathMutationPaths { + return 0, ErrPathMutationTooLarge + } + } + for _, binding := range bindings { + if _, err := tx.Exec(`DELETE FROM paths WHERE domain_uuid=? AND path=? AND object_uuid=?`, domainUUID, binding.OldPath, binding.ObjectUUID); err != nil { + return 0, pathMutationTransactionError(err) + } + } + operationID := uuid.NewString() + roots := make([]map[string]any, 0, len(snapshots)) + for _, snapshot := range snapshots { + roots = append(roots, map[string]any{"path": snapshot.root, "recursive": snapshot.recursive}) + } + payload, err := json.Marshal(map[string]any{"operation_uuid": operationID, "roots": roots, "count": len(bindings)}) + if err != nil { + return 0, err + } + if err := s.appendActivityOutboxIfAvailable(tx, ActivityOutboxEvent{ + DomainUUID: domainUUID, EventType: "path.unlinked", TargetKind: "path", + Payload: string(payload), IdempotencyKey: "path.unlinked:" + operationID, + }); err != nil { + return 0, err + } + if err := tx.Commit(); err != nil { + return 0, pathMutationTransactionError(err) + } + s.InvalidatePathCaches() + return len(bindings), nil +} diff --git a/internal/store/path_snapshot_query_test.go b/internal/store/path_snapshot_query_test.go new file mode 100644 index 0000000..fa88e29 --- /dev/null +++ b/internal/store/path_snapshot_query_test.go @@ -0,0 +1,107 @@ +package store + +import ( + "database/sql" + "errors" + "strings" + "testing" + + "pageswiki/internal/db" +) + +type recordingPathQuery struct { + db *sql.DB + query string + args []any +} + +func (q *recordingPathQuery) Query(query string, args ...any) (*sql.Rows, error) { + q.query, q.args = query, args + return q.db.Query(query, args...) +} + +func TestPathMutationEnumerationUsesIndexedRange(t *testing.T) { + database, err := db.Open(t.TempDir() + "/query.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if _, err := database.Exec(`CREATE TABLE paths(domain_uuid TEXT, path TEXT, object_uuid TEXT, created_at INTEGER, is_primary INTEGER, + PRIMARY KEY(domain_uuid,path))`); err != nil { + t.Fatal(err) + } + query := &recordingPathQuery{db: database} + if _, err := listMutationPaths(query, "domain", "/a%_", true); err != nil { + t.Fatal(err) + } + rows, err := database.Query("EXPLAIN QUERY PLAN "+query.query, query.args...) + if err != nil { + t.Fatal(err) + } + defer rows.Close() + var plan []string + for rows.Next() { + var id, parent, unused int + var detail string + if err := rows.Scan(&id, &parent, &unused, &detail); err != nil { + t.Fatal(err) + } + plan = append(plan, detail) + } + if err := rows.Err(); err != nil { + t.Fatal(err) + } + joined := strings.Join(plan, "\n") + if !strings.Contains(joined, "domain_uuid=? AND path>?") || strings.Contains(joined, "SCAN paths") || strings.Contains(joined, "USE TEMP B-TREE") { + t.Fatalf("mutation query no longer bounded by an ordered index range:\n%s", joined) + } +} + +func TestPathSnapshotSQLiteConcurrentWriteCannotUpgrade(t *testing.T) { + filename := t.TempDir() + "/concurrent.db" + database, err := db.Open(filename) + if err != nil { + t.Fatal(err) + } + defer database.Close() + if _, err := database.Exec(`CREATE TABLE paths(domain_uuid TEXT, path TEXT, object_uuid TEXT, created_at INTEGER, is_primary INTEGER, + PRIMARY KEY(domain_uuid,path)); INSERT INTO paths VALUES('d','/source/checked','first',1,0)`); err != nil { + t.Fatal(err) + } + st := &Store{DB: database} + snapshot, err := st.SnapshotPathsInDomain("d", "/source", true) + if err != nil { + t.Fatal(err) + } + tx, err := database.Begin() + if err != nil { + t.Fatal(err) + } + defer tx.Rollback() + bindings, err := listMutationPaths(tx, "d", "/source", true) + if err != nil { + t.Fatal(err) + } + if err := snapshot.validate("d", "/source", true, bindings); err != nil { + t.Fatal(err) + } + // This interleaving occurs after in-transaction revalidation, exercising + // the SQLite read-snapshot guarantee used by all checked mutations. + writer, err := db.Open(filename) + if err != nil { + t.Fatal(err) + } + defer writer.Close() + if _, err := writer.Exec(`INSERT INTO paths VALUES('d','/source/unchecked','second',1,0)`); err != nil { + t.Fatal(err) + } + _, err = tx.Exec(`DELETE FROM paths WHERE domain_uuid='d' AND path='/source/checked'`) + if !errors.Is(pathMutationTransactionError(err), ErrPathSnapshotChanged) { + t.Fatalf("stale read snapshot unexpectedly upgraded to a writer: %v", err) + } + _ = tx.Rollback() + var count int + if err := database.QueryRow(`SELECT COUNT(*) FROM paths`).Scan(&count); err != nil || count != 2 { + t.Fatalf("concurrent commit or rejected mutation lost data: %d, %v", count, err) + } +} diff --git a/internal/store/path_snapshot_test.go b/internal/store/path_snapshot_test.go new file mode 100644 index 0000000..e9b6868 --- /dev/null +++ b/internal/store/path_snapshot_test.go @@ -0,0 +1,249 @@ +package store_test + +import ( + "errors" + "fmt" + "reflect" + "testing" + + "pageswiki/internal/db" + "pageswiki/internal/store" +) + +func pathSnapshotFixture(t *testing.T) (*store.Store, string, string) { + t.Helper() + filename := t.TempDir() + "/paths.db" + database, err := db.Open(filename) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := store.NewWithDocumentRoot(database, t.TempDir()+"/documents") + return st, mustDefaultDomainUUID(t, st), filename +} + +func makeSnapshotPage(t *testing.T, st *store.Store, domain, path string) string { + t.Helper() + object, err := st.CreatePageAtPathInDomain(domain, path) + if err != nil { + t.Fatal(err) + } + return object +} + +func requirePathSnapshot(t *testing.T, st *store.Store, domain, root string, recursive bool) *store.PathMutationSnapshot { + t.Helper() + snapshot, err := st.SnapshotPathsInDomain(domain, root, recursive) + if err != nil { + t.Fatal(err) + } + return snapshot +} + +func runCheckedMutation(st *store.Store, domain, action string, snapshot *store.PathMutationSnapshot) (int, error) { + switch action { + case "rename": + return st.RenamePathsInDomainChecked(domain, snapshot.Root(), "/target", true, snapshot) + case "copy": + return st.CopyPathsInDomainChecked(domain, snapshot.Root(), "/target", true, snapshot) + default: + return st.RemovePathsInDomainChecked(domain, []*store.PathMutationSnapshot{snapshot}) + } +} + +func TestPathMutationPrefixesAreLiteralCaseSensitiveAndNormalized(t *testing.T) { + for _, action := range []string{"rename", "copy", "remove"} { + t.Run(action, func(t *testing.T) { + st, domain, _ := pathSnapshotFixture(t) + root := `/Case%_\` + expected := []string{root, root + "/child", root + "/child/deeper"} + outside := []string{`/case%_\/child`, `/CaseXY\/child`, `/Case%_\-neighbor/child`, `/Case%_\0/child`, "/elsewhere"} + bindings := map[string]string{} + for _, path := range append(append([]string{}, expected...), outside...) { + bindings[path] = makeSnapshotPage(t, st, domain, path) + } + snapshot := requirePathSnapshot(t, st, domain, " "+root+"/// ", true) + if !reflect.DeepEqual(snapshot.Paths(), expected) { + t.Fatalf("snapshot = %#v, want %#v", snapshot.Paths(), expected) + } + // The caller cannot mutate the store-issued snapshot through Paths(). + paths := snapshot.Paths() + paths[0] = "/elsewhere" + count, err := runCheckedMutation(st, domain, action, snapshot) + if err != nil || count != len(expected) { + t.Fatalf("%s = %d, %v", action, count, err) + } + for _, path := range outside { + if object, err := st.ResolvePathInDomain(domain, path); err != nil || object != bindings[path] { + t.Fatalf("unrelated %q changed: %q, %v", path, object, err) + } + } + for _, path := range expected { + if action != "copy" && st.PathExistsInDomain(domain, path) { + t.Fatalf("source still present: %s", path) + } + if action != "remove" { + destination := "/target" + path[len(root):] + object, err := st.ResolvePathInDomain(domain, destination) + if err != nil || (action == "rename" && object != bindings[path]) || (action == "copy" && object == bindings[path]) { + t.Fatalf("destination %q = %q, %v", destination, object, err) + } + } + } + }) + } +} + +func TestCheckedPathMutationRejectsConcurrentNamespaceChange(t *testing.T) { + for _, action := range []string{"rename", "copy", "remove"} { + for _, change := range []string{"added", "removed", "rebound"} { + t.Run(action+"/"+change, func(t *testing.T) { + st, domain, filename := pathSnapshotFixture(t) + makeSnapshotPage(t, st, domain, "/source/checked") + snapshot := requirePathSnapshot(t, st, domain, "/source", true) + // A second connection represents a different request committing + // after enumeration/authorization but before the mutation begins. + other, err := db.Open(filename) + if err != nil { + t.Fatal(err) + } + defer other.Close() + writer := store.New(other) + done := make(chan error, 1) + go func() { + switch change { + case "added": + _, err := writer.CreatePageAtPathInDomain(domain, "/source/unchecked") + done <- err + case "removed": + done <- writer.RemovePathInDomain(domain, "/source/checked") + case "rebound": + object, err := writer.CreateObject("page") + if err == nil { + err = writer.BindPathInDomain(domain, "/source/checked", object) + } + done <- err + } + }() + if err := <-done; err != nil { + t.Fatal(err) + } + before := pathMutationState(t, st) + count, err := runCheckedMutation(st, domain, action, snapshot) + if !errors.Is(err, store.ErrPathSnapshotChanged) || count != 0 { + t.Fatalf("stale snapshot accepted: %d, %v", count, err) + } + if after := pathMutationState(t, st); !reflect.DeepEqual(before, after) { + t.Fatalf("rejected %s changed state: before %#v, after %#v", action, before, after) + } + }) + } + } +} + +func pathMutationState(t *testing.T, st *store.Store) []string { + t.Helper() + rows, err := st.DB.Query(`SELECT 'path:'||domain_uuid||':'||path||':'||object_uuid FROM paths + UNION ALL SELECT 'object:'||uuid FROM objects + UNION ALL SELECT 'revision:'||uuid||':'||object_uuid FROM revisions ORDER BY 1`) + if err != nil { + t.Fatal(err) + } + defer rows.Close() + var state []string + for rows.Next() { + var item string + if err := rows.Scan(&item); err != nil { + t.Fatal(err) + } + state = append(state, item) + } + if err := rows.Err(); err != nil { + t.Fatal(err) + } + return state +} + +func TestCheckedPathMutationsRollbackAfterPartialWrites(t *testing.T) { + for _, action := range []string{"rename", "copy", "remove"} { + t.Run(action, func(t *testing.T) { + st, domain, _ := pathSnapshotFixture(t) + for _, path := range []string{"/source/one.txt", "/source/two.txt"} { + object := makeSnapshotPage(t, st, domain, path) + if _, err := st.SaveRevision(object, "test", "initial"); err != nil { + t.Fatal(err) + } + } + snapshot := requirePathSnapshot(t, st, domain, "/source", true) + before := pathMutationState(t, st) + if _, err := st.DB.Exec(`CREATE TABLE path_test_writes(value INTEGER)`); err != nil { + t.Fatal(err) + } + verb := "INSERT" + if action == "remove" { + verb = "DELETE" + } + // Abort the second write, proving the first write and cloned Object/ + // Revision rows are not leaked by a failed multi-Path operation. + trigger := fmt.Sprintf(`CREATE TRIGGER fail_path_write BEFORE %s ON paths BEGIN + INSERT INTO path_test_writes(value) VALUES(1); + SELECT CASE WHEN (SELECT COUNT(*) FROM path_test_writes)=2 THEN RAISE(ABORT,'injected failure') END; + END`, verb) + if _, err := st.DB.Exec(trigger); err != nil { + t.Fatal(err) + } + if _, err := runCheckedMutation(st, domain, action, snapshot); err == nil { + t.Fatal("injected write failure was ignored") + } + if after := pathMutationState(t, st); !reflect.DeepEqual(before, after) { + t.Fatalf("rollback failed: before %#v, after %#v", before, after) + } + var writes int + if err := st.DB.QueryRow(`SELECT COUNT(*) FROM path_test_writes`).Scan(&writes); err != nil || writes != 0 { + t.Fatalf("trigger side effects survived rollback: %d, %v", writes, err) + } + }) + } +} + +func TestCheckedPathSnapshotsCannotChangeScope(t *testing.T) { + st, domain, _ := pathSnapshotFixture(t) + makeSnapshotPage(t, st, domain, "/source") + makeSnapshotPage(t, st, domain, "/source/child") + snapshot := requirePathSnapshot(t, st, domain, "/source", false) + for _, action := range []string{"rename", "copy"} { + if _, err := runCheckedMutation(st, domain, action, snapshot); !errors.Is(err, store.ErrPathSnapshotChanged) { + t.Fatalf("non-recursive snapshot expanded by %s: %v", action, err) + } + } + for _, snapshot := range []*store.PathMutationSnapshot{nil, {}} { + if _, err := st.RenamePathsInDomainChecked(domain, "/source", "/target", false, snapshot); !errors.Is(err, store.ErrPathSnapshotChanged) { + t.Fatalf("missing or forged snapshot accepted: %v", err) + } + } + child := requirePathSnapshot(t, st, domain, "/source/child", false) + parent := requirePathSnapshot(t, st, domain, "/source", true) + count, err := st.RemovePathsInDomainChecked(domain, []*store.PathMutationSnapshot{child, parent}) + if err != nil || count != 2 { + t.Fatalf("overlapping selection = %d, %v", count, err) + } +} + +func TestPathMutationSnapshotBound(t *testing.T) { + st, domain, _ := pathSnapshotFixture(t) + object := makeSnapshotPage(t, st, domain, "/root") + if _, err := st.DB.Exec(`WITH RECURSIVE numbers(n) AS (SELECT 1 UNION ALL SELECT n+1 FROM numbers WHERE n 3500 || strings.ContainsAny(prefix, "\\?#%") || strings.IndexFunc(prefix+keyword, unicode.IsControl) >= 0 { + return "", ErrPeriodicalInvalid + } + for _, reserved := range []string{"/_", "/-", "/v", "/e", "/:"} { + if prefix == reserved || strings.HasPrefix(prefix, reserved+"/") { + return "", ErrPeriodicalInvalid + } + } + d, err := time.Parse("2006-01-02", date) + if err != nil || d.Year() < 1 || d.Year() > 9999 || d.Format("2006-01-02") != date || len(keyword) > 240 || keyword != strings.TrimSpace(keyword) || keyword == "." || keyword == ".." || strings.ContainsAny(keyword, "/\\?#%") { + return "", ErrPeriodicalInvalid + } + return path.Join(prefix, d.Format("2006/01/02"), keyword), nil +} + +func (s *Store) PeriodicalPrefix(ctx context.Context, domain, kind string) (string, error) { + if !PeriodicalKind(kind) { + return "", ErrPeriodicalInvalid + } + var prefix string + err := s.DB.QueryRowContext(ctx, `SELECT prefix FROM periodical_prefixes WHERE domain_uuid=? AND kind=?`, domain, kind).Scan(&prefix) + if errors.Is(err, sql.ErrNoRows) { + return "/" + kind, nil + } + return prefix, err +} + +func (s *Store) ChangePeriodical(ctx context.Context, domain, actor, kind string, enabled *bool, entry *PeriodicalEntry, prefixes ...string) error { + return s.changePeriodical(ctx, domain, actor, kind, enabled, entry, prefixes, nil) +} + +type PeriodicalPost struct { + Title string `json:"title"` + Date string `json:"date"` + Category string `json:"category"` + Keyword string `json:"keyword"` + Body string `json:"body"` + RequestID string `json:"request_id"` + Timezone string `json:"-"` + Path string `json:"-"` + PageUUID string `json:"-"` +} + +// Body is canonical HTML produced by the server. The Page, Revision, binding, +// article metadata and retry receipt become visible in one transaction. +func (s *Store) CreatePeriodical(ctx context.Context, domain, actor, kind string, post *PeriodicalPost) error { + if post == nil || len(post.Body) > 256<<10 || strings.TrimSpace(post.Body) == "" { + return ErrPeriodicalInvalid + } + if _, err := uuid.Parse(post.RequestID); err != nil { + return ErrPeriodicalInvalid + } + if strings.TrimSpace(post.Title) == "" || len(post.Title) > 240 || len(post.Category) > 80 || strings.ContainsAny(post.Title+post.Category, "\x00\r\n") { + return ErrPeriodicalInvalid + } + if _, err := time.LoadLocation(post.Timezone); err != nil { + return ErrPeriodicalInvalid + } + s.revisionWriteMu.Lock() + defer s.revisionWriteMu.Unlock() + entry := &PeriodicalEntry{Title: post.Title, Date: post.Date, Category: post.Category, Timezone: post.Timezone} + return s.changePeriodical(ctx, domain, actor, kind, nil, entry, nil, post) +} + +func (s *Store) changePeriodical(ctx context.Context, domain, actor, kind string, enabled *bool, entry *PeriodicalEntry, prefixes []string, post *PeriodicalPost) error { + if !PeriodicalKind(kind) || (enabled == nil) == (entry == nil) { + return ErrPeriodicalInvalid + } + if len(prefixes) > 1 || (len(prefixes) > 0 && enabled == nil) { + return ErrPeriodicalInvalid + } + if len(prefixes) == 1 { + if _, err := PeriodicalPath(prefixes[0], "2000-01-01", ""); err != nil { + return err + } + } + ctx, cancel := context.WithTimeout(ctx, 3*time.Second) + defer cancel() + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return err + } + defer tx.Rollback() + // Reserve writer before all authorization, configuration and binding checks. + if _, err = tx.ExecContext(ctx, `INSERT INTO periodical_settings(domain_uuid,kind) VALUES(?,?) ON CONFLICT(domain_uuid,kind) DO UPDATE SET enabled=enabled`, domain, kind); err != nil { + return err + } + var active, admin bool + err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM principals p JOIN domain_memberships m ON m.principal_uuid=p.uuid JOIN domains d ON d.uuid=m.domain_uuid AND d.enabled=1 WHERE p.uuid=? AND p.state='active' AND m.domain_uuid=? AND m.state='active')`, actor, domain).Scan(&active) + if err != nil { + return err + } + if !active { + return ErrAccessDenied + } + err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM groups g JOIN group_members gm ON gm.group_uuid=g.uuid JOIN domain_memberships m ON m.uuid=gm.membership_uuid AND m.domain_uuid=g.domain_uuid WHERE g.domain_uuid=? AND g.builtin_key='domain_admin' AND g.state='active' AND gm.member_role IN ('owner','manager') AND m.principal_uuid=? AND m.state='active')`, domain, actor).Scan(&admin) + if err != nil { + return err + } + operation, pageUUID, version := "settings", "", int64(0) + if enabled != nil { + var controlled bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM domain_entry_settings WHERE domain_uuid=?)`, domain).Scan(&controlled); err != nil { + return err + } + if controlled { + return ErrAccessDenied + } + if !admin { + return ErrAccessDenied + } + if _, err = tx.ExecContext(ctx, `UPDATE periodical_settings SET enabled=? WHERE domain_uuid=? AND kind=?`, *enabled, domain, kind); err != nil { + return err + } + if len(prefixes) == 1 { + if _, err = tx.ExecContext(ctx, `INSERT INTO periodical_prefixes(domain_uuid,kind,prefix) VALUES(?,?,?) ON CONFLICT(domain_uuid,kind) DO UPDATE SET prefix=excluded.prefix`, domain, kind, prefixes[0]); err != nil { + return err + } + } + } else { + var projected bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM periodical_projections WHERE domain_uuid=? AND kind=?)`, domain, kind).Scan(&projected); err != nil { + return err + } + if projected { + return ErrAccessDenied + } + var on bool + if err = tx.QueryRowContext(ctx, `SELECT enabled FROM periodical_settings WHERE domain_uuid=? AND kind=?`, domain, kind).Scan(&on); err != nil { + return err + } + if !on { + return ErrPeriodicalDisabled + } + e := entry + if post != nil { + var local bool + if err = tx.QueryRowContext(ctx, `SELECT COALESCE(placement,'local')='local' FROM domains WHERE uuid=? AND enabled=1`, domain).Scan(&local); err != nil { + return err + } + if !local { + return ErrAccessDenied + } + prefix := "/" + kind + err = tx.QueryRowContext(ctx, `SELECT prefix FROM periodical_prefixes WHERE domain_uuid=? AND kind=?`, domain, kind).Scan(&prefix) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return err + } + e.Path, err = PeriodicalPath(prefix, e.Date, post.Keyword) + if err != nil { + return err + } + post.Path = e.Path + } + if !strings.HasPrefix(e.Path, "/") || path.Clean(e.Path) != e.Path || len(e.Path) > 4096 || strings.ContainsAny(e.Path, "\\\x00\r\n") || e.Version < 0 { + return ErrPeriodicalInvalid + } + if post == nil { + if err = tx.QueryRowContext(ctx, `SELECT p.object_uuid FROM paths p JOIN objects o ON o.uuid=p.object_uuid AND o.kind='page' WHERE p.domain_uuid=? AND p.path=?`, domain, e.Path).Scan(&pageUUID); err != nil { + return err + } + if (e.Version > 0 && e.PageUUID != pageUUID) || (e.PageUUID != "" && e.PageUUID != pageUUID) { + return ErrPeriodicalConflict + } + } + capabilities := []string{"write"} + if post != nil { + capabilities = append(capabilities, "create") + } + for _, capability := range capabilities { + basis := authorizeGrantFrom(tx, AuthorizationRequest{DomainUUID: domain, PrincipalUUID: actor, Capability: capability, TargetType: "path", TargetID: e.Path}, false) + if basis != nil && !errors.Is(basis, ErrAccessDenied) { + return basis + } + // Match the existing semantic editor's own-user Wiki authority; the + // authenticated identity and Locality caps still come from this tx. + if errors.Is(basis, ErrAccessDenied) { + var own bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM principal_identities WHERE principal_uuid=? AND provider_type='password' AND (?='/u/'||subject OR substr(?,1,length('/u/'||subject||'/'))='/u/'||subject||'/'))`, actor, e.Path, e.Path).Scan(&own); err != nil { + return err + } + if own { + basis = nil + } + } + caps, err := loadLocalityAccess(tx, domain, actor) + if err != nil { + return err + } + if !caps.decide(e.Path, capability, basis == nil) { + return ErrAccessDenied + } + } + if post != nil { + encoded, _ := json.Marshal([]string{post.Path, post.Title, post.Date, post.Category, post.Keyword, post.Body}) + digest := revisionHash(string(encoded)) + var oldDigest, oldPage string + err = tx.QueryRowContext(ctx, `SELECT digest,page_uuid FROM periodical_posts WHERE domain_uuid=? AND kind=? AND actor_uuid=? AND request_id=?`, domain, kind, actor, post.RequestID).Scan(&oldDigest, &oldPage) + if err == nil { + var live bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM paths p JOIN periodical_entries e ON e.domain_uuid=p.domain_uuid AND e.page_uuid=p.object_uuid AND e.kind=? WHERE p.domain_uuid=? AND p.path=? AND p.object_uuid=?)`, kind, domain, e.Path, oldPage).Scan(&live); err != nil { + return err + } + if digest != oldDigest || !live { + return ErrPeriodicalConflict + } + post.PageUUID = oldPage + return tx.Commit() + } + if !errors.Is(err, sql.ErrNoRows) { + return err + } + var exists bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM paths WHERE domain_uuid=? AND path=?)`, domain, e.Path).Scan(&exists); err != nil { + return err + } + if exists { + return ErrPeriodicalConflict + } + pageUUID = uuid.NewString() + if _, err = tx.ExecContext(ctx, `INSERT INTO objects(uuid,kind,created_at) VALUES(?,'page',strftime('%s','now'))`, pageUUID); err != nil { + return err + } + if _, err = tx.ExecContext(ctx, `INSERT INTO object_origins(object_uuid,domain_uuid,created_at) VALUES(?,?,strftime('%s','now'))`, pageUUID, domain); err != nil { + return err + } + if _, err = tx.ExecContext(ctx, `INSERT INTO paths(domain_uuid,path,object_uuid,created_at) VALUES(?,?,?,strftime('%s','now'))`, domain, e.Path, pageUUID); err != nil { + return err + } + body, hashes, err := freezeEmbeddedAssetsFrom(tx, pageUUID, []byte(post.Body), "text/html; charset=utf-8") + if err != nil { + return err + } + now := time.Now() + rev := &Revision{UUID: uuid.NewString(), ObjectUUID: pageUUID, Body: string(body), DocumentHash: revisionHash(string(body)), Language: "und", ContentType: "text/html; charset=utf-8", CreatedAt: now.Unix(), CreatedAtMS: now.UnixMilli()} + if err = s.persistDocument(rev.DocumentHash, rev.Body); err != nil { + return err + } + if err = insertRevision(tx, rev, hashes); err != nil { + return err + } + if _, err = tx.ExecContext(ctx, `INSERT INTO periodical_posts(domain_uuid,kind,actor_uuid,request_id,digest,page_uuid) VALUES(?,?,?,?,?,?)`, domain, kind, actor, post.RequestID, digest, pageUUID); err != nil { + return err + } + post.PageUUID = pageUUID + } + var oldVersion int64 + var owner, oldTimezone string + err = tx.QueryRowContext(ctx, `SELECT version,owner_uuid,timezone FROM periodical_entries WHERE domain_uuid=? AND kind=? AND page_uuid=?`, domain, kind, pageUUID).Scan(&oldVersion, &owner, &oldTimezone) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return err + } + if oldVersion != e.Version || (e.Remove && oldVersion == 0) { + return ErrPeriodicalConflict + } + version = oldVersion + 1 + if oldVersion == 0 { + if err = tx.QueryRowContext(ctx, `SELECT COALESCE(MAX(version),0)+1 FROM periodical_events WHERE domain_uuid=? AND kind=? AND page_uuid=?`, domain, kind, pageUUID).Scan(&version); err != nil { + return err + } + } + if e.Remove { + operation = "removed" + _, err = tx.ExecContext(ctx, `DELETE FROM periodical_entries WHERE domain_uuid=? AND kind=? AND page_uuid=?`, domain, kind, pageUUID) + } else { + operation = "registered" + if oldVersion > 0 { + e.Timezone = oldTimezone + } + e.Title = strings.TrimSpace(e.Title) + e.Category = strings.TrimSpace(e.Category) + date, parseErr := time.Parse("2006-01-02", e.Date) + if parseErr != nil || date.Format("2006-01-02") != e.Date || date.Year() < 1 || date.Year() > 9999 || len(e.Title) == 0 || len(e.Title) > 240 || len(e.Category) > 80 || strings.ContainsAny(e.Title+e.Category, "\x00\r\n") { + return ErrPeriodicalInvalid + } + if _, err = time.LoadLocation(e.Timezone); err != nil { + return ErrPeriodicalInvalid + } + if owner == "" { + owner = actor + } + _, err = tx.ExecContext(ctx, `INSERT INTO periodical_entries(domain_uuid,kind,page_uuid,owner_uuid,local_date,title,category,timezone,version) VALUES(?,?,?,?,?,?,?,?,?) ON CONFLICT(domain_uuid,kind,page_uuid) DO UPDATE SET local_date=excluded.local_date,title=excluded.title,category=excluded.category,timezone=excluded.timezone,version=excluded.version`, domain, kind, pageUUID, owner, e.Date, e.Title, e.Category, e.Timezone, version) + } + if err != nil { + return err + } + } + if _, err = tx.ExecContext(ctx, `INSERT INTO periodical_events(domain_uuid,kind,page_uuid,actor_uuid,operation,version,created_at_ms) VALUES(?,?,?,?,?,?,?)`, domain, kind, pageUUID, actor, operation, version, time.Now().UnixMilli()); err != nil { + return err + } + return tx.Commit() +} + +// Bounded metadata-only scan; callers filter permissions before counts/paging. +// All aliases are retained until filtering, so a private alias cannot hide an +// otherwise readable Page. No canonical HTML is loaded to build an index. +func (s *Store) ListPeriodicalEntries(ctx context.Context, domain, kind string) ([]PeriodicalEntry, error) { + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + rows, err := s.DB.QueryContext(ctx, `SELECT e.page_uuid,p.path,e.title,e.local_date,e.category,e.timezone,e.owner_uuid,e.version FROM periodical_entries e JOIN paths p ON p.object_uuid=e.page_uuid AND p.domain_uuid=e.domain_uuid JOIN objects o ON o.uuid=e.page_uuid AND o.kind='page' WHERE e.domain_uuid=? AND e.kind=? ORDER BY e.local_date DESC,e.page_uuid,p.path LIMIT 5001`, domain, kind) + if err != nil { + return nil, err + } + defer rows.Close() + out := []PeriodicalEntry{} + bytes := 0 + for rows.Next() { + var e PeriodicalEntry + if err = rows.Scan(&e.PageUUID, &e.Path, &e.Title, &e.Date, &e.Category, &e.Timezone, &e.Owner, &e.Version); err != nil { + return nil, err + } + out = append(out, e) + bytes += len(e.Path) + len(e.Title) + len(e.Category) + len(e.Timezone) + len(e.Owner) + len(e.PageUUID) + len(e.Date) + if len(out) > 5000 || bytes > 4<<20 { + return nil, ErrNavigationBudget + } + } + return out, rows.Err() +} diff --git a/internal/store/preview_candidates.go b/internal/store/preview_candidates.go new file mode 100644 index 0000000..d19d648 --- /dev/null +++ b/internal/store/preview_candidates.go @@ -0,0 +1,54 @@ +package store + +func (s *Store) ListPreviewCandidatesInDomain( + domainUUID string, +) ([]BrowserEntry, error) { + rows, err := s.DB.Query(` + WITH latest AS ( + SELECT + r.uuid, + r.object_uuid, + COALESCE(r.document_hash, ''), + COALESCE(NULLIF(r.content_type, ''), 'application/octet-stream'), + COALESCE(r.filename, ''), + ROW_NUMBER() OVER ( + PARTITION BY r.object_uuid + ORDER BY COALESCE(r.created_at_ms, r.created_at * 1000) DESC, r.rowid DESC + ) AS rn + FROM revisions r + ) + SELECT + p.path, + p.object_uuid, + latest.uuid, + latest.document_hash, + latest.content_type, + latest.filename + FROM paths p + JOIN latest + ON latest.object_uuid = p.object_uuid + AND latest.rn = 1 + WHERE p.domain_uuid = ? + ORDER BY p.path + `, domainUUID) + if err != nil { + return nil, err + } + defer rows.Close() + var entries []BrowserEntry + for rows.Next() { + var entry BrowserEntry + if err := rows.Scan( + &entry.Path, + &entry.ObjectUUID, + &entry.RevisionUUID, + &entry.DocumentHash, + &entry.ContentType, + &entry.Filename, + ); err != nil { + return nil, err + } + entries = append(entries, entry) + } + return entries, rows.Err() +} diff --git a/internal/store/projection_metadata.go b/internal/store/projection_metadata.go new file mode 100644 index 0000000..546a9b2 --- /dev/null +++ b/internal/store/projection_metadata.go @@ -0,0 +1,95 @@ +package store + +import ( + "encoding/json" + "errors" + "strings" + "time" +) + +const ( + MaxProjectionMetadataBytes = 1 << 20 + maxProjectionCacheBytes = 64 << 20 + maxProjectionCacheRecords = 2048 +) + +// ProjectionMetadata is non-authoritative, immutable-Document-derived data. +// Authorization must always resolve a live Object/Revision before cache access. +// Paths, credentials, and per-user visibility must never be stored in Payload. +type ProjectionMetadata struct { + DocumentHash string + Kind string + Version int + Payload json.RawMessage + Error string + UpdatedAtMS int64 + RetryAtMS int64 +} + +func (s *Store) EnsureProjectionMetadataSchema() error { + for _, statement := range []string{ + `CREATE TABLE IF NOT EXISTS projection_metadata ( + document_hash TEXT NOT NULL,kind TEXT NOT NULL,version INTEGER NOT NULL, + payload TEXT NOT NULL DEFAULT '{}',error TEXT NOT NULL DEFAULT '', + updated_at_ms INTEGER NOT NULL,retry_at_ms INTEGER NOT NULL DEFAULT 0, + PRIMARY KEY(document_hash,kind,version))`, + `CREATE INDEX IF NOT EXISTS projection_metadata_eviction ON projection_metadata(updated_at_ms DESC)`, + `CREATE INDEX IF NOT EXISTS idx_event_jobs_identity_status ON event_jobs(event_type,event_key,status)`, + } { + if _, err := s.DB.Exec(statement); err != nil { + return err + } + } + return nil +} + +func (s *Store) GetProjectionMetadata(hash, kind string, version int) (*ProjectionMetadata, error) { + if !validDocumentHash(hash) || version < 1 || (kind != "pdf" && kind != "archive") { + return nil, errors.New("invalid projection metadata key") + } + entry := &ProjectionMetadata{DocumentHash: hash, Kind: kind, Version: version} + var payload string + err := s.DB.QueryRow(`SELECT payload,error,updated_at_ms,retry_at_ms FROM projection_metadata + WHERE document_hash=? AND kind=? AND version=?`, hash, kind, version). + Scan(&payload, &entry.Error, &entry.UpdatedAtMS, &entry.RetryAtMS) + entry.Payload = json.RawMessage(payload) + return entry, err +} + +func (s *Store) SaveProjectionMetadata(entry ProjectionMetadata) error { + if !validDocumentHash(entry.DocumentHash) || entry.Version < 1 || + (entry.Kind != "pdf" && entry.Kind != "archive") || + len(entry.Payload) > MaxProjectionMetadataBytes || !json.Valid(entry.Payload) { + return errors.New("invalid or oversized projection metadata") + } + if len(entry.Error) > 1024 { + entry.Error = strings.ToValidUTF8(entry.Error[:1024], "") + } + if entry.UpdatedAtMS == 0 { + entry.UpdatedAtMS = time.Now().UnixMilli() + } + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + if _, err = tx.Exec(`INSERT INTO projection_metadata + (document_hash,kind,version,payload,error,updated_at_ms,retry_at_ms) + VALUES(?,?,?,?,?,?,?) ON CONFLICT(document_hash,kind,version) DO UPDATE SET + payload=excluded.payload,error=excluded.error,updated_at_ms=excluded.updated_at_ms,retry_at_ms=excluded.retry_at_ms`, + entry.DocumentHash, entry.Kind, entry.Version, string(entry.Payload), entry.Error, entry.UpdatedAtMS, entry.RetryAtMS); err != nil { + return err + } + // Bound both artifact size and aggregate storage. Eviction happens only on + // background writes, not on foreground cache reads. Cache loss is recoverable. + if _, err = tx.Exec(`DELETE FROM projection_metadata WHERE (document_hash,kind,version) IN ( + SELECT document_hash,kind,version FROM ( + SELECT document_hash,kind,version, + ROW_NUMBER() OVER(ORDER BY updated_at_ms DESC,document_hash,kind,version) AS rank, + SUM(length(CAST(payload AS BLOB))+length(CAST(error AS BLOB))+128) + OVER(ORDER BY updated_at_ms DESC,document_hash,kind,version) AS total_bytes + FROM projection_metadata) WHERE rank>? OR total_bytes>?)`, maxProjectionCacheRecords, maxProjectionCacheBytes); err != nil { + return err + } + return tx.Commit() +} diff --git a/internal/store/projection_metadata_test.go b/internal/store/projection_metadata_test.go new file mode 100644 index 0000000..5da6a49 --- /dev/null +++ b/internal/store/projection_metadata_test.go @@ -0,0 +1,72 @@ +package store + +import ( + "database/sql" + "encoding/json" + "fmt" + "strings" + "testing" +) + +func TestProjectionMetadataCacheValidationAndEviction(t *testing.T) { + database, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + st := &Store{DB: database} + if err := st.EnsureEventJobsSchema(); err != nil { + t.Fatal(err) + } + if err := st.EnsureProjectionMetadataSchema(); err != nil { + t.Fatal(err) + } + entry := ProjectionMetadata{DocumentHash: strings.Repeat("a", 64), Kind: "pdf", Version: 1, Payload: json.RawMessage(`{"status":"ready","pdf_pages":3}`), UpdatedAtMS: 10000} + for _, change := range []func(*ProjectionMetadata){ + func(e *ProjectionMetadata) { e.DocumentHash = "../../unsafe" }, + func(e *ProjectionMetadata) { e.Version = 0 }, + func(e *ProjectionMetadata) { e.Kind = "arbitrary" }, + func(e *ProjectionMetadata) { e.Payload = json.RawMessage(`{`) }, + func(e *ProjectionMetadata) { + e.Payload = json.RawMessage(`"` + strings.Repeat("x", MaxProjectionMetadataBytes) + `"`) + }, + } { + bad := entry + change(&bad) + if err := st.SaveProjectionMetadata(bad); err == nil { + t.Fatal("invalid cache entry accepted") + } + } + if err := st.SaveProjectionMetadata(entry); err != nil { + t.Fatal(err) + } + if _, err := st.GetProjectionMetadata(entry.DocumentHash, "pdf", 2); err != sql.ErrNoRows { + t.Fatalf("cache reused a different parser version: %v", err) + } + // Seed a legacy oversized cache without paying a prune on each insertion. + tx, err := database.Begin() + if err != nil { + t.Fatal(err) + } + for index := range maxProjectionCacheRecords + 10 { + if _, err := tx.Exec(`INSERT INTO projection_metadata(document_hash,kind,version,payload,updated_at_ms) + VALUES(?,'archive',1,'{}',?)`, fmt.Sprintf("%064x", index), index); err != nil { + _ = tx.Rollback() + t.Fatal(err) + } + } + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + if err := st.SaveProjectionMetadata(entry); err != nil { + t.Fatal(err) + } + var count int + if err := database.QueryRow(`SELECT COUNT(*) FROM projection_metadata`).Scan(&count); err != nil || count != maxProjectionCacheRecords { + t.Fatalf("cache record cap: %d %v", count, err) + } + got, err := st.GetProjectionMetadata(entry.DocumentHash, "pdf", 1) + if err != nil || string(got.Payload) != string(entry.Payload) { + t.Fatalf("new cache result was evicted: %+v %v", got, err) + } +} diff --git a/internal/store/public_periodicals.go b/internal/store/public_periodicals.go new file mode 100644 index 0000000..353c86c --- /dev/null +++ b/internal/store/public_periodicals.go @@ -0,0 +1,44 @@ +package store + +import ( + "context" + "strings" + "time" +) + +// A registered title is public presentation metadata iff its Page has a live +// publication grant. Other registration fields are deliberately not selected. +func (s *Store) PublicPeriodicalTitles(ctx context.Context, domain, kind string, pages []PublishedNavigationPage) (map[string]string, error) { + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + titles := map[string]string{} + paths := map[string][]string{} + args := []any{domain, kind} + for _, p := range pages { + if _, exists := paths[p.Revision.ObjectUUID]; !exists { + args = append(args, p.Revision.ObjectUUID) + } + paths[p.Revision.ObjectUUID] = append(paths[p.Revision.ObjectUUID], p.Path) + } + if len(paths) == 0 { + return titles, nil + } + rows, err := s.DB.QueryContext(ctx, `SELECT page_uuid,title FROM periodical_entries WHERE domain_uuid=? AND kind=? AND page_uuid IN (`+strings.TrimSuffix(strings.Repeat("?,", len(paths)), ",")+`)`, args...) + if err != nil { + return nil, err + } + defer rows.Close() + for rows.Next() { + var object, title string + if err := rows.Scan(&object, &title); err != nil { + return nil, err + } + for _, path := range paths[object] { + titles[path] = title + } + if len(titles) > MaxNavigationEntries { + return nil, ErrNavigationBudget + } + } + return titles, rows.Err() +} diff --git a/internal/store/publication_approval.go b/internal/store/publication_approval.go new file mode 100644 index 0000000..d699a61 --- /dev/null +++ b/internal/store/publication_approval.go @@ -0,0 +1,190 @@ +package store + +import ( + "context" + "crypto/sha256" + "database/sql" + "encoding/hex" + "encoding/json" + "errors" + "strings" + "time" + + "github.com/google/uuid" +) + +var ErrApprovalTransition = errors.New("invalid approval request transition") + +type ApprovalRequest struct { + UUID string `json:"uuid"` + DomainUUID string `json:"domain_uuid"` + ScopeKind string `json:"scope_kind"` + ScopeUUID string `json:"scope_uuid"` + SubjectHash string `json:"subject_hash"` + SubjectJSON string `json:"subject_json,omitempty"` + PolicyVersion int64 `json:"policy_version"` + RequesterUUID string `json:"requester_uuid"` + State string `json:"state"` + Generation int64 `json:"generation"` + IdempotencyKey string `json:"idempotency_key"` + ExpiresAtMS int64 `json:"expires_at_ms"` + CreatedAtMS int64 `json:"created_at_ms"` + UpdatedAtMS int64 `json:"updated_at_ms"` +} + +type ApprovalDecision struct { + UUID string `json:"uuid"` + RequestUUID string `json:"request_uuid"` + ReviewerUUID string `json:"reviewer_uuid"` + Generation int64 `json:"generation"` + Decision string `json:"decision"` + Justification string `json:"justification,omitempty"` + CreatedAtMS int64 `json:"created_at_ms"` +} + +func (s *Store) EnsurePublicationApprovalSchema() error { + for _, statement := range []string{ + `CREATE TABLE IF NOT EXISTS publication_requests (uuid TEXT PRIMARY KEY, domain_uuid TEXT NOT NULL, scope_kind TEXT NOT NULL, scope_uuid TEXT NOT NULL, subject_hash TEXT NOT NULL, subject_json TEXT NOT NULL, policy_version INTEGER NOT NULL, requester_uuid TEXT NOT NULL, state TEXT NOT NULL CHECK(state IN ('pending','approved','rejected','withdrawn','expired','superseded')), generation INTEGER NOT NULL, idempotency_key TEXT NOT NULL, expires_at_ms INTEGER NOT NULL DEFAULT 0, created_at_ms INTEGER NOT NULL, updated_at_ms INTEGER NOT NULL, UNIQUE(domain_uuid,idempotency_key))`, + `CREATE INDEX IF NOT EXISTS idx_publication_requests_state ON publication_requests(domain_uuid,state,updated_at_ms DESC,uuid DESC)`, + `CREATE TABLE IF NOT EXISTS publication_decisions (uuid TEXT PRIMARY KEY, request_uuid TEXT NOT NULL REFERENCES publication_requests(uuid), reviewer_uuid TEXT NOT NULL, generation INTEGER NOT NULL, decision TEXT NOT NULL CHECK(decision IN ('approved','rejected','changes_requested')), justification TEXT NOT NULL DEFAULT '', created_at_ms INTEGER NOT NULL, UNIQUE(request_uuid,reviewer_uuid,generation))`, + } { + if _, err := s.DB.Exec(statement); err != nil { + return err + } + } + return nil +} + +func ApprovalSubjectHash(subject any) (string, string, error) { + b, err := json.Marshal(subject) + if err != nil { + return "", "", err + } + h := sha256.Sum256(b) + return hex.EncodeToString(h[:]), string(b), nil +} + +func ApprovalSubjectHashJSON(b []byte) (string, string, error) { + var raw json.RawMessage + if err := json.Unmarshal(b, &raw); err != nil { + return "", "", err + } + h := sha256.Sum256(raw) + return hex.EncodeToString(h[:]), string(raw), nil +} + +const approvalRequestColumns = `uuid,domain_uuid,scope_kind,scope_uuid,subject_hash,subject_json,policy_version,requester_uuid,state,generation,idempotency_key,expires_at_ms,created_at_ms,updated_at_ms` + +func scanApprovalRequest(scanner interface{ Scan(...any) error }, item *ApprovalRequest) error { + return scanner.Scan(&item.UUID, &item.DomainUUID, &item.ScopeKind, &item.ScopeUUID, &item.SubjectHash, &item.SubjectJSON, &item.PolicyVersion, &item.RequesterUUID, &item.State, &item.Generation, &item.IdempotencyKey, &item.ExpiresAtMS, &item.CreatedAtMS, &item.UpdatedAtMS) +} + +func (s *Store) CreateApprovalRequestTx(tx *sql.Tx, request ApprovalRequest) (ApprovalRequest, bool, error) { + request.DomainUUID = strings.TrimSpace(request.DomainUUID) + request.ScopeKind = strings.TrimSpace(request.ScopeKind) + request.ScopeUUID = strings.TrimSpace(request.ScopeUUID) + request.RequesterUUID = strings.TrimSpace(request.RequesterUUID) + request.IdempotencyKey = strings.TrimSpace(request.IdempotencyKey) + if request.DomainUUID == "" || request.ScopeKind == "" || request.ScopeUUID == "" || request.RequesterUUID == "" || request.IdempotencyKey == "" || request.SubjectHash == "" { + return ApprovalRequest{}, false, ErrNotificationInput + } + if request.UUID == "" { + request.UUID = uuid.NewString() + } + if request.State == "" { + request.State = "pending" + } + if request.Generation == 0 { + request.Generation = 1 + } + if request.CreatedAtMS == 0 { + request.CreatedAtMS = time.Now().UnixMilli() + } + if request.UpdatedAtMS == 0 { + request.UpdatedAtMS = request.CreatedAtMS + } + var existing ApprovalRequest + err := scanApprovalRequest(tx.QueryRow(`SELECT `+approvalRequestColumns+` FROM publication_requests WHERE domain_uuid=? AND idempotency_key=?`, request.DomainUUID, request.IdempotencyKey), &existing) + if err == nil { + return existing, false, nil + } + if !errors.Is(err, sql.ErrNoRows) { + return ApprovalRequest{}, false, err + } + _, err = tx.Exec(`INSERT INTO publication_requests(`+approvalRequestColumns+`) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)`, request.UUID, request.DomainUUID, request.ScopeKind, request.ScopeUUID, request.SubjectHash, request.SubjectJSON, request.PolicyVersion, request.RequesterUUID, request.State, request.Generation, request.IdempotencyKey, request.ExpiresAtMS, request.CreatedAtMS, request.UpdatedAtMS) + if err != nil { + return ApprovalRequest{}, false, err + } + return request, true, nil +} + +func (s *Store) DecideApprovalRequest(ctx context.Context, requestUUID, reviewerUUID, decision, justification string, generation int64) error { + return s.decideApprovalRequest(ctx, "", requestUUID, reviewerUUID, decision, justification, generation) +} + +func (s *Store) DecideApprovalRequestScoped(ctx context.Context, domainUUID, requestUUID, reviewerUUID, decision, justification string, generation int64) error { + return s.decideApprovalRequest(ctx, domainUUID, requestUUID, reviewerUUID, decision, justification, generation) +} + +func (s *Store) decideApprovalRequest(ctx context.Context, domainUUID, requestUUID, reviewerUUID, decision, justification string, generation int64) error { + if requestUUID == "" || reviewerUUID == "" || generation < 1 || (decision != "approved" && decision != "rejected" && decision != "changes_requested") { + return ErrApprovalTransition + } + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return err + } + defer tx.Rollback() + var state string + var currentGeneration int64 + query := `SELECT state,generation FROM publication_requests WHERE uuid=?` + args := []any{requestUUID} + if strings.TrimSpace(domainUUID) != "" { + query = `SELECT state,generation FROM publication_requests WHERE uuid=? AND domain_uuid=?` + args = append(args, domainUUID) + } + if err := tx.QueryRowContext(ctx, query, args...).Scan(&state, ¤tGeneration); err != nil { + return err + } + if state != "pending" || currentGeneration != generation { + return ErrApprovalTransition + } + now := time.Now().UnixMilli() + if _, err := tx.ExecContext(ctx, `INSERT INTO publication_decisions(uuid,request_uuid,reviewer_uuid,generation,decision,justification,created_at_ms) VALUES(?,?,?,?,?,?,?)`, uuid.NewString(), requestUUID, reviewerUUID, generation, decision, justification, now); err != nil { + return err + } + newState := decision + if decision == "changes_requested" { + newState = "rejected" + } + if _, err := tx.ExecContext(ctx, `UPDATE publication_requests SET state=?,updated_at_ms=? WHERE uuid=? AND state='pending' AND generation=?`, newState, now, requestUUID, generation); err != nil { + return err + } + return tx.Commit() +} + +func (s *Store) GetApprovalRequest(ctx context.Context, domainUUID, requestUUID string) (ApprovalRequest, error) { + var request ApprovalRequest + if strings.TrimSpace(domainUUID) == "" || strings.TrimSpace(requestUUID) == "" { + return request, ErrApprovalTransition + } + err := scanApprovalRequest(s.DB.QueryRowContext(ctx, `SELECT `+approvalRequestColumns+` FROM publication_requests WHERE domain_uuid=? AND uuid=?`, domainUUID, requestUUID), &request) + return request, err +} + +// ExpireApprovalRequests moves only pending requests whose explicit deadline +// has passed. A zero deadline means no automatic expiry. The bounded update +// keeps scheduler cleanup from monopolizing the SQLite writer. +func (s *Store) ExpireApprovalRequests(ctx context.Context, nowMS int64, limit int) (int64, error) { + if nowMS <= 0 { + nowMS = time.Now().UnixMilli() + } + if limit < 1 || limit > 1000 { + limit = 100 + } + result, err := s.DB.ExecContext(ctx, `UPDATE publication_requests SET state='expired',updated_at_ms=? WHERE state='pending' AND expires_at_ms>0 AND expires_at_ms<=? AND uuid IN (SELECT uuid FROM publication_requests WHERE state='pending' AND expires_at_ms>0 AND expires_at_ms<=? ORDER BY expires_at_ms,uuid LIMIT ?)`, nowMS, nowMS, nowMS, limit) + if err != nil { + return 0, err + } + return result.RowsAffected() +} diff --git a/internal/store/publication_approval_test.go b/internal/store/publication_approval_test.go new file mode 100644 index 0000000..63dbcb9 --- /dev/null +++ b/internal/store/publication_approval_test.go @@ -0,0 +1,91 @@ +package store + +import ( + "context" + "database/sql" + "testing" + + _ "modernc.org/sqlite" +) + +func TestApprovalRequestIsIdempotentAndGenerationFenced(t *testing.T) { + db, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + defer db.Close() + s := &Store{DB: db} + if err := s.EnsurePublicationApprovalSchema(); err != nil { + t.Fatal(err) + } + hash, body, err := ApprovalSubjectHash(map[string]any{"path": "/docs/a", "revision": "rev-1"}) + if err != nil { + t.Fatal(err) + } + tx, err := db.Begin() + if err != nil { + t.Fatal(err) + } + first, inserted, err := s.CreateApprovalRequestTx(tx, ApprovalRequest{DomainUUID: "d", ScopeKind: "spot", ScopeUUID: "spot-1", SubjectHash: hash, SubjectJSON: body, RequesterUUID: "u", IdempotencyKey: "idem-1"}) + if err != nil || !inserted { + t.Fatalf("first=%+v inserted=%v err=%v", first, inserted, err) + } + second, inserted, err := s.CreateApprovalRequestTx(tx, ApprovalRequest{DomainUUID: "d", ScopeKind: "spot", ScopeUUID: "spot-1", SubjectHash: hash, SubjectJSON: body, RequesterUUID: "u", IdempotencyKey: "idem-1"}) + if err != nil || inserted || second.UUID != first.UUID { + t.Fatalf("duplicate=%+v inserted=%v err=%v", second, inserted, err) + } + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + if err := s.DecideApprovalRequest(context.Background(), first.UUID, "reviewer", "approved", "ok", 2); err == nil { + t.Fatal("stale generation was accepted") + } + if err := s.DecideApprovalRequest(context.Background(), first.UUID, "reviewer", "approved", "ok", 1); err != nil { + t.Fatal(err) + } + if err := s.DecideApprovalRequest(context.Background(), first.UUID, "reviewer-2", "approved", "replay", 1); err == nil { + t.Fatal("second decision was accepted") + } +} + +func TestApprovalRequestExpiryIsBounded(t *testing.T) { + db, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + defer db.Close() + s := &Store{DB: db} + if err := s.EnsurePublicationApprovalSchema(); err != nil { + t.Fatal(err) + } + hash, body, err := ApprovalSubjectHash(map[string]string{"path": "/docs/a"}) + if err != nil { + t.Fatal(err) + } + for i := 0; i < 2; i++ { + tx, err := db.Begin() + if err != nil { + t.Fatal(err) + } + _, _, err = s.CreateApprovalRequestTx(tx, ApprovalRequest{UUID: "request-expired-" + string(rune('a'+i)), DomainUUID: "d", ScopeKind: "spot", ScopeUUID: "s", SubjectHash: hash, SubjectJSON: body, RequesterUUID: "u", IdempotencyKey: "expired-" + string(rune('a'+i)), ExpiresAtMS: 10}) + if err != nil { + t.Fatal(err) + } + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + } + if _, err := s.ExpireApprovalRequests(context.Background(), 20, 1); err != nil { + t.Fatal(err) + } + var pending, expired int + if err := db.QueryRow(`SELECT COUNT(*) FROM publication_requests WHERE state='pending'`).Scan(&pending); err != nil { + t.Fatal(err) + } + if err := db.QueryRow(`SELECT COUNT(*) FROM publication_requests WHERE state='expired'`).Scan(&expired); err != nil { + t.Fatal(err) + } + if pending != 1 || expired != 1 { + t.Fatalf("pending=%d expired=%d", pending, expired) + } +} diff --git a/internal/store/read_policy.go b/internal/store/read_policy.go new file mode 100644 index 0000000..00b7d40 --- /dev/null +++ b/internal/store/read_policy.go @@ -0,0 +1,101 @@ +package store + +import ( + "errors" + "strings" +) + +// ReadPathPolicy is an immutable, request-scoped snapshot of positive Path +// read grants. Never share it across requests or use it to authorize writes. +type ReadPathPolicy struct { + access *localityAccessSnapshot + all bool + exact map[string]bool + subtrees map[string]bool +} + +func (p *ReadPathPolicy) Allows(path string) bool { + if p == nil { + return false + } + return p.access.decide(path, "read", p.allowsBase(path)) +} + +func (p *ReadPathPolicy) allowsBase(path string) bool { + if p == nil || !strings.HasPrefix(path, "/") { + return false + } + if p.all || p.exact[path] { + return true + } + for at := strings.LastIndex(path, "/"); at > 0; at = strings.LastIndex(path[:at], "/") { + if p.subtrees[path[:at]] { + return true + } + } + return false +} + +// LoadReadPathPolicy uses one bounded query, independent of the number of +// directory entries. It deliberately excludes Object grants: an Object grant +// does not reveal all of that Object's semantic aliases. +func (s *Store) LoadReadPathPolicy(domain, principal string) (*ReadPathPolicy, error) { + return loadReadPathPolicy(s.DB, domain, principal) +} + +func loadReadPathPolicy(q pathQueryer, domain, principal string) (*ReadPathPolicy, error) { + p := &ReadPathPolicy{exact: map[string]bool{}, subtrees: map[string]bool{}} + if domain == "" || principal == "" { + return p, ErrAccessDenied + } + rows, err := q.Query(` + SELECT 'role',g.target_type,g.target_id FROM principals p + JOIN domain_memberships m ON m.principal_uuid=p.uuid AND m.domain_uuid=? AND m.state='active' + JOIN auth_role_bindings b ON b.membership_uuid=m.uuid + JOIN auth_roles r ON r.uuid=b.role_uuid AND r.domain_uuid=m.domain_uuid + JOIN auth_capability_grants g ON g.role_uuid=r.uuid AND g.capability='read' + WHERE p.uuid=? AND p.state IN ('active','readonly') AND g.target_type IN ('domain','path') + UNION ALL + SELECT 'group','path',gp.scope_path FROM principals p + JOIN domain_memberships m ON m.principal_uuid=p.uuid AND m.domain_uuid=? AND m.state='active' + JOIN group_members gm ON gm.membership_uuid=m.uuid + JOIN groups g ON g.uuid=gm.group_uuid AND g.domain_uuid=m.domain_uuid AND g.state='active' + JOIN group_permissions gp ON gp.group_uuid=g.uuid AND gp.permission IN ('read','read_write','read_write_once') + WHERE p.uuid=? AND p.state IN ('active','readonly') + LIMIT 4097`, domain, principal, domain, principal) + if err != nil { + return nil, err + } + defer rows.Close() + count := 0 + for rows.Next() { + count++ + if count > 4096 { + return nil, errors.New("too many read grants for bounded projection") + } + var source, kind, target string + if err := rows.Scan(&source, &kind, &target); err != nil { + return nil, err + } + if source == "role" { + if kind == "domain" && target == domain || kind == "path" && target == "*" { + p.all = true + } else if kind == "path" { + p.exact[target] = true + } + } else if target == "/" { + p.all = true + } else if strings.HasPrefix(target, "/") { + p.exact[target] = true + p.subtrees[strings.TrimRight(target, "/")] = true + } + } + if err = rows.Err(); err != nil { + return nil, err + } + if err = rows.Close(); err != nil { + return nil, err + } + p.access, err = loadLocalityAccess(q, domain, principal) + return p, err +} diff --git a/internal/store/read_policy_test.go b/internal/store/read_policy_test.go new file mode 100644 index 0000000..0a4d517 --- /dev/null +++ b/internal/store/read_policy_test.go @@ -0,0 +1,73 @@ +package store + +import ( + "database/sql" + "testing" +) + +func TestReadPolicyMatchesPositiveGrants(t *testing.T) { + db, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { db.Close() }) + s := &Store{DB: db} + if err := s.EnsureAuthSchema(); err != nil { + t.Fatal(err) + } + statements := []string{ + `INSERT INTO principals(uuid,state,created_at_ms,updated_at_ms) VALUES('p','active',1,1)`, + `INSERT INTO domain_memberships(uuid,domain_uuid,principal_uuid,state,created_at_ms) VALUES('m','d','p','active',1)`, + `INSERT INTO auth_roles(uuid,domain_uuid,name,created_at_ms) VALUES('r','d','reader',1)`, + `INSERT INTO auth_role_bindings(membership_uuid,role_uuid,created_at_ms) VALUES('m','r',1)`, + `INSERT INTO auth_capability_grants(uuid,role_uuid,capability,target_type,target_id,created_at_ms) VALUES('g','r','read','path','/exact_%/A',1),('wild','r','read','domain','*',1)`, + `INSERT INTO groups(uuid,domain_uuid,name,display_name,created_at_ms,updated_at_ms) VALUES('group','d','readers','Readers',1,1)`, + `INSERT INTO group_members(group_uuid,membership_uuid,member_role,source,created_at_ms) VALUES('group','m','member','local',1)`, + `INSERT INTO group_permissions(uuid,group_uuid,scope_path,permission,created_at_ms) VALUES('gp','group','/group_%','read',1),('up','group','/drop','upload_only',1),('once','group','/once','read_write_once',1)`, + } + for _, statement := range statements { + if _, err := db.Exec(statement); err != nil { + t.Fatal(err) + } + } + paths := []string{"/", "/exact_%/A", "/exact_%/a", "/exact_%/A/child", "/group_%", "/group_%/child", "/groupXX/child", "/drop", "/once/deep/file", "/hidden", "", "relative"} + for _, state := range []string{"active", "readonly", "suspended", "quarantined"} { + if _, err := db.Exec(`UPDATE principals SET state=? WHERE uuid='p'`, state); err != nil { + t.Fatal(err) + } + policy, err := s.LoadReadPathPolicy("d", "p") + if err != nil { + t.Fatal(err) + } + for _, path := range paths { + want := s.Authorize(AuthorizationRequest{DomainUUID: "d", PrincipalUUID: "p", Capability: "read", TargetType: "path", TargetID: path}) == nil + if got := policy.Allows(path); got != want { + t.Fatalf("state=%s path=%q got=%v want=%v", state, path, got, want) + } + } + } + if _, err := db.Exec(`UPDATE principals SET state='active' WHERE uuid='p'`); err != nil { + t.Fatal(err) + } + old, err := s.LoadReadPathPolicy("d", "p") + if err != nil { + t.Fatal(err) + } + if _, err := db.Exec(`DELETE FROM group_permissions`); err != nil { + t.Fatal(err) + } + current, err := s.LoadReadPathPolicy("d", "p") + if err != nil { + t.Fatal(err) + } + if !old.Allows("/group_%/child") || current.Allows("/group_%/child") { + t.Fatal("request snapshot/revocation boundary incorrect") + } + foreign, err := s.LoadReadPathPolicy("other", "p") + if err != nil { + t.Fatal(err) + } + if foreign.Allows("/exact_%/A") { + t.Fatal("cross-Domain grant accepted") + } +} diff --git a/internal/store/recent_objects.go b/internal/store/recent_objects.go index 8bdc268..e40db86 100644 --- a/internal/store/recent_objects.go +++ b/internal/store/recent_objects.go @@ -1,15 +1,29 @@ package store +import "os" + type RecentObject struct { - UUID string - Path string - Size int - UpdatedAt int64 + UUID string + Path string + Size int + UpdatedAt int64 + documentHash string } func (s *Store) ListRecentObjects( limit int, ) ([]RecentObject, error) { + domainUUID, err := s.defaultDomainUUID() + if err != nil { + return nil, err + } + return s.ListRecentObjectsInDomain(domainUUID, limit) +} + +func (s *Store) ListRecentObjectsInDomain( + domainUUID string, + limit int, +) ([]RecentObject, error) { if limit <= 0 { limit = 20 @@ -18,12 +32,15 @@ func (s *Store) ListRecentObjects( rows, err := s.DB.Query(` WITH latest AS ( SELECT + r.uuid, r.object_uuid, - r.body, + COALESCE(r.document_hash, '') AS document_hash, r.created_at, ROW_NUMBER() OVER ( PARTITION BY r.object_uuid - ORDER BY r.created_at DESC + ORDER BY + COALESCE(r.created_at_ms, r.created_at * 1000) DESC, + r.rowid DESC ) AS rn FROM revisions r ), @@ -38,30 +55,35 @@ func (s *Store) ListRecentObjects( p.path ASC ) AS rn FROM paths p + WHERE p.domain_uuid = ? ) SELECT o.uuid, COALESCE(ranked_path.path, ''), - COALESCE(LENGTH(latest.body), 0), - COALESCE(latest.created_at, o.created_at) + CASE + WHEN latest.document_hash <> '' THEN 0 + ELSE COALESCE(LENGTH(r.body), 0) + END, + COALESCE(latest.created_at, o.created_at), + COALESCE(latest.document_hash, '') FROM objects o LEFT JOIN latest ON latest.object_uuid = o.uuid AND latest.rn = 1 - LEFT JOIN ranked_path + LEFT JOIN revisions r + ON r.uuid = latest.uuid + JOIN ranked_path ON ranked_path.object_uuid = o.uuid AND ranked_path.rn = 1 ORDER BY COALESCE(latest.created_at, o.created_at) DESC LIMIT ? - `, limit) + `, domainUUID, limit) if err != nil { return nil, err } - defer rows.Close() - var out []RecentObject for rows.Next() { @@ -73,6 +95,7 @@ func (s *Store) ListRecentObjects( &ro.Path, &ro.Size, &ro.UpdatedAt, + &ro.documentHash, ) if err != nil { @@ -81,6 +104,24 @@ func (s *Store) ListRecentObjects( out = append(out, ro) } - + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + for i := range out { + if out[i].Size != 0 { + continue + } + if out[i].documentHash == "" { + continue + } + if path, err := s.documentPath(out[i].documentHash); err == nil && path != "" { + if info, err := os.Stat(path); err == nil { + out[i].Size = int(info.Size()) + } + } + } return out, nil } diff --git a/internal/store/resource_history.go b/internal/store/resource_history.go new file mode 100644 index 0000000..dec62df --- /dev/null +++ b/internal/store/resource_history.go @@ -0,0 +1,73 @@ +package store + +import ( + "context" + "encoding/json" + "time" +) + +const ResourceEventID = "builtin.resource.sample" +const ResourceEventType = "resource.sample" + +func (s *Store) EnsureResourceHistorySchema() error { + _, err := s.DB.Exec(`CREATE TABLE IF NOT EXISTS resource_samples ( + id INTEGER PRIMARY KEY, job_uuid TEXT NOT NULL UNIQUE, + timestamp_ms INTEGER NOT NULL, payload TEXT NOT NULL + ); CREATE INDEX IF NOT EXISTS idx_resource_samples_time ON resource_samples(timestamp_ms)`) + return err +} + +func (s *Store) EnsureBuiltinResourceEvent() error { + now := time.Now().UnixMilli() + _, err := s.DB.Exec(`INSERT OR IGNORE INTO event_definitions + (uuid,name,event_type,event_key,payload,schedule_kind,interval_seconds,next_run_at_ms,enabled,priority,max_attempts,created_at_ms,updated_at_ms) + VALUES(?,?,?,?,?,'interval',60,?,1,100,1,?,?)`, ResourceEventID, "Resource monitoring", ResourceEventType, "local", "{}", now, now, now) + return err +} + +func (s *Store) SaveResourceSample(job string, at int64, payload []byte) error { + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + if _, err = tx.Exec(`INSERT OR IGNORE INTO resource_samples(job_uuid,timestamp_ms,payload) VALUES(?,?,?)`, job, at, string(payload)); err != nil { + return err + } + if _, err = tx.Exec(`DELETE FROM resource_samples WHERE timestamp_ms < ?`, at-int64(7*24*time.Hour/time.Millisecond)); err != nil { + return err + } + return tx.Commit() +} + +// Return the last sample in each time bucket, not averages disguised as peaks. +// At most 361 points and an indexed seven-day scan; no request-side collection. +func (s *Store) ResourceHistory(ctx context.Context, hours int, now time.Time) ([]json.RawMessage, error) { + if hours < 1 { + hours = 1 + } + if hours > 168 { + hours = 168 + } + span := int64(hours) * 3600000 + bucket := span / 360 + if bucket < 60000 { + bucket = 60000 + } + rows, err := s.DB.QueryContext(ctx, `SELECT payload FROM resource_samples WHERE id IN + (SELECT MAX(id) FROM resource_samples WHERE timestamp_ms>=? AND timestamp_ms<=? GROUP BY timestamp_ms / ?) + ORDER BY timestamp_ms LIMIT 361`, now.UnixMilli()-span, now.UnixMilli(), bucket) + if err != nil { + return nil, err + } + defer rows.Close() + out := []json.RawMessage{} + for rows.Next() { + var raw string + if err := rows.Scan(&raw); err != nil { + return nil, err + } + out = append(out, json.RawMessage(raw)) + } + return out, rows.Err() +} diff --git a/internal/store/revision_language_test.go b/internal/store/revision_language_test.go new file mode 100644 index 0000000..1fa17d5 --- /dev/null +++ b/internal/store/revision_language_test.go @@ -0,0 +1,171 @@ +package store_test + +import ( + "testing" + + "pageswiki/internal/db" + "pageswiki/internal/store" +) + +func TestRevisionIdentityAndLanguageProjection(t *testing.T) { + database, err := db.Open(t.TempDir() + "/pages.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + + st := store.New(database) + + firstPage, err := st.CreatePageAtPath("/first") + if err != nil { + t.Fatal(err) + } + + secondPage, err := st.CreatePageAtPath("/second") + if err != nil { + t.Fatal(err) + } + + japanese, err := + st.SaveRevisionForLanguage( + firstPage, + "

    shared body

    ", + "Japanese", + "ja", + ) + if err != nil { + t.Fatal(err) + } + + english, err := + st.SaveRevisionForLanguage( + firstPage, + "

    English

    ", + "English", + "en", + ) + if err != nil { + t.Fatal(err) + } + + shared, err := + st.SaveRevisionForLanguage( + secondPage, + "

    shared body

    ", + "shared payload", + "en", + ) + if err != nil { + t.Fatal(err) + } + + if japanese.UUID == shared.UUID { + t.Fatal("Revision UUID was reused across Pages") + } + + if japanese.DocumentHash != shared.DocumentHash { + t.Fatal("identical Documents have different hashes") + } + + selected, err := + st.GetLatestRevisionForLanguages( + firstPage, + []string{"ja-JP", "ja", "en"}, + ) + if err != nil { + t.Fatal(err) + } + + if selected.UUID != japanese.UUID { + t.Fatalf("selected Revision = %q, want %q", selected.UUID, japanese.UUID) + } + + selected, err = + st.GetLatestRevisionForLanguages( + firstPage, + []string{"fr", "en"}, + ) + if err != nil { + t.Fatal(err) + } + + if selected.UUID != english.UUID { + t.Fatalf("fallback Revision = %q, want %q", selected.UUID, english.UUID) + } +} + +func TestLegacyRevisionMetadataMigration(t *testing.T) { + database, err := db.Open(t.TempDir() + "/pages.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + + _, err = database.Exec(` + CREATE TABLE revisions ( + uuid TEXT PRIMARY KEY, + object_uuid TEXT, + body TEXT, + message TEXT, + created_at INTEGER + ); + + INSERT INTO revisions ( + uuid, + object_uuid, + body, + message, + created_at + ) + VALUES ( + 'legacy-revision', + 'legacy-page', + 'legacy body', + 'legacy', + 123 + ); + `) + if err != nil { + t.Fatal(err) + } + + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + + var documentHash string + var revisionLanguage string + var createdAtMS int64 + + err = database.QueryRow(` + SELECT + document_hash, + lang, + created_at_ms + FROM revisions + WHERE uuid = 'legacy-revision' + `).Scan( + &documentHash, + &revisionLanguage, + &createdAtMS, + ) + if err != nil { + t.Fatal(err) + } + + if len(documentHash) != 64 { + t.Fatalf("legacy Document hash length = %d", len(documentHash)) + } + + if revisionLanguage != "und" { + t.Fatalf("legacy language = %q", revisionLanguage) + } + + if createdAtMS != 123000 { + t.Fatalf("legacy created_at_ms = %d", createdAtMS) + } +} diff --git a/internal/store/revision_listing.go b/internal/store/revision_listing.go new file mode 100644 index 0000000..933ecd6 --- /dev/null +++ b/internal/store/revision_listing.go @@ -0,0 +1,72 @@ +package store + +import ( + "context" + "database/sql" + "errors" + "time" +) + +var ErrRevisionCursor = errors.New("invalid revision cursor") + +type RevisionPage struct { + Items []RevisionListItem + Next string +} + +// ListRevisionPage is metadata-only and keeps insertion-order tie breaking. +// The cursor is a visible Revision UUID in the same Object, never a global +// row counter or an OFFSET that shifts when newer revisions arrive. +func (s *Store) ListRevisionPage(ctx context.Context, objectUUID, before string, limit int) (RevisionPage, error) { + page := RevisionPage{Items: []RevisionListItem{}} + if limit <= 0 { + limit = 100 + } + if limit > 200 { + limit = 200 + } + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + tx, err := s.DB.BeginTx(ctx, &sql.TxOptions{ReadOnly: true}) + if err != nil { + return page, err + } + defer tx.Rollback() + where := "" + args := []any{objectUUID} + if before != "" { + var createdMS, rowID int64 + if err := tx.QueryRowContext(ctx, `SELECT created_at_ms,rowid FROM revisions WHERE uuid=? AND object_uuid=?`, before, objectUUID).Scan(&createdMS, &rowID); err != nil { + if errors.Is(err, sql.ErrNoRows) { + return page, ErrRevisionCursor + } + return page, err + } + where = ` AND (created_at_ms,rowid) < (?,?)` + args = append(args, createdMS, rowID) + } + args = append(args, limit+1) + rows, err := tx.QueryContext(ctx, `SELECT uuid,object_uuid,COALESCE(document_hash,''),COALESCE(NULLIF(lang,''),'und'), + COALESCE(NULLIF(content_type,''),'text/html; charset=utf-8'),substr(COALESCE(filename,''),1,4096), + substr(COALESCE(message,''),1,4096),COALESCE(created_at,0),created_at_ms + FROM revisions WHERE object_uuid=?`+where+` ORDER BY created_at_ms DESC,rowid DESC LIMIT ?`, args...) + if err != nil { + return page, err + } + defer rows.Close() + for rows.Next() { + var item RevisionListItem + if err := rows.Scan(&item.UUID, &item.ObjectUUID, &item.DocumentHash, &item.Language, &item.ContentType, &item.Filename, &item.Message, &item.CreatedAt, &item.CreatedAtMS); err != nil { + return page, err + } + page.Items = append(page.Items, item) + } + if err := rows.Err(); err != nil { + return page, err + } + if len(page.Items) > limit { + page.Items = page.Items[:limit] + page.Next = page.Items[len(page.Items)-1].UUID + } + return page, nil +} diff --git a/internal/store/revision_store.go b/internal/store/revision_store.go index 7597299..0ee555e 100644 --- a/internal/store/revision_store.go +++ b/internal/store/revision_store.go @@ -4,27 +4,50 @@ import ( "crypto/sha256" "database/sql" "encoding/hex" + "errors" + "strings" + "time" + + "github.com/google/uuid" + "golang.org/x/text/language" ) type Revision struct { - Hash string - ObjectUUID string - Body string - Message string - CreatedAt int64 + UUID string + ObjectUUID string + DocumentHash string + Language string + ContentType string + Filename string + Body string + Message string + CreatedAt int64 + CreatedAtMS int64 } -func revisionHash( - body string, -) string { +var ( + ErrInvalidRevisionLanguage = errors.New("invalid revision language") + ErrPageNotFound = errors.New("page UUID does not exist") +) - sum := sha256.Sum256( - []byte(body), - ) +func revisionHash(body string) string { + sum := sha256.Sum256([]byte(body)) + return hex.EncodeToString(sum[:]) +} - return hex.EncodeToString( - sum[:], - ) +func normalizeRevisionLanguage(raw string) (string, error) { + raw = strings.TrimSpace(raw) + + if raw == "" { + return "und", nil + } + + tag, err := language.Parse(raw) + if err != nil { + return "", ErrInvalidRevisionLanguage + } + + return tag.String(), nil } func (s *Store) SaveRevision( @@ -32,109 +55,343 @@ func (s *Store) SaveRevision( body string, message string, ) (string, error) { - - hash := revisionHash(body) - - _, err := s.DB.Exec(` - INSERT OR IGNORE INTO revisions ( - uuid, - object_uuid, - body, - message, - created_at - ) - VALUES ( - ?, ?, ?, ?, - strftime('%s','now') - ) - `, - hash, - objectUUID, - body, - message, - ) + revision, err := + s.SaveRevisionForLanguage( + objectUUID, + body, + message, + "und", + ) if err != nil { return "", err } - return hash, nil + return revision.UUID, nil } -func (s *Store) GetRevision( - hash string, +func (s *Store) SaveRevisionForLanguage( + objectUUID string, + body string, + message string, + rawLanguage string, ) (*Revision, error) { - - row := s.DB.QueryRow(` - SELECT - uuid, - object_uuid, - body, - message, - created_at - FROM revisions - WHERE uuid = ? - `, - hash, + return s.SaveRevisionContent( + objectUUID, + []byte(body), + message, + rawLanguage, + "text/html; charset=utf-8", + "", ) +} - var r Revision +func (s *Store) SaveRevisionContent( + objectUUID string, + payload []byte, + message string, + rawLanguage string, + contentType string, + filename string, +) (*Revision, error) { + s.revisionWriteMu.Lock() + defer s.revisionWriteMu.Unlock() + return s.saveRevisionContentUnlocked(objectUUID, payload, message, rawLanguage, contentType, filename) +} - err := row.Scan( - &r.Hash, - &r.ObjectUUID, - &r.Body, - &r.Message, - &r.CreatedAt, - ) +func (s *Store) saveRevisionContentUnlocked( + objectUUID string, + payload []byte, + message string, + rawLanguage string, + contentType string, + filename string, +) (*Revision, error) { + lang, err := + normalizeRevisionLanguage( + rawLanguage, + ) if err != nil { return nil, err } - return &r, nil + var objectCount int + err = s.DB.QueryRow(` + SELECT count(*) + FROM objects + WHERE uuid = ? + `, objectUUID).Scan(&objectCount) + + if err != nil { + return nil, err + } + + if objectCount == 0 { + return nil, ErrPageNotFound + } + + now := time.Now() + contentType = normalizeRevisionContentType(contentType) + filename = strings.TrimSpace(filename) + payload, embeddedHashes, err := s.freezeEmbeddedAssets(objectUUID, payload, contentType) + if err != nil { + return nil, err + } + body := string(payload) + + revision := &Revision{ + UUID: uuid.NewString(), + ObjectUUID: objectUUID, + DocumentHash: revisionHash(body), + Language: lang, + ContentType: contentType, + Filename: filename, + Body: body, + Message: message, + CreatedAt: now.Unix(), + CreatedAtMS: now.UnixMilli(), + } + + if err := s.persistDocument( + revision.DocumentHash, + revision.Body, + ); err != nil { + return nil, err + } + + tx, err := s.DB.Begin() + if err != nil { + return nil, err + } + defer tx.Rollback() + if err = insertRevision(tx, revision, embeddedHashes); err != nil { + return nil, err + } + if err = s.appendRevisionActivityOutboxIfAvailable(tx, revision); err != nil { + return nil, err + } + if err = tx.Commit(); err != nil { + return nil, err + } + + return revision, nil +} + +func insertRevision(tx *sql.Tx, revision *Revision, embeddedHashes []string) error { + result, err := tx.Exec(` + INSERT INTO revisions ( + uuid, + object_uuid, + body, + document_hash, + lang, + content_type, + filename, + message, + created_at_ms, + created_at + ) + SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?, ? + WHERE EXISTS(SELECT 1 FROM objects WHERE uuid=?) + `, + revision.UUID, + revision.ObjectUUID, + revision.Body, + revision.DocumentHash, + revision.Language, + revision.ContentType, + revision.Filename, + revision.Message, + revision.CreatedAtMS, + revision.CreatedAt, + revision.ObjectUUID, + ) + + if err != nil { + return err + } + if n, err := result.RowsAffected(); err != nil { + return err + } else if n != 1 { + return ErrPageNotFound + } + for _, hash := range embeddedHashes { + if _, err = tx.Exec(`INSERT INTO revision_document_refs(revision_uuid,document_hash) VALUES(?,?)`, revision.UUID, hash); err != nil { + return err + } + } + return nil +} + +func (s *Store) GetRevision( + revisionUUID string, +) (*Revision, error) { + row := s.DB.QueryRow(` + SELECT + uuid, + object_uuid, + COALESCE(document_hash, ''), + COALESCE(NULLIF(lang, ''), 'und'), + COALESCE(NULLIF(content_type, ''), 'text/html; charset=utf-8'), + COALESCE(filename, ''), + COALESCE(body, ''), + COALESCE(message, ''), + COALESCE(created_at, 0), + COALESCE(created_at_ms, COALESCE(created_at, 0) * 1000) + FROM revisions + WHERE uuid = ? + `, revisionUUID) + + revision, err := + scanRevision( + row, + ) + + if err != nil { + return nil, err + } + + return s.hydrateRevision( + revision, + ) +} + +func (s *Store) GetLatestRevisionMetadataForLanguages(objectUUID string, rawLanguages []string) (*Revision, error) { + candidates := make([]string, 0, len(rawLanguages)+1) + seen := map[string]bool{} + for _, rawLanguage := range rawLanguages { + lang, err := normalizeRevisionLanguage(rawLanguage) + if err == nil && !seen[lang] { + candidates, seen[lang] = append(candidates, lang), true + } + } + if !seen["und"] { + candidates = append(candidates, "und") + } + for _, lang := range candidates { + row := s.DB.QueryRow(`SELECT uuid,object_uuid,COALESCE(document_hash,''),COALESCE(NULLIF(lang,''),'und'),COALESCE(NULLIF(content_type,''),'text/html; charset=utf-8'),COALESCE(filename,''),'',COALESCE(message,''),COALESCE(created_at,0),COALESCE(created_at_ms,COALESCE(created_at,0)*1000) FROM revisions WHERE object_uuid=? AND COALESCE(NULLIF(lang,''),'und')=? ORDER BY COALESCE(created_at_ms,created_at*1000) DESC,rowid DESC LIMIT 1`, objectUUID, lang) + revision, err := scanRevision(row) + if err == nil { + return revision, nil + } + if !errors.Is(err, sql.ErrNoRows) { + return nil, err + } + } + return &Revision{ObjectUUID: objectUUID, Language: candidates[0], ContentType: "text/html; charset=utf-8"}, nil +} + +func (s *Store) ObjectBoundInDomain(domainUUID, objectUUID string) bool { + var exists int + return s.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM paths WHERE domain_uuid=? AND object_uuid=?)`, domainUUID, objectUUID).Scan(&exists) == nil && exists != 0 } func (s *Store) GetLatestRevision( objectUUID string, ) (*Revision, error) { - - row := s.DB.QueryRow(` - SELECT - uuid, - object_uuid, - body, - message, - created_at - FROM revisions - WHERE object_uuid = ? - ORDER BY created_at DESC - LIMIT 1 - `, + return s.GetLatestRevisionForLanguages( objectUUID, + []string{"und"}, ) +} - var r Revision +func (s *Store) GetLatestRevisionForLanguages( + objectUUID string, + rawLanguages []string, +) (*Revision, error) { + candidates := make([]string, 0, len(rawLanguages)+1) + seen := map[string]bool{} + + for _, rawLanguage := range rawLanguages { + lang, err := normalizeRevisionLanguage(rawLanguage) + if err != nil { + continue + } + + if !seen[lang] { + candidates = append(candidates, lang) + seen[lang] = true + } + } + + if !seen["und"] { + candidates = append(candidates, "und") + } + + for _, lang := range candidates { + row := s.DB.QueryRow(` + SELECT + uuid, + object_uuid, + COALESCE(document_hash, ''), + COALESCE(NULLIF(lang, ''), 'und'), + COALESCE(NULLIF(content_type, ''), 'text/html; charset=utf-8'), + COALESCE(filename, ''), + COALESCE(body, ''), + COALESCE(message, ''), + COALESCE(created_at, 0), + COALESCE(created_at_ms, COALESCE(created_at, 0) * 1000) + FROM revisions + WHERE object_uuid = ? + AND COALESCE(NULLIF(lang, ''), 'und') = ? + ORDER BY + COALESCE(created_at_ms, created_at * 1000) DESC, + rowid DESC + LIMIT 1 + `, objectUUID, lang) + + revision, err := scanRevision(row) + if err == nil { + return s.hydrateRevision( + revision, + ) + } + + if !errors.Is(err, sql.ErrNoRows) { + return nil, err + } + } + + return &Revision{ + ObjectUUID: objectUUID, + Language: candidates[0], + ContentType: "text/html; charset=utf-8", + }, nil +} + +func scanRevision(row interface { + Scan(dest ...any) error +}) (*Revision, error) { + var revision Revision err := row.Scan( - &r.Hash, - &r.ObjectUUID, - &r.Body, - &r.Message, - &r.CreatedAt, + &revision.UUID, + &revision.ObjectUUID, + &revision.DocumentHash, + &revision.Language, + &revision.ContentType, + &revision.Filename, + &revision.Body, + &revision.Message, + &revision.CreatedAt, + &revision.CreatedAtMS, ) if err != nil { - - if err == sql.ErrNoRows { - - return &Revision{ - ObjectUUID: objectUUID, - }, nil - } - return nil, err } - return &r, nil + return &revision, nil +} + +func normalizeRevisionContentType(raw string) string { + raw = strings.TrimSpace(raw) + if raw == "" { + return "text/html; charset=utf-8" + } + if strings.ContainsAny(raw, "\r\n") { + return "application/octet-stream" + } + return raw } diff --git a/internal/store/revisions.go b/internal/store/revisions.go index 17d8971..dc9bcce 100644 --- a/internal/store/revisions.go +++ b/internal/store/revisions.go @@ -1,10 +1,15 @@ package store type RevisionListItem struct { - Hash string - ObjectUUID string - Message string - CreatedAt int64 + UUID string + ObjectUUID string + DocumentHash string + Language string + ContentType string + Filename string + Message string + CreatedAt int64 + CreatedAtMS int64 } func (s *Store) ListRevisions( @@ -15,11 +20,18 @@ func (s *Store) ListRevisions( SELECT uuid, object_uuid, - message, - created_at + COALESCE(document_hash, ''), + COALESCE(NULLIF(lang, ''), 'und'), + COALESCE(NULLIF(content_type, ''), 'text/html; charset=utf-8'), + COALESCE(filename, ''), + COALESCE(message, ''), + COALESCE(created_at, 0), + COALESCE(created_at_ms, COALESCE(created_at, 0) * 1000) FROM revisions WHERE object_uuid = ? - ORDER BY created_at DESC + ORDER BY + COALESCE(created_at_ms, COALESCE(created_at, 0) * 1000) DESC, + rowid DESC `, objectUUID, ) @@ -37,10 +49,15 @@ func (s *Store) ListRevisions( var r RevisionListItem err = rows.Scan( - &r.Hash, + &r.UUID, &r.ObjectUUID, + &r.DocumentHash, + &r.Language, + &r.ContentType, + &r.Filename, &r.Message, &r.CreatedAt, + &r.CreatedAtMS, ) if err != nil { diff --git a/internal/store/search.go b/internal/store/search.go new file mode 100644 index 0000000..26e1054 --- /dev/null +++ b/internal/store/search.go @@ -0,0 +1,379 @@ +package store + +import ( + "context" + "database/sql" + "errors" + "sort" + "strings" + "time" +) + +const SearchCandidateLimit = 1000 +const SearchExcerptDocumentBytes = 64 << 10 +const SearchExcerptTotalBytes = 1 << 20 +const searchExcerptTimeout = 400 * time.Millisecond + +const searchResultColumns = `p.path,COALESCE(r.content_type,''),COALESCE(r.filename,''),COALESCE(r.document_hash,''),COALESCE(r.revision_uuid,''),COALESCE(r.created_at_ms/1000,0)` +const searchPathBoundary = `(p.path=? OR (p.path>=? AND p.path0 OR instr(lower(COALESCE(r.filename,'')),lower(?))>0)` +const searchPathCandidatesSQL = searchPathCandidatesBaseSQL + searchPathQueryPredicate + ` ORDER BY p.path LIMIT ?` + +// CROSS JOIN is intentional: revision_uuid is an UNINDEXED FTS payload column. +// A Path-first plan re-runs the complete MATCH scan for every Path. Start with +// MATCH exactly once, then seek current Revision metadata and Domain bindings +// through their B-tree indexes. Keep scope filtering before the candidate cap. +const searchFTSCandidatesBaseSQL = `SELECT ` + searchResultColumns + `,revision_search.rowid + FROM revision_search + CROSS JOIN latest_revision_index r ON r.revision_uuid=revision_search.revision_uuid + CROSS JOIN paths p ON p.object_uuid=r.object_uuid + WHERE revision_search MATCH ? AND p.domain_uuid=? AND ` + searchPathBoundary +const searchFTSCandidatesSQL = searchFTSCandidatesBaseSQL + ` LIMIT ?` + +func searchBodyExcerptsSQL(count int) string { + // UUID is not indexed by FTS5. Restrict the MATCH/snippet work using the + // integer rowids collected from the same read snapshot, not payload UUIDs. + return `SELECT revision_uuid,substr(snippet(revision_search,3,'','',' … ',36),1,4096) + FROM revision_search WHERE revision_search MATCH ? AND rowid IN (` + strings.TrimRight(strings.Repeat("?,", count), ",") + `)` +} + +// Excerpts are optional enrichment. Even small documents can have expensive +// prefix hit-position scans, so their time budget is separate from finding +// results. A spent excerpt budget omits snippets, not already-authorized hits. +func loadSearchBodyExcerpts(parent context.Context, tx *sql.Tx, expression string, ids []any, budget time.Duration) (excerpts map[string]string, err error) { + ctx, cancel := context.WithTimeout(parent, budget) + defer cancel() + defer func() { + if err != nil && ctx.Err() != nil { + if parent.Err() != nil { + err = parent.Err() + } else { + excerpts, err = nil, nil + } + } + }() + args := append([]any{"body : (" + expression + ")"}, ids...) + rows, err := tx.QueryContext(ctx, searchBodyExcerptsSQL(len(ids)), args...) + if err != nil { + return nil, err + } + defer rows.Close() + excerpts = make(map[string]string) + for rows.Next() { + var id, excerpt string + if err := rows.Scan(&id, &excerpt); err != nil { + return nil, err + } + excerpts[id] = excerpt + } + return excerpts, rows.Err() +} + +type SearchResult struct { + Path string + ContentType string + Filename string + DocumentHash string + RevisionUUID string + Size int64 // Kept for API compatibility; search does not stat Document files. + UpdatedAt int64 + PathMatch bool + FilenameMatch bool + BodyMatch bool + Excerpt string // Untrusted source text, never HTML-safe markup. + ExcerptOmitted bool // A body match remains visible when snippet work exceeds its budget. +} + +type PathSuggestion struct { + SearchResult + Title string +} + +// SearchPathsInDomain preserves the store API for trusted callers. HTTP callers +// must use SearchPathsInDomainFiltered with a request-scoped authorization filter. +func (s *Store) SearchPathsInDomain(domainUUID, scope, query string, limit int) ([]SearchResult, error) { + return s.SearchPathsInDomainFiltered(context.Background(), domainUUID, scope, query, limit, func(string) bool { return true }) +} + +// SearchPathsInDomainFiltered bounds SQL candidates before materialization and +// authorizes each Path before loading an excerpt. It never computes a global hit +// count or stats Document files. A narrow scope improves both recall and cost. +func (s *Store) SearchPathsInDomainFiltered(ctx context.Context, domainUUID, scope, query string, limit int, allowed func(string) bool) ([]SearchResult, error) { + return s.SearchPathsInDomainWithOptions(ctx, domainUUID, scope, query, limit, allowed, SearchOptions{}) +} + +// SearchPathsInDomainWithOptions also permits filter-only searches. File/date +// predicates apply before SQL candidate caps, while ACL checks stay ahead of all +// snippet enrichment. Zero options preserve the original indexed query plans. +func (s *Store) SearchPathsInDomainWithOptions(ctx context.Context, domainUUID, scope, query string, limit int, allowed func(string) bool, options SearchOptions) (found []SearchResult, searchErr error) { + return s.searchPathsInDomainWithOptions(ctx, domainUUID, scope, query, limit, allowed, options, true) +} + +// SearchPathSuggestionsInDomain shares the current-Revision FTS and ACL path +// with full search, but deliberately skips snippet generation. Typeahead calls +// are frequent and only need a bounded display label, never a body excerpt. +func (s *Store) SearchPathSuggestionsInDomain(ctx context.Context, domainUUID, scope, query string, limit int, allowed func(string) bool) ([]PathSuggestion, error) { + results, err := s.searchPathsInDomainWithOptions(ctx, domainUUID, scope, query, limit, allowed, SearchOptions{}, false) + if err != nil || len(results) == 0 { + return nil, err + } + ids := make([]any, 0, len(results)) + seen := make(map[string]bool, len(results)) + for _, result := range results { + if result.RevisionUUID != "" && strings.HasPrefix(strings.ToLower(result.ContentType), "text/html") && !seen[result.RevisionUUID] { + ids = append(ids, result.RevisionUUID) + seen[result.RevisionUUID] = true + } + } + headings := make(map[string]string, len(ids)) + if len(ids) > 0 { + rows, queryErr := s.DB.QueryContext(ctx, `SELECT uuid,substr(CAST(body AS TEXT),1,65536) FROM revisions WHERE uuid IN (`+strings.TrimRight(strings.Repeat("?,", len(ids)), ",")+`)`, ids...) + if queryErr != nil { + return nil, queryErr + } + for rows.Next() { + var revision, source string + if queryErr = rows.Scan(&revision, &source); queryErr != nil { + rows.Close() + return nil, queryErr + } + headings[revision] = firstHTMLHeading(source) + } + queryErr = rows.Err() + rows.Close() + if queryErr != nil { + return nil, queryErr + } + } + out := make([]PathSuggestion, 0, len(results)) + for _, result := range results { + out = append(out, PathSuggestion{SearchResult: result, Title: headings[result.RevisionUUID]}) + } + return out, nil +} + +func (s *Store) searchPathsInDomainWithOptions(ctx context.Context, domainUUID, scope, query string, limit int, allowed func(string) bool, options SearchOptions, loadExcerpts bool) (found []SearchResult, searchErr error) { + if err := options.Validate(); err != nil { + return nil, err + } + scope, query = normalizePath(scope), strings.TrimSpace(query) + if query == "" && !options.HasFilters() || allowed == nil { + return nil, nil + } + if len(query) > 512 || len(strings.Fields(query)) > 16 { + return nil, errors.New("search query is too long") + } + if limit <= 0 || limit > 200 { + limit = 100 + } + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + defer func() { + // SQLite can report an interrupted statement instead of wrapping the + // context error. Preserve cancellation/deadline semantics for HTTP. + if searchErr != nil && ctx.Err() != nil { + searchErr = ctx.Err() + } + }() + tx, err := s.DB.BeginTx(ctx, &sql.TxOptions{ReadOnly: true}) + if err != nil { + return nil, err + } + defer tx.Rollback() + prefix := strings.TrimRight(scope, "/") + "/" + upper := strings.TrimRight(scope, "/") + "0" + results := make(map[string]SearchResult) + ftsRows := make(map[string]int64) + collect := func(statement string, body, filename bool, args ...any) error { + rows, err := tx.QueryContext(ctx, statement, args...) + if err != nil { + return err + } + defer rows.Close() + for rows.Next() { + var result SearchResult + var rowID int64 + if err := rows.Scan(&result.Path, &result.ContentType, &result.Filename, &result.DocumentHash, &result.RevisionUUID, &result.UpdatedAt, &rowID); err != nil { + return err + } + if !allowed(result.Path) { + continue + } + if rowID != 0 { + ftsRows[result.RevisionUUID] = rowID + } + result.PathMatch = query != "" && strings.Contains(strings.ToLower(result.Path), strings.ToLower(query)) + result.FilenameMatch = filename || results[result.Path].FilenameMatch || query != "" && strings.Contains(strings.ToLower(result.Filename), strings.ToLower(query)) + result.BodyMatch = body || results[result.Path].BodyMatch + results[result.Path] = result + } + return rows.Err() + } + filterSQL, filterArgs := searchOptionsPredicate(options) + pathSQL := searchPathCandidatesBaseSQL + pathArgs := []any{domainUUID, scope, prefix, upper} + if query != "" { + pathSQL += searchPathQueryPredicate + pathArgs = append(pathArgs, query, query) + } + pathSQL += filterSQL + ` ORDER BY p.path LIMIT ?` + pathArgs = append(pathArgs, filterArgs...) + pathArgs = append(pathArgs, SearchCandidateLimit) + if err := collect(pathSQL, false, false, pathArgs...); err != nil { + return nil, err + } + expression := ftsPrefixExpression(query) + if expression != "" { + // No global ORDER BY or unbounded IN materialization: stop the FTS scan + // after at most this many current, in-Domain, in-scope Path candidates. + for _, field := range []string{"body", "filename"} { + args := []any{field + " : (" + expression + ")", domainUUID, scope, prefix, upper} + args = append(args, filterArgs...) + args = append(args, SearchCandidateLimit) + if err := collect(searchFTSCandidatesBaseSQL+filterSQL+` LIMIT ?`, field == "body", field == "filename", args...); err != nil { + return nil, err + } + } + } + out := make([]SearchResult, 0, len(results)) + for _, result := range results { + out = append(out, result) + } + sort.Slice(out, func(i, j int) bool { + // Direct name/Path matches precede body-only hits; all ties are stable. + iName, jName := out[i].PathMatch || out[i].FilenameMatch, out[j].PathMatch || out[j].FilenameMatch + if iName != jName { + return iName + } + if len(out[i].Path) != len(out[j].Path) { + return len(out[i].Path) < len(out[j].Path) + } + return out[i].Path < out[j].Path + }) + if len(out) > limit { + out = out[:limit] + } + if !loadExcerpts { + return out, nil + } + // Only authorized, displayed results receive text excerpts. Batch the FTS + // lookup so a broad query is not re-scanned once for every visible result. + ids := make([]any, 0, len(out)) + seen := make(map[string]bool) + for _, result := range out { + if result.BodyMatch && !seen[result.RevisionUUID] { + ids = append(ids, ftsRows[result.RevisionUUID]) + seen[result.RevisionUUID] = true + } + } + if len(ids) != 0 { + // snippet's output token/character limit does not bound its input work: + // FTS5 may tokenize the entire matched document. Read byte lengths only + // for authorized displayed rows before spending the snippet budget. + rows, err := tx.QueryContext(ctx, `SELECT rowid,octet_length(body) + FROM revision_search WHERE rowid IN (`+strings.TrimRight(strings.Repeat("?,", len(ids)), ",")+`)`, ids...) + if err != nil { + return nil, err + } + sizes := make(map[int64]int64) + for rows.Next() { + var rowID, size int64 + if err := rows.Scan(&rowID, &size); err != nil { + rows.Close() + return nil, err + } + sizes[rowID] = size + } + err = rows.Err() + rows.Close() + if err != nil { + return nil, err + } + ids = nil + selected := make(map[string]bool) + remaining := int64(SearchExcerptTotalBytes) + for i := range out { + if !out[i].BodyMatch { + continue + } + revision := out[i].RevisionUUID + include, decided := selected[revision] + if !decided { + rowID := ftsRows[revision] + size, exists := sizes[rowID] + include = exists && size >= 0 && size <= SearchExcerptDocumentBytes && size <= remaining + if include { + ids = append(ids, rowID) + remaining -= size + } + selected[revision] = include + } + out[i].ExcerptOmitted = !include + } + } + if len(ids) != 0 { + excerpts, err := loadSearchBodyExcerpts(ctx, tx, expression, ids, searchExcerptTimeout) + if err != nil { + return nil, err + } + for i := range out { + if out[i].BodyMatch { + var present bool + out[i].Excerpt, present = excerpts[out[i].RevisionUUID] + out[i].ExcerptOmitted = !present + } + } + } + // A filename/Path-only hit still benefits from a short Page summary. Read + // only a bounded prefix from displayed textual revisions, in one batch. + ids, seen = nil, make(map[string]bool) + for _, result := range out { + media := strings.ToLower(result.ContentType) + textual := strings.HasPrefix(media, "text/") || strings.HasPrefix(media, "application/json") || strings.HasPrefix(media, "application/xml") || strings.HasPrefix(media, "application/javascript") || strings.HasPrefix(media, "application/yaml") || strings.HasPrefix(media, "application/x-yaml") + if !result.BodyMatch && textual && result.RevisionUUID != "" && !seen[result.RevisionUUID] { + ids = append(ids, result.RevisionUUID) + seen[result.RevisionUUID] = true + } + } + if len(ids) != 0 { + rows, err := tx.QueryContext(ctx, `SELECT uuid,substr(body,1,1024) FROM revisions WHERE uuid IN (`+strings.TrimRight(strings.Repeat("?,", len(ids)), ",")+`)`, ids...) + if err != nil { + return nil, err + } + excerpts := make(map[string]string) + for rows.Next() { + var id, excerpt string + if err := rows.Scan(&id, &excerpt); err != nil { + rows.Close() + return nil, err + } + excerpts[id] = excerpt + } + err = rows.Err() + rows.Close() + if err != nil { + return nil, err + } + for i := range out { + if !out[i].BodyMatch { + out[i].Excerpt = excerpts[out[i].RevisionUUID] + } + } + } + return out, nil +} + +func ftsPrefixExpression(query string) string { + words := strings.Fields(query) + terms := make([]string, 0, len(words)) + for _, word := range words { + word = strings.ReplaceAll(word, `"`, `""`) + if word != "" { + terms = append(terms, `"`+word+`"*`) + } + } + return strings.Join(terms, " AND ") +} diff --git a/internal/store/search_filters.go b/internal/store/search_filters.go new file mode 100644 index 0000000..5c98020 --- /dev/null +++ b/internal/store/search_filters.go @@ -0,0 +1,135 @@ +package store + +import ( + "errors" + "fmt" + "strings" +) + +var ErrInvalidSearchOptions = errors.New("invalid search options") + +// SearchOptions applies to current Page metadata, not historical Revisions. +// Dates are Unix milliseconds: FromMS is inclusive and BeforeMS is exclusive. +// The created field refers to Object creation, not creation of a Path alias. +// FileType and Extension are normalized lower-case values; Extension has no dot +// prefix and may contain a compound suffix such as tar.gz. +type SearchOptions struct { + FileType string + Extension string + DateField string + FromMS *int64 + BeforeMS *int64 +} + +func (o SearchOptions) HasFilters() bool { + return o.FileType != "" || o.Extension != "" || o.FromMS != nil || o.BeforeMS != nil +} + +func (o SearchOptions) Validate() error { + switch o.FileType { + case "", "html", "text", "image", "audio", "video", "pdf", "archive", "csv", "json", "code", "office", "other": + default: + return fmt.Errorf("%w: unknown file type", ErrInvalidSearchOptions) + } + switch o.DateField { + case "", "updated", "created": + default: + return fmt.Errorf("%w: unknown date field", ErrInvalidSearchOptions) + } + if len(o.Extension) > 32 { + return fmt.Errorf("%w: extension is too long", ErrInvalidSearchOptions) + } + for i, c := range o.Extension { + alnum := c >= 'a' && c <= 'z' || c >= '0' && c <= '9' + if !alnum && (i == 0 || !strings.ContainsRune("._+-", c)) { + return fmt.Errorf("%w: invalid extension", ErrInvalidSearchOptions) + } + } + if o.FromMS != nil && o.BeforeMS != nil && *o.FromMS >= *o.BeforeMS { + return fmt.Errorf("%w: empty or reversed date range", ErrInvalidSearchOptions) + } + return nil +} + +const searchMIMESQL = `lower(trim(substr(COALESCE(r.content_type,''),1,instr(COALESCE(r.content_type,'')||';',';')-1)))` + +// The original filename wins over the Path suffix when present. Names remain +// data: even extension patterns are bound arguments and do not become SQL. +const searchFilenameSQL = `lower(CASE WHEN COALESCE(r.filename,'')<>'' THEN r.filename ELSE p.path END)` + +func searchSuffixesSQL(suffixes ...string) string { + clauses := make([]string, 0, len(suffixes)) + for _, suffix := range suffixes { + // Only package-owned ASCII constants reach this helper. GLOB has no + // escaping ambiguity for underscores, unlike LIKE. + clauses = append(clauses, searchFilenameSQL+` GLOB '*.`+suffix+`'`) + } + return "(" + strings.Join(clauses, " OR ") + ")" +} + +// Specific MIME types are authoritative. Generic text/binary types may use a +// known suffix (e.g. a Python source uploaded as text/plain); unrecognized, +// specific MIME types stay Other instead of pretending to be a different type. +// This uses metadata only and never hydrates a Document to sniff its bytes. +var searchFileTypeSQL = `CASE + WHEN ` + searchMIMESQL + ` IN ('text/html','application/xhtml+xml') THEN 'html' + WHEN ` + searchMIMESQL + `='application/pdf' THEN 'pdf' + WHEN ` + searchMIMESQL + ` LIKE 'image/%' THEN 'image' + WHEN ` + searchMIMESQL + ` LIKE 'audio/%' THEN 'audio' + WHEN ` + searchMIMESQL + ` LIKE 'video/%' THEN 'video' + WHEN ` + searchMIMESQL + ` IN ('text/csv','application/csv','text/tab-separated-values') THEN 'csv' + WHEN ` + searchMIMESQL + ` IN ('application/json','text/json') OR ` + searchMIMESQL + ` GLOB '*+json' THEN 'json' + WHEN ` + searchMIMESQL + ` IN ('application/zip','application/x-zip-compressed','application/x-7z-compressed','application/vnd.rar','application/x-rar','application/x-rar-compressed','application/x-tar','application/gzip','application/x-gzip','application/x-xz','application/x-bzip2','application/zstd','application/x-zstd','application/x-compress','application/x-cpio') THEN 'archive' + WHEN ` + searchMIMESQL + ` IN ('application/msword','application/vnd.ms-excel','application/vnd.ms-powerpoint','application/rtf','text/rtf') OR ` + searchMIMESQL + ` GLOB 'application/vnd.openxmlformats-officedocument.*' OR ` + searchMIMESQL + ` GLOB 'application/vnd.oasis.opendocument.*' OR ` + searchMIMESQL + ` GLOB 'application/vnd.ms-*.macroenabled.*' THEN 'office' + WHEN ` + searchMIMESQL + ` IN ('text/markdown','text/x-markdown') THEN 'text' + WHEN ` + searchMIMESQL + ` IN ('application/javascript','application/x-javascript','text/javascript','application/typescript','text/typescript','application/xml','text/xml','application/yaml','application/x-yaml','text/yaml','application/toml','application/x-sh','application/x-shellscript','application/x-python','application/x-python-code','application/x-httpd-php','application/sql','text/css') OR ` + searchMIMESQL + ` GLOB 'text/x-*' OR ` + searchMIMESQL + ` GLOB '*+xml' THEN 'code' + WHEN ` + searchMIMESQL + ` NOT IN ('','text/plain','application/octet-stream','binary/octet-stream','application/x-empty') THEN CASE WHEN ` + searchMIMESQL + ` LIKE 'text/%' THEN 'text' ELSE 'other' END + WHEN ` + searchSuffixesSQL("html", "htm", "xhtml") + ` THEN 'html' + WHEN ` + searchSuffixesSQL("pdf") + ` THEN 'pdf' + WHEN ` + searchSuffixesSQL("png", "jpg", "jpeg", "gif", "webp", "avif", "bmp", "svg", "tif", "tiff", "ico", "heic", "heif") + ` THEN 'image' + WHEN ` + searchSuffixesSQL("mp3", "flac", "wav", "ogg", "oga", "opus", "m4a", "aac", "aiff", "alac", "mid", "midi") + ` THEN 'audio' + WHEN ` + searchSuffixesSQL("mp4", "webm", "mkv", "mov", "avi", "m4v", "ogv", "mpeg", "mpg") + ` THEN 'video' + WHEN ` + searchSuffixesSQL("zip", "7z", "rar", "tar", "gz", "tgz", "xz", "txz", "bz2", "tbz", "tbz2", "zst", "tzst", "cbz", "cbr", "cpio") + ` THEN 'archive' + WHEN ` + searchSuffixesSQL("csv", "tsv") + ` THEN 'csv' + WHEN ` + searchSuffixesSQL("json", "jsonl", "ndjson", "excalidraw", "ipynb") + ` THEN 'json' + WHEN ` + searchSuffixesSQL("doc", "docx", "docm", "xls", "xlsx", "xlsm", "ppt", "pptx", "pptm", "odt", "ods", "odp", "rtf") + ` THEN 'office' + WHEN ` + searchSuffixesSQL("py", "pyw", "sh", "bash", "zsh", "fish", "ps1", "bat", "cmd", "js", "mjs", "cjs", "jsx", "ts", "tsx", "go", "rs", "c", "h", "cpp", "hpp", "cc", "cs", "java", "kt", "kts", "swift", "rb", "php", "pl", "pm", "lua", "r", "sql", "css", "scss", "sass", "less", "xml", "xsl", "yaml", "yml", "toml", "ini", "conf", "vue", "svelte", "dart", "ex", "exs", "erl", "hs", "scala", "clj", "lisp", "el", "vim", "wasm") + ` THEN 'code' + WHEN ` + searchMIMESQL + `='text/plain' OR ` + searchSuffixesSQL("txt", "text", "log", "md", "markdown", "rst", "adoc", "org") + ` THEN 'text' + ELSE 'other' END` + +// The returned predicate is inserted before each candidate stream's LIMIT, +// including FTS-first streams. Filtering after their cap silently loses hits. +func searchOptionsPredicate(options SearchOptions) (string, []any) { + var predicate strings.Builder + var args []any + if options.FromMS != nil || options.BeforeMS != nil { + dateSQL := "r.created_at_ms" + if options.DateField == "created" { + // Objects.uuid is a primary-key lookup. Avoid joining Objects in the + // normal search plan when Object creation is not being filtered. + predicate.WriteString(" AND EXISTS (SELECT 1 FROM objects o WHERE o.uuid=p.object_uuid") + dateSQL = "o.created_at*1000" + } + if options.FromMS != nil { + predicate.WriteString(" AND " + dateSQL + ">=?") + args = append(args, *options.FromMS) + } + if options.BeforeMS != nil { + predicate.WriteString(" AND " + dateSQL + " 3 { + t.Fatalf("nonmatching metadata reached ACL callback: %d calls", calls) + } + if query == "bodymarker" && !results[0].BodyMatch { + t.Fatal("FTS body stream was not used") + } + if query == "marker filename" && !results[0].FilenameMatch { + t.Fatal("FTS filename stream was not used") + } + } + } +} + +func TestSearchOptionsKeepACLDomainScopeAndEmptyQuerySemantics(t *testing.T) { + st := searchStoreFixture(t) + domain := defaultDomainUUID(t, st) + for _, path := range []string{"/literal_%/visible", "/literal_%/hidden", "/literalXY/other"} { + insertSearchFilterPage(t, st, domain, path, "application/pdf", "paper.pdf", "", 1, 1000) + } + insertSearchFilterPage(t, st, "foreign-domain", "/literal_%/foreign", "application/pdf", "paper.pdf", "", 1, 1000) + results, err := st.SearchPathsInDomainWithOptions(context.Background(), domain, "/literal_%", "", 100, func(path string) bool { return path != "/literal_%/hidden" }, store.SearchOptions{FileType: "pdf"}) + if err != nil || len(results) != 1 || results[0].Path != "/literal_%/visible" { + t.Fatalf("filter-only search leaked ACL/Domain/Scope: %+v %v", results, err) + } + for _, options := range []store.SearchOptions{{}, {DateField: "created"}} { + results, err := st.SearchPathsInDomainWithOptions(context.Background(), domain, "/", "", 100, func(string) bool { t.Fatal("empty search invoked ACL"); return true }, options) + if err != nil || len(results) != 0 { + t.Fatalf("empty search enumerated Pages: %+v %v", results, err) + } + } + if results, err := st.SearchPathsInDomainWithOptions(context.Background(), domain, "/", "", 100, nil, store.SearchOptions{FileType: "pdf"}); err != nil || len(results) != 0 { + t.Fatalf("nil ACL searched Pages: %+v %v", results, err) + } + ctx, cancel := context.WithCancel(context.Background()) + cancel() + if _, err := st.SearchPathsInDomainWithOptions(ctx, domain, "/", "", 100, func(string) bool { return true }, store.SearchOptions{FileType: "pdf"}); !errors.Is(err, context.Canceled) { + t.Fatalf("cancellation ignored: %v", err) + } +} diff --git a/internal/store/search_index.go b/internal/store/search_index.go new file mode 100644 index 0000000..7ebc208 --- /dev/null +++ b/internal/store/search_index.go @@ -0,0 +1,211 @@ +package store + +import "database/sql" + +// EnsureSearchIndexSchema installs an FTS5 index over immutable Revisions. +// Paths stay outside the index because links can be renamed independently; the +// search query joins matching latest Revisions to the current domain Paths. +func (s *Store) EnsureSearchIndexSchema() error { + var revisionsTable string + if err := s.DB.QueryRow(` + SELECT name FROM sqlite_master + WHERE type = 'table' AND name = 'revisions' + `).Scan(&revisionsTable); err != nil { + if err == sql.ErrNoRows { + return nil + } + return err + } + if _, err := s.DB.Exec(` + CREATE VIRTUAL TABLE IF NOT EXISTS revision_search USING fts5( + revision_uuid UNINDEXED, + object_uuid UNINDEXED, + filename, + body, + tokenize = 'unicode61' + ) + `); err != nil { + return err + } + if _, err := s.DB.Exec(` + CREATE TABLE IF NOT EXISTS revision_search_state ( + revision_uuid TEXT PRIMARY KEY + ) + `); err != nil { + return err + } + if _, err := s.DB.Exec(` + CREATE TABLE IF NOT EXISTS latest_revision_index ( + object_uuid TEXT PRIMARY KEY, + revision_uuid TEXT NOT NULL, + content_type TEXT NOT NULL, + filename TEXT NOT NULL, + document_hash TEXT NOT NULL, + created_at_ms INTEGER NOT NULL + ); + CREATE TABLE IF NOT EXISTS search_schema_state ( + name TEXT PRIMARY KEY + ); + CREATE INDEX IF NOT EXISTS idx_latest_revision_search_uuid ON latest_revision_index(revision_uuid) + `); err != nil { + return err + } + var latestBackfilled int + if err := s.DB.QueryRow(` + SELECT EXISTS( + SELECT 1 FROM search_schema_state + WHERE name = 'latest_revision_index_v1' + ) + `).Scan(&latestBackfilled); err != nil { + return err + } + if latestBackfilled == 0 { + if _, err := s.DB.Exec(` + INSERT OR REPLACE INTO latest_revision_index ( + object_uuid, revision_uuid, content_type, filename, + document_hash, created_at_ms + ) + SELECT + object_uuid, uuid, COALESCE(content_type, ''), + COALESCE(filename, ''), COALESCE(document_hash, ''), + COALESCE(created_at_ms, created_at * 1000, 0) + FROM ( + SELECT + uuid, object_uuid, content_type, filename, + document_hash, created_at_ms, created_at, + ROW_NUMBER() OVER ( + PARTITION BY object_uuid + ORDER BY COALESCE(created_at_ms, created_at * 1000) DESC, + rowid DESC + ) AS rn + FROM revisions + ) + WHERE rn = 1; + INSERT OR IGNORE INTO search_schema_state (name) + VALUES ('latest_revision_index_v1'); + `); err != nil { + return err + } + } + // Populate the cheap membership table once for installations that already + // created revision_search before revision_search_state was introduced. + var stateExists int + if err := s.DB.QueryRow(` + SELECT EXISTS(SELECT 1 FROM revision_search_state LIMIT 1) + `).Scan(&stateExists); err != nil { + return err + } + if stateExists == 0 { + if _, err := s.DB.Exec(` + INSERT OR IGNORE INTO revision_search_state (revision_uuid) + SELECT revision_uuid FROM revision_search + `); err != nil { + return err + } + } + // Trigger definitions evolve with the projection schema; recreate them so + // existing installations receive the current maintenance logic. + if _, err := s.DB.Exec(` + DROP TRIGGER IF EXISTS revision_search_insert; + DROP TRIGGER IF EXISTS revision_search_delete; + `); err != nil { + return err + } + if _, err := s.DB.Exec(` + CREATE TRIGGER IF NOT EXISTS revision_search_insert + AFTER INSERT ON revisions BEGIN + INSERT INTO revision_search ( + revision_uuid, object_uuid, filename, body + ) VALUES ( + new.uuid, + new.object_uuid, + COALESCE(new.filename, ''), + CASE + WHEN lower(COALESCE(new.content_type, '')) LIKE 'text/%' + OR lower(COALESCE(new.content_type, '')) LIKE 'application/json%' + OR lower(COALESCE(new.content_type, '')) LIKE 'application/xml%' + OR lower(COALESCE(new.content_type, '')) LIKE 'application/javascript%' + OR lower(COALESCE(new.content_type, '')) LIKE 'application/x-yaml%' + OR lower(COALESCE(new.content_type, '')) LIKE 'application/yaml%' + THEN COALESCE(new.body, '') + ELSE '' + END + ); + INSERT OR IGNORE INTO revision_search_state (revision_uuid) + VALUES (new.uuid); + INSERT INTO latest_revision_index ( + object_uuid, revision_uuid, content_type, filename, + document_hash, created_at_ms + ) VALUES ( + new.object_uuid, new.uuid, COALESCE(new.content_type, ''), + COALESCE(new.filename, ''), COALESCE(new.document_hash, ''), + COALESCE(new.created_at_ms, new.created_at * 1000, 0) + ) + ON CONFLICT(object_uuid) DO UPDATE SET + revision_uuid = excluded.revision_uuid, + content_type = excluded.content_type, + filename = excluded.filename, + document_hash = excluded.document_hash, + created_at_ms = excluded.created_at_ms + WHERE excluded.created_at_ms >= latest_revision_index.created_at_ms; + END + `); err != nil { + return err + } + if _, err := s.DB.Exec(` + CREATE TRIGGER IF NOT EXISTS revision_search_delete + AFTER DELETE ON revisions BEGIN + DELETE FROM revision_search WHERE revision_uuid = old.uuid; + DELETE FROM revision_search_state WHERE revision_uuid = old.uuid; + DELETE FROM latest_revision_index + WHERE object_uuid = old.object_uuid + AND revision_uuid = old.uuid; + INSERT OR REPLACE INTO latest_revision_index ( + object_uuid, revision_uuid, content_type, filename, + document_hash, created_at_ms + ) + SELECT + object_uuid, uuid, COALESCE(content_type, ''), + COALESCE(filename, ''), COALESCE(document_hash, ''), + COALESCE(created_at_ms, created_at * 1000, 0) + FROM revisions + WHERE object_uuid = old.object_uuid + ORDER BY COALESCE(created_at_ms, created_at * 1000) DESC, rowid DESC + LIMIT 1; + END + `); err != nil { + return err + } + _, err := s.DB.Exec(` + INSERT INTO revision_search ( + revision_uuid, object_uuid, filename, body + ) + SELECT + r.uuid, + r.object_uuid, + COALESCE(r.filename, ''), + CASE + WHEN lower(COALESCE(r.content_type, '')) LIKE 'text/%' + OR lower(COALESCE(r.content_type, '')) LIKE 'application/json%' + OR lower(COALESCE(r.content_type, '')) LIKE 'application/xml%' + OR lower(COALESCE(r.content_type, '')) LIKE 'application/javascript%' + OR lower(COALESCE(r.content_type, '')) LIKE 'application/x-yaml%' + OR lower(COALESCE(r.content_type, '')) LIKE 'application/yaml%' + THEN COALESCE(r.body, '') + ELSE '' + END + FROM revisions r + WHERE NOT EXISTS ( + SELECT 1 FROM revision_search_state state + WHERE state.revision_uuid = r.uuid + ) + `) + if err != nil { + return err + } + _, err = s.DB.Exec(` + INSERT OR IGNORE INTO revision_search_state (revision_uuid) + SELECT uuid FROM revisions + `) + return err +} diff --git a/internal/store/search_live_test.go b/internal/store/search_live_test.go new file mode 100644 index 0000000..a226f31 --- /dev/null +++ b/internal/store/search_live_test.go @@ -0,0 +1,70 @@ +package store_test + +import ( + "context" + "database/sql" + "net/url" + "os" + "path/filepath" + "testing" + "time" + + "pageswiki/internal/store" +) + +// This opt-in diagnostic never initializes/migrates a Store or prints Page +// contents, Paths, account information or queries. SQLite itself enforces ro. +func TestSearchReadOnlyDatabase(t *testing.T) { + filename := os.Getenv("PAGESWIKI_SEARCH_DIAGNOSTIC_DB") + if filename == "" { + t.Skip("set PAGESWIKI_SEARCH_DIAGNOSTIC_DB for read-only search timing") + } + absolute, err := filepath.Abs(filename) + if err != nil { + t.Fatal(err) + } + dsn := (&url.URL{Scheme: "file", Path: absolute, RawQuery: url.Values{ + "mode": {"ro"}, "_pragma": {"query_only(1)", "busy_timeout(1000)"}, + }.Encode()}).String() + database, err := sql.Open("sqlite", dsn) + if err != nil { + t.Fatal(err) + } + defer database.Close() + database.SetMaxOpenConns(1) + ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second) + defer cancel() + var domain string + if err := database.QueryRowContext(ctx, `SELECT uuid FROM domains WHERE enabled=1 ORDER BY id LIMIT 1`).Scan(&domain); err != nil { + t.Fatal(err) + } + st := &store.Store{DB: database} + queries := []string{"wiki", "the", "a", "検索"} + if query := os.Getenv("PAGESWIKI_SEARCH_DIAGNOSTIC_QUERY"); query != "" { + queries = []string{query} + } + for i, query := range queries { + start := time.Now() + results, err := st.SearchPathsInDomainFiltered(ctx, domain, "/", query, 100, func(string) bool { return true }) + t.Logf("case=%d rows=%d elapsed=%s error=%v", i, len(results), time.Since(start).Round(time.Millisecond), err) + if err != nil { + t.Errorf("case %d search failed", i) + } + } + if os.Getenv("PAGESWIKI_SEARCH_DIAGNOSTIC_FILTERS") == "1" { + for i, options := range []store.SearchOptions{{FileType: "pdf"}, {FileType: "image"}, {FileType: "archive"}, {FileType: "code"}, {FileType: "other"}, {Extension: "pdf"}} { + start := time.Now() + results, err := st.SearchPathsInDomainWithOptions(ctx, domain, "/", "", 100, func(string) bool { return true }, options) + t.Logf("filter-case=%d rows=%d elapsed=%s error=%v", i, len(results), time.Since(start).Round(time.Millisecond), err) + if err != nil { + t.Errorf("filter case %d search failed", i) + } + } + start := time.Now() + city, err := st.SearchCityInDomain(ctx, domain, "/", "a", 30, func(string) bool { return true }, store.SearchOptions{}) + t.Logf("city rows=%d elapsed=%s error=%v", len(city), time.Since(start).Round(time.Millisecond), err) + if err != nil { + t.Error("City metadata search failed") + } + } +} diff --git a/internal/store/search_query_plan_test.go b/internal/store/search_query_plan_test.go new file mode 100644 index 0000000..1f00a69 --- /dev/null +++ b/internal/store/search_query_plan_test.go @@ -0,0 +1,132 @@ +package store + +import ( + "context" + "database/sql" + "errors" + "strings" + "testing" + "time" + + "pageswiki/internal/db" +) + +func searchQueryPlan(t *testing.T, database *sql.DB, query string, args ...any) []string { + t.Helper() + rows, err := database.Query("EXPLAIN QUERY PLAN "+query, args...) + if err != nil { + t.Fatal(err) + } + defer rows.Close() + var plan []string + for rows.Next() { + var id, parent, unused int + var detail string + if err := rows.Scan(&id, &parent, &unused, &detail); err != nil { + t.Fatal(err) + } + plan = append(plan, detail) + } + if err := rows.Err(); err != nil { + t.Fatal(err) + } + return plan +} + +func TestSearchExcerptDeadlineIsOptionalButParentCancellationIsNot(t *testing.T) { + database, err := db.Open(t.TempDir() + "/excerpt-deadline.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + New(database) + tx, err := database.BeginTx(context.Background(), &sql.TxOptions{ReadOnly: true}) + if err != nil { + t.Fatal(err) + } + defer tx.Rollback() + excerpts, err := loadSearchBodyExcerpts(context.Background(), tx, `"needle"*`, []any{1}, -time.Second) + if err != nil || len(excerpts) != 0 { + t.Fatalf("optional excerpt deadline discarded search: excerpts=%v err=%v", excerpts, err) + } + var one int + if err := tx.QueryRow(`SELECT 1`).Scan(&one); err != nil || one != 1 { + t.Fatalf("excerpt timeout left search transaction unusable: %d %v", one, err) + } + ctx, cancel := context.WithCancel(context.Background()) + cancel() + if _, err := loadSearchBodyExcerpts(ctx, tx, `"needle"*`, []any{1}, time.Second); !errors.Is(err, context.Canceled) { + t.Fatalf("parent cancellation was swallowed: %v", err) + } + if _, err := loadSearchBodyExcerpts(context.Background(), tx, `NEAR(`, []any{1}, time.Second); err == nil { + t.Fatal("non-timeout SQL failure was swallowed") + } +} + +func TestSearchFTSPlanScansMatchesOnce(t *testing.T) { + database, err := db.Open(t.TempDir() + "/search-plan.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + New(database) + for _, field := range []string{"body", "filename"} { + plan := searchQueryPlan(t, database, searchFTSCandidatesSQL, + field+` : ("needle"*)`, "domain", "/", "/", "0", SearchCandidateLimit) + if len(plan) != 3 || !strings.Contains(plan[0], "SCAN revision_search VIRTUAL TABLE") || + !strings.Contains(plan[1], "revision_uuid=?") || !strings.Contains(plan[2], "object_uuid=? AND domain_uuid=?") { + t.Fatalf("%s search must scan FTS once, then use indexed Revision/Path seeks:\n%s", field, strings.Join(plan, "\n")) + } + } + plan := searchQueryPlan(t, database, searchBodyExcerptsSQL(2), `body : ("needle"*)`, 1, 2) + if len(plan) != 1 || !strings.Contains(plan[0], "VIRTUAL TABLE INDEX 0:=M4") { + t.Fatalf("snippets must use both rowid and MATCH constraints:\n%s", strings.Join(plan, "\n")) + } +} + +func TestSearchFilteredFTSPlanKeepsMatchFirstAndIndexedSeeks(t *testing.T) { + database, err := db.Open(t.TempDir() + "/search-filter-plan.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + New(database) + from, before := int64(1000), int64(2000) + for _, options := range []SearchOptions{ + {FileType: "code"}, {Extension: "py"}, {FromMS: &from, BeforeMS: &before}, + {DateField: "created", FromMS: &from, BeforeMS: &before, FileType: "code", Extension: "py"}, + } { + predicate, filterArgs := searchOptionsPredicate(options) + args := []any{`body : ("needle"*)`, "domain", "/", "/", "0"} + args = append(args, filterArgs...) + args = append(args, SearchCandidateLimit) + plan := searchQueryPlan(t, database, searchFTSCandidatesBaseSQL+predicate+` LIMIT ?`, args...) + if len(plan) < 3 || !strings.Contains(plan[0], "SCAN revision_search VIRTUAL TABLE") || + !strings.Contains(plan[1], "revision_uuid=?") || !strings.Contains(plan[2], "object_uuid=? AND domain_uuid=?") { + t.Fatalf("filtered FTS must scan MATCH once, then indexed Revision/Path seeks: %+v\n%s", options, strings.Join(plan, "\n")) + } + if options.DateField == "created" { + if len(plan) != 5 || !strings.Contains(plan[4], "SEARCH o USING INDEX") || !strings.Contains(plan[4], "uuid=?") { + t.Fatalf("Object date needs one indexed PK lookup, not a scan: %s", strings.Join(plan, "\n")) + } + } + args = []any{"domain", "/", "/", "0"} + args = append(args, filterArgs...) + args = append(args, SearchCandidateLimit) + plan = searchQueryPlan(t, database, searchPathCandidatesBaseSQL+predicate+` ORDER BY p.path LIMIT ?`, args...) + joinedPlan := strings.Join(plan, "\n") + if len(plan) < 2 || !strings.Contains(plan[0], "SEARCH p USING INDEX") || !strings.Contains(plan[0], "domain_uuid=?") || + !strings.Contains(joinedPlan, "SEARCH r USING INDEX") || !strings.Contains(joinedPlan, "object_uuid=?") || strings.Contains(joinedPlan, "TEMP B-TREE") { + t.Fatalf("filter-only search must keep indexed Domain order and bounded candidate memory: %s", strings.Join(plan, "\n")) + } + } +} diff --git a/internal/store/search_test.go b/internal/store/search_test.go new file mode 100644 index 0000000..557b4e9 --- /dev/null +++ b/internal/store/search_test.go @@ -0,0 +1,321 @@ +package store_test + +import ( + "context" + "fmt" + "strings" + "testing" + + "pageswiki/internal/db" + "pageswiki/internal/store" +) + +func TestSearchUsesLatestTextRevisionAndCurrentPath(t *testing.T) { + database, err := db.Open(t.TempDir() + "/pages.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := store.New(database) + + objectUUID, err := st.CreatePageAtPath("/docs/guide") + if err != nil { + t.Fatal(err) + } + if _, err := st.SaveRevisionContent( + objectUUID, []byte("古い検索語"), "", "ja", + "text/plain; charset=utf-8", "guide.txt", + ); err != nil { + t.Fatal(err) + } + if _, err := st.SaveRevisionContent( + objectUUID, []byte("新しい検索語と本文"), "", "ja", + "text/plain; charset=utf-8", "guide.txt", + ); err != nil { + t.Fatal(err) + } + + results, err := st.SearchPathsInDomain( + defaultDomainUUID(t, st), "/docs", "新しい", 10, + ) + if err != nil { + t.Fatal(err) + } + if len(results) != 1 || results[0].Path != "/docs/guide" { + t.Fatalf("new body results = %#v", results) + } + + results, err = st.SearchPathsInDomain( + defaultDomainUUID(t, st), "/docs", "古い", 10, + ) + if err != nil { + t.Fatal(err) + } + if len(results) != 0 { + t.Fatalf("old body unexpectedly matched: %#v", results) + } + + if err := st.RenamePath("/docs/guide", "/docs/manual"); err != nil { + t.Fatal(err) + } + results, err = st.SearchPathsInDomain( + defaultDomainUUID(t, st), "/docs", "manual", 10, + ) + if err != nil { + t.Fatal(err) + } + if len(results) != 1 || results[0].Path != "/docs/manual" { + t.Fatalf("renamed path results = %#v", results) + } +} + +func searchStoreFixture(t *testing.T) *store.Store { + t.Helper() + database, err := db.Open(t.TempDir() + "/search.db") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { database.Close() }) + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + return store.New(database) +} + +func TestSearchLiteralScopeAndMatchSources(t *testing.T) { + st := searchStoreFixture(t) + domain := defaultDomainUUID(t, st) + for _, path := range []string{"/docs_%/literal_%", "/docsXY/literal-any", "/docs_%extra/literal_%", "/docs_%/body"} { + object, err := st.CreatePageAtPathInDomain(domain, path) + if err != nil { + t.Fatal(err) + } + filename, body := "report_annual.txt", "Some surrounding context about nebula and stars." + if strings.HasSuffix(path, "body") { + filename = "body.txt" + } + if _, err := st.SaveRevisionContent(object, []byte(body), "", "en", "text/plain", filename); err != nil { + t.Fatal(err) + } + } + results, err := st.SearchPathsInDomain(domain, "/docs_%", "literal_%", 20) + if err != nil || len(results) != 1 || results[0].Path != "/docs_%/literal_%" || !results[0].PathMatch || results[0].BodyMatch { + t.Fatalf("literal search: %#v %v", results, err) + } + results, err = st.SearchPathsInDomain(domain, "/docs_%", "annual report", 20) + if err != nil || len(results) != 1 || !results[0].FilenameMatch || results[0].BodyMatch { + t.Fatalf("filename prefix source: %#v %v", results, err) + } + results, err = st.SearchPathsInDomain(domain, "/docs_%", "nebula", 20) + if err != nil || len(results) != 2 || !results[0].BodyMatch || !strings.Contains(results[0].Excerpt, "nebula") || results[0].FilenameMatch { + t.Fatalf("body context: %#v %v", results, err) + } + for _, query := range []string{"%", "_", `" OR *`, `NEAR(`, `body:nebula`} { + if _, err := st.SearchPathsInDomain(domain, "/docs_%", query, 20); err != nil { + t.Fatalf("literal syntax %q: %v", query, err) + } + } +} + +func TestSearchFiltersBeforeLimitAndBoundsCandidates(t *testing.T) { + st := searchStoreFixture(t) + domain := defaultDomainUUID(t, st) + object, err := st.CreatePageAtPathInDomain(domain, "/items/base") + if err != nil { + t.Fatal(err) + } + if _, err := st.SaveRevisionContent(object, []byte("needle context"), "", "en", "text/plain", "document.txt"); err != nil { + t.Fatal(err) + } + tx, err := st.DB.Begin() + if err != nil { + t.Fatal(err) + } + for i := 0; i < store.SearchCandidateLimit+50; i++ { + if _, err := tx.Exec(`INSERT INTO paths(domain_uuid,path,object_uuid,created_at,is_primary) VALUES(?,?,?,1,0)`, domain, fmt.Sprintf("/items/needle-%04d", i), object); err != nil { + tx.Rollback() + t.Fatal(err) + } + } + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + calls := 0 + results, err := st.SearchPathsInDomainFiltered(context.Background(), domain, "/items", "needle-", 3, func(path string) bool { + calls++ + return strings.HasSuffix(path, "0004") || strings.HasSuffix(path, "0005") + }) + if err != nil || len(results) != 2 || calls > 3*store.SearchCandidateLimit { + t.Fatalf("filter/limit: results=%#v calls=%d err=%v", results, calls, err) + } + if _, err := st.SearchPathsInDomain(domain, "/", strings.Repeat("a", 513), 10); err == nil { + t.Fatal("oversized query accepted") + } + ctx, cancel := context.WithCancel(context.Background()) + cancel() + if _, err := st.SearchPathsInDomainFiltered(ctx, domain, "/", "needle", 10, func(string) bool { return true }); err == nil { + t.Fatal("canceled query succeeded") + } + if results, err := st.SearchPathsInDomainFiltered(context.Background(), domain, "/", "needle", 10, nil); err != nil || len(results) != 0 { + t.Fatal("missing authorization filter returned results") + } +} + +func TestSearchKeepsDomainAliasesSeparate(t *testing.T) { + st := searchStoreFixture(t) + first, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + if err := st.CreateDomain(first.CampusUUID, "search-other", "Other", "search-other", "local", "", "", true); err != nil { + t.Fatal(err) + } + domains, err := st.ListDomains() + if err != nil { + t.Fatal(err) + } + for _, domain := range domains { + object, err := st.CreatePageAtPathInDomain(domain.UUID, "/same-path") + if err != nil { + t.Fatal(err) + } + body := "OTHER_DOMAIN_MARKER" + if domain.UUID == first.UUID { + body = "FIRST_DOMAIN_MARKER" + } + if _, err := st.SaveRevisionContent(object, []byte(body), "", "en", "text/plain", "same-name.txt"); err != nil { + t.Fatal(err) + } + } + results, err := st.SearchPathsInDomain(first.UUID, "/", "OTHER_DOMAIN_MARKER", 10) + if err != nil || len(results) != 0 { + t.Fatalf("other Domain body leaked: %#v %v", results, err) + } + results, err = st.SearchPathsInDomain(first.UUID, "/", "FIRST_DOMAIN_MARKER", 10) + if err != nil || len(results) != 1 || !strings.Contains(results[0].Excerpt, "FIRST_DOMAIN_MARKER") { + t.Fatalf("current Domain result: %#v %v", results, err) + } +} + +func TestSearchManyPagesPreservesCurrentRowsAndExcerpts(t *testing.T) { + st := searchStoreFixture(t) + domain := defaultDomainUUID(t, st) + tx, err := st.DB.Begin() + if err != nil { + t.Fatal(err) + } + defer tx.Rollback() + for i := 0; i < 600; i++ { + object := fmt.Sprintf("search-object-%04d", i) + if _, err := tx.Exec(`INSERT INTO objects(uuid,kind,created_at) VALUES(?,'page',1)`, object); err != nil { + t.Fatal(err) + } + if _, err := tx.Exec(`INSERT INTO paths(domain_uuid,path,object_uuid,created_at,is_primary) VALUES(?,?,?,1,1)`, domain, fmt.Sprintf("/collection/page-%04d", i), object); err != nil { + t.Fatal(err) + } + for revision := 0; revision < 2; revision++ { + body := "outdated needle " + strings.Repeat("obsolete context ", 64) + if revision == 1 { + body = fmt.Sprintf("Current needle marker%04d; ", i) + strings.Repeat("surrounding text ", 64) + } + if _, err := tx.Exec(`INSERT INTO revisions(uuid,object_uuid,body,document_hash,lang,content_type,filename,message,created_at_ms,created_at) + VALUES(?,?,?,'','en','text/plain','needle.txt','',?,?)`, fmt.Sprintf("search-revision-%04d-%d", i, revision), object, body, (revision+1)*1000, revision+1); err != nil { + t.Fatal(err) + } + } + } + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + // Exercise 1,200 FTS rows, current-only filtering, both candidate streams, + // display clipping and the rowid-based batched snippet lookup together. + results, err := st.SearchPathsInDomainFiltered(context.Background(), domain, "/collection", "needle", 100, func(path string) bool { + return !strings.HasSuffix(path, "0000") + }) + if err != nil || len(results) != 100 { + t.Fatalf("large search rows=%d err=%v", len(results), err) + } + for i, result := range results { + want := fmt.Sprintf("/collection/page-%04d", i+1) + if result.Path != want || !result.BodyMatch || !result.FilenameMatch || strings.Contains(result.Excerpt, "outdated") { + t.Fatalf("result %d mismatched current excerpt/source: %+v", i, result) + } + // Race instrumentation can spend the optional 400ms snippet budget. + // Hits must still be returned, with either the correct excerpt or an + // explicit omission, never an old/wrong Revision or silent blank text. + if result.ExcerptOmitted { + if result.Excerpt != "" { + t.Fatal("omitted result contains excerpt text") + } + } else if !strings.Contains(result.Excerpt, fmt.Sprintf("marker%04d", i+1)) { + t.Fatalf("result %d has wrong current excerpt: %+v", i, result) + } + } +} + +func TestSearchExcerptInputBudgetsKeepHitsAndDeduplicateAliases(t *testing.T) { + st := searchStoreFixture(t) + domain := defaultDomainUUID(t, st) + const size = 48 << 10 + for i := 0; i < 30; i++ { + object, err := st.CreatePageAtPathInDomain(domain, fmt.Sprintf("/items/page-%02d", i)) + if err != nil { + t.Fatal(err) + } + if _, err := st.SaveRevisionContent(object, []byte("needle "+strings.Repeat(" ", size-7)), "", "en", "text/plain", "entry.txt"); err != nil { + t.Fatal(err) + } + if i == 0 { + if _, err := st.DB.Exec(`INSERT INTO paths(domain_uuid,path,object_uuid,created_at,is_primary) VALUES(?,?,?,1,0)`, domain, "/items/page-xx", object); err != nil { + t.Fatal(err) + } + } + } + object, err := st.CreatePageAtPathInDomain(domain, "/items/byte-limit") + if err != nil { + t.Fatal(err) + } + // Below 64K characters but above 64KiB: budgets count bytes, not runes. + if _, err := st.SaveRevisionContent(object, []byte("needle "+strings.Repeat("界", 23000)), "", "ja", "text/plain", "entry.txt"); err != nil { + t.Fatal(err) + } + results, err := st.SearchPathsInDomain(domain, "/items", "needle", 100) + if err != nil || len(results) != 32 { + t.Fatalf("budgeted search lost hits: rows=%d err=%v", len(results), err) + } + included := 0 + for _, result := range results { + if !result.BodyMatch { + t.Fatalf("omitted excerpt lost body-match source: %+v", result) + } + if result.Path == "/items/byte-limit" && !result.ExcerptOmitted { + t.Fatal("multi-byte document bypassed byte budget") + } + if result.ExcerptOmitted { + if result.Excerpt != "" { + t.Fatal("omitted excerpt contains body") + } + } else { + included++ + if !strings.Contains(result.Excerpt, "needle") { + t.Fatal("included excerpt lost matching term") + } + } + } + want := store.SearchExcerptTotalBytes/size + 1 // the alias reuses one excerpt + if included != want { + t.Fatalf("included excerpts=%d want=%d; alias must not consume input budget twice", included, want) + } +} + +func defaultDomainUUID(t *testing.T, st *store.Store) string { + t.Helper() + domain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + return domain.UUID +} diff --git a/internal/store/store.go b/internal/store/store.go index 0cd92b2..653e91f 100644 --- a/internal/store/store.go +++ b/internal/store/store.go @@ -1,23 +1,149 @@ package store -import "database/sql" +import ( + "crypto/rand" + "crypto/sha256" + "database/sql" + "os" + "path/filepath" + "strings" + "sync" +) type Store struct { - DB *sql.DB + DB *sql.DB + DocumentRoot string + pathCacheMu sync.RWMutex + revisionWriteMu sync.Mutex + childCache map[string][]string + authKey []byte } func New( db *sql.DB, ) *Store { + return NewWithDocumentRoot( + db, + "", + ) +} + +func NewWithDocumentRoot( + db *sql.DB, + documentRoot string, +) *Store { st := &Store{ - DB: db, + DB: db, + DocumentRoot: strings.TrimSpace(documentRoot), + childCache: map[string][]string{}, } + st.authKey = loadOrCreateAuthKey(st.DocumentRoot) - if err := st.EnsureDistrictsSchema(); err != nil { + if err := st.EnsureDomainsSchema(); err != nil { + panic(err) + } + + if err := st.EnsureCampusesSchema(); err != nil { + panic(err) + } + + if err := st.EnsureDomainPathsSchema(); err != nil { + panic(err) + } + if err := st.EnsureObjectListingSchema(); err != nil { + panic(err) + } + if err := st.EnsureAssetsSchema(); err != nil { + panic(err) + } + + if err := st.EnsureFederationSchema(); err != nil { + panic(err) + } + + if err := st.EnsureDocumentStore(); err != nil { + panic(err) + } + if err := st.EnsureEventJobsSchema(); err != nil { + panic(err) + } + if err := st.EnsureActivityOutboxSchema(); err != nil { + panic(err) + } + if err := st.EnsureNotificationSchema(); err != nil { + panic(err) + } + if err := st.EnsurePublicationApprovalSchema(); err != nil { + panic(err) + } + if err := st.EnsureBroadcastSchema(); err != nil { + panic(err) + } + if err := st.EnsureProjectionMetadataSchema(); err != nil { + panic(err) + } + if err := st.EnsureResourceHistorySchema(); err != nil { + panic(err) + } + if err := st.EnsureAdapterSessionsSchema(); err != nil { + panic(err) + } + if err := st.EnsureAuthSchema(); err != nil { + panic(err) + } + if err := st.EnsureTasksSchema(); err != nil { + panic(err) + } + if err := st.EnsureBrowserNavigationSchema(); err != nil { + panic(err) + } + if err := st.EnsureCitySchema(); err != nil { + panic(err) + } + if err := st.EnsurePeriodicalSchema(); err != nil { + panic(err) + } + if err := st.EnsureUserSpaceSchema(); err != nil { + panic(err) + } + if err := st.EnsureBuiltinAdminGroups(); err != nil { + panic(err) + } + if err := st.EnsureSearchIndexSchema(); err != nil { + panic(err) + } + if err := st.EnsureImportSchema(); err != nil { + panic(err) + } + if err := st.EnsureZombieGCSchema(); err != nil { panic(err) } return st } + +func loadOrCreateAuthKey(documentRoot string) []byte { + if encoded := strings.TrimSpace(os.Getenv("PAGESWIKI_AUTH_KEY")); encoded != "" { + sum := sha256.Sum256([]byte(encoded)) + return sum[:] + } + path := "" + if documentRoot != "" { + path = filepath.Join(filepath.Dir(documentRoot), "auth.key") + if data, err := os.ReadFile(path); err == nil && len(data) == 32 { + return data + } + } + key := make([]byte, 32) + if _, err := rand.Read(key); err != nil { + panic(err) + } + if path != "" { + if err := os.WriteFile(path, key, 0600); err != nil { + panic(err) + } + } + return key +} diff --git a/internal/store/task_blocks.go b/internal/store/task_blocks.go new file mode 100644 index 0000000..8d05a77 --- /dev/null +++ b/internal/store/task_blocks.go @@ -0,0 +1,191 @@ +package store + +import ( + "context" + "database/sql" + "errors" + "time" + + "github.com/google/uuid" +) + +type TaskBlock struct { + UUID string `json:"uuid"` + TaskUUID string `json:"task_uuid"` + CalendarUUID string `json:"calendar_uuid"` + EventUID string `json:"event_uid"` + Start time.Time `json:"start"` + End time.Time `json:"end"` + State string `json:"state"` + Title string `json:"-"` // Snapshot approved for the calendar summary. +} + +func (s *Store) ensureTaskBlocksSchema() error { + _, err := s.DB.Exec(`CREATE TABLE IF NOT EXISTS organizer_time_blocks(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,uuid TEXT NOT NULL,task_uuid TEXT NOT NULL,calendar_uuid TEXT NOT NULL,event_uid TEXT NOT NULL,start TEXT NOT NULL,end TEXT NOT NULL,state TEXT NOT NULL,created_at_ms INTEGER NOT NULL,PRIMARY KEY(domain_uuid,uuid)); CREATE INDEX IF NOT EXISTS organizer_time_blocks_live ON organizer_time_blocks(domain_uuid,owner_uuid,task_uuid,created_at_ms,uuid) WHERE state!='unlinked'`) + if err != nil { + return err + } + cols, err := tableColumns(s.DB, "organizer_time_blocks") + if err != nil { + return err + } + if !cols["title"] { + _, err = s.DB.Exec(`ALTER TABLE organizer_time_blocks ADD COLUMN title TEXT NOT NULL DEFAULT ''`) + } + return err +} + +const taskBlockColumns = `uuid,task_uuid,calendar_uuid,event_uid,start,end,state,title` + +func scanTaskBlock(row interface{ Scan(...any) error }) (TaskBlock, error) { + var b TaskBlock + var start, end string + err := row.Scan(&b.UUID, &b.TaskUUID, &b.CalendarUUID, &b.EventUID, &start, &end, &b.State, &b.Title) + if err != nil { + return b, err + } + b.Start, err = time.Parse(time.RFC3339, start) + if err != nil { + return b, err + } + b.End, err = time.Parse(time.RFC3339, end) + return b, err +} + +// Reserve before touching canonical calendar files. This durable intent bridges +// the two commit domains; the caller can safely retry using the same UUID. +func (s *Store) ReserveTaskBlock(ctx context.Context, domain, actor string, b TaskBlock, version int64) (TaskBlock, error) { + for _, id := range []string{b.UUID, b.TaskUUID, b.CalendarUUID} { + if _, err := uuid.Parse(id); err != nil { + return b, ErrTaskInvalid + } + } + if b.Start.Year() < 1900 || b.End.Year() > 9999 || !b.End.After(b.Start) || b.End.Sub(b.Start) > 24*time.Hour || version < 1 { + return b, ErrTaskInvalid + } + b.Start = b.Start.UTC().Truncate(time.Second) + b.End = b.End.UTC().Truncate(time.Second) + b.EventUID = uuid.NewSHA1(uuid.NameSpaceOID, []byte("pageswiki-task-block:"+domain+":"+b.UUID)).String() + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return b, err + } + defer tx.Rollback() + if _, err = tx.ExecContext(ctx, `UPDATE domain_memberships SET state=state WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil { + return b, err + } + if err = taskActor(ctx, tx, domain, actor, true); err != nil { + return b, err + } + enabled, err := taskReminderExtensionEnabled(ctx, tx, domain) + if err != nil { + return b, err + } + if !enabled { + return b, ErrAccessDenied + } + var current int64 + err = tx.QueryRowContext(ctx, `SELECT version,title FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND uuid=? AND kind='task' AND archived=0 AND status NOT IN ('done','cancelled')`, domain, actor, b.TaskUUID).Scan(¤t, &b.Title) + if err != nil { + return b, err + } + old, err := scanTaskBlock(tx.QueryRowContext(ctx, `SELECT `+taskBlockColumns+` FROM organizer_time_blocks WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, b.UUID)) + if err == nil { + if old.TaskUUID != b.TaskUUID || old.CalendarUUID != b.CalendarUUID || !old.Start.Equal(b.Start) || !old.End.Equal(b.End) || old.State == "unlinked" { + return b, ErrTaskConflict + } + if old.Title == "" && old.State == "pending" { + old.Title = b.Title + if _, err = tx.ExecContext(ctx, `UPDATE organizer_time_blocks SET title=? WHERE domain_uuid=? AND uuid=?`, old.Title, domain, old.UUID); err != nil { + return b, err + } + } + return old, tx.Commit() + } + if !errors.Is(err, sql.ErrNoRows) { + return b, err + } + if current != version { + return b, ErrTaskConflict + } + var count int + if err = tx.QueryRowContext(ctx, `SELECT count(*) FROM organizer_time_blocks WHERE domain_uuid=? AND owner_uuid=? AND task_uuid=? AND state!='unlinked'`, domain, actor, b.TaskUUID).Scan(&count); err != nil { + return b, err + } + if count >= 100 { + return b, ErrTaskInvalid + } + b.State = "pending" + res, err := tx.ExecContext(ctx, `INSERT OR IGNORE INTO organizer_time_blocks(domain_uuid,owner_uuid,uuid,task_uuid,calendar_uuid,event_uid,start,end,state,created_at_ms,title) VALUES(?,?,?,?,?,?,?,?,?,?,?)`, domain, actor, b.UUID, b.TaskUUID, b.CalendarUUID, b.EventUID, b.Start.Format(time.RFC3339), b.End.Format(time.RFC3339), b.State, time.Now().UnixMilli(), b.Title) + if err != nil { + return b, err + } + if n, _ := res.RowsAffected(); n != 1 { + return b, sql.ErrNoRows + } + return b, tx.Commit() +} + +func (s *Store) TaskBlocks(ctx context.Context, domain, actor, task string) ([]TaskBlock, error) { + if _, err := s.GetTask(ctx, domain, actor, task); err != nil { + return nil, err + } + rows, err := s.DB.QueryContext(ctx, `SELECT `+taskBlockColumns+` FROM organizer_time_blocks WHERE domain_uuid=? AND owner_uuid=? AND task_uuid=? AND state!='unlinked' ORDER BY created_at_ms,uuid LIMIT 100`, domain, actor, task) + if err != nil { + return nil, err + } + defer rows.Close() + out := []TaskBlock{} + for rows.Next() { + b, err := scanTaskBlock(rows) + if err != nil { + return nil, err + } + out = append(out, b) + } + return out, rows.Err() +} + +func (s *Store) SetTaskBlockState(ctx context.Context, domain, actor, id, state string) error { + if state != "active" && state != "unlinked" { + return ErrTaskInvalid + } + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return err + } + defer tx.Rollback() + if _, err = tx.ExecContext(ctx, `UPDATE domain_memberships SET state=state WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil { + return err + } + if err = taskActor(ctx, tx, domain, actor, true); err != nil { + return err + } + enabled, err := taskReminderExtensionEnabled(ctx, tx, domain) + if err != nil { + return err + } + if !enabled { + return ErrAccessDenied + } + res, err := tx.ExecContext(ctx, `UPDATE organizer_time_blocks SET state=? WHERE domain_uuid=? AND owner_uuid=? AND uuid=? AND (state!='unlinked' OR ?='unlinked')`, state, domain, actor, id, state) + if err != nil { + return err + } + if n, _ := res.RowsAffected(); n != 1 { + return sql.ErrNoRows + } + return tx.Commit() +} + +func (s *Store) GetTaskBlock(ctx context.Context, domain, actor, id string) (TaskBlock, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return TaskBlock{}, err + } + b, err := scanTaskBlock(s.DB.QueryRowContext(ctx, `SELECT `+taskBlockColumns+` FROM organizer_time_blocks WHERE domain_uuid=? AND owner_uuid=? AND uuid=? AND state!='unlinked'`, domain, actor, id)) + if err != nil { + return b, err + } + _, err = s.GetTask(ctx, domain, actor, b.TaskUUID) + return b, err +} diff --git a/internal/store/task_dav.go b/internal/store/task_dav.go new file mode 100644 index 0000000..bc97c1d --- /dev/null +++ b/internal/store/task_dav.go @@ -0,0 +1,216 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "strings" +) + +// TaskDAVData is retained in the canonical task revision, not just a cache. +// Generic SaveTask preserves it; only SaveTaskDAV can replace it. +type TaskDAVData struct { + Name string `json:"name"` + UID string `json:"uid"` + Data string `json:"data"` +} + +var ErrTaskDAVLimit = errors.New("task DAV collection exceeds response limit") +var ErrTaskDAVIdentity = errors.New("task DAV UID or resource name already exists") +var ErrTaskDAVRelocated = errors.New("task DAV resource moved to a project collection; rediscover collections") + +func (s *Store) ensureTaskDAVSchema() error { + for _, q := range []string{ + `CREATE TABLE IF NOT EXISTS organizer_dav_collections(domain_uuid TEXT NOT NULL,path TEXT NOT NULL,owner_uuid TEXT NOT NULL,project_uuid TEXT NOT NULL,PRIMARY KEY(domain_uuid,path),UNIQUE(domain_uuid,project_uuid))`, + `CREATE TABLE IF NOT EXISTS organizer_dav_resources(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,item_uuid TEXT NOT NULL,name TEXT NOT NULL,uid TEXT NOT NULL,PRIMARY KEY(domain_uuid,item_uuid),UNIQUE(domain_uuid,owner_uuid,name),UNIQUE(domain_uuid,owner_uuid,uid))`, + `CREATE TABLE IF NOT EXISTS organizer_dav_legacy_hrefs(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,name TEXT NOT NULL,item_uuid TEXT NOT NULL,PRIMARY KEY(domain_uuid,owner_uuid,name))`, + `CREATE TABLE IF NOT EXISTS organizer_dav_default_lists(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,title TEXT NOT NULL,updated_at_ms INTEGER NOT NULL,PRIMARY KEY(domain_uuid,owner_uuid))`, + `CREATE TABLE IF NOT EXISTS organizer_dav_credentials(id TEXT PRIMARY KEY,domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,label TEXT NOT NULL,secret_hash TEXT NOT NULL,write_access INTEGER NOT NULL,created_ms INTEGER NOT NULL,expires_ms INTEGER NOT NULL)`, + `CREATE INDEX IF NOT EXISTS organizer_dav_credentials_owner ON organizer_dav_credentials(domain_uuid,owner_uuid)`, + `CREATE TABLE IF NOT EXISTS organizer_dav_scopes(credential_id TEXT PRIMARY KEY,scope TEXT NOT NULL CHECK(scope IN ('tasks','calendar','all')))`, + `CREATE TABLE IF NOT EXISTS organizer_dav_compat(credential_id TEXT PRIMARY KEY)`, + `CREATE TRIGGER IF NOT EXISTS organizer_dav_compat_delete AFTER DELETE ON organizer_dav_credentials BEGIN DELETE FROM organizer_dav_compat WHERE credential_id=OLD.id; END`, + `CREATE TRIGGER IF NOT EXISTS organizer_dav_scopes_delete AFTER DELETE ON organizer_dav_credentials BEGIN DELETE FROM organizer_dav_scopes WHERE credential_id=OLD.id; END`, + } { + if _, err := s.DB.Exec(q); err != nil { + return err + } + } + // Both tables are derived indexes. Rebuild atomically, including archived + // identities, so an upgrade never exposes projects in the default list or + // leaves old hrefs writable after moving them to project collections. + tx, err := s.DB.Begin() + if err != nil { + return err + } + defer tx.Rollback() + for _, q := range []string{ + // Keep upgrade tombstones: a stale client must not recreate an already + // relocated task in the default list. These are migration metadata, not + // a live alias that could delete/update a different collection. + `INSERT OR IGNORE INTO organizer_dav_legacy_hrefs(domain_uuid,owner_uuid,name,item_uuid) SELECT r.domain_uuid,r.owner_uuid,r.name,r.item_uuid FROM organizer_dav_resources r JOIN organizer_items i ON i.domain_uuid=r.domain_uuid AND i.uuid=r.item_uuid WHERE i.project_uuid<>'' AND instr(r.name,char(0))=0`, + `DELETE FROM organizer_dav_resources`, + `DELETE FROM organizer_dav_collections`, + `INSERT INTO organizer_dav_collections(domain_uuid,path,owner_uuid,project_uuid) SELECT domain_uuid,COALESCE(NULLIF(json_extract(data,'$.dav_collection'),''),'tasks/projects/'||uuid),owner_uuid,uuid FROM organizer_items WHERE kind='project'`, + `INSERT INTO organizer_dav_resources(domain_uuid,owner_uuid,item_uuid,name,uid) SELECT domain_uuid,owner_uuid,uuid,CASE WHEN project_uuid='' THEN '' ELSE char(0)||project_uuid||char(0) END||COALESCE(json_extract(data,'$.caldav.name'),uuid||'.ics'),CASE WHEN project_uuid='' THEN '' ELSE char(0)||project_uuid||char(0) END||COALESCE(json_extract(data,'$.caldav.uid'),uuid) FROM organizer_items WHERE kind='task'`, + } { + if _, err = tx.Exec(q); err != nil { + return err + } + } + return tx.Commit() +} + +func syncTaskDAVTx(ctx context.Context, tx *sql.Tx, domain, actor string, item TaskRecord) error { + if item.Kind == "project" { + _, err := tx.ExecContext(ctx, `INSERT INTO organizer_dav_collections(domain_uuid,path,owner_uuid,project_uuid) VALUES(?,?,?,?) ON CONFLICT(domain_uuid,project_uuid) DO NOTHING`, domain, item.TaskDAVCollectionPath(), actor, item.UUID) + return err + } + if item.Kind != "task" { + return nil + } + name, uid := item.UUID+".ics", item.UUID + if item.CalDAV != nil { + name, uid = item.CalDAV.Name, item.CalDAV.UID + } + project, err := taskDAVProjectTx(ctx, tx, domain, actor, item.ProjectUUID) + if err != nil { + return err + } + name, uid = taskDAVIndexKey(project, name), taskDAVIndexKey(project, uid) + var collision bool + if err := tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_dav_resources WHERE domain_uuid=? AND owner_uuid=? AND item_uuid<>? AND (name=? OR uid=?))`, domain, actor, item.UUID, name, uid).Scan(&collision); err != nil { + return err + } + if collision { + return ErrTaskDAVIdentity + } + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_dav_resources(domain_uuid,owner_uuid,item_uuid,name,uid) VALUES(?,?,?,?,?) ON CONFLICT(domain_uuid,item_uuid) DO UPDATE SET name=excluded.name,uid=excluded.uid`, domain, actor, item.UUID, name, uid) + return err +} + +func (s *Store) TaskDAVByName(ctx context.Context, domain, actor, name string, project ...string) (TaskRecord, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return TaskRecord{}, err + } + var id string + if len(project) == 1 { + name = taskDAVIndexKey(project[0], name) + } + if err := s.DB.QueryRowContext(ctx, `SELECT item_uuid FROM organizer_dav_resources WHERE domain_uuid=? AND owner_uuid=? AND name=?`, domain, actor, name).Scan(&id); err != nil { + return TaskRecord{}, err + } + return s.GetTask(ctx, domain, actor, id) +} + +// A complete bounded snapshot, including completed tasks. Never silently return +// a partial collection: synchronizers would mistake omitted resources for deletes. +func (s *Store) TaskDAVList(ctx context.Context, domain, actor string, project ...string) ([]TaskRecord, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return nil, err + } + p := "" + if len(project) == 1 { + p = project[0] + } + query := `SELECT data FROM organizer_items i WHERE domain_uuid=? AND owner_uuid=? AND kind='task' AND archived=0` + args := []any{domain, actor} + if p != "" { + query += ` AND project_uuid=?` + args = append(args, p) + } else { + query += ` AND project_uuid=''` + } + rows, err := s.DB.QueryContext(ctx, query+` ORDER BY created_at_ms DESC,uuid DESC LIMIT 10001`, args...) + if err != nil { + return nil, err + } + defer rows.Close() + out := []TaskRecord{} + size := 0 + for rows.Next() { + var raw string + if err = rows.Scan(&raw); err != nil { + return nil, err + } + size += len(raw) + if len(out) >= 10000 || size > 32<<20 { + return nil, ErrTaskDAVLimit + } + var item TaskRecord + if err = json.Unmarshal([]byte(raw), &item); err != nil { + return nil, err + } + out = append(out, item) + } + return out, rows.Err() +} + +func (s *Store) SaveTaskDAV(ctx context.Context, domain, actor string, item TaskRecord, expected int64, data *TaskDAVData, credential string, collectionProject ...string) (TaskRecord, error) { + return s.saveTask(ctx, domain, actor, item, expected, func(tx *sql.Tx, v *TaskRecord, old TaskRecord) error { + if credential != "" { + if err := taskDAVCredentialAllowed(ctx, tx, domain, actor, credential, true); err != nil { + return err + } + } + if v.Kind != "task" { + return ErrTaskInvalid + } + if len(collectionProject) == 1 { + p, err := taskDAVProjectTx(ctx, tx, domain, actor, v.ProjectUUID) + if err != nil { + return err + } + if p != collectionProject[0] { + return ErrTaskConflict + } + if p != "" { + var active bool + if err := tx.QueryRowContext(ctx, `SELECT archived=0 FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, p).Scan(&active); err != nil { + return err + } + if !active { + return ErrAccessDenied + } + } + } + if data != nil { + if !ValidTaskDAVName(data.Name) || data.UID == "" || len(data.UID) > 512 || strings.ContainsAny(data.UID, "\r\n\x00") || len(data.Data) > 32768 { + return ErrTaskInvalid + } + if old.Version > 0 { + name, uid := old.UUID+".ics", old.UUID + if old.CalDAV != nil { + name, uid = old.CalDAV.Name, old.CalDAV.UID + } + if data.Name != name || data.UID != uid { + return ErrTaskDAVIdentity + } + } else if v.ProjectUUID == "" { + var relocated bool + if err := tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_dav_legacy_hrefs WHERE domain_uuid=? AND owner_uuid=? AND name=?)`, domain, actor, data.Name).Scan(&relocated); err != nil { + return err + } + if relocated { + return ErrTaskDAVRelocated + } + } + copy := *data + v.CalDAV = © + } + return nil + }) +} + +func ValidTaskDAVName(name string) bool { + if len(name) > 128 || len(name) < 5 || !strings.HasSuffix(name, ".ics") { + return false + } + for _, c := range name { + if !(c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9' || strings.ContainsRune("._-", c)) { + return false + } + } + return name != "..ics" +} diff --git a/internal/store/task_dav_collections.go b/internal/store/task_dav_collections.go new file mode 100644 index 0000000..d29b8fe --- /dev/null +++ b/internal/store/task_dav_collections.go @@ -0,0 +1,147 @@ +package store + +import ( + "context" + "database/sql" + "errors" + "os" + "path/filepath" + + "github.com/google/uuid" +) + +var ErrTaskDAVCollectionExists = errors.New("DAV collection already exists") + +// Native projects derive their stable collection URI from their canonical UUID. +// Explicit MKCALENDAR paths keep their original identity. The reserved tasks/ +// namespace cannot shadow a VEVENT calendar (including an external source). +func (v TaskRecord) TaskDAVCollectionPath() string { + if v.DAVCollection != "" { + return v.DAVCollection + } + return "tasks/projects/" + v.UUID +} + +// Collection metadata lives in a normal, revisioned project document. This +// table is only its routing/uniqueness index, rebuilt from canonical heads. +func (s *Store) CreateTaskDAVCollection(ctx context.Context, domain, actor, path, title, credential string) (TaskRecord, error) { + id, err := uuid.Parse(path) + if err != nil || id.String() != path { + return TaskRecord{}, ErrTaskInvalid + } + item := TaskRecord{UUID: uuid.NewString(), Kind: "project", Title: title, Status: "todo", Bucket: "inbox"} + return s.saveTask(ctx, domain, actor, item, 0, func(tx *sql.Tx, v *TaskRecord, old TaskRecord) error { + if credential != "" { + if err := taskDAVCredentialAllowed(ctx, tx, domain, actor, credential, true); err != nil { + return err + } + } + var exists bool + if err := tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_dav_collections WHERE domain_uuid=? AND path=?)`, domain, path).Scan(&exists); err != nil { + return err + } + if exists { + return ErrTaskDAVCollectionExists + } + // Never shadow even a private calendar owned by another principal. Only + // inspect directory existence; do not read calendar metadata or events. + if s.DocumentRoot != "" { + _, err := os.Stat(filepath.Join(s.DocumentRoot, "calendars", domain, path)) + if err == nil { + return ErrTaskDAVCollectionExists + } + if !os.IsNotExist(err) { + return err + } + } + var count int + if err := tx.QueryRowContext(ctx, `SELECT count(*) FROM organizer_dav_collections WHERE domain_uuid=? AND owner_uuid=?`, domain, actor).Scan(&count); err != nil { + return err + } + if count >= 256 { + return ErrTaskDAVLimit + } + v.DAVCollection = path + return nil + }) +} + +func (s *Store) IsTaskDAVCollection(ctx context.Context, domain, path string) (bool, error) { + var found bool + err := s.DB.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_dav_collections WHERE domain_uuid=? AND path=?)`, domain, path).Scan(&found) + return found, err +} + +func (s *Store) TaskDAVCollection(ctx context.Context, domain, actor, path string) (TaskRecord, error) { + var project string + if err := s.DB.QueryRowContext(ctx, `SELECT project_uuid FROM organizer_dav_collections WHERE domain_uuid=? AND owner_uuid=? AND path=?`, domain, actor, path).Scan(&project); err != nil { + return TaskRecord{}, err + } + v, err := s.GetTask(ctx, domain, actor, project) + if err == nil && v.Archived { + return TaskRecord{}, sql.ErrNoRows + } + return v, err +} + +func (s *Store) TaskDAVCollections(ctx context.Context, domain, actor string) ([]TaskRecord, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return nil, err + } + rows, err := s.DB.QueryContext(ctx, `SELECT i.uuid FROM organizer_dav_collections c JOIN organizer_items i ON i.domain_uuid=c.domain_uuid AND i.uuid=c.project_uuid AND i.owner_uuid=c.owner_uuid WHERE c.domain_uuid=? AND c.owner_uuid=? AND i.archived=0 ORDER BY c.path LIMIT 257`, domain, actor) + if err != nil { + return nil, err + } + var ids []string + for rows.Next() { + var id string + if err = rows.Scan(&id); err != nil { + rows.Close() + return nil, err + } + ids = append(ids, id) + } + err = rows.Err() + rows.Close() + if err != nil { + return nil, err + } + if len(ids) > 256 { + return nil, ErrTaskDAVLimit + } + items := make([]TaskRecord, 0, len(ids)) + for _, id := range ids { + v, err := s.GetTask(ctx, domain, actor, id) + if err != nil { + return nil, err + } + if !v.Archived { + items = append(items, v) + } + } + return items, nil +} + +func taskDAVIndexKey(project, value string) string { + if project == "" { + return value + } + // A NUL prefix cannot occur in an accepted UID/name, avoiding collisions + // between default-list UIDs and collection-qualified index keys. + return "\x00" + project + "\x00" + value +} + +func taskDAVProjectTx(ctx context.Context, tx *sql.Tx, domain, actor, project string) (string, error) { + if project == "" { + return "", nil + } + var found bool + err := tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_dav_collections WHERE domain_uuid=? AND owner_uuid=? AND project_uuid=?)`, domain, actor, project).Scan(&found) + if found { + return project, err + } + if err != nil { + return "", err + } + return "", sql.ErrNoRows +} diff --git a/internal/store/task_dav_credentials.go b/internal/store/task_dav_credentials.go new file mode 100644 index 0000000..f116a42 --- /dev/null +++ b/internal/store/task_dav_credentials.go @@ -0,0 +1,170 @@ +package store + +import ( + "context" + "crypto/rand" + "crypto/sha256" + "crypto/subtle" + "database/sql" + "encoding/base64" + "github.com/google/uuid" + "strings" + "time" +) + +type TaskDAVCredential struct { + ID string `json:"id"` + Label string `json:"label"` + Write bool `json:"write"` + CreatedMS int64 `json:"created_ms"` + ExpiresMS int64 `json:"expires_ms"` + Scope string `json:"scope"` + CalendarAccessCompat bool `json:"calendar_access_compat"` +} + +func taskDAVSecretHash(secret string) string { + sum := sha256.Sum256([]byte(secret)) + return base64.RawURLEncoding.EncodeToString(sum[:]) +} + +func (s *Store) CreateTaskDAVCredential(ctx context.Context, domain, actor, label string, write bool, days int) (TaskDAVCredential, string, error) { + return s.CreateDAVCredential(ctx, domain, actor, label, write, days, "tasks") +} + +func (s *Store) CreateDAVCredential(ctx context.Context, domain, actor, label string, write bool, days int, scope string, compatibility ...bool) (TaskDAVCredential, string, error) { + compat := len(compatibility) == 1 && compatibility[0] + if scope != "tasks" && scope != "calendar" && scope != "all" { + return TaskDAVCredential{}, "", ErrTaskInvalid + } + label = strings.TrimSpace(label) + if label == "" || len(label) > 100 || strings.ContainsAny(label, "\r\n\x00") || days < 1 || days > 365 { + return TaskDAVCredential{}, "", ErrTaskInvalid + } + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return TaskDAVCredential{}, "", err + } + defer tx.Rollback() + if _, err = tx.ExecContext(ctx, `UPDATE domain_memberships SET state=state WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil { + return TaskDAVCredential{}, "", err + } + if err = taskActor(ctx, tx, domain, actor, write); err != nil { + return TaskDAVCredential{}, "", err + } + var count int + if err = tx.QueryRowContext(ctx, `SELECT count(*) FROM organizer_dav_credentials WHERE domain_uuid=? AND owner_uuid=? AND expires_ms>?`, domain, actor, time.Now().UnixMilli()).Scan(&count); err != nil { + return TaskDAVCredential{}, "", err + } + if count >= 20 { + return TaskDAVCredential{}, "", ErrTaskDAVLimit + } + if _, err = tx.ExecContext(ctx, `DELETE FROM organizer_dav_credentials WHERE domain_uuid=? AND owner_uuid=? AND expires_ms<=?`, domain, actor, time.Now().UnixMilli()); err != nil { + return TaskDAVCredential{}, "", err + } + raw := make([]byte, 32) + if _, err = rand.Read(raw); err != nil { + return TaskDAVCredential{}, "", err + } + secret := "pw_taskdav_" + base64.RawURLEncoding.EncodeToString(raw) + if scope != "tasks" { + // Older binaries reject shared/calendar credentials on rollback instead + // of accidentally interpreting them as task-only authority. + secret = "pw_dav_" + base64.RawURLEncoding.EncodeToString(raw) + } + now := time.Now() + c := TaskDAVCredential{ID: uuid.NewString(), Label: label, Write: write, CreatedMS: now.UnixMilli(), ExpiresMS: now.Add(time.Duration(days) * 24 * time.Hour).UnixMilli(), Scope: scope} + c.CalendarAccessCompat = compat + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_dav_credentials(id,domain_uuid,owner_uuid,label,secret_hash,write_access,created_ms,expires_ms) VALUES(?,?,?,?,?,?,?,?)`, c.ID, domain, actor, c.Label, taskDAVSecretHash(secret), write, c.CreatedMS, c.ExpiresMS) + if err == nil { + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_dav_scopes(credential_id,scope) VALUES(?,?)`, c.ID, scope) + } + if err == nil && compat { + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_dav_compat(credential_id) VALUES(?)`, c.ID) + } + if err == nil { + err = tx.Commit() + } + return c, secret, err +} +func (s *Store) ListTaskDAVCredentials(ctx context.Context, domain, actor string) ([]TaskDAVCredential, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return nil, err + } + rows, err := s.DB.QueryContext(ctx, `SELECT id,label,write_access,created_ms,expires_ms,COALESCE((SELECT scope FROM organizer_dav_scopes WHERE credential_id=id),'tasks'),EXISTS(SELECT 1 FROM organizer_dav_compat WHERE credential_id=id) FROM organizer_dav_credentials WHERE domain_uuid=? AND owner_uuid=? ORDER BY created_ms DESC LIMIT 100`, domain, actor) + if err != nil { + return nil, err + } + defer rows.Close() + out := []TaskDAVCredential{} + for rows.Next() { + var c TaskDAVCredential + if err = rows.Scan(&c.ID, &c.Label, &c.Write, &c.CreatedMS, &c.ExpiresMS, &c.Scope, &c.CalendarAccessCompat); err != nil { + return nil, err + } + out = append(out, c) + } + return out, rows.Err() +} + +// Discovery compatibility is opt-in per authenticated credential. It does not +// grant a scope or write authority, and is not applied to normal Wiki sessions. +func (s *Store) DAVCalendarAccessCompat(ctx context.Context, domain, actor, id string) (bool, error) { + var enabled bool + err := s.DB.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_dav_compat f JOIN organizer_dav_credentials c ON c.id=f.credential_id WHERE c.id=? AND c.domain_uuid=? AND c.owner_uuid=? AND c.expires_ms>?)`, id, domain, actor, time.Now().UnixMilli()).Scan(&enabled) + return enabled, err +} +func (s *Store) RevokeTaskDAVCredential(ctx context.Context, domain, actor, id string) error { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return err + } + _, err := s.DB.ExecContext(ctx, `DELETE FROM organizer_dav_credentials WHERE domain_uuid=? AND owner_uuid=? AND id=?`, domain, actor, id) + return err +} +func taskDAVCredentialAllowed(ctx context.Context, q interface { + QueryRowContext(context.Context, string, ...any) *sql.Row +}, domain, actor, id string, write bool) error { + return davCredentialAllowed(ctx, q, domain, actor, id, write, "tasks") +} + +func davCredentialAllowed(ctx context.Context, q interface { + QueryRowContext(context.Context, string, ...any) *sql.Row +}, domain, actor, id string, write bool, scope string) error { + var yes bool + if err := q.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_dav_credentials WHERE id=? AND domain_uuid=? AND owner_uuid=? AND expires_ms>? AND (?=0 OR write_access=1) AND COALESCE((SELECT scope FROM organizer_dav_scopes WHERE credential_id=id),'tasks') IN (?, 'all'))`, id, domain, actor, time.Now().UnixMilli(), write, scope).Scan(&yes); err != nil { + return err + } + if !yes { + return ErrAccessDenied + } + return taskActor(ctx, q, domain, actor, write) +} + +// The Basic username is the credential ID, not an account password/login name. +func (s *Store) AuthenticateTaskDAV(ctx context.Context, domain, id, secret string) (string, bool, error) { + actor, write, _, err := s.AuthenticateDAV(ctx, domain, id, secret, "tasks") + return actor, write, err +} + +func (s *Store) CheckDAVCredential(ctx context.Context, domain, actor, id string, write bool, scope string) error { + return davCredentialAllowed(ctx, s.DB, domain, actor, id, write, scope) +} + +// An empty requested scope is discovery only; callers must filter collections. +func (s *Store) AuthenticateDAV(ctx context.Context, domain, id, secret, requested string) (string, bool, string, error) { + if len(secret) > 128 || !(strings.HasPrefix(secret, "pw_taskdav_") || strings.HasPrefix(secret, "pw_dav_")) { + return "", false, "", ErrAccessDenied + } + var actor, hash, state, scope string + var write bool + err := s.DB.QueryRowContext(ctx, `SELECT c.owner_uuid,c.secret_hash,c.write_access,p.state,COALESCE(s.scope,'tasks') FROM organizer_dav_credentials c JOIN principals p ON p.uuid=c.owner_uuid LEFT JOIN organizer_dav_scopes s ON s.credential_id=c.id WHERE c.id=? AND c.domain_uuid=? AND c.expires_ms>?`, id, domain, time.Now().UnixMilli()).Scan(&actor, &hash, &write, &state, &scope) + if err != nil || subtle.ConstantTimeCompare([]byte(hash), []byte(taskDAVSecretHash(secret))) != 1 { + return "", false, "", ErrAccessDenied + } + if requested != "" && scope != "all" && scope != requested { + return "", false, "", ErrAccessDenied + } + if err = taskActor(ctx, s.DB, domain, actor, false); err != nil { + return "", false, "", err + } + return actor, write && state == "active", scope, nil +} diff --git a/internal/store/task_dav_settings.go b/internal/store/task_dav_settings.go new file mode 100644 index 0000000..fa483e8 --- /dev/null +++ b/internal/store/task_dav_settings.go @@ -0,0 +1,74 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "strings" + "time" + "unicode" + "unicode/utf8" +) + +const DefaultTaskDAVTitle = "PagesWiki Tasks" + +func ValidTaskDAVTitle(title string) bool { + return strings.TrimSpace(title) != "" && len(title) <= 300 && utf8.ValidString(title) && strings.IndexFunc(title, unicode.IsControl) < 0 +} + +// The default list is a personal setting, not a synthetic project. Renaming it +// must not change task membership, resource identities, or another user's view. +func (s *Store) TaskDAVDefaultTitle(ctx context.Context, domain, actor string) (string, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return "", err + } + var title string + err := s.DB.QueryRowContext(ctx, `SELECT title FROM organizer_dav_default_lists WHERE domain_uuid=? AND owner_uuid=?`, domain, actor).Scan(&title) + if errors.Is(err, sql.ErrNoRows) { + return DefaultTaskDAVTitle, nil + } + return title, err +} + +func (s *Store) SetTaskDAVDefaultTitle(ctx context.Context, domain, actor, title, credential string) error { + if !ValidTaskDAVTitle(title) { + return ErrTaskInvalid + } + ctx, cancel := context.WithTimeout(ctx, 5*time.Second) + defer cancel() + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return err + } + defer tx.Rollback() + // Acquire the writer before checking authority, as with task writes. + if _, err = tx.ExecContext(ctx, `UPDATE domain_memberships SET state=state WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil { + return err + } + if err = taskActor(ctx, tx, domain, actor, true); err != nil { + return err + } + if credential != "" { + if err = taskDAVCredentialAllowed(ctx, tx, domain, actor, credential, true); err != nil { + return err + } + } + var raw string + err = tx.QueryRowContext(ctx, `SELECT value FROM config WHERE domain_uuid=? AND key='system_extension_states'`, domain).Scan(&raw) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return err + } + states := map[string]bool{} + if raw != "" && json.Unmarshal([]byte(raw), &states) != nil { + return ErrAccessDenied + } + if enabled, ok := states["organizer.tasks"]; ok && !enabled { + return ErrAccessDenied + } + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_dav_default_lists(domain_uuid,owner_uuid,title,updated_at_ms) VALUES(?,?,?,?) ON CONFLICT(domain_uuid,owner_uuid) DO UPDATE SET title=excluded.title,updated_at_ms=excluded.updated_at_ms`, domain, actor, title, time.Now().UnixMilli()) + if err != nil { + return err + } + return tx.Commit() +} diff --git a/internal/store/task_focus.go b/internal/store/task_focus.go new file mode 100644 index 0000000..464bf41 --- /dev/null +++ b/internal/store/task_focus.go @@ -0,0 +1,307 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "time" + + "github.com/google/uuid" +) + +const TaskFocusEventType = "task.focus.complete" + +type TaskFocus struct { + UUID string `json:"uuid"` + TaskUUID string `json:"task_uuid"` + Phase string `json:"phase"` + State string `json:"state"` + DurationMS int64 `json:"duration_ms"` + RemainingMS int64 `json:"remaining_ms"` + DeadlineMS int64 `json:"deadline_ms"` + CreatedMS int64 `json:"created_at_ms"` + UpdatedMS int64 `json:"updated_at_ms"` + Version int64 `json:"version"` +} + +func (s *Store) ensureTaskFocusSchema() error { + _, err := s.DB.Exec(`CREATE TABLE IF NOT EXISTS organizer_focus(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,uuid TEXT PRIMARY KEY,task_uuid TEXT NOT NULL,phase TEXT NOT NULL,state TEXT NOT NULL,duration_ms INTEGER NOT NULL,remaining_ms INTEGER NOT NULL,deadline_ms INTEGER NOT NULL,created_at_ms INTEGER NOT NULL,updated_at_ms INTEGER NOT NULL,version INTEGER NOT NULL); +CREATE UNIQUE INDEX IF NOT EXISTS organizer_focus_active ON organizer_focus(owner_uuid) WHERE state IN ('running','paused'); +CREATE INDEX IF NOT EXISTS organizer_focus_due ON organizer_focus(state,deadline_ms,uuid); +CREATE INDEX IF NOT EXISTS organizer_focus_owner ON organizer_focus(domain_uuid,owner_uuid,created_at_ms DESC,uuid DESC); +CREATE TABLE IF NOT EXISTS organizer_focus_changes(session_uuid TEXT NOT NULL,version INTEGER NOT NULL,action TEXT NOT NULL,created_at_ms INTEGER NOT NULL,data TEXT NOT NULL,PRIMARY KEY(session_uuid,version))`) + if err != nil { + return err + } + return s.ensureTaskFocusSpans() +} + +const focusColumns = `uuid,task_uuid,phase,state,duration_ms,remaining_ms,deadline_ms,created_at_ms,updated_at_ms,version` + +func scanFocus(row interface{ Scan(...any) error }) (TaskFocus, error) { + var f TaskFocus + err := row.Scan(&f.UUID, &f.TaskUUID, &f.Phase, &f.State, &f.DurationMS, &f.RemainingMS, &f.DeadlineMS, &f.CreatedMS, &f.UpdatedMS, &f.Version) + return f, err +} + +func (s *Store) LatestTaskFocus(ctx context.Context, domain, actor string) (*TaskFocus, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return nil, err + } + f, err := scanFocus(s.DB.QueryRowContext(ctx, `SELECT `+focusColumns+` FROM organizer_focus WHERE domain_uuid=? AND owner_uuid=? AND state IN ('running','paused')`, domain, actor)) + if errors.Is(err, sql.ErrNoRows) { + f, err = scanFocus(s.DB.QueryRowContext(ctx, `SELECT `+focusColumns+` FROM organizer_focus WHERE domain_uuid=? AND owner_uuid=? ORDER BY created_at_ms DESC,uuid DESC LIMIT 1`, domain, actor)) + } + if errors.Is(err, sql.ErrNoRows) { + return nil, nil + } + if err != nil { + return nil, err + } + return &f, nil +} + +func recordFocusTx(ctx context.Context, tx *sql.Tx, f TaskFocus, action string) error { + if err := recordFocusSpanTx(ctx, tx, f); err != nil { + return err + } + data, err := json.Marshal(f) + if err != nil { + return err + } + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_focus_changes(session_uuid,version,action,created_at_ms,data) VALUES(?,?,?,?,?)`, f.UUID, f.Version, action, f.UpdatedMS, string(data)) + return err +} + +// ChangeTaskFocus serializes transitions, including cross-Domain starts, under +// SQLite's writer lock. The partial unique index is a second line of defense. +// The supplied time is server-controlled (also allows deterministic tests). +func (s *Store) ChangeTaskFocus(ctx context.Context, domain, actor, action string, f TaskFocus, expected int64, now time.Time) (TaskFocus, error) { + if _, err := uuid.Parse(f.UUID); err != nil { + return f, ErrTaskInvalid + } + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return f, err + } + defer tx.Rollback() + if _, err = tx.ExecContext(ctx, `UPDATE domain_memberships SET state=state WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil { + return f, err + } + if err = taskActor(ctx, tx, domain, actor, true); err != nil { + return f, err + } + enabled, err := taskReminderExtensionEnabled(ctx, tx, domain) + if err != nil { + return f, err + } + if !enabled { + return f, ErrAccessDenied + } + old, err := scanFocus(tx.QueryRowContext(ctx, `SELECT `+focusColumns+` FROM organizer_focus WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, f.UUID)) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return f, err + } + ms := now.UnixMilli() + if action == "start" { + if f.Phase != "focus" && f.Phase != "break" || f.DurationMS < 60000 || f.DurationMS > 180*60000 || f.DurationMS%60000 != 0 || expected != 0 { + return f, ErrTaskInvalid + } + if err == nil { + if old.TaskUUID != f.TaskUUID || old.Phase != f.Phase || old.DurationMS != f.DurationMS { + return f, ErrTaskConflict + } + return old, tx.Commit() + } + if f.TaskUUID != "" { + var exists bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND uuid=? AND kind='task' AND archived=0 AND status NOT IN ('done','cancelled'))`, domain, actor, f.TaskUUID).Scan(&exists); err != nil { + return f, err + } + if !exists { + return f, sql.ErrNoRows + } + } + var otherDomain, otherID string + err = tx.QueryRowContext(ctx, `SELECT domain_uuid,uuid FROM organizer_focus WHERE owner_uuid=? AND state IN ('running','paused')`, actor).Scan(&otherDomain, &otherID) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return f, err + } + if err == nil { + allowed := taskActor(ctx, tx, otherDomain, actor, false) + if allowed != nil && !errors.Is(allowed, ErrAccessDenied) { + return f, allowed + } + on, e := taskReminderExtensionEnabled(ctx, tx, otherDomain) + if e != nil { + return f, e + } + if allowed == nil && on { + return f, ErrTaskConflict + } + // A timer stranded in a revoked/disabled Domain must not lock the + // user out forever. Release only their timer, never another task. + stale, e := scanFocus(tx.QueryRowContext(ctx, `SELECT `+focusColumns+` FROM organizer_focus WHERE uuid=?`, otherID)) + if e != nil { + return f, e + } + if stale.State == "running" { + stale.RemainingMS = max(0, min(stale.RemainingMS, stale.DeadlineMS-ms)) + } + stale.State = "cancelled" + stale.DeadlineMS = 0 + stale.UpdatedMS = ms + stale.Version++ + if _, e = tx.ExecContext(ctx, `UPDATE organizer_focus SET state='cancelled',deadline_ms=0,remaining_ms=?,updated_at_ms=?,version=? WHERE uuid=?`, stale.RemainingMS, ms, stale.Version, stale.UUID); e != nil { + return f, e + } + if e = recordFocusTx(ctx, tx, stale, "revoked"); e != nil { + return f, e + } + } + f.State = "running" + f.RemainingMS = f.DurationMS + f.DeadlineMS = ms + f.DurationMS + f.CreatedMS = ms + f.UpdatedMS = ms + f.Version = 1 + res, e := tx.ExecContext(ctx, `INSERT OR IGNORE INTO organizer_focus(domain_uuid,owner_uuid,uuid,task_uuid,phase,state,duration_ms,remaining_ms,deadline_ms,created_at_ms,updated_at_ms,version) VALUES(?,?,?,?,?,?,?,?,?,?,?,?)`, domain, actor, f.UUID, f.TaskUUID, f.Phase, f.State, f.DurationMS, f.RemainingMS, f.DeadlineMS, f.CreatedMS, f.UpdatedMS, f.Version) + if e != nil { + return f, e + } + if n, _ := res.RowsAffected(); n != 1 { + return f, ErrTaskConflict + } + } else { + if err != nil { + return f, err + } + f = old + if f.Version != expected { + return f, ErrTaskConflict + } + if f.State != "running" && f.State != "paused" { + return f, ErrTaskConflict + } + if f.State == "running" { + f.RemainingMS = max(0, min(f.RemainingMS, f.DeadlineMS-ms)) + } + switch action { + case "pause": + if f.State != "running" || f.RemainingMS == 0 { + return f, ErrTaskConflict + } + f.State = "paused" + f.DeadlineMS = 0 + case "resume": + if f.State != "paused" { + return f, ErrTaskConflict + } + f.State = "running" + f.DeadlineMS = ms + f.RemainingMS + case "complete": + f.State = "completed" + f.DeadlineMS = 0 + case "cancel": + f.State = "cancelled" + f.DeadlineMS = 0 + default: + return f, ErrTaskInvalid + } + f.Version++ + f.UpdatedMS = ms + if _, err = tx.ExecContext(ctx, `UPDATE organizer_focus SET state=?,remaining_ms=?,deadline_ms=?,updated_at_ms=?,version=? WHERE uuid=?`, f.State, f.RemainingMS, f.DeadlineMS, f.UpdatedMS, f.Version, f.UUID); err != nil { + return f, err + } + } + if err = recordFocusTx(ctx, tx, f, action); err != nil { + return f, err + } + return f, tx.Commit() +} + +// A bounded, indexed sweep completes timers even while all browsers are closed. +// Completing a timer never changes a task's status, due date or planned date. +func (s *Store) CompleteTaskFocus(ctx context.Context, now time.Time, limit int) (int, error) { + if limit < 1 || limit > 100 { + limit = 100 + } + ctx, cancel := context.WithTimeout(ctx, 3*time.Second) + defer cancel() + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return 0, err + } + defer tx.Rollback() + if _, err = tx.ExecContext(ctx, `UPDATE organizer_focus SET state=state WHERE rowid=-1`); err != nil { + return 0, err + } + rows, err := tx.QueryContext(ctx, `SELECT domain_uuid,owner_uuid,uuid FROM organizer_focus WHERE state='running' AND deadline_ms<=? ORDER BY deadline_ms,uuid LIMIT ?`, now.UnixMilli(), limit) + if err != nil { + return 0, err + } + type entry struct{ domain, owner, id string } + items := []entry{} + for rows.Next() { + var e entry + if err = rows.Scan(&e.domain, &e.owner, &e.id); err != nil { + rows.Close() + return 0, err + } + items = append(items, e) + } + err = rows.Err() + rows.Close() + if err != nil { + return 0, err + } + for _, e := range items { + f, err := scanFocus(tx.QueryRowContext(ctx, `SELECT `+focusColumns+` FROM organizer_focus WHERE uuid=?`, e.id)) + if err != nil { + return 0, err + } + enabled, err := taskReminderExtensionEnabled(ctx, tx, e.domain) + if err != nil { + return 0, err + } + auth := taskActor(ctx, tx, e.domain, e.owner, false) + if auth != nil && !errors.Is(auth, ErrAccessDenied) { + return 0, auth + } + // Stop unauthorized/disabled sessions without notification. Do not queue + // them indefinitely ahead of valid timers belonging to other users. + f.State = "completed" + action := "elapsed" + if !enabled || auth != nil { + f.State = "cancelled" + action = "revoked" + } + if enabled && auth == nil && now.UnixMilli()-f.DeadlineMS < 24*time.Hour.Milliseconds() { + _, _, err = s.CreateNotificationTx(tx, Notification{DomainUUID: e.domain, RecipientUUID: e.owner, EventUUID: f.UUID, Kind: TaskFocusEventType, RequestUUID: f.TaskUUID, Href: "/v/plan/today", Message: "Timer completed", CreatedAtMS: now.UnixMilli()}) + if err != nil { + return 0, err + } + } + f.RemainingMS = 0 + f.DeadlineMS = 0 + f.UpdatedMS = now.UnixMilli() + f.Version++ + if _, err = tx.ExecContext(ctx, `UPDATE organizer_focus SET state=?,remaining_ms=0,deadline_ms=0,updated_at_ms=?,version=? WHERE uuid=?`, f.State, f.UpdatedMS, f.Version, f.UUID); err != nil { + return 0, err + } + if err = recordFocusTx(ctx, tx, f, action); err != nil { + return 0, err + } + } + if err = tx.Commit(); err != nil { + return 0, err + } + return len(items), nil +} + +func (s *Store) EnsureTaskFocusEvent() error { + now := time.Now().UnixMilli() + _, err := s.DB.Exec(`INSERT OR IGNORE INTO event_definitions(uuid,name,event_type,event_key,payload,schedule_kind,interval_seconds,next_run_at_ms,enabled,priority,max_attempts,created_at_ms,updated_at_ms) VALUES('builtin.task.focus','Focus timer completion',?,'local','{}','interval',60,?,1,-2,3,?,?)`, TaskFocusEventType, now, now, now) + return err +} diff --git a/internal/store/task_hierarchy.go b/internal/store/task_hierarchy.go new file mode 100644 index 0000000..d831969 --- /dev/null +++ b/internal/store/task_hierarchy.go @@ -0,0 +1,168 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "strings" + "time" + + "github.com/google/uuid" +) + +// A bounded batch supplies context for children whose parent does not match the +// day/filter. It never grants access to another owner or Domain. +func (s *Store) TaskContextParents(ctx context.Context, domain, actor string, items []TaskRecord) ([]TaskRecord, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return nil, err + } + if len(items) > 100 { + return nil, ErrTaskInvalid + } + ids := map[string]bool{} + for _, item := range items { + if item.ParentUUID != "" { + ids[item.ParentUUID] = true + } + } + parents := []TaskRecord{} + if len(ids) == 0 { + return parents, nil + } + args := []any{domain, actor} + marks := []string{} + for id := range ids { + marks = append(marks, "?") + args = append(args, id) + } + rows, err := s.DB.QueryContext(ctx, `SELECT data FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND kind='task' AND uuid IN (`+strings.Join(marks, ",")+`)`, args...) + if err != nil { + return nil, err + } + defer rows.Close() + for rows.Next() { + var raw string + var item TaskRecord + if err = rows.Scan(&raw); err != nil { + return nil, err + } + if err = json.Unmarshal([]byte(raw), &item); err != nil { + return nil, err + } + item.Notes = "" + item.CalDAV = nil + parents = append(parents, item) + } + return parents, rows.Err() +} + +func (s *Store) ensureTaskHierarchySchema() error { + cols, err := tableColumns(s.DB, "organizer_items") + if err != nil { + return err + } + for _, col := range []string{"parent_uuid", "start_on", "end_on"} { + if !cols[col] { + if _, err = s.DB.Exec(`ALTER TABLE organizer_items ADD COLUMN ` + col + ` TEXT NOT NULL DEFAULT ''`); err != nil { + return err + } + } + } + _, err = s.DB.Exec(`CREATE INDEX IF NOT EXISTS organizer_children ON organizer_items(domain_uuid,owner_uuid,parent_uuid,created_at_ms DESC,uuid DESC); +CREATE INDEX IF NOT EXISTS organizer_schedule ON organizer_items(domain_uuid,owner_uuid,COALESCE(NULLIF(start_on,''),end_on)) WHERE kind='task' AND archived=0`) + return err +} + +func validateTaskHierarchy(item *TaskRecord) error { + if !validTaskDate(item.StartOn) || !validTaskDate(item.EndOn) { + return ErrTaskInvalid + } + if item.Kind == "project" && (item.ParentUUID != "" || item.StartOn != "" || item.EndOn != "") { + return ErrTaskInvalid + } + if item.ParentUUID != "" { + u, e := uuid.Parse(item.ParentUUID) + if e != nil || u.String() != item.ParentUUID || item.ParentUUID == item.UUID { + return ErrTaskInvalid + } + } + if item.StartOn != "" && item.EndOn != "" { + a, _ := time.Parse("2006-01-02", item.StartOn) + b, _ := time.Parse("2006-01-02", item.EndOn) + if b.Before(a) || b.Sub(a) > 365*24*time.Hour { + return ErrTaskInvalid + } + } + return nil +} + +func (s *Store) validateTaskParentTx(ctx context.Context, tx *sql.Tx, domain, actor string, item, old TaskRecord) error { + if item.ParentUUID == "" { + return nil + } + if item.ParentUUID == old.ParentUUID { + return nil + } // Parent archiving must not disable its children. + var parent, kind string + var archived bool + err := tx.QueryRowContext(ctx, `SELECT parent_uuid,kind,archived FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, item.ParentUUID).Scan(&parent, &kind, &archived) + if errors.Is(err, sql.ErrNoRows) { + return ErrTaskInvalid + } + if err != nil { + return err + } + if parent != "" || kind != "task" || archived { + return ErrTaskInvalid + } + var children bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND parent_uuid=?)`, domain, actor, item.UUID).Scan(&children); err != nil { + return err + } + if children { + return ErrTaskInvalid + } + return nil +} + +func (s *Store) TaskSchedule(ctx context.Context, domain, actor, month, project string) ([]TaskRecord, bool, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return nil, false, err + } + first, err := time.Parse("2006-01", month) + if err != nil || first.Year() < 1 || first.Format("2006-01") != month { + return nil, false, ErrTaskInvalid + } + q := `SELECT data FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND kind='task' AND archived=0 AND COALESCE(NULLIF(start_on,''),end_on)>=? AND COALESCE(NULLIF(start_on,''),end_on)=?` + args := []any{domain, actor, first.AddDate(0, 0, -365).Format("2006-01-02"), first.AddDate(0, 1, 0).Format("2006-01-02"), first.Format("2006-01-02")} + if project != "" { + q += ` AND project_uuid=?` + args = append(args, project) + } + q += ` ORDER BY COALESCE(NULLIF(start_on,''),end_on),uuid LIMIT 201` + rows, err := s.DB.QueryContext(ctx, q, args...) + if err != nil { + return nil, false, err + } + defer rows.Close() + items := []TaskRecord{} + for rows.Next() { + var raw string + var item TaskRecord + if err = rows.Scan(&raw); err != nil { + return nil, false, err + } + if err = json.Unmarshal([]byte(raw), &item); err != nil { + return nil, false, err + } + item.Notes = "" + item.CalDAV = nil + items = append(items, item) + } + more := len(items) > 200 + if more { + items = items[:200] + } + return items, more, rows.Err() +} diff --git a/internal/store/task_notes.go b/internal/store/task_notes.go new file mode 100644 index 0000000..ba8af66 --- /dev/null +++ b/internal/store/task_notes.go @@ -0,0 +1,108 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "html" + "path" + "strings" + "time" + "unicode" + + "github.com/google/uuid" +) + +var ErrTaskNoteExists = errors.New("task note path already exists") + +func validTaskNotesSubpath(p string) bool { + if p == "" { + return true + } + for _, part := range strings.Split(p, "/") { + if part == ".." || part == "." || part == "" || part == "_" { + return false + } + } + return len(p) <= 500 && path.Clean(p) == p && !strings.HasPrefix(p, "/") && + !strings.ContainsAny(p, "\\?#%") && strings.IndexFunc(p, unicode.IsControl) < 0 +} + +func TaskNotePath(base string, project, item TaskRecord) string { + sub := project.NotesSubpath + if sub == "" { + sub = "tasks" + } + name := strings.TrimSpace(strings.Map(func(r rune) rune { + if unicode.IsControl(r) || strings.ContainsRune("/\\?#%", r) { + return '-' + } + return r + }, item.Title)) + if name == "" || name == "." || name == ".." || name == "_" { + name = "task-" + item.UUID + } + return strings.TrimRight(base, "/") + "/" + sub + "/" + name +} + +// CreateTaskNote binds a title-initialized Wiki page and its task in one transaction. +// The caller must authorize read/create/write at target and verify the project +// alias. Recheck the alias and project version under the writer lock. +func (s *Store) CreateTaskNote(ctx context.Context, domain, actor string, item TaskRecord, expected int64, project TaskRecord, base, target string) (TaskRecord, error) { + if item.Kind != "task" || item.PageUUID != "" || project.Kind != "project" || + item.ProjectUUID != project.UUID || project.PageUUID == "" || + path.Clean(target) != target || target != TaskNotePath(base, project, item) || + !strings.HasPrefix(target, strings.TrimRight(base, "/")+"/") { + return TaskRecord{}, ErrTaskInvalid + } + saved, err := s.saveTask(ctx, domain, actor, item, expected, func(tx *sql.Tx, current *TaskRecord, old TaskRecord) error { + var version int64 + var projectPage string + if err := tx.QueryRowContext(ctx, `SELECT version,json_extract(data,'$.page_uuid') FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND uuid=? AND kind='project' AND archived=0`, domain, actor, project.UUID).Scan(&version, &projectPage); err != nil { + return err + } + if version != project.Version || projectPage != project.PageUUID || old.PageUUID != "" { + return ErrTaskConflict + } + var bound string + if err := tx.QueryRowContext(ctx, `SELECT object_uuid FROM paths WHERE domain_uuid=? AND path=?`, domain, base).Scan(&bound); err != nil { + return err + } + if bound != project.PageUUID { + return ErrTaskConflict + } + var exists bool + if err := tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM paths WHERE domain_uuid=? AND path=?)`, domain, target).Scan(&exists); err != nil { + return err + } + if exists { + return ErrTaskNoteExists + } + current.PageUUID = uuid.NewString() + if _, err := tx.ExecContext(ctx, `INSERT INTO objects(uuid,kind,created_at) VALUES(?,'page',strftime('%s','now'))`, current.PageUUID); err != nil { + return err + } + if _, err := tx.ExecContext(ctx, `INSERT INTO paths(domain_uuid,path,object_uuid,created_at) VALUES(?,?,?,strftime('%s','now'))`, domain, target, current.PageUUID); err != nil { + return err + } + body := "

    " + html.EscapeString(current.Title) + "

    \n" + now := time.Now() + rev := &Revision{UUID: uuid.NewString(), ObjectUUID: current.PageUUID, DocumentHash: revisionHash(body), Language: "und", ContentType: "text/html; charset=utf-8", Body: body, Message: "Create task note", CreatedAt: now.Unix(), CreatedAtMS: now.UnixMilli()} + if err := s.persistDocument(rev.DocumentHash, rev.Body); err != nil { + return err + } + if err := insertRevision(tx, rev, nil); err != nil { + return err + } + if err := s.appendRevisionActivityOutboxIfAvailable(tx, rev); err != nil { + return err + } + payload, _ := json.Marshal(map[string]string{"path": target, "object_uuid": current.PageUUID}) + return s.appendActivityOutboxIfAvailable(tx, ActivityOutboxEvent{DomainUUID: domain, ActorUUID: actor, EventType: "page.created", TargetKind: "page", TargetUUID: current.PageUUID, Payload: string(payload), IdempotencyKey: "page.created:" + current.PageUUID}) + }) + if err == nil { + s.InvalidatePathCaches() + } + return saved, err +} diff --git a/internal/store/task_reminders.go b/internal/store/task_reminders.go new file mode 100644 index 0000000..5704c3d --- /dev/null +++ b/internal/store/task_reminders.go @@ -0,0 +1,173 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "time" + + "github.com/google/uuid" +) + +const TaskReminderEventType = "task.reminders.deliver" + +func (s *Store) ensureTaskReminderSchema() error { + for _, q := range []string{ + `CREATE TABLE IF NOT EXISTS organizer_reminders(domain_uuid TEXT NOT NULL,item_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,kind TEXT NOT NULL,source_version INTEGER NOT NULL,fire_at_ms INTEGER NOT NULL,civil_date TEXT NOT NULL,timezone TEXT NOT NULL,notification_key TEXT NOT NULL,state TEXT NOT NULL,PRIMARY KEY(domain_uuid,item_uuid,kind))`, + `CREATE INDEX IF NOT EXISTS organizer_reminders_due ON organizer_reminders(state,fire_at_ms,domain_uuid,item_uuid,kind)`, + `CREATE INDEX IF NOT EXISTS organizer_reminders_notification ON organizer_reminders(domain_uuid,owner_uuid,notification_key)`, + } { + if _, err := s.DB.Exec(q); err != nil { + return err + } + } + return nil +} + +// Derived reservations are replaced in the source mutation transaction, not +// asynchronously from an old event: completion/date changes cannot race a +// delayed outbox consumer into resurrecting obsolete reminders. +func (s *Store) syncTaskRemindersTx(ctx context.Context, tx *sql.Tx, domain, actor string, item TaskRecord) error { + for _, kind := range []string{"due", "planned"} { + date, enabled := item.DueOn, item.NotifyDue + if kind == "planned" { + date, enabled = item.PlannedOn, item.NotifyPlanned + } + if item.Kind != "task" || !enabled || item.Archived || item.Status == "done" || item.Status == "cancelled" { + if _, err := tx.ExecContext(ctx, `DELETE FROM organizer_reminders WHERE domain_uuid=? AND item_uuid=? AND kind=?`, domain, item.UUID, kind); err != nil { + return err + } + continue + } + loc, err := time.LoadLocation(item.ReminderTimezone) + if err != nil { + return ErrTaskInvalid + } + stamp := date + " " + item.ReminderTime + fire, err := time.ParseInLocation("2006-01-02 15:04", stamp, loc) + if err != nil || fire.Format("2006-01-02 15:04") != stamp { + return ErrTaskInvalid + } + key := uuid.NewSHA1(uuid.NameSpaceOID, []byte(domain+":"+item.UUID+":"+kind+":"+stamp+":"+item.ReminderTimezone)).String() + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_reminders(domain_uuid,item_uuid,owner_uuid,kind,source_version,fire_at_ms,civil_date,timezone,notification_key,state) VALUES(?,?,?,?,?,?,?,?,?,'pending') ON CONFLICT(domain_uuid,item_uuid,kind) DO UPDATE SET owner_uuid=excluded.owner_uuid,source_version=excluded.source_version,fire_at_ms=excluded.fire_at_ms,civil_date=excluded.civil_date,timezone=excluded.timezone,state=CASE WHEN notification_key=excluded.notification_key AND state='sent' THEN 'sent' ELSE 'pending' END,notification_key=excluded.notification_key`, domain, item.UUID, actor, kind, item.Version, fire.UnixMilli(), date, item.ReminderTimezone, key) + if err != nil { + return err + } + } + return nil +} + +func taskReminderExtensionEnabled(ctx context.Context, tx *sql.Tx, domain string) (bool, error) { + var raw string + err := tx.QueryRowContext(ctx, `SELECT value FROM config WHERE domain_uuid=? AND key='system_extension_states'`, domain).Scan(&raw) + if errors.Is(err, sql.ErrNoRows) { + return true, nil + } + if err != nil { + return false, err + } + if raw == "" { + return true, nil + } + states := map[string]bool{} + if json.Unmarshal([]byte(raw), &states) != nil { + return false, nil + } + v, ok := states["organizer.tasks"] + return !ok || v, nil +} + +// Notification insertion and reservation acknowledgment share one writer +// transaction. Current membership, source version and extension state are +// rechecked under that lock. No task title/body is copied into the Inbox. +func (s *Store) DeliverTaskReminders(ctx context.Context, now time.Time, limit int) (int, int, error) { + if limit < 1 || limit > 100 { + limit = 100 + } + ctx, cancel := context.WithTimeout(ctx, 3*time.Second) + defer cancel() + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return 0, 0, err + } + defer tx.Rollback() + // Acquire the shared SQLite writer before selecting candidates. Mutations + // and parallel delivery workers cannot change the checked source meanwhile. + if _, err = tx.ExecContext(ctx, `UPDATE organizer_reminders SET state=state WHERE rowid=-1`); err != nil { + return 0, 0, err + } + rows, err := tx.QueryContext(ctx, `SELECT domain_uuid,item_uuid,owner_uuid,kind,source_version,fire_at_ms,civil_date,timezone,notification_key FROM organizer_reminders WHERE state='pending' AND fire_at_ms<=? ORDER BY fire_at_ms,domain_uuid,item_uuid,kind LIMIT ?`, now.UnixMilli(), limit) + if err != nil { + return 0, 0, err + } + type reminder struct { + domain, id, owner, kind, date, timezone, key string + version, fire int64 + } + items := []reminder{} + for rows.Next() { + var v reminder + if err = rows.Scan(&v.domain, &v.id, &v.owner, &v.kind, &v.version, &v.fire, &v.date, &v.timezone, &v.key); err != nil { + rows.Close() + return 0, 0, err + } + items = append(items, v) + } + err = rows.Err() + rows.Close() + if err != nil { + return 0, 0, err + } + sent := 0 + for _, v := range items { + state := "skipped" + loc, e := time.LoadLocation(v.timezone) + if e != nil { + return 0, 0, e + } + auth := taskActor(ctx, tx, v.domain, v.owner, false) + if auth != nil && !errors.Is(auth, ErrAccessDenied) { + return 0, 0, auth + } + enabled, e := taskReminderExtensionEnabled(ctx, tx, v.domain) + if e != nil { + return 0, 0, e + } + var current bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_items WHERE domain_uuid=? AND uuid=? AND owner_uuid=? AND version=? AND archived=0 AND status NOT IN ('done','cancelled') AND kind='task')`, v.domain, v.id, v.owner, v.version).Scan(¤t); err != nil { + return 0, 0, err + } + if auth == nil && enabled && current && now.In(loc).Format("2006-01-02") == v.date { + _, created, e := s.CreateNotificationTx(tx, Notification{DomainUUID: v.domain, RecipientUUID: v.owner, EventUUID: v.key, Kind: "task." + v.kind, RequestUUID: v.id, Href: "/v/plan/task/" + v.id, Message: "Task reminder", CreatedAtMS: now.UnixMilli()}) + if e != nil { + return 0, 0, e + } + if created { + sent++ + } + state = "sent" + } + if _, err = tx.ExecContext(ctx, `UPDATE organizer_reminders SET state=? WHERE domain_uuid=? AND item_uuid=? AND kind=?`, state, v.domain, v.id, v.kind); err != nil { + return 0, 0, err + } + } + if err = tx.Commit(); err != nil { + return 0, 0, err + } + return len(items), sent, nil +} + +// Resolve a notification using current owner-only metadata; no CAS body fetch +// is necessary. Stale notices remain generic receipts, with no title or link. +func (s *Store) TaskReminderTitle(ctx context.Context, domain, actor, key string) (string, error) { + var title string + err := s.DB.QueryRowContext(ctx, `SELECT i.title FROM organizer_reminders r JOIN organizer_items i ON i.domain_uuid=r.domain_uuid AND i.uuid=r.item_uuid AND i.owner_uuid=r.owner_uuid AND i.version=r.source_version JOIN principals p ON p.uuid=r.owner_uuid AND p.state IN ('active','readonly') JOIN domain_memberships m ON m.principal_uuid=r.owner_uuid AND m.domain_uuid=r.domain_uuid AND m.state='active' JOIN domains d ON d.uuid=r.domain_uuid AND d.enabled=1 AND COALESCE(d.placement,'local')='local' WHERE r.domain_uuid=? AND r.owner_uuid=? AND r.notification_key=? AND r.state='sent' AND i.archived=0 AND i.status NOT IN ('done','cancelled')`, domain, actor, key).Scan(&title) + return title, err +} + +func (s *Store) EnsureTaskReminderEvent() error { + now := time.Now().UnixMilli() + _, err := s.DB.Exec(`INSERT OR IGNORE INTO event_definitions(uuid,name,event_type,event_key,payload,schedule_kind,interval_seconds,next_run_at_ms,enabled,priority,max_attempts,created_at_ms,updated_at_ms) VALUES('builtin.task.reminders','Task Inbox reminders',?,'local','{}','interval',60,?,1,-2,3,?,?)`, TaskReminderEventType, now, now, now) + return err +} diff --git a/internal/store/task_today.go b/internal/store/task_today.go new file mode 100644 index 0000000..5916983 --- /dev/null +++ b/internal/store/task_today.go @@ -0,0 +1,130 @@ +package store + +import ( + "context" + "database/sql" + "time" +) + +// Spans are an indexed projection of running transitions. They are committed +// with the session/audit, never with a per-second timer write. +func (s *Store) ensureTaskFocusSpans() error { + _, err := s.DB.Exec(`CREATE TABLE IF NOT EXISTS organizer_focus_spans(session_uuid TEXT NOT NULL,version INTEGER NOT NULL,domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,task_uuid TEXT NOT NULL,phase TEXT NOT NULL,start_ms INTEGER NOT NULL,end_ms INTEGER NOT NULL,closed INTEGER NOT NULL,PRIMARY KEY(session_uuid,version)); +CREATE INDEX IF NOT EXISTS organizer_focus_spans_day ON organizer_focus_spans(domain_uuid,owner_uuid,start_ms); +CREATE INDEX IF NOT EXISTS organizer_time_blocks_calendar ON organizer_time_blocks(domain_uuid,owner_uuid,calendar_uuid,event_uid) WHERE state='active'; +INSERT OR IGNORE INTO organizer_focus_spans SELECT uuid,version,domain_uuid,owner_uuid,task_uuid,phase,max(created_at_ms,deadline_ms-remaining_ms),deadline_ms,0 FROM organizer_focus WHERE state='running'`) + return err +} + +func recordFocusSpanTx(ctx context.Context, tx *sql.Tx, f TaskFocus) error { + if f.State == "running" { + _, err := tx.ExecContext(ctx, `INSERT INTO organizer_focus_spans SELECT uuid,version,domain_uuid,owner_uuid,task_uuid,phase,updated_at_ms,deadline_ms,0 FROM organizer_focus WHERE uuid=?`, f.UUID) + return err + } + _, err := tx.ExecContext(ctx, `UPDATE organizer_focus_spans SET end_ms=min(end_ms,max(start_ms,?)),closed=1 WHERE session_uuid=? AND closed=0`, f.UpdatedMS, f.UUID) + return err +} + +type TaskDaySummary struct { + TaskCount int `json:"task_count"` + EstimateMinutes int `json:"estimate_minutes"` + FocusMS int64 `json:"focus_ms"` + TasksPartial bool `json:"tasks_partial"` + FocusPartial bool `json:"focus_partial"` +} + +func (s *Store) TaskDaySummary(ctx context.Context, domain, actor string, start, end, now time.Time) (TaskDaySummary, error) { + var out TaskDaySummary + if !end.After(start) || end.Sub(start) > 26*time.Hour { + return out, ErrTaskInvalid + } + items, next, err := s.ListTasks(ctx, domain, actor, TaskQuery{Kind: "task", View: "today", Today: start.Format("2006-01-02"), Limit: 100}) + if err != nil { + return out, err + } + out.TaskCount = len(items) + out.TasksPartial = next != "" + for _, item := range items { + out.EstimateMinutes += item.Estimate + } + // Each running interval is at most 180 minutes, including resumed ones. + rows, err := s.DB.QueryContext(ctx, `SELECT start_ms,end_ms FROM organizer_focus_spans WHERE domain_uuid=? AND owner_uuid=? AND start_ms>=? AND start_ms? AND phase='focus' ORDER BY start_ms,session_uuid,version LIMIT 1001`, domain, actor, start.Add(-180*time.Minute).UnixMilli(), end.UnixMilli(), start.UnixMilli()) + if err != nil { + return out, err + } + defer rows.Close() + n := 0 + for rows.Next() { + var a, b int64 + if err = rows.Scan(&a, &b); err != nil { + return out, err + } + n++ + if n > 1000 { + out.FocusPartial = true + break + } + out.FocusMS += max(int64(0), min(b, end.UnixMilli(), now.UnixMilli())-max(a, start.UnixMilli())) + } + return out, rows.Err() +} + +func (s *Store) TaskBlockCalendars(ctx context.Context, domain, actor string) ([]string, bool, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return nil, false, err + } + rows, err := s.DB.QueryContext(ctx, `SELECT calendar_uuid FROM organizer_time_blocks WHERE domain_uuid=? AND owner_uuid=? AND state='active' GROUP BY calendar_uuid ORDER BY calendar_uuid LIMIT 21`, domain, actor) + if err != nil { + return nil, false, err + } + defer rows.Close() + out := []string{} + for rows.Next() { + var id string + if err = rows.Scan(&id); err != nil { + return nil, false, err + } + out = append(out, id) + } + more := len(out) > 20 + if more { + out = out[:20] + } + return out, more, rows.Err() +} + +type TaskDayBlock struct { + UUID string `json:"uuid"` + TaskUUID string `json:"task_uuid"` + Title string `json:"title"` + Start int64 `json:"start_ms"` + End int64 `json:"end_ms"` + EventUID string `json:"-"` + Href string `json:"href"` +} + +// Call ONLY inside Repository.ReadPersonalLocalIndex: that lock enforces the +// current calendar policy and keeps this cache at the canonical manifest head. +func (s *Store) TaskDayBlocks(ctx context.Context, domain, actor, calendar string, start, end time.Time) ([]TaskDayBlock, bool, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return nil, false, err + } + rows, err := s.DB.QueryContext(ctx, `SELECT b.uuid,b.task_uuid,i.title,e.start*1000,e.end*1000,b.event_uid FROM calendar_event_cache e JOIN organizer_time_blocks b ON b.domain_uuid=e.domain AND b.calendar_uuid=e.calendar AND b.event_uid=e.uid JOIN organizer_items i ON i.domain_uuid=b.domain_uuid AND i.uuid=b.task_uuid AND i.owner_uuid=b.owner_uuid WHERE b.domain_uuid=? AND b.owner_uuid=? AND b.calendar_uuid=? AND b.state='active' AND e.start? ORDER BY e.start,b.uuid LIMIT 101`, domain, actor, calendar, end.Unix(), start.Unix()) + if err != nil { + return nil, false, err + } + defer rows.Close() + out := []TaskDayBlock{} + for rows.Next() { + var b TaskDayBlock + if err = rows.Scan(&b.UUID, &b.TaskUUID, &b.Title, &b.Start, &b.End, &b.EventUID); err != nil { + return nil, false, err + } + out = append(out, b) + } + more := len(out) > 100 + if more { + out = out[:100] + } + return out, more, rows.Err() +} diff --git a/internal/store/tasks.go b/internal/store/tasks.go new file mode 100644 index 0000000..d021767 --- /dev/null +++ b/internal/store/tasks.go @@ -0,0 +1,520 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "strings" + "time" + "unicode/utf8" + + "github.com/google/uuid" +) + +var ErrTaskInvalid = errors.New("invalid task input") +var ErrTaskConflict = errors.New("task changed; reload before saving") + +// TaskRecord is a typed, private organizer record, not a semantic Wiki Object. +// A project uses the same identity/revision envelope with task fields empty. +type TaskRecord struct { + DAVCollection string `json:"dav_collection,omitempty"` + CalDAV *TaskDAVData `json:"caldav,omitempty"` + UUID string `json:"uuid"` + Kind string `json:"kind"` + Title string `json:"title"` + Notes string `json:"notes"` + NotesSubpath string `json:"notes_subpath,omitempty"` + ProjectUUID string `json:"project_uuid"` + ParentUUID string `json:"parent_uuid,omitempty"` + StartOn string `json:"start_on,omitempty"` + EndOn string `json:"end_on,omitempty"` + Status string `json:"status"` + Bucket string `json:"bucket"` + Priority int `json:"priority"` + Estimate int `json:"estimate_minutes"` + DueOn string `json:"due_on"` + PlannedOn string `json:"planned_on"` + ReviewOn string `json:"review_on"` + PageUUID string `json:"page_uuid"` + Archived bool `json:"archived"` + Version int64 `json:"version"` + CreatedMS int64 `json:"created_at_ms"` + UpdatedMS int64 `json:"updated_at_ms"` + CompletedMS int64 `json:"completed_at_ms"` + NotifyDue bool `json:"notify_due,omitempty"` + NotifyPlanned bool `json:"notify_planned,omitempty"` + ReminderTime string `json:"reminder_time,omitempty"` + ReminderTimezone string `json:"reminder_timezone,omitempty"` +} + +type TaskQuery struct { + Kind, View, Project, Search, Today, Before string + Parent string + Hierarchy bool + Limit int +} + +func (s *Store) EnsureTasksSchema() error { + for _, q := range []string{ + `CREATE TABLE IF NOT EXISTS organizer_items ( + domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,uuid TEXT NOT NULL, + kind TEXT NOT NULL CHECK(kind IN ('task','project')),project_uuid TEXT NOT NULL, + title TEXT NOT NULL,status TEXT NOT NULL,bucket TEXT NOT NULL, + due_on TEXT NOT NULL,planned_on TEXT NOT NULL,review_on TEXT NOT NULL, + archived INTEGER NOT NULL,version INTEGER NOT NULL,created_at_ms INTEGER NOT NULL, + updated_at_ms INTEGER NOT NULL,data TEXT NOT NULL,document_hash TEXT NOT NULL, + PRIMARY KEY(domain_uuid,uuid))`, + `CREATE INDEX IF NOT EXISTS organizer_list ON organizer_items(domain_uuid,owner_uuid,kind,archived,created_at_ms DESC,uuid DESC)`, + `CREATE INDEX IF NOT EXISTS organizer_project ON organizer_items(domain_uuid,owner_uuid,project_uuid,archived)`, + `CREATE INDEX IF NOT EXISTS organizer_plan ON organizer_items(domain_uuid,owner_uuid,kind,archived,planned_on)`, + `CREATE INDEX IF NOT EXISTS organizer_due ON organizer_items(domain_uuid,owner_uuid,kind,archived,due_on)`, + `CREATE TABLE IF NOT EXISTS organizer_revisions ( + domain_uuid TEXT NOT NULL,item_uuid TEXT NOT NULL,version INTEGER NOT NULL, + actor_uuid TEXT NOT NULL,document_hash TEXT NOT NULL,created_at_ms INTEGER NOT NULL, + PRIMARY KEY(domain_uuid,item_uuid,version))`, + `CREATE TABLE IF NOT EXISTS organizer_changes ( + sequence INTEGER PRIMARY KEY AUTOINCREMENT,domain_uuid TEXT NOT NULL,item_uuid TEXT NOT NULL, + version INTEGER NOT NULL,actor_uuid TEXT NOT NULL,created_at_ms INTEGER NOT NULL, + UNIQUE(domain_uuid,item_uuid,version))`, + `CREATE TABLE IF NOT EXISTS organizer_activity_bridge(id INTEGER PRIMARY KEY CHECK(id=1),last_sequence INTEGER NOT NULL DEFAULT 0)`, + `INSERT OR IGNORE INTO organizer_activity_bridge(id,last_sequence) VALUES(1,0)`, + } { + if _, err := s.DB.Exec(q); err != nil { + return err + } + } + if err := s.ensureTaskHierarchySchema(); err != nil { + return err + } + if err := s.ensureTaskDAVSchema(); err != nil { + return err + } + if err := s.ensureTaskReminderSchema(); err != nil { + return err + } + if err := s.ensureTaskBlocksSchema(); err != nil { + return err + } + return s.ensureTaskFocusSchema() +} + +func validTaskDate(v string) bool { + if v == "" { + return true + } + t, err := time.Parse("2006-01-02", v) + return err == nil && t.Year() >= 1 && t.Format("2006-01-02") == v +} + +func validateTask(item *TaskRecord) error { + if !validTaskNotesSubpath(item.NotesSubpath) || (item.Kind != "project" && item.NotesSubpath != "") { + return ErrTaskInvalid + } + if err := validateTaskHierarchy(item); err != nil { + return err + } + if item.NotifyDue || item.NotifyPlanned { + if item.ReminderTime == "" { + item.ReminderTime = "09:00" + } + if item.Kind != "task" || (item.NotifyDue && item.DueOn == "") || (item.NotifyPlanned && item.PlannedOn == "") { + return ErrTaskInvalid + } + } + if item.ReminderTime != "" { + v, e := time.Parse("15:04", item.ReminderTime) + if e != nil || v.Format("15:04") != item.ReminderTime { + return ErrTaskInvalid + } + } + item.Title = strings.TrimSpace(item.Title) + if id, err := uuid.Parse(item.UUID); err != nil || id.String() != item.UUID { + return ErrTaskInvalid + } + if item.Kind != "task" && item.Kind != "project" { + return ErrTaskInvalid + } + if item.Title == "" || len(item.Title) > 300 || strings.ContainsAny(item.Title, "\r\n\x00") || !utf8.ValidString(item.Title) || !utf8.ValidString(item.Notes) || len(item.Notes) > 16384 || strings.ContainsRune(item.Notes, 0) { + return ErrTaskInvalid + } + if item.Status != "todo" && item.Status != "doing" && item.Status != "done" && item.Status != "cancelled" { + return ErrTaskInvalid + } + if item.Bucket != "inbox" && item.Bucket != "backlog" && item.Bucket != "someday" { + return ErrTaskInvalid + } + if item.Priority < 0 || item.Priority > 3 || item.Estimate < 0 || item.Estimate > 10080 { + return ErrTaskInvalid + } + if !validTaskDate(item.DueOn) || !validTaskDate(item.PlannedOn) || !validTaskDate(item.ReviewOn) { + return ErrTaskInvalid + } + if item.ProjectUUID != "" { + if id, err := uuid.Parse(item.ProjectUUID); err != nil || id.String() != item.ProjectUUID { + return ErrTaskInvalid + } + } + if item.PageUUID != "" { + if id, err := uuid.Parse(item.PageUUID); err != nil || id.String() != item.PageUUID { + return ErrTaskInvalid + } + } + if item.Kind == "project" && (item.ProjectUUID != "" || item.DueOn != "" || item.PlannedOn != "" || item.ReviewOn != "" || item.Estimate != 0) { + return ErrTaskInvalid + } + return nil +} + +// The source of authority is checked again in the same SQLite writer transaction +// as the conditional head, revision and change-journal commit. +func taskActor(ctx context.Context, q interface { + QueryRowContext(context.Context, string, ...any) *sql.Row +}, domain, actor string, write bool) error { + var allowed bool + err := q.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM principals p JOIN domain_memberships m ON m.principal_uuid=p.uuid JOIN domains d ON d.uuid=m.domain_uuid WHERE p.uuid=? AND m.domain_uuid=? AND m.state='active' AND d.enabled=1 AND COALESCE(d.placement,'local')='local' AND (p.state='active' OR (?=0 AND p.state='readonly')))`, actor, domain, write).Scan(&allowed) + if err != nil { + return err + } + if !allowed { + return ErrAccessDenied + } + return nil +} + +func (s *Store) SaveTask(ctx context.Context, domain, actor string, item TaskRecord, expected int64) (TaskRecord, error) { + return s.saveTask(ctx, domain, actor, item, expected, nil) +} + +// prepare participates in the same writer transaction as the task head. +func (s *Store) saveTask(ctx context.Context, domain, actor string, item TaskRecord, expected int64, prepare func(*sql.Tx, *TaskRecord, TaskRecord) error) (TaskRecord, error) { + if err := validateTask(&item); err != nil { + return TaskRecord{}, err + } + ctx, cancel := context.WithTimeout(ctx, 5*time.Second) + defer cancel() + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return TaskRecord{}, err + } + defer tx.Rollback() + if _, err = tx.ExecContext(ctx, `UPDATE domain_memberships SET state=state WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil { + return TaskRecord{}, err + } + if err = taskActor(ctx, tx, domain, actor, true); err != nil { + return TaskRecord{}, err + } + var rawConfig string + err = tx.QueryRowContext(ctx, `SELECT value FROM config WHERE domain_uuid=? AND key='system_extension_states'`, domain).Scan(&rawConfig) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return TaskRecord{}, err + } + states := map[string]bool{} + if rawConfig != "" && json.Unmarshal([]byte(rawConfig), &states) != nil { + return TaskRecord{}, ErrAccessDenied + } + if enabled, exists := states["organizer.tasks"]; exists && !enabled { + return TaskRecord{}, ErrAccessDenied + } + if item.NotifyDue || item.NotifyPlanned { + item.ReminderTimezone = "UTC" + err = tx.QueryRowContext(ctx, `SELECT value FROM config WHERE domain_uuid=? AND key='timezone'`, domain).Scan(&item.ReminderTimezone) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return TaskRecord{}, err + } + if _, e := time.LoadLocation(item.ReminderTimezone); e != nil || item.ReminderTimezone == "" { + item.ReminderTimezone = "UTC" + } + } + var oldJSON, owner string + err = tx.QueryRowContext(ctx, `SELECT data,owner_uuid FROM organizer_items WHERE domain_uuid=? AND uuid=?`, domain, item.UUID).Scan(&oldJSON, &owner) + var old TaskRecord + if err == nil { + if owner != actor { + return TaskRecord{}, sql.ErrNoRows + } + if err = json.Unmarshal([]byte(oldJSON), &old); err != nil { + return TaskRecord{}, err + } + if expected == 0 { // Safe retry of a create with the same client-generated UUID. + candidate := item + candidate.Version, candidate.CreatedMS, candidate.UpdatedMS, candidate.CompletedMS = old.Version, old.CreatedMS, old.UpdatedMS, old.CompletedMS + b, _ := json.Marshal(candidate) + if string(b) == oldJSON { + return old, nil + } + return TaskRecord{}, ErrTaskConflict + } + if old.Version != expected || old.Kind != item.Kind { + return TaskRecord{}, ErrTaskConflict + } + } else if !errors.Is(err, sql.ErrNoRows) { + return TaskRecord{}, err + } else if expected != 0 { + return TaskRecord{}, sql.ErrNoRows + } + if item.ProjectUUID != "" && item.ProjectUUID != old.ProjectUUID { + var exists bool + err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND uuid=? AND kind='project' AND archived=0)`, domain, actor, item.ProjectUUID).Scan(&exists) + if err != nil { + return TaskRecord{}, err + } + if !exists { + return TaskRecord{}, ErrTaskInvalid + } + } + if err = s.validateTaskParentTx(ctx, tx, domain, actor, item, old); err != nil { + return TaskRecord{}, err + } + // DAV identity and round-trip metadata are writable only through the DAV + // transaction callback, never through a generic JSON/UI update. + item.CalDAV = old.CalDAV + item.DAVCollection = old.DAVCollection + if prepare != nil { + if err = prepare(tx, &item, old); err != nil { + return TaskRecord{}, err + } + } + if err = syncTaskDAVTx(ctx, tx, domain, actor, item); err != nil { + return TaskRecord{}, err + } + if item.PageUUID != "" && item.PageUUID != old.PageUUID { + var exists bool + err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM paths WHERE domain_uuid=? AND object_uuid=?)`, domain, item.PageUUID).Scan(&exists) + if err != nil { + return TaskRecord{}, err + } + if !exists { + return TaskRecord{}, ErrTaskInvalid + } + } + now := time.Now().UnixMilli() + item.Version = old.Version + 1 + item.CreatedMS = old.CreatedMS + item.UpdatedMS = now + if item.CreatedMS == 0 { + item.CreatedMS = now + } + item.CompletedMS = old.CompletedMS + if item.Status == "done" && old.Status != "done" { + item.CompletedMS = now + } else if item.Status != "done" { + item.CompletedMS = 0 + } + b, err := json.Marshal(item) + if err != nil { + return TaskRecord{}, err + } + hash := revisionHash(string(b)) + if err = s.persistDocument(hash, string(b)); err != nil { + return TaskRecord{}, err + } + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_items(domain_uuid,owner_uuid,uuid,kind,project_uuid,title,status,bucket,due_on,planned_on,review_on,archived,version,created_at_ms,updated_at_ms,data,document_hash) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT(domain_uuid,uuid) DO UPDATE SET project_uuid=excluded.project_uuid,title=excluded.title,status=excluded.status,bucket=excluded.bucket,due_on=excluded.due_on,planned_on=excluded.planned_on,review_on=excluded.review_on,archived=excluded.archived,version=excluded.version,updated_at_ms=excluded.updated_at_ms,data=excluded.data,document_hash=excluded.document_hash`, domain, actor, item.UUID, item.Kind, item.ProjectUUID, item.Title, item.Status, item.Bucket, item.DueOn, item.PlannedOn, item.ReviewOn, item.Archived, item.Version, item.CreatedMS, item.UpdatedMS, string(b), hash) + if err != nil { + return TaskRecord{}, err + } + if _, err = tx.ExecContext(ctx, `UPDATE organizer_items SET parent_uuid=?,start_on=?,end_on=? WHERE domain_uuid=? AND uuid=?`, item.ParentUUID, item.StartOn, item.EndOn, domain, item.UUID); err != nil { + return TaskRecord{}, err + } + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_revisions(domain_uuid,item_uuid,version,actor_uuid,document_hash,created_at_ms) VALUES(?,?,?,?,?,?)`, domain, item.UUID, item.Version, actor, hash, now) + if err != nil { + return TaskRecord{}, err + } + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_changes(domain_uuid,item_uuid,version,actor_uuid,created_at_ms) VALUES(?,?,?,?,?)`, domain, item.UUID, item.Version, actor, now) + if err != nil { + return TaskRecord{}, err + } + if _, err = s.appendTaskActivityTx(tx, domain, actor, item.UUID, item.Kind, item.Version, now); err != nil { + return TaskRecord{}, err + } + if err = s.syncTaskRemindersTx(ctx, tx, domain, actor, item); err != nil { + return TaskRecord{}, err + } + if err = tx.Commit(); err != nil { + return TaskRecord{}, err + } + return item, nil +} + +func (s *Store) GetTask(ctx context.Context, domain, actor, id string) (TaskRecord, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return TaskRecord{}, err + } + var data, hash string + err := s.DB.QueryRowContext(ctx, `SELECT data,document_hash FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, id).Scan(&data, &hash) + if err != nil { + return TaskRecord{}, err + } + if s.DocumentRoot != "" { + data, err = s.readDocument(hash) + if err != nil { + return TaskRecord{}, err + } + } + if revisionHash(data) != hash { + return TaskRecord{}, ErrDocumentHashMismatch + } + var item TaskRecord + err = json.Unmarshal([]byte(data), &item) + return item, err +} + +func (s *Store) ListTasks(ctx context.Context, domain, actor string, query TaskQuery) ([]TaskRecord, string, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return nil, "", err + } + if query.Kind != "task" && query.Kind != "project" { + return nil, "", ErrTaskInvalid + } + if !validTaskDate(query.Today) || query.Today == "" || len(query.Search) > 200 { + return nil, "", ErrTaskInvalid + } + if query.Limit < 1 || query.Limit > 100 { + query.Limit = 60 + } + q := `SELECT data FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND kind=?` + args := []any{domain, actor, query.Kind} + hierarchy := query.Hierarchy && query.Kind == "task" && query.View != "family" + if hierarchy { + q = `WITH task_rows AS ( + SELECT i.*,COALESCE(p.created_at_ms,i.created_at_ms) AS family_created, + COALESCE(p.uuid,i.uuid) AS family_uuid,(i.parent_uuid='') AS family_head + FROM organizer_items i LEFT JOIN organizer_items p + ON p.domain_uuid=i.domain_uuid AND p.owner_uuid=i.owner_uuid AND p.uuid=i.parent_uuid + WHERE i.domain_uuid=? AND i.owner_uuid=? + ) SELECT data FROM task_rows WHERE kind=?` + } + if query.View == "family" { + if query.Parent == "" || query.Kind != "task" { + return nil, "", ErrTaskInvalid + } + } else if query.View == "archived" { + q += ` AND archived=1` + } else { + q += ` AND archived=0` + } + if query.Parent != "" { + if _, err := s.GetTask(ctx, domain, actor, query.Parent); err != nil { + return nil, "", err + } + q += ` AND parent_uuid=?` + args = append(args, query.Parent) + } + if query.Project != "" { + q += ` AND project_uuid=?` + args = append(args, query.Project) + } + if query.Kind == "task" { + switch query.View { + case "today": + q += ` AND status NOT IN ('done','cancelled') AND (planned_on=? OR (due_on!='' AND due_on<=?))` + args = append(args, query.Today, query.Today) + case "day": + q += ` AND status NOT IN ('done','cancelled') AND (planned_on=? OR due_on=?)` + args = append(args, query.Today, query.Today) + case "carryover": + q += ` AND status NOT IN ('done','cancelled') AND ((planned_on!='' AND planned_on0` + args = append(args, query.Search) + } + if query.Before != "" { + if hierarchy { + // A separate indexed cursor lookup keeps the wide task_rows CTE + // single-use, avoiding materialization of every private JSON body. + var familyCreated, created int64 + var familyUUID, id string + var head int + err := s.DB.QueryRowContext(ctx, `SELECT COALESCE(p.created_at_ms,i.created_at_ms),COALESCE(p.uuid,i.uuid),(i.parent_uuid=''),i.created_at_ms,i.uuid + FROM organizer_items i LEFT JOIN organizer_items p ON p.domain_uuid=i.domain_uuid AND p.owner_uuid=i.owner_uuid AND p.uuid=i.parent_uuid + WHERE i.domain_uuid=? AND i.owner_uuid=? AND i.uuid=?`, domain, actor, query.Before).Scan(&familyCreated, &familyUUID, &head, &created, &id) + if errors.Is(err, sql.ErrNoRows) { + return []TaskRecord{}, "", nil + } + if err != nil { + return nil, "", err + } + q += ` AND (family_created,family_uuid,family_head,created_at_ms,uuid)<(?,?,?,?,?)` + args = append(args, familyCreated, familyUUID, head, created, id) + } else { + q += ` AND (created_at_ms,uuid)<(SELECT created_at_ms,uuid FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND uuid=?)` + args = append(args, domain, actor, query.Before) + } + } + if hierarchy { + q += ` ORDER BY family_created DESC,family_uuid DESC,family_head DESC,created_at_ms DESC,uuid DESC LIMIT ?` + } else { + q += ` ORDER BY created_at_ms DESC,uuid DESC LIMIT ?` + } + args = append(args, query.Limit+1) + rows, err := s.DB.QueryContext(ctx, q, args...) + if err != nil { + return nil, "", err + } + defer rows.Close() + items := []TaskRecord{} + for rows.Next() { + var raw string + var item TaskRecord + if err = rows.Scan(&raw); err != nil { + return nil, "", err + } + if err = json.Unmarshal([]byte(raw), &item); err != nil { + return nil, "", err + } + item.Notes = "" + item.CalDAV = nil + items = append(items, item) + } + if err = rows.Err(); err != nil { + return nil, "", err + } + next := "" + if len(items) > query.Limit { + items = items[:query.Limit] + next = items[len(items)-1].UUID + } + return items, next, nil +} + +type TaskRevision struct { + Version int64 `json:"version"` + CreatedMS int64 `json:"created_at_ms"` +} + +func (s *Store) TaskHistory(ctx context.Context, domain, actor, id string) ([]TaskRevision, error) { + if _, err := s.GetTask(ctx, domain, actor, id); err != nil { + return nil, err + } + rows, err := s.DB.QueryContext(ctx, `SELECT version,created_at_ms FROM organizer_revisions WHERE domain_uuid=? AND item_uuid=? ORDER BY version DESC LIMIT 50`, domain, id) + if err != nil { + return nil, err + } + defer rows.Close() + items := []TaskRevision{} + for rows.Next() { + var v TaskRevision + if err = rows.Scan(&v.Version, &v.CreatedMS); err != nil { + return nil, err + } + items = append(items, v) + } + return items, rows.Err() +} diff --git a/internal/store/tasks_activity.go b/internal/store/tasks_activity.go new file mode 100644 index 0000000..6696f87 --- /dev/null +++ b/internal/store/tasks_activity.go @@ -0,0 +1,94 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "strconv" + "time" +) + +const TaskActivityBridgeEventType = "task.activity.publish" + +// No title, notes, Wiki path or dates are copied into the common journal. +// Consumers must reload the item and verify current authority before delivery. +func (s *Store) appendTaskActivityTx(tx *sql.Tx, domain, actor, id, kind string, version, occurred int64) (bool, error) { + if (kind != "task" && kind != "project") || version < 1 { + return false, ErrTaskInvalid + } + payload, err := json.Marshal(struct { + Version int64 `json:"version"` + OccurredMS int64 `json:"occurred_at_ms"` + }{version, occurred}) + if err != nil { + return false, err + } + _, created, err := s.AppendActivityOutboxTx(tx, ActivityOutboxEvent{DomainUUID: domain, ActorUUID: actor, EventType: "organizer." + kind + ".changed", TargetKind: kind, TargetUUID: id, Payload: string(payload), IdempotencyKey: "organizer:" + kind + ":" + id + ":" + strconv.FormatInt(version, 10)}) + return created, err +} + +// PublishTaskActivity migrates the existing compact journal in bounded, +// restartable batches. New mutations already append directly and atomically; +// their idempotency key also makes this repair path safe to replay. +func (s *Store) PublishTaskActivity(ctx context.Context, limit int) (int, int, error) { + if limit < 1 || limit > 100 { + limit = 100 + } + ctx, cancel := context.WithTimeout(ctx, 3*time.Second) + defer cancel() + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return 0, 0, err + } + defer tx.Rollback() + if _, err = tx.ExecContext(ctx, `UPDATE organizer_activity_bridge SET last_sequence=last_sequence WHERE id=1`); err != nil { + return 0, 0, err + } + rows, err := tx.QueryContext(ctx, `SELECT c.sequence,c.domain_uuid,c.item_uuid,c.version,c.actor_uuid,c.created_at_ms,COALESCE(i.kind,'') FROM organizer_changes c LEFT JOIN organizer_items i ON i.domain_uuid=c.domain_uuid AND i.uuid=c.item_uuid WHERE c.sequence>(SELECT last_sequence FROM organizer_activity_bridge WHERE id=1) ORDER BY c.sequence LIMIT ?`, limit) + if err != nil { + return 0, 0, err + } + type change struct { + sequence, version, occurred int64 + domain, id, actor, kind string + } + changes := []change{} + for rows.Next() { + var c change + if err = rows.Scan(&c.sequence, &c.domain, &c.id, &c.version, &c.actor, &c.occurred, &c.kind); err != nil { + rows.Close() + return 0, 0, err + } + changes = append(changes, c) + } + err = rows.Err() + rows.Close() + if err != nil { + return 0, 0, err + } + published := 0 + for _, c := range changes { + created, e := s.appendTaskActivityTx(tx, c.domain, c.actor, c.id, c.kind, c.version, c.occurred) + if e != nil { + return 0, 0, e + } + if created { + published++ + } + } + if len(changes) > 0 { + if _, err = tx.ExecContext(ctx, `UPDATE organizer_activity_bridge SET last_sequence=? WHERE id=1`, changes[len(changes)-1].sequence); err != nil { + return 0, 0, err + } + } + if err = tx.Commit(); err != nil { + return 0, 0, err + } + return len(changes), published, nil +} + +func (s *Store) EnsureTaskActivityBridgeEvent() error { + now := time.Now().UnixMilli() + _, err := s.DB.Exec(`INSERT OR IGNORE INTO event_definitions(uuid,name,event_type,event_key,payload,schedule_kind,interval_seconds,next_run_at_ms,enabled,priority,max_attempts,created_at_ms,updated_at_ms) VALUES(?,?,?,?,?,'interval',60,?,1,-5,3,?,?)`, "builtin.task.activity.publish", "Task activity journal bridge", TaskActivityBridgeEventType, "local", "{}", now, now, now) + return err +} diff --git a/internal/store/tree.go b/internal/store/tree.go index c641be6..55933d1 100644 --- a/internal/store/tree.go +++ b/internal/store/tree.go @@ -1,6 +1,7 @@ package store import ( + "path" "sort" "strings" ) @@ -22,13 +23,29 @@ type FlatTreeNode struct { } func (s *Store) BuildPathTree() (*TreeNode, error) { + domainUUID, err := s.defaultDomainUUID() + if err != nil { + return nil, err + } + return s.BuildPathTreeInDomain(domainUUID) +} +func (s *Store) BuildPathTreeInDomain(domainUUID string) (*TreeNode, error) { + return s.BuildPathTreeAtInDomain(domainUUID, "/") +} + +func (s *Store) BuildPathTreeAtInDomain(domainUUID, rootPath string) (*TreeNode, error) { + rootPath = path.Clean(normalizeBrowserPath(rootPath)) + prefix := strings.TrimRight(rootPath, "/") + "/" rows, err := s.DB.Query(` SELECT path FROM paths - WHERE path LIKE '/%' + WHERE domain_uuid = ? + AND path >= ? AND path < ? + AND path != '/u' + AND path NOT LIKE '/u/%' ORDER BY path ASC - `) + `, domainUUID, prefix, strings.TrimSuffix(prefix, "/")+"0") if err != nil { return nil, err @@ -37,8 +54,8 @@ func (s *Store) BuildPathTree() (*TreeNode, error) { defer rows.Close() root := &TreeNode{ - Name: "/", - FullPath: "/", + Name: path.Base(rootPath), + FullPath: rootPath, Children: map[string]*TreeNode{}, IsDir: true, } @@ -55,17 +72,21 @@ func (s *Store) BuildPathTree() (*TreeNode, error) { return nil, err } + if path == rootPath { + continue + } parts := strings.Split( strings.TrimPrefix( path, - "/", + prefix, ), "/", ) current := root var pathBuilder strings.Builder + pathBuilder.WriteString(strings.TrimRight(rootPath, "/")) for i, part := range parts { @@ -110,7 +131,7 @@ func (s *Store) BuildPathTree() (*TreeNode, error) { walk(root) - return root, nil + return root, rows.Err() } func FlattenTree( diff --git a/internal/store/tree_test.go b/internal/store/tree_test.go new file mode 100644 index 0000000..285e7e9 --- /dev/null +++ b/internal/store/tree_test.go @@ -0,0 +1,74 @@ +package store + +import ( + "database/sql" + "testing" + + _ "modernc.org/sqlite" +) + +func TestBuildPathTreeExcludesUserNamespace(t *testing.T) { + database, err := sql.Open("sqlite", "file:tree-user-namespace-test?mode=memory&cache=shared") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + if _, err := database.Exec(`CREATE TABLE paths(domain_uuid TEXT,path TEXT); INSERT INTO paths VALUES('d','/u'),('d','/u/alice'),('d','/u/alice/note'),('d','/docs/guide')`); err != nil { + t.Fatal(err) + } + st := &Store{DB: database} + tree, err := st.BuildPathTreeInDomain("d") + if err != nil { + t.Fatal(err) + } + var flattened []FlatTreeNode + FlattenTree(tree, 0, &flattened) + for _, node := range flattened { + if node.FullPath == "/u" || len(node.FullPath) > 3 && node.FullPath[:3] == "/u/" { + t.Fatalf("user namespace leaked into Tree View: %q", node.FullPath) + } + } + if len(flattened) != 2 || flattened[0].FullPath != "/docs" || flattened[1].FullPath != "/docs/guide" { + t.Fatalf("tree = %#v", flattened) + } +} + +func TestTreeScopeUsesLiteralPathAndDomain(t *testing.T) { + database, err := sql.Open("sqlite", ":memory:") + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = database.Close() }) + if _, err := database.Exec(`CREATE TABLE paths(domain_uuid TEXT,path TEXT); + INSERT INTO paths VALUES('d','/docs/a/b'),('d','/docs/a/c'),('d','/docset/hidden'), + ('other','/docs/secret'),('d','/a_%/child'),('d','/a12/hidden'),('d','/Docs/hidden'),('d','/u/alice');`); err != nil { + t.Fatal(err) + } + st := &Store{DB: database} + for _, tc := range []struct { + root string + want []string + }{ + {"/docs", []string{"/docs", "/docs/a", "/docs/a/b", "/docs/a/c"}}, + {"/a_%", []string{"/a_%", "/a_%/child"}}, + {"/missing", []string{"/missing"}}, + } { + tree, err := st.BuildPathTreeAtInDomain("d", tc.root) + if err != nil { + t.Fatal(err) + } + var nodes []FlatTreeNode + FlattenTree(tree, 0, &nodes) + if len(nodes) != len(tc.want) { + t.Fatalf("%s: %#v", tc.root, nodes) + } + for i, want := range tc.want { + if nodes[i].FullPath != want { + t.Fatalf("%s: %#v", tc.root, nodes) + } + } + if len(nodes) > 1 && nodes[1].Depth != 1 { + t.Fatalf("relative depth: %#v", nodes) + } + } +} diff --git a/internal/store/user_space.go b/internal/store/user_space.go new file mode 100644 index 0000000..7d01c7e --- /dev/null +++ b/internal/store/user_space.go @@ -0,0 +1,490 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "path" + "sort" + "strings" + "time" +) + +const MaxUserSpaceOverrides = 256 + +type UserSpacePathPolicy struct { + Path string `json:"path"` + Visibility string `json:"visibility"` +} + +type UserSpacePolicy struct { + PrincipalUUID string `json:"principal_uuid"` + Username string `json:"username"` + ProfileVisibility string `json:"profile_visibility"` + AvatarVisibility string `json:"avatar_visibility"` + RootVisibility string `json:"root_visibility"` + DescendantVisibility string `json:"descendant_visibility"` + Version int64 `json:"version"` + DomainAllowsPublic bool `json:"domain_allows_public"` + Overrides []UserSpacePathPolicy `json:"overrides"` +} + +type UserSpacePage struct { + Path string + Visibility string + Override string +} + +func (s *Store) EnsureUserSpaceSchema() error { + for _, query := range []string{ + `CREATE TABLE IF NOT EXISTS user_space_policies( + domain_uuid TEXT NOT NULL, principal_uuid TEXT NOT NULL, + profile_visibility TEXT NOT NULL CHECK(profile_visibility IN ('private','domain','public')), + avatar_visibility TEXT NOT NULL CHECK(avatar_visibility IN ('private','domain','public')), + root_visibility TEXT NOT NULL CHECK(root_visibility IN ('private','domain','public')), + descendant_visibility TEXT NOT NULL CHECK(descendant_visibility IN ('private','domain','public')), + version INTEGER NOT NULL, actor_uuid TEXT NOT NULL, updated_at_ms INTEGER NOT NULL, + PRIMARY KEY(domain_uuid,principal_uuid))`, + `CREATE TABLE IF NOT EXISTS user_space_path_policies( + domain_uuid TEXT NOT NULL, principal_uuid TEXT NOT NULL, path TEXT NOT NULL, + visibility TEXT NOT NULL CHECK(visibility IN ('private','domain')), + actor_uuid TEXT NOT NULL, updated_at_ms INTEGER NOT NULL, + PRIMARY KEY(domain_uuid,principal_uuid,path))`, + `CREATE INDEX IF NOT EXISTS idx_user_space_path_policy ON user_space_path_policies(domain_uuid,path,principal_uuid)`, + `CREATE TABLE IF NOT EXISTS user_space_policy_events( + id INTEGER PRIMARY KEY AUTOINCREMENT, domain_uuid TEXT NOT NULL, principal_uuid TEXT NOT NULL, + actor_uuid TEXT NOT NULL, before_json TEXT NOT NULL, after_json TEXT NOT NULL, created_at_ms INTEGER NOT NULL)`, + `CREATE INDEX IF NOT EXISTS idx_user_space_policy_events ON user_space_policy_events(domain_uuid,principal_uuid,id DESC)`, + `CREATE TRIGGER IF NOT EXISTS user_space_path_policy_move BEFORE UPDATE OF path,domain_uuid ON paths + WHEN EXISTS(SELECT 1 FROM user_space_path_policies usp WHERE usp.domain_uuid=OLD.domain_uuid AND usp.path=OLD.path) + AND NOT EXISTS(SELECT 1 FROM user_space_path_policies usp JOIN principal_identities i ON i.principal_uuid=usp.principal_uuid AND i.provider_type='password' + WHERE usp.domain_uuid=OLD.domain_uuid AND usp.path=OLD.path AND NEW.domain_uuid=OLD.domain_uuid AND substr(NEW.path,1,length('/u/'||i.subject||'/'))='/u/'||i.subject||'/') + BEGIN SELECT RAISE(ABORT,'user_space_policy_scope'); END`, + `CREATE TRIGGER IF NOT EXISTS user_space_path_policy_rename AFTER UPDATE OF path ON paths + BEGIN UPDATE user_space_path_policies SET path=NEW.path WHERE domain_uuid=OLD.domain_uuid AND path=OLD.path; END`, + `CREATE TRIGGER IF NOT EXISTS user_space_path_policy_delete AFTER DELETE ON paths + BEGIN DELETE FROM user_space_path_policies WHERE domain_uuid=OLD.domain_uuid AND path=OLD.path; END`, + } { + if _, err := s.DB.Exec(query); err != nil { + return err + } + } + return s.ensureNavigationSchema() +} + +func defaultUserSpacePolicy(principal, username string) UserSpacePolicy { + return UserSpacePolicy{PrincipalUUID: principal, Username: username, ProfileVisibility: "domain", AvatarVisibility: "domain", RootVisibility: "domain", DescendantVisibility: "domain", Overrides: []UserSpacePathPolicy{}} +} + +func userSpaceVisibilityRank(value string) int { + switch value { + case "private": + return 0 + case "domain": + return 1 + case "public": + return 2 + default: + return -1 + } +} + +func userSpaceRoot(username string) string { return "/u/" + username } + +func escapeUserSpaceLike(value string) string { + value = strings.ReplaceAll(value, "\\", "\\\\") + value = strings.ReplaceAll(value, "%", "\\%") + return strings.ReplaceAll(value, "_", "\\_") +} + +func userSpaceDocumentPath(username, value string, descendant bool) bool { + root := userSpaceRoot(username) + if value != path.Clean(value) || strings.ContainsAny(value, "\\\x00\r\n") { + return false + } + if descendant { + if !strings.HasPrefix(value, root+"/") { + return false + } + rest := strings.TrimPrefix(value, root+"/") + return rest != "" && !strings.HasPrefix(rest, "_/") && rest != "_" + } + return value == root +} + +func (s *Store) domainAllowsUserSpacePublic(ctx context.Context, q interface { + QueryRowContext(context.Context, string, ...any) *sql.Row +}, domain string) (bool, error) { + var allowed bool + err := q.QueryRowContext(ctx, `SELECT EXISTS( + SELECT 1 FROM domains d JOIN campuses c ON c.uuid=d.campus_uuid + JOIN config cfg ON cfg.domain_uuid=d.uuid AND cfg.key='authorization_mode' AND cfg.value='enforcing' + JOIN locality_publication_policies p ON p.domain_uuid=d.uuid AND p.node_kind='domain' AND p.node_uuid=d.uuid AND p.policy='public' + WHERE d.uuid=? AND d.enabled=1 AND c.enabled=1)`, domain).Scan(&allowed) + return allowed, err +} + +func loadUserSpacePolicy(ctx context.Context, q interface { + QueryRowContext(context.Context, string, ...any) *sql.Row + QueryContext(context.Context, string, ...any) (*sql.Rows, error) +}, domain, principal, username string) (UserSpacePolicy, error) { + p := defaultUserSpacePolicy(principal, username) + err := q.QueryRowContext(ctx, `SELECT profile_visibility,avatar_visibility,root_visibility,descendant_visibility,version FROM user_space_policies WHERE domain_uuid=? AND principal_uuid=?`, domain, principal).Scan(&p.ProfileVisibility, &p.AvatarVisibility, &p.RootVisibility, &p.DescendantVisibility, &p.Version) + if err != nil && err != sql.ErrNoRows { + return p, err + } + rows, err := q.QueryContext(ctx, `SELECT path,visibility FROM user_space_path_policies WHERE domain_uuid=? AND principal_uuid=? ORDER BY path LIMIT ?`, domain, principal, MaxUserSpaceOverrides+1) + if err != nil { + return p, err + } + defer rows.Close() + for rows.Next() { + var item UserSpacePathPolicy + if err = rows.Scan(&item.Path, &item.Visibility); err != nil { + return p, err + } + p.Overrides = append(p.Overrides, item) + } + if err = rows.Err(); err != nil { + return p, err + } + if len(p.Overrides) > MaxUserSpaceOverrides { + return p, ErrGovernanceInvalid + } + return p, nil +} + +func (s *Store) UserSpacePolicy(ctx context.Context, domain, principal string) (UserSpacePolicy, error) { + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + var username string + if err := s.DB.QueryRowContext(ctx, `SELECT i.subject FROM principal_identities i JOIN domain_memberships m ON m.principal_uuid=i.principal_uuid AND m.domain_uuid=? AND m.state='active' JOIN principals p ON p.uuid=i.principal_uuid AND p.state IN ('active','readonly') WHERE i.principal_uuid=? AND i.provider_type='password'`, domain, principal).Scan(&username); err != nil { + return UserSpacePolicy{}, err + } + p, err := loadUserSpacePolicy(ctx, s.DB, domain, principal, username) + if err != nil { + return p, err + } + p.DomainAllowsPublic, err = s.domainAllowsUserSpacePublic(ctx, s.DB, domain) + return p, err +} + +func userSpaceEffectiveVisibility(p UserSpacePolicy, target string) string { + root := userSpaceRoot(p.Username) + if target == root { + return p.RootVisibility + } + if !userSpaceDocumentPath(p.Username, target, true) { + return "private" + } + visibility := p.DescendantVisibility + for _, item := range p.Overrides { + if target == item.Path || strings.HasPrefix(target, strings.TrimRight(item.Path, "/")+"/") { + if userSpaceVisibilityRank(item.Visibility) < userSpaceVisibilityRank(visibility) { + visibility = item.Visibility + } + } + } + return visibility +} + +func EffectiveUserSpaceVisibility(p UserSpacePolicy, target string) string { + return userSpaceEffectiveVisibility(p, target) +} + +func renameUserSpacePathPoliciesTx(tx *sql.Tx, domain, oldPath, newPath string, recursive bool) error { + // Path mutation is also used by small maintenance/test stores that predate + // the optional authentication schemas. Keep the core rename primitive usable + // there; a fully opened application Store always creates this table. + var tableExists bool + if err := tx.QueryRow(`SELECT EXISTS(SELECT 1 FROM sqlite_master WHERE type='table' AND name='user_space_path_policies')`).Scan(&tableExists); err != nil { + return err + } + if !tableExists { + return nil + } + query := `SELECT usp.principal_uuid,usp.path,i.subject FROM user_space_path_policies usp JOIN principal_identities i ON i.principal_uuid=usp.principal_uuid AND i.provider_type='password' WHERE usp.domain_uuid=? AND usp.path=?` + args := []any{domain, oldPath} + if recursive { + query = `SELECT usp.principal_uuid,usp.path,i.subject FROM user_space_path_policies usp JOIN principal_identities i ON i.principal_uuid=usp.principal_uuid AND i.provider_type='password' WHERE usp.domain_uuid=? AND (usp.path=? OR substr(usp.path,1,length(?)+1)=?||'/') ORDER BY length(usp.path) DESC` + args = []any{domain, oldPath, oldPath, oldPath} + } + rows, err := tx.Query(query, args...) + if err != nil { + return err + } + type move struct{ principal, old, new, username string } + moves := []move{} + for rows.Next() { + var item move + if err = rows.Scan(&item.principal, &item.old, &item.username); err != nil { + rows.Close() + return err + } + item.new = newPath + strings.TrimPrefix(item.old, oldPath) + if !userSpaceDocumentPath(item.username, item.new, true) { + rows.Close() + return ErrGovernanceInvalid + } + moves = append(moves, item) + } + if err = rows.Err(); err != nil { + rows.Close() + return err + } + rows.Close() + for _, item := range moves { + if _, err = tx.Exec(`UPDATE user_space_path_policies SET path=? WHERE domain_uuid=? AND principal_uuid=? AND path=?`, item.new, domain, item.principal, item.old); err != nil { + return err + } + } + return nil +} + +func (s *Store) SaveUserSpacePolicy(ctx context.Context, domain, actor string, proposed UserSpacePolicy) (UserSpacePolicy, error) { + ctx, cancel := context.WithTimeout(ctx, 3*time.Second) + defer cancel() + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return UserSpacePolicy{}, err + } + defer tx.Rollback() + // Reserve the writer before authority and ceiling checks. + if _, err = tx.ExecContext(ctx, `INSERT INTO navigation_generation(id,version) VALUES(1,1) ON CONFLICT(id) DO UPDATE SET version=version`); err != nil { + return UserSpacePolicy{}, err + } + var username string + if err = tx.QueryRowContext(ctx, `SELECT i.subject FROM principal_identities i JOIN domain_memberships m ON m.principal_uuid=i.principal_uuid AND m.domain_uuid=? AND m.state='active' JOIN principals p ON p.uuid=i.principal_uuid AND p.state='active' WHERE i.principal_uuid=? AND i.provider_type='password'`, domain, actor).Scan(&username); err != nil { + return UserSpacePolicy{}, ErrAccessDenied + } + if proposed.PrincipalUUID != "" && proposed.PrincipalUUID != actor || proposed.Username != "" && proposed.Username != username { + return UserSpacePolicy{}, ErrAccessDenied + } + current, err := loadUserSpacePolicy(ctx, tx, domain, actor, username) + if err != nil { + return UserSpacePolicy{}, err + } + if proposed.Version != current.Version { + return current, ErrGovernanceConflict + } + for _, value := range []string{proposed.ProfileVisibility, proposed.AvatarVisibility, proposed.RootVisibility, proposed.DescendantVisibility} { + if userSpaceVisibilityRank(value) < 0 { + return current, ErrGovernanceInvalid + } + } + allowed, err := s.domainAllowsUserSpacePublic(ctx, tx, domain) + if err != nil { + return current, err + } + if !allowed && (proposed.ProfileVisibility == "public" || proposed.AvatarVisibility == "public" || proposed.RootVisibility == "public" || proposed.DescendantVisibility == "public") { + return current, ErrGovernanceCeiling + } + if len(proposed.Overrides) > MaxUserSpaceOverrides { + return current, ErrGovernanceInvalid + } + seen := map[string]bool{} + for i := range proposed.Overrides { + item := &proposed.Overrides[i] + item.Path = path.Clean(item.Path) + if seen[item.Path] || !userSpaceDocumentPath(username, item.Path, true) || userSpaceVisibilityRank(item.Visibility) < 0 || userSpaceVisibilityRank(item.Visibility) > userSpaceVisibilityRank(proposed.DescendantVisibility) || item.Visibility == "public" { + return current, ErrGovernanceInvalid + } + seen[item.Path] = true + var exists bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM paths WHERE domain_uuid=? AND path=?)`, domain, item.Path).Scan(&exists); err != nil || !exists { + return current, ErrGovernanceInvalid + } + } + sort.Slice(proposed.Overrides, func(i, j int) bool { return proposed.Overrides[i].Path < proposed.Overrides[j].Path }) + proposed.PrincipalUUID, proposed.Username, proposed.DomainAllowsPublic = actor, username, allowed + before, _ := json.Marshal(current) + now := time.Now().UnixMilli() + if _, err = tx.ExecContext(ctx, `INSERT INTO user_space_policies(domain_uuid,principal_uuid,profile_visibility,avatar_visibility,root_visibility,descendant_visibility,version,actor_uuid,updated_at_ms) VALUES(?,?,?,?,?,?,1,?,?) ON CONFLICT(domain_uuid,principal_uuid) DO UPDATE SET profile_visibility=excluded.profile_visibility,avatar_visibility=excluded.avatar_visibility,root_visibility=excluded.root_visibility,descendant_visibility=excluded.descendant_visibility,version=user_space_policies.version+1,actor_uuid=excluded.actor_uuid,updated_at_ms=excluded.updated_at_ms`, domain, actor, proposed.ProfileVisibility, proposed.AvatarVisibility, proposed.RootVisibility, proposed.DescendantVisibility, actor, now); err != nil { + return current, err + } + if _, err = tx.ExecContext(ctx, `DELETE FROM user_space_path_policies WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil { + return current, err + } + for _, item := range proposed.Overrides { + if _, err = tx.ExecContext(ctx, `INSERT INTO user_space_path_policies VALUES(?,?,?,?,?,?)`, domain, actor, item.Path, item.Visibility, actor, now); err != nil { + return current, err + } + } + proposed.Version = current.Version + 1 + after, _ := json.Marshal(proposed) + if _, err = tx.ExecContext(ctx, `INSERT INTO user_space_policy_events(domain_uuid,principal_uuid,actor_uuid,before_json,after_json,created_at_ms) VALUES(?,?,?,?,?,?)`, domain, actor, actor, string(before), string(after), now); err != nil { + return current, err + } + if err = tx.Commit(); err != nil { + return current, err + } + return proposed, nil +} + +func (s *Store) ListUserSpacePages(ctx context.Context, domain, principal string, limit int) ([]UserSpacePage, error) { + if limit <= 0 || limit > MaxNavigationEntries { + limit = 512 + } + p, err := s.UserSpacePolicy(ctx, domain, principal) + if err != nil { + return nil, err + } + rows, err := s.DB.QueryContext(ctx, `SELECT path FROM paths WHERE domain_uuid=? AND path LIKE ? ESCAPE '\' ORDER BY path LIMIT ?`, domain, escapeUserSpaceLike(userSpaceRoot(p.Username))+"/%", limit+1) + if err != nil { + return nil, err + } + defer rows.Close() + result := []UserSpacePage{} + explicit := map[string]string{} + for _, item := range p.Overrides { + explicit[item.Path] = item.Visibility + } + for rows.Next() { + var item UserSpacePage + if err = rows.Scan(&item.Path); err != nil { + return nil, err + } + if !userSpaceDocumentPath(p.Username, item.Path, true) { + continue + } + item.Visibility = userSpaceEffectiveVisibility(p, item.Path) + item.Override = explicit[item.Path] + result = append(result, item) + } + if len(result) > limit { + return nil, ErrNavigationBudget + } + return result, rows.Err() +} + +func (s *Store) UserSpaceCanReadAuthenticated(ctx context.Context, domain, viewer, target string) (bool, error) { + parts := strings.Split(strings.TrimPrefix(target, "/u/"), "/") + if len(parts) == 0 || parts[0] == "" { + return false, nil + } + owner, err := s.PrincipalByUsername(domain, parts[0]) + if err != nil { + return false, err + } + if viewer == owner.UUID || s.IsBuiltinGroupAdmin(domain, viewer, "domain_admin") { + return true, nil + } + p, err := s.UserSpacePolicy(ctx, domain, owner.UUID) + if err != nil { + return false, err + } + root := userSpaceRoot(p.Username) + if target == root+"/_/avatar" { + return p.AvatarVisibility != "private", nil + } + if strings.HasPrefix(target, root+"/_/") { + return false, nil + } + if target == root { + return p.ProfileVisibility != "private" || p.RootVisibility != "private", nil + } + return userSpaceEffectiveVisibility(p, target) != "private", nil +} + +func chooseRevisionLanguage(items []*Revision, languages []string) (*Revision, error) { + if len(items) == 0 || len(items) > 32 { + return nil, sql.ErrNoRows + } + for _, language := range languages { + for _, item := range items { + if item.Language == language { + return item, nil + } + } + } + return items[0], nil +} + +func (s *Store) PublicUserSpaceRevision(ctx context.Context, domain, username, target string, languages []string) (*Revision, error) { + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + owner, err := s.PrincipalByUsername(domain, username) + if err != nil { + return nil, err + } + p, err := s.UserSpacePolicy(ctx, domain, owner.UUID) + if err != nil || !p.DomainAllowsPublic || userSpaceEffectiveVisibility(p, target) != "public" { + return nil, sql.ErrNoRows + } + rows, err := s.DB.QueryContext(ctx, `SELECT r.uuid,r.object_uuid,r.document_hash,COALESCE(NULLIF(r.lang,''),'und'),COALESCE(NULLIF(r.content_type,''),'text/html; charset=utf-8'),COALESCE(r.filename,''),r.created_at_ms + FROM paths p JOIN revisions r ON r.object_uuid=p.object_uuid + WHERE p.domain_uuid=? AND p.path=? + AND NOT EXISTS(SELECT 1 FROM paths other WHERE other.object_uuid=p.object_uuid AND (other.domain_uuid!=p.domain_uuid OR other.path!=p.path)) + AND r.uuid=(SELECT head.uuid FROM revisions head WHERE head.object_uuid=r.object_uuid AND COALESCE(NULLIF(head.lang,''),'und')=COALESCE(NULLIF(r.lang,''),'und') ORDER BY head.created_at_ms DESC,head.rowid DESC LIMIT 1) + ORDER BY r.created_at_ms DESC,r.uuid LIMIT 33`, domain, target) + if err != nil { + return nil, err + } + defer rows.Close() + items := []*Revision{} + for rows.Next() { + v := &Revision{} + if err = rows.Scan(&v.UUID, &v.ObjectUUID, &v.DocumentHash, &v.Language, &v.ContentType, &v.Filename, &v.CreatedAtMS); err != nil { + return nil, err + } + items = append(items, v) + } + if err = rows.Err(); err != nil { + return nil, err + } + return chooseRevisionLanguage(items, languages) +} + +func (s *Store) PublicUserSpaceNavigation(ctx context.Context, domain, username string) ([]PublishedNavigationPage, error) { + ctx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + owner, err := s.PrincipalByUsername(domain, username) + if err != nil { + return nil, err + } + p, err := s.UserSpacePolicy(ctx, domain, owner.UUID) + if err != nil || !p.DomainAllowsPublic { + return nil, sql.ErrNoRows + } + root := userSpaceRoot(username) + rows, err := s.DB.QueryContext(ctx, `SELECT p.path,r.uuid,r.object_uuid,r.document_hash,COALESCE(NULLIF(r.lang,''),'und'),COALESCE(NULLIF(r.content_type,''),'text/html; charset=utf-8'),COALESCE(r.filename,''),r.created_at_ms + FROM paths p JOIN revisions r ON r.object_uuid=p.object_uuid + WHERE p.domain_uuid=? AND (p.path=? OR p.path LIKE ? ESCAPE '\') + AND NOT EXISTS(SELECT 1 FROM paths other WHERE other.object_uuid=p.object_uuid AND (other.domain_uuid!=p.domain_uuid OR other.path!=p.path)) + AND r.uuid=(SELECT head.uuid FROM revisions head WHERE head.object_uuid=r.object_uuid AND COALESCE(NULLIF(head.lang,''),'und')=COALESCE(NULLIF(r.lang,''),'und') ORDER BY head.created_at_ms DESC,head.rowid DESC LIMIT 1) + ORDER BY p.path,r.created_at_ms DESC,r.uuid LIMIT ?`, domain, root, escapeUserSpaceLike(root)+"/%", MaxNavigationEntries+1) + if err != nil { + return nil, err + } + defer rows.Close() + result := []PublishedNavigationPage{} + for rows.Next() { + var item PublishedNavigationPage + v := &item.Revision + if err = rows.Scan(&item.Path, &v.UUID, &v.ObjectUUID, &v.DocumentHash, &v.Language, &v.ContentType, &v.Filename, &v.CreatedAtMS); err != nil { + return nil, err + } + if userSpaceEffectiveVisibility(p, item.Path) == "public" && (item.Path == root || userSpaceDocumentPath(username, item.Path, true)) { + result = append(result, item) + } + } + if err = rows.Err(); err != nil { + return nil, err + } + if len(result) > MaxNavigationEntries { + return nil, ErrNavigationBudget + } + return result, nil +} + +func IsUserSpacePath(value string) bool { + parts := strings.Split(strings.TrimPrefix(value, "/u/"), "/") + return strings.HasPrefix(value, "/u/") && len(parts) > 0 && parts[0] != "" +} + +func UserSpaceUsername(value string) string { + if !IsUserSpacePath(value) { + return "" + } + return strings.Split(strings.TrimPrefix(value, "/u/"), "/")[0] +} diff --git a/internal/store/zombie_gc.go b/internal/store/zombie_gc.go index 7b69912..48894b6 100644 --- a/internal/store/zombie_gc.go +++ b/internal/store/zombie_gc.go @@ -1,5 +1,24 @@ package store +import ( + "context" + "database/sql" + "errors" + "fmt" + "strings" + "time" +) + +const ( + ZombieGCDefaultLimit = 100 + ZombieGCMaxLimit = 1000 + ZombieGCDefaultGraceSeconds int64 = 24 * 60 * 60 + zombieGCTimeout = 5 * time.Second + emptyDocumentSHA256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" +) + +var ErrZombieGCOptions = errors.New("invalid zombie GC options") + type ZombieObject struct { UUID string CreatedAt int64 @@ -7,135 +26,207 @@ type ZombieObject struct { MaxBodyLength int } -func (s *Store) ListZombieObjects( - graceSeconds int64, -) ([]ZombieObject, error) { +// EnsureZombieGCSchema runs during initialization, never on the request path. +// Domain-only stores used for federation do not necessarily own an object store. +func (s *Store) EnsureZombieGCSchema() error { + var exists bool + if err := s.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM sqlite_master WHERE type='table' AND name='objects')`).Scan(&exists); err != nil || !exists { + return err + } + statements := []string{ + `CREATE TABLE IF NOT EXISTS zombie_gc_maintenance (singleton INTEGER PRIMARY KEY CHECK(singleton=1), grace_seconds INTEGER NOT NULL CHECK(grace_seconds>=86400))`, + `INSERT OR IGNORE INTO zombie_gc_maintenance(singleton,grace_seconds) VALUES(1,86400)`, + `CREATE INDEX IF NOT EXISTS idx_objects_zombie_age ON objects(created_at,uuid)`, + `CREATE INDEX IF NOT EXISTS idx_object_origins_domain ON object_origins(domain_uuid,object_uuid)`, + `CREATE INDEX IF NOT EXISTS idx_assets_object_uuid ON assets(object_uuid)`, + `CREATE INDEX IF NOT EXISTS idx_tags_object_uuid ON tags(object_uuid)`, + `CREATE INDEX IF NOT EXISTS idx_spot_pages_page ON spot_pages(page_uuid)`, + `CREATE INDEX IF NOT EXISTS idx_street_inbox_page ON street_inbox_pages(page_uuid)`, + `CREATE INDEX IF NOT EXISTS idx_city_page_overrides_page ON city_page_overrides(page_uuid)`, + `CREATE INDEX IF NOT EXISTS idx_adapter_sessions_object ON adapter_sessions(object_uuid)`, + `CREATE INDEX IF NOT EXISTS idx_auth_grants_object_target ON auth_capability_grants(target_type,target_id)`, + } + for _, statement := range statements { + if _, err := s.DB.Exec(statement); err != nil { + return err + } + } + return nil +} - rows, err := s.DB.Query(` - SELECT - o.uuid, - o.created_at, - COUNT(r.uuid) AS revision_count, - COALESCE(MAX(LENGTH(r.body)), 0) AS max_body_length - FROM objects o - LEFT JOIN paths p - ON p.object_uuid = o.uuid - LEFT JOIN revisions r - ON r.object_uuid = o.uuid - WHERE p.object_uuid IS NULL - AND o.created_at < strftime('%s','now') - ? - GROUP BY - o.uuid, - o.created_at - HAVING - revision_count = 0 - OR max_body_length = 0 - ORDER BY - o.created_at ASC - `, - graceSeconds, - ) +// RaiseZombieMaintenanceGrace is an instance-maintenance operation, not a +// Domain setting. The persistent high-water mark cannot shorten old retention. +func (s *Store) RaiseZombieMaintenanceGrace(ctx context.Context, graceSeconds int64) (int64, error) { + if graceSeconds < 0 { + return 0, ErrZombieGCOptions + } + ctx, cancel := context.WithTimeout(ctx, zombieGCTimeout) + defer cancel() + var grace int64 + err := s.DB.QueryRowContext(ctx, `UPDATE zombie_gc_maintenance SET grace_seconds=MAX(grace_seconds,?) WHERE singleton=1 RETURNING grace_seconds`, graceSeconds).Scan(&grace) + return grace, err +} +// This predicate intentionally examines all domains, all revisions (not merely +// the head), and both inline bytes and CAS metadata. A nonempty inline body must +// not be masked by a stale empty-document hash. Semantic references and active +// editor sessions also protect deliberately empty documents. +const zombieEligibility = ` + NOT EXISTS(SELECT 1 FROM paths p WHERE p.object_uuid=o.uuid) + AND NOT EXISTS(SELECT 1 FROM assets a WHERE a.object_uuid=o.uuid) + AND NOT EXISTS(SELECT 1 FROM revisions r WHERE r.object_uuid=o.uuid AND ( + COALESCE(r.document_hash,'') NOT IN ('','` + emptyDocumentSHA256 + `') + OR length(CAST(COALESCE(r.body,'') AS BLOB)) > 0 + OR EXISTS(SELECT 1 FROM revision_document_refs ref WHERE ref.revision_uuid=r.uuid))) + AND NOT EXISTS(SELECT 1 FROM spot_pages sp WHERE sp.page_uuid=o.uuid) + AND NOT EXISTS(SELECT 1 FROM street_inbox_pages ip WHERE ip.page_uuid=o.uuid) + AND NOT EXISTS(SELECT 1 FROM city_page_overrides ov WHERE ov.page_uuid=o.uuid) + AND NOT EXISTS(SELECT 1 FROM auth_capability_grants g WHERE g.target_type='object' AND g.target_id=o.uuid) + AND NOT EXISTS(SELECT 1 FROM adapter_sessions ed WHERE ed.object_uuid=o.uuid + AND MAX(ed.ticket_expires_at_ms,ed.session_expires_at_ms) > CAST(strftime('%s','now') AS INTEGER)*1000) +` + +func zombieOptions(graceSeconds int64, limit int) (int, error) { + if graceSeconds < 0 || limit < 0 || limit > ZombieGCMaxLimit { + return 0, ErrZombieGCOptions + } + if limit == 0 { + limit = ZombieGCDefaultLimit + } + return limit, nil +} + +type zombieQueryer interface { + QueryContext(context.Context, string, ...any) (*sql.Rows, error) +} + +func queryZombieObjects(ctx context.Context, q zombieQueryer, domainUUID string, cutoff int64, limit int) ([]ZombieObject, error) { + query := `SELECT o.uuid,o.created_at,(SELECT COUNT(*) FROM revisions r WHERE r.object_uuid=o.uuid),0 ` + args := []any{} + if domainUUID != "" { + // Start with the indexed Domain origins, not every other Domain's + // objects. CROSS JOIN preserves that loop order even before ANALYZE. + query += `FROM object_origins origin CROSS JOIN objects o ON o.uuid=origin.object_uuid WHERE origin.domain_uuid=? AND ` + args = append(args, domainUUID) + } else { + query += `FROM objects o WHERE ` + } + query += `o.created_at < ? AND ` + zombieEligibility + args = append(args, cutoff) + query += ` ORDER BY o.created_at,o.uuid LIMIT ?` + args = append(args, limit) + rows, err := q.QueryContext(ctx, query, args...) if err != nil { return nil, err } - defer rows.Close() - - var out []ZombieObject - + out := []ZombieObject{} for rows.Next() { - var z ZombieObject - - err := rows.Scan( - &z.UUID, - &z.CreatedAt, - &z.RevisionCount, - &z.MaxBodyLength, - ) - - if err != nil { + if err := rows.Scan(&z.UUID, &z.CreatedAt, &z.RevisionCount, &z.MaxBodyLength); err != nil { return nil, err } - out = append(out, z) } - - return out, nil + return out, rows.Err() } -func (s *Store) PurgeZombieObjects( - graceSeconds int64, - limit int, -) (int, error) { +// ListZombieObjects is reserved for trusted, instance-wide maintenance/CLI use. +// HTTP callers must use ListZombieObjectsInDomain, including instance admins. +func (s *Store) ListZombieObjects(graceSeconds int64) ([]ZombieObject, error) { + return s.listZombieObjects(context.Background(), "", graceSeconds, ZombieGCMaxLimit) +} - zombies, err := - s.ListZombieObjects( - graceSeconds, - ) +func (s *Store) ListZombieObjectsInDomain(ctx context.Context, domainUUID string, graceSeconds int64, limit int) ([]ZombieObject, error) { + if strings.TrimSpace(domainUUID) == "" { + return nil, fmt.Errorf("%w: Domain required", ErrZombieGCOptions) + } + return s.listZombieObjects(ctx, domainUUID, graceSeconds, limit) +} +func (s *Store) listZombieObjects(ctx context.Context, domainUUID string, graceSeconds int64, limit int) ([]ZombieObject, error) { + limit, err := zombieOptions(graceSeconds, limit) + if err != nil { + return nil, err + } + ctx, cancel := context.WithTimeout(ctx, zombieGCTimeout) + defer cancel() + return queryZombieObjects(ctx, s.DB, domainUUID, time.Now().Unix()-graceSeconds, limit) +} + +// PurgeZombieObjects remains global only for trusted instance maintenance. +func (s *Store) PurgeZombieObjects(graceSeconds int64, limit int) (int, error) { + return s.purgeZombieObjects(context.Background(), "", graceSeconds, limit) +} + +func (s *Store) PurgeZombieObjectsInDomain(ctx context.Context, domainUUID string, graceSeconds int64, limit int) (int, error) { + if strings.TrimSpace(domainUUID) == "" { + return 0, fmt.Errorf("%w: Domain required", ErrZombieGCOptions) + } + return s.purgeZombieObjects(ctx, domainUUID, graceSeconds, limit) +} + +func (s *Store) purgeZombieObjects(ctx context.Context, domainUUID string, graceSeconds int64, limit int) (int, error) { + limit, err := zombieOptions(graceSeconds, limit) if err != nil { return 0, err } - - if limit > 0 && - len(zombies) > limit { - - zombies = zombies[:limit] - } - - tx, err := - s.DB.Begin() - + ctx, cancel := context.WithTimeout(ctx, zombieGCTimeout) + defer cancel() + tx, err := s.DB.BeginTx(ctx, nil) if err != nil { return 0, err } - + defer tx.Rollback() + // Acquire SQLite's writer lock BEFORE reading any candidate. Other writers + // cannot add a Path/Asset/revision between selection and deletion. + result, err := tx.ExecContext(ctx, `UPDATE zombie_gc_maintenance SET grace_seconds=grace_seconds WHERE singleton=1`) + if err != nil { + return 0, err + } + if n, err := result.RowsAffected(); err != nil || n != 1 { + return 0, errors.New("zombie GC maintenance lock is unavailable") + } + cutoff := time.Now().Unix() - graceSeconds + zombies, err := queryZombieObjects(ctx, tx, domainUUID, cutoff, limit) + if err != nil { + return 0, err + } + deleted := 0 for _, z := range zombies { - - _, err = tx.Exec(` - DELETE FROM tags - WHERE object_uuid = ? - `, - z.UUID, - ) - - if err != nil { - tx.Rollback() + // Revalidate immediately before destructive work, within the write + // transaction. A future selector refactor cannot make a stale list safe. + query := `SELECT EXISTS(SELECT 1 FROM objects o WHERE o.uuid=? AND o.created_at < ? AND ` + zombieEligibility + args := []any{z.UUID, cutoff} + if domainUUID != "" { + query += ` AND EXISTS(SELECT 1 FROM object_origins origin WHERE origin.object_uuid=o.uuid AND origin.domain_uuid=?)` + args = append(args, domainUUID) + } + var eligible bool + if err := tx.QueryRowContext(ctx, query+`)`, args...).Scan(&eligible); err != nil { return 0, err } - - _, err = tx.Exec(` - DELETE FROM revisions - WHERE object_uuid = ? - `, - z.UUID, - ) - - if err != nil { - tx.Rollback() - return 0, err + if !eligible { + continue } - - _, err = tx.Exec(` - DELETE FROM objects - WHERE uuid = ? - `, - z.UUID, - ) - - if err != nil { - tx.Rollback() - return 0, err + // Foreign keys are not enabled on every legacy connection. Explicitly + // clean dependent bookkeeping; revision triggers maintain the FTS index. + for _, statement := range []string{ + `DELETE FROM revision_document_refs WHERE revision_uuid IN (SELECT uuid FROM revisions WHERE object_uuid=?)`, + `DELETE FROM tags WHERE object_uuid=?`, + `DELETE FROM revisions WHERE object_uuid=?`, + `DELETE FROM adapter_sessions WHERE object_uuid=?`, + `DELETE FROM object_origins WHERE object_uuid=?`, + `DELETE FROM objects WHERE uuid=?`, + } { + if _, err := tx.ExecContext(ctx, statement, z.UUID); err != nil { + return 0, err + } } + deleted++ } - - err = tx.Commit() - - if err != nil { + if err := tx.Commit(); err != nil { return 0, err } - - return len(zombies), nil + return deleted, nil } diff --git a/internal/store/zombie_gc_integrity_test.go b/internal/store/zombie_gc_integrity_test.go new file mode 100644 index 0000000..1fb4762 --- /dev/null +++ b/internal/store/zombie_gc_integrity_test.go @@ -0,0 +1,368 @@ +package store + +import ( + "context" + "database/sql" + "database/sql/driver" + "errors" + "fmt" + "sync" + "sync/atomic" + "testing" + "time" + + "modernc.org/sqlite" + "pageswiki/internal/db" +) + +func zombieFixture(t *testing.T) (*Store, string) { + t.Helper() + filename := t.TempDir() + "/zombie.db" + database, err := db.Open(filename) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { database.Close() }) + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + return New(database), filename +} + +func seedZombie(t *testing.T, st *Store, id, domain string) { + t.Helper() + if _, err := st.DB.Exec(`INSERT INTO objects(uuid,kind,created_at) VALUES(?,'page',1)`, id); err != nil { + t.Fatal(err) + } + if domain != "" { + if _, err := st.DB.Exec(`INSERT INTO object_origins(object_uuid,domain_uuid,created_at) VALUES(?,?,1)`, id, domain); err != nil { + t.Fatal(err) + } + } +} + +func requireGCObject(t *testing.T, st *Store, id string, want bool) { + t.Helper() + var exists bool + if err := st.DB.QueryRow(`SELECT EXISTS(SELECT 1 FROM objects WHERE uuid=?)`, id).Scan(&exists); err != nil || exists != want { + t.Fatalf("Object %s exists=%v want=%v err=%v", id, exists, want, err) + } +} + +func TestZombieGCDomainProvenanceAndGlobalReferenceProtection(t *testing.T) { + st, _ := zombieFixture(t) + for _, spec := range [][2]string{{"own", "local"}, {"foreign", "foreign"}, {"legacy", ""}, {"foreign-path", "local"}, {"foreign-asset", "local"}} { + seedZombie(t, st, spec[0], spec[1]) + } + if _, err := st.DB.Exec(` + INSERT INTO paths(domain_uuid,path,object_uuid,created_at) VALUES('foreign','/kept','foreign-path',1); + INSERT INTO assets(domain_uuid,address,object_uuid,created_at_ms,updated_at_ms) VALUES('foreign','asset:file:kept','foreign-asset',1,1) + `); err != nil { + t.Fatal(err) + } + zombies, err := st.ListZombieObjectsInDomain(context.Background(), "local", 0, 100) + if err != nil || len(zombies) != 1 || zombies[0].UUID != "own" { + t.Fatalf("scoped list=%+v err=%v", zombies, err) + } + if n, err := st.PurgeZombieObjectsInDomain(context.Background(), "local", 0, 100); err != nil || n != 1 { + t.Fatalf("scoped purge=%d err=%v", n, err) + } + requireGCObject(t, st, "own", false) + for _, id := range []string{"foreign", "legacy", "foreign-path", "foreign-asset"} { + requireGCObject(t, st, id, true) + } + if n, err := st.PurgeZombieObjects(0, 100); err != nil || n != 2 { + t.Fatalf("trusted maintenance=%d err=%v", n, err) + } + for _, id := range []string{"foreign-path", "foreign-asset"} { + requireGCObject(t, st, id, true) + } + var origins int + if err := st.DB.QueryRow(`SELECT COUNT(*) FROM object_origins WHERE object_uuid IN ('own','foreign')`).Scan(&origins); err != nil || origins != 0 { + t.Fatalf("orphan origin count=%d err=%v", origins, err) + } +} + +func TestZombieGCProtectsAllBytesHistoryAndSemanticReferences(t *testing.T) { + st, _ := zombieFixture(t) + ids := []string{"no-revision", "empty-inline", "empty-cas", "inconsistent-hash", "nul-byte", "nonempty-cas", "historical-body", "attachment", "spot", "inbox", "override", "editor", "grant"} + for _, id := range ids { + seedZombie(t, st, id, "local") + } + for _, spec := range []struct{ id, body, hash string }{ + {"empty-inline", "", ""}, {"empty-cas", "", emptyDocumentSHA256}, + {"inconsistent-hash", "keep", emptyDocumentSHA256}, {"nul-byte", "\x00", ""}, + {"nonempty-cas", "", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}, + {"historical-body", "keep", ""}, {"attachment", "", emptyDocumentSHA256}, + } { + if _, err := st.DB.Exec(`INSERT INTO revisions(uuid,object_uuid,body,document_hash,created_at_ms,created_at) VALUES(?,?,?,?,1,1)`, spec.id+"-rev", spec.id, spec.body, spec.hash); err != nil { + t.Fatal(err) + } + } + if _, err := st.DB.Exec(` + INSERT INTO revisions(uuid,object_uuid,body,document_hash,created_at_ms,created_at) VALUES('head','historical-body','','',2,2); + INSERT INTO revision_document_refs(revision_uuid,document_hash) VALUES('attachment-rev','attachment-hash'); + INSERT INTO spot_pages(spot_uuid,page_uuid,created_at_ms) VALUES('spot-id','spot',1); + INSERT INTO street_inbox_pages(street_uuid,page_uuid,created_at_ms) VALUES('street-id','inbox',1); + INSERT INTO city_page_overrides(domain_uuid,page_uuid,spot_uuid) VALUES('local','override','spot-id'); + INSERT INTO adapter_sessions(ticket_hash,domain_uuid,plugin_id,object_uuid,base_revision_uuid,ticket_expires_at_ms,created_at_ms) VALUES('ticket','local','editor','editor','',9999999999999,1); + INSERT INTO auth_capability_grants(uuid,role_uuid,capability,target_type,target_id,created_at_ms) VALUES('grant-id','role','read','object','grant',1) + `); err != nil { + t.Fatal(err) + } + if n, err := st.PurgeZombieObjects(0, 100); err != nil || n != 3 { + t.Fatalf("purged=%d err=%v", n, err) + } + for i, id := range ids { + requireGCObject(t, st, id, i >= 3) + } +} + +// Keep a second connection's write transaction open while GC starts. In WAL +// mode, the old implementation read stale candidates successfully before +// waiting for that writer, then deleted a newly linked/populated Object. +func TestZombieGCSeesLatePathAssetAndRevisionCommit(t *testing.T) { + for _, change := range []string{"path", "asset", "revision"} { + t.Run(change, func(t *testing.T) { + st, filename := zombieFixture(t) + seedZombie(t, st, "late", "local") + writer, err := db.Open(filename) + if err != nil { + t.Fatal(err) + } + defer writer.Close() + tx, err := writer.Begin() + if err != nil { + t.Fatal(err) + } + defer tx.Rollback() + switch change { + case "path": + _, err = tx.Exec(`INSERT INTO paths(domain_uuid,path,object_uuid,created_at) VALUES('foreign','/late','late',1)`) + case "asset": + _, err = tx.Exec(`INSERT INTO assets(domain_uuid,address,object_uuid,created_at_ms,updated_at_ms) VALUES('foreign','asset:file:late','late',1,1)`) + case "revision": + _, err = tx.Exec(`INSERT INTO revisions(uuid,object_uuid,body,created_at_ms,created_at) VALUES('late-revision','late','keep',1,1)`) + } + if err != nil { + t.Fatal(err) + } + type outcome struct { + n int + err error + } + result := make(chan outcome, 1) + go func() { n, err := st.PurgeZombieObjects(0, 100); result <- outcome{n, err} }() + waitForBlockedGCWriter(t, st.DB) + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + select { + case got := <-result: + if got.err != nil || got.n != 0 { + t.Fatalf("late %s lost: purged=%d err=%v", change, got.n, got.err) + } + case <-time.After(5 * time.Second): + t.Fatal("GC did not finish after writer committed") + } + requireGCObject(t, st, "late", true) + }) + } +} + +func waitForBlockedGCWriter(t *testing.T, database *sql.DB) { + t.Helper() + deadline := time.NewTimer(2 * time.Second) + defer deadline.Stop() + tick := time.NewTicker(time.Millisecond) + defer tick.Stop() + for database.Stats().InUse == 0 { + select { + case <-tick.C: + case <-deadline.C: + t.Fatal("writer did not acquire a database connection") + } + } + // The pending writer holds the SQLite lock for the whole interval, allowing + // even the old read-then-write implementation to reach its blocked DELETE. + time.Sleep(100 * time.Millisecond) +} + +func TestZombieGCLimitsCancellationAndRollback(t *testing.T) { + st, _ := zombieFixture(t) + if _, err := st.DB.Exec(`WITH RECURSIVE seq(n) AS (VALUES(1) UNION ALL SELECT n+1 FROM seq WHERE n<1005) + INSERT INTO objects(uuid,kind,created_at) SELECT printf('z-%04d',n),'page',1 FROM seq; + INSERT INTO object_origins(object_uuid,domain_uuid,created_at) SELECT uuid,'local',1 FROM objects`); err != nil { + t.Fatal(err) + } + zombies, err := st.ListZombieObjects(0) + if err != nil || len(zombies) != ZombieGCMaxLimit { + t.Fatalf("global listing not bounded: n=%d err=%v", len(zombies), err) + } + zombies, err = st.ListZombieObjectsInDomain(context.Background(), "local", 0, 3) + if err != nil || len(zombies) != 3 || zombies[0].UUID != "z-0001" { + t.Fatalf("SQL limit/order: %+v %v", zombies, err) + } + for _, limit := range []int{-1, ZombieGCMaxLimit + 1} { + if _, err := st.PurgeZombieObjects(0, limit); !errors.Is(err, ErrZombieGCOptions) { + t.Fatalf("invalid limit %d accepted: %v", limit, err) + } + } + if _, err := st.PurgeZombieObjects(-1, 1); !errors.Is(err, ErrZombieGCOptions) { + t.Fatal("negative grace accepted") + } + if _, err := st.PurgeZombieObjectsInDomain(context.Background(), "", 0, 1); !errors.Is(err, ErrZombieGCOptions) { + t.Fatal("missing Domain became global maintenance") + } + ctx, cancel := context.WithCancel(context.Background()) + cancel() + if _, err := st.ListZombieObjectsInDomain(ctx, "local", 0, 1); !errors.Is(err, context.Canceled) { + t.Fatalf("list cancellation=%v", err) + } + if _, err := st.PurgeZombieObjectsInDomain(ctx, "local", 0, 1); !errors.Is(err, context.Canceled) { + t.Fatalf("purge cancellation=%v", err) + } + if _, err := st.DB.Exec(`INSERT INTO tags(object_uuid,tag) VALUES('z-0001','keep'); + INSERT INTO revisions(uuid,object_uuid,body,created_at_ms,created_at) VALUES('empty-rev','z-0001','',1,1); + CREATE TRIGGER reject_zombie_delete BEFORE DELETE ON objects BEGIN SELECT RAISE(ABORT,'injected failure'); END`); err != nil { + t.Fatal(err) + } + if n, err := st.PurgeZombieObjects(0, 1); err == nil || n != 0 { + t.Fatalf("partial success escaped rollback: %d %v", n, err) + } + for _, query := range []string{`SELECT COUNT(*) FROM objects WHERE uuid='z-0001'`, `SELECT COUNT(*) FROM tags WHERE object_uuid='z-0001'`, `SELECT COUNT(*) FROM revisions WHERE uuid='empty-rev'`, `SELECT COUNT(*) FROM object_origins WHERE object_uuid='z-0001'`} { + var n int + if err := st.DB.QueryRow(query).Scan(&n); err != nil || n != 1 { + t.Fatalf("rollback lost %s: %d %v", query, n, err) + } + } + if _, err := st.DB.Exec(`DROP TRIGGER reject_zombie_delete`); err != nil { + t.Fatal(err) + } + if n, err := st.PurgeZombieObjects(0, 2); err != nil || n != 2 { + t.Fatalf("purge limit=%d %v", n, err) + } + if n, err := st.PurgeZombieObjects(0, 0); err != nil || n != ZombieGCDefaultLimit { + t.Fatalf("zero limit must be bounded default: %d %v", n, err) + } +} + +func TestObjectWritersRejectGCRaceInsteadOfCreatingOrphans(t *testing.T) { + for _, operation := range []string{"path"} { + t.Run(operation, func(t *testing.T) { + st, filename := zombieFixture(t) + seedZombie(t, st, "gone", "") + seedZombie(t, st, "keeper", "") + domain, err := st.GetDefaultDomain() + if err != nil { + t.Fatal(err) + } + if err := st.BindPathInDomain(domain.UUID, "/kept", "keeper"); err != nil { + t.Fatal(err) + } + writer, err := db.Open(filename) + if err != nil { + t.Fatal(err) + } + defer writer.Close() + tx, err := writer.Begin() + if err != nil { + t.Fatal(err) + } + defer tx.Rollback() + if _, err = tx.Exec(`DELETE FROM objects WHERE uuid='gone'`); err != nil { + t.Fatal(err) + } + result := make(chan error, 1) + go func() { + result <- st.BindPathInDomain(domain.UUID, "/kept", "gone") + }() + waitForBlockedGCWriter(t, st.DB) + if err := tx.Commit(); err != nil { + t.Fatal(err) + } + select { + case err := <-result: + if !errors.Is(err, ErrPageNotFound) { + t.Fatalf("late %s write error=%v", operation, err) + } + case <-time.After(5 * time.Second): + t.Fatal("late write did not finish") + } + var orphan int + if err := st.DB.QueryRow(`SELECT (SELECT COUNT(*) FROM paths WHERE object_uuid='gone')+(SELECT COUNT(*) FROM revisions WHERE object_uuid='gone')`).Scan(&orphan); err != nil || orphan != 0 { + t.Fatalf("orphan data=%d %v", orphan, err) + } + if id, err := st.ResolvePathInDomain(domain.UUID, "/kept"); err != nil || id != "keeper" { + t.Fatalf("failed bind replaced existing Path: %s %v", id, err) + } + }) + } +} + +var zombieReadFunctionID atomic.Uint64 + +// Delay the external existence precheck without holding a writer lock. GC can +// commit after that read snapshot, before Revision INSERT begins. This tests +// the atomic INSERT guard itself, without timing assumptions or runtime hooks. +func TestObjectWritersRevisionRechecksAfterZombieGC(t *testing.T) { + reading, resume := make(chan struct{}), make(chan struct{}) + var entered atomic.Bool + var released sync.Once + defer released.Do(func() { close(resume) }) + functionName := fmt.Sprintf("test_zombie_precheck_%d", zombieReadFunctionID.Add(1)) + if err := sqlite.RegisterScalarFunction(functionName, 1, func(_ *sqlite.FunctionContext, args []driver.Value) (driver.Value, error) { + if entered.CompareAndSwap(false, true) { + close(reading) + <-resume + } + return args[0], nil + }); err != nil { + t.Fatal(err) + } + st, filename := zombieFixture(t) + seedZombie(t, st, "gone", "") + if _, err := st.DB.Exec(`ALTER TABLE objects RENAME TO gc_physical_objects; + CREATE VIEW objects AS SELECT ` + functionName + `(uuid) AS uuid,kind,created_at FROM gc_physical_objects`); err != nil { + t.Fatal(err) + } + result := make(chan error, 1) + go func() { _, err := st.SaveRevision("gone", "keep this", "late"); result <- err }() + select { + case <-reading: + case <-time.After(5 * time.Second): + t.Fatal("Revision did not reach its Object precheck") + } + writer, err := db.Open(filename) + if err != nil { + t.Fatal(err) + } + defer writer.Close() + if _, err := writer.Exec(`DELETE FROM gc_physical_objects WHERE uuid='gone'`); err != nil { + t.Fatal(err) + } + released.Do(func() { close(resume) }) + select { + case err := <-result: + if !errors.Is(err, ErrPageNotFound) { + t.Fatalf("Revision did not revalidate after Object deletion: %v", err) + } + case <-time.After(5 * time.Second): + t.Fatal("Revision INSERT did not finish") + } + var count int + if err := st.DB.QueryRow(`SELECT COUNT(*) FROM revisions WHERE object_uuid='gone'`).Scan(&count); err != nil || count != 0 { + t.Fatalf("orphan Revision count=%d err=%v", count, err) + } +} + +func TestZombieGCSchemaAllowsDomainOnlyStore(t *testing.T) { + database, err := sql.Open("sqlite", fmt.Sprintf("file:%s?mode=memory&cache=shared", t.Name())) + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := (&Store{DB: database}).EnsureZombieGCSchema(); err != nil { + t.Fatal(err) + } +} diff --git a/internal/store/zombie_gc_test.go b/internal/store/zombie_gc_test.go new file mode 100644 index 0000000..f617f32 --- /dev/null +++ b/internal/store/zombie_gc_test.go @@ -0,0 +1,33 @@ +package store + +import ( + "testing" + + "pageswiki/internal/db" +) + +func TestAssetOwnerIsNotAZombieObject(t *testing.T) { + database, err := db.Open(t.TempDir() + "/gc.db") + if err != nil { + t.Fatal(err) + } + defer database.Close() + if err := db.Migrate(database); err != nil { + t.Fatal(err) + } + st := New(database) + if _, err := database.Exec(` + INSERT INTO objects(uuid,kind,created_at) VALUES('asset-owner','asset',1),('empty-object','page',1); + INSERT INTO assets(domain_uuid,address,object_uuid,head_document_hash,content_type,filename,size_bytes,created_at_ms,updated_at_ms) + SELECT uuid,'asset:image:logo','asset-owner','aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa','image/png','logo.png',1,1000,1000 FROM domains LIMIT 1 + `); err != nil { + t.Fatal(err) + } + zombies, err := st.ListZombieObjects(0) + if err != nil { + t.Fatal(err) + } + if len(zombies) != 1 || zombies[0].UUID != "empty-object" { + t.Fatalf("zombies=%#v, want only empty-object", zombies) + } +} diff --git a/static/css/auth.css b/static/css/auth.css new file mode 100644 index 0000000..60331f1 --- /dev/null +++ b/static/css/auth.css @@ -0,0 +1,193 @@ +.auth-page { + --home-glass-opacity: 58%; + min-height: 100vh; + min-height: 100dvh; + overflow-x: hidden; + background-color: var(--bg); +} + +.auth-page > :not(.home-wallpaper) { + position: relative; + z-index: 1; +} + +.auth-brand { + position: fixed; + top: 1rem; + left: 1.25rem; + max-width: min(24rem, calc(100vw - 2.5rem)); + overflow: hidden; + color: var(--fg); + font-size: 1rem; + font-weight: 650; + line-height: 2.25rem; + text-decoration: none; + text-overflow: ellipsis; + white-space: nowrap; +} + +.auth-shell { + display: grid; + place-items: center; + width: min(100% - 2rem, 30rem); + min-height: 100vh; + min-height: 100dvh; + margin: 0 auto; + padding: 5.5rem 0 3rem; + box-sizing: border-box; +} + +.auth-card { + width: 100%; + box-sizing: border-box; + padding: clamp(1.35rem, 4vw, 2rem); + border: 1px solid color-mix(in srgb, var(--border) 72%, var(--accent) 28%); + border-radius: 1rem; + background: color-mix(in srgb, var(--bg) var(--home-glass-opacity, 58%), transparent); + box-shadow: 0 1.4rem 4rem #0007; + -webkit-backdrop-filter: blur(18px) saturate(120%); + backdrop-filter: blur(18px) saturate(120%); +} + +.auth-heading h1 { + margin: 0 0 1.4rem; + font-size: clamp(1.5rem, 5vw, 2rem); + font-weight: 620; + letter-spacing: -.02em; +} + +.auth-form { + display: grid; + gap: 1rem; +} + +.auth-form label { + display: grid; + gap: .4rem; + color: var(--fg); + font-size: .88rem; +} + +.auth-form input { + width: 100%; + box-sizing: border-box; + padding: .72rem .82rem; + border: 1px solid color-mix(in srgb, var(--input-border, var(--border)) 82%, var(--accent) 18%); + border-radius: .55rem; + background: color-mix(in srgb, var(--input-bg, var(--bg)) 78%, transparent); + color: var(--input-fg, var(--fg)); + font: inherit; +} + +.auth-form input:focus { + border-color: var(--accent); + outline: 2px solid color-mix(in srgb, var(--accent) 35%, transparent); + outline-offset: 2px; +} + +.auth-primary, +.auth-secondary, +.auth-provider-button { + display: flex; + align-items: center; + justify-content: center; + gap: .65rem; + min-height: 2.8rem; + box-sizing: border-box; + padding: .65rem 1rem; + border: 1px solid color-mix(in srgb, var(--border) 72%, var(--accent) 28%); + border-radius: .6rem; + color: var(--fg); + font: inherit; + font-weight: 620; + text-align: center; + text-decoration: none; + cursor: pointer; +} + +.auth-primary { + border-color: var(--accent); + background: var(--accent); + color: var(--bg); +} + +.auth-secondary, +.auth-provider-button { + background: color-mix(in srgb, var(--button-bg, var(--bg)) 72%, transparent); +} + +.auth-primary:hover, +.auth-primary:focus-visible, +.auth-secondary:hover, +.auth-secondary:focus-visible, +.auth-provider-button:hover, +.auth-provider-button:focus-visible { + filter: brightness(1.08); + outline: 2px solid color-mix(in srgb, var(--accent) 48%, transparent); + outline-offset: 2px; +} + +.auth-provider-button svg { + width: 1.35rem; + height: 1.35rem; + fill: none; + stroke: currentColor; + stroke-width: 1.65; + stroke-linecap: round; + stroke-linejoin: round; +} + +.auth-separator { + display: grid; + grid-template-columns: 1fr auto 1fr; + align-items: center; + gap: .7rem; + margin: 1.2rem 0; + color: var(--muted); + font-size: .78rem; +} + +.auth-separator::before, +.auth-separator::after { + height: 1px; + background: var(--border-soft, var(--border)); + content: ""; +} + +.auth-magic-form { + margin-top: 1.2rem; + padding-top: 1.2rem; + border-top: 1px solid var(--border-soft, var(--border)); +} + +.auth-error { + padding: .65rem .75rem; + border: 1px solid color-mix(in srgb, #d33 65%, var(--border)); + border-radius: .5rem; + background: color-mix(in srgb, #d33 12%, transparent); + color: color-mix(in srgb, #f55 80%, var(--fg)); +} + +@supports not ((backdrop-filter: blur(1px)) or (-webkit-backdrop-filter: blur(1px))) { + .auth-card { background: color-mix(in srgb, var(--bg) 92%, transparent); } +} + +@media (max-width: 600px) { + .auth-brand { left: .75rem; } + .auth-shell { width: min(100% - 1.25rem, 30rem); padding-top: 4.5rem; } +} + +@media (forced-colors: active) { + .auth-card, + .auth-form input, + .auth-primary, + .auth-secondary, + .auth-provider-button { + border-color: CanvasText; + background: Canvas; + color: CanvasText; + box-shadow: none; + -webkit-backdrop-filter: none; + backdrop-filter: none; + } +} diff --git a/static/css/bookmarks.css b/static/css/bookmarks.css new file mode 100644 index 0000000..bfdd6f9 --- /dev/null +++ b/static/css/bookmarks.css @@ -0,0 +1,63 @@ +.bookmark-sections { display:grid; grid-template-columns:repeat(auto-fill,minmax(min(100%,13rem),1fr)); gap:1rem; margin-block:1rem; } +.bookmark-section { border:1px solid var(--border); background:var(--panel,var(--bg)); border-radius:.75rem; padding:1rem; min-width:0; } +.home-bookmarks > .bookmark-sections > .bookmark-section { background:color-mix(in srgb,var(--bg) var(--home-glass-opacity,58%),transparent); border-color:color-mix(in srgb,var(--border) 72%,var(--accent) 28%); box-shadow:0 .45rem 1.4rem #0002; -webkit-backdrop-filter:blur(10px) saturate(115%); backdrop-filter:blur(10px) saturate(115%); } +body:has(> .home-wallpaper) .home-bookmarks > .bookmark-sections > .bookmark-section { background:color-mix(in srgb,var(--bg) var(--home-glass-opacity,58%),transparent); box-shadow:0 .55rem 1.8rem #0005; } +@supports not ((backdrop-filter:blur(1px)) or (-webkit-backdrop-filter:blur(1px))) { body:has(> .home-wallpaper) .home-bookmarks > .bookmark-sections > .bookmark-section { background:color-mix(in srgb,var(--bg) 90%,transparent); } } +@media (forced-colors:active) { .home-bookmarks > .bookmark-sections > .bookmark-section { background:Canvas; border-color:CanvasText; box-shadow:none; -webkit-backdrop-filter:none; backdrop-filter:none; } } +.bookmark-section h2 { font-size:1rem; color:var(--fg); margin:0 0 .75rem; } +.bookmark-section ul { margin:0; padding:0; list-style:none; } +.bookmark-section a { display:block; padding:.5rem; color:var(--link); text-decoration:none; overflow-wrap:anywhere; border-radius:.35rem; } +.bookmark-section a:hover { background:var(--row-hover,var(--border-soft)); } +.home-bookmark-manager { margin-block:1rem; } +.home-bookmark-manager summary { cursor:pointer; color:var(--link); } +.home-bookmark-manager #panel-bookmarks { display:block; margin-top:1rem; padding:1rem; border:1px solid var(--border); border-radius:.75rem; } +.home-bookmark-manager .table-scroll { overflow:auto; } +.home-bookmark-manager table { width:100%; border-collapse:collapse; text-align:left; } +.home-bookmark-manager th,.home-bookmark-manager td { padding:.5rem; } +.home-bookmark-manager input:not([type=checkbox]),.home-bookmark-manager select { box-sizing:border-box; width:100%; min-width:8rem; padding:.5rem; } +.home-bookmark-manager .row-actions { white-space:nowrap; } +.home-bookmark-manager button { cursor:pointer; padding:.4rem .7rem; } +.home-bookmark-manager .config-actions { display:flex; gap:.5rem; margin-top:1rem; } +.bookmark-section-row { background:var(--row-hover,var(--border-soft)); } +.bookmark-toggle { display:flex; gap:.4rem; align-items:center; font-size:.85rem; margin-top:.5rem; } +.bookmark-toggle[hidden] { display:none!important; } +.bookmark-toggle input { appearance:none; width:2rem; height:1.1rem; border-radius:1rem; background:var(--border); flex-shrink:0; position:relative; cursor:pointer; } +.bookmark-toggle input::after { content:''; position:absolute; width:.8rem; height:.8rem; top:.15rem; left:.15rem; border-radius:50%; background:var(--fg); transition:transform .15s; } +.bookmark-toggle input:checked { background:var(--accent); } +.bookmark-toggle input:checked::after { transform:translateX(.9rem); } +.bookmark-toggle input:focus-visible { outline:2px solid var(--link); outline-offset:2px; } +.bookmark-toolbar { display:flex; justify-content:flex-end; } +.bookmark-settings-icon { display:grid; place-items:center; width:2rem; height:2rem; padding:.35rem; background:transparent; color:var(--muted,var(--fg)); border:0; border-radius:.4rem; cursor:pointer; } +.bookmark-settings-icon:hover { color:var(--link); background:var(--row-hover,var(--border-soft)); } +.bookmark-settings-icon svg { width:100%; height:100%; fill:none; stroke:currentColor; stroke-width:1.5; stroke-linejoin:round; } +dialog.home-bookmark-manager { width:min(72rem,calc(100vw - 2rem)); max-height:90vh; max-height:90svh; box-sizing:border-box; margin:auto; padding:0; border:1px solid var(--border); border-radius:.85rem; background:var(--bg); color:var(--fg); box-shadow:0 1.5rem 5rem #0009; overflow:auto; } +dialog.home-bookmark-manager::backdrop { background:#0009; backdrop-filter:blur(3px); } +.bookmark-dialog-header { position:sticky; top:0; z-index:2; display:flex; align-items:center; justify-content:space-between; gap:1rem; padding:.75rem 1.25rem; background:var(--bg); border-bottom:1px solid var(--border); } +.bookmark-dialog-header h2 { margin:0; color:var(--fg); font-size:1.1rem; } +.bookmark-dialog-header button { border:0; background:transparent; color:var(--fg); font-size:1.5rem; } +dialog.home-bookmark-manager #panel-bookmarks { border:0; margin:0; padding:1.25rem; } +dialog.home-bookmark-manager #panel-bookmarks > h1 { display:none; } +.bookmark-editor-toolbar { display:flex; gap:.5rem; margin-block:1rem; } +.bookmark-card-editor { display:grid; gap:1rem; } +.bookmark-editor-card { min-width:0; border:1px solid var(--border); border-radius:.65rem; padding:1rem; margin:0; background:var(--panel,var(--bg)); } +.bookmark-card-head { display:flex; align-items:end; gap:.5rem; margin-bottom:1rem; } +.bookmark-card-head .bookmark-field { flex:1; } +.bookmark-card-head h3 { margin:0; } +.bookmark-field { display:flex; flex-direction:column; gap:.35rem; min-width:0; } +.bookmark-field > span { font-size:.8rem; color:var(--muted,var(--fg)); } +.bookmark-field input { width:100%; min-width:0!important; box-sizing:border-box; } +.bookmark-section-options { display:flex; flex-wrap:wrap; align-items:center; gap:1rem; padding-bottom:.75rem; } +.bookmark-section-options .muted { flex-basis:100%; margin:0; font-size:.85rem; } +.bookmark-link-row { display:grid; grid-template-columns:minmax(7rem,1fr) 5rem minmax(9rem,2fr) minmax(5rem,1fr) repeat(3,2rem); gap:.5rem; align-items:end; margin-bottom:.75rem; } +.bookmark-link-row > select { min-width:0; width:100%; } +.bookmark-link-row button { padding:.4rem!important; } +.bookmark-savebar { position:sticky; bottom:0; background:var(--bg); padding-block:1rem; display:flex; gap:1rem; align-items:center; } +.bookmark-legacy[hidden] { display:none!important; } +.vim-config-code { font-family:"Hack Nerd Font",monospace; width:100%; resize:vertical; line-height:1.5; tab-size:4; } +#vim-settings-form input[type=file]::file-selector-button { padding:.45rem .8rem; margin-right:.8rem; border:1px solid var(--border); border-radius:.35rem; background:var(--button-bg,var(--bg)); color:var(--fg); cursor:pointer; } +@media(max-width:700px) { + .bookmark-link-row { grid-template-columns:1fr 1fr repeat(3,2rem); border-top:1px solid var(--border); padding-top:.75rem; } + .bookmark-link-row .bookmark-field { grid-column:span 2; } + .bookmark-link-row .bookmark-field:nth-child(3) { grid-column:1 / -1; } + dialog.home-bookmark-manager { width:calc(100vw - 1rem); max-height:95svh; } +} diff --git a/static/css/calendar-mobile.css b/static/css/calendar-mobile.css new file mode 100644 index 0000000..1badc0f --- /dev/null +++ b/static/css/calendar-mobile.css @@ -0,0 +1,92 @@ +/* Keep the desktop layout and gestures intact. Small screens get compact + navigation; coarse pointers default to scrolling instead of editing. */ +.calendar-mobile-view,.calendar-mobile-days,.calendar-mobile-actions,.calendar-mobile-count,.calendar-touch-edit{display:none} +@media (pointer:coarse){ + .calendar-touch-edit{display:inline-flex;align-items:center;justify-content:center;min-height:40px} + .calendar-time-event,.calendar-time-column{touch-action:pan-x pan-y pinch-zoom} + .calendar-time-event .calendar-move-handle,.calendar-time-event .calendar-resize-handle,.calendar-timeline-handle{display:none} + .calendar-touch-editing .calendar-time-event,.calendar-touch-editing .calendar-time-column{touch-action:none} + .calendar-touch-editing .calendar-move-handle{display:grid;width:28px;height:28px} + .calendar-touch-editing .calendar-resize-handle{display:block;height:10px} + .calendar-touch-editing .calendar-time-event .calendar-event{padding-right:2rem} + .calendar-touch-edit[aria-pressed=true]{background:var(--accent);color:var(--bg)} +} +@media(max-width:650px), (max-width:950px) and (pointer:coarse){ + body:has(.calendar-app)>.topbar{flex-wrap:nowrap;gap:.15rem;padding:.3rem max(.35rem,env(safe-area-inset-right)) .3rem max(.35rem,env(safe-area-inset-left));min-height:44px;box-sizing:border-box} + body:has(.calendar-app)>.topbar>nav{display:none} + body:has(.calendar-app)>.topbar>.brand{flex:1;min-width:0;font-size:.85rem} + body:has(.calendar-app)>.topbar .auth-user-name{display:none} + body:has(.calendar-app)>.topbar .city-map-launch,body:has(.calendar-app)>.topbar .notification-launch{flex:0 0 40px;width:40px;height:40px;margin:0;padding:.55rem} + body:has(.calendar-app)>.topbar .auth-menu>details>summary{min-width:40px;min-height:40px;justify-content:center} + .calendar-app{padding:.35rem max(.35rem,env(safe-area-inset-right)) max(.35rem,env(safe-area-inset-bottom)) max(.35rem,env(safe-area-inset-left));min-width:0} + .calendar-app>.calendar-toolbar:first-child{display:grid;grid-template-columns:minmax(0,1fr) 40px 76px 40px;gap:.3rem;margin-bottom:.3rem} + /* Name and date already have visible controls; keep the heading for readers. */ + .calendar-app>.calendar-toolbar:first-child h1{position:absolute;width:1px;height:1px;overflow:hidden;clip-path:inset(50%);white-space:nowrap} + #calendar-select{grid-row:2;grid-column:1;min-width:0;width:100%} + #calendar-refresh{grid-row:2;grid-column:2} + #calendar-new{grid-row:2;grid-column:3;text-align:center;white-space:nowrap} + #calendar-create,#calendar-settings,#calendar-display-settings,#calendar-source-settings{display:none} + .calendar-mobile-actions{display:block;position:relative;grid-row:2;grid-column:4;z-index:30} + .calendar-mobile-actions>summary{display:grid;place-items:center;min-height:40px;border:1px solid var(--border);border-radius:6px;cursor:pointer;list-style:none;font-size:1.4rem;background:var(--bg)} + .calendar-mobile-actions>summary::-webkit-details-marker{display:none} + .calendar-mobile-actions>div{position:absolute;right:0;top:calc(100% + .3rem);min-width:12rem;display:grid;gap:.25rem;background:var(--bg);border:1px solid var(--border);border-radius:.5rem;padding:.4rem;box-shadow:0 .6rem 1.5rem #0006} + .calendar-mobile-actions button{text-align:left} + .calendar-toolbar{gap:.3rem;margin-bottom:.3rem} + .calendar-toolbar a,.calendar-toolbar button,.calendar-toolbar select,#calendar-nav input{font-size:16px;min-height:40px;box-sizing:border-box;padding:.3rem .45rem;line-height:1.4} + .calendar-toolbar [hidden],.calendar-mobile-actions [hidden]{display:none!important} + #calendar-nav .calendar-view-link{display:none} + #calendar-nav>a{min-width:40px;text-align:center} + #calendar-nav input{flex:1;width:0;min-width:130px;max-width:100%;color:var(--fg);background:var(--bg);border:1px solid var(--border);border-radius:6px;-webkit-appearance:none;appearance:none} + #calendar-nav input::-webkit-date-and-time-value{text-align:center} + .calendar-mobile-view{display:block;flex:0 0 100%;width:100%} + .calendar-time-controls{flex-wrap:nowrap;gap:.3rem;min-width:0;flex-shrink:0;margin:0;padding:.25rem} + .calendar-time-controls button{min-width:36px;min-height:40px} + .calendar-time-meta{font-size:0;flex:1;min-width:0} + .calendar-time-meta::after{content:attr(data-short);font-size:.7rem;white-space:nowrap} + .calendar-time-controls .calendar-touch-edit{font-size:.78rem;padding:.2rem .4rem;white-space:nowrap} + .calendar-mobile-days{display:flex;flex-shrink:0;justify-content:space-between;gap:1px;padding:.2rem 0;background:var(--bg)} + .calendar-mobile-days button{display:flex;flex:1;flex-direction:column;align-items:center;justify-content:center;min-width:0;min-height:44px;padding:.1rem;border:1px solid transparent;border-radius:.4rem;color:var(--fg);background:transparent;font:inherit;cursor:pointer} + .calendar-mobile-days small{font-size:.65rem} + .calendar-mobile-days button[aria-pressed=true]{border-color:var(--accent);background:color-mix(in srgb,var(--accent) 20%,var(--bg));font-weight:700} + .calendar-time-grid{grid-template-columns:3rem minmax(0,1fr)} + .calendar-time-grid[data-days="7"]{grid-template-columns:3rem repeat(7,max(245px,calc(100vw - 4rem)))} + .calendar-time-scroll{scrollbar-gutter:auto;-webkit-overflow-scrolling:touch;touch-action:pan-x pan-y pinch-zoom} + .calendar-time-heading{padding:.2rem;background:var(--bg);font-size:.85rem;min-height:2rem;box-sizing:border-box} + .calendar-time-heading>a{display:block;min-height:32px;line-height:32px;color:var(--accent)} + .calendar-time-axis,.calendar-all-day-label{background:var(--bg)} + .calendar-time-axis span{font-size:.65rem;right:.2rem} + .calendar-all-day-label{font-size:.7rem} + .calendar-time-event .calendar-event{font-size:.85rem;line-height:1.25;padding:.2rem} + #calendar-content:not(:empty){-webkit-backdrop-filter:none;backdrop-filter:none;background:color-mix(in srgb,var(--bg) 90%,transparent);box-shadow:none} + .calendar-day{min-height:62px;padding:.2rem;box-sizing:border-box} + .calendar-day>a:first-child{display:block;line-height:28px;color:var(--fg)} + .calendar-month .calendar-day>.calendar-event{display:none} + .calendar-mobile-count{display:block;font-size:.7rem;line-height:24px;color:var(--accent);white-space:nowrap} + .calendar-month .calendar-day>a:not(:first-child):not(.calendar-mobile-count):not(.calendar-event){display:none} + .calendar-year .calendar-day{min-height:40px} + .calendar-week{grid-template-columns:repeat(7,minmax(260px,1fr));overscroll-behavior:contain} + .calendar-list{table-layout:fixed;font-size:.85rem} + .calendar-list td{overflow-wrap:anywhere;vertical-align:top} + .calendar-list td:first-child{width:6rem} + .calendar-list td:nth-child(3){display:none} + .calendar-list .calendar-event{white-space:normal;font-size:.85rem} + .calendar-detail{overflow-wrap:anywhere} + .calendar-detail dl{grid-template-columns:1fr;gap:.25rem} + .calendar-detail dt{font-size:.8rem;color:var(--muted)} + .calendar-detail dd{margin-bottom:.5rem} + #calendar-dialog{inset-block-start:calc(var(--calendar-visual-top,0px) + .5rem);inset-block-end:auto;max-height:calc(var(--calendar-visual-height,100dvh) - 1rem);width:calc(100vw - 1rem);max-width:calc(100vw - 1rem);margin:0 auto;border-radius:.6rem;background:var(--bg);-webkit-backdrop-filter:none;backdrop-filter:none} + #calendar-dialog #calendar-form{max-height:calc(var(--calendar-visual-height,100dvh) - 1rem)} + #calendar-dialog header,#calendar-dialog footer{padding:.5rem .7rem;gap:.4rem} + #calendar-dialog footer{padding-bottom:max(.5rem,env(safe-area-inset-bottom))} + #calendar-dialog button{min-height:44px;font-size:16px} + #calendar-fields{padding:.2rem .7rem .5rem;scrollbar-gutter:auto;min-width:0;-webkit-overflow-scrolling:touch} + #calendar-fields label{min-width:0;margin:.5rem 0} + #calendar-fields input,#calendar-fields select,#calendar-fields textarea{font-size:16px;min-width:0;max-width:100%;min-height:44px;-webkit-text-size-adjust:100%} + #calendar-fields input[type=checkbox]{min-height:24px;min-width:24px} + #calendar-fields p{font-size:.85rem;overflow-wrap:anywhere} +} +@media(max-width:950px) and (max-height:480px) and (pointer:coarse){ + .calendar-app>.calendar-toolbar:first-child h1{display:none} + #calendar-nav .calendar-mobile-view{flex:1;min-width:100px;width:0} + .calendar-time-grid[data-days="7"]{grid-template-columns:3rem repeat(7,max(245px,calc((100vw - 4rem)/2)))} +} diff --git a/static/css/calendar.css b/static/css/calendar.css new file mode 100644 index 0000000..638addd --- /dev/null +++ b/static/css/calendar.css @@ -0,0 +1,608 @@ +.calendar-app { + box-sizing: border-box; + width: 100%; + max-width: 1500px; + margin: 0 auto; + padding: 1rem; +} +@media (max-width: 760px) { + body:has(.calendar-app) > .topbar { flex-wrap: wrap; padding: .65rem; gap: .5rem; } + body:has(.calendar-app) > .topbar > .brand { flex: 1; min-width: 0; } + body:has(.calendar-app) > .topbar > .brand > a { display: block; overflow: hidden; text-overflow: ellipsis; } + body:has(.calendar-app) > .topbar > nav { order: 2; width: 100%; } + body:has(.calendar-app) > .topbar > .city-map-launch { margin-inline: 0; flex-shrink: 0; } +} +body.mode-view:has(.calendar-app) { + background: + radial-gradient(circle at 12% 0%, color-mix(in srgb, var(--accent, #578) 13%, transparent), transparent 34rem), + radial-gradient(circle at 92% 100%, color-mix(in srgb, var(--accent, #578) 8%, transparent), transparent 30rem), + var(--bg); +} +#calendar-content:not(:empty) { + border-radius: 0.8rem; + background: color-mix(in srgb, var(--bg) 76%, transparent); + box-shadow: 0 0.55rem 1.8rem #0002; + -webkit-backdrop-filter: blur(12px) saturate(115%); + backdrop-filter: blur(12px) saturate(115%); +} +.calendar-time-view { + min-height: 0; +} +.calendar-time-scroll { + max-height: none; + overflow: auto; + overscroll-behavior: contain; + scrollbar-gutter: stable; + border: 1px solid var(--border, #7775); + position: relative; +} +html:has(body.mode-view .calendar-time-view) { + height: 100%; + overflow: hidden; +} +body.mode-view:has(.calendar-time-view) { + display: flex; + flex-direction: column; + height: 100vh; + height: 100dvh; + min-height: 0; + overflow: hidden; +} +body.mode-view:has(.calendar-time-view) > .topbar { + flex: 0 0 auto; +} +.calendar-app:has(.calendar-time-view) { + display: flex; + flex: 1 1 auto; + flex-direction: column; + min-height: 0; + padding-bottom: 0; + overflow: hidden; +} +.calendar-app:has(.calendar-time-view) > .calendar-toolbar, +.calendar-app:has(.calendar-time-view) > #calendar-status { + flex: 0 0 auto; +} +.calendar-app:has(.calendar-time-view) > #calendar-content, +.calendar-app:has(.calendar-time-view) .calendar-time-view { + display: flex; + flex-direction: column; + min-height: 0; + overflow: hidden; +} +.calendar-app:has(.calendar-time-view) > #calendar-content { + flex: 1 1 auto; +} +.calendar-app:has(.calendar-time-view) .calendar-time-view { + flex: 0 1 95%; + height: 95%; +} +.calendar-app:has(.calendar-time-view) .calendar-time-scroll { + flex: 1 1 auto; + min-height: 0; +} +.calendar-time-grid { + display: grid; + grid-template-columns: 4rem repeat(var(--calendar-days), minmax(115px, 1fr)); + position: relative; + isolation: isolate; +} +.calendar-time-heading { + position: sticky; + top: 0; + z-index: 8; + background: color-mix(in srgb, var(--bg) 86%, transparent); + padding: 0.6rem 0.25rem; + text-align: center; + border-bottom: 1px solid var(--border, #7775); +} +.calendar-time-corner { + left: 0; + z-index: 10; +} +.calendar-all-day, +.calendar-all-day-label { + background: color-mix(in srgb, var(--bg) 84%, transparent); + border-bottom: 1px solid var(--border, #7775); + padding: 0.25rem; + min-height: 2rem; +} +.calendar-all-day-label { + position: sticky; + left: 0; + z-index: 7; +} +.calendar-time-axis { + height: calc(24 * var(--hour-height)); + position: sticky; + left: 0; + background: color-mix(in srgb, var(--bg) 84%, transparent); + z-index: 6; +} +.calendar-time-axis span { + position: absolute; + right: 0.4rem; + font-size: 0.75rem; +} +.calendar-time-column { + height: calc(24 * var(--hour-height)); + position: relative; + border-left: 1px solid var(--border, #7775); + cursor: crosshair; + background: + repeating-linear-gradient( + to bottom, + var(--border, #7775) 0px, + var(--border, #7775) 1px, + transparent 1px, + transparent var(--hour-height) + ), + repeating-linear-gradient( + to bottom, + var(--border-soft, #7772) 0px, + var(--border-soft, #7772) 1px, + transparent 1px, + transparent var(--snap-height) + ); +} +.calendar-time-column.selecting { + box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--accent, #578) 28%, transparent); +} +.calendar-time-column.calendar-drop-target { + box-shadow: inset 0 0 0 2px color-mix(in srgb, var(--accent, #578) 72%, transparent); + background-color: color-mix(in srgb, var(--accent, #578) 8%, transparent); +} +.calendar-time-selection { + position: absolute; + z-index: 12; + left: 2px; + right: 2px; + box-sizing: border-box; + padding: 0.15rem 0.35rem; + overflow: hidden; + border: 2px solid var(--accent, #578); + border-radius: 6px; + background: color-mix(in srgb, var(--accent, #578) 24%, var(--bg)); + color: var(--fg); + font-size: 0.75rem; + font-weight: 650; + font-variant-numeric: tabular-nums; + box-shadow: 0 0 0 2px color-mix(in srgb, var(--accent, #578) 18%, transparent), 0 0.4rem 1.2rem #0004; + pointer-events: none; + user-select: none; +} +.calendar-time-event { + position: absolute; + box-sizing: border-box; + padding: 2px; + border: 1px solid var(--accent, #578); + border-radius: 6px; + background: color-mix(in srgb, var(--accent, #578) 20%, var(--bg)); + z-index: 2; + overflow: hidden; + min-width: 0; + display: flex; + flex-direction: column; + cursor: grab; + touch-action: none; + box-shadow: 0 1px 3px #0003; + transition: box-shadow 90ms ease, border-color 90ms ease; +} +.calendar-time-event:hover, +.calendar-time-event:focus-within { + box-shadow: 0 0 0 1px color-mix(in srgb, var(--accent, #578) 35%, transparent), 0 0.35rem 0.9rem #0004; +} +.calendar-time-event .calendar-event { + margin: 0; + border: 0; + padding: 0.15rem 1.4rem 0.15rem 0.2rem; + white-space: normal; + line-height: 1.1; + background: transparent; + flex: 1; + font-size: 0.8rem; + overflow: hidden; +} +.calendar-move-handle { + position: absolute; + right: 2px; + top: 50%; + transform: translateY(-50%); + z-index: 4; + padding: 0; + border: 0; + display: grid; + place-items: center; + border: 1px solid color-mix(in srgb, var(--accent, #578) 45%, transparent); + border-radius: 5px; + background: color-mix(in srgb, var(--bg) 78%, transparent); + color: var(--fg); + cursor: grab; + touch-action: none; + width: 18px; + height: 18px; + font-size: 0.8rem; + line-height: 1; + opacity: 0.72; +} +.calendar-move-handle::before { + content: ""; + width: 11px; + height: 13px; + background: radial-gradient(circle, currentColor 1.2px, transparent 1.4px) 0 0 / 5px 5px; +} +.calendar-time-event:hover .calendar-move-handle, +.calendar-move-handle:focus-visible { + opacity: 1; +} +.calendar-resize-handle { + position: absolute; + left: 0; + right: 0; + z-index: 5; + width: 100%; + height: 7px; + min-height: 0; + margin: 0; + padding: 0; + border: 0; + background: transparent; + cursor: ns-resize; + touch-action: none; +} +.calendar-resize-handle::after { + content: ""; + position: absolute; + left: 50%; + top: 50%; + width: min(2.2rem, 42%); + height: 3px; + border-radius: 999px; + background: color-mix(in srgb, var(--accent, #578) 72%, var(--fg)); + transform: translate(-50%, -50%); + opacity: 0.55; +} +.calendar-resize-start { + top: 0; + border-top: 2px solid color-mix(in srgb, var(--accent, #578) 70%, transparent); +} +.calendar-resize-end { + bottom: 0; + border-bottom: 2px solid color-mix(in srgb, var(--accent, #578) 70%, transparent); +} +.calendar-time-event:hover .calendar-resize-handle, +.calendar-resize-handle:focus-visible { + background: color-mix(in srgb, var(--accent, #578) 30%, transparent); +} +.calendar-time-event:hover .calendar-resize-handle::after, +.calendar-resize-handle:focus-visible::after, +.calendar-time-event.resizing .calendar-resize-handle::after { + opacity: 1; +} +.calendar-time-event.moving { + z-index: 15; + opacity: 0.9; + outline: 2px solid var(--accent, #578); + box-shadow: 0 0 0 4px color-mix(in srgb, var(--accent, #578) 22%, transparent), 0 0.8rem 2rem #0007; + pointer-events: none; + overflow: visible; + cursor: grabbing; + will-change: transform, top, height; +} +.calendar-time-event.calendar-drag-invalid { + border-color: var(--danger, #c44); + outline-color: var(--danger, #c44); + filter: saturate(0.55); +} +.calendar-time-event.resizing-start { + border-top-width: 3px; +} +.calendar-time-event.resizing-end { + border-bottom-width: 3px; +} +.calendar-time-controls > span:last-child { + font-size: 0.8rem; + opacity: 0.8; + margin-left: auto; +} +.calendar-week-heading { + grid-row: 1; + text-align: center; + padding: 0.5rem; + border-bottom: 1px solid var(--border, #7775); +} +.calendar-timeline-handle { + position: absolute; + bottom: 0; + height: 12px; + padding: 0; + line-height: 1; + border: 0; + background: transparent; + color: var(--fg); + cursor: ew-resize; + touch-action: none; + z-index: 2; +} +.calendar-track.moving { + outline: 1px solid var(--accent, #578); +} +.calendar-toolbar { + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 0.5rem; + margin-bottom: 0.8rem; +} +.calendar-toolbar h1 { + font-size: 1.25rem; + margin: 0 auto 0 0; +} +.calendar-toolbar a, +.calendar-toolbar button, +.calendar-toolbar select { + padding: 0.35rem 0.65rem; + border: 1px solid var(--border, #7775); + border-radius: 6px; + background: var(--bg); + color: var(--fg); + text-decoration: none; +} +.calendar-toolbar a[aria-current="page"] { + background: var(--accent, #375); + color: var(--bg); +} +#calendar-status:empty { + display: none; +} +.calendar-month { + display: grid; + grid-template-columns: repeat(7, minmax(0, 1fr)); + gap: 1px; + background: var(--border, #7775); + border: 1px solid var(--border, #7775); +} +.calendar-day { + min-height: 100px; + background: color-mix(in srgb, var(--bg) 82%, transparent); + padding: 0.4rem; + overflow: hidden; +} +.calendar-day.outside { + opacity: 0.55; +} +.calendar-day.today { + box-shadow: inset 0 0 0 2px var(--accent, #578); +} +.calendar-weekday { + background: color-mix(in srgb, var(--bg) 86%, transparent); + padding: 0.35rem; + text-align: center; +} +.calendar-event { + display: block; + padding: 0.2rem 0.35rem; + margin: 0.25rem 0; + border-inline-start: 3px solid var(--accent, #578); + background: color-mix(in srgb, var(--accent, #578) 10%, var(--bg)); + color: var(--fg); + text-decoration: none; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.calendar-event:hover { + text-decoration: underline; +} +.calendar-year { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(230px, 1fr)); + gap: 1rem; +} +.calendar-year .calendar-day { + min-height: 32px; + text-align: center; + padding: 0.15rem; +} +.calendar-year h2 { + font-size: 1rem; +} +.calendar-dot { + display: block; + font-size: 0.7rem; + color: var(--accent); +} +.calendar-week { + display: grid; + grid-template-columns: repeat(7, minmax(140px, 1fr)); + overflow: auto; + gap: 0.5rem; +} +.calendar-week section { + border: 1px solid var(--border, #7775); + padding: 0.5rem; + min-height: 260px; + background: color-mix(in srgb, var(--bg) 78%, transparent); +} +.calendar-list { + width: 100%; + border-collapse: collapse; +} +.calendar-list td, +.calendar-list th { + padding: 0.5rem; + text-align: start; + border-bottom: 1px solid var(--border, #7775); +} +.calendar-list th { + white-space: nowrap; +} +.calendar-detail { + max-width: 850px; +} +.calendar-detail p { + white-space: pre-wrap; +} +.calendar-detail dl { + display: grid; + grid-template-columns: auto 1fr; + gap: 0.5rem 1rem; +} +.calendar-detail dd { + margin: 0; +} +.calendar-timeline { + overflow: auto; +} +.calendar-track { + min-width: 1000px; + position: relative; + height: 2.5rem; + background: repeating-linear-gradient( + 90deg, + transparent 0, + transparent calc(100% / 24 - 1px), + var(--border, #7775) calc(100% / 24 - 1px), + var(--border, #7775) calc(100% / 24) + ); +} +.calendar-track a { + position: absolute; + top: 0.25rem; + min-width: 4px; + margin: 0; +} +#calendar-dialog { + position: fixed; + inset: 0; + box-sizing: border-box; + width: min(42rem, 95vw); + max-width: 95vw; + max-height: 95vh; + max-height: 95dvh; + margin: auto; + overflow: hidden; + border: 1px solid var(--border, #7775); + border-radius: 12px; + background: color-mix(in srgb, var(--bg) 76%, transparent); + color: var(--fg); + padding: 0; + box-shadow: 0 1.5rem 5rem #0009; + -webkit-backdrop-filter: blur(16px) saturate(120%); + backdrop-filter: blur(16px) saturate(120%); +} +#calendar-dialog::backdrop { + background: #0008; + backdrop-filter: blur(3px); +} +#calendar-dialog #calendar-form { + display: grid; + grid-template-rows: auto minmax(0, 1fr) auto auto; + max-height: 95vh; + max-height: 95dvh; + margin: 0; +} +#calendar-dialog header, +#calendar-dialog footer { + display: flex; + align-items: center; + justify-content: space-between; + gap: 0.7rem; + padding: 0.8rem 1rem; + background: color-mix(in srgb, var(--bg) 84%, transparent); +} +#calendar-dialog header { + border-bottom: 1px solid var(--border-soft, var(--border, #7775)); +} +#calendar-dialog footer { + justify-content: flex-end; + border-top: 1px solid var(--border-soft, var(--border, #7775)); +} +#calendar-dialog h2 { + margin: 0; + font-size: 1.15rem; +} +#calendar-dialog header [data-close] { + padding: 0.2rem 0.55rem; + border: 0; + background: transparent; + color: inherit; + font-size: 1.4rem; +} +#calendar-fields { + min-height: 0; + padding: 0.3rem 1rem 0.8rem; + overflow: auto; + overscroll-behavior: contain; + scrollbar-gutter: stable; +} +#calendar-fields label { + display: grid; + gap: 0.3rem; + margin: 0.7rem 0; +} +#calendar-fields input, +#calendar-fields textarea, +#calendar-fields select { + box-sizing: border-box; + width: 100%; + padding: 0.5rem; + color: var(--fg); + background: var(--bg); + border: 1px solid var(--border, #7775); + border-radius: 5px; +} +#calendar-fields input[type="checkbox"] { + width: auto; + justify-self: start; +} +#calendar-fields textarea { + min-height: 100px; +} +#calendar-form-error { + margin: 0; + padding: 0 1rem; + color: var(--danger, #c44); +} +.calendar-delete-button { + width: 100%; + margin-top: 1rem; + padding: 0.55rem 0.8rem; + border: 1px solid var(--danger, #c44); + border-radius: 6px; + background: transparent; + color: var(--danger, #c44); + cursor: pointer; +} +.calendar-delete-button:hover, +.calendar-delete-button:focus-visible { + background: color-mix(in srgb, var(--danger, #c44) 16%, transparent); +} +@supports not ((backdrop-filter: blur(1px)) or (-webkit-backdrop-filter: blur(1px))) { + #calendar-content:not(:empty), + #calendar-dialog { background: color-mix(in srgb, var(--bg) 94%, transparent); } +} +@media (forced-colors: active) { + body.mode-view:has(.calendar-app) { background: Canvas; } + #calendar-content:not(:empty), + #calendar-dialog { background: Canvas; box-shadow: none; -webkit-backdrop-filter: none; backdrop-filter: none; } + #calendar-dialog { border-color: CanvasText; } +} +@media (max-width: 650px) { + .calendar-app { + padding: 0.5rem; + } + .calendar-day { + min-height: 75px; + padding: 0.2rem; + } + .calendar-event { + font-size: 0.75rem; + } + .calendar-toolbar h1 { + width: 100%; + } + .calendar-list td { + padding: 0.35rem; + } +} diff --git a/static/css/city-governance.css b/static/css/city-governance.css new file mode 100644 index 0000000..460230b --- /dev/null +++ b/static/css/city-governance.css @@ -0,0 +1,16 @@ +.city-governance { box-sizing:border-box; width:min(38rem,calc(100vw - 2rem)); max-height:85vh; overflow:auto; color:var(--fg); background:var(--bg); border:1px solid var(--border); border-radius:.75rem; padding:1rem; } +.city-governance::backdrop { background:#0008; } +.city-governance header,.city-governance footer,.city-governance li { display:flex; align-items:center; justify-content:space-between; gap:.7rem; } +.city-governance h2,.city-governance h3 { margin:.4rem 0; } +.city-governance fieldset { border:0; padding:0; margin:0; min-width:0; } +.city-governance label { display:flex; align-items:center; gap:.6rem; margin:.5rem 0; } +.city-governance select,.city-governance input[type=search] { min-width:0; flex:1; } +.city-governance dl { display:grid; grid-template-columns:auto 1fr; gap:.3rem 1rem; margin:.7rem 0; } +.city-governance dd { margin:0; } +.city-governance ol,.city-governance ul { padding:0; list-style:none; } +.city-governance li { margin:.25rem 0; overflow-wrap:anywhere; } +.city-governance li code { font-size:.75rem; } +.city-governance .governance-confirm { font-size:.85rem; } +.city-access-row { display:grid; grid-template-columns:5rem minmax(4rem,1fr) 7rem 2rem; gap:.3rem; margin:.3rem 0; } +.city-access-row input,.city-access-row select { width:100%; box-sizing:border-box; min-width:0; } +@media(max-width:480px) { .city-access-row { grid-template-columns:4.5rem minmax(3rem,1fr) 6rem 1.8rem; font-size:.85rem; } } diff --git a/static/css/city-graph.css b/static/css/city-graph.css new file mode 100644 index 0000000..0cd9aa6 --- /dev/null +++ b/static/css/city-graph.css @@ -0,0 +1,40 @@ +.city-relation{fill:none;stroke:color-mix(in srgb,var(--accent) 55%,var(--fg));stroke-width:2;stroke-dasharray:7 5;opacity:.72;marker-end:url(#city-arrow)} +.city-relation-label{font-size:10px;fill:var(--muted)} +.city-localities{display:flex;align-items:center;gap:.45rem;flex-wrap:wrap;margin:.5rem 0 1rem;color:var(--muted)} +.city-localities a{padding:.2rem .55rem;border:1px solid var(--border);border-radius:999px;text-decoration:none;color:var(--fg);background:color-mix(in srgb,var(--accent) 10%,var(--bg))} +.city-inspector form{display:grid;gap:.55rem;margin-top:1rem;padding-top:.75rem;border-top:1px solid var(--border)} +.city-node-link{font-size:18px;font-weight:800;fill:var(--accent);cursor:pointer}.city-spot-link{font-size:13px}.city-detail-link{display:inline-block;padding:.4rem .7rem;border-radius:.55rem;background:var(--accent);color:var(--bg);font-weight:700;text-decoration:none} +.city-path-form{display:flex;align-items:center;gap:.5rem;flex-wrap:wrap}.city-path-form input{min-width:min(28rem,60vw)} +.city-inspector form label{display:grid;gap:.25rem}.city-inspector li button{padding:.05rem .35rem;margin-left:.35rem}.city-node-detail dl{display:grid;grid-template-columns:auto 1fr;gap:.5rem 1rem}.city-node-detail dd{margin:0} +.city-context-menu{position:fixed;z-index:10000;display:grid;min-width:13rem;padding:.4rem;border:1px solid var(--border);border-radius:.65rem;background:var(--bg);color:var(--fg);box-shadow:0 .75rem 2rem color-mix(in srgb,#000 28%,transparent)} +.city-context-menu strong{padding:.4rem .55rem;border-bottom:1px solid var(--border);margin-bottom:.25rem}.city-context-menu a,.city-context-menu button{display:block;width:100%;box-sizing:border-box;padding:.5rem .55rem;border:0;border-radius:.4rem;background:transparent;color:var(--fg);font:inherit;text-align:left;text-decoration:none;cursor:pointer}.city-context-menu a:hover,.city-context-menu a:focus,.city-context-menu button:hover,.city-context-menu button:focus{outline:none;background:color-mix(in srgb,var(--accent) 16%,transparent)} +.city-page{fill:color-mix(in srgb,var(--bg) 82%,var(--accent) 18%);stroke:var(--border);stroke-width:1}.city-page-title{font-size:9px;fill:var(--fg);pointer-events:none}.city-page-link:hover .city-page{stroke:var(--accent);stroke-width:2}.city-page-more{font-size:9px;fill:var(--muted)} +.city-delete,.city-context-delete{color:var(--danger,#c43b3b)!important}.city-delete{margin-top:1rem;border-color:currentColor;background:transparent} +.city-trail{display:flex;align-items:center;gap:.35rem;margin-right:auto}.city-trail button{min-width:0;padding:.35rem .55rem;border:0;background:transparent;color:var(--accent);font:inherit;cursor:pointer}.city-trail button:hover{text-decoration:underline} +.city-scene-title{font-size:16px;font-weight:750;fill:var(--fg);pointer-events:none}.city-scene-path{font-size:10px;fill:var(--muted);pointer-events:none}.city-scene-count{font-size:11px;fill:var(--muted);text-anchor:end;pointer-events:none} +.city-district-block{fill:color-mix(in srgb,var(--accent) 16%,var(--bg));stroke:color-mix(in srgb,var(--accent) 70%,var(--border));stroke-width:3;filter:drop-shadow(0 8px 7px rgb(0 0 0/.16));cursor:pointer}.city-district-road{fill:none;stroke:color-mix(in srgb,var(--fg) 18%,var(--bg));stroke-width:14;stroke-linecap:round;pointer-events:none}.city-quartier-tile:hover .city-district-block{fill:color-mix(in srgb,var(--accent) 25%,var(--bg));stroke-width:5} +.city-green-belt{fill:color-mix(in srgb,#73a96b 25%,var(--bg));stroke:color-mix(in srgb,#73a96b 50%,var(--border));stroke-width:1}.city-road{fill:color-mix(in srgb,var(--fg) 30%,var(--bg));stroke:var(--border);stroke-width:2;cursor:pointer}.city-road-center{stroke:color-mix(in srgb,#f5d76e 75%,var(--fg));stroke-width:3;stroke-dasharray:20 16;pointer-events:none}.city-street-tile:hover .city-road{fill:color-mix(in srgb,var(--fg) 40%,var(--bg));stroke:var(--accent);stroke-width:4} +.city-building-shadow{fill:rgb(0 0 0/.18);pointer-events:none}.city-building{fill:color-mix(in srgb,var(--bg) 78%,var(--accent) 22%);stroke:color-mix(in srgb,var(--accent) 60%,var(--border));stroke-width:2;cursor:pointer}.city-building-roof{fill:color-mix(in srgb,var(--accent) 65%,var(--bg));pointer-events:none}.city-spot-tile:hover .city-building{stroke:var(--accent);stroke-width:5}.city-building-window{fill:color-mix(in srgb,#8bd5ff 35%,var(--bg));stroke:color-mix(in srgb,#8bd5ff 55%,var(--border));stroke-width:1}.city-page-link:hover .city-building-window{fill:color-mix(in srgb,#8bd5ff 60%,var(--bg))} +.city-brick-base{fill:color-mix(in srgb,#984f3f 58%,var(--bg))}.city-brick-mortar{fill:none;stroke:color-mix(in srgb,#e3c6a6 48%,var(--bg));stroke-width:1}.city-cobble-base{fill:color-mix(in srgb,#8e887d 55%,var(--bg))}.city-cobble-line{fill:none;stroke:color-mix(in srgb,#d8d0c2 40%,var(--bg));stroke-width:.8}.city-brick-fill{fill:url(#city-bricks)} +.city-old-map-ground{fill:color-mix(in srgb,#c9b894 20%,var(--bg));stroke:color-mix(in srgb,#806c4e 35%,var(--border));stroke-width:2}.city-street-border{fill:none;stroke:color-mix(in srgb,#4c4238 75%,var(--border));stroke-width:38;stroke-linecap:round;stroke-linejoin:round;cursor:pointer}.city-cobbled-street{fill:none;stroke:url(#city-cobbles);stroke-width:32;stroke-linecap:round;stroke-linejoin:round;cursor:pointer}.city-cobbled-street-wide{stroke-width:64}.city-street-tile:hover .city-cobbled-street{stroke:color-mix(in srgb,#b7aa96 74%,var(--accent));filter:drop-shadow(0 0 4px color-mix(in srgb,var(--accent) 55%,transparent))} +.city-building{fill:url(#city-bricks)}.city-building-roof{fill:color-mix(in srgb,#6d352d 72%,var(--accent))} +.city-generator-status{padding:.25rem .5rem;border:1px solid var(--border);border-radius:999px;color:var(--muted);font:11px "JetBrains Mono",monospace}.city-generated-fabric{opacity:.68;pointer-events:none}.city-generated-building{fill:color-mix(in srgb,#9a5544 55%,var(--bg));stroke:color-mix(in srgb,#4f3028 48%,var(--border));stroke-width:.35}.city-generated-road-border{stroke:color-mix(in srgb,#4c4238 75%,var(--border));stroke-width:5.2;stroke-linecap:round}.city-generated-road{stroke:color-mix(in srgb,#b7aa96 82%,var(--bg));stroke-width:4.1;stroke-linecap:round} +.city-spot-point{fill:#c92d38;stroke:#fff;stroke-width:2.5;cursor:pointer;filter:drop-shadow(0 2px 4px rgb(0 0 0/.45))}.city-spot-point-halo{fill:color-mix(in srgb,#c92d38 24%,transparent);stroke:#c92d38;stroke-width:1.5;cursor:pointer}.city-spot-point-label{font-size:11px;font-weight:750;fill:var(--fg);paint-order:stroke;stroke:var(--bg);stroke-width:4px;pointer-events:none}.city-spot-tile:hover .city-spot-point-halo{fill:color-mix(in srgb,#c92d38 42%,transparent);stroke-width:3} +.city-spot-undefined .city-spot-point{fill:#9bdc28;stroke:#f5ffd9}.city-spot-undefined .city-spot-point-halo{fill:color-mix(in srgb,#9bdc28 30%,transparent);stroke:#9bdc28}.city-spot-undefined .city-spot-point-label{fill:#9bdc28}.city-spot-undefined.city-undefined-expanded>.city-spot-point,.city-spot-undefined.city-undefined-expanded>.city-spot-point-halo,.city-spot-undefined.city-undefined-expanded>.city-spot-point-label{display:none}.city-undefined-page-link{cursor:pointer}.city-undefined-page-point{fill:#9bdc28;stroke:#f5ffd9;stroke-width:2;filter:drop-shadow(0 2px 4px rgb(0 0 0/.42))}.city-undefined-page-halo{fill:color-mix(in srgb,#9bdc28 28%,transparent);stroke:#9bdc28;stroke-width:1.25}.city-undefined-page-label{font-size:9px;font-weight:700;fill:#9bdc28;paint-order:stroke;stroke:var(--bg);stroke-width:3px;pointer-events:none;opacity:.82;transition:opacity .12s}.city-undefined-page-link:hover .city-undefined-page-point,.city-undefined-page-link:focus .city-undefined-page-point{r:7}.city-undefined-page-link:hover .city-undefined-page-halo,.city-undefined-page-link:focus .city-undefined-page-halo{fill:color-mix(in srgb,#9bdc28 46%,transparent);stroke-width:2.5}.city-undefined-page-link:hover .city-undefined-page-label,.city-undefined-page-link:focus .city-undefined-page-label{opacity:1} +.city-spot-popover{position:absolute;z-index:30;width:min(20rem,calc(100% - 20px));max-height:calc(100% - 20px);overflow:auto;box-sizing:border-box;padding:1rem;border:1px solid var(--border);border-radius:.75rem;background:var(--bg);color:var(--fg);box-shadow:0 1rem 2.5rem rgb(0 0 0/.35)}.city-spot-popover h3{margin:.1rem 2rem .25rem 0}.city-spot-popover h4{margin:.85rem 0 .3rem}.city-spot-popover ul{margin:.2rem 0 .8rem;padding-left:1.2rem}.city-popover-type{margin:0;color:#c92d38;font-size:.75rem;font-weight:800;text-transform:uppercase}.city-popover-close{position:absolute;top:.45rem;right:.45rem;width:2rem;height:2rem;padding:0;border:0;background:transparent;color:var(--fg);font-size:1.4rem;cursor:pointer} +.city-quartier-tile .city-district-block{fill-opacity:.34}.city-quartier-tile:hover .city-district-block{fill-opacity:.52}.city-assigned-street{fill:none;stroke:color-mix(in srgb,var(--city-street-color,var(--accent)) 48%,transparent);stroke-width:5;stroke-linecap:round;pointer-events:none;transition:stroke-width .15s,stroke .15s,filter .15s}.city-generated-street-hit{fill:none;stroke:transparent;stroke-width:28;stroke-linecap:round;cursor:pointer;transition:stroke .15s}.city-generated-street-label{font-size:13px;font-weight:850;fill:var(--fg);paint-order:stroke;stroke:color-mix(in srgb,var(--bg) 88%,transparent);stroke-width:5px;pointer-events:none;opacity:0;transition:opacity .15s,fill .15s}.city-street-tile:hover .city-generated-street-hit,.city-street-tile:focus .city-generated-street-hit{stroke:rgb(0 0 0/.34)}.city-street-tile:hover .city-assigned-street,.city-street-tile:focus .city-assigned-street{stroke:color-mix(in srgb,var(--city-street-color,var(--accent)) 78%,white);stroke-width:8;filter:drop-shadow(0 0 4px var(--city-street-color,var(--accent)))}.city-street-tile:hover .city-generated-street-label,.city-street-tile:focus .city-generated-street-label{fill:var(--city-street-color,var(--accent));opacity:1} +.city-quartier-boundary{fill:color-mix(in srgb,var(--accent) 8%,transparent);stroke:color-mix(in srgb,var(--accent) 65%,var(--border));stroke-width:2;stroke-dasharray:8 5;cursor:pointer}.city-quartier-tile:hover .city-quartier-boundary{fill:color-mix(in srgb,var(--accent) 18%,transparent);stroke-width:4}.city-assigned-street.is-current{stroke:color-mix(in srgb,var(--accent) 78%,white);stroke-width:8;filter:drop-shadow(0 0 4px var(--accent))} +.city-autoplan{margin:1rem 0;padding:.8rem;border:1px solid var(--border);border-radius:.7rem}.city-autoplan summary{cursor:pointer;font-weight:750}.city-autoplan-results{max-height:28rem;overflow:auto;margin-top:.7rem}.city-autoplan-results table{width:100%;border-collapse:collapse;font-size:.8rem}.city-autoplan-results th,.city-autoplan-results td{padding:.35rem;border-bottom:1px solid var(--border-soft);text-align:left}.city-autoplan-results .is-undefined{color:#9bdc28} + +/* The resting map is a guide: names are visible without finding a hit target. + Hover/focus still emphasize the road and its label, without hiding neighbors. */ +.city-generated-street-label,.city-undefined-page-label{opacity:1} +.city-scene-title,.city-scene-path{paint-order:stroke;stroke:var(--bg);stroke-width:4px;stroke-linejoin:round} +/* Keep the explicit Labels toggle working for every current renderer label. */ +.city-labels-off :is(.city-scene-title,.city-scene-path,.city-scene-count,.city-generated-street-label,.city-spot-point-label,.city-undefined-page-label){display:none} +.city-is-selected>.city-spot-point-halo,.city-undefined-page-link.city-is-selected>.city-undefined-page-halo{stroke:var(--accent);stroke-width:4;fill:color-mix(in srgb,var(--accent) 42%,transparent)} +.city-selection-bar{position:absolute;z-index:35;bottom:1rem;left:50%;transform:translateX(-50%);display:flex;align-items:center;gap:.4rem;padding:.35rem .6rem;max-width:calc(100% - 2rem);white-space:nowrap;background:var(--bg);color:var(--fg);border:1px solid var(--border);border-radius:.7rem;box-shadow:0 .3rem 1rem #0005} +.city-selection-bar[hidden]{display:none}.city-selection-bar button{min-width:2rem;min-height:2rem;padding:.2rem .4rem} +.city-inspector h2 :is([data-city-rename],[data-city-move-selection]){margin-left:.5rem;padding:.1rem .35rem;border:0;background:transparent;color:var(--accent);cursor:pointer} +.city-organize-dialog{box-sizing:border-box;width:min(32rem,calc(100vw - 2rem));max-height:calc(100dvh - 2rem);overflow:auto;padding:1rem;border:1px solid var(--border);border-radius:.8rem;background:var(--bg);color:var(--fg)} +.city-organize-dialog::backdrop{background:#0008}.city-organize-dialog form{display:grid;gap:.7rem;margin:0}.city-organize-dialog h2,.city-organize-dialog p{margin:0}.city-organize-dialog label{display:grid;gap:.25rem}.city-organize-dialog :is(input,select){box-sizing:border-box;width:100%;min-width:0;font:inherit;color:var(--fg);background:var(--bg);border:1px solid var(--border);border-radius:.3rem;padding:.4rem}.city-organize-dialog footer{display:flex;gap:.5rem;justify-content:flex-end}.city-organize-dialog [role=alert]{color:var(--danger,#ef6565)}.city-selection-summary{max-height:8rem;overflow:auto;margin:0;padding-left:1.4rem}.city-organize-dialog button{padding:.4rem .7rem}.city-organize-dialog :focus-visible{outline:2px solid var(--accent);outline-offset:2px} diff --git a/static/css/city-immersive.css b/static/css/city-immersive.css new file mode 100644 index 0000000..eb18147 --- /dev/null +++ b/static/css/city-immersive.css @@ -0,0 +1,29 @@ +/* SVG architecture keeps the map's labels and hit targets native and sharp. */ +.mode-city{--city-stone:color-mix(in srgb,var(--bg) 42%,#d7c59d);--city-paper:color-mix(in srgb,var(--bg) 83%,#d7c59d);--city-brass:color-mix(in srgb,var(--fg) 30%,#ba9857);--city-roof:#a76549;--city-iron:color-mix(in srgb,var(--fg) 70%,#25382f);height:100dvh;overflow:hidden;margin:0;background:var(--bg);color:var(--fg)} +.mode-city .city-shell,.mode-city .city-layout,.mode-city .city-canvas-wrap{box-sizing:border-box;width:100%;height:100dvh;min-height:0;padding:0;margin:0;display:block;overflow:hidden;border:0;border-radius:0} +.mode-city .city-canvas-wrap{background:radial-gradient(ellipse at center,color-mix(in srgb,var(--city-stone) 23%,var(--bg)),var(--bg))} +.mode-city .city-map{position:absolute;inset:76px 22px 48px;width:calc(100% - 44px);height:calc(100% - 124px);min-height:0} +.mode-city .city-canvas-wrap::after{content:"";position:absolute;inset:12px;pointer-events:none;border:1px solid color-mix(in srgb,var(--city-brass) 50%,transparent);outline:1px solid color-mix(in srgb,var(--city-brass) 22%,transparent);outline-offset:4px} +.city-hud{position:absolute;inset:21px 29px auto;display:flex;align-items:center;gap:13px;pointer-events:none}.city-hud>*{pointer-events:auto}.city-atlas-seal{width:34px;color:var(--city-brass)}.city-atlas-seal svg{width:100%;fill:none;stroke:currentColor;stroke-width:1.5}.city-hud-location{min-width:0}.city-hud-location>small{display:block;letter-spacing:.16em;font-size:9px;color:var(--city-brass)} +.mode-city .city-trail{font-family:Georgia,"Noto Serif",serif;font-size:17px;gap:.1rem;max-width:70vw;overflow:auto;scrollbar-width:none}.mode-city .city-trail button{font:inherit;color:var(--fg);padding:.15rem .35rem;white-space:nowrap}.mode-city .city-trail span{white-space:nowrap}.mode-city .city-menu-launch{margin-left:auto;display:flex;align-items:center;gap:.6rem;border:1px solid var(--city-brass);border-radius:2px;background:var(--city-paper);padding:.45rem .8rem;font:small-caps 14px Georgia,serif;letter-spacing:.1em;color:var(--fg);cursor:pointer}.city-menu-launch span{font:20px serif} +.city-compass{position:absolute;bottom:42px;right:27px;width:53px;text-align:center;color:var(--city-brass);pointer-events:none;font:10px Georgia,serif}.city-compass svg{display:block;fill:none;stroke:currentColor;stroke-width:.85}.city-map-hint{position:absolute;bottom:23px;left:30px;font-size:10px;color:var(--muted);letter-spacing:.03em;pointer-events:none} +.city-command-menu{box-sizing:border-box;width:min(860px,calc(100vw - 38px));max-height:calc(100dvh - 38px);padding:22px;border:1px solid var(--city-brass);border-radius:3px;outline:1px solid color-mix(in srgb,var(--city-brass) 35%,transparent);outline-offset:-6px;background:var(--city-paper);color:var(--fg);box-shadow:0 24px 100px #0009}.city-command-menu::backdrop{background:#080c1399;backdrop-filter:blur(5px)} +.city-command-head{display:flex;align-items:center;justify-content:space-between;border-bottom:1px solid var(--city-brass);padding-bottom:15px;margin-bottom:18px}.city-command-head small{color:var(--city-brass);font:10px Georgia,serif;letter-spacing:.25em}.city-command-head h1{margin:4px 0 0;font:25px Georgia,"Noto Serif",serif;letter-spacing:.1em}.city-command-head>button{border:0;background:transparent;color:var(--fg);font-size:27px;cursor:pointer} +.city-command-layout{display:grid;grid-template-columns:190px minmax(0,1fr);gap:23px}.city-command-nav{display:flex;flex-direction:column;gap:7px}.city-command-nav :is(button,a){padding:10px 12px;text-align:left;font:inherit;font-size:13px;text-decoration:none;border:1px solid transparent;background:transparent;color:var(--fg);cursor:pointer}.city-command-nav [aria-pressed=true],.city-command-nav :is(button,a):hover{border-color:color-mix(in srgb,var(--city-brass) 50%,transparent);background:color-mix(in srgb,var(--city-brass) 12%,transparent)}.city-command-nav [aria-pressed=true]::after{content:" ◂";color:var(--city-brass)}.city-command-content{min-width:0;max-height:65dvh;overflow:auto;padding-right:5px} +.mode-city .city-command-menu :is(.city-inspector,.city-directory,.city-planner){display:block;border:0;padding:0;margin:0;border-radius:0;min-height:0}.mode-city .city-command-menu .city-toolbar{display:flex;gap:.7rem}.mode-city .city-command-menu .city-planner-grid{display:block}.mode-city .city-command-menu [hidden]{display:none!important}.mode-city .city-command-menu .city-planner form{margin-top:1rem}.mode-city .city-menu-account{display:flex;position:static;padding:1rem 0;background:transparent;border:0}.mode-city .city-menu-account .city-map-launch{display:none}.city-command-menu .city-locality-search{margin-left:0;width:100%}.city-command-menu .city-locality-search input[name=q]{width:100%;min-width:0}.city-command-menu .city-generator-status{font-size:10px;white-space:normal;border:0;padding:0}.city-create-kind{display:grid;gap:.35rem;margin-top:1rem} +.city-command-menu :is(input,select){box-sizing:border-box;max-width:100%;color:var(--fg);background:var(--bg);border:1px solid var(--border);padding:.4rem;font:inherit}.city-command-menu button{cursor:pointer}.city-command-menu :focus-visible,.mode-city .city-menu-launch:focus-visible{outline:2px solid var(--accent);outline-offset:3px} +.city-command-menu [data-city-jump]{background:transparent;border:0;padding:.15rem 0;color:var(--fg);font:inherit;text-align:left}.city-command-menu [data-city-jump]:hover{color:var(--accent);text-decoration:underline} +.city-command-content{scrollbar-width:thin;scrollbar-color:var(--city-brass) transparent}.city-command-menu h2{margin:0 0 .65rem;font-size:1.15rem}.city-command-menu .city-autoplan{margin:0 0 .7rem;padding:.6rem}.mode-city .city-command-menu .city-planner form{gap:.5rem;margin-top:.8rem}.city-command-menu .city-planner form h3{margin:.2rem 0 .45rem;font-size:1rem}.city-command-menu .city-planner form label{display:grid;grid-template-columns:6rem minmax(0,1fr);align-items:center;gap:.5rem;font-size:.85rem}.city-command-menu .city-planner form :is(input,select){width:100%;min-width:0;padding:.3rem;line-height:1.3}.city-command-menu .city-planner form>button{justify-self:end;min-width:5rem;padding:.3rem .75rem}.city-command-menu .auth-menu-popover{position:static;margin-top:.5rem;box-shadow:none} +.mode-city .city-scene-pager{position:absolute;bottom:24px;left:50%;transform:translateX(-50%);display:flex;align-items:center;gap:.7rem;color:var(--city-brass);font:12px Georgia,serif}.city-scene-pager[hidden]{display:none!important}.city-scene-pager button{background:var(--city-paper);border:1px solid var(--city-brass);color:var(--fg);width:30px;height:26px;cursor:pointer}.mode-city .city-selection-bar{bottom:4.5rem} +.estate-ground{fill:color-mix(in srgb,var(--city-stone) 8%,transparent);stroke:none;pointer-events:none}.estate-stone{fill:var(--city-stone)}.estate-mortar{fill:none;stroke:color-mix(in srgb,var(--bg) 22%,var(--city-stone));stroke-width:.7}.estate-roof-fill{fill:var(--city-roof)}.estate-roof-tile{fill:none;stroke:#743e303f;stroke-width:.7} +.estate-route-edge{fill:none;stroke:color-mix(in srgb,var(--city-brass) 56%,var(--bg));stroke-width:20;stroke-linecap:round;pointer-events:none}.estate-route{fill:none;stroke:var(--city-stone);stroke-width:14;stroke-dasharray:2 1;pointer-events:none}.estate-walkway{fill:none;stroke:color-mix(in srgb,var(--city-stone) 70%,transparent);stroke-width:12;stroke-dasharray:4 1;pointer-events:none}.estate-detail-walkway{fill:none;stroke:color-mix(in srgb,var(--bg) 14%,transparent);stroke-width:4;stroke-dasharray:3 4;pointer-events:none} +.city-courtyard{fill:url(#city-court-stone);stroke:var(--city-brass);stroke-width:2;filter:drop-shadow(2px 5px 3px #0003)}.estate-balustrade{fill:none;stroke:color-mix(in srgb,var(--city-brass) 70%,var(--bg));stroke-width:6;stroke-dasharray:2 4;pointer-events:none}.estate-shadow{fill:#0002}.estate-house-wall{fill:#dbc8a3;stroke:#6c614a;stroke-width:1.3}.estate-house-roof{fill:url(#city-terracotta);stroke:#744735;stroke-width:1.2}.estate-window{fill:#384641;stroke:#a99570;stroke-width:1.4}.estate-cornice{fill:none;stroke:#897653;stroke-width:2.5}.estate-palazzo-wall{fill:#dccaab;stroke:#8f7c56;stroke-width:1.5}.estate-pediment{fill:#ba9e76;stroke:#857351;stroke-width:2}.estate-column{stroke:#f1e2c4;stroke-width:7;fill:none}.estate-rosette{fill:#d3b567;stroke:#78694d;stroke-width:1.5}.estate-iron{fill:none;stroke:var(--city-iron);stroke-width:1.7}.estate-cypress{fill:color-mix(in srgb,#467155 65%,var(--bg));stroke:#738268;stroke-width:.7}.estate-tree-trunk{stroke:#867654;stroke-width:2}.estate-fountain{fill:#77a99d;stroke:#d5c59e;stroke-width:6}.estate-fountain-inner{fill:#b3d2c0;stroke:#637f75;stroke-width:3} +.mode-city .city-estate-scene .city-spot-point-label{font-family:Georgia,"Noto Serif",serif;font-weight:600;fill:var(--fg);stroke:var(--city-stone);stroke-width:4;paint-order:stroke;font-size:17px}.mode-city .city-estate-detail .city-spot-point-label{font-size:20px}.mode-city .city-estate-scene .city-generated-street-label{font:22px Georgia,"Noto Serif",serif;fill:var(--fg);opacity:1;stroke:var(--bg);stroke-width:4;paint-order:stroke} +.city-estate-page-label,.mode-city .city-estate-scene .city-undefined-page-label{font-size:12px;fill:var(--fg);font-weight:500;stroke:var(--city-stone);stroke-width:3;paint-order:stroke;pointer-events:none}.city-map-page-link:hover use,.city-map-page-link:focus use{filter:drop-shadow(0 0 4px var(--accent))}.city-map-page-link:focus-visible{outline:none}.city-map-page-link:focus-visible .estate-shadow{stroke:var(--accent);stroke-width:3}.city-spot-entry{cursor:pointer}.city-spot-entry:hover use,.city-spot-entry:focus-visible use{filter:drop-shadow(0 0 4px var(--accent))}.city-spot-entry:focus-visible{outline:none}.city-spot-entry:focus-visible .city-spot-point-label{fill:var(--accent)} +.mode-city .city-spot-tile.city-is-selected>.city-courtyard{stroke:var(--accent);stroke-width:5}.city-map-page-link.city-is-selected .estate-shadow{stroke:var(--accent);stroke-width:4;fill:color-mix(in srgb,var(--accent) 35%,transparent)}.city-estate-more rect,.city-portal-link rect{fill:var(--city-paper);stroke:var(--city-brass);stroke-width:1}.city-estate-more text,.city-portal-label{fill:var(--fg);font-size:12px;pointer-events:none}.city-estate-more{cursor:pointer}.city-portal-link:hover rect{stroke:var(--accent);stroke-width:2}.mode-city .city-labels-off :is(.city-estate-page-label,.city-undefined-page-label,.city-spot-point-label,.city-generated-street-label){display:none} +.mode-city .city-generated-fabric{opacity:.88}.mode-city .city-generated-building{fill:url(#city-terracotta);stroke:color-mix(in srgb,var(--city-brass) 60%,var(--bg));stroke-width:1;filter:drop-shadow(1px 2px 1px #0003)}.mode-city .city-generated-road-border{stroke:color-mix(in srgb,var(--city-brass) 60%,var(--bg));stroke-width:7}.mode-city .city-generated-road{stroke:var(--city-stone);stroke-width:5}.mode-city .city-quartier-boundary{fill:color-mix(in srgb,var(--city-brass) 6%,transparent);stroke:var(--city-brass);stroke-dasharray:none;stroke-width:2}.mode-city .city-quartier-tile:hover .city-quartier-boundary{fill:color-mix(in srgb,var(--accent) 14%,transparent)}.mode-city .city-scene-title{font:20px Georgia,"Noto Serif",serif;stroke:var(--bg);stroke-width:4}.mode-city .city-scene-path{font:11px Georgia,serif}.city-quartier-ornament{pointer-events:none} +@media(max-width:650px){.mode-city .city-map{inset:85px 8px 63px;width:calc(100% - 16px);height:calc(100% - 148px)}.city-hud{inset:24px 22px auto;gap:6px}.city-atlas-seal{display:none}.mode-city .city-trail{max-width:61vw;font-size:14px}.city-hud-location>small{font-size:8px;letter-spacing:.06em;max-width:56vw;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.mode-city .city-menu-launch{padding:.35rem;font-size:11px;gap:.25rem}.city-map-hint{bottom:23px;font-size:9px;left:23px;max-width:65vw}.city-scene-pager{bottom:43px!important}.city-compass{width:34px;right:22px;bottom:30px}.city-command-layout{grid-template-columns:1fr;gap:12px}.city-command-nav{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:2px}.city-command-nav :is(button,a){padding:7px;font-size:12px}.city-command-content{max-height:48dvh}.city-command-menu{padding:16px}.city-command-head{margin-bottom:10px}} +@media(prefers-reduced-motion:reduce){.mode-city *{transition:none!important;scroll-behavior:auto!important}} +.city-public-exit{position:absolute;z-index:2;top:88px;left:30px;display:flex;gap:.8rem;font-size:.85rem;background:var(--bg);border:1px solid var(--border);border-radius:.3rem;padding:.35rem .65rem} +.city-public-exit a{text-decoration:none;color:var(--link)} +.city-map-popup-mode .city-public-exit{display:none} diff --git a/static/css/city-map.css b/static/css/city-map.css new file mode 100644 index 0000000..7c3b1fe --- /dev/null +++ b/static/css/city-map.css @@ -0,0 +1,3 @@ +.city-shell{padding:1rem;max-width:none}.city-map-title{font-weight:700}.city-toolbar{display:flex;align-items:center;gap:.5rem;flex-wrap:wrap;margin-bottom:.75rem}.city-toolbar button{min-width:2.4rem}.city-toolbar label{margin-left:.5rem}.city-layout{display:grid;grid-template-columns:minmax(0,1fr) 18rem;gap:1rem;min-height:68vh}.city-canvas-wrap{position:relative;overflow:hidden;border:1px solid var(--border);border-radius:1rem;background:color-mix(in srgb,var(--bg) 88%,var(--accent) 12%);min-height:68vh}.city-map{display:block;width:100%;height:68vh;touch-action:none;cursor:grab}.city-map.is-dragging{cursor:grabbing}.city-quartier{fill:color-mix(in srgb,var(--bg) 86%,var(--accent) 14%);stroke:color-mix(in srgb,var(--accent) 65%,var(--border));stroke-width:2}.city-quartier-title{font-size:18px;font-weight:750;fill:var(--fg)}.city-street{fill:color-mix(in srgb,var(--fg) 13%,var(--bg));stroke:color-mix(in srgb,var(--fg) 24%,transparent);stroke-width:1}.city-street-line{stroke:color-mix(in srgb,var(--bg) 65%,var(--fg));stroke-width:2;stroke-dasharray:10 8}.city-street-title{font-size:13px;font-weight:650;fill:var(--fg)}.city-spot{fill:var(--accent);stroke:var(--bg);stroke-width:3;cursor:pointer;filter:drop-shadow(0 2px 3px rgb(0 0 0/.25))}.city-spot:hover,.city-node:focus .city-spot{stroke:var(--fg);stroke-width:4}.city-spot-title{font-size:11px;font-weight:650;fill:var(--fg);paint-order:stroke;stroke:var(--bg);stroke-width:3px;stroke-linejoin:round;pointer-events:none}.city-labels-off .city-spot-title{display:none}.city-inspector{border:1px solid var(--border);border-radius:1rem;padding:1rem;overflow:auto}.city-inspector h2{margin-top:0}.city-inspector dl{display:grid;grid-template-columns:auto 1fr;gap:.4rem .7rem}.city-inspector dt{font-weight:700}.city-inspector dd{margin:0;overflow-wrap:anywhere}.city-empty{position:absolute;inset:0;display:grid;place-content:center;text-align:center;padding:2rem}.city-empty[hidden]{display:none}.city-directory,.city-planner{margin-top:1rem;border:1px solid var(--border);border-radius:.75rem;padding:.75rem}.city-directory-grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(15rem,1fr));gap:1rem}.city-directory article{border-left:3px solid var(--accent);padding-left:.75rem}.city-directory ul{padding-left:1.2rem}.city-planner-grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(15rem,1fr));gap:1rem}.city-planner form{display:grid;gap:.7rem;align-content:start}.city-planner label{display:grid;gap:.3rem}@media(max-width:800px){.city-layout{grid-template-columns:1fr}.city-canvas-wrap,.city-map{min-height:58vh;height:58vh}.city-inspector{min-height:8rem}} +.city-locality-search{display:flex;align-items:center;gap:.25rem;margin-inline-start:auto}.city-locality-search input[name="q"]{width:min(18rem,30vw)} +html.city-map-popup-mode,body.city-map-popup-mode{width:100%;height:100%;overflow:hidden}.city-map-popup-mode .topbar,.city-map-popup-mode .city-toolbar,.city-map-popup-mode .city-inspector,.city-map-popup-mode .city-directory,.city-map-popup-mode .city-planner{display:none}.city-map-popup-mode .city-shell{width:100%;height:100%;padding:0;overflow:hidden}.city-map-popup-mode .city-layout{display:block;width:100%;height:100%;min-height:0;overflow:hidden}.city-map-popup-mode .city-canvas-wrap{width:100%;height:100%;min-height:0;border:0;border-radius:0;overflow:hidden}.city-map-popup-mode .city-map{width:100%;height:100%;min-height:0} diff --git a/static/css/city-navigation.css b/static/css/city-navigation.css new file mode 100644 index 0000000..44c9175 --- /dev/null +++ b/static/css/city-navigation.css @@ -0,0 +1,3 @@ +.mode-city .city-quartier-tile:focus-visible .city-quartier-boundary{stroke:var(--accent);stroke-width:3;vector-effect:non-scaling-stroke} +.mode-city .city-estate-more:focus-visible rect,.mode-city .city-portal-link:focus-visible rect{stroke:var(--accent);stroke-width:3} +.mode-city [data-city-retry]{justify-self:center;margin-top:1rem} diff --git a/static/css/config.css b/static/css/config.css new file mode 100644 index 0000000..6c58392 --- /dev/null +++ b/static/css/config.css @@ -0,0 +1,352 @@ +body.mode-config .config-main { + padding: 1.25rem; + display: block; +} + +body.mode-config .config-layout { + display: grid !important; + grid-template-columns: 16rem minmax(0, 1fr) !important; + gap: 1.5rem !important; + align-items: start !important; +} + +body.mode-config .config-sidebar { + grid-column: 1; + position: sticky; + top: 4rem; + align-self: start; + border-right: 1px solid var(--border-soft); + padding: 0.75rem; + min-height: calc(100vh - 6rem); +} + +body.mode-config .config-sidebar.collapsed { + width: 2.5rem; + overflow: hidden; +} + +body.mode-config .config-sidebar.collapsed .sidebar-nav { + display: none; +} + +body.mode-config .config-content { + grid-column: 2; + min-width: 0; +} + +body.mode-config .config-panel { + display: none; +} + +body.mode-config .config-panel.active { + display: block; +} + +body.mode-config .sidebar-nav { + display: flex; + flex-direction: column; + gap: 0.5rem; + margin-top: 1rem; +} + +body.mode-config .sidebar-nav a { + text-decoration: none; +} + +body.mode-config .sidebar-nav a.active { + color: var(--link-hover); +} + +body.mode-config .config-section { + margin-bottom: 2rem; + min-width: 0; +} + +.resource-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(12rem, 1fr)); + gap: .75rem; +} +.resource-card { + display: flex; + flex-direction: column; + gap: .35rem; + padding: .85rem; + border: 1px solid var(--border-soft); + border-radius: .5rem; +} +.queue-settings-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(12rem, 1fr)); + gap: .75rem; + align-items: end; +} +.queue-settings-grid label { display: flex; flex-direction: column; gap: .25rem; } +.queue-settings-grid label:first-child { flex-direction: row; align-items: center; } +.event-definition-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(11rem, 1fr)); + gap: .75rem; + align-items: end; +} +.event-definition-grid label { display: flex; flex-direction: column; gap: .25rem; } +.event-definition-grid label:has(input[type="checkbox"]) { flex-direction: row; align-items: center; } +.event-definition-grid .event-payload { grid-column: 1 / -1; } +.event-definition-grid textarea { font-family: monospace; } +.adapter-plugin-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(12rem, 1fr)); + gap: .75rem; + align-items: end; +} +.adapter-plugin-grid label { display: flex; flex-direction: column; gap: .25rem; } +.adapter-plugin-grid label:has(input[type="checkbox"]) { flex-direction: row; align-items: center; } +.adapter-plugin-grid .adapter-template { grid-column: 1 / -1; } +.auth-account-form { display:grid;grid-template-columns:repeat(auto-fit,minmax(12rem,1fr));gap:.75rem;align-items:end;margin-bottom:1rem } +.auth-account-form label { display:grid;gap:.25rem } +.asset-detail-dialog { width:min(72rem,calc(100vw - 2rem));max-height:calc(100vh - 2rem);overflow:auto;background:var(--bg);color:var(--fg);border:1px solid var(--border-soft);border-radius:.5rem;padding:1.25rem } +.asset-detail-dialog::backdrop { background:rgba(0,0,0,.55) } +.config-path-control,.config-range-control{display:flex;align-items:center;gap:.5rem;min-width:0}.config-path-control input{flex:1;min-width:0}.config-path-control button{flex:0 0 2.2rem;height:2.2rem;padding:0}.config-range-control input{flex:1;min-width:8rem}.config-range-control output{min-width:3.5rem;text-align:end;font-variant-numeric:tabular-nums} +.config-path-picker{box-sizing:border-box;width:min(46rem,95vw);height:min(42rem,90dvh);margin:auto;padding:0;overflow:hidden;border:1px solid var(--border);border-radius:.8rem;background:var(--input-bg,var(--bg));color:var(--fg);box-shadow:0 1.5rem 5rem #0009}.config-path-picker[open]{display:grid;grid-template-rows:auto auto auto minmax(0,1fr) auto}.config-path-picker::backdrop{background:#0009;backdrop-filter:blur(3px)}.config-path-picker>header,.config-path-picker>nav,.config-path-picker>footer{display:flex;align-items:center;gap:.6rem;padding:.75rem 1rem;background:var(--input-bg,var(--bg))}.config-path-picker>header{justify-content:space-between;border-bottom:1px solid var(--border)}.config-path-picker>header h2{margin:0;font-size:1.05rem}.config-path-picker>header button{border:0;background:transparent;color:inherit;font-size:1.4rem}.config-path-picker>nav{border-bottom:1px solid var(--border-soft)}.config-path-picker>nav code{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.config-path-picker>[data-path-picker-status]{min-height:1.2rem;margin:0;padding:.45rem 1rem}.config-path-picker-list{min-height:10rem;padding:.25rem .5rem;overflow:auto;overscroll-behavior:contain}.config-path-picker-item{display:grid;grid-template-columns:1.5rem minmax(0,1fr) auto;align-items:center;gap:.55rem;width:100%;padding:.5rem .65rem;border:0;border-radius:.35rem;background:transparent;color:inherit;text-align:start}.config-path-picker-item:hover,.config-path-picker-item[aria-selected=true]{background:var(--row-hover,var(--border-soft))}.config-path-picker-item[aria-selected=true]{outline:1px solid var(--accent)}.config-path-picker-item span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.config-path-picker-item small{color:var(--muted)}.config-path-picker>footer{justify-content:flex-end;border-top:1px solid var(--border)} +.asset-dialog-close { position:absolute;right:.75rem;top:.75rem } +.table-scroll { overflow-x: auto; } + +body.mode-config .config-section input[type="text"], +body.mode-config .config-section input[type="number"], +body.mode-config .config-section select { + max-width: 42rem; +} + +body.mode-config .config-section input[type="text"] { + width: 100%; + padding: 0.6rem; + font-family: monospace; +} + +body.mode-config .recent-table { + width: 100%; + border-collapse: collapse; +} + +body.mode-config .recent-table th, +body.mode-config .recent-table td { + border-bottom: 1px solid var(--border-soft); + padding: 0.4rem; +} + +body.mode-config .recent-table th { + text-align: left; + color: var(--muted); + font-weight: normal; +} + +body.mode-config .recent-table tr:hover { + background: var(--row-hover); +} + +/* Dense administration tables. Keep detail/log bodies readable, and scroll + wide tables rather than wrapping editable rows or clipping their controls. */ +body.mode-config :is(.recent-table, .config-form-table) { + width:100%; border-collapse:collapse; font-size:.85rem; line-height:1.35; +} +body.mode-config :is(.recent-table, .config-form-table) :is(th, td) { + padding:.22rem .45rem; vertical-align:middle; white-space:nowrap; + overflow-wrap:normal; word-break:normal; border-bottom:1px solid var(--border-soft); +} +body.mode-config :is(.recent-table, .config-form-table) td form { + display:inline-flex; align-items:center; gap:.35rem; flex-wrap:nowrap; + margin:0; padding:0; vertical-align:middle; +} +body.mode-config :is(.recent-table, .config-form-table) td form:empty { display:none; } +body.mode-config :is(.recent-table, .config-form-table) :is(input:not([type=checkbox]):not([type=hidden]), select, button, .button-link) { + box-sizing:border-box; height:1.8rem; min-height:1.8rem; margin:0; + padding:.18rem .4rem; font-size:inherit; line-height:1.3; vertical-align:middle; +} +body.mode-config .recent-table input:not([type=checkbox]):not([type=hidden]):not([type=file]) { + width:clamp(7rem,9vw,12rem); min-width:6rem; +} +body.mode-config .recent-table select { width:auto; min-width:7rem; max-width:24rem; } +body.mode-config .config-panel .recent-table input[name=campus_default_lang]:not([type=hidden]) { width:4rem; min-width:4rem; } +body.mode-config .config-panel .recent-table input[name=nav_href]:not([type=hidden]) { width:clamp(16rem,35vw,40rem); } +body.mode-config :is(.recent-table, .config-form-table) label.config-toggle { min-height:1.8rem; margin:0; gap:.4rem; } +body.mode-config .recent-table td :is(p, small) { display:inline; margin:0; } +body.mode-config .recent-table td small { margin-inline-start:.45rem; } +body.mode-config .recent-table td br { display:none; } +body.mode-config .recent-table td code + code { margin-inline-start:.5rem; } +body.mode-config .recent-table .cell-secondary { color:var(--muted); margin-inline-start:.5rem; } +body.mode-config .recent-table .cell-clip { + display:inline-block; max-width:24rem; overflow:hidden; text-overflow:ellipsis; + white-space:nowrap; vertical-align:middle; +} +body.mode-config .recent-table .job-log-detail td { white-space:normal; padding:.5rem; } +body.mode-config .recent-table .job-log-detail pre { display:block; white-space:pre-wrap; } +body.mode-config .table-scroll { max-width:100%; overflow-x:auto; margin-block:.5rem 1rem; scrollbar-width:thin; scrollbar-color:var(--muted) var(--bg); } +#panel-extensions .cell-clip { max-width:14rem; } + +body.mode-config .mono { + font-family: "JetBrains Mono", monospace; +} + +body.mode-config .muted { + color: var(--muted); +} + +.mode-config .config-warning { + max-width: 64rem; + padding: .7rem .85rem; + border: 1px solid color-mix(in srgb, var(--danger) 55%, var(--border)); + border-radius: .5rem; + background: color-mix(in srgb, var(--danger) 9%, transparent); +} + + +/* Shared settings shell and panels */ +.mode-config > .topbar { gap: 1rem; padding: .5rem 1rem; flex-wrap: wrap; } +.mode-config > .topbar nav { display: flex; gap: .8rem; flex-wrap: wrap; } +.mode-config .config-sidebar { scrollbar-width: thin; scrollbar-color: var(--border) transparent; } +.mode-config [hidden] { display: none !important; } +.mode-config .config-layout { transition: grid-template-columns .15s; } +body.mode-config .config-layout.sidebar-collapsed { grid-template-columns: 3rem minmax(0,1fr) !important; } +body.mode-config .config-sidebar { max-height: calc(100vh - 5rem); overflow-y: auto; min-height: 0; } +body.mode-config .sidebar-nav { gap: .9rem; } +.config-nav-group summary { color: var(--muted); font-size: .85rem; cursor: pointer; padding: .5rem .25rem; } +.config-nav-group a { display: block; padding: .55rem .7rem; margin: .15rem 0; border-radius: .35rem; overflow-wrap: anywhere; } +.config-nav-group a.active { background: color-mix(in srgb,var(--accent) 15%,transparent); border-inline-start: 3px solid var(--accent); } +.config-nav-group a:hover { background: var(--row-hover,var(--border-soft)); } +.mode-config .config-content { max-width: 90rem; width: 100%; } +.mode-config .config-panel h1 { margin-top: .4rem; font-size: 1.5rem; } +.mode-config .config-panel h2 { margin-top: 2rem; font-size: 1.12rem; } +.mode-config .config-panel input:not([type=checkbox]):not([type=hidden]):not([type=file]), +.mode-config .config-panel select, .mode-config .config-panel textarea { box-sizing: border-box; min-width: 0; width: 100%; } +.mode-config .config-panel input[type=file] { max-width: 100%; } +.mode-config .config-panel form { margin-bottom: 1.3rem; } +.mode-config .settings-form > label { display: grid; gap: .5rem; margin-block: .9rem; } +.mode-config .settings-form { max-width: 64rem; } +.settings-form fieldset { border: 1px solid var(--border); border-radius: .6rem; padding: 1.25rem; margin-bottom: 1.25rem; display: grid; grid-template-columns: repeat(2,minmax(0,1fr)); gap: 1rem; } +.settings-form fieldset label { display: grid; gap: .4rem; } +.settings-form legend { padding: 0 .5rem; color: var(--muted); } +.settings-form .wide { grid-column: 1 / -1; } +.config-actions { display: flex; gap: .6rem; margin-top: 1rem; align-items: center; } +.mode-config .row-actions { white-space: nowrap; } +.config-error { color: var(--danger); min-height: 1.5rem; white-space: pre-wrap; } +.mode-config .queue-settings-grid { max-width: 48rem; grid-template-columns: repeat(2,minmax(0,1fr)); gap: 1.3rem; border: 1px solid var(--border); border-radius: .6rem; padding: 1.25rem; } +.mode-config .event-definition-grid { grid-template-columns: repeat(2,minmax(0,1fr)); gap: 1rem; border: 1px solid var(--border); border-radius: .6rem; padding: 1.25rem; } +.mode-config .event-definition-grid details { grid-column: 1 / -1; } +.mode-config .event-definition-grid details > div { display: grid; grid-template-columns: repeat(2,minmax(0,1fr)); gap: 1rem; padding-top: 1rem; } +.mode-config label.config-toggle { display: flex !important; flex-direction: row !important; align-items: center; gap: .7rem; cursor: pointer; min-height: 2.3rem; } +.config-toggle::after { content: attr(data-label); } +.mode-config input[type=checkbox] { appearance: none; flex: 0 0 2.6rem; width: 2.6rem; height: 1.45rem; border: 1px solid var(--input-border); border-radius: 1rem; background: var(--button-bg); position: relative; padding: 0; vertical-align: middle; cursor: pointer; } +.mode-config input[type=checkbox]::before { content: ""; position: absolute; width: 1.03rem; height: 1.03rem; border-radius: 50%; top: .15rem; left: .18rem; background: var(--muted); transition: transform .15s; } +.mode-config input[type=checkbox]:checked { background: var(--accent); } +.mode-config input[type=checkbox]:checked::before { transform: translateX(1.08rem); background: var(--bg); } +.mode-config input[type=checkbox]:focus-visible { outline: 2px solid var(--link); outline-offset: 3px; } +.mode-config input[type=checkbox]:disabled { opacity: .45; cursor: not-allowed; } +.mode-config .config-toggle:has(input:disabled) { cursor: not-allowed; opacity: .7; } +.resource-charts { display: grid; grid-template-columns: repeat(2,minmax(0,1fr)); gap: 1rem; margin-top: 1.25rem; } +.resource-charts figure { margin: 0; padding: 1rem; border: 1px solid var(--border); border-radius: .6rem; } +.resource-charts figcaption { color: var(--muted); margin-bottom: .75rem; } +.resource-charts svg { width: 100%; display: block; color: var(--accent); } +.resource-charts .chart-line { fill: none; stroke: currentColor; stroke-width: 2; vector-effect: non-scaling-stroke; } +.resource-charts .io-write { stroke-dasharray:5 3; } +.resource-charts .io-write, .io-legend .io-write { color:var(--fg); } +.io-legend { display:flex; gap:.8rem; font-size:.75rem; color:var(--accent); } +.io-legend span::before { content:''; display:inline-block; width:1rem; border-top:2px solid currentColor; margin-right:.25rem; vertical-align:middle; } +.io-legend .io-write::before { border-top-style:dashed; } +.resource-charts .chart-axis { stroke: var(--border); } +.resource-charts text { fill: var(--muted); font: 11px system-ui,sans-serif; } +.monitor-toolbar { display:flex; flex-wrap:wrap; align-items:center; gap:.75rem; margin:1rem 0; } +.monitor-toolbar a { margin-inline-start:auto; } +.monitor-header, .monitor-header-actions { display:flex; align-items:center; gap:.8rem; flex-wrap:wrap; } +.monitor-header { justify-content:space-between; margin-bottom:1rem; } +.mode-config .monitor-header h1 { margin:0; } +#resource-time-range { margin:.4rem 0 0; font-size:.8rem; font-variant-numeric:tabular-nums; } +.monitor-settings-icon { display:inline-flex; align-items:center; justify-content:center; padding:.5rem; } +.monitor-settings-icon svg { width:1.2rem; height:1.2rem; fill:none; stroke:currentColor; stroke-width:1.6; stroke-linejoin:round; } +dialog.monitor-settings-dialog { box-sizing:border-box; width:min(44rem,calc(100vw - 2rem)); max-height:90vh; max-height:90svh; margin:auto; padding:0; overflow:auto; background:var(--bg); color:var(--fg); border:1px solid var(--border); border-radius:.8rem; box-shadow:0 1.5rem 5rem #0009; } +dialog.monitor-settings-dialog:not([open]) { display:none; } +.monitor-settings-dialog::backdrop { background:#0009; backdrop-filter:blur(3px); } +.monitor-settings-dialog > header { position:sticky; top:0; z-index:1; display:flex; align-items:center; justify-content:space-between; gap:1rem; padding:.75rem 1.25rem; background:var(--bg); border-bottom:1px solid var(--border); } +.mode-config .monitor-settings-dialog h2 { margin:0; font-size:1.12rem; } +.monitor-settings-dialog > header button { background:transparent; border:0; color:var(--fg); font-size:1.5rem; } +.monitor-settings-body { padding:1.25rem; } +.monitor-settings-body .config-actions { flex-wrap:wrap; } +.resource-chart-scroll { overflow-x:auto; margin-top:1rem; } +.execution-dashboard .resource-charts { grid-template-columns:repeat(4,minmax(12rem,1fr)); gap:.6rem; margin-top:.5rem; } +.execution-dashboard .resource-charts figure { padding:.6rem; min-width:0; } +.execution-dashboard .resource-card span { font-variant-numeric:tabular-nums; } +.job-table { font-variant-numeric:tabular-nums; } +.job-table td:first-child { overflow-wrap:anywhere; } +.job-table small { color:var(--muted); } +.job-table button { white-space:nowrap; } +.job-log-detail td { padding:.75rem; background:var(--surface-alt,var(--surface)); } +.job-log-detail pre { white-space:pre-wrap; overflow-wrap:anywhere; max-height:22rem; overflow:auto; margin:.5rem 0; font-size:.8rem; } +.job-log-detail[hidden] { display:none; } +.execution-dashboard .config-error:empty, #scheduler-queue-state:empty { display:none; } +.mode-config #bookmark-rows td:first-child { width: 25%; } +.mode-config #bookmark-rows td:nth-child(2) { width: 6rem; } +@media (max-width: 760px) { + body.mode-config .config-main { padding: .5rem; } + body.mode-config .config-layout { grid-template-columns: 1fr !important; gap: .8rem !important; } + body.mode-config .config-sidebar { grid-column: 1; position: static; max-height: 15rem; border: 1px solid var(--border); padding: .5rem; } + body.mode-config .config-content { grid-column: 1; } + body.mode-config .config-layout.sidebar-collapsed { grid-template-columns: 1fr !important; } + body.mode-config .config-sidebar.collapsed { width: auto; } +.resource-charts, .mode-config .event-definition-grid, .mode-config .queue-settings-grid, .settings-form fieldset { grid-template-columns: 1fr; } +} +/* Keep modal layout independent of compact administration tables. */ +body.mode-config:has(.domain-entry-dialog[open]) { overflow: hidden; } +body.mode-config .domain-entry-dialog { + box-sizing: border-box; + width: min(46rem, calc(100vw - 2rem)); + max-height: 90vh; + max-height: 90dvh; + margin: auto; + padding: 0; + overflow: auto; + scrollbar-width: thin; + scrollbar-color: var(--muted) var(--bg); + white-space: normal; + font-size: 1rem; + line-height: 1.5; + background: var(--bg); + color: var(--fg); + border: 1px solid var(--border); + border-radius: .7rem; + box-shadow: 0 1.5rem 5rem #0008; +} +.domain-entry-dialog:not([open]) { display: none; } +.domain-entry-dialog::backdrop { background: #0009; } +.domain-entry-dialog > header { + position: sticky; top: 0; z-index: 1; + display: flex; align-items: center; justify-content: space-between; + gap: 1rem; padding: .8rem 1rem; + background: var(--bg); border-bottom: 1px solid var(--border); +} +body.mode-config .domain-entry-dialog h2 { margin: 0; min-width: 0; font-size: 1.1rem; overflow-wrap: anywhere; } +.domain-entry-dialog [data-domain-entry-close] { flex: 0 0 auto; font-size: 1.4rem; min-width: 2rem; min-height: 2rem; padding: .1rem .4rem; } +.domain-entry-body { padding: 1rem; } +.domain-entry-body > form { display: block; margin: 0; padding: 0; } +.domain-entry-body > form + form { margin-top: 1rem; } +.domain-entry-dialog fieldset { display: grid; grid-template-columns: minmax(0,1fr); gap: .75rem; min-width: 0; margin: 0; padding: .9rem; border: 1px solid var(--border); border-radius: .4rem; } +.domain-entry-dialog legend { padding: 0 .4rem; font-weight: 600; } +.domain-entry-dialog label:not(.config-toggle) { display: grid; grid-template-columns: minmax(0,1fr) minmax(0,1fr); align-items: center; gap: .5rem 1rem; margin: 0; overflow-wrap: anywhere; } +body.mode-config .domain-entry-dialog .config-toggle { justify-content: flex-start; } +body.mode-config .domain-entry-dialog input:not([type=checkbox]):not([type=hidden]), body.mode-config .domain-entry-dialog select { + display: block; width: 100%; min-width: 0; max-width: 100%; box-sizing: border-box; + min-height: 2.2rem; margin: 0; padding: .35rem .5rem; font: inherit; + background: var(--input-bg, var(--bg)); color: var(--fg); border: 1px solid var(--input-border, var(--border)); border-radius: .25rem; +} +.domain-entry-dialog button[type=submit] { justify-self: end; width: auto; min-height: 2.2rem; } +.domain-entry-dialog p { display: block; margin: .75rem 0; white-space: normal; overflow-wrap: anywhere; font-size: .85rem; line-height: 1.6; color: var(--muted); } +.domain-entry-dialog :focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; } +@media (max-width: 560px) { + body.mode-config .domain-entry-dialog { width: calc(100vw - 1rem); max-height: 95vh; max-height: 95dvh; } + .domain-entry-body { padding: .65rem; } + .domain-entry-dialog label:not(.config-toggle) { grid-template-columns: minmax(0,1fr); } +} + .config-create-heading{display:flex;align-items:center;gap:.45rem}.config-icon-button{display:inline-grid;place-items:center;width:1.8rem;height:1.8rem;border:1px solid var(--border);border-radius:.35rem;background:transparent;color:var(--link);cursor:pointer;font-size:1.2rem}.config-icon-button:hover{background:var(--button-hover-bg)}.config-form-dialog{width:min(42rem,calc(100vw - 2rem));max-height:calc(100vh - 2rem);padding:0;border:1px solid var(--border);border-radius:.7rem;background:var(--bg);color:var(--fg);box-shadow:0 1.5rem 5rem #0009}.config-form-dialog::backdrop{background:#0008;backdrop-filter:blur(2px)}.config-form-dialog>header{position:sticky;top:0;display:flex;align-items:center;justify-content:space-between;padding:.75rem 1rem;background:var(--bg);border-bottom:1px solid var(--border);z-index:1}.config-form-dialog>header h2{margin:0;font-size:1rem}.config-form-dialog>header button{border:0;background:transparent;color:var(--fg);font-size:1.4rem;cursor:pointer}.config-form-dialog>form{padding:1rem}.config-form-dialog .table-scroll{overflow:visible}.config-form-dialog .config-form-table{margin:0;width:100%} +.broadcast-form { margin-block: .75rem 1rem; } +.broadcast-form .config-form-table { width: 100%; margin: 0; } +.broadcast-form th { width: 15rem; text-align: left; white-space: nowrap; } +.broadcast-form td { width: auto; } +.broadcast-form :is(input,textarea,select) { width: min(100%, 34rem); box-sizing: border-box; } diff --git a/static/css/content-viewer.css b/static/css/content-viewer.css new file mode 100644 index 0000000..936ee45 --- /dev/null +++ b/static/css/content-viewer.css @@ -0,0 +1,384 @@ +.lightbox-trigger { + display: block; + max-width: 100%; + margin: auto; + padding: 0; + border: 0; + background: transparent; + cursor: zoom-in; +} + +.content-lightbox { + width: 100vw; + max-width: none; + height: 100vh; + max-height: none; + margin: 0; + padding: 2.5rem; + border: 0; + background: rgba(5, 8, 14, .96); +} + +.content-lightbox::backdrop { + background: rgba(0, 0, 0, .9); +} + +.content-lightbox img { + display: block; + width: 100%; + height: 100%; + object-fit: contain; +} + +.content-lightbox [data-lightbox-close] { + position: fixed; + z-index: 2; + top: .8rem; + right: 1rem; + width: 2.5rem; + height: 2.5rem; + padding: 0; + border-radius: 50%; + font-size: 1.7rem; +} + +.media-player { + overflow: hidden; + width: min(100%, 70rem); + margin: 1rem auto; + border: 1px solid var(--border-soft); + border-radius: .65rem; + background: color-mix(in srgb, var(--input-bg) 94%, black); + box-shadow: 0 .8rem 2rem rgba(0, 0, 0, .18); +} + +.media-player audio, +.media-player video { + display: block; + width: 100%; + margin: 0; + background: #05070a; +} + +.audio-player { + padding-top: .45rem; +} + +.media-player-toolbar { + display: flex; + align-items: center; + justify-content: flex-end; + gap: .6rem; + min-height: 2.8rem; + padding: .45rem .65rem; + color: var(--muted); + font: .78rem "JetBrains Mono", monospace; +} + +.media-player-toolbar [data-media-time] { + margin-right: auto; +} + +.media-player-toolbar label { + display: flex; + align-items: center; + gap: .35rem; +} + +.media-player-toolbar select, +.media-player-toolbar button { + min-height: 2rem; + padding: .25rem .55rem; +} + +.children-icon-grid { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(9rem, 1fr)); + gap: .75rem; +} + +.children-icon-item { + display: grid; + grid-template-rows: 7rem auto; + gap: .45rem; + min-width: 0; + padding: .5rem; + border: 1px solid var(--border-soft); + border-radius: .4rem; + text-decoration: none; +} + +.children-preview, +.children-type-icon { + position: relative; + overflow: hidden; + width: 100%; + height: 7rem; + background: var(--input-bg); +} + +.children-preview img, +.children-preview video, +.children-preview iframe, +.children-preview canvas { + display: block; + width: 100%; + height: 100%; + border: 0; + object-fit: contain; + pointer-events: none; +} + +.children-type-icon { + display: grid; + place-items: center; + color: var(--muted); +} + +.children-type-icon svg { + width: 3.25rem; + height: 3.25rem; + fill: none; + stroke: currentColor; + stroke-linecap: round; + stroke-linejoin: round; + stroke-width: 1.5; +} + +.children-type-folder { color: #e8bd62; } +.children-type-archive { color: #b998dc; } +.children-type-audio { color: #74c7b8; } +.children-type-code { color: #79aee8; } +.children-type-package { color: #d88d78; } + +.children-preview-badge { + position: absolute; + right: .3rem; + bottom: .3rem; + padding: .12rem .32rem; + border-radius: .2rem; + background: rgba(0, 0, 0, .72); + color: white; + font: .66rem "JetBrains Mono", monospace; +} + +.children-icon-name { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.children-loading { + padding: .7rem; + color: var(--muted); +} + +.children-preview-pending::before { + position: absolute; + inset: 0; + content: ""; + background: + linear-gradient( + 100deg, + transparent 30%, + color-mix(in srgb, var(--fg) 8%, transparent) 50%, + transparent 70% + ); + background-size: 200% 100%; + animation: children-preview-pulse 1.4s linear infinite; +} + +.children-preview-ready::before { + display: none; +} + +.children-next { + height: 2px; + margin-top: .5rem; +} + +@keyframes children-preview-pulse { + from { background-position: 200% 0; } + to { background-position: -200% 0; } +} + +.children-detail { + width: 100%; + border-collapse: collapse; +} + +.children-detail th, +.children-detail td { + padding: .45rem .6rem; + border-bottom: 1px solid var(--border-soft); + text-align: left; +} + +.breadcrumb-bar { + display: flex; + align-items: center; + justify-content: space-between; + gap: 1rem; +} + +.children-view-switcher { + display: flex; + align-items: center; + gap: .3rem; +} + +.children-view-switcher[hidden] { + display: none; +} + +.children-view-switcher button { + display: grid; + place-items: center; + width: 1.75rem; + height: 1.75rem; + padding: 0; + border: 1px solid var(--border-soft); + border-radius: .3rem; + background: transparent; + color: var(--muted); + cursor: pointer; +} + +.children-view-switcher button:hover, +.children-view-switcher button.active { + border-color: var(--link); + color: var(--link); +} + +.children-entry { + cursor: pointer; +} + +.children-entry.children-selected { + outline: 2px solid var(--link); + outline-offset: -2px; + background: color-mix(in srgb, var(--link) 16%, transparent); +} + +.children-context-menu { + position: fixed; + z-index: 100; + min-width: 13rem; + padding: .35rem; + border: 1px solid var(--border-soft); + border-radius: .35rem; + background: var(--input-bg); + box-shadow: 0 .6rem 1.5rem rgba(0, 0, 0, .3); +} + +.children-context-menu button { + display: block; + width: 100%; + padding: .5rem .7rem; + border: 0; + background: transparent; + color: var(--fg); + text-align: left; + cursor: pointer; +} + +.children-context-menu button:hover { + background: color-mix(in srgb, var(--link) 14%, transparent); +} + +.children-context-group { + margin: .25rem 0; + padding: .35rem 0; + border-top: 1px solid var(--border-soft); + border-bottom: 1px solid var(--border-soft); +} + +.children-context-group > span { + display: block; + padding: .2rem .7rem; + color: var(--muted); + font-size: .78rem; +} + +.children-context-group a { + display: block; + padding: .5rem .7rem; + color: var(--fg); + text-decoration: none; +} + +.children-context-group a:hover { + background: color-mix(in srgb, var(--link) 14%, transparent); +} + +.search-unified-results .search-view-icon, +.search-unified-results .search-view-detail { + display: none; +} + +.search-unified-results[data-search-view="icon"] .search-view-icon { + display: grid; +} + +.search-unified-results[data-search-view="detail"] .search-view-detail { + display: table; +} + +.search-unified-results[data-search-view="icon"] .search-view-list, +.search-unified-results[data-search-view="detail"] .search-view-list { + display: none; +} + +@media (max-width: 38rem) { + .media-player-toolbar { + flex-wrap: wrap; + } +} +.excalidraw-plugin-frame { + display: block; + width: 100%; + min-height: calc(100vh - 12rem); + border: 1px solid var(--border-soft); + border-radius: 0.4rem; + background: var(--input-bg); +} + +.excalidraw-plugin-frame[hidden] { + display: none; +} + +.excalidraw-viewer { + display: grid; + grid-template-rows: auto minmax(24rem, calc(100vh - 14rem)); + overflow: hidden; + border: 1px solid var(--border-soft); + border-radius: 0.4rem; + background: var(--input-bg); +} + +.excalidraw-toolbar { + display: flex; + align-items: center; + justify-content: flex-end; + gap: 1rem; + padding: 0.4rem 0.6rem; + border-bottom: 1px solid var(--border-soft); +} + +.excalidraw-viewer canvas { + width: 100%; + height: 100%; + cursor: grab; + touch-action: none; +} + +.excalidraw-viewer canvas:active { + cursor: grabbing; +} + +[data-projection-status]:empty { display: none; } +.pdf-toolbar [data-projection-status] { max-width: 40em; font-size: .85em; color: var(--muted); } +.print-actions{display:inline-flex;align-items:center;gap:.45rem}.print-actions a{display:grid;place-items:center;min-width:2rem;height:2rem;padding:0 .45rem;border:1px solid var(--border);border-radius:.35rem;color:var(--link);text-decoration:none;font-weight:700}.print-actions a:hover{background:var(--button-hover-bg);border-color:var(--link)} +.viewer-shortcut-dialog{width:min(34rem,calc(100vw - 2rem));padding:0;border:1px solid var(--border);border-radius:.7rem;background:var(--bg);color:var(--fg);box-shadow:0 1.5rem 5rem #0009}.viewer-shortcut-dialog::backdrop{background:#0008}.viewer-shortcut-dialog form{margin:0;padding:1rem}.viewer-shortcut-dialog header{display:flex;align-items:center;justify-content:space-between;gap:1rem}.viewer-shortcut-dialog header h2{margin:0;font-size:1.1rem}.viewer-shortcut-dialog header button{border:0;background:transparent;color:var(--fg);font-size:1.4rem}.viewer-shortcut-content{display:grid;gap:.65rem;margin-top:.8rem}.viewer-shortcut-content label{display:grid;gap:.25rem}.viewer-shortcut-content input{box-sizing:border-box;width:100%;padding:.5rem;background:var(--input-bg,var(--bg));color:var(--fg);border:1px solid var(--border)}.viewer-shortcut-content a,.viewer-shortcut-content button{width:max-content;padding:.4rem .7rem;color:var(--link)} +.viewer-shortcut-dialog{max-height:min(80vh,42rem);overflow:auto}.viewer-shortcut-dialog form{box-sizing:border-box;min-width:0}.viewer-shortcut-dialog input,.viewer-shortcut-dialog button,.viewer-shortcut-dialog a{font:inherit}.viewer-shortcut-dialog button,.viewer-shortcut-dialog a{display:inline-flex;align-items:center;justify-content:center;border:1px solid var(--border);border-radius:.35rem;background:var(--surface,var(--bg));text-decoration:none;cursor:pointer}.viewer-shortcut-dialog button:hover,.viewer-shortcut-dialog a:hover{background:var(--row-hover,var(--surface,var(--bg)))}.viewer-find-form{display:grid;gap:.65rem}.viewer-find-form input{min-width:0}.viewer-find-suggestions{display:grid;gap:.15rem;max-height:18rem;overflow:auto}.viewer-find-suggestions a{display:block;width:auto;justify-content:flex-start;border-color:transparent;text-align:left;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.viewer-shortcut-grid{display:grid;grid-template-columns:auto 1fr;align-items:center;gap:.45rem .8rem}.viewer-shortcut-grid kbd{padding:.2rem .45rem;border:1px solid var(--border);border-radius:.3rem;background:var(--surface,var(--bg));font-family:var(--mono,monospace);font-size:.85em} +.viewer-children-dialog-content{display:block;max-height:60vh;overflow:auto}.viewer-children-dialog-content ul{display:grid;gap:.25rem;margin:0;padding:0;list-style:none}.viewer-children-dialog-content a{width:auto;justify-content:flex-start;border-color:transparent;text-align:left}.viewer-children-dialog-content table{width:100%;border-collapse:collapse}.viewer-children-dialog-content th,.viewer-children-dialog-content td{padding:.4rem;border-bottom:1px solid var(--border);text-align:start} diff --git a/static/css/dav-settings.css b/static/css/dav-settings.css new file mode 100644 index 0000000..4ba4d61 --- /dev/null +++ b/static/css/dav-settings.css @@ -0,0 +1,5 @@ +#tasks-dav-dialog{box-sizing:border-box;width:min(800px,96vw);max-height:92dvh;overflow:auto;color:var(--fg);background:var(--bg)!important;border:1px solid var(--border,#8885);border-radius:1rem;padding:1rem;box-shadow:0 1rem 4rem #0005} +#tasks-dav-dialog::backdrop{background:#0007;backdrop-filter:blur(3px)} +#tasks-dav-dialog header{display:flex;align-items:center;justify-content:space-between;gap:1rem}#tasks-dav-dialog h2{font-size:1.2rem;margin:.25rem 0}#tasks-dav-dialog p{font-size:.9rem}#tasks-dav-dialog form{display:flex;flex-wrap:wrap;gap:.4rem;margin:1rem 0}#tasks-dav-dialog form>input{flex:1;min-width:10rem}#tasks-dav-dialog>input,#tasks-dav-dialog section input{width:100%}#tasks-dav-dialog input,#tasks-dav-dialog select,#tasks-dav-dialog button{box-sizing:border-box;font:inherit;color:var(--fg);background:var(--bg);border:1px solid var(--border,#8885);border-radius:.4rem;padding:.5rem;min-width:0}#tasks-dav-dialog button{cursor:pointer}#tasks-dav-dialog :focus-visible{outline:2px solid var(--accent);outline-offset:2px}#tasks-dav-dialog section{padding:.7rem;border:1px solid var(--accent);border-radius:.5rem}#tasks-dav-dialog section label{display:block;font-size:.85rem;margin:.3rem 0}#tasks-dav-dialog .task-dav-table{overflow:auto}#tasks-dav-dialog table{width:100%;border-collapse:collapse;font-size:.85rem}#tasks-dav-dialog th,#tasks-dav-dialog td{padding:.35rem;text-align:left;border-bottom:1px solid var(--border,#8885)}#tasks-dav-dialog td:first-child{overflow-wrap:anywhere}#tasks-dav-dialog [role=status]{color:var(--danger,#d55)} +#tasks-dav-dialog .dav-compat-toggle{display:flex;align-items:center;gap:.5rem;width:100%;font-size:.9rem}#tasks-dav-dialog .dav-compat-toggle input{width:1.2rem;height:1.2rem;min-height:0;flex:none;accent-color:var(--accent)}#tasks-dav-dialog .dav-compat-help{width:100%;margin:.15rem 0;font-size:.85rem;color:var(--muted,var(--fg))} +@media(max-width:760px){#tasks-dav-dialog{width:100%;max-width:none;height:100dvh;max-height:100dvh;margin:0;border-radius:0}#tasks-dav-dialog input,#tasks-dav-dialog select,#tasks-dav-dialog button{min-height:44px;font-size:16px}#tasks-dav-dialog .dav-compat-toggle{min-height:44px}} diff --git a/static/css/fonts.css b/static/css/fonts.css new file mode 100644 index 0000000..077a291 --- /dev/null +++ b/static/css/fonts.css @@ -0,0 +1,8 @@ +/* Vendored Nerd Fonts v3.2.1; see /static/fonts/hack/LICENSE.md. */ +@font-face { + font-family: "Hack Nerd Font"; + src: url("/static/fonts/hack/HackNerdFont-Regular.ttf") format("truetype"); + font-style: normal; + font-weight: 400; + font-display: swap; +} diff --git a/static/css/home.css b/static/css/home.css new file mode 100644 index 0000000..f692999 --- /dev/null +++ b/static/css/home.css @@ -0,0 +1,122 @@ +.home-wallpaper { position:fixed; inset:0; z-index:0; width:100%; height:100%; object-fit:cover; object-position:center; pointer-events:none; user-select:none; } +body:has(> .home-wallpaper) { isolation:isolate; } +.mode-home > :is(.topbar,main), .is-home-page > :is(.topbar,main), .home-landing > .home-main, body:has(> .home-wallpaper) > .periodical-shell { position:relative; z-index:1; } +.home-landing:has(> .home-wallpaper), .mode-home:has(> .home-wallpaper), .is-home-page:has(> .home-wallpaper) { background-color:var(--bg); } +.home-landing,.mode-home,.is-home-page { --home-glass-opacity:58%; } +.home-landing { margin: 0; min-height: 100vh; font-family: system-ui, sans-serif; } +.home-landing * { box-sizing: border-box; } +.home-landing a { text-decoration: none; } +.home-account { position: absolute; top: .7rem; right: 1rem; display: flex; align-items: center; gap: .55rem; z-index: 5; padding:.3rem .45rem; border:1px solid color-mix(in srgb,var(--border) 70%,var(--accent) 30%); border-radius:999px; background:color-mix(in srgb,var(--bg) var(--home-glass-opacity,58%),transparent); box-shadow:0 .4rem 1.4rem #0003; -webkit-backdrop-filter:blur(12px) saturate(115%); backdrop-filter:blur(12px) saturate(115%); } +.home-account .auth-menu { position: relative; } +.home-wiki-title { position:absolute; z-index:5; top:1rem; left:1.25rem; min-width:0; max-width:min(22rem,40vw); margin:0; font-size:1rem; font-weight:600; line-height:2.25rem; } +.home-wiki-title a { display:block; overflow:hidden; color:var(--fg); text-overflow:ellipsis; white-space:nowrap; } +.home-account .city-map-launch { display: grid; place-items: center; width: 2.25rem; height: 2.25rem; padding: .4rem; border-radius: 50%; background: transparent; color: var(--fg); } +.home-main { width: min(100% - 2rem, 58rem); margin: auto; padding: 6rem 0 3rem; } +.home-layout-directory .home-main { width:min(100% - 3rem,100rem); } +.home-search { width: min(100%, 40rem); margin: auto; text-align: center; } +.home-search-combobox { position:relative; width:100%; z-index:6; } +.home-search form { display: flex; border: 1px solid color-mix(in srgb,var(--border) 72%,var(--accent) 28%); background:color-mix(in srgb,var(--bg) var(--home-glass-opacity,58%),transparent); border-radius: 2rem; padding: .35rem .5rem .35rem 1rem; box-shadow:0 .45rem 1.5rem #0002; -webkit-backdrop-filter:blur(12px) saturate(115%); backdrop-filter:blur(12px) saturate(115%); } +.home-search form:focus-within { outline: 2px solid var(--accent); outline-offset: 2px; } +.home-search input[type=search] { min-width: 0; width: 100%; font-size: 1.1rem; border: 0; background: transparent; outline: none; } +.home-search button { flex-shrink: 0; border: 0; border-radius: 50%; padding: .65rem; display: grid; place-items: center; background:color-mix(in srgb,var(--button-bg,var(--bg)) 76%,transparent); } +.home-search button svg { width: 1.4rem; height: 1.4rem; fill: none; stroke: currentColor; stroke-width: 1.8; } +.home-search-suggestions { position:absolute; z-index:8; top:calc(100% + .55rem); left:0; right:0; max-height:max(8rem,min(28rem,calc(50dvh - 5rem))); padding:.4rem; overflow:auto; overscroll-behavior:contain; border:1px solid color-mix(in srgb,var(--border) 70%,var(--accent) 30%); border-radius:.85rem; background:color-mix(in srgb,var(--bg) var(--home-glass-opacity,58%),transparent); box-shadow:0 1rem 2.6rem #0007; -webkit-backdrop-filter:blur(16px) saturate(120%); backdrop-filter:blur(16px) saturate(120%); text-align:left; } +.home-search-suggestions[hidden] { display:none; } +.home-search-suggestion { display:grid; grid-template-columns:auto minmax(0,1fr) auto; align-items:center; gap:.7rem; min-width:0; padding:.58rem .7rem; border-radius:.55rem; color:var(--fg); text-decoration:none; } +.home-search-suggestion:hover,.home-search-suggestion[aria-selected="true"] { background:color-mix(in srgb,var(--accent) 16%,transparent); outline:none; } +.home-search-suggestion-kind { min-width:3.4rem; padding:.12rem .35rem; overflow:hidden; border:1px solid color-mix(in srgb,var(--accent) 42%,var(--border)); border-radius:999px; color:var(--muted); font-size:.68rem; text-align:center; text-overflow:ellipsis; white-space:nowrap; } +.home-search-suggestion-main { display:grid; min-width:0; gap:.12rem; } +.home-search-suggestion-main strong,.home-search-suggestion-main small { overflow:hidden; text-overflow:ellipsis; white-space:nowrap; } +.home-search-suggestion-main strong { color:var(--fg); font-size:.92rem; font-weight:620; } +.home-search-suggestion-main small { color:var(--muted); font: .75rem "Hack Nerd Font",monospace; } +.home-search-suggestion-open { color:var(--muted); font-size:.75rem; white-space:nowrap; } +.home-search-suggestion-search { margin-top:.3rem; border-top:1px solid var(--border-soft,var(--border)); border-radius:.25rem .25rem .55rem .55rem; } +.home-search-suggestion-search .home-search-suggestion-kind { min-width:2rem; border:0; font-size:1rem; } +.mode-home .topbar-search, +.is-home-page .topbar-search { border:1px solid color-mix(in srgb,var(--border) 72%,var(--accent) 28%); border-radius:.45rem; background:color-mix(in srgb,var(--bg) var(--home-glass-opacity,58%),transparent); box-shadow:0 .35rem 1.2rem #0002; -webkit-backdrop-filter:blur(12px) saturate(115%); backdrop-filter:blur(12px) saturate(115%); } +.mode-home .topbar-search:focus-within, +.is-home-page .topbar-search:focus-within { outline:2px solid var(--accent); outline-offset:2px; } +.mode-home .topbar-search input[name="q"], +.is-home-page .topbar-search input[name="q"] { border-color:transparent; background:transparent; box-shadow:none; outline:none; } +body:has(> .home-wallpaper) .home-search form, +body:has(> .home-wallpaper) .topbar-search { background:color-mix(in srgb,var(--bg) var(--home-glass-opacity,58%),transparent); box-shadow:0 .55rem 1.8rem #0005; } +:is(body.mode-home,body.is-home-page,body.home-landing,body.periodical-top) :is(.notification-dialog,.calendar-upcoming-dialog,.city-map-dialog,dialog.home-bookmark-manager,.auth-menu-popover), +body.periodical-top .periodical-shell dialog { border-color:color-mix(in srgb,var(--border) 72%,var(--accent) 28%); background:color-mix(in srgb,var(--bg) var(--home-glass-opacity,58%),transparent); box-shadow:0 1.5rem 5rem #0009; -webkit-backdrop-filter:blur(16px) saturate(120%); backdrop-filter:blur(16px) saturate(120%); } +:is(body.mode-home,body.is-home-page,body.home-landing,body.periodical-top) :is(.notification-dialog,.calendar-upcoming-dialog,dialog.home-bookmark-manager) header, +:is(body.mode-home,body.is-home-page,body.home-landing,body.periodical-top) dialog.home-bookmark-manager .bookmark-savebar, +body.periodical-top .periodical-shell dialog header { background:color-mix(in srgb,var(--bg) var(--home-glass-opacity,58%),transparent); } +body:has(> .home-wallpaper) :is(.notification-dialog,.calendar-upcoming-dialog,.city-map-dialog,dialog.home-bookmark-manager,.auth-menu-popover), +body.periodical-top:has(> .home-wallpaper) .periodical-shell dialog { background:color-mix(in srgb,var(--bg) var(--home-glass-opacity,58%),transparent); } +body:has(> .home-wallpaper) :is(.notification-dialog,.calendar-upcoming-dialog,dialog.home-bookmark-manager) header, +body:has(> .home-wallpaper) dialog.home-bookmark-manager .bookmark-savebar, +body.periodical-top:has(> .home-wallpaper) .periodical-shell dialog header { background:color-mix(in srgb,var(--bg) var(--home-glass-opacity,58%),transparent); } +@supports not ((backdrop-filter:blur(1px)) or (-webkit-backdrop-filter:blur(1px))) { + body:has(> .home-wallpaper) .home-search form, + body:has(> .home-wallpaper) .topbar-search { background:color-mix(in srgb,var(--bg) 90%,transparent); } + body:has(> .home-wallpaper) :is(.notification-dialog,.calendar-upcoming-dialog,.city-map-dialog,dialog.home-bookmark-manager,.auth-menu-popover), + body.periodical-top:has(> .home-wallpaper) .periodical-shell dialog { background:color-mix(in srgb,var(--bg) 92%,transparent); } +} +.home-shortcuts { display:flex; width:max-content; max-width:100%; margin:1.35rem auto 0; gap:.25rem; } +.home-shortcuts a { display:grid; place-items:center; width:2.45rem; height:2.45rem; border-radius:50%; color:var(--fg); } +.home-shortcuts a:hover,.home-shortcuts a:focus-visible { background:color-mix(in srgb,var(--accent) 17%,transparent); color:var(--accent); outline:2px solid color-mix(in srgb,var(--accent) 42%,transparent); outline-offset:-2px; } +.home-shortcuts svg { width:1.35rem; height:1.35rem; fill:none; stroke:currentColor; stroke-width:1.65; stroke-linecap:round; stroke-linejoin:round; } +.home-appearance-launch { position:fixed; z-index:7; right:1rem; bottom:1rem; display:grid; place-items:center; width:2.6rem; height:2.6rem; padding:.55rem; border:1px solid color-mix(in srgb,var(--border) 70%,var(--accent) 30%); border-radius:50%; background:color-mix(in srgb,var(--bg) var(--home-glass-opacity,58%),transparent); color:var(--fg); box-shadow:0 .45rem 1.5rem #0005; -webkit-backdrop-filter:blur(12px) saturate(115%); backdrop-filter:blur(12px) saturate(115%); cursor:pointer; } +.home-appearance-launch:hover,.home-appearance-launch:focus-visible { border-color:var(--accent); color:var(--accent); outline:2px solid color-mix(in srgb,var(--accent) 42%,transparent); outline-offset:2px; } +.home-appearance-launch svg { width:100%; height:100%; fill:none; stroke:currentColor; stroke-width:1.6; stroke-linejoin:round; } +.home-appearance-dialog { width:min(30rem,calc(100vw - 2rem)); box-sizing:border-box; margin:auto; padding:0; border:1px solid color-mix(in srgb,var(--border) 70%,var(--accent) 30%); border-radius:.9rem; background:color-mix(in srgb,var(--bg) var(--home-glass-opacity,58%),transparent); color:var(--fg); box-shadow:0 1.5rem 5rem #0009; -webkit-backdrop-filter:blur(18px) saturate(120%); backdrop-filter:blur(18px) saturate(120%); } +.home-appearance-dialog::backdrop { background:#0008; -webkit-backdrop-filter:blur(3px); backdrop-filter:blur(3px); } +.home-appearance-dialog form { display:grid; gap:1rem; margin:0; padding:1.2rem; } +.home-appearance-dialog header,.home-appearance-dialog footer { display:flex; align-items:center; gap:.75rem; } +.home-appearance-dialog header { justify-content:space-between; } +.home-appearance-dialog h2,.home-appearance-dialog p { margin:0; } +.home-appearance-dialog h2 { font-size:1.1rem; } +.home-appearance-dialog header button { border:0; background:transparent; color:inherit; font-size:1.5rem; cursor:pointer; } +.home-appearance-dialog label { display:grid; gap:.55rem; } +.home-appearance-range { display:grid; grid-template-columns:minmax(0,1fr) 3.5rem; align-items:center; gap:.75rem; } +.home-appearance-range input { width:100%; accent-color:var(--accent); } +.home-appearance-range output { color:var(--fg); font-variant-numeric:tabular-nums; text-align:right; } +.home-appearance-dialog footer { justify-content:flex-end; } +.home-appearance-dialog footer [role=status] { min-width:0; margin-right:auto; color:var(--muted); } +.home-appearance-dialog footer button { padding:.5rem .8rem; border:1px solid var(--border); border-radius:.4rem; background:color-mix(in srgb,var(--button-bg,var(--bg)) var(--home-glass-opacity,58%),transparent); color:var(--fg); cursor:pointer; } +.home-search ~ .home-bookmarks { margin-top: 4rem; } +.home-bookmarks h2 { font-size: 1rem; font-weight: 500; color: var(--muted); } +.home-bookmark-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(100%, 13rem), 1fr)); gap: .75rem; } +.home-bookmark { display: flex; gap: .8rem; align-items: center; padding: 1.25rem; border: 1px solid var(--border); border-radius: .65rem; overflow-wrap: anywhere; } +.home-bookmark:hover { background: var(--button-hover-bg); border-color: var(--accent); } +.home-empty { color: var(--muted); } +.home-layout-search .home-main { min-height: 100vh; min-height: 100svh; display: grid; align-items: center; padding-block: 5rem; } +.home-layout-directory .home-main { padding-top: max(7rem, 18vh); } +@media (max-width: 600px) { .home-layout-directory .home-main { padding-top: 7rem; } .home-search ~ .home-bookmarks { margin-top: 2.5rem; } } +.home-paged { height:100vh; height:100dvh; overflow:hidden; overscroll-behavior:none; } +.home-paged .home-main[data-home-pager] { display:grid; grid-template-rows:100vh 100vh; grid-template-rows:100dvh 100dvh; align-items:stretch; width:min(100% - 3rem,100rem); height:200vh; height:200dvh; margin:auto; padding:0; transform:translate3d(0,var(--home-pager-drag),0); transition:transform .42s cubic-bezier(.22,.8,.24,1); will-change:transform; } +.home-paged .home-main[data-home-page="bookmarks"] { transform:translate3d(0,calc(-100dvh + var(--home-pager-drag)),0); } +.home-paged .home-main[data-home-dragging] { transition:none; user-select:none; } +.home-pager-page { position:relative; min-width:0; height:100vh; height:100dvh; } +.home-search-page { display:grid; place-items:center; padding:5rem 0; touch-action:pan-x; } +.home-search-page .home-search { align-self:center; } +.home-bookmarks-page { padding:4.5rem 0 3rem; overflow:auto; overscroll-behavior:contain; scrollbar-gutter:stable; touch-action:pan-y; } +.home-bookmarks-page-head { display:flex; align-items:center; justify-content:space-between; gap:1rem; margin:0 0 1.25rem; padding-inline:.25rem; } +.home-bookmarks-page-head h1 { margin:0; font-size:clamp(1.45rem,3vw,2rem); font-weight:550; } +.home-page-cue { display:grid; place-items:center; width:2.5rem; height:2.5rem; padding:.5rem; border:1px solid color-mix(in srgb,var(--border) 72%,var(--accent) 28%); border-radius:50%; background:color-mix(in srgb,var(--bg) 62%,transparent); color:var(--fg); box-shadow:0 .35rem 1.2rem #0003; -webkit-backdrop-filter:blur(10px) saturate(115%); backdrop-filter:blur(10px) saturate(115%); cursor:pointer; } +.home-page-cue svg { width:100%; height:100%; fill:none; stroke:currentColor; stroke-width:1.8; stroke-linecap:round; stroke-linejoin:round; } +.home-page-cue-next { position:absolute; z-index:2; left:50%; bottom:1.25rem; transform:translateX(-50%); animation:home-page-cue 2.4s ease-in-out infinite; } +.home-page-cue:hover,.home-page-cue:focus-visible { border-color:var(--accent); color:var(--accent); outline:2px solid color-mix(in srgb,var(--accent) 45%,transparent); outline-offset:2px; } +.home-page-indicator { position:fixed; z-index:4; top:50%; right:max(.7rem,env(safe-area-inset-right)); display:grid; gap:.55rem; transform:translateY(-50%); } +.home-page-indicator button { width:.65rem; height:.65rem; padding:0; border:1px solid color-mix(in srgb,var(--fg) 62%,transparent); border-radius:50%; background:color-mix(in srgb,var(--bg) 62%,transparent); box-shadow:0 1px 5px #0005; cursor:pointer; } +.home-page-indicator button[aria-current="page"] { border-color:var(--accent); background:var(--accent); transform:scale(1.25); } +@keyframes home-page-cue { 0%,70%,100%{translate:0 0} 82%{translate:0 .28rem} 91%{translate:0 0} } +@media(max-width:600px) { .home-account{right:.5rem;gap:.35rem;padding:.2rem .3rem}.home-wiki-title{left:.75rem;max-width:35vw;font-size:.95rem}.home-appearance-launch{right:.7rem;bottom:.7rem}.home-paged .home-main[data-home-pager]{width:min(100% - 1.5rem,100rem)} .home-search-page{padding-inline:.35rem} .home-bookmarks-page{padding-top:4.25rem} .home-page-indicator{right:.35rem} } +@media(max-width:600px) { .home-search-suggestions{max-height:max(8rem,calc(50dvh - 4rem))} .home-search-suggestion{grid-template-columns:minmax(0,1fr) auto;gap:.4rem} .home-search-suggestion-kind{display:none} } +@media(prefers-reduced-motion:reduce) { .home-paged .home-main[data-home-pager]{transition:none} .home-page-cue-next{animation:none} } +@media (forced-colors:active) { + .home-search form, + .mode-home .topbar-search, + .is-home-page .topbar-search, + :is(body.mode-home,body.is-home-page,body.home-landing,body.periodical-top) :is(.notification-dialog,.calendar-upcoming-dialog,.city-map-dialog,dialog.home-bookmark-manager,.auth-menu-popover), + body.periodical-top .periodical-shell dialog, + .home-page-cue, + .home-account, + .home-appearance-launch, + .home-appearance-dialog, + .home-search-suggestions { border-color:CanvasText; background:Canvas; box-shadow:none; -webkit-backdrop-filter:none; backdrop-filter:none; } +} diff --git a/static/css/main.css b/static/css/main.css index 9d25352..b0a5755 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -15,8 +15,15 @@ a { padding: 1rem; border-bottom: 1px solid var(--border-soft); background: var(--bg); + align-items: center; + gap: .75rem; } +.topbar > nav { display: flex; flex-wrap: wrap; align-items: center; gap: .4rem; } +.topbar > nav > a { margin: 0; padding: .4rem .6rem; border-radius: .35rem; white-space: nowrap; } +.topbar > nav > a:hover { background: var(--row-hover, var(--border-soft)); } +.topbar > .brand > a { margin: 0; white-space: nowrap; } + .topbar a { color: var(--link); text-decoration: none; @@ -55,3 +62,8 @@ a { background: var(--panel); color: var(--fg); } + +.preview.code-preview { + white-space: pre; + font-family: "JetBrains Mono", monospace; +} diff --git a/static/css/nav-modals.css b/static/css/nav-modals.css new file mode 100644 index 0000000..eb9e4b6 --- /dev/null +++ b/static/css/nav-modals.css @@ -0,0 +1,179 @@ +html:has(.notification-dialog[open], .calendar-upcoming-dialog[open]) { + overflow: hidden; +} + +/* Dialogs remain in the topbar DOM but render in the browser's top layer. */ +.notification-dialog, +.calendar-upcoming-dialog { + position: fixed; + inset: 0; + box-sizing: border-box; + margin: auto; + max-width: calc(100vw - 1rem); + max-height: calc(100dvh - 1rem); + padding: 0; + overflow: hidden; + text-align: start; + background: var(--input-bg, var(--bg, #fff)); + color: var(--fg, #222); + border: 1px solid var(--border, #888); + border-radius: 0.85rem; + box-shadow: 0 1.5rem 5rem #0009; +} +.notification-dialog { + width: min(40rem, calc(100vw - 1rem)); + height: fit-content; +} +.calendar-upcoming-dialog { + width: clamp(20rem, 72vw, 68rem); + height: min(52rem, 95vh); + height: min(52rem, 95dvh); +} +.notification-dialog::backdrop, +.calendar-upcoming-dialog::backdrop { + background: #0009; + backdrop-filter: blur(3px); +} +.notification-dialog .nav-modal-content, +.calendar-upcoming-dialog .nav-modal-content { + box-sizing: border-box; + display: grid; + grid-template-rows: auto auto minmax(0, 1fr) auto; + height: 100%; + padding: 0; +} +.notification-dialog header, +.calendar-upcoming-dialog header { + position: static; + display: flex; + align-items: center; + justify-content: space-between; + gap: 0.75rem; + min-width: 0; + padding: 0.8rem 1rem; + background: var(--input-bg, var(--bg, #fff)); + border-bottom: 1px solid var(--border-soft, var(--border, #8884)); +} +.notification-dialog h2, +.calendar-upcoming-dialog h2 { + min-width: 0; + margin: 0; + overflow: hidden; + font-size: 1.05rem; + text-overflow: ellipsis; + white-space: nowrap; +} +.notification-dialog header button, +.calendar-upcoming-dialog header button { + flex: 0 0 auto; + padding: 0.25rem 0.55rem; + border: 0; + background: transparent; + color: inherit; + font: inherit; + font-size: 1.4rem; + cursor: pointer; +} +.notification-dialog .notifications-list { + max-height: min(28rem, 60dvh); + overflow: auto; +} +.notification-dialog a, +.calendar-upcoming-dialog a { + color: var(--link, var(--fg)); + text-decoration: none; +} +.notification-dialog .notification-item { + display: grid; + min-width: 0; + overflow-wrap: anywhere; +} +.notification-dialog small { + color: var(--muted, var(--fg)); +} +.notification-launch { + flex-shrink: 0; +} + +.calendar-upcoming-dialog [data-calendar-upcoming-status] { + margin: 0; + padding: 0.65rem 1rem; + color: var(--muted, var(--fg)); + font-size: 0.85rem; +} +.calendar-upcoming-dialog [data-calendar-upcoming-status]:empty { + display: none; +} +.calendar-upcoming-list { + min-height: 0; + padding: 0.35rem 0.55rem; + overflow: auto; + overscroll-behavior: contain; + scrollbar-gutter: stable; + contain: layout paint style; +} +.calendar-upcoming-item { + display: grid; + grid-template-columns: 7.5rem 4.75rem minmax(0, 1fr); + align-items: center; + gap: 0.65rem; + min-width: 0; + min-height: 2.1rem; + padding: 0.25rem 0.55rem; + border-bottom: 1px solid var(--border-soft, var(--border, #8883)); + color: inherit; + content-visibility: auto; + contain: layout paint style; + contain-intrinsic-size: auto 2.1rem; +} +.calendar-upcoming-item:hover, +.calendar-upcoming-item:focus-visible { + background: var(--row-hover, color-mix(in srgb, var(--accent, #578) 10%, transparent)); + outline: none; +} +.calendar-upcoming-item time, +.calendar-upcoming-item strong { + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.calendar-upcoming-item time { + color: var(--muted, var(--fg)); + font-size: 0.82rem; + font-variant-numeric: tabular-nums; +} +.calendar-upcoming-item strong { + font-size: 0.9rem; + font-weight: 600; +} +.calendar-upcoming-dialog footer { + padding: 0.65rem 1rem; + text-align: end; + border-top: 1px solid var(--border-soft, var(--border, #8884)); +} + +@media (max-width: 560px) { + .calendar-upcoming-dialog { + width: 95vw; + max-width: none; + height: 95vh; + height: 95dvh; + max-height: 95dvh; + border-radius: 0.6rem; + } + .calendar-upcoming-list { + padding-inline: 0.25rem; + } + .calendar-upcoming-item { + grid-template-columns: 5.8rem 3.8rem minmax(0, 1fr); + gap: 0.4rem; + padding-inline: 0.35rem; + } +} + +@media (prefers-reduced-motion: reduce) { + .calendar-upcoming-list { + scroll-behavior: auto; + } +} diff --git a/static/css/notification-active.css b/static/css/notification-active.css new file mode 100644 index 0000000..d0e8df6 --- /dev/null +++ b/static/css/notification-active.css @@ -0,0 +1 @@ +.notification-settings{border-top:1px solid var(--border);margin-top:.7rem;padding-top:.5rem}.notification-settings summary{cursor:pointer;font-size:.85rem}.notification-settings>div{display:grid;gap:.6rem;padding:.6rem 0}.notification-settings label{display:flex;align-items:center;gap:.5rem;font-size:.85rem}.notification-settings input[type=checkbox]{appearance:auto;width:1rem;height:1rem;margin:0;accent-color:var(--accent)}.notification-settings select{background:var(--input-bg,var(--bg));color:var(--fg);border:1px solid var(--border);border-radius:.3rem;padding:.3rem}.notification-settings small,.notification-settings [role=status]{font-size:.75rem;color:var(--muted);margin:0}.notification-settings input[type=range]{min-width:0;max-width:12rem;accent-color:var(--accent)}.notification-toasts{position:fixed;right:1rem;bottom:1rem;z-index:1000;width:min(25rem,calc(100vw - 2rem));display:grid;gap:.5rem;pointer-events:none}.notification-toast{display:flex;align-items:center;gap:.6rem;padding:.8rem 1rem;pointer-events:auto;border:1px solid var(--border);border-left:3px solid var(--accent);border-radius:.7rem;background:var(--bg);color:var(--fg);box-shadow:0 .4rem 1.4rem #0005}.notification-toast a{color:inherit;text-decoration:none;flex:1;overflow-wrap:anywhere}.notification-toast button{color:inherit;background:transparent;border:0;cursor:pointer;font-size:1.2rem}.task-nav-item{grid-template-columns:auto minmax(0,1fr) auto;align-items:center}.task-nav-item strong{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tasks-today-dialog .nav-modal-content{padding:1rem}.tasks-today-dialog .notifications-list{max-height:65dvh;overflow:auto} diff --git a/static/css/notifications.css b/static/css/notifications.css new file mode 100644 index 0000000..0438fd2 --- /dev/null +++ b/static/css/notifications.css @@ -0,0 +1 @@ +.notification-launch{position:relative;display:grid;place-items:center;width:2.25rem;height:2.25rem;margin-inline-end:.35rem;padding:.38rem;border:1px solid var(--border,currentColor);border-radius:50%;background:transparent;color:var(--fg,currentColor);cursor:pointer}.notification-launch:hover,.notification-launch:focus-visible{background:color-mix(in srgb,var(--accent,#5267df) 15%,transparent);color:var(--accent,#5267df)}.notification-launch svg{width:100%;height:100%;fill:none;stroke:currentColor;stroke-width:1.7;stroke-linecap:round;stroke-linejoin:round}.notification-badge{position:absolute;top:-.1rem;right:-.1rem;width:.58rem;height:.58rem;border-radius:50%;background:#e5484d;border:2px solid var(--bg,#111)}.notification-badge[hidden]{display:none}.notification-dialog{width:min(34rem,calc(100vw - 2rem));max-height:min(38rem,calc(100vh - 2rem));padding:0;border:1px solid var(--border);border-radius:.75rem;background:var(--bg);color:var(--fg);box-shadow:0 1.5rem 5rem #0009}.notification-dialog::backdrop{background:#0008;backdrop-filter:blur(2px)}.notification-dialog form{margin:0;padding:1rem}.notification-dialog header,.notifications-page>header{display:flex;align-items:center;justify-content:space-between;gap:.7rem}.notification-dialog h2,.notifications-page h1{margin:0;font-size:1.15rem}.notification-dialog button,.notifications-page button{border:0;background:transparent;color:inherit;font:inherit;cursor:pointer}.notification-dialog .notifications-list{max-height:24rem;overflow:auto;margin-top:.8rem}.notifications-list{display:grid;gap:.5rem}.notification-item{display:grid;gap:.25rem;padding:.65rem .75rem;border:1px solid var(--border-soft,var(--border));border-radius:.45rem;text-decoration:none;color:inherit}.notification-item:hover{background:var(--row-hover,var(--surface,var(--bg)))}.notification-item time{font-size:.78rem;color:var(--muted)}.notification-item.unread{border-color:color-mix(in srgb,var(--accent) 55%,var(--border));background:color-mix(in srgb,var(--accent) 7%,transparent)}.notification-dialog footer{margin-top:.8rem;text-align:right}.notifications-page{max-width:54rem;margin-inline:auto}.notifications-page .notifications-list{margin-top:1rem}.notifications-page .notification-item{grid-template-columns:1fr auto;align-items:center} diff --git a/static/css/periodicals.css b/static/css/periodicals.css new file mode 100644 index 0000000..084b657 --- /dev/null +++ b/static/css/periodicals.css @@ -0,0 +1,14 @@ +.periodical-shell{max-width:76rem;margin:0 auto;padding:1rem;min-width:0}.periodical-shell .topbar{position:static;gap:1rem;padding:.5rem 0;border-bottom:1px solid var(--border)}.periodical-shell nav{display:flex;align-items:center;gap:.6rem;flex-wrap:wrap}.periodical-heading{display:flex;align-items:center;justify-content:space-between;gap:1rem}.periodical-heading h1{font-size:1.6rem}.periodical-filters{display:flex;gap:.6rem;align-items:center;flex-wrap:wrap;margin:1rem 0}.periodical-layout{display:grid;grid-template-columns:minmax(0,1fr) 18rem;gap:2rem}.periodical-entries article{padding:1rem 0;border-bottom:1px solid var(--border)}.periodical-entries h2{font-size:1.3rem;margin:.4rem 0;overflow-wrap:anywhere}.periodical-entry-meta{display:flex;gap:1rem;font-size:.85rem;color:var(--muted)}.periodical-path{font-size:.8rem;color:var(--muted);overflow-wrap:anywhere}.periodical-entries nav{font-size:.85rem}.periodical-entries button{background:transparent;padding:.25rem .45rem;cursor:pointer}.periodical-pagination{justify-content:space-between;padding:1rem 0}.periodical-calendar{border:1px solid var(--border);border-radius:.5rem;padding:.7rem}.periodical-calendar header{display:flex;justify-content:space-between;align-items:center;margin-bottom:.5rem}.periodical-calendar header a{padding:.3rem .7rem}.periodical-days,.periodical-weekdays{display:grid;grid-template-columns:repeat(7,minmax(0,1fr));text-align:center;gap:.2rem}.periodical-days a{padding:.4rem .1rem;text-decoration:none;color:var(--muted);border-radius:.2rem;position:relative}.periodical-days .has-entries{color:var(--link);font-weight:bold;background:var(--button-hover-bg)}.periodical-days small{display:block;font-size:.65rem}.periodical-days [aria-current=date]{outline:2px solid var(--accent)}.periodical-recent h2{font-size:1rem}.periodical-recent>a{display:block;margin:.5rem 0;overflow-wrap:anywhere}.periodical-recent time{font-size:.75rem;color:var(--muted)}.periodical-shell dialog{width:min(30rem,calc(100vw - 2rem));box-sizing:border-box;background:var(--bg);color:var(--fg);border:1px solid var(--border);border-radius:.6rem;padding:1rem}.periodical-shell dialog::backdrop{background:#0008}.periodical-shell dialog header{display:flex;justify-content:space-between;align-items:center}.periodical-shell dialog label{display:grid;gap:.2rem;margin:.6rem 0}.periodical-shell dialog input{width:100%;box-sizing:border-box;padding:.4rem}.periodical-shell :focus-visible{outline:2px solid var(--accent);outline-offset:2px}@media(max-width:700px){.periodical-layout{grid-template-columns:1fr}.periodical-layout aside{display:grid;grid-template-columns:minmax(0,1fr) minmax(0,1fr);gap:1rem}.periodical-shell{padding:.65rem}.periodical-heading{flex-wrap:wrap}.periodical-filters input{max-width:10rem}}@media(max-width:420px){.periodical-layout aside{grid-template-columns:1fr}.periodical-recent{display:block}} +@media(max-width:700px){.periodical-layout aside{grid-row:auto}.periodical-recent{display:block}} +.periodical-entries{min-width:0}.periodical-index{width:100%;table-layout:fixed;border-collapse:collapse;font-size:.95rem;margin:0}.periodical-index th,.periodical-index td{padding:.4rem .55rem;text-align:left;vertical-align:middle;border:0;border-bottom:1px solid var(--border)}.periodical-index th{font-size:.75rem;font-weight:500;color:var(--muted)}.periodical-index th:first-child,.periodical-index-date{width:7.5rem;white-space:nowrap;color:var(--muted);font-size:.8rem;font-variant-numeric:tabular-nums}.periodical-index .periodical-index-title{min-width:0}.periodical-index h2{font-size:.95rem;font-weight:500;line-height:1.5;margin:0}.periodical-index h2 a{display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-decoration:none;color:var(--fg)}.periodical-index h2 a:hover{text-decoration:underline;color:var(--link)}.periodical-index tbody tr:hover{background:var(--button-hover-bg)}.periodical-index .periodical-index-actions{width:5.5rem;padding-left:.25rem;padding-right:.25rem}.periodical-index-actions nav{flex-wrap:nowrap;gap:.3rem;justify-content:flex-end}.periodical-index-actions button{padding:.1rem .25rem}.periodical-calendar-panel{min-width:0}.periodical-calendar-panel .periodical-filters{margin:0 0 .65rem;gap:.5rem;font-size:.8rem}.periodical-calendar-panel .periodical-filters label:first-child{display:flex;align-items:center;justify-content:space-between;width:100%;gap:.4rem}.periodical-calendar-panel .periodical-filters input[type=month]{min-width:0;max-width:11rem;padding:.3rem}.periodical-calendar-panel .periodical-filters button{padding:.25rem .55rem}@media(max-width:500px){.periodical-index th:first-child,.periodical-index-date{width:6rem;font-size:.75rem}.periodical-index th,.periodical-index td{padding:.4rem .25rem}.periodical-index h2{font-size:.85rem}.periodical-index .periodical-index-actions{width:4.7rem}.periodical-index-actions nav{gap:.15rem}} +.periodical-compose-page{max-width:60rem;margin:auto}.periodical-compose-page fieldset{border:0;padding:0;min-width:0}.periodical-compose-page label{display:grid;gap:.4rem;margin:.8rem 0}.periodical-compose-page input,.periodical-compose-page textarea{width:100%;box-sizing:border-box;padding:.5rem;background:var(--bg);color:var(--fg);border:1px solid var(--border);font:inherit}.periodical-compose-page textarea{resize:vertical}.periodical-compose-meta{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:1rem}@media(max-width:650px){.periodical-compose-meta{grid-template-columns:1fr;gap:0}} +.periodical-site-title{font-size:1.25rem;font-weight:600}.periodical-full-article h1{overflow-wrap:anywhere}.periodical-body{overflow-wrap:anywhere;line-height:1.8}.periodical-body img{max-width:100%;height:auto}.periodical-body pre{overflow:auto;max-width:100%}.periodical-body table{display:block;max-width:100%;overflow:auto}.periodical-recent time{margin-right:.4rem}.periodical-shell .topbar{justify-content:space-between} +.periodical-shell dialog[data-periodical-composer]{width:min(48rem,calc(100vw - 2rem));max-height:90vh;overflow:auto}.periodical-shell dialog fieldset{min-width:0;border:0;padding:0}.periodical-shell dialog textarea{width:100%;box-sizing:border-box;resize:vertical;background:var(--bg);color:var(--fg);font:inherit;padding:.5rem;border:1px solid var(--border)} +.periodical-filters input[type=month]{color:var(--fg);background:var(--input-bg,var(--bg));border:1px solid var(--border)} +.periodical-filters input[type=month]::-webkit-calendar-picker-indicator{background-color:#e8e8e8;border-radius:2px;opacity:.75} +.periodical-month-controls{display:flex;align-items:center;gap:.3rem;width:100%;min-width:0} +.periodical-calendar-panel .periodical-month-controls input[type=month]{flex:1;width:0;min-width:0;max-width:none;height:2rem;box-sizing:border-box;font:inherit} +.periodical-calendar-panel .periodical-filter-icon{display:inline-flex;align-items:center;justify-content:center;flex:0 0 2rem;width:2rem;height:2rem;box-sizing:border-box;padding:0;border:1px solid transparent;border-radius:.25rem;background:transparent;color:var(--muted);text-decoration:none;cursor:pointer} +.periodical-calendar-panel .periodical-filter-icon:hover{background:var(--button-hover-bg);color:var(--fg);border-color:var(--border)} +.periodical-filter-icon svg{display:block;pointer-events:none} +.periodical-editor-actions{display:flex;align-items:center;gap:.35rem;margin-left:auto}.periodical-editor-actions button{min-width:2.2rem;min-height:2rem;padding:.25rem .45rem}.periodical-compose-page .editor-grid{margin:.5rem 0 1rem}.periodical-compose-page .editor-pane{min-width:0}.periodical-compose-page .cm-editor{min-height:25rem;border:1px solid var(--border)}.periodical-compose-page .preview{min-height:25rem}.periodical-compose-page .editor-statusbar{display:flex;justify-content:space-between;gap:.6rem;padding:.25rem .45rem;font-size:.75rem;color:var(--muted);border:1px solid var(--border);border-top:0} diff --git a/static/css/public-navigation.css b/static/css/public-navigation.css new file mode 100644 index 0000000..c7f6322 --- /dev/null +++ b/static/css/public-navigation.css @@ -0,0 +1,45 @@ +.public-document {max-width:80rem;margin:0 auto;padding:1rem;min-width:0} +.public-document [hidden] {display:none!important} +.public-topbar,.public-location,.public-heading {display:flex;align-items:center;justify-content:space-between;gap:.75rem;flex-wrap:wrap} +.public-topbar {border-bottom:1px solid var(--border);padding:.5rem 0 .8rem;margin-bottom:.6rem} +.public-topbar nav,.public-scope-links,.public-breadcrumbs {display:flex;align-items:center;gap:.7rem;flex-wrap:wrap;min-width:0} +.public-topbar a,.public-location a {text-decoration:none} +.public-topbar a:hover,.public-location a:hover {text-decoration:underline} +.public-brand {font-weight:700;overflow-wrap:anywhere} +.public-location {margin-bottom:1.2rem;font-size:.9rem} +.public-breadcrumbs a {overflow-wrap:anywhere} +.public-breadcrumbs a+a:before {content:'›';color:var(--muted);margin-right:.7rem} +.public-heading h1 {font-size:1.35rem;margin:.4rem 0} +.public-notice {color:var(--muted);font-size:.85rem;margin:.3rem 0 1rem} +.public-skip {position:absolute;left:-9999px} +.public-skip:focus {left:1rem;top:1rem;background:var(--bg);padding:.6rem;z-index:1000} +.public-document :focus-visible {outline:2px solid var(--accent,var(--link));outline-offset:3px} +.public-tree-tools {display:flex;align-items:center;gap:.5rem;flex-wrap:wrap;margin:.7rem 0} +.public-tree-tools label {display:flex;align-items:center;gap:.5rem} +.public-tree-tools input {max-width:100%;min-width:0} +.public-tree {display:flex;flex-direction:column} +.public-tree-row {display:flex;gap:.4rem;align-items:center;min-height:2rem;padding:.15rem .3rem .15rem calc(min(var(--depth),16)*1rem);border-bottom:1px solid var(--border-soft)} +.public-tree-row:hover {background:var(--button-hover-bg)} +.public-tree-row button,.public-tree-spacer {width:1.6rem;flex-shrink:0;padding:0;text-align:center} +.public-tree-name {overflow-wrap:anywhere;min-width:0} +.public-tree-name {text-decoration:none} +.public-tree-name:hover {text-decoration:underline} +.public-tree-folder {margin-left:auto;padding:.2rem .5rem;text-decoration:none} +.public-children-list,.public-children-details,.public-children-icons {list-style:none;padding:0;margin:.5rem 0} +.public-children-list li,.public-children-details li,.public-children-icons li {display:flex;gap:.5rem;align-items:center;min-width:0;padding:.5rem;border-bottom:1px solid var(--border-soft)} +.public-child-link {display:flex;align-items:center;gap:.5rem;min-width:0;overflow-wrap:anywhere;text-decoration:none} +.public-child-link:hover {text-decoration:underline} +.public-child-folder {margin-left:auto;padding:.2rem .5rem;text-decoration:none;flex-shrink:0} +.public-children-details small {color:var(--muted);overflow-wrap:anywhere;margin-left:auto;font-size:.8rem} +.public-children-icons {display:grid;grid-template-columns:repeat(auto-fill,minmax(10rem,1fr));gap:.5rem} +.public-children-icons li {border:1px solid var(--border);border-radius:.4rem;position:relative;align-items:stretch} +.public-children-icons .public-child-link {flex:1;flex-direction:column;align-items:center;text-align:center;padding:.6rem .2rem} +.public-children-icons .public-child-link>span:first-child {font-size:2rem} +.public-children-icons .public-child-folder {position:absolute;right:.15rem;top:.15rem} +.public-children-views {display:flex;gap:.35rem;margin:.5rem 0} +.public-tree-tools button {padding:.25rem .55rem} +.public-children-views button {display:grid;place-items:center;width:1.75rem;height:1.75rem;padding:0;border:1px solid var(--border-soft);border-radius:.3rem;background:transparent;color:var(--muted);cursor:pointer} +.public-children-views button:hover,.public-children-views button[aria-pressed=true] {border-color:var(--link);color:var(--link)} +.public-document .children-next {min-height:2rem} +@media(max-width:600px) {.public-document{padding:.6rem}.public-topbar nav{gap:.5rem;font-size:.85rem}.public-children-details li{flex-wrap:wrap}.public-children-details small{width:100%;margin-left:1.5rem}.public-tree-row{padding-left:calc(min(var(--depth),8)*.7rem)}.public-tree-tools label{width:100%}.public-tree-tools input{flex:1;width:8rem}} +@media(max-width:600px) {.public-topbar .public-nav-label{display:none}.public-topbar nav a{display:inline-flex;align-items:center;justify-content:center;min-width:2rem;min-height:2rem;font-size:1.25rem}} diff --git a/static/css/revisions.css b/static/css/revisions.css index 7037216..f449564 100644 --- a/static/css/revisions.css +++ b/static/css/revisions.css @@ -6,6 +6,13 @@ line-height: 1.0; } +.revision-pagination { + display: flex; + justify-content: flex-end; + gap: 1.5rem; + padding-block: 1rem; +} + .diff-view div { margin: 0; padding: 0; diff --git a/static/css/search.css b/static/css/search.css new file mode 100644 index 0000000..9eff5c5 --- /dev/null +++ b/static/css/search.css @@ -0,0 +1,65 @@ +.mode-search .search-main{max-width:1200px;padding-top:1.1rem} +.mode-search .topbar-search{display:flex;align-items:center;gap:.4rem;flex:1;max-width:46rem;margin:0}.mode-search .topbar-search input{flex:1;min-width:0;width:auto;margin:0}.mode-search .topbar-search button{flex-shrink:0;margin:0;line-height:1;display:grid;place-items:center;padding:.55rem}.mode-search .topbar-search button svg{width:1rem;height:1rem;fill:none;stroke:currentColor;stroke-width:1.8} +.mode-search .breadcrumb-bar{gap:1rem;margin-bottom:.4rem} +.mode-search .breadcrumb-bar h1{font-size:1.2rem;margin:0} +.mode-search .search-scope,.mode-search .search-help{margin:.3rem 0;font-size:.8rem;color:var(--fg-muted,var(--muted,var(--fg)));overflow-wrap:anywhere} +.mode-search .search-help{opacity:.7;margin-bottom:1rem} +.mode-search .search-options{margin:.6rem 0 1rem;border:1px solid var(--border-soft,var(--border));border-radius:.4rem;background:color-mix(in srgb,var(--fg) 2%,transparent)} +.mode-search .search-options>summary{display:flex;align-items:center;gap:.45rem;padding:.55rem .7rem;font-size:.82rem;cursor:pointer;list-style:none} +.mode-search .search-options>summary::-webkit-details-marker{display:none} +.mode-search .search-options>summary::after{content:"⌄";margin-inline-start:auto;transition:transform .15s} +.mode-search .search-options[open]>summary::after{transform:rotate(180deg)} +.mode-search .search-options>summary svg,.mode-search .search-city-results h2 svg{width:1rem;height:1rem;flex-shrink:0;fill:none;stroke:currentColor;stroke-width:1.7;stroke-linecap:round;stroke-linejoin:round} +.mode-search .search-options-active{font-size:.68rem;padding:.05rem .4rem;border-radius:1rem;background:color-mix(in srgb,var(--accent,var(--link)) 15%,transparent);color:var(--fg)} +.mode-search .search-filter-grid{display:grid;grid-template-columns:minmax(8rem,1.15fr) minmax(8rem,1.1fr) minmax(7rem,.85fr) repeat(2,minmax(8.5rem,1fr));gap:.6rem .7rem;padding:.2rem .7rem .7rem;min-width:0} +.mode-search .search-filter-field{display:flex;flex-direction:column;gap:.25rem;font-size:.75rem;min-width:0;margin:0} +.mode-search .search-filter-field input,.mode-search .search-filter-field select{box-sizing:border-box;width:100%;min-width:0;min-height:2rem;padding:.35rem .45rem;margin:0;border:1px solid var(--input-border,var(--border));border-radius:.3rem;background:var(--input-bg,var(--bg));color:var(--input-fg,var(--fg));font:inherit} +.mode-search .search-filter-field input[type="date"]{max-width:100%} +.mode-search .search-filter-field small,.mode-search .search-filter-footer small,.mode-search .search-city-filter-hint{font-size:.7rem;line-height:1.4;color:var(--fg-muted,var(--muted,var(--fg)));overflow-wrap:anywhere} +.mode-search .search-filter-footer{grid-column:1/-1;display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap;gap:.5rem} +.mode-search .search-filter-actions{display:flex;align-items:center;gap:.8rem;font-size:.78rem;margin-inline-start:auto} +.mode-search .search-filter-actions button{margin:0;padding:.35rem .65rem;font-size:.78rem;min-height:2rem} +.mode-search .search-city-filter-hint{grid-column:1/-1;margin:0} +.mode-search .search-options summary:focus-visible,.mode-search .search-filter-grid :is(input,select,button,a):focus-visible,.mode-search .search-city-result a:focus-visible{outline:2px solid var(--accent,var(--link));outline-offset:3px} +.mode-search .search-city-results{margin:.9rem 0 1.1rem;padding:.7rem .85rem;border:1px solid var(--border-soft,var(--border));border-inline-start:3px solid color-mix(in srgb,var(--accent,var(--link)) 65%,var(--border));border-radius:.4rem;background:color-mix(in srgb,var(--accent,var(--link)) 3%,var(--bg))} +.mode-search .search-city-results h2,.mode-search .search-pages-heading{display:flex;align-items:center;gap:.45rem;margin:0 0 .4rem;font-size:.9rem;font-weight:600} +.mode-search .search-city-list{list-style:none;margin:0;padding:0} +.mode-search .search-city-result{position:relative;padding:.55rem 0;line-height:1.45} +.mode-search .search-city-result+.search-city-result{border-top:1px solid var(--border-soft,var(--border))} +.mode-search .search-city-title{display:flex;align-items:baseline;gap:.45rem;min-width:0} +.mode-search .search-city-title .search-result-name{font-size:.95rem} +.mode-search .search-city-kind{flex-shrink:0;font-size:.65rem;line-height:1.5;padding:.04rem .38rem;border:1px solid color-mix(in srgb,var(--accent,var(--link)) 35%,var(--border));border-radius:.25rem;color:var(--fg)} +.mode-search .search-city-location{display:flex;align-items:baseline;flex-wrap:wrap;gap:.2rem .65rem;margin-top:.1rem} +.mode-search .search-city-parent,.mode-search .search-city-updated{font-size:.7rem;color:var(--fg-muted,var(--muted,var(--fg)));overflow-wrap:anywhere} +.mode-search .search-city-parent::before{content:"·";margin-inline-end:.65rem} +.mode-search .search-city-updated{display:block;margin-top:.25rem} +.mode-search .search-city-result .search-result-excerpt{font-size:.8rem;margin-top:.2rem} +.mode-search .search-city-result .search-match-sources:empty{display:none} +.mode-search .search-limit{border-inline-start:3px solid var(--accent,var(--link));padding:.4rem .7rem;font-size:.85rem} +.mode-search .search-view-list{list-style:none;margin:0;padding:0} +.mode-search .search-view-list .search-result{display:block;padding:.65rem .25rem;border-bottom:1px solid var(--border-soft,var(--border));line-height:1.45} +.mode-search .search-result-name{display:block;font-size:1rem;font-weight:600;text-decoration:none;overflow-wrap:anywhere} +.mode-search .search-result-path{display:block;font-family:var(--font-mono,monospace);font-size:.77rem;font-weight:400;line-height:1.5;overflow-wrap:anywhere;text-decoration:none;opacity:.82} +.mode-search .search-result-name:hover,.mode-search a.search-result-path:hover{text-decoration:underline} +.mode-search .search-match-sources{display:flex;gap:.3rem;flex-wrap:wrap;margin-top:.3rem} +.mode-search .search-match-sources>span{font-size:.66rem;line-height:1.5;padding:.05rem .38rem;border-radius:.25rem;background:color-mix(in srgb,var(--fg) 7%,transparent);color:var(--fg);white-space:nowrap} +.mode-search .search-result-excerpt{display:block;font-size:.84rem;line-height:1.55;margin-top:.3rem;color:var(--fg);overflow-wrap:anywhere} +.mode-search .search-excerpt-omitted{display:block;font-size:.75rem;line-height:1.5;margin-top:.3rem;color:var(--fg-muted,var(--muted,var(--fg)));opacity:.8;overflow-wrap:anywhere} +.mode-search mark{background:color-mix(in srgb,var(--accent,var(--link)) 25%,transparent);color:inherit;font-weight:650;border-radius:.12rem;padding:0 .04em;box-decoration-break:clone} +.mode-search .search-view-icon{grid-template-columns:repeat(auto-fill,minmax(230px,1fr));gap:.8rem} +.mode-search .search-view-icon .search-result{align-items:stretch;text-align:left;padding:.8rem;min-width:0} +.mode-search .search-view-icon .children-preview{align-self:center;margin-bottom:.5rem} +.mode-search .search-view-icon .search-result-name{font-size:.9rem;white-space:normal;overflow:visible} +.mode-search .search-view-icon .search-result-excerpt{font-size:.77rem;line-height:1.45;display:-webkit-box;-webkit-line-clamp:4;-webkit-box-orient:vertical;overflow:hidden} +.mode-search .search-view-detail{width:100%;table-layout:fixed;font-size:.8rem;border-collapse:collapse} +.mode-search .search-view-detail th,.mode-search .search-view-detail td{padding:.55rem .6rem;text-align:left;vertical-align:top;border-bottom:1px solid var(--border-soft,var(--border))} +.mode-search .search-view-detail th:first-child{width:32%}.mode-search .search-view-detail th:nth-child(2){width:40%}.mode-search .search-view-detail th:nth-child(3){width:14%} +.mode-search .search-view-detail .search-result-name{font-size:.88rem}.mode-search .search-view-detail .search-result-excerpt{font-size:.78rem} +.mode-search .search-result-type,.mode-search .search-result-updated{font-size:.72rem;overflow-wrap:anywhere} +.mode-search .search-empty{padding:2rem 0;opacity:.75} +.mode-search .search-error{margin:1rem 0;padding:1rem;border:1px solid var(--border-soft,var(--border));border-inline-start:3px solid var(--accent,var(--link));border-radius:.35rem;background:color-mix(in srgb,var(--fg) 3%,transparent)} +.mode-search .search-error h2{margin:0;font-size:1rem}.mode-search .search-error p{margin:.6rem 0;font-size:.85rem;line-height:1.6;color:var(--fg-muted,var(--muted,var(--fg)))} +.mode-search .search-retry{display:inline-flex;align-items:center;gap:.4rem;font-size:.85rem;text-decoration:none}.mode-search .search-retry:hover{text-decoration:underline}.mode-search .search-retry svg{width:1rem;height:1rem;fill:none;stroke:currentColor;stroke-width:1.8;stroke-linecap:round;stroke-linejoin:round} +@media(max-width:700px){.mode-search .search-main{padding-inline:.8rem}.mode-search .search-view-detail th:nth-child(n+3),.mode-search .search-view-detail td:nth-child(n+3){display:none}.mode-search .search-view-detail th:first-child{width:42%}.mode-search .search-view-detail th:nth-child(2){width:auto}.mode-search .search-view-icon{grid-template-columns:repeat(auto-fill,minmax(170px,1fr))}.mode-search .topbar-search{min-width:0}.mode-search .topbar-search input{min-width:0;width:100%}} +@media(max-width:850px){.mode-search .search-filter-grid{grid-template-columns:repeat(3,minmax(0,1fr))}} +@media(max-width:520px){.mode-search .search-filter-grid{grid-template-columns:repeat(2,minmax(0,1fr))}.mode-search .search-city-results{padding:.6rem}.mode-search .search-city-title{align-items:flex-start}.mode-search .search-city-parent{flex-basis:100%}.mode-search .search-city-parent::before{content:none}.mode-search .search-city-result .search-result-path{font-size:.72rem}.mode-search .search-filter-footer small{flex-basis:100%}} diff --git a/static/css/tasks.css b/static/css/tasks.css new file mode 100644 index 0000000..fa76afb --- /dev/null +++ b/static/css/tasks.css @@ -0,0 +1,101 @@ +#tasks-app{max-width:1380px;margin:0 auto;padding:1.2rem;display:grid;grid-template-columns:12rem minmax(0,1fr);gap:2rem;color:var(--fg)} +#task-schedule{padding:1rem;max-width:1600px;margin:auto}.task-schedule-scroll{overflow:auto;max-height:80dvh}.task-schedule-grid{min-width:1000px}.task-schedule-row{display:grid;grid-template-columns:16rem repeat(var(--days),minmax(1.6rem,1fr));align-items:center;min-height:2.4rem;border-bottom:1px solid var(--border);gap:1px}.task-schedule-row>a:first-child{position:sticky;left:0;background:var(--bg);color:var(--accent);z-index:1;padding:.4rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.task-schedule-row>span{text-align:center;font-size:.8rem}.task-schedule-bar{background:color-mix(in srgb,var(--accent) 25%,var(--bg));border:1px solid var(--accent);border-radius:.4rem;padding:.3rem;color:var(--fg);white-space:nowrap;overflow:hidden;font-size:.7rem}.task-schedule-bar[data-status=done]{opacity:.5}.task-schedule-row:first-child{position:sticky;top:0;background:var(--bg);z-index:2} +.task-day-cards{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:.6rem}.task-day-cards>div{display:flex;flex-direction:column;gap:.25rem;padding:.6rem .8rem;border:1px solid var(--border,#8885);border-radius:.6rem}.task-day-cards small{font-size:.8rem;opacity:.8}.task-day-cards strong{font-variant-numeric:tabular-nums;font-size:1.2rem}#tasks-day-blocks{list-style:none;padding:0;margin:.5rem 0}#tasks-day-blocks li{display:grid;grid-template-columns:minmax(12rem,auto) minmax(0,1fr);gap:.6rem;padding:.4rem 0;border-bottom:1px solid var(--border,#8885)}#tasks-day-blocks a{color:var(--accent);overflow-wrap:anywhere}#tasks-day>p{font-size:.8rem}#tasks-day summary{cursor:pointer;font-size:.9rem}@media(max-width:520px){.task-day-cards{gap:.35rem}.task-day-cards>div{padding:.5rem}.task-day-cards strong{font-size:1rem}#tasks-day-blocks li{grid-template-columns:1fr;gap:.2rem}} +#tasks-focus>small:empty{display:none} +#tasks-focus{display:flex;align-items:center;gap:.5rem;flex-wrap:wrap;border:1px solid var(--border,#8885);border-radius:.65rem;padding:.7rem;margin-bottom:1rem}#tasks-focus-clock{font-variant-numeric:tabular-nums;font-size:1.35rem;min-width:4.5rem}#tasks-focus input{width:5rem}#tasks-focus>small{flex-basis:100%;min-height:1em;overflow-wrap:anywhere}#tasks-focus>a{color:var(--accent)}#tasks-focus[data-state=running]{border-color:var(--accent)}#tasks-focus-state{font-size:.8rem;opacity:.8} +#tasks-plan-dialog{box-sizing:border-box;width:min(720px,96vw);max-height:92dvh;overflow:auto;color:var(--fg);background:var(--bg)!important;border:1px solid var(--border,#8885);border-radius:1rem;padding:1.2rem;box-shadow:0 1rem 4rem #0005} +#tasks-plan-dialog::backdrop{background:#0007;backdrop-filter:blur(3px)} +#tasks-plan-dialog form{display:grid;gap:.7rem;margin:1rem 0}#tasks-plan-dialog form>button{justify-self:end}.task-plan-fields{display:grid;grid-template-columns:1fr 1fr;gap:.7rem}.task-plan-fields label{display:flex;flex-direction:column;gap:.3rem;min-width:0}.task-plan-fields label:first-child{grid-column:1/-1}.task-plan-fields input,.task-plan-fields select{width:100%;min-width:0}.task-plan-row{display:flex;align-items:center;gap:.6rem;flex-wrap:wrap;border-top:1px solid var(--border,#8885);padding:.6rem 0}.task-plan-row>a,.task-plan-row>span{flex:1;min-width:12rem;color:var(--accent);overflow-wrap:anywhere}#tasks-plan-dialog h2{font-size:1.2rem}#tasks-plan-dialog [role=status]{font-size:.9rem} +@media(max-width:760px){#tasks-plan-dialog{width:100%;max-width:none;height:100dvh;max-height:100dvh;margin:0;border-radius:0;padding:1rem}.task-plan-fields{grid-template-columns:minmax(0,1fr)}.task-plan-row .tasks-actions{width:100%;justify-content:flex-end}} +#tasks-fields .task-full{grid-column:1/-1}#tasks-fields label.task-toggle{flex-direction:row-reverse;align-items:center;justify-content:flex-end;gap:.6rem}#tasks-fields label.task-toggle input{width:1.2rem;height:1.2rem;accent-color:var(--accent)} +body:has(#tasks-app)>.topbar{min-width:0}#tasks-app{box-sizing:border-box} +#tasks-dialog{background:var(--bg)!important}#tasks-form{display:flex;flex-direction:column;max-height:calc(92dvh - 3rem)}#tasks-fields{overflow:auto;min-height:0;padding:.25rem .2rem}.tasks-toolbar,#tasks-form>footer,#tasks-history,#tasks-error{flex-shrink:0} +#tasks-nav{display:flex;flex-direction:column;gap:.25rem;padding-top:.5rem} +#tasks-nav a{display:flex;gap:.6rem;align-items:center;padding:.55rem .75rem;color:var(--fg);text-decoration:none;border-radius:.5rem} +#tasks-nav a[aria-current=page],#tasks-nav a:hover{background:color-mix(in srgb,var(--accent,#6598bf) 17%,transparent)} +.tasks-workspace{min-width:0}.tasks-toolbar{display:flex;align-items:center;justify-content:space-between;gap:1rem}.tasks-toolbar h1,.tasks-toolbar h2{margin:.25rem 0;font-size:1.5rem}.tasks-actions{display:flex;align-items:center;gap:.5rem;flex-wrap:wrap} +.tasks-muted,#tasks-date,.task-row-meta{color:var(--muted,var(--fg));opacity:.75;font-size:.85rem} +#tasks-app input,#tasks-app select,#tasks-app textarea{box-sizing:border-box;color:var(--fg);background:var(--bg);border:1px solid var(--border,#8885);border-radius:.4rem;font:inherit;padding:.55rem;min-width:0} +#tasks-app button{font:inherit;color:var(--fg);border:1px solid var(--border,#8885);background:var(--panel,var(--bg));border-radius:.45rem;padding:.5rem .7rem;cursor:pointer}#tasks-app button:hover{border-color:var(--accent)}#tasks-app :focus-visible{outline:2px solid var(--accent);outline-offset:2px}#tasks-app button:disabled{opacity:.5;cursor:default} +#tasks-capture{display:flex;gap:.5rem;margin:1rem 0}#tasks-quick-title{flex:1}.tasks-search{display:flex;align-items:center;gap:.6rem;margin:1rem 0}.tasks-search input{flex:1}#tasks-status:empty{display:none} +#tasks-list{border-top:1px solid var(--border,#8885)}.task-row{display:flex;align-items:center;gap:.8rem;padding:.6rem .2rem;border-bottom:1px solid var(--border,#8885);content-visibility:auto;contain-intrinsic-size:auto 62px}.task-row-main{min-width:0;flex:1;display:flex;flex-direction:column;gap:.2rem}.task-row-main>a{color:var(--fg);text-decoration:none;overflow-wrap:anywhere}.task-row-main>a:hover{color:var(--accent)}.task-row[data-done=true] .task-row-main>a{text-decoration:line-through;opacity:.65}.task-row-meta{display:flex;gap:.7rem;flex-wrap:wrap}.task-row-meta .task-overdue{color:var(--danger,#da6161);opacity:1}#tasks-more{margin:1rem 0;width:100%} +#tasks-dialog{box-sizing:border-box;color:var(--fg);background:var(--panel,var(--bg));border:1px solid var(--border,#8885);border-radius:1rem;width:min(680px,95vw);max-height:92dvh;padding:1.5rem;box-shadow:0 1rem 4rem #0005;overflow:auto}#tasks-dialog::backdrop{background:#0007;backdrop-filter:blur(3px)}#tasks-fields{display:grid;grid-template-columns:1fr 1fr;gap:.8rem;margin:1rem 0}#tasks-fields label{display:flex;flex-direction:column;gap:.3rem;font-size:.9rem}#tasks-fields label.task-full{grid-column:1/-1}#tasks-fields input,#tasks-fields select,#tasks-fields textarea{width:100%}#tasks-fields textarea{min-height:7rem;resize:vertical}#tasks-fields a{overflow-wrap:anywhere;color:var(--accent)}#tasks-form footer{justify-content:flex-end;margin-top:1rem}#tasks-error{color:var(--danger,#d55)}#tasks-history{font-size:.8rem}#tasks-app [hidden]{display:none!important} +@media(max-width:760px){#tasks-app{display:block;padding:.75rem}#tasks-nav{flex-direction:row;overflow:auto;padding:0 0 .7rem;gap:.1rem;white-space:nowrap}#tasks-nav a{padding:.5rem}.tasks-toolbar h1{font-size:1.3rem}#tasks-dialog{width:100%;height:100dvh;max-height:100dvh;margin:0;border-radius:0;padding:1rem}#tasks-fields{gap:.7rem}.task-row{gap:.5rem}} +@media(max-width:760px){body:has(#tasks-app)>.topbar{flex-wrap:wrap;padding:.65rem;gap:.5rem}body:has(#tasks-app)>.topbar>.brand{flex:1;min-width:0}body:has(#tasks-app)>.topbar>.brand>a{display:block;overflow:hidden;text-overflow:ellipsis}body:has(#tasks-app)>.topbar>nav{order:2;width:100%}body:has(#tasks-app)>.topbar>.city-map-launch{margin-inline:0;flex-shrink:0}#tasks-fields{grid-template-columns:minmax(0,1fr) minmax(0,1fr)}} +@media(max-width:760px){#tasks-dialog{max-width:none}#tasks-form{max-height:calc(100dvh - 2rem);height:100%}#tasks-fields{flex:1}#tasks-form>footer{margin-top:.5rem}} + +/* Inline tasks: shared columns on desktop, labelled touch controls on mobile. */ +.tasks-list-scroll{min-width:0} +.task-inline-header{display:none} +.task-inline-row{position:relative;min-width:0;border-bottom:1px solid var(--border,#8885)} +.task-inline-row label{min-width:0;margin:0} +.task-inline-row label>span{font-size:.75rem;color:var(--muted,var(--fg))} +#tasks-app .task-inline-row input,#tasks-app .task-inline-row select{width:100%;min-width:0;margin:0} +.task-inline-row .tasks-actions{margin:0} +.task-inline-row [data-action=detail]{display:inline-flex;align-items:center;justify-content:center;box-sizing:border-box;color:var(--fg);text-decoration:none;border:1px solid transparent;border-radius:.3rem} +.task-inline-row [data-action=detail]:hover{border-color:var(--accent)} +.task-inline-estimate{white-space:nowrap;font-size:.7rem;color:var(--muted,var(--fg));font-variant-numeric:tabular-nums} +.task-inline-status{display:block;font-size:.8rem;overflow-wrap:anywhere;color:var(--danger,#d55)} +.task-inline-status:empty{display:none} +.task-inline-status[data-state=saved],.task-inline-status[data-state=saving]{position:absolute;width:1px;height:1px;overflow:hidden;clip-path:inset(50%);white-space:nowrap} +.task-inline-row[aria-busy=true]>.task-inline-main [data-action=complete]{color:var(--accent)} +.task-inline-row input[type=date]::-webkit-calendar-picker-indicator,.task-date-nav input[type=date]::-webkit-calendar-picker-indicator{background-color:#e8e8e8;border-radius:2px;opacity:.75} +.task-inline-row[data-done=true]>.task-inline-main input[name=title]{text-decoration:line-through;opacity:.7} +.task-child-capture{display:flex;min-width:0;gap:.25rem} +.task-inline-row>a{color:var(--accent);font-size:.75rem} +.task-inline-title{position:relative} +.task-context-badge{position:absolute;right:.3rem;bottom:.65rem;font-size:.65rem;color:var(--muted,var(--fg));pointer-events:none} +#tasks-app .task-inline-row[data-context=true]>.task-inline-main input[name=title]{padding-right:2.5rem} +.task-date-nav,.task-date-nav>label{display:flex;align-items:center;gap:.35rem;flex-wrap:wrap} +.task-date-nav{margin:.5rem 0} +#tasks-app .task-date-nav input{width:auto;max-width:100%;font-size:16px;min-height:44px} +#tasks-app .task-date-nav button{min-width:44px;min-height:44px} + +@media(min-width:1024px){ + #tasks-app{max-width:none;padding:1rem;grid-template-columns:10rem minmax(0,1fr);gap:1rem} + .tasks-list-scroll{overflow-x:auto;overscroll-behavior-x:contain} + .tasks-list-scroll:has(.task-inline-row){--task-columns:2rem minmax(12rem,1fr) 5.5rem repeat(5,7rem) 18rem} + .tasks-list-scroll:has(.task-inline-row)>.task-inline-header{display:grid} + .task-inline-header,.task-inline-row{display:grid;grid-template-columns:var(--task-columns);align-items:center;min-width:72.5rem;gap:0;padding:0;margin:0} + .task-inline-header{min-height:1.8rem;background:var(--panel,var(--bg));font-size:.75rem;color:var(--muted,var(--fg))} + .task-inline-header>span{padding:0 .3rem;white-space:nowrap} + .task-inline-row>.task-inline-main,.task-inline-row>.task-inline-dates{display:contents} + .task-inline-row>.task-inline-main>label,.task-inline-row>.task-inline-dates>label{display:block} + .task-inline-row label>span{position:absolute;width:1px;height:1px;overflow:hidden;clip-path:inset(50%);white-space:nowrap} + #tasks-app .task-inline-row input,#tasks-app .task-inline-row select{height:2.1rem;padding:0 .25rem;font-size:.8rem;border:1px solid transparent;border-radius:0;background:transparent;line-height:normal} + #tasks-app .task-inline-row input:hover,#tasks-app .task-inline-row select:hover{background:color-mix(in srgb,var(--accent) 6%,transparent)} + #tasks-app .task-inline-row input:focus,#tasks-app .task-inline-row select:focus{border-color:var(--accent);background:var(--bg);outline-offset:-2px} + #tasks-app .task-inline-row button,.task-inline-row [data-action=detail]{flex:none;width:1.75rem;height:1.75rem;padding:0;font-size:1rem;border-color:transparent;background:transparent} + #tasks-app .task-inline-row button:hover{border-color:var(--accent)} + .task-inline-row>.tasks-actions{grid-column:9;flex-wrap:nowrap;justify-content:flex-end;gap:0} + .task-inline-estimate{margin-right:auto} + .task-inline-estimate{max-width:2.25rem;overflow:hidden;text-overflow:ellipsis;flex-shrink:0} + .task-inline-row>.task-inline-status{grid-column:2/-1} + .task-inline-row>.task-inline-status[data-state=error]{padding:.25rem} + .task-inline-row>.task-inline-children,.task-inline-row>.task-child-capture{grid-column:1/-1;margin:0} + .task-inline-children{border-top:1px solid var(--border,#8885)} + .task-inline-children>.task-inline-row:last-child{border-bottom:0} + .task-inline-row>.task-child-capture{padding-left:2rem;border-top:1px solid var(--border,#8885)} + .task-inline-row>a{position:absolute;top:.5rem;left:2.1rem;z-index:1} + #tasks-app .task-is-child>.task-inline-main input[name=title]{padding-left:1.3rem} + #tasks-app .task-inline-row .task-children-more{width:auto;padding:0 .5rem;font-size:.8rem} +} +@media(max-width:1023px){ + .task-inline-row{padding:.75rem 0} + .task-inline-main{display:grid;grid-template-columns:2.75rem minmax(0,1fr);align-items:end;gap:.35rem} + .task-inline-main>label:last-child{grid-column:2} + .task-inline-row label{display:grid;gap:.2rem} + .task-inline-dates{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:.5rem;margin:.5rem 0} + #tasks-app .task-inline-row input,#tasks-app .task-inline-row select{height:2.75rem;font-size:16px;padding:.4rem;max-width:100%} + #tasks-app .task-inline-row button,.task-inline-row [data-action=detail]{min-width:2.75rem;min-height:2.75rem;padding:.4rem;font-size:1.1rem} + .task-inline-row>.tasks-actions{gap:.25rem;justify-content:flex-end;flex-wrap:wrap} + .task-inline-estimate{margin-right:auto} + .task-inline-children{border-left:2px solid var(--border,#8885);padding-left:.5rem;margin-top:.5rem} + .task-inline-row>a{display:inline-flex;align-items:center;min-height:2.75rem;gap:.3rem} + .task-inline-row>a::after{content:attr(aria-label)} + .task-child-capture{margin-top:.5rem} +} +#tasks-dav-dialog{box-sizing:border-box;width:min(760px,96vw);max-height:92dvh;overflow:auto;color:var(--fg);background:var(--bg)!important;border:1px solid var(--border,#8885);border-radius:1rem;padding:1rem;box-shadow:0 1rem 4rem #0005} +#tasks-dav-dialog::backdrop{background:#0007;backdrop-filter:blur(3px)} +#tasks-dav-dialog h2{font-size:1.2rem}#tasks-dav-dialog p{font-size:.9rem}#tasks-dav-dialog form{display:flex;flex-wrap:wrap;gap:.4rem;margin:1rem 0}#tasks-dav-dialog form>input{flex:1;min-width:10rem}#tasks-dav-dialog>input,#tasks-dav-dialog section input{width:100%;box-sizing:border-box}#tasks-dav-dialog section{padding:.7rem;border:1px solid var(--accent);border-radius:.5rem}#tasks-dav-dialog section label{display:block;font-size:.85rem;margin:.3rem 0}#tasks-dav-dialog .task-dav-table{overflow:auto}#tasks-dav-dialog table{width:100%;border-collapse:collapse;font-size:.85rem}#tasks-dav-dialog th,#tasks-dav-dialog td{padding:.35rem;text-align:left;border-bottom:1px solid var(--border,#8885)}#tasks-dav-dialog td:first-child{overflow-wrap:anywhere}#tasks-dav-dialog [role=status]{color:var(--danger,#d55)} +@media(max-width:760px){#tasks-dav-dialog{width:100%;max-width:none;height:100dvh;max-height:100dvh;margin:0;border-radius:0}#tasks-dav-dialog input,#tasks-dav-dialog select,#tasks-dav-dialog button{min-height:44px;font-size:16px}} diff --git a/static/css/theme/accelerator-dark.css b/static/css/theme/accelerator-dark.css new file mode 100644 index 0000000..3521d3b --- /dev/null +++ b/static/css/theme/accelerator-dark.css @@ -0,0 +1,22 @@ +:root { + --bg: #070809; + --fg: #e7e9ec; + --muted: #858b92; + --panel: #0e1012; + --border: rgba(210, 217, 224, 0.23); + --border-soft: rgba(210, 217, 224, 0.09); + --link: #c9d0d7; + --link-hover: #ffffff; + --input-bg: #111418; + --input-fg: #f2f3f4; + --input-border: rgba(205, 213, 220, 0.28); + --button-bg: #171a1e; + --button-fg: #e8eaed; + --button-border: rgba(210, 217, 224, 0.32); + --button-hover-bg: #24282d; + --danger: #cf233f; + --accent: #bec5cc; + --row-hover: rgba(225, 231, 236, 0.08); + --code-bg: #030405; + --code-fg: #d8dde2; +} diff --git a/static/css/theme/base.css b/static/css/theme/base.css index 16587e3..a219ed7 100644 --- a/static/css/theme/base.css +++ b/static/css/theme/base.css @@ -16,6 +16,9 @@ --button-hover-bg: #222; --danger: #ff6d6d; --accent: #b077ff; + --scrollbar-track: color-mix(in srgb, var(--bg) 88%, var(--fg) 12%); + --scrollbar-thumb: color-mix(in srgb, var(--muted) 72%, var(--accent) 28%); + --scrollbar-thumb-hover: color-mix(in srgb, var(--muted) 38%, var(--accent) 62%); } html, @@ -24,6 +27,44 @@ body { color: var(--fg); } +/* Theme-aware global scrollbars. Firefox uses the standard properties; + Chromium/WebKit use the pseudo-elements below. */ +* { + scrollbar-color: var(--scrollbar-thumb) var(--scrollbar-track); + scrollbar-width: thin; +} + +*::-webkit-scrollbar { + width: 0.7rem; + height: 0.7rem; +} + +*::-webkit-scrollbar-track, +*::-webkit-scrollbar-corner { + background: var(--scrollbar-track); +} + +*::-webkit-scrollbar-thumb { + min-width: 2rem; + min-height: 2rem; + border: 2px solid var(--scrollbar-track); + border-radius: 999px; + background: var(--scrollbar-thumb); + background-clip: padding-box; +} + +*::-webkit-scrollbar-thumb:hover, +*::-webkit-scrollbar-thumb:active { + background: var(--scrollbar-thumb-hover); + background-clip: padding-box; +} + +@media (forced-colors: active) { + * { + scrollbar-color: auto; + } +} + a { color: var(--link); } @@ -162,3 +203,100 @@ body:has(.config-sidebar) .container { filter: brightness(0.92) contrast(1.08); } } +.campus-status-lamp { + display: inline-block; + width: 0.72rem; + height: 0.72rem; + margin-right: 0.35rem; + border-radius: 50%; + vertical-align: middle; + box-shadow: 0 0 0.45rem currentColor; +} + +.campus-status-lamp.online { + color: #9acd32; + background: #9acd32; +} + +.campus-status-lamp.offline { + color: #e04444; + background: #e04444; +} + +.config-form-table { + width: min(100%, 52rem); + margin: 0 0 2rem; + border-collapse: collapse; + border: 1px solid var(--border); +} + +.config-form-table th, +.config-form-table td { + padding: 0.65rem 0.8rem; + text-align: left; + vertical-align: middle; + border-bottom: 1px solid var(--border-soft); +} + +.config-form-table th { + width: 14rem; + font-weight: 500; +} + +.config-form-table input[type="text"], +.config-form-table select { + width: min(100%, 30rem); + box-sizing: border-box; +} + +.config-form-table tfoot td { + text-align: right; + border-bottom: 0; +} + +.token-status { + display: inline-block; + margin-left: 0.55rem; + padding: 0.1rem 0.42rem; + border: 1px solid currentColor; + border-radius: 999px; + font-size: 0.8em; +} + +.token-status.active { + color: #9acd32; +} + +.token-status.revoked { + color: var(--danger); +} +.topbar-search { + flex: 1 1 24rem; + max-width: 36rem; + margin: 0 1rem; +} + +.topbar-search input[name="q"] { + box-sizing: border-box; + width: 100%; + padding: .42rem .65rem; + border: 1px solid var(--border-soft); + border-radius: .35rem; + background: var(--input-bg); + color: var(--fg); +} + +.topbar-search button { + margin-left: .35rem; +} + +.search-path-results { + display: grid; + gap: .45rem; + padding-left: 1.25rem; +} + +.search-path-results small { + margin-left: .6rem; + color: var(--muted); +} diff --git a/static/css/theme/fate-t-dark.css b/static/css/theme/fate-t-dark.css new file mode 100644 index 0000000..c707f40 --- /dev/null +++ b/static/css/theme/fate-t-dark.css @@ -0,0 +1,36 @@ +:root { + --bg: #090b11; + --fg: #f7f3e9; + --muted: #aaa38e; + --panel: rgba(23, 24, 31, 0.72); + --border: rgba(245, 197, 66, 0.25); + --border-soft: rgba(245, 197, 66, 0.10); + --link: #f7cf58; + --link-hover: #fff2ae; + --input-bg: #12141c; + --input-fg: #fff9e9; + --input-border: rgba(245, 197, 66, 0.38); + --button-bg: #191b24; + --button-fg: #fff7dc; + --button-border: rgba(245, 197, 66, 0.42); + --button-hover-bg: #292733; + --danger: #e84c68; + --accent: #f5c542; + --row-hover: rgba(245, 197, 66, 0.11); + --code-bg: #07080d; + --code-fg: #ffe48a; + --scrollbar-thumb: color-mix(in srgb, #8f7c45 42%, var(--accent) 58%); + --scrollbar-thumb-hover: #f8d763; +} + +body { + background-image: + radial-gradient(circle at 78% 12%, rgba(245, 197, 66, 0.055), transparent 28rem), + linear-gradient(145deg, transparent 65%, rgba(122, 24, 48, 0.07)); + background-attachment: fixed; +} + +::selection { + background: color-mix(in srgb, var(--accent) 72%, #7a1830); + color: #080910; +} diff --git a/static/css/theme/index-dark.css b/static/css/theme/index-dark.css new file mode 100644 index 0000000..4794b9d --- /dev/null +++ b/static/css/theme/index-dark.css @@ -0,0 +1,22 @@ +:root { + --bg: #091321; + --fg: #edf7ff; + --muted: #829ab5; + --panel: #0d1b2d; + --border: rgba(80, 178, 240, 0.24); + --border-soft: rgba(80, 178, 240, 0.11); + --link: #62c7ff; + --link-hover: #c5edff; + --input-bg: #0e2035; + --input-fg: #edf7ff; + --input-border: rgba(90, 194, 255, 0.34); + --button-bg: #102942; + --button-fg: #dff4ff; + --button-border: rgba(90, 194, 255, 0.34); + --button-hover-bg: #173b5d; + --danger: #ff6682; + --accent: #35aeea; + --row-hover: rgba(66, 183, 242, 0.11); + --code-bg: #07101c; + --code-fg: #8edcff; +} diff --git a/static/css/theme/index-white.css b/static/css/theme/index-white.css new file mode 100644 index 0000000..7a62df4 --- /dev/null +++ b/static/css/theme/index-white.css @@ -0,0 +1,22 @@ +:root { + --bg: #f8fbff; + --fg: #17253d; + --muted: #687b98; + --panel: #ffffff; + --border: rgba(34, 105, 177, 0.22); + --border-soft: rgba(34, 105, 177, 0.10); + --link: #176fbd; + --link-hover: #064c91; + --input-bg: #ffffff; + --input-fg: #17253d; + --input-border: rgba(25, 112, 190, 0.32); + --button-bg: #edf6ff; + --button-fg: #135a9b; + --button-border: rgba(25, 112, 190, 0.34); + --button-hover-bg: #dceeff; + --danger: #d43f5e; + --accent: #238bd2; + --row-hover: rgba(35, 139, 210, 0.08); + --code-bg: #edf5fc; + --code-fg: #164f7d; +} diff --git a/static/css/theme/nanoha-dark.css b/static/css/theme/nanoha-dark.css index 26b30b1..830773a 100644 --- a/static/css/theme/nanoha-dark.css +++ b/static/css/theme/nanoha-dark.css @@ -1,22 +1,22 @@ :root { - --bg: #101322; - --fg: #f6eef8; - --muted: #9fa7c7; - --panel: transparent; - --border: rgba(255,255,255,0.16); - --border-soft: rgba(255,255,255,0.07); - --link: #f7b7d8; + --bg: #140d1d; + --fg: #fff0fa; + --muted: #c79ab8; + --panel: rgba(45, 18, 50, 0.34); + --border: rgba(255, 104, 180, 0.25); + --border-soft: rgba(255, 104, 180, 0.11); + --link: #ff9dce; --link-hover: #ffffff; - --input-bg: #171b31; - --input-fg: #f6eef8; - --input-border: rgba(247,183,216,0.34); - --button-bg: #1d2342; - --button-fg: #f6eef8; - --button-border: rgba(247,183,216,0.38); - --button-hover-bg: #28305a; - --danger: #ff5d8f; - --accent: #ffd86f; - --row-hover: rgba(247,183,216,0.09); - --code-bg: #171b31; - --code-fg: #aee7ff; + --input-bg: #21132b; + --input-fg: #fff0fa; + --input-border: rgba(255, 91, 173, 0.43); + --button-bg: #2a1736; + --button-fg: #fff2fa; + --button-border: rgba(255, 91, 173, 0.47); + --button-hover-bg: #472044; + --danger: #ff477e; + --accent: #ff4fa3; + --row-hover: rgba(255, 79, 163, 0.14); + --code-bg: #1b1024; + --code-fg: #ffc1df; } diff --git a/static/css/theme/railgun-dark.css b/static/css/theme/railgun-dark.css new file mode 100644 index 0000000..d81285f --- /dev/null +++ b/static/css/theme/railgun-dark.css @@ -0,0 +1,22 @@ +:root { + --bg: #11101b; + --fg: #f7f1ff; + --muted: #a49ab6; + --panel: #191629; + --border: rgba(255, 145, 58, 0.25); + --border-soft: rgba(117, 220, 224, 0.12); + --link: #ff9b49; + --link-hover: #ffd2a8; + --input-bg: #1d1930; + --input-fg: #f7f1ff; + --input-border: rgba(116, 214, 220, 0.34); + --button-bg: #28213c; + --button-fg: #ffe8d2; + --button-border: rgba(255, 139, 48, 0.38); + --button-hover-bg: #382b4e; + --danger: #ff537a; + --accent: #f6812d; + --row-hover: rgba(117, 220, 224, 0.10); + --code-bg: #0d0c16; + --code-fg: #82e1df; +} diff --git a/static/css/theme/railgun-white.css b/static/css/theme/railgun-white.css new file mode 100644 index 0000000..3e0a242 --- /dev/null +++ b/static/css/theme/railgun-white.css @@ -0,0 +1,22 @@ +:root { + --bg: #fffaf4; + --fg: #30241d; + --muted: #806d61; + --panel: #ffffff; + --border: rgba(225, 108, 28, 0.23); + --border-soft: rgba(225, 108, 28, 0.11); + --link: #d85e13; + --link-hover: #9f3900; + --input-bg: #fffefd; + --input-fg: #30241d; + --input-border: rgba(221, 99, 21, 0.34); + --button-bg: #fff0df; + --button-fg: #a94308; + --button-border: rgba(221, 99, 21, 0.38); + --button-hover-bg: #ffe2c1; + --danger: #cf334f; + --accent: #ed741f; + --row-hover: rgba(237, 116, 31, 0.09); + --code-bg: #fff1e2; + --code-fg: #8a3b0d; +} diff --git a/static/fonts/hack/HackNerdFont-Regular.ttf b/static/fonts/hack/HackNerdFont-Regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..124e362197a67aae2f6f8bb90bebdd3b23fa71e1 GIT binary patch literal 2445204 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 z%0Dpzng!Uf0`%EljbS2&|(&6`K$!X zZzWp1C0L>*S+b>As-;=FWmu+VSplnpRne+sRko^FRjsqEYF3g}-Kt^Lv}##FE7?l1 zQmxun9jmTY&#G@Vuo_xvR=Sm8HL@C8O{}x6bF8LTGwWQdxpkh^!fI)qZ?&>oTWzei zRy(V`b%B*>b+EFmj#ekDv(?4wYIU=^TRp4`t&6OSt)5mdtGCt1>TC70`db66Y%9ka zXkB6rvIbk1T0^W{E6*Bg4YTsC;noQ2GHawY${KB5ZjG_VTH~xMtnt>B)&%P+YoayD zy4t$NnrvNbU1wcyO|fpUZnSQ)rdl^!w^+AY)2!R9+pX!=3~Qz}%eupwZQW_zW!-Jf zvF@?%weGX#TK8KISPxqBtcR?Jtw*f+)}z*A*5lR!>j~>g>nUrYwa8j*J#8(qp0S>_ zp0k!(&s#58FIpjMnYG+nVXd@YvR<}US*xvAtXHkqtToo_)>`WgYn}C`^_KOvwcgrb zy<@#=ZM5FA-nTxmHd!B9A6Xw;o2@O@C)TIdR_inCbL$IhoAssjm9^d4VSR1ww02nq z)^2N$wb$BbePexV?Y9nC-&x;V2dzWa57v*?Pu5}UXX}Xdi*?lc)jDSVW*xVFxBjsH zv`$zjty5NEfCcc9B9IX92NDB(KnREdDIf=wfEv&OdcX*n0V@y)R0vcIR0>oMR0&iK zoE4}RND5RB)CklJ)CvRx$$^wWYM^$YPM~g}UZ8%UL7-tEEs!3_2s8>b4m1gz9XKb@ zG|((?ZlHPKyg-XU%fR`8R)N-mHi5Q*c7gVR3j&#e4uPyd$3Uk*=RlW0*Fd*G_dt)p zg@KC#7YBL@W6<` zWr2}_QGwBc%L8KqV*}#?R|Lift_(~FT*Xv6h2fpII(Jbi@7C5I5oCf={S!b3fZo&)Isz{Ocw@(P0=@pP^i|+B@U=nL0qeon1x4Kcjo{NjKL9p?&j9@x_#J#>#u81y0*}}e zp(_z@z;C1ldgB}5JZst1#dK@5s@cuE#0L1D$3<}?Z^}zoL3SWab-Abqc+7dV) ze09*)0Bk4J1kD1vf=>bM9!5faQ20(rXaG7sjD&`u69LS_1mq`(ID#~O%|RCcI8#h$ z1&SDguYm8xSTgcXNaza+8w7ewn2cN#68eMo1R$F*0JIN4c9Fm2IRNHf!U)g;;5+ch zTk=81QV>(ZTF^>iBKC z4)Bmm!8oNX1dnSWWjTPj{Q01(!|;y;eG7O8_2{4SA+QDfIMA;E_(^jy<)<+Gw=$Lr z8w7e2nkoVcc#Lr>#*5&e2@2m+lffgeshGd1FM!9jl8UiR#kJ~3j_WX>5d1=hxBFov z5t01$iPF3=re(0kl^1z{xa0sR)hI3?}{{T28PJo3_DIxqt~=5T`t0oY5# z9Bu$vLgHaij7$EuA_qY z!=N|I1)G3RP~RMMYZ&x)x!`l)3)Hv8_YBav2l?jPGkjeE;2-{bhVLvG`}QTqgpU~8 zkNW)^7!zkPe0u>PS5i+2mq8WaBJjx7LG(XV zlTNuA`vLlY!2D4V`;Un8C)iZMBkk;$N!W4_6S}Zpn=)p#$9El&B?KligK^BL2Eo82 z#?#u0RoMPNanT=+`69eSqfH(Lo$-^v{45c}B`}dm_@YR`o~SV$)=Xxx0IR?%vP!Hn ztHP?Xvsg8j#HzCztR}0)f-IS(uvAtX7e!rGkJV=lFjdm}+-pYs#9j zb6InC9&5o`vh!Ih)|$0pZCN|ko?XB)SqGNII%lH$7qN?3Pu7d| zW_?&+){pgP16Vf8VFTGEY!DmFE@eYlF3W@ex3lSNCcA^($L6ue*i-CDwva7mi`dib z8TK5$w^+)aXD_lBScolSE7(hHC3_iPajar%*lX-{wl+aw6IebQ&PF9@Y%+U-jc1o* zeY~2D_NTHL?BRr;*j4^|{`%}Pc1^-(3HuWEaQ7$t#>TKI+>LArdzIbHhOu!82k}jp zlJF%P%Wg=pa9?l>yNx}_Rpcu9PWcKGgai@aU-{W9iR0Lt-1!M937x~=Z6N(ByEY*a z-zrsP)7WfwE4!1;Vt2DS>>hR(yPrLP2{0dz`-SVt^=DUdy}3SIUv?cgfa}L$ z)ef=rV2Jh0?wAt{c3;ipUfn}{pMlw-W=Wy?Ik_W(v-)L+e0B0(!8=|yY*^~hq~zof z%L%a#saeZ0fjZ=7W`wx(P%w8yM#z^Q%nydv^$hvz4qRTJQ#y1U)-l9)%uWs^)XC|6 zNp^B-a?-5qV5nzLRJG4Z3Wiz`*CHn;xGXH4mmjK+sz@mqYC`QzNOE1z>>#|El@|=j zJ+pIB6QnkoxaPz)&rQnB$;nBAw;{R1un_B=9b(-{7*ZXQx`%2KSF?NGYLg8kiPed0 zXiiRkUQUQh%gIR%v7Xt(b8<353F*O(!H~aB9%4!C&@(%fn3@^lQ!^1cL~}Dj{&akh zmK@AqmN+ysNG%j&QrKtuH^k?592QDwn2g2_`1)%W3@mGsSO;n8m7Uu&DX(`as^8KK1VkkBD*Ij%!Hw>*lenW-3~)Xcn)Z|H~+Hw<2c5*ucOg!CY} zsv;IY8wwFP+demkL~^riSH<+@g33B{%xst(9W5!n=;+B|EnFI0=zzF$gB@q3=Fv#n z8D>c|3ZY;UoOHazc&6rMg-s}Nx`%3`7dl5nb9Yi{(xqlDSL6gtkEGP(oQBC6AuWBG z&(|@OpO=*p($f(@Fc{K0bfdVyq-N%XbSm{mNk=IoWI&B+rzD6B41?PtqeE_RR&Fq4 zAZZyPGrfD?>}CG^ten~*ZFuVBjF6Syy;pYkKHjUY_nAxFU_A=A#5aRMO zLq;0Sa?Ga8Wg7jX$86%NUr)Tyun)*mq<}8da%<2u3Q_;=gF&n6zy5QoW)*M9A z8UA-hZPB5MGl1B=E2JXD9YU<_a*pHd*-#-J>yWQw-|Uc?ni=dEQZf0IR7|+cU@pwR z6bN9EXPKF^a+d}8w9w2nc$}1iOjSg971A<7mC~1SL@OiJM60APOCVY`eVL!=S?S9X ziB?Nr#uH6SUnUT(p1w>ZS|fd#M6^LV5)n>4tRu;(!A2o&FkK@Vp@y!;%F)Iv!;NXK z#=6nQ3E{??=`5tBonDBw5MoWZ7DR|dlMy1(6og1L6(JI>jSz{}L5M`_B1EF~5F*j~ z2$5)dda$*95oM$!xq;kZ2aIqo&4@hEP&&=nM(Lr9v`_}F#m2Y{I%B@ZyckpSTBOoS zTA~CdV@9ZnGr-GKr6bL^P~(Qn61hqpv#|=&K%VW&P&}D)(u3#Po;QWIu%3>^mk6vp zF}Y!vKFD+03Hb=IuTshzO`Wn;6!ii>5UImcD1h$Oeb(p5QRLClZUw2m#d zOlFxOsYBZES&dSI!Pc{&vt?1SV56|UkUurkkq(A(X;Eq4D|>}6m=H`_;j5caEhm!} zS`lkD?8Af9PPoJ|;6<-jEG}GHcqj68$jwg;C3MKk$6Dv>ke38LHwO!Zw@)5i!}6cn zDX&FRDlBwDoFKLp=!;0h=mU(R=O z5rhYcbtAb*ZH+XwiZ+ErtR}%=r_|15lt!_&(`E+~&UA?N&2AKIjZK`q_k}B=G&&R^ zz79%V(G(a~IynY2(?c!OW?}l#9GiuU zJ)UnE&_3tj3?&(2hLH?0`6NTk zaNDm;a3gHLh`Y@8i@1@tU&M{F{UUC(?H6&E+kO!@#`cT2vB>fH(E%K1mqKmPa7CDH z2X;Iqoy0=zQMwY_Em)G75N1i{DqDscNM<5Bw~A_=WS8t7SBF{ZaZQ*d@yXEBDy;I_ zFiQg0g;^4~9~mc(xivm|~KdbSShn;K?G;N~z(0=Gc6O;q2lcFEQ^ zEzFYmZDE$gZ%5BIVSUrXED6jAvm`JxeTC%rIk&c%X(4fVD4}-G$<9umfw_c-t&P2L zAIaT?JudusHGUZrGFP#yhIDJyfM*S<)Ly?naRk0y&E%U1NfIwcDsS{v*1C%8%ynve90>4Cf@p=zH`r9xKJve*;o1b2wX8NbqZghPW@Il*$j@3< zpGvDmMn#sDleDZJRlF)rWt_kLjA6KgrfT|Wuixk&iO*=W_;ZAsBCj@F%@y7j^52O) zJS)Usx*{>3XIWW@uDn01@l?HlE%0BO_!*q9=+DKuMSo%JsTzrg3-_XYec|3yU8v07 z#{cHC`6O3V%9gSFuvhTEyV>3TN;p;e`BV<|Bc87q=A$~+7w#uph5IA6*27jZ^hC;0 zxzc>Pf!%;JgB<+tLE$NXF4+^_4%0{?=7GAvHNz?~5$C)(A4-@HFT3FU2xS3hfubMC z2XIa$;mk)`7d{7)TjLC949|-+O_pKgH8vIGiDsZ8FUkz`v8IZzydr$>|m^- z3iJi0F;;0jV^z?%3iMQM25e>Qte(J9-~?mUpfjl|fcB(Aj8)G9rT_)_T`}mbu^H#q zkgo+Dwbn2eoDb~4neJ==Z7Dr~rN9ZCdBSEY+EX{-_s%K;xd6(wAzx=7&NbnCy==zn zBgXnDH-O%T2XN+xerd3mo)4^JETcMr`bJ}bLyR?E$XFA!H9?=VrvWDzJ7)#}JGkLx zO=mOKOa)-?T*Pv27si_VfhA#_2bmTqw^+zn%Xy5Q-vpS2uJIJ)l z2j*dsZvjkXEE6;n{jx@4$AHa_@UPQS#yZ1Z=WK>UC}0d@U7@qxpu&`Hb}*4@zu#K^iBN-bNV(jvDjEzPAD~_bJ70+=z0)3 z=b`UIXnS}HV~?P2K74s}JY$a`hmU75wjc;)ucKs&CHlS_;Y`$Xxi1}Uge;57U zh5W|WzaCQy3 zy$5h!4Ljeg!_BZ`24mj^aRv?9gX?kLJO$^>**IhFf-~kUoG+vPXZU*r z{`@i?XUu(Z#ypv^W03nz1kmUB7{-1_pFe5?^BDUR?I-*I{5+WpK;{(s7f!_eQ#Nn_ z_eUEU=UdM>e>2A644)Iy87Hd1X2wZ#8HY8GQ-VM~5MrF#9zeZT9oWP;eLS!ZILsl2+-)@tELyYS_53iM{GVVgyzYyh%<}>bM z$o7Qoo=X_lD;?O3SIi=?0DvET(6?_3UVnhD`>Ln|#>FN8jP- zJ0b{-Vccc4fhoWN#*IY#Na!C0U8AxYH`)ZC=W;(Vjd5epXUtS!E91s?0pbs zfSg~E%ee6(0tRulgbPG}@jHF>XmVP{6on;QzA|8TZ^u#w`V&NBs+aeCjZU zaiN8bTP`wg1$V#pFz$8OczqM&)}rl= z_P}w*t(ypJW!#(a>&+94dkebXt`DqZ+BmCG1`abNxzmjnu zv|t?8XKvFP#(g-CaUWG@+{aY`*xoz^IKa3q;6Dj6?$gP@QO0c@0~}`DXTayVjQe6L zu%2<-<}&Wf@r?UQWZZTYfbH$jyB&RYfZwr{abJUey^V1@H#2V6G{zN#7`MAGCHF-1l98eT+K<{t#^ZzhNA%qY@2q9#J5Mo_6&(D4T1@{ln$NT-huGjUtt`p5UGuyVYDg`XG)_?->K?Rb&0(Pnb z4mEDN0$!T}{-gry_wi#O9SWpoDzMQoKL)~?=hVQaJVtNUufXP|3Zxe*utl>1TheQ* zSp_oCY|Va~b_KT0S0FP_f$dBnw|y-?CQ<S^68ylq`QZY!GHo)*1+FXr=Bj7j`VIxIN>ku! z_SfVA^$qFJs=&2Dp!V7^1+Js^x-JE-CwD#G*Uu=>*rdRcOqf&Ph9L!-ENF)*1#T*W zE(LD3p$3K&xFs7{o6CWkTbbdu76opn$L;KS3=6d6Lp?C(QfikLL$d;RqysZ8qu;Vl z1zLUJd?z(`;(sUCcUO}Fcb6&9Wh<}`jFU%GYWjv$&czaEAVlR0-vDyv`c}pDFr@9^96oipdW`X8x{B}sKD1n zFwKvcwJ7jS9+3N%8NSPf9t9@Ze~;#eR2WiVYCwUXdiim)Rt0|XfpxkPMiuxq6S$UN z@mNc*wfO!<-x=aFT9TNu#Ud#x)k^W&1{YWf7(z69SZ!#`L98KY|Vs1=u==W z8>STahy1^3&jmy}( zUdBGmvd^%LeD?dY-BDpk5h;WzZ*s&s2|JC)i~2W6aA z4Cqd8mQj%kc%OmSnFTV=$^vqg=+ADIv5@@2Mj7X%!+?ycQW@OWjPop@M>X?RSHZB1 z3+Q*jxQq*P0q={L>!M=7>!Jx6HF(!l!jO!M1x3&z;}YVR)X2Cr2o=x;Gcs!PpaIZd zWV(%gx{iJ8FlomYnQPY-4*Ds%9L@95BOd)CZiz(ssZh_WiTh>I=rt( ze?9R=w2jm^PRdw9o_nHkL$iz<+hjD=%ebXZMl)wVA2M1@$OFzT12UGTLIsSWpt2RB|x{T3Fc%xkOe(5I+>{x{e!7M z&4b-C9%BDcGvN2ogpAe9wVM8`*>{z~kc@}(phLzZIe-tJVHuAW$>`38Q5oDLjmOhr zK*kfTGJ2|HJee!wDIcl2nLzG^E*O*XA~i3f>n{iLFVXWQ@-MZ)w2YUBWxSFO%<;;MjDb2BlJP3K zS4*KDxYjiV&;pY(UZZxfSjOu%Q2$1Wj5o7n3~?U9i86V+2IxXYl92l4J2{oT)Kr_&5EFbEjU&d!?zLZbV_hb2E$jZb$8R0||F8kiKj{C*n2gzcC5~R1vU0nzgi2 z!4pjAQ}D!E1Q6FHU-aURPZc%p2am*PAPcykb(<2pOXO{3RVp$cunMQCbr6}%YVOMM0TJScb>9*fv7Dg*l0alT?&!7J%|Q>%hE7Xa~F zdSFh$W@5KaDtOzVf-Tf6CBJk`!DY|ZQaus=t^m+0{d^#ctGzKZvn0R>;HRB({<;Dmy2 zQ2S;fkb8^1Z%r%sHs0@4D>z)I;JeKBUXgAG#XqSQ?*DLr5 zu}@jYS{3|kSi#Tn{$ftS@qPurMEg~$f?qSwM6-h5FyptG3Vz4>9eFNg$3@QHa|#(%3WXXJO378o98@UAIo_pEVoagr zltT8fLe7vv9x*>np$$qEO3hGcqdJ8)sZuCyM4?S*6xzH~q4a5mwrEjkt1N{wIuzPw zRG~~uq3wGV%IZ^Sr%Hvg+Z5WB+8q9uFY=y2ERfzZHq549F zu0hwpY}e*0bR9EaPv6Ee=ul`$wL&*Ez@$P=c?#V`-OXrkp;t5gZ^QR?{90NRx`Wx4 z5o=|JR^oRCp;w{1sua3A4TcnIt5axsDhw)gPpv{LGGJ7p_C|&7rS9GmXa!;`Q=u5h zt)%D5DTVGse_sW30_P5T^UM(Hpl`>tLaR8h;=GDkR^f5KAO|X;4Mr5=do}bxnL?eW zLaUkaVLbU>4L#Pc&=dIdbSd;?xk69j^K_F!z4UvA{j+GED^aMgL!svf6nbGup%gW7&i$Vj{3cXsa(3(DlUYk^CkbbXoegoYbGYWAJ4!w!jo8*Vs549`w7PIjE8hUG1 zp|>kxSfO_cfLVrFhX)mUw+O}+dXL)oCKP%f-TRXYjc^_z{sA+6faizVfagbee$*u1 z_CYQ5DD*LNd{U;+r}X*EgnXc$_r;+vIDe6$(0H9fUs3-x+KC20`&~NJDD?fbLO*c+ zu}z^V^i%ZwDNmuFs}!21-!$ISc>PN5H{!qbD>Rb}jSBsqrO+&Of3+wy*P+lqa|->J zrm!q%Rd~Hlm{K^935^Peg9=Cc6i$>WoJ>{N8C2L!hhBxf9OzMagDU7yc*9YJQ%e=z zh}qV2 zL(%e@6F#gNrWHPt{4sczRw#Tz7O+2IOyLu&6fR3s_@p9*Pi8$OAG#GjwOHZPOoh4s zhR-Nd_{=edE2Z$+sX%Ta*Rc@ab7~c?no;;X^5@g{{BeaZ2r7Ib+S(k2FQXUt-0_7UD2cP$|{8) z$OUo_5`PfyhvpRS!t3E_g&)lT=6lOZVN@1Rb!+gdR9?w$v%UXrM9ai|e z0fm1i{tNIu68;s|l3P2j@NYv3&)~zeXLwzy!hcsQJXfw16+(|v))Q2~m{I~6K+H%} zN^npqDg8=`6e}g#pp;mPQmhgfRtn!YDTzL%*y&1fT9x8fDaET(%7z_E*%*&a&~DbG zl+A-c&DIr4$?8!G&zmVb&nkt_Ia223DrG)B78F2-QgX9lR4IGll}Bu!Hl-X`q?CiG zIXFithh_k}B6Np!E9G$d9x<(yBlDF~GNP1H;{5-aa^i$i&L2?91+#n4aU|8lxjWRbKm6@I{bK4@B+fm1Bg_&i`+;K`~HtQ}OGUuV4PyPIQ znG4Y8&dJ;ppFLY-?%O7FziOHLSIR8Nk$F(7%tHJRp{@w8lX77|X8EAZ)2XdsmNR{s zmE?I|HWv~<2cPrvWnP#k^CI>&=q{%AVrIAm?@NR5zqMUvEnbW0!~Ne}M82+D=3;tY zF(UIy_Vr~luS$hknOEa=4f|`Ty{1oQ1O5&4yS5l6WL`(l>uP~Hu5W;8nT>cia$Z7i zNf+RALlJb!yfG-VX-eiz^tfqK=FRxtVnU6~W@>KD0(@>Gf4hLXmVTK_@m$&?^NtK) z<#oVpt&+)eg?VSYOkNMnyPAMrcNan(bi;(qHXjP020CC=Ca)Fda{Awc<{oNR)WVR= zb{ld5?{@t7T*6$*EGwzIkD3m2tMFTe-zw_wXMcY_pufKr#>B6hgbX0|z@W^|BAE~7 zL8r`zN&wAjv|adi^~!uW6B=YbVgX-|N19|lO1`@o*gwYHkG08soY@|y@8jeipOX1R z1rYC{$CG$GIV$t1G^m9EnS4%RK3xtyGJCV28D?ZYQ!4XW`aOr=a}zTA$Uo0Dyby$G znJ?nm&za94%$NFQzMKPfGGA$gVVMK?4phi|H675d>6G~z43@#9%-4%#zQO*@8ks}% zc&l9I+tj|@EtBUN^PN_i!_*It$b7e2ChtYe_vrI}lgtr3N6>zdE%U<;nIBnz=jgCZ z-jkRgkIMXn_@`qs$BJcshVHXknS91zeoo!zcz(gWU!WPU0?uDD%a^kyseyWrCGhRPW$@~TFv0ktrtNVH0kn5BqC zF3uWn0%{ViiX=@afLTTCE=64OZZ^=U@GX@er0r9v?@!+;{2`;Z5v&<7KWq-R0BB3saNi(W;xq|cUv zifo1V*6E6D(+b0iY>Q7O=k0?0EUvA{4ke24S{vCh19}wMDHj?Q*%`l`#}vuNdsp(i zb||u2g(5krz+Ch2onNKM0(1-LlUoOUitLVN5A=I9!;B((mMW4*kGw8L_A+5ak-fVW z*{58Qd_4Cpgb79VYfxnW7MN6|AWxA4$R9AJ$bs}a2oBDHX+;jV6gjdU$Q@On$kADf zl+*&g$FM(UPLX3Xf&6jwK8{|coJ$84Ii8tLpytFhMasC2GHOm@=9BR)w_sM0Q`;3e ztrGA#Jx`Ge6Uu=4Ginq$6MZFpDw|+bk+Tbd{lYXTf&cA?6*(sZ(4W%__*Z2@Ikduz zBIn|Lo(O#Q(nk+>cx)ixK zRgvok6lwHfMiK5sktLjOpyq}?MQ$X2V?E3%($ufW&3TI4(yd5yt|GS;D8lFCk)^$g zETe82@z!=l?!;$#wIcUq0Cg*B6ltg5y?EW*smRJvMLO7bu-=~w-VSCPMKf&Co(!}-5_=vH*S8bt#+Fs3N4aZzJR z(crYA;Y=WwLeBJIRMAMaqS0I!Ry5YGs5PKyoWE(Es8lpbJc-`M&%wv(Q(>UL!I9VZmsX;jgjOMo?dT2bCNMt99t zbT=D%70qEkzd_Lj#B+-j-Mv)NJvi^#sAwJ@d!;M7cdnxQkERj7#uk`Vl;_6i4OzhX25N6C zgDFM%+$q{Lt>{f-ir$Q-xe%D^RvW0hty9t4OB8J>QgkUbOR2r1Ptj$iFrnz3+0dit zUG<9I&Au&P(dEpsyjjtE=)a;#(e`qfR`gzati}eL4dM6zxU# zOtGTRqInMQzJ5iY$N%{`MPDG_U#sX#^m@5S(O2m6O1Gi|6N;`$RrEEy2gekBeNfRi zdK4YXSM+VP@38Wm6@3rQ`}K-`(52{y%sQH-=*N7WK0*5_jKODhihf?H=odjn$7dD& zs!GwX#})miL{XlNqTgpL`eTlwQ+WNztQk)6P+7W^q&z$|E+*IMgN;tO#OET$oVo^ajN$GGIWlGw5|D-j!*<`D}Cx z^A$TMTd^u%v2)?#R>dyqRqWDQ#V$j4*`Q*V*D1D${&nmZ7btc`xnftQ!nk7fvx;4v zr`S!VVz<-hcFx>iV|P?2whZ6aGR5wcVs{rS)>fm~@?pj9ffWskwbOfLhhq0NDb`W1 z*!_4uzzh!zDAq~*!9wU(?4ef0y2=%M7@vpvIz3XW*rWJ9+NRiJtdEx}_QaTCJw1v& zS)kZc)rvix2eXR3lnV`ty*#7X0NPjaTm!F7DE9i0VsD~}zJ6V3u!+U_!C) zEFd(Ak0|yF{id1e*LKC$;{O{n%+x6MJJ+!e-#^gJQupV$ zVt-{rgJOT@!hmA`*ns9=>i&}~`Lfn4fqwBTrJ+$)uvS(mOIA2vR%}d`)h8=HD=Wc1 z*(1wF?_|ny3t>{0AC$Fz28_zuuv}JZjjWBPWo<%ilWtj?&dJ)WLe}Qw((7bx(I#ul z23Z-ltgTI1d|qO0OD*?GYr94mm$iKkP`3lxtSVVMrpww1?M_Xyb}p2aoe90NcENYo zR9U;F$;v@H56wK{^UGu{K$9z3yXVW=gPHfB$DS>+@``2cMSgGQ+}DB;S^M?K+8^J7 zFe_yyOpj>Z4jaar6itx~Rud!=;( zJ||4bDl3(BQo5{@(`23E!>p|GQCX*=KW$3Z=}~tc$6+g#D#KS+)4p(&w^nS(l@^oVgZ} zU(_k9j&t3Bti_qoBkPKKn3TnHv{gSQ>#BBHS7$>V5Wl8HRs;PSres~)A?rGNT;D3I zu}#(zyq0vzx`Emo=49Q-zKOb<=zkN}dNZ}RtI}iF~wc*i5pXH6R?x}=1Su2`lwNuyLE9>44Su4wB z-IoT$JMigfkhO}sRpjosfq5RFN9UNV2kT@#R1L$jR+qwvtgdt*&*w7M!`aXz>k;Z6 zse(~ikCK0seYXkJKgRj7PFauF$a;dlJwWek znJ^^lgF2X#^t77%Hp#Z>$5glpXb7utS_o%eM#=iepz4D z%KDnQz9v6WCVu5P^ve3SUDkJ#vcAuf^+S!UABjzs!i=n+@c%hS)-TNc%ap8Xu4yf^ zuBCqMtgPRN&2-56o!Z|=WUXtJ^#@+O-dTUq`|o;Lb5*kbolsoaim#WUxRIuKP>P3q zs8c-5K0K&+O0D818WU{cDOm{UAnqj;hex)o1WC~lK;z{SIDR@}>k zDj@GoEAHn&qvE``h_8>=`s_Dg-JnPD4Rc{k@zhquH%eE0V^i@>s$o>|v;oC8?NWTR zLd7@Ff+5Az>lNQ3Tk)-kXS6B4b%WyDSU~-@T+6o1mx=Fo!;0^er})nKif5+*@m;9j zwFJf#-wk~Z@tk(W=Vd@AFzft0V7~d(FJQ(6|+AH`4fuo+ow3Mq4E8@6)&LXfI`I&s#3f#UGamN;SlnN()UoVv#3My!!n^p z@xy~aeKB6ecpWLA_9$jOYFhE5D-M-tN2NEil6K&eoBVo_5yN(Vgd9#Fh3Tk+*V#qUACqF?d$GR5!ZeD9p%D|-~b4?VB1@s4T5 zS4}8>KOUVH5a)R;{!k7y!HnXo>lE+8lV`H{BYlcLS_=4dwQG(BT6N!E$l4UTZggvK(n+{z{c(xL}UM1EqQep!J|EiLElBPl=2HCARKVVjKGKnv}@QRbo3lw&%PA>&FYZB&U0 zdYmz+#F3ub}^xX+V8F`TB7suF3~`T-^+aR;@_N?=xrR@PQ# zy0ct~yKIJF&$TGgNA2_M`Aj77Vm6E` z(O;{?OU(2#Jzl|Y0Kb7=C0=b;Voj?Oui^9Bj1q$*O1$2t#2Xb#yh+^o?nu&F(s{HCF6NYCbFSX$z+3)b{Y&S z>9i>6%_!-2DVf@-9mrY^(wjfoRWNxC$}tAa;tnLGb)ta8ozCGfxekF zN^ak*r`Y9!^LEBKG z`I_sMyp`B(%yHYSl1ptR@2F66SqqFS+3G_R;NRA(gPlq~)T-oaVh>aMC^L35&tud+j!zG|9%`O!R`RJLK+AiF zWH0e&nD5yd7*q1OS|$6K<$2Z@@Om*5rj+c*|D_fsU#9*Qd2^VX(jo8Kl#D1k{<1fkgw+KQh{BKX~R`lk3)83l;ZAxTw@3psM-JaSV zYGr3-LXYennPn$Iw(Om&_*FLPFeiK0G}*hM*$uCGc+caS=cCUpl)Zb0>^;!rrNXf6 zz390Q+I$;YWba!E1G2gA+6VZu4`i-`Ex_Xt<~W3!L+b&LBD@aE0=y4zkbT6E>?12= zABE4+jj~HdWgjyp`&icFh?U|~iqG-wvQI3NT{a>6Wcu+OZ~px*b0%e1HOoF1kMn9|pI->Gva82sU(hT2LV91sS`&m? z*%#*lHJ6mhzLaw)w{*-f=DC;KL}HS*^jY*ycOnT_mlzJr_yCVE!n-D zvY*L}Qg$Q~*LG;h_*emf25@s0(9vWNR*zuP4K0Tv+tK3|LXn`MuXA3^s) zI^gvox{pd^kK*}p7EtpE{XeM?|5OX~%N}FK&&p(fj>qS%FeLj6>c40J_T$9Isrxbw z= zCuoLgIe~IHMz)+_0dNk@$qCoVNl682QfB3th0qFeJ_m>gbn9iKYCPtN*yti2k)G5IXrhc^Eofb0JOO^a&|9*DLH$K49MBP0+_V`{Q>9?=#z6`B@D|sC==*ih_-M-&cV!Z z@U)yms)6&NMS$<2{V*%1C(YNP0kVN&?Tq17^dVLiRV$d&?Dz)a@;SR z5^760AA{x?{EqFA!+SNS6u;wx&@JZ#_9s$zBK2j|oFpK2GV96YPhsBjGN876PR^;+ zpOy;MFfQlx3K*7C!MS2m&KY=|!PnwU8w#KS(4A#LDYO9RN<1s^tell|b~#YH5dA{t zSV*69nBklWIaL*M&SigYH_XU6FBj^d6XS0b!YZ(x~GY2~5+=bWOXxf--Ilb;lg(f*G=(z&l_B5z~E|`&XZ=;-* zxq#ow2|4#w0r8Fo7?86H-&Or`?x+5K@(&aOGj~$c*(T>fX5s$oJVc*|+U2aapcFdf zbd}3_I0)au}1d2JMy@uN{-~TM+R6twY?xfc*?Lzca({lXBKo$oT`GKWbrG&MfiS0Xcut z=g)pQf06&IPtM<|&;&Db=9q1+L(V@IkpG9+znuT`p+zqDaaVKv^J2x&29t6FdC&6Xt=k#&Zu11hH7YoVYwc0uTQR@1;l*3*DnEb8{_~! z8`jHB&6B$k@r|k9xDM#INu}I0&S}kZH$}5q2F%Ijvk*7EP3{&J^6 zxfxw@w+1~+Xl?NUk+5r-G5YWK`xBTJ)jsmeZ$@q=mruR{KN z6xISY2Ui2RLrMYPL-SxtZc#l<%RP)a4r6~fo=0Rst9UE}>WW9?9?94KsBGYTbUyHP zEn!yP7rMvN``A9Y$7R5n+)~b^LvoKVfquCs)B-(En2>uSYgrXgUp6WCq(QkSGwUfq zV7Brc7?*o$yWG>zot_C?&*?*QE9&K*Q7QM#LZI(iS%CLh^sG#SUb$zpa!+^9M!yj4 z!fv_e6hMdEDiex<*tzsOw^8nStlZPx^QPpU&$-$Hv=>y#y)YMsG`dl(7_tFBGkXuW>mh)vr&@cD$3}~0TC>xq#PHx?h+{IkaV)j?`$mL${UO6VW zo?i8JFeCRWdS9ImZE~;4gKB7kP8fi3xecj6ZNrG%Yw2?>nrrdCE(jIC9M@+-1K`<+ z_YxCY<=((NH%!UBk)Ai=$vxg}vH-s(v^UiNUN`3h>n-@*f~L6;M&;hhwcI)>_cms` ztxN9hHq-;PEm?rRrCaXOAkbqey_XKky(1Mm0MBK3FYA}vS|;~S6Po1SRVnvwyzXw7 zyIfER=?)~`P zKPLBq5}|bunflKK7{8(-EvpswYpPo7k&?0&>;7b3?TMs9xz8Y^KjpHAEWj$ zY96P@6ZrRJ%Y72>r_$vE|4DZj&fch_} zAJ2jTxnFhyUSBce*MeN&IwrD#8M)WH-%QH=7Qb(&^quaP`z!UoGRN9>xxZ0AlL>Wle=mb^x$9Whq5XsXY$~9iZH8gF zf2ITZKdJvK2k`itugTx^nZsvpOzyuvp!v67?tj@ZB2PsyEN{J9n3NaDg${X!1=Y|A zbMk`y^0<$Cp>cU(a^Y4Olb2Em)S2ZlB`;DVFDht~7sD&oEYAu;n>_B>UVKPi0!?B@ zUJ`G+2zp>voqdmV7rsb`l2WU4)hZcDo;=kdDywq&yleZD|8`Ec# z449FZ#yO3Co3d^e1hktE$V*4N1vOjHe@l97)h;gs&DJ&)0{N|(XPXL`mbWeIw)kZ- zYbLW~PRZLY6Ix+H-uA`N1!#Aug*kayXtS7QM<3Yl*Z|!yDsQJjc{`)crgoPy7?Zav zb-QKBo7XIFKKcb*9arcaPRgC@Gro#0M7%6ABgXP%y1B%2jxR0bjT|#hJGM-a5hkX z2zA`Iy+ixNV-ys~J1iA?)S|l#|I5mO{+FS0J6>ajaEP+XR+^@a*33*qs zUY!Y}@~+8|$9>tmHVvr1c1+%N_+QruL-MY-0bS#qyd`Lt49dG9AA058i2lYIc}>mo zZlcG{Xm1{ncMEehR{@$^Enx23vgF-f4Ai&a(}Mp}6NoMCly?WUcTjgn4@}EjhJG36 zWyA7XQ=t_4R_>g3%oXaHgl>u9w%vEDz)NNRzxrId{|J zu@ZTYXTp@cC%WbJ;P+&nyr&9bPTtd8OE3MNDU$ar@n`XRt{D2|^;H4>&*Sw1`WMrn z0tR75UcU|G`l)$|+{<{q!um=BP&d#g@6{=JYnbD;9H;?i9&DAzJ=J@?Qr;UDpn0z_f{@6$$L8sh`&86@115~<(}&C*|+zu4b1pnt-SZsVNBjgHqiTnRA>bBAC?0C zA63X3&6oEvxsUPsg#9ON@;=Q3u4jzeu`ZaC_Zf41UIe}Jz92uI3!U=5Wd5(H`>ItQ z_fYTaQh5_5Q2!0_Zz|<|TQ2XrbZC+{iDq&@-uLwWAr*-Ifd7xR@}`)7su1es{e-aiyPxbyNfi}QrHV+!*{h0xH za4+?EkL>+DEN_lk=6YaK-alzj4AlKY?q9CwzbyI6fJ*u670M5=4-CjRa^wenn35kN z7w(szk`3+h%^*z6kEB8|w8)RLkG9E=p^1&iw}@M4;tlc>xiBd|nFpOPE1&zP@03Ef ze3zfrcG$9>dapLKouZjcJpZ)idVOvq2Aexq#p8>d05{7o_e?@i|9 zrH7N|dn{6W+gvL0*!-iPD@+C#?W zAByjxRY3mGA^Anw&;isORtv0$lRttPkEn)W`Ne38n_*i1k)^zl1&| zoR3KZYLA(be=PcA=j0z(C%-fs@IF2r=yg2vo`CKI@+UISiOhE5fc&y{`6qE*ClNmx zzmtibk_G6?D}eZ^E%Hw*0%E6^%dfCuLjD=dab^%2A-qU zHQ-gnOjT3z&&>n$=MKp~kJ|IfphN!osX*=d=*}OPU)?7E0u%7OU_}0fmGWz9ka*2K2Xe%D-LE zBEN;TWl;W7GA4b$8)+R~hueto*yHfqC03kITO& z1MpaZ{|aVWQ3&MP@oC5ZUiSA6%U@Xn%)1iL`-pXP$X`_oo$~L`0s3=a_8*{EC)fL6 zI*iJHs80TBd{>Xi@2Zjia2mA8e}owxnUnu$3AD@aCf?l$)IZh>)AAp0mj6V){2ux| zDd7C%p!}z5Uvwrp*SWy{vKY;8hlv@MpcSqSlNgpg^35JCtc6G8}K$Xf^@gb+dq zy(fg^cW-;Y-=FXI_WS<+%g4 zb;!lLu&XUjt~c;`qYPT*dK1mJlAs70)kBqmy5mI^&WZN zL+|}=xjsmP9=SU4{jgfDkD`J0;{>3#t~$9sLH`qSf7&kBXU%eTC&OO3KF8;CbiN?> zmyu8iU2^qUa((53R=K{W_HR<5Q?A|txxTH0KDoZj1jgUz%GKwDGP!<`TtA}qBlADe z{xl?4e+e-DR~l5vwJ#Qk`?*T4fi}5*Nd)rzS^)U}hW~Gaat#(jw_Lwt`=d#&KZ*a7 zb_oBWe7XM0gf6*;@%uXpYGo)HI%GKVWrR7QS_XTv5suA?EnSfsUgCh_d ztd$WWXJ|+Ud#^DyO-4*45W~-wjo5r3Zkh!JGNxnW&*>R)SZr2%n^ zsWSaRL)&F6>5-94?T3}iSXv=tSu~W$NTE&1fHoP2lY4n4^vYO4Kb3r` zMKV^Rx03i(*jC3vvy8MZ8Aqf8_BFXO)?!~Tp0~A zj!Ff_M^{3hjAO`q47!=Y44P{#4-WhDZB8}Q$N?SwKJC+5R|jO<1k z8=W#XMMI^G%`PBEPA2roIEnS1Tq9!(K3mYvErJdiTay6)t=%%VS%79FX6E8`MD zvy4l#Wt5_GSsW0vi}=g&zq|~n@p59yh$+j1256PBo7mk+K{q4&@mCU8 z9)czrS0%`}dW1F^*O2R)ZW$H1&?V#AIvLj$%D6rr(7B#ml_fH6a6*xc8}nt{6bXGY zs!CVf#X(Y?D#My(6*xhF@)z0BXs{JjG*?jzQ z;vdY0ei;vy$apve)Y%XR6QSW0NG8zk@OUC19J&^}!KPkZ8L~Ii=PnFAf z8v8ToKZAa=6R4N(h>d5Nf38Nx^Ql08Z;^}_A|V&>eK8(dWW1Cuqa{wp%h7-qd!h02 zkc@wp%6Nr5uhhwC&5`kHB~aIE#JyG~<8^Yr-YKIEy*C7Vp;yM6#JtJ;TglKYqdfr{ zWxSmV{W9KZkimXvyxT6LBMQj*UIq-vc%Pi_x61gy1+<;TGCquhJm`?|QJsvB>33o4 z>Xz|Im5fg_WqgMJXO%L#O~9vnNXF-kzlfFbWrd8MY{363^uLY-;=Uo~n=~kZ1{uA{ z&?e*CA|U>|a_ExLmjr0^Vfz8iA9J8n#!syCrwl;rr&byLc`|sXHU8BiV;>s(nq~Yf zz@K+o)`DueHejlavFUv62D3iWb3Vxdv)usCRvJ3IkeRt${o!(Is;neo|ppta!+E8 z9}>DJ5j&aMCO63K%9Punb?3_MaRRlP$$*xZId7-jKH_|}a{Ke36!7;`hlQ@yEO&r> zfquE|e84}5Pbdni;%YASf5I3Lt=eNtffVvXVNW^DhwcLwxj%Oar)2IWr40pbs*ro&t1US2QvibA7T z1ZZuf-Pk4frYvZcoBh|WBK`)oQrdvR0(~^MpbmmSc?u=+4PeB~)mHSNcpE)G=S=i1d=IlDT z3(+nlFMFu_++4Z;;RNhO*oz9}-bw7vTDjR%-RE`5eSV?b#poB8$bA9zT~G#ta$iV$ zQ3}wOFn4hgVCS9FeaV2_msZHlJEyypx-O%=tWxe>A*h2sxi8O#2D!_ym1P3)B#Li_4?sFM2{d@3U4zLs@d+a&jO)O%gM+}AU{p0+Yg?i)tH_l9n{Z$#t9 zT%e8{JLImSUqyX4*U5cLf!wz;e=GLtBDrr%ghFVM`}QbE1;)4609tq8dq*-5cSkL> z%3Tu)Nl*-pFeEqosr$|{pq@L4y9=MY(x3zy0NdS+?-Nfhe;g3AhZ^^k0)7u90)7wRSDyuqaz7Xi=sm>TL)7vxaSvC> z&A#hypnZh)5nA?N_oK9r(LRQMW4YXq7t8%b3Q*&dY0xWoQ>ENbVS6SUTIFsge{(z( z0CCOuJR1v)pRJPnIVWU5m)y^@rst`BZ$1$Ff(vTpelZS8VMy+mh1#l zE_BM>L0m__-0$K4-jLkyH^}`#rQDs=(%CHchpg*EY#${95P$T!xtmBtL zAnw-&xqnLqY8UJmK+BD~~e|I^>DSh5>m-p~2qj8I4|Kr#xfuADb!9xE2_ahwqR*QI){l zczh=iH=#qGgJ=&LkcW3w&%^|%mS+-mOpb;md0ZvHypaxQdkUdR9+Nn4E)2=zYnO-p z(_=Nt6UdjxwxC0vAikkkKywP3yq9{WW2cv&5?R*o+w;&c+ zZzA!Djq)rE0r88Hfp&2L^vIJ$+#yaVljqPVXpv`0D$phu!H_(MmCCb}xTV$dEE819 zlj4Lzc@B5MNZTpT@_gu#XGM-Ysc5AZL%%#LD_~HbRk?uP>OAO>CylrxGUZv50&ViF zC2lQiO()+v^w*JZeIoS9b0oDKiADx>9u+Ci(P$i#Do-Z%W0U1ME*gkEp7|`s8{(lw zo)hpnp-!F?(K)eQp6p_IHsZUHnl{Bkl{}kiHRTc~YIvpl(s zbMZL^pRG~QD9^SuAZK2aJlnJ7Ih7ncMj$R9-P1zQD$nWl@|;m4PeFn_XAyt4DK0U< zb`IlnvHyekA}3VKvy)sq$#ov{=f?r{oZlx;F}W_t1T-&9mFJ>J$dIQb7HZ|Wn3lcM za|yOfiMzB%p3)q^|1#>jtVNz(Xz#*)c^*(_8Ex61Ji9C9xgrh7du6&j<8t*1v=MO$a9?qo$_3t0v+;H7Rz%(7BGKfjXXD@TZKw94}&F;8~N(*#eU@pL5M_Y5^Oqx) zm*)*?c%xUIH(Bdj7BtJ#o(p~Qyv_J+`fpR;JEhPg&%3Ge@V@Bj!2i8y=#c0Ad?5D+ z)$()}%JU)mA5q^&gYtY#>?inr(k;(taZmx+yYc;;nm#X==L@GiU!w8lkUTw=@_a>( zue#*<8rwJYzd@t7O`dN{<@qj0p6?6f>5GCasFml3OlX(q$0B)tN&;g4B_PK>;`i0d z^K%|h!!Ou=EtcoEWI%T?8_I#X-_idg5{UVuL!LkJ8;Xa$FeJ}kW%3N8KaB6+A!v}P zH0YM;$b?>*>^)|9G%)9^k{MAZb5xeh$P}4lhGdR2Wk%r}Ma=jLnG=$M{z26;qq}5I z?36jF5U@>V>?)OM;BWNEbeBN8Oiu_3WSUVx4sQZ<$n*`!^jFHXiev_yP$Sbu-)3y1 z8%zQ6gd!mqn4dy@Q;3^d4AdW!4}&seX=8_EP9y&`+Ubol*=NkSWSKMTWX?*JIa@#- z@tHvEoIIIxvCSKyNoGO{U_TiDgZpL9PXh8RNQ7>g3*(?e=Avqui-}FLfI1H;fdQF^ zQsWZ(OQ88ujzOW*$*2b4?`F%3OpPsX6kqtQNw zer5vn$UL@Q=5gsTAoKV_=$6U;VP@sa+)xBVGEZoed15x;lU*fqV+!=i+(f&nUgl=> zH`mC_2|>BclcE8?lapj_Ndx9`(add-c?#oGx@B%9*Vay%+X`gn5uaBib35_d>tvpq z3A8%|#V{x{AOC#fPRo^fI`-2upi<@;=$_Fkvw-U-i32pwO$65Yj}n7n4vA{gC$o-P>IP-rUnp}=ip&R?f1m`KU_fR)Yp6%Fo*eZY&j(#HABu)HOXl;$Ki?~JFZLJEevzCncFJTwGGD^4r5xI1zMKSwK%K8-0d=*eK)cLW z(*U2>u)j7S^Yt>BZE=9k8&xvjq>i@+WwtZlUMutMe3|c1%RALF-z}2aLC*KEy|-89 z`>{|b^8>Uy@#(CT`C&Hn$^0k-dSrf#W*2^4)bPoW%uicovNxHZb;;}|S9c!Z|9Js) z$o!&A=9fv(BC{t~=2xc7uj6I%u4MM2(@WlOng15O?}+(6K_=fNQW7DBi-f<~_PgD+c$U8m@`sJO#_#hMTjix^_5-Ols-bv_BqCYtgy5w~w0@_9{ zFz;sUE(P>FQIHA)@|q3uddcgh?_Mck|^d1sf&8($>v9CFObhaP$75<7QD-g(3&5RFYiSS@|F}rue=v$L7TjnFutS` zy5+qz69(ih&6Ah!9=*Ind3U7(I+vG1m%L@g^6rj@MtQF&0Bl#r0ySSrY&m)O4$^xS zwO>umS0_TPyw^ZQF7(TLEwx>T&h_|KR>^xqhrBn&0sWh3Z)%mdDjjHVPK7pkZ;1xt zZ;g_-8lP(Fy{%ea-l4pA5LXiqP4eDJ|1M(hjs)u9-N}0oIqyvabn5V{E0gzr7hv0y z0F3wa$@@Toy!BDgBk#lHd$?WR25gT+Lb<$;I-vxH_kFCoHI! zm-i;`ldbYLY9r@;-FYoK-!=RI_3Qm{hoNJlJ_g(zJ_m{P$+M2vAo}w$oriO>g4^N zeqSuq%lktXp#P%{e33Qsjmd{D`NmeuHx9pXo$^Hy7d0f`_+I%Y zqyTdhdgMDO4d_QZfw_sqPfC?$t{Esz1!V-sVe8>H4yF7(Mar9!@`*r(EuA%DzX`C@bAn^Pj{`K96Th5x1u-iIbTLrdF&R(> z{qpfn<=c+msRi=whz9iY zE95(kI!-6|>Eu3xTxZ}@kOHmpotX)P@|{KhY<$mdm#>gKh4u2C!`wMl@}0~0+&=k= zq5#dErc1kLiD?*eS+56D+MB;N&%@?BUc-$k)dCSOUmd>1D|n|zn#$#*HW zUs?j_mgdWM8TDR<|E@^rmhbW$V6Lnf2ISklS3dR{-<6EZJLJ2nUcRdtUz09h1@%-= z%e9^IT~{gJ^@%`CWsiL9E4~}aeNzb9R4R1K_jH|n&qPC|e9b1*$oH%uPrm2K^*nj^ zCIh-Jl*spDCUna8Qa<#{*HQ{Y^1WOn-#@Xv5+`3PdadZUw#xS^I_fiKOXd55n!ae0@5>^nmaiug za$!imuR7%Wx>>$&@ax6i+auq%d*%DCM!xUkpjE!U6d?WwVtydz$4dErN(5~EInXcP zztG)>AMZ!LpV1h==a*#pe#P(CUip3__BYly7zNbvyA#Uf`-2>RG|2a7CJe|oR4?CO z_zn{{jPBnp@+%(7<#!}Oll)=r@`o1!tutHxh-fH)Zuv*yGYX&4wes_xDr2D8Gefph$kZ7+T~H;vZr>g?v-V6B8?ctO@u| z!*@D4X0*y5S0Vq*NGOL6`DYP78{gU3;{{pJDgPXF=FrY%JkJUB&@F#LJP@1EF8{%C zP%8iYRQVU+!~2szF<<_L3Gy#uE$l!3#clE@B|(Gyhv0umz5ItJL!JCf$eqkwa*=o_kpIX&`7_GpKdMCjqtQL4Q2xv! z7?S^3^o}L(afwhV|M9udE`JvO8{uAPX`cBN2KRX&4&+U3v1H@5)Dm)kG@Dfphk`cJ8re`_S%y9LCZS|k6C zWcl-n&+m}`G-6IqfJXVxD3`w=TK+Rb&?Wy_1@fOwzfizD`;q_LeEI*8326OeNdBS{ zXqJCxj{N6Q!+90*pPvT(@)uLv1;k&_DgTA6_afp;uw9%j|0N0XU+M&Mmc|46mt{eZ z{JV{b|sW2q}b@*N%D}QB@{5Mp{ehEF`D=5aPyTx{p-29ETjjqm8M@`KL$j_){`;}-sg(bL zQXpS_G1STbAleT$%Ks3t53!DiBcTk?YhWD>Xgz|~Ben8B8VyzQKZeg^Xf@J*oEn}e zf+6{zWc=iS{7tzqDF0K8pLPN|Pq)keObGCOrc?grSSXbLS@J*IDF5>o)XBdW``$MB zUr2|3`CqJ%|D^vYaki>_JvUk*rbJMpeohod@_u(nb!-8dD={Y?Z8W%taA9J_m+mO~7^# z{b)3z8)QvPfL>XX>SayNmc@Q!xzOP|Im?X?KUcCmXn9&?nNH}I<;BlCAj?-M%O4HR zvaAeQ0Riy=^m*5@>`Y)T*d{AP+!W%b;xn~GR*WSp7QNVhS<_&8wX7NOKpU4LYbNuv z(4K|wEOO1>D=R(`nq#u^kSgab>v@1yS`r5 zkqOW#E2B%+Q5~|5#(oUr%vM>)Hpx1!LDuo)$*PdGp-9#V)Nmr>>|9wJV*$TSEwVOe z12t?WhW*9L$%jE%>@n6!L$Xe0ZVUcfs%7QI16sLzW%15qol+-jYcv!>r>t#hP!8R) z_-@Y1%K~z2kA!rf&QnVP+YW3yG69WzeDl%I@0E305>WGL{jyF+_jGDFBL&bsqf1r+ z^94<^&P)dU&LrlnG-!}@Hny|dWEG|YInKd;4mr;)ll2cY{?RO}h_3h_ z5a3hQDeLA2S+|tPx)rLKuWpfbTM-P(x*fec(5bOxvF})S?v-^HdUuiIZftksS1Z7$ zwoBGMXxtkQ)OBAh)XS=)tz*89`TLWB*gd(>Eb9T<2ij!SX93y|rb3OZhfHXc^>7Y! z$ZDW%=#=$Ho~%dFdz6|VBc_qHG&0wS=HujeA|9G#@m-wtB<)inSx=+W?2`2?{?Db$ zdcH{3-XvKsSh8N^n7xF?OSQ6E$lcN{>*Y#W|4fthiU5t)0$Hy*p*+al|`RH&8peF%vEzE4(PHuTE+p%RGyF&W75vi?W}eE%fRU##J;GFii=vi@#UK&1*evK0s` zP#`=OS`~0sC=ijMz^FtRRA6+s0+Crje@u@8V@nhmmjD9_M71a|zD$7$XiQ-Kpc)0D z6GY_su+C&wIo z<`w~KnO6b53MAAja4@!mS>t?IKx`uGSeONs3M|S~fW0G-6jI=jSfGYO*9emtQ$~ZeW3zJ;&Wt~0vT~orNB|ta5T1~ zhZH!bOMy(Zk458H@*ao%xD04g;CTFxCx2Ecv?{>6OJGB<0w-WUp+|ueYZb`06xb96 zeF|*GFNe9DP6bY?RN&+^1-3W={cVi%B7t^0w(ZzXW$mXnE3kvO{B-D7;571`UZTJm z#R?P@C~#)30%v6@a5nRWDGHpEsKB{73j70#(BFyeJbbvH2a56MJ|4I*PJxS{BuRmb zlNGomRe?*PG#~K0EKPx3QP8fyXHC$Vwz;y!(Tu=V%>lLVshC=99;D!PPZgfG50yk05O&tnUk(>95z|DCI z+~Nf0ZY@`!Iu(e&4gK316}X*xZ*NuLjy?tMWbRJ-cai_@SOsb=1@2+~o@xc|Wqfaq z0{59fUHlnph4~hM-M}d#<|Cs*AZ3=YdEAUAy zkoVJE1wKRjGc>y^6!@IDFUl48GE0FTGF=uHLuzoou!dldMt zT7mEJ??b1rNr4|S75EX|pPCiu?@(Z0k^(=sDDX>_0>3gph%Wcxz#p{={E0sI;J|Q5 zfxk;-Yp-laDs;#WtC1a^CEJ-SJ0e&1sAkzb$J=9KWsl94J+4J|6#f&UWgnC%JGxr- zL`(K0r|iii49GTUjZ)ced_1wT`CiC28)SPEphC6}yRT8UpFCEX>_C%jJ4bd9d$3k^ zC<(|hB^L%|PbDTM8G2>MR>_{02K1*_%ASFJ2K~5f=#o8?n3=@PDwRFkf@<0E@j$*g z#LbPBJrDhaIN1jm$ev#)o9}|`1x>OOiCLH_dr>O%$X=W!J1JK7AyH5z`%u<#XpQV8 z$+kteTH_I7kmrGF|pca+G^r=Q;{`?Lbtr=xj#x9l@& zWb<5Y7xc(JGZn~l7TRZ3%RbwLTIiQuNX$72&@TJj2HF28m0cuYekXZ$Vn44K`emO_ zTih)B0{Ryv$SxsoNtx`6EohN_Nrvo8BLSb%0@;_5=Q8@c@?>A04Gpr(sG+P78evHG z?qon?cdP6x(7PfNs-a8vm9dZudu5k1SDp{_ud)FBt2jPa)4#e9h`%NT*ssA}LBFC1 zuwNSu8BhhCvajoreLXsrm9lRTWW$i`8`A;XjeW9jN(K5=#8y$?&G_A%3DvT1A?Gdl zR2R#>ElKtr#NB~!4ZbzxxRaXiN|1dwF?Scqu8oCKAm$$GxTjh6y=dHv?cOfg_a#G} z>^f|9<+AU0LWS%-iLxIkkzHRP`$23E;`0#whgxJm94EWM1;sEZ`;on}A4U7o0ojic z+lXdkuk6RGVMz89%s*KpyNP^4Dx z>^E{{zu7ALtyT{6UIoXsDj1asg9?t%1+*s=D0q+y zsuYawQ*aXTlS_act`ule&`1O3-KjvVr$|BenV^ZDHyLPsWeV~`f}rJud<6s4X~zL| z1*tJaz7YCT@)Vp(oiQP3R4_IPIux8n&gs#R1L(~_e@3-}aVFF&I5Pt}6`Yj`=*+HE zFdmILkx-)`&-1}~@ld8<0yQKQD0r}d{PVHRA5?Hb6$~ku$T*R9VLqU>h}stQE4UcV zq%;K&A;+PG3N9gj2{rIsA5892@UU!XQ;=u-;8Nn2l`5DL3mpm`PJKMv2bb3?xB{Kj z6d>oy3I$iuUxohabZA!a2x5*HQgAKf^lk;$6)3nq5r{vsT)_VGkh?U8Z+~uR>5P@K9>B)QPXjK3bGdkvzXgpDR@F8P(yaKf*Z-P3EQT<3T|dT z#|0dRlbnzWRSKS*tKb%Nazikn;3@qIZY4fXK)bzH!Be{x+z}6@3g(;8q~K{e3Z9Pb z^t}q6kq5*UWI~UEXSOML7P)z*4;E5SAsXkfhI9KAETXQR3DB${drR>AN(GDYzW|L3 zS{1x79@-VWs9eF46hQal3I#7oR`62tmSzBTU53`>%(JHicNZ#nMYe)h)+$&|+*Q#~ zrQp@E(4ycqXjeo*qk`9(K;G-{xsLJm*sn*w5_@Hbf;ZCM#C#RC+)S>UhZMY}TftkK z6s%5H@HXOZD^u`xv~O=y@QwxrYv|X|zq3ohyWsA81@DPe@LqK96O;lvb=3;q&)oer z(5c{_c)({*uYwO`K%Ij1(U1q|J(vjC9&$pVf)6Js*g*dgG#{bXN1GLVjJg`Bxv^2f z$14?l!UeSoKAEOq6IxB=d5Som^Mg-UDEJKhXYg%~18RDfdY&Cn@VR0IpGW)oRt5Kx z^9AN#C{ysoLr0e_zN zgKzXG_-3|(Z;|7zCI#EEy`84uJNUgzzavw@_tF8~_tE?yOTkVH$njyGf*;ZUC>8Rd z5}Kh`!H->#4Cr*lD#$xP@RLRbKPBcfYWfVHZpNQe;}`L;SHUmQ=pp7SeEGRR@N4S) zx=O)sQh|DVng2El$`$;Myx$T3eGYUe*p~)f3jR>4;E!?8qu@_93ijtI_%G)6#VhzT zu|M}KI8dhGFXZ{9TftxJ6#UJES_KEQ75qJ$< z6&e?-P*fxo06OENAs&dIK-@tY(5g^$HuNYo$%HC}CR2xtzJb5dtdKibArCs9dWB5- z-g1R}QBbXrKT#ozK6^wcK)wKa!8BkUp*Uz#XiAPkQ}K(*QYf}Up=mCtgD!=pW1nFG z_Bbb?6W6WK%uMK2XjY>_v(b&Go_ONtkbe$wbLr1*S7=^3bSjik0>sTnZ~l-%3kDQQ zEPz&p7UHvzb`d^{BcVf~q#A_|VSH$&LQBZMq+g-rCWQ_wRcL9NLd)=5)}~NOxk86W zL9;^3Qvux-WeTN+01e(rLaQ>MPNCI(3LQcGnm8cG+I)r5(Md;_Jt4F{7O4HmcqmdR zBUz!NOoiAJLPz6&OoKw1)O2hD3@UUS@y9!%U!klag*NmkbV8v*yo-cRq@P`>&_)-O zE3_$Aq0Q8iL!O)#g-$}_B-)el*@8Wn@hRloTBFc5e7EgYC@&k(-Cm{8sYwd$a02%H zRG>XA1)3E)ow?JS6gndr&@5nF(5TRv%%9n=&{;V!pwQWwfSvF2L+A7| z8cWN8T&3t=76&y7?aBcBc^?Ut5wjb;-E9h8LI27G=uxP=TA{0o6}no$nyw*7MZQAU zGQO7aby*5sZ$h6!m3tMsp-!P2D-^mZO`$6Es_GTueIaynze2Y#cWWvPDO8QlZSl~i z(Cy_4-GP5i2++8*M4`JZ=v3(LT!m_*phKa1n7fyp_hmqXLUoA>-5;mWo)IdcPa)nD zLJxE+RL@*JwtD;@BQLxmay{ItP(vYfDfCEzLXYC}Xq`fj%Voh$$1NIJwxuuO9j;+#gXpxNr1?vw#0U z{0ejY^Y51Mu@N6BLWa_x2*)DFnzap6NbeT)QIPW1Qd-z%rz0%v%#jMHi+*_6mj609 z(l?}xA3f@z@uQ5<#w0Sk_h$}|nLKsI^o5Cw7cH3YaT~7Dqa2?*#;n+R=&HGM=gwQX zavqH{;COa;#b2-f^=ZP~BiGNJH*fCxBj+aUukGmYJ>eHcyvJfj^ItK$!Z`xkNP)_8 zq)(hUG1@uKob6aJF=jtUKlG5}qK6)ec<- zjtC2%5Xk`z58E1j(3o&X)YveMbLf;&4yQA3?RdwyaofkS#_5d1otOSUy8qj8LyB!# zR?rIC0l&{{jx2KWBx>9LD|+I%!0eQ%JGIlXGi+!0&Ph8b?{w`ncDi?ZcA7iAJAFI- zJFT6;=$VdLa!gq`W%39M!WWESOxaJ&gn1$SLPh5u9_!M$Yr8Ye#Y5 z!#8s!Y!6R2Cr&h3@aS>=*;D2^W=x;4&~|v-o{1y=gfrtUupwquOL7~|OgA>HpfavBX6X9!PD4t|^~w_|f^ z;jHY;Yfng7a_F47rkOqK+?DGVdxDFS)~sK+XrX)g@Gs5_|GXr8Wm)zKnH48oy2&?n zoOe#b=F8SCT9}`{?$lGmy$8?AF57tR(WW_P?jeUBUY0#;{^bijD`usWBr)U2g>HMe z!qIr<@X^Cdva@$>syJqoZ;?0Y@MVPw*_SU`xNcqksYk9qb>uUh^!FFemm~Uhm@*uT z4%|oGrX$Re<{ig9YW2by;Su3UoEhgDZlX~mcd`Hbtng1wxlvpr|MndDP@TEoaip66f1)Y> z-+Gjp;#s!Tp`{tiG8QjNm}^_cWF6)>ERqW^f=gpAR{tkY4%M;yZV#1aO4`04G zG0u$!Xa@5S2JeiYJJ8jz9J@2iLJ8r?Oty~BTrx2?ErN#QALm#<7a^6Xj1M~(G988>OtoH<7(Ew_(O`s?k)w6(de1u>&%)Si1@ z)>o%ZO`LR)>(;0V#)R?XM@59CrmsJG(+ykZEgbn=JHn#F_k=ySfB%@A68*pIRTHDb zMm8vRj;7Y;ES>4x>AYU!l(PRG8N(ApMA)(H%}zdb?4w-k5gWNPMyxxq2aX!&o1HRYhjT~7 zj?8w83V-5G!)oU9(d|t+loYc(}ww;gA$SLNmAOCNgLq~3CjEmWSrWY+96|?^y zH*#?Q^C&XfQSr-YV{+=Oc(>_Fjy-nX-0bYS;jd2bcFvfwddd=Gq9=95&OH~LzZ89k z-V7T#k`J(hnkfbbhmIYwvo*@G?!W~#nU%a5zHsREum@^K<{U5m{Z;sA$6}5Z=VO0a zBM&cp+#MPn!9&Nm@B^PlK8g$GkKA^{PD$OgDHZ&i)~?+&!v5S_|6cA~{6E+6fy**a z>HoQo9WmiMpBwt|`H1&^KW$`>zwGZXxeoYS)-+W~x@qJ*t!fbl5NH(g7 z&5DTF!JQ~9Oq>66CrSw^g2}K5=eGax{@+|Sr1)cFCQou`-kg}E*d)Jq($vXQ$BfoQ z$HXxs`&uYACN?&9PVC&+d9g`3F*&h0Nd++lu?0ybF(t7jNeBJ=^ha<;CPp8)^-MBc zVF&h{iP8J-K@%KCw8uU9f9_NqAnr8#x2CYX{+;KYx3jJ3cZhaIiIF!q}+MW4(cvmmL>4E_}JAC1?2amX_f!a$0JtZsP8hbmPrc zYrnj6_>~)~9Al0}eLNSe;<%4hOiGBeAI>@C3BZxJ zcH}&UZ{qmyEHrVVYyXqzv?&wAXK+*DDsW729QxzwjuT#UEE;Ov znpJ4VaBk*lPRcBUi^t{QL3Pc@dH(lq5*8M|@qqHYxpU%u=H!V^j_TsXk$cY4u#tc7 ze`?}Jy>S1H`@nJG&b?GY4Prr zivk%7ryriSaYb0u&^f!Nd6VxsY0cW1o|F^f*RL;LwfeHQgT3CQQC01l-1K5&WKn?xN`x|NuwQ(Fs>m-#2T)^k;m&(*yi?M zVeF72AJczdU=GcSn-cVT+^z{xN_HfV{_l>o{~^-m^Lb!_vmFcn(;eBA{=3=(&nKh* zyX>$<3ELOVJ$=!FlN0BkH2=P=4Ov;Y+;YoR>(-^MDnI7roNecA+K{pRk>wZ1Oi3-h ze*Mg8yHj5Xj2RngO>XneV%u1ozI#`C`n`uGpLynChq)%td^!{zy=d`{Cl22lcT~)b zEr}PVwViutGHVahR?giS`>%)bnwv5^DvU<}#~St>UgG2&nIE|}Ms{~+`nYl9#*Z7% zEpSrw=yBfJJl=C@EHGjw#&|hUpZ#@tSk`y1yz=VsOh@kX;g1e2s2#2jiwrl0zULTU z!!e#ip4nQFlEU^H;T;`z;NXU@;c;{1hP#a{`!5sn{ci_1W=g>F``oUmv6}6e{l6Yu zc9R3gb7c45e?<4+djEY59e6$r8$aiagBKhZx9P-<*$-!(Fn{)}(i7LGuU{E9@K?+1 z`04X^HZ8mSs+F$j<*=A=9=5_Gw*AlZ(P(Z<|GiXVV;q_@J7#h0Vw*oi z%aij|$JGBkz)TNY7_BM$ZwelsTMn#f;{L^q+)NHUzV0`V;&Z_>?8tM<&fQNeS+>Lx zFc*}8Pq)~PWwX2eY08aV01lO5KR zj!H*aboe;W$Yn9baKwZk_t(Pk`oF$=H)8gl zm}3^kG5gvdzRDIx~IA~-R)dg`Gdu$*RAW@eCIuNHP`?CYM-yxw|?EV*Iu(_x5wGMb!$^o zQ;X%pQ}@pAwnx|G& zyt(EE&!qLQtzBDLyY_eBDBpEZ_6vJes8Si!(_u51 zg)E;(P{9KS(gH4$6~tnpB`T5$amGk;;pPHor$ot$cr)o6M*Z>;O`O?Br`GG8}eE%{)|u} z8N#~wGcZ3svs~sr>yV$(eM7$r&JNt2XeN-813M&|MQb=o20>5h0V^=b_@Yjn+n8Ti znBO=yzn~yr`hW>x@$rDA^5bjW9fkQnJt96=nBO+Ou%MuzwJpE!{5x0tLzC$p+maP$ z9y4a+BM$nCv4)i*zejOYekmtjVmFqI=)?Pzwn4^qL_D(?LR6#FP(T2OAOv_ zXS3DoRQs{Zb%Mi}hM!?mGg!_b?G%uf1iPpr`RC1O9hJHcN?myGr(eCJj?sK6WC|l-O_zpPA0ogWQN58yqF5nN zFSCFJsaC35yjjJCStGn7tQomll3BoaYME??$kG8DDPW3_8qr3RXJ}yo@Gl@{fc|}A zwNIRG$%#lzw~SmeX=+Yq!R)T-3%loPsrn9(F%fgngG0PRv4Zmw5Iq91yQHciK>l5+$E^AI@QHDb@(hb)l3*&SKVCG zTvFuCblA-C#+axGGK(TO2d8_W=Za&?O4Ex9W8;m^5)c+5OZMJnx|(G;2Ok(?pyQz8 z&D<1(6bk`*5>%-Nqz@L)U((q%8wSP)pWo{C`6lgOlwVO?QnqdEg!;PlX;bfAaboOk z2gZM}ZN<`jN0l{gMB3tOeZD0NN8*?C!WCDpU^TBj!$z#Sa;5aeM;D~!wGPKsrT5I6 zv9G#zgws(|dv9mgtl7^=&q@zJ-#I_?MuSnS)rxg@UwcDK%eZmZ-2lNZ3NGlz!_bX7 zSk+!%Mi?YHYtkt490nG^X2N+FvKH7F;reje1X_;sLQUF%g+?&;$!F}9)64vyEjg`9 zJaa~K=A4&pk=BbI@q%AXy7M63u@dhv0r$-kYJ8Ouu$W+|DXJ52I|thFDl#`XyovYO zZ3*$29$S_@3vwhaAvZwyA;TlJpZEoG| zlO}E1DxH%W*wNd4BYh)p|NB258Q0v}_P{?iXXed2+OXK|E(%XruwehI3wl*cE6Ufc zDJYa`{1r7dJ8m0Y?|+|mqOcu0umCzRO(^pfN5XPSiGnUjg&cT zETuG-Mlz6~9=EYL7VMKiW|EuiK4Xj>V=jva%ZPv4@lo47x3cJG=KN3V*s0T|o|rqA zZJRo6^4QkaHcR({Q*7y{Y{qeS_8ZkU+g*1_r~LQWY}IdM#+yivZ3CSrg3e(;PTf9d zKUpbK5Fl$rxG6R~J|f;_qo_cf-6j}gblObjvXzy>*~?{!6l`O8Y$~hYzh62eoyHG@ z?)lwCPi&a2IV0UJT`O%qdi3DN4XlYZU*oGjzn0VHMZ9}F-W?%i`rH_cN-e79lPRnO zEZ}T)s6qMrqUuWjWbqdN72v31o!>+Y$b_X|{a*D9o|zyN`tme*B-!Bbu@%o+ zahd21e9OQVkH(fsUPH#B$2M5kWyF8@6jc8VV#@E@b+B4npth39GrKg3M=L_}zIdLnq7 zJPJGz^!e3E@$`jmNJfr1pg2Lj4);Y089rAyloWsr?xn-b*eDN+b}Swe8w-C`X6i78 zRWo8_M(0%E88Ek5^wZMk-;+Lj3PaP2U!L=7JQx0B)S?c1EBd9=jc@^5u!I1WA8FbLM=J`qVkE`qcR%+B2fC276{E_KZ=m6H)@%qU;Td zNC9D&7mrXV;7^F0$@mkQ!u_}s77?<^tIXGMpZ@>tGq#`+j;eyT4)zoTsC%TheJ{pI{p>=A-I1axB$fUz!Lop1XRG-GG zIxDFZV%6Jw$FM~oOZ!78mIBmgC)?Cdv)???er>vR3;W}cbn64%PJ?bKf``T(PMZ^& zS@!4VLt-n`Q;YyhsyjW^WAPZ>R-2CYOF$cIIRIovWR!ceGBp*q4d3*!`@Xn-b4Et% z?GuVqM`oXV_c70CYuco|7f!MVca0g-oW8UfhQsm|r&`zMb;X;?EDPJEUbb#hk2x{H zzfENsIr4_hqiyN_PdIOb7n?xqa?-<)+oD4afD6tLTv0G4cZU=YG$>Ru+?EvZWH~Dj z=;46h$vw+FhGA2vlpAqMoD>X7(Kd5J8pA&_*4eoD7mHUeoZtJssZ&PS<}@#ve`jIW zjlLgWF|8|ieo6j}oX*a^2Q0}Iw=H^O?wp3|&6eEkUo|=%_4U^+9$|+`Y_2cr`u@qa z6*Y0;7SpLTZ?tvmnxfH3rH;hB#S5Oe;`_+c0gj6`*^f2R2`RorlI2`?L%IayIp4S( ztAI=p)sk1eO3FD2u;S3UGq`^@=u?gRy+XRrP7B9Tj^HL`NJ%osM@14KrAS!5W@N@f z6i_G_zX_Y7-~30=TpZ10VsGyh&m>z~zA?sdQmc)&RaZ@&R#lT0qtU(^6PYr`KEdPa zvRDi`meiJt!aLWi?z#}UG&eW7(rUHZDlA!fi&dXr=)GZg&K#dL+kh-ATF(m1_b!ZA zE6=xIR4I})R*|G(tcW=)PO~mH>$KGT8HrPk_Z&GGppnAIk;3RF!;w>fX(MeSmD~(j z8^RV@3@yeur zO3q)wfLQ#lWIrk1qbl<+6?b2F#Xnbm-ZG4L9>yC+wi+QgAcQDm-jrIvxg~&k8<9Oh zBQKMoG3c^o;uroj)hic11r;Lps&^gQdwx0B^Q;c>v>$7`hv!8z#cW`8;tHve9rNF+ z?e05!xDTVb7V(t{7@tbual%3Il{hfLwa=+yL2(MNV8B+q_ZICu<-H&d@DnJ02wRE? z(M*JX@13%5U_#iLl^v5B#TEWrH)$vJeM#?aR6VHP#`)0xsJ6S_mp}{a|;W>$Y9ey;7oy=nYj825n@(0l|HRy*EHx6+OfXG%~1oF%D0VOL2v;d4>A z3HyJJdcEL8R>^vw0U=RUG^{Q=(`Z%L6oe7k@IG`gFtHl%>6`|J(PS8g7b|~Ya67f?KrMeOlu9VSWVUVg$ z2pt15AZmb#I2{}lX8!$e@A%!dU+mi4^Rp>4pPAeJlbg*k@$TbBleY5om@E25{dN2u zbFQ~M{i9t!7-i{OQC@h=kzKZ7VbdLd?D|8yrz30r+`TKF=*@J_?OL=Dba(-DXh&{M z9CX{_qcDQh8WIXLe+%Zls5t;vuHufTFbg<@GIcxd@Fi^&u3 zi3mfI7uc1>$+)IR=Y%BX(-q@Q2EgAnzzuRm%oE>RMe*TZ%#J;HEO-C>s}9WbX3slt zcl+Wplc{WR`?SRsCR4>?%b}fGlm92vCM|gA&EAEl5BKhyc*CCh`a3sIoOu16^`r4W zR_6fbr^Py_k{*nJNthf7e>4S>t=}JAMOq_7^d~077@!AJS*oH33D4kYEBqFD83?o> zcT{}g(f_mlnt%VebIYrV;_QlmB zYM+Bu3!1OTm|{V5Bc#^iqcIUf(VUw@0h+5Wrn&Mtsk@74P8OymCDs+^ibh0TwlZa! z=OO|TOMW%EI36U-3?g~f)d%Ng|NZ5;`*M#RjGcE_A@nqb@Rr_3-d@ZiS^1=CV%^z~ zcOKd|ar2#{>-T`*n>pbp(cTn=YcRhK&^!Ss0HQ&0kep=eiNL@$01P!ES)Bb72)d1C zGsCGT=CssgV{|0#5x6&e-0;8o0>oM%5lv9LAiaUb70auk6Awy$>D@JdKJ?)i7k+>2 z@!k_NW}UdBeEs~MZR5f%h?+({zzp|FA4$`-KYDXi-jkj@@zKsb?Hzk&fKI*_|-Wkv>LZ9>{eii^q^f=FG1ck5@y8zd-h>77`Yym&A-dctHL7z#7rT(h!hF%Gk)lQm@kx<5SY^#e z^w@N6kcPi9MB;E`ZJ``ABbl;>C*M#yrUPSB!Ld-OWZ5+ImC@hmxwQ3%^W5PMl_T9r zP6tUqN1ij!YDrFvF<^D=%uW)Jvc8atSHy*!0s9L~T3jO%mzKfO5;-VHVu9>TaoU6* zw6^@PeaTe?IeUB89-N<>+w;Ix^Y;|Q9{k|1cZC)bGvPGJAT@ z4^Q>6H-^H=NezWejO>Mt;{mtLdx-j7ccpwElU=lpObVM!5D-i^U zHpPKk1)GRFMkc4pA-kGIM#uv=MQ}GsZbLE~ohOdX|I^L8%a1Qw(Yq%97(~;76W6}J z*54!^z4Mj@`#bzMf(KaSS6`~@@vaE?V3odd0!;W$;BVt;R#<(FM(m{Y1$eg+@i@dHv|9A{rTr}|^x`5iy~1=0R@p#6iK9N=^Gp8YszZN;;r2t&Zrl)X*D z9$TAd;4mRFoF^Ygu_#5@D{~-Hs!HyELVA~d04nOwyrBC0*7H}(!~E66 zN2CG`F@v}G--IMa{KZiK&SC?;S$bzo{g%G+`rB?QEqgG^kc8l+(eR)lI;E*8CC2c8 zdiLz~J9qXhl-~ER6|dWPv%Rd!xplpNlX%^_TkPePj_p_ZHxVBw{ExX9h59FC_Lrv; zOO%=g`wjzFc0dXTaloR3w?@a4an9Jl=D^@>^3ZA5VrLwTo&N_m?fAlFn|B^l&wlWP zR4H$Z<3FTbLA;>*AM z<%`e%x^4IFZ8z_}-2%imm04K6bQ&!4d+F_cAD({mgAd+3{UP4}tTa_U8Sgg;iNc(t zNRyE5AX?E>^6(Wh(E4#9yOKz-lor;8@$)^aXtawiL7Xop+7ug|7?T*A?tlg%2#wa4 zMvTY^l!p!YHkWVDJ`g+m)GL4f>q~FVIL=;YI_d0NLdh(6ffdjffbx-vZ+f@S4n&7-{IZMRD-BW#mPf8pa)KOiVDQ z#-4j`0&j)KEhzICv&ln#(?h8h?qxEq5$&T$HLgbjm(|k(rE2gbrlpW4RB+=KbV`n|qere(30N_3Zc7Zfba@ z{oRxPw~6=9DE1+8J$%I`SSplRjz6I|3EqKC5Ww%a7&L0t0x~-kXrP2l5)gtA5+2g# zFNYD!(wLfZ{xT{xO;a0=H%h;-~G_Pv#wm##1cNXG(5X#?!+LtIMHONv$wj_;LMO>>Boo5N zj-mWXF3wa{Ta zV;I6>06QTYii|NtGT96j6Qzfay?5=7;}67kTiA=@QGb*4-tixb>(1|g@I{QJ8$7a9 zJ$o?r!AC(T@&N3k`#Cn6H9RL>@elRv3zJoc&)>)AgMZYg@eCPHR=^KDI|y(Dfsc#e z4MyD-YYKXwF9UMr6BKdahy{ywqCzZcIzzO8x-o_`U(5maHZL*W~0 zY58j`lX>2dma}7Lq+`sT@Cpr#z!1I= zmj**l0;Rb_mE+$aZocsJA(d*7jT6sD z{F5pb1kE%qfWhV(p_L&Oj}q~sA`t!vW{Y{;u!cN0jVlg}+~u&(UzTEN zocz!mTl$=_bvez2**|yyHuamR2Q#4_EE+N00$;Al2o*vBdgOGf#5qCPjS8%o7$(HT z$Hd1`U=leuJPnD*$^&UtWu++$vA;O+ijaD*Ep^ft<21hxE%x&N*8hrB$9^J~(He`w zThdEv7wU05z>}(c6|vEg@apn2(&7NS+pyF`GK5V*(aqo>wi!W4^$plY+|5J6iZR)k zWT7aQhU3i8B0MBoWF(xO7Tp7=gnk6a7gU7b0lb-)B#BS0I5Mhs%-EXhN3L8@y}rd) z@2p9)`Rr-+w%qEpy0QgZTHD$tY)*-oHeuZ9tFC^#rFmuqOOrm*SR9AliII`wg}tat zibyjZHktHBmGnDJV&s);pFFzu$|#JMVr1=zBiJeXCK{6fQl=I`T!c_$43V;KAbwT= zh7bgOr=Zs_)KjF{l$nnBUKq;B$WkaNqBK5v;VJsdnL+lQ;XiNx_@$SYEq$k{E^%Cj zV`Oqo{f)Igwo2M5CS52x#7_5pB5l}U(3oS6CECLhI@*8wZl9EQh|~R)a6;Xp9woSi zQlZ(`Xp8`NrkW@jT;)n5W40+SHatu%G`g)86&r(luokKXFlQlerjb=kW}C=bGd%gZ zp3;ocbVn`~A;y)FDu)#Hl$m9YEi(slDRgF?2h;~!>s;8Ep(!h;4%$;<-{&gEhO0p|WUmfz`I?*Ek50&;ObYFF-pOdD2? z7>ocy0G%R)<>AAcyZqtO=l*c)rI)^{R!4&88iWp#m>HN+TTN!N4m%o3fC5;Q*vEu< zU^{M%uTa7I$<9i5KqoY?2E~!1O+%I$tq?cOlsZ31A|;4LK^$%-LUICJNCVz2XUhaK zwY4gW?vMwD1*dB$BX^Rg&6YkT`$uc%mzOVEmDqh#mM<@FdUdL`yZGj2_XOLRDfeGh z)R>f#GHYq(RoB=?<>bw*vKpd$dW^LetH(C>KeZNvvC-3aLXQe1!-4TxSq)Xab%qhs z3tASmH;pOCF0ZKDillG7)?hs_K0eM=ky0?f#yqOiHLj<9%$VZh(&S3_&66jKoq67z zyv!!c=*@ZF`0Ui?I@e5E2Ue?TQ0>yja9^r~OYJPg^C7jFFpYl!$N>hMz*@OK6@#?Q z1lgr0dC0{!;R>>IUt|yYntg1w_F1iBg4KG9)vAr5e*=H;YOK5})8Fp72-ki|{f77AQ|Xh`%+ zFLV{ASqZv>>O}A&B9a(H-cl63;3R`)LRKYrzY^g0lawUVQ}BWl)0{x19-?!@xaQ8T z!$+%}?K#y|zESn{j#~GT_G#A{3VpRBdPj}iw5z%%(UkqRxX<4$K2=}8>bfxv>KQr7 zCS#m!lO;;0n>zWp{R_t?S#J&CFq}s3Ije9 z%x_i6X|Ap8jPy3kiI)Ep^Cq(W&q<$3pFYR-2fxI#kSEJlA@8*dtXd-jvn3E4sgU)Nk(NNm&vu(@d6f`Ay-EhU)=?)2pBlx$QC zB(bER{062j+b;y8L&62cArLa`&){|?3sUT^U7eFrFk||S){$0AsVUJJW}fL?J1Vm= z$&y@dZpdmYEiWrmt;xyBxT4|4&d!LaNRKJ0JfWg?TSr#GCTo(V!P#1Fww0DoY%MDR zJE1B-ske-#d|9X(sB0hs2&4*NPR)GC7G0;H(=F8TltjwCBjl5B5uOWXbZSUWgcMjx z^^_bg-gk(Nm7Y8#J${JHKhS!VdbVnV?s37!ruz&A=(H%J62uw>RCI*L(q)t&zLAg# z?xn(?K{`K0TY?{6Kj_1-&<_XSNs*UJ-Wd`4;ov)|Ea8%OMumPj_)bIUhl58;0iNJv z2j5u``r*JkeQ_kl;Ji^aQ-CzQG=cwf)R^qaP)DL+g`zuU4^GaT2TSp6pJ*_ zIxeHTt*E@BwthrS)s89ISteu7^0(Pu|BLF^e^*s+tuC%Yu3q|vRD)rZqrK2smNI(j zsVis=8`M)&`*g>U;lIk4;6~Mq3wfpk>+_nA&@`+8l?A7hm+4_Tkib0cbQ8tn0oC%n zRPw92ZVUam1CdBriE<$yGS)}15jw8KxO;^Vl#+-__WZy?K9~@Q%gfdQFD!@QNdJq4 z&T@;b)atCU6qU@WPPUbmFB#P|v#=mPZ%RINz18Wnj40kYb#iw0$Y4PNB^>v)b-&230dWz>d zByovgz^cK6M0IqCAaSxHam`+q^m9sbz-PGTerdA$T3|*V;R>04kqMxdE6ohOAfk={ z->QP&qJn@(%yX#-v%;oDF@;(Uz*wtYss(Y=Kvak##`A%I`3%0I10^`_43o*lgQQ66 zR8o88^e81;iZZx49w7g3bl!i=mRhxPqtACdCdL|WG^Dy6ZflLp9hp07)Qlrj5ytR0 zj_-B0Oqp^}+it5dqf61QT`P@!%n{jz*-|XjBuRhzOO*{J$ zJ)iwt^r^yCw+S5I!}|h7+t@s)+UDkyQXCyx)+F{SB}}3(Sh&O}0Y;UHr<#T7d_BV{ z^Mqs0Bx~%^_vuTcPh`!J#Fc*RYkUu~Oi9gTm%2Xp`oivL*SZvD4O^y&T zwnu!X)DjV0WofU;_U2}do_I|{LUvV|xyU*tH^HpcMsBvvw0XTXH0O56*4?@vpz5La z$v`Qw%q2#Ay0O2am;|a1KLb~S9x@z>pLHDNb;cw>ij2AvzyR8Dl{SFIVJzGUpS@vh8qt=o5u zYx#f-Pf_?YYO1d9w>!hNDzZD}`X-nB-=A3y?9MZim;F5WRSQxoBA=7GCQ4n;^?wPo zEk*h_`rfPu{SB}OQiWNZTPDj(5sAHIn}M zwQ99?3jMEDcOgATs~(@6oSd4RitT{<98`i66hJJ4EgM)R9Wx`DTB-kyr~2PsW!c85 z(^JmBt1?L&*y8=GSKlmsqB&_S`U(TOYx*l^g2}PuXcMVhPrIY4w*^E~~%FB3b=)6+-<$0(QWkE-_(?~f5i3X6Q+*{VsRXf#Eoa7k=2s3>B-nsP+6FN-gDTyT}@7Tn$Sfiu<8EaOQ z!65HRjw9+SFz*OR7$9v?NbXZ|IXOtJV_KL~T6GVUXs}i$GBVN-X@KzHR(mpJdz@2; zOiz_v#Vg%&Fgpmt)cKTm&woOGwcH}bf$fiNA#Ut{zaT6l z3q3dpvPN(f6d|zm{>wtHK=k_Jk*b{W{Ua5B{L~-!4jiaY`f}cYfpXa;kF^STf&n=a zdwk)P^BRN7%7DJM@v%T9Im0Lu-dq%P+*fDNDC^yskX$WI|N5{_4yK;v5UR9(;B1x?&Kmf$cktK)>$MayfDFV>YkgH& zu~77^NslcnVjDwgB54KeyNsuY1}juEGn11ty_sI8Jt-qO!w3}`CR@aSKMA)}tVXR) z+0Y!5QLsIrp;XFxdW6m1bWO{M`7UR+Ev&vDEiH&#}-&uyckSIvp+>{?&8Io_K+vbOy~xA>)BkAcE%$D-^*Tq7FU4u}Zj zC#o=1NQSd8)IEo3=Od~ypjJ{@jF_01xR_uELnW|*Cal}Rbd40*vQoLa5`dcc#}jks&duA^GmRIZXpJ28HubE6)RAx&{ zCkiiO{l;^d9*yit-t8(YAj+}bkn9TRN0E0t7Y~7{ek3Tx=jj*e!ONA5+yPg@+u@Qg z02@K_5nL2laJC&9NSYQ}EUP2I9#Sv+zc^OafU$~?K?h0i3}>vQe`1CEpO6bKWJfV0 zMDf62q-YA|R&yu^B-7~v@mNIxd4mclcr{;-A#d>w`{__fk@AXgWrV<@tc=LT3apBl zDr=(~2Fz7fM!}U)DLf?0WG6{vc<~WpxGal70Ud&7RC32tWids)KCDv+3tJe*Gi99) zyX_lGwy)%?~?hR3PX?+%G*;c<5kAWfXUnpV4o>I zyTb8mwiy92)ezSV!Rsh;1!^o)maQgUzaq4(n0Wo%75%lv|BuH9VH+|&ZevOB4QG5Z zfA1c^-;Mx(YuIK=VdT}-q=i+gL7eR(&ekAlh#G<{<963j7yE|s#7l9rDs*09GB+M0-w=*)&uxVUTti6V3NqaD!X9Cjs z?JgzaK%g7KJjA$LHf(_5N8J-9`5#30guI&{EGRAnK=ttTv(b$5OYy}!#Pw*SaGiAh z(aw&8qpC;#=FpK}`0A=8?;ZY+xUQkRlm=ZD?92k;&ZBu*@QEo!k53>$B>znvMpOnp;vzW!@w;Gf>4l8hHr@78}SY7UQMvPd^l#W^iO~z zN)5Vp&gG5X9U&#^D!D$L%c*$SzP&S4`*B*vgi)F*Q50o|Hp>w&Th zzJ`{HO~KMGO;0Y9&ptXF&LNzV_i*5Hr2@F!6EcOe21yjquNOv#ZWb)870n2&>$S6} zm-b48N#q`4*|Kcm7xv4ROWou91}^~Jtd%1mX@t6wBgR&aEy&BL$gKEQ{x&tbzdV75 zBadFYB<;UWI-R|KIIE&o)uZ1(4MXoqiYg;(MW=XQv<7lN^Ob6}082_F zFTJQBtHN7hPfN^9${enj{`IUkK)*_#U77|1%*L~;hcja`diDs9s4LZzflX+CjE?_2 zj!+gx5G)!X?_pii{?%0DzgpVQX0DcgARS;XHj{O&!T0o!bYLxA1DOt<)_?Vs`iRyH znO`O}3L||rambJrM%SAFkc#O*tyE2@7;SVhHin{Qgc_{iZ2)-Od?jnCC@*iUXw1&C zSwD^&s(IN{Mr`kXFg`6JJYs#-(_1Tg@~2n#iSI>ulgm3MF9g;?F)@J96BpZT zPLzn~w0_AtYUG86t+m@GpJcW<^E%^A853S<`XqBn^@uyBO6#BRnj4ppG2x{8>uTx1=!Uhd>0Ef8lYn}tHh}G*nZfmM3PFJX> zS}{G^SM;mK;gd;$fmy+DNTsODZ$K=SvTtPhTqpQ^)uGavd>oJ{L@>)@xx5TD4(W+? zNp+z@S#BYS0tcnEH5599P#*TA2Z`rl%zU6%bawSOpa97Z7yOaKTy{hXOP&lz<8|a@ zD-H?#gFvVP;d=xzAVm6u0!jFgM>`;cmhpPm;05Ga40UG*ny{dnh?gQ$`;|C3e;bJm zv?V+tjZJ8`UsyDtxrvMi?BqCWD)ofME2w8AohAd2QY{ijhavECJ7Y{rQcS8b)#$M+ zg^R`_8%4Q*-`kNnAvYCNT)S6Zm6&S7HMP|nP>+v>PK-{iDSS@#+h%B;cK`AJAIZq|O7JQb=? zH$zi#o0iuJ3$xHwK&eGb3HgM&BOu-e?c|98EE2Y(uk{idv z61(~>)2D=m?lSi=EpOmu#7eNJ`0bA-i% zx>CpJoT??>DbB?e6(dJ&KfhbO^2~w-%a*?rRa-r;AS2ObaurUz{dQFr@7b_l*G5}?_%*gJXa_6-6zur4( zVzp(GcAIq5xwq!zZfHL~caCLCO;t)t@v#_NL|m4sI>X{i8?)z+Bih|rO>t>u8f!&D zPE6r=bN=2%i;rcNmtWCco^1WL{6JBzZ_W=PcMX#tLhcxn?}p}wkh=!GX9#`>x%lE& z438h+Ajyeh-;E!{FMcjPz1R8w8-CCtCuJNf_ZcXZkb->iWZv0cmJ#Sx0vQ4GMGGMz zr;Zc$#|r`=BoOUwMo3hzLgsiVh~T~KZSozua5O`ZaR-tT-{MWg7T@Si-}oh*F;acC zdR;?(?Kt1Kk|H}A!5O1LQ6c_>hF-1rh zW(tehBfjtorVlG;I(6dqVT2zk6ucbO zh#5P4>0O;}n3vsiI~R8?o;0Dhx}*rE^Gx?lEL3`iGtT3TA+UL1js?sXCC5T3edEgP zzr?f5!HSBeyB#)HMM6xB!5tfm<7xswiHg%kN8?B0yzju#n#wKBO@?S&SzLIy%iX4Y z6KPO~xm**@J@{QTqgt_(geyh%Y*bHDCR`6hjo7`Tgg``f*bnEIQ(@7uhJvtj0h zHraEVHl?j=LRUk5VSWZ!Ah9*6HPnNPzD)89_u#0^?z`zzHajFrD{cQSY}ODgU&I&Z z?*1?El}?NNl~iG}FpqWn!VADx`5}B&3gxPzVji^A#tEKiBuG_|oYRKETZO~9dr1EJ z_U|Pg`!?_OealzMyf$@;)nY`k{>`J$eA2o^zQzws~**bI7xKZPpkiu0|;C9*5fC(7jKaXT1 zX$8={TJe-=Ta(umS}$YfnSaK3yVeBM04Zc}kfcl!ztg$95P0j zGwA?w#HhDqE#-(+0!68chN6!_9L<#gASHds95JX4Dx86z^>sO7Ay+CnVmKlxH^XgD zLylN2tCe$)IiJhv#7cLF%cO|`$uI_zF{#YiEx!IpXQ#Jt){hD&Idev)IojN&OtZ%< zXNq~VRXL3Zqh0V>mI8iLJ z?`{^?_fFIQ#G7(ns7nEKN;n1Y56N)~r;sDG`dTbZqoy;%sJ|`;C;*fr(1C&v9deJU z#UaorkOL_QC=2IELwY(e^PKb?>IM^Qgd^|NpgUu@;>gEQ$4I#lS?(DrGhL8CaR3r! z_nx`QS04eu>enrGV}G{tz0WTEes=EW88bTzdTbBG0I*!t6;G^ z&oobHOmKungo}?(UGJXU-oEdf&y$KG|1Zu{r6M2n>Hn+q)S`AL zUzp;XNPeXaHUD-rY(RAit*MNcha;I*qtzn~P^aU20E)mj=BKn;!HtdBJb7jAZEgklp$%Pu;>Z%nUmTkx~NZUESt^$;<6r#a_*c3$> zt2$(?^31h<>rt-{U@J8JNZD>IFINEZk>w+6s&c$;7mTX1q_R+>ipn=Gl~Jr3Hc8l$ z5WDI9VUa~M$Uqt%d4OmCn)kU}j@@n&ihTvjzNUNtCCv@x7nD&%2`1>_rBTNjsd<^& zq%p|>Flu2;%GJm1H)M0UH3_J~`a3*Cm)@ z(6m=))4n3Hqzgqus^u0~YZa??pjNF_JzQ?uO=B&$-+^X5 z5iEl$JN1=jvo~Sp+_sl@byG0a!ycq1KO{{&EcvMow)5jl#mTh*N5{i-GgYnQ#>Sp~8*z2*JSzPmCyC`3Jel=!_YMsmrKJ?lH>k4imrwV;qywQ2&}-&B&#C-a!qa3 z`t^VP`_=2$ulsmsBYy4NLI29O#Gdi*?_jBS-FfF-(jTSY+`ebuvZZIvEL*yC*_ks- zQ5O6Edd%XdB;I!Zx5iAe&qMhp1EpU`QkdMeIv6}pO4RF+sN+fUK=;ccFf2s(b3fxU zBp1^Zm0x?g8IYDAF5PKwl?bD$9%_h$F217_JZL}?SXn6ncD2=|qsvAEsw;7q1osNB zhZ;UqcbVA^Z`+)@6e%vdf6l#sc?zkOy%f+VPSrkE6CGBw{Hx?wj}tAv_!Vx-l2+-mjj<_BOt&c9Kuvp!|T zpZ$lVh4kTZIi{EQ)qUzc>SqM>kcZ!iT#HzQ5+RiH;+RGy+ITV-s#HJn)&%OoJaQZ~?~pk; zJbwN9zZ3wY9+S4a^FUTY!us`pFPr9WE5A=XXfG-rxxFdfqXQknHOo>#LS|x8 zsp;jcw!B%ZnB}fJqYP15mLua%)Xkc8HHpC(gQe;z)kpbe^Wx$?3(CqW8z2k{ql8u@yjhY(f8KcoYFjbQp$YthHVi=`#2#}0qC|zs;V{nn*@X+MR$4Zl1tF9kC z8Xav5CQn6C{7vWnxpKuHsI%=|4G!1L84vO1wsQ&#xgP)DnFpnR4ml554OD*XdEg9b zVVPVdn+ngKFm*x^!N5UBkP@P>DoC7~jqs8j6&#Q@tXx3hMt+qZ%Los#!)Ma#sNNE% zs6^`0^l7k?LsZ12r=+Nce+)S(sDw){54el>LRR|epe*DccG2 zg20=t$GILnE`amvsF-x{H55SL7e>f_V295xi$*G-MJ1pmF+V9k)Z+dc(Kz&44orml z!9~*_WPsm&DJ~^GY;jJ_yj{CYy6Nn> z6q9+yl0c*46)Vb9ckJ+#7RAKH(HMCjcWoLf<*a1kK{!%FbchQmYmJ5{w65aSLA*FK z&<))bhocRwCTqMa(4U>ocK~k%#2~Cx-lJUxC7(S$`?Xj9yn6Mk6_Z`#vX8S@Sfupn z*3tN-P4ho?NP1EFhxCvC*=LT=nGk5#9yIAdJx)i>zj@tpiBRtw=}6Sq&@|SOR8X>HQ(dgPG67|rf%;@UzM|d&CBDKyZvmuq;oN9= zA;ah_05us}6J9M&^&fh4K%KNsfBU_Iildb{w&oqY`;vK3f$S%^<-9o%$^HN~bLl*& z%iJ|6AEo(-oCkH8JFxdJ&bJ~tiGw4R+^iu+H|RYG|6S(di(kQ`E0@oM0@43lVPYRG z*bCnwOrm+`_H*}sr-(>DFM80s+z2#k{S$G#$X`xmb|J8f9>B{45j`-`WvG`RN@|lx z=|jPKf1LD1*8#S<>}5C|8=-I^))Wg6i_AYXDc7O%y(omSFbR{7K#6*Xt%hS z*dt=bj0aP}AFIC0Zi-=PjpO%7ADw&qJMJmuJ0tc*XQEPHs&&4&6tr$a!*dmR`l=@M zreb52<_NqY1r9Ki_Y+y$bYK}-Lx_VdWz-xYcnSZxz~=F-$1f#|FDW^h3DmF(xF1w< zG@TuVUYGprC|DFcj!6B|i+Bebz_!$32gX--T3%Xqq5aQ!)oOn5I(r3st1Ca__?a`( zzoMhJMCuKLu{`RUHNbJC1kdFHjmBE zb*JM9+<2WvXk?A@gys37TZeoWfQPg>;;7#wPm$=OqI@8p!c4)~5_M@!O_tBK;>z5r zh-f7rb^Y*ItuD_qLrGg5fecpZKh`Y~VN*H^=QX5`P%=}8$8EmJ_I8y|Nnk}TEBEpE zdGb83-Xr|n7j1--=ZqB*`$M=eaAq2Lb1DJd@?e94b$ApFXWLS=Fi^iLXENJxp;Cu) z$?K?k!->oKD|#+*sqbr_Mq&e{J+y*=4?P-BptJ`W`!*Ij**U%aoB|0 zm`Cc^HL3Zw8IL^m%#UV`%^c~x<%skZVc&>SExU)sG7~G$$bDf{#fNX4{?Hojweuq~ zG3LP9MhG_H9$z$-Dk77G#w+i8S}qi!0eOSkL2JkXyI#R?l=?h7hv!J$poiGd7k=%d zuu^6!Cbgs_nd6L+wkX@s$Q}h_(Sj6fmy0En7f&lLvRZdpt#Q(aI0~TeKQ|+v~&RtJX}mYVej~{yE`8_{?x-yZMs8K zPlpWNYCU%^E5{;Y88dTU7&+pD({FybZtxmvg)HHKFAm`?wCL2R-SJ37@*p*U_9v|) zuu9AnwzV3aP0`wgl4BshDKTJRRb4tRLyeMpBW^&g)FrMR#`Cb8sIGI`lM@kW$kJ!w z2r0R`4yT$8PdKw(JMKTY@0``7=H&%^r17-N#m zG0Dc{bUPwNXzsie^)?vJDiS&$g2yIKehhCXF?d3zW zbyc*+ooHBcJzAFBesGEZz28WS&#xulv-7LpYi!zhd=-m%uRCgt6wzA^6DQXPb_VbV zbXOsCN~crOf6&oWE6&p3tT(waC4#v_Tm|M|i0*rIsge=}OW8!AbwXUSDVf~Qh%j}m z24Y*zib7)^<)p;G>AxhO@K-(k=PUR6&%XTEzrFm{44nJh`C}G?!v_DOjYn!l1CEx$ zVREeOkaFZNojoYENo`n)K(ClcIVyq!fiBxC#t;SEmX7X9F{FU#gL=gX0|*WfLg^AS zg^gCoou`m{P=}Zx!IkDP^7+cAkuzXHjO50nNs*!)7$=H*;8nn$L4SCveB%K;1rwwa z734mK%ejv!KJO*3#7fCEF#Plc`Ix)3G%FJ_+}6CbJPH~pj!G2LR4vRxz^#T-B6v;# zqA1kAsiY{rC>|A*+<=!;31Gwrt#UDM(S4<>|Ncr(%eZXm4OVdMx#teXnnz@gYq}9I zqpf?)*1Gz7XOCra(>++77*^rUp2SMl-EqgdbLVzu)S9#9P;$`-0v?xD6qEh;BKF{T z9bt0ObebTHDB6S|gwmRAs9tLW8m(bfLR)&VR>F5~4(*afcwB#LEWC;5`f)5S37Q-WLvTgk@&cn=*Vz&k_NT%oU1V+ zhV44=bZD}dkl{xsxUe}iL{?8a?E1g&`|al!e*gU8N8VZV!ab_Kn{Il@$N?rcf*GD* zVYf-YJwILhZlW3 zC0D{IUCB~>*#XF5&`qShF1ozKhoi}Z>~lH%h<1qbSG=_!K=Q|iE{Ap!;YS;TD-y`P zEC2`OBBSPezVJ-=kMM4hwbp#ZiP`1y*`b;ijXsquHkux`%E0V3C2Eo4%MF>|fZK+? zp~L6QLyrR{z@Dn&SpI%l zow)@@XBTm^^fEh3u}(7r+b@U|fRl#Wi7CEeKA3D(#Gw17kP?NK58Ljqtq<*)C>C&A zPf`uw9>q4@dlCPTJ!(hKp{c$}z#X|!E;a$0<{7)_(+SB!_BNPi;D%NTiyaQKOC1@G z40pOECDCk(jkHJEW$ScsUKwBbSooK6A}_fa{o7m2<-<Z)A_MYG zU>5IW>P81f`C7~nM%=uiZXwhzAqz(w^dkCT0ixxvL7 zq>Z)P6qn+Xo0ao*5Ar1dd|^Hr!e4v|glC`zPX&%b6@fy=jqp6Pf$=uN7ca9fz`kG6~19VouHvehcPz8l@0@5 zUVh%+n;}()Lql?=Atj-RkQz8(({2O~oGu1nBI!T(-OG}nzo%vTl-WP+o|hQceA~v& z9al=FuHJ*EqmkS;y1=-rUNoOdH0I;y>onQ*Fpb=yNwA!Y8{%O2T-+l(Jybfoq$K~W+SFjJRN4NJ2u!FyP^R@Thg=CWV z3dKGPg?+wQGj@F<3xma{)91nJqs23WHr$BgVNh79WX0hIy)F#>L9{r!5vD5k3Wbv~)9X_=6Vgm1x=|P7`Q+Q!SVSi|pXSM`Gqda?@z;Ws>MnIb47twh_JhUb= zJ36j}*u7u$y+7{m*0z@4_Pw~*JH?$nGv~y-dHMN;yXIZn2Bx3b-6O|R&py)IeTpri z=GAi+FMcDl+!$vh*1zYY=JAa(>*M4`h?yYoldW7PjAlR~3+!T8I2;%)V7OrP0Vkd* z!Nj1Q4Bih9SK^5jO5`vqPh^tAt!skS!UcnGru%R>04j_xeIxCGZ~a!<3E%3ih;5*5p5|1UMtGUT^LzgKDuIbQDJVjJ3Tcyrp#E@?=S=cuLB$g-i5CJ zR4;5k9w_7BIu(mTUm0iNyri(`NN`sqa#g}*#~>es=&O1?yf@DpEb0(6=gI?Vxw^T1;cz@@;0U}1CE zJD_p~qT2oKdq_iNqSF9ZdqJ~YHco=-slVS3)eQ{m(O8xgGU44Wq$8mm6b5`oREBK8 z4^Bst4fyn6tU%-_h@!C+XuMYXlk~G&S=2N04o#Tw!`UzY^!b-JOdwq~5FY=G%{*38 z`o{Q1=?&>+G^+oVqN{>?mHZO7P{0~}(T)UBr;mn?!tp9-a44Gt1xWG;aZN&XR0K9% zzmgJXha)Xy4SM&>K3z`ejs05c(l^l_{Z?Vk{{T1Xz- za7Vf2g&dr3sB+M`LHzg*=rO1Oi`>awGG-uoZk^3*L%edGu-gh_)*f;je_H`&26Z=QZf zw)gxe)NME$ELE@x6MW;bGE}`R;`BN-&=NXUU4vvYjT*{IK*y#z@Kw0`37tiyK*aYe zg%&1It7?KEEkVBBlQpqLOaG&E6{HXyTEIxB7?v!5r=hL@YC~$Kr&U{IFAXJwu z0;gJmbQbxdlaYz12Wqbd92w+KG|oZ`bHd~X8c>w=70R5n!~2;tD|lBwXI}aaIWg^< zzK7WIo4f}&(l>eqXUG&=8lut8v`kxODgtfBXdu{DjWy7qi?@dy4h#O|wyu9pyBq^* z7fBDCE&F=rL;V>r(?;%V#0onH^ntWte%wIhL1i$WTGvB4E4|41Kx$vG6|l2ESge+> z0%hbg0s1fXeeKi8AsF(E1@u~{Q`GUVQ&d_#K5|mbJbBXptCO;o-|62ccAxW#FZnC* zYNc+B&k2zjIZr!G$sXh3xX_8IR2;-noI&Np6$QFV@1Gg>d4|5$XaCygVQvv|P80kc z%Cg5nu*&ffMU;ixUoECZv6#4Bj)H%7Z2q4PPvOO2Hy@LyY4smCu_93Pb(Gh9k!LQb zUkA1mhgzgcUpX?haITRkzz&%o$s%CmM(F3`G)y#Q1RPBV(wa;rGb$b8g9pkOW1`@F zQ&W3D_CeU5$jxvH!?vwkUlp@nz469Z{l9!w{M7$T^@IZ-;@5%mKO%aoR(|*)XwJ~v zkZScz$d^JcY&dKYe##I+KPXhhxwurp7%Z4k_$SU8>!20q?qA^jaQ;h+Y)MS6pCgK# z*s$RknkR~K^0-db`7s8_pbj`oiJp(#h2kyJX#o&Tu0XYRY zJ@vbsBBcUu7Catf7{^GxJ>YDFuW6`%Zfx+hgg}k225~*F(C8a2SBMb>gM{I$%4rEx z1Aag!)j~luq^1Z$Rz|whVNdaBpg z$SiVx*O>Z>MD#SK7EJt`3@g4C+1nvSw(7rczO%Z_9D_zm^o7Uens7d9P^B%&g;&6% zS|vV|BTIWUd!J82ZHSXeWMQOiSVSTQ(49wywuVv`k)d;?0pcmN(>#OyX%af+LS9=) z9B9ZQ@f0c{p|fvW%YTLl0sp3A5V{_v}fgNAOZZq60kEYl1}A1%z#|9Gz-OdV{ArS zziY<5fkCmHxWTI-b`FZ!v@Q){-vMsbxjzkBBFNTPs1FOr?@@JxW9@N>D*A&f;IiGDogN7OLBO3cc;nRg27I)X4zIO={c&dayh~in24MC;?2Sgk>={MiF2?Nv#gPOO zPtmdfx38_1Q!8tvRq{ePF~^2q9b8;WH#6ItK?v2S?MOX5MK#xBOsqE1Vt7)vkZL8r*`?fbeJJ`=`uXXIfbE&jG^qP?4eyc^ys0K zG&xLxxONFgWS})GSv=3a6%BU#&2~F0Rzen;#amhf9UJy#I5b}C!&dw``=%VZ$m{e) z&J5|`P|;#*56UAswsxzmuOK5Z52(!rmyk+|mU0AVdzsUhzV>0zNW+Sx4cM4zawIKj zz@AhhX`zShFu5m#dN$50&G5M>%F+p*#Lj}#!jnQ4lG73$g#>dgx(cD&vyw&-N^aGR zke#9*yf;MQM#%JL%`Z{;5HFBSr?<%V4n^1lUjpr-SOpIBF&bUQcpH^$l_BvE2{0;q zi7SpyP^IK<9BzpS%sspic27w}r) z|KsgF;G?S2zwvwSy;IUNne=3mnM`^omCn#ZXb~YafzT0=A|1g+5d@JUAOa$yB4Wf9 z1vKC;sH_cC)`G6D>sogGtzFl(hRo&tKIhy!B_t7l|IhmuQOKOR_nhZE=Q&ULKF@PR zt5*v+FDC#Yk}GxQejrq1Mr>3dUepQHObAORFbixR-T~?QkRiF*wiuVqR$g9S7D~!j zrCtvlMNqN={%nHYYj>4Z(s8rlrgR+Fuc69tx=w;A3v#WJw{Gi}Upj_9xd&HA?J+2cbBMp3bMcz5T)k z3#2|(=mYP@&IC_KLE|QU2aw5kpKxJ6^TjcM9e)JX&AcYbugw9Z#=AFoKT=7&oEM|$9EkTZ-}^uh=xU5n=lkDy z=O?GwKR?n2GL(Osvf&ilig%i0TW(};Xyd#Ch8;8d+|g4B(gIQj)b^p)@uDAjB5gKAuqfLP3i53_H zS;OVRPdBa>xi==o9y)kTdyjp1>|M(kbh0?~)*0oetru4`Q`sM)4fc5<_{s#@WB}Hy zz%!&y#z$B)WZy)ro^uq;Dq1nhpI&--U@a0j}N- zr%&6aPyc5?`AiouebZaodZGvI*;;-6kiS0puhXBdg5S9aC1??Y@k0L^%&GKNACK~N z*d({dN&5g_*UZ)%QC=Rj5x`rD#t#tm`ifo?_-MW;xhuyU)ANsEU1?ZX1T1RE584;x z(9-jHAqK1oN|1i1m6y9RY<9ZSvH~^(7FWRA zn>}|Q+TZSaf1dV@_n(b8B}3?pVO@#jC!k~}dWRKCdTlG7Bh)D8xr8{%Gn5ipVt|4G zd^JBd^je{pDK1hJvWhKANA-PEkwk~iI`~oNFld+zV7`S}cOb%_Hh@5GRd4jw%5>6Q61x8BKOb#8K)Gy_Tv$=@WA56C!UN z*Ro8ai=D^@hmgcoD?BdxRm*V0pj=UquSKy^8jJS!!5F`{g@Un99BS=r*$BA-I1Z#x zgp}jSv;ZvB?(GJGh}+Fa3KA3>{e)n5ajE1d1qmn60`EuxzK3+XQG}@G^)HAPNrXi) znJ1HUnj|h9I_Z#n)QedEjIJRJ(DASO=b!?vTX>#073`N$fM#|kaQSR1=B73T6F|&Q z@DAZLqLCvQMyQj>5TtLAX-3LaB4%bFZK!qtwM*yiwRI&5ojkD5KDc-AkoLb#N)zX? z7=0&o+>F6zKGe(vKZSM7jGw}Ryhi=?rg}nY{)V5Fh>TjLzUf0Z5>-^M+@4~lml2&g1aL+>5=eQ0mTAp;m=gX`Uxf@YK{f)D zNOMIIYcL>`ZQf9Y{-)@ELq8Q7kY<8W%yZ#q;}8?#EBO2jK0>BvM!+b3isXM3QoLXtG*cr;WU5>ynoNWl!m?m!8^DHsd_@#e57QISGA0yqytxQ`n#qgEpz zu`+ReWO1X2!e5oVbQ!r`ZTe2dqMm}B`0%)~i&k#F`)pIpT#YSy^5ARQ_baz4|2g)^ zd#|>PHeGn}pWYu^On-Tkwueb)FjqReiI{7YK3CcY|6Fl6Tg^nw6+hSK3Y1K%5&B#+ zjk&fxRrb?~qufy}xQWlSSw4IBX7Us3N4bhm)aZvunDIzNuBtr%k`tl|9ynco&IiK> z^hAq}q6~znwCFU%ZX!*Qdf6OODfR3F7!O%x)m64=9l;chT4}tp1Ixeo^Up2bpSAEk z{rdLpw`W&B`~$b)uk%n{em#Dz)>doFTbd7S+Q5deA-8YZv{gH)J+pNaVKp|ucB?VH zi$6ud(@(YCbgskJ`XqhOOrZd(z>_D~5-`&!Q&gKXm2>nY34MwMU;gmZ=b!)l(-+L4 z{Zspw>D?X8`;j2xguk{#dqevKzuwyGOOe2AL_bNw-=x4xyh7ZZIpi4RXd7q_9Brff z{^xU#y9&IWUOL9-LhN`T@HLK9LfB-vQwv}(+d@;qQvCRu;L-!gOV>dVz)L{Yj%1X6 z5V#+xNbq5zQIX(-_In%h>IA?3@ydD{8uj;tAF@%gxgM9=9|s08_rT-P&ToIP#85i$QA@ z{LvSjVnK#bhIFkEv~D7XG=Ur?Fz0;SA;7leGogk99v42xKprq|dkh>{vGx#aYO*~e zHUm-b7-(NmzCvMglGQ-JmG;l2?0`lltN2f8TSv36_6z0W{Cem&&!EpH#v^oR(vzL~^eHZ45|wx#G!TXMdl&c4 z$x2P8(q}00UdRe5A4B9X0hP`#X>nDfs5=#fqeO3BhJoX&@P4X=DN^Ss1xG9uU9l}>*`&S);qa--SZ7;ozr@bo|PLL z=f0|6bw9fu`3&&`<+tRz`q9}rj+#EVv+76Q>ATTazkTHWwKWluNfn0^T-MmN*(Fh~ zT_f}F+kE`lnu6TC{kwPEpI@9U$6E{7u66zT?<)Z9wqUQ{;I>VYFgQ3;kieAeN^#jT zlX>zR6~!X+r%a`8dTDZk-K`YMh$&F1sfuj;L0(D*(Fbh*kIeGGomE%WRiAtB$%-+P zJkOnDhgkaETQ6`6>BCp{KNTNUz2tgr7F&M(^_kucii0WZZ}WbGcmiM;>Ok}DSgl=} z=n2CT<#02wWTb-&eZx0<_!#}qxYVcoS0H$Ha!g!y)D{gdx6x@Ewh#=QHQ_bu87*fCT~Bu;W*A9{GY zB6(S5wU7c>0QDo(VLf#0unXiDL;!~kNr3)^BssY7X_L^wZ?2EB!h^M6VWu$@Df4g)~zq-m~gJAz(~~{NZk0+aZ1qR z_{X3o*g4rtqCni` zL*`WqiYKB7sX&mC+-l{J^=H!~rOa0i#pBe^H92J49Ks#4X{kx18|Rtw{0>=)-BS30 zWH~j-tgHw)@3HX&T!@QRd6WAQbKjivk8`^pS-5@9nS!TH-}zkN#k zg(TOnj}{fZyXm&urY~|Qm7d;v+e_CEdu{2hH;$d-Oe}rp@pnI_HDAD*&HkDtt=4?` zGWc2Yt(0n(@HMomSrV`YnfERcKy!BnuZWY*NF*zfB)aNHAD{hNQ}B%viTAvQj(v z4Dp-3cXTE@NqVgk-t|K4pV^m1;lh$sp0Lt-ZvrArL6N8q#`$WM1i0t}x7+tfogttd zwD&YZVuu#FOIn4ZcxHnDPy?lcNU)zBM5#obAqX#;Dne9`e)#g9#;$3ThR^xy#ECb4 zu;b|26DPKf7*XA2+w8wSuQj*KJ!=H5-rcle^>tmH`7uc)lP2DO+lzC+9)0>O9gozw z#FDp;z57uCNE^T-X5gCi`X;St%lRaDb(~QQ0+hImTGuzx`@wQP_wxv@HO?Xl;B@G3 zU=vzdrigisoilby-SU2Ym;Axn|GsVSz4qvXdmDcU4=<@GpI&=MzX9Kz9rKjP+_;!{ zsxmpHtkc!~$0UPiwyl2Pu|CJHc_=eAEh{R<9+^61$m#=sa${{w+6ZhzEwHcSq#Hbm z199SOa&Y3aEx2zIU_?UuWR&YfX?*FejxzKQp1j8!x?eBx+lSFJr?xSWvJ#_)4e8q( z87x#^(ng(e87&aNBi`>cjt7BZJM#0-G4naR@D%=Tv{wg#~)AnZ(GLr4uW!FJEwN)r_)T^|?jqDd{r@%$a_7S#c?Z z$mog1(<{ra$)7M`@WSj73C^x}&Ypaa{M5|jH{4$_JTbXbY^x?TwygO0u*|r3Yuqu> z{hX8fcNvlDEI{Rle&r=AN3MVII(w)i_BCfgWSTp@?~=UQG_Y1Y94yiW!j#~SuZN^f z8UVTvADE;37U6Z_^V@_E7|01fq_&TzxbXKAo^K3*Vx(c@B9fYpO#V~tTKhDz)fqeY$>P#)Dtd~g{Tu8G$PG4hf~C%wE* zj7gGB{yHITjrIKY^GH>(S}Mx&a_lxsjkSh5YN-o5chvGSng1*9=aK`K5gRBJn&RKh z@|8F~ea;A7=hr8GKZ|$aC#Fkvu>9;tHHJtRLO(=PWl;ps>0$%gpgedufbv!gwF8We zvGlX{Ym-X9hgE&#$rHL!$?xOOzF_no4;sm&zmFdwdcoSIFq=@J05aeK*d^((t3zW@ zJj@0~%fOYT5|)gEB4(kyItP@IiiNY!^Q4ow&MZ%DJ&KTIh_J+F7U+-;;D|YCXwBS! z<^XpRq=0l+y3_}>q8d5YmXaEh+`Z@G@guYQ6|GFqs?-V)hAe2lAjjEKTv1(0Mimz& zu8E1fCU;b|sQ^eae&cEDR4eA6Bkl4;A)82!!(ozZv$JG#jmU>dhdH9CiatxL1xPvW zUgpLtMT>+90JlG_we{z|no}G?_gl}xS&GKAa-CV5RfwE)AXUr2LQ`-OmaK3n1)qZ9nV&(Y%&*$Xcjk2e)(fe$p_cYESUpwBBBK7z5 zi9q4m8dyB2(SR<7!7C35kCnEDJ+Hjzwl-CV1(zVdGO^^DITaM z;6f$meB-B|`j-FcrxO>SR}Y^1dh_R7Sjhlw9a;dV^YoGV=~4N&V$3^=JGs*R>M74_E@l3vI942 zm(HcdIoYYb9lbHN z;2?ea#M~a)T?!oOxvSKM3C>={T?&#ja$mpx@$Q+Wk&#j7%;rwry4R0dooWtK%x9w_ zowpAkYo0t~aYAfbQdz!v%5r<6E2*r={Oc_}t6U>WOLpI=>}my)2bX5F--{MyCI4$xTC-d6yTFO;4-Ucittg)>VzOu21zE}GA&hcf_TH-w_pmfk*^ zqJV9UpWWto%5i9;DH81?9!_xtYB{{Us=h$D2#M5Wu4pzsr+Q zvmZa>(L0h}V6uR~ok?{$5x9#CF!ymdDdpe__(H_*iaKNi9?83+U8l3f_uX_7^Ny1? zAE)w#{*`+K7>m9ipxpoSS}P;4!U7U}I5EjlB91 zVOEP8XNvQO2;0~=PJ{OXHpz5yNAsUA-xNb`P)x8unkpiKE-P?EA|!~|w4N(~4WeiW z*2kkgPCkae%Vx2(LNNyZ?Mp*w{=Dd+6iRylbm8p z5p9x1NhQNqM-IA3gnUIbhAi?c6aMnTp{oWBS~Ya&s+yWr!+MP!+siY0bmtC_ys4&k z<g<=5o6Y~E(PQN1Q*5hQD7?J>(dC^Q88NtZU z#<7_h$Va~ZD|zjX^Rb6s*8)9Q9O(4JB(z}3&2l@_Q;Qr$fus~U(e0B`xlEwT%LLhm zt*oh8Ib0{3D?m)B$J!>+vCBn=kDn+mX+f3H)w=o$twWCk3r695==dI{*0iLI+}?Q)GyhEHoQbX=_qQ(q*CO%lF+Eh`uFYv#Avn zk3xTY+3pg4X*%#r7o;lc7#fXR4)!MSTBv@{2AQEuiW{4|^Ma~!LC{o5RXORInTZxc zaU1Fy54}R5`EzynRnE;SXdUDtBFzK-B2<94sXe&5)_ZVarjfCf-?jesvNjYu(*;9C zOHg~%IraKuCDVFayA`#o)sZ|T+|y$8C!Z*}r4!;Nup{gOOep|qSg=xyHqdNPipTgV z1fcJyK&p`*=b-Qu_7E7)2EwSdY9}Ckp{V)H2XTB9@IMU@r3-M&U2j#q0-8K~1@-l4UA&5a6z)AGchE;@%6LDFeCP&Ca z5t$P9suQ2%I50)z1hhGhE~DRgn8z9LGKz%5Cv=l|nEpNr4TJ%3NtnyP^lejl3Zs7& zcNp`frfaXfu%+>>!&_eX@btN}r-i3~!o_|{M$6yTQ_Tg+(iUXg8#FM_<22~%sScz; zJM;0azk{hTJ{7$enD*{dXZGLwz?rAC<|9X+JVKp>fBf<8mZfqZ?2;GGB>;c4%?AZkbq{xOi!y!w}& zvR}#xE3IexpVQp$qU8H^?`bYQ*}r9uQtiE7-rn+xcM9kzdUg>Vof7&mb2>(%IlbO$ z9Wz73M|T_`$!8*N4kY;$pm7)89FTK_B%i?MT?*NQkwCu51tRvbiZ_s|&h@wMN=>!J zB~)}xEL<~fhoJ4RzXmmps;MdN-u3paxr46)n;J9@1A5OXt$8{vB@qlyH$6uRLkw7D z3ndXy<{z)I8p!L({6m~=y5uP1FJOcxvAr*Y#7VqBI>2+uNrA1_T9?W!&+wPc#0H2x z2`KBuT81og!RgDwm&ik^$* z=c)|SYJA5Ve#bUOA|^zV0;4$U{qhmSWjMAzE>qkgj65@xG%ar;_{l-}XK%XlO3M#8 zqG33%zckNK?`+(2aUMAtW$7H&5^Y|<*HY#w2~l~1z~yg+!1k{o@Qp0sjY=(t*YAQKtqH@AoJew-QbYivpTi`0BpUY&N0SH~ zgi+L3&lC?Rgo0544piL8Z4C9aLRDNo1Y{583>4%@^|LJt(Lo~H0x2yVs?D=5qceDy z)`r|DzBYjS;Nov%MO@?H{(h{e!}se!3+-?qdCd!`v}GV8GwBoUdvz{w`Y}?LCj+EW zZv{=b>mBJ!U{1mtUMCHSb7hKTH9DCH?^ThroCi~J4^(Q8v8zXoKJvjERlQ?!nv^%T z3_Ce$^zJx&-pu9_oP7y6^CNgisWikhCv`wkn8YV=d$wR zl+wh~(iw|V7Pl~ar^ue2rruRrR#F+2A8RX0E+3lO#a;vybT8xg0%j(O%i&UAyWp-2sCHW0~QLeHeB231y8l1524& zQz{5spx+|lzOgRK3c^vx`7xXM$wxO_Nh-*5yYRIXcV=dml}s8kkjYPiCA*A@`DqBL zBIM12VAADf>UL^%)OwpuO+zd(3e>`9J)R+LtZO z22ggZBM~}w^QG26c3E;_9n^PHr7BGM12UY z6r4%}vC`mS&}Y-2>}5C!c!d|FW@KhnawAS(adu98T(s;KYj)Ds(vpoX0sCmFQI5#C zpS~buElXRPhcdg~{}D)dbpcD(E;%To;xHDdbonyx&kmUw0 z<(bm3y%3BtDe&oIlz>m-(m-lfTr5h=rN*V&vMNZ!go%?8=cbcTj#8+w%2bY;*V* zl1sYV6Nyf3sPZG3;qidEB}}SRh(MHnk!DdVI}UMERn`FAkWiLTVyWuA^Rh8K=1IO+ za2h%$6Binf;hu6b62ObChCzH&7|z|S><(7W(#FLD-K?=s8Mz8}_m@-fS*{BtqPf{P) zE76C>idtP(3#GXjc|ie%kUmAW&K1|1cMI zEylnvUFqA%-S9i#_PAijfo7mxUAHgCOlvZuc!he>n~6f zX&qL;k&*Q9v!70$huU^XVd0pa09HuUBl5-%p%B ze$-57R$3@a+SS+T4h{8ceK{=k<(3*|-K$t1c%}B6tF%iGX)CmwA2_FeHEhg~0VA}Q zliNMok z_~ok$_R9w|r}x;jGZLNnHg63N*E-d3=<53~@A!hHvZ8rMhMu|YN9`Zlg{3EzkIM=# zJl|zu&4u@0?>@Jy_l=2kXK(a=!f}XMh$Hs#^uki)1Xv}w4q;pxRXa$1)io>}H^7bc z!kdVUW+NPLhYKx>W$9%Rt^h_%$;NVRM=)aT7(nojj$y=yL=8@0iLnO4^krjzesc|g zHwCQ$0f8K9`HD4Uv+T>(;D?A38wS9L`5Fdyh$7bhPK)>r6fs|gACr_QjrT-_K##{= z4j(ao8y#0u=-xHVChq^Fb%04Z1T+!n68{466EuiWh)6yFE-8!ZB)EV{ii?E~91KQ+ zPvE@0OT~Ai#-4jxb&<00el3<0DKPGT8=%+lIDA&qTzo) zk}C|W43}&I_K1+`kauvvn@~K1hyL&-vUecy17TEDzysf#+V)riQ;{-}C1u%dNvO(| z$(0Gc;=yHW;9*Y#^C8b5Xv_1Zh2PbWq1CwaZ}S+i7v&8BaOpguTwhpi&!}Dj_!m0! zjOD4{D2LD}+AO)AFi-18+66KTYH?cRHK4h)2-2HMKs;fV`Z0Ho#ceNF4sASs4DHp_ zZ+`rdEem=^4u1xaNZ8O?L<5P47_bPhGD~J#j0)rqe-g(YD(o2V)Ao~j1{s$8StX`C z}P+4`0-4OhKW?GX@@d+WQ0AVkHTGN|MI$S%jjHvK)cc8D6{u zObHVP*=fo2od#Ml$R1ChK<8=o0i5Xkc}Y1r##XyHVp=DB91$L7H!Y!BzO5)OKGji? znc{L}xwDg3R(DNFsp?r!-~_rBb+6ZksiuO0i6xcQ-SJSoDc$5yo-|kE{x0V8b;F(k zl@Kz8q0BhhSOfe53afM5bFuLx1~}z#YIyZYx1Re)=QWj%GTj+(4av&7YVF|K$S7xZXp|a?l9b|aw6|l_Z`1^wCyL=^ z@mVHgZkYWj{7+=VGHED<-hA7NBW1^L_VI?(jT3Ks^{Dy{Mb~f|@U4~s>Ni>ze_j%Q zS|olb&Xg@$Hck`zMYjxiktOXh&k(h1m^T#P`<#C-oqrFg3Ve^uAv%nTq}Y_OI8GdL z1bd-Bz-=ks%-=iA=`~<8>A)#HwS9bfg_-ncYBxIR6*Yv<7@hL z$x9ZL#a~S0cty|Kwo_%#?7G_so5osRQNPz_nqNe9%?7@Pa69%p22l%`v9S6`0moGU z#K}C|;3OER$PiuLk~|!ef$o!AFaKn$Cjzmks1U1!mY=Hc%nH0NOmeVDWd*pUvdX*s zQ!5)*v7>LN_+_K}jxxX4C|i47>l`yDzSLed(YXdM_m*l?z1~YDplCLqBZ{J8n@7?7 zk@<|nGPD)B87f71OJCEbzWOQ+eIN4oWPAG?s!L1kuh5B%{Z*vzO~uMzEW~Go%IL%2 zT}>NHj&c$u6yL&iHJUC-xxu2M$d4k|QNe(OSimZh!>lM6K&1@=USbLG`nm%CENkS` zzQDr)Y*<>_=Cm{mIPF>bgYmDVT>1-?$iwi7D3F$s$VDYlLeY<0Y?RZ2znJ0Gz6t5k zJQ;NciO`XQQ8Z0aMsY>jH-vtsDz^rYlyFg|hKB=WD1}FcN2+0}j)}zk6kBL$T!8{k zrr&PGrJ%Zcch1vYc+2!RsC&9R@WKUk0v)c4526-R0kut+bM$uUl6(o(k$4U#(G<18 zXxeC3hM7=pFyuU%Rb&`att>Hfc&K=_%2DV8KMGtoqdbq>8MwBHS zz$mH?a@hd-1mzj|FiL<8nwCP-3Mj}OEv99Z;}%m2sKzZ{a$!#E^*Pn++a17#dL_t_ zunuI|PcdNN1f$}|l0~*mCQcPaBS*GFD?i}2tC&<^eM*{G%TTI8io&FH=q?R|&uAC& zjzW3ej~yZ*(g}YU9CX-GxR7}+c|9ma&{b0PCm_Yhhi}ry$?{0@Zg5X!>#?2;-{ar` zR2Zsv(eR)L!mW`I9mOP3QX~?UuAqO1vQTR%!FWY02?Vc*abfcXd1vJV-k+$P$i?%t zUZp;usEC8zgmNOc83jd5-(&Upmsb@bo&jP~ecAL8ur{5f4+bA81Ybwvs%P1bFi;%0 zM6*(x;<5SvDkJ6I#0CMZKsdx~_@60zoMP~7k_qybfgt2WH2$orqj)zMIx%Vf(U85P zX^4b&r3&@87Nh9>8NN}fdJ7+eD;!}_dN`TZOo0S<1rEZ7a<$8Nn#nX0tjhx_w#1w+ z?rKXYp!gNVGTfD9LsvpaqMWV-`1I*2;%Q)X4Q1ys+h_O za)!snf)H`8akL6n_2aSyYrfh4z&E$dU-669Y0>S+ckemcZNUhwlj#_kX#OqC`KPy7 z*+U1l*WYZ?K3seFa19&s_J5g0`}OzxF#3vE-coaGeco5?8-B|n^z=+P`-*5XHI>61O zit6K3EGGC$i@=pe+uPoCrjQ0I%KfIHHE>)T*IUZ55hLDYn;k=I##*Ln>(BVEIsBpd ze8ZHt<-S|I?#VNA_Cnj>aev4^3na~uiSZogV>Y>m_sR*Uv%_){k&H-|1aDGS@OVhQ57lQQ!zmC8JHUsYu zkp_A~k@kdNIEK0+7KbJAjfV`^p#@y~ilI5k%4FZiSoTwh5!+NSVzm!YF*h(Ey~l_| zGtpy&uerBaa~xhvn$vWlERhJ{@A3UyT=)D_;<3PG2529sjw{-LpeC-r0|+GQrH|A{ zO^XnJb4y6a@}PnV1wLRwgM^5{k)pq z2=D#uEv-mCu#K5snU6M%FKXJ>-CFaR*@`mn1t#s@@a^`y{y}egsD+K*!+R5X=86nI`*3wBiG5tIBh(Fx6KAbs!YhG1MQtlls1h z`ovv4A->wZ;`OAP>uk@@Qv@9VX#)Q#9BEJSqQ2Pqz@omvm5N&xDaQMZGiH{`d|hTp z{*WhTiN&*#QO{^U?bd!giPc%Hc3*MK zfWnxlG+wU02K3Bp7t66!%$oMC25TiB!v7N)LL!n-4I7lxExmET&}E1IkE#T*X7KNinO+s8)T6mgJdCkEpZx+Yn zQJyGw&)A}&ugNowGF?|+=XAQW()-`N2Pg#Bbq)h~pjXhV?bqkSXJPPQVbV`f?9$wA%d@{Bz{F*K7h)!Muvt&M~2vN(`Pu%{L&(bf*We7aeE$S z$5@M|QsjTr-g`EG0j;vP)`w#L+t;nz#$*2Q5UD6s4;~rfiK3JsREy+iOO|y#6B`q7 zadNy>u&_5ihJYbqZ|A~3gpqK;;fQlBV=ro5l^}!R?k6tqc}k%bsi# zWD3G2AEo>TZ6<8Zakmq0Nko!hwpbWiq3Hnr8(JYNw!egimlZp;Q!((Nw(RNp<<$% zba`bl%mx@ql>k5?gES4s0>DnlCUx0$*KI;MN7q-tNy_GLUvhNX^rMTnv;S;g^5pbs zN0)5ZqP7ps>(?)L*tz`fw!VGyhc+$>pZxsZz0XexU((pPBzy|}d2;xoM%84?>$mUT zetEVKr>*b4`}*cn;DZ4>CaF-Mz{k~3hoDcv?+~mI=ESlB&x-2<|H@_!-BN4Vu=ljy z?8Eo8ZQA1hqa?_uysydS-aaj#1JSmMws>wL@bfrs8+; zMB{3X*01I%;!|-g$0Mv@&=QhNWJ3Z&hNLU_66vq#Z@>x4=50SR<;HWlnMH%n4Jsad z?#3xcK)uFy(s!MPEk9a&(;$gjKX|eDI|(3VvTq1UpOB<{*vx#+)#aG7Xy%J$P%}|s zIFb{TkUx6G6N1FKYJa@3x_ax@?^ZoKU~6?3vK^Q8?ORY>uyWXl<#}WK_FtlPI=pV{ zre|5@iKi!yeOi0v*-dxCdK~i5feVZN)UQ|nn(k}rNG1MgwT|NL z!U@om&jdkt52PU|>ZZ=5 zIa4QMlVv!^nK)<<`uFSJwY)SZDBO0y`gFe%_`v_qu3&)7${p(*9c~pc=buGE>jEz^{ro>0cmMT}pbINzKkoD^4#?N{C1HYIvyXFgeg0Q}@`|;SLop ztOUfFp$&4FFg$k1_3R~jXp3T;&=WaG#C7(oRj(~u-{hEj;I&-qQ0JJr6IaF*ufOA# zfjtTn7x(Ej&Yhhza305ryu(VF?Nw&}!+rO$EbsmAcN)9*rZIEY?7DFL-?v;}-KE#z z$s3;mOayw~BbUBFPnnI_nS80Ydzj)u|W9E%0Zt?DkeM`3_CarE*cW>##DM_Qy ze0}SjapSM;|5z$%Nmv)J*Ui@zCv8Q=Zm8_wFsc&h)K^25(_~qN!;bGHZV|%aj^%wo ziA@YnG+`Vc0hc9pR>zV9#s&=w9KjJC;1K>ua^0eCyxooKkzBX1{}@HI1B;UDVJ~)D zK&kH&v|8_jft9{5?x*#!D)LF97ZBy!BTpz`O*&2luO|F7oLypPfKY=sUS!2v^j#6v z0)pIwoYUCaiMM3u<>^jAY6x^uDlh7^Z>HZ9h$~GhztpT=>x;{EmG&UpH-y)FAi)Wo zuyA!^zT*amt6{C(qoF_zVwQvmj4=G8rN)?keW!j4Tq`r>9K?CO|}Id(`mQXgfiCWnv(-Y z_r3)&%2t8G=2xG)Aa~p1Er9p*_J6F5Oo^QIw;RTNvuFM%&ny60z^7aus>>03&X->E zgg6o+LJ@y3q+v4HN2vUhMDS2*P%W~An5!WJvjRqdFOAQkMj-4pDPSF!*+2d=cnYO11qqP=+m6Ul0tOb z_X_13Yq=uPmUKl@O_p{chhnPP4Vsoq$Snwm=8%ktCF<|NmI6wgdQZ;;-8jl>q6qIm z8^-yU<+1XRteA>Sd$F4isvX8cc^R1rRPmP^3y7(piCLP=J9<$MZA)c5^he#Vwrj=n zvj^|FWq5sk{p$WVy?;mT`tc`Dq+GYQ&w!=1+OoI|+Y={;EvV?VXplN~|JjC;Dfi5| z?&ac`#Sf3a>4h6uc7VtJ{!G=XjZjUn@ zb)v~JM4xb@5F4u~W0fH>c2@@32`+}3#FYTgi0n7HP|?9Gpai8^op)-C!e7DlX`y;~pmkhyDukfp#m( z?^Mt!J2NFQCR)m4c}Cce>QF=YQzkPNS3yx5lo*VH8!C#45`zgUARb2Te)-xjf9&1W zQDn`qWu$)jX7;e8yZh|D%IWUy%1KGfOP$U>`r#{)#o$2Rg6rr+-*$Sqm59rkt38TkuR9L z_haGr9z?7_m^_4^I3s7esThhvY9g^HOdPecBAHc_KUI|o^GIq3CC|v8RE+Q1D|2h( z-f646&w9U7W@tOL?Ml@6mFv20+Oy|D?Q^w9ztTQo7JJ$Cr|-Upbz#oMCr+HvR=kpu zxas~O=w!5h>6GE6spC>d_P0nq>A(Gh`!y zgRwoby;vrfyoJFZU+qdm*2?EU@tzf()LttlPFT@PWyurqU++1!=L!d+;EVBVy|zrd zUAseDu8iIJ*{!#Jw$s~x?dNyh_4!)tfzS;gCu~wcpGqzsgddZ0Z#3L;Rtu6VY$ndR zWB>x46Pa4uXI0|ZqZ3vYJ*+l(YqsoUb@HZ`{R>TM_KX6 zk2&mzEbELtEtaZ0<<2Oi+u%xr=ZUG(O+++)+#%2qG-`lQ9%~v>T$G*$Uj#60aO%Vb ziZyBA>XHp9cd=Jp*IpUhjyyQ~=-y2muUqg}B~E)md+{QR)85y< zp15g8^?@~9*!AyPToYmn&#c?BaPv1+wq46+Zzwo%V*Bd3)69+Wf4*_pgii66#GB{+ z0g-6q-o#xJh6o+?Y}KQ2lY&DBWXPi&i9LcK>5v1h;sgHMZ&q+447%gm>sQ01x=ZhY zCx?*iIu2FL7YBDBEf(BF-5teF65B~gz0t!MPDutzS(a`J8W%8xSJQ~KBU74+5uzTS zD9wra$!jCd{ljrS90y8LwaW!hvBXTh-DF zXc)n|)IZm=$H#9h-*-)6Bn#cKaPh;OR!f2P8jF`l0*zAYDWaGkzxPK2bq1Xf5`=Fu z$6+Nzr9`J-`%Ea8A8Fx|o};kf{)PvXd<~R%18+Ab8Z8g~;MZ^dBP;)TeaYXqHLUJ^ zxO?~8HWUA)LRHIcdO-X4?l0HvoqA~2e{U|fKlrvboc0c97^EmejhJW&CN|j_ekVP@ zsKt!9VG#?JiaL-^^_}g}z1>+#dp(!+dfzwo)$g+y&ER} z=Z=M+{)r4eSsDU9Ukkg+A>~WxPm1rs*h4(42FH`<;*18bL)LPj6f6?XV7WG1yxYO= z00Plb1cS~RxlL@OPm>ZSn{giPd^d$JJ5G*xsrkCcXY}qgWY6?f3#J@jxcJr8Pe0vr z@sNCXdY|}iaMm;Dsm~Y3JeWLq;j{0&DnGt!=dxd)e^&c-oi#0bjjXM z133dh=${fPZZ>J z?*Fu-uOqME#Ny)(Pbb~{(N=lA_YY&274}F{-fk%jEp!$x8!O-JUAFb3o3(l1w*feV zcVHf65~|&lQdAT&0^$O(dD=gk4PvnkX0p~1H)c|CVRn`yB@U^c(7MW4na?!Bgvul3 zxM)$ZrLvshYlP0A@-01Bv_h9FWqFflkS%!l*5odwr;0i!t;*^h6&}%O3JZMV^zWwD6bcZ78G zWZ*#akrd8odl0JLB_+}=h_p$>6cY22@~+gKtzh-R>S<6|!5*lpn(~4HY^^m{MaT-% z4}6`K(tfedtiZ^CzE1Q9G8Re&=lsA=3bOF=zSXudlm}V-qbzuYMWtH)sLV_crXY*Q zB}js_%nXXMBvvL>1`?&iD2vZ;)rNEmqL21b+oB3JL<~qfVg26eNOT#t68EVZJ^OGF z)(HQ5kWWCk9Veg@_~kwOd=6nB7}&4*aOdNuVD*Rld;i*j4kU~HXW5d2b>b{VBJJD^y$i{lzuBk zMnG_rT2`8$=fXj=+u-f3G67;8s?S={uZ}C0Hew~SuTbRB(we{gU&x&R{7npecCf*z z%-Q8Ocs-Ae`b=zr_3zjQkF}$NmXr{0Pl`3Cq+b@ zYTWwpb5UW|s0Xc9HC}sJ`?^W{1wA=sf#u|NuA-zpBEFiVvmMWT_GN`|qpXZ93ZCLn zj-(I~k;?}Ka3urlZKRM$QZ@M{+xUj(N}mlW=}+3QQrlgmIRdX^B2MuY)9OjF`9~G<1gBa(rbr_s*2qQ>q78NAOY{L4iRvw8j z_eJ6hj6s1Bc`OhK^_PFebLEf65<3pITiXw|2a)2gfLN|KIglj50o%QP;;>6^YWeCs z^kVHS)p+`6AmWFrbIAP#&Pi4*GD6aNB`{D#QOe1EC+ZD#mWIeuah`z>K%SXJ>MVB- z;gijF=WsO!=7s3LYvC2>kd462Mwg8%VsHzShn-w8=wAqxOx_k>VO54%BBRD#S2|}& z*)@d;>5;C?bDt=)wZ8FL$&nFpJ?{oA`@vBmk@Bbsn7Vx2#+YaKZEXLZjq$Nzakkuz zBei*^BGjY*Z&FI6RgKI-h-ReKrq2JDHsI7J)1d3f0(Z@MJw%!(xB-4fejgC8`#Dxs z%ekA9&;!U*(Am2cTZ=*Dsci2F@KkbWv&jmW71HGSuDRvUsMx_Vj^7qM%OTu&%FU1? zIlv^QkQ_mHm7x@eoCM!AjC>R&07nP;rn?Xi3OUl1w9SM#xE2v|hPXo!eG7KP1W_TZ zQn*R66*xc?#6TlRv;2Yfv37>_VvZwwc0IHDp1Npxp?AGpe|XK9#@am&Dj~w=v)v=k zuUhuSqm6fev!Ped^CK`v-ro#!%%VQStt$+Gf>c@n6C-xP0h9Q|{AC49G%4tHmAFI6 zJKaHdvJOiM{6;ka%<~nTeKW^gxw%dzoJwVWC~~<;^gD<)Tayc}1aPc~XZqyH{epu? zExa7lQ^xPDR+1zL(^Kuo^t2l6xspfze~}*TLv`w}45|bAUVrJI%AY{r81k7wcHmCN z9Y7Hyj>3f42x0-c-w-B@VKF`y5NLGKJS5u8nx~zdcg^Yf*UT-|*2n|jaO8FR>Z+?e zd)6ua8e3wtFVH8Gj6t5iNLWFNe<#NQ{*?qr32B|GC9nwBqbYB+y5r+&)+ zD4ubvmQRd3&|~-QJ&yf#25a;ln*QSU?JrF?6=*ZG&$SuXEn2IV?}2g~)hBf` z3w#mJ&~32&oV@gF?=y1!4_eZmbCzz}FB849XXVmG+b-myE>p?y34kzB2gUBHSN(9V=6XeScga)Wj z#+N;aHMfx)X#M{qH!unDb02lE`Q>n}AhK_5D+5rLT;QD}*h8C?E_L!0;|i3Nt6;3@ z0vNS<;Lzg+3*<0LR;S0LQI~mJ0xrgsf@-+B6@D$^bc0zK{u3Likh{6uHPr5Q#D^;* zmp8V&(5MX7`h-OTOKvV{yzcnNU(I1}Heb+USs(2b`%1l8dw1N0w~x*@M_MWP51!^W z7}vw{2#OS(CddywPYesv#`t#Y#$LN=fOvKkR`ficZI^(FKnEDeas~CLDMFHp6gTUoeSDs!KEqPaqfJQZ3;!7V%-Datpxh{r^FAhD z&3_+kSu5XuQY&SDJ?UK{)$NY$ z{P|r1+CesZQY<3b3)}{((X|F%<2hY)_IxsbqhH#$>^sO(EEgC!Rt%WKkHLE>+Td ze6n7Jtfx!04C=4hT+We~Bfxw$ z*rzzj1^fxPi@-iOH_!)QVDX)bx7iY-$;PbqtG9HD5gvkC8#!@aC8@JY@i}c)WM!8b zUcU;9^uGdaXruPlzxyu5yXx_-<#<;(VMvT5MB-vZLV5NfnNNZ_c#a`n8I)sKe+4;) zq<>NFUl?CcKngACTKu$;v`U>v>+o@S)#;jmGjUTjQQa(J@v z1)8}X>hnftwJuBH%h3xeNU;h@EbEPe6bIU>MG=^vmxAIwdTO5U{-l+u{6Z6QwsjJo z@W(9%eJBSn-;+afoNOy!`W@E;a6AL^>-d$>I=}9P-_EZiTfP%ySUTDA;W#=e5vZY) zia4p_gZ@EiQFz&B%cEBz>!LyYPGur*qdX?KST{r?bcTyf|LY z30QxX`W9Lw(2`6hgZT|U;k0Zo!Hx<26W@=OGCb+vXPg|$9~8$&nTUnqa>$N}chZ*N z3Jh$XAUY?!+MXVFxD5pkXHt>+V9s0cPO4InLpzw0o)*vZt{|L1MMR;ggbKFNWTHzC zhZo6JxSFzx882^9jrvK*-=^TMB@W%mMQw|6!rcH&DJzeixvK6jkDWXA{NUk#`Qy2H z(^68V%{w=DT59UFxx1_fnf=j57P`;0Vuj@a?Yl!yYTxfQ?^2((%{{qx?a4VYF>~nu za|t|!^X|_}OZTK2iD^M1i|$P#&i^j|Y#MZuM?i}($?b7M%QuZ6*)D{LM5zeSWc{bz zr>s&huS+e{Nm*UjsOzdwF~pone)PjL6C~&psFww=1IP(>#m{AFrg#C&2xvJdlo*%6 zeQ${RW*`fY0>HxSP>nyjmF2VU9(VQj1)g&i*Vp%$Fuu#VbMm$dM{?c$>t&`T&7YYX zo?j?0Yc3#K-GJve@U?(eyt0ru)F#TE3)WuB@o@3Wb;HSz@T(=pSOsa_VjUAe8)Se( zhk@=w<$*?UP!9B9JRFLC0CgZUtZ;#I`WR2f^wpe}D*kvsk*L`$CzLEzV7?ph{7~G- zetml;9vfhi8~S#5SWI-7J=~t5>)UjsY~_$B0lGFkLl@ck+bL&PJIqFIzGv^I+mXuZ zJ*4%~dLP`jZXMO>R;1o|?_9h$9LNyVR`V2qcIXCX#?Fv(LFr~PtQcLzK*{=~7&L0i zc43LQO|U!;Y`})OkXPvUO!PiG{+4q~mcF`LdtaGy?wt3`jN6wjL*A&*34>hvgSYJD zlfW7;lcSggFV=w1#6=@d1lt72(F_+(AyjM3Ab8y`oc)5Yc?dg3Yet@O@RIT5M<7Rs z8-81q8#39U3z9BE+{yj69qNJb+d_8@3-sISdLZ286#W4ZfXe-FXD<8ikv)SCkGkd2 zdKK>4g|Q>3BFCxIr!(3p+c-9z&LPOr||EGF)%|st`0aRNT!9Vg_`Kk{NA?oMTiArdXH-g-R0Q zmBg3-6guzRxp|?_oMl^IdUa}0D-p$hGJ;@XAUGdt7 z%?0vO?*_#o$K1AF^U~g|$KFgv{IFUYAT@hJV{zfziF@EHv4Z@7d-Eeiz+{ef-Dz$y3&lE10%iiDWnOF8WXy8a5>C%}=y?S&W&}BezVR9l6 z$yTYFRg;6oltFk8-aCWPX|&CH#FNL0C|u;Ax|ZT!B);K3g!9D=)SUs?TAaZL?d6z6k)Q&$R{EqO(C*leBp#qcaI+P z`F&T9=;659F}Zlvm=jYbJJ$B>o|0106zvSN=g0QQb$HST?)I4@I3YhT-6}Gp6H5fXZ<$6 z#9gX;%810#zX_C;!5vvqj7&|!sQWWBKKq3+_z&c;ez(l3e|>p!X5s*QLE?9XBMZkb z4z>1reDeSN^z*-2iuNzh%*;u@qo?R^3PQ8Bouy+;ZPoUnm{Jn5(}JG;h*7Y4i=H@;PTa-up4gvZ`r09ho&`5SvTkW8Eq=tJ8I;}`hR{q zY5M4E|Eo6iT-7jkeR$%=IS)K6?;h2+Z@qTj>z!9Wc!EZyJFz*0J#=HPCMm#AQ^7@@ z&ridPAEFSO{GIn@^grL(QbpgDrE9fM)LHm$o4%Tg!R`8L;+^gKYM^TiY~Zzh2ZIKYUR+`sJ z@a|a1p*Sg3>g(|k3Kq?i5EaI)jj*tgh#XoE2}D+b?#hUdXHtA>d}?wcZ@p-i;#i!O z4m55oo(&e`04V@mETeo+J4tY0;v$X!o;8Pk6s0{m;l9$|8S{ zf$?y5=sIT)5QMW)TAYWWn11=@-FUI@>)=`4EeS6EOP>M%2;W} zQ!x>`kB9DvHeEAxPKA%BP1lU?WA1cE14npf!ovu+45vHlM+&Dqu#gZ))#WmIX2b-A zXC`d?_(Q31&2;un_ZOC4Gi;~!@vgvWg9cw=-cN!CVNz?~jE@R!`DVU4#s2w`Hjp7u zK4rrxwLvRkZ)oGZ1LQt8YrTlJWq58eo*N(Nn}G}ftqk8x4$M0z_st0Nl6YXdrSNw4d+YGv&{qeew&kgF@4e#oKcin?`wd|-yA`qFy-jCaIxI+3p_z&C?q z)sb)J&%PaK(7Ldf@L0v`1;6k-E69^DoYsIGiEhEZnagq{g#KqU(EYx9=y&Bv7;E9a z16;G*u}|C06}i@am_I9{1;Z23A*N;N6fnmlF?Z4lCqEUAq;Vd*B6TFCni=hH#MU|a#@gyudS zXAWFCdLeP2QwQRkQa-qg1VS9Z9{FYM(w*Ce4%nfMA2?{lkO4!+{c*yCg0e}EmtE~H z>YbiZm+ijVvG-nP-}1NGd*Wh?p6i?9n7`olh6CLfL`T|+9H(P5!a~D{@7{sqqy>Bz z?B@Xu+xGKBXs;;Q+AB@U*`0Ky!ZycVZN&GJq+mY}KZ@MXgN;GEOz!8g2m5(^O){VF zusNpoU3+aYp|?=~&e_Ok5khZeJ~0suqskjWT+-4y&w@TB|X0whqSey zCt~}_F{4lJXxedd^q7;|o9d<&7f-9x|L2HW+5Ga0zpjd6yS157tA2g)<>r-9+CtOn z=s}M@_~4PD(a}SXJowoV~bTJdbp|H}Jex{vAk+EB5bnYboZB-|8cfk4UoA9rJC(^C_0;_wP(6`cZ^H zNG8L-6B!}Onr0gQ9e^)vRNNG4z%E}jl~w$LyeR37uRnW7t6@i0u3Nw27o0Jz+rh?% z59}R1Zu~fH51vm=?nK@V)tydg?cObb?SzK`$ZZR!H|xF~ z-Zekr@k;l-Z%1!#YT6wA_O98F&z$|oZ!53P8I+um(z$Zz@XjfY zR0oUsR!hZ(C2LH%S-bestD1Kui(cHTSC<3RUz|H*`}uFH0`*&?4Mb~tEz@) zvJXRZYvzwwxTWvK{Zvv=p1`ipuIufo%f`9k_7$&#lq5N&;hrJ!z;-535`u9_0O=pX zEP#1hRJ5!y8{QsDVW4t5UF9Lk$$*18lbva)aduu`D9Hr-Hb>^;%cT28Z+9n zx_AwtH`_P8u=`^E5zyxn;NPf_c6≠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

    |J(i_gG0DKO0B;dR_Yr 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 z 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 z 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
  • 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�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

    o|XN^&R=N3QCYepM(_ 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

    4uoeJefcq+->sZb$=^&@N{6%M5DwR`Pjf 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 ZxPJM?;TOC;dd|-;Pc%;de?02(_&*^z$y5LU literal 0 HcmV?d00001 diff --git a/static/fonts/hack/LICENSE.md b/static/fonts/hack/LICENSE.md new file mode 100644 index 0000000..08927e5 --- /dev/null +++ b/static/fonts/hack/LICENSE.md @@ -0,0 +1,45 @@ +The work in the Hack project is Copyright 2018 Source Foundry Authors and licensed under the MIT License + +The work in the DejaVu project was committed to the public domain. + +Bitstream Vera Sans Mono Copyright 2003 Bitstream Inc. and licensed under the Bitstream Vera License with Reserved Font Names "Bitstream" and "Vera" + +### MIT License + +Copyright (c) 2018 Source Foundry Authors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +### BITSTREAM VERA LICENSE + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: + +The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera". + +This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Bitstream Vera" names. + +The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. diff --git a/static/fonts/hack/NERD-FONTS-LICENSE b/static/fonts/hack/NERD-FONTS-LICENSE new file mode 100644 index 0000000..e69bd15 --- /dev/null +++ b/static/fonts/hack/NERD-FONTS-LICENSE @@ -0,0 +1,126 @@ +# Nerd Fonts Licensing + +There are various sources used under various licenses: + +* Nerd Fonts source fonts, patched fonts, and folders with explict OFL SIL files are licensed under SIL OPEN FONT LICENSE Version 1.1 (see below). +* Nerd Fonts original source code files (such as `.sh`, `.py`, `font-patcher` and others) are licensed under the MIT License (MIT) (see below). +* Many other licenses are present in this project for even more detailed breakdown see: [License Audit](https://github.com/ryanoasis/nerd-fonts/blob/-/license-audit.md). + +## Source files not in folders containing an explicit license are using the MIT License (MIT) + +The MIT License (MIT) + +Copyright (c) 2014 Ryan L McIntyre + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +## Various Fonts, Patched Fonts, SVGs, Glyph Fonts, and any files in a folder with explicit SIL OFL 1.1 License + +Copyright (c) 2014, Ryan L McIntyre (https://ryanlmcintyre.com). + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/static/fonts/hack/README.md b/static/fonts/hack/README.md new file mode 100644 index 0000000..2888ca1 --- /dev/null +++ b/static/fonts/hack/README.md @@ -0,0 +1,9 @@ +# Hack Nerd Font + +Vendored from Nerd Fonts **v3.2.1**: +https://github.com/ryanoasis/nerd-fonts/blob/v3.2.1/patched-fonts/Hack/Regular/HackNerdFont-Regular.ttf + +Hack upstream license: `LICENSE.md` (Source Foundry Hack v3.003). +Nerd Fonts license and icon-license references: `NERD-FONTS-LICENSE`. + +Served by `/static/css/fonts.css`; no runtime CDN request is needed. diff --git a/static/js/app.js b/static/js/app.js index 89cc3a7..09ca897 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -27,6 +27,8 @@ async function renderMarkdownPreview() { body: JSON.stringify({ markdown: editor.value, + path: window.PagesWikiCurrentPath || location.pathname, + projection: true, }), }, ) @@ -44,7 +46,8 @@ async function restoreRevision( const res = await fetch( "/_/api/v1/revisions/restore?revision=" - + revisionUUID, + + encodeURIComponent(revisionUUID), + { method: "POST" }, ) if (!res.ok) { @@ -56,57 +59,42 @@ async function restoreRevision( } async function openRevisionDialog() { - - const objectUUID = - document.getElementById( - "object-uuid", - ).value - - const res = await fetch( - "/_/api/v1/revisions/list?uuid=" - + objectUUID, - ) - - const revisions = - await res.json() - - const root = - document.getElementById( - "revision-list", - ) - - root.innerHTML = "" - - revisions.forEach((r) => { - - const div = - document.createElement("div") - - div.className = - "revision-item" - - const ts = - new Date( - r.created_at * 1000, - ) - - div.innerHTML = - "" - + r.uuid - + "
    " - + ts.toLocaleString() - + "
    " - + r.message - + "
    " - - root.appendChild(div) + const objectUUID = document.getElementById("object-uuid")?.value + const root = document.getElementById("revision-list") + const dialog = document.getElementById("revision-dialog") + if (!objectUUID || !root || !dialog) return + const ja = document.documentElement.lang.startsWith("ja") + const res = await fetch("/_/api/v1/revisions/list?uuid=" + encodeURIComponent(objectUUID)) + if (!res.ok) { + root.textContent = ja ? "履歴を取得できませんでした。" : "Revision history is unavailable." + dialog.showModal() + return + } + const revisions = await res.json() + root.replaceChildren() + revisions.forEach((revision) => { + const item = document.createElement("div") + item.className = "revision-item" + const id = document.createElement("code") + id.textContent = revision.uuid + const time = document.createElement("div") + time.textContent = new Date(revision.created_at * 1000).toLocaleString() + const message = document.createElement("p") + message.textContent = revision.message + const restore = document.createElement("button") + restore.type = "button" + restore.textContent = ja ? "復元" : "Restore" + restore.addEventListener("click", () => restoreRevision(revision.uuid)) + item.append(id, time, message, restore) + root.append(item) }) - - document.getElementById( - "revision-dialog", - ).showModal() + if (res.headers.get("X-Next-Cursor")) { + const more = document.createElement("a") + more.href = "/r/history/" + encodeURIComponent(objectUUID) + more.textContent = ja ? "すべての履歴を表示" : "Browse revision history" + root.append(more) + } + dialog.showModal() } window.addEventListener( diff --git a/static/js/archive-import.js b/static/js/archive-import.js new file mode 100644 index 0000000..6c6fc40 --- /dev/null +++ b/static/js/archive-import.js @@ -0,0 +1,91 @@ +document.addEventListener('DOMContentLoaded', () => { + const ja = document.documentElement.lang.startsWith('ja'); + const id = location.pathname.split('/').filter(Boolean).pop(); + const result = document.querySelector('[data-import-result]'); + const rows = () => Array.from(document.querySelectorAll('[data-import-item]')); + const fields = ['target_path', 'quartier', 'street', 'spot']; + const namePattern = /^[a-z0-9][a-z0-9_-]{1,63}$/; + + const style = document.createElement('style'); + style.textContent = '.import-bulk-replace{display:flex;gap:.45rem;align-items:center;flex-wrap:wrap;margin:.7rem 0}.import-row-warning{display:block;color:var(--danger);font-size:.72rem;max-width:15rem;white-space:normal}.import-row-hint{color:var(--muted)}tr.import-invalid{background:color-mix(in srgb,var(--danger) 8%,transparent)}'; + document.head.appendChild(style); + + document.querySelectorAll('[data-field=spot]').forEach(input => { + if (!input.value) input.placeholder = ja ? '未定義(Street所属)' : 'Undefined (Street inbox)'; + const status = document.createElement('small'); + status.className = 'import-row-warning'; + input.closest('td').appendChild(status); + }); + + const validateRow = row => { + const get = name => row.querySelector(`[data-field=${name}]`).value.trim(); + const sourceDepth = row.querySelector('code').textContent.split('/').filter(Boolean).length; + const quartier = get('quartier'), street = get('street'), spot = get('spot'); + const status = row.querySelector('.import-row-warning'); + let error = '', hint = ''; + if (street && !quartier) error = ja ? 'StreetにはQuartierが必要です' : 'Street requires a Quartier'; + else if (spot && !street) error = ja ? 'SpotにはStreetが必要です' : 'Spot requires a Street'; + else if ([quartier, street, spot].some(value => value && !namePattern.test(value))) error = ja ? 'City名は英小文字・数字・_・-を2〜64文字で指定してください' : 'City names require 2–64 lowercase letters, digits, _ or -'; + else if (spot === street && spot) hint = ja ? '同名のため未定義Spotとして配置されます' : 'Same name: assigned to the undefined Spot'; + else if (!spot && street) hint = ja ? '未定義SpotとしてStreetへ所属します' : 'Assigned to the Street undefined Spot'; + else if (spot && sourceDepth <= 3) hint = ja ? `Spot PathはStreet配下の _${spot} になります` : `Spot Path will be _${spot} below the Street`; + status.textContent = error || hint; + status.classList.toggle('import-row-hint', !error); + row.classList.toggle('import-invalid', !!error); + return !error; + }; + const validateAll = () => rows().every(validateRow); + rows().forEach(row => fields.forEach(field => row.querySelector(`[data-field=${field}]`).addEventListener('input', () => validateRow(row)))); + validateAll(); + + const actions = document.querySelector('.import-actions'); + if (actions) { + const bulk = document.createElement('div'); + bulk.className = 'import-bulk-replace'; + bulk.innerHTML = `${ja ? '一括置換' : 'Bulk replace'}→`; + actions.before(bulk); + bulk.querySelector('[data-replace-apply]').addEventListener('click', () => { + const from = bulk.querySelector('[data-replace-from]').value; + if (!from) return; + const to = bulk.querySelector('[data-replace-to]').value; + const scope = bulk.querySelector('[data-replace-field]').value; + const targets = scope === 'all' ? fields : [scope]; + rows().forEach(row => targets.forEach(field => { + const input = row.querySelector(`[data-field=${field}]`); + input.value = input.value.split(from).join(to); + })); + validateAll(); + }); + } + + document.querySelector('.import-table-wrap')?.addEventListener('keydown', event => { + if (event.key !== 'Tab' || !event.target.matches('input[data-field]:not([type=checkbox])')) return; + const column = event.target.dataset.field; + const inputs = rows().map(row => row.querySelector(`input[data-field=${column}]`)).filter(Boolean); + const current = inputs.indexOf(event.target); + const next = current + (event.shiftKey ? -1 : 1); + if (next < 0 || next >= inputs.length) return; + event.preventDefault(); + inputs[next].focus(); + inputs[next].select(); + }); + + const collect = () => rows().map(row => ({ + sequence: Number(row.dataset.sequence), + selected: row.querySelector('[data-field=selected]').checked, + target_path: row.querySelector('[data-field=target_path]').value, + quartier: row.querySelector('[data-field=quartier]').value, + street: row.querySelector('[data-field=street]').value, + spot: row.querySelector('[data-field=spot]').value, + })); + const call = async (method, body) => { + if (result) result.textContent = '…'; + const response = await fetch('/_/api/v1/import/' + encodeURIComponent(id), {method, headers: {'Content-Type': 'application/json'}, body: body ? JSON.stringify(body) : undefined}); + const data = await response.json().catch(() => ({})); + if (!response.ok) throw new Error(data.error || `HTTP ${response.status}`); + return data; + }; + document.querySelector('[data-save-plan]')?.addEventListener('click', async () => { if (!validateAll()) return; try { await call('PATCH', {items: collect()}); result.textContent = ja ? '計画を保存しました' : 'Plan saved'; } catch (error) { result.textContent = error.message; } }); + document.querySelector('[data-commit-import]')?.addEventListener('click', async () => { if (!validateAll()) return; try { await call('PATCH', {items: collect()}); await call('POST', {conflict: document.querySelector('[data-conflict]').value}); location.reload(); } catch (error) { result.textContent = error.message; } }); + document.querySelector('[data-rollback-import]')?.addEventListener('click', async () => { if (!confirm(ja ? 'このimportで作成したPathを取り消しますか?' : 'Roll back paths created by this import?')) return; try { await call('DELETE'); location.reload(); } catch (error) { result.textContent = error.message; } }); +}); diff --git a/static/js/bookmark-manager.js b/static/js/bookmark-manager.js new file mode 100644 index 0000000..32fab70 --- /dev/null +++ b/static/js/bookmark-manager.js @@ -0,0 +1,89 @@ +(() => { + const form = document.getElementById('bookmark-form'); + if (!form) return; + const msg = form.dataset, groups = []; + for (const row of document.querySelectorAll('#bookmark-source-rows tr')) { + const item = {label:row.querySelector('[name=bookmark_label]').value, href:row.querySelector('[name=bookmark_target]').value, kind:row.querySelector('[name=bookmark_kind]').value, children:row.querySelector('[data-bookmark-children]').checked}; + if (item.kind === 'section') groups.push({section:item, links:[]}); + else { if (!groups.length) groups.push({section:null,links:[]}); groups.at(-1).links.push(item); } + } + const legacy = form.querySelector('.bookmark-legacy'); + legacy.hidden = true; legacy.querySelectorAll('input,select').forEach(input => input.disabled = true); + const el = (tag, cls, text) => { const node = document.createElement(tag); if (cls) node.className = cls; if (text) node.textContent = text; return node; }; + const editor = el('div','bookmark-card-editor'); legacy.before(editor); + const toolbar = el('div','bookmark-editor-toolbar'); editor.before(toolbar); + const status = form.querySelector('[data-bookmark-status]'); + const count = () => groups.reduce((n,g) => n + g.links.length + (g.section ? 1 : 0), 0); + const room = () => { if (count() < 64) return true; status.textContent = msg.limit; return false; }; + const button = (text, action, title = text) => {const node = el('button','',text); node.type='button'; node.title=title; node.setAttribute('aria-label',title); node.addEventListener('click',action); return node;}; + const field = (title, value, change, required = true) => { + const label=el('label','bookmark-field'), input=el('input'); label.append(el('span','',title),input); + input.value=value; input.required=required; input.maxLength=(title===msg.label || title===msg.section) ? 200 : 4096; + input.addEventListener('input',()=>change(input.value)); return label; + }; + const addLink = group => { if (!room()) return; group.links.push({kind:'path', label:'', href:'', children:false}); render(); editor.querySelectorAll('.bookmark-link-row').item([...editor.querySelectorAll('.bookmark-link-row')].length-1)?.querySelector('input')?.focus(); }; + toolbar.append(button(msg.addSection,()=>{ + if (!room() || groups.filter(g=>g.section).length>=16) {status.textContent=msg.limit;return;} + groups.push({section:{kind:'section',label:'',href:'',children:false},links:[]});render();editor.lastElementChild.querySelector('input').focus(); + }),button(msg.addLink,()=>{if(!groups.length)groups.push({section:null,links:[]});addLink(groups.at(-1));})); + function render() { + editor.replaceChildren(); + groups.forEach((group,index) => { + const card=el('fieldset','bookmark-editor-card'), header=el('div','bookmark-card-head'); + if (group.section) { + header.append(field(msg.section,group.section.label,v=>group.section.label=v)); + const up=button('↑',()=>{[groups[index-1],groups[index]]=[groups[index],groups[index-1]];render();},msg.up); + up.disabled=index===0 || !groups[index-1].section; + const down=button('↓',()=>{[groups[index+1],groups[index]]=[groups[index],groups[index+1]];render();},msg.down);down.disabled=index===groups.length-1; + header.append(up,down,button('×',()=>{if(!confirm(msg.confirm))return;groups.splice(index,1);render();},msg.remove)); + } else header.append(el('h3','',msg.default)); + card.append(header); + if (group.section) { + const options=el('div','bookmark-section-options'), toggle=el('label','bookmark-toggle'), check=el('input');check.type='checkbox';check.role='switch';check.checked=group.section.children; + toggle.append(check,el('span','',msg.children));check.addEventListener('change',()=>{group.section.children=check.checked;render();}); + options.append(toggle); + if (group.section.children) options.append(field('Path',group.section.href,v=>group.section.href=v),el('p','muted',msg.auto)); + card.append(options); + } + group.links.forEach((link,li) => { + const row=el('div','bookmark-link-row'); + row.append(field(msg.label,link.label,v=>link.label=v)); + const kind=el('select');kind.setAttribute('aria-label',msg.target); + for (const value of ['path','url']) {const option=el('option','',value==='path'?'Path':'URL');option.value=value;kind.append(option);}kind.value=link.kind;kind.addEventListener('change',()=>link.kind=kind.value); + row.append(kind,field(msg.target,link.href,v=>link.href=v)); + const move=el('select');move.setAttribute('aria-label',msg.section); + groups.forEach((g,i)=>{const option=el('option','',g.section?.label||msg.default);option.value=i;move.append(option);});move.value=index; + move.addEventListener('change',()=>{group.links.splice(li,1);groups[Number(move.value)].links.push(link);render();});row.append(move); + const up=button('↑',()=>{[group.links[li-1],group.links[li]]=[group.links[li],group.links[li-1]];render();},msg.up);up.disabled=li===0; + const down=button('↓',()=>{[group.links[li+1],group.links[li]]=[group.links[li],group.links[li+1]];render();},msg.down);down.disabled=li===group.links.length-1; + row.append(up,down,button('×',()=>{group.links.splice(li,1);render();},msg.remove));card.append(row); + }); + card.append(button(msg.addLink,()=>addLink(group)));editor.append(card); + }); + } + render(); + const dialog=document.querySelector('[data-bookmark-dialog]'), open=document.querySelector('[data-bookmark-open]'); + let dirty=false; + form.addEventListener('input',()=>dirty=true);form.addEventListener('change',()=>dirty=true); + toolbar.addEventListener('click',()=>dirty=true);editor.addEventListener('click',e=>{if(e.target.closest('button'))dirty=true;}); + if (dialog) { + open.addEventListener('click',()=>dialog.showModal()); + dialog.querySelector('[data-bookmark-close]').addEventListener('click',()=>dialog.close()); + dialog.addEventListener('click',event=>{if(event.target===dialog){const r=dialog.getBoundingClientRect();if(event.clientXr.right||event.clientYr.bottom)dialog.close();}}); + dialog.addEventListener('close',()=>open.focus()); + } + window.addEventListener('beforeunload',event=>{if(dirty){event.preventDefault();event.returnValue='';}}); + form.addEventListener('submit',async event=>{ + event.preventDefault();const save=form.querySelector('[type=submit]');if(save.disabled)return; + const data=new URLSearchParams(new FormData(form)); + for(const group of groups)for(const item of [...(group.section?[group.section]:[]),...group.links]){ + data.append('bookmark_label',item.label);data.append('bookmark_kind',item.kind);data.append('bookmark_target',item.href);data.append('bookmark_children',String(Boolean(item.children))); + } + save.disabled=true;status.textContent=''; + try{ + const response=await fetch(form.action,{method:'POST',body:data,headers:{Accept:'application/json'},signal:AbortSignal.timeout(15000)}); + if(!response.ok)throw new Error((await response.text()).trim());await response.json();dirty=false;status.textContent=msg.saved; + if(dialog){dialog.close();location.reload();} + }catch(error){status.textContent=error.message;}finally{save.disabled=false;} + }); +})(); diff --git a/static/js/bookmarks.js b/static/js/bookmarks.js new file mode 100644 index 0000000..6bc35bf --- /dev/null +++ b/static/js/bookmarks.js @@ -0,0 +1,32 @@ +(() => { + // At most two background listings at a time; no previews or revision fetches. + const queue = []; let active = 0; + const pump = () => { while (active < 2 && queue.length) { active++; queue.shift()().finally(() => { active--; pump(); }); } }; + const enqueue = job => { queue.push(job); pump(); }; + const observer = new IntersectionObserver(entries => { + for (const entry of entries) if (entry.isIntersecting) { observer.unobserve(entry.target); entry.target._load(); } + }, {rootMargin: '100px'}); + for (const list of document.querySelectorAll('[data-bookmark-source]')) { + const button = list.parentElement.querySelector('[data-bookmark-load]'); + let after = '', busy = false; + const load = () => { + if (busy) return; busy = true; button.disabled = true; list.setAttribute('aria-busy', 'true'); + enqueue(async () => { + try { + const url = new URL(list.dataset.bookmarkSource, location.origin); + if (after) url.searchParams.set('after', after); + const response = await fetch(url, {cache: 'no-store', signal: AbortSignal.timeout(15000)}); + if (!response.ok) throw new Error(String(response.status)); + const data = await response.json(); + for (const link of data.links) { + const li = document.createElement('li'), a = document.createElement('a'); + a.href = link.href; a.textContent = link.label; li.append(a); list.append(li); + } + after = data.next; button.hidden = !after; button.textContent = button.dataset.more; + } catch (_) { button.textContent = button.dataset.error; } + finally { busy = false; button.disabled = false; list.setAttribute('aria-busy', 'false'); } + }); + }; + list._load = load; button.addEventListener('click', load); observer.observe(list); + } +})(); diff --git a/static/js/browser-interactions.js b/static/js/browser-interactions.js new file mode 100644 index 0000000..59fc158 --- /dev/null +++ b/static/js/browser-interactions.js @@ -0,0 +1,376 @@ +let browserSelectionAnchor = null; +let activeNavigatorLink = null; + +function browserRows() { + return Array.from(document.querySelectorAll('.browser-row')); +} + +function selectedEntries() { + return browserRows().filter(row => row.classList.contains('selected')); +} + +function markEntrySelected(row, selected) { + row.classList.toggle('selected', selected); + row.setAttribute('aria-selected', String(selected)); +} + +function clearBrowserSelection() { + browserRows().forEach(row => markEntrySelected(row, false)); + selectedEntry = null; + updateSelectionStatus(); +} + +function updateSelectionStatus() { + const count = selectedEntries().length; + const status = document.getElementById('browser-selection-status'); + if (status) status.textContent = count ? `${count} selected` : ''; + const rename = document.getElementById('browser-context-rename'); + if (rename) rename.disabled = count !== 1; +} + +function selectEntry(el, event) { + const modifier = Boolean(event && (event.ctrlKey || event.metaKey)); + const range = Boolean(event && event.shiftKey && browserSelectionAnchor); + if (range) { + const rows = browserRows(); + const from = rows.indexOf(browserSelectionAnchor); + const to = rows.indexOf(el); + if (!modifier) rows.forEach(row => markEntrySelected(row, false)); + if (from >= 0 && to >= 0) { + const [start, end] = from < to ? [from, to] : [to, from]; + rows.slice(start, end + 1).forEach(row => markEntrySelected(row, true)); + } + } else if (modifier) { + markEntrySelected(el, !el.classList.contains('selected')); + browserSelectionAnchor = el; + } else { + browserRows().forEach(row => markEntrySelected(row, row === el)); + browserSelectionAnchor = el; + } + const selected = selectedEntries(); + selectedEntry = el.classList.contains('selected') ? el : (selected.at(-1) || null); + if (selectedEntry) updatePreview(selectedEntry); + updateSelectionStatus(); +} + +function openContextMenu(ev, el) { + ev.preventDefault(); + ev.stopPropagation(); + if (!el.classList.contains('selected')) selectEntry(el); + selectedEntry = el; + const menu = document.getElementById('context-menu'); + const rename = menu.querySelector('button:nth-child(3)'); + if (rename) { + rename.id = 'browser-context-rename'; + rename.disabled = selectedEntries().length !== 1; + } + placeContextMenu(menu, ev.clientX, ev.clientY); + loadContextAdapters(el.dataset.path); +} + +function placeContextMenu(menu, x, y) { + menu.style.display = 'block'; + menu.style.left = `${x}px`; + menu.style.top = `${y}px`; + const bounds = menu.getBoundingClientRect(); + menu.style.left = `${Math.max(8, Math.min(x, innerWidth - bounds.width - 8))}px`; + menu.style.top = `${Math.max(8, Math.min(y, innerHeight - bounds.height - 8))}px`; +} + +function selectionMarquee() { + const grid = document.getElementById('browser-grid'); + const box = document.getElementById('selection-marquee'); + if (!grid || !box) return; + grid.addEventListener('pointerdown', event => { + if (event.button !== 0 || event.target.closest('.browser-row,button,a,input')) return; + const startX = event.clientX; + const startY = event.clientY; + const additive = event.ctrlKey || event.metaKey; + const initial = new Set(additive ? selectedEntries() : []); + let active = false; + try { grid.setPointerCapture?.(event.pointerId); } catch (_) {} + + const move = current => { + if (!active && Math.hypot(current.clientX - startX, current.clientY - startY) < 4) return; + active = true; + current.preventDefault(); + const left = Math.min(startX, current.clientX); + const top = Math.min(startY, current.clientY); + const right = Math.max(startX, current.clientX); + const bottom = Math.max(startY, current.clientY); + Object.assign(box.style, { + display: 'block', left: `${left}px`, top: `${top}px`, + width: `${right - left}px`, height: `${bottom - top}px` + }); + for (const row of browserRows()) { + const rect = row.getBoundingClientRect(); + const hit = rect.left < right && rect.right > left && rect.top < bottom && rect.bottom > top; + markEntrySelected(row, initial.has(row) || hit); + } + const selected = selectedEntries(); + selectedEntry = selected.at(-1) || null; + updateSelectionStatus(); + const edge = 44; + const main = grid.closest('.browser-main'); + if (main && current.clientY > innerHeight - edge) main.scrollTop += 18; + if (main && current.clientY < grid.getBoundingClientRect().top + edge) main.scrollTop -= 18; + }; + const finish = current => { + grid.removeEventListener('pointermove', move); + grid.removeEventListener('pointerup', finish); + grid.removeEventListener('pointercancel', finish); + try { grid.releasePointerCapture?.(current.pointerId); } catch (_) {} + box.style.display = 'none'; + if (!active && !additive) clearBrowserSelection(); + if (selectedEntry) updatePreview(selectedEntry); + }; + grid.addEventListener('pointermove', move); + grid.addEventListener('pointerup', finish); + grid.addEventListener('pointercancel', finish); + }); +} + +function draggedItems(event) { + let raw = ''; + try { raw = event.dataTransfer.getData('application/x-pageswiki-paths'); } catch (_) {} + if (raw) { + try { + const items = JSON.parse(raw); + if (Array.isArray(items)) return items.filter(item => item && typeof item.path === 'string'); + } catch (_) {} + } + const path = event.dataTransfer.getData('text/plain') || draggedPath; + if (!path) return []; + const row = browserRows().find(item => item.dataset.path === path); + return [{path, name: row?.dataset.name || path.split('/').pop(), is_directory: row?.dataset.isDir === 'true'}]; +} + +function dragStart(ev, el) { + if (!el.classList.contains('selected')) selectEntry(el); + const items = selectedEntries().map(row => ({ + path: row.dataset.path, + name: row.dataset.name, + is_directory: row.dataset.isDir === 'true' + })); + draggedPath = el.dataset.path; + ev.dataTransfer.effectAllowed = 'copyMove'; + ev.dataTransfer.setData('application/x-pageswiki-paths', JSON.stringify(items)); + ev.dataTransfer.setData('text/plain', items.map(item => item.path).join('\n')); +} + +function dragOver(ev, el) { + if (el.dataset.isDir === 'true') { + ev.preventDefault(); + ev.dataTransfer.dropEffect = 'move'; + } +} + +async function dropEntry(ev, el) { + ev.preventDefault(); + ev.stopPropagation(); + if (el.dataset.isDir !== 'true') return; + const targetDir = el.dataset.path.replace(/\/$/, ''); + const items = draggedItems(ev).filter(item => item.path !== targetDir); + if (!items.length) return; + const moves = items.map(item => ({ + ...item, + destination: `${targetDir}/${item.path.replace(/\/+$/, '').split('/').pop()}` + })).filter(item => item.destination !== item.path); + if (!moves.length) return; + if (!confirm(`${moves.length} item(s)\n→ ${targetDir}`)) return; + await runMoveQueue(moves); + location.reload(); +} + +async function ctxRename() { + const entries = selectedEntries(); + if (entries.length !== 1) return; + const entry = entries[0]; + const oldPath = entry.dataset.path; + const newPath = prompt('Rename path:', oldPath); + if (!newPath || newPath === oldPath) return; + await renamePath(oldPath, newPath, entry.dataset.isDir === 'true'); + location.reload(); +} + +function ctxCopy() { + const paths = selectedEntries().map(row => row.dataset.path); + if (!paths.length) return; + localStorage.setItem('pageswiki.fileClipboard', JSON.stringify({ + operation: 'copy', paths, created_at: Date.now() + })); +} + +function ctxCopyPath() { + const paths = selectedEntries().map(row => row.dataset.path); + if (paths.length) navigator.clipboard.writeText(paths.join('\n')); +} + +async function renamePath(oldPath, newPath, recursive = false, operation = null, range = {start: 0, end: 100}) { + const ownOperation = !operation; + operation ||= startBrowserOperation('Renaming', oldPath, true); + const request = {old_path: oldPath, new_path: newPath, recursive}; + try { + const preview = await fetch('/_/api/v1/path/rename?preview=1', { + method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(request) + }); + if (!preview.ok) throw new Error((await preview.text()).trim() || 'rename preview failed'); + const estimate = await preview.json(); + const count = Number(estimate.count || 1); + updateBrowserOperation(operation, range.start + (range.end - range.start) * .2, + `${count} path${count === 1 ? '' : 's'} · ${newPath}`); + const response = await fetch('/_/api/v1/path/rename', { + method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(request) + }); + if (!response.ok) throw new Error((await response.text()).trim() || 'rename failed'); + const result = await response.json().catch(() => ({count})); + updateBrowserOperation(operation, range.end, `${result.count || count} path${(result.count || count) === 1 ? '' : 's'}`); + if (ownOperation) finishBrowserOperation(operation); + return result.count || count; + } catch (error) { + failBrowserOperation(operation, error.message); + throw error; + } +} + +async function runMoveQueue(moves) { + const operation = startBrowserOperation('Moving items', `0 / ${moves.length}`, true); + for (let index = 0; index < moves.length; index += 1) { + const move = moves[index]; + await renamePath(move.path, move.destination, Boolean(move.is_directory), operation, { + start: index / moves.length * 100, + end: (index + 1) / moves.length * 100 + }); + updateBrowserOperation(operation, (index + 1) / moves.length * 100, `${index + 1} / ${moves.length}`); + } + finishBrowserOperation(operation); +} + +function startBrowserOperation(title, detail, indeterminate = false) { + const operation = document.createElement('div'); + operation.className = `browser-operation${indeterminate ? ' indeterminate' : ''}`; + operation.style.setProperty('--operation-progress', '4'); + operation.innerHTML = '

    '; + operation.querySelector('.operation-title').textContent = title; + operation.querySelector('.operation-detail').textContent = detail; + document.getElementById('browser-operation-stack').append(operation); + return operation; +} + +function updateBrowserOperation(operation, progress, detail) { + operation.classList.remove('indeterminate'); + operation.style.setProperty('--operation-progress', String(Math.max(0, Math.min(100, progress)))); + if (detail) operation.querySelector('.operation-detail').textContent = detail; +} + +function finishBrowserOperation(operation) { + updateBrowserOperation(operation, 100); + operation.classList.add('done'); + setTimeout(() => operation.remove(), 1000); +} + +function failBrowserOperation(operation, detail) { + operation.classList.remove('indeterminate'); + operation.classList.add('failed'); + operation.style.setProperty('--operation-progress', '100'); + operation.querySelector('.operation-title').textContent = 'Operation failed'; + operation.querySelector('.operation-detail').textContent = detail; +} + +function navigatorDragOver(event) { + const container = document.getElementById('navigator-links'); + if (container?.dataset.editable !== 'true') return; + event.preventDefault(); + event.dataTransfer.dropEffect = 'copy'; + document.getElementById('browser-sidebar').classList.add('is-drop-target'); +} + +function navigatorDragLeave(event) { + const sidebar = document.getElementById('browser-sidebar'); + if (!sidebar.contains(event.relatedTarget)) sidebar.classList.remove('is-drop-target'); +} + +async function navigatorDrop(event) { + event.preventDefault(); + event.stopPropagation(); + const sidebar = document.getElementById('browser-sidebar'); + sidebar.classList.remove('is-drop-target'); + const container = document.getElementById('navigator-links'); + if (container?.dataset.editable !== 'true') return; + const items = draggedItems(event); + if (!items.length) return; + const operation = startBrowserOperation('Adding shortcuts', `0 / ${items.length}`); + try { + for (let index = 0; index < items.length; index += 1) { + const item = items[index]; + const response = await fetch('/_/api/v1/browser/navigation', { + method: 'POST', headers: {'Content-Type': 'application/json'}, + body: JSON.stringify({label: item.name, path: item.path, is_directory: Boolean(item.is_directory)}) + }); + if (!response.ok) throw new Error((await response.text()).trim() || 'could not add shortcut'); + appendNavigatorLink(await response.json()); + updateBrowserOperation(operation, (index + 1) / items.length * 100, `${index + 1} / ${items.length}`); + } + finishBrowserOperation(operation); + } catch (error) { + failBrowserOperation(operation, error.message); + } +} + +function appendNavigatorLink(link) { + const container = document.getElementById('navigator-links'); + if (container.querySelector(`[data-navigation-id="${CSS.escape(link.uuid)}"]`)) return; + const anchor = document.createElement('a'); + anchor.className = 'sidebar-link navigator-link'; + anchor.href = link.is_directory ? `/v/browser${link.path}` : link.path; + anchor.dataset.navigationId = link.uuid; + anchor.dataset.navigationPath = link.path; + anchor.dataset.isDir = String(Boolean(link.is_directory)); + anchor.textContent = link.label; + anchor.addEventListener('contextmenu', event => openNavigatorMenu(event, anchor)); + container.append(anchor); +} + +function openNavigatorMenu(event, link) { + event.preventDefault(); + event.stopPropagation(); + activeNavigatorLink = link; + placeContextMenu(document.getElementById('navigator-menu'), event.clientX, event.clientY); +} + +async function renameNavigatorLink() { + if (!activeNavigatorLink) return; + const label = prompt('Shortcut name:', activeNavigatorLink.textContent.trim()); + if (!label || label === activeNavigatorLink.textContent.trim()) return; + const response = await fetch('/_/api/v1/browser/navigation', { + method: 'PATCH', headers: {'Content-Type': 'application/json'}, + body: JSON.stringify({uuid: activeNavigatorLink.dataset.navigationId, label}) + }); + if (!response.ok) { + alert((await response.text()).trim()); + return; + } + activeNavigatorLink.textContent = label; +} + +async function deleteNavigatorLink() { + if (!activeNavigatorLink) return; + const link = activeNavigatorLink; + if (!confirm(`Remove “${link.textContent.trim()}” from Navigator?`)) return; + const response = await fetch('/_/api/v1/browser/navigation', { + method: 'DELETE', headers: {'Content-Type': 'application/json'}, + body: JSON.stringify({uuid: link.dataset.navigationId}) + }); + if (!response.ok) { + alert((await response.text()).trim()); + return; + } + link.remove(); + activeNavigatorLink = null; +} + +document.addEventListener('click', () => { + document.getElementById('navigator-menu')?.style.setProperty('display', 'none'); +}); +selectionMarquee(); +updateSelectionStatus(); diff --git a/static/js/browser-thumbnails.js b/static/js/browser-thumbnails.js new file mode 100644 index 0000000..291ed68 --- /dev/null +++ b/static/js/browser-thumbnails.js @@ -0,0 +1,75 @@ +(() => { + document.documentElement.dataset.browserThumbnails = 'ready'; + const connection = navigator.connection || {}; + const concurrency = connection.saveData || /(^|-)2g$/.test(connection.effectiveType || '') ? 1 : 2; + const queue = []; + let active = 0; + let stopped = false; + + const ready = image => image.closest('.browser-thumbnail') + ?.classList.replace('children-preview-pending', 'children-preview-ready'); + + const load = image => new Promise(resolve => { + if (stopped || !image.isConnected || image.dataset.previewLoaded) { + resolve(); + return; + } + image.dataset.previewLoaded = 'true'; + image.loading = 'lazy'; + image.decoding = 'async'; + image.fetchPriority = 'low'; + const done = success => { + window.clearTimeout(timeout); + if (success) ready(image); + resolve(); + }; + const timeout = window.setTimeout(() => done(false), 30000); + image.addEventListener('load', () => done(true), {once: true}); + image.addEventListener('error', () => done(false), {once: true}); + image.src = image.dataset.previewSrc; + }); + + const drain = () => { + if (stopped || document.visibilityState === 'hidden') return; + while (active < concurrency && queue.length) { + active++; + const image = queue.shift(); + Promise.resolve().then(() => load(image)).finally(() => { + active--; + drain(); + }); + } + }; + + const enqueue = image => { + if (image.dataset.previewQueued || image.dataset.previewLoaded) return; + image.dataset.previewQueued = 'true'; + queue.push(image); + }; + + const observer = new IntersectionObserver(entries => { + for (const entry of entries) { + if (!entry.isIntersecting) continue; + observer.unobserve(entry.target); + enqueue(entry.target); + } + drain(); + }, {rootMargin: '240px 0px'}); + + document.querySelectorAll('.browser-thumbnail [data-preview-src]').forEach(image => { + observer.observe(image); + const rect = image.getBoundingClientRect(); + if (rect.bottom >= -240 && rect.top <= innerHeight + 240) { + observer.unobserve(image); + enqueue(image); + } + }); + drain(); + document.addEventListener('visibilitychange', drain); + window.addEventListener('pagehide', () => { + stopped = true; + queue.length = 0; + observer.disconnect(); + document.querySelectorAll('.browser-thumbnail [data-preview-loaded]').forEach(image => image.removeAttribute('src')); + }, {once: true}); +})(); diff --git a/static/js/calendar.js b/static/js/calendar.js new file mode 100644 index 0000000..bcc96d0 --- /dev/null +++ b/static/js/calendar.js @@ -0,0 +1,2147 @@ +(() => { + "use strict"; + const app = document.querySelector("#calendar-app"); + if (!app) return; + const $ = (id) => document.getElementById(id), + ja = document.documentElement.lang.startsWith("ja"); + const t = (a, b) => (ja ? a : b), + API = "/_/api/v1/extension/organizer.calendar/", + DAV = "/_/api/v1/caldav/"; + let calendars = [], + enabled = [], + current = null, + actor = "", + active = false, + publicAllowed = false, + events = [], + generation = 0, + abort = null; + const calendarTimezone = app.dataset.timezone || "UTC"; + const compactScreen = matchMedia('(max-width: 650px), (max-width: 950px) and (pointer: coarse)'); + const touchScreen = matchMedia('(pointer: coarse)'); + // Dynamic browser chrome / keyboard on iOS. Do not interfere with pinch zoom. + function updateVisibleViewport() { + const viewport=window.visualViewport; + if(viewport && viewport.scale!==1)return; + app.style.setProperty('--calendar-visual-height',(viewport?.height||innerHeight)+'px'); + app.style.setProperty('--calendar-visual-top',(viewport?.offsetTop||0)+'px'); + } + window.visualViewport?.addEventListener('resize',updateVisibleViewport); + window.visualViewport?.addEventListener('scroll',updateVisibleViewport); + window.addEventListener('resize',updateVisibleViewport); + updateVisibleViewport(); + const zoneFormatter = new Intl.DateTimeFormat("en-CA", { + timeZone: calendarTimezone, + year: "numeric", + month: "2-digit", + day: "2-digit", + hour: "2-digit", + minute: "2-digit", + second: "2-digit", + hourCycle: "h23", + }); + const timeScales = [40, 60, 90, 120, 180, 240]; + const calendarViews = new Set([ + "year", + "month", + "week", + "week/list", + "day", + "timeline", + "events", + ]); + let timeScale = 1, + movePending = false, + cancelDrag = null; + const cache = new Map(); // Per-tab only; never persist private schedules to localStorage. + function viewPreferenceKey() { + // The preference contains only a layout name. Calendar names, event data, + // selected dates and credentials never enter browser-persistent storage. + return "pageswiki.calendar.view.v1:" + + (actor || app.dataset.actor || "anonymous"); + } + function preferredView() { + try { + const value = localStorage.getItem(viewPreferenceKey()); + return calendarViews.has(value) ? value : "week"; + } catch (_) { + return "week"; + } + } + function rememberView(value) { + if (!calendarViews.has(value)) return; + try { + localStorage.setItem(viewPreferenceKey(), value); + } catch (_) {} + } + const node = (tag, text, cls) => { + const e = document.createElement(tag); + if (text !== undefined) e.textContent = text; + if (cls) e.className = cls; + return e; + }; + const pad = (n) => String(n).padStart(2, "0"), + ymd = (d) => + `${d.getFullYear()}/${pad(d.getMonth() + 1)}/${pad(d.getDate())}`; + const dateOnly = (d) => + `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`; + function zoneParts(value) { + const parts = {}; + zoneFormatter.formatToParts(value).forEach((part) => { + if (part.type !== "literal") parts[part.type] = Number(part.value); + }); + return parts; + } + const zoneDateOnly = (value) => { + const p = zoneParts(value); + return `${p.year}-${pad(p.month)}-${pad(p.day)}`; + }; + const zoneMinutes = (value) => { + const p = zoneParts(value); + return p.hour * 60 + p.minute + p.second / 60; + }; + const zonedText = (value, options) => + new Intl.DateTimeFormat(undefined, { + ...options, + timeZone: calendarTimezone, + }).format(value); + function calendarToday() { + const p = zoneParts(new Date()); + return new Date(p.year, p.month - 1, p.day); + } + // Convert a wall-clock value in the configured calendar timezone into an + // instant. Iterative offset correction avoids depending on the browser's + // own timezone. Ambiguous/nonexistent DST times are left for the explicit + // event editor rather than silently choosing a different instant. + function zonedInstant(day, minutes, rejectAmbiguous = true) { + const [year, month, date] = day.split("-").map(Number), + hour = Math.floor(minutes / 60), + minute = Math.floor(minutes % 60), + wanted = Date.UTC(year, month - 1, date, hour, minute); + let candidate = wanted; + for (let i = 0; i < 4; i++) { + const p = zoneParts(new Date(candidate)); + const actual = Date.UTC(p.year, p.month - 1, p.day, p.hour, p.minute); + const correction = wanted - actual; + candidate += correction; + if (!correction) break; + } + const value = new Date(candidate), + p = zoneParts(value); + if ( + p.year !== year || + p.month !== month || + p.day !== date || + p.hour !== hour || + p.minute !== minute + ) + return null; + if (rejectAmbiguous) { + for (const offset of [-120, -90, -60, -30, 30, 60, 90, 120]) { + const other = new Date(candidate + offset * 60000), + q = zoneParts(other); + if ( + q.year === year && + q.month === month && + q.day === date && + q.hour === hour && + q.minute === minute + ) + return null; + } + } + return value; + } + function dayBounds(day) { + const civil = new Date(day + "T00:00:00"), + next = dateOnly(dayAdd(civil, 1)); + return { + start: zonedInstant(day, 0, false), + end: zonedInstant(next, 0, false), + }; + } + const snapMinutes = (pixels = timeScales[timeScale]) => + pixels >= 180 ? 5 : pixels >= 120 ? 10 : 15; + const link = (label, href) => { + const a = node("a", label); + a.href = href; + return a; + }; + const dayAdd = (d, n) => + new Date(d.getFullYear(), d.getMonth(), d.getDate() + n); + const xml = (s) => + s.replace( + /[<>&"']/g, + (c) => + ({ + "<": "<", + ">": ">", + "&": "&", + '"': """, + "'": "'", + })[c], + ); + const stamp = (d) => + d + .toISOString() + .replace(/[-:]/g, "") + .replace(/\.\d{3}Z$/, "Z"); + async function request(url, options = {}) { + const r = await fetch(url, { + credentials: "same-origin", + cache: "no-store", + signal: abort?.signal, + ...options, + }); + if (!r.ok) { + const text = await r.text(); + let message = text; + try { + message = JSON.parse(text).error || text; + } catch {} + throw new Error(message || String(r.status)); + } + return r; + } + const api = async (path, method = "GET", body) => { + const r = await request(API + path, { + method, + headers: { "Content-Type": "application/json" }, + body: body === undefined ? undefined : JSON.stringify(body), + }); + if (r.status === 204) return null; + return r.json(); + }; + function pathFor(d, view) { + let path = "/v/plan/cal/" + ymd(d); + if (view === "year") path = path.slice(0, 16); + else if (view === "month") path = path.slice(0, 19); + else if (view !== "day") path += "/" + view; + return ( + path + + (new URLSearchParams(location.search).has("calendar") && enabled.length + ? "?calendar=" + + enabled.map((c) => encodeURIComponent(c.pretty_name)).join(",") + : "") + ); + } + function route() { + const path = location.pathname; + const p = path.split("/"); + const now = calendarToday(); + if (path.startsWith("/v/plan/event/")) + return { + view: "detail", + uid: decodeURIComponent(path.slice("/v/plan/event/".length)), + date: now, + }; + if (path.startsWith("/v/event/") && path.endsWith("/edit")) + return { + view: "edit", + uid: decodeURIComponent(path.slice("/v/event/".length, -5)), + date: now, + }; + if (path === "/v/event/new") return { view: "new", date: now }; + if (p[3] === "cal") { + return { + view: + p[7] === "week" && p[8] === "list" + ? "week/list" + : p[7] || (p[6] ? "day" : p[5] ? "month" : "year"), + date: new Date(+p[4], p[5] ? +p[5] - 1 : 0, p[6] ? +p[6] : 1), + }; + } + return { view: preferredView(), date: now }; + } + function period(r) { + let start = new Date( + r.date.getFullYear(), + r.date.getMonth(), + r.date.getDate(), + ), + end; + if (r.view === "year") { + start = new Date(start.getFullYear(), 0, 1); + end = new Date(start.getFullYear() + 1, 0, 1); + } else if (r.view === "month") { + start = new Date(start.getFullYear(), start.getMonth(), 1); + start = dayAdd(start, -((start.getDay() + 6) % 7)); + end = dayAdd(start, 42); + } else if (r.view === "week" || r.view === "week/list") { + start = dayAdd(start, -((start.getDay() + 6) % 7)); + end = dayAdd(start, 7); + } else end = dayAdd(start, r.view === "events" ? 31 : 1); + return { start, end }; + } + function eventDate(e, key) { + const value = e[key]; + if (e.all_day) { + const [y, m, d] = value.slice(0, 10).split("-").map(Number); + return new Date(y, m - 1, d); + } + return new Date(value); + } + function inDay(e, d) { + if (e.all_day) { + const day = dateOnly(d), + next = dateOnly(dayAdd(d, 1)); + return e.start.slice(0, 10) < next && e.end.slice(0, 10) > day; + } + const bounds = dayBounds(dateOnly(d)), + start = new Date(e.start), + end = new Date(e.end); + return ( + start < bounds.end && + (end > bounds.start || (+start === +end && start >= bounds.start)) + ); + } + function eventLink(e) { + const calendar = calendars.find((c) => c.id === e.calendar_id) || current; + const a = link( + (e.all_day + ? "" + : zonedText(new Date(e.start), { + hour: "2-digit", + minute: "2-digit", + }) + " ") + (e.summary || t("無題", "Untitled")), + "/v/plan/event/" + + encodeURIComponent(e.uid) + + "?calendar=" + + encodeURIComponent(calendar.pretty_name), + ); + a.className = "calendar-event"; + a.title = calendar.name + " · " + (e.summary || ""); + if (enabled.length > 1) a.prepend(node("span", calendar.name + " · ")); + return a; + } + function toolbar(r) { + const nav = $("calendar-nav"); + nav.replaceChildren(); + const labels = { + year: t("年", "Year"), + month: t("月", "Month"), + week: t("週", "Week"), + "week/list": t("週リスト", "Week list"), + day: t("日", "Day"), + timeline: t("時間軸", "Timeline"), + events: t("予定一覧", "Events"), + }; + const view = labels[r.view] ? r.view : "month"; + let prev, next; + if (view === "year") { + prev = new Date(r.date.getFullYear() - 1, 0, 1); + next = new Date(r.date.getFullYear() + 1, 0, 1); + } else if (view === "month") { + prev = new Date(r.date.getFullYear(), r.date.getMonth() - 1, 1); + next = new Date(r.date.getFullYear(), r.date.getMonth() + 1, 1); + } else { + const n = + view === "week" || view === "week/list" + ? 7 + : view === "events" + ? 31 + : 1; + prev = dayAdd(r.date, -n); + next = dayAdd(r.date, n); + } + nav.append( + link("‹", pathFor(prev, view)), + link(t("今日", "Today"), pathFor(calendarToday(), view)), + link("›", pathFor(next, view)), + ); + for (const [key, label] of Object.entries(labels)) { + const a = link(label, pathFor(r.date, key)); + a.className='calendar-view-link'; + if (key === view) a.setAttribute("aria-current", "page"); + nav.append(a); + } + const viewSelect=node('select');viewSelect.className='calendar-mobile-view';viewSelect.setAttribute('aria-label',t('表示形式','View')); + for(const [key,label] of Object.entries(labels)){const o=node('option',label);o.value=key;viewSelect.append(o);} + viewSelect.value=view;viewSelect.onchange=()=>navigate(pathFor(r.date,viewSelect.value)); + const input = node("input"); + input.type = "date"; + input.value = dateOnly(r.date); + input.setAttribute("aria-label", t("日付へ移動", "Go to date")); + input.onchange = () => { + if (input.value) + navigate(pathFor(new Date(input.value + "T00:00:00"), view)); + }; + nav.append(input); + nav.append(viewSelect); + $("calendar-heading").textContent = current + ? enabled.map((c) => c.name).join(" / ") + + " · " + + (view === "year" ? r.date.getFullYear() : dateOnly(r.date)) + : t("カレンダー", "Calendar"); + $("calendar-new").textContent = t("+ 予定", "+ Event"); + $("calendar-new").href = pathFor(r.date, "new"); + $("calendar-new").hidden = !enabled.some((c) => canWrite(c)); + $("calendar-settings").hidden = !current || current.owner !== actor; + $("calendar-source-settings").hidden = !current || current.owner !== actor; + } + function canWrite(c = current) { + return ( + active && + c && + !c.read_only && + (c.owner === actor || c.members?.[actor] === "write" || c.can_write) + ); + } + async function loadEvents(start, end, signal, calendar, budget = 5000) { + // DATE values use UTC civil dates. Widen the query one day, then filter in + // the display timezone, so all-day events at either boundary are retained. + const startBound = dayBounds(dateOnly(start)).start, + endBound = dayBounds(dateOnly(end)).start, + lo = new Date(startBound.getTime() - 86400000), + hi = new Date(endBound.getTime() + 86400000); + const body = ``; + const response = await request(DAV + calendar.id + "/", { + method: "REPORT", + headers: { "Content-Type": "application/xml", Depth: "1" }, + body, + signal, + }); + const doc = new DOMParser().parseFromString( + await response.text(), + "application/xml", + ); + if (doc.querySelector("parsererror")) + throw new Error("Invalid calendar REPORT"); + const entries = Array.from( + doc.getElementsByTagNameNS("DAV:", "response"), + ).map((n) => ({ + href: n.getElementsByTagNameNS("DAV:", "href")[0]?.textContent, + etag: n.getElementsByTagNameNS("DAV:", "getetag")[0]?.textContent, + })); + const result = []; + if (entries.length > budget) + throw new Error( + t( + "表示上限の5000件を超えます。期間またはカレンダーを絞ってください。", + "More than 5000 events. Narrow the date range or calendar selection.", + ), + ); + let cursor = 0; + const selected = calendar.id; + await Promise.all( + Array.from({ length: Math.min(4, entries.length) }, async () => { + while (cursor < entries.length) { + const row = entries[cursor++]; + if (!row.href?.startsWith(DAV + selected + "/") || !row.etag) + throw new Error("Invalid resource"); + let item = cache.get(row.href); + if (!item || item.etag !== row.etag) { + const filename = row.href.split("/").pop(); + const res = await request( + API + + "calendars/" + + selected + + "/events?resource=" + + encodeURIComponent(filename), + { signal }, + ); + item = await res.json(); + cache.set(row.href, item); + } + result.push({ ...item, calendar_id: calendar.id }); + } + }), + ); + if (cache.size > 10000) cache.clear(); + return result.sort( + (a, b) => a.start.localeCompare(b.start) || a.uid.localeCompare(b.uid), + ); + } + function monthGrid(date, small = false) { + const wrap = node("section"), + grid = node("div", undefined, "calendar-month"); + if (small) { + const h = node("h2"); + h.append( + link( + date.toLocaleDateString([], { month: "long" }), + pathFor(date, "month"), + ), + ); + wrap.append(h); + } + const names = ja + ? ["月", "火", "水", "木", "金", "土", "日"] + : ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]; + names.forEach((n) => grid.append(node("div", n, "calendar-weekday"))); + const first = new Date(date.getFullYear(), date.getMonth(), 1), + start = dayAdd(first, -((first.getDay() + 6) % 7)); + for (let i = 0; i < 42; i++) { + const d = dayAdd(start, i), + cell = node("div", undefined, "calendar-day"); + if (d.getMonth() !== date.getMonth()) cell.classList.add("outside"); + if (dateOnly(d) === dateOnly(calendarToday())) + cell.classList.add("today"); + cell.append(link(String(d.getDate()), pathFor(d, "day"))); + const found = events.filter((e) => inDay(e, d)); + if (small) { + if (found.length) + cell.append(node("span", String(found.length), "calendar-dot")); + } else { + if(found.length){const count=link(t(found.length+'件',found.length+' events'),pathFor(d,'day'));count.className='calendar-mobile-count';count.setAttribute('aria-label',dateOnly(d)+' · '+count.textContent);cell.append(count);} + found.slice(0, 5).forEach((e) => cell.append(eventLink(e))); + if (found.length > 5) + cell.append(link("+" + (found.length - 5), pathFor(d, "day"))); + } + grid.append(cell); + } + wrap.append(grid); + return wrap; + } + function render(r) { + const content = $("calendar-content"); + content.replaceChildren(); + if (r.view === "year") { + const year = node("div", undefined, "calendar-year"); + for (let m = 0; m < 12; m++) + year.append(monthGrid(new Date(r.date.getFullYear(), m, 1), true)); + content.append(year); + } else if (r.view === "month") content.append(monthGrid(r.date)); + else if (r.view === "week" || r.view === "day") content.append(timeGrid(r)); + else if (r.view === "week/list") { + const week = node("div", undefined, "calendar-week"), + { start } = period(r); + for (let i = 0; i < 7; i++) { + const d = dayAdd(start, i), + heading = node("header", undefined, "calendar-week-heading"); + heading.append( + link( + d.toLocaleDateString([], { + weekday: "short", + month: "numeric", + day: "numeric", + }), + pathFor(d, "day"), + ), + ); + week.append(heading); + } + for (let i = 0; i < 7; i++) { + const d = dayAdd(start, i), + col = node("section"); + events + .filter((e) => inDay(e, d)) + .forEach((e) => col.append(eventLink(e))); + week.append(col); + } + content.append(week); + } else if (r.view === "timeline") { + const box = node("div", undefined, "calendar-timeline"); + const header = node("div", undefined, "calendar-track"); + for (let h = 0; h < 24; h++) { + const label = node("span", pad(h)); + label.style.position = "absolute"; + label.style.left = (h / 24) * 100 + "%"; + header.append(label); + } + box.append(header); + const { start } = period(r), + bounds = dayBounds(dateOnly(start)), + rangeStart = bounds.start, + rangeEnd = bounds.end; + events + .filter((e) => inDay(e, start)) + .forEach((e) => { + const row = node("div", undefined, "calendar-track"), + a = eventLink(e); + row.dataset.start = e.start; + row.dataset.uid = e.uid; + const lo = new Date( + Math.max(+rangeStart, +eventDate(e, "start")), + ), + hi = new Date(Math.min(+rangeEnd, +eventDate(e, "end"))); + a.style.left = + ((lo - rangeStart) / (rangeEnd - rangeStart)) * 100 + "%"; + a.style.width = + Math.max(1, ((hi - lo) / (rangeEnd - rangeStart)) * 100) + "%"; + const c = calendars.find((c) => c.id === e.calendar_id) || current; + if (!e.all_day && canWrite(c)) { + const handle = node("button", "↔", "calendar-timeline-handle"); + handle.type = "button"; + handle.setAttribute( + "aria-label", + t( + "ドラッグで時刻変更。左右キーで15分移動", + "Drag to reschedule. Left/right keys move by 15 minutes", + ), + ); + handle.style.left = a.style.left; + handle.style.width = a.style.width; + handle.onkeydown = (ev) => { + if (!["ArrowLeft", "ArrowRight"].includes(ev.key)) return; + ev.preventDefault(); + rescheduleEvent( + e, + c, + new Date( + +new Date(e.start) + + (ev.key === "ArrowLeft" ? -1 : 1) * 900000, + ), + ); + }; + handle.onpointerdown = (ev) => { + if (ev.button !== 0 || movePending) return; + ev.preventDefault(); + cancelDrag?.(); + const x = ev.clientX, + rect = row.getBoundingClientRect(), + left = a.style.left; + let delta = 0; + handle.setPointerCapture(ev.pointerId); + const cleanup = () => { + handle.removeEventListener("pointermove", move); + handle.removeEventListener("pointerup", up); + handle.removeEventListener("pointercancel", cleanup); + handle.removeEventListener("lostpointercapture", cleanup); + document.removeEventListener("keydown", escape); + a.style.left = left; + handle.style.left = left; + row.classList.remove("moving"); + if (handle.hasPointerCapture(ev.pointerId)) + handle.releasePointerCapture(ev.pointerId); + if (cancelDrag === cleanup) cancelDrag = null; + }; + const move = (moveEvent) => { + delta = + Math.round( + (((moveEvent.clientX - x) / rect.width) * + (rangeEnd - rangeStart)) / + 900000, + ) * 900000; + const next = + ((lo - rangeStart + delta) / (rangeEnd - rangeStart)) * + 100; + a.style.left = next + "%"; + handle.style.left = next + "%"; + row.classList.add("moving"); + handle.title = new Date( + +new Date(e.start) + delta, + ).toLocaleString(); + }; + const up = () => { + const next = new Date(+new Date(e.start) + delta); + cleanup(); + if (delta) rescheduleEvent(e, c, next); + }; + const escape = (event) => { + if (event.key === "Escape") { + event.preventDefault(); + cleanup(); + } + }; + cancelDrag = cleanup; + handle.addEventListener("pointermove", move); + handle.addEventListener("pointerup", up); + handle.addEventListener("pointercancel", cleanup); + handle.addEventListener("lostpointercapture", cleanup); + document.addEventListener("keydown", escape); + }; + row.append(handle); + } + row.append(a); + box.append(row); + }); + content.append(box); + } else { + const table = node("table", undefined, "calendar-list"); + const head = node("tr"); + [t("日時", "When"), t("予定", "Event"), t("場所", "Location")].forEach( + (v) => head.append(node("th", v)), + ); + table.append(head); + const { start, end } = period(r), + rangeStart = dayBounds(dateOnly(start)).start, + rangeEnd = dayBounds(dateOnly(end)).start; + events + .filter( + (e) => + (e.all_day + ? e.start.slice(0, 10) < dateOnly(end) + : eventDate(e, "start") < rangeEnd) && + (e.all_day + ? e.end.slice(0, 10) > dateOnly(start) + : eventDate(e, "end") > rangeStart || inDay(e, start)), + ) + .forEach((e) => { + const row = node("tr"), + cell = node("td"); + cell.append(eventLink(e)); + row.append( + node( + "td", + e.all_day + ? e.start.slice(0, 10) + : zonedText(new Date(e.start), { + dateStyle: "medium", + timeStyle: "short", + }), + ), + cell, + node("td", e.location), + ); + table.append(row); + }); + content.append(table); + } + } + function timeGrid(r) { + const wrap = node("section", undefined, "calendar-time-view"); + const controls = node( + "div", + undefined, + "calendar-toolbar calendar-time-controls", + ); + const less = node("button", "−"), + more = node("button", "+"); + less.type = more.type = "button"; + less.setAttribute("aria-label", t("時間軸を縮小", "Zoom out")); + more.setAttribute("aria-label", t("時間軸を拡大", "Zoom in")); + less.dataset.calendarZoom = "out"; + more.dataset.calendarZoom = "in"; + less.disabled = timeScale === 0; + more.disabled = timeScale === timeScales.length - 1; + const pixels = timeScales[timeScale], + step = snapMinutes(pixels); + controls.append( + less, + node("span", Math.round((pixels / 60) * 100) + "%"), + more, + node( + "span", + t( + `${step}分単位 · ${calendarTimezone}`, + `${step}-minute steps · ${calendarTimezone}`, + ), 'calendar-time-meta', + ), + ); + controls.lastElementChild.dataset.short=t(`${step}分単位`,`${step} min`); + controls.lastElementChild.title=calendarTimezone; + const touchEdit=node('button',t('編集操作','Edit gestures'),'calendar-touch-edit');touchEdit.type='button';touchEdit.setAttribute('aria-pressed','false');touchEdit.title=t('ON: 移動・伸縮・範囲選択、OFF: スクロール','On: move, resize and select. Off: scroll.'); + touchEdit.onclick=()=>{cancelDrag?.();const value=wrap.classList.toggle('calendar-touch-editing');touchEdit.setAttribute('aria-pressed',String(value));}; + if(enabled.some(c=>canWrite(c)))controls.append(touchEdit); + const scroll = node("div", undefined, "calendar-time-scroll"), + grid = node("div", undefined, "calendar-time-grid"); + const days = r.view === "week" ? 7 : 1, + { start } = period(r); + grid.style.setProperty("--calendar-days", days); + grid.dataset.days=String(days); + grid.style.setProperty("--hour-height", pixels + "px"); + grid.style.setProperty("--snap-height", (pixels * step) / 60 + "px"); + grid.dataset.snapMinutes = String(step); + grid.append( + node( + "div", + t("時刻", "Time"), + "calendar-time-heading calendar-time-corner", + ), + ); + for (let i = 0; i < days; i++) { + const day = dayAdd(start, i), + heading = node("div", undefined, "calendar-time-heading"); + heading.append( + link( + day.toLocaleDateString(ja?'ja':'en', { + weekday: "short", + month: "numeric", + day: "numeric", + }), + pathFor(day, "day"), + ), + ); + grid.append(heading); + } + grid.append(node("div", t("終日", "All day"), "calendar-all-day-label")); + for (let i = 0; i < days; i++) { + const day = dayAdd(start, i), + cell = node("div", undefined, "calendar-all-day"); + events + .filter((e) => e.all_day && inDay(e, day)) + .forEach((e) => cell.append(eventLink(e))); + grid.append(cell); + } + const axis = node("div", undefined, "calendar-time-axis"); + for (let h = 0; h < 24; h++) { + const label = node("span", pad(h) + ":00"); + label.style.top = h * pixels + "px"; + axis.append(label); + } + grid.append(axis); + const columns = []; + for (let i = 0; i < days; i++) { + const day = dayAdd(start, i), + column = node("div", undefined, "calendar-time-column"); + column.dataset.date = dateOnly(day); + columns.push(column); + grid.append(column); + const entries = events + .filter((e) => !e.all_day && inDay(e, day)) + .map((e) => { + const begin = new Date(e.start), + end = new Date(e.end), + bounds = dayBounds(dateOnly(day)); + const from = + begin <= bounds.start + ? 0 + : zoneMinutes(begin); + const actualTo = end >= bounds.end ? 1440 : zoneMinutes(end), + displayTo = Math.max( + from + Math.max(step, ((touchScreen.matches?44:22) * 60) / pixels), + actualTo, + ), + overlapTo = Math.max(from + 0.001, displayTo); + return { + event: e, + from, + actualTo, + overlapTo, + displayTo, + segment: new Date(Math.max(+begin, +bounds.start)), + startsHere: begin >= bounds.start && begin < bounds.end, + endsHere: end > bounds.start && end <= bounds.end, + }; + }) + .sort((a, b) => a.from - b.from || b.overlapTo - a.overlapTo); + // Interval groups use distinct lanes, including transitive overlaps. + let group = [], + end = -1; + const finish = () => { + const lanes = []; + for (const entry of group) { + let lane = lanes.findIndex((to) => to <= entry.from); + if (lane < 0) lane = lanes.length; + lanes[lane] = entry.overlapTo; + entry.lane = lane; + } + for (const entry of group) { + const e = entry.event, + card = node("div", undefined, "calendar-time-event"); + card.dataset.uid = e.uid; + card.dataset.calendar = e.calendar_id; + card.dataset.start = e.start; + card.dataset.end = e.end; + card.style.top = (entry.from / 60) * pixels + "px"; + card.style.height = + Math.max( + 12, + ((Math.min(1440, entry.displayTo) - entry.from) / 60) * pixels, + ) + "px"; + card.style.left = (entry.lane / lanes.length) * 100 + "%"; + card.style.width = 100 / lanes.length + "%"; + const a = eventLink(e); + a.draggable = false; + card.append(a); + const calendar = + calendars.find((c) => c.id === e.calendar_id) || current; + if (canWrite(calendar)) { + if (entry.startsHere) { + const top = node("button", undefined, "calendar-resize-handle calendar-resize-start"); + top.type = "button"; + top.setAttribute( + "aria-label", + t( + `開始時刻を変更。上下キーで${step}分`, + `Change start time. Arrow keys use ${step} minutes`, + ), + ); + card.prepend(top); + attachEventResize(top, card, entry, column, pixels, calendar, "start", step); + } + const handle = node("button", undefined, "calendar-move-handle"); + handle.type = "button"; + handle.setAttribute( + "aria-label", + t( + `中央をドラッグして移動。上下キーで${step}分`, + `Drag the middle to move. Arrow keys use ${step} minutes`, + ), + ); + handle.title = handle.getAttribute("aria-label"); + card.append(handle); + attachEventMove( + card, + handle, + entry, + column, + columns, + pixels, + calendar, + step, + ); + if (entry.endsHere) { + const bottom = node("button", undefined, "calendar-resize-handle calendar-resize-end"); + bottom.type = "button"; + bottom.setAttribute( + "aria-label", + t( + `終了時刻を変更。上下キーで${step}分`, + `Change end time. Arrow keys use ${step} minutes`, + ), + ); + card.append(bottom); + attachEventResize(bottom, card, entry, column, pixels, calendar, "end", step); + } + } + column.append(card); + } + group = []; + end = -1; + }; + for (const entry of entries) { + if (group.length && entry.from >= end) finish(); + group.push(entry); + end = Math.max(end, entry.overlapTo); + } + finish(); + if (enabled.some((calendar) => canWrite(calendar))) + attachRangeCreation(column, pixels, step); + } + scroll.append(grid); + wrap.append(controls, scroll); + if(days===7){ + const strip=node('nav',undefined,'calendar-mobile-days');strip.setAttribute('aria-label',t('週内の日を選択','Choose day of week')); + let requestedDay=null; + const buttons=[];for(let i=0;i<7;i++){const date=dayAdd(start,i),button=node('button');button.type='button';button.append(node('small',date.toLocaleDateString(ja?'ja':'en',{weekday:'short'})),node('span',String(date.getDate())));button.setAttribute('aria-label',dateOnly(date));button.onclick=()=>{requestedDay=i;scroll.scrollLeft=columns[i].offsetLeft-axis.offsetWidth;updateDay();};buttons.push(button);strip.append(button);} + let frame=0;const updateDay=()=>{frame=0;const i=requestedDay??Math.max(0,Math.min(6,Math.round(scroll.scrollLeft/columns[0].offsetWidth)));buttons.forEach((b,index)=>b.setAttribute('aria-pressed',String(index===i)));}; + scroll.addEventListener('pointerdown',()=>{requestedDay=null;},{passive:true});scroll.addEventListener('wheel',()=>{requestedDay=null;},{passive:true}); + scroll.addEventListener('scroll',()=>{if(!frame)frame=requestAnimationFrame(updateDay);},{passive:true});wrap.insertBefore(strip,scroll); + requestAnimationFrame(()=>{if(!scroll.isConnected)return;if(compactScreen.matches&&!scroll.dataset.positioned){const index=Math.max(0,Math.min(6,Math.round((r.date-start)/86400000)));scroll.scrollLeft=columns[index].offsetLeft-axis.offsetWidth;}updateDay();}); + } + const zoom = (delta) => { + if (movePending) return; + cancelDrag?.(); + const old = scroll.scrollTop / pixels; + const oldLeft=scroll.scrollLeft; + timeScale = Math.max( + 0, + Math.min(timeScales.length - 1, timeScale + delta), + ); + render(r); + const next = $("calendar-content").querySelector(".calendar-time-scroll"); + if (next) {next.scrollTop = old * timeScales[timeScale];next.scrollLeft=oldLeft;next.dataset.positioned='true';} + }; + less.onclick = () => zoom(-1); + more.onclick = () => zoom(1); + requestAnimationFrame(() => { + if (scroll.isConnected && scroll.scrollTop === 0) + scroll.scrollTop = 8 * pixels; + }); + return wrap; + } + async function updateEventTimes(e, calendar, start, end) { + if (movePending || !canWrite(calendar)) return; + const oldStart = new Date(e.start), + oldEnd = new Date(e.end); + if (+oldStart === +start && +oldEnd === +end) return; + if (end < start) { + $("calendar-status").textContent = t( + "終了時刻は開始時刻以降にしてください。", + "End time must not precede start time.", + ); + return; + } + const viewGeneration = generation; + movePending = true; + cancelDrag?.(); + $("calendar-status").textContent = t("時刻を保存中…", "Saving time…"); + try { + const updated = await api("calendars/" + calendar.id + "/events", "POST", { + uid: e.uid, + etag: e.etag, + summary: e.summary, + description: e.description, + location: e.location, + all_day: false, + start: start.toISOString(), + end: end.toISOString(), + }); + if (generation === viewGeneration) { + updated.calendar_id = e.calendar_id || calendar.id; + events = events + .map((item) => + item.uid === e.uid && item.calendar_id === updated.calendar_id + ? updated + : item, + ) + .sort( + (a, b) => + a.start.localeCompare(b.start) || + a.calendar_id.localeCompare(b.calendar_id) || + a.uid.localeCompare(b.uid), + ); + for (const [href, item] of cache) + if (item.uid === e.uid) cache.delete(href); + const oldScroll = $("calendar-content").querySelector( + ".calendar-time-scroll", + ), + top = oldScroll?.scrollTop || 0, + left = oldScroll?.scrollLeft || 0; + render(route()); + const nextScroll = $("calendar-content").querySelector( + ".calendar-time-scroll", + ); + if (nextScroll) { + nextScroll.scrollTop = top; + nextScroll.scrollLeft = left; + nextScroll.dataset.positioned='true'; + } + $("calendar-status").textContent = ""; + } + } catch (error) { + if (generation === viewGeneration) + $("calendar-status").textContent = + t( + "時刻を変更できませんでした。再読込してください:", + "Unable to change time. Reload: ", + ) + error.message; + } finally { + movePending = false; + } + } + function rescheduleEvent(e, calendar, start) { + const delta = +start - +new Date(e.start); + return updateEventTimes( + e, + calendar, + start, + new Date(+new Date(e.end) + delta), + ); + } + function instantAt(day, minutes) { + if (minutes < 1440) return zonedInstant(day, minutes); + const civil = new Date(day + "T00:00:00"); + return zonedInstant(dateOnly(dayAdd(civil, 1)), 0); + } + function attachEventMove( + card, + handle, + entry, + column, + columns, + pixels, + calendar, + step, + ) { + handle.addEventListener("keydown", (event) => { + if (event.key !== "ArrowUp" && event.key !== "ArrowDown") return; + event.preventDefault(); + if (movePending) return; + const start = new Date(entry.event.start); + start.setTime( + +start + (event.key === "ArrowUp" ? -1 : 1) * step * 60000, + ); + rescheduleEvent(entry.event, calendar, start); + }); + card.addEventListener("pointerdown", (event) => { + if (event.button !== 0 || movePending) return; + if(event.pointerType==='touch'&&!card.closest('.calendar-touch-editing'))return; + if (event.target.closest(".calendar-resize-handle")) return; + cancelDrag?.(); + card.setPointerCapture(event.pointerId); + const origin = { x: event.clientX, y: event.clientY }, + originalTop = card.style.top, + originalLeft = card.style.left, + originalWidth = card.style.width; + const grab = + ((event.clientY - column.getBoundingClientRect().top) / pixels) * 60 - + entry.from; + let moved = false, + target = null, + targetTime = null; + const cleanup = () => { + card.removeEventListener("pointermove", move); + card.removeEventListener("pointerup", up); + card.removeEventListener("pointercancel", cancel); + card.removeEventListener("lostpointercapture", cancel); + document.removeEventListener("keydown", escape); + card.classList.remove("moving", "calendar-drag-invalid"); + columns.forEach((candidate) => + candidate.classList.remove("calendar-drop-target"), + ); + card.style.top = originalTop; + card.style.left = originalLeft; + card.style.width = originalWidth; + card.style.transform = ""; + if (card.parentNode !== column) column.append(card); + if (card.hasPointerCapture(event.pointerId)) + card.releasePointerCapture(event.pointerId); + if (cancelDrag === cancel) cancelDrag = null; + }; + const cancel = () => cleanup(), + escape = (e) => { + if (e.key === "Escape") { + e.preventDefault(); + cancel(); + } + }; + const move = (e) => { + if ( + !moved && + Math.hypot(e.clientX - origin.x, e.clientY - origin.y) < 5 + ) + return; + moved = true; + e.preventDefault(); + card.classList.add("moving"); + target = columns.find((c) => { + const box = c.getBoundingClientRect(); + return ( + e.clientX >= box.left && + e.clientX <= box.right && + e.clientY >= box.top && + e.clientY <= box.bottom + ); + }); + columns.forEach((candidate) => + candidate.classList.toggle( + "calendar-drop-target", + candidate === target, + ), + ); + if (!target) { + targetTime = null; + card.classList.add("calendar-drag-invalid"); + return; + } + const box = target.getBoundingClientRect(); + const minutes = Math.max( + 0, + Math.min( + 1440 - step, + Math.round( + (((e.clientY - box.top) / pixels) * 60 - grab) / step, + ) * step, + ), + ); + const candidate = instantAt(target.dataset.date, minutes); + if (!candidate) { + targetTime = null; + card.classList.add("calendar-drag-invalid"); + return; + } + card.classList.remove("calendar-drag-invalid"); + targetTime = new Date( + +new Date(entry.event.start) + (+candidate - +entry.segment), + ); + card.style.top = (minutes / 60) * pixels + "px"; + card.style.left = "0"; + card.style.width = "100%"; + // Keep the captured pointer element in its original DOM parent. + card.style.transform = + "translateX(" + + (box.left - column.getBoundingClientRect().left) + + "px)"; + handle.title = zonedText(candidate, { + dateStyle: "medium", + timeStyle: "short", + }); + }; + const up = () => { + const next = moved ? targetTime : null; + if (moved) + card.addEventListener("click", (click) => click.preventDefault(), { + capture: true, + once: true, + }); + card.style.transform = ""; + cleanup(); + if (next) rescheduleEvent(entry.event, calendar, next); + else if (moved) + $("calendar-status").textContent = t( + "移動先を確定できません。編集画面で時刻を指定してください。", + "Cannot resolve target time. Use the event editor.", + ); + }; + cancelDrag = cancel; + card.addEventListener("pointermove", move); + card.addEventListener("pointerup", up); + card.addEventListener("pointercancel", cancel); + card.addEventListener("lostpointercapture", cancel); + document.addEventListener("keydown", escape); + }); + } + function attachEventResize( + handle, + card, + entry, + column, + pixels, + calendar, + edge, + step, + ) { + const apply = (delta) => { + if (movePending) return; + const start = new Date(entry.event.start), + end = new Date(entry.event.end); + if (edge === "start") start.setTime(+start + delta * 60000); + else end.setTime(+end + delta * 60000); + if (end < start || end - start < step * 60000) return; + updateEventTimes(entry.event, calendar, start, end); + }; + handle.addEventListener("keydown", (event) => { + if (event.key !== "ArrowUp" && event.key !== "ArrowDown") return; + event.preventDefault(); + apply((event.key === "ArrowUp" ? -1 : 1) * step); + }); + handle.addEventListener("pointerdown", (event) => { + if (event.button !== 0 || movePending) return; + if(event.pointerType==='touch'&&!card.closest('.calendar-touch-editing'))return; + event.preventDefault(); + event.stopPropagation(); + cancelDrag?.(); + handle.setPointerCapture(event.pointerId); + const originalTop = card.style.top, + originalHeight = card.style.height, + originalStart = new Date(entry.event.start), + originalEnd = new Date(entry.event.end); + let targetTime = null, + moved = false; + const cleanup = () => { + handle.removeEventListener("pointermove", move); + handle.removeEventListener("pointerup", up); + handle.removeEventListener("pointercancel", cancel); + handle.removeEventListener("lostpointercapture", cancel); + document.removeEventListener("keydown", escape); + card.classList.remove("moving", "resizing", "resizing-start", "resizing-end"); + card.style.top = originalTop; + card.style.height = originalHeight; + if (handle.hasPointerCapture(event.pointerId)) + handle.releasePointerCapture(event.pointerId); + if (cancelDrag === cancel) cancelDrag = null; + }; + const cancel = () => cleanup(), + escape = (e) => { + if (e.key === "Escape") { + e.preventDefault(); + cancel(); + } + }, + move = (e) => { + const box = column.getBoundingClientRect(), + minutes = Math.max( + 0, + Math.min( + 1440, + Math.round(((e.clientY - box.top) / pixels) * 60 / step) * + step, + ), + ), + candidate = instantAt(column.dataset.date, minutes); + if (!candidate) { + targetTime = null; + return; + } + if ( + (edge === "start" && originalEnd - candidate < step * 60000) || + (edge === "end" && candidate - originalStart < step * 60000) + ) { + targetTime = null; + return; + } + moved = true; + targetTime = candidate; + card.classList.add("moving", "resizing", "resizing-" + edge); + if (edge === "start") { + card.style.top = (minutes / 60) * pixels + "px"; + card.style.height = + Math.max(12, ((entry.actualTo - minutes) / 60) * pixels) + + "px"; + } else { + card.style.height = + Math.max(12, ((minutes - entry.from) / 60) * pixels) + "px"; + } + handle.title = zonedText(candidate, { + dateStyle: "medium", + timeStyle: "short", + }); + }, + up = () => { + const value = moved ? targetTime : null; + cleanup(); + if (!value) return; + updateEventTimes( + entry.event, + calendar, + edge === "start" ? value : originalStart, + edge === "end" ? value : originalEnd, + ); + }; + cancelDrag = cancel; + handle.addEventListener("pointermove", move); + handle.addEventListener("pointerup", up); + handle.addEventListener("pointercancel", cancel); + handle.addEventListener("lostpointercapture", cancel); + document.addEventListener("keydown", escape); + }); + } + function attachRangeCreation(column, pixels, step) { + column.addEventListener("pointerdown", (event) => { + if (event.button !== 0 || event.target !== column || movePending) return; + if(event.pointerType==='touch'&&!column.closest('.calendar-touch-editing'))return; + cancelDrag?.(); + event.preventDefault(); + column.setPointerCapture(event.pointerId); + const box = column.getBoundingClientRect(), + minuteAt = (clientY) => + Math.max( + 0, + Math.min( + 1440, + Math.round(((clientY - box.top) / pixels) * 60 / step) * step, + ), + ), + origin = Math.min(1440 - step, minuteAt(event.clientY)), + selection = node("div", undefined, "calendar-time-selection"); + let current = origin, + moved = false; + selection.setAttribute("aria-hidden", "true"); + column.classList.add("selecting"); + column.append(selection); + const draw = () => { + const from = current < origin ? current : origin, + to = current < origin ? origin : Math.max(origin + step, current), + clock = (minutes) => + minutes >= 1440 + ? "24:00" + : pad(Math.floor(minutes / 60)) + ":" + pad(minutes % 60); + selection.style.top = (from / 60) * pixels + "px"; + selection.style.height = + Math.max(8, ((Math.min(1440, to) - from) / 60) * pixels) + "px"; + selection.textContent = clock(from) + "–" + clock(to); + }; + draw(); + const cleanup = () => { + column.removeEventListener("pointermove", move); + column.removeEventListener("pointerup", up); + column.removeEventListener("pointercancel", cancel); + column.removeEventListener("lostpointercapture", cancel); + document.removeEventListener("keydown", escape); + selection.remove(); + column.classList.remove("selecting"); + if (column.hasPointerCapture(event.pointerId)) + column.releasePointerCapture(event.pointerId); + if (cancelDrag === cancel) cancelDrag = null; + }; + const cancel = () => cleanup(), + escape = (e) => { + if (e.key === "Escape") { + e.preventDefault(); + cancel(); + } + }, + move = (e) => { + const next = minuteAt(e.clientY); + if (!moved && Math.abs(e.clientY - event.clientY) < 4) return; + moved = true; + current = next <= origin ? Math.max(0, next) : Math.min(1440, next); + draw(); + }, + up = () => { + if (!moved) { + cleanup(); + return; + } + const from = current < origin ? current : origin, + to = current < origin ? origin : Math.max(origin + step, current), + start = instantAt(column.dataset.date, from), + end = instantAt(column.dataset.date, Math.min(1440, to)); + cleanup(); + if (!start || !end || end <= start) { + $("calendar-status").textContent = t( + "この範囲はタイムゾーン上で選択できません。", + "This range is unavailable in the configured timezone.", + ); + return; + } + editEvent( + null, + new Date(column.dataset.date + "T00:00:00"), + { start, end }, + ); + }; + cancelDrag = cancel; + column.addEventListener("pointermove", move); + column.addEventListener("pointerup", up); + column.addEventListener("pointercancel", cancel); + column.addEventListener("lostpointercapture", cancel); + document.addEventListener("keydown", escape); + }); + } + function field(label, name, type, value = "", required = false) { + const l = node("label", label), + i = node(type === "textarea" ? "textarea" : "input"); + i.name = name; + if (type !== "textarea") i.type = type; + if (type === "checkbox") i.checked = !!value; + else i.value = value; + i.required = required; + l.append(i); + $("calendar-fields").append(l); + return i; + } + function dialog(title, save, build, submit) { + $("calendar-dialog-title").textContent = title; + $("calendar-fields").replaceChildren(); + $("calendar-form-error").textContent = ""; + $("calendar-submit").textContent = save; + $("calendar-cancel").textContent = t("閉じる", "Close"); + build(); + $("calendar-form").onsubmit = async (e) => { + e.preventDefault(); + $("calendar-submit").disabled = true; + try { + await submit(new FormData(e.target)); + $("calendar-dialog").close(); + } catch (err) { + $("calendar-form-error").textContent = err.message; + } finally { + $("calendar-submit").disabled = false; + } + }; + $("calendar-dialog").showModal(); + } + function editEvent(item, date, selectedRange = null) { + if (!(item ? canWrite() : enabled.some((c) => canWrite(c)))) + throw new Error(t("編集権限がありません", "No write permission")); + const originRoute = route(), + creationReturnView = calendarViews.has(originRoute.view) + ? originRoute.view + : preferredView(), + creationReturnHref = calendarViews.has(originRoute.view) + ? location.pathname + location.search + : pathFor(date, creationReturnView), + initialStart = + selectedRange?.start || zonedInstant(dateOnly(date), 9 * 60, false), + initialEnd = + selectedRange?.end || zonedInstant(dateOnly(date), 10 * 60, false), + initial = item || { + uid: "", + summary: "", + description: "", + location: "", + all_day: false, + start: initialStart.toISOString(), + end: initialEnd.toISOString(), + }; + const local = (s) => { + const p = zoneParts(new Date(s)); + return `${p.year}-${pad(p.month)}-${pad(p.day)}T${pad(p.hour)}:${pad(p.minute)}`; + }; + dialog( + t("予定を編集", "Edit event"), + t("保存", "Save"), + () => { + field(t("タイトル", "Title"), "summary", "text", initial.summary, true); + if (!item) { + const label = node( + "label", + t("作成先カレンダー", "Destination calendar"), + ), + select = node("select"); + select.name = "destination"; + for (const c of enabled.filter((c) => canWrite(c))) { + const o = node("option", c.name + " (" + c.pretty_name + ")"); + o.value = c.id; + select.append(o); + } + label.append(select); + $("calendar-fields").append(label); + } + const all = field( + t("終日(終了日を含む)", "All day (including end date)"), + "all_day", + "checkbox", + initial.all_day, + ); + const start = field( + t("開始", "Start"), + "start", + initial.all_day ? "date" : "datetime-local", + initial.all_day ? initial.start.slice(0, 10) : local(initial.start), + true, + ), + end = field( + t("終了", "End"), + "end", + initial.all_day ? "date" : "datetime-local", + initial.all_day ? new Date(Date.parse(initial.end) - 86400000).toISOString().slice(0, 10) : local(initial.end), + true, + ); + all.onchange = () => { + for (const input of [start, end]) { + const v = input.value.slice(0, 10); + input.type = all.checked ? "date" : "datetime-local"; + input.value = all.checked ? v : v + "T09:00"; + } + }; + field(t("場所", "Location"), "location", "text", initial.location); + field( + t("説明", "Description"), + "description", + "textarea", + initial.description, + ); + $("calendar-fields").append( + node( + "p", + t( + "設定済みのタイムゾーン:", + "Configured timezone: ", + ) + calendarTimezone, + ), + ); + }, + async (form) => { + const all = form.has("all_day"); + if (all && form.get("end") < form.get("start")) + throw new Error(t("終了日は開始日以降を指定してください", "End date must be on or after start date")); + const destination = item + ? current + : enabled.find((c) => c.id === form.get("destination")); + if (!destination || !canWrite(destination)) + throw new Error(t("編集権限がありません", "No write permission")); + const parseWall = (value) => { + const [day, clock] = value.split("T"), + [hour, minute] = clock.split(":").map(Number), + instant = zonedInstant(day, hour * 60 + minute); + if (!instant) + throw new Error( + t( + "タイムゾーン上で存在しない、または重複する時刻です。別の時刻を指定してください。", + "This wall time is nonexistent or ambiguous in the configured timezone.", + ), + ); + return instant; + }; + const startValue = all + ? new Date(form.get("start") + "T00:00:00Z") + : parseWall(form.get("start")), + endValue = all + ? new Date(Date.parse(form.get("end") + "T00:00:00Z") + 86400000) + : parseWall(form.get("end")); + if (endValue < startValue) + throw new Error( + t( + "終了時刻は開始時刻以降を指定してください", + "End time must be on or after start time", + ), + ); + const body = { + uid: initial.uid, + etag: initial.etag || "", + summary: form.get("summary"), + description: form.get("description"), + location: form.get("location"), + all_day: all, + start: startValue.toISOString(), + end: endValue.toISOString(), + }; + const e = await api( + "calendars/" + destination.id + "/events", + "POST", + body, + ); + if (!item) { + cache.clear(); + history.replaceState(null, "", creationReturnHref); + await load(); + return; + } + navigate( + "/v/plan/event/" + + encodeURIComponent(e.uid) + + "?calendar=" + + encodeURIComponent(destination.pretty_name), + ); + }, + ); + } + async function details(r) { + const g = generation; + const e = await api( + "calendars/" + current.id + "/events?uid=" + encodeURIComponent(r.uid), + ); + if (g !== generation) return; + const content = $("calendar-content"), + article = node("article", undefined, "calendar-detail"); + article.append(node("h2", e.summary || t("無題", "Untitled"))); + const dl = node("dl"); + for (const [key, value] of [ + [ + t("開始", "Start"), + e.all_day + ? e.start.slice(0, 10) + : zonedText(new Date(e.start), { + dateStyle: "medium", + timeStyle: "short", + }), + ], + [ + e.all_day ? t("終了日(含む)", "End date (inclusive)") : t("終了", "End"), + e.all_day + ? new Date(Date.parse(e.end) - 86400000).toISOString().slice(0, 10) + : zonedText(new Date(e.end), { + dateStyle: "medium", + timeStyle: "short", + }), + ], + [t("場所", "Location"), e.location], + ]) + dl.append(node("dt", key), node("dd", value)); + article.append(dl, node("p", e.description)); + if (canWrite()) { + const nav = node("nav", undefined, "calendar-toolbar"); + nav.append( + link( + t("編集", "Edit"), + "/v/event/" + + encodeURIComponent(e.uid) + + "/edit?calendar=" + + encodeURIComponent(current.pretty_name), + ), + ); + const del = node("button", t("削除", "Delete")); + del.onclick = async () => { + if (!confirm(t("この予定を削除しますか?", "Delete this event?"))) + return; + try { + await request( + DAV + + current.id + + "/" + + btoa(String.fromCharCode(...new TextEncoder().encode(e.uid))) + .replace(/\+/g, "-") + .replace(/\//g, "_") + .replace(/=+$/, "") + + ".ics", + { method: "DELETE", headers: { "If-Match": e.etag } }, + ); + const p = zoneParts(new Date(e.start)); + navigate(pathFor(new Date(p.year, p.month - 1, p.day), "month")); + } catch (err) { + $("calendar-status").textContent = err.message; + } + }; + nav.append(del); + article.append(nav); + } + content.replaceChildren(article); + if (r.view === "edit") editEvent(e, new Date(e.start)); + } + async function load() { + cancelDrag?.(); + const g = ++generation; + abort?.abort(); + abort = new AbortController(); + $("calendar-status").textContent = t("読み込み中…", "Loading…"); + try { + const data = await api("calendars"); + if (g !== generation) return; + calendars = data.calendars; + if (actor !== data.actor) cache.clear(); + actor = data.actor; + active = data.active; + publicAllowed = data.public_allowed; + let selected = new URLSearchParams(location.search).get("calendar"); + const r = route(); + rememberView(r.view); + if (!selected && (r.view === "detail" || r.view === "edit")) { + const resolved = await api("event?uid=" + encodeURIComponent(r.uid)); + if (g !== generation) return; + selected = calendars.find( + (c) => c.id === resolved.calendar, + )?.pretty_name; + const u = new URL(location.href); + u.searchParams.set("calendar", selected); + history.replaceState(null, "", u.pathname + u.search); + } + if (selected !== null) { + const names = selected.split(","); + if (names.length > 32 || names.some((n) => !n)) + throw new Error( + t("カレンダー指定が不正です", "Invalid calendar selection"), + ); + enabled = names.map((n) => + calendars.find((c) => c.pretty_name === n || c.id === n), + ); + if (enabled.some((c) => !c)) + throw new Error( + t( + "カレンダーが見つからないか閲覧権限がありません", + "Calendar unavailable", + ), + ); + enabled = [...new Map(enabled.map((c) => [c.id, c])).values()]; + history.replaceState( + null, + "", + location.pathname + + "?calendar=" + + enabled.map((c) => encodeURIComponent(c.pretty_name)).join(","), + ); + } else { + enabled = (data.defaults || []) + .map((id) => calendars.find((c) => c.id === id)) + .filter(Boolean); + if (!enabled.length && calendars.length) enabled = [calendars[0]]; + } + current = enabled[0] || null; + if ((r.view === "detail" || r.view === "edit") && enabled.length !== 1) + throw new Error( + t( + "詳細表示ではカレンダーを1つ指定してください", + "Select one calendar for event details", + ), + ); + const select = $("calendar-select"); + select.replaceChildren(); + calendars.forEach((c) => { + const o = node("option", c.name); + o.value = c.id; + select.append(o); + }); + if (current) select.value = current.id; + $("calendar-create").hidden = !active; + toolbar(r); + if (!current) { + cache.clear(); + $("calendar-content").replaceChildren( + node( + "p", + selected + ? t( + "カレンダーが見つからないか、閲覧権限がありません。", + "Calendar unavailable.", + ) + : t( + "+ からカレンダーを作成してください。", + "Create a calendar using +.", + ), + ), + ); + $("calendar-status").textContent = ""; + return; + } + if (r.view === "detail" || r.view === "edit") await details(r); + else if (r.view === "new") { + render({ ...r, view: "day" }); + editEvent(null, r.date); + } else { + const range = period(r); + const result = []; + // Sequential calendars; at most four event bodies in flight globally. + for (const c of enabled) + result.push( + ...(await loadEvents( + range.start, + range.end, + abort.signal, + c, + 5000 - result.length, + )), + ); + result.sort( + (a, b) => + a.start.localeCompare(b.start) || + a.calendar_id.localeCompare(b.calendar_id) || + a.uid.localeCompare(b.uid), + ); + if (g !== generation) return; + events = result; + render(r); + } + $("calendar-status").textContent = ""; + } catch (err) { + if (err.name !== "AbortError" && g === generation) { + cache.clear(); + $("calendar-content").replaceChildren(); + $("calendar-status").textContent = err.message; + } + } + } + function navigate(href) { + cancelDrag?.(); + $("calendar-dialog").close(); + history.pushState(null, "", href); + load(); + } + app.addEventListener("click", (e) => { + const a = e.target.closest("a"); + if ( + !a || + e.ctrlKey || + e.metaKey || + e.shiftKey || + e.altKey || + e.button !== 0 + ) + return; + const u = new URL(a.href); + if ( + u.origin === location.origin && + (u.pathname.startsWith("/v/plan") || u.pathname.startsWith("/v/event/")) + ) { + e.preventDefault(); + navigate(u.pathname + u.search); + } + }); + window.addEventListener("popstate", load); + $("calendar-refresh").onclick = load; + const sourceButton = node("button", t("外部同期", "External sync")); + sourceButton.type = "button"; + sourceButton.id = "calendar-source-settings"; + $("calendar-settings").after(sourceButton); + sourceButton.onclick = () => + dialog( + t( + "外部カレンダーの読み取り同期", + "External calendar read-only synchronization", + ), + t("保存", "Save"), + () => { + const source = current.source || {}; + const label = node("label", t("取得方式", "Protocol")), + kind = node("select"); + kind.name = "source_kind"; + for (const [value, text] of [ + ["ics", "ICS"], + ["caldav", "CalDAV (REPORT / multiget)"], + ]) { + const option = node("option", text); + option.value = value; + kind.append(option); + } + kind.value = source.kind || "ics"; + label.append(kind); + $("calendar-fields").append(label); + field( + t( + "HTTPS URL(CalDAVはカレンダーcollection)", + "HTTPS URL (calendar collection for CalDAV)", + ), + "source_url", + "url", + source.url || "", + true, + ); + field( + t( + "外部サービスのユーザー名(任意)", + "External service username (optional)", + ), + "source_username", + "text", + ).autocomplete = "off"; + field( + t( + "外部サービスのパスワード(空欄で保持)", + "External service password (blank to retain)", + ), + "source_password", + "password", + ).autocomplete = "new-password"; + if (source.has_credential) + field( + t("保存した認証情報を削除", "Clear saved credentials"), + "clear_credential", + "checkbox", + false, + ); + $("calendar-fields").append( + node( + "p", + t( + "CalDAVは過去90日〜未来275日を読み取り同期します。外部への書き込みは行いません。", + "CalDAV imports the previous 90 and next 275 days. It never writes to the external server.", + ), + ), + ); + const interval = field( + t("読み取り間隔(分)", "Polling interval (minutes)"), + "interval", + "number", + source.interval_seconds ? source.interval_seconds / 60 : 60, + true, + ); + interval.min = "1"; + interval.max = "10080"; + interval.step = "1"; + field( + t("同期を有効化", "Enable synchronization"), + "source_enabled", + "checkbox", + source.enabled ?? true, + ); + $("calendar-fields").append( + node( + "p", + t( + "新しい空のカレンダーに設定してください。外部予定は読み取り専用です。HTTPSの公開アドレスのみ取得します。Outlookのタイムゾーン、RRULE、例外日・追加日・変更/取消回を同期期間内へ展開します。未対応形式はエラーになり、前回の予定を保持します。", + "Use a new empty calendar. Imported events are read-only. Only public HTTPS addresses are fetched. Outlook timezones, RRULE, excluded/added dates, and moved or cancelled instances are expanded within the synchronization window. Unsupported forms fail without replacing previous events.", + ), + ), + ); + if (source.checked_at_ms) + $("calendar-fields").append( + node( + "p", + t("最終確認:", "Last checked: ") + + new Date(source.checked_at_ms).toLocaleString(), + ), + ); + if (source.success_at_ms) + $("calendar-fields").append( + node( + "p", + t("最終成功:", "Last successful check: ") + + new Date(source.success_at_ms).toLocaleString(), + ), + ); + if (source.error) $("calendar-fields").append(node("p", source.error)); + if (source.enabled) { + const sync = node("button", t("今すぐ同期", "Synchronize now")); + sync.type = "button"; + sync.onclick = async () => { + sync.disabled = true; + try { + await api("calendars/" + current.id + "/source", "POST", {}); + $("calendar-form-error").textContent = t( + "同期をキューに追加しました。閉じて更新すると結果を確認できます。", + "Synchronization queued. Close and refresh to check the result.", + ); + } catch (e) { + $("calendar-form-error").textContent = e.message; + } finally { + sync.disabled = false; + } + }; + $("calendar-fields").append(sync); + } + }, + async (form) => { + await api("calendars/" + current.id + "/source", "PUT", { + url: form.get("source_url"), + kind: form.get("source_kind"), + username: form.get("source_username"), + password: form.get("source_password"), + clear_credential: form.has("clear_credential"), + interval_seconds: Number(form.get("interval")) * 60, + enabled: form.has("source_enabled"), + version: current.version, + }); + cache.clear(); + load(); + }, + ); + const displayButton = node("button", t("表示設定", "Display settings")); + displayButton.type = "button"; + displayButton.id = "calendar-display-settings"; + $("calendar-select").before(displayButton); + displayButton.onclick = () => + dialog( + t("表示するカレンダー", "Visible calendars"), + t("適用", "Apply"), + () => { + for (const c of calendars) + field( + c.name + " (" + c.pretty_name + ")", + "visible:" + c.id, + "checkbox", + enabled.some((e) => e.id === c.id), + ); + if (actor) + field( + t("自分のデフォルトとして保存", "Save as my defaults"), + "save-defaults", + "checkbox", + false, + ); + $("calendar-fields").append( + node( + "p", + t( + "複数選択できます。作成先は新規予定で選択します。", + "Select multiple calendars. Choose a destination when creating an event.", + ), + ), + ); + }, + async (form) => { + const selected = calendars.filter((c) => form.has("visible:" + c.id)); + if (!selected.length || selected.length > 32) + throw new Error( + t("1〜32個のカレンダーを選択してください", "Select 1–32 calendars"), + ); + const base = ["detail", "edit", "new"].includes(route().view) + ? "/v/plan" + : location.pathname; + if (form.has("save-defaults")) { + await api("preferences", "PUT", { + calendars: selected.map((c) => c.id), + }); + navigate(base); + } else + navigate( + base + + "?calendar=" + + selected.map((c) => encodeURIComponent(c.pretty_name)).join(","), + ); + }, + ); + $("calendar-select").onchange = () => { + cache.clear(); + const u = new URL(location.href); + u.searchParams.set( + "calendar", + calendars.find((c) => c.id === $("calendar-select").value).pretty_name, + ); + navigate(u.pathname + u.search); + }; + document + .querySelectorAll("[data-close]") + .forEach((b) => (b.onclick = () => $("calendar-dialog").close())); + $("calendar-create").onclick = () => + dialog( + t("カレンダーを作成", "Create calendar"), + t("作成", "Create"), + () => { + field(t("名前", "Name"), "name", "text", "", true); + field("pretty_name", "pretty_name", "text", "", true); + }, + async (form) => { + const c = await api("calendars", "POST", { + name: form.get("name"), + pretty_name: form.get("pretty_name"), + }); + navigate("/v/plan?calendar=" + encodeURIComponent(c.pretty_name)); + }, + ); + $("calendar-settings").onclick = () => + dialog( + t("カレンダー設定", "Calendar settings"), + t("保存", "Save"), + () => { + field(t("名前", "Name"), "name", "text", current.name, true); + field("pretty_name", "pretty_name", "text", current.pretty_name, true); + const publication = field( + t("匿名での閲覧を許可", "Allow public reading"), + "public", + "checkbox", + current.public && publicAllowed, + ); + publication.disabled = !publicAllowed; + if (!publicAllowed) + $("calendar-fields").append( + node( + "p", + t( + "ドメイン管理者による公開許可が必要です。", + "Publication requires the Domain administrator to allow public access.", + ), + ), + ); + field( + t( + "コラボレータ(ユーザー名 または UUID:read / UUID:write、1行1件)", + "Collaborators (username or UUID:read / UUID:write, one per line)", + ), + "members", + "textarea", + Object.entries(current.members || {}) + .map(([id, role]) => id + ":" + role) + .join("\n"), + ); + $("calendar-fields").append( + node( + "p", + t( + "公開すると説明・場所を含む全予定が閲覧可能になります。", + "Publishing exposes all events, including descriptions and locations.", + ), + ), + ); + const remove = node( + "button", + t("カレンダーを削除", "Delete calendar"), + "calendar-delete-button", + ); + remove.type = "button"; + remove.onclick = async () => { + const target = current; + if ( + !target || + !confirm( + t( + `「${target.name}」とすべての予定を完全に削除しますか?`, + `Permanently delete “${target.name}” and all its events?`, + ), + ) + ) + return; + remove.disabled = true; + $("calendar-form-error").textContent = ""; + try { + await api( + "calendars/" + target.id + "/settings", + "DELETE", + { version: target.version }, + ); + cache.clear(); + $("calendar-dialog").close(); + navigate("/v/plan"); + } catch (error) { + $("calendar-form-error").textContent = error.message; + remove.disabled = false; + } + }; + $("calendar-fields").append(remove); + }, + async (form) => { + const members = {}; + for (const line of String(form.get("members")) + .split("\n") + .map((l) => l.trim()) + .filter(Boolean)) { + const i = line.lastIndexOf(":"); + if (i < 1) throw new Error("username:read / username:write"); + members[line.slice(0, i)] = line.slice(i + 1); + } + await api("calendars/" + current.id + "/settings", "PUT", { + name: form.get("name"), + pretty_name: form.get("pretty_name"), + public: form.has("public"), + members, + version: current.version, + }); + cache.clear(); + if (new URLSearchParams(location.search).has("calendar")) { + navigate( + location.pathname + + "?calendar=" + + enabled + .map((c) => + encodeURIComponent( + c.id === current.id + ? form.get("pretty_name") + : c.pretty_name, + ), + ) + .join(","), + ); + } else load(); + }, + ); + const mobileActions=node('details',undefined,'calendar-mobile-actions'),mobileSummary=node('summary','⋯'),mobilePanel=node('div'); + mobileSummary.setAttribute('aria-label',t('カレンダーの設定・管理','Calendar settings and management'));mobileActions.append(mobileSummary,mobilePanel); + for(const [id,label] of [['calendar-display-settings',t('表示カレンダー','Visible calendars')],['calendar-settings',t('カレンダー設定','Calendar settings')],['calendar-create',t('カレンダーを追加','Add calendar')],['calendar-source-settings',t('外部同期設定','External sync settings')]]){const b=node('button',label);b.type='button';b.dataset.source=id;b.onclick=()=>{mobileActions.open=false;$(id).click();};mobilePanel.append(b);} + mobileActions.addEventListener('toggle',()=>{if(mobileActions.open)mobilePanel.querySelectorAll('button').forEach(b=>{b.hidden=$(b.dataset.source).hidden;b.disabled=$(b.dataset.source).disabled;});}); + $('calendar-new').after(mobileActions); + document.addEventListener('click',e=>{if(!mobileActions.contains(e.target))mobileActions.open=false;}); + document.addEventListener('keydown',e=>{if(e.key==='Escape'&&mobileActions.open){mobileActions.open=false;mobileSummary.focus();}}); + load(); +})(); diff --git a/static/js/city-estates.js b/static/js/city-estates.js new file mode 100644 index 0000000..ff71663 --- /dev/null +++ b/static/js/city-estates.js @@ -0,0 +1,121 @@ +// Bounded, deterministic close-up projection. Geometry never owns Page identity. +(() => { + const SPOTS_PER_VIEW = 6, PAGES_PER_VIEW = 24; + const ns='http://www.w3.org/2000/svg'; + const el=(tag,attrs={},text='')=>{const n=document.createElementNS(ns,tag);for(const [k,v] of Object.entries(attrs))n.setAttribute(k,v);if(text)n.textContent=text;return n;}; + const uniquePages=spot=>[...new Map((spot.pages||[]).map(p=>[p.page_uuid,p])).values()]; + // Only the actual boundary Page is represented by the central palace. The + // API may suggest a descendant as a fallback portal (also in undefined + // buckets); such a Page must keep its independently selectable building. + const surroundingPages=spot=>uniquePages(spot).filter(p=>!(p.page_uuid===spot.portal_page_uuid&&p.path===spot.path_prefix)); + const undefinedSpot=spot=>spot.name?.endsWith('-undefined')||spot.path_prefix?.endsWith('/_undefined'); + const pageName=p=>p.label||(p.path||'').split('/').filter(Boolean).pop()||p.page_uuid; + const pageURL=p=>p.path?p.path.split('/').map(encodeURIComponent).join('/'):`/o/uuid:${encodeURIComponent(p.page_uuid)}`; + const slice=(items,page,size)=>{const pages=Math.max(1,Math.ceil(items.length/size)),index=Math.max(0,Math.min(pages-1,page||0));return{items:items.slice(index*size,(index+1)*size),page:index,pages,total:items.length};}; + function layout(count) { + const columns=Math.min(3,Math.max(1,count)),rows=Math.ceil(count/columns); + const width=Math.max(960,columns*380+120),height=Math.max(680,rows*350+180); + return {width,height,plots:Array.from({length:count},(_,i)=>({x:width/2-(columns-1)*190+(i%columns)*380,y:height/2-(rows-1)*175+Math.floor(i/columns)*350,w:336,h:314}))}; + } + const label=(parent,cls,x,y,text,width=100,size=12)=>{ + const n=el('text',{class:cls,x,y,'text-anchor':'middle','font-size':size}); + // Bounded horizontal lines; the complete name is always in the tooltip. + const chars=[...String(text)],lines=[];let line='',used=0; + for(const char of chars){const unit=/[\u0000-\u00ff]/.test(char)?size*.57:size;if(used+unit>width&&line){lines.push(line);line='';used=0;}line+=char;used+=unit;} + if(line)lines.push(line); + lines.slice(0,2).forEach((part,i)=>n.append(el('tspan',{x,dy:i?size+2:0},i===1&&lines.length>2?part.slice(0,-1)+'…':part))); + n.append(el('title',{},text));parent.append(n);return n; + }; + const use=(parent,id,x,y,width,height,cls='')=>{const n=el('use',{href:`#${id}`,x,y,width,height,class:cls});parent.append(n);return n;}; + function definitions() { + const defs=el('defs'); + const paving=el('pattern',{id:'city-court-stone',width:24,height:16,patternUnits:'userSpaceOnUse'}); + paving.append(el('rect',{width:24,height:16,class:'estate-stone'}),el('path',{d:'M0 0H24M0 8H24M0 16H24M12 0V8M6 8V16M24 8V16',class:'estate-mortar'}));defs.append(paving); + const roof=el('pattern',{id:'city-terracotta',width:8,height:8,patternUnits:'userSpaceOnUse'}); + roof.append(el('rect',{width:8,height:8,class:'estate-roof-fill'}),el('path',{d:'M0 4H8M0 8H8M4 0V4M2 4V8M6 4V8',class:'estate-roof-tile'}));defs.append(roof); + const house=el('symbol',{id:'city-page-house',viewBox:'0 0 64 54'}); + house.append(el('path',{d:'M7 25 32 8 57 25V49H7Z',class:'estate-house-wall'}),el('path',{d:'M2 26 32 3 62 26 56 28 32 12 8 28Z',class:'estate-house-roof'}),el('path',{d:'M27 49V36Q32 28 37 36V49M13 30H20V39H13ZM44 30H51V39H44Z',class:'estate-window'}),el('path',{d:'M4 49H60M9 43H24M41 43H55',class:'estate-cornice'}));defs.append(house); + const hall=el('symbol',{id:'city-palazzo',viewBox:'0 0 140 105'}); + hall.append(el('path',{d:'M10 34H130V96H10Z',class:'estate-palazzo-wall'}),el('path',{d:'M3 36 70 3 137 36ZM11 34H129V42H11Z',class:'estate-pediment'}),el('path',{d:'M18 44V90M43 44V90M97 44V90M122 44V90',class:'estate-column'}),el('path',{d:'M56 96V63Q70 43 84 63V96M24 55H36V72H24ZM104 55H116V72H104Z',class:'estate-window'}),el('path',{d:'M4 96H136M0 102H140M16 83H46M94 83H124',class:'estate-cornice'}),el('circle',{cx:70,cy:24,r:6,class:'estate-rosette'}));defs.append(hall); + const gate=el('symbol',{id:'city-iron-gate',viewBox:'0 0 100 50'}); + gate.append(el('path',{d:'M4 16H14V48H4ZM86 16H96V48H86ZM1 12H17V18H1ZM83 12H99V18H83Z',class:'estate-palazzo-wall'}),el('path',{d:'M15 47V24Q50-6 85 24V47M15 32H85M15 44H85M24 15V47M37 8V47M50 5V47M63 8V47M76 15V47M21 23Q30 13 37 23Q44 32 50 23Q57 13 64 23Q71 32 79 23',class:'estate-iron'}));defs.append(gate); + const tree=el('symbol',{id:'city-cypress',viewBox:'0 0 18 44'}); + tree.append(el('path',{d:'M9 3Q-4 24 5 36H13Q22 24 9 3Z',class:'estate-cypress'}),el('path',{d:'M9 32V44',class:'estate-tree-trunk'}));defs.append(tree); + return defs; + } + function projectRoads(roads,width,height) { + if(!roads.length)return []; + const xs=roads.flatMap(r=>[r[0],r[2]]),ys=roads.flatMap(r=>[r[1],r[3]]); + const loX=Math.min(...xs),hiX=Math.max(...xs),loY=Math.min(...ys),hiY=Math.max(...ys); + const scale=Math.min((width-180)/Math.max(40,hiX-loX),(height-150)/Math.max(40,hiY-loY)); + return roads.map(r=>[width/2+(r[0]-(loX+hiX)/2)*scale,height/2+(r[1]-(loY+hiY)/2)*scale,width/2+(r[2]-(loX+hiX)/2)*scale,height/2+(r[3]-(loY+hiY)/2)*scale]); + } + function nearestRoad(x,y,roads) { + let best=null,distance=Infinity; + for(const [ax,ay,bx,by] of roads){const dx=bx-ax,dy=by-ay,t=Math.max(0,Math.min(1,((x-ax)*dx+(y-ay)*dy)/(dx*dx+dy*dy||1))),px=ax+t*dx,py=ay+t*dy,d=Math.hypot(x-px,y-py);if(devent.stopPropagation());group.append(a); + } + function ground(group,width,height) { + group.append(el('rect',{x:0,y:0,width,height,rx:16,class:'estate-ground'})); + for(const x of [32,width-48])for(let y=80;y{if(event.target.closest('a'))return;event.stopPropagation();if(!focused)onSpot(spot);});return group; + } + function streetScene(street,roads,page,onSpot) { + const available=street.spots.filter(s=>!undefinedSpot(s)||uniquePages(s).length); + const batch=slice(available,page,SPOTS_PER_VIEW),space=layout(batch.items.length),root=el('g',{class:'city-estate-scene'}); + root.append(definitions());ground(root,space.width,space.height); + const projected=projectRoads(roads,space.width,space.height); + for(const r of projected)root.append(el('path',{d:`M${r[0]} ${r[1]}L${r[2]} ${r[3]}`,class:'estate-route-edge'}),el('path',{d:`M${r[0]} ${r[1]}L${r[2]} ${r[3]}`,class:'estate-route'})); + label(root,'city-generated-street-label',space.width/2,38,street.title||street.name,500,22); + batch.items.forEach((spot,i)=>{ + const box=space.plots[i],group=spotGroup(spot,onSpot),pages=surroundingPages(spot),isUndefined=undefinedSpot(spot),anchor=nearestRoad(box.x,box.y,projected); + if(anchor)root.append(el('path',{d:`M${anchor[0]} ${anchor[1]}L${box.x} ${box.y+box.h/2}`,class:'estate-walkway'})); + group.setAttribute('data-estate-box',`${box.x-box.w/2},${box.y-box.h/2},${box.w},${box.h}`); + if(isUndefined)group.classList.add('city-spot-undefined','city-undefined-expanded'); + courtyard(group,box.x,box.y,box.w,box.h);entry(group,spot,box.x,box.y-9,onSpot,isUndefined); + const places=[[-109,-91],[109,-91],[109,91],[-109,91],[0,-110],[0,110]]; + pages.slice(0,6).forEach((p,j)=>pageHouse(group,p,box.x+places[j][0],box.y+places[j][1],isUndefined)); + if(pages.length>6){const count=el('g',{class:'city-estate-more',role:'button',tabindex:0,'aria-label':`${pages.length} Pages`});count.append(el('rect',{x:box.x+65,y:box.y+box.h/2+5,width:90,height:22,rx:11}),el('text',{x:box.x+110,y:box.y+box.h/2+21,'text-anchor':'middle'},`+ ${pages.length-6} Pages`));group.append(count);} + use(group,'city-iron-gate',box.x-31,box.y+box.h/2-6,62,31);root.append(group); + }); + return {root,...space,...batch,kind:'spots'}; + } + function spotScene(spot,page,onSpot) { + const batch=slice(surroundingPages(spot),page,PAGES_PER_VIEW),width=1120,height=780,root=el('g',{class:'city-estate-scene city-estate-detail'}); + root.append(definitions());ground(root,width,height); + const group=spotGroup(spot,onSpot,true);group.classList.add('city-estate-focused');courtyard(group,width/2,height/2,990,630); + group.append(el('ellipse',{cx:width/2,cy:height/2+118,rx:45,ry:22,class:'estate-fountain'})); + entry(group,spot,width/2,height/2-35,onSpot,undefinedSpot(spot),true); + const places=[];for(let i=0;i<8;i++)places.push([175+i*110,126]);for(let i=0;i<8;i++)places.push([175+i*110,618]);for(let i=0;i<4;i++)places.push([123,228+i*96]);for(let i=0;i<4;i++)places.push([997,228+i*96]); + batch.items.forEach((p,i)=>{const [x,y]=places[i];group.append(el('path',{d:`M${width/2} ${height/2+70}Q${x} ${height/2+70} ${x} ${y}`,class:'estate-detail-walkway'}));}); + batch.items.forEach((p,i)=>pageHouse(group,p,...places[i],undefinedSpot(spot))); + const portal=spot.portal_path||(spot.portal_page_uuid&&`/o/uuid:${spot.portal_page_uuid}`); + if(portal){const text=document.documentElement.lang.startsWith('ja')?'ポータルPageを開く':'Open portal Page',link=el('a',{href:portal,class:'city-portal-link','aria-label':text});link.append(el('rect',{x:width/2-110,y:height/2+48,width:220,height:31,rx:3}));label(link,'city-portal-label',width/2,height/2+69,text,210,13);link.addEventListener('click',e=>e.stopPropagation());group.append(link);} + use(group,'city-iron-gate',width/2-60,height-75,120,60);root.append(group); + return {root,width,height,...batch,kind:'pages'}; + } + window.PagesWikiCityEstates={layout,streetScene,spotScene,definitions,uniquePages,pageURL,surroundingPages,undefinedSpot,SPOTS_PER_VIEW,PAGES_PER_VIEW}; +})(); diff --git a/static/js/city-generator-client.js b/static/js/city-generator-client.js new file mode 100644 index 0000000..089372a --- /dev/null +++ b/static/js/city-generator-client.js @@ -0,0 +1,105 @@ +/* Geometry only: never put Page names, grants or topology into this cache. */ +(() => { + 'use strict'; + const VERSION = 'gen-city-1.4.6-layout2'; + const PREFIX = 'pageswiki:city-fabric:v2:'; + const MAX_CACHE_ENTRIES = 3, MAX_CACHE_BYTES = 512 * 1024; + const workerURL = '/static/js/city-generator-worker.js?v=2'; + const abortError = () => new DOMException('City generation cancelled', 'AbortError'); + const validFabric = fabric => { + if (!fabric || !Number.isFinite(fabric.width) || !Number.isFinite(fabric.height) || fabric.width < 64 || fabric.width > 320 || fabric.height < 64 || fabric.height > 240) return false; + if (!Array.isArray(fabric.roads) || !Array.isArray(fabric.buildings) || fabric.roads.length > 4096 || fabric.buildings.length > 4096) return false; + const finite = value => Number.isFinite(value) && Math.abs(value) <= 2048; + return fabric.roads.every(road => Array.isArray(road) && road.length === 4 && road.every(finite)) && + fabric.buildings.every(building => Array.isArray(building) && building.length >= 3 && building.length <= 16 && building.every(point => Array.isArray(point) && point.length === 2 && point.every(finite))); + }; + + class CityFabricClient { + constructor({workerFactory = url => new Worker(url), storage, timeout = 5000} = {}) { + this.workerFactory = workerFactory; + this.timeout = Math.max(20, Math.min(5000, timeout)); + try { this.storage = storage === undefined ? sessionStorage : storage; } catch (_) { this.storage = null; } + this.memory = new Map(); this.pending = null; this.sequence = 0; + } + + cacheKey(key, width, height) { return PREFIX + JSON.stringify([VERSION, key, width, height]); } + + readCache(key) { + if (this.memory.has(key)) { + const value = this.memory.get(key); this.memory.delete(key); this.memory.set(key, value); return value; + } + try { + const raw = this.storage?.getItem(key); + if (raw && raw.length <= MAX_CACHE_BYTES) { + const value = JSON.parse(raw); + if (validFabric(value)) { this.remember(key, value); return value; } + } + if (raw) this.storage?.removeItem(key); + } catch (_) { /* Storage denial or corrupt cache must not break the map. */ } + return null; + } + + remember(key, value) { + this.memory.delete(key); this.memory.set(key, value); + while (this.memory.size > MAX_CACHE_ENTRIES) this.memory.delete(this.memory.keys().next().value); + } + + saveCache(key, value) { + this.remember(key, value); + try { + const raw = JSON.stringify(value); + if (raw.length > MAX_CACHE_BYTES || !this.storage) return; + // Only inspect our namespace; never clear another feature's storage. + const keys = []; + for (let i = 0; i < this.storage.length; i++) { + const item = this.storage.key(i); + if (item?.startsWith(PREFIX) && item !== key) keys.push(item); + } + while (keys.length >= MAX_CACHE_ENTRIES) this.storage.removeItem(keys.shift()); + this.storage.setItem(key, raw); + } catch (_) { /* Quota exhaustion: the bounded in-memory cache still works. */ } + } + + generateFabric(key, width = 180, height = 100, {signal} = {}) { + key = String(key || ''); + if (!key || key.length > 256 || !Number.isInteger(width) || !Number.isInteger(height) || width < 64 || width > 320 || height < 64 || height > 240) return Promise.reject(new RangeError('City generation bounds exceeded')); + if (signal?.aborted) return Promise.reject(abortError()); + const cacheKey = this.cacheKey(key, width, height); + if (this.pending?.key === cacheKey) return this.pending.promise; + this.cancel(); + const cached = this.readCache(cacheKey); + if (cached && cached.width === width && cached.height === height) return Promise.resolve(cached); + let resolve, reject; + const promise = new Promise((yes, no) => { resolve = yes; reject = no; }); + const job = {key: cacheKey, id: ++this.sequence, promise, resolve, reject, worker: null, timer: null, signal, abort: null}; + this.pending = job; + const finish = (error, fabric) => { + if (this.pending !== job) return; + clearTimeout(job.timer); job.signal?.removeEventListener('abort', job.abort); + job.worker?.terminate(); this.pending = null; + if (error) reject(error); else { this.saveCache(cacheKey, fabric); resolve(fabric); } + }; + job.abort = () => finish(abortError()); + signal?.addEventListener('abort', job.abort, {once: true}); + try { + job.worker = this.workerFactory(workerURL); + job.worker.onmessage = event => { + const message = event.data; + if (message?.id !== job.id) return; + if (message.error || !validFabric(message.fabric) || message.fabric.width !== width || message.fabric.height !== height) finish(new Error('Invalid City generation result')); + else finish(null, message.fabric); + }; + job.worker.onerror = event => { event.preventDefault?.(); finish(new Error('City worker unavailable')); }; + job.worker.onmessageerror = () => finish(new Error('Invalid City worker message')); + job.timer = setTimeout(() => finish(new Error('City generation timed out')), this.timeout); + job.worker.postMessage({id: job.id, key, width, height}); + } catch (_) { finish(new Error('City worker unavailable')); } + return promise; + } + + cancel() { this.pending?.abort(); } + } + + window.PagesWikiCityFabricClient = CityFabricClient; + window.PagesWikiGenCity = new CityFabricClient(); +})(); diff --git a/static/js/city-generator-worker.js b/static/js/city-generator-worker.js new file mode 100644 index 0000000..78029dc --- /dev/null +++ b/static/js/city-generator-worker.js @@ -0,0 +1,18 @@ +/* gen-city has synchronous internals; only this Worker may execute its bundle. */ +'use strict'; +importScripts('/static/vendor/city-generator/gen-city.bundle.js?v=1.4.6.2'); +let busy = false; +self.onmessage = async event => { + if (busy) return; + const {id, key, width, height} = event.data || {}; + if (!Number.isInteger(id) || typeof key !== 'string' || !key || key.length > 256 || !Number.isInteger(width) || !Number.isInteger(height) || width < 64 || width > 320 || height < 64 || height > 240) { + self.postMessage({id, error: 'Invalid City generation bounds'}); return; + } + busy = true; + try { + const fabric = await self.PagesWikiGenCity.generateFabric(key, width, height); + if (fabric.roads.length > 4096 || fabric.buildings.length > 4096) throw new Error('City geometry budget exceeded'); + self.postMessage({id, fabric}); + } catch (_) { self.postMessage({id, error: 'City generation failed'}); } + finally { busy = false; } +}; diff --git a/static/js/city-geometry.js b/static/js/city-geometry.js new file mode 100644 index 0000000..782fc69 --- /dev/null +++ b/static/js/city-geometry.js @@ -0,0 +1,48 @@ +(() => { + const VERSION = 1; + const hash = value => { + let h = 2166136261; + for (const char of String(value)) { h ^= char.charCodeAt(0); h = Math.imul(h, 16777619); } + return h >>> 0; + }; + const randomFrom = seed => { + let state = hash(seed) || 1; + return () => { state += 0x6D2B79F5; let t = state; t = Math.imul(t ^ t >>> 15, t | 1); t ^= t + Math.imul(t ^ t >>> 7, t | 61); return ((t ^ t >>> 14) >>> 0) / 4294967296; }; + }; + const jitter = (random, amount) => (random() * 2 - 1) * amount; + const cacheKey = city => `pageswiki:city-geometry:v${VERSION}:${city.domain_uuid}:${city.version}`; + const signature = city => city.quartiers.map(q => `${q.uuid}:${q.streets.map(s => `${s.uuid}:${s.spots.map(p => p.uuid).join(',')}`).join('|')}`).join(';'); + + function generate(city) { + const random = randomFrom(`${city.domain_uuid}:${city.version}:${signature(city)}`); + const geometry = { version:VERSION, domain:{width:1000,height:Math.max(560,Math.ceil(city.quartiers.length/3)*250+80)}, quartiers:{}, streets:{}, spots:{} }; + city.quartiers.forEach((quartier,index) => { + const col=index%3,row=Math.floor(index/3),x=55+col*315+jitter(random,18),y=55+row*235+jitter(random,14); + const width=255+jitter(random,22),height=170+jitter(random,18),cut=18+random()*24; + geometry.quartiers[quartier.uuid]={x,y,width,height,polygon:[[x+cut,y],[x+width-cut*.3,y+4],[x+width,y+cut],[x+width-7,y+height-cut*.4],[x+width-cut,y+height],[x+cut*.4,y+height-5],[x,y+height-cut],[x+5,y+cut]]}; + const mapHeight=Math.max(480,quartier.streets.length*125+110); + quartier.streets.forEach((street,streetIndex) => { + const sy=90+streetIndex*120+jitter(random,22),bend=jitter(random,85),startY=sy+jitter(random,18),endY=sy+jitter(random,28); + geometry.streets[street.uuid]={width:920,height:mapHeight,path:[[35,startY],[260,sy+bend],[635,sy-bend*.65],[885,endY]],laneWidth:26+random()*14}; + street.spots.forEach((spot,spotIndex) => { + const side=spotIndex%2===0?-1:1,slot=Math.floor(spotIndex/2),sx=65+slot*210+jitter(random,18),baseY=side<0?62:330; + geometry.spots[spot.uuid]={x:sx,y:baseY+jitter(random,16),width:160+jitter(random,15),height:112+Math.min(4,(spot.pages||[]).length)*19+jitter(random,10),side,roof:random()>.55?'gable':'flat'}; + }); + }); + }); + return geometry; + } + + function load(city) { + const key=cacheKey(city),expected=signature(city); + try { const cached=JSON.parse(localStorage.getItem(key)); if(cached?.version===VERSION&&cached.signature===expected)return cached.geometry; } catch (_) {} + const geometry=generate(city); + try { + localStorage.setItem(key,JSON.stringify({version:VERSION,signature:expected,geometry})); + Object.keys(localStorage).filter(item=>item.startsWith(`pageswiki:city-geometry:v${VERSION}:${city.domain_uuid}:`)&&item!==key).slice(0,-2).forEach(item=>localStorage.removeItem(item)); + } catch (_) {} + return geometry; + } + + window.PagesWikiCityGeometry={version:VERSION,load,generate,register(adapter){if(adapter?.load&&adapter?.generate)window.PagesWikiCityGeometry=adapter;}}; +})(); diff --git a/static/js/city-governance.js b/static/js/city-governance.js new file mode 100644 index 0000000..a8b3b64 --- /dev/null +++ b/static/js/city-governance.js @@ -0,0 +1,164 @@ +document.addEventListener('DOMContentLoaded', () => { + const dialog = document.querySelector('[data-governance-dialog]'); + if (!dialog) return; + const find = selector => dialog.querySelector(selector); + const form = find('form'), fields = find('fieldset'), result = find('[data-governance-result]'); + const endpoint = dialog.dataset.endpoint; + const accessForm = find('[data-access-form]'), accessFields = accessForm.querySelector('fieldset'); + const publicationForm=find('[data-publication-form]'), publicationFields=publicationForm.querySelector('fieldset'); + let impact; + const autoForm=find('[data-auto-publication-form]');let autoState; + const clearAuto=()=>{autoState=null;autoForm.reset();autoForm.elements.confirm.setCustomValidity('');find('[data-auto-save]').disabled=true;find('[data-auto-impact]').replaceChildren();}; + const clearPublication=()=>{impact=null; publicationForm.reset();find('[data-publication-impact]').replaceChildren();find('[data-publication-status]').textContent='';find('[data-publication-enable]').disabled=true;}; + let accessState, entries = []; + const showAccess = () => { + const list = find('[data-access-entries]'); list.replaceChildren(); + entries.forEach((entry,index) => { + const row = document.createElement('div'); row.className = 'city-access-row'; + for (const [key,options] of [['kind',['user','group']],['name',null],['permission',['read','read_write']]]) { + const input = document.createElement(options ? 'select' : 'input'); + if (options) options.forEach(value => { const option = document.createElement('option'); option.value = value; option.textContent = accessForm.dataset[value]; input.append(option); }); + else { input.maxLength=64; input.required=true; input.placeholder=accessForm.dataset.name; } + input.setAttribute('aria-label', key==='name' ? accessForm.dataset.name : key==='kind' ? `${accessForm.dataset.user} / ${accessForm.dataset.group}` : `${accessForm.dataset.read} / ${accessForm.dataset.read_write}`); + input.value = entry[key]; input.addEventListener('input',()=>{ entry[key]=input.value; if(key==='kind'||key==='name') delete entry.id; }); row.append(input); + } + const remove = document.createElement('button'); remove.type='button'; remove.textContent='×'; remove.setAttribute('aria-label',dialog.dataset.remove); remove.addEventListener('click',()=>{ entries.splice(index,1); showAccess(); }); row.append(remove); list.append(row); + }); + }; + let state, owners = [], candidates = [], timer, generation = 0, searchGeneration = 0; + const label = policy => dialog.dataset[policy] || policy; + const api = async (url, method = 'GET', body) => { + const response = await fetch(url, {method, headers:{'Content-Type':'application/json'}, ...(body ? {body:JSON.stringify(body)} : {})}); + const data = await response.json().catch(() => ({})); + if (!response.ok) throw new Error(data.error || `HTTP ${response.status}`); + return data; + }; + const showPolicy = data => { + find('[data-governance-superior]').textContent = data.superior_allows_public ? dialog.dataset.yes : dialog.dataset.no; + find('[data-governance-effective]').textContent = data.draft_effective_public ? dialog.dataset.yes : dialog.dataset.no; + const chain = find('[data-governance-chain]'); chain.replaceChildren(); + data.chain.forEach(item => { const li = document.createElement('li'); li.textContent = `${item.kind}: ${label(item.policy)}`; chain.append(li); }); + }; + const showOwners = () => { + const list = find('[data-governance-owners]'); list.replaceChildren(); + owners.forEach(owner => { + const li = document.createElement('li'), text = document.createElement('span'); + text.textContent = `${owner.display_name || owner.username} (${owner.username})${owner.active ? '' : ' · '+dialog.dataset.inactive}`; + li.append(text); + if (state.can_appoint) { + const button = document.createElement('button'); button.type = 'button'; button.textContent = '×'; button.setAttribute('aria-label',dialog.dataset.remove); + button.addEventListener('click', () => { owners = owners.filter(o => o.membership_uuid !== owner.membership_uuid); showOwners(); }); li.append(button); + } + list.append(li); + }); + }; + const members = async () => { + const seq = ++searchGeneration, opened = generation; + try { + const data = await api(endpoint+'/members?q='+encodeURIComponent(find('[data-governance-search]').value)); + if (seq !== searchGeneration || opened !== generation || !dialog.open) return; + candidates = data; + const select = find('[data-governance-members]'); select.replaceChildren(); + data.forEach(o => { const option = document.createElement('option'); option.value = o.membership_uuid; option.textContent = `${o.display_name || o.username} (${o.username})`; select.append(option); }); + } catch (error) { if (opened === generation && dialog.open) result.textContent = error.message; } + }; + document.querySelector('[data-governance-open]').addEventListener('click', async () => { + dialog.showModal(); const seq = ++generation; fields.disabled = true; accessFields.disabled=true; result.textContent = ''; form.reset(); accessForm.reset(); + publicationFields.disabled=true; clearPublication();clearAuto(); + try { + const [data,acl] = await Promise.all([api(endpoint),api(endpoint+'/access')]); + if (seq !== generation || !dialog.open) return; + if (data.epoch !== acl.epoch || data.topology_version !== acl.topology_version) throw new Error(dialog.dataset.conflict); + state = data; owners = [...data.owners]; form.elements.policy.value = data.policy; + accessState=acl; entries=acl.entries.map(e=>({...e})); accessForm.elements.mode.value=acl.mode; showAccess(); accessFields.disabled=false; + form.elements.policy.querySelector('[value=inherit]').disabled = data.kind === 'domain'; + form.elements.policy.querySelector('[value=public]').disabled = !data.superior_allows_public; + find('[data-governance-appointments]').hidden = !data.can_appoint; + showPolicy(data); showOwners(); fields.disabled = false; + publicationFields.disabled=false; + if (data.can_appoint) members(); + } catch (error) { result.textContent = error.message; } + }); + find('[data-governance-close]').addEventListener('click', () => dialog.close()); + dialog.addEventListener('close', () => { if (dialog.open) return; generation++; searchGeneration++; clearTimeout(timer); }); + dialog.addEventListener('keydown', event => event.stopPropagation()); + find('[data-governance-search]').addEventListener('input', () => { clearTimeout(timer); searchGeneration++; timer = setTimeout(members,200); }); + find('[data-governance-add]').addEventListener('click', () => { + const selected = candidates.find(o => o.membership_uuid === find('[data-governance-members]').value); + if (selected && owners.length < 32 && !owners.some(o => o.membership_uuid === selected.membership_uuid)) { owners.push(selected); showOwners(); } + }); + const save = async preview => { + if (!state || fields.disabled || accessFields.disabled) return; + const body = {epoch:state.epoch, topology_version:state.topology_version, policy:form.elements.policy.value, confirm_relaxation:form.elements.confirm_relaxation.checked}; + if (state.can_appoint && JSON.stringify(owners.map(o => o.membership_uuid)) !== JSON.stringify(state.owners.map(o => o.membership_uuid))) body.owners = owners.map(o => o.membership_uuid); + fields.disabled = true; accessFields.disabled=true; const seq = generation; + publicationFields.disabled=true; + try { + const data = await api(endpoint+(preview ? '/preview' : ''), preview ? 'POST' : 'PATCH', body); + if (seq !== generation || !dialog.open) return; + showPolicy(data); + if (!preview) { state = data; accessState.epoch=data.epoch; owners = [...data.owners]; showOwners(); form.elements.confirm_relaxation.checked = false; result.textContent = dialog.dataset.saved; clearPublication(); } + else result.textContent = ''; + } catch (error) { if (seq === generation) result.textContent = error.message; } + finally { if (seq === generation) {fields.disabled = false; accessFields.disabled=false; publicationFields.disabled=false;} } + }; + form.addEventListener('submit', event => { event.preventDefault(); save(false); }); + find('[data-governance-preview]').addEventListener('click', () => save(true)); + find('[data-access-add]').addEventListener('click',()=>{ if(entries.length<64) { entries.push({kind:'user',name:'',permission:'read'}); showAccess(); } }); + accessForm.addEventListener('submit',async event=>{ + event.preventDefault(); if (!accessState || fields.disabled || accessFields.disabled) return; + const body={epoch:accessState.epoch,topology_version:accessState.topology_version,mode:accessForm.elements.mode.value,entries:accessForm.elements.mode.value==='inherit'?[]:entries.map(({kind,name,permission,id})=>({kind,name,permission,id}))}; + fields.disabled=true; accessFields.disabled=true; const seq=generation; + publicationFields.disabled=true;clearPublication(); + try { const data=await api(endpoint+'/access','PATCH',body); if(seq!==generation||!dialog.open)return; accessState=data; state.epoch=data.epoch; entries=data.entries.map(e=>({...e})); showAccess(); accessForm.elements.confirm.checked=false; result.textContent=accessForm.dataset.saved; + } catch(error) { if(seq===generation) result.textContent=error.message; + } finally { if(seq===generation) {fields.disabled=false;accessFields.disabled=false;publicationFields.disabled=false;} } + }); + const publication = async operation => { + if(!state || fields.disabled || publicationFields.disabled) return; + const seq=generation; fields.disabled=true; accessFields.disabled=true; publicationFields.disabled=true; + const body=operation==='preview'?undefined:{epoch:state.epoch,topology_version:state.topology_version,publication_version:impact?.publication_version??state.publication_version,enabled:operation==='enable',confirm:publicationForm.elements.confirm.checked,impact_token:impact?.impact_token||''}; + try { + const data=await api(endpoint+'/publication',operation==='preview'?'GET':'PATCH',body); + if(seq!==generation||!dialog.open)return; + if(data.epoch!==state.epoch||data.topology_version!==state.topology_version)throw new Error(dialog.dataset.conflict); + state.publication_version=data.publication_version; + impact=data;find('[data-publication-enable]').disabled=!data.eligible;publicationForm.elements.confirm.checked=false; + find('[data-publication-status]').textContent=publicationForm.dataset[data.enabled?'enabled':'disabled']; + const list=find('[data-publication-impact]');list.replaceChildren(); + const ul=document.createElement('ul'); + data.entries.forEach(e=>{const li=document.createElement('li');li.textContent=`${e.path} (${e.lang}) · ${e.revision_uuid}`;ul.append(li);});list.append(ul); + if(data.excluded.length){const p=document.createElement('p');p.textContent=publicationForm.dataset.excluded;list.append(p);const ul=document.createElement('ul');data.excluded.forEach(path=>{const li=document.createElement('li');li.textContent=path;ul.append(li);});list.append(ul);} + } catch(error){if(seq===generation){clearPublication();result.textContent=error.message;}} + finally{if(seq===generation){fields.disabled=false;accessFields.disabled=false;publicationFields.disabled=false;}} + }; + find('[data-publication-preview]').addEventListener('click',()=>publication('preview')); + find('[data-publication-revoke]').addEventListener('click',()=>publication('revoke')); + publicationForm.addEventListener('submit',event=>{event.preventDefault();if(impact?.eligible)publication('enable');}); + find('[data-auto-preview]').addEventListener('click',async()=>{ + const seq=generation;clearAuto(); + try { + const data=await api(endpoint+'/auto-publication');if(seq!==generation||!dialog.open)return; + autoState=data;autoForm.elements.mode.value=data.mode; + autoForm.elements.mode.querySelector('[value=automatic]').disabled=!data.can_automatic; + find('[data-auto-save]').disabled=false; + const list=document.createElement('ul'); + (data.impact.entries||[]).forEach(entry=>{const li=document.createElement('li');li.textContent=entry.path+' · '+entry.lang;list.append(li);}); + (data.impact.excluded||[]).forEach(path=>{const li=document.createElement('li');li.textContent=publicationForm.dataset.excluded+': '+path;list.append(li);}); + if(!data.preview_complete){const note=document.createElement('p');note.textContent=publicationForm.dataset.error;list.append(note);} + const status=document.createElement('p');status.textContent=publicationForm.dataset[data.active?'enabled':'disabled'];find('[data-auto-impact]').append(status,list); + }catch(error){if(seq===generation)result.textContent=error.message;} + }); + autoForm.addEventListener('submit',async event=>{ + event.preventDefault();if(!autoState)return; + const seq=generation,mode=autoForm.elements.mode.value; + if(mode!=='required'&&!autoForm.elements.confirm.checked){autoForm.elements.confirm.setCustomValidity(autoForm.elements.confirm.parentElement.textContent.trim());autoForm.elements.confirm.reportValidity();return;} + find('[data-auto-save]').disabled=true; + try { + await api(endpoint+'/auto-publication','PATCH',{mode,version:autoState.version,epoch:autoState.epoch,topology_version:autoState.topology_version,confirm:autoForm.elements.confirm.checked,impact_token:autoState.impact.impact_token}); + if(seq!==generation||!dialog.open)return;clearAuto();clearPublication();result.textContent=dialog.dataset.saved; + }catch(error){if(seq===generation){result.textContent=error.message;clearAuto();}} + }); + autoForm.elements.confirm.addEventListener('change',()=>autoForm.elements.confirm.setCustomValidity('')); + autoForm.elements.mode.addEventListener('change',()=>autoForm.elements.confirm.setCustomValidity('')); +}); diff --git a/static/js/city-map.js b/static/js/city-map.js new file mode 100644 index 0000000..3ce3a4c --- /dev/null +++ b/static/js/city-map.js @@ -0,0 +1,344 @@ +(() => { + const graphStyles = document.createElement('link'); graphStyles.rel = 'stylesheet'; graphStyles.href = '/static/css/city-graph.css?v=12'; document.head.append(graphStyles); + const svg = document.querySelector('#city-map'); + if (!svg) return; + const viewport = svg.querySelector('[data-city-viewport]'); + const inspector = document.querySelector('[data-city-inspector]'); + const directory = document.querySelector('[data-city-directory]'); + const empty = document.querySelector('[data-city-empty]'); + const version = document.querySelector('[data-city-version]'); + const ns = 'http://www.w3.org/2000/svg'; + let transform = { x: 24, y: 24, scale: 1 }; + let dragging = null; + let city = null; + let contextMenu = null; + let suppressClick = false; + let cityView = { level:'domain', quartier:null, street:null }; + let fabricToken = 0; + let domainFabricPromise = null; + let domainFabricKey = null; + let generationController = null; + let loadController = null; + let suspended = false; + let navigation = null; + let organizer = null; + const label = key => svg.dataset[key] || key; + const popupMode = new URLSearchParams(location.search).get('popup') === '1'; + if (popupMode) { document.documentElement.classList.add('city-map-popup-mode'); document.body.classList.add('city-map-popup-mode'); } + + const node = (name, attrs = {}, text = '') => { + const el = document.createElementNS(ns, name); + for (const [key, value] of Object.entries(attrs)) el.setAttribute(key, value); + if (text) el.textContent = text; + return el; + }; + const applyTransform = () => viewport.setAttribute('transform', `translate(${transform.x} ${transform.y}) scale(${transform.scale})`); + const svgPoint = (x,y) => new DOMPoint(x,y).matrixTransform(svg.getScreenCTM().inverse()); + const zoom = (factor, cx = svg.viewBox.baseVal.width / 2, cy = svg.viewBox.baseVal.height / 2) => { + const next = Math.max(.35, Math.min(3, transform.scale * factor)); + transform.x = cx - (cx - transform.x) * next / transform.scale; + transform.y = cy - (cy - transform.y) * next / transform.scale; + transform.scale = next; applyTransform(); + }; + const show = (type, item, parent = '') => { + inspector.dataset.cityType=type;inspector.dataset.cityUuid=item.uuid; + inspector.innerHTML = `

    ${escapeHTML(item.title || item.name)}

    Type
    ${type}
    Name
    ${escapeHTML(item.name)}
    Path
    ${escapeHTML(item.path_prefix || '—')}
    ${parent ? `
    Location
    ${escapeHTML(parent)}
    ` : ''}
    State
    ${escapeHTML(item.state)}
    ${item.description || item.summary ? `

    ${escapeHTML(item.description || item.summary)}

    ` : ''}

    Details →

    ${document.querySelector('.city-planner') ? `` : ''}`; + inspector.querySelector('[data-delete-city-node]')?.addEventListener('click', event => deleteNode(event.currentTarget.dataset.cityType, item)); + organizer?.decorateInspector(inspector,type,item); + }; + const showStreet = (street, parent) => { + show('Street', street, parent); + if (!document.querySelector('.city-planner')) return; + const options = city.quartiers.map(q => ``).join(''); + inspector.insertAdjacentHTML('beforeend', `

    Move Street

    `); + inspector.querySelector('[data-street-move]').addEventListener('submit', async event => { event.preventDefault(); const values=Object.fromEntries(new FormData(event.target)); values.sort_key=Number(values.sort_key); const response = await fetch(`/_/api/v1/city/zones/${street.uuid}/move`, {method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(values)}); if (response.ok) await load(); else alert((await response.json()).error); }); + }; + const showSpot = (spot, parent) => { + show('Spot', spot, parent); + // The map already contains these placements; do not fetch/render a second + // unbounded list just to populate the closed utility menu. + const pages = window.PagesWikiCityEstates.uniquePages(spot).slice(0,100); + const canPlan = !!document.querySelector('.city-planner'); + const pageList = pages.length ? `

    Pages

    ` : '

    No Pages

    '; + inspector.insertAdjacentHTML('beforeend', pageList); + const relations = city.relations.filter(relation => relation.source_spot_uuid === spot.uuid); + if (relations.length) inspector.insertAdjacentHTML('beforeend', `

    Relations

      ${relations.map(relation => { const target = city.quartiers.flatMap(q => q.streets.flatMap(s => s.spots)).find(item => item.uuid === relation.target_spot_uuid); return `
    • ${escapeHTML(relation.relation_type)} → ${escapeHTML(target?.title || relation.target_spot_uuid)}${canPlan ? ` ` : ''}
    • `; }).join('')}
    `); + if (canPlan) { + const options = city.quartiers.flatMap(q => q.streets.flatMap(s => s.spots)).filter(item => item.uuid !== spot.uuid).map(item => ``).join(''); + inspector.insertAdjacentHTML('beforeend', `
    SpotGraph
    `); + inspector.querySelector('[data-spot-page]')?.addEventListener('submit', async event => { event.preventDefault(); const response = await fetch(`/_/api/v1/city/spots/${spot.uuid}/pages`, {method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(Object.fromEntries(new FormData(event.target)))}); if (response.ok) await load(); else alert((await response.json()).error); }); + inspector.querySelector('[data-spot-relation]')?.addEventListener('submit', async event => { event.preventDefault(); const response = await fetch(`/_/api/v1/city/spots/${spot.uuid}/relations`, {method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(Object.fromEntries(new FormData(event.target)))}); if (response.ok) await load(); else alert((await response.json()).error); }); + inspector.querySelectorAll('[data-remove-page]').forEach(button => button.addEventListener('click', async () => { const response = await fetch(`/_/api/v1/city/spots/${spot.uuid}/pages`, {method:'DELETE',headers:{'Content-Type':'application/json'},body:JSON.stringify({page_uuid:button.dataset.removePage,edge_type:button.dataset.edge})}); if (response.ok) await load(); else alert((await response.json()).error); })); + inspector.querySelectorAll('[data-remove-relation]').forEach(button => button.addEventListener('click', async () => { const response = await fetch(`/_/api/v1/city/spots/${spot.uuid}/relations`, {method:'DELETE',headers:{'Content-Type':'application/json'},body:JSON.stringify({target_spot_uuid:button.dataset.removeRelation,relation_type:button.dataset.relation})}); if (response.ok) await load(); else alert((await response.json()).error); })); + // Spot relocation is offered by the organizer's modal. The legacy form + // changed the Street without changing its boundary or retaining inference. + } + }; + const enterSpot = (spot, parent) => { + cityView={...cityView,level:'spot',spot:spot.uuid,page:0}; + showSpot(spot,parent);renderScene(); + }; + const escapeHTML = value => String(value || '').replace(/[&<>'"]/g, c => ({'&':'&','<':'<','>':'>',"'":''','"':'"'}[c])); + // Estate placement is computed directly before rendering; no observer-driven + // reflow or redistribution of Spot anchors is needed. + const detailURL = (type, item) => item.detail_href?.startsWith('/v/city/') ? item.detail_href : `/v/city/${{Quartier:'q', Street:'s', Spot:'p'}[type]}/uuid:${encodeURIComponent(item.uuid)}`; + const closeContext = () => { contextMenu?.remove(); contextMenu = null; }; + const deleteNode = async (type, item) => { + const ja = document.documentElement.lang.toLowerCase().startsWith('ja'); + if (!confirm(ja ? `${item.title || item.name} を削除しますか? 下位要素も案内図から削除されます。ドキュメント自体は削除されません。` : `Delete ${item.title || item.name}? Descendants are removed from the map; documents are preserved.`)) return; + const plural = type === 'Spot' ? 'spots' : 'zones'; + const options = {method:'DELETE', headers:{'Content-Type':'application/json'}}; + if (type !== 'Spot') options.body = JSON.stringify({kind:type.toLowerCase()}); + const response = await fetch(`/_/api/v1/city/${plural}/${item.uuid}`, options); + if (!response.ok) { alert((await response.json()).error || 'Delete failed'); return; } + closeContext(); inspector.innerHTML = ''; await load(); + }; + const openContext = (event, type, item) => { + event.preventDefault(); event.stopPropagation(); closeContext(); + const ja = document.documentElement.lang.toLowerCase().startsWith('ja'); + const url = event.target.closest?.('.city-map-page-link')?.getAttribute('href') || detailURL(type, item); + contextMenu = document.createElement('div'); + contextMenu.className = 'city-context-menu'; contextMenu.setAttribute('role', 'menu'); + contextMenu.innerHTML = `${escapeHTML(item.title || item.name)}${ja ? '詳細を開く' : 'Open details'}${ja ? '新しいタブで開く' : 'Open in new tab'}${document.querySelector('.city-planner') ? `` : ''}`; + document.body.append(contextMenu); + organizer?.context(contextMenu,type,item,event); + const rect = contextMenu.getBoundingClientRect(); + contextMenu.style.left = `${Math.max(8, Math.min(event.clientX, innerWidth - rect.width - 8))}px`; + contextMenu.style.top = `${Math.max(8, Math.min(event.clientY, innerHeight - rect.height - 8))}px`; + contextMenu.querySelector('[data-copy-city-link]').addEventListener('click', async () => { try { await navigator.clipboard.writeText(new URL(url, location.href).href); } catch (_) {} closeContext(); }); + contextMenu.querySelector('[data-delete-city]')?.addEventListener('click', () => deleteNode(type, item)); + contextMenu.querySelector('a')?.focus(); + }; + const findCityItem = (type, id) => { + if (!city) return null; + if (type === 'Quartier') return city.quartiers.find(item => item.uuid === id); + if (type === 'Street') return city.quartiers.flatMap(item => item.streets).find(item => item.uuid === id); + if (type === 'Spot') return city.quartiers.flatMap(item => item.streets.flatMap(street => street.spots)).find(item => item.uuid === id); + return null; + }; + + const sceneGroup = (type, item) => node('g', {class:`city-node city-${type.toLowerCase()}-tile`,tabindex:'0',role:'button','data-city-type':type,'data-city-uuid':item.uuid,'aria-label':`${type} ${item.title}`}); + const sceneText = (group, x, y, title, path) => { group.append(node('text',{class:'city-scene-title',x,y},title)); group.append(node('text',{class:'city-scene-path',x,y:y+22},path||'')); }; + // Anchor the name to a road, but keep the text horizontal even on vertical + // or diagonal segments. textPath rotates and clips names on short segments. + const appendStreetLabel = (group, street, roads, mapPoint) => { + if (!roads.length) return; + const road = roads[Math.floor(roads.length / 2)]; + const [x, y] = mapPoint([(road[0] + road[2]) / 2, (road[1] + road[3]) / 2]); + group.append(node('text', { + class: 'city-generated-street-label', x, y: y - 10, 'text-anchor': 'middle' + }, street.title || street.name)); + }; + function updateCityTrail() { + let trail=document.querySelector('[data-city-trail]'); if(!trail){trail=document.createElement('nav');trail.className='city-trail';trail.dataset.cityTrail='';document.querySelector('.city-toolbar').prepend(trail);} + const q=city.quartiers.find(item=>item.uuid===cityView.quartier), s=q?.streets.find(item=>item.uuid===cityView.street),p=s?.spots.find(item=>item.uuid===cityView.spot); + trail.innerHTML=`${q?`›`:''}${s?`›`:''}${cityView.level==='spot'&&p?`›${escapeHTML(p.title)}`:''}`; + trail.querySelector('[data-city-level="domain"]')?.addEventListener('click',()=>{cityView={level:'domain',quartier:null,street:null};renderScene();}); + trail.querySelector('[data-city-level="quartier"]')?.addEventListener('click',()=>{cityView={level:'quartier',quartier:q.uuid,street:null};renderScene();}); + trail.querySelector('[data-city-level="street"]')?.addEventListener('click',()=>{cityView={level:'street',quartier:q.uuid,street:s.uuid};renderScene();}); + const search=document.querySelector('[data-city-locality-search]');if(search){const id=cityView.level==='quartier'?q?.uuid:cityView.level==='street'?s?.uuid:cityView.level==='spot'?p?.uuid:null;search.elements.locality.value=cityView.level;search.elements.locality_id.value=id?'uuid:'+id:'';} + } + const edgeWeight = edge => ({primary:1,path:1,guide:.7,example:.5,attachment:.25,reference:.15,related:.15}[edge]||.35); + const spotWeight = spot => { const pages=new Map();(spot.pages||[]).forEach(page=>pages.set(page.page_uuid,Math.max(pages.get(page.page_uuid)||0,edgeWeight(page.edge_type))));return [...pages.values()].reduce((a,b)=>a+b,0); }; + const streetWeight = street => Math.max(.25,street.spots.reduce((sum,spot)=>sum+spotWeight(spot),0)); + const quartierWeight = quartier => { const pages=new Map();quartier.streets.forEach(street=>street.spots.forEach(spot=>(spot.pages||[]).forEach(page=>pages.set(page.page_uuid,Math.max(pages.get(page.page_uuid)||0,edgeWeight(page.edge_type))))));return Math.max(.5,[...pages.values()].reduce((a,b)=>a+b,0)); }; + function partition(items,rect,weight,output=new Map(),depth=0){if(!items.length)return output;if(items.length===1){output.set(items[0].uuid,rect);return output;}const total=items.reduce((sum,item)=>sum+weight(item),0);let split=1,running=weight(items[0]);for(let i=1;isum+weight(item),0)/total)),vertical=rect.w>=rect.h;if(vertical){const w=rect.w*ratio;partition(first,{x:rect.x,y:rect.y,w,h:rect.h},weight,output,depth+1);partition(second,{x:rect.x+w,y:rect.y,w:rect.w-w,h:rect.h},weight,output,depth+1);}else{const h=rect.h*ratio;partition(first,{x:rect.x,y:rect.y,w:rect.w,h},weight,output,depth+1);partition(second,{x:rect.x,y:rect.y+h,w:rect.w,h:rect.h-h},weight,output,depth+1);}return output;} + const centerOf = points => points.reduce((sum,p)=>[sum[0]+p[0],sum[1]+p[1]],[0,0]).map(value=>value/points.length); + const inside = (point,rect) => point[0]>=rect.x&&point[0]<=rect.x+rect.w&&point[1]>=rect.y&&point[1]<=rect.y+rect.h; + function cityLayout(fabric) { + const totalWeight=city.quartiers.reduce((sum,q)=>sum+quartierWeight(q),0); + const minimum=Math.min(.35,city.quartiers.length*.025),occupancy=Math.min(.92,Math.max(minimum,totalWeight*5/Math.max(1,fabric.buildings.length))),scale=Math.sqrt(occupancy); + const used={x:(fabric.width-fabric.width*scale)/2,y:(fabric.height-fabric.height*scale)/2,w:fabric.width*scale,h:fabric.height*scale}; + const quartiers=partition(city.quartiers,used,quartierWeight),streetRoads=new Map(); + city.quartiers.forEach(q=>{ + const region=quartiers.get(q.uuid),roads=fabric.roads.filter(r=>inside([(r[0]+r[2])/2,(r[1]+r[3])/2],region)).sort((a,b)=>(a[0]+a[2]+a[1]+a[3])-(b[0]+b[2]+b[1]+b[3])); + let cursor=0; + q.streets.forEach((street,index)=>{ + const requested=Math.max(1,Math.ceil(streetWeight(street)*1.5)); + const count=Math.min(requested,Math.max(1,roads.length-cursor-(q.streets.length-index-1))); + streetRoads.set(street.uuid,roads.slice(cursor,cursor+count));cursor+=count; + }); + }); + return {quartiers,streetRoads,occupancy,totalWeight}; + } + async function renderTown(context) { + const token=context.token,status=document.querySelector('[data-city-generator-status]')||document.createElement('span');status.dataset.cityGeneratorStatus='';status.className='city-generator-status';status.textContent=label('generating');if(!status.isConnected)document.querySelector('.city-toolbar').append(status); + try { const fabric=await domainFabricPromise;if(token!==fabricToken)return;const layout=cityLayout(fabric); + if(context.type==='street'||context.type==='spot'){ + const open=spot=>enterSpot(spot,context.quartier.title+' / '+context.street.title); + const estate=context.type==='spot' + ?window.PagesWikiCityEstates.spotScene(context.spot,cityView.page||0,open) + :window.PagesWikiCityEstates.streetScene(context.street,layout.streetRoads.get(context.street.uuid)||[],cityView.page||0,open); + svg.setAttribute('viewBox',[0,0,estate.width,estate.height].join(' '));viewport.append(estate.root); + organizer?.syncSelection();setScenePager(estate);navigation?.refresh();svg.setAttribute('aria-busy','false'); + status.textContent=(document.documentElement.lang.startsWith('ja')?'表示中: ':'Showing: ')+estate.items.length+' / '+estate.total+' '+estate.kind; + return; + } + const source=context.type==='domain'?{x:0,y:0,w:fabric.width,h:fabric.height}:layout.quartiers.get(context.quartier.uuid),width=920,height=context.type==='domain'?600:570,pad=20,sx=(width-pad*2)/source.w,sy=(height-pad*2)/source.h,mapPoint=p=>[pad+(p[0]-source.x)*sx,pad+(p[1]-source.y)*sy],layer=node('g',{class:'city-generated-fabric','aria-hidden':'true'}),visibleRoads=fabric.roads.filter(r=>inside([(r[0]+r[2])/2,(r[1]+r[3])/2],source)),visibleBuildings=fabric.buildings.filter(b=>inside(centerOf(b),source));visibleBuildings.forEach(points=>layer.append(node('polygon',{class:'city-generated-building',points:points.map(mapPoint).map(p=>p.join(',')).join(' ')})));visibleRoads.forEach(r=>{const a=mapPoint([r[0],r[1]]),b=mapPoint([r[2],r[3]]);layer.append(node('line',{class:'city-generated-road-border',x1:a[0],y1:a[1],x2:b[0],y2:b[1]}));});visibleRoads.forEach(r=>{const a=mapPoint([r[0],r[1]]),b=mapPoint([r[2],r[3]]);layer.append(node('line',{class:'city-generated-road',x1:a[0],y1:a[1],x2:b[0],y2:b[1]}));});viewport.append(layer);const overlay=node('g',{class:'city-generated-assignments'}); + if(context.type==='domain'){city.quartiers.forEach(q=>{const rect=layout.quartiers.get(q.uuid),a=mapPoint([rect.x,rect.y]),b=mapPoint([rect.x+rect.w,rect.y+rect.h]),g=sceneGroup('Quartier',q);g.append(node('rect',{class:'city-quartier-boundary',x:a[0],y:a[1],width:b[0]-a[0],height:b[1]-a[1],rx:8}));sceneText(g,a[0]+14,a[1]+28,q.title,`${Math.round(quartierWeight(q)*10)/10} pages`);g.addEventListener('click',()=>{cityView={level:'quartier',quartier:q.uuid,street:null};show('Quartier',q);renderScene();});overlay.append(g);});} + if(context.type==='quartier'){ + context.quartier.streets.forEach((street,streetIndex)=>{ + const roads=layout.streetRoads.get(street.uuid)||[],hue=(streetIndex*67+18)%360,g=sceneGroup('Street',street); + g.style.setProperty('--city-street-color',`hsl(${hue} 68% 58%)`); + roads.forEach((r,i)=>{ + const a=mapPoint([r[0],r[1]]),b=mapPoint([r[2],r[3]]),d=`M ${a[0]} ${a[1]} L ${b[0]} ${b[1]}`; + g.append(node('path',{class:'city-assigned-street',id:`city-street-${street.uuid}-${i}`,d})); + g.append(node('path',{class:'city-generated-street-hit',d})); + }); + appendStreetLabel(g,street,roads,mapPoint); + g.addEventListener('click',()=>{cityView={level:'street',quartier:context.quartier.uuid,street:street.uuid};showStreet(street,context.quartier.title);renderScene();}); + overlay.append(g); + }); + } + viewport.append(overlay);navigation?.refresh();svg.setAttribute('aria-busy','false');status.textContent='gen-city '+fabric.version+' · '+Math.round(layout.totalWeight*10)/10+' weighted pages'; + } catch(error){ + if(token!==fabricToken||suspended||error.name==='AbortError')return; + svg.setAttribute('aria-busy','false'); + status.textContent=label('generationFailed');empty.hidden=false; + empty.querySelector('p').textContent=label('generationFailed'); + empty.querySelector('[data-city-retry]').hidden=false; + console.warn(error); + } + } + function setScenePager(batch) { + const pager=document.querySelector('[data-city-scene-pager]'); + cityView.page=batch.page;pager.hidden=batch.pages<=1; + pager.querySelector('[data-city-scene-page]').textContent=(batch.page+1)+' / '+batch.pages+' · '+batch.total+' '+batch.kind; + pager.querySelector('[data-city-scene-prev]').disabled=batch.page===0; + pager.querySelector('[data-city-scene-next]').disabled=batch.page+1>=batch.pages; + } + function renderScene() { + if(!city)return; + viewport.replaceChildren();updateCityTrail();reset();const token=++fabricToken; + svg.setAttribute('aria-busy','true'); + empty.querySelector('[data-city-retry]').hidden=true; + empty.querySelector('p').textContent=empty.dataset.emptyHelp; + document.querySelector('[data-city-scene-pager]').hidden=true; + const q=city.quartiers.find(item=>item.uuid===cityView.quartier),s=q?.streets.find(item=>item.uuid===cityView.street),spot=s?.spots.find(item=>item.uuid===cityView.spot); + if(cityView.level==='domain'){ + svg.setAttribute('viewBox','0 0 920 600');viewport.append(window.PagesWikiCityEstates.definitions()); + empty.hidden=city.quartiers.length>0;renderTown({type:'domain',token}); + }else if(cityView.level==='quartier'&&q){ + svg.setAttribute('viewBox','0 0 920 570');viewport.append(window.PagesWikiCityEstates.definitions()); + empty.hidden=q.streets.length>0;renderTown({type:'quartier',quartier:q,token}); + }else if(s){ + empty.hidden=true; + renderTown({type:cityView.level==='spot'&&spot?'spot':'street',quartier:q,street:s,spot,token}); + } + } + function render(data) { + city=data; + // A title/membership update must not randomly regenerate the town fabric. + if(domainFabricKey!==data.domain_uuid||!domainFabricPromise){ + generationController?.abort();generationController=new AbortController(); + domainFabricKey=data.domain_uuid; + domainFabricPromise=window.PagesWikiGenCity.generateFabric(data.domain_uuid,240,160,{signal:generationController.signal}); + } + if(cityView.quartier&&!data.quartiers.some(q=>q.uuid===cityView.quartier))cityView={level:'domain',quartier:null,street:null}; + const q=data.quartiers.find(q=>q.uuid===cityView.quartier); + if(cityView.street&&!q?.streets.some(s=>s.uuid===cityView.street))cityView={level:'quartier',quartier:cityView.quartier,street:null}; + if(cityView.level==='spot'&&!q?.streets.find(s=>s.uuid===cityView.street)?.spots.some(s=>s.uuid===cityView.spot))cityView={level:'street',quartier:cityView.quartier,street:cityView.street,page:0}; + version.textContent=`Topology v${data.version}`;renderDirectory(data);populateSelects(data);renderScene();organizer?.refresh(); + const selected=findCityItem(inspector.dataset.cityType,inspector.dataset.cityUuid); + if(selected){if(inspector.dataset.cityType==='Spot')showSpot(selected,'');else if(inspector.dataset.cityType==='Street')showStreet(selected,'');else show('Quartier',selected);} + else{inspector.replaceChildren();delete inspector.dataset.cityUuid;delete inspector.dataset.cityType;} + if(!svg.dataset.requestedLocalityApplied){ + svg.dataset.requestedLocalityApplied='true'; + const params=new URLSearchParams(location.search),type=['spot','street','quartier'].find(kind=>params.has(kind)),id=params.get(type); + const q=data.quartiers.find(q=>type==='quartier'?q.uuid===id:q.streets.some(s=>type==='street'?s.uuid===id:s.spots.some(p=>p.uuid===id))); + const s=q?.streets.find(s=>type==='street'?s.uuid===id:s.spots.some(p=>p.uuid===id)),p=s?.spots.find(p=>p.uuid===id); + if(q){cityView={level:type,quartier:q.uuid,street:s?.uuid||null,spot:p?.uuid||null,page:0};renderScene();if(p)showSpot(p,q.title+' / '+s.title);else if(s)showStreet(s,q.title);else show('Quartier',q);} + } + } + function renderDirectory(data) { + const jump=(type,item)=>``; + directory.innerHTML = `
    ${data.quartiers.map(q => `

    ${jump('quartier',q)}

    ${q.description ? `

    ${escapeHTML(q.description)}

    ` : ''}${q.streets.map(s => `

    ${jump('street',s)}

      ${s.spots.map(p => `
    • ${jump('spot',p)}
    • `).join('')}
    `).join('')}
    `).join('')}
    `; + directory.querySelectorAll('[data-city-jump]').forEach(button=>button.addEventListener('click',()=>{ + const type=button.dataset.cityJump,id=button.dataset.cityId; + const q=data.quartiers.find(q=>q.uuid===id||q.streets.some(s=>s.uuid===id||s.spots.some(p=>p.uuid===id))); + const s=q?.streets.find(s=>s.uuid===id||s.spots.some(p=>p.uuid===id)),p=s?.spots.find(p=>p.uuid===id); + if(!q)return; + cityView={level:type,quartier:q.uuid,street:s?.uuid||null,spot:p?.uuid||null,page:0}; + if(p)showSpot(p,q.title+' / '+s.title);else if(s)showStreet(s,q.title);else show('Quartier',q); + window.PagesWikiCityMenu.close();renderScene(); + })); + } + function populateSelects(data) { + document.querySelectorAll('[data-city-quartier-select]').forEach(select => select.innerHTML = data.quartiers.map(q => ``).join('')); + const streets = data.quartiers.flatMap(q => q.streets.map(s => ({...s, quartier: q.title}))); + document.querySelectorAll('[data-city-street-select]').forEach(select => select.innerHTML = streets.map(s => ``).join('')); + } + function installCityAutoPlan() { + const planner=document.querySelector('.city-planner');if(!planner||document.querySelector('[data-city-autoplan]'))return; + const ja=document.documentElement.lang.startsWith('ja'),panel=document.createElement('details');panel.className='city-autoplan';panel.dataset.cityAutoplan='';panel.innerHTML=`${ja?'URL Pathから都市を自動生成':'Generate City from URL Paths'}

    ${ja?'第1階層をQuartier、第2階層をStreet、第3階層をSpotとしてdry-runします。浅いPageは未定義Spotへ所属します。':'Dry-run: level 1 becomes Quartier, level 2 Street, and level 3 Spot. Shallow Pages use an undefined Spot.'}

    `;planner.before(panel); + const result=panel.querySelector('[data-autoplan-result]'),results=panel.querySelector('[data-autoplan-results]'),apply=panel.querySelector('[data-autoplan-apply]'); + panel.querySelector('[data-autoplan-preview]').addEventListener('click',async()=>{result.textContent='…';const response=await fetch('/_/api/v1/city/autoplan');const data=await response.json();if(!response.ok){result.textContent=data.error||'Failed';return}result.textContent=`${data.count} Pages`;const rows=(data.items||[]).slice(0,300);results.innerHTML=`${rows.map(item=>``).join('')}
    PathQuartierStreetSpot${ja?'処理':'Action'}
    ${escapeHTML(item.path)}${escapeHTML(item.Quartier)}${escapeHTML(item.Street)}${escapeHTML(item.Spot)}${escapeHTML(item.action)}
    ${data.count>rows.length?`

    + ${data.count-rows.length}

    `:''}`;apply.hidden=!data.count;}); + apply.addEventListener('click',async()=>{if(!confirm(ja?'この計画をCityへ適用しますか?':'Apply this plan to the City?'))return;apply.disabled=true;result.textContent='…';const response=await fetch('/_/api/v1/city/autoplan',{method:'POST'}),data=await response.json();apply.disabled=false;if(!response.ok){result.textContent=data.error||'Failed';return}result.textContent=`${data.applied} Pages`;await load();}); + } + function reset() { transform = { x: 0, y: 0, scale: 1 }; applyTransform(); } + async function load() { + loadController?.abort();const controller=new AbortController();loadController=controller; + // Discard old authorized labels before revalidation, including BFCache + // restoration and failed/revoked reloads. Geometry caches contain no names. + ++fabricToken;generationController?.abort();domainFabricPromise=null;city=null;closeContext();viewport.replaceChildren();directory.replaceChildren();inspector.replaceChildren(); + document.querySelector('[data-city-trail]')?.replaceChildren(); + document.querySelector('[data-city-scene-pager]').hidden=true;version.textContent=''; + populateSelects({quartiers:[]}); + try { + const response=await fetch('/_/api/v1/city/map',{cache:'no-store',headers:{Accept:'application/json'},signal:controller.signal}); + if(!response.ok)throw new Error(await response.text()); + const data=await response.json(); + if(loadController===controller&&!suspended)render(data); + } catch(error){if(error.name!=='AbortError')throw error;} + finally {if(loadController===controller)loadController=null;} + } + function goParent(focus=false) { + if(!city||cityView.level==='domain')return; + const preferred=cityView.spot||cityView.street||cityView.quartier; + if(cityView.level==='spot')cityView={level:'street',quartier:cityView.quartier,street:cityView.street,page:0}; + else if(cityView.level==='street')cityView={level:'quartier',quartier:cityView.quartier,street:null}; + else cityView={level:'domain',quartier:null,street:null}; + if(focus)navigation?.requestFocus(preferred);renderScene(); + } + document.querySelectorAll('[data-city-action]').forEach(button => button.addEventListener('click', () => ({'zoom-in': () => zoom(1.25), 'zoom-out': () => zoom(.8), reset}[button.dataset.cityAction] || (() => {}))())); + document.querySelector('[data-city-labels]')?.addEventListener('change', event => svg.classList.toggle('city-labels-off', !event.target.checked)); + svg.addEventListener('wheel', event => { event.preventDefault(); const point=svgPoint(event.clientX,event.clientY);zoom(event.deltaY < 0 ? 1.12 : .89,point.x,point.y); }, { passive: false }); + svg.addEventListener('contextmenu', event => { + const target = event.target.closest?.('[data-city-type]'); + if (!target) return; + const item = findCityItem(target.dataset.cityType, target.dataset.cityUuid); + if (item) openContext(event, target.dataset.cityType, item); + }, true); + svg.addEventListener('pointerdown', event => { + if (event.button !== 0 || event.target.closest?.('a,button')) return; + const p=svgPoint(event.clientX,event.clientY);dragging = { x:p.x, y:p.y, screenX:event.clientX,screenY:event.clientY,tx:transform.x, ty:transform.y, pointerId:event.pointerId, active:false }; + }); + svg.addEventListener('click', event => { if (suppressClick) { event.preventDefault(); event.stopPropagation(); event.cityDragSuppressed=true; suppressClick = false; } }, true); + svg.addEventListener('click', event => { + if(event.cityDragSuppressed||event.defaultPrevented||event.target.closest?.('.city-node,a,button'))return; + goParent(); + }); + svg.addEventListener('pointermove', event => { + if (!dragging) return; + const p=svgPoint(event.clientX,event.clientY),dx=p.x-dragging.x,dy=p.y-dragging.y; + if (!dragging.active && Math.hypot(event.clientX-dragging.screenX,event.clientY-dragging.screenY) < 7) return; + if (!dragging.active) { dragging.active = true; svg.setPointerCapture(dragging.pointerId); svg.classList.add('is-dragging'); } + transform.x = dragging.tx + dx; transform.y = dragging.ty + dy; applyTransform(); + }); + const endDrag = () => { if (dragging?.active) suppressClick = true; dragging = null; svg.classList.remove('is-dragging'); }; + svg.addEventListener('pointerup', endDrag); svg.addEventListener('pointercancel', endDrag); + document.querySelectorAll('[data-city-create]').forEach(form => form.addEventListener('submit', async event => { event.preventDefault(); const values = Object.fromEntries(new FormData(form)); const kind = form.dataset.cityCreate; const endpoint = kind === 'spot' ? 'spots' : 'zones'; const result = document.querySelector('[data-city-plan-result]'); const response = await fetch(`/_/api/v1/city/${endpoint}`, { method: 'POST', headers: {'Content-Type':'application/json','Accept':'application/json'}, body: JSON.stringify(values) }); const body = await response.json(); if (!response.ok) { result.textContent = body.error || 'Failed'; return; } form.reset(); result.textContent = 'Saved'; await load(); })); + document.addEventListener('pointerdown', event => { if (contextMenu && !contextMenu.contains(event.target)) closeContext(); }); + document.addEventListener('keydown', event => { if (event.key === 'Escape') closeContext(); }); + if(popupMode) document.addEventListener('click',event=>{const link=event.target.closest?.('a[href]');if(!link||link.hasAttribute('data-city-level'))return;if(organizer&&(event.ctrlKey||event.metaKey)&&link.closest('#city-map'))return;const href=link.getAttribute('href');if(!href)return;event.preventDefault();event.stopPropagation();window.top.location.href=new URL(href,location.href).href},true); + addEventListener('scroll', closeContext, true); + installCityAutoPlan(); + document.querySelector('[data-city-scene-prev]').addEventListener('click',()=>{cityView.page=Math.max(0,(cityView.page||0)-1);renderScene();}); + document.querySelector('[data-city-scene-next]').addEventListener('click',()=>{cityView.page=(cityView.page||0)+1;renderScene();}); + organizer=window.PagesWikiCityOrganizer?.({svg,getCity:()=>city,reload:load,canPlan:!!document.querySelector('.city-planner'),dismissMenus:()=>{closeContext();window.PagesWikiCityMenu.close();}}); + navigation=window.PagesWikiCityNavigation({svg,parent:()=>goParent(true)}); + empty.querySelector('[data-city-retry]').addEventListener('click',()=>{domainFabricPromise=null;load().catch(error=>{empty.hidden=false;empty.querySelector('p').textContent=error.message;});}); + addEventListener('pagehide',()=>{suspended=true;++fabricToken;loadController?.abort();generationController?.abort();window.PagesWikiGenCity.cancel();domainFabricPromise=null;}); + addEventListener('pageshow',event=>{if(event.persisted){suspended=false;load().catch(error=>{empty.hidden=false;empty.querySelector('p').textContent=error.message;});}}); + load().catch(error => { empty.hidden = false; empty.querySelector('p').textContent = error.message; }); +})(); diff --git a/static/js/city-menu.js b/static/js/city-menu.js new file mode 100644 index 0000000..f296773 --- /dev/null +++ b/static/js/city-menu.js @@ -0,0 +1,17 @@ +(() => { + const dialog=document.querySelector('[data-city-command-menu]');if(!dialog)return; + const select=tab=>{ + if(!dialog.querySelector(`[data-city-menu-panel="${tab}"]`))tab='guide'; + dialog.querySelectorAll('[data-city-menu-panel]').forEach(panel=>panel.hidden=panel.dataset.cityMenuPanel!==tab); + dialog.querySelectorAll('[data-city-menu-tab]').forEach(button=>button.setAttribute('aria-pressed',String(button.dataset.cityMenuTab===tab))); + }; + const open=(tab='guide')=>{select(tab);if(!dialog.open)dialog.showModal();dialog.querySelector(`[data-city-menu-tab="${tab}"]`)?.focus();}; + const close=()=>dialog.close(); + document.querySelector('[data-city-menu-open]').addEventListener('click',()=>open()); + dialog.querySelectorAll('[data-city-menu-close]').forEach(b=>b.addEventListener('click',close)); + dialog.querySelectorAll('[data-city-menu-tab]').forEach(b=>b.addEventListener('click',()=>select(b.dataset.cityMenuTab))); + dialog.addEventListener('click',event=>{if(event.target===dialog)close();}); + dialog.addEventListener('keydown',event=>{if(event.key==='Escape')event.stopPropagation();}); + dialog.querySelector('[data-city-create-kind]')?.addEventListener('change',event=>dialog.querySelectorAll('[data-city-create]').forEach(form=>form.hidden=form.dataset.cityCreate!==event.target.value)); + window.PagesWikiCityMenu={open,close}; +})(); diff --git a/static/js/city-navigation.js b/static/js/city-navigation.js new file mode 100644 index 0000000..e3d1735 --- /dev/null +++ b/static/js/city-navigation.js @@ -0,0 +1,56 @@ +(() => { + 'use strict'; + window.PagesWikiCityNavigation = ({svg, parent}) => { + const selector = '.city-quartier-tile,.city-street-tile,.city-spot-entry[role="button"],.city-estate-more,.city-map-page-link,.city-portal-link'; + const directions = {ArrowLeft:[-1,0], a:[-1,0], h:[-1,0], ArrowRight:[1,0], d:[1,0], l:[1,0], ArrowUp:[0,-1], w:[0,-1], k:[0,-1], ArrowDown:[0,1], s:[0,1], j:[0,1]}; + let focusPending = false, preferred = null; + const blocked = () => !!document.querySelector('dialog[open],.city-context-menu') || [...document.querySelectorAll('[role="dialog"][aria-modal="true"]:not(dialog):not([hidden])')].some(element => element.getClientRects().length && getComputedStyle(element).visibility !== 'hidden'); + const candidates = () => { + const bounds = svg.getBoundingClientRect(); + return [...svg.querySelectorAll(selector)].map(element => ({element, rect: element.getBoundingClientRect()})).filter(({element, rect}) => { + const style = getComputedStyle(element); + return rect.width > 0 && rect.height > 0 && rect.right > bounds.left && rect.left < bounds.right && rect.bottom > bounds.top && rect.top < bounds.bottom && style.display !== 'none' && style.visibility !== 'hidden' && !element.closest('[hidden],[inert]'); + }).map(item => ({...item, x: item.rect.left + item.rect.width/2, y: item.rect.top + item.rect.height/2})); + }; + const focus = item => item?.element.focus({preventScroll:true}); + const refresh = () => { + if (!focusPending || blocked()) return; + const items = candidates(); + const wanted = preferred && items.find(item => item.element.closest('[data-city-uuid]')?.dataset.cityUuid === preferred); + focus(wanted || items.sort((a,b) => a.y-b.y || a.x-b.x)[0]); + if (items.length) { focusPending = false; preferred = null; } + }; + const requestFocus = id => { focusPending = true; preferred = id || null; }; + const keydown = event => { + if (event.defaultPrevented || event.isComposing || event.keyCode === 229 || event.ctrlKey || event.metaKey || event.altKey || blocked()) return; + const target = event.target; + if (target.closest?.('input,textarea,select,[contenteditable]:not([contenteditable="false"]),[role="textbox"]')) return; + if (!svg.contains(target) && target !== document.body && target !== document.documentElement) return; + const direction = directions[event.key] || directions[event.key.toLowerCase()]; + if (event.key === 'Backspace') { + event.preventDefault(); event.stopPropagation(); parent(); return; + } + if (!direction && event.key !== 'Enter' && event.key !== ' ') return; + const items = candidates(); + const current = items.find(item => item.element === document.activeElement || item.element === target); + if (event.key === 'Enter' || event.key === ' ') { + if (!current) return; + event.preventDefault(); event.stopPropagation(); requestFocus(); + if (event.repeat) return; + current.element.dispatchEvent(new MouseEvent('click', {bubbles:true,cancelable:true,view:window})); + return; + } + if (!direction || !items.length) return; + event.preventDefault(); event.stopPropagation(); + if (!current) { focus(items.sort((a,b) => a.y-b.y || a.x-b.x)[0]); return; } + const [vx, vy] = direction; + const next = items.filter(item => item !== current).map(item => { + const dx = item.x-current.x, dy = item.y-current.y, forward = dx*vx+dy*vy, sideways = Math.abs(dx*vy-dy*vx); + return {item, forward, score: Math.hypot(dx,dy)*(1+sideways/Math.max(1,forward))}; + }).filter(item => item.forward > 1).sort((a,b) => a.score-b.score)[0]; + focus(next?.item); + }; + document.addEventListener('keydown', keydown, true); + return {refresh, requestFocus, destroy: () => document.removeEventListener('keydown', keydown, true)}; + }; +})(); diff --git a/static/js/city-node.js b/static/js/city-node.js new file mode 100644 index 0000000..fc9047b --- /dev/null +++ b/static/js/city-node.js @@ -0,0 +1,20 @@ +document.addEventListener('DOMContentLoaded', () => { + const form = document.querySelector('[data-city-path-form]'); + if (!form) return; + form.addEventListener('submit', async (event) => { + event.preventDefault(); + const result = form.querySelector('[data-city-path-result]'); + const type = form.dataset.kind === 'spot' ? 'spots' : 'zones'; + const response = await fetch(`/_/api/v1/city/${type}/${encodeURIComponent(form.dataset.uuid)}`, { + method: 'PATCH', + headers: {'Content-Type': 'application/json'}, + body: JSON.stringify({kind: form.dataset.kind, path_prefix: form.elements.path_prefix.value}), + }); + if (!response.ok) { + const data = await response.json().catch(() => ({})); + result.textContent = data.error || `HTTP ${response.status}`; + return; + } + result.textContent = document.documentElement.lang.startsWith('ja') ? '保存しました' : 'Saved'; + }); +}); diff --git a/static/js/city-organizer.js b/static/js/city-organizer.js new file mode 100644 index 0000000..824a83e --- /dev/null +++ b/static/js/city-organizer.js @@ -0,0 +1,165 @@ +// City-only organization. Document URLs are not renamed by these actions. +window.PagesWikiCityOrganizer = ({svg, getCity, reload, dismissMenus, canPlan}) => { + if (!canPlan) return null; + const ja = document.documentElement.lang.startsWith('ja'); + const words = ja ? { + rename:'表示名を変更', title:'表示名', save:'保存', cancel:'キャンセル', + merge:'既存Spotに統合', create:'新しいSpotにまとめる', move:'別のStreetに移す', clear:'選択を解除', + selected:'件を選択中', target:'統合先Spot', street:'配置先Street', path:'SpotのPath境界', name:'識別名', + advanced:'詳細設定', unchanged:'PageのURL・UUID・内容は変更しません。Spotの入れ子は作りません。', + mergeHelp:'選択したPageをまとめます。選択元のSpot全体を統合した場合、元Spotは地図から除去し、関連リンクを統合先へ引き継ぎます。', + moveHelp:'SpotのUUIDを保ってStreetとPath境界を変更します。既存PageはURLを変えず、明示的な所属として引き継ぎます。', + renameHelp:'地図の表示名だけを変更します。識別名と既存リンクは維持されます。', + empty:'選べる宛先がありません。新しいSpotを作成してください。', busy:'保存中…', failed:'操作に失敗しました。', + city_changed:'地図が更新されています。閉じて地図を更新し、選択内容を確認してから再実行してください。', + city_invalid_selection:'選択が無効です。地図を更新して選択し直してください。', + city_invalid_target:'選択元と異なる有効な宛先を指定してください。', + city_invalid_title:'表示名を1〜160文字で入力してください。', city_name_conflict:'識別名が使用済みです。詳細設定で変更してください。', + city_too_many_pages:'一度に処理できるPage数を超えています。選択を分けてください。', + city_too_many_relations:'関連リンクが多すぎます。選択するSpotを分けてください。', + boundary:'Pathは配置先の配下に指定し、ほかのSpotの境界と重ならないようにしてください。', + forbidden:'この操作にはドメイン管理権限が必要です。', refresh:'地図を更新', hint:'Ctrl / ⌘ + クリックで複数選択' + } : { + rename:'Rename display title', title:'Display title', save:'Save', cancel:'Cancel', + merge:'Merge into Spot', create:'Create Spot from selection', move:'Move to Street', clear:'Clear selection', + selected:'selected', target:'Destination Spot', street:'Destination Street', path:'Spot Path boundary', name:'Identifier', + advanced:'Advanced', unchanged:'Page URLs, UUIDs and content are preserved. Spots cannot contain other Spots.', + mergeHelp:'Combine the selected Pages. Whole source Spots are removed from the map; their relations are transferred to the destination.', + moveHelp:'Keep Spot UUIDs while changing Street and Path boundaries. Existing Pages retain their URLs and are kept as explicit members.', + renameHelp:'Change the map title only. Identifiers and existing links remain unchanged.', + empty:'No destination is available. Create a new Spot instead.', busy:'Saving…', failed:'Operation failed.', + city_changed:'The map changed. Close this dialog, refresh and review the selection before retrying.', + city_invalid_selection:'Invalid selection. Refresh and select again.', city_invalid_target:'Choose a valid destination outside the selection.', + city_invalid_title:'Enter a title of 1–160 characters.', city_name_conflict:'Identifier already exists. Change it in Advanced.', + city_too_many_pages:'Too many Pages for one operation. Split the selection.', + city_too_many_relations:'Too many relations. Select fewer Spots.', + boundary:'The Path must be under the destination and must not overlap another Spot boundary.', + forbidden:'Domain administrator access is required.', refresh:'Refresh map', hint:'Ctrl / ⌘ + click to select multiple items' + }; + const escape = value => String(value ?? '').replace(/[&<>"']/g, c => ({'&':'&','<':'<','>':'>','"':'"',"'":'''}[c])); + const selection = new Map(); + const spots = () => (getCity()?.quartiers || []).flatMap(q => q.streets.flatMap(s => s.spots.map(p => ({...p, street:s, quartier:q})))); + const streets = () => (getCity()?.quartiers || []).flatMap(q => q.streets.map(s => ({...s, quartier:q}))); + const pageKey = (spot, page) => `page:${spot}:${page}`; + const pick = target => { + const page = target.closest?.('.city-map-page-link'); + const spot = target.closest?.('[data-city-type="Spot"]'); + if (!spot) return null; + const item = spots().find(p => p.uuid === spot.dataset.cityUuid); + if (!item) return null; + if (page) return {key:pageKey(item.uuid,page.dataset.pageUuid),spot_uuid:item.uuid,page_uuid:page.dataset.pageUuid,title:page.getAttribute('aria-label')}; + return {key:`spot:${item.uuid}`,spot_uuid:item.uuid,title:item.title || item.name}; + }; + const bar = document.createElement('div'); + bar.className='city-selection-bar'; bar.hidden=true; + bar.innerHTML=``; + svg.closest('.city-canvas-wrap').append(bar); + const button = (container, title, icon, action, attribute) => { + const el=document.createElement('button'); el.type='button';el.title=title;el.setAttribute('aria-label',title); + if(attribute)el.setAttribute(attribute,'');if(container.getAttribute('role')==='menu')el.setAttribute('role','menuitem');el.textContent=icon;el.addEventListener('click',action);container.append(el);return el; + }; + const syncSelection = () => { + bar.hidden=selection.size===0; + bar.querySelector('[data-city-selected-count]').textContent=`${selection.size} ${words.selected}`; + moveButton.disabled=[...selection.values()].some(p=>p.page_uuid); + svg.querySelectorAll('[data-city-type="Spot"]').forEach(el=>el.classList.toggle('city-is-selected',selection.has(`spot:${el.dataset.cityUuid}`))); + svg.querySelectorAll('.city-map-page-link').forEach(el=>el.classList.toggle('city-is-selected',selection.has(pageKey(el.closest('[data-city-uuid]').dataset.cityUuid,el.dataset.pageUuid)))); + }; + const add = item => { + if(item.page_uuid)selection.delete(`spot:${item.spot_uuid}`); + else for(const [key,value] of selection)if(value.spot_uuid===item.spot_uuid)selection.delete(key); + selection.set(item.key,item); + }; + button(bar,words.merge,'↪',()=>organize('merge'),'data-city-merge'); + button(bar,words.create,'+',()=>organize('create'),'data-city-create-selection'); + const moveButton=button(bar,words.move,'⇄',()=>organize('move'),'data-city-move-selection'); + button(bar,words.clear,'×',()=>{selection.clear();syncSelection();},'data-city-clear-selection'); + svg.addEventListener('pointerdown',event=>{if((event.ctrlKey||event.metaKey)&&pick(event.target))event.stopPropagation();},true); + svg.addEventListener('click',event=>{ + if(!(event.ctrlKey||event.metaKey)||event.cityDragSuppressed)return; + const item=pick(event.target);if(!item)return; + event.preventDefault();event.stopImmediatePropagation(); + if(selection.has(item.key))selection.delete(item.key);else if(selection.size<200)add(item); + syncSelection(); + },true); + const errorText = error => words[error.message] || (/Path|boundar/.test(error.message)?words.boundary:error.message || words.failed); + const post = async (url, body) => { + const response=await fetch(url,{method:'POST',headers:{'Content-Type':'application/json','Accept':'application/json'},body:JSON.stringify(body)}); + const data=await response.json().catch(()=>({})); + if(!response.ok)throw new Error(response.status===403||response.status===401?'forbidden':data.error||`HTTP ${response.status}`); + return data; + }; + let dialog=null; + const openDialog = (title, content, submit) => { + dismissMenus();dialog?.close(); + const previous=document.activeElement,el=document.createElement('dialog');dialog=el;el.className='city-organize-dialog'; + el.innerHTML=`

    ${escape(title)}

    ${content}

    ${escape(words.unchanged)}

    `; + document.body.append(el);let busy=false; + el.addEventListener('close',()=>{el.remove();if(dialog===el)dialog=null;if(previous?.isConnected)previous.focus();}); + el.addEventListener('cancel',event=>{if(busy)event.preventDefault();}); + // Stop outer map-popup Escape handlers; native dialog cancellation still runs. + el.addEventListener('keydown',event=>{if(event.key==='Escape')event.stopPropagation();}); + el.querySelector('[data-city-dialog-cancel]').addEventListener('click',()=>el.close()); + el.querySelector('form').addEventListener('submit',async event=>{ + event.preventDefault();if(busy)return;busy=true; + const error=el.querySelector('[data-city-organize-error]'),buttons=el.querySelectorAll('button'); + buttons.forEach(b=>b.disabled=true);error.textContent=words.busy; + try {await submit(new FormData(event.target));selection.clear();syncSelection();await reload();el.close();} + catch(e){error.textContent=errorText(e);} + finally{busy=false;buttons.forEach(b=>b.disabled=false);} + }); + el.showModal();el.querySelector('input,select')?.focus();return el; + }; + const rename = (type, item) => { + const version=getCity().version; + const el=openDialog(words.rename,`

    ${escape(words.renameHelp)}

    `,data=>post(`/_/api/v1/city/${type==='Spot'?'spots':'zones'}/${encodeURIComponent(item.uuid)}/title`,{kind:type.toLowerCase(),title:data.get('title'),base_version:version})); + el.querySelector('input').select(); + }; + const organize = action => { + if(!selection.size)return; + const entries=[...selection.values()],base_version=getCity().version; + const request={action:action==='move'?'move':'merge',base_version,spots:entries.filter(p=>!p.page_uuid).map(p=>p.spot_uuid),pages:entries.filter(p=>p.page_uuid).map(({spot_uuid,page_uuid})=>({spot_uuid,page_uuid}))}; + if(action==='move'&&request.pages.length)return; + const options=streets(),firstSource=spots().find(p=>p.uuid===entries[0].spot_uuid); + const defaultStreet=firstSource?.street.uuid||options[0]?.uuid; + const name=`spot-${crypto.randomUUID().slice(0,8)}`; + const choices=spots().filter(p=>!entries.some(e=>e.spot_uuid===p.uuid)&&!p.name.endsWith('-undefined')&&!p.path_prefix.endsWith('/_undefined')); + let fields=`
      ${entries.map(e=>`
    • ${escape(e.title)}
    • `).join('')}

    ${escape(action==='move'?words.moveHelp:words.mergeHelp)}

    `; + if(action==='merge')fields+=`${choices.length?'':`

    ${escape(words.empty)}

    `}`; + else { + fields+=``; + if(action==='create')fields+=`
    ${escape(words.advanced)}
    `; + if(action==='create'||entries.length===1)fields+=``; + } + const el=openDialog(words[action],fields,data=>{ + if(action==='merge')request.target_spot_uuid=data.get('target'); + else if(action==='create')request.new_spot={street_uuid:data.get('street'),name:data.get('name'),title:data.get('title'),path_prefix:data.get('path')}; + else {request.street_uuid=data.get('street');request.path_prefix=data.get('path')||'';} + return post('/_/api/v1/city/organize',request); + }); + if(action!=='merge'){ + const form=el.querySelector('form'); + const updatePath=()=>{const street=options.find(s=>s.uuid===form.elements.street.value),leaf=action==='create'?form.elements.name.value:firstSource.path_prefix.split('/').pop();if(form.elements.path)form.elements.path.value=street.path_prefix.replace(/\/$/,'')+'/'+leaf;}; + form.elements.street.addEventListener('change',updatePath);form.elements.name?.addEventListener('input',updatePath);updatePath(); + } + }; + return { + syncSelection, + refresh(){const current=spots();for(const [key,item] of selection)if(!current.some(s=>s.uuid===item.spot_uuid&&(!item.page_uuid||s.pages.some(p=>p.page_uuid===item.page_uuid))))selection.delete(key);syncSelection();}, + decorateInspector(container,type,item){ + const heading=container.querySelector('h2');if(heading)button(heading,words.rename,'✎',()=>rename(type,item),'data-city-rename'); + if(heading&&type==='Spot')button(heading,words.move,'⇄',()=>{selection.clear();add({key:`spot:${item.uuid}`,spot_uuid:item.uuid,title:item.title||item.name});syncSelection();organize('move');},'data-city-move-selection'); + }, + context(menu,type,item,event){ + const hit=pick(event.target); + if(!hit?.page_uuid)button(menu,words.rename,words.rename,()=>rename(type,item),'data-city-rename'); + if(type==='Spot'){ + if(hit&&!selection.has(hit.key)){selection.clear();add(hit);syncSelection();} + if(hit?.page_uuid){menu.querySelector('strong').textContent=hit.title;menu.querySelector('[data-delete-city]')?.remove();} + button(menu,words.merge,words.merge,()=>organize('merge'),'data-city-merge'); + button(menu,words.create,words.create,()=>organize('create'),'data-city-create-selection'); + if(![...selection.values()].some(p=>p.page_uuid))button(menu,words.move,words.move,()=>organize('move'),'data-city-move-selection'); + } + } + }; +}; diff --git a/static/js/config-panels.js b/static/js/config-panels.js new file mode 100644 index 0000000..dd14ebe --- /dev/null +++ b/static/js/config-panels.js @@ -0,0 +1,407 @@ +/* Shared configuration navigation and bounded live resource charts. */ +async function configJSON(url, options = {}) { + const response = await fetch(url, {cache: "no-store", ...options}); + const text = await response.text(); + let data; + try { data = JSON.parse(text); } catch (_) { + throw new Error(response.ok ? configMessages.requestFailed : text.trim() || response.statusText); + } + if (!response.ok) throw new Error(data.error || response.statusText); + return data; +} + +async function configAction(button, resultID, work) { + if (button) button.disabled = true; + const result = document.getElementById(resultID); + if (result) result.textContent = ""; + try { await work(); if (result) result.textContent = "✓"; } + catch (error) { if (result) result.textContent = error.message; else alert(error.message); } + finally { if (button) button.disabled = false; } +} + +let activeConfigPanel = ""; +let configPanelController = null; +function setupConfigDialogs() { + for (const button of document.querySelectorAll('[data-config-open]')) { + const dialog = document.getElementById(button.dataset.configOpen); + if (!dialog || button.dataset.configReady) continue; + button.dataset.configReady = '1'; + button.addEventListener('click', () => dialog.showModal()); + for (const close of dialog.querySelectorAll('[data-config-close]')) close.addEventListener('click', () => dialog.close()); + dialog.addEventListener('click', event => { if (event.target === dialog) dialog.close(); }); + } + const promote = (form, title) => { + if (!form || form.dataset.dialogReady) return; + form.dataset.dialogReady = '1'; + const anchor = form.parentElement; + const dialog = document.createElement('dialog'); + dialog.className = 'config-form-dialog'; + const header = document.createElement('header'); + const heading = document.createElement('h2'); heading.textContent = title; + const close = document.createElement('button'); close.type='button'; close.textContent='×'; close.setAttribute('aria-label', configMessages.close || 'Close'); + header.append(heading, close); dialog.append(header, form); document.body.append(dialog); + const trigger = document.createElement('button'); trigger.type='button'; trigger.className='config-icon-button'; trigger.textContent='⚙'; trigger.title=title; trigger.setAttribute('aria-label', title); + anchor?.insertBefore(trigger, anchor.firstChild); trigger.addEventListener('click',()=>dialog.showModal()); close.addEventListener('click',()=>dialog.close()); + }; + promote(document.getElementById('asset-form'), document.querySelector('#panel-assets h1')?.textContent || 'Assets'); + for (const form of document.querySelectorAll('#panel-auth-providers > form, #panel-auth > form')) promote(form, form.querySelector('input[name=action]')?.value || 'Account settings'); +} +document.addEventListener('DOMContentLoaded', setupConfigDialogs); +function toggleSidebar() { + const sidebar = document.getElementById("config-sidebar"); + const closed = sidebar.classList.toggle("collapsed"); + sidebar.closest(".config-layout").classList.toggle("sidebar-collapsed", closed); + sidebar.querySelector(".sidebar-toggle").setAttribute("aria-expanded", String(!closed)); +} +function showConfigPanel(name, updateURL = true) { + if (name === "nav") name = "nav-home"; + if (name === "resources") name = "scheduler"; + const target = document.getElementById("panel-" + name); + if (!target?.classList.contains("config-panel")) return showConfigPanel("home", updateURL); + configPanelController?.abort(); + configPanelController = new AbortController(); + activeConfigPanel = name; + if (name !== 'scheduler') document.getElementById('monitor-settings-dialog')?.close(); + for (const panel of document.querySelectorAll(".config-panel")) panel.classList.toggle("active", panel === target); + for (const group of document.querySelectorAll(".config-nav-group")) group.open = false; + for (const link of document.querySelectorAll(".sidebar-nav a[data-panel]")) { + const active = link.dataset.panel === name; + link.classList.toggle("active", active); + if (active) { link.setAttribute("aria-current", "page"); link.closest("details").open = true; } + else link.removeAttribute("aria-current"); + } + if (updateURL) { + const url = new URL(location.href); + url.searchParams.set("panel", name); + history.replaceState(null, "", url); + } + configResources.activate(name === "scheduler"); + if (["events", "queue", "logs"].includes(name)) loadSchedulerPanel(name, configPanelController.signal); + if (name === "adapters" || name === "adapters-builtin") loadAdapterPanel(); + if (name === "assets") loadAssetPanel(); +} + +function resourceIORates(before, after) { + const unavailable = {read:NaN, write:NaN}; + if (!before?.io?.available || !after?.io?.available || !after.io.process_id || before.io.process_id !== after.io.process_id) return unavailable; + const seconds = (after.time - before.time) / 1000; + const counters = [before.io.read_bytes, before.io.write_bytes, after.io.read_bytes, after.io.write_bytes]; + if (!(seconds > 0) || !counters.every(n => Number.isSafeInteger(n) && n >= 0)) return unavailable; + const read = after.io.read_bytes - before.io.read_bytes, write = after.io.write_bytes - before.io.write_bytes; + if (read < 0 || write < 0) return unavailable; + return {read:read/seconds, write:write/seconds}; +} + +const monitorPreferences = (() => { + const key = 'pageswiki.monitor.display.v1'; + const fields = ['resource-history-hours','resource-stat-interval','resource-graph-interval','resource-live']; + return { + restore() { + try { + const saved = JSON.parse(localStorage.getItem(key) || '{}'); + for (const id of fields) { + const input = document.getElementById(id), value = saved[id]; + if (id === 'resource-live' && typeof value === 'boolean') input.checked = value; + else if (id === 'resource-history-hours' && ['1','24','168'].includes(value)) input.value = value; + else if (id.includes('-interval') && Number.isInteger(value) && value >= 1 && value <= 60) input.value = String(value); + } + const stat = document.getElementById('resource-stat-interval'), graph = document.getElementById('resource-graph-interval'); + graph.value = String(Math.max(Number(stat.value), Number(graph.value))); + } catch (_) { /* Storage can be disabled or hold an older format. */ } + }, + save() { + try { localStorage.setItem(key, JSON.stringify(Object.fromEntries(fields.map(id => { + const input = document.getElementById(id); + return [id, input.type === 'checkbox' ? input.checked : input.type === 'number' ? Number(input.value) : input.value]; + })))); } catch (_) { /* Monitoring still works without storage. */ } + } + }; +})(); + +const configResources = (() => { + const samples = []; + const historySamples = [], liveSamples = []; + let active = false, timer = null, controller = null, generation = 0; + let historyAt = 0, graphAt = 0, historyHours = '', monitorLoaded = false, previousLive = null; + const seconds = (id, fallback) => { + const input = document.getElementById(id); + return input?.checkValidity() && input.value !== '' ? Number(input.value) : fallback; + }; + const statDelay = () => seconds('resource-stat-interval', 1) * 1000; + const graphDelay = () => Math.max(statDelay(), seconds('resource-graph-interval', 5) * 1000); + const point = item => ({ + time:item.timestamp_ms, io:item.io, cpu:parseFloat(item.cpu.load_average), memory:item.memory.heap_bytes, + storage:item.storage.total_bytes ? item.storage.used_bytes / item.storage.total_bytes * 100 : NaN, + queue:Number(item.queue.stats?.queued || 0) + Number(item.queue.active_workers || 0) + }); + function renderGraphs(current, hours) { + liveSamples.push(point(current)); + if (liveSamples.length > 361) liveSamples.splice(0, liveSamples.length - 361); + const cutoff = current.timestamp_ms - Number(hours) * 3600000; + const byTime = new Map([...historySamples, ...liveSamples].filter(item => item.time >= cutoff && item.time <= current.timestamp_ms).map(item => [item.time,item])); + const combined = [...byTime.values()].sort((a,b) => a.time - b.time); + for (let i=0;i { + const result = document.createElementNS(ns, tag); + for (const [key,value] of Object.entries(attrs)) result.setAttribute(key, value); + if (text !== undefined) result.textContent = text; + return result; + }; + function plot(key) { + const svg = document.querySelector('[data-resource-chart="' + key + '"]'); + const series = key === 'io' ? ['read','write'] : [key]; + const values = samples.flatMap(sample => series.map(name => sample[name])).filter(Number.isFinite); + if (!svg) return; + if (!values.length) {svg.replaceChildren();return;} + const high = Math.max(1, ...values) * 1.1; + const first = samples[0].time, last = samples[samples.length - 1].time; + const label = key === 'io' ? formatSchedulerBytes(high) + '/s' : key === "memory" ? formatSchedulerBytes(high) : high.toFixed(key === "cpu" ? 1 : 0); + svg.replaceChildren( + node("line", {x1:48,y1:112,x2:392,y2:112,class:"chart-axis"}), + node("text", {x:1,y:15}, label), node("text", {x:20,y:114}, "0") + ); + for (const name of series) { + const className = 'chart-line' + (key === 'io' ? ' io-' + name : ''); + let points = []; + const flush = () => { + if (!points.length) return; + svg.append(node('polyline', {points:points.map(p=>p.join(',')).join(' '),class:className})); + const end=points.at(-1);svg.append(node('circle',{cx:end[0],cy:end[1],r:2,fill:'currentColor',class:key==='io'?'io-'+name:''})); + points=[]; + }; + for (const sample of samples) { + if (!Number.isFinite(sample[name])) { flush(); continue; } + points.push([48+(sample.time-first)/Math.max(1,last-first)*344,112-sample[name]/high*98]); + } + flush(); + } + } + async function sample() { + if (!active || document.hidden || controller) return; + controller = new AbortController(); + const request = controller, version = generation; + try { + const hours = document.getElementById('resource-history-hours').value; + const fetchHistory = hours !== historyHours || Date.now() - historyAt >= 30000; + const [r, jobs, history, definitions] = await Promise.all([ + configJSON("/_/api/v1/queue/resources", {signal: request.signal}), + configJSON("/_/api/v1/queue/jobs?status=running&limit=100", {signal: request.signal}), + fetchHistory ? configJSON("/_/api/v1/queue/resources/history?hours=" + hours, {signal: request.signal}) : null, + !monitorLoaded ? configJSON("/_/api/v1/event", {signal: request.signal}) : null + ]); + if (!active || version !== generation || request.signal.aborted) return; + const count = r.queue.stats || {}; + const current = point(r), io = resourceIORates(previousLive, current); + previousLive = current; + const rate = value => Number.isFinite(value) ? formatSchedulerBytes(value) + '/s' : '—'; + document.querySelector('[data-resource="io"]').textContent = configMessages.ioRead + ' ' + rate(io.read) + ' · ' + configMessages.ioWrite + ' ' + rate(io.write); + const queued = Number(count.queued || 0), running = Number(count.running || 0); + configJobs.renderRunning(jobs.jobs || []); + if (history) { + historyAt = Date.now(); historyHours = hours; + historySamples.splice(0, historySamples.length, ...(history.samples || []).map(point)); + } + if (history || Date.now() - graphAt >= graphDelay()) { + graphAt = Date.now(); + renderGraphs(r, hours); + } + if (!samples.length) document.querySelectorAll('[data-resource-chart]').forEach(svg => svg.replaceChildren()); + const form = document.getElementById('resource-monitor-form'); + const monitor = definitions?.events.find(item => item.uuid === 'builtin.resource.sample'); + if (monitor && !form.dataset.dirty) { + form.elements.enabled.checked = monitor.enabled; + form.elements.interval.value = monitor.interval_seconds; + } + if (definitions) monitorLoaded = true; + document.getElementById('scheduler-queue-state').textContent = r.queue.paused ? configMessages.paused : ''; + document.querySelector('[data-resource="cpu"]').textContent = (r.cpu.load_average || "—") + " / " + r.cpu.logical_cpus + " CPU"; + document.querySelector('[data-resource="memory"]').textContent = formatSchedulerBytes(r.memory.heap_bytes); + document.querySelector('[data-resource="storage"]').textContent = formatSchedulerBytes(r.storage.used_bytes) + " / " + formatSchedulerBytes(r.storage.total_bytes); + document.querySelector('[data-resource="queue"]').textContent = queued + " " + configMessages.queued + " · " + running + " " + configMessages.running; + document.querySelector('[data-panel-error="resources"]').textContent = ""; + } catch (error) { + if (error.name !== "AbortError") document.querySelector('[data-panel-error="resources"]').textContent = error.message; + } finally { + if (controller === request) controller = null; + if (version === generation && active && !document.hidden && document.getElementById("resource-live").checked) timer = setTimeout(sample, statDelay()); + } + } + function activate(value) { + active = value; + generation++; + clearTimeout(timer); timer = null; + controller?.abort(); + controller = null; + previousLive = null; + if (value && !document.hidden) timer = setTimeout(sample, 0); + } + return {activate, refresh() { historyAt = 0; graphAt = 0; monitorLoaded = false; activate(activeConfigPanel === 'scheduler'); }}; +})(); + +// Job history is paged, not accumulated in the DOM. Log pages are fetched only +// when expanded; all requests are aborted when leaving the panel. +const configJobs = (() => { + let historyVersion = 0; + const esc = value => schedulerEscape(value); + function row(job) { + const duration = job.started_at_ms ? Math.max(0, ((job.finished_at_ms || Date.now()) - job.started_at_ms) / 1000).toFixed(1) + ' s' : '—'; + const action = ['failed','cancelled','skipped'].includes(job.status) ? 'retry' : ['running','queued'].includes(job.status) ? 'cancel' : ''; + const label = job.cancel_requested && job.status === 'running' ? configMessages.cancelRequested : configMessages[job.status] || job.status; + return '' + esc(job.event_type) + ' ' + esc(job.event_key) + + '' + esc(label) + (job.error ? ' ' + esc(job.error) + '' : '') + '' + job.attempts + ' / ' + job.max_attempts + '' + + esc(new Date(job.started_at_ms || job.created_at_ms).toLocaleString()) + '' + duration + '' + + (action ? ' ' : '') + + ''; + } + function renderRunning(jobs) { + const body = document.querySelector('#scheduler-jobs tbody'); + // Preserve expanded logs and keyboard focus while refreshing job values. + const present = new Set(jobs.map(job => job.uuid)); + for (const old of body.querySelectorAll('[data-job-row]')) { + if (!present.has(old.dataset.jobRow)) { if (old.nextElementSibling?.classList.contains('job-log-detail')) old.nextElementSibling.remove(); old.remove(); } + } + body.querySelector('[data-empty]')?.remove(); + for (const job of jobs) { + const old = [...body.querySelectorAll('[data-job-row]')].find(node => node.dataset.jobRow === job.uuid); + if (!old) body.insertAdjacentHTML('beforeend', row(job)); + else { + const fresh = document.createElement('tbody'); fresh.innerHTML = row(job); + for (let i = 0; i < 5; i++) old.cells[i].innerHTML = fresh.rows[0].cells[i].innerHTML; + const cancel = old.querySelector('[data-queue-action="cancel"]'); + if (cancel) cancel.disabled = job.cancel_requested; + } + } + if (!jobs.length) body.innerHTML = '' + esc(configMessages.emptyRunning) + ''; + } + async function loadHistory(cursor = '', signal = configPanelController?.signal) { + const version = ++historyVersion; + const params = new URLSearchParams({status:document.getElementById('job-history-status').value,limit:'50',cursor}); + const data = await configJSON('/_/api/v1/queue/jobs?' + params, {signal}); + if (version !== historyVersion || signal?.aborted || activeConfigPanel !== 'logs') return; + document.querySelector('#job-history tbody').innerHTML = (data.jobs || []).map(row).join('') || '—'; + const more = document.getElementById('job-history-more'); + more.hidden = !data.next_cursor; more.dataset.cursor = data.next_cursor || ''; + } + async function loadLogs(button, older = false) { + const row = button.closest('tr'); + let detail = older ? row : row.nextElementSibling; + const job = older ? detail.dataset.job : button.dataset.jobLogs; + if (!older && detail?.classList.contains('job-log-detail')) { + detail.remove(); button.setAttribute('aria-expanded', 'false'); return; + } + if (!older) { + row.insertAdjacentHTML('afterend', '
    ');
    +            detail = row.nextElementSibling; detail.dataset.job = job;
    +            detail.querySelector('small').textContent = job;
    +            button.setAttribute('aria-expanded', 'true');
    +        }
    +        const pre = detail.querySelector('pre'), more = detail.querySelector('button');
    +        pre.textContent = configMessages.loading; more.disabled = true;
    +        try {
    +            const params = new URLSearchParams({job_uuid:job,limit:'100'});
    +            if (older && more.dataset.before) params.set('before_id',more.dataset.before);
    +            const data = await configJSON('/_/api/v1/event/logs?' + params, {signal:configPanelController?.signal});
    +            if (!detail.isConnected) return;
    +            pre.textContent = data.logs.map(log => new Date(log.created_at_ms).toLocaleString() + ' [' + log.level + '] ' + log.message).join('\n') || '—';
    +            more.hidden = data.logs.length < 100;
    +            more.dataset.before = data.logs.at(-1)?.id || '';
    +            more.textContent = configMessages.olderLogs;
    +        } catch (error) {
    +            if (error.name === 'AbortError') {
    +                const toggle = detail.previousElementSibling?.querySelector('[data-job-logs]');
    +                toggle?.setAttribute('aria-expanded', 'false'); detail.remove();
    +            } else { pre.textContent = error.message; more.hidden = false; more.textContent = configMessages.retry; }
    +        }
    +        finally { more.disabled = false; }
    +    }
    +    document.addEventListener('click', event => {
    +        const logs = event.target.closest('[data-job-logs], [data-older-logs]');
    +        if (logs) loadLogs(logs, logs.hasAttribute('data-older-logs'));
    +        const action = event.target.closest('[data-queue-action]');
    +        if (action) configAction(action, '', async () => {
    +            await configJSON('/_/api/v1/queue/' + action.dataset.queueAction, {method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({uuid:action.dataset.job})});
    +            if (activeConfigPanel === 'logs') await loadHistory();
    +            else configResources.activate(activeConfigPanel === 'scheduler');
    +        });
    +    });
    +    return {loadHistory, renderRunning};
    +})();
    +
    +document.addEventListener("DOMContentLoaded", () => {
    +    monitorPreferences.restore();
    +    const monitorDialog = document.getElementById('monitor-settings-dialog');
    +    const monitorOpen = document.getElementById('monitor-settings-open');
    +    monitorOpen.addEventListener('click', () => {
    +        monitorDialog.showModal(); monitorOpen.setAttribute('aria-expanded', 'true');
    +    });
    +    document.getElementById('monitor-settings-close').addEventListener('click', () => monitorDialog.close());
    +    monitorDialog.addEventListener('click', event => {
    +        if (event.target !== monitorDialog) return;
    +        const bounds = monitorDialog.getBoundingClientRect();
    +        if (event.clientX < bounds.left || event.clientX > bounds.right || event.clientY < bounds.top || event.clientY > bounds.bottom) monitorDialog.close();
    +    });
    +    monitorDialog.addEventListener('close', () => {
    +        monitorOpen.setAttribute('aria-expanded', 'false');
    +        if (activeConfigPanel === 'scheduler') monitorOpen.focus();
    +    });
    +    document.querySelector(".sidebar-nav").addEventListener("click", event => {
    +        const link = event.target.closest("a[data-panel]");
    +        if (!link || event.ctrlKey || event.metaKey || event.shiftKey || event.altKey) return;
    +        event.preventDefault(); showConfigPanel(link.dataset.panel);
    +    });
    +    document.addEventListener("click", event => {
    +        const link = event.target.closest("[data-config-panel]");
    +        if (!link || event.ctrlKey || event.metaKey) return;
    +        event.preventDefault(); showConfigPanel(link.dataset.configPanel);
    +    });
    +    document.getElementById("resource-live").addEventListener("change", () => { monitorPreferences.save(); configResources.activate(activeConfigPanel === "scheduler"); });
    +    const statInterval = document.getElementById('resource-stat-interval');
    +    const graphInterval = document.getElementById('resource-graph-interval');
    +    const updateIntervals = () => {
    +        if (!statInterval.checkValidity() || !graphInterval.checkValidity() || !statInterval.value || !graphInterval.value) return;
    +        if (Number(graphInterval.value) < Number(statInterval.value)) graphInterval.value = statInterval.value;
    +        monitorPreferences.save();
    +        configResources.refresh();
    +    };
    +    statInterval.addEventListener('change', updateIntervals);
    +    graphInterval.addEventListener('change', updateIntervals);
    +    document.getElementById('resource-history-hours').addEventListener('change', () => { monitorPreferences.save(); configResources.refresh(); });
    +    document.getElementById('monitor-refresh').addEventListener('click', () => configResources.refresh());
    +    document.getElementById('job-history-status').addEventListener('change', () => loadSchedulerPanel('logs', configPanelController?.signal));
    +    document.getElementById('job-history-refresh').addEventListener('click', () => loadSchedulerPanel('logs', configPanelController?.signal));
    +    document.getElementById('job-history-more').addEventListener('click', event => configAction(event.currentTarget, '', () => configJobs.loadHistory(event.currentTarget.dataset.cursor)));
    +    const monitorForm = document.getElementById('resource-monitor-form');
    +    monitorForm.addEventListener('input', () => monitorForm.dataset.dirty = 'true');
    +    monitorForm.addEventListener('submit', event => {
    +        event.preventDefault();
    +        configAction(event.submitter, 'resource-monitor-result', async () => {
    +            await configJSON('/_/api/v1/event', {method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({
    +                uuid:'builtin.resource.sample',name:'Resource monitoring',event_type:'resource.sample',event_key:'local',payload:'{}',
    +                schedule_kind:'interval',interval_seconds:Number(monitorForm.elements.interval.value),enabled:monitorForm.elements.enabled.checked,priority:100,max_attempts:1
    +            })});
    +            delete monitorForm.dataset.dirty;
    +        });
    +    });
    +    document.getElementById('resource-monitor-run').addEventListener('click', event => configAction(event.currentTarget,'resource-monitor-result',async () => {
    +        await configJSON('/_/api/v1/event/run',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({uuid:'builtin.resource.sample'})});
    +    }));
    +    document.addEventListener("visibilitychange", () => configResources.activate(activeConfigPanel === "scheduler"));
    +    const schedule = document.querySelector('#event-definition-form [name="schedule_kind"]');
    +    const updateSchedule = () => {
    +        for (const field of document.querySelectorAll("[data-schedule-field]")) field.hidden = field.dataset.scheduleField !== schedule.value;
    +    };
    +    schedule.addEventListener("change", updateSchedule); updateSchedule();
    +    showConfigPanel(new URLSearchParams(location.search).get("panel") || "home");
    +});
    diff --git a/static/js/content-viewer.js b/static/js/content-viewer.js
    new file mode 100644
    index 0000000..4a168bf
    --- /dev/null
    +++ b/static/js/content-viewer.js
    @@ -0,0 +1,1039 @@
    +(() => {
    +    const connection = navigator.connection || {}
    +    const previewConcurrency =
    +        connection.saveData || /(^|-)2g$/.test(connection.effectiveType || "")
    +            ? 1
    +            : 2
    +    const previewQueue = []
    +    const previewControllers = new Set()
    +    let activePreviews = 0
    +    let previewsStopped = false
    +
    +    const scheduleIdle = callback => {
    +        if ("requestIdleCallback" in window) {
    +            window.requestIdleCallback(callback, { timeout: 1200 })
    +        } else {
    +            window.setTimeout(callback, 32)
    +        }
    +    }
    +
    +    const runPreviewQueue = () => {
    +        if (
    +            previewsStopped ||
    +            document.visibilityState === "hidden" ||
    +            activePreviews >= previewConcurrency ||
    +            !previewQueue.length
    +        ) return
    +        const task = previewQueue.shift()
    +        activePreviews++
    +        scheduleIdle(async () => {
    +            try {
    +                if (!previewsStopped) await task()
    +            } finally {
    +                activePreviews--
    +                runPreviewQueue()
    +            }
    +        })
    +        if (activePreviews < previewConcurrency) runPreviewQueue()
    +    }
    +
    +    const enqueuePreview = task => {
    +        if (previewsStopped) return
    +        previewQueue.push(task)
    +        runPreviewQueue()
    +    }
    +
    +    const renderExcalidrawThumbnail = async canvas => {
    +        const controller = new AbortController()
    +        previewControllers.add(controller)
    +        try {
    +            const response = await fetch(canvas.dataset.previewSrc, {
    +                credentials: "same-origin",
    +                cache: "force-cache",
    +                signal: controller.signal,
    +                headers: { "X-PagesWiki-Priority": "background" }
    +            })
    +            if (!response.ok) return
    +            const scene = await response.json()
    +            const elements = (scene.elements || []).filter(element => !element.isDeleted)
    +            if (!elements.length) return
    +            const width = canvas.clientWidth || 160
    +            const height = canvas.clientHeight || 112
    +            const ratio = window.devicePixelRatio || 1
    +            canvas.width = Math.round(width * ratio)
    +            canvas.height = Math.round(height * ratio)
    +            const context = canvas.getContext("2d")
    +            context.scale(ratio, ratio)
    +            const minX = Math.min(...elements.map(element => element.x || 0))
    +            const minY = Math.min(...elements.map(element => element.y || 0))
    +            const maxX = Math.max(...elements.map(element => (element.x || 0) + Math.abs(element.width || 1)))
    +            const maxY = Math.max(...elements.map(element => (element.y || 0) + Math.abs(element.height || 1)))
    +            const scale = Math.min((width - 12) / Math.max(1, maxX - minX), (height - 12) / Math.max(1, maxY - minY))
    +            context.translate(6 - minX * scale, 6 - minY * scale)
    +            context.scale(scale, scale)
    +            context.lineWidth = 1.5 / Math.max(scale, .1)
    +            elements.slice(0, 500).forEach(element => {
    +                const x = element.x || 0
    +                const y = element.y || 0
    +                const w = element.width || 0
    +                const h = element.height || 0
    +                context.strokeStyle = element.strokeColor || "#555"
    +                context.fillStyle = element.backgroundColor && element.backgroundColor !== "transparent"
    +                    ? element.backgroundColor
    +                    : "transparent"
    +                context.beginPath()
    +                if (element.type === "ellipse") {
    +                    context.ellipse(x + w / 2, y + h / 2, Math.abs(w / 2), Math.abs(h / 2), 0, 0, Math.PI * 2)
    +                } else if (element.type === "line" || element.type === "arrow") {
    +                    const points = element.points || [[0, 0], [w, h]]
    +                    points.forEach((point, index) => {
    +                        if (index) context.lineTo(x + point[0], y + point[1])
    +                        else context.moveTo(x + point[0], y + point[1])
    +                    })
    +                } else if (element.type === "text") {
    +                    context.font = `${element.fontSize || 20}px sans-serif`
    +                    context.fillStyle = element.strokeColor || "#555"
    +                    context.fillText((element.text || "").slice(0, 80), x, y + (element.fontSize || 20))
    +                    return
    +                } else {
    +                    context.rect(x, y, w, h)
    +                }
    +                if (context.fillStyle !== "transparent") context.fill()
    +                context.stroke()
    +            })
    +            canvas.closest(".children-preview")
    +                ?.classList.replace("children-preview-pending", "children-preview-ready")
    +        } catch (_) {
    +            // The format icon and EX badge remain as the safe fallback.
    +        } finally {
    +            previewControllers.delete(controller)
    +        }
    +    }
    +
    +    const initializeExcalidrawViewer = viewer => {
    +        if (viewer.dataset.excalidrawInitialized) return
    +        viewer.dataset.excalidrawInitialized = "true"
    +        const canvas = viewer.querySelector("[data-excalidraw-canvas]")
    +        const source = viewer.querySelector("[data-excalidraw-source]")
    +        if (!canvas || !source) return
    +        let scene
    +        try {
    +            scene = JSON.parse(source.value)
    +        } catch (_) {
    +            return
    +        }
    +        const elements = (scene.elements || []).filter(element =>
    +            !element.isDeleted && Number.isFinite(element.x) && Number.isFinite(element.y)
    +        )
    +        const context = canvas.getContext("2d")
    +        if (!context) return
    +        const camera = { x: 0, y: 0, scale: 1 }
    +        let dragging = false
    +        let previousX = 0
    +        let previousY = 0
    +
    +        const elementBounds = element => {
    +            const points = Array.isArray(element.points) ? element.points : []
    +            const width = Math.abs(Number(element.width) || 0)
    +            const height = Math.abs(Number(element.height) || 0)
    +            let minPointX = 0
    +            let minPointY = 0
    +            let maxPointX = width
    +            let maxPointY = height
    +            points.forEach(point => {
    +                const x = Number(point?.[0]) || 0
    +                const y = Number(point?.[1]) || 0
    +                minPointX = Math.min(minPointX, x)
    +                minPointY = Math.min(minPointY, y)
    +                maxPointX = Math.max(maxPointX, x)
    +                maxPointY = Math.max(maxPointY, y)
    +            })
    +            return {
    +                minX: (Number(element.x) || 0) + minPointX,
    +                minY: (Number(element.y) || 0) + minPointY,
    +                maxX: (Number(element.x) || 0) + maxPointX,
    +                maxY: (Number(element.y) || 0) + maxPointY
    +            }
    +        }
    +
    +        const bounds = () => {
    +            if (!elements.length) return { minX: 0, minY: 0, maxX: 1, maxY: 1 }
    +            const boxes = elements.map(elementBounds)
    +            return {
    +                minX: Math.min(...boxes.map(box => box.minX)),
    +                minY: Math.min(...boxes.map(box => box.minY)),
    +                maxX: Math.max(...boxes.map(box => box.maxX)),
    +                maxY: Math.max(...boxes.map(box => box.maxY))
    +            }
    +        }
    +
    +        const drawElement = element => {
    +            const x = Number(element.x) || 0
    +            const y = Number(element.y) || 0
    +            const width = Number(element.width) || 0
    +            const height = Number(element.height) || 0
    +            const stroke = element.strokeColor || "#1b1b1f"
    +            const fill = element.backgroundColor || "transparent"
    +            context.save()
    +            context.globalAlpha = Math.max(0, Math.min(1, Number(element.opacity ?? 100) / 100))
    +            context.strokeStyle = stroke
    +            context.fillStyle = fill
    +            context.lineWidth = Math.max(1, Number(element.strokeWidth) || 1) / camera.scale
    +            context.lineCap = "round"
    +            context.lineJoin = "round"
    +            context.beginPath()
    +            if (element.type === "text") {
    +                const size = Math.max(4, Number(element.fontSize) || 20)
    +                context.fillStyle = stroke
    +                context.font = `${size}px sans-serif`
    +                context.textBaseline = "top"
    +                String(element.text || "").split("\n").slice(0, 200).forEach((line, index) => {
    +                    context.fillText(line, x, y + index * (Number(element.lineHeight) || 1.25) * size)
    +                })
    +                context.restore()
    +                return
    +            }
    +            if (element.type === "ellipse") {
    +                context.ellipse(x + width / 2, y + height / 2, Math.abs(width / 2), Math.abs(height / 2), 0, 0, Math.PI * 2)
    +            } else if (element.type === "diamond") {
    +                context.moveTo(x + width / 2, y)
    +                context.lineTo(x + width, y + height / 2)
    +                context.lineTo(x + width / 2, y + height)
    +                context.lineTo(x, y + height / 2)
    +                context.closePath()
    +            } else if (["line", "arrow", "freedraw"].includes(element.type)) {
    +                const points = Array.isArray(element.points) ? element.points : [[0, 0], [width, height]]
    +                points.forEach((point, index) => {
    +                    const px = x + (Number(point?.[0]) || 0)
    +                    const py = y + (Number(point?.[1]) || 0)
    +                    if (index) context.lineTo(px, py)
    +                    else context.moveTo(px, py)
    +                })
    +            } else {
    +                context.rect(x, y, width, height)
    +            }
    +            if (fill !== "transparent" && !["line", "arrow", "freedraw"].includes(element.type)) context.fill()
    +            context.stroke()
    +            context.restore()
    +        }
    +
    +        const render = () => {
    +            const ratio = window.devicePixelRatio || 1
    +            const width = Math.max(1, canvas.clientWidth)
    +            const height = Math.max(1, canvas.clientHeight)
    +            const pixelWidth = Math.round(width * ratio)
    +            const pixelHeight = Math.round(height * ratio)
    +            if (canvas.width !== pixelWidth || canvas.height !== pixelHeight) {
    +                canvas.width = pixelWidth
    +                canvas.height = pixelHeight
    +            }
    +            context.setTransform(ratio, 0, 0, ratio, 0, 0)
    +            context.clearRect(0, 0, width, height)
    +            context.fillStyle = scene.appState?.viewBackgroundColor || "#ffffff"
    +            context.fillRect(0, 0, width, height)
    +            context.translate(camera.x, camera.y)
    +            context.scale(camera.scale, camera.scale)
    +            elements.forEach(drawElement)
    +        }
    +
    +        const fit = () => {
    +            const box = bounds()
    +            const width = Math.max(1, canvas.clientWidth)
    +            const height = Math.max(1, canvas.clientHeight)
    +            const sceneWidth = Math.max(1, box.maxX - box.minX)
    +            const sceneHeight = Math.max(1, box.maxY - box.minY)
    +            camera.scale = Math.max(.02, Math.min(20, Math.min((width - 48) / sceneWidth, (height - 48) / sceneHeight)))
    +            camera.x = (width - sceneWidth * camera.scale) / 2 - box.minX * camera.scale
    +            camera.y = (height - sceneHeight * camera.scale) / 2 - box.minY * camera.scale
    +            render()
    +        }
    +
    +        canvas.addEventListener("pointerdown", event => {
    +            dragging = true
    +            previousX = event.clientX
    +            previousY = event.clientY
    +            canvas.setPointerCapture(event.pointerId)
    +        })
    +        canvas.addEventListener("pointermove", event => {
    +            if (!dragging) return
    +            camera.x += event.clientX - previousX
    +            camera.y += event.clientY - previousY
    +            previousX = event.clientX
    +            previousY = event.clientY
    +            render()
    +        })
    +        canvas.addEventListener("pointerup", () => { dragging = false })
    +        canvas.addEventListener("pointercancel", () => { dragging = false })
    +        canvas.addEventListener("wheel", event => {
    +            event.preventDefault()
    +            const rect = canvas.getBoundingClientRect()
    +            const x = event.clientX - rect.left
    +            const y = event.clientY - rect.top
    +            const next = Math.max(.02, Math.min(20, camera.scale * Math.exp(-event.deltaY * .0015)))
    +            camera.x = x - (x - camera.x) * next / camera.scale
    +            camera.y = y - (y - camera.y) * next / camera.scale
    +            camera.scale = next
    +            render()
    +        }, { passive: false })
    +        viewer.querySelector("[data-excalidraw-fit]")?.addEventListener("click", fit)
    +        new ResizeObserver(render).observe(canvas)
    +        requestAnimationFrame(fit)
    +    }
    +
    +    const activatePreview = async element => {
    +        if (element.dataset.previewLoaded) return
    +        element.dataset.previewLoaded = "true"
    +        const kind = element.dataset.previewKind
    +        if (kind === "excalidraw") {
    +            await renderExcalidrawThumbnail(element)
    +            return
    +        }
    +        await new Promise(resolve => {
    +            const eventName = kind === "video" ? "loadeddata" : "load"
    +            const done = () => {
    +                window.clearTimeout(timeout)
    +                element.closest(".children-preview")
    +                    ?.classList.replace("children-preview-pending", "children-preview-ready")
    +                resolve()
    +            }
    +            const timeout = window.setTimeout(resolve, 30000)
    +            element.addEventListener(eventName, done, { once: true })
    +            element.addEventListener("error", () => {
    +                window.clearTimeout(timeout)
    +                resolve()
    +            }, { once: true })
    +            if (kind === "image") element.fetchPriority = "low"
    +            element.src = element.dataset.previewSrc
    +            if (kind === "video") element.load()
    +        })
    +    }
    +
    +    const previewObserver = new IntersectionObserver(entries => {
    +        entries.forEach(entry => {
    +            if (!entry.isIntersecting) return
    +            previewObserver.unobserve(entry.target)
    +            // Allow the icon grid and labels to paint before media I/O starts.
    +            requestAnimationFrame(() => requestAnimationFrame(() => {
    +                enqueuePreview(() => activatePreview(entry.target))
    +            }))
    +        })
    +    }, { rootMargin: "250px 0px" })
    +
    +    const pollPreviewCache = async placeholder => {
    +        if (previewsStopped || !placeholder.isConnected) return
    +        const controller = new AbortController()
    +        previewControllers.add(controller)
    +        try {
    +            const response = await fetch(placeholder.dataset.previewCache, {
    +                method: "HEAD",
    +                cache: "no-store",
    +                credentials: "same-origin",
    +                signal: controller.signal,
    +                headers: { "X-PagesWiki-Priority": "background" }
    +            })
    +            if (response.ok) {
    +                const image = document.createElement("img")
    +                image.alt = ""
    +                image.dataset.previewKind = "image"
    +                image.dataset.previewSrc = placeholder.dataset.previewCache
    +                const badge = placeholder.dataset.previewBadge
    +                placeholder.replaceChildren(image)
    +                if (badge) {
    +                    const label = document.createElement("span")
    +                    label.className = "children-preview-badge"
    +                    label.textContent = badge
    +                    placeholder.append(label)
    +                }
    +                placeholder.classList.remove("children-preview-placeholder")
    +                delete placeholder.dataset.previewCache
    +                previewObserver.observe(image)
    +                return
    +            }
    +        } catch (_) {
    +            if (previewsStopped) return
    +        } finally {
    +            previewControllers.delete(controller)
    +        }
    +        const attempts = Number.parseInt(placeholder.dataset.previewAttempts || "0", 10) + 1
    +        placeholder.dataset.previewAttempts = String(attempts)
    +        if (attempts < 24) {
    +            window.setTimeout(() => enqueuePreview(
    +                () => pollPreviewCache(placeholder)
    +            ), Math.min(15000, 2500 + attempts * 500))
    +        }
    +    }
    +
    +    const cacheObserver = new IntersectionObserver(entries => {
    +        entries.forEach(entry => {
    +            if (!entry.isIntersecting) return
    +            cacheObserver.unobserve(entry.target)
    +            enqueuePreview(() => pollPreviewCache(entry.target))
    +        })
    +    }, { rootMargin: "250px 0px" })
    +
    +    document.addEventListener("visibilitychange", () => {
    +        if (document.visibilityState === "visible") runPreviewQueue()
    +    })
    +    window.addEventListener("pagehide", () => {
    +        previewsStopped = true
    +        previewQueue.length = 0
    +        previewControllers.forEach(controller => controller.abort())
    +        document.querySelectorAll("[data-preview-loaded]").forEach(element => {
    +            if ("pause" in element) element.pause()
    +            element.removeAttribute("src")
    +        })
    +    }, { once: true })
    +
    +    const fetchNextChildren = async sentinel => {
    +        if (sentinel.dataset.childrenFetching) return
    +        sentinel.dataset.childrenFetching = "true"
    +        try {
    +            const response = await fetch(sentinel.dataset.childrenNext, {
    +                credentials: "same-origin",
    +                headers: { "X-Requested-With": "PagesWikiChildren" }
    +            })
    +            if (!response.ok) throw new Error(`HTTP ${response.status}`)
    +            const range = document.createRange()
    +            const fragment = range.createContextualFragment(await response.text())
    +            initializeChildren(fragment)
    +            sentinel.replaceWith(fragment)
    +        } catch (error) {
    +            sentinel.dataset.childrenFetching = ""
    +            sentinel.setAttribute("aria-label", error.message)
    +        }
    +    }
    +
    +    const nextObserver = new IntersectionObserver(entries => {
    +        entries.forEach(entry => {
    +            if (!entry.isIntersecting) return
    +            nextObserver.unobserve(entry.target)
    +            fetchNextChildren(entry.target)
    +        })
    +    }, { rootMargin: "800px 0px" })
    +
    +    const initializeChildren = root => {
    +        const previews = []
    +        const sentinels = []
    +        const pendingCaches = []
    +        if (root.matches?.("[data-preview-src]")) previews.push(root)
    +        if (root.matches?.("[data-children-next]")) sentinels.push(root)
    +        if (root.matches?.("[data-preview-cache]")) pendingCaches.push(root)
    +        root.querySelectorAll?.("[data-preview-src]").forEach(item => previews.push(item))
    +        root.querySelectorAll?.("[data-children-next]").forEach(item => sentinels.push(item))
    +        root.querySelectorAll?.("[data-preview-cache]").forEach(item => pendingCaches.push(item))
    +        previews.forEach(preview => previewObserver.observe(preview))
    +        sentinels.forEach(sentinel => nextObserver.observe(sentinel))
    +        pendingCaches.forEach(item => cacheObserver.observe(item))
    +    }
    +
    +    const childrenModeKey = "pageswiki.children.view"
    +    const validChildrenMode = mode =>
    +        mode === "icon" || mode === "detail" || mode === "list"
    +    const currentChildrenMode = () => {
    +        const saved = localStorage.getItem(childrenModeKey)
    +        return validChildrenMode(saved) ? saved : "list"
    +    }
    +    const childrenSource = (container, mode, offset = 0) => {
    +        const query = new URLSearchParams()
    +        query.set("path", container.dataset.childrenPath || location.pathname)
    +        query.set("view", mode)
    +        if (container.dataset.childrenExclude) {
    +            query.set("exclude", container.dataset.childrenExclude)
    +        }
    +        if (offset) query.set("offset", String(offset))
    +        return `/v/children?${query}`
    +    }
    +
    +    const updateChildrenSwitcher = mode => {
    +        const switcher = document.querySelector("[data-children-view-switcher]")
    +        if (!switcher) return
    +        switcher.hidden = !document.querySelector(
    +            "[data-children-src], [data-search-view]"
    +        )
    +        switcher.querySelectorAll("[data-children-view]").forEach(button => {
    +            const active = button.dataset.childrenView === mode
    +            button.classList.toggle("active", active)
    +            button.setAttribute("aria-pressed", String(active))
    +        })
    +    }
    +
    +    const loadChildren = root => {
    +        const containers = []
    +        if (root.matches?.("[data-children-src]")) containers.push(root)
    +        root.querySelectorAll?.("[data-children-src]").forEach(item => containers.push(item))
    +        containers.forEach(async container => {
    +            if (container.dataset.childrenLoading) return
    +            container.dataset.childrenLoading = "true"
    +            const mode = currentChildrenMode()
    +            container.dataset.childrenSrc = childrenSource(container, mode)
    +            updateChildrenSwitcher(mode)
    +            try {
    +                const response = await fetch(container.dataset.childrenSrc, {
    +                    credentials: "same-origin",
    +                    headers: { "X-Requested-With": "PagesWikiChildren" }
    +                })
    +                if (!response.ok) throw new Error(`HTTP ${response.status}`)
    +                container.innerHTML = await response.text()
    +                initializeChildren(container)
    +            } catch (error) {
    +                container.innerHTML = `

    ${error.message}

    ` + } finally { + delete container.dataset.childrenLoading + } + }) + } + + // Dynamic projections such as the Editor preview must be able to start + // loading immediately instead of depending only on MutationObserver timing. + window.PagesWikiLoadChildren = loadChildren + + document.addEventListener("click", event => { + const viewButton = event.target.closest("[data-children-view]") + if (viewButton) { + const mode = viewButton.dataset.childrenView + if (!validChildrenMode(mode)) return + localStorage.setItem(childrenModeKey, mode) + document.querySelectorAll("[data-search-view]").forEach(results => { + results.dataset.searchView = mode + }) + document.querySelectorAll("[data-children-src]").forEach(container => { + container.innerHTML = `
    Loading…
    ` + container.dataset.childrenSrc = childrenSource(container, mode) + }) + updateChildrenSwitcher(mode) + loadChildren(document) + return + } + + const entry = event.target.closest(".children-entry") + if (entry && (event.ctrlKey || event.metaKey)) { + event.preventDefault() + entry.classList.toggle("children-selected") + return + } + const menu = document.querySelector("[data-children-context-menu]") + if (menu && !event.target.closest("[data-children-context-menu]")) { + menu.hidden = true + } + }) + + document.addEventListener("contextmenu", event => { + const entry = event.target.closest(".children-entry") + if (!entry) return + event.preventDefault() + if (!entry.classList.contains("children-selected")) { + document.querySelectorAll(".children-entry.children-selected") + .forEach(item => item.classList.remove("children-selected")) + entry.classList.add("children-selected") + } + const menu = document.querySelector("[data-children-context-menu]") + if (!menu) return + menu.hidden = false + menu.dataset.activePath = entry.dataset.childPath || "" + refreshAdapterActions(menu, menu.dataset.activePath) + const width = menu.offsetWidth + const height = menu.offsetHeight + menu.style.left = `${Math.min(event.clientX, innerWidth - width - 8)}px` + menu.style.top = `${Math.min(event.clientY, innerHeight - height - 8)}px` + }) + + const selectedChildrenPaths = () => { + const paths = Array.from(new Set(Array.from( + document.querySelectorAll(".children-entry.children-selected") + ).map(item => item.dataset.childPath).filter(Boolean))).sort( + (left, right) => left.length - right.length || left.localeCompare(right) + ) + // Moving or deleting a selected directory already includes descendants. + return paths.filter((path, index) => !paths.slice(0, index).some( + parent => path.startsWith(`${parent}/`) + )) + } + + const postJSON = async (url, body) => { + const response = await fetch(url, { + method: "POST", + credentials: "same-origin", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify(body) + }) + if (!response.ok) throw new Error((await response.text()).trim() || `HTTP ${response.status}`) + } + + const pathBasename = path => path.replace(/\/+$/, "").split("/").pop() + const pathDirname = path => { + const clean = path.replace(/\/+$/, "") + return clean.slice(0, clean.lastIndexOf("/")) || "/" + } + const copyBasename = name => { + const dot = name.lastIndexOf(".") + return dot > 0 + ? `${name.slice(0, dot)} (copy)${name.slice(dot)}` + : `${name} (copy)` + } + const joinSemanticPath = (directory, name) => + `${directory === "/" ? "" : directory}/${name}`.replace(/\/+/g, "/") + + const refreshAdapterActions = async (menu, path) => { + const target = menu.querySelector("[data-adapter-actions]") + const group = menu.querySelector("[data-adapter-group]") + if (!target || !group) return + target.replaceChildren() + group.hidden = true + if (!path || selectedChildrenPaths().length !== 1) return + try { + const response = await fetch( + `/_/api/v1/adapter?path=${encodeURIComponent(path)}`, + {credentials: "same-origin", cache: "no-store"} + ) + if (!response.ok) return + const data = await response.json() + for (const action of data.actions || []) { + const link = document.createElement("a") + link.href = action.open_url + link.textContent = action.default ? `★ ${action.name}` : action.name + link.dataset.adapterMode = action.mode + if (action.new_tab) { + link.target = "_blank" + link.rel = "noopener" + } + if (action.mode === "native") link.rel = "external" + target.append(link) + } + group.hidden = !target.children.length + } catch (_) { + group.hidden = true + } + } + + document.querySelector("[data-children-open]")?.addEventListener("click", () => { + const paths = selectedChildrenPaths() + if (paths.length === 1) location.href = paths[0] + }) + + document.querySelector("[data-children-rename]")?.addEventListener("click", async () => { + const menu = document.querySelector("[data-children-context-menu]") + const paths = selectedChildrenPaths() + if (paths.length !== 1) return + const oldPath = paths[0] + const newPath = prompt(menu.dataset.renamePrompt || "New path", oldPath) + if (!newPath || newPath === oldPath) return + try { + await postJSON("/_/api/v1/path/rename", { + old_path: oldPath, new_path: newPath, recursive: true + }) + location.reload() + } catch (error) { + alert(`${menu.dataset.operationFailed || "Operation failed"}: ${error.message}`) + } + }) + + document.querySelector("[data-children-copy]")?.addEventListener("click", () => { + const paths = selectedChildrenPaths() + if (!paths.length) return + localStorage.setItem("pageswiki.fileClipboard", JSON.stringify({ + operation: "copy", paths, created_at: Date.now() + })) + }) + + document.querySelector("[data-children-paste]")?.addEventListener("click", async () => { + const menu = document.querySelector("[data-children-context-menu]") + let clipboard + try { + clipboard = JSON.parse(localStorage.getItem("pageswiki.fileClipboard") || "null") + } catch (_) { + clipboard = null + } + if (!clipboard?.paths?.length) return + const directory = menu.dataset.activePath + ? pathDirname(menu.dataset.activePath) + : (menu.dataset.contextPath || "/") + menu.hidden = true + try { + for (const sourcePath of clipboard.paths) { + const basename = pathBasename(sourcePath) + const destinationName = pathDirname(sourcePath) === directory + ? copyBasename(basename) : basename + await postJSON("/_/api/v1/path/copy", { + source_path: sourcePath, + destination_path: joinSemanticPath(directory, destinationName), + recursive: true + }) + } + location.reload() + } catch (error) { + alert(`${menu.dataset.operationFailed || "Operation failed"}: ${error.message}`) + } + }) + + document.querySelector("[data-children-move]")?.addEventListener("click", async () => { + const menu = document.querySelector("[data-children-context-menu]") + const paths = selectedChildrenPaths() + if (!paths.length) return + const target = prompt(menu.dataset.movePrompt || "Destination directory", "/") + if (!target) return + const directory = `/${target}`.replace(/\/+/g, "/").replace(/\/$/, "") || "/" + const names = paths.map(path => path.slice(path.lastIndexOf("/") + 1)) + if (new Set(names).size !== names.length) { + alert(`${menu.dataset.operationFailed || "Operation failed"}: duplicate destination name`) + return + } + menu.hidden = true + try { + for (const oldPath of paths) { + const basename = oldPath.slice(oldPath.lastIndexOf("/") + 1) + const newPath = directory === "/" ? `/${basename}` : `${directory}/${basename}` + await postJSON("/_/api/v1/path/rename", { + old_path: oldPath, + new_path: newPath, + recursive: true + }) + } + location.reload() + } catch (error) { + alert(`${menu.dataset.operationFailed || "Operation failed"}: ${error.message}`) + } + }) + + document.querySelector("[data-children-delete]")?.addEventListener("click", async () => { + const menu = document.querySelector("[data-children-context-menu]") + const paths = selectedChildrenPaths() + if (!paths.length) return + if (!confirm(menu.dataset.deleteConfirm || "Delete selected paths?")) return + menu.hidden = true + try { + await postJSON("/_/api/v1/path/remove", { + paths, + recursive: true + }) + location.reload() + } catch (error) { + alert(`${menu.dataset.operationFailed || "Operation failed"}: ${error.message}`) + } + }) + + // Server-rendered listings (for example /v/browser) already contain + // preview nodes, so register them before handling async children macros. + initializeChildren(document) + loadChildren(document) + document.querySelectorAll("[data-search-view]").forEach(results => { + results.dataset.searchView = currentChildrenMode() + }) + updateChildrenSwitcher(currentChildrenMode()) + new MutationObserver(records => { + records.forEach(record => { + record.addedNodes.forEach(node => { + if (node.nodeType === Node.ELEMENT_NODE) loadChildren(node) + }) + }) + }).observe(document.documentElement, { childList: true, subtree: true }) + + const formatTime = value => { + if (!Number.isFinite(value)) return "0:00" + const seconds = Math.max(0, Math.floor(value)) + const hours = Math.floor(seconds / 3600) + const minutes = Math.floor((seconds % 3600) / 60) + const rest = String(seconds % 60).padStart(2, "0") + return hours + ? `${hours}:${String(minutes).padStart(2, "0")}:${rest}` + : `${minutes}:${rest}` + } + + document.querySelectorAll("[data-lightbox-open]").forEach(trigger => { + const dialog = trigger.nextElementSibling + if (!dialog || !dialog.matches("[data-lightbox]")) return + trigger.addEventListener("click", () => dialog.showModal()) + dialog.querySelector("[data-lightbox-close]") + ?.addEventListener("click", () => dialog.close()) + dialog.addEventListener("click", event => { + if (event.target === dialog) dialog.close() + }) + }) + + document.querySelectorAll("[data-media-player]").forEach(player => { + const media = player.querySelector("audio, video") + const rate = player.querySelector("[data-playback-rate]") + const time = player.querySelector("[data-media-time]") + if (!media) return + + const updateTime = () => { + if (time) { + time.textContent = + `${formatTime(media.currentTime)} / ${formatTime(media.duration)}` + } + } + media.addEventListener("loadedmetadata", updateTime) + media.addEventListener("timeupdate", updateTime) + rate?.addEventListener("change", () => { + media.playbackRate = Number.parseFloat(rate.value) || 1 + }) + player.querySelector("[data-media-fullscreen]") + ?.addEventListener("click", () => { + if (document.fullscreenElement) { + document.exitFullscreen() + } else { + player.requestFullscreen() + } + }) + const pip = player.querySelector("[data-media-pip]") + if (!document.pictureInPictureEnabled || !media.requestPictureInPicture) { + pip?.remove() + } else { + pip?.addEventListener("click", async () => { + if (document.pictureInPictureElement) { + await document.exitPictureInPicture() + } else { + await media.requestPictureInPicture() + } + }) + } + }) + + const pluginFrames = Array.from(document.querySelectorAll("[data-excalidraw-plugin]")) + const activateExcalidrawFallback = frame => { + if (frame.dataset.excalidrawFallbackActive) return + frame.dataset.excalidrawFallbackActive = "true" + frame.hidden = true + const fallback = frame.closest("[data-excalidraw-plugin-host]") + ?.querySelector("[data-excalidraw-fallback]") + if (!fallback) return + fallback.hidden = false + initializeExcalidrawViewer(fallback) + } + pluginFrames.forEach(frame => { + const timeout = window.setTimeout(() => activateExcalidrawFallback(frame), 15000) + frame.addEventListener("error", () => activateExcalidrawFallback(frame), { once: true }) + const receive = event => { + if (event.origin !== window.location.origin || event.source !== frame.contentWindow || + event.data?.source !== "pageswiki-excalidraw") return + if (event.data.type === "ready") { + window.clearTimeout(timeout) + } else if (event.data.type === "error") { + window.clearTimeout(timeout) + activateExcalidrawFallback(frame) + } + } + window.addEventListener("message", receive) + window.addEventListener("pagehide", () => { + window.clearTimeout(timeout) + window.removeEventListener("message", receive) + }, { once: true }) + }) + document.querySelectorAll("[data-excalidraw-viewer]:not([data-excalidraw-fallback])") + .forEach(initializeExcalidrawViewer) + + const initializeComicViewer = viewer => { + if (viewer.dataset.comicInitialized) return + const pages = Array.from(viewer.querySelectorAll("[data-comic-page]")) + if (!pages.length) return + viewer.dataset.comicInitialized = "true" + const status = viewer.querySelector("[data-comic-status]") + const layoutButton = viewer.querySelector("[data-comic-layout]") + let index = 0 + let spread = false + + const render = () => { + const count = spread ? 2 : 1 + index = Math.max(0, Math.min(index, Math.max(0, pages.length - 1))) + pages.forEach((page, pageIndex) => { + const visible = pageIndex >= index && pageIndex < index + count + page.hidden = !visible + if (visible && !page.src) page.src = page.dataset.src + }) + viewer.dataset.layout = spread ? "spread" : "single" + if (status) { + const end = Math.min(pages.length, index + count) + status.textContent = pages.length ? `${index + 1}–${end} / ${pages.length}` : "0 / 0" + } + } + const move = direction => { + index += direction * (spread ? 2 : 1) + render() + } + viewer.querySelector("[data-comic-prev]") + ?.addEventListener("click", () => move(-1)) + viewer.querySelector("[data-comic-next]") + ?.addEventListener("click", () => move(1)) + layoutButton?.addEventListener("click", () => { + spread = !spread + layoutButton.textContent = spread + ? viewer.dataset.singleLabel || "Single page" + : viewer.dataset.spreadLabel || "Two-page spread" + render() + }) + viewer.querySelector("[data-comic-fit]")?.addEventListener("click", async () => { + if (document.fullscreenElement === viewer) { + await document.exitFullscreen() + } else { + await viewer.requestFullscreen() + } + }) + document.addEventListener("keydown", event => { + if (!viewer.isConnected || event.altKey || event.ctrlKey || event.metaKey) return + if (event.key === "ArrowLeft") { + event.preventDefault() + move(-1) + } else if (event.key === "ArrowRight") { + event.preventDefault() + move(1) + } + }) + render() + } + document.querySelectorAll("[data-comic-viewer]").forEach(initializeComicViewer) + + // These are small, authorization-checked metadata reads. Decoders run only + // in the durable scheduler; polling pauses in hidden tabs and has a budget. + const watchMetadata = (element, ready) => { + const endpoint = element.dataset.metadataUrl + if (!endpoint) return + const status = element.querySelector("[data-projection-status]") || element.previousElementSibling?.querySelector("[data-projection-status]") + const retry = element.querySelector("[data-projection-retry]") || element.previousElementSibling?.querySelector("[data-projection-retry]") + const loadingLabel = element.dataset.loadingLabel || "Loading…" + const failedLabel = element.dataset.failedLabel || "Metadata unavailable" + const unavailableLabel = element.dataset.unavailableLabel || failedLabel + let timer, controller, attempts = 0, stopped = false, complete = false + const load = async () => { + window.clearTimeout(timer) + if (stopped || !element.isConnected) return + if (document.visibilityState === "hidden") { + timer = window.setTimeout(load, 5000) + return + } + attempts++ + if (retry) { retry.hidden = true; retry.disabled = true } + if (status) status.textContent = loadingLabel + controller?.abort() + controller = new AbortController() + const timeout = window.setTimeout(() => controller.abort(), 15000) + try { + const response = await fetch(endpoint, { credentials: "same-origin", cache: "no-store", signal: controller.signal }) + if (!response.headers.get("content-type")?.includes("application/json")) throw new Error(failedLabel) + const data = await response.json() + if (response.status === 202 && data.status === "pending") { + if (attempts >= 60) { + if (retry) { retry.hidden = false; retry.disabled = false } + return + } + const delay = Math.min(10000, Math.max(2000, Number(response.headers.get("Retry-After") || "2") * 1000, attempts * 500)) + timer = window.setTimeout(load, delay) + return + } + if (!response.ok || data.status !== "ready") throw new Error(data.status === "unavailable" ? unavailableLabel : failedLabel) + if (status) status.textContent = "" + ready(data, status) + complete = true + } catch (error) { + if (stopped) return + if (status) status.textContent = error.message === unavailableLabel ? unavailableLabel : failedLabel + if (retry) { retry.hidden = false; retry.disabled = false } + } finally { + window.clearTimeout(timeout) + } + } + retry?.addEventListener("click", () => { attempts = 0; load() }) + window.addEventListener("pagehide", () => { stopped = true; controller?.abort(); window.clearTimeout(timer) }) + window.addEventListener("pageshow", event => { + if (event.persisted && !complete) { stopped = false; attempts = 0; load() } + }) + load() + } + + document.querySelectorAll("[data-archive-metadata]").forEach(viewer => { + if (viewer.dataset.metadataStatus === "ready") return + watchMetadata(viewer, (data, status) => { + const entries = Array.isArray(data.entries) ? data.entries.slice(0, 2000) : [] + const table = viewer.querySelector("[data-archive-entries]") + const comic = viewer.querySelector("[data-comic-viewer]") + const pages = comic?.querySelector("[data-comic-pages]") + const fragment = document.createDocumentFragment() + for (const entry of entries) { + let href + try { + const url = new URL(entry.url || "", location.href) + if (url.origin !== location.origin || url.pathname !== "/v/archive") continue + href = url.href + } catch { continue } + if (table) { + const row = document.createElement("tr"), name = document.createElement("td"), size = document.createElement("td") + if (entry.is_dir) name.textContent = entry.name + else { const link = document.createElement("a"); link.href = href; link.textContent = entry.name; name.append(link) } + size.textContent = String(entry.size ?? 0) + row.append(name, size); fragment.append(row) + } else if (pages && entry.is_image) { + const image = document.createElement("img") + image.dataset.comicPage = ""; image.dataset.src = href; image.alt = entry.name; image.hidden = true + fragment.append(image) + } + } + if (table) table.replaceChildren(fragment) + else if (pages) { pages.replaceChildren(fragment); initializeComicViewer(comic) } + viewer.dataset.metadataStatus = "ready" + if (status) status.textContent = data.truncated ? `${entries.length} · ${viewer.dataset.truncatedLabel || "…"}` : entries.length ? "" : "0" + }) + }) + + document.querySelectorAll("[data-pdf-viewer]").forEach(viewer => { + const image = viewer.querySelector("[data-pdf-image]") + const toolbar = viewer.previousElementSibling + const status = toolbar?.querySelector("[data-pdf-status]") + let total = Number.parseInt(viewer.dataset.pages || "0", 10) + let page = 1 + const render = () => { + image.src = `/v/pdf-page?rev=${encodeURIComponent(viewer.dataset.revision)}&page=${page}` + if (status) status.textContent = `${page} / ${total || "?"}` + viewer.scrollTo({ top: 0, behavior: "instant" }) + } + let retries = 0 + image?.addEventListener("error", () => { + if (retries >= 90) return + retries += 1 + window.setTimeout(render, 1000) + }) + image?.addEventListener("load", () => { retries = 0 }) + const move = direction => { + const next = page + direction + if (next < 1 || (total && next > total)) return + page = next + render() + } + toolbar?.querySelector("[data-pdf-prev]") + ?.addEventListener("click", () => move(-1)) + toolbar?.querySelector("[data-pdf-next]") + ?.addEventListener("click", () => move(1)) + if (!total) watchMetadata(viewer, data => { + total = Math.max(0, Math.min(10000, Number(data.pdf_pages) || 0)) + viewer.dataset.pages = String(total) + if (total && page > total) { page = total; render() } + else if (status) status.textContent = `${page} / ${total || "?"}` + }) + }) + + const escapeJSONText = value => String(value ?? "").replace(/[&<>"']/g, character => ({"&":"&","<":"<",">":">",'"':""","'":"'"}[character])) + document.querySelectorAll("[data-json-viewer]").forEach(viewer => { + const root = viewer.querySelector("[data-json-root]") + const status = viewer.querySelector("[data-json-status]") + const endpoint = viewer.dataset.jsonUrl + if (!root || !endpoint) return + const load = async (container, pointer = "", offset = 0, append = false) => { + const url = new URL(endpoint, location.href) + url.searchParams.set("pointer", pointer);url.searchParams.set("offset", String(offset));url.searchParams.set("limit", "100") + if (!append) container.innerHTML = '
    Loading…
    ' + const response = await fetch(url, {credentials:"same-origin"}) + if (!response.ok) throw new Error(await response.text()) + const page = await response.json() + if (!append) container.innerHTML = "" + for (const item of page.items || []) { + const row = document.createElement("div");row.className = "json-structure-item json-kind-" + item.kind + if (item.expandable) { + row.innerHTML = '' + escapeJSONText(item.key) + '' + escapeJSONText(item.kind) + '' + const button=row.querySelector("button"),children=row.querySelector(".json-structure-children") + button.addEventListener("click",async()=>{const open=button.getAttribute("aria-expanded")==="true";button.setAttribute("aria-expanded",String(!open));button.textContent=open?"▸":"▾";children.hidden=open;if(!open&&!children.dataset.loaded){children.dataset.loaded="true";try{await load(children,item.path)}catch(error){children.textContent=error.message}}}) + } else row.innerHTML = '' + escapeJSONText(item.key) + '' + escapeJSONText(item.preview) + '' + escapeJSONText(item.kind) + '' + container.appendChild(row) + } + if(page.truncated){const more=document.createElement("button");more.type="button";more.className="json-structure-more";more.textContent="Load more";more.addEventListener("click",async()=>{more.remove();await load(container,pointer,page.next_offset,true)});container.appendChild(more)} + if(status)status.textContent=page.kind+(page.truncated?" · bounded":"") + } + load(root).catch(error=>{if(status)status.textContent=error.message}) + }) +})() diff --git a/static/js/editor.js b/static/js/editor.js index 8f085c3..da41c6e 100644 --- a/static/js/editor.js +++ b/static/js/editor.js @@ -29,24 +29,28 @@ window.PagesEditor = { const renderPreview = async () => { + this.previewController?.abort() + const controller = new AbortController() + this.previewController = controller + const sequence = (this.previewSequence || 0) + 1 + this.previewSequence = sequence + const source = editor.value - if ( - editType.value - === - "html" - ) { - - preview.innerHTML = + if (editType.value === "code") { + preview.classList.add("code-preview") + preview.textContent = editor.value return editor.value } + try { const res = await fetch( "/_/api/v1/render/markdown", { method: "POST", + signal: controller.signal, headers: { "Content-Type": @@ -54,34 +58,66 @@ window.PagesEditor = { }, body: JSON.stringify({ - markdown: - editor.value, + ...(editType.value === "html" ? {html: source} : {markdown: source}), + path: window.PagesWikiCurrentPath || location.pathname, + projection: true, }), }, ) + if (controller.signal.aborted || sequence !== this.previewSequence) return if (!res.ok) { + preview.classList.add("code-preview") preview.innerText = - editor.value + source return editor.value } const data = await res.json() + if (controller.signal.aborted || sequence !== this.previewSequence) return + preview.classList.remove("code-preview") preview.innerHTML = data.html + if (window.PagesWikiLoadChildren) { + window.PagesWikiLoadChildren(preview) + } + return data.html + } catch (error) { + if (controller.signal.aborted || sequence !== this.previewSequence) return + preview.classList.add("code-preview") + preview.textContent = source + return source + } } + this.renderPreview = + renderPreview + + document.querySelectorAll('[data-editor-action]').forEach(button => button.addEventListener('click', event => { + event.preventDefault() + switch (button.dataset.editorAction) { + case 'save': this.saveNow(); break + case 'rename': window.PagesPathActions.renameCurrentPath(); break + case 'delete': window.PagesPathActions.removeCurrentPath(); break + case 'html': window.switchEditorFormat('html'); break + case 'markdown': window.switchEditorFormat('markdown'); break + case 'preview': window.toggleEditorPreview(); break + } + })) + editor.addEventListener( "input", async () => { - await renderPreview() + clearTimeout(this.previewTimer) + this.previewController?.abort() + this.previewTimer = setTimeout(renderPreview, 150) clearTimeout( this.autosaveTimer, @@ -138,6 +174,10 @@ window.PagesEditor = { return editor.value } + if (editType.value === "code") { + return editor.value + } + const res = await fetch( "/_/api/v1/render/markdown", @@ -184,6 +224,15 @@ window.PagesEditor = { const canonicalHTML = await this.getCanonicalHTML() + const pageLanguage = + document.getElementById( + "page-language", + ) + const pageContentType = + document.getElementById("page-content-type") + const pageFilename = + document.getElementById("page-filename") + await fetch( "/_/api/v1/revisions/save", { @@ -203,6 +252,21 @@ window.PagesEditor = { message: "autosave", + + lang: + pageLanguage + ? pageLanguage.value + : "und", + + content_type: + pageContentType + ? pageContentType.value + : "", + + filename: + pageFilename + ? pageFilename.value + : "", }), }, ) @@ -226,6 +290,15 @@ window.PagesEditor = { const canonicalHTML = await this.getCanonicalHTML() + const pageLanguage = + document.getElementById( + "page-language", + ) + const pageContentType = + document.getElementById("page-content-type") + const pageFilename = + document.getElementById("page-filename") + const res = await fetch( "/_/api/v1/revisions/save", @@ -246,6 +319,21 @@ window.PagesEditor = { message: "manual-save", + + lang: + pageLanguage + ? pageLanguage.value + : "und", + + content_type: + pageContentType + ? pageContentType.value + : "", + + filename: + pageFilename + ? pageFilename.value + : "", }), }, ) @@ -314,288 +402,5 @@ document.addEventListener( }, ) -async function renderPagesWikiDiagramsInPreview(root) { - - if (!root) { - return - } - - const blocks = - root.querySelectorAll( - "pre code.language-mermaid, pre code.language-plantuml, pre code.language-graphviz, pre code.language-dot, pre code.language-d2" - ) - - for (const code of blocks) { - - const pre = - code.closest("pre") - - if (!pre) { - continue - } - - let diagramType = - Array.from(code.classList) - .find(c => c.startsWith("language-")) - ?.replace("language-", "") - - if (!diagramType) { - continue - } - - if (diagramType === "dot") { - diagramType = "graphviz" - } - - const source = - code.textContent || "" - - const figure = - document.createElement("figure") - - figure.className = - "diagram diagram-" + diagramType - - figure.textContent = - "Rendering " + diagramType + "..." - - pre.replaceWith(figure) - - try { - - const res = - await fetch( - "/:/compile/diagram/" + encodeURIComponent(diagramType), - { - method: "POST", - headers: { - "Content-Type": "text/plain; charset=utf-8", - }, - body: source, - }, - ) - - if (!res.ok) { - figure.textContent = - "Diagram render failed: " + res.status - continue - } - - const svg = - await res.text() - - const blob = - new Blob( - [svg], - { - type: "image/svg+xml", - }, - ) - - const url = - URL.createObjectURL(blob) - - const img = - document.createElement("img") - - img.src = - url - - img.alt = - diagramType + " diagram" - - img.onload = - () => { - URL.revokeObjectURL(url) - } - - figure.textContent = - "" - - figure.appendChild(img) - - } catch (err) { - - figure.textContent = - "Diagram render failed" - } - } -} - -const PagesWikiOldRenderPreview = - window.PagesEditor && - window.PagesEditor.renderPreview - -if (PagesWikiOldRenderPreview) { - - window.PagesEditor.renderPreview = - async function() { - - const ret = - PagesWikiOldRenderPreview.apply( - window.PagesEditor, - arguments, - ) - - await Promise.resolve(ret) - - await renderPagesWikiDiagramsInPreview( - document.getElementById("preview"), - ) - - return ret - } -} - -async function renderPagesWikiDiagramsInPreview(root) { - - if (!root) { - return - } - - const blocks = - root.querySelectorAll( - "pre code.language-mermaid, pre code.language-plantuml, pre code.language-graphviz, pre code.language-dot, pre code.language-d2" - ) - - for (const code of blocks) { - - const pre = - code.closest("pre") - - if (!pre) { - continue - } - - let diagramType = - Array.from(code.classList) - .find(c => c.startsWith("language-")) - ?.replace("language-", "") - - if (!diagramType) { - continue - } - - if (diagramType === "dot") { - diagramType = "graphviz" - } - - const source = - code.textContent || "" - - const figure = - document.createElement("figure") - - figure.className = - "diagram diagram-" + diagramType - - figure.textContent = - "Rendering " + diagramType + "..." - - pre.replaceWith(figure) - - const res = - await fetch( - "/:/compile/diagram/" + encodeURIComponent(diagramType), - { - method: "POST", - headers: { - "Content-Type": "text/plain; charset=utf-8", - }, - body: source, - }, - ) - - if (!res.ok) { - figure.textContent = - "Diagram render failed: " + res.status - continue - } - - const svg = - await res.text() - - const blob = - new Blob( - [svg], - { - type: "image/svg+xml", - }, - ) - - const url = - URL.createObjectURL(blob) - - const img = - document.createElement("img") - - img.src = - url - - img.alt = - diagramType + " diagram" - - img.onload = - () => URL.revokeObjectURL(url) - - figure.textContent = - "" - - figure.appendChild(img) - } -} - -function installPagesWikiDiagramPreviewHook() { - - if ( - !window.PagesEditor || - !window.PagesEditor.renderPreview || - window.PagesEditorDiagramPreviewHookInstalled - ) { - return - } - - window.PagesEditorDiagramPreviewHookInstalled = true - - const original = - window.PagesEditor.renderPreview - - window.PagesEditor.renderPreview = - async function() { - - const ret = - original.apply( - window.PagesEditor, - arguments, - ) - - await Promise.resolve(ret) - - await renderPagesWikiDiagramsInPreview( - document.getElementById("preview"), - ) - - return ret - } -} - -window.addEventListener( - "DOMContentLoaded", - () => { - installPagesWikiDiagramPreviewHook() - - setTimeout( - () => { - installPagesWikiDiagramPreviewHook() - - if ( - window.PagesEditor && - window.PagesEditor.renderPreview - ) { - window.PagesEditor.renderPreview() - } - }, - 100, - ) - }, -) +// HTML/Markdown previews and diagram projections are produced by the common +// server boundary. Do not reinterpret authoring source in a second client pass. diff --git a/static/js/home-appearance.js b/static/js/home-appearance.js new file mode 100644 index 0000000..1860f76 --- /dev/null +++ b/static/js/home-appearance.js @@ -0,0 +1,70 @@ +(() => { + const open = document.querySelector('[data-home-appearance-open]'); + const dialog = document.querySelector('[data-home-appearance-dialog]'); + const form = dialog?.querySelector('[data-home-appearance-form]'); + const input = form?.elements.home_glass_transparency; + const output = form?.querySelector('output'); + const status = form?.querySelector('[data-home-appearance-status]'); + if (!open || !dialog || !form || !input || !output || !status) return; + + let saved = Number(input.value); + const preview = value => { + const transparency = Math.max(0, Math.min(85, Number(value) || 0)); + document.body.style.setProperty('--home-glass-opacity', `${100 - transparency}%`); + output.value = `${transparency}%`; + output.textContent = `${transparency}%`; + }; + const restore = () => { + input.value = String(saved); + preview(saved); + status.textContent = ''; + }; + const close = () => { + restore(); + dialog.close(); + }; + + input.addEventListener('input', () => preview(input.value)); + open.addEventListener('click', () => { + restore(); + dialog.showModal(); + input.focus(); + }); + form.querySelector('[data-home-appearance-close]').addEventListener('click', close); + form.querySelector('[data-home-appearance-cancel]').addEventListener('click', close); + dialog.addEventListener('cancel', event => { + event.preventDefault(); + close(); + }); + dialog.addEventListener('click', event => { + if (event.target !== dialog) return; + const rect = dialog.getBoundingClientRect(); + if (event.clientX < rect.left || event.clientX > rect.right || event.clientY < rect.top || event.clientY > rect.bottom) close(); + }); + dialog.addEventListener('close', () => open.focus()); + form.addEventListener('submit', async event => { + event.preventDefault(); + const submit = form.querySelector('[type=submit]'); + if (submit.disabled) return; + submit.disabled = true; + status.textContent = ''; + try { + const response = await fetch(form.action, { + method: 'POST', + body: new URLSearchParams(new FormData(form)), + headers: {Accept: 'application/json'}, + signal: AbortSignal.timeout(15000), + }); + if (!response.ok) throw new Error((await response.text()).trim()); + await response.json(); + saved = Number(input.value); + preview(saved); + status.textContent = form.dataset.saved; + window.setTimeout(() => dialog.open && dialog.close(), 350); + } catch (error) { + status.textContent = error.message; + } finally { + submit.disabled = false; + } + }); +})(); diff --git a/static/js/home-pages.js b/static/js/home-pages.js new file mode 100644 index 0000000..ef130e1 --- /dev/null +++ b/static/js/home-pages.js @@ -0,0 +1,102 @@ +(() => { + const pager = document.querySelector('[data-home-pager]'); + if (!pager) return; + const search = pager.querySelector('[data-home-pager-page="search"]'); + const bookmarks = pager.querySelector('[data-home-pager-page="bookmarks"]'); + const indicator = document.querySelector('[data-home-page-indicator]'); + const buttons = document.querySelectorAll('[data-home-page-target]'); + const reduced = matchMedia('(prefers-reduced-motion: reduce)'); + let page = 0; + let startY = 0; + let lastY = 0; + let startedAt = 0; + let pointer = null; + let wheel = 0; + let wheelTimer = 0; + + const modalOpen = () => Boolean(document.querySelector('dialog[open]')); + const interactive = target => Boolean(target.closest('a,button,input,select,textarea,summary,[contenteditable="true"],dialog')); + const sync = (focus = false) => { + const name = page ? 'bookmarks' : 'search'; + pager.dataset.homePage = name; + pager.style.setProperty('--home-pager-drag', '0px'); + search.inert = page !== 0; + bookmarks.inert = page !== 1; + search.setAttribute('aria-hidden', String(page !== 0)); + bookmarks.setAttribute('aria-hidden', String(page !== 1)); + buttons.forEach(button => { + if (button.closest('[data-home-page-indicator]')) { + if (button.dataset.homePageTarget === name) button.setAttribute('aria-current', 'page'); + else button.removeAttribute('aria-current'); + } + }); + if (focus) { + const target = page ? bookmarks.querySelector('h1') : search.querySelector('input[type="search"]'); + target?.focus({preventScroll:true}); + } + }; + const show = (name, focus = false) => { + const next = name === 'bookmarks' ? 1 : 0; + if (next === page || modalOpen()) return; + page = next; + sync(focus); + }; + + buttons.forEach(button => button.addEventListener('click', () => show(button.dataset.homePageTarget, true))); + pager.addEventListener('wheel', event => { + if (modalOpen()) return; + if (page === 1 && (event.deltaY > 0 || bookmarks.scrollTop > 0)) return; + if ((page === 0 && event.deltaY <= 0) || (page === 1 && event.deltaY >= 0)) return; + event.preventDefault(); + wheel += event.deltaY; + clearTimeout(wheelTimer); + wheelTimer = setTimeout(() => { wheel = 0; }, 180); + if (Math.abs(wheel) < 40) return; + show(page ? 'search' : 'bookmarks'); + wheel = 0; + }, {passive:false}); + + pager.addEventListener('pointerdown', event => { + if (!event.isPrimary || modalOpen() || interactive(event.target)) return; + if (page === 1 && bookmarks.scrollTop > 0) return; + pointer = event.pointerId; + startY = lastY = event.clientY; + startedAt = performance.now(); + pager.dataset.homeDragging = ''; + pager.setPointerCapture(pointer); + }); + pager.addEventListener('pointermove', event => { + if (event.pointerId !== pointer) return; + lastY = event.clientY; + const delta = lastY - startY; + const allowed = page === 0 ? Math.min(0, delta) : Math.max(0, delta); + pager.style.setProperty('--home-pager-drag', `${allowed * .72}px`); + }); + const finish = event => { + if (event.pointerId !== pointer) return; + const delta = lastY - startY; + const velocity = delta / Math.max(1, performance.now() - startedAt); + const advance = page === 0 && (delta < -72 || velocity < -.55); + const retreat = page === 1 && (delta > 72 || velocity > .55) && bookmarks.scrollTop <= 0; + pointer = null; + delete pager.dataset.homeDragging; + if (advance) show('bookmarks'); + else if (retreat) show('search'); + else pager.style.setProperty('--home-pager-drag', '0px'); + }; + pager.addEventListener('pointerup', finish); + pager.addEventListener('pointercancel', finish); + + addEventListener('keydown', event => { + if (modalOpen() || interactive(event.target)) return; + if ((event.key === 'PageDown' || event.key === 'ArrowDown') && page === 0) { + event.preventDefault(); show('bookmarks', true); + } else if ((event.key === 'PageUp' || event.key === 'ArrowUp') && page === 1 && bookmarks.scrollTop <= 0) { + event.preventDefault(); show('search', true); + } else if (event.key === 'Home' && page === 1) { + event.preventDefault(); show('search', true); + } + }); + reduced.addEventListener?.('change', () => pager.style.setProperty('--home-pager-drag', '0px')); + sync(); +})(); diff --git a/static/js/home-search-suggest.js b/static/js/home-search-suggest.js new file mode 100644 index 0000000..029d93f --- /dev/null +++ b/static/js/home-search-suggest.js @@ -0,0 +1,130 @@ +(() => { + const root = document.querySelector('[data-home-search-suggest]'); + if (!root) return; + const form = root.querySelector('form'); + const input = form.querySelector('input[name="q"]'); + const list = root.querySelector('[role="listbox"]'); + const labels = { + page: root.dataset.pageLabel, + file: root.dataset.fileLabel, + quartier: root.dataset.quartierLabel, + street: root.dataset.streetLabel, + spot: root.dataset.spotLabel, + }; + const cache = new Map(); + let controller; + let timer; + let sequence = 0; + let active = -1; + let candidates = []; + + const rows = () => [...list.querySelectorAll('[role="option"]')]; + const close = () => { + list.hidden = true; + active = -1; + input.setAttribute('aria-expanded', 'false'); + input.removeAttribute('aria-activedescendant'); + }; + const activate = index => { + const options = rows(); + if (!options.length) return; + active = (index + options.length) % options.length; + options.forEach((option, position) => option.setAttribute('aria-selected', String(position === active))); + input.setAttribute('aria-activedescendant', options[active].id); + options[active].scrollIntoView({block:'nearest'}); + }; + const resultHref = query => { + const url = new URL(form.action, location.href); + url.searchParams.set('q', query); + url.searchParams.set('scope', '/'); + return url.pathname + url.search; + }; + const makeRow = (item, index) => { + const link = document.createElement('a'); + link.id = `home-search-option-${index}`; + link.className = 'home-search-suggestion'; + link.href = item.href; + link.role = 'option'; + link.setAttribute('aria-selected', 'false'); + link.dataset.suggestionIndex = String(index); + if (item.exact) link.dataset.exact = 'true'; + const kind = document.createElement('span'); + kind.className = 'home-search-suggestion-kind'; + kind.textContent = labels[item.kind] || item.kind; + const main = document.createElement('span'); + main.className = 'home-search-suggestion-main'; + const title = document.createElement('strong'); + title.textContent = item.label; + const detail = document.createElement('small'); + detail.textContent = [item.context, item.path].filter(Boolean).join(' · '); + main.append(title, detail); + const open = document.createElement('span'); + open.className = 'home-search-suggestion-open'; + open.textContent = item.exact ? root.dataset.directLabel : '↵'; + link.append(kind, main, open); + link.addEventListener('pointerenter', () => activate(index)); + link.addEventListener('click', close); + return link; + }; + const render = (query, data) => { + if (input.value.trim() !== query) return; + candidates = Array.isArray(data.items) ? data.items : []; + const fragment = document.createDocumentFragment(); + candidates.forEach((item, index) => fragment.append(makeRow(item, index))); + const search = makeRow({kind:'search', label:`${root.dataset.allLabel}: “${query}”`, path:'', href:resultHref(query)}, candidates.length); + search.classList.add('home-search-suggestion-search'); + search.querySelector('.home-search-suggestion-kind').textContent = '⌕'; + fragment.append(search); + list.replaceChildren(fragment); + active = -1; + list.hidden = false; + input.setAttribute('aria-expanded', 'true'); + }; + const request = async query => { + if (cache.has(query)) { render(query, cache.get(query)); return; } + controller?.abort(); + controller = new AbortController(); + const current = ++sequence; + try { + const url = new URL(root.dataset.endpoint, location.href); + url.searchParams.set('q', query); + const response = await fetch(url, {headers:{Accept:'application/json'}, credentials:'same-origin', cache:'no-store', signal:controller.signal}); + if (!response.ok) throw new Error(`HTTP ${response.status}`); + const data = await response.json(); + if (current !== sequence) return; + cache.set(query, data); + if (cache.size > 24) cache.delete(cache.keys().next().value); + render(query, data); + } catch (error) { + if (error.name !== 'AbortError' && current === sequence) close(); + } + }; + input.addEventListener('input', () => { + clearTimeout(timer); + controller?.abort(); + candidates = []; + close(); + const query = input.value.trim(); + if ([...query].length < 2) return; + timer = setTimeout(() => request(query), 140); + }); + input.addEventListener('keydown', event => { + if (event.key === 'ArrowDown' && !list.hidden) { event.preventDefault(); activate(active + 1); } + else if (event.key === 'ArrowUp' && !list.hidden) { event.preventDefault(); activate(active < 0 ? rows().length - 1 : active - 1); } + else if (event.key === 'Escape') { event.preventDefault(); close(); } + }); + form.addEventListener('submit', event => { + if (event.ctrlKey || event.metaKey) return; + const options = rows(); + let selected = active >= 0 ? options[active] : null; + if (!selected) { + const exact = candidates.findIndex(item => item.exact); + if (exact >= 0) selected = options[exact]; + } + if (!selected || selected.classList.contains('home-search-suggestion-search')) return; + event.preventDefault(); + location.assign(selected.href); + }); + document.addEventListener('pointerdown', event => { if (!root.contains(event.target)) close(); }); + root.addEventListener('focusout', () => setTimeout(() => { if (!root.contains(document.activeElement)) close(); }, 100)); +})(); diff --git a/static/js/nav-modals.js b/static/js/nav-modals.js new file mode 100644 index 0000000..5e0a5be --- /dev/null +++ b/static/js/nav-modals.js @@ -0,0 +1,83 @@ +(() => { + const ja = document.documentElement.lang.startsWith('ja'); + const t = (a,b) => ja ? a : b; + const city = document.querySelector('[data-city-map-dialog]'); + const cityButton = document.querySelector('[data-city-map-launch]'); + const launch = document.querySelector('[data-calendar-upcoming-launch]'); + const modal = document.querySelector('[data-calendar-upcoming-dialog]'); + const notification = document.querySelector('[data-notification-dialog]'); + const notificationButton = document.querySelector('[data-notification-launch]'); + // Keep the visual/tab order City → Calendar → Notifications → Profile. + if (launch && notificationButton) notificationButton.before(launch); + const bind = (dialog, button, close) => { + if (!dialog || !button) return; + dialog.setAttribute('aria-modal','true'); + button.setAttribute('aria-haspopup','dialog'); + dialog.querySelector(close)?.addEventListener('click',()=>dialog.close()); + dialog.addEventListener('click', e => { + if (e.target !== dialog) return; + const r=dialog.getBoundingClientRect(); + if(e.clientXr.right || e.clientYr.bottom) dialog.close(); + }); + }; + bind(city,cityButton,'[data-city-map-close]'); + if(cityButton && city) cityButton.addEventListener('click',()=>{ + const frame=city.querySelector('iframe'); + if(!frame.getAttribute('src')) frame.src=frame.dataset.src; + if(!city.open) city.showModal(); + }); + if(notification) { + notification.setAttribute('aria-modal','true'); + notification.querySelector('h2').textContent=t('通知','Notifications'); + notification.querySelector('footer a').textContent=t('すべての通知を見る','View all notifications'); + notificationButton?.setAttribute('aria-label',t('通知','Notifications')); + notificationButton?.setAttribute('title',t('通知','Notifications')); + } + bind(modal,launch,'[data-calendar-upcoming-close]'); + if(!launch || !modal) return; + const timezone=modal.dataset.timezone||'UTC'; + const dateFormat=new Intl.DateTimeFormat(ja?'ja-JP':'en-US',{timeZone:timezone,year:'numeric',month:'2-digit',day:'2-digit'}); + const timeFormat=new Intl.DateTimeFormat(ja?'ja-JP':'en-US',{timeZone:timezone,hour:'2-digit',minute:'2-digit',hourCycle:'h23'}); + const fullFormat=new Intl.DateTimeFormat(ja?'ja-JP':'en-US',{timeZone:timezone,dateStyle:'medium',timeStyle:'short'}); + const parts=value=>Object.fromEntries(new Intl.DateTimeFormat('en-CA',{timeZone:timezone,year:'numeric',month:'2-digit',day:'2-digit'}).formatToParts(value).filter(p=>p.type!=='literal').map(p=>[p.type,p.value])); + let pending; + modal.addEventListener('close',()=>pending?.abort()); + launch.addEventListener('click',async()=>{ + if(modal.open) return; + modal.showModal(); + const list=modal.querySelector('[data-calendar-upcoming-list]'); + const status=modal.querySelector('[data-calendar-upcoming-status]'); + list.replaceChildren(); status.textContent=t('読み込み中…','Loading…'); + pending=new AbortController(); + const request=pending; + const date=new Date(),civil=parts(date); + const today=[civil.year,civil.month,civil.day].join('-'); + try { + const r=await fetch('/_/api/v1/extension/organizer.calendar/upcoming?date='+today,{credentials:'same-origin',headers:{Accept:'application/json'},signal:request.signal,cache:'no-store'}); + if(!r.ok) throw Error('unavailable'); + const data=await r.json(); + if(request.signal.aborted) return; + status.textContent=data.events.length?'':t('この期間の予定はありません。','No events in this period.'); + const fragment=document.createDocumentFragment(); + for(const event of data.events) { + const a=document.createElement('a'); a.className='calendar-upcoming-item'; a.href=event.href; + const day=document.createElement('time');day.className='calendar-upcoming-date'; + const start=document.createElement('time');start.className='calendar-upcoming-time'; + const title=document.createElement('strong');title.textContent=event.summary||t('無題','Untitled'); + if(event.all_day) { + const end=new Date(Date.parse(event.end)-86400000).toISOString().slice(0,10); + day.textContent=event.start.slice(0,10).replaceAll('-','/'); + start.textContent=t('終日','All day'); + a.title=event.calendar+' · '+event.start.slice(0,10)+(end===event.start.slice(0,10)?'':' – '+end); + } else { + const begins=new Date(event.start),ends=new Date(event.end); + day.textContent=dateFormat.format(begins); + start.textContent=timeFormat.format(begins); + a.title=event.calendar+' · '+fullFormat.format(begins)+' – '+fullFormat.format(ends); + } + a.append(day,start,title);fragment.append(a); + } + list.append(fragment); + } catch(e) { if(!request.signal.aborted) status.textContent=t('予定を取得できませんでした。','Events unavailable.'); } + }); +})(); diff --git a/static/js/notifications-worker.js b/static/js/notifications-worker.js new file mode 100644 index 0000000..f4b24ef --- /dev/null +++ b/static/js/notifications-worker.js @@ -0,0 +1,9 @@ +/* Notification-only worker: no fetch handler or application cache. */ +'use strict'; +self.addEventListener('install',event=>event.waitUntil(self.skipWaiting())); +self.addEventListener('push',event=>event.waitUntil((async()=>{ + let data;try{data=event.data.json();}catch{return;}if(!data||!/^[0-9a-f-]{36}$/.test(data.uuid||''))return; + const clients=await self.clients.matchAll({type:'window',includeUncontrolled:true});clients.forEach(client=>client.postMessage({type:'pageswiki-notification'})); + const ja=(self.navigator.language||'').startsWith('ja');await self.registration.showNotification(ja?'PagesWiki: 新着通知':'PagesWiki: new notification',{body:ja?'Inboxで確認できます。':'Open your Inbox to read it.',tag:'pageswiki-inbox',data:{url:'/v/notification?uuid='+encodeURIComponent(data.uuid)}}); +})())); +self.addEventListener('notificationclick',event=>{event.notification.close();event.waitUntil((async()=>{const u=new URL(event.notification.data?.url||'/v/notification',self.location.origin);if(u.origin!==self.location.origin||u.pathname!=='/v/notification')return;const clients=await self.clients.matchAll({type:'window',includeUncontrolled:true}),existing=clients.find(c=>new URL(c.url).pathname==='/v/notification');if(existing){await existing.navigate(u.href);await existing.focus();}else await self.clients.openWindow(u.href);})());}); diff --git a/static/js/notifications.js b/static/js/notifications.js new file mode 100644 index 0000000..11aecdd --- /dev/null +++ b/static/js/notifications.js @@ -0,0 +1,49 @@ +(() => { + 'use strict'; + if(window.pageswikiNotificationsInitialized)return;window.pageswikiNotificationsInitialized=true; + const api='/_/api/v1/notifications',ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en; + const el=(tag,text,cls)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;if(cls)n.className=cls;return n;}; + const request=async(url=api+'?limit=30',options={})=>{const r=await fetch(url,{credentials:'same-origin',signal:AbortSignal.timeout(10000),...options,headers:{Accept:'application/json','Content-Type':'application/json',...options.headers}});if(!r.ok||r.redirected)throw Error(t('Notification request failed.','通知の処理に失敗しました。'));return r.json();}; + const href=item=>{try{const u=new URL(item.href||'/v/notification?uuid='+encodeURIComponent(item.uuid),location.origin);return u.origin===location.origin?u.href:'/v/notification';}catch{return '/v/notification';}}; + function render(root,items){root.replaceChildren(...items.map(item=>{const a=el('a',undefined,'notification-item'+(item.status==='unread'?' unread':''));a.href=href(item);a.append(el('strong',item.message||t('Notification','通知')),el('time',new Date(Number(item.created_at_ms)).toLocaleString()));return a;}));if(!items.length)root.append(el('p',t('No notifications.','通知はありません。'),'muted'));} + document.addEventListener('DOMContentLoaded',()=>{ + const launch=document.querySelector('[data-notification-launch]'),dialog=document.querySelector('[data-notification-dialog]'),badge=document.querySelector('[data-notification-badge]'),dialogRoot=dialog?.querySelector('[data-notifications-list]'),pageRoot=document.querySelector('.notifications-page [data-notifications-list]');if(!dialogRoot&&!pageRoot)return; + const owner=dialog?.dataset.owner,key='pageswiki.notifications.v1:'+location.host+':'+(dialog?.dataset.domain||'')+':'+owner; + const read=(suffix,fallback)=>{try{return JSON.parse(localStorage.getItem(key+suffix))??fallback;}catch{return fallback;}},write=(suffix,value)=>{try{localStorage.setItem(key+suffix,JSON.stringify(value));}catch{}}; + const defaults={toast:true,browser:false,auto:false,sound:'none',volume:30};let prefs={...defaults,...read('.settings',{})}; + let previousVisit=Number(read('.visit',0)),lastServerTime=0,first=true,pending=false,autoPending=false,registration=null,subscription=null,pushReady=false,audio=null,seenIDs=[];const tabID=crypto.randomUUID(); + const settings=el('details',undefined,'notification-settings');settings.append(el('summary','⚙ '+t('Notification settings','通知設定')));const panel=el('div');settings.append(panel);dialog?.querySelector('footer')?.before(settings);const settingStatus=el('p');settingStatus.role='status';const controls={}; + function toggle(name,label){const l=el('label'),i=el('input');i.type='checkbox';i.checked=!!prefs[name];controls[name]=i;l.append(i,el('span',label));panel.append(l);i.onchange=()=>{prefs[name]=i.checked;write('.settings',prefs);};return i;} + toggle('toast',t('Quiet toast while focused','操作中は右下に一時通知'));toggle('auto',t('Open Inbox on return if new notifications exist','再訪時に新着があればInboxを自動表示'));const browserToggle=toggle('browser',t('Background notifications (Web Push)','バックグラウンド通知(Web Push)')); + const soundLabel=el('label',t('Sound','通知音')),sound=el('select');sound.ariaLabel=t('Sound','通知音');[['none',t('Off','なし')],['soft',t('Soft','ソフト')],['chime',t('Chime','チャイム')],['bell',t('Bell','ベル')]].forEach(([value,label])=>{const o=el('option',label);o.value=value;sound.append(o);});sound.value=prefs.sound;soundLabel.append(sound);panel.append(soundLabel); + const volumeLabel=el('label',t('Volume','音量')),volume=el('input');volume.type='range';volume.min=0;volume.max=100;volume.value=prefs.volume;volume.ariaLabel=t('Volume','音量');volumeLabel.append(volume);panel.append(volumeLabel); + async function unlockAudio(){try{audio??=new(window.AudioContext||window.webkitAudioContext)();await audio.resume();}catch{}} + function play(){if(prefs.sound==='none'||!audio||audio.state!=='running')return;const notes=prefs.sound==='chime'?[660,880]:prefs.sound==='bell'?[880,440]:[520];notes.forEach((hz,i)=>{const osc=audio.createOscillator(),gain=audio.createGain(),start=audio.currentTime+i*.15;osc.frequency.value=hz;gain.gain.setValueAtTime(0,start);gain.gain.linearRampToValueAtTime(Math.min(100,Math.max(0,Number(prefs.volume)||0))/100*.12,start+.02);gain.gain.exponentialRampToValueAtTime(.0001,start+.3);osc.connect(gain);gain.connect(audio.destination);osc.start(start);osc.stop(start+.32);osc.onended=()=>{osc.disconnect();gain.disconnect();};});} + sound.onchange=async()=>{prefs.sound=sound.value;write('.settings',prefs);await unlockAudio();play();};volume.oninput=()=>{prefs.volume=Number(volume.value);write('.settings',prefs);};const test=el('button',t('Test sound','試聴'));test.type='button';test.onclick=async()=>{await unlockAudio();play();}; + panel.append(test,el('small',t('Settings are per account and browser. Selected sounds need an active page and interaction; closed-tab sound follows OS settings. Push requires HTTPS, permission and a valid login session.','このアカウント・ブラウザごとの設定です。選択した音はページ動作中・操作後のみ再生します。タブ終了時の音はOS設定に従います。PushにはHTTPS・通知許可・有効なログインが必要です。')),settingStatus); + const toasts=el('div',undefined,'notification-toasts');toasts.setAttribute('aria-live','polite');document.body.append(toasts); + function toast(items){const box=el('div',undefined,'notification-toast'),a=el('a',items.length===1?(items[0].message||t('New notification','新着通知')):t(`${items.length} new notifications`,`${items.length}件の新着通知`));a.href=items.length===1?href(items[0]):'/v/notification';const close=el('button','×');close.type='button';close.ariaLabel=t('Dismiss','閉じる');close.onclick=()=>box.remove();box.append(a,close);toasts.append(box);while(toasts.children.length>3)toasts.firstElementChild.remove();setTimeout(()=>box.remove(),8000);} + const paging=new WeakMap(); + async function refresh(target=dialogRoot||pageRoot,mark=false,onlyNew=false,append=false){ + let state=paging.get(target);if(!append||!state){state={since:previousVisit,mark,onlyNew,next:''};paging.set(target,state);}state.button?.remove(); + try{const data=await request(api+'?limit=30'+(append?'&before='+encodeURIComponent(state.next):''));let items=data.notifications||[];if(state.onlyNew)items=items.filter(n=>n.created_at_ms>=state.since); + if(append){const holder=el('div');render(holder,items);if(items.length)target.append(...holder.children);}else render(target,items); + if(state.mark){await Promise.all(items.filter(n=>n.status==='unread').map(n=>request(api+'/read',{method:'POST',body:JSON.stringify({uuid:n.uuid})})));if(badge)badge.hidden=true;} + state.next=data.next_cursor;if(state.next&&(!state.onlyNew||items.length===30)){const more=el('button',t('Load more','さらに表示'));more.type='button';more.className='notification-more';more.onclick=()=>{more.disabled=true;refresh(target,state.mark,state.onlyNew,true);};state.button=more;target.after(more);}return data; + }catch(e){if(append)target.append(el('p',e.message,'muted'));else target.replaceChildren(el('p',e.message,'muted'));return null;} + } + const focused=()=>!document.hidden&&document.hasFocus(); + function showInbox(automatic=false){if(!dialog||dialog.open)return;if(automatic&&(!focused()||document.querySelector('dialog[open]')||/^(INPUT|TEXTAREA|SELECT)$/.test(document.activeElement?.tagName)||document.activeElement?.isContentEditable)){autoPending=true;return;}autoPending=false;dialog.showModal();if(badge)badge.hidden=true;refresh(dialogRoot,true,automatic).then(data=>{if(data){previousVisit=data.server_time_ms||Date.now();write('.visit',previousVisit);}});} + launch?.addEventListener('click',()=>showInbox());dialog?.addEventListener('click',e=>{if(e.target===dialog)dialog.close();});dialog?.querySelector('[data-notification-close]')?.addEventListener('click',()=>dialog.close());document.querySelector('[data-notifications-refresh]')?.addEventListener('click',()=>refresh(pageRoot||dialogRoot));if(pageRoot)refresh(pageRoot); + async function deliver(items){if(!items.length)return;const run=async()=>{const seen=read('.delivered',[]),fresh=items.filter(n=>!seen.includes(n.uuid));if(!fresh.length)return;if(!focused())return;write('.delivered',[...fresh.map(n=>n.uuid),...seen].slice(0,200));if(prefs.toast){toast(fresh);play();}};if(navigator.locks)await navigator.locks.request(key+'.delivery',run);else await run();} + async function poll(){if(pending)return;pending=true;try{const data=await request(api+'?unread=1&limit=30'),items=data.notifications||[];lastServerTime=data.server_time_ms||Date.now();if(badge&&!dialog?.open)badge.hidden=!items.length;if(first){first=false;if(prefs.auto&&previousVisit&&items.some(n=>n.created_at_ms>=previousVisit))showInbox(true);else if(!document.hidden){previousVisit=lastServerTime;write('.visit',previousVisit);}}else{if(!dialog?.open)await deliver(items.filter(n=>n.created_at_ms>=previousVisit));if(autoPending&&focused())showInbox(true);if(focused()&&!autoPending&&!dialog?.open){previousVisit=lastServerTime;write('.visit',previousVisit);}}if(dialog?.open&&focused()&&items.some(n=>n.created_at_ms>=previousVisit)){const updated=await refresh(dialogRoot,true);if(updated){previousVisit=updated.server_time_ms;write('.visit',previousVisit);}}seenIDs=focused()?items.map(n=>n.uuid):[];await syncPush();}catch{}finally{pending=false;}} + const decode=v=>Uint8Array.from(atob(v.replace(/-/g,'+').replace(/_/g,'/')),c=>c.charCodeAt(0)); + async function registerWorker(){if(!window.isSecureContext||!('serviceWorker'in navigator)||!('PushManager'in window)||!('Notification'in window))throw Error(t('Web Push is unavailable in this browser.','このブラウザではWeb Pushを利用できません。'));registration=await navigator.serviceWorker.register('/static/js/notifications-worker.js',{scope:'/static/js/'});if(!registration.active)await new Promise((resolve,reject)=>{const worker=registration.installing||registration.waiting;if(!worker)return reject(Error('Worker unavailable'));const timer=setTimeout(()=>reject(Error('Worker activation timed out')),10000);worker.addEventListener('statechange',()=>{if(worker.state==='activated'){clearTimeout(timer);resolve();}});});return registration;} + async function syncPush(){if(!prefs.browser||!subscription)return;let presence=read('.focus',{});if(focused()){presence={id:tabID,until:Date.now()+90000};write('.focus',presence);}else if(presence.id===tabID){presence={};write('.focus',presence);}await request(api+'/push',{method:'POST',body:JSON.stringify({subscription:subscription.toJSON(),focused:focused()||presence.until>Date.now(),seen:focused()?seenIDs:[]})});pushReady=true;} + async function enablePush(ask){if(ask&&'Notification'in window&&Notification.permission!=='granted'){if(await Notification.requestPermission()!=='granted')throw Error(t('Browser notification permission was not granted.','ブラウザ通知が許可されていません。'));}await registerWorker();if(Notification.permission!=='granted')throw Error(t('Allow notifications in browser settings.','ブラウザ設定から通知を許可してください。'));const {public_key}=await request(api+'/push');subscription=await registration.pushManager.getSubscription();const globalOwner=localStorage.getItem('pageswiki.push.owner');if(subscription&&globalOwner!==key){await subscription.unsubscribe();subscription=null;}subscription??=await registration.pushManager.subscribe({userVisibleOnly:true,applicationServerKey:decode(public_key)});await syncPush();localStorage.setItem('pageswiki.push.owner',key);settingStatus.textContent=t('Background notifications enabled.','バックグラウンド通知を有効にしました。');} + browserToggle.onchange=async()=>{browserToggle.disabled=true;try{prefs.browser=browserToggle.checked;if(prefs.browser){await enablePush(true);await unlockAudio();}else{subscription??=await(await registerWorker()).pushManager.getSubscription();if(subscription){await request(api+'/push',{method:'DELETE',body:JSON.stringify({subscription:subscription.toJSON()})});await subscription.unsubscribe();}subscription=null;pushReady=false;settingStatus.textContent=t('Background notifications disabled.','バックグラウンド通知を無効にしました。');}write('.settings',prefs);}catch(e){prefs.browser=pushReady;browserToggle.checked=prefs.browser;settingStatus.textContent=e.message;}finally{browserToggle.disabled=false;}}; + document.addEventListener('pointerdown',()=>{if(prefs.sound!=='none')unlockAudio();},{passive:true});document.addEventListener('visibilitychange',()=>{if(document.hidden){if(lastServerTime)write('.visit',lastServerTime);}else{if(prefs.auto){previousVisit=Number(read('.visit',previousVisit));first=true;}poll();}syncPush().catch(()=>{});});window.addEventListener('focus',()=>{poll();syncPush().catch(()=>{});});window.addEventListener('blur',()=>syncPush().catch(()=>{})); + window.addEventListener('storage',e=>{if(e.key===key+'.settings'){prefs={...defaults,...read('.settings',{})};for(const name in controls)controls[name].checked=!!prefs[name];sound.value=prefs.sound;volume.value=prefs.volume;if(!prefs.browser)pushReady=false;}});navigator.serviceWorker?.addEventListener('message',e=>{if(e.data?.type==='pageswiki-notification')poll();});window.addEventListener('pagehide',()=>{if(lastServerTime&&!document.hidden)write('.visit',lastServerTime);}); + if(owner){poll();setInterval(()=>{if(!document.hidden||!pushReady)poll();},30000);if(prefs.browser)enablePush(false).catch(e=>{settingStatus.textContent=e.message;});} + }); +})(); diff --git a/static/js/path-picker.js b/static/js/path-picker.js new file mode 100644 index 0000000..fb07d1b --- /dev/null +++ b/static/js/path-picker.js @@ -0,0 +1,101 @@ +(() => { + const dialog = document.querySelector('[data-path-picker-dialog]'); + if (!dialog) return; + const list = dialog.querySelector('[data-path-picker-list]'); + const status = dialog.querySelector('[data-path-picker-status]'); + const current = dialog.querySelector('[data-path-picker-current]'); + const up = dialog.querySelector('[data-path-picker-up]'); + const chooseFolder = dialog.querySelector('[data-path-picker-folder]'); + const choose = dialog.querySelector('[data-path-picker-select]'); + let target = null, mode = 'any', path = '/', parent = '/', selected = '', request = null; + + const labels = { + loading: dialog.dataset.loading, + empty: dialog.dataset.empty, + failed: dialog.dataset.failed, + truncated: dialog.dataset.truncated, + }; + const formatBytes = value => { + if (!Number.isFinite(value) || value <= 0) return ''; + const units = ['B', 'KiB', 'MiB', 'GiB']; + let number = value, index = 0; + while (number >= 1024 && index < units.length - 1) { number /= 1024; index++; } + return number.toFixed(index ? 1 : 0) + ' ' + units[index]; + }; + const commit = value => { + if (!target) return; + target.value = value; + target.dispatchEvent(new Event('input', {bubbles: true})); + target.dispatchEvent(new Event('change', {bubbles: true})); + dialog.close(); + target.focus(); + }; + const markSelected = value => { + selected = value; + choose.disabled = !selected; + list.querySelectorAll('[role=option]').forEach(item => item.setAttribute('aria-selected', String(item.dataset.path === selected))); + }; + const load = async next => { + request?.abort(); + request = new AbortController(); + status.textContent = labels.loading; + list.replaceChildren(); + choose.disabled = true; + selected = ''; + try { + const response = await fetch('/_/api/v1/path-picker?path=' + encodeURIComponent(next || '/') + '&mode=' + encodeURIComponent(mode), {headers: {Accept: 'application/json'}, credentials: 'same-origin', cache: 'no-store', signal: request.signal}); + if (!response.ok) throw new Error('picker unavailable'); + const data = await response.json(); + path = data.path || '/'; parent = data.parent || '/'; current.textContent = path; + up.disabled = path === '/'; + chooseFolder.hidden = !(mode === 'folder' || mode === 'any' || mode === 'image-or-folder'); + const fragment = document.createDocumentFragment(); + for (const entry of data.entries || []) { + const item = document.createElement('button'); + item.type = 'button'; item.className = 'config-path-picker-item'; item.dataset.path = entry.path; + item.setAttribute('role', 'option'); item.setAttribute('aria-selected', 'false'); + const icon = document.createElement('span'); icon.textContent = entry.kind === 'folder' ? '▰' : (entry.content_type || '').startsWith('image/') ? '▧' : '▤'; icon.setAttribute('aria-hidden', 'true'); + const name = document.createElement('span'); name.textContent = entry.name; + const detail = document.createElement('small'); detail.textContent = entry.kind === 'folder' ? '' : formatBytes(entry.size); + item.append(icon, name, detail); + if (entry.kind === 'folder') item.addEventListener('click', () => load(entry.path)); + else { + item.addEventListener('click', () => markSelected(entry.path)); + item.addEventListener('dblclick', () => commit(entry.path)); + } + fragment.append(item); + } + list.append(fragment); + if (data.selected) markSelected(data.selected); + status.textContent = data.truncated ? labels.truncated : (data.entries || []).length ? '' : labels.empty; + } catch (error) { + if (error.name !== 'AbortError') status.textContent = labels.failed; + } + }; + + document.addEventListener('click', event => { + const opener = event.target.closest('[data-path-picker]'); + if (!opener) return; + target = document.getElementById(opener.dataset.pickerTarget); + if (!target) return; + mode = opener.dataset.pickerMode || 'any'; + dialog.showModal(); + load(target.value.trim() || '/'); + }); + up.addEventListener('click', () => load(parent)); + chooseFolder.addEventListener('click', () => commit(path)); + choose.addEventListener('click', () => selected && commit(selected)); + dialog.querySelectorAll('[data-path-picker-close]').forEach(button => button.addEventListener('click', () => dialog.close())); + dialog.addEventListener('close', () => request?.abort()); + dialog.addEventListener('click', event => { + if (event.target !== dialog) return; + const box = dialog.getBoundingClientRect(); + if (event.clientX < box.left || event.clientX > box.right || event.clientY < box.top || event.clientY > box.bottom) dialog.close(); + }); + + document.querySelectorAll('[data-range-output]').forEach(input => { + const output = document.getElementById(input.dataset.rangeOutput); + const update = () => { if (output) output.value = input.value + '%'; }; + input.addEventListener('input', update); update(); + }); +})(); diff --git a/static/js/periodicals.js b/static/js/periodicals.js new file mode 100644 index 0000000..cc15926 --- /dev/null +++ b/static/js/periodicals.js @@ -0,0 +1,86 @@ +(() => { + 'use strict'; + const ja=document.documentElement.lang.startsWith('ja'); + const endpoint=(kind,operation)=>`/_/api/v1/extension/content.${kind}/${operation}`; + async function request(url,body) { + const controller=new AbortController(),timeout=setTimeout(()=>controller.abort(),15000); + try {const response=await fetch(url,{cache:'no-store',signal:controller.signal,headers:{Accept:'application/json',...(body?{'Content-Type':'application/json'}:{})},...(body?{method:'POST',body:JSON.stringify(body)}:{})}); + if(!response.ok||response.redirected)throw new Error(response.status===401||response.redirected?(ja?'ログインし直してください。':'Please sign in again.'):await response.text());return await response.json(); + }finally{clearTimeout(timeout);} + } + const settingPanels=document.querySelectorAll('[data-periodical-settings]'); + const observer=new IntersectionObserver(entries=>entries.forEach(async entry=>{ + if(!entry.isIntersecting)return;const panel=entry.target;observer.unobserve(panel); + const form=panel.querySelector('form'),status=form.querySelector('[data-periodical-status]'); + try {const data=await request(endpoint(panel.dataset.periodicalSettings,'settings'));form.elements.enabled.checked=data.enabled;form.elements.prefix.value=data.prefix;form.querySelector('fieldset').disabled=!!data.controlled;if(data.controlled)status.textContent=ja?'ドメインの入口設定で管理中です。コントローラのドメインパネルから変更してください。':'Managed by Domain entry settings. Change settings in the controller Domains panel.';} + catch(error){status.textContent=error.message;} + })); + settingPanels.forEach(panel=>{observer.observe(panel);panel.querySelector('form').addEventListener('submit',async event=>{event.preventDefault();const form=event.target,status=form.querySelector('[data-periodical-status]'),fields=form.querySelector('fieldset');fields.disabled=true;try{await request(endpoint(panel.dataset.periodicalSettings,'settings'),{enabled:form.elements.enabled.checked,prefix:form.elements.prefix.value});status.textContent=ja?'保存しました。':'Saved.';}catch(error){status.textContent=error.message;}finally{fields.disabled=false;}});}); + document.querySelectorAll('[data-domain-entry-open]').forEach(button=>button.addEventListener('click',()=>document.getElementById(button.dataset.domainEntryOpen)?.showModal())); + document.querySelectorAll('[data-domain-entry-close]').forEach(button=>button.addEventListener('click',()=>button.closest('dialog').close())); + document.querySelectorAll('.domain-entry-dialog select[name=entry_layout]').forEach(select=>select.addEventListener('change',()=>{if(select.value==='diary'||select.value==='blog')select.form.elements[select.value+'_enabled'].checked=true;})); + const root=document.querySelector('[data-periodical-kind]');if(!root)return; + const composer=root.querySelector('[data-periodical-composer]'),postForm=composer?.querySelector('form'); + let requestID='',posting=false; + root.querySelector('[data-periodical-compose]')?.addEventListener('click',()=>{if(!requestID){postForm.reset();requestID=crypto.randomUUID();}composer.showModal();}); + composer?.querySelector('[data-composer-close]')?.addEventListener('click',()=>{if(!posting)composer.close();}); + composer?.addEventListener('cancel',event=>{if(posting)event.preventDefault();}); + postForm?.addEventListener('input',()=>{requestID=crypto.randomUUID();}); + postForm?.addEventListener('submit',async event=>{ + event.preventDefault();if(posting)return; + if(!requestID)requestID=crypto.randomUUID(); + const body=Object.fromEntries(new FormData(postForm)); + if (window.PagesWikiGetEditorText) body.body=window.PagesWikiGetEditorText(); + body.request_id=requestID; + const fields=postForm.querySelector('fieldset'),status=postForm.querySelector('[data-composer-status]'); + posting=true;fields.disabled=true;status.textContent=''; + try { + const result=await request(endpoint(root.dataset.periodicalKind,'posts'),body);requestID=''; + postForm.hidden=true; + const done=document.createElement('section');done.dataset.periodicalPosted='true'; + const heading=document.createElement('h2');heading.textContent=ja?'記事を保存しました':'Article saved';done.append(heading); + const warning=document.createElement('p');warning.textContent=result.published?(ja?'公開済みの記事をシェアできます。':'This article is public.'):(ja?'まだ公開承認されていません。承認するまで共有先では閲覧できません。':'Publication approval is pending. Shared links are not readable until approved.');done.append(warning); + const targets=Array.isArray(result.share_targets)?result.share_targets:[]; + const select=document.createElement('select');select.setAttribute('aria-label',ja?'共有ドメイン':'Sharing domain'); + targets.forEach(target=>{const option=document.createElement('option');option.value=target.url;option.textContent=target.title+' — '+target.url;select.append(option);}); + const link=document.createElement('a');link.textContent=ja?'Xでシェア':'Share on X';link.target='_blank';link.rel='noopener noreferrer';link.dataset.shareX='true'; + const display=document.createElement('p');display.style.overflowWrap='anywhere'; + const update=()=>{const url=new URL('https://x.com/intent/tweet');const target=targets.find(item=>item.url===select.value);url.searchParams.set('text',body.title+' - '+(target?.title||document.title));url.searchParams.set('url',select.value);link.href=url.href;display.textContent=select.value;}; + if(targets.length){update();select.addEventListener('change',update);if(targets.length>1)done.append(select);done.append(display,link);} + else {const message=document.createElement('p');message.textContent=ja?'共有先URLを取得できませんでした。ドメイン設定を確認してください。':'No sharing URL is available. Check Domain settings.';done.append(message);} + link.addEventListener('click',event=>{if(!result.published&&!confirm(ja?'この記事はまだ公開されていません。未公開のURLをXの投稿画面へ渡しますか?':'This article is not public yet. Send its unpublished URL to the X composer?'))event.preventDefault();}); + const next=document.createElement('a');next.href='/v/'+root.dataset.periodicalKind+'/'+body.date.replaceAll('-','/');next.textContent=ja?'記事一覧へ':'Back to entries';next.dataset.postContinue='true'; + const navigation=document.createElement('nav');navigation.append(next);done.append(navigation);composer.append(done); + posting=false;composer.addEventListener('close',()=>location.assign(next.href),{once:true}); + } + catch(error){status.textContent=error.message;fields.disabled=false;posting=false;} + }); + root.querySelector('[data-periodical-filters]')?.addEventListener('submit',event=>{ + event.preventDefault();const fields=event.target.elements,month=fields.month.value; + const target='/v/'+root.dataset.periodicalKind+(month?'/'+month.replace('-', '/'):''); + const query=new URLSearchParams();if(fields.category?.value)query.set('category',fields.category.value); + let suffix=query.toString();if(fields.own?.checked)suffix+=(suffix?'&':'')+'own'; + location.assign(target+(suffix?'?'+suffix:'')); + }); + const dialog=root.querySelector('[data-periodical-dialog]'),form=dialog?.querySelector('form'); + root.querySelector('[data-periodical-add]')?.addEventListener('click',()=>{form.reset();form.elements.path.readOnly=false;form.querySelector('[data-periodical-status]').textContent='';dialog.showModal();}); + const planner=root.querySelector('[data-periodical-planner]'),planForm=planner?.querySelector('form'); + let planned=null; + root.querySelector('[data-periodical-new]')?.addEventListener('click',()=>{planForm.reset();planned=null;planForm.querySelector('[data-planner-result]').hidden=true;planForm.querySelector('[data-planner-status]').textContent='';planner.showModal();}); + planner?.querySelector('[data-planner-close]').addEventListener('click',()=>planner.close()); + planForm?.addEventListener('input',()=>{planned=null;planForm.querySelector('[data-planner-result]').hidden=true;}); + planForm?.addEventListener('submit',async event=>{ + event.preventDefault();const button=planForm.querySelector('[type=submit]'),status=planForm.querySelector('[data-planner-status]');button.disabled=true;planned=null;planForm.querySelector('[data-planner-result]').hidden=true; + const values=new URLSearchParams(new FormData(planForm)),date=planForm.elements.date.value; + try {const data=await request(endpoint(root.dataset.periodicalKind,'plan')+'?'+values);if(new URLSearchParams(new FormData(planForm)).toString()!==values.toString())return;planned={...data,date};status.textContent=data.path;planForm.querySelector('[data-planner-editor]').href=data.editor_href;planForm.querySelector('[data-planner-result]').hidden=false;} + catch(error){status.textContent=error.message;}finally{button.disabled=false;} + }); + planner?.querySelector('[data-planner-register]').addEventListener('click',()=>{if(!planned)return;planner.close();form.reset();form.elements.path.value=planned.path;form.elements.date.value=planned.date;form.elements.path.readOnly=false;form.querySelector('[data-periodical-status]').textContent='';dialog.showModal();}); + root.querySelector('[data-periodical-close]')?.addEventListener('click',()=>dialog.close()); + root.querySelectorAll('[data-periodical-entry]').forEach(row=>{ + row.querySelector('[data-periodical-edit]')?.addEventListener('click',()=>{form.reset();for(const key of ['path','title','date','category','version'])form.elements[key].value=row.dataset[key];form.elements.page_uuid.value=row.dataset.page;form.elements.path.readOnly=true;form.querySelector('[data-periodical-status]').textContent='';dialog.showModal();}); + row.querySelector('[data-periodical-remove]')?.addEventListener('click',async event=>{if(!confirm(event.target.dataset.confirm))return;event.target.disabled=true;try{await request(endpoint(root.dataset.periodicalKind,'entries'),{path:row.dataset.path,page_uuid:row.dataset.page,version:Number(row.dataset.version),remove:true});location.reload();}catch(error){alert(error.message);event.target.disabled=false;}}); + }); + form?.addEventListener('submit',async event=>{event.preventDefault();const button=form.querySelector('[type=submit]'),status=form.querySelector('[data-periodical-status]');button.disabled=true;try{const data=Object.fromEntries(new FormData(form));data.version=Number(data.version);await request(endpoint(root.dataset.periodicalKind,'entries'),data);location.reload();}catch(error){status.textContent=error.message;button.disabled=false;}}); + addEventListener('pageshow',event=>{if(event.persisted)location.reload();}); +})(); diff --git a/static/js/public-navigation.js b/static/js/public-navigation.js new file mode 100644 index 0000000..73175fc --- /dev/null +++ b/static/js/public-navigation.js @@ -0,0 +1,136 @@ +(() => { + 'use strict'; + const ja = document.documentElement.lang.startsWith('ja'); + const text = {loading: ja ? '読み込み中…' : 'Loading…', failed: ja ? '一覧を取得できませんでした。' : 'Could not load this listing.', retry: ja ? '再試行' : 'Retry', views: ja ? '表示形式' : 'View mode'}; + // Persist presentation only, never content, names or authorization. + let preferred = 'list'; + try { const v = sessionStorage.getItem('public-navigation-view'); if (['list', 'detail', 'icon'].includes(v)) preferred = v; } catch (_) {} + const sections = new Set(), queue = []; + let active = 0; + function pump() { + while (active < 3 && queue.length) { + const job = queue.shift(); + if (job.signal.aborted) { job.reject(new DOMException('Aborted', 'AbortError')); continue; } + active++; + job.run().then(job.resolve, job.reject).finally(() => { active--; pump(); }); + } + } + const scheduled = (signal, run) => new Promise((resolve, reject) => { queue.push({signal, run, resolve, reject}); pump(); }); + const observer = 'IntersectionObserver' in window ? new IntersectionObserver(entries => { + for (const entry of entries) if (entry.isIntersecting) { + observer.unobserve(entry.target); + const state = entry.target.closest('[data-children-src]')?._publicChildren; + if (state) load(state, entry.target.dataset.childrenNext, entry.target); + } + }, {rootMargin: '160px'}) : null; + function watch(state) { + state.body.querySelectorAll('[data-children-next]').forEach(target => { + if (observer) observer.observe(target); + else { + const link = document.createElement('a'); link.href = target.dataset.childrenNext; link.textContent = ja ? '次の項目' : 'Next items'; + link.addEventListener('click', event => { event.preventDefault(); load(state, link.href, target); }); target.replaceChildren(link); + } + }); + } + function status(target, message) { const p = document.createElement('p'); p.setAttribute('role', 'status'); p.textContent = message; target.replaceChildren(p); } + async function load(state, source, appendTarget = null) { + const generation = state.generation, signal = state.controller.signal, target = appendTarget || state.body; + const current = () => !signal.aborted && state.generation === generation && target.isConnected; + if (!current()) return; + status(target, text.loading); state.section.setAttribute('aria-busy', 'true'); + try { + const url = new URL(source, location.origin); + if (url.origin !== location.origin || url.pathname !== '/v/children') throw new Error('Invalid navigation endpoint'); + const body = await scheduled(signal, async () => { + const request = new AbortController(), abort = () => request.abort(); + signal.addEventListener('abort', abort, {once: true}); + const timeout = setTimeout(abort, 15000); + try { + const response = await fetch(url, {signal: request.signal, cache: 'no-store', headers: {Accept: 'text/html'}}); + if (!response.ok || response.redirected || !response.headers.get('Content-Type')?.includes('text/html')) throw new Error('Navigation unavailable'); + return await response.text(); + } finally { clearTimeout(timeout); signal.removeEventListener('abort', abort); } + }); + if (!current()) return; + const fragment = document.createElement('template'); fragment.innerHTML = body; + if (appendTarget) appendTarget.replaceWith(fragment.content); else target.replaceChildren(fragment.content); + watch(state); + } catch (error) { + if (!current()) return; + status(target, text.failed); + const retry = document.createElement('button'); retry.type = 'button'; retry.textContent = text.retry; + retry.addEventListener('click', () => load(state, source, appendTarget)); target.append(retry); + } finally { if (state.generation === generation) state.section.removeAttribute('aria-busy'); } + } + document.querySelectorAll('[data-children-src]').forEach(section => { + const views = document.createElement('nav'); views.className = 'public-children-views'; views.setAttribute('aria-label', text.views); + const body = document.createElement('div'); body.dataset.publicChildrenBody = ''; + const ready = section.hasAttribute('data-public-children-ready'); + if (ready) while (section.firstChild) body.append(section.firstChild); + section.replaceChildren(views, body); + const state = {section, body, generation: 0, controller: new AbortController()}; + section._publicChildren = state; sections.add(state); + const buttons = []; + const choose = (view, initial = false) => { + state.controller.abort(); state.controller = new AbortController(); state.generation++; + buttons.forEach(button => button.setAttribute('aria-pressed', String(button.dataset.view === view))); + if (!initial) try { sessionStorage.setItem('public-navigation-view', view); } catch (_) {} + if (ready && initial && view === 'list') { watch(state); return; } + const url = new URL(section.dataset.childrenSrc, location.origin); url.searchParams.set('view', view); load(state, url); + }; + for (const [view, icon, name] of [['icon', '▦', ja ? '縮小版表示' : 'Thumbnail view'], ['detail', '☷', ja ? '詳細表示' : 'Detail view'], ['list', '≡', ja ? '通常表示' : 'List view']]) { + const button = document.createElement('button'); button.type = 'button'; button.textContent = icon; button.dataset.view = view; + button.title = name; button.setAttribute('aria-label', name); + button.addEventListener('click', () => choose(view)); views.append(button); buttons.push(button); + } + choose(preferred, true); + }); + const tree = document.querySelector('[data-public-tree]'); + if (tree) { + const rows = [...tree.querySelectorAll('[data-public-tree-path]')], filter = document.querySelector('[data-public-tree-filter]'); + const collapsed = new Set(), byPath = new Map(rows.map(row => [row.dataset.publicTreePath, row])); + const parent = path => path.slice(0, path.lastIndexOf('/')) || '/'; + function update() { + const query = filter.value.trim().toLocaleLowerCase(), matches = new Set(); + if (query) for (const row of rows) if (row.dataset.publicTreePath.toLocaleLowerCase().includes(query)) { + for (let at = row.dataset.publicTreePath; byPath.has(at); at = parent(at)) matches.add(at); + } + let visible = 0; + const ancestors = []; + for (const row of rows) { + const path = row.dataset.publicTreePath, depth = Number(row.dataset.depth); + while (ancestors.length && ancestors.at(-1).depth >= depth) ancestors.pop(); + row.hidden = query ? !matches.has(path) : !!ancestors.at(-1)?.hidden; + ancestors.push({depth, hidden: row.hidden || collapsed.has(path)}); + const toggle = row.querySelector('[data-public-tree-toggle]'); + if (toggle) { toggle.hidden = false; toggle.disabled = !!query; toggle.setAttribute('aria-expanded', String(!!query || !collapsed.has(path))); toggle.textContent = query || !collapsed.has(path) ? '▾' : '▸'; } + if (!row.hidden) visible++; + } + document.querySelector('[data-public-tree-no-match]').hidden = visible > 0 || !query; + } + tree.addEventListener('click', event => { + const toggle = event.target.closest('[data-public-tree-toggle]'); if (!toggle) return; + const path = toggle.closest('[data-public-tree-path]').dataset.publicTreePath; + collapsed.has(path) ? collapsed.delete(path) : collapsed.add(path); update(); + }); + tree.addEventListener('keydown', event => { + if (event.altKey || event.ctrlKey || event.metaKey || !['ArrowDown', 'ArrowUp', 'ArrowLeft', 'ArrowRight', 'Home', 'End'].includes(event.key)) return; + const row = event.target.closest('[data-public-tree-path]'); if (!row) return; + const visible = rows.filter(item => !item.hidden), at = visible.indexOf(row), path = row.dataset.publicTreePath; + let next; + if (event.key === 'ArrowDown') next = visible[Math.min(at + 1, visible.length - 1)]; + if (event.key === 'ArrowUp') next = visible[Math.max(at - 1, 0)]; + if (event.key === 'Home') next = visible[0]; + if (event.key === 'End') next = visible.at(-1); + if (event.key === 'ArrowLeft') { if (!filter.value.trim() && row.querySelector('[data-public-tree-toggle]') && !collapsed.has(path)) collapsed.add(path); else next = byPath.get(parent(path)); } + if (event.key === 'ArrowRight') { if (collapsed.has(path)) collapsed.delete(path); else if (visible[at + 1]?.dataset.publicTreePath.startsWith(path + '/')) next = visible[at + 1]; } + event.preventDefault(); update(); next?.querySelector('.public-tree-name').focus(); + }); + filter.addEventListener('input', update); + document.querySelector('[data-public-expand]').addEventListener('click', () => { filter.value = ''; collapsed.clear(); update(); }); + document.querySelector('[data-public-collapse]').addEventListener('click', () => { filter.value = ''; rows.forEach(row => collapsed.add(row.dataset.publicTreePath)); update(); }); + document.querySelector('[data-public-tree-tools]').hidden = false; update(); + } + window.addEventListener('pagehide', () => { observer?.disconnect(); for (const state of sections) state.controller.abort(); }); + window.addEventListener('pageshow', event => { if (event.persisted) location.reload(); }); +})(); diff --git a/static/js/task-dav-settings.js b/static/js/task-dav-settings.js new file mode 100644 index 0000000..1c6b428 --- /dev/null +++ b/static/js/task-dav-settings.js @@ -0,0 +1,69 @@ +(() => { + 'use strict'; + const app = document.getElementById('tasks-app') || document.getElementById('calendar-app'); + if (!app) return; + const calendar = app.id === 'calendar-app'; + if (calendar && !app.dataset.actor) return; + const ja = document.documentElement.lang.startsWith('ja'); + const t = (en, jp) => ja ? jp : en; + const api = '/_/api/v1/caldav-credentials'; + const el = (tag, text) => { const n = document.createElement(tag); if (text !== undefined) n.textContent = text; return n; }; + const button = el('button', '⇄'); button.type = 'button'; button.id = 'tasks-dav-open'; + button.title = button.ariaLabel = t('CalDAV / CLI access', 'CalDAV / CLI連携'); + app.querySelector(calendar ? '.calendar-toolbar' : '.tasks-toolbar .tasks-actions').append(button); + const dialog = el('dialog'); dialog.id = 'tasks-dav-dialog'; dialog.setAttribute('aria-labelledby', 'tasks-dav-title'); + const header = el('header'); header.className = 'tasks-toolbar'; + const title = el('h2', t('CalDAV access', '予定・タスクのCalDAV連携')); title.id = 'tasks-dav-title'; + const close = el('button', '×'); close.type = 'button'; close.ariaLabel = t('Close', '閉じる'); header.append(title, close); + const help = el('p', t('Choose calendars, tasks, or both. Calendar permissions still apply. Existing task passwords remain task-only. Wiki access is not granted. Use HTTPS.', '予定・タスクの対象を選んで発行します。予定には既存のカレンダー権限が適用されます。従来のパスワードはタスク専用のままです。Wikiへのアクセス権は付与されません。HTTPSで接続してください。')); + const url = el('input'); url.readOnly = true; url.value = location.origin + '/_/api/v1/caldav/'; url.ariaLabel = 'CalDAV URL'; url.onclick = () => url.select(); + const form = el('form'); const label = el('input'); label.required = true; label.maxLength = 100; label.placeholder = t('Device / client name', '端末・クライアント名'); label.ariaLabel = label.placeholder; + const access = el('select'); access.ariaLabel = t('Access', 'アクセス権限'); + for (const [value, text] of [['read', t('Read only', '読み取り専用')], ['write', t('Read / write', '読み書き')]]) { const option = el('option', text); option.value = value; if (value === 'write' && !calendar && app.dataset.writable !== 'true') option.disabled = true; access.append(option); } + const scope = el('select'); scope.ariaLabel = t('Scope', '対象'); + const scopes = { tasks: t('Tasks only', 'タスクのみ'), calendar: t('Calendars only', '予定のみ'), all: t('Calendars and tasks', '予定とタスク') }; + for (const [value, text] of Object.entries(scopes)) { const option = el('option', text); option.value = value; option.selected = value === (calendar ? 'calendar' : 'tasks'); scope.append(option); } + const days = el('select'); days.ariaLabel = t('Validity', '有効期間'); + for (const n of [30, 90, 365]) { const option = el('option', n + t(' days', '日間')); option.value = String(n); option.selected = n === 90; days.append(option); } + const issue = el('button', t('Issue password', 'パスワードを発行')); issue.type = 'submit'; form.append(label, scope, access, days, issue); + const compatLabel = el('label'); compatLabel.className = 'dav-compat-toggle'; + const compat = el('input'); compat.type = 'checkbox'; compat.id = 'tasks-dav-compat'; compat.setAttribute('aria-describedby', 'tasks-dav-compat-help'); + compatLabel.append(compat, document.createTextNode(t('OneTask compatibility (calendar-access advertisement)', 'OneTask互換モード(calendar-accessを宣言)'))); + const compatHelp = el('p', t('Opt in only for clients that require calendar-access. This is a limited implementation, not full RFC compliance. Task dates are date-only; recurrence, timezone definitions and alarms remain unsupported. Enabling this does not grant additional access.', 'calendar-accessを要求するクライアント向けの互換設定です。完全なRFC準拠ではありません。タスクの日付は日単位のみで、繰り返し・タイムゾーン定義・アラームは引き続き未対応です。アクセス権限は増えません。')); + compatHelp.id = 'tasks-dav-compat-help'; compatHelp.className = 'dav-compat-help'; form.append(compatLabel, compatHelp); + const secret = el('section'); secret.hidden = true; + const status = el('p'); status.role = 'status'; + const tableWrap = el('div'); tableWrap.className = 'task-dav-table'; const table = el('table'); tableWrap.append(table); + const note = el('p', t('Clients: chroncal, vdirsyncer + Todoman. Task start/due accept dates only. Recurring events and alarms cannot be created via DAV. Calendar events are deleted; tasks are archived.', '連携例:chroncal、vdirsyncer + Todoman。タスクの開始・期限は日付のみ対応。DAV経由の繰り返し予定・アラームの新規作成は未対応です。削除操作では予定は削除、タスクはアーカイブされます。')); + dialog.append(header, help, url, form, secret, status, tableWrap, note); app.append(dialog); + let busy = false, generation = 0; + async function request(path = '', options = {}) { + const res = await fetch(api + path, { credentials: 'same-origin', ...options, headers: { 'Content-Type': 'application/json', ...options.headers } }); + const data = await res.json().catch(() => ({})); + if (!res.ok || res.redirected) throw new Error(t('Request failed: ', '処理に失敗しました:') + (data.error || res.status)); + return data; + } + async function load() { + const ticket = ++generation; const data = await request(); if (ticket !== generation || !dialog.open) return; + table.replaceChildren(); const head = el('tr'); + [t('Name', '名称'), t('Scope', '対象'), t('Access', '権限'), t('Expires', '有効期限'), ''].forEach(v => head.append(el('th', v))); const thead = el('thead'); thead.append(head); table.append(thead); const body = el('tbody'); table.append(body); + for (const c of data.items) { + const row = el('tr'); row.append(el('td', c.label + (c.calendar_access_compat ? t(' · OneTask compatibility', ' · OneTask互換') : '')), el('td', scopes[c.scope || 'tasks']), el('td', c.write ? t('Read / write', '読み書き') : t('Read only', '読み取り専用')), el('td', new Date(c.expires_ms).toLocaleString())); + const cell = el('td'), revoke = el('button', t('Revoke', '失効')); revoke.type = 'button'; + revoke.onclick = async () => { if (busy || !confirm(t('Revoke this password?', 'このパスワードを失効させますか?'))) return; busy = true; revoke.disabled = true; status.textContent = ''; try { await request('/' + encodeURIComponent(c.id), { method: 'DELETE' }); await load(); } catch (e) { status.textContent = e.message; } finally { busy = false; revoke.disabled = false; } }; + cell.append(revoke); row.append(cell); body.append(row); + } + } + function hide() { if (busy) return; ++generation; dialog.close(); secret.replaceChildren(); secret.hidden = true; } + close.onclick = hide; dialog.addEventListener('cancel', e => { e.preventDefault(); hide(); }); + button.onclick = async () => { if (dialog.open) return; status.textContent = ''; dialog.showModal(); try { await load(); } catch (e) { status.textContent = e.message; } }; + form.onsubmit = async e => { + e.preventDefault(); if (busy) return; busy = true; issue.disabled = true; status.textContent = ''; + try { + const data = await request('', { method: 'POST', body: JSON.stringify({ label: label.value, scope: scope.value, write: access.value === 'write', days: Number(days.value), calendar_access_compat: compat.checked }) }); + secret.replaceChildren(el('p', t('Shown only once. Save both values in your password manager before closing.', 'この画面を閉じると再表示できません。両方をパスワードマネージャーなどに保存してください。'))); + for (const [name, value] of [[t('Username (credential ID)', 'ユーザー名(認証情報ID)'), data.username], [t('Password', 'パスワード'), data.password]]) { const wrapper = el('label', name), field = el('input'); field.readOnly = true; field.value = value; field.autocomplete = 'off'; field.spellcheck = false; field.onclick = () => field.select(); wrapper.append(field); secret.append(wrapper); } + secret.hidden = false; label.value = ''; await load(); + } catch (e) { status.textContent = e.message; } finally { busy = false; issue.disabled = false; } + }; +})(); diff --git a/static/js/task-focus.js b/static/js/task-focus.js new file mode 100644 index 0000000..ec34a96 --- /dev/null +++ b/static/js/task-focus.js @@ -0,0 +1,35 @@ +(() => { + 'use strict'; + const app=document.getElementById('tasks-app');if(!app)return; + const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en; + const el=(tag,value)=>{const n=document.createElement(tag);if(value!==undefined)n.textContent=value;return n;}; + const panel=el('section');panel.id='tasks-focus';panel.ariaLabel='Pomodoro'; + const heading=el('strong','Pomodoro'),state=el('span'),clock=el('output','25:00');state.id='tasks-focus-state';clock.id='tasks-focus-clock';clock.setAttribute('aria-live','off'); + const phase=el('select');phase.ariaLabel=t('Phase','集中・休憩');[['focus',t('Focus','集中')],['break',t('Break','休憩')]].forEach(([v,label])=>{const o=el('option',label);o.value=v;phase.append(o);}); + const minutes=el('input');minutes.type='number';minutes.min=1;minutes.max=180;minutes.value=25;minutes.ariaLabel=t('Minutes','分'); + const buttons=el('div');buttons.className='tasks-actions';const actions={};[['start','▶',t('Start','開始')],['pause','Ⅱ',t('Pause','一時停止')],['resume','▶',t('Resume','再開')],['complete','✓',t('Finish session (not task)','セッションを終了(タスクは未完了のまま)')],['cancel','×',t('Cancel session','セッションを中断')]].forEach(([key,icon,label])=>{const b=el('button',icon);b.type='button';b.title=b.ariaLabel=label;b.dataset.action=key;b.addEventListener('click',()=>command(key));actions[key]=b;buttons.append(b);}); + const link=el('a',t('Linked task','関連タスク'));link.hidden=true;const status=el('small');status.role='status'; + panel.append(heading,state,clock,phase,minutes,el('span',t('min','分')),buttons,link,status);app.querySelector('.tasks-workspace').prepend(panel); + let current=null,loading=false,pendingStart=null,chosenTask='',serverAt=Date.now(),perfAt=performance.now(),ready=false,draftChoice=false; + const writable=app.dataset.writable==='true'; + function remaining(){return !current?Number(minutes.value)*60000:current.state==='running'?Math.max(0,Math.min(current.remaining_ms,current.deadline_ms-serverAt-(performance.now()-perfAt))):current.remaining_ms;} + function render(){const active=current&&['running','paused'].includes(current.state);const ms=remaining(),secs=Math.ceil(ms/1000);clock.textContent=String(Math.floor(secs/60)).padStart(2,'0')+':'+String(secs%60).padStart(2,'0'); + phase.disabled=minutes.disabled=!!active||loading||!writable||!!pendingStart; + for(const [key,b]of Object.entries(actions)){b.disabled=loading||!ready||!writable;b.hidden=key==='start'?!!active:key==='pause'?current?.state!=='running':key==='resume'?current?.state!=='paused':!active;} + if(current?.state==='running'&&ms<=0)actions.pause.disabled=true; + link.hidden=!current?.task_uuid;if(current?.task_uuid)link.href='/v/plan/task/'+encodeURIComponent(current.task_uuid); + panel.dataset.state=current?.state||'idle'; + state.textContent=({running:t('Running','実行中'),paused:t('Paused','一時停止'),completed:t('Completed','終了'),cancelled:t('Cancelled','中断')})[current?.state]||''; + } + function accept(data){const previous=current;current=data.item;const active=current&&['running','paused'].includes(current.state);if(active)draftChoice=false;else if(draftChoice)current=null;serverAt=data.server_now_ms;perfAt=performance.now();ready=true;if(current&&(active||previous?.uuid!==current.uuid)){phase.value=current.phase;minutes.value=current.duration_ms/60000;}render();if(previous?.uuid!==current?.uuid||previous?.version!==current?.version)app.dispatchEvent(new Event('task-today-refresh'));} + async function request(options={}){const r=await fetch('/_/api/v1/extension/organizer.tasks/focus',{credentials:'same-origin',signal:AbortSignal.timeout(10000),...options,headers:{'Content-Type':'application/json'}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected){const err=new Error(r.status===412?t('Session changed, or another Domain has an active timer. Review before retrying.','別の画面で変更されたか、他ドメインでタイマーが動作中です。状態を確認してください。'):t('Timer unavailable. Check permissions and extension settings.','タイマーを利用できません。権限や拡張の設定を確認してください。'));err.status=r.status;throw err;}return d;} + async function load(){if(loading)return;loading=true;try{accept(await request());}catch(e){status.textContent=e.message;ready=false;}finally{loading=false;render();}} + async function command(action){if(loading||!ready)return;if(action==='cancel'&&!confirm(t('Cancel this session?','このセッションを中断しますか?')))return; + let payload;if(action==='start'){if(!minutes.reportValidity())return;if(!pendingStart)pendingStart={uuid:crypto.randomUUID(),action,task_uuid:chosenTask,phase:phase.value,minutes:Number(minutes.value),version:0};payload=pendingStart;}else{if(!current)return;payload={uuid:current.uuid,action,version:current.version};} + loading=true;status.textContent='';render();try{accept(await request({method:'POST',body:JSON.stringify(payload)}));pendingStart=null;chosenTask='';status.textContent=t('Saved','保存しました');}catch(e){status.textContent=e.message;if(e.status>=400&&e.status<500){pendingStart=null;chosenTask='';}try{accept(await request());if(current?.uuid===pendingStart?.uuid){pendingStart=null;chosenTask='';}}catch{ready=false;}}finally{loading=false;render();} + } + phase.addEventListener('change',()=>{minutes.value=phase.value==='break'?5:25;if(!current||!['running','paused'].includes(current.state)){current=null;draftChoice=true;}render();});minutes.addEventListener('input',()=>{if(!current||!['running','paused'].includes(current.state)){current=null;draftChoice=true;}render();}); + app.addEventListener('task-focus',async e=>{await load();if(pendingStart||(current&&['running','paused'].includes(current.state))){status.textContent=t('Resolve the pending request, or finish the current session first.','未完了の開始要求を再試行するか、現在のセッションを終了してください。');}else{chosenTask=e.detail.uuid;phase.value='focus';minutes.value=25;await command('start');}panel.scrollIntoView({block:'nearest',behavior:'smooth'});}); + document.addEventListener('visibilitychange',()=>{if(!document.hidden)load();}); + setInterval(()=>{if(!document.hidden)render();},1000);setInterval(()=>{if(!document.hidden)load();},30000);render();load(); +})(); diff --git a/static/js/task-inline.js b/static/js/task-inline.js new file mode 100644 index 0000000..fb865a1 --- /dev/null +++ b/static/js/task-inline.js @@ -0,0 +1,75 @@ +(() => { + 'use strict'; + if(window.PagesWikiTaskRows)return; + const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en,api='/_/api/v1/extension/organizer.tasks/items'; + const el=(tag,value,cls)=>{const n=document.createElement(tag);if(value!==undefined)n.textContent=value;if(cls)n.className=cls;return n;}; + const dirtyRows=new Set(); + const expandedRows=new Set(); + const labels={title:t('Title','件名'),status:t('Status','状態'),planned_on:t('Planned','取り組む日'),due_on:t('Due','期限'),review_on:t('Review','見直す日'),start_on:t('Work starts','工程開始'),end_on:t('Work ends','工程終了')}; + const header=document.createElement('div');header.className='task-inline-header';header.setAttribute('aria-hidden','true'); + ['',...Object.values(labels),t('Actions','操作')].forEach(label=>header.append(el('span',label))); + document.getElementById('tasks-list')?.before(header); + async function request(url,options={}){const r=await fetch(url,{credentials:'same-origin',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json',...options.headers}});const data=await r.json().catch(()=>({}));if(!r.ok||r.redirected){const messages={note_setup:t('Set a project and its related Wiki page first (project settings → note subfolder).','先にプロジェクトを選び、その設定で関連Wikiページとメモのサブ階層を指定してください。'),note_exists:t('A page already exists here. Link it explicitly in task details, or change the title.','同じPathのページが既にあります。タスクの詳細から明示的に関連付けるか、件名を変更してください。')};throw Error(messages[data.error]||(r.status===412?t('Changed elsewhere. Input kept; reload to discard it.','別の画面で変更されています。入力は保持しています。「再読込」で破棄して最新版を取得できます。'):t('Unable to save. Check permissions, dates and reminder requirements.','保存できません。権限・日付の順序・通知に必要な日付を確認してください。')));}return data;} + function create(initial,options={}){ + let item={...initial},draft={},saving=false,childDraft=null;const writable=options.writable!==false; + const row=el('article',undefined,'task-inline-row');row.dataset.taskId=item.uuid;row.setAttribute('role','listitem'); + const line=el('div',undefined,'task-inline-main'), dates=el('div',undefined,'task-inline-dates'), actions=el('div',undefined,'tasks-actions'),status=el('span',undefined,'task-inline-status');status.role='status'; + const inputs={}; + function message(text,state='error'){status.textContent=text;status.dataset.state=state;} + function field(key,type,container){const label=el('label'),n=el(type==='select'?'select':'input');label.append(el('span',labels[key]));if(type!=='select')n.type=type;else ['todo','doing','done','cancelled'].forEach((v,i)=>{const o=el('option',[t('To do','未着手'),t('Doing','進行中'),t('Done','完了'),t('Cancelled','取りやめ')][i]);o.value=v;n.append(o);});n.name=key;n.value=item[key]||'';n.disabled=!writable;n.ariaLabel=labels[key];if(key==='title'){n.required=true;n.maxLength=300;label.className='task-inline-title';}inputs[key]=n;label.append(n);container.append(label); + n.addEventListener('input',()=>{draft[key]=n.value;dirtyRows.add(row);});n.addEventListener('change',()=>{draft[key]=n.value;dirtyRows.add(row);flush();}); + n.addEventListener('keydown',e=>{if(e.key==='Enter'){e.preventDefault();n.blur();}if(e.key==='Escape'){e.preventDefault();n.value=item[key]||'';draft[key]=n.value;flush();}});} + field('title','text',line);field('status','select',line);['planned_on','due_on','review_on','start_on','end_on'].forEach(k=>field(k,'date',dates)); + const complete=el('button','○');complete.type='button';complete.title=complete.ariaLabel=t('Toggle completion','完了を切り替え');complete.disabled=!writable;complete.dataset.action='complete';complete.addEventListener('click',()=>{draft.status=item.status==='done'?'todo':'done';inputs.status.value=draft.status;dirtyRows.add(row);flush();});line.prepend(complete); + const parent=el('a','↳');parent.title=parent.ariaLabel=t('Parent task','親タスク');parent.hidden=!item.parent_uuid;if(item.parent_uuid){row.classList.add('task-is-child');parent.href='/v/plan/task/'+encodeURIComponent(item.parent_uuid);}row.append(parent,line,dates,actions,status); + function button(label,icon,fn){const b=el('button',icon);b.type='button';b.title=b.ariaLabel=label;b.addEventListener('click',fn);actions.append(b);return b;} + const detail=el('a','⋯');detail.title=detail.ariaLabel=t('Details','詳細');detail.href='/v/plan/task/'+item.uuid;detail.dataset.action='detail';if(options.onDetail)detail.addEventListener('click',e=>{if(e.ctrlKey||e.metaKey||e.shiftKey||e.button)return;e.preventDefault();if(blocked())return;options.onDetail(item.uuid);});actions.append(detail); + function blocked(){if(saving||dirtyRows.has(row)){message(t('Save or reload this row first.','先にこの行の変更を保存するか再読込してください。'));return true;}return false;} + button(t('Calendar time blocks','カレンダーへ時間枠を追加'),'▦',async()=>{if(blocked())return;try{const d=await request(api+'/'+item.uuid);document.getElementById('tasks-app')?.dispatchEvent(new CustomEvent('task-plan',{detail:d.item}));}catch(e){message(e.message);}}).dataset.action='plan'; + const reset=button(t('Reload row (discard edits)','行を再読込(編集を破棄)'),'↻',async()=>{if(saving)return;if(dirtyRows.has(row)&&!confirm(t('Discard changes in this row?','この行の変更を破棄しますか?')))return;try{const d=await request(api+'/'+item.uuid);item=d.item;draft={};dirtyRows.delete(row);Object.keys(inputs).forEach(k=>inputs[k].value=item[k]||'');paint();message('','idle');}catch(e){message(e.message);}});reset.dataset.action='reload'; + function buttonMore(cursor){const more=el('button',t('More subtasks','続きのサブタスク'));more.type='button';more.className='task-children-more';more.addEventListener('click',async()=>{if(dirtyRows.size)return;more.disabled=true;try{const d=await request(api+'?'+new URLSearchParams({view:'family',parent:item.uuid,limit:100,before:cursor}));if(dirtyRows.size)return;d.items.forEach(c=>more.before(create(c,{...options,initialChildren:[],context:false,nested:true})));if(d.next)more.replaceWith(buttonMore(d.next));else more.remove();}catch(e){message(e.message);}finally{more.disabled=false;}});return more;} + const children=el('div',undefined,'task-inline-children');children.hidden=true;children.role='list';children.ariaLabel=t('Subtasks','サブタスク');row.append(children); + let expand;function showChildren(show){children.hidden=!show;if(show)expandedRows.add(item.uuid);else expandedRows.delete(item.uuid);if(expand){expand.textContent=show?'▾':'▸';expand.setAttribute('aria-expanded',String(show));expand.title=expand.ariaLabel=show?t('Hide subtasks','サブタスクを閉じる'):t('Show subtasks','サブタスクを表示');}} + if(!item.parent_uuid){ + let childRequest=0,loadAll; + async function loadChildren(){ + if(blocked()||dirtyRows.size)return; + const ticket=++childRequest;showChildren(true); + try{const d=await request(api+'?'+new URLSearchParams({view:'family',parent:item.uuid,limit:100})); + if(ticket!==childRequest||dirtyRows.size||!row.isConnected)return; + children.replaceChildren();d.items.forEach(c=>children.append(create(c,{...options,initialChildren:[],context:false,nested:true}))); + if(!d.items.length)children.append(el('small',t('No subtasks.','サブタスクはありません。'))); + if(d.next)children.append(buttonMore(d.next)); + if(loadAll)loadAll.hidden=true; + }catch(e){message(e.message);} + } + expand=button(t('Show subtasks','サブタスクを表示'),'▸',()=>{if(blocked()||dirtyRows.size)return;if(!children.hidden){childRequest++;showChildren(false);}else loadChildren();});expand.dataset.action='children';expand.setAttribute('aria-expanded','false'); + if(options.initialChildren?.length){loadAll=button(t('Load all subtasks, including other dates','別の日付も含めてすべてのサブタスクを表示'),'⇊',loadChildren);loadAll.dataset.action='children-all';} + if(writable&&!item.archived){const add=el('form',undefined,'task-child-capture'),input=el('input'),submit=el('button','+');input.required=true;input.maxLength=300;input.placeholder=input.ariaLabel=t('New subtask','サブタスクを追加');submit.type='submit';submit.title=t('Add subtask','サブタスクを追加');add.append(input,submit);add.hidden=true;row.append(add);button(t('Add subtask','サブタスクを追加'),'+',()=>{if(blocked())return;add.hidden=!add.hidden;if(!add.hidden)input.focus();}).dataset.action='add-child'; + input.addEventListener('input',()=>{if(input.value)dirtyRows.add(add);else dirtyRows.delete(add);}); + add.addEventListener('submit',async e=>{e.preventDefault();if(submit.disabled||blocked())return;const title=input.value.trim();if(!title)return;submit.disabled=input.disabled=true;if(!childDraft||childDraft.title!==title)childDraft={uuid:crypto.randomUUID(),kind:'task',title,notes:'',parent_uuid:item.uuid,project_uuid:item.project_uuid,status:'todo',bucket:item.bucket,priority:item.priority,estimate_minutes:0,archived:false,version:0};try{const d=await request(api,{method:'POST',body:JSON.stringify(childDraft)});childDraft=null;childRequest++;input.value='';dirtyRows.delete(add);showChildren(true);children.querySelector('small')?.remove();children.append(create(d.item,{...options,initialChildren:[],context:false,nested:true}));document.getElementById('tasks-app')?.dispatchEvent(new Event('task-today-refresh'));}catch(err){message(err.message);}finally{submit.disabled=input.disabled=false;input.focus();}}); + } + } + if(options.context){row.dataset.context='true';const badge=el('small',t('Parent','親'),'task-context-badge');badge.title=t('Context only: this parent is outside the current filter.','親子関係を示すために表示しています。親自体は現在の条件の対象外です。');inputs.title.parentElement.append(badge);} + async function openNote(edit){if(blocked()||dirtyRows.size)return;try{let data=await request(api+'/'+item.uuid+'/note');if(!data.linked){ + if(data.exists){message(t('A page already exists here. Link it in task details.','同じPathのページが既にあります。タスクの詳細から関連付けてください。'));return;} + if(!data.writable){message(t('No permission to create this Wiki note.','このWikiメモを作成する権限がありません。'));return;} + if(!confirm(t('Create a Wiki note at ','次のPathにWikiメモを作成します:')+data.path+'\n\n'+t('Its visibility follows the Wiki path, not this private task.','公開範囲は個人タスクではなく、WikiのPathの設定に従います。')))return; + data=await request(api+'/'+item.uuid+'/note',{method:'POST',headers:{'If-Match':'"'+item.version+'"'},body:JSON.stringify({path:data.path})});item=data.item;edit=true; + } + if(edit&&!data.writable){message(t('This Wiki note is read-only.','このWikiメモは読み取り専用です。'));return;}location.assign(edit?data.edit_url:data.url); + }catch(e){message(e.message);}} + button(t('View Wiki note (create if missing)','Wikiメモを表示(未作成なら新規作成)'),'▤',()=>openNote(false)).dataset.action='note-view'; + const editNote=button(t('Edit / create Wiki note','Wikiメモを編集・新規作成'),'✎',()=>openNote(true));editNote.dataset.action='note-edit';editNote.disabled=!writable; + if(options.planDate&&writable){button(t('Schedule for ','取り組む日を変更:')+options.planDate,'→',()=>{if(blocked())return;draft.planned_on=options.planDate;inputs.planned_on.value=draft.planned_on;dirtyRows.add(row);flush();}).dataset.action='schedule-day';} + const estimate=el('small',undefined,'task-inline-estimate');actions.prepend(estimate); + function paint(){row.dataset.done=String(['done','cancelled'].includes(item.status));complete.textContent=item.status==='done'?'✓':'○';row.dataset.archived=String(item.archived);estimate.textContent=item.estimate_minutes?item.estimate_minutes+' min':'';} + async function flush(){if(saving||!writable||!Object.keys(draft).length)return;if(!inputs.title.reportValidity())return;saving=true;row.setAttribute('aria-busy','true');message(t('Saving…','保存中…'),'saving');try{while(Object.keys(draft).length){const patch={...draft};const fresh=await request(api+'/'+item.uuid);const saved=await request(api+'/'+item.uuid,{method:'PUT',headers:{'If-Match':'"'+item.version+'"'},body:JSON.stringify({...fresh.item,...patch})});item=saved.item;for(const [k,v]of Object.entries(patch)){if(draft[k]===v)delete draft[k];}paint();}dirtyRows.delete(row);message(t('Saved','保存しました'),'saved');document.getElementById('tasks-app')?.dispatchEvent(new Event('task-today-refresh'));options.onChanged?.(item,row);}catch(e){message(e.message);}finally{saving=false;row.removeAttribute('aria-busy');}} + const restoreExpanded=expandedRows.has(item.uuid); + if(options.initialChildren?.length){options.initialChildren.forEach(c=>children.append(create(c,{...options,initialChildren:[],context:false,nested:true})));showChildren(true);} + else if(expand&&restoreExpanded){queueMicrotask(()=>{if(row.isConnected)expand.click();});} + paint();return row; + } + window.addEventListener('beforeunload',e=>{if(dirtyRows.size){e.preventDefault();e.returnValue='';}}); + window.PagesWikiTaskRows={create,request,hasDirty:()=>dirtyRows.size>0}; +})(); diff --git a/static/js/task-nav.js b/static/js/task-nav.js new file mode 100644 index 0000000..3a84dfa --- /dev/null +++ b/static/js/task-nav.js @@ -0,0 +1,2 @@ +(()=>{'use strict';if(window.pageswikiTaskNav)return;window.pageswikiTaskNav=true;const button=document.querySelector('[data-tasks-today-launch]'),dialog=document.querySelector('[data-tasks-today-dialog]'),list=dialog?.querySelector('[data-tasks-today-list]');if(!button||!dialog)return;const ja=document.documentElement.lang.startsWith('ja');let controller; +button.onclick=async()=>{dialog.showModal();list.textContent=ja?'読み込み中…':'Loading…';controller?.abort();controller=new AbortController();try{const r=await fetch('/_/api/v1/extension/organizer.tasks/items?view=today&limit=100',{credentials:'same-origin',signal:controller.signal});if(!r.ok)throw Error();const data=await r.json();list.replaceChildren();for(const item of data.items){const a=document.createElement('a');a.className='notification-item task-nav-item';a.href='/v/plan/task/'+item.uuid;const state=document.createElement('span');state.textContent=item.status==='doing'?'◐':'○';const title=document.createElement('strong');title.textContent=(item.parent_uuid?'↳ ':'')+item.title;const date=document.createElement('time');date.textContent=item.due_on||item.planned_on;a.append(state,title,date);list.append(a);}if(!data.items.length)list.textContent=ja?'今日のタスクはありません。':'No tasks for today.';if(data.next){const a=document.createElement('a');a.href='/v/plan/today';a.textContent=ja?'さらに表示':'Show more';list.append(a);}}catch(e){if(e.name!=='AbortError')list.textContent=ja?'取得できませんでした。':'Unable to load tasks.';}};dialog.querySelector('[data-tasks-today-close]').onclick=()=>dialog.close();dialog.addEventListener('click',e=>{if(e.target===dialog)dialog.close();});dialog.addEventListener('close',()=>controller?.abort());})(); diff --git a/static/js/task-planning.js b/static/js/task-planning.js new file mode 100644 index 0000000..a456ce7 --- /dev/null +++ b/static/js/task-planning.js @@ -0,0 +1,69 @@ +(() => { + 'use strict'; + const app=document.getElementById('tasks-app');if(!app)return; + const ja=document.documentElement.lang.startsWith('ja'), text=(en,jp)=>ja?jp:en; + const root='/_/api/v1/extension/organizer.tasks/', writable=app.dataset.writable==='true'; + const el=(tag,value)=>{const n=document.createElement(tag);if(value!==undefined)n.textContent=value;return n;}; + const dialog=el('dialog');dialog.id='tasks-plan-dialog';dialog.setAttribute('aria-labelledby','tasks-plan-title'); + const header=el('header');header.className='tasks-toolbar';const title=el('h2',text('Calendar time blocks','カレンダーの時間枠'));title.id='tasks-plan-title'; + const close=el('button','×');close.type='button';close.ariaLabel=text('Close','閉じる');header.append(title,close); + const help=el('p',text('Private local calendars only. Event titles include the task title; sharing this calendar later exposes that title. Notes are not copied. Unlink keeps the event.','自分専用・非公開のローカルカレンダーのみ。予定名にタスクの件名を含めます。後からカレンダーを公開・共有すると件名も見えます。メモはコピーせず、関連を解除しても予定は残ります。'));help.className='tasks-muted'; + const form=el('form'), inputs={}, fields=el('div');fields.className='task-plan-fields'; + function field(name,label,type){const wrap=el('label',label),input=el(type==='select'?'select':'input');if(type!=='select')input.type=type;input.name=name;input.required=true;inputs[name]=input;wrap.append(input);fields.append(wrap);return input;} + const select=field('calendar_uuid',text('Calendar','カレンダー'),'select'); + const start=field('start',text('Start','開始'),'datetime-local'),end=field('end',text('End','終了'),'datetime-local');start.step=end.step=60; + const zone=el('small'),save=el('button',text('Add time block','時間枠を追加'));save.type='submit';form.append(fields,zone,save); + const status=el('p');status.role='status';status.setAttribute('aria-live','polite'); + const list=el('div');list.id='tasks-plan-list';const more=el('button',text('Load more','続きを表示'));more.type='button';more.hidden=true; + const refresh=el('button','↻');refresh.type='button';refresh.ariaLabel=refresh.title=text('Refresh','更新');header.append(refresh); + dialog.append(header,help,form,status,list,more);app.append(dialog); + let task,ticket=0,busy=false,mutating=false,controller=null,draft=null,items=[],offset=0,timezone=app.dataset.timezone; + const message=code=>({conflict:text('Changed elsewhere, or this request was unlinked. Reopen the task to review it.','別の画面で変更されたか、関連付けが解除されています。タスクを開き直してください。'),forbidden:text('This calendar must be private, local and owned by you.','自分所有の非公開・ローカルカレンダーのみ利用できます。'),not_found:text('Unavailable. Check the calendar and extension settings.','利用できません。カレンダーや拡張機能の設定を確認してください。'),invalid:text('Check dates (up to 24 hours), task status and timezone.','日時(24時間以内)・タスクの状態・タイムゾーンを確認してください。')}[code]||text('Request failed. Retry using the same request, or reopen this dialog to inspect pending blocks.','処理に失敗しました。同じ要求を再試行するか、画面を開き直して未完了の関連付けを確認してください。')); + async function request(path,options={}){ + const res=await fetch(root+path,{credentials:'same-origin',signal:AbortSignal.any([controller.signal,AbortSignal.timeout(15000)]),...options,headers:{'Content-Type':'application/json',...options.headers}}); + if(res.status===204)return{};const data=await res.json().catch(()=>({}));if(!res.ok||res.redirected)throw new Error(message(data.error||(res.status===404?'not_found':'')));return data; + } + function localValue(date){const p=new Intl.DateTimeFormat('en-CA',{timeZone:timezone,year:'numeric',month:'2-digit',day:'2-digit',hour:'2-digit',minute:'2-digit',hourCycle:'h23'}).formatToParts(date);const get=k=>p.find(v=>v.type===k).value;return `${get('year')}-${get('month')}-${get('day')}T${get('hour')}:${get('minute')}`;} + function display(date){return new Intl.DateTimeFormat(ja?'ja-JP':'en-GB',{timeZone:timezone,month:'short',day:'numeric',hour:'2-digit',minute:'2-digit'}).format(new Date(date));} + function lock(value){busy=value;close.disabled=value&&mutating;refresh.disabled=more.disabled=value;save.disabled=value;Object.values(inputs).forEach(n=>n.disabled=value||!!draft);list.querySelectorAll('button').forEach(n=>n.disabled=value||!writable);} + function dismiss(){if(mutating)return;ticket++;controller?.abort();dialog.close();draft=null;} + close.addEventListener('click',dismiss);dialog.addEventListener('cancel',e=>{e.preventDefault();dismiss();}); + async function appendRows(gen){ + const batch=items.slice(offset,offset+10);offset+=batch.length;more.hidden=offset>=items.length; + for(const b of batch){ + if(gen!==ticket||!dialog.open)return; + const row=el('section');row.className='task-plan-row';row.dataset.uuid=b.uuid;const summary=el('span',display(b.start)+' – '+display(b.end));row.append(summary);list.append(row); + try{ + const current=await request('blocks/'+b.uuid);if(gen!==ticket)return; + if(current.available){const a=el('a',display(current.start)+' – '+display(current.end));a.href=current.href;summary.replaceWith(a);} + else summary.textContent=text('Event unavailable (removed, shared, or calendar unavailable)','予定を参照できません(削除・共有・カレンダー利用不可)'); + if(b.state==='pending')row.append(el('small',text('Pending request','未完了の連携要求'))); + }catch(e){summary.textContent=e.message;} + if(!writable)continue; + const actions=el('div');actions.className='tasks-actions'; + if(b.state==='pending'){const retry=el('button',text('Retry','再試行'));retry.type='button';retry.addEventListener('click',()=>mutate(()=>request('blocks',{method:'POST',body:JSON.stringify({uuid:b.uuid,task_uuid:task.uuid,task_version:task.version,calendar_uuid:b.calendar_uuid,start:b.start,end:b.end})})));actions.append(retry);} + const unlink=el('button',text('Unlink','関連を解除'));unlink.type='button';unlink.addEventListener('click',()=>{if(confirm(text('Unlink? The calendar event will be kept.','関連を解除しますか? カレンダーの予定は残ります。')))mutate(()=>request('blocks/'+b.uuid,{method:'DELETE'}));});actions.append(unlink);row.append(actions); + } + } + async function reload(){const gen=++ticket;status.textContent=text('Loading…','読み込み中…');const data=await request('blocks?task_uuid='+encodeURIComponent(task.uuid));if(gen!==ticket)return;items=data.items;offset=0;list.replaceChildren();await appendRows(gen);if(gen===ticket)status.textContent=items.length?'':text('No time blocks yet.','時間枠はまだありません。');} + async function mutate(fn){if(busy)return;mutating=true;lock(true);status.textContent='';try{await fn();app.dispatchEvent(new Event('task-today-refresh'));mutating=false;lock(true);await reload();}catch(e){status.textContent=e.message;}finally{mutating=false;lock(false);}} + more.addEventListener('click',async()=>{if(busy)return;lock(true);try{await appendRows(ticket);}finally{lock(false);}}); + refresh.addEventListener('click',()=>mutate(async()=>{})); + form.addEventListener('submit',e=>{e.preventDefault();if(busy||!task)return; + if(!draft)draft={uuid:crypto.randomUUID(),task_uuid:task.uuid,task_version:task.version,calendar_uuid:select.value,start:start.value,end:end.value,timezone}; + mutate(async()=>{await request('blocks',{method:'POST',body:JSON.stringify(draft)});draft=null;}); + }); + app.addEventListener('task-plan',async e=>{ + if(dialog.open||busy)return;controller=new AbortController();task=e.detail;draft=null;list.replaceChildren();more.hidden=true;form.hidden=true;status.textContent=text('Loading…','読み込み中…');dialog.showModal();const gen=++ticket;lock(true); + try{const data=await request('calendars');if(gen!==ticket)return;timezone=data.timezone;zone.textContent=timezone;select.replaceChildren();data.items.forEach(c=>{const o=el('option',c.name+' ('+c.pretty_name+')');o.value=c.id;select.append(o);}); + const now=new Date(Math.ceil(Date.now()/300000)*300000);start.value=localValue(now);end.value=localValue(new Date(now.getTime()+Math.min(1440,task.estimate_minutes||25)*60000)); + const plannedDate=app.dataset.view==='day'?app.dataset.selectedDate:task.planned_on; + if(/^\d{4}-\d{2}-\d{2}$/.test(plannedDate||'')){ + start.value=plannedDate+start.value.slice(10); + const wallTime=new Date(start.value+':00Z');wallTime.setUTCMinutes(wallTime.getUTCMinutes()+Math.min(1440,task.estimate_minutes||25));end.value=wallTime.toISOString().slice(0,16); + } + form.hidden=!writable||task.archived||['done','cancelled'].includes(task.status)||!data.items.length; + await reload();if(!data.items.length)status.textContent=text('Create a private local calendar in Calendar settings first.','カレンダーの設定で、自分専用の非公開ローカルカレンダーを作成してください。'); + }catch(err){status.textContent=err.message;}finally{lock(false);} + }); +})(); diff --git a/static/js/task-schedule.js b/static/js/task-schedule.js new file mode 100644 index 0000000..f67bab0 --- /dev/null +++ b/static/js/task-schedule.js @@ -0,0 +1,2 @@ +(()=>{'use strict';const root=document.getElementById('task-schedule');if(!root)return;const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en,month=root.dataset.month,project=new URLSearchParams(location.search).get('project')||'',[year,m]=month.split('-').map(Number),days=new Date(Date.UTC(year,m,0)).getUTCDate();const url=(y,n)=>'/v/plan/tasks/schedule/'+y+'/'+String(n).padStart(2,'0')+(project?'?project='+encodeURIComponent(project):'');const prev=new Date(Date.UTC(year,m-2,1)),next=new Date(Date.UTC(year,m,1));root.querySelector('[data-previous]').href=url(prev.getUTCFullYear(),prev.getUTCMonth()+1);root.querySelector('[data-next]').href=url(next.getUTCFullYear(),next.getUTCMonth()+1);root.querySelector('h1').textContent=t('Day schedule','日割り工程表');const input=root.querySelector('input');input.value=month;input.onchange=()=>{if(input.value){const [y,n]=input.value.split('-');location.href=url(y,n);}};root.querySelector('[data-help]').textContent=t('Inclusive work dates, independent of hourly calendar blocks. Change dates inline in the task list. Up to 200 items per month.','工程の開始日・終了日(両端を含む)です。時間枠のカレンダーとは独立しています。日付はタスク一覧で編集できます。月あたり最大200件。');const grid=root.querySelector('[role=table]');grid.style.setProperty('--days',days);const node=(tag,text,cls)=>{const n=document.createElement(tag);n.textContent=text;if(cls)n.className=cls;return n;};const head=node('div','','task-schedule-row');head.append(node('strong',t('Task / subtask','タスク/サブタスク')));for(let i=1;i<=days;i++){const d=node('span',i);d.title=new Date(Date.UTC(year,m-1,i)).toLocaleDateString(undefined,{weekday:'long',timeZone:'UTC'});head.append(d);}grid.append(head); +fetch('/_/api/v1/extension/organizer.tasks/schedule?'+new URLSearchParams({month,project}),{credentials:'same-origin',signal:AbortSignal.timeout(15000)}).then(async r=>{if(!r.ok)throw Error();return r.json();}).then(data=>{for(const item of data.items){const row=node('div','','task-schedule-row'),a=node('a',(item.parent_uuid?'↳ ':'')+item.title);a.href='/v/plan/task/'+item.uuid;a.title=item.title;row.append(a);const start=item.start_on||item.end_on,end=item.end_on||item.start_on,left=startmonth+'-'+days?days:Number(end.slice(-2));const bar=node('a',start+' – '+end,'task-schedule-bar');bar.href=a.href;bar.title=item.title+' · '+bar.textContent;bar.style.gridColumn=(left+1)+' / '+(right+2);bar.dataset.status=item.status;row.append(bar);grid.append(row);}root.querySelector('[role=status]').textContent=data.partial?t('First 200 items shown. Filter by project.','200件まで表示しています。プロジェクトで絞り込んでください。'):data.items.length?'':t('No scheduled tasks.','工程日が設定されたタスクはありません。');}).catch(()=>{root.querySelector('[role=status]').textContent=t('Unable to load schedule.','工程表を取得できません。');});})(); diff --git a/static/js/task-today.js b/static/js/task-today.js new file mode 100644 index 0000000..ed7152e --- /dev/null +++ b/static/js/task-today.js @@ -0,0 +1,36 @@ +(() => { + 'use strict'; + const app=document.getElementById('tasks-app');if(!app||app.dataset.view!=='today')return; + const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en; + const el=(tag,value)=>{const n=document.createElement(tag);if(value!==undefined)n.textContent=value;return n;}; + const panel=el('section');panel.id='tasks-day';panel.ariaLabel=t('Today overview','今日の見通し'); + const cards=el('div');cards.className='task-day-cards';const stats={}; + [['estimate',t('Remaining task estimates','未完了タスクの見積もり')],['allocated',t('Calendar time blocks','今日の時間枠')],['focus',t('Recorded focus time','記録済みの集中時間')]].forEach(([key,label])=>{const card=el('div');const value=el('strong','—');stats[key]=value;card.append(el('small',label),value);cards.append(card);}); + const note=el('p');note.className='tasks-muted';note.role='status'; + const details=el('details'),heading=el('summary',t('Today’s time blocks','今日の時間枠を表示')),list=el('ol');list.id='tasks-day-blocks';details.append(heading,list); + panel.append(cards,note,details);document.getElementById('tasks-help').after(panel); + let busy=false,queued=false,generation=0,controller,last=0; + const duration=ms=>{const minutes=Math.floor(ms/60000);return minutes>=60?`${Math.floor(minutes/60)}${t('h ','時間 ')}${minutes%60}${t('m','分')}`:`${minutes}${t(' min','分')}`;}; + async function load(){ + if(document.hidden){queued=true;return;}if(busy){queued=true;return;} + busy=true;queued=false;const ticket=++generation;controller=new AbortController(); + try{ + const res=await fetch('/_/api/v1/extension/organizer.tasks/today',{credentials:'same-origin',signal:AbortSignal.any([controller.signal,AbortSignal.timeout(15000)])}); + if(!res.ok||res.redirected)throw Error(t('Overview unavailable. Refresh to retry.','集約情報を取得できません。更新して再試行してください。'));const data=await res.json();if(ticket!==generation)return; + last=Date.now();stats.estimate.textContent=duration(data.summary.estimate_minutes*60000)+(data.summary.tasks_partial?' +':'');stats.allocated.textContent=data.calendar_enabled?duration(data.allocated_ms)+(data.blocks_partial||data.unavailable_calendars?' +':''):'—';stats.focus.textContent=duration(data.summary.focus_ms)+(data.summary.focus_partial?' +':''); + const messages=[t('Estimates include unfinished tasks planned for today or due by today. Focus excludes breaks; values are as of refresh.','見積もりは今日取り組む・今日までが期限の未完了タスク。集中時間は休憩を除いた更新時点の記録です。')]; + if(data.overlap_ms>0)messages.push(t('Overlapping allocations: ','時間枠の重複:')+duration(data.overlap_ms)); + if(data.summary.tasks_partial||data.summary.focus_partial||data.blocks_partial)messages.push(t('Only a bounded subset is shown (+); totals may be incomplete.','表示上限に達したため一部のみの集計です(+)。')); + if(data.unavailable_calendars)messages.push(t('Some linked calendars are unavailable or no longer private/local.','取得できない、または非公開・ローカルの条件を満たさなくなったカレンダーがあります。')); + if(!data.calendar_enabled)messages.push(t('Calendar extension disabled.','カレンダー拡張は無効です。')); + note.textContent=messages.join(' ');list.replaceChildren(); + const fmt=new Intl.DateTimeFormat(ja?'ja-JP':'en-GB',{timeZone:data.timezone,month:'numeric',day:'numeric',hour:'2-digit',minute:'2-digit'}); + data.blocks.forEach(b=>{const row=el('li'),time=el('a',fmt.format(new Date(b.start_ms))+' – '+fmt.format(new Date(b.end_ms)));time.href=b.href;time.title=t('Open calendar event','カレンダーの予定を開く');const task=el('a',b.title);task.href='/v/plan/task/'+encodeURIComponent(b.task_uuid);row.append(time,task);list.append(row);}); + if(!data.blocks.length)list.append(el('li',t('No linked time blocks today.','今日の関連する時間枠はありません。'))); + }catch(e){if(e.name!=='AbortError')note.textContent=e.message;} + finally{busy=false;if(queued&&!document.hidden){queued=false;load();}} + } + app.addEventListener('task-today-refresh',load);document.getElementById('tasks-refresh').addEventListener('click',load); + document.addEventListener('visibilitychange',()=>{if(document.hidden){generation++;controller?.abort();}else if(queued||Date.now()-last>30000)load();}); + load(); +})(); diff --git a/static/js/tasks.js b/static/js/tasks.js new file mode 100644 index 0000000..e08e471 --- /dev/null +++ b/static/js/tasks.js @@ -0,0 +1,150 @@ +(() => { + 'use strict'; + const app = document.getElementById('tasks-app'); if (!app) return; + const ja = document.documentElement.lang.startsWith('ja'); + const words = { + carryover:['Carryover','持ち越し'],tomorrow:['Tomorrow','明日'],day:['Daily plan','日別の計画'],notes_subpath:['Wiki note subfolder (relative to the project Wiki page)','Wikiメモのサブ階層(プロジェクトの関連Wiki配下)'], + start_on:['Work starts','工程開始'],end_on:['Work ends','工程終了'],schedule:['Day schedule','日割り工程表'], + notify_due:['Notify on due date','期限日にInboxへ通知'],notify_planned:['Notify on planned date','取り組む日にInboxへ通知'],reminder_time:['Notification time','通知時刻'],reminder_help:['Inbox only. Saved using the Domain timezone. Missed reminders from earlier days are skipped.','Inbox通知のみ。保存時のドメインのタイムゾーンを使用します。前日以前の未配信分は送りません。'],reminder_zone:['Timezone on save','保存時のタイムゾーン'], + task:['Task','タスク'], kind:['Show','表示対象'], archivedProjects:['Archived projects','アーカイブ済みのプロジェクト'], + today:['Today','今日'], all:['All active tasks','すべての未完了'], inbox:['Inbox','取り込み箱'], backlog:['Backlog','Backlog'], someday:['Someday','いつか'], review:['Review','見直し'], done:['Completed','完了'], archived:['Archived','アーカイブ'], projects:['Projects','プロジェクト'], + newTask:['New task','タスクを作成'], newProject:['New project','プロジェクトを作成'], edit:['Edit','編集'], close:['Close','閉じる'], save:['Save','保存'], archive:['Archive','アーカイブ'], restore:['Restore','復元'], more:['Load more','続きを表示'], refresh:['Refresh','更新'], search:['Filter titles','タイトルを絞り込む'], quick:['Capture a task…','タスクを書き留める…'], empty:['No matching items.','該当する項目はありません。'], loading:['Loading…','読み込み中…'], title:['Title','件名'], notes:['Notes (plain text)','メモ(プレーンテキスト)'], project:['Project','プロジェクト'], status:['Status','状態'], bucket:['Bucket','整理先'], priority:['Priority','優先度'], estimate:['Estimate (minutes)','見積もり(分)'], due_on:['Due date','期限'], planned_on:['Planned date','取り組む日'], review_on:['Review date','見直す日'], page:['Related Wiki Path','関連するWikiのPath'], noProject:['No project','プロジェクトなし'], todo:['To do','未着手'], doing:['In progress','進行中'], cancelled:['Cancelled','取りやめ'], normal:['Normal','通常'], low:['Low','低'], high:['High','高'], urgent:['Urgent','最優先'], history:['Revision history','変更履歴'], openProject:['Open project','プロジェクトを開く'], complete:['Complete','完了にする'], reopen:['Reopen','未完了に戻す'], private:['Private to you in this Domain.','このドメイン内の自分専用です。'], reviewHelp:['Review dates due, or active tasks unchanged for 30 days.','見直す日を迎えたタスク、または30日間変更されていない未完了のタスクです。'], todayHelp:['Tasks planned for today and tasks due today or overdue.','今日取り組むタスクと、今日までに期限を迎えた未完了のタスクです。'], conflict:['Changed in another window. Close and reopen to review the latest version. Your input has not been discarded.','別の画面で更新されています。入力内容は残しています。内容を控え、閉じて再度開くと最新版を確認できます。'], forbidden:['You do not have permission for this operation.','この操作の権限がありません。'], invalid:['Check the fields and the Wiki Path.','入力内容とWikiのPathを確認してください。'], not_found:['Item not found or no longer accessible.','項目が見つからないか、アクセスできません。'], internal:['The operation failed. Please try again.','処理に失敗しました。再度お試しください。'], busy:['The server is busy. Please try again.','処理が混み合っています。再度お試しください。'], login:['Please sign in again.','再度ログインしてください。'], projectSearch:['Find a project by title (up to 100 matches)','プロジェクト名で検索(最大100件)'], readonly:['Read-only account','読み取り専用アカウント'], linked:['Open related page','関連ページを開く'], hiddenLink:['The linked page is unavailable. Leave this blank to keep its reference.','関連ページは現在表示できません。未変更なら参照を保持します。'], unlink:['Remove page link','ページとの関連付けを解除'], discard:['Discard unsaved changes?','保存していない変更を破棄しますか?'] + }; + const t = key => (words[key] || words.internal)[ja ? 1 : 0]; + const $ = id => document.getElementById('tasks-' + id); + const api = '/_/api/v1/extension/organizer.tasks/items'; + const view = app.dataset.view, projectID = view === 'project' ? app.dataset.id : ''; + const writable = app.dataset.writable === 'true'; + let today = app.dataset.today; + let selectedDate=app.dataset.selectedDate||today; + const loadedItems=new Map(),contextParents=new Map(); + const nextDay=date=>{const d=new Date(date+'T12:00:00Z');d.setUTCDate(d.getUTCDate()+1);return d.toISOString().slice(0,10);}; + const el = (tag, text, cls) => { const n = document.createElement(tag); if (text !== undefined) n.textContent = text; if (cls) n.className = cls; return n; }; + let generation = 0, next = '', editing = null, saving = false, dirty = false, detailGeneration = 0, projectGeneration = 0; + let listController, dialogController; + async function request(url, options = {}) { + const res = await fetch(url, { credentials:'same-origin', ...options, headers: { 'Content-Type':'application/json', ...options.headers } }); + if (res.status === 401 || res.redirected) throw new Error(t('login')); + const data = await res.json().catch(() => ({})); + if (!res.ok) throw new Error(t(data.error || 'internal')); + return data; + } + const href = item => '/v/plan/' + item.kind + '/' + encodeURIComponent(item.uuid); + const routes = {today:'/v/plan/today',all:'/v/plan/tasks',projects:'/v/plan/projects'}; + const icons = {carryover:'↶',today:'☀',tomorrow:'⇢',inbox:'↓',backlog:'≡',someday:'◇',review:'↻',all:'☷',projects:'▱',done:'✓',archived:'▣'}; + Object.keys(icons).forEach(key => { const a = el('a'); a.href = routes[key] || '/v/plan/tasks/' + key; a.append(el('span',icons[key]),el('span',t(key))); if(view===key||(key==='tomorrow'&&view==='day'&&selectedDate===nextDay(today)))a.setAttribute('aria-current','page'); $('nav').append(a); }); + const schedule=el('a','▦ '+t('schedule'));schedule.href='/v/plan/tasks/schedule'+(projectID?'?project='+projectID:'');$('nav').append(schedule); + $('date').textContent = view==='day'?selectedDate:today; $('heading').textContent = t(view === 'project' ? 'project' : view === 'detail' || view === 'new' ? 'all' : view); + $('help').textContent = t(view==='today'?'todayHelp':view==='review'?'reviewHelp':'private'); + $('search-label').textContent=t('search');$('quick-title').placeholder=t('quick');$('quick-title').setAttribute('aria-label',t('title')); + $('kind-control').hidden=view!=='archived';$('kind-control').querySelector('span').textContent=t('kind');['task','project'].forEach(k=>{const o=el('option',t(k));o.value=k;$('kind').append(o);});$('kind').value=new URLSearchParams(location.search).get('kind')==='project'?'project':'task';$('kind').addEventListener('change',()=>load());$('project-archive').hidden=view!=='projects';$('project-archive').textContent=t('archivedProjects'); + $('new').title=$('new').ariaLabel=t(view==='projects'?'newProject':'newTask');$('refresh').title=$('refresh').ariaLabel=t('refresh');$('close').ariaLabel=t('close');$('more').textContent=t('more');$('save').textContent=t('save');$('history').querySelector('summary').textContent=t('history'); + $('capture').hidden=!writable||view==='projects'||view==='archived'||view==='done';$('new').hidden=!writable; + if(['today','day','carryover'].includes(view)){ + const bar=el('nav',undefined,'task-date-nav');bar.ariaLabel=ja?'計画する日':'Planning date'; + const input=el('input');input.type='date';input.value=selectedDate;input.ariaLabel=bar.ariaLabel; + const go=date=>{if(date)location.assign('/v/plan/tasks/day/'+date.replaceAll('-','/'));}; + const previous=el('button','‹'),following=el('button','›');previous.type=following.type='button';previous.title=previous.ariaLabel=ja?'前の日':'Previous day';following.title=following.ariaLabel=ja?'次の日':'Next day'; + previous.onclick=()=>{const d=new Date(selectedDate+'T12:00:00Z');d.setUTCDate(d.getUTCDate()-1);go(d.toISOString().slice(0,10));};following.onclick=()=>go(nextDay(selectedDate));input.onchange=()=>{if(input.validity.valid)go(input.value);}; + bar.append(previous,input,following); + if(view==='carryover'){const label=el('label',ja?'割り当て先':'Schedule for'),target=el('input');target.type='date';target.value=selectedDate;target.ariaLabel=ja?'持ち越しの割り当て先':'Carryover target date';target.addEventListener('change',()=>{if(!target.value||!target.validity.valid)return;if(window.PagesWikiTaskRows.hasDirty()){target.value=selectedDate;return;}selectedDate=target.value;renderGroups();});label.append(target);bar.replaceChildren(label);} + $('help').after(bar); + if(view==='day')$('help').textContent=ja?'選択日に取り組む、または期限を迎える未完了タスク。新規タスクもこの日に割り当てます。':'Unfinished tasks planned or due on this date. New tasks are scheduled for this date.'; + if(view==='carryover')$('help').textContent=ja?'昨日以前の計画・期限が残っている未完了タスク。行の矢印で割り当て直します(期限は変更しません)。':'Unfinished tasks planned or due before today. Use the row arrow to reschedule without changing the due date.'; + } + if(!writable)$('help').textContent+=' '+t('readonly'); + function blank(kind='task') { return { uuid:crypto.randomUUID(),kind,title:'',notes:'',status:'todo',bucket:['inbox','backlog','someday'].includes(view)?view:'inbox',priority:1,estimate_minutes:0,project_uuid:kind==='task'?projectID:'',page_uuid:'',due_on:'',planned_on:['today','day'].includes(view)&&kind==='task'?(view==='day'?selectedDate:today):'',review_on:'',archived:false,version:0 }; } + function listView(){return ['project','detail','new'].includes(view)?'all':view;} + async function load(append=false) { + if(window.PagesWikiTaskRows?.hasDirty()){$('status').textContent=ja?'編集中の行を保存または再読込してください。':'Save or reload edited rows first.';return;} + const ticket=++generation; listController?.abort();listController=new AbortController();$('status').textContent=t('loading');$('more').disabled=true; + const q=new URLSearchParams({kind:view==='projects'?'project':view==='archived'?$('kind').value:'task',view:listView(),q:$('search').value,project:projectID,hierarchy:'1'});if(view==='day')q.set('date',selectedDate);if(append&&next)q.set('before',next); + const parent=new URLSearchParams(location.search).get('parent');if(parent){q.set('parent',parent);q.set('view','family');} + try { const data=await request(api+'?'+q,{signal:listController.signal});if(ticket!==generation||window.PagesWikiTaskRows?.hasDirty())return;if(data.today){today=data.today;$('date').textContent=view==='day'?selectedDate:today;}if(!append){loadedItems.clear();contextParents.clear();}data.items.forEach(item=>loadedItems.set(item.uuid,item));(data.parents||[]).forEach(item=>contextParents.set(item.uuid,item));renderGroups();next=data.next;$('more').hidden=!next;$('status').textContent=$('list').children.length?'':t('empty'); } + catch(e){if(e.name!=='AbortError'&&ticket===generation)$('status').textContent=e.message;}finally{if(ticket===generation)$('more').disabled=false;} + } + function rowOptions(extra={}){return {writable,onDetail:open,planDate:view==='carryover'?selectedDate:'',onChanged:(saved,row)=>{loadedItems.set(saved.uuid,saved);if(view==='carryover'){load();return;}if(!window.PagesWikiTaskRows.hasDirty()&&(['done','cancelled'].includes(saved.status)&&!['done','archived'].includes(view))){if(row.querySelector('.task-inline-children .task-inline-row'))load();else{loadedItems.delete(saved.uuid);row.remove();}}},...extra};} + function renderGroups(){ + $('list').replaceChildren(); + const groups=new Map(); + for(const item of loadedItems.values()){ + if(item.kind!=='task'){renderRow(item);continue;} + const root=item.parent_uuid||item.uuid; + if(!groups.has(root))groups.set(root,{parent:null,children:[]}); + const group=groups.get(root);if(item.parent_uuid)group.children.push(item);else group.parent=item; + } + for(const [id,group]of groups){ + const parent=group.parent||contextParents.get(id); + if(parent)$('list').append(window.PagesWikiTaskRows.create(parent,rowOptions({context:!group.parent,initialChildren:group.children}))); + else group.children.forEach(renderRow); + } + } + function renderRow(item) { + if(item.kind==='task'&&window.PagesWikiTaskRows){$('list').append(window.PagesWikiTaskRows.create(item,rowOptions()));return;} + const row=el('div',undefined,'task-row');row.role='listitem';row.dataset.done=String(item.status==='done'||item.status==='cancelled'); + if(item.kind==='task'&&writable){const b=el('button',item.status==='done'?'✓':'○');b.type='button';b.title=b.ariaLabel=t(item.status==='done'?'reopen':'complete');b.addEventListener('click',async()=>{b.disabled=true;try{const {item:fresh}=await request(api+'/'+item.uuid);fresh.status=fresh.status==='done'?'todo':'done';await saveItem(fresh);await load();}catch(e){$('status').textContent=e.message;}finally{b.disabled=false;}});row.append(b);} + const main=el('div',undefined,'task-row-main'), a=el('a',item.title);a.href=href(item);if(item.kind==='task')a.addEventListener('click',e=>{if(e.button||e.ctrlKey||e.metaKey||e.shiftKey||e.altKey)return;e.preventDefault();open(item.uuid);});main.append(a); + const meta=el('div',undefined,'task-row-meta');meta.append(el('span',t(item.status)));if(item.kind==='task'){if(item.due_on)meta.append(el('span',t('due_on')+' '+item.due_on,item.due_on=2)meta.append(el('span',t(item.priority===3?'urgent':'high')));if(item.estimate_minutes)meta.append(el('span',item.estimate_minutes+' min'));}main.append(meta);row.append(main);$('list').append(row); + } + const fields={}; + function field(name,label,type,value,full=false,options=null){const l=el('label',label,full?'task-full':'');let input=el(type==='textarea'?'textarea':options?'select':'input');if(options)options.forEach(([val,text])=>{const o=el('option',text);o.value=val;input.append(o);});else if(type!=='textarea')input.type=type;input.name=name;input.value=value??'';input.disabled=!writable;fields[name]=input;l.append(input);$('fields').append(l);return input;} + async function fillProjects(selected) { + const ticket=++projectGeneration, target=fields.project_uuid;if(!target)return; + try {const data=await request(api+'?'+new URLSearchParams({kind:'project',view:'all',limit:'100',q:fields.project_search?.value||''}));if(ticket!==projectGeneration||target!==fields.project_uuid)return;const items=data.items;if(selected&&!items.some(p=>p.uuid===selected)){try{const d=await request(api+'/'+selected);if(d.item.kind==='project')items.unshift(d.item);}catch{ /* inaccessible reference is not exposed */ }}target.replaceChildren();const none=el('option',t('noProject'));none.value='';target.append(none);items.forEach(p=>{const o=el('option',p.title);o.value=p.uuid;target.append(o);});target.value=selected||'';if(selected&&target.value!==selected){const o=el('option',t('not_found'));o.value=selected;target.append(o);target.value=selected;}} + catch(e){$('error').textContent=e.message;} + } + async function open(id,kind='task') { + if($('dialog').open&&!closeDialog())return; + const ticket=++detailGeneration;dialogController?.abort();dialogController=new AbortController();$('error').textContent='';editing=null;dirty=false;$('fields').replaceChildren();Object.keys(fields).forEach(k=>delete fields[k]);$('history').open=false;$('history').querySelector('ol').replaceChildren();$('dialog-title').textContent=t('loading');$('save').disabled=true;$('archive').hidden=true;$('history').hidden=true;$('project-open').hidden=true;$('dialog').showModal(); + try { + const data=id?await request(api+'/'+id,{signal:dialogController.signal}):{item:blank(kind),page_path:''};if(ticket!==detailGeneration)return;editing=data.item; + $('dialog-title').textContent=t(id?'edit':kind==='project'?'newProject':'newTask'); + const title=field('title',t('title'),'text',editing.title,true);title.required=true;title.maxLength=300; + const notes=field('notes',t('notes'),'textarea',editing.notes,true);notes.maxLength=16384; + if(editing.kind==='task'){ + field('status',t('status'),'select',editing.status,false,['todo','doing','done','cancelled'].map(k=>[k,t(k)])); + field('bucket',t('bucket'),'select',editing.bucket,false,['inbox','backlog','someday'].map(k=>[k,t(k)])); + field('project_search',t('projectSearch'),'search','',true).addEventListener('input',debounce(()=>fillProjects(fields.project_uuid.value),250)); + field('project_uuid',t('project'),'select',editing.project_uuid,true,[[editing.project_uuid,t(editing.project_uuid?'loading':'noProject')]]);await fillProjects(editing.project_uuid);if(ticket!==detailGeneration)return; + field('priority',t('priority'),'select',editing.priority,false,[[0,t('low')],[1,t('normal')],[2,t('high')],[3,t('urgent')]]); + const estimate=field('estimate_minutes',t('estimate'),'number',editing.estimate_minutes);estimate.min=0;estimate.max=10080; + ['due_on','planned_on','review_on','start_on','end_on'].forEach(k=>field(k,t(k),'date',editing[k])); + ['notify_due','notify_planned'].forEach(k=>{const input=field(k,t(k),'checkbox','',true);input.checked=!!editing[k];input.parentElement.classList.add('task-toggle');}); + const clock=field('reminder_time',t('reminder_time'),'time',editing.reminder_time||'09:00');clock.step=60; + const reminderHelp=el('small',t('reminder_help')+' '+t('reminder_zone')+': '+app.dataset.timezone,'task-full');$('fields').append(reminderHelp); + const requirements=()=>{fields.due_on.required=fields.notify_due.checked;fields.planned_on.required=fields.notify_planned.checked;clock.required=fields.notify_due.checked||fields.notify_planned.checked;};fields.notify_due.addEventListener('change',requirements);fields.notify_planned.addEventListener('change',requirements);requirements(); + } + if(editing.kind==='project'){const folder=field('notes_subpath',t('notes_subpath'),'text',editing.notes_subpath||'tasks',true);folder.maxLength=500;folder.placeholder='tasks';$('fields').append(el('small',ja?'例:関連Wikiが /projects/app、サブ階層が tasks → /projects/app/tasks/件名。Wikiの公開範囲に従います。':'Example: project Wiki /projects/app + subfolder tasks → /projects/app/tasks/title. Wiki permissions apply.','task-full'));} + field('page_path',t('page'),'text',data.page_path,true).placeholder='/lab/project'; + if(data.page_path){const a=el('a',t('linked')+' ↗');a.href='/'+data.page_path.replace(/^\/+/, '').split('/').map(encodeURIComponent).join('/');$('fields').append(a);}else if(editing.page_uuid)$('fields').append(el('small',t('hiddenLink'))); + if(editing.page_uuid){const unlink=el('button',t('unlink'));unlink.type='button';unlink.disabled=!writable;unlink.addEventListener('click',()=>{editing.page_uuid='';fields.page_path.value='';fields.page_path.dataset.changed='true';dirty=true;unlink.disabled=true;});$('fields').append(unlink);} + fields.page_path.addEventListener('input',()=>{fields.page_path.dataset.changed='true';}); + if(id&&editing.kind==='task'){ + if(writable&&!editing.archived&&!['done','cancelled'].includes(editing.status)){const focus=el('button',ja?'◷ このタスクに集中':'◷ Focus on this task','task-full');focus.type='button';focus.addEventListener('click',()=>{if(dirty){$('error').textContent=ja?'先にタスクの変更を保存してください。':'Save your task changes first.';return;}const task={...editing};if(closeDialog())app.dispatchEvent(new CustomEvent('task-focus',{detail:task}));});$('fields').append(focus);} + const plan=el('button',ja?'▦ 時間枠をカレンダーへ':'▦ Calendar time blocks','task-full');plan.type='button';plan.id='tasks-plan-open'; + plan.addEventListener('click',()=>{if(dirty){$('error').textContent=ja?'先にタスクの変更を保存してください。':'Save your task changes first.';return;}app.dispatchEvent(new CustomEvent('task-plan',{detail:{...editing}}));});$('fields').append(plan); + } + $('archive').hidden=!id||!writable;$('archive').textContent=t(editing.archived?'restore':'archive');$('save').hidden=!writable;$('save').disabled=false;$('history').hidden=!id; + if(editing.kind==='project'&&id){$('project-open').hidden=false;$('project-open').href=href(editing);$('project-open').textContent=t('openProject');} + title.focus(); + }catch(e){if(e.name!=='AbortError'&&ticket===detailGeneration)$('error').textContent=e.message;} + } + function closeDialog(force=false){if(saving)return false;if(!force&&dirty&&!confirm(t('discard')))return false;detailGeneration++;projectGeneration++;dialogController?.abort();$('dialog').close();editing=null;dirty=false;return true;} + $('close').addEventListener('click',()=>closeDialog());$('dialog').addEventListener('cancel',e=>{e.preventDefault();closeDialog();}); + $('form').addEventListener('input',()=>{dirty=true;}); + function readForm(){const item={...editing};['title','notes','notes_subpath','status','bucket','project_uuid','due_on','planned_on','review_on','start_on','end_on','reminder_time'].forEach(k=>{if(fields[k])item[k]=fields[k].value;});['notify_due','notify_planned'].forEach(k=>{if(fields[k])item[k]=fields[k].checked;});['priority','estimate_minutes'].forEach(k=>{if(fields[k])item[k]=Number(fields[k].value);});if(fields.page_path?.dataset.changed||(!item.page_uuid&&fields.page_path?.value))item.page_path=fields.page_path.value;return item;} + async function saveItem(item){const data=await request(api+(item.version?'/'+item.uuid:''),{method:item.version?'PUT':'POST',headers:item.version?{'If-Match':'"'+item.version+'"'}:{},body:JSON.stringify(item)});app.dispatchEvent(new Event('task-today-refresh'));return data;} + async function submit(archive=false){if(!editing||saving||!writable)return;if(!$('form').reportValidity())return;const item=readForm();if(archive)item.archived=!item.archived;saving=true;Object.values(fields).forEach(f=>f.disabled=true);$('save').disabled=$('archive').disabled=true;$('error').textContent='';try{await saveItem(item);saving=false;closeDialog(true);await load();if(projectID)await loadProject();}catch(e){$('error').textContent=e.message;}finally{saving=false;Object.values(fields).forEach(f=>f.disabled=!writable);$('save').disabled=$('archive').disabled=false;}} + $('form').addEventListener('submit',e=>{e.preventDefault();submit();});$('archive').addEventListener('click',()=>submit(true)); + $('history').addEventListener('toggle',async()=>{if(!$('history').open||!editing?.version)return;const id=editing.uuid;try{const data=await request(api+'/'+id+'/history');if(editing?.uuid!==id)return;const ol=$('history').querySelector('ol');ol.replaceChildren();data.items.forEach(v=>ol.append(el('li','#'+v.version+' · '+new Date(v.created_at_ms).toLocaleString())));}catch(e){$('error').textContent=e.message;}}); + $('new').addEventListener('click',()=>open('',view==='projects'?'project':'task')); + let capturing=false,captureDraft=null; + $('capture').addEventListener('submit',async e=>{e.preventDefault();if(capturing)return;const title=$('quick-title').value.trim();if(!title)return;capturing=true;const b=$('capture').querySelector('button');b.disabled=$('quick-title').disabled=true;if(!captureDraft||captureDraft.title!==title)captureDraft={...blank(),title};try{await saveItem(captureDraft);captureDraft=null;$('quick-title').value='';await load();}catch(err){$('status').textContent=err.message;}finally{capturing=false;b.disabled=$('quick-title').disabled=false;$('quick-title').focus();}}); + function debounce(fn,delay){let timer;return()=>{clearTimeout(timer);timer=setTimeout(fn,delay);};} + $('search').addEventListener('input',debounce(()=>load(),200));$('refresh').addEventListener('click',()=>load());$('more').addEventListener('click',()=>load(true)); + async function loadProject(){try{const {item}=await request(api+'/'+projectID);$('heading').textContent=item.title;$('help').textContent=(item.archived?t('archived')+' · ':'')+(item.notes||t('private'));$('new').hidden=$('capture').hidden=!writable||item.archived;$('project-edit').hidden=false;$('project-edit').title=$('project-edit').ariaLabel=t('edit');}catch(e){$('status').textContent=e.message;}} + $('project-edit').addEventListener('click',()=>open(projectID)); + window.addEventListener('beforeunload',e=>{if(dirty){e.preventDefault();e.returnValue='';}}); + document.addEventListener('visibilitychange',()=>{if(!document.hidden&&!$('dialog').open&&!capturing)load();}); + load();if(projectID)loadProject();if(view==='detail')open(app.dataset.id);if(view==='new')open(''); +})(); diff --git a/static/js/viewer-shortcuts.js b/static/js/viewer-shortcuts.js new file mode 100644 index 0000000..608ff7a --- /dev/null +++ b/static/js/viewer-shortcuts.js @@ -0,0 +1,86 @@ +(() => { + const path = document.body?.dataset?.path || document.querySelector('.breadcrumb-bar')?.dataset?.path || location.pathname; + const isTyping = target => target?.matches?.('input,textarea,select,[contenteditable="true"]'); + const openDialog = (title, content) => { + const dialog = document.createElement('dialog'); dialog.className = 'viewer-shortcut-dialog'; + dialog.innerHTML = `

    `; + dialog.querySelector('h2').textContent = title; dialog.querySelector('.viewer-shortcut-content').append(content); document.body.append(dialog); + dialog.addEventListener('close', () => dialog.remove()); dialog.showModal(); return dialog; + }; + const formDialog = (title, action, fields) => { + const form = document.createElement('form'); form.method='get'; form.action=action; + for (const field of fields) { const label=document.createElement('label'); label.textContent=field.label; const input=document.createElement(field.tag||'input'); Object.assign(input,field.attrs||{}); label.append(input); form.append(label); } + const submit=document.createElement('button'); submit.type='submit'; submit.textContent='Open'; form.append(submit); openDialog(title,form); + }; + const findDialog = () => { + const form=document.createElement('form'); form.method='get'; form.action='/v/search'; form.className='viewer-find-form'; + const input=document.createElement('input'); input.type='search'; input.name='q'; input.autocomplete='off'; input.placeholder='Find…'; input.setAttribute('aria-label','Find'); + const list=document.createElement('div'); list.className='viewer-find-suggestions'; + const candidates=[...document.querySelectorAll('a[href]')].map(a=>({href:a.href,label:(a.textContent||'').trim()||a.getAttribute('href')})).filter(x=>x.label&&x.href.startsWith(location.origin)).slice(0,80); + const render=()=>{const q=input.value.toLowerCase();list.replaceChildren(...candidates.filter(x=>!q||x.label.toLowerCase().includes(q)).slice(0,12).map(x=>{const a=document.createElement('a');a.href=x.href;a.textContent=x.label;return a;}));}; + input.addEventListener('input',render); form.append(input,list); const button=document.createElement('button');button.type='submit';button.textContent='Search';form.append(button);openDialog('Find',form);setTimeout(()=>input.focus(),0); + }; + const shortcutSheet = () => { + const table=document.createElement('div'); table.className='viewer-shortcut-grid'; + [['e','Edit'],['/','Find'],['v','Change view'],['c','Create child'],['u','Upload'],['s','Share'],['p','Permissions'],['Ctrl+↑','Parent'],['Ctrl+↓','Children'],['Ctrl+→','Previous'],['Ctrl+←','Next'],['?','This cheat sheet']].forEach(([key,label])=>{const k=document.createElement('kbd');k.textContent=key;const d=document.createElement('span');d.textContent=label;table.append(k,d);}); + openDialog('Keyboard shortcuts',table); + }; + const childrenDialog = async () => { + const content=document.createElement('div'); content.className='viewer-children-dialog-content'; content.textContent='Loading…'; + const dialog=openDialog('Children',content); + try { + const response=await fetch(childrenURL(path),{headers:{'Accept':'text/html'}}); + if(!response.ok) throw new Error('children request failed'); + content.innerHTML=await response.text(); + content.querySelectorAll('a[href]').forEach(link=>link.addEventListener('click',event=>{event.preventDefault();dialog.close();window.location.assign(new URL(link.getAttribute('href'),location.href).href);})); + } catch (_) { content.textContent='Unable to load children.'; } + }; + const parentPath = value => { const clean=(value||'/').replace(/\/+$/,'')||'/'; const i=clean.lastIndexOf('/'); return i<=0?'/':clean.slice(0,i); }; + const childrenURL = value => '/v/children?path='+encodeURIComponent(value||'/'); + const focusView = () => { const buttons=[...document.querySelectorAll('[data-children-view]')]; if (!buttons.length) return; const active=buttons.findIndex(b=>b.classList.contains('active')); buttons[(active+1+buttons.length)%buttons.length].click(); }; + const share = () => { + const url = new URL(location.href); url.hash=''; const wrap=document.createElement('div'); + const input=document.createElement('input'); input.value=url.href; input.readOnly=true; input.select(); + const copy=document.createElement('button'); copy.type='button'; copy.textContent='Copy link'; copy.onclick=async()=>{try{await navigator.clipboard.writeText(input.value);copy.textContent='Copied'}catch{input.select()}}; + const pageTitle=document.querySelector('meta[property="og:title"]')?.content || document.title.split(' · ')[0] || location.pathname.split('/').filter(Boolean).pop() || '/'; + const domainTitle=document.querySelector('meta[property="og:site_name"]')?.content || location.host; + const text=pageTitle+' - '+domainTitle; + const x=document.createElement('a'); x.href='https://twitter.com/intent/tweet?url='+encodeURIComponent(input.value)+'&text='+encodeURIComponent(text); x.target='_blank'; x.rel='noopener noreferrer'; x.dataset.shareX='true'; x.textContent='Share on X'; wrap.append(input,copy,x); openDialog('Share link',wrap); + }; + document.addEventListener('click', event => { + const link = event.target.closest?.('a[data-share-x]'); + if (!link || event.defaultPrevented) return; + event.preventDefault(); + event.stopImmediatePropagation(); + window.open(link.href, '_blank', 'noopener,noreferrer'); + }); + document.querySelector('[data-viewer-delete]')?.addEventListener('click', async event => { + const uuid = event.currentTarget.dataset.objectUuid; + if (!uuid || !window.confirm('Delete this object?')) return; + const response = await fetch('/_/api/v1/object/delete', { + method: 'POST', headers: {'Content-Type': 'application/json'}, + body: JSON.stringify({object_uuid: uuid}), + }); + if (!response.ok) { window.alert('Delete failed'); return; } + window.location.assign('/'); + }); + document.addEventListener('keydown', event => { + if (event.defaultPrevented || isTyping(event.target) || document.querySelector('dialog[open]')) return; + const key=event.key.toLowerCase(); + if (event.ctrlKey || event.metaKey) { + if (key==='arrowup') { event.preventDefault(); location.href=parentPath(path); } + else if (key==='arrowdown') { event.preventDefault(); childrenDialog(); } + else if (key==='arrowright') { event.preventDefault(); history.forward(); } + else if (key==='arrowleft') { event.preventDefault(); history.back(); } + return; + } + if (key==='e') { event.preventDefault(); location.href='/e/-'+(path==='/'?'':path); } + else if (key==='/') { event.preventDefault(); findDialog(); } + else if (key==='v') { event.preventDefault(); focusView(); } + else if (key==='c') { event.preventDefault(); location.href='/:/new?path='+encodeURIComponent(path); } + else if (key==='u') { event.preventDefault(); location.href='/v/upload?path='+encodeURIComponent(path); } + else if (key==='s') { event.preventDefault(); share(); } + else if (key==='p') { event.preventDefault(); const trigger=document.querySelector('[data-governance-open]'); if(trigger) trigger.click(); else { const message=document.createElement('p'); message.textContent='Open the City governance dialog from the City view to manage permissions for this locality.'; openDialog('Permissions',message); } } + else if (key==='?') { event.preventDefault(); shortcutSheet(); } + }); +})(); diff --git a/static/js/vim-settings.js b/static/js/vim-settings.js new file mode 100644 index 0000000..cb2b10f --- /dev/null +++ b/static/js/vim-settings.js @@ -0,0 +1,46 @@ +(() => { + const form = document.getElementById('vim-settings-form'); + if (!form) return; + const status = document.getElementById('vim-settings-status'); + let loading = 0; + for (const input of form.querySelectorAll('[data-vim-upload]')) input.addEventListener('change', async () => { + const file = input.files[0]; if (!file) return; + loading++; + try { + if (file.size > 65536) throw new Error(form.dataset.invalid); + const content = new TextDecoder('utf-8', {fatal:true}).decode(await file.arrayBuffer()); + if (content.includes('\0')) throw new Error(form.dataset.invalid); + form.elements[input.dataset.vimUpload].value = content; + form.elements.vim_enabled.checked = true; + if (input.dataset.vimUpload === 'colorscheme') form.elements.color_name.value = file.name; + status.textContent = ''; + } catch (_) { status.textContent = form.dataset.invalid; } + finally { loading--; input.value = ''; } + }); + for (const button of form.querySelectorAll('[data-vim-download]')) button.addEventListener('click', () => { + const key = button.dataset.vimDownload, link = document.createElement('a'); + link.href = URL.createObjectURL(new Blob([form.elements[key].value], {type:'text/plain;charset=utf-8'})); + link.download = key === 'vimrc' ? '.vimrc' : (form.elements.color_name.value || 'pageswiki_custom.vim'); + link.click(); setTimeout(() => URL.revokeObjectURL(link.href), 1000); + }); + form.querySelector('[data-vim-clear-color]').addEventListener('click', () => { form.elements.colorscheme.value = ''; form.elements.color_name.value = ''; }); + form.addEventListener('submit', async event => { + event.preventDefault(); + if (loading) return; + const reset = event.submitter?.name === 'reset'; + if (reset && !confirm(form.dataset.reset)) return; + const body = new URLSearchParams(new FormData(form)); + if (reset) body.set('reset', 'true'); + const buttons = [...form.querySelectorAll('button[type=submit]')]; + if (buttons.some(button => button.disabled)) return; + buttons.forEach(button => button.disabled = true); + try { + const response = await fetch(form.action, {method:'POST', body, headers:{Accept:'application/json'}, signal:AbortSignal.timeout(15000)}); + if (!response.ok) throw new Error((await response.text()).trim()); + await response.json(); + if (reset) { form.elements.font_size.value = 16; form.elements.vim_enabled.checked = false; form.elements.vimrc.value = ''; form.elements.colorscheme.value = ''; form.elements.color_name.value = ''; } + status.textContent = form.dataset.saved; + } catch (error) { status.textContent = error.message; } + finally { buttons.forEach(button => button.disabled = false); } + }); +})(); diff --git a/static/vendor/city-generator/gen-city.bundle.js b/static/vendor/city-generator/gen-city.bundle.js new file mode 100644 index 0000000..0bd7732 --- /dev/null +++ b/static/vendor/city-generator/gen-city.bundle.js @@ -0,0 +1,411 @@ +var PagesWikiGenCity = (() => { + var __create = Object.create; + var __defProp = Object.defineProperty; + var __getOwnPropDesc = Object.getOwnPropertyDescriptor; + var __getOwnPropNames = Object.getOwnPropertyNames; + var __getProtoOf = Object.getPrototypeOf; + var __hasOwnProp = Object.prototype.hasOwnProperty; + var __commonJS = (cb, mod) => function __require() { + return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports; + }; + var __export = (target, all) => { + for (var name in all) + __defProp(target, name, { get: all[name], enumerable: true }); + }; + var __copyProps = (to, from, except, desc) => { + if (from && typeof from === "object" || typeof from === "function") { + for (let key of __getOwnPropNames(from)) + if (!__hasOwnProp.call(to, key) && key !== except) + __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable }); + } + return to; + }; + var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps( + // If the importer is in node compatibility mode or this is not an ESM + // file that has been converted to a CommonJS file using a Babel- + // compatible transform (i.e. "__esModule" has not been set), then set + // "default" to the CommonJS "module.exports" for node compatibility. + isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, + mod + )); + var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod); + + // node_modules/gen-city/dist/index.js + var require_dist = __commonJS({ + "node_modules/gen-city/dist/index.js"(exports, module) { + (() => { + "use strict"; + var t = { 895: (t2, i2) => { + Object.defineProperty(i2, "__esModule", { value: true }), i2.Building = void 0, i2.Building = class { + constructor(t3, i3) { + if (4 !== i3.length) throw Error("Invalid building vertices"); + this.path = t3, this.vertices = i3; + const e2 = this.vertices.map((t4) => t4.x), s = this.vertices.map((t4) => t4.y); + this.position = { x: Math.min(...e2), y: Math.min(...s) }, this.width = Math.max(...e2) - this.position.x + 1, this.height = Math.max(...s) - this.position.y + 1; + } + remove() { + const t3 = this.path.getBuildings(), i3 = t3.findIndex((t4) => t4 === this); + -1 !== i3 && t3.splice(i3, 1); + } + each(t3) { + for (let i3 = 0; i3 < this.width; i3++) for (let e2 = 0; e2 < this.height; e2++) t3({ x: this.position.x + i3, y: this.position.y + e2 }); + } + }; + }, 863: function(t2, i2, e2) { + var s = this && this.__awaiter || function(t3, i3, e3, s2) { + return new (e3 || (e3 = Promise))(function(n2, r2) { + function o2(t4) { + try { + a(s2.next(t4)); + } catch (t5) { + r2(t5); + } + } + function h2(t4) { + try { + a(s2.throw(t4)); + } catch (t5) { + r2(t5); + } + } + function a(t4) { + var i4; + t4.done ? n2(t4.value) : (i4 = t4.value, i4 instanceof e3 ? i4 : new e3(function(t5) { + t5(i4); + })).then(o2, h2); + } + a((s2 = s2.apply(t3, i3 || [])).next()); + }); + }; + Object.defineProperty(i2, "__esModule", { value: true }), i2.City = void 0; + const n = e2(792), r = e2(82), o = e2(309), h = e2(679); + i2.City = class { + constructor({ width: t3, height: i3 }) { + this.seed = null, this.matrix = [], this.nodes = [], this.gauge = 1, this.params = {}, this.width = t3, this.height = i3; + } + getSeed() { + return this.seed; + } + getAllBuildings() { + return this.getAllPaths().map((t3) => t3.getBuildings()).flat(); + } + getAllNodes() { + return this.nodes; + } + getAllPaths() { + return this.nodes.map((t3) => t3.getOutputPaths()).flat(); + } + generate(t3 = {}) { + return s(this, void 0, void 0, function* () { + this.reset(), this.params = Object.assign({ mode: o.CityGenerationMode.RUNTIME, seed: [], startPosition: { x: Math.round(this.width / 2), y: Math.round(this.height / 2) }, startDirections: [0, 90, 180, 270], streetMinLength: 10, buildingMinSize: 3, buildingMaxSize: 6, buildingMinSpace: 1, buildingMaxSpace: 3, buildingOffset: 0, probabilityIntersection: 0.1, probabilityTurn: 0.05, probabilityStreetEnd: 1e-3 }, t3), this.params.mode === o.CityGenerationMode.SEED && (this.seed = 0 === this.params.seed.length ? (0, h.generateSeed)() : this.params.seed); + const i3 = this.addNode(this.params.startPosition); + this.markAt(this.params.startPosition, i3), this.params.startDirections.forEach((t4) => { + i3.addOutputPath(t4); + }), this.generatePaths(), this.generateBuildings(); + }); + } + reset() { + for (let t3 = 0; t3 < this.height; t3++) { + this.matrix[t3] = []; + for (let i3 = 0; i3 < this.width; i3++) this.matrix[t3][i3] = null; + } + this.seed = null, this.gauge = 1, this.nodes = []; + } + generatePaths() { + const t3 = () => { + const i3 = this.getAllPaths(); + for (let t4 = 0, e3 = i3.length; t4 < e3; t4++) this.processingPath(i3[t4]); + i3.every((t4) => t4.isCompleted()) || t3(); + }; + t3(); + } + processingPath(t3) { + if (t3.isCompleted()) return; + const i3 = t3.getNextCursor(); + if (void 0 === this.getAt(i3) || this.variabilityChance(this.params.probabilityStreetEnd)) return void this.closePath(t3); + const e3 = this.getCross(t3); + if (null == e3 ? void 0 : e3.tile) { + let i4 = null; + return e3.tile instanceof n.Node ? i4 = e3.tile : e3.tile instanceof r.Path && (i4 = this.splitPath(e3.tile, e3.position)), void (i4 && t3.setNodeEnd(i4)); + } + t3.setCursor(i3), this.markAt(t3.getCursor(), t3); + const s2 = this.params.streetMinLength; + t3.getLength() > s2 && !this.getCross(t3, s2) && (this.variabilityChance(this.params.probabilityIntersection) ? this.forkPath(t3) : this.variabilityChance(this.params.probabilityTurn) && this.turnPath(t3)); + } + generateBuildings() { + this.getAllPaths().forEach((t3) => { + const i3 = (0, h.getShift)(t3.direction), e3 = t3.getNodeBeg().position.x + i3.x, s2 = t3.getNodeBeg().position.y + i3.y; + (0, h.turnDirection)(t3.direction).forEach((i4) => { + let n2 = this.params.buildingOffset; + for (; t3.getLength() > n2; ) { + const r2 = (0, h.getShift)(t3.direction, n2), o2 = (0, h.getShift)(i4, this.params.buildingOffset + 1), a = { x: e3 + r2.x + o2.x, y: s2 + r2.y + o2.y }, d = [this.variabilityRange(this.params.buildingMinSize, this.params.buildingMaxSize), this.variabilityRange(this.params.buildingMinSize, this.params.buildingMaxSize)]; + if (n2 + d[0] + this.params.buildingOffset > t3.getLength()) break; + this.processingBuilding(t3, a, d, [t3.direction, i4]); + const u = this.variabilityRange(this.params.buildingMinSpace, this.params.buildingMaxSpace); + n2 += d[0] + u; + } + }); + }); + } + processingBuilding(t3, i3, e3, s2) { + const n2 = [], r2 = []; + for (let t4 = 0; t4 < e3[0]; t4++) { + const o3 = (0, h.getShift)(s2[0], t4), a = { x: i3.x + o3.x, y: i3.y + o3.y }; + for (let i4 = 0; i4 < e3[1]; i4++) { + const o4 = (0, h.getShift)(s2[1], i4), d = { x: a.x + o4.x, y: a.y + o4.y }; + if (!this.isEmptyAt(d)) return; + n2.push(d), 0 !== t4 && t4 !== e3[0] - 1 || 0 !== i4 && i4 !== e3[1] - 1 || r2.push(d); + } + } + const o2 = t3.addBuilding(r2); + n2.forEach((t4) => { + this.markAt(t4, o2); + }); + } + getAt(t3) { + var i3, e3; + return null === (e3 = null === (i3 = this.matrix) || void 0 === i3 ? void 0 : i3[t3.y]) || void 0 === e3 ? void 0 : e3[t3.x]; + } + markAt(t3, i3) { + this.matrix[t3.y][t3.x] = i3; + } + isEmptyAt(t3) { + return null === this.getAt(t3); + } + addNode(t3, i3) { + const e3 = new n.Node(this.nodes.length, t3); + return void 0 === i3 ? this.nodes.push(e3) : this.nodes.splice(i3, 0, e3), e3; + } + closePath(t3) { + const i3 = t3.getCursor(), e3 = this.addNode(i3); + return t3.setNodeEnd(e3), this.markAt(i3, e3), e3; + } + forkPath(t3) { + let i3 = (0, h.forkDirection)(t3.direction).sort(() => this.variabilityChance(0.5) ? 1 : -1); + if (i3 = this.filterDirections(t3, i3), 0 === i3.length || 1 === i3.length && i3[0] === t3.direction) return; + const e3 = this.closePath(t3); + for (let t4 = 0; t4 < i3.length; t4++) (t4 < 2 || this.variabilityChance(0.5)) && e3.addOutputPath(i3[t4]); + this.markAt(e3.position, e3); + } + turnPath(t3) { + let i3 = (0, h.turnDirection)(t3.direction).sort(() => this.variabilityChance(0.5) ? 1 : -1); + if (i3 = this.filterDirections(t3, i3), 0 === i3.length) return; + const e3 = this.closePath(t3); + e3.addOutputPath(i3[0]), this.markAt(e3.position, e3); + } + splitPath(t3, i3) { + const e3 = t3.getNodeBeg(), s2 = this.nodes.findIndex((t4) => t4 === e3), n2 = this.addNode(i3, s2 + 1), o2 = n2.addOutputPath(t3.direction); + this.markAt(i3, n2); + const h2 = t3.getNodeEnd(); + return h2 ? o2.setNodeEnd(h2) : o2.setCursor(t3.getCursor()), o2.each((t4) => { + this.getAt(t4) instanceof r.Path && this.markAt(t4, o2); + }), t3.setNodeEnd(n2), n2; + } + getCross(t3, i3 = 1) { + const e3 = t3.getCursor(); + for (let s2 = 1; s2 <= i3; s2++) { + const i4 = (0, h.getShift)(t3.direction, s2), n2 = { x: e3.x + i4.x, y: e3.y + i4.y }; + if (!this.isEmptyAt(n2)) return { tile: this.getAt(n2), position: n2 }; + } + return null; + } + filterDirections(t3, i3) { + return i3.filter((i4) => { + const e3 = (0, h.getShift)(i4), s2 = t3.getCursor(), n2 = { x: s2.x + e3.x, y: s2.y + e3.y }; + return this.isEmptyAt(n2); + }); + } + variabilityChance(t3) { + if (!this.seed) return (0, h.randomChance)(t3); + const i3 = this.seed[this.gauge % this.seed.length]; + return this.gauge++, i3 / 1e3 >= 1 - t3; + } + variabilityRange(t3, i3) { + if (!this.seed) return (0, h.randomRange)(t3, i3); + const e3 = this.seed[this.gauge % this.seed.length]; + return this.gauge++, Math.floor(t3 + e3 / 1e3 * (i3 - t3 + 1)); + } + }; + }, 465: function(t2, i2, e2) { + var s = this && this.__createBinding || (Object.create ? function(t3, i3, e3, s2) { + void 0 === s2 && (s2 = e3); + var n2 = Object.getOwnPropertyDescriptor(i3, e3); + n2 && !("get" in n2 ? !i3.__esModule : n2.writable || n2.configurable) || (n2 = { enumerable: true, get: function() { + return i3[e3]; + } }), Object.defineProperty(t3, s2, n2); + } : function(t3, i3, e3, s2) { + void 0 === s2 && (s2 = e3), t3[s2] = i3[e3]; + }), n = this && this.__exportStar || function(t3, i3) { + for (var e3 in t3) "default" === e3 || Object.prototype.hasOwnProperty.call(i3, e3) || s(i3, t3, e3); + }; + Object.defineProperty(i2, "__esModule", { value: true }), n(e2(863), i2), n(e2(895), i2), n(e2(792), i2), n(e2(82), i2), n(e2(309), i2); + }, 792: (t2, i2, e2) => { + Object.defineProperty(i2, "__esModule", { value: true }), i2.Node = void 0; + const s = e2(82), n = e2(309); + i2.Node = class { + constructor(t3, i3) { + this.outputPaths = [], this.inputPaths = [], this.id = t3, this.position = i3; + } + addOutputPath(t3) { + const i3 = new s.Path(this, t3); + return this.outputPaths.push(i3), i3; + } + removeOutputPath(t3) { + const i3 = this.outputPaths.indexOf(t3); + -1 !== i3 && this.outputPaths.splice(i3, 1); + } + getOutputPaths() { + return this.outputPaths; + } + addInputPath(t3) { + const i3 = t3.getNodeEnd(); + i3 && i3.removeInputPath(t3), this.inputPaths.push(t3); + } + removeInputPath(t3) { + const i3 = this.inputPaths.indexOf(t3); + -1 !== i3 && this.inputPaths.splice(i3, 1); + } + getInputPaths() { + return this.inputPaths; + } + getAllPaths() { + return this.outputPaths.concat(this.inputPaths); + } + getType() { + const t3 = this.outputPaths.length + this.inputPaths.length; + return 2 === t3 ? n.NodeType.TURN : 1 === t3 ? n.NodeType.END : n.NodeType.CROSS; + } + }; + }, 82: (t2, i2, e2) => { + Object.defineProperty(i2, "__esModule", { value: true }), i2.Path = void 0; + const s = e2(895), n = e2(679); + i2.Path = class { + constructor(t3, i3) { + this.buildings = [], this.nodeEnd = null, this.direction = i3, this.nodeBeg = t3, this.cursor = t3.position; + } + getBuildings() { + return this.buildings; + } + getPositions() { + var t3, i3; + return { beg: this.nodeBeg.position, end: null !== (i3 = null === (t3 = this.nodeEnd) || void 0 === t3 ? void 0 : t3.position) && void 0 !== i3 ? i3 : this.cursor }; + } + isCompleted() { + return Boolean(this.nodeEnd); + } + getNextCursor() { + const t3 = (0, n.getShift)(this.direction); + return { x: this.cursor.x + t3.x, y: this.cursor.y + t3.y }; + } + getCursor() { + return this.cursor; + } + setCursor(t3) { + this.cursor = t3; + } + getNodeBeg() { + return this.nodeBeg; + } + getNodeEnd() { + return this.nodeEnd; + } + setNodeEnd(t3) { + t3.addInputPath(this), this.nodeEnd = t3, this.cursor = t3.position; + } + addBuilding(t3) { + const i3 = new s.Building(this, t3); + return this.buildings.push(i3), i3; + } + getLength() { + const t3 = this.getPositions(); + return Math.hypot(t3.beg.x - t3.end.x, t3.beg.y - t3.end.y); + } + remove() { + this.nodeBeg.removeOutputPath(this), this.nodeEnd && this.nodeEnd.removeInputPath(this); + } + each(t3) { + const i3 = (0, n.getShift)(this.direction), e3 = this.getLength(), s2 = Object.assign({}, this.nodeBeg.position); + for (let n2 = 0; n2 <= e3; n2++) t3(s2), s2.x += i3.x, s2.y += i3.y; + } + }; + }, 309: (t2, i2) => { + var e2, s; + Object.defineProperty(i2, "__esModule", { value: true }), i2.NodeType = i2.CityGenerationMode = void 0, function(t3) { + t3.RUNTIME = "RUNTIME", t3.SEED = "SEED"; + }(e2 || (i2.CityGenerationMode = e2 = {})), function(t3) { + t3.TURN = "TURN", t3.CROSS = "CROSS", t3.END = "END"; + }(s || (i2.NodeType = s = {})); + }, 679: (t2, i2) => { + function e2(t3) { + return t3 * (Math.PI / 180); + } + function s(t3) { + return [(t3 + 90) % 360, (t3 - 90) % 360]; + } + Object.defineProperty(i2, "__esModule", { value: true }), i2.between = i2.getShift = i2.forkDirection = i2.turnDirection = i2.degToRad = i2.generateSeed = i2.randomRange = i2.randomItem = i2.randomChance = void 0, i2.randomChance = function(t3) { + return Math.random() > 1 - t3; + }, i2.randomItem = function(t3) { + return t3[Math.floor(Math.random() * t3.length)]; + }, i2.randomRange = function(t3, i3) { + return Math.floor(t3 + Math.random() * (i3 - t3 + 1)); + }, i2.generateSeed = function(t3 = 32) { + const i3 = []; + for (let e3 = 0; e3 < t3; e3++) i3.push(Math.round(1e3 * Math.random())); + return i3; + }, i2.degToRad = e2, i2.turnDirection = s, i2.forkDirection = function(t3) { + return [t3].concat(s(t3)); + }, i2.getShift = function(t3, i3 = 1) { + return { x: Math.round(Math.cos(e2(t3))) * i3, y: Math.round(Math.sin(e2(t3))) * i3 }; + }, i2.between = function(t3, i3) { + return t3 >= i3[0] && t3 <= i3[1]; + }; + } }, i = {}, e = function e2(s) { + var n = i[s]; + if (void 0 !== n) return n.exports; + var r = i[s] = { exports: {} }; + return t[s].call(r.exports, r, r.exports, e2), r.exports; + }(465); + module.exports = e; + })(); + } + }); + + // src/adapter.js + var adapter_exports = {}; + __export(adapter_exports, { + generateFabric: () => generateFabric + }); + var import_gen_city = __toESM(require_dist()); + var seed = (value) => { + let state = 2166136261; + for (const char of String(value)) { + state ^= char.charCodeAt(0); + state = Math.imul(state, 16777619); + } + return Array.from({ length: 256 }, () => { + state = Math.imul(state ^ state >>> 15, 2246822519); + return Math.abs(state % 1001); + }); + }; + async function generateFabric(key, width = 180, height = 100) { + if (typeof key !== "string" || !key || key.length > 256 || !Number.isInteger(width) || !Number.isInteger(height) || width < 64 || width > 320 || height < 64 || height > 240) { + throw new RangeError("City generation bounds exceeded"); + } + const city = new import_gen_city.City({ width, height }); + await city.generate({ mode: import_gen_city.CityGenerationMode.SEED, seed: seed(key), streetMinLength: 9, probabilityIntersection: 0.12, probabilityTurn: 0.09, probabilityStreetEnd: 0.012, buildingMinSize: 3, buildingMaxSize: 7, buildingMinSpace: 1, buildingMaxSpace: 2, buildingOffset: 1 }); + const fabric = { + generator: "gen-city", + version: "1.4.6", + width, + height, + roads: city.getAllPaths().map((path) => { + const p = path.getPositions(); + return [p.beg.x, p.beg.y, p.end.x, p.end.y]; + }), + buildings: city.getAllBuildings().map((building) => building.vertices.map((point) => [point.x, point.y])) + }; + if (fabric.roads.length > 4096 || fabric.buildings.length > 4096) throw new RangeError("City geometry budget exceeded"); + return fabric; + } + return __toCommonJS(adapter_exports); +})(); diff --git a/static/vendor/codemirror/editor.bundle.js b/static/vendor/codemirror/editor.bundle.js index 53b0ed9..725b44b 100644 --- a/static/vendor/codemirror/editor.bundle.js +++ b/static/vendor/codemirror/editor.bundle.js @@ -145,15 +145,15 @@ if (other.length != this.length || other.lines != this.lines) return false; let start = this.scanIdentical(other, 1), end = this.length - this.scanIdentical(other, -1); - let a = new RawTextCursor(this), b = new RawTextCursor(other); + let a2 = new RawTextCursor(this), b = new RawTextCursor(other); for (let skip = start, pos = start; ; ) { - a.next(skip); + a2.next(skip); b.next(skip); skip = 0; - if (a.lineBreak != b.lineBreak || a.done != b.done || a.value != b.value) + if (a2.lineBreak != b.lineBreak || a2.done != b.done || a2.value != b.value) return false; - pos += a.value.length; - if (a.done || pos >= end) + pos += a2.value.length; + if (a2.done || pos >= end) return true; } } @@ -816,10 +816,10 @@ Create a change desc from its JSON representation (as produced by [`toJSON`](https://codemirror.net/6/docs/ref/#state.ChangeDesc.toJSON). */ - static fromJSON(json) { - if (!Array.isArray(json) || json.length % 2 || json.some((a) => typeof a != "number")) + static fromJSON(json2) { + if (!Array.isArray(json2) || json2.length % 2 || json2.some((a2) => typeof a2 != "number")) throw new RangeError("Invalid JSON representation of ChangeDesc"); - return new _ChangeDesc(json); + return new _ChangeDesc(json2); } /** @internal @@ -1022,12 +1022,12 @@ Create a changeset from its JSON representation (as produced by [`toJSON`](https://codemirror.net/6/docs/ref/#state.ChangeSet.toJSON). */ - static fromJSON(json) { - if (!Array.isArray(json)) + static fromJSON(json2) { + if (!Array.isArray(json2)) throw new RangeError("Invalid JSON representation of ChangeSet"); let sections = [], inserted = []; - for (let i = 0; i < json.length; i++) { - let part = json[i]; + for (let i = 0; i < json2.length; i++) { + let part = json2[i]; if (typeof part == "number") { sections.push(part, -1); } else if (!Array.isArray(part) || typeof part[0] != "number" || part.some((e, i2) => i2 && typeof e != "string")) { @@ -1103,32 +1103,32 @@ } function mapSet(setA, setB, before, mkSet = false) { let sections = [], insert2 = mkSet ? [] : null; - let a = new SectionIter(setA), b = new SectionIter(setB); + let a2 = new SectionIter(setA), b = new SectionIter(setB); for (let inserted = -1; ; ) { - if (a.done && b.len || b.done && a.len) { + if (a2.done && b.len || b.done && a2.len) { throw new Error("Mismatched change set lengths"); - } else if (a.ins == -1 && b.ins == -1) { - let len = Math.min(a.len, b.len); + } else if (a2.ins == -1 && b.ins == -1) { + let len = Math.min(a2.len, b.len); addSection(sections, len, -1); - a.forward(len); + a2.forward(len); b.forward(len); - } else if (b.ins >= 0 && (a.ins < 0 || inserted == a.i || a.off == 0 && (b.len < a.len || b.len == a.len && !before))) { + } else if (b.ins >= 0 && (a2.ins < 0 || inserted == a2.i || a2.off == 0 && (b.len < a2.len || b.len == a2.len && !before))) { let len = b.len; addSection(sections, b.ins, -1); while (len) { - let piece = Math.min(a.len, len); - if (a.ins >= 0 && inserted < a.i && a.len <= piece) { - addSection(sections, 0, a.ins); + let piece = Math.min(a2.len, len); + if (a2.ins >= 0 && inserted < a2.i && a2.len <= piece) { + addSection(sections, 0, a2.ins); if (insert2) - addInsert(insert2, sections, a.text); - inserted = a.i; + addInsert(insert2, sections, a2.text); + inserted = a2.i; } - a.forward(piece); + a2.forward(piece); len -= piece; } b.next(); - } else if (a.ins >= 0) { - let len = 0, left = a.len; + } else if (a2.ins >= 0) { + let len = 0, left = a2.len; while (left) { if (b.ins == -1) { let piece = Math.min(left, b.len); @@ -1142,12 +1142,12 @@ break; } } - addSection(sections, len, inserted < a.i ? a.ins : 0); - if (insert2 && inserted < a.i) - addInsert(insert2, sections, a.text); - inserted = a.i; - a.forward(a.len - left); - } else if (a.done && b.done) { + addSection(sections, len, inserted < a2.i ? a2.ins : 0); + if (insert2 && inserted < a2.i) + addInsert(insert2, sections, a2.text); + inserted = a2.i; + a2.forward(a2.len - left); + } else if (a2.done && b.done) { return insert2 ? ChangeSet.createSet(sections, insert2) : ChangeDesc.create(sections); } else { throw new Error("Mismatched change set lengths"); @@ -1157,38 +1157,38 @@ function composeSets(setA, setB, mkSet = false) { let sections = []; let insert2 = mkSet ? [] : null; - let a = new SectionIter(setA), b = new SectionIter(setB); + let a2 = new SectionIter(setA), b = new SectionIter(setB); for (let open = false; ; ) { - if (a.done && b.done) { + if (a2.done && b.done) { return insert2 ? ChangeSet.createSet(sections, insert2) : ChangeDesc.create(sections); - } else if (a.ins == 0) { - addSection(sections, a.len, 0, open); - a.next(); + } else if (a2.ins == 0) { + addSection(sections, a2.len, 0, open); + a2.next(); } else if (b.len == 0 && !b.done) { addSection(sections, 0, b.ins, open); if (insert2) addInsert(insert2, sections, b.text); b.next(); - } else if (a.done || b.done) { + } else if (a2.done || b.done) { throw new Error("Mismatched change set lengths"); } else { - let len = Math.min(a.len2, b.len), sectionLen = sections.length; - if (a.ins == -1) { + let len = Math.min(a2.len2, b.len), sectionLen = sections.length; + if (a2.ins == -1) { let insB = b.ins == -1 ? -1 : b.off ? 0 : b.ins; addSection(sections, len, insB, open); if (insert2 && insB) addInsert(insert2, sections, b.text); } else if (b.ins == -1) { - addSection(sections, a.off ? 0 : a.len, len, open); + addSection(sections, a2.off ? 0 : a2.len, len, open); if (insert2) - addInsert(insert2, sections, a.textBit(len)); + addInsert(insert2, sections, a2.textBit(len)); } else { - addSection(sections, a.off ? 0 : a.len, b.off ? 0 : b.ins, open); + addSection(sections, a2.off ? 0 : a2.len, b.off ? 0 : b.ins, open); if (insert2 && !b.off) addInsert(insert2, sections, b.text); } - open = (a.ins > len || b.ins >= 0 && b.len > len) && (open || sections.length > sectionLen); - a.forward2(len); + open = (a2.ins > len || b.ins >= 0 && b.len > len) && (open || sections.length > sectionLen); + a2.forward2(len); b.forward(len); } } @@ -1335,10 +1335,10 @@ Convert a JSON representation of a range to a `SelectionRange` instance. */ - static fromJSON(json) { - if (!json || typeof json.anchor != "number" || typeof json.head != "number") + static fromJSON(json2) { + if (!json2 || typeof json2.anchor != "number" || typeof json2.head != "number") throw new RangeError("Invalid JSON representation for SelectionRange"); - return EditorSelection.range(json.anchor, json.head); + return EditorSelection.range(json2.anchor, json2.head); } /** @internal @@ -1415,10 +1415,10 @@ /** Create a selection from a JSON representation. */ - static fromJSON(json) { - if (!json || !Array.isArray(json.ranges) || typeof json.main != "number" || json.main >= json.ranges.length) + static fromJSON(json2) { + if (!json2 || !Array.isArray(json2.ranges) || typeof json2.main != "number" || json2.main >= json2.ranges.length) throw new RangeError("Invalid JSON representation for EditorSelection"); - return new _EditorSelection(json.ranges.map((r) => SelectionRange.fromJSON(r)), json.main); + return new _EditorSelection(json2.ranges.map((r) => SelectionRange.fromJSON(r)), json2.main); } /** Create a selection holding a single range. @@ -1462,7 +1462,7 @@ */ static normalized(ranges, mainIndex = 0) { let main = ranges[mainIndex]; - ranges.sort((a, b) => a.from - b.from); + ranges.sort((a2, b) => a2.from - b.from); mainIndex = ranges.indexOf(main); for (let i = 1; i < ranges.length; i++) { let range = ranges[i], prev = ranges[i - 1]; @@ -1503,7 +1503,7 @@ Define a new facet. */ static define(config2 = {}) { - return new _Facet(config2.combine || ((a) => a), config2.compareInput || ((a, b) => a === b), config2.compare || (!config2.combine ? sameArray : (a, b) => a === b), !!config2.static, config2.enables); + return new _Facet(config2.combine || ((a2) => a2), config2.compareInput || ((a2, b) => a2 === b), config2.compare || (!config2.combine ? sameArray : (a2, b) => a2 === b), !!config2.static, config2.enables); } /** Returns an extension that adds the given value to this facet. @@ -1540,8 +1540,8 @@ return this.compute([field], (state) => get(state.field(field))); } }; - function sameArray(a, b) { - return a == b || a.length == b.length && a.every((e, i) => e === b[i]); + function sameArray(a2, b) { + return a2 == b || a2.length == b.length && a2.every((e, i) => e === b[i]); } var FacetProvider = class { constructor(dependencies, facet, type, value) { @@ -1599,11 +1599,11 @@ }; } }; - function compareArray(a, b, compare2) { - if (a.length != b.length) + function compareArray(a2, b, compare2) { + if (a2.length != b.length) return false; - for (let i = 0; i < a.length; i++) - if (!compare2(a[i], b[i])) + for (let i = 0; i < a2.length; i++) + if (!compare2(a2[i], b[i])) return false; return true; } @@ -1678,7 +1678,7 @@ Define a state field. */ static define(config2) { - let field = new _StateField(nextID++, config2.create, config2.update, config2.compare || ((a, b) => a === b), config2); + let field = new _StateField(nextID++, config2.create, config2.update, config2.compare || ((a2, b) => a2 === b), config2); if (config2.provide) field.provides = config2.provide(field); return field; @@ -1836,7 +1836,7 @@ let dynamicSlots = []; for (let field of fields) { address[field.id] = dynamicSlots.length << 1; - dynamicSlots.push((a) => field.slot(a)); + dynamicSlots.push((a2) => field.slot(a2)); } let oldFacets = oldState === null || oldState === void 0 ? void 0 : oldState.config.facets; for (let id2 in facets) { @@ -1860,11 +1860,11 @@ staticValues.push(p.value); } else { address[p.id] = dynamicSlots.length << 1; - dynamicSlots.push((a) => p.dynamicSlot(a)); + dynamicSlots.push((a2) => p.dynamicSlot(a2)); } } address[facet.id] = dynamicSlots.length << 1; - dynamicSlots.push((a) => dynamicFacetSlot(a, facet, providers)); + dynamicSlots.push((a2) => dynamicFacetSlot(a2, facet, providers)); } } let dynamic = dynamicSlots.map((f) => f(address)); @@ -1913,7 +1913,7 @@ } } inner(extension, Prec_.default); - return result.reduce((a, b) => a.concat(b)); + return result.reduce((a2, b) => a2.concat(b)); } function ensureAddr(state, addr) { if (addr & 1) @@ -2046,7 +2046,7 @@ this._state = null; if (selection) checkSelection(selection, changes.newLength); - if (!annotations.some((a) => a.type == _Transaction.time)) + if (!annotations.some((a2) => a2.type == _Transaction.time)) this.annotations = annotations.concat(_Transaction.time.of(Date.now())); } /** @@ -2126,13 +2126,13 @@ Transaction.userEvent = /* @__PURE__ */ Annotation.define(); Transaction.addToHistory = /* @__PURE__ */ Annotation.define(); Transaction.remote = /* @__PURE__ */ Annotation.define(); - function joinRanges(a, b) { + function joinRanges(a2, b) { let result = []; for (let iA = 0, iB = 0; ; ) { let from, to; - if (iA < a.length && (iB == b.length || b[iB] >= a[iA])) { - from = a[iA++]; - to = a[iA++]; + if (iA < a2.length && (iB == b.length || b[iB] >= a2[iA])) { + from = a2[iA++]; + to = a2[iA++]; } else if (iB < b.length) { from = b[iB++]; to = b[iB++]; @@ -2144,24 +2144,24 @@ result[result.length - 1] = to; } } - function mergeTransaction(a, b, sequential) { + function mergeTransaction(a2, b, sequential) { var _a2; let mapForA, mapForB, changes; if (sequential) { mapForA = b.changes; mapForB = ChangeSet.empty(b.changes.length); - changes = a.changes.compose(b.changes); + changes = a2.changes.compose(b.changes); } else { - mapForA = b.changes.map(a.changes); - mapForB = a.changes.mapDesc(b.changes, true); - changes = a.changes.compose(mapForA); + mapForA = b.changes.map(a2.changes); + mapForB = a2.changes.mapDesc(b.changes, true); + changes = a2.changes.compose(mapForA); } return { changes, - selection: b.selection ? b.selection.map(mapForB) : (_a2 = a.selection) === null || _a2 === void 0 ? void 0 : _a2.map(mapForA), - effects: StateEffect.mapEffects(a.effects, mapForA).concat(StateEffect.mapEffects(b.effects, mapForB)), - annotations: a.annotations.length ? a.annotations.concat(b.annotations) : b.annotations, - scrollIntoView: a.scrollIntoView || b.scrollIntoView + selection: b.selection ? b.selection.map(mapForB) : (_a2 = a2.selection) === null || _a2 === void 0 ? void 0 : _a2.map(mapForA), + effects: StateEffect.mapEffects(a2.effects, mapForA).concat(StateEffect.mapEffects(b.effects, mapForB)), + annotations: a2.annotations.length ? a2.annotations.concat(b.annotations) : b.annotations, + scrollIntoView: a2.scrollIntoView || b.scrollIntoView }; } function resolveTransactionInner(state, spec, docSize) { @@ -2449,20 +2449,20 @@ to [`toJSON`](https://codemirror.net/6/docs/ref/#state.EditorState.toJSON) when serializing as third argument. */ - static fromJSON(json, config2 = {}, fields) { - if (!json || typeof json.doc != "string") + static fromJSON(json2, config2 = {}, fields) { + if (!json2 || typeof json2.doc != "string") throw new RangeError("Invalid JSON representation for EditorState"); let fieldInit = []; if (fields) for (let prop in fields) { - if (Object.prototype.hasOwnProperty.call(json, prop)) { - let field = fields[prop], value = json[prop]; + if (Object.prototype.hasOwnProperty.call(json2, prop)) { + let field = fields[prop], value = json2[prop]; fieldInit.push(field.init((state) => field.spec.fromJSON(value, state))); } } return _EditorState.create({ - doc: json.doc, - selection: EditorSelection.fromJSON(json.selection), + doc: json2.doc, + selection: EditorSelection.fromJSON(json2.selection), extensions: config2.extensions ? fieldInit.concat([config2.extensions]) : fieldInit }); } @@ -2599,9 +2599,9 @@ EditorState.lineSeparator = lineSeparator; EditorState.readOnly = readOnly; EditorState.phrases = /* @__PURE__ */ Facet.define({ - compare(a, b) { - let kA = Object.keys(a), kB = Object.keys(b); - return kA.length == kB.length && kA.every((k) => a[k] == b[k]); + compare(a2, b) { + let kA = Object.keys(a2), kB = Object.keys(b); + return kA.length == kB.length && kA.every((k) => a2[k] == b[k]); } }); EditorState.languageData = languageData; @@ -2609,7 +2609,7 @@ EditorState.transactionFilter = transactionFilter; EditorState.transactionExtender = transactionExtender; Compartment.reconfigure = /* @__PURE__ */ StateEffect.define(); - function combineConfig(configs, defaults2, combine = {}) { + function combineConfig(configs, defaults3, combine = {}) { let result = {}; for (let config2 of configs) for (let key of Object.keys(config2)) { @@ -2622,9 +2622,9 @@ else throw new Error("Config merge conflict for field " + key); } - for (let key in defaults2) + for (let key in defaults3) if (result[key] === void 0) - result[key] = defaults2[key]; + result[key] = defaults3[key]; return result; } var RangeValue = class { @@ -2648,8 +2648,8 @@ RangeValue.prototype.startSide = RangeValue.prototype.endSide = 0; RangeValue.prototype.point = false; RangeValue.prototype.mapMode = MapMode.TrackDel; - function cmpVal(a, b) { - return a == b || a.constructor == b.constructor && a.eq(b); + function cmpVal(a2, b) { + return a2 == b || a2.constructor == b.constructor && a2.eq(b); } var Range = class _Range { constructor(from, to, value) { @@ -2664,8 +2664,8 @@ return new _Range(from, to, value); } }; - function cmpRange(a, b) { - return a.from - b.from || a.value.startSide - b.value.startSide; + function cmpRange(a2, b) { + return a2.from - b.from || a2.value.startSide - b.value.startSide; } var Chunk = class _Chunk { constructor(from, to, value, maxPoint) { @@ -2873,10 +2873,10 @@ to notify it of possible differences. */ static compare(oldSets, newSets, textDiff, comparator, minPointSize = -1) { - let a = oldSets.filter((set) => set.maxPoint > 0 || !set.isEmpty && set.maxPoint >= minPointSize); + let a2 = oldSets.filter((set) => set.maxPoint > 0 || !set.isEmpty && set.maxPoint >= minPointSize); let b = newSets.filter((set) => set.maxPoint > 0 || !set.isEmpty && set.maxPoint >= minPointSize); - let sharedChunks = findSharedChunks(a, b, textDiff); - let sideA = new SpanCursor(a, sharedChunks, minPointSize); + let sharedChunks = findSharedChunks(a2, b, textDiff); + let sideA = new SpanCursor(a2, sharedChunks, minPointSize); let sideB = new SpanCursor(b, sharedChunks, minPointSize); textDiff.iterGaps((fromA, fromB, length) => compare(sideA, fromA, sideB, fromB, length, comparator)); if (textDiff.empty && textDiff.length == 0) @@ -2889,14 +2889,14 @@ static eq(oldSets, newSets, from = 0, to) { if (to == null) to = 1e9 - 1; - let a = oldSets.filter((set) => !set.isEmpty && newSets.indexOf(set) < 0); + let a2 = oldSets.filter((set) => !set.isEmpty && newSets.indexOf(set) < 0); let b = newSets.filter((set) => !set.isEmpty && oldSets.indexOf(set) < 0); - if (a.length != b.length) + if (a2.length != b.length) return false; - if (!a.length) + if (!a2.length) return true; - let sharedChunks = findSharedChunks(a, b); - let sideA = new SpanCursor(a, sharedChunks, 0).goto(from), sideB = new SpanCursor(b, sharedChunks, 0).goto(from); + let sharedChunks = findSharedChunks(a2, b); + let sideA = new SpanCursor(a2, sharedChunks, 0).goto(from), sideB = new SpanCursor(b, sharedChunks, 0).goto(from); for (; ; ) { if (sideA.to != sideB.to || !sameValues(sideA.active, sideB.active) || sideA.point && (!sideB.point || !cmpVal(sideA.point, sideB.point))) return false; @@ -3070,9 +3070,9 @@ return result; } }; - function findSharedChunks(a, b, textDiff) { + function findSharedChunks(a2, b, textDiff) { let inA = /* @__PURE__ */ new Map(); - for (let set of a) + for (let set of a2) for (let i = 0; i < set.chunk.length; i++) if (set.chunk[i].maxPoint <= 0) inA.set(set.chunk[i], set.chunkPos[i]); @@ -3282,16 +3282,16 @@ this.point = null; let trackOpen = this.openStart < 0 ? [] : null; for (; ; ) { - let a = this.minActive; - if (a > -1 && (this.activeTo[a] - this.cursor.from || this.active[a].endSide - this.cursor.startSide) < 0) { - if (this.activeTo[a] > from) { - this.to = this.activeTo[a]; - this.endSide = this.active[a].endSide; + let a2 = this.minActive; + if (a2 > -1 && (this.activeTo[a2] - this.cursor.from || this.active[a2].endSide - this.cursor.startSide) < 0) { + if (this.activeTo[a2] > from) { + this.to = this.activeTo[a2]; + this.endSide = this.active[a2].endSide; break; } - this.removeActive(a); + this.removeActive(a2); if (trackOpen) - remove(trackOpen, a); + remove(trackOpen, a2); } else if (!this.cursor.value) { this.to = this.endSide = 1e9; break; @@ -3343,42 +3343,42 @@ return open; } }; - function compare(a, startA, b, startB, length, comparator) { - a.goto(startA); + function compare(a2, startA, b, startB, length, comparator) { + a2.goto(startA); b.goto(startB); let endB = startB + length; let pos = startB, dPos = startB - startA; let bounds = !!comparator.boundChange; for (let boundChange = false; ; ) { - let dEnd = a.to + dPos - b.to, diff = dEnd || a.endSide - b.endSide; - let end = diff < 0 ? a.to + dPos : b.to, clipEnd = Math.min(end, endB); - let point = a.point || b.point; + let dEnd = a2.to + dPos - b.to, diff = dEnd || a2.endSide - b.endSide; + let end = diff < 0 ? a2.to + dPos : b.to, clipEnd = Math.min(end, endB); + let point = a2.point || b.point; if (point) { - if (!(a.point && b.point && cmpVal(a.point, b.point) && sameValues(a.activeForPoint(a.to), b.activeForPoint(b.to)))) - comparator.comparePoint(pos, clipEnd, a.point, b.point); + if (!(a2.point && b.point && cmpVal(a2.point, b.point) && sameValues(a2.activeForPoint(a2.to), b.activeForPoint(b.to)))) + comparator.comparePoint(pos, clipEnd, a2.point, b.point); boundChange = false; } else { if (boundChange) comparator.boundChange(pos); - if (clipEnd > pos && !sameValues(a.active, b.active)) - comparator.compareRange(pos, clipEnd, a.active, b.active); - if (bounds && clipEnd < endB && (dEnd || a.openEnd(end) != b.openEnd(end))) + if (clipEnd > pos && !sameValues(a2.active, b.active)) + comparator.compareRange(pos, clipEnd, a2.active, b.active); + if (bounds && clipEnd < endB && (dEnd || a2.openEnd(end) != b.openEnd(end))) boundChange = true; } if (end > endB) break; pos = end; if (diff <= 0) - a.next(); + a2.next(); if (diff >= 0) b.next(); } } - function sameValues(a, b) { - if (a.length != b.length) + function sameValues(a2, b) { + if (a2.length != b.length) return false; - for (let i = 0; i < a.length; i++) - if (a[i] != b[i] && !cmpVal(a[i], b[i])) + for (let i = 0; i < a2.length; i++) + if (a2[i] != b[i] && !cmpVal(a2[i], b[i])) return false; return true; } @@ -3450,7 +3450,7 @@ let value = spec2[prop]; if (/&/.test(prop)) { render( - prop.split(/,\s*/).map((part) => selectors.map((sel) => part.replace(/&/, sel))).reduce((a, b) => a.concat(b)), + prop.split(/,\s*/).map((part) => selectors.map((sel) => part.replace(/&/, sel))).reduce((a2, b) => a2.concat(b)), value, target ); @@ -3705,18 +3705,18 @@ return target; } var noAttrs = /* @__PURE__ */ Object.create(null); - function attrsEq(a, b, ignore) { - if (a == b) + function attrsEq(a2, b, ignore) { + if (a2 == b) return true; - if (!a) - a = noAttrs; + if (!a2) + a2 = noAttrs; if (!b) b = noAttrs; - let keysA = Object.keys(a), keysB = Object.keys(b); + let keysA = Object.keys(a2), keysB = Object.keys(b); if (keysA.length - (ignore && keysA.indexOf(ignore) > -1 ? 1 : 0) != keysB.length - (ignore && keysB.indexOf(ignore) > -1 ? 1 : 0)) return false; for (let key of keysA) { - if (key != ignore && (keysB.indexOf(key) == -1 || a[key] !== b[key])) + if (key != ignore && (keysB.indexOf(key) == -1 || a2[key] !== b[key])) return false; } return true; @@ -3998,8 +3998,8 @@ end = spec.inclusive; return { start: start !== null && start !== void 0 ? start : block, end: end !== null && end !== void 0 ? end : block }; } - function widgetsEq(a, b) { - return a == b || !!(a && b && a.compare(b)); + function widgetsEq(a2, b) { + return a2 == b || !!(a2 && b && a2.compare(b)); } function addRange(from, to, ranges, margin = 0) { let last = ranges.length - 1; @@ -4473,11 +4473,11 @@ return maybe; } }; - function isolatesEq(a, b) { - if (a.length != b.length) + function isolatesEq(a2, b) { + if (a2.length != b.length) return false; - for (let i = 0; i < a.length; i++) { - let iA = a[i], iB = b[i]; + for (let i = 0; i < a2.length; i++) { + let iA = a2[i], iB = b[i]; if (iA.from != iB.from || iA.to != iB.to || iA.direction != iB.direction || !isolatesEq(iA.inner, iB.inner)) return false; } @@ -4607,12 +4607,12 @@ let ourType = level % 2 ? 2 : 1; if (level % 2 == baseLevel % 2) { for (let iCh = from, iI = 0; iCh < to; ) { - let sameDir = true, isNum = false; + let sameDir = true, isNum2 = false; if (iI == isolates.length || iCh < isolates[iI].from) { let next = types[iCh]; if (next != ourType) { sameDir = false; - isNum = next == 16; + isNum2 = next == 16; } } let recurse = !sameDir && ourType == 1 ? [] : null; @@ -4620,7 +4620,7 @@ let iScan = iCh; run: for (; ; ) { if (iI < isolates.length && iScan == isolates[iI].from) { - if (isNum) + if (isNum2) break run; let iso = isolates[iI]; if (!sameDir) @@ -4659,12 +4659,12 @@ } } else { for (let iCh = to, iI = isolates.length; iCh > from; ) { - let sameDir = true, isNum = false; + let sameDir = true, isNum2 = false; if (!iI || iCh > isolates[iI - 1].to) { let next = types[iCh - 1]; if (next != ourType) { sameDir = false; - isNum = next == 16; + isNum2 = next == 16; } } let recurse = !sameDir && ourType == 1 ? [] : null; @@ -4672,7 +4672,7 @@ let iScan = iCh; run: for (; ; ) { if (iI && iScan == isolates[iI - 1].to) { - if (isNum) + if (isNum2) break run; let iso = isolates[--iI]; if (!sameDir) @@ -5440,8 +5440,8 @@ let rects = clientRectsFor(last); return rects[rects.length - 1] || null; } - function onSameLine(a, b) { - let posA = a.coordsIn(0, 1), posB = b.coordsIn(0, 1); + function onSameLine(a2, b) { + let posA = a2.coordsIn(0, 1), posB = b.coordsIn(0, 1); return posA && posB && posB.top < posA.bottom; } var MarkTile = class _MarkTile extends CompositeTile { @@ -5669,8 +5669,8 @@ } }; var TileBuilder = class { - constructor(cache2, root, blockWrappers2) { - this.cache = cache2; + constructor(cache4, root, blockWrappers2) { + this.cache = cache4; this.root = root; this.blockWrappers = blockWrappers2; this.curLine = null; @@ -6900,9 +6900,9 @@ addRange(pos, pos, this.changes); } }; - function findChangedDeco(a, b, diff) { + function findChangedDeco(a2, b, diff) { let comp = new DecorationComparator$1(); - RangeSet.compare(a, b, diff, comp); + RangeSet.compare(a2, b, diff, comp); return comp.changes; } var WrapperComparator = class { @@ -6918,9 +6918,9 @@ addRange(pos, pos, this.changes); } }; - function findChangedWrappers(a, b, diff) { + function findChangedWrappers(a2, b, diff) { let comp = new WrapperComparator(); - RangeSet.compare(a, b, diff, comp); + RangeSet.compare(a2, b, diff, comp); return comp.changes; } function inUneditable(node, inside) { @@ -7684,15 +7684,15 @@ } return startState.update(tr, { userEvent, scrollIntoView: true }); } - function findDiff(a, b, preferredPos, preferredSide) { - let minLen = Math.min(a.length, b.length); + function findDiff(a2, b, preferredPos, preferredSide) { + let minLen = Math.min(a2.length, b.length); let from = 0; - while (from < minLen && a.charCodeAt(from) == b.charCodeAt(from)) + while (from < minLen && a2.charCodeAt(from) == b.charCodeAt(from)) from++; - if (from == minLen && a.length == b.length) + if (from == minLen && a2.length == b.length) return null; - let toA = a.length, toB = b.length; - while (toA > 0 && toB > 0 && a.charCodeAt(toA - 1) == b.charCodeAt(toB - 1)) { + let toA = a2.length, toB = b.length; + while (toA > 0 && toB > 0 && a2.charCodeAt(toA - 1) == b.charCodeAt(toB - 1)) { toA--; toB--; } @@ -7700,7 +7700,7 @@ let adjust = Math.max(0, from - Math.min(toA, toB)); preferredPos -= toA + adjust - from; } - if (toA < from && a.length < b.length) { + if (toA < from && a2.length < b.length) { let move = preferredPos <= from && preferredPos >= toA ? from - preferredPos : 0; from -= move; toB = from + (toB - toA); @@ -7923,8 +7923,8 @@ function dragScrollSpeed(dist2) { return Math.max(0, dist2) * 0.7 + 8; } - function dist(a, b) { - return Math.max(Math.abs(a.clientX - b.clientX), Math.abs(a.clientY - b.clientY)); + function dist(a2, b) { + return Math.max(Math.abs(a2.clientX - b.clientX), Math.abs(a2.clientY - b.clientY)); } var MouseSelection = class { constructor(view, startEvent, style, mustSelect) { @@ -8445,7 +8445,7 @@ view.inputState.lastContextMenu = Date.now(); }; handlers.beforeinput = (view, event) => { - var _a2, _b; + var _a2, _b2; if (event.inputType == "insertText" || event.inputType == "insertCompositionText") { view.inputState.insertingText = event.data; view.inputState.insertingTextAt = Date.now(); @@ -8463,7 +8463,7 @@ if (browser.chrome && browser.android && (pending = PendingKeys.find((key) => key.inputType == event.inputType))) { view.observer.delayAndroidKey(pending.key, pending.keyCode); if (pending.key == "Backspace" || pending.key == "Delete") { - let startViewHeight = ((_b = window.visualViewport) === null || _b === void 0 ? void 0 : _b.height) || 0; + let startViewHeight = ((_b2 = window.visualViewport) === null || _b2 === void 0 ? void 0 : _b2.height) || 0; setTimeout(() => { var _a3; if ((((_a3 = window.visualViewport) === null || _a3 === void 0 ? void 0 : _a3.height) || 0) > startViewHeight + 10 && view.hasFocus) { @@ -9191,9 +9191,9 @@ return builder.finish(from); } }; - function heightRelevantDecoChanges(a, b, diff) { + function heightRelevantDecoChanges(a2, b, diff) { let comp = new DecorationComparator2(); - RangeSet.compare(a, b, diff, comp, 0); + RangeSet.compare(a2, b, diff, comp, 0); return comp.changes; } var DecorationComparator2 = class { @@ -9202,8 +9202,8 @@ } compareRange() { } - comparePoint(from, to, a, b) { - if (from < to || a && a.heightRelevant || b && b.heightRelevant) + comparePoint(from, to, a2, b) { + if (from < to || a2 && a2.heightRelevant || b && b.heightRelevant) addRange(from, to, this.changes, 5); } }; @@ -9257,11 +9257,11 @@ this.size = size; this.displaySize = displaySize; } - static same(a, b) { - if (a.length != b.length) + static same(a2, b) { + if (a2.length != b.length) return false; - for (let i = 0; i < a.length; i++) { - let gA = a[i], gB = b[i]; + for (let i = 0; i < a2.length; i++) { + let gA = a2[i], gB = b[i]; if (gA.from != gB.from || gA.to != gB.to || gA.size != gB.size) return false; } @@ -9346,7 +9346,7 @@ viewports.push(new Viewport(from, to)); } } - this.viewports = viewports.sort((a, b) => a.from - b.from); + this.viewports = viewports.sort((a2, b) => a2.from - b.from); return this.updateScaler(); } updateScaler() { @@ -10544,10 +10544,10 @@ } } destroy() { - var _a2, _b, _c; + var _a2, _b2, _c; this.stop(); (_a2 = this.intersection) === null || _a2 === void 0 ? void 0 : _a2.disconnect(); - (_b = this.gapIntersection) === null || _b === void 0 ? void 0 : _b.disconnect(); + (_b2 = this.gapIntersection) === null || _b2 === void 0 ? void 0 : _b2.disconnect(); (_c = this.resizeScroll) === null || _c === void 0 ? void 0 : _c.disconnect(); for (let dom of this.scrollTargets) dom.removeEventListener("scroll", this.onScroll); @@ -11611,8 +11611,8 @@ cause it to scroll the given position or range into view. */ static scrollIntoView(pos, options = {}) { - var _a2, _b, _c, _d; - return scrollIntoView.of(new ScrollTarget(typeof pos == "number" ? EditorSelection.cursor(pos) : pos, (_a2 = options.y) !== null && _a2 !== void 0 ? _a2 : "nearest", (_b = options.x) !== null && _b !== void 0 ? _b : "nearest", (_c = options.yMargin) !== null && _c !== void 0 ? _c : 5, (_d = options.xMargin) !== null && _d !== void 0 ? _d : 5)); + var _a2, _b2, _c, _d; + return scrollIntoView.of(new ScrollTarget(typeof pos == "number" ? EditorSelection.cursor(pos) : pos, (_a2 = options.y) !== null && _a2 !== void 0 ? _a2 : "nearest", (_b2 = options.x) !== null && _b2 !== void 0 ? _b2 : "nearest", (_c = options.yMargin) !== null && _c !== void 0 ? _c : 5, (_d = options.xMargin) !== null && _d !== void 0 ? _d : 5)); } /** Return an effect that resets the editor to its current (at the @@ -11770,12 +11770,12 @@ this.fresh = fresh; this.order = order; } - static update(cache2, changes) { - if (changes.empty && !cache2.some((c) => c.fresh)) - return cache2; - let result = [], lastDir = cache2.length ? cache2[cache2.length - 1].dir : Direction.LTR; - for (let i = Math.max(0, cache2.length - 10); i < cache2.length; i++) { - let entry = cache2[i]; + static update(cache4, changes) { + if (changes.empty && !cache4.some((c) => c.fresh)) + return cache4; + let result = [], lastDir = cache4.length ? cache4[cache4.length - 1].dir : Direction.LTR; + for (let i = Math.max(0, cache4.length - 10); i < cache4.length; i++) { + let entry = cache4[i]; if (entry.dir == lastDir && !changes.touchesRange(entry.from, entry.to)) result.push(new _CachedOrder(changes.mapPos(entry.from, 1), changes.mapPos(entry.to, -1), entry.dir, entry.isolates, false, entry.order)); } @@ -11847,7 +11847,7 @@ let bindings = state.facet(keymap); let map = Keymaps.get(bindings); if (!map) - Keymaps.set(bindings, map = buildKeymap(bindings.reduce((a, b) => a.concat(b), []))); + Keymaps.set(bindings, map = buildKeymap(bindings.reduce((a2, b) => a2.concat(b), []))); return map; } function runScopeHandlers(view, event, scope) { @@ -11866,7 +11866,7 @@ throw new Error("Key binding " + name2 + " is used both as a regular binding and as a multi-stroke prefix"); }; let add = (scope, key, command2, preventDefault, stopPropagation) => { - var _a2, _b; + var _a2, _b2; let scopeObj = bound[scope] || (bound[scope] = /* @__PURE__ */ Object.create(null)); let parts = key.split(/ (?!$)/).map((k) => normalizeKeyName(k, platform)); for (let i = 1; i < parts.length; i++) { @@ -11891,7 +11891,7 @@ let binding = scopeObj[full] || (scopeObj[full] = { preventDefault: false, stopPropagation: false, - run: ((_b = (_a2 = scopeObj._any) === null || _a2 === void 0 ? void 0 : _a2.run) === null || _b === void 0 ? void 0 : _b.slice()) || [] + run: ((_b2 = (_a2 = scopeObj._any) === null || _a2 === void 0 ? void 0 : _a2.run) === null || _b2 === void 0 ? void 0 : _b2.slice()) || [] }); if (command2) binding.run.push(command2); @@ -11987,8 +11987,8 @@ drawRangeCursor: true, iosSelectionHandles: true }, { - cursorBlinkRate: (a, b) => Math.min(a, b), - drawRangeCursor: (a, b) => a || b + cursorBlinkRate: (a2, b) => Math.min(a2, b), + drawRangeCursor: (a2, b) => a2 || b }); } }); @@ -12060,10 +12060,10 @@ } var tooltipConfig = /* @__PURE__ */ Facet.define({ combine: (values2) => { - var _a2, _b, _c; + var _a2, _b2, _c; return { position: browser.ios ? "absolute" : ((_a2 = values2.find((conf) => conf.position)) === null || _a2 === void 0 ? void 0 : _a2.position) || "fixed", - parent: ((_b = values2.find((conf) => conf.parent)) === null || _b === void 0 ? void 0 : _b.parent) || null, + parent: ((_b2 = values2.find((conf) => conf.parent)) === null || _b2 === void 0 ? void 0 : _b2.parent) || null, tooltipSpace: ((_c = values2.find((conf) => conf.tooltipSpace)) === null || _c === void 0 ? void 0 : _c.tooltipSpace) || windowSpace }; } @@ -12170,7 +12170,7 @@ return tooltipView; } destroy() { - var _a2, _b, _c; + var _a2, _b2, _c; this.view.win.removeEventListener("resize", this.measureSoon); for (let tooltipView of this.manager.tooltipViews) { tooltipView.dom.remove(); @@ -12178,7 +12178,7 @@ } if (this.parent) this.container.remove(); - (_b = this.resizeObserver) === null || _b === void 0 ? void 0 : _b.disconnect(); + (_b2 = this.resizeObserver) === null || _b2 === void 0 ? void 0 : _b2.disconnect(); (_c = this.intersectionObserver) === null || _c === void 0 ? void 0 : _c.disconnect(); clearTimeout(this.measureTimeout); } @@ -12232,12 +12232,12 @@ for (let t2 of this.manager.tooltipViews) t2.dom.style.position = "absolute"; } - let { visible, space: space4, scaleX, scaleY } = measured; + let { visible, space: space6, scaleX, scaleY } = measured; let others = []; for (let i = 0; i < this.manager.tooltips.length; i++) { let tooltip = this.manager.tooltips[i], tView = this.manager.tooltipViews[i], { dom } = tView; let pos = measured.pos[i], size = measured.size[i]; - if (!pos || tooltip.clip !== false && (pos.bottom <= Math.max(visible.top, space4.top) || pos.top >= Math.min(visible.bottom, space4.bottom) || pos.right < Math.max(visible.left, space4.left) - 0.1 || pos.left > Math.min(visible.right, space4.right) + 0.1)) { + if (!pos || tooltip.clip !== false && (pos.bottom <= Math.max(visible.top, space6.top) || pos.top >= Math.min(visible.bottom, space6.bottom) || pos.right < Math.max(visible.left, space6.left) - 0.1 || pos.left > Math.min(visible.right, space6.right) + 0.1)) { dom.style.top = Outside; continue; } @@ -12245,11 +12245,11 @@ let arrowHeight = arrow ? 7 : 0; let width = size.right - size.left, height = (_a2 = knownHeight.get(tView)) !== null && _a2 !== void 0 ? _a2 : size.bottom - size.top; let offset = tView.offset || noOffset, ltr = this.view.textDirection == Direction.LTR; - let left = size.width > space4.right - space4.left ? ltr ? space4.left : space4.right - size.width : ltr ? Math.max(space4.left, Math.min(pos.left - (arrow ? 14 : 0) + offset.x, space4.right - width)) : Math.min(Math.max(space4.left, pos.left - width + (arrow ? 14 : 0) - offset.x), space4.right - width); + let left = size.width > space6.right - space6.left ? ltr ? space6.left : space6.right - size.width : ltr ? Math.max(space6.left, Math.min(pos.left - (arrow ? 14 : 0) + offset.x, space6.right - width)) : Math.min(Math.max(space6.left, pos.left - width + (arrow ? 14 : 0) - offset.x), space6.right - width); let above = this.above[i]; - if (!tooltip.strictSide && (above ? pos.top - height - arrowHeight - offset.y < space4.top : pos.bottom + height + arrowHeight + offset.y > space4.bottom) && above == space4.bottom - pos.bottom > pos.top - space4.top) + if (!tooltip.strictSide && (above ? pos.top - height - arrowHeight - offset.y < space6.top : pos.bottom + height + arrowHeight + offset.y > space6.bottom) && above == space6.bottom - pos.bottom > pos.top - space6.top) above = this.above[i] = !above; - let spaceVert = (above ? pos.top - space4.top : space4.bottom - pos.bottom) - arrowHeight; + let spaceVert = (above ? pos.top - space6.top : space6.bottom - pos.bottom) - arrowHeight; if (spaceVert < height && tView.resize !== false) { if (spaceVert < this.view.defaultLineHeight) { dom.style.top = Outside; @@ -12887,11 +12887,11 @@ this.setMarkers(null, []); } }; - function sameMarkers(a, b) { - if (a.length != b.length) + function sameMarkers(a2, b) { + if (a2.length != b.length) return false; - for (let i = 0; i < a.length; i++) - if (!a[i].compare(b[i])) + for (let i = 0; i < a2.length; i++) + if (!a2[i].compare(b[i])) return false; return true; } @@ -12900,8 +12900,8 @@ var lineNumberConfig = /* @__PURE__ */ Facet.define({ combine(values2) { return combineConfig(values2, { formatNumber: String, domEventHandlers: {} }, { - domEventHandlers(a, b) { - let result = Object.assign({}, a); + domEventHandlers(a2, b) { + let result = Object.assign({}, a2); for (let event in b) { let exists = result[event], add = b[event]; result[event] = exists ? (view, line, event2) => exists(view, line, event2) || add(view, line, event2) : add; @@ -13023,11 +13023,11 @@ NodeProp.lookAhead = new NodeProp({ perNode: true }); NodeProp.mounted = new NodeProp({ perNode: true }); var MountedTree = class { - constructor(tree, overlay, parser5, bracketed = false) { + constructor(tree, overlay, parser14, bracketed2 = false) { this.tree = tree; this.overlay = overlay; - this.parser = parser5; - this.bracketed = bracketed; + this.parser = parser14; + this.bracketed = bracketed2; } /** @internal @@ -14130,10 +14130,10 @@ get node() { if (!this.buffer) return this._tree; - let cache2 = this.bufferNode, result = null, depth = 0; - if (cache2 && cache2.context == this.buffer) { + let cache4 = this.bufferNode, result = null, depth = 0; + if (cache4 && cache4.context == this.buffer) { scan: for (let index = this.index, d = this.stack.length; d >= 0; ) { - for (let c = cache2; c; c = c._parent) + for (let c = cache4; c; c = c._parent) if (c.index == index) { if (index == this.index) return c; @@ -14214,9 +14214,9 @@ } function buildTree(data2) { var _a2; - let { buffer, nodeSet, maxBufferLength = DefaultBufferLength, reused = [], minRepeatType = nodeSet.types.length } = data2; + let { buffer, nodeSet: nodeSet2, maxBufferLength = DefaultBufferLength, reused = [], minRepeatType = nodeSet2.types.length } = data2; let cursor = Array.isArray(buffer) ? new FlatBufferCursor(buffer, buffer.length) : buffer; - let types2 = nodeSet.types; + let types2 = nodeSet2.types; let contextHash = 0, lookAhead = 0; function takeNode(parentStart, minPos, children2, positions2, inRepeat, depth) { let { id: id2, start, end, size } = cursor; @@ -14245,7 +14245,7 @@ let endPos = cursor.pos - buffer2.size, index = data3.length; while (cursor.pos > endPos) index = copyToBuffer(buffer2.start, data3, index); - node = new TreeBuffer(data3, end - buffer2.start, nodeSet); + node = new TreeBuffer(data3, end - buffer2.start, nodeSet2); startPos = buffer2.start - parentStart; } else { let endPos = cursor.pos - size; @@ -14307,7 +14307,7 @@ buffer2[j++] = nodes[i + 2] - start; buffer2[j++] = j; } - children2.push(new TreeBuffer(buffer2, nodes[2] - start, nodeSet)); + children2.push(new TreeBuffer(buffer2, nodes[2] - start, nodeSet2)); positions2.push(start - parentStart); } } @@ -14329,7 +14329,7 @@ localChildren.push(children2.pop()); localPositions.push(positions2.pop() + base2 - from); } - children2.push(makeTree(nodeSet.types[type], localChildren, localPositions, to - from, lookAhead2 - to, contextHash2)); + children2.push(makeTree(nodeSet2.types[type], localChildren, localPositions, to - from, lookAhead2 - to, contextHash2)); positions2.push(from - base2); } function makeTree(type, children2, positions2, length2, lookAhead2, contextHash2, props) { @@ -14642,11 +14642,11 @@ return (parse, input, fragments, ranges) => new MixedParse(parse, nest, input, fragments, ranges); } var InnerParse = class { - constructor(parser5, parse, overlay, bracketed, target, from) { - this.parser = parser5; + constructor(parser14, parse, overlay, bracketed2, target, from) { + this.parser = parser14; this.parse = parse; this.overlay = overlay; - this.bracketed = bracketed; + this.bracketed = bracketed2; this.target = target; this.from = from; } @@ -14656,13 +14656,13 @@ throw new RangeError("Invalid inner parse ranges given: " + JSON.stringify(ranges)); } var ActiveOverlay = class { - constructor(parser5, predicate, mounts, index, start, bracketed, target, prev) { - this.parser = parser5; + constructor(parser14, predicate, mounts, index, start, bracketed2, target, prev) { + this.parser = parser14; this.predicate = predicate; this.mounts = mounts; this.index = index; this.start = start; - this.bracketed = bracketed; + this.bracketed = bracketed2; this.target = target; this.prev = prev; this.depth = 0; @@ -14915,14 +14915,14 @@ this.inner = new StructureCursor(frag.tree, -frag.offset); } } - findMounts(pos, parser5) { + findMounts(pos, parser14) { var _a2; let result = []; if (this.inner) { this.inner.cursor.moveTo(pos, 1); for (let pos2 = this.inner.cursor.node; pos2; pos2 = pos2.parent) { let mount = (_a2 = pos2.tree) === null || _a2 === void 0 ? void 0 : _a2.prop(NodeProp.mounted); - if (mount && mount.parser == parser5) { + if (mount && mount.parser == parser14) { for (let i = this.fragI; i < this.fragments.length; i++) { let frag = this.fragments[i]; if (frag.from >= pos2.to) @@ -14965,11 +14965,11 @@ } return current; } - function findCoverChanges(a, b, from, to) { + function findCoverChanges(a2, b, from, to) { let iA = 0, iB = 0, inA = false, inB = false, pos = -1e9; let result = []; for (; ; ) { - let nextA = iA == a.length ? 1e9 : inA ? a[iA].to : a[iA].from; + let nextA = iA == a2.length ? 1e9 : inA ? a2[iA].to : a2[iA].from; let nextB = iB == b.length ? 1e9 : inB ? b[iB].to : b[iB].from; if (inA != inB) { let start = Math.max(pos, from), end = Math.min(nextA, nextB, to); @@ -15071,7 +15071,7 @@ return (tag) => { if (tag.modified.indexOf(mod) > -1) return tag; - return Modifier.get(tag.base || tag, tag.modified.concat(mod).sort((a, b) => a.id - b.id)); + return Modifier.get(tag.base || tag, tag.modified.concat(mod).sort((a2, b) => a2.id - b.id)); }; } }; @@ -15099,8 +15099,8 @@ return tag; } }; - function sameArray2(a, b) { - return a.length == b.length && a.every((x, i) => x == b[i]); + function sameArray2(a2, b) { + return a2.length == b.length && a2.every((x, i) => x == b[i]); } function powerSet(array) { let sets = [[]]; @@ -15109,7 +15109,7 @@ sets.push(sets[j].concat(array[i])); } } - return sets.sort((a, b) => b.length - a.length); + return sets.sort((a2, b) => b.length - a2.length); } function styleTags(spec) { let byName = /* @__PURE__ */ Object.create(null); @@ -15151,15 +15151,15 @@ return ruleNodeProp.add(byName); } var ruleNodeProp = new NodeProp({ - combine(a, b) { + combine(a2, b) { let cur2, root, take; - while (a || b) { - if (!a || b && a.depth >= b.depth) { + while (a2 || b) { + if (!a2 || b && a2.depth >= b.depth) { take = b; b = b.next; } else { - take = a; - a = a.next; + take = a2; + a2 = a2.next; } if (cur2 && cur2.mode == take.mode && !take.context && !cur2.context) continue; @@ -15762,14 +15762,14 @@ configure your parser to [attach](https://codemirror.net/6/docs/ref/#language.languageDataProp) it to the language's outer syntax node. */ - constructor(data2, parser5, extraExtensions = [], name2 = "") { + constructor(data2, parser14, extraExtensions = [], name2 = "") { this.data = data2; this.name = name2; if (!EditorState.prototype.hasOwnProperty("tree")) Object.defineProperty(EditorState.prototype, "tree", { get() { return syntaxTree(this); } }); - this.parser = parser5; + this.parser = parser14; this.extension = [ language.of(this), EditorState.languageData.of((state, pos, side) => { @@ -15856,9 +15856,9 @@ return tree; } var LRLanguage = class _LRLanguage extends Language { - constructor(data2, parser5, name2) { - super(data2, parser5, [], name2); - this.parser = parser5; + constructor(data2, parser14, name2) { + super(data2, parser14, [], name2); + this.parser = parser14; } /** Define a language from a parser. @@ -15921,17 +15921,17 @@ return true; } read(from, to) { - let stringStart = this.cursorPos - this.string.length; - if (from < stringStart || to >= this.cursorPos) + let stringStart2 = this.cursorPos - this.string.length; + if (from < stringStart2 || to >= this.cursorPos) return this.doc.sliceString(from, to); else - return this.string.slice(from - stringStart, to - stringStart); + return this.string.slice(from - stringStart2, to - stringStart2); } }; var currentContext = null; var ParseContext = class _ParseContext { - constructor(parser5, state, fragments = [], tree, treeLen, viewport, skipped, scheduleOn) { - this.parser = parser5; + constructor(parser14, state, fragments = [], tree, treeLen, viewport, skipped, scheduleOn) { + this.parser = parser14; this.state = state; this.fragments = fragments; this.tree = tree; @@ -15945,8 +15945,8 @@ /** @internal */ - static create(parser5, state, viewport) { - return new _ParseContext(parser5, state, [], Tree.empty, 0, viewport, [], null); + static create(parser14, state, viewport) { + return new _ParseContext(parser14, state, [], Tree.empty, 0, viewport, [], null); } startParse() { return this.parser.startParse(new DocInput(this.state.doc), this.fragments); @@ -16094,7 +16094,7 @@ return new class extends Parser { createParse(input, fragments, ranges) { let from = ranges[0].from, to = ranges[ranges.length - 1].to; - let parser5 = { + let parser14 = { parsedPos: from, advance() { let cx = currentContext; @@ -16111,7 +16111,7 @@ stopAt() { } }; - return parser5; + return parser14; } }(); } @@ -16351,13 +16351,13 @@ static matchLanguageName(descs, name2, fuzzy = true) { name2 = name2.toLowerCase(); for (let d of descs) - if (d.alias.some((a) => a == name2)) + if (d.alias.some((a2) => a2 == name2)) return d; if (fuzzy) for (let d of descs) - for (let a of d.alias) { - let found = name2.indexOf(a); - if (found > -1 && (a.length > 2 || !/\w/.test(name2[found - 1]) && !/\w/.test(name2[found + a.length]))) + for (let a2 of d.alias) { + let found = name2.indexOf(a2); + if (found > -1 && (a2.length > 2 || !/\w/.test(name2[found - 1]) && !/\w/.test(name2[found + a2.length]))) return d; } return null; @@ -16602,8 +16602,8 @@ if (!next.type.isSkipped) { if (next.from >= lineEnd2) return null; - let space4 = /^ */.exec(openLine.text.slice(openToken.to - openLine.from))[0].length; - return { from: openToken.from, to: openToken.to + space4 }; + let space6 = /^ */.exec(openLine.text.slice(openToken.to - openLine.from))[0].length; + return { from: openToken.from, to: openToken.to + space6 }; } pos = next.to; } @@ -16612,8 +16612,8 @@ return (context) => delimitedStrategy(context, align, units, closing2); } function delimitedStrategy(context, align, units, closing2, closedAt) { - let after = context.textAfter, space4 = after.match(/^\s*/)[0].length; - let closed = closing2 && after.slice(space4, space4 + closing2.length) == closing2 || closedAt == context.pos + space4; + let after = context.textAfter, space6 = after.match(/^\s*/)[0].length; + let closed = closing2 && after.slice(space6, space6 + closing2.length) == closing2 || closedAt == context.pos + space6; let aligned = align ? bracketedAligned(context) : null; if (aligned) return closed ? context.column(aligned.from) : context.column(aligned.to); @@ -16728,14 +16728,14 @@ }); function clearTouchedFolds(folded, from, to = from) { let touched = false; - folded.between(from, to, (a, b) => { - if (a < to && b > from) + folded.between(from, to, (a2, b) => { + if (a2 < to && b > from) touched = true; }); return !touched ? folded : folded.update({ filterFrom: from, filterTo: to, - filter: (a, b) => a >= to || b <= from + filter: (a2, b) => a2 >= to || b <= from }); } function findFold(state, from, to) { @@ -16749,8 +16749,8 @@ } function foldExists(folded, from, to) { let found = false; - folded.between(from, from, (a, b) => { - if (a == from && b == to) + folded.between(from, from, (a2, b) => { + if (a2 == from && b == to) found = true; }); return found; @@ -17339,8 +17339,297 @@ return this.string.slice(this.start, this.pos); } }; + function fullParser(spec) { + return { + name: spec.name || "", + token: spec.token, + blankLine: spec.blankLine || (() => { + }), + startState: spec.startState || (() => true), + copyState: spec.copyState || defaultCopyState, + indent: spec.indent || (() => null), + languageData: spec.languageData || {}, + tokenTable: spec.tokenTable || noTokens, + mergeTokens: spec.mergeTokens !== false + }; + } + function defaultCopyState(state) { + if (typeof state != "object") + return state; + let newState = {}; + for (let prop in state) { + let val = state[prop]; + newState[prop] = val instanceof Array ? val.slice() : val; + } + return newState; + } + var IndentedFrom = /* @__PURE__ */ new WeakMap(); + var StreamLanguage = class _StreamLanguage extends Language { + constructor(parser14) { + let data2 = defineLanguageFacet(parser14.languageData); + let p = fullParser(parser14), self; + let impl = new class extends Parser { + createParse(input, fragments, ranges) { + return new Parse(self, input, fragments, ranges); + } + }(); + super(data2, impl, [], parser14.name); + this.topNode = docID(data2, this); + self = this; + this.streamParser = p; + this.stateAfter = new NodeProp({ perNode: true }); + this.tokenTable = parser14.tokenTable ? new TokenTable(p.tokenTable) : defaultTokenTable; + } + /** + Define a stream language. + */ + static define(spec) { + return new _StreamLanguage(spec); + } + /** + @internal + */ + getIndent(cx) { + let from = void 0; + let { overrideIndentation } = cx.options; + if (overrideIndentation) { + from = IndentedFrom.get(cx.state); + if (from != null && from < cx.pos - 1e4) + from = void 0; + } + let start = findState(this, cx.node.tree, cx.node.from, cx.node.from, from !== null && from !== void 0 ? from : cx.pos), statePos, state; + if (start) { + state = start.state; + statePos = start.pos + 1; + } else { + state = this.streamParser.startState(cx.unit); + statePos = cx.node.from; + } + if (cx.pos - statePos > 1e4) + return null; + while (statePos < cx.pos) { + let line2 = cx.state.doc.lineAt(statePos), end = Math.min(cx.pos, line2.to); + if (line2.length) { + let indentation3 = overrideIndentation ? overrideIndentation(line2.from) : -1; + let stream = new StringStream(line2.text, cx.state.tabSize, cx.unit, indentation3 < 0 ? void 0 : indentation3); + while (stream.pos < end - line2.from) + readToken(this.streamParser.token, stream, state); + } else { + this.streamParser.blankLine(state, cx.unit); + } + if (end == cx.pos) + break; + statePos = line2.to + 1; + } + let line = cx.lineAt(cx.pos); + if (overrideIndentation && from == null) + IndentedFrom.set(cx.state, line.from); + return this.streamParser.indent(state, /^\s*(.*)/.exec(line.text)[1], cx); + } + get allowsNesting() { + return false; + } + }; + function findState(lang, tree, off2, startPos, before) { + let state = off2 >= startPos && off2 + tree.length <= before && tree.prop(lang.stateAfter); + if (state) + return { state: lang.streamParser.copyState(state), pos: off2 + tree.length }; + for (let i = tree.children.length - 1; i >= 0; i--) { + let child = tree.children[i], pos = off2 + tree.positions[i]; + let found = child instanceof Tree && pos < before && findState(lang, child, pos, startPos, before); + if (found) + return found; + } + return null; + } + function cutTree(lang, tree, from, to, inside) { + if (inside && from <= 0 && to >= tree.length) + return tree; + if (!inside && from == 0 && tree.type == lang.topNode) + inside = true; + for (let i = tree.children.length - 1; i >= 0; i--) { + let pos = tree.positions[i], child = tree.children[i], inner; + if (pos < to && child instanceof Tree) { + if (!(inner = cutTree(lang, child, from - pos, to - pos, inside))) + break; + return !inside ? inner : new Tree(tree.type, tree.children.slice(0, i).concat(inner), tree.positions.slice(0, i + 1), pos + inner.length); + } + } + return null; + } + function findStartInFragments(lang, fragments, startPos, endPos, editorState) { + for (let f of fragments) { + let from = f.from + (f.openStart ? 25 : 0), to = f.to - (f.openEnd ? 25 : 0); + let found = from <= startPos && to > startPos && findState(lang, f.tree, 0 - f.offset, startPos, to), tree; + if (found && found.pos <= endPos && (tree = cutTree(lang, f.tree, startPos + f.offset, found.pos + f.offset, false))) + return { state: found.state, tree }; + } + return { state: lang.streamParser.startState(editorState ? getIndentUnit(editorState) : 4), tree: Tree.empty }; + } + var Parse = class { + constructor(lang, input, fragments, ranges) { + this.lang = lang; + this.input = input; + this.fragments = fragments; + this.ranges = ranges; + this.stoppedAt = null; + this.chunks = []; + this.chunkPos = []; + this.chunk = []; + this.chunkReused = void 0; + this.rangeIndex = 0; + this.to = ranges[ranges.length - 1].to; + let context = ParseContext.get(), from = ranges[0].from; + let { state, tree } = findStartInFragments(lang, fragments, from, this.to, context === null || context === void 0 ? void 0 : context.state); + this.state = state; + this.parsedPos = this.chunkStart = from + tree.length; + for (let i = 0; i < tree.children.length; i++) { + this.chunks.push(tree.children[i]); + this.chunkPos.push(tree.positions[i]); + } + if (context && this.parsedPos < context.viewport.from - 1e5 && ranges.some((r) => r.from <= context.viewport.from && r.to >= context.viewport.from)) { + this.state = this.lang.streamParser.startState(getIndentUnit(context.state)); + context.skipUntilInView(this.parsedPos, context.viewport.from); + this.parsedPos = context.viewport.from; + } + this.moveRangeIndex(); + } + advance() { + let context = ParseContext.get(); + let parseEnd = this.stoppedAt == null ? this.to : Math.min(this.to, this.stoppedAt); + let end = Math.min( + parseEnd, + this.chunkStart + 512 + /* C.ChunkSize */ + ); + if (context) + end = Math.min(end, context.viewport.to); + while (this.parsedPos < end) + this.parseLine(context); + if (this.chunkStart < this.parsedPos) + this.finishChunk(); + if (this.parsedPos >= parseEnd) + return this.finish(); + if (context && this.parsedPos >= context.viewport.to) { + context.skipUntilInView(this.parsedPos, parseEnd); + return this.finish(); + } + return null; + } + stopAt(pos) { + this.stoppedAt = pos; + } + lineAfter(pos) { + let chunk = this.input.chunk(pos); + if (!this.input.lineChunks) { + let eol2 = chunk.indexOf("\n"); + if (eol2 > -1) + chunk = chunk.slice(0, eol2); + } else if (chunk == "\n") { + chunk = ""; + } + return pos + chunk.length <= this.to ? chunk : chunk.slice(0, this.to - pos); + } + nextLine() { + let from = this.parsedPos, line = this.lineAfter(from), end = from + line.length; + for (let index = this.rangeIndex; ; ) { + let rangeEnd2 = this.ranges[index].to; + if (rangeEnd2 >= end) + break; + line = line.slice(0, rangeEnd2 - (end - line.length)); + index++; + if (index == this.ranges.length) + break; + let rangeStart = this.ranges[index].from; + let after = this.lineAfter(rangeStart); + line += after; + end = rangeStart + after.length; + } + return { line, end }; + } + skipGapsTo(pos, offset, side) { + for (; ; ) { + let end = this.ranges[this.rangeIndex].to, offPos = pos + offset; + if (side > 0 ? end > offPos : end >= offPos) + break; + let start = this.ranges[++this.rangeIndex].from; + offset += start - end; + } + return offset; + } + moveRangeIndex() { + while (this.ranges[this.rangeIndex].to < this.parsedPos) + this.rangeIndex++; + } + emitToken(id2, from, to, offset) { + let size = 4; + if (this.ranges.length > 1) { + offset = this.skipGapsTo(from, offset, 1); + from += offset; + let len0 = this.chunk.length; + offset = this.skipGapsTo(to, offset, -1); + to += offset; + size += this.chunk.length - len0; + } + let last = this.chunk.length - 4; + if (this.lang.streamParser.mergeTokens && size == 4 && last >= 0 && this.chunk[last] == id2 && this.chunk[last + 2] == from) + this.chunk[last + 2] = to; + else + this.chunk.push(id2, from, to, size); + return offset; + } + parseLine(context) { + let { line, end } = this.nextLine(), offset = 0, { streamParser } = this.lang; + let stream = new StringStream(line, context ? context.state.tabSize : 4, context ? getIndentUnit(context.state) : 2); + if (stream.eol()) { + streamParser.blankLine(this.state, stream.indentUnit); + } else { + while (!stream.eol()) { + let token = readToken(streamParser.token, stream, this.state); + if (token) + offset = this.emitToken(this.lang.tokenTable.resolve(token), this.parsedPos + stream.start, this.parsedPos + stream.pos, offset); + if (stream.start > 1e4) + break; + } + } + this.parsedPos = end; + this.moveRangeIndex(); + if (this.parsedPos < this.to) + this.parsedPos++; + } + finishChunk() { + let tree = Tree.build({ + buffer: this.chunk, + start: this.chunkStart, + length: this.parsedPos - this.chunkStart, + nodeSet, + topID: 0, + maxBufferLength: 512, + reused: this.chunkReused + }); + tree = new Tree(tree.type, tree.children, tree.positions, tree.length, [[this.lang.stateAfter, this.lang.streamParser.copyState(this.state)]]); + this.chunks.push(tree); + this.chunkPos.push(this.chunkStart - this.ranges[0].from); + this.chunk = []; + this.chunkReused = void 0; + this.chunkStart = this.parsedPos; + } + finish() { + return new Tree(this.lang.topNode, this.chunks, this.chunkPos, this.parsedPos - this.ranges[0].from).balance(); + } + }; + function readToken(token, stream, state) { + stream.start = stream.pos; + for (let i = 0; i < 10; i++) { + let result = token(stream, state); + if (stream.pos > stream.start) + return result; + } + throw new Error("Stream parser failed to advance stream."); + } var noTokens = /* @__PURE__ */ Object.create(null); var typeArray = [NodeType.none]; + var nodeSet = /* @__PURE__ */ new NodeSet(typeArray); var warned = []; var byTag = /* @__PURE__ */ Object.create(null); var defaultTable = /* @__PURE__ */ Object.create(null); @@ -17359,6 +17648,16 @@ ["property", "propertyName"] ]) defaultTable[legacyName] = /* @__PURE__ */ createTokenType(noTokens, name2); + var TokenTable = class { + constructor(extra) { + this.extra = extra; + this.table = Object.assign(/* @__PURE__ */ Object.create(null), defaultTable); + } + resolve(tag) { + return !tag ? 0 : this.table[tag] || (this.table[tag] = createTokenType(this.extra, tag)); + } + }; + var defaultTokenTable = /* @__PURE__ */ new TokenTable(noTokens); function warnForPart(part, msg) { if (warned.indexOf(part) > -1) return; @@ -17402,6 +17701,14 @@ typeArray.push(type); return type.id; } + function docID(data2, lang) { + let type = NodeType.define({ id: typeArray.length, name: "Document", props: [ + languageDataProp.add(() => data2), + indentNodeProp.add(() => (cx) => lang.getIndent(cx)) + ], top: true }); + typeArray.push(type); + return type; + } var marks = { rtl: /* @__PURE__ */ Decoration.mark({ class: "cm-iso", inclusive: true, attributes: { dir: "rtl" }, bidiIsolate: Direction.RTL }), ltr: /* @__PURE__ */ Decoration.mark({ class: "cm-iso", inclusive: true, attributes: { dir: "ltr" }, bidiIsolate: Direction.LTR }), @@ -17494,21 +17801,21 @@ return ranges; } function changeBlockComment(option, state, ranges = state.selection.ranges) { - let tokens = ranges.map((r) => getConfig(state, r.from).block); - if (!tokens.every((c) => c)) + let tokens2 = ranges.map((r) => getConfig(state, r.from).block); + if (!tokens2.every((c) => c)) return null; - let comments = ranges.map((r, i) => findBlockComment(state, tokens[i], r.from, r.to)); + let comments = ranges.map((r, i) => findBlockComment(state, tokens2[i], r.from, r.to)); if (option != 2 && !comments.every((c) => c)) { return { changes: state.changes(ranges.map((range, i) => { if (comments[i]) return []; - return [{ from: range.from, insert: tokens[i].open + " " }, { from: range.to, insert: " " + tokens[i].close }]; + return [{ from: range.from, insert: tokens2[i].open + " " }, { from: range.to, insert: " " + tokens2[i].close }]; })) }; } else if (option != 1 && comments.some((c) => c)) { let changes = []; for (let i = 0, comment2; i < comments.length; i++) if (comment2 = comments[i]) { - let token = tokens[i], { open, close } = comment2; + let token = tokens2[i], { open, close } = comment2; changes.push({ from: open.pos - token.open.length, to: open.pos + open.margin }, { from: close.pos - close.margin, to: close.pos + token.close.length }); } return { changes }; @@ -17529,12 +17836,12 @@ } if (line.from > prevLine && (from == to || to > line.from)) { prevLine = line.from; - let indent = /^\s*/.exec(line.text)[0].length; - let empty2 = indent == line.length; - let comment2 = line.text.slice(indent, indent + token.length) == token ? indent : -1; - if (indent < line.text.length && indent < minIndent) - minIndent = indent; - lines.push({ line, comment: comment2, token, indent, empty: empty2, single: false }); + let indent2 = /^\s*/.exec(line.text)[0].length; + let empty2 = indent2 == line.length; + let comment2 = line.text.slice(indent2, indent2 + token.length) == token ? indent2 : -1; + if (indent2 < line.text.length && indent2 < minIndent) + minIndent = indent2; + lines.push({ line, comment: comment2, token, indent: indent2, empty: empty2, single: false }); } pos = line.to + 1; } @@ -17548,9 +17855,9 @@ } if (option != 2 && lines.some((l) => l.comment < 0 && (!l.empty || l.single))) { let changes = []; - for (let { line, token, indent, empty: empty2, single } of lines) + for (let { line, token, indent: indent2, empty: empty2, single } of lines) if (single || !empty2) - changes.push({ from: line.from + indent, insert: token + " " }); + changes.push({ from: line.from + indent2, insert: token + " " }); let changeSet = state.changes(changes); return { changes: changeSet, selection: state.selection.map(changeSet, 1) }; } else if (option != 1 && lines.some((l) => l.comment >= 0)) { @@ -17578,7 +17885,7 @@ }, { minDepth: Math.max, newGroupDelay: Math.min, - joinToEvent: (a, b) => (tr, adj) => a(tr, adj) || b(tr, adj) + joinToEvent: (a2, b) => (tr, adj) => a2(tr, adj) || b(tr, adj) }); } }); @@ -17616,8 +17923,8 @@ toJSON(value) { return { done: value.done.map((e) => e.toJSON()), undone: value.undone.map((e) => e.toJSON()) }; }, - fromJSON(json) { - return new HistoryState(json.done.map(HistEvent.fromJSON), json.undone.map(HistEvent.fromJSON)); + fromJSON(json2) { + return new HistoryState(json2.done.map(HistEvent.fromJSON), json2.undone.map(HistEvent.fromJSON)); } }); function history(config2 = {}) { @@ -17665,16 +17972,16 @@ return new _HistEvent(this.changes, this.effects, this.mapped, this.startSelection, after); } toJSON() { - var _a2, _b, _c; + var _a2, _b2, _c; return { changes: (_a2 = this.changes) === null || _a2 === void 0 ? void 0 : _a2.toJSON(), - mapped: (_b = this.mapped) === null || _b === void 0 ? void 0 : _b.toJSON(), + mapped: (_b2 = this.mapped) === null || _b2 === void 0 ? void 0 : _b2.toJSON(), startSelection: (_c = this.startSelection) === null || _c === void 0 ? void 0 : _c.toJSON(), selectionsAfter: this.selectionsAfter.map((s) => s.toJSON()) }; } - static fromJSON(json) { - return new _HistEvent(json.changes && ChangeSet.fromJSON(json.changes), [], json.mapped && ChangeDesc.fromJSON(json.mapped), json.startSelection && EditorSelection.fromJSON(json.startSelection), json.selectionsAfter.map(EditorSelection.fromJSON)); + static fromJSON(json2) { + return new _HistEvent(json2.changes && ChangeSet.fromJSON(json2.changes), [], json2.mapped && ChangeDesc.fromJSON(json2.mapped), json2.startSelection && EditorSelection.fromJSON(json2.startSelection), json2.selectionsAfter.map(EditorSelection.fromJSON)); } // This does not check `addToHistory` and such, it assumes the // transaction needs to be converted to an item. Returns null when @@ -17700,10 +18007,10 @@ newBranch.push(newEvent); return newBranch; } - function isAdjacent(a, b) { + function isAdjacent(a2, b) { let ranges = [], isAdjacent2 = false; - a.iterChangedRanges((f, t2) => ranges.push(f, t2)); - b.iterChangedRanges((_f, _t, f, t2) => { + a2.iterChangedRanges((f, t2) => ranges.push(f, t2)); + b.iterChangedRanges((_f2, _t, f, t2) => { for (let i = 0; i < ranges.length; ) { let from = ranges[i++], to = ranges[i++]; if (t2 >= from && f <= to) @@ -17712,11 +18019,11 @@ }); return isAdjacent2; } - function eqSelectionShape(a, b) { - return a.ranges.length == b.ranges.length && a.ranges.filter((r, i) => r.empty != b.ranges[i].empty).length === 0; + function eqSelectionShape(a2, b) { + return a2.ranges.length == b.ranges.length && a2.ranges.filter((r, i) => r.empty != b.ranges[i].empty).length === 0; } - function conc(a, b) { - return !a.length ? b : !b.length ? a : a.concat(b); + function conc(a2, b) { + return !a2.length ? b : !b.length ? a2 : a2.concat(b); } var none2 = []; var MaxSelectionsPerEvent = 200; @@ -17947,9 +18254,9 @@ if (moved.head == start.head && moved.head != (forward ? line.to : line.from)) moved = view.moveToLineBoundary(start, forward, false); if (!forward && moved.head == line.from && line.length) { - let space4 = /^\s*/.exec(view.state.sliceDoc(line.from, Math.min(line.from + 100, line.to)))[0].length; - if (space4 && start.head != line.from + space4) - moved = EditorSelection.cursor(line.from + space4); + let space6 = /^\s*/.exec(view.state.sliceDoc(line.from, Math.min(line.from + 100, line.to)))[0].length; + if (space6 && start.head != line.from + space6) + moved = EditorSelection.cursor(line.from + space6); } return moved; } @@ -18331,16 +18638,16 @@ if (atEof) from = to = (to <= line.to ? line : state.doc.lineAt(to)).to; let cx = new IndentContext(state, { simulateBreak: from, simulateDoubleBreak: !!explode }); - let indent = getIndentation(cx, from); - if (indent == null) - indent = countColumn(/^\s*/.exec(state.doc.lineAt(from).text)[0], state.tabSize); + let indent2 = getIndentation(cx, from); + if (indent2 == null) + indent2 = countColumn(/^\s*/.exec(state.doc.lineAt(from).text)[0], state.tabSize); while (to < line.to && /\s/.test(line.text[to - line.from])) to++; if (explode) ({ from, to } = explode); else if (from > line.from && from < line.from + 100 && !/\S/.test(line.text.slice(0, from))) from = line.from; - let insert2 = ["", indentString(state, indent)]; + let insert2 = ["", indentString(state, indent2)]; if (explode) insert2.push(indentString(state, cx.lineIndent(line.from, -1))); return { @@ -18380,15 +18687,15 @@ return found == null ? -1 : found; } }); let changes = changeBySelectedLine(state, (line, changes2, range) => { - let indent = getIndentation(context, line.from); - if (indent == null) + let indent2 = getIndentation(context, line.from); + if (indent2 == null) return; if (!/\S/.test(line.text)) - indent = 0; + indent2 = 0; let cur2 = /^\s*/.exec(line.text)[0]; - let norm = indentString(state, indent); + let norm = indentString(state, indent2); if (cur2 != norm || range.from < line.from + cur2.length) { - updated[line.from] = indent; + updated[line.from] = indent2; changes2.push({ from: line.from, to: line.from + cur2.length, insert: norm }); } }); @@ -18408,14 +18715,14 @@ if (state.readOnly) return false; dispatch(state.update(changeBySelectedLine(state, (line, changes) => { - let space4 = /^\s*/.exec(line.text)[0]; - if (!space4) + let space6 = /^\s*/.exec(line.text)[0]; + if (!space6) return; - let col = countColumn(space4, state.tabSize), keep = 0; + let col = countColumn(space6, state.tabSize), keep = 0; let insert2 = indentString(state, Math.max(0, col - getIndentUnit(state))); - while (keep < space4.length && keep < insert2.length && space4.charCodeAt(keep) == insert2.charCodeAt(keep)) + while (keep < space6.length && keep < insert2.length && space6.charCodeAt(keep) == insert2.charCodeAt(keep)) keep++; - changes.push({ from: line.from + keep, to: line.from + space4.length, insert: insert2.slice(keep) }); + changes.push({ from: line.from + keep, to: line.from + space6.length, insert: insert2.slice(keep) }); }), { userEvent: "delete.dedent" })); return true; }; @@ -18560,10 +18867,10 @@ }; function toSet(chars) { let flat = Object.keys(chars).join(""); - let words = /\w/.test(flat); - if (words) + let words2 = /\w/.test(flat); + if (words2) flat = flat.replace(/\w/g, ""); - return `[${words ? "\\w" : ""}${flat.replace(/[^\w\s]/g, "\\$&")}]`; + return `[${words2 ? "\\w" : ""}${flat.replace(/[^\w\s]/g, "\\$&")}]`; } function prefixMatch(options) { let first = /* @__PURE__ */ Object.create(null), rest = /* @__PURE__ */ Object.create(null); @@ -18795,43 +19102,43 @@ addToOptions: [], positionInfo: defaultPositionInfo, filterStrict: false, - compareCompletions: (a, b) => (a.sortText || a.label).localeCompare(b.sortText || b.label), + compareCompletions: (a2, b) => (a2.sortText || a2.label).localeCompare(b.sortText || b.label), interactionDelay: 75, updateSyncTime: 100 }, { - defaultKeymap: (a, b) => a && b, - closeOnBlur: (a, b) => a && b, - icons: (a, b) => a && b, - tooltipClass: (a, b) => (c) => joinClass(a(c), b(c)), - optionClass: (a, b) => (c) => joinClass(a(c), b(c)), - addToOptions: (a, b) => a.concat(b), - filterStrict: (a, b) => a || b + defaultKeymap: (a2, b) => a2 && b, + closeOnBlur: (a2, b) => a2 && b, + icons: (a2, b) => a2 && b, + tooltipClass: (a2, b) => (c) => joinClass(a2(c), b(c)), + optionClass: (a2, b) => (c) => joinClass(a2(c), b(c)), + addToOptions: (a2, b) => a2.concat(b), + filterStrict: (a2, b) => a2 || b }); } }); - function joinClass(a, b) { - return a ? b ? a + " " + b : a : b; + function joinClass(a2, b) { + return a2 ? b ? a2 + " " + b : a2 : b; } - function defaultPositionInfo(view, list, option, info, space4, tooltip) { + function defaultPositionInfo(view, list, option, info, space6, tooltip) { let rtl = view.textDirection == Direction.RTL, left = rtl, narrow = false; let side = "top", offset, maxWidth; - let spaceLeft = list.left - space4.left, spaceRight = space4.right - list.right; + let spaceLeft = list.left - space6.left, spaceRight = space6.right - list.right; let infoWidth = info.right - info.left, infoHeight = info.bottom - info.top; if (left && spaceLeft < Math.min(infoWidth, spaceRight)) left = false; else if (!left && spaceRight < Math.min(infoWidth, spaceLeft)) left = true; if (infoWidth <= (left ? spaceLeft : spaceRight)) { - offset = Math.max(space4.top, Math.min(option.top, space4.bottom - infoHeight)) - list.top; + offset = Math.max(space6.top, Math.min(option.top, space6.bottom - infoHeight)) - list.top; maxWidth = Math.min(400, left ? spaceLeft : spaceRight); } else { narrow = true; maxWidth = Math.min( 400, - (rtl ? list.right : space4.right - list.left) - 30 + (rtl ? list.right : space6.right - list.left) - 30 /* Info.Margin */ ); - let spaceBelow = space4.bottom - list.bottom; + let spaceBelow = space6.bottom - list.bottom; if (spaceBelow >= infoHeight || spaceBelow > list.top) { offset = option.bottom - list.top; } else { @@ -18891,7 +19198,7 @@ }, position: 80 }); - return content2.sort((a, b) => a.position - b.position).map((a) => a.render); + return content2.sort((a2, b) => a2.position - b.position).map((a2) => a2.render); } function rangeAroundSelected(total, selected, max) { if (total <= max) @@ -18993,8 +19300,8 @@ this.currentClass = cls; } } - positioned(space4) { - this.space = space4; + positioned(space6) { + this.space = space6; if (this.info) this.view.requestMeasure(this.placeInfoReq); } @@ -19069,14 +19376,14 @@ let listRect = this.dom.getBoundingClientRect(); let infoRect = this.info.getBoundingClientRect(); let selRect = sel.getBoundingClientRect(); - let space4 = this.space; - if (!space4) { + let space6 = this.space; + if (!space6) { let docElt = this.dom.ownerDocument.documentElement; - space4 = { left: 0, top: 0, right: docElt.clientWidth, bottom: docElt.clientHeight }; + space6 = { left: 0, top: 0, right: docElt.clientWidth, bottom: docElt.clientHeight }; } - if (selRect.top > Math.min(space4.bottom, listRect.bottom) - 10 || selRect.bottom < Math.max(space4.top, listRect.top) + 10) + if (selRect.top > Math.min(space6.bottom, listRect.bottom) - 10 || selRect.bottom < Math.max(space6.top, listRect.top) + 10) return null; - return this.view.state.facet(completionConfig).positionInfo(this.view, listRect, selRect, infoRect, space4, this.dom); + return this.view.state.facet(completionConfig).positionInfo(this.view, listRect, selRect, infoRect, space6, this.dom); } placeInfo(pos) { if (this.info) { @@ -19174,21 +19481,21 @@ } }; let conf = state.facet(completionConfig); - for (let a of active) - if (a.hasResult()) { - let getMatch = a.result.getMatch; - if (a.result.filter === false) { - for (let option of a.result.options) { - addOption(new Option(option, a.source, getMatch ? getMatch(option) : [], 1e9 - options.length)); + for (let a2 of active) + if (a2.hasResult()) { + let getMatch = a2.result.getMatch; + if (a2.result.filter === false) { + for (let option of a2.result.options) { + addOption(new Option(option, a2.source, getMatch ? getMatch(option) : [], 1e9 - options.length)); } } else { - let pattern = state.sliceDoc(a.from, a.to), match; + let pattern = state.sliceDoc(a2.from, a2.to), match; let matcher = conf.filterStrict ? new StrictMatcher(pattern) : new FuzzyMatcher(pattern); - for (let option of a.result.options) + for (let option of a2.result.options) if (match = matcher.match(option.label)) { let matched = !option.displayLabel ? match.matched : getMatch ? getMatch(option, match.matched) : []; let score2 = match.score + (option.boost || 0); - addOption(new Option(option, a.source, matched, score2)); + addOption(new Option(option, a2.source, matched, score2)); if (typeof option.section == "object" && option.section.rank === "dynamic") { let { name: name2 } = option.section; if (!dynamicSectionScore) @@ -19200,8 +19507,8 @@ } if (sections) { let sectionOrder = /* @__PURE__ */ Object.create(null), pos = 0; - let cmp = (a, b) => { - return (a.rank === "dynamic" && b.rank === "dynamic" ? dynamicSectionScore[b.name] - dynamicSectionScore[a.name] : 0) || (typeof a.rank == "number" ? a.rank : 1e9) - (typeof b.rank == "number" ? b.rank : 1e9) || (a.name < b.name ? -1 : 1); + let cmp = (a2, b) => { + return (a2.rank === "dynamic" && b.rank === "dynamic" ? dynamicSectionScore[b.name] - dynamicSectionScore[a2.name] : 0) || (typeof a2.rank == "number" ? a2.rank : 1e9) - (typeof b.rank == "number" ? b.rank : 1e9) || (a2.name < b.name ? -1 : 1); }; for (let s of sections.sort(cmp)) { pos -= 1e5; @@ -19215,7 +19522,7 @@ } let result = [], prev = null; let compare2 = conf.compareCompletions; - for (let opt of options.sort((a, b) => b.score - a.score || compare2(a.completion, b.completion))) { + for (let opt of options.sort((a2, b) => b.score - a2.score || compare2(a2.completion, b.completion))) { let cur2 = opt.completion; if (!prev || prev.label != cur2.label || prev.detail != cur2.detail || prev.type != null && cur2.type != null && prev.type != cur2.type || prev.apply != cur2.apply || prev.boost != cur2.boost) result.push(opt); @@ -19242,7 +19549,7 @@ return prev.setDisabled(); let options = sortOptions(active, state); if (!options.length) - return prev && active.some((a) => a.isPending) ? prev.setDisabled() : null; + return prev && active.some((a2) => a2.isPending) ? prev.setDisabled() : null; let selected = state.facet(completionConfig).selectOnOpen ? 0 : -1; if (prev && prev.selected != selected && prev.selected != -1) { let selectedValue = prev.options[prev.selected].completion; @@ -19253,7 +19560,7 @@ } } return new _CompletionDialog(options, makeAttrs(id2, selected), { - pos: active.reduce((a, b) => b.hasResult() ? Math.min(a, b.from) : a, 1e8), + pos: active.reduce((a2, b) => b.hasResult() ? Math.min(a2, b.from) : a2, 1e8), create: createTooltip, above: conf.aboveCursor }, prev ? prev.timestamp : Date.now(), selected, false); @@ -19281,28 +19588,28 @@ let value = this.active.find((s) => s.source == source) || new ActiveSource( source, this.active.some( - (a) => a.state != 0 + (a2) => a2.state != 0 /* State.Inactive */ ) ? 1 : 0 /* State.Inactive */ ); return value.update(tr, conf); }); - if (active.length == this.active.length && active.every((a, i) => a == this.active[i])) + if (active.length == this.active.length && active.every((a2, i) => a2 == this.active[i])) active = this.active; let open = this.open, didSet = tr.effects.some((e) => e.is(setActiveEffect)); if (open && tr.docChanged) open = open.map(tr.changes); - if (tr.selection || active.some((a) => a.hasResult() && tr.changes.touchesRange(a.from, a.to)) || !sameResults(active, this.active) || didSet) + if (tr.selection || active.some((a2) => a2.hasResult() && tr.changes.touchesRange(a2.from, a2.to)) || !sameResults(active, this.active) || didSet) open = CompletionDialog.build(active, state, this.id, open, conf, didSet); - else if (open && open.disabled && !active.some((a) => a.isPending)) + else if (open && open.disabled && !active.some((a2) => a2.isPending)) open = null; - if (!open && active.every((a) => !a.isPending) && active.some((a) => a.hasResult())) - active = active.map((a) => a.hasResult() ? new ActiveSource( - a.source, + if (!open && active.every((a2) => !a2.isPending) && active.some((a2) => a2.hasResult())) + active = active.map((a2) => a2.hasResult() ? new ActiveSource( + a2.source, 0 /* State.Inactive */ - ) : a); + ) : a2); for (let effect of tr.effects) if (effect.is(setSelectedEffect)) open = open && open.setSelected(effect.value, this.id); @@ -19315,18 +19622,18 @@ return this.open ? this.open.attrs : this.active.length ? baseAttrs : noAttrs2; } }; - function sameResults(a, b) { - if (a == b) + function sameResults(a2, b) { + if (a2 == b) return true; for (let iA = 0, iB = 0; ; ) { - while (iA < a.length && !a[iA].hasResult()) + while (iA < a2.length && !a2[iA].hasResult()) iA++; while (iB < b.length && !b[iB].hasResult()) iB++; - let endA = iA == a.length, endB = iB == b.length; + let endA = iA == a2.length, endB = iB == b.length; if (endA || endB) return endA == endB; - if (a[iA++].result != b[iB++].result) + if (a2[iA++].result != b[iB++].result) return false; } } @@ -19482,7 +19789,7 @@ }); function applyCompletion(view, option) { const apply = option.completion.apply || option.completion.label; - let result = view.state.field(completionState).active.find((a) => a.source == option.source); + let result = view.state.field(completionState).active.find((a2) => a2.source == option.source); if (!(result instanceof ActiveResult)) return false; if (typeof apply == "string") @@ -19529,7 +19836,7 @@ var closeCompletion = (view) => { let cState = view.state.field(completionState, false); if (!cState || !cState.active.some( - (a) => a.state != 0 + (a2) => a2.state != 0 /* State.Inactive */ )) return false; @@ -19589,7 +19896,7 @@ if (update.transactions.some((tr) => tr.effects.some((e) => e.is(startCompletionEffect)))) this.pendingStart = true; let delay = this.pendingStart ? 50 : conf.activateOnTypingDelay; - this.debounceUpdate = cState.active.some((a) => a.isPending && !this.running.some((q) => q.active.source == a.source)) ? setTimeout(() => this.startUpdate(), delay) : -1; + this.debounceUpdate = cState.active.some((a2) => a2.isPending && !this.running.some((q) => q.active.source == a2.source)) ? setTimeout(() => this.startUpdate(), delay) : -1; if (this.composing != 0) for (let tr of update.transactions) { if (tr.isUserEvent("input.type")) @@ -19655,7 +19962,7 @@ continue; } } - let current = cState.active.find((a) => a.source == query.active.source); + let current = cState.active.find((a2) => a2.source == query.active.source); if (current && current.isPending) { if (query.done == null) { let active = new ActiveSource( @@ -19703,7 +20010,7 @@ if (!field || !field.open || field.open.disabled || field.open.selected < 0 || event.key.length > 1 || event.ctrlKey && !(windows && event.altKey) || event.metaKey) return false; let option = field.open.options[field.open.selected]; - let result = field.active.find((a) => a.source == option.source); + let result = field.active.find((a2) => a2.source == option.source); let commitChars = option.completion.commitCharacters || result.result.commitCharacters; if (commitChars && commitChars.indexOf(event.key) > -1) applyCompletion(view, option); @@ -19865,11 +20172,11 @@ let lineObj = state.doc.lineAt(pos), baseIndent = /^\s*/.exec(lineObj.text)[0]; for (let line of this.lines) { if (text.length) { - let indent = baseIndent, tabs = /^\t*/.exec(line)[0].length; + let indent2 = baseIndent, tabs = /^\t*/.exec(line)[0].length; for (let i = 0; i < tabs; i++) - indent += state.facet(indentUnit); - lineStart.push(pos + indent.length - tabs); - line = indent + line.slice(tabs); + indent2 += state.facet(indentUnit); + lineStart.push(pos + indent2.length - tabs); + line = indent2 + line.slice(tabs); } text.push(line); pos += line.length + 1; @@ -20115,11 +20422,11 @@ if (state.readOnly) return false; let conf = config(state, state.selection.main.head); - let tokens = conf.brackets || defaults.brackets; + let tokens2 = conf.brackets || defaults.brackets; let dont = null, changes = state.changeByRange((range) => { if (range.empty) { let before = prevChar(state.doc, range.head); - for (let token of tokens) { + for (let token of tokens2) { if (token == before && nextChar(state.doc, range.head) == closing(codePointAt2(token, 0))) return { changes: { from: range.head - token.length, to: range.head + token.length }, @@ -20138,11 +20445,11 @@ ]; function insertBracket(state, bracket2) { let conf = config(state, state.selection.main.head); - let tokens = conf.brackets || defaults.brackets; - for (let tok of tokens) { + let tokens2 = conf.brackets || defaults.brackets; + for (let tok of tokens2) { let closed = closing(codePointAt2(tok, 0)); if (bracket2 == tok) - return closed == tok ? handleSame(state, tok, tokens.indexOf(tok + tok + tok) > -1, conf) : handleOpen(state, tok, closed, conf.before || defaults.before); + return closed == tok ? handleSame(state, tok, tokens2.indexOf(tok + tok + tok) > -1, conf) : handleOpen(state, tok, closed, conf.before || defaults.before); if (bracket2 == closed && closedBracketAt(state, state.selection.main.from)) return handleClose(state, tok, closed); } @@ -20363,23 +20670,23 @@ reduce(action) { var _a2; let depth = action >> 19, type = action & 65535; - let { parser: parser5 } = this.p; + let { parser: parser14 } = this.p; let lookaheadRecord = this.reducePos < this.pos - 25 && this.setLookAhead(this.pos); - let dPrec = parser5.dynamicPrecedence(type); + let dPrec = parser14.dynamicPrecedence(type); if (dPrec) this.score += dPrec; if (depth == 0) { - if (type < parser5.minRepeatTerm && this.reducePos < this.pos) + if (type < parser14.minRepeatTerm && this.reducePos < this.pos) this.reducePos = this.pos; - this.pushState(parser5.getGoto(this.state, type, true), this.reducePos); - if (type < parser5.minRepeatTerm) + this.pushState(parser14.getGoto(this.state, type, true), this.reducePos); + if (type < parser14.minRepeatTerm) this.storeNode(type, this.reducePos, this.reducePos, lookaheadRecord ? 8 : 4, true); this.reduceContext(type, this.reducePos); return; } let base2 = this.stack.length - (depth - 1) * 3 - (action & 262144 ? 6 : 0); let start = base2 ? this.stack[base2 - 2] : this.p.ranges[0].from; - if (type < parser5.minRepeatTerm && start == this.reducePos && this.reducePos < this.pos) + if (type < parser14.minRepeatTerm && start == this.reducePos && this.reducePos < this.pos) this.reducePos = this.pos; let size = this.reducePos - start; if (size >= 2e3 && !((_a2 = this.p.parser.nodeSet.types[type]) === null || _a2 === void 0 ? void 0 : _a2.isAnonymous)) { @@ -20393,8 +20700,8 @@ } } let bufferBase = base2 ? this.stack[base2 - 1] : 0, count2 = this.bufferBase + this.buffer.length - bufferBase; - if (type < parser5.minRepeatTerm || action & 131072) { - let pos = parser5.stateFlag( + if (type < parser14.minRepeatTerm || action & 131072) { + let pos = parser14.stateFlag( this.state, 1 /* StateFlag.Skipped */ @@ -20405,7 +20712,7 @@ this.state = this.stack[base2]; } else { let baseStateID = this.stack[base2 - 3]; - this.state = parser5.getGoto(baseStateID, type, true); + this.state = parser14.getGoto(baseStateID, type, true); } while (this.stack.length > base2) this.stack.pop(); @@ -20464,18 +20771,18 @@ if (action & 131072) { this.pushState(action & 65535, this.pos); } else if ((action & 262144) == 0) { - let nextState = action, { parser: parser5 } = this.p; + let nextState = action, { parser: parser14 } = this.p; this.pos = end; - let skipped = parser5.stateFlag( + let skipped = parser14.stateFlag( nextState, 1 /* StateFlag.Skipped */ ); - if (!skipped && (end > start || type <= parser5.maxNode)) + if (!skipped && (end > start || type <= parser14.maxNode)) this.reducePos = end; this.pushState(nextState, skipped ? start : Math.min(start, this.reducePos)); this.shiftContext(type, start); - if (type <= parser5.maxNode) + if (type <= parser14.maxNode) this.buffer.push(type, start, end, 4); } else { this.pos = end; @@ -20611,18 +20918,18 @@ @internal */ forceReduce() { - let { parser: parser5 } = this.p; - let reduce = parser5.stateSlot( + let { parser: parser14 } = this.p; + let reduce = parser14.stateSlot( this.state, 5 /* ParseState.ForcedReduce */ ); if ((reduce & 65536) == 0) return false; - if (!parser5.validAction(this.state, reduce)) { + if (!parser14.validAction(this.state, reduce)) { let depth = reduce >> 19, term = reduce & 65535; let target = this.stack.length - depth * 3; - if (target < 0 || parser5.getGoto(this.stack[target], term, false) < 0) { + if (target < 0 || parser14.getGoto(this.stack[target], term, false) < 0) { let backup = this.findForcedReduction(); if (backup == null) return false; @@ -20641,18 +20948,18 @@ isn't a valid action. @internal */ findForcedReduction() { - let { parser: parser5 } = this.p, seen = []; + let { parser: parser14 } = this.p, seen = []; let explore = (state, depth) => { if (seen.includes(state)) return; seen.push(state); - return parser5.allActions(state, (action) => { + return parser14.allActions(state, (action) => { if (action & (262144 | 131072)) ; else if (action & 65536) { let rDepth = (action >> 19) - depth; if (rDepth > 1) { let term = action & 65535, target = this.stack.length - rDepth * 3; - if (target >= 0 && parser5.getGoto(this.stack[target], term, false) >= 0) + if (target >= 0 && parser14.getGoto(this.stack[target], term, false) >= 0) return rDepth << 19 | 65536 | term; } } else { @@ -20688,12 +20995,12 @@ get deadEnd() { if (this.stack.length != 3) return false; - let { parser: parser5 } = this.p; - return parser5.data[parser5.stateSlot( + let { parser: parser14 } = this.p; + return parser14.data[parser14.stateSlot( this.state, 1 /* ParseState.Actions */ - )] == 65535 && !parser5.stateSlot( + )] == 65535 && !parser14.stateSlot( this.state, 4 /* ParseState.DefaultReduce */ @@ -20855,7 +21162,7 @@ return new _StackBufferCursor(this.stack, this.pos, this.index); } }; - function decodeArray(input, Type2 = Uint16Array) { + function decodeArray(input, Type3 = Uint16Array) { if (typeof input != "string") return input; let array = null; @@ -20884,7 +21191,7 @@ if (array) array[out++] = value; else - array = new Type2(value); + array = new Type3(value); } return array; } @@ -21116,8 +21423,8 @@ this.id = id2; } token(input, stack) { - let { parser: parser5 } = stack.p; - readToken(this.data, input, stack, this.id, parser5.data, parser5.tokenPrecTable); + let { parser: parser14 } = stack.p; + readToken2(this.data, input, stack, this.id, parser14.data, parser14.tokenPrecTable); } }; TokenGroup.prototype.contextual = TokenGroup.prototype.fallback = TokenGroup.prototype.extend = false; @@ -21131,7 +21438,7 @@ let start = input.pos, skipped = 0; for (; ; ) { let atEof = input.next < 0, nextPos = input.resolveOffset(1, 1); - readToken(this.data, input, stack, 0, this.data, this.precTable); + readToken2(this.data, input, stack, 0, this.data, this.precTable); if (input.token.value > -1) break; if (this.elseToken == null) @@ -21164,8 +21471,8 @@ this.extend = !!options.extend; } }; - function readToken(data2, input, stack, group, precTable, precOffset) { - let state = 0, groupMask = 1 << group, { dialect } = stack.p.parser; + function readToken2(data2, input, stack, group, precTable, precOffset) { + let state = 0, groupMask = 1 << group, { dialect: dialect2 } = stack.p.parser; scan: for (; ; ) { if ((groupMask & data2[state]) == 0) break; @@ -21173,7 +21480,7 @@ for (let i = state + 3; i < accEnd; i += 2) if ((data2[i + 1] & groupMask) > 0) { let term = data2[i]; - if (dialect.allows(term) && (input.token.value == -1 || input.token.value == term || overrides(term, input.token.value, precTable, precOffset))) { + if (dialect2.allows(term) && (input.token.value == -1 || input.token.value == term || overrides(term, input.token.value, precTable, precOffset))) { input.acceptToken(term); break; } @@ -21236,9 +21543,9 @@ } } var FragmentCursor2 = class { - constructor(fragments, nodeSet) { + constructor(fragments, nodeSet2) { this.fragments = fragments; - this.nodeSet = nodeSet; + this.nodeSet = nodeSet2; this.i = 0; this.fragment = null; this.safeFrom = -1; @@ -21318,18 +21625,18 @@ } }; var TokenCache = class { - constructor(parser5, stream) { + constructor(parser14, stream) { this.stream = stream; this.tokens = []; this.mainToken = null; this.actions = []; - this.tokens = parser5.tokenizers.map((_) => new CachedToken()); + this.tokens = parser14.tokenizers.map((_) => new CachedToken()); } getActions(stack) { let actionIndex = 0; let main = null; - let { parser: parser5 } = stack.p, { tokenizers } = parser5; - let mask = parser5.stateSlot( + let { parser: parser14 } = stack.p, { tokenizers } = parser14; + let mask = parser14.stateSlot( stack.state, 3 /* ParseState.TokenizerMask */ @@ -21387,10 +21694,10 @@ let start = this.stream.clipPos(stack.pos); tokenizer.token(this.stream.reset(start, token), stack); if (token.value > -1) { - let { parser: parser5 } = stack.p; - for (let i = 0; i < parser5.specialized.length; i++) - if (parser5.specialized[i] == token.value) { - let result = parser5.specializers[i](this.stream.read(token.start, token.end), stack); + let { parser: parser14 } = stack.p; + for (let i = 0; i < parser14.specialized.length; i++) + if (parser14.specialized[i] == token.value) { + let result = parser14.specializers[i](this.stream.read(token.start, token.end), stack); if (result >= 0 && stack.p.parser.dialect.allows(result >> 1)) { if ((result & 1) == 0) token.value = result >> 1; @@ -21414,9 +21721,9 @@ return index; } addActions(stack, token, end, index) { - let { state } = stack, { parser: parser5 } = stack.p, { data: data2 } = parser5; + let { state } = stack, { parser: parser14 } = stack.p, { data: data2 } = parser14; for (let set = 0; set < 2; set++) { - for (let i = parser5.stateSlot( + for (let i = parser14.stateSlot( state, set ? 2 : 1 /* ParseState.Actions */ @@ -21437,9 +21744,9 @@ return index; } }; - var Parse = class { - constructor(parser5, input, fragments, ranges) { - this.parser = parser5; + var Parse2 = class { + constructor(parser14, input, fragments, ranges) { + this.parser = parser14; this.input = input; this.ranges = ranges; this.recovering = 0; @@ -21451,11 +21758,11 @@ this.lastBigReductionSize = 0; this.bigReductionCount = 0; this.stream = new InputStream(input, ranges); - this.tokens = new TokenCache(parser5, this.stream); - this.topTerm = parser5.top[1]; + this.tokens = new TokenCache(parser14, this.stream); + this.topTerm = parser14.top[1]; let { from } = ranges[0]; - this.stacks = [Stack.start(this, parser5.top[0], from)]; - this.fragments = fragments.length && this.stream.end - from > parser5.bufferLength * 4 ? new FragmentCursor2(fragments, parser5.nodeSet) : null; + this.stacks = [Stack.start(this, parser14.top[0], from)]; + this.fragments = fragments.length && this.stream.end - from > parser14.bufferLength * 4 ? new FragmentCursor2(fragments, parser14.nodeSet) : null; } get parsedPos() { return this.minStackPos; @@ -21522,7 +21829,7 @@ if (this.recovering) { let maxRemaining = this.recovering == 1 ? 1 : this.recovering * 3; if (newStacks.length > maxRemaining) { - newStacks.sort((a, b) => b.score - a.score); + newStacks.sort((a2, b) => b.score - a2.score); while (newStacks.length > maxRemaining) newStacks.pop(); } @@ -21544,7 +21851,7 @@ } } if (newStacks.length > 12) { - newStacks.sort((a, b) => b.score - a.score); + newStacks.sort((a2, b) => b.score - a2.score); newStacks.splice( 12, newStacks.length - 12 @@ -21568,18 +21875,18 @@ // given, stacks split off by ambiguous operations will be pushed to // `split`, or added to `stacks` if they move `pos` forward. advanceStack(stack, stacks, split) { - let start = stack.pos, { parser: parser5 } = this; + let start = stack.pos, { parser: parser14 } = this; let base2 = verbose ? this.stackID(stack) + " -> " : ""; if (this.stoppedAt != null && start > this.stoppedAt) return stack.forceReduce() ? stack : null; if (this.fragments) { let strictCx = stack.curContext && stack.curContext.tracker.strict, cxHash = strictCx ? stack.curContext.hash : 0; for (let cached = this.fragments.nodeAt(start); cached; ) { - let match = this.parser.nodeSet.types[cached.type.id] == cached.type ? parser5.getGoto(stack.state, cached.type.id) : -1; + let match = this.parser.nodeSet.types[cached.type.id] == cached.type ? parser14.getGoto(stack.state, cached.type.id) : -1; if (match > -1 && cached.length && (!strictCx || (cached.prop(NodeProp.contextHash) || 0) == cxHash)) { stack.useNode(cached, match); if (verbose) - console.log(base2 + this.stackID(stack) + ` (via reuse of ${parser5.getName(cached.type.id)})`); + console.log(base2 + this.stackID(stack) + ` (via reuse of ${parser14.getName(cached.type.id)})`); return true; } if (!(cached instanceof Tree) || cached.children.length == 0 || cached.positions[0] > 0) @@ -21591,7 +21898,7 @@ break; } } - let defaultReduce = parser5.stateSlot( + let defaultReduce = parser14.stateSlot( stack.state, 4 /* ParseState.DefaultReduce */ @@ -21599,7 +21906,7 @@ if (defaultReduce > 0) { stack.reduce(defaultReduce); if (verbose) - console.log(base2 + this.stackID(stack) + ` (via always-reduce ${parser5.getName( + console.log(base2 + this.stackID(stack) + ` (via always-reduce ${parser14.getName( defaultReduce & 65535 /* Action.ValueMask */ )})`); @@ -21617,10 +21924,10 @@ let main = this.tokens.mainToken; localStack.apply(action, term, main ? main.start : localStack.pos, end); if (verbose) - console.log(base2 + this.stackID(localStack) + ` (via ${(action & 65536) == 0 ? "shift" : `reduce of ${parser5.getName( + console.log(base2 + this.stackID(localStack) + ` (via ${(action & 65536) == 0 ? "shift" : `reduce of ${parser14.getName( action & 65535 /* Action.ValueMask */ - )}`} for ${parser5.getName(term)} @ ${start}${localStack == stack ? "" : ", split"})`); + )}`} for ${parser14.getName(term)} @ ${start}${localStack == stack ? "" : ", split"})`); if (last) return true; else if (localStack.pos > start) @@ -21644,10 +21951,10 @@ } } } - runRecovery(stacks, tokens, newStacks) { + runRecovery(stacks, tokens2, newStacks) { let finished = null, restarted = false; for (let i = 0; i < stacks.length; i++) { - let stack = stacks[i], token = tokens[i << 1], tokenEnd = tokens[(i << 1) + 1]; + let stack = stacks[i], token = tokens2[i << 1], tokenEnd = tokens2[(i << 1) + 1]; let base2 = verbose ? this.stackID(stack) + " -> " : ""; if (stack.deadEnd) { if (restarted) @@ -21817,7 +22124,7 @@ this.top = this.topRules[Object.keys(this.topRules)[0]]; } createParse(input, fragments, ranges) { - let parse = new Parse(this, input, fragments, ranges); + let parse = new Parse2(this, input, fragments, ranges); for (let w of this.wrappers) parse = w(parse, input, fragments, ranges); return parse; @@ -21886,7 +22193,7 @@ @internal */ validAction(state, action) { - return !!this.allActions(state, (a) => a == action ? true : null); + return !!this.allActions(state, (a2) => a2 == action ? true : null); } /** @internal @@ -22020,10 +22327,10 @@ /** @internal */ - parseDialect(dialect) { + parseDialect(dialect2) { let values2 = Object.keys(this.dialects), flags = values2.map(() => false); - if (dialect) - for (let part of dialect.split(" ")) { + if (dialect2) + for (let part of dialect2.split(" ")) { let id2 = values2.indexOf(part); if (id2 >= 0) flags[id2] = true; @@ -22034,7 +22341,7 @@ for (let j = this.dialects[values2[i]], id2; (id2 = this.data[j++]) != 65535; ) (disabled || (disabled = new Uint8Array(this.maxTerm + 1)))[id2] = 1; } - return new Dialect(dialect, flags, disabled); + return new Dialect(dialect2, flags, disabled); } /** Used by the output of the parser generator. Not available to @@ -24400,8 +24707,8 @@ "aria-valuetext": null }; var eventAttributes = /* @__PURE__ */ "beforeunload copy cut dragstart dragover dragleave dragenter dragend drag paste focus blur change click load mousedown mouseenter mouseleave mouseup keydown keyup resize scroll unload".split(" ").map((n) => "on" + n); - for (let a of eventAttributes) - GlobalAttrs[a] = null; + for (let a2 of eventAttributes) + GlobalAttrs[a2] = null; var Schema = class { constructor(extraTags, extraAttrs) { this.tags = { ...Tags, ...extraTags }; @@ -24645,14 +24952,14 @@ wrap: /* @__PURE__ */ configureNesting(defaultNesting, defaultAttrs) }); function html(config2 = {}) { - let dialect = "", wrap; + let dialect2 = "", wrap; if (config2.matchClosingTags === false) - dialect = "noMatch"; + dialect2 = "noMatch"; if (config2.selfClosingTags === true) - dialect = (dialect ? dialect + " " : "") + "selfClosing"; + dialect2 = (dialect2 ? dialect2 + " " : "") + "selfClosing"; if (config2.nestedLanguages && config2.nestedLanguages.length || config2.nestedAttributes && config2.nestedAttributes.length) wrap = configureNesting((config2.nestedLanguages || []).concat(defaultNesting), (config2.nestedAttributes || []).concat(defaultAttrs)); - let lang = wrap ? htmlPlain.configure({ wrap, dialect }) : dialect ? htmlLanguage.configure({ dialect }) : htmlLanguage; + let lang = wrap ? htmlPlain.configure({ wrap, dialect: dialect2 }) : dialect2 ? htmlLanguage.configure({ dialect: dialect2 }) : htmlLanguage; return new LanguageSupport(lang, [ htmlLanguage.data.of({ autocomplete: htmlCompletionSourceWith(config2) }), config2.autoCloseTags !== false ? autoCloseTags2 : [], @@ -24666,12 +24973,12 @@ return false; let base2 = insertTransaction(), { state } = base2; let closeTags = state.changeByRange((range) => { - var _a2, _b, _c; + var _a2, _b2, _c; let didType = state.doc.sliceString(range.from - 1, range.to) == text; let { head } = range, after = syntaxTree(state).resolveInner(head, -1), name2; if (didType && text == ">" && after.name == "EndTag") { let tag = after.parent; - if (((_b = (_a2 = tag.parent) === null || _a2 === void 0 ? void 0 : _a2.lastChild) === null || _b === void 0 ? void 0 : _b.name) != "CloseTag" && (name2 = elementName2(state.doc, tag.parent, head)) && !selfClosers2.has(name2)) { + if (((_b2 = (_a2 = tag.parent) === null || _a2 === void 0 ? void 0 : _a2.lastChild) === null || _b2 === void 0 ? void 0 : _b2.name) != "CloseTag" && (name2 = elementName2(state.doc, tag.parent, head)) && !selfClosers2.has(name2)) { let to2 = head + (state.doc.sliceString(head, head + 1) === ">" ? 1 : 0); let insert2 = ``; return { range, changes: { from: head, to: to2, insert: insert2 } }; @@ -24704,18 +25011,18 @@ // node_modules/@lezer/markdown/dist/index.js var CompositeBlock = class _CompositeBlock { static create(type, value, from, parentHash, end) { - let hash2 = parentHash + (parentHash << 8) + type + (value << 4) | 0; - return new _CompositeBlock(type, value, from, hash2, end, [], []); + let hash3 = parentHash + (parentHash << 8) + type + (value << 4) | 0; + return new _CompositeBlock(type, value, from, hash3, end, [], []); } - constructor(type, value, from, hash2, end, children, positions) { + constructor(type, value, from, hash3, end, children, positions) { this.type = type; this.value = value; this.from = from; - this.hash = hash2; + this.hash = hash3; this.end = end; this.children = children; this.positions = positions; - this.hashProp = [[NodeProp.contextHash, hash2]]; + this.hashProp = [[NodeProp.contextHash, hash3]]; } addChild(child, pos) { if (child.prop(NodeProp.contextHash) != this.hash) @@ -24723,61 +25030,61 @@ this.children.push(child); this.positions.push(pos); } - toTree(nodeSet, end = this.end) { + toTree(nodeSet2, end = this.end) { let last = this.children.length - 1; if (last >= 0) end = Math.max(end, this.positions[last] + this.children[last].length + this.from); - return new Tree(nodeSet.types[this.type], this.children, this.positions, end - this.from).balance({ + return new Tree(nodeSet2.types[this.type], this.children, this.positions, end - this.from).balance({ makeTree: (children, positions, length) => new Tree(NodeType.none, children, positions, length, this.hashProp) }); } }; var Type; - (function(Type2) { - Type2[Type2["Document"] = 1] = "Document"; - Type2[Type2["CodeBlock"] = 2] = "CodeBlock"; - Type2[Type2["FencedCode"] = 3] = "FencedCode"; - Type2[Type2["Blockquote"] = 4] = "Blockquote"; - Type2[Type2["HorizontalRule"] = 5] = "HorizontalRule"; - Type2[Type2["BulletList"] = 6] = "BulletList"; - Type2[Type2["OrderedList"] = 7] = "OrderedList"; - Type2[Type2["ListItem"] = 8] = "ListItem"; - Type2[Type2["ATXHeading1"] = 9] = "ATXHeading1"; - Type2[Type2["ATXHeading2"] = 10] = "ATXHeading2"; - Type2[Type2["ATXHeading3"] = 11] = "ATXHeading3"; - Type2[Type2["ATXHeading4"] = 12] = "ATXHeading4"; - Type2[Type2["ATXHeading5"] = 13] = "ATXHeading5"; - Type2[Type2["ATXHeading6"] = 14] = "ATXHeading6"; - Type2[Type2["SetextHeading1"] = 15] = "SetextHeading1"; - Type2[Type2["SetextHeading2"] = 16] = "SetextHeading2"; - Type2[Type2["HTMLBlock"] = 17] = "HTMLBlock"; - Type2[Type2["LinkReference"] = 18] = "LinkReference"; - Type2[Type2["Paragraph"] = 19] = "Paragraph"; - Type2[Type2["CommentBlock"] = 20] = "CommentBlock"; - Type2[Type2["ProcessingInstructionBlock"] = 21] = "ProcessingInstructionBlock"; - Type2[Type2["Escape"] = 22] = "Escape"; - Type2[Type2["Entity"] = 23] = "Entity"; - Type2[Type2["HardBreak"] = 24] = "HardBreak"; - Type2[Type2["Emphasis"] = 25] = "Emphasis"; - Type2[Type2["StrongEmphasis"] = 26] = "StrongEmphasis"; - Type2[Type2["Link"] = 27] = "Link"; - Type2[Type2["Image"] = 28] = "Image"; - Type2[Type2["InlineCode"] = 29] = "InlineCode"; - Type2[Type2["HTMLTag"] = 30] = "HTMLTag"; - Type2[Type2["Comment"] = 31] = "Comment"; - Type2[Type2["ProcessingInstruction"] = 32] = "ProcessingInstruction"; - Type2[Type2["Autolink"] = 33] = "Autolink"; - Type2[Type2["HeaderMark"] = 34] = "HeaderMark"; - Type2[Type2["QuoteMark"] = 35] = "QuoteMark"; - Type2[Type2["ListMark"] = 36] = "ListMark"; - Type2[Type2["LinkMark"] = 37] = "LinkMark"; - Type2[Type2["EmphasisMark"] = 38] = "EmphasisMark"; - Type2[Type2["CodeMark"] = 39] = "CodeMark"; - Type2[Type2["CodeText"] = 40] = "CodeText"; - Type2[Type2["CodeInfo"] = 41] = "CodeInfo"; - Type2[Type2["LinkTitle"] = 42] = "LinkTitle"; - Type2[Type2["LinkLabel"] = 43] = "LinkLabel"; - Type2[Type2["URL"] = 44] = "URL"; + (function(Type3) { + Type3[Type3["Document"] = 1] = "Document"; + Type3[Type3["CodeBlock"] = 2] = "CodeBlock"; + Type3[Type3["FencedCode"] = 3] = "FencedCode"; + Type3[Type3["Blockquote"] = 4] = "Blockquote"; + Type3[Type3["HorizontalRule"] = 5] = "HorizontalRule"; + Type3[Type3["BulletList"] = 6] = "BulletList"; + Type3[Type3["OrderedList"] = 7] = "OrderedList"; + Type3[Type3["ListItem"] = 8] = "ListItem"; + Type3[Type3["ATXHeading1"] = 9] = "ATXHeading1"; + Type3[Type3["ATXHeading2"] = 10] = "ATXHeading2"; + Type3[Type3["ATXHeading3"] = 11] = "ATXHeading3"; + Type3[Type3["ATXHeading4"] = 12] = "ATXHeading4"; + Type3[Type3["ATXHeading5"] = 13] = "ATXHeading5"; + Type3[Type3["ATXHeading6"] = 14] = "ATXHeading6"; + Type3[Type3["SetextHeading1"] = 15] = "SetextHeading1"; + Type3[Type3["SetextHeading2"] = 16] = "SetextHeading2"; + Type3[Type3["HTMLBlock"] = 17] = "HTMLBlock"; + Type3[Type3["LinkReference"] = 18] = "LinkReference"; + Type3[Type3["Paragraph"] = 19] = "Paragraph"; + Type3[Type3["CommentBlock"] = 20] = "CommentBlock"; + Type3[Type3["ProcessingInstructionBlock"] = 21] = "ProcessingInstructionBlock"; + Type3[Type3["Escape"] = 22] = "Escape"; + Type3[Type3["Entity"] = 23] = "Entity"; + Type3[Type3["HardBreak"] = 24] = "HardBreak"; + Type3[Type3["Emphasis"] = 25] = "Emphasis"; + Type3[Type3["StrongEmphasis"] = 26] = "StrongEmphasis"; + Type3[Type3["Link"] = 27] = "Link"; + Type3[Type3["Image"] = 28] = "Image"; + Type3[Type3["InlineCode"] = 29] = "InlineCode"; + Type3[Type3["HTMLTag"] = 30] = "HTMLTag"; + Type3[Type3["Comment"] = 31] = "Comment"; + Type3[Type3["ProcessingInstruction"] = 32] = "ProcessingInstruction"; + Type3[Type3["Autolink"] = 33] = "Autolink"; + Type3[Type3["HeaderMark"] = 34] = "HeaderMark"; + Type3[Type3["QuoteMark"] = 35] = "QuoteMark"; + Type3[Type3["ListMark"] = 36] = "ListMark"; + Type3[Type3["LinkMark"] = 37] = "LinkMark"; + Type3[Type3["EmphasisMark"] = 38] = "EmphasisMark"; + Type3[Type3["CodeMark"] = 39] = "CodeMark"; + Type3[Type3["CodeText"] = 40] = "CodeText"; + Type3[Type3["CodeInfo"] = 41] = "CodeInfo"; + Type3[Type3["LinkTitle"] = 42] = "LinkTitle"; + Type3[Type3["LinkLabel"] = 43] = "LinkLabel"; + Type3[Type3["URL"] = 44] = "URL"; })(Type || (Type = {})); var LeafBlock = class { /** @@ -24849,9 +25156,9 @@ /** Move the line's base position forward to the given _column_. */ - moveBaseColumn(indent) { - this.baseIndent = indent; - this.basePos = this.findColumn(indent); + moveBaseColumn(indent2) { + this.baseIndent = indent2; + this.basePos = this.findColumn(indent2); } /** Store a composite-block-level marker. Should be called from @@ -24865,18 +25172,18 @@ Find the column position at `to`, optionally starting at a given position and column. */ - countIndent(to, from = 0, indent = 0) { + countIndent(to, from = 0, indent2 = 0) { for (let i = from; i < to; i++) - indent += this.text.charCodeAt(i) == 9 ? 4 - indent % 4 : 1; - return indent; + indent2 += this.text.charCodeAt(i) == 9 ? 4 - indent2 % 4 : 1; + return indent2; } /** Find the position corresponding to the given column. */ findColumn(goal) { let i = 0; - for (let indent = 0; i < this.text.length && indent < goal; i++) - indent += this.text.charCodeAt(i) == 9 ? 4 - indent % 4 : 1; + for (let indent2 = 0; i < this.text.length && indent2 < goal; i++) + indent2 += this.text.charCodeAt(i) == 9 ? 4 - indent2 % 4 : 1; return i; } /** @@ -25334,8 +25641,8 @@ /** @internal */ - constructor(parser5, input, fragments, ranges) { - this.parser = parser5; + constructor(parser14, input, fragments, ranges) { + this.parser = parser14; this.input = input; this.ranges = ranges; this.line = new Line2(); @@ -25391,9 +25698,9 @@ let leaf = new LeafBlock(this.lineStart + line.pos, line.text.slice(line.pos)); for (let parse of this.parser.leafBlockParsers) if (parse) { - let parser5 = parse(this, leaf); - if (parser5) - leaf.parsers.push(parser5); + let parser14 = parse(this, leaf); + if (parser14) + leaf.parsers.push(parser14); } lines: while (this.nextLine()) { if (line.pos == line.text.length) @@ -25403,8 +25710,8 @@ if (stop(this, line, leaf)) break lines; } - for (let parser5 of leaf.parsers) - if (parser5.nextLine(this, line, leaf)) + for (let parser14 of leaf.parsers) + if (parser14.nextLine(this, line, leaf)) return null; leaf.content += "\n" + line.scrub(); for (let m of line.markers) @@ -25537,8 +25844,8 @@ lineChunkAt(pos) { let next = this.input.chunk(pos), text; if (!this.input.lineChunks) { - let eol = next.indexOf("\n"); - text = eol < 0 ? next : next.slice(0, eol); + let eol2 = next.indexOf("\n"); + text = eol2 < 0 ? next : next.slice(0, eol2); } else { text = next == "\n" ? "" : next; } @@ -25608,8 +25915,8 @@ @internal */ finishLeaf(leaf) { - for (let parser5 of leaf.parsers) - if (parser5.finish(this, leaf)) + for (let parser14 of leaf.parsers) + if (parser14.finish(this, leaf)) return; let inline = injectMarks(this.parser.parseInline(leaf.content, leaf.start), leaf.marks); this.addNode(this.buffer.writeElements(inline, -leaf.start).finish(Type.Paragraph, leaf.content.length), leaf.start); @@ -25659,9 +25966,9 @@ /** @internal */ - constructor(nodeSet, blockParsers, leafBlockParsers, blockNames, endLeafBlock, skipContextMarkup, inlineParsers, inlineNames, wrappers) { + constructor(nodeSet2, blockParsers, leafBlockParsers, blockNames, endLeafBlock, skipContextMarkup, inlineParsers, inlineNames, wrappers) { super(); - this.nodeSet = nodeSet; + this.nodeSet = nodeSet2; this.blockParsers = blockParsers; this.leafBlockParsers = leafBlockParsers; this.blockNames = blockNames; @@ -25671,7 +25978,7 @@ this.inlineNames = inlineNames; this.wrappers = wrappers; this.nodeTypes = /* @__PURE__ */ Object.create(null); - for (let t2 of nodeSet.types) + for (let t2 of nodeSet2.types) this.nodeTypes[t2.name] = t2.id; } createParse(input, fragments, ranges) { @@ -25687,11 +25994,11 @@ let config2 = resolveConfig(spec); if (!config2) return this; - let { nodeSet, skipContextMarkup } = this; + let { nodeSet: nodeSet2, skipContextMarkup } = this; let blockParsers = this.blockParsers.slice(), leafBlockParsers = this.leafBlockParsers.slice(), blockNames = this.blockNames.slice(), inlineParsers = this.inlineParsers.slice(), inlineNames = this.inlineNames.slice(), endLeafBlock = this.endLeafBlock.slice(), wrappers = this.wrappers; if (nonEmpty(config2.defineNodes)) { skipContextMarkup = Object.assign({}, skipContextMarkup); - let nodeTypes2 = nodeSet.types.slice(), styles; + let nodeTypes2 = nodeSet2.types.slice(), styles; for (let s of config2.defineNodes) { let { name: name2, block, composite, style } = typeof s == "string" ? { name: s } : s; if (nodeTypes2.some((t2) => t2.name == name2)) @@ -25714,12 +26021,12 @@ Object.assign(styles, style); } } - nodeSet = new NodeSet(nodeTypes2); + nodeSet2 = new NodeSet(nodeTypes2); if (styles) - nodeSet = nodeSet.extend(styleTags(styles)); + nodeSet2 = nodeSet2.extend(styleTags(styles)); } if (nonEmpty(config2.props)) - nodeSet = nodeSet.extend(...config2.props); + nodeSet2 = nodeSet2.extend(...config2.props); if (nonEmpty(config2.remove)) { for (let rm2 of config2.remove) { let block = this.blockNames.indexOf(rm2), inline = this.inlineNames.indexOf(rm2); @@ -25759,7 +26066,7 @@ } if (config2.wrap) wrappers = wrappers.concat(config2.wrap); - return new _MarkdownParser(nodeSet, blockParsers, leafBlockParsers, blockNames, endLeafBlock, skipContextMarkup, inlineParsers, inlineNames, wrappers); + return new _MarkdownParser(nodeSet2, blockParsers, leafBlockParsers, blockNames, endLeafBlock, skipContextMarkup, inlineParsers, inlineNames, wrappers); } /** @internal @@ -25792,8 +26099,8 @@ return cx.resolveMarkers(0); } }; - function nonEmpty(a) { - return a != null && a.length > 0; + function nonEmpty(a2) { + return a2 != null && a2.length > 0; } function resolveConfig(spec) { if (!Array.isArray(spec)) @@ -25806,7 +26113,7 @@ let rest = resolveConfig(spec.slice(1)); if (!rest || !conf) return conf || rest; - let conc2 = (a, b) => (a || none4).concat(b || none4); + let conc2 = (a2, b) => (a2 || none4).concat(b || none4); let wrapA = conf.wrap, wrapB = rest.wrap; return { props: conc2(conf.props, rest.props), @@ -25834,8 +26141,8 @@ } var none4 = []; var Buffer = class { - constructor(nodeSet) { - this.nodeSet = nodeSet; + constructor(nodeSet2) { + this.nodeSet = nodeSet2; this.content = []; this.nodes = []; } @@ -25879,8 +26186,8 @@ /** @internal */ - toTree(nodeSet) { - return new Buffer(nodeSet).writeElements(this.children, -this.from).finish(this.type, this.to - this.from); + toTree(nodeSet2) { + return new Buffer(nodeSet2).writeElements(this.children, -this.from).finish(this.type, this.to - this.from); } }; var TreeElement = class { @@ -26159,8 +26466,8 @@ /** @internal */ - constructor(parser5, text, offset) { - this.parser = parser5; + constructor(parser14, text, offset) { + this.parser = parser14; this.text = text; this.offset = offset; this.parts = []; @@ -26388,9 +26695,9 @@ return false; } } - matches(hash2) { + matches(hash3) { let tree = this.cursor.tree; - return tree && tree.prop(NodeProp.contextHash) == hash2; + return tree && tree.prop(NodeProp.contextHash) == hash3; } takeNodes(cx) { let cur2 = this.cursor, off2 = this.fragment.offset, fragEnd = this.fragmentEnd - (this.fragment.openEnd ? 1 : 0); @@ -26488,9 +26795,9 @@ if (infoNode) info = input.read(infoNode.from, infoNode.to); } - let parser5 = codeParser(info); - if (parser5) - return { parser: parser5, overlay: (node2) => node2.type.id == Type.CodeText, bracketed: id2 == Type.FencedCode }; + let parser14 = codeParser(info); + if (parser14) + return { parser: parser14, overlay: (node2) => node2.type.id == Type.CodeText, bracketed: id2 == Type.FencedCode }; } else if (htmlParser && (id2 == Type.HTMLBlock || id2 == Type.HTMLTag || id2 == Type.CommentBlock)) { return { parser: htmlParser, overlay: leftOverSpace(node.node, node.from, node.to) }; } @@ -26809,8 +27116,8 @@ } return null; }); - function mkLang(parser5) { - return new Language(data, parser5, [], "markdown"); + function mkLang(parser14) { + return new Language(data, parser14, [], "markdown"); } var commonmarkLanguage = /* @__PURE__ */ mkLang(commonmark); var extended = /* @__PURE__ */ commonmark.configure([GFM, Subscript, Superscript, Emoji, { @@ -26925,17 +27232,17 @@ if (!blank || state.facet(indentUnit) != " ") return content2; let col = countColumn(content2, 4, blank); - let space4 = ""; + let space6 = ""; for (let i = col; i > 0; ) { if (i >= 4) { - space4 += " "; + space6 += " "; i -= 4; } else { - space4 += " "; + space6 += " "; i--; } } - return space4 + content2.slice(blank); + return space6 + content2.slice(blank); } var insertNewlineContinueMarkupCommand = (config2 = {}) => ({ state, dispatch }) => { let tree = syntaxTree(state), { doc: doc2 } = state; @@ -27097,8 +27404,8 @@ ]; var htmlNoMatch = /* @__PURE__ */ html({ matchClosingTags: false }); function markdown(config2 = {}) { - let { codeLanguages, defaultCodeLanguage, addKeymap = true, base: { parser: parser5 } = commonmarkLanguage, completeHTMLTags = true, pasteURLAsLink: pasteURL = true, htmlTagLanguage = htmlNoMatch } = config2; - if (!(parser5 instanceof MarkdownParser)) + let { codeLanguages, defaultCodeLanguage, addKeymap = true, base: { parser: parser14 } = commonmarkLanguage, completeHTMLTags = true, pasteURLAsLink: pasteURL = true, htmlTagLanguage = htmlNoMatch } = config2; + if (!(parser14 instanceof MarkdownParser)) throw new RangeError("Base parser provided to `markdown` should be a Markdown parser"); let extensions = config2.extensions ? [config2.extensions] : []; let support = [htmlTagLanguage.support, headerIndent], defaultCode; @@ -27114,7 +27421,7 @@ extensions.push(parseCode({ codeParser, htmlParser: htmlTagLanguage.language.parser })); if (addKeymap) support.push(Prec.high(keymap.of(markdownKeymap))); - let lang = mkLang(parser5.configure(extensions)); + let lang = mkLang(parser14.configure(extensions)); if (completeHTMLTags) support.push(lang.data.of({ autocomplete: htmlTagCompletion })); return new LanguageSupport(lang, support); @@ -27181,6 +27488,3035 @@ } }); + // node_modules/@lezer/python/dist/index.js + var printKeyword = 1; + var indent = 194; + var dedent = 195; + var newline$1 = 196; + var blankLineStart = 197; + var newlineBracketed = 198; + var eof = 199; + var stringContent = 200; + var Escape = 2; + var replacementStart = 3; + var stringEnd = 201; + var ParenL = 24; + var ParenthesizedExpression = 25; + var TupleExpression = 49; + var ComprehensionExpression = 50; + var BracketL = 55; + var ArrayExpression = 56; + var ArrayComprehensionExpression = 57; + var BraceL = 59; + var DictionaryExpression = 60; + var DictionaryComprehensionExpression = 61; + var SetExpression = 62; + var SetComprehensionExpression = 63; + var ArgList = 65; + var subscript = 238; + var String$1 = 71; + var stringStart = 241; + var stringStartD = 242; + var stringStartL = 243; + var stringStartLD = 244; + var stringStartR = 245; + var stringStartRD = 246; + var stringStartRL = 247; + var stringStartRLD = 248; + var FormatString = 72; + var stringStartF = 249; + var stringStartFD = 250; + var stringStartFL = 251; + var stringStartFLD = 252; + var stringStartFR = 253; + var stringStartFRD = 254; + var stringStartFRL = 255; + var stringStartFRLD = 256; + var FormatReplacement = 73; + var nestedFormatReplacement = 77; + var importList = 263; + var TypeParamList = 112; + var ParamList = 130; + var SequencePattern = 151; + var MappingPattern = 152; + var PatternArgList = 155; + var newline3 = 10; + var carriageReturn = 13; + var space4 = 32; + var tab = 9; + var hash2 = 35; + var parenOpen = 40; + var dot2 = 46; + var braceOpen = 123; + var braceClose = 125; + var singleQuote = 39; + var doubleQuote = 34; + var backslash2 = 92; + var letter_o = 111; + var letter_x = 120; + var letter_N = 78; + var letter_u = 117; + var letter_U = 85; + var bracketed = /* @__PURE__ */ new Set([ + ParenthesizedExpression, + TupleExpression, + ComprehensionExpression, + importList, + ArgList, + ParamList, + ArrayExpression, + ArrayComprehensionExpression, + subscript, + SetExpression, + SetComprehensionExpression, + FormatString, + FormatReplacement, + nestedFormatReplacement, + DictionaryExpression, + DictionaryComprehensionExpression, + SequencePattern, + MappingPattern, + PatternArgList, + TypeParamList + ]); + function isLineBreak(ch) { + return ch == newline3 || ch == carriageReturn; + } + function isHex2(ch) { + return ch >= 48 && ch <= 57 || ch >= 65 && ch <= 70 || ch >= 97 && ch <= 102; + } + var newlines = new ExternalTokenizer((input, stack) => { + let prev; + if (input.next < 0) { + input.acceptToken(eof); + } else if (stack.context.flags & cx_Bracketed) { + if (isLineBreak(input.next)) input.acceptToken(newlineBracketed, 1); + } else if (((prev = input.peek(-1)) < 0 || isLineBreak(prev)) && stack.canShift(blankLineStart)) { + let spaces2 = 0; + while (input.next == space4 || input.next == tab) { + input.advance(); + spaces2++; + } + if (input.next == newline3 || input.next == carriageReturn || input.next == hash2) + input.acceptToken(blankLineStart, -spaces2); + } else if (isLineBreak(input.next)) { + input.acceptToken(newline$1, 1); + } + }, { contextual: true }); + var indentation = new ExternalTokenizer((input, stack) => { + let context = stack.context; + if (context.flags) return; + let prev = input.peek(-1); + if (prev == newline3 || prev == carriageReturn) { + let depth = 0, chars = 0; + for (; ; ) { + if (input.next == space4) depth++; + else if (input.next == tab) depth += 8 - depth % 8; + else break; + input.advance(); + chars++; + } + if (depth != context.indent && input.next != newline3 && input.next != carriageReturn && input.next != hash2) { + if (depth < context.indent) input.acceptToken(dedent, -chars); + else input.acceptToken(indent); + } + } + }); + var cx_Bracketed = 1; + var cx_String = 2; + var cx_DoubleQuote = 4; + var cx_Long = 8; + var cx_Raw = 16; + var cx_Format = 32; + function Context2(parent, indent2, flags) { + this.parent = parent; + this.indent = indent2; + this.flags = flags; + this.hash = (parent ? parent.hash + parent.hash << 8 : 0) + indent2 + (indent2 << 4) + flags + (flags << 6); + } + var topIndent2 = new Context2(null, 0, 0); + function countIndent(space6) { + let depth = 0; + for (let i = 0; i < space6.length; i++) + depth += space6.charCodeAt(i) == tab ? 8 - depth % 8 : 1; + return depth; + } + var stringFlags = new Map([ + [stringStart, 0], + [stringStartD, cx_DoubleQuote], + [stringStartL, cx_Long], + [stringStartLD, cx_Long | cx_DoubleQuote], + [stringStartR, cx_Raw], + [stringStartRD, cx_Raw | cx_DoubleQuote], + [stringStartRL, cx_Raw | cx_Long], + [stringStartRLD, cx_Raw | cx_Long | cx_DoubleQuote], + [stringStartF, cx_Format], + [stringStartFD, cx_Format | cx_DoubleQuote], + [stringStartFL, cx_Format | cx_Long], + [stringStartFLD, cx_Format | cx_Long | cx_DoubleQuote], + [stringStartFR, cx_Format | cx_Raw], + [stringStartFRD, cx_Format | cx_Raw | cx_DoubleQuote], + [stringStartFRL, cx_Format | cx_Raw | cx_Long], + [stringStartFRLD, cx_Format | cx_Raw | cx_Long | cx_DoubleQuote] + ].map(([term, flags]) => [term, flags | cx_String])); + var trackIndent = new ContextTracker({ + start: topIndent2, + reduce(context, term, _, input) { + if (context.flags & cx_Bracketed && bracketed.has(term) || (term == String$1 || term == FormatString) && context.flags & cx_String) + return context.parent; + return context; + }, + shift(context, term, stack, input) { + if (term == indent) + return new Context2(context, countIndent(input.read(input.pos, stack.pos)), 0); + if (term == dedent) + return context.parent; + if (term == ParenL || term == BracketL || term == BraceL || term == replacementStart) + return new Context2(context, 0, cx_Bracketed); + if (stringFlags.has(term)) + return new Context2(context, 0, stringFlags.get(term) | context.flags & cx_Bracketed); + return context; + }, + hash(context) { + return context.hash; + } + }); + var legacyPrint = new ExternalTokenizer((input) => { + for (let i = 0; i < 5; i++) { + if (input.next != "print".charCodeAt(i)) return; + input.advance(); + } + if (/\w/.test(String.fromCharCode(input.next))) return; + for (let off2 = 0; ; off2++) { + let next = input.peek(off2); + if (next == space4 || next == tab) continue; + if (next != parenOpen && next != dot2 && next != newline3 && next != carriageReturn && next != hash2) + input.acceptToken(printKeyword); + return; + } + }); + var strings = new ExternalTokenizer((input, stack) => { + let { flags } = stack.context; + let quote = flags & cx_DoubleQuote ? doubleQuote : singleQuote; + let long = (flags & cx_Long) > 0; + let escapes = !(flags & cx_Raw); + let format = (flags & cx_Format) > 0; + let start = input.pos; + for (; ; ) { + if (input.next < 0) { + break; + } else if (format && input.next == braceOpen) { + if (input.peek(1) == braceOpen) { + input.advance(2); + } else { + if (input.pos == start) { + input.acceptToken(replacementStart, 1); + return; + } + break; + } + } else if (escapes && input.next == backslash2) { + if (input.pos == start) { + input.advance(); + let escaped = input.next; + if (escaped >= 0) { + input.advance(); + skipEscape(input, escaped); + } + input.acceptToken(Escape); + return; + } + break; + } else if (input.next == backslash2 && !escapes && input.peek(1) > -1) { + input.advance(2); + } else if (input.next == quote && (!long || input.peek(1) == quote && input.peek(2) == quote)) { + if (input.pos == start) { + input.acceptToken(stringEnd, long ? 3 : 1); + return; + } + break; + } else if (input.next == newline3) { + if (long) { + input.advance(); + } else if (input.pos == start) { + input.acceptToken(stringEnd); + return; + } + break; + } else { + input.advance(); + } + } + if (input.pos > start) input.acceptToken(stringContent); + }); + function skipEscape(input, ch) { + if (ch == letter_o) { + for (let i = 0; i < 2 && input.next >= 48 && input.next <= 55; i++) input.advance(); + } else if (ch == letter_x) { + for (let i = 0; i < 2 && isHex2(input.next); i++) input.advance(); + } else if (ch == letter_u) { + for (let i = 0; i < 4 && isHex2(input.next); i++) input.advance(); + } else if (ch == letter_U) { + for (let i = 0; i < 8 && isHex2(input.next); i++) input.advance(); + } else if (ch == letter_N) { + if (input.next == braceOpen) { + input.advance(); + while (input.next >= 0 && input.next != braceClose && input.next != singleQuote && input.next != doubleQuote && input.next != newline3) input.advance(); + if (input.next == braceClose) input.advance(); + } + } + } + var pythonHighlighting = styleTags({ + 'async "*" "**" FormatConversion FormatSpec': tags.modifier, + "for while if elif else try except finally return raise break continue with pass assert await yield match case": tags.controlKeyword, + "in not and or is del": tags.operatorKeyword, + "from def class global nonlocal lambda": tags.definitionKeyword, + import: tags.moduleKeyword, + "with as print": tags.keyword, + Boolean: tags.bool, + None: tags.null, + VariableName: tags.variableName, + "CallExpression/VariableName": tags.function(tags.variableName), + "FunctionDefinition/VariableName": tags.function(tags.definition(tags.variableName)), + "ClassDefinition/VariableName": tags.definition(tags.className), + PropertyName: tags.propertyName, + "CallExpression/MemberExpression/PropertyName": tags.function(tags.propertyName), + Comment: tags.lineComment, + Number: tags.number, + String: tags.string, + FormatString: tags.special(tags.string), + Escape: tags.escape, + UpdateOp: tags.updateOperator, + "ArithOp!": tags.arithmeticOperator, + BitOp: tags.bitwiseOperator, + CompareOp: tags.compareOperator, + AssignOp: tags.definitionOperator, + Ellipsis: tags.punctuation, + At: tags.meta, + "( )": tags.paren, + "[ ]": tags.squareBracket, + "{ }": tags.brace, + ".": tags.derefOperator, + ", ;": tags.separator + }); + var spec_identifier3 = { __proto__: null, await: 44, or: 54, and: 56, in: 60, not: 62, is: 64, if: 70, else: 72, lambda: 76, yield: 94, from: 96, async: 102, for: 104, None: 162, True: 164, False: 164, del: 178, pass: 182, break: 186, continue: 190, return: 194, raise: 202, import: 206, as: 208, global: 212, nonlocal: 214, assert: 218, type: 223, elif: 236, while: 240, try: 246, except: 248, finally: 250, with: 254, def: 258, class: 268, match: 279, case: 285 }; + var parser5 = LRParser.deserialize({ + version: 14, + states: "##jQ`QeOOP$}OSOOO&WQtO'#HUOOQS'#Co'#CoOOQS'#Cp'#CpO'vQdO'#CnO*UQtO'#HTOOQS'#HU'#HUOOQS'#DU'#DUOOQS'#HT'#HTO*rQdO'#D_O+VQdO'#DfO+gQdO'#DjO+zOWO'#DuO,VOWO'#DvO.[QtO'#GuOOQS'#Gu'#GuO'vQdO'#GtO0ZQtO'#GtOOQS'#Eb'#EbO0rQdO'#EcOOQS'#Gs'#GsO0|QdO'#GrOOQV'#Gr'#GrO1XQdO'#FYOOQS'#G^'#G^O1^QdO'#FXOOQV'#IS'#ISOOQV'#Gq'#GqOOQV'#Fq'#FqQ`QeOOO'vQdO'#CqO1lQdO'#C}O1sQdO'#DRO2RQdO'#HYO2cQtO'#EVO'vQdO'#EWOOQS'#EY'#EYOOQS'#E['#E[OOQS'#E^'#E^O2wQdO'#E`O3_QdO'#EdO3rQdO'#EfO3zQtO'#EfO1XQdO'#EiO0rQdO'#ElO1XQdO'#EnO0rQdO'#EtO0rQdO'#EwO4VQdO'#EyO4^QdO'#FOO4iQdO'#EzO0rQdO'#FOO1XQdO'#FQO1XQdO'#FVO4nQdO'#F[P4uOdO'#GpPOOO)CBd)CBdOOQS'#Ce'#CeOOQS'#Cf'#CfOOQS'#Cg'#CgOOQS'#Ch'#ChOOQS'#Ci'#CiOOQS'#Cj'#CjOOQS'#Cl'#ClO'vQdO,59OO'vQdO,59OO'vQdO,59OO'vQdO,59OO'vQdO,59OO'vQdO,59OO5TQdO'#DoOOQS,5:Y,5:YO5hQdO'#HdOOQS,5:],5:]O5uQ!fO,5:]O5zQtO,59YO1lQdO,59bO1lQdO,59bO1lQdO,59bO8jQdO,59bO8oQdO,59bO8vQdO,59jO8}QdO'#HTO:TQdO'#HSOOQS'#HS'#HSOOQS'#D['#D[O:lQdO,59aO'vQdO,59aO:zQdO,59aOOQS,59y,59yO;PQdO,5:RO'vQdO,5:ROOQS,5:Q,5:QO;_QdO,5:QO;dQdO,5:XO'vQdO,5:XO'vQdO,5:VOOQS,5:U,5:UO;uQdO,5:UO;zQdO,5:WOOOW'#Fy'#FyOOOOQS'#Ds'#DsOOQS1G/w1G/wOOQS1G.|1G.|O!/[QtO1G.|O!/cQtO1G.|O1lQdO1G.|O!0OQdO1G/UOOQS'#DZ'#DZO0rQdO,59tOOQS1G.{1G.{O!0VQdO1G/eO!0gQdO1G/eO!0oQdO1G/fO'vQdO'#H[O!0tQdO'#H[O!0yQtO1G.{O!1ZQdO,59iO!2aQdO,5=zO!2qQdO,5=zO!2yQdO1G/mO!3OQtO1G/mOOQS1G/l1G/lO!3`QdO,5=uO!4VQdO,5=uO0rQdO1G/qO!4tQdO1G/sO!4yQtO1G/sO!5ZQtO1G/qOOQS1G/p1G/pOOQS1G/r1G/rOOOW-E9w-E9wOOQS1G/{1G/{O!5kQdO'#HxO0rQdO'#HxO!5|QdO,5>cOOOW-E9x-E9xOOQS1G/|1G/|OOQS-E9{-E9{O!6[Q#xO1G2zO!6{QtO1G2zO'vQdO,5kOOQS1G1`1G1`O!8RQdO1G1`OOQS'#DV'#DVO0rQdO,5=qOOQS,5=q,5=qO!8WQdO'#FrO!8cQdO,59oO!8kQdO1G/XO!8uQtO,5=uOOQS1G3`1G3`OOQS,5:m,5:mO!9fQdO'#GtOOQS,5jO!;ZQdO,5>jO1XQdO,5>jO!;lQdO,5>iOOQS-E:R-E:RO!;qQdO1G0lO!;|QdO1G0lO!lO!lO!hO!=VQdO,5>hO!=hQdO'#EpO0rQdO1G0tO!=sQdO1G0tO!=xQgO1G0zO!AvQgO1G0}O!EqQdO,5>oO!E{QdO,5>oO!FTQtO,5>oO0rQdO1G1PO!F_QdO1G1PO4iQdO1G1UO!!vQdO1G1WOOQV,5;a,5;aO!FdQfO,5;aO!FiQgO1G1QO!JjQdO'#GZO4iQdO1G1QO4iQdO1G1QO!JzQdO,5>pO!KXQdO,5>pO1XQdO,5>pOOQV1G1U1G1UO!KaQdO'#FSO!KrQ!fO1G1WO!KzQdO1G1WOOQV1G1]1G1]O4iQdO1G1]O!LPQdO1G1]O!LXQdO'#F^OOQV1G1b1G1bO!#ZQtO1G1bPOOO1G2v1G2vP!L^OSO1G2vOOQS,5=},5=}OOQS'#Dp'#DpO0rQdO,5=}O!LfQdO,5=|O!LyQdO,5=|OOQS1G/u1G/uO!MRQdO,5>PO!McQdO,5>PO!MkQdO,5>PO!NOQdO,5>PO!N`QdO,5>POOQS1G3j1G3jOOQS7+$h7+$hO!8kQdO7+$pO#!RQdO1G.|O#!YQdO1G.|OOQS1G/`1G/`OOQS,5<`,5<`O'vQdO,5<`OOQS7+%P7+%PO#!aQdO7+%POOQS-E9r-E9rOOQS7+%Q7+%QO#!qQdO,5=vO'vQdO,5=vOOQS7+$g7+$gO#!vQdO7+%PO##OQdO7+%QO##TQdO1G3fOOQS7+%X7+%XO##eQdO1G3fO##mQdO7+%XOOQS,5<_,5<_O'vQdO,5<_O##rQdO1G3aOOQS-E9q-E9qO#$iQdO7+%]OOQS7+%_7+%_O#$wQdO1G3aO#%fQdO7+%_O#%kQdO1G3gO#%{QdO1G3gO#&TQdO7+%]O#&YQdO,5>dO#&sQdO,5>dO#&sQdO,5>dOOQS'#Dx'#DxO#'UO&jO'#DzO#'aO`O'#HyOOOW1G3}1G3}O#'fQdO1G3}O#'nQdO1G3}O#'yQ#xO7+(fO#(jQtO1G2UP#)TQdO'#GOOOQS,5nQdO,5sQdO1G4OOOQS-E9y-E9yO#?^QdO1G4OO<[QdO'#H{OOOO'#D{'#D{OOOO'#F|'#F|O#?oO&jO,5:fOOOW,5>e,5>eOOOW7+)i7+)iO#?zQdO7+)iO#@SQdO1G2zO#@mQdO1G2zP'vQdO'#FuO0rQdO<mO#BQQdO,5>mOOQS1G0v1G0vOOQS<rO#KgQdO,5>rO#KrQdO,5>rO#K}QdO,5>qO#L`QdO,5>qOOQS1G1Y1G1YOOQS,5;p,5;pOOQV<VAN>VO$ oQdO<cAN>cO0rQdO1G1|O$!PQtO1G1|P$!ZQdO'#FvOOQS1G2R1G2RP$!hQdO'#F{O$!uQdO7+)jO$#`QdO,5>gOOOO-E9z-E9zOOOW<tO$4{QdO,5>tO1XQdO,5vO$)nQdO,5>vOOQS1G1p1G1pOOQS,5<[,5<[OOQU7+'P7+'PO$+zQdO1G/iO$)nQdO,5wO$8zQdO,5>wOOQS1G1s1G1sOOQS7+'S7+'SP$)nQdO'#GdO$9SQdO1G4bO$9^QdO1G4bO$9fQdO1G4bOOQS7+%T7+%TO$9tQdO1G1tO$:SQtO'#FaO$:ZQdO,5<}OOQS,5<},5<}O$:iQdO1G4cOOQS-E:a-E:aO$)nQdO,5<|O$:pQdO,5<|O$:uQdO7+)|OOQS-E:`-E:`O$;PQdO7+)|O$)nQdO,5S~O%cOS%^OSSOS%]PQ~OPdOVaOfoOhYOopOs!POvqO!PrO!Q{O!T!SO!U!RO!XZO!][O!h`O!r`O!s`O!t`O!{tO!}uO#PvO#RwO#TxO#XyO#ZzO#^|O#_|O#a}O#c!OO#l!QO#o!TO#s!UO#u!VO#z!WO#}hO$P!XO%oRO%pRO%tSO%uWO&Z]O&[]O&]]O&^]O&_]O&`]O&a]O&b]O&c^O&d^O&e^O&f^O&g^O&h^O&i^O&j^O~O%]!YO~OV!aO_!aOa!bOh!iO!X!kO!f!mO%j![O%k!]O%l!^O%m!_O%n!_O%o!`O%p!`O%q!aO%r!aO%s!aO~Ok%xXl%xXm%xXn%xXo%xXp%xXs%xXz%xX{%xX!x%xX#g%xX%[%xX%_%xX%z%xXg%xX!T%xX!U%xX%{%xX!W%xX![%xX!Q%xX#[%xXt%xX!m%xX~P%SOfoOhYO!XZO!][O!h`O!r`O!s`O!t`O%oRO%pRO%tSO%uWO&Z]O&[]O&]]O&^]O&_]O&`]O&a]O&b]O&c^O&d^O&e^O&f^O&g^O&h^O&i^O&j^O~Oz%wX{%wX#g%wX%[%wX%_%wX%z%wX~Ok!pOl!qOm!oOn!oOo!rOp!sOs!tO!x%wX~P)pOV!zOg!|Oo0cOv0qO!PrO~P'vOV#OOo0cOv0qO!W#PO~P'vOV#SOa#TOo0cOv0qO![#UO~P'vOQ#XO%`#XO%a#ZO~OQ#^OR#[O%`#^O%a#`O~OV%iX_%iXa%iXh%iXk%iXl%iXm%iXn%iXo%iXp%iXs%iXz%iX!X%iX!f%iX%j%iX%k%iX%l%iX%m%iX%n%iX%o%iX%p%iX%q%iX%r%iX%s%iXg%iX!T%iX!U%iX~O&Z]O&[]O&]]O&^]O&_]O&`]O&a]O&b]O&c^O&d^O&e^O&f^O&g^O&h^O&i^O&j^O{%iX!x%iX#g%iX%[%iX%_%iX%z%iX%{%iX!W%iX![%iX!Q%iX#[%iXt%iX!m%iX~P,eOz#dO{%hX!x%hX#g%hX%[%hX%_%hX%z%hX~Oo0cOv0qO~P'vO#g#gO%[#iO%_#iO~O%uWO~O!T#nO#u!VO#z!WO#}hO~OopO~P'vOV#sOa#tO%uWO{wP~OV#xOo0cOv0qO!Q#yO~P'vO{#{O!x$QO%z#|O#g!yX%[!yX%_!yX~OV#xOo0cOv0qO#g#SX%[#SX%_#SX~P'vOo0cOv0qO#g#WX%[#WX%_#WX~P'vOh$WO%uWO~O!f$YO!r$YO%uWO~OV$eO~P'vO!U$gO#s$hO#u$iO~O{$jO~OV$qO~P'vOS$sO%[$rO%_$rO%c$tO~OV$}Oa$}Og%POo0cOv0qO~P'vOo0cOv0qO{%SO~P'vO&Y%UO~Oa!bOh!iO!X!kO!f!mOVba_bakbalbambanbaobapbasbazba{ba!xba#gba%[ba%_ba%jba%kba%lba%mba%nba%oba%pba%qba%rba%sba%zbagba!Tba!Uba%{ba!Wba![ba!Qba#[batba!mba~On%ZO~Oo%ZO~P'vOo0cO~P'vOk0eOl0fOm0dOn0dOo0mOp0nOs0rOg%wX!T%wX!U%wX%{%wX!W%wX![%wX!Q%wX#[%wX!m%wX~P)pO%{%]Og%vXz%vX!T%vX!U%vX!W%vX{%vX~Og%_Oz%`O!T%dO!U%cO~Og%_O~Oz%gO!T%dO!U%cO!W&SX~O!W%kO~Oz%lO{%nO!T%dO!U%cO![%}X~O![%rO~O![%sO~OQ#XO%`#XO%a%uO~OV%wOo0cOv0qO!PrO~P'vOQ#^OR#[O%`#^O%a%zO~OV!qa_!qaa!qah!qak!qal!qam!qan!qao!qap!qas!qaz!qa{!qa!X!qa!f!qa!x!qa#g!qa%[!qa%_!qa%j!qa%k!qa%l!qa%m!qa%n!qa%o!qa%p!qa%q!qa%r!qa%s!qa%z!qag!qa!T!qa!U!qa%{!qa!W!qa![!qa!Q!qa#[!qat!qa!m!qa~P#yOz%|O{%ha!x%ha#g%ha%[%ha%_%ha%z%ha~P%SOV&OOopOvqO{%ha!x%ha#g%ha%[%ha%_%ha%z%ha~P'vOz%|O{%ha!x%ha#g%ha%[%ha%_%ha%z%ha~OPdOVaOopOvqO!PrO!Q{O!{tO!}uO#PvO#RwO#TxO#XyO#ZzO#^|O#_|O#a}O#c!OO#g$zX%[$zX%_$zX~P'vO#g#gO%[&TO%_&TO~O!f&UOh&sX%[&sXz&sX#[&sX#g&sX%_&sX#Z&sXg&sX~Oh!iO%[&WO~Okealeameaneaoeapeaseazea{ea!xea#gea%[ea%_ea%zeagea!Tea!Uea%{ea!Wea![ea!Qea#[eatea!mea~P%SOsqazqa{qa#gqa%[qa%_qa%zqa~Ok!pOl!qOm!oOn!oOo!rOp!sO!xqa~PEcO%z&YOz%yX{%yX~O%uWOz%yX{%yX~Oz&]O{wX~O{&_O~Oz%lO#g%}X%[%}X%_%}Xg%}X{%}X![%}X!m%}X%z%}X~OV0lOo0cOv0qO!PrO~P'vO%z#|O#gUa%[Ua%_Ua~Oz&hO#g&PX%[&PX%_&PXn&PX~P%SOz&kO!Q&jO#g#Wa%[#Wa%_#Wa~Oz&lO#[&nO#g&rX%[&rX%_&rXg&rX~O!f$YO!r$YO#Z&qO%uWO~O#Z&qO~Oz&sO#g&tX%[&tX%_&tX~Oz&uO#g&pX%[&pX%_&pX{&pX~O!X&wO%z&xO~Oz&|On&wX~P%SOn'PO~OPdOVaOopOvqO!PrO!Q{O!{tO!}uO#PvO#RwO#TxO#XyO#ZzO#^|O#_|O#a}O#c!OO%['UO~P'vOt'YO#p'WO#q'XOP#naV#naf#nah#nao#nas#nav#na!P#na!Q#na!T#na!U#na!X#na!]#na!h#na!r#na!s#na!t#na!{#na!}#na#P#na#R#na#T#na#X#na#Z#na#^#na#_#na#a#na#c#na#l#na#o#na#s#na#u#na#z#na#}#na$P#na%X#na%o#na%p#na%t#na%u#na&Z#na&[#na&]#na&^#na&_#na&`#na&a#na&b#na&c#na&d#na&e#na&f#na&g#na&h#na&i#na&j#na%Z#na%_#na~Oz'ZO#[']O{&xX~Oh'_O!X&wO~Oh!iO{$jO!X&wO~O{'eO~P%SO%['hO%_'hO~OS'iO%['hO%_'hO~OV!aO_!aOa!bOh!iO!X!kO!f!mO%l!^O%m!_O%n!_O%o!`O%p!`O%q!aO%r!aO%s!aOkWilWimWinWioWipWisWizWi{Wi!xWi#gWi%[Wi%_Wi%jWi%zWigWi!TWi!UWi%{Wi!WWi![Wi!QWi#[WitWi!mWi~O%k!]O~P!#uO%kWi~P!#uOV!aO_!aOa!bOh!iO!X!kO!f!mO%o!`O%p!`O%q!aO%r!aO%s!aOkWilWimWinWioWipWisWizWi{Wi!xWi#gWi%[Wi%_Wi%jWi%kWi%lWi%zWigWi!TWi!UWi%{Wi!WWi![Wi!QWi#[WitWi!mWi~O%m!_O%n!_O~P!&pO%mWi%nWi~P!&pOa!bOh!iO!X!kO!f!mOkWilWimWinWioWipWisWizWi{Wi!xWi#gWi%[Wi%_Wi%jWi%kWi%lWi%mWi%nWi%oWi%pWi%zWigWi!TWi!UWi%{Wi!WWi![Wi!QWi#[WitWi!mWi~OV!aO_!aO%q!aO%r!aO%s!aO~P!)nOVWi_Wi%qWi%rWi%sWi~P!)nO!T%dO!U%cOg&VXz&VX~O%z'kO%{'kO~P,eOz'mOg&UX~Og'oO~Oz'pO{'rO!W&XX~Oo0cOv0qOz'pO{'sO!W&XX~P'vO!W'uO~Om!oOn!oOo!rOp!sOkjisjizji{ji!xji#gji%[ji%_ji%zji~Ol!qO~P!.aOlji~P!.aOk0eOl0fOm0dOn0dOo0mOp0nO~Ot'wO~P!/jOV'|Og'}Oo0cOv0qO~P'vOg'}Oz(OO~Og(QO~O!U(SO~Og(TOz(OO!T%dO!U%cO~P%SOk0eOl0fOm0dOn0dOo0mOp0nOgqa!Tqa!Uqa%{qa!Wqa![qa!Qqa#[qatqa!mqa~PEcOV'|Oo0cOv0qO!W&Sa~P'vOz(WO!W&Sa~O!W(XO~Oz(WO!T%dO!U%cO!W&Sa~P%SOV(]Oo0cOv0qO![%}a#g%}a%[%}a%_%}ag%}a{%}a!m%}a%z%}a~P'vOz(^O![%}a#g%}a%[%}a%_%}ag%}a{%}a!m%}a%z%}a~O![(aO~Oz(^O!T%dO!U%cO![%}a~P%SOz(dO!T%dO!U%cO![&Ta~P%SOz(gO{&lX![&lX!m&lX%z&lX~O{(kO![(mO!m(nO%z(jO~OV&OOopOvqO{%hi!x%hi#g%hi%[%hi%_%hi%z%hi~P'vOz(pO{%hi!x%hi#g%hi%[%hi%_%hi%z%hi~O!f&UOh&sa%[&saz&sa#[&sa#g&sa%_&sa#Z&sag&sa~O%[(uO~OV#sOa#tO%uWO~Oz&]O{wa~OopOvqO~P'vOz(^O#g%}a%[%}a%_%}ag%}a{%}a![%}a!m%}a%z%}a~P%SOz(zO#g%hX%[%hX%_%hX%z%hX~O%z#|O#gUi%[Ui%_Ui~O#g&Pa%[&Pa%_&Pan&Pa~P'vOz(}O#g&Pa%[&Pa%_&Pan&Pa~O%uWO#g&ra%[&ra%_&rag&ra~Oz)SO#g&ra%[&ra%_&rag&ra~Og)VO~OV)WOh$WO%uWO~O#Z)XO~O%uWO#g&ta%[&ta%_&ta~Oz)ZO#g&ta%[&ta%_&ta~Oo0cOv0qO#g&pa%[&pa%_&pa{&pa~P'vOz)^O#g&pa%[&pa%_&pa{&pa~OV)`Oa)`O%uWO~O%z)eO~Ot)hO#j)gOP#hiV#hif#hih#hio#his#hiv#hi!P#hi!Q#hi!T#hi!U#hi!X#hi!]#hi!h#hi!r#hi!s#hi!t#hi!{#hi!}#hi#P#hi#R#hi#T#hi#X#hi#Z#hi#^#hi#_#hi#a#hi#c#hi#l#hi#o#hi#s#hi#u#hi#z#hi#}#hi$P#hi%X#hi%o#hi%p#hi%t#hi%u#hi&Z#hi&[#hi&]#hi&^#hi&_#hi&`#hi&a#hi&b#hi&c#hi&d#hi&e#hi&f#hi&g#hi&h#hi&i#hi&j#hi%Z#hi%_#hi~Ot)iOP#kiV#kif#kih#kio#kis#kiv#ki!P#ki!Q#ki!T#ki!U#ki!X#ki!]#ki!h#ki!r#ki!s#ki!t#ki!{#ki!}#ki#P#ki#R#ki#T#ki#X#ki#Z#ki#^#ki#_#ki#a#ki#c#ki#l#ki#o#ki#s#ki#u#ki#z#ki#}#ki$P#ki%X#ki%o#ki%p#ki%t#ki%u#ki&Z#ki&[#ki&]#ki&^#ki&_#ki&`#ki&a#ki&b#ki&c#ki&d#ki&e#ki&f#ki&g#ki&h#ki&i#ki&j#ki%Z#ki%_#ki~OV)kOn&wa~P'vOz)lOn&wa~Oz)lOn&wa~P%SOn)pO~O%Y)tO~Ot)wO#p'WO#q)vOP#niV#nif#nih#nio#nis#niv#ni!P#ni!Q#ni!T#ni!U#ni!X#ni!]#ni!h#ni!r#ni!s#ni!t#ni!{#ni!}#ni#P#ni#R#ni#T#ni#X#ni#Z#ni#^#ni#_#ni#a#ni#c#ni#l#ni#o#ni#s#ni#u#ni#z#ni#}#ni$P#ni%X#ni%o#ni%p#ni%t#ni%u#ni&Z#ni&[#ni&]#ni&^#ni&_#ni&`#ni&a#ni&b#ni&c#ni&d#ni&e#ni&f#ni&g#ni&h#ni&i#ni&j#ni%Z#ni%_#ni~OV)zOo0cOv0qO{$jO~P'vOo0cOv0qO{&xa~P'vOz*OO{&xa~OV*SOa*TOg*WO%q*UO%uWO~O{$jO&{*YO~Oh'_O~Oh!iO{$jO~O%[*_O~O%[*aO%_*aO~OV$}Oa$}Oo0cOv0qOg&Ua~P'vOz*dOg&Ua~Oo0cOv0qO{*gO!W&Xa~P'vOz*hO!W&Xa~Oo0cOv0qOz*hO{*kO!W&Xa~P'vOo0cOv0qOz*hO!W&Xa~P'vOz*hO{*kO!W&Xa~Om0dOn0dOo0mOp0nOgjikjisjizji!Tji!Uji%{ji!Wji{ji![ji#gji%[ji%_ji!Qji#[jitji!mji%zji~Ol0fO~P!NkOlji~P!NkOV'|Og*pOo0cOv0qO~P'vOn*rO~Og*pOz*tO~Og*uO~OV'|Oo0cOv0qO!W&Si~P'vOz*vO!W&Si~O!W*wO~OV(]Oo0cOv0qO![%}i#g%}i%[%}i%_%}ig%}i{%}i!m%}i%z%}i~P'vOz*zO!T%dO!U%cO![&Ti~Oz*}O![%}i#g%}i%[%}i%_%}ig%}i{%}i!m%}i%z%}i~O![+OO~Oa+QOo0cOv0qO![&Ti~P'vOz*zO![&Ti~O![+SO~OV+UOo0cOv0qO{&la![&la!m&la%z&la~P'vOz+VO{&la![&la!m&la%z&la~O!]+YO&n+[O![!nX~O![+^O~O{(kO![+_O~O{(kO![+_O!m+`O~OV&OOopOvqO{%hq!x%hq#g%hq%[%hq%_%hq%z%hq~P'vOz$ri{$ri!x$ri#g$ri%[$ri%_$ri%z$ri~P%SOV&OOopOvqO~P'vOV&OOo0cOv0qO#g%ha%[%ha%_%ha%z%ha~P'vOz+aO#g%ha%[%ha%_%ha%z%ha~Oz$ia#g$ia%[$ia%_$ian$ia~P%SO#g&Pi%[&Pi%_&Pin&Pi~P'vOz+dO#g#Wq%[#Wq%_#Wq~O#[+eOz$va#g$va%[$va%_$vag$va~O%uWO#g&ri%[&ri%_&rig&ri~Oz+gO#g&ri%[&ri%_&rig&ri~OV+iOh$WO%uWO~O%uWO#g&ti%[&ti%_&ti~Oo0cOv0qO#g&pi%[&pi%_&pi{&pi~P'vO{#{Oz#eX!W#eX~Oz+mO!W&uX~O!W+oO~Ot+rO#j)gOP#hqV#hqf#hqh#hqo#hqs#hqv#hq!P#hq!Q#hq!T#hq!U#hq!X#hq!]#hq!h#hq!r#hq!s#hq!t#hq!{#hq!}#hq#P#hq#R#hq#T#hq#X#hq#Z#hq#^#hq#_#hq#a#hq#c#hq#l#hq#o#hq#s#hq#u#hq#z#hq#}#hq$P#hq%X#hq%o#hq%p#hq%t#hq%u#hq&Z#hq&[#hq&]#hq&^#hq&_#hq&`#hq&a#hq&b#hq&c#hq&d#hq&e#hq&f#hq&g#hq&h#hq&i#hq&j#hq%Z#hq%_#hq~On$|az$|a~P%SOV)kOn&wi~P'vOz+yOn&wi~Oz,TO{$jO#[,TO~O#q,VOP#nqV#nqf#nqh#nqo#nqs#nqv#nq!P#nq!Q#nq!T#nq!U#nq!X#nq!]#nq!h#nq!r#nq!s#nq!t#nq!{#nq!}#nq#P#nq#R#nq#T#nq#X#nq#Z#nq#^#nq#_#nq#a#nq#c#nq#l#nq#o#nq#s#nq#u#nq#z#nq#}#nq$P#nq%X#nq%o#nq%p#nq%t#nq%u#nq&Z#nq&[#nq&]#nq&^#nq&_#nq&`#nq&a#nq&b#nq&c#nq&d#nq&e#nq&f#nq&g#nq&h#nq&i#nq&j#nq%Z#nq%_#nq~O#[,WOz%Oa{%Oa~Oo0cOv0qO{&xi~P'vOz,YO{&xi~O{#{O%z,[Og&zXz&zX~O%uWOg&zXz&zX~Oz,`Og&yX~Og,bO~O%Y,eO~O!T%dO!U%cOg&Viz&Vi~OV$}Oa$}Oo0cOv0qOg&Ui~P'vO{,hOz$la!W$la~Oo0cOv0qO{,iOz$la!W$la~P'vOo0cOv0qO{*gO!W&Xi~P'vOz,lO!W&Xi~Oo0cOv0qOz,lO!W&Xi~P'vOz,lO{,oO!W&Xi~Og$hiz$hi!W$hi~P%SOV'|Oo0cOv0qO~P'vOn,qO~OV'|Og,rOo0cOv0qO~P'vOV'|Oo0cOv0qO!W&Sq~P'vOz$gi![$gi#g$gi%[$gi%_$gig$gi{$gi!m$gi%z$gi~P%SOV(]Oo0cOv0qO~P'vOa+QOo0cOv0qO![&Tq~P'vOz,sO![&Tq~O![,tO~OV(]Oo0cOv0qO![%}q#g%}q%[%}q%_%}qg%}q{%}q!m%}q%z%}q~P'vO{,uO~OV+UOo0cOv0qO{&li![&li!m&li%z&li~P'vOz,zO{&li![&li!m&li%z&li~O!]+YO&n+[O![!na~O{(kO![,}O~OV&OOo0cOv0qO#g%hi%[%hi%_%hi%z%hi~P'vOz-OO#g%hi%[%hi%_%hi%z%hi~O%uWO#g&rq%[&rq%_&rqg&rq~Oz-RO#g&rq%[&rq%_&rqg&rq~OV)`Oa)`O%uWO!W&ua~Oz-TO!W&ua~On$|iz$|i~P%SOV)kO~P'vOV)kOn&wq~P'vOt-XOP#myV#myf#myh#myo#mys#myv#my!P#my!Q#my!T#my!U#my!X#my!]#my!h#my!r#my!s#my!t#my!{#my!}#my#P#my#R#my#T#my#X#my#Z#my#^#my#_#my#a#my#c#my#l#my#o#my#s#my#u#my#z#my#}#my$P#my%X#my%o#my%p#my%t#my%u#my&Z#my&[#my&]#my&^#my&_#my&`#my&a#my&b#my&c#my&d#my&e#my&f#my&g#my&h#my&i#my&j#my%Z#my%_#my~O%Z-]O%_-]O~P`O#q-^OP#nyV#nyf#nyh#nyo#nys#nyv#ny!P#ny!Q#ny!T#ny!U#ny!X#ny!]#ny!h#ny!r#ny!s#ny!t#ny!{#ny!}#ny#P#ny#R#ny#T#ny#X#ny#Z#ny#^#ny#_#ny#a#ny#c#ny#l#ny#o#ny#s#ny#u#ny#z#ny#}#ny$P#ny%X#ny%o#ny%p#ny%t#ny%u#ny&Z#ny&[#ny&]#ny&^#ny&_#ny&`#ny&a#ny&b#ny&c#ny&d#ny&e#ny&f#ny&g#ny&h#ny&i#ny&j#ny%Z#ny%_#ny~Oz-aO{$jO#[-aO~Oo0cOv0qO{&xq~P'vOz-dO{&xq~O%z,[Og&zaz&za~O{#{Og&zaz&za~OV*SOa*TO%q*UO%uWOg&ya~Oz-hOg&ya~O$S-lO~OV$}Oa$}Oo0cOv0qO~P'vOo0cOv0qO{-mOz$li!W$li~P'vOo0cOv0qOz$li!W$li~P'vO{-mOz$li!W$li~Oo0cOv0qO{*gO~P'vOo0cOv0qO{*gO!W&Xq~P'vOz-pO!W&Xq~Oo0cOv0qOz-pO!W&Xq~P'vOs-sO!T%dO!U%cOg&Oq!W&Oq![&Oqz&Oq~P!/jOa+QOo0cOv0qO![&Ty~P'vOz$ji![$ji~P%SOa+QOo0cOv0qO~P'vOV+UOo0cOv0qO~P'vOV+UOo0cOv0qO{&lq![&lq!m&lq%z&lq~P'vO{(kO![-xO!m-yO%z-wO~OV&OOo0cOv0qO#g%hq%[%hq%_%hq%z%hq~P'vO%uWO#g&ry%[&ry%_&ryg&ry~OV)`Oa)`O%uWO!W&ui~Ot-}OP#m!RV#m!Rf#m!Rh#m!Ro#m!Rs#m!Rv#m!R!P#m!R!Q#m!R!T#m!R!U#m!R!X#m!R!]#m!R!h#m!R!r#m!R!s#m!R!t#m!R!{#m!R!}#m!R#P#m!R#R#m!R#T#m!R#X#m!R#Z#m!R#^#m!R#_#m!R#a#m!R#c#m!R#l#m!R#o#m!R#s#m!R#u#m!R#z#m!R#}#m!R$P#m!R%X#m!R%o#m!R%p#m!R%t#m!R%u#m!R&Z#m!R&[#m!R&]#m!R&^#m!R&_#m!R&`#m!R&a#m!R&b#m!R&c#m!R&d#m!R&e#m!R&f#m!R&g#m!R&h#m!R&i#m!R&j#m!R%Z#m!R%_#m!R~Oo0cOv0qO{&xy~P'vOV*SOa*TO%q*UO%uWOg&yi~O$S-lO%Z.VO%_.VO~OV.aOh._O!X.^O!].`O!h.YO!s.[O!t.[O%p.XO%uWO&Z]O&[]O&]]O&^]O&_]O&`]O&a]O&b]O~Oo0cOv0qOz$lq!W$lq~P'vO{.fOz$lq!W$lq~Oo0cOv0qO{*gO!W&Xy~P'vOz.gO!W&Xy~Oo0cOv.kO~P'vOs-sO!T%dO!U%cOg&Oy!W&Oy![&Oyz&Oy~P!/jO{(kO![.nO~O{(kO![.nO!m.oO~OV*SOa*TO%q*UO%uWO~Oh.tO!f.rOz$TX#[$TX%j$TXg$TX~Os$TX{$TX!W$TX![$TX~P$-bO%o.vO%p.vOs$UXz$UX{$UX#[$UX%j$UX!W$UXg$UX![$UX~O!h.xO~Oz.|O#[/OO%j.yOs&|X{&|X!W&|Xg&|X~Oa/RO~P$)zOh.tOs&}Xz&}X{&}X#[&}X%j&}X!W&}Xg&}X![&}X~Os/VO{$jO~Oo0cOv0qOz$ly!W$ly~P'vOo0cOv0qO{*gO!W&X!R~P'vOz/ZO!W&X!R~Og&RXs&RX!T&RX!U&RX!W&RX![&RXz&RX~P!/jOs-sO!T%dO!U%cOg&Qa!W&Qa![&Qaz&Qa~O{(kO![/^O~O!f.rOh$[as$[az$[a{$[a#[$[a%j$[a!W$[ag$[a![$[a~O!h/eO~O%o.vO%p.vOs$Uaz$Ua{$Ua#[$Ua%j$Ua!W$Uag$Ua![$Ua~O%j.yOs$Yaz$Ya{$Ya#[$Ya!W$Yag$Ya![$Ya~Os&|a{&|a!W&|ag&|a~P$)nOz/jOs&|a{&|a!W&|ag&|a~O!W/mO~Og/mO~O{/oO~O![/pO~Oo0cOv0qO{*gO!W&X!Z~P'vO{/sO~O%z/tO~P$-bOz/uO#[/OO%j.yOg'PX~Oz/uOg'PX~Og/wO~O!h/xO~O#[/OOs%Saz%Sa{%Sa%j%Sa!W%Sag%Sa![%Sa~O#[/OO%j.yOs%Waz%Wa{%Wa!W%Wag%Wa~Os&|i{&|i!W&|ig&|i~P$)nOz/zO#[/OO%j.yO!['Oa~Og'Pa~P$)nOz0SOg'Pa~Oa0UO!['Oi~P$)zOz0WO!['Oi~Oz0WO#[/OO%j.yO!['Oi~O#[/OO%j.yOg$biz$bi~O%z0ZO~P$-bO#[/OO%j.yOg%Vaz%Va~Og'Pi~P$)nO{0^O~Oa0UO!['Oq~P$)zOz0`O!['Oq~O#[/OO%j.yOz%Ui![%Ui~Oa0UO~P$)zOa0UO!['Oy~P$)zO#[/OO%j.yOg$ciz$ci~O#[/OO%j.yOz%Uq![%Uq~Oz+aO#g%ha%[%ha%_%ha%z%ha~P%SOV&OOo0cOv0qO~P'vOn0hO~Oo0hO~P'vO{0iO~Ot0jO~P!/jO&]&Z&j&h&i&g&f&d&e&c&b&`&a&_&^&[%u~", + goto: "!=j'QPPPPPP'RP'Z*s+[+t,_,y-fP.SP'Z.r.r'ZPPP'Z2[PPPPPP2[5PPP5PP7b7k=sPP=v>h>kPP'Z'ZPP>zPP'Z'ZPP'Z'Z'Z'Z'Z?O?w'ZP?zP@QDXGuGyPG|HWH['ZPPPH_Hk'RP'R'RP'RP'RP'RP'RP'R'R'RP'RPP'RPP'RP'RPHqH}IVPI^IdPI^PI^I^PPPI^PKrPK{LVL]KrPI^LfPI^PLmLsPLwM]MzNeLwLwNkNxLwLwLwLw! ^! d! g! l! o! y!!P!!]!!o!!u!#P!#V!#s!#y!$P!$Z!$a!$g!$y!%T!%Z!%a!%k!%q!%w!%}!&T!&Z!&e!&k!&u!&{!'U!'[!'k!'s!'}!(UPPPPPPPPPPP!([!(_!(e!(n!(x!)TPPPPPPPPPPPP!-u!/Z!3^!6oPP!6w!7W!7a!8Y!8P!8c!8i!8l!8o!8r!8z!9jPPPPPPPPPPPPPPPPP!9m!9q!9wP!:]!:a!:m!:v!;S!;j!;m!;p!;v!;|!_![!]Do!]!^Es!^!_FZ!_!`Gk!`!aHX!a!b%T!b!cIf!c!dJU!d!eK^!e!hJU!h!i!#f!i!tJU!t!u!,|!u!wJU!w!x!.t!x!}JU!}#O!0S#O#P&o#P#Q!0j#Q#R!1Q#R#SJU#S#T%T#T#UJU#U#VK^#V#YJU#Y#Z!#f#Z#fJU#f#g!,|#g#iJU#i#j!.t#j#oJU#o#p!1n#p#q!1s#q#r!2a#r#s!2f#s$g%T$g;'SJU;'S;=`KW<%lOJU`%YT&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%T`%lP;=`<%l%To%v]&n`%c_OX%TXY%oY[%T[]%o]p%Tpq%oq#O%T#O#P&o#P#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%To&tX&n`OY%TYZ%oZ]%T]^%o^#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tc'f[&n`O!_%T!_!`([!`#T%T#T#U(r#U#f%T#f#g(r#g#h(r#h#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tc(cTmR&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tc(yT!mR&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk)aV&n`&[ZOr%Trs)vs#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk){V&n`Or%Trs*bs#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk*iT&n`&^ZO#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%To+PZS_&n`OY*xYZ%TZ]*x]^%T^#o*x#o#p+r#p#q*x#q#r+r#r;'S*x;'S;=`,^<%lO*x_+wTS_OY+rZ]+r^;'S+r;'S;=`,W<%lO+r_,ZP;=`<%l+ro,aP;=`<%l*xj,kV%rQ&n`O!_%T!_!`-Q!`#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tj-XT!xY&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tj-oV%lQ&n`O!_%T!_!`-Q!`#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk.]V&n`&ZZOw%Twx.rx#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk.wV&n`Ow%Twx/^x#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk/eT&n`&]ZO#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk/{ThZ&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tc0cTgR&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk0yXVZ&n`Oz%Tz{1f{!_%T!_!`-Q!`#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk1mVaR&n`O!_%T!_!`-Q!`#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk2ZV%oZ&n`O!_%T!_!`-Q!`#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tc2wTzR&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%To3_W%pZ&n`O!_%T!_!`-Q!`!a3w!a#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Td4OT&{S&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk4fX!fQ&n`O!O%T!O!P5R!P!Q%T!Q![6T![#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk5WV&n`O!O%T!O!P5m!P#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk5tT!rZ&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Ti6[a!hX&n`O!Q%T!Q![6T![!g%T!g!h7a!h!l%T!l!m9s!m#R%T#R#S6T#S#X%T#X#Y7a#Y#^%T#^#_9s#_#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Ti7fZ&n`O{%T{|8X|}%T}!O8X!O!Q%T!Q![8s![#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Ti8^V&n`O!Q%T!Q![8s![#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Ti8z]!hX&n`O!Q%T!Q![8s![!l%T!l!m9s!m#R%T#R#S8s#S#^%T#^#_9s#_#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Ti9zT!hX&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk:bX%qR&n`O!P%T!P!Q:}!Q!_%T!_!`-Q!`#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tj;UV%sQ&n`O!_%T!_!`-Q!`#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Ti;ro!hX&n`O!O%T!O!P=s!P!Q%T!Q![>_![!d%T!d!e?q!e!g%T!g!h7a!h!l%T!l!m9s!m!q%T!q!rA]!r!z%T!z!{Bq!{#R%T#R#S>_#S#U%T#U#V?q#V#X%T#X#Y7a#Y#^%T#^#_9s#_#c%T#c#dA]#d#l%T#l#mBq#m#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Ti=xV&n`O!Q%T!Q![6T![#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Ti>fc!hX&n`O!O%T!O!P=s!P!Q%T!Q![>_![!g%T!g!h7a!h!l%T!l!m9s!m#R%T#R#S>_#S#X%T#X#Y7a#Y#^%T#^#_9s#_#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Ti?vY&n`O!Q%T!Q!R@f!R!S@f!S#R%T#R#S@f#S#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Ti@mY!hX&n`O!Q%T!Q!R@f!R!S@f!S#R%T#R#S@f#S#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%TiAbX&n`O!Q%T!Q!YA}!Y#R%T#R#SA}#S#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%TiBUX!hX&n`O!Q%T!Q!YA}!Y#R%T#R#SA}#S#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%TiBv]&n`O!Q%T!Q![Co![!c%T!c!iCo!i#R%T#R#SCo#S#T%T#T#ZCo#Z#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%TiCv]!hX&n`O!Q%T!Q![Co![!c%T!c!iCo!i#R%T#R#SCo#S#T%T#T#ZCo#Z#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%ToDvV{_&n`O!_%T!_!`E]!`#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%TcEdT%{R&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%TkEzT#gZ&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%TkFbXmR&n`O!^%T!^!_F}!_!`([!`!a([!a#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%TjGUV%mQ&n`O!_%T!_!`-Q!`#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%TkGrV%zZ&n`O!_%T!_!`([!`#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%TkH`WmR&n`O!_%T!_!`([!`!aHx!a#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%TjIPV%nQ&n`O!_%T!_!`-Q!`#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%TkIoV_Q#}P&n`O!_%T!_!`-Q!`#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%ToJ_]&n`&YS%uZO!Q%T!Q![JU![!c%T!c!}JU!}#R%T#R#SJU#S#T%T#T#oJU#p#q%T#r$g%T$g;'SJU;'S;=`KW<%lOJUoKZP;=`<%lJUoKge&n`&YS%uZOr%Trs)Ysw%Twx.Ux!Q%T!Q![JU![!c%T!c!tJU!t!uLx!u!}JU!}#R%T#R#SJU#S#T%T#T#fJU#f#gLx#g#oJU#p#q%T#r$g%T$g;'SJU;'S;=`KW<%lOJUoMRa&n`&YS%uZOr%TrsNWsw%Twx! vx!Q%T!Q![JU![!c%T!c!}JU!}#R%T#R#SJU#S#T%T#T#oJU#p#q%T#r$g%T$g;'SJU;'S;=`KW<%lOJUkN_V&n`&`ZOr%TrsNts#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%TkNyV&n`Or%Trs! `s#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk! gT&n`&bZO#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk! }V&n`&_ZOw%Twx!!dx#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk!!iV&n`Ow%Twx!#Ox#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk!#VT&n`&aZO#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%To!#oe&n`&YS%uZOr%Trs!%Qsw%Twx!&px!Q%T!Q![JU![!c%T!c!tJU!t!u!(`!u!}JU!}#R%T#R#SJU#S#T%T#T#fJU#f#g!(`#g#oJU#p#q%T#r$g%T$g;'SJU;'S;=`KW<%lOJUk!%XV&n`&dZOr%Trs!%ns#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk!%sV&n`Or%Trs!&Ys#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk!&aT&n`&fZO#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk!&wV&n`&cZOw%Twx!'^x#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk!'cV&n`Ow%Twx!'xx#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk!(PT&n`&eZO#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%To!(ia&n`&YS%uZOr%Trs!)nsw%Twx!+^x!Q%T!Q![JU![!c%T!c!}JU!}#R%T#R#SJU#S#T%T#T#oJU#p#q%T#r$g%T$g;'SJU;'S;=`KW<%lOJUk!)uV&n`&hZOr%Trs!*[s#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk!*aV&n`Or%Trs!*vs#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk!*}T&n`&jZO#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk!+eV&n`&gZOw%Twx!+zx#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk!,PV&n`Ow%Twx!,fx#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tk!,mT&n`&iZO#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%To!-Vi&n`&YS%uZOr%TrsNWsw%Twx! vx!Q%T!Q![JU![!c%T!c!dJU!d!eLx!e!hJU!h!i!(`!i!}JU!}#R%T#R#SJU#S#T%T#T#UJU#U#VLx#V#YJU#Y#Z!(`#Z#oJU#p#q%T#r$g%T$g;'SJU;'S;=`KW<%lOJUo!.}a&n`&YS%uZOr%Trs)Ysw%Twx.Ux!Q%T!Q![JU![!c%T!c!}JU!}#R%T#R#SJU#S#T%T#T#oJU#p#q%T#r$g%T$g;'SJU;'S;=`KW<%lOJUk!0ZT!XZ&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tc!0qT!WR&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%Tj!1XV%kQ&n`O!_%T!_!`-Q!`#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%T~!1sO!]~k!1zV%jR&n`O!_%T!_!`-Q!`#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%T~!2fO![~i!2mT%tX&n`O#o%T#p#q%T#r;'S%T;'S;=`%i<%lO%T", + tokenizers: [legacyPrint, indentation, newlines, strings, 0, 1, 2, 3, 4], + topRules: { "Script": [0, 5] }, + specialized: [{ term: 221, get: (value) => spec_identifier3[value] || -1 }], + tokenPrec: 7668 + }); + + // node_modules/@codemirror/lang-python/dist/index.js + var cache2 = /* @__PURE__ */ new NodeWeakMap(); + var ScopeNodes2 = /* @__PURE__ */ new Set([ + "Script", + "Body", + "FunctionDefinition", + "ClassDefinition", + "LambdaExpression", + "ForStatement", + "MatchClause" + ]); + function defID2(type) { + return (node, def, outer) => { + if (outer) + return false; + let id2 = node.node.getChild("VariableName"); + if (id2) + def(id2, type); + return true; + }; + } + var gatherCompletions2 = { + FunctionDefinition: /* @__PURE__ */ defID2("function"), + ClassDefinition: /* @__PURE__ */ defID2("class"), + ForStatement(node, def, outer) { + if (outer) + for (let child = node.node.firstChild; child; child = child.nextSibling) { + if (child.name == "VariableName") + def(child, "variable"); + else if (child.name == "in") + break; + } + }, + ImportStatement(_node, def) { + var _a2, _b2; + let { node } = _node; + let isFrom = ((_a2 = node.firstChild) === null || _a2 === void 0 ? void 0 : _a2.name) == "from"; + for (let ch = node.getChild("import"); ch; ch = ch.nextSibling) { + if (ch.name == "VariableName" && ((_b2 = ch.nextSibling) === null || _b2 === void 0 ? void 0 : _b2.name) != "as") + def(ch, isFrom ? "variable" : "namespace"); + } + }, + AssignStatement(node, def) { + for (let child = node.node.firstChild; child; child = child.nextSibling) { + if (child.name == "VariableName") + def(child, "variable"); + else if (child.name == ":" || child.name == "AssignOp") + break; + } + }, + ParamList(node, def) { + for (let prev = null, child = node.node.firstChild; child; child = child.nextSibling) { + if (child.name == "VariableName" && (!prev || !/\*|AssignOp/.test(prev.name))) + def(child, "variable"); + prev = child; + } + }, + CapturePattern: /* @__PURE__ */ defID2("variable"), + AsPattern: /* @__PURE__ */ defID2("variable"), + __proto__: null + }; + function getScope2(doc2, node) { + let cached = cache2.get(node); + if (cached) + return cached; + let completions = [], top2 = true; + function def(node2, type) { + let name2 = doc2.sliceString(node2.from, node2.to); + completions.push({ label: name2, type }); + } + node.cursor(IterMode.IncludeAnonymous).iterate((node2) => { + if (node2.name) { + let gather = gatherCompletions2[node2.name]; + if (gather && gather(node2, def, top2) || !top2 && ScopeNodes2.has(node2.name)) + return false; + top2 = false; + } else if (node2.to - node2.from > 8192) { + for (let c of getScope2(doc2, node2.node)) + completions.push(c); + return false; + } + }); + cache2.set(node, completions); + return completions; + } + var Identifier2 = /^[\w\xa1-\uffff][\w\d\xa1-\uffff]*$/; + var dontComplete2 = ["String", "FormatString", "Comment", "PropertyName"]; + function localCompletionSource2(context) { + let inner = syntaxTree(context.state).resolveInner(context.pos, -1); + if (dontComplete2.indexOf(inner.name) > -1) + return null; + let isWord = inner.name == "VariableName" || inner.to - inner.from < 20 && Identifier2.test(context.state.sliceDoc(inner.from, inner.to)); + if (!isWord && !context.explicit) + return null; + let options = []; + for (let pos = inner; pos; pos = pos.parent) { + if (ScopeNodes2.has(pos.name)) + options = options.concat(getScope2(context.state.doc, pos)); + } + return { + options, + from: isWord ? inner.from : context.pos, + validFor: Identifier2 + }; + } + var globals = /* @__PURE__ */ [ + "__annotations__", + "__builtins__", + "__debug__", + "__doc__", + "__import__", + "__name__", + "__loader__", + "__package__", + "__spec__", + "False", + "None", + "True" + ].map((n) => ({ label: n, type: "constant" })).concat(/* @__PURE__ */ [ + "ArithmeticError", + "AssertionError", + "AttributeError", + "BaseException", + "BlockingIOError", + "BrokenPipeError", + "BufferError", + "BytesWarning", + "ChildProcessError", + "ConnectionAbortedError", + "ConnectionError", + "ConnectionRefusedError", + "ConnectionResetError", + "DeprecationWarning", + "EOFError", + "Ellipsis", + "EncodingWarning", + "EnvironmentError", + "Exception", + "FileExistsError", + "FileNotFoundError", + "FloatingPointError", + "FutureWarning", + "GeneratorExit", + "IOError", + "ImportError", + "ImportWarning", + "IndentationError", + "IndexError", + "InterruptedError", + "IsADirectoryError", + "KeyError", + "KeyboardInterrupt", + "LookupError", + "MemoryError", + "ModuleNotFoundError", + "NameError", + "NotADirectoryError", + "NotImplemented", + "NotImplementedError", + "OSError", + "OverflowError", + "PendingDeprecationWarning", + "PermissionError", + "ProcessLookupError", + "RecursionError", + "ReferenceError", + "ResourceWarning", + "RuntimeError", + "RuntimeWarning", + "StopAsyncIteration", + "StopIteration", + "SyntaxError", + "SyntaxWarning", + "SystemError", + "SystemExit", + "TabError", + "TimeoutError", + "TypeError", + "UnboundLocalError", + "UnicodeDecodeError", + "UnicodeEncodeError", + "UnicodeError", + "UnicodeTranslateError", + "UnicodeWarning", + "UserWarning", + "ValueError", + "Warning", + "ZeroDivisionError" + ].map((n) => ({ label: n, type: "type" }))).concat(/* @__PURE__ */ [ + "bool", + "bytearray", + "bytes", + "classmethod", + "complex", + "float", + "frozenset", + "int", + "list", + "map", + "memoryview", + "object", + "range", + "set", + "staticmethod", + "str", + "super", + "tuple", + "type" + ].map((n) => ({ label: n, type: "class" }))).concat(/* @__PURE__ */ [ + "abs", + "aiter", + "all", + "anext", + "any", + "ascii", + "bin", + "breakpoint", + "callable", + "chr", + "compile", + "delattr", + "dict", + "dir", + "divmod", + "enumerate", + "eval", + "exec", + "exit", + "filter", + "format", + "getattr", + "globals", + "hasattr", + "hash", + "help", + "hex", + "id", + "input", + "isinstance", + "issubclass", + "iter", + "len", + "license", + "locals", + "max", + "min", + "next", + "oct", + "open", + "ord", + "pow", + "print", + "property", + "quit", + "repr", + "reversed", + "round", + "setattr", + "slice", + "sorted", + "sum", + "vars", + "zip" + ].map((n) => ({ label: n, type: "function" }))); + var snippets2 = [ + /* @__PURE__ */ snippetCompletion("def ${name}(${params}):\n ${}", { + label: "def", + detail: "function", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("for ${name} in ${collection}:\n ${}", { + label: "for", + detail: "loop", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("while ${}:\n ${}", { + label: "while", + detail: "loop", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("try:\n ${}\nexcept ${error}:\n ${}", { + label: "try", + detail: "/ except block", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("if ${}:\n \n", { + label: "if", + detail: "block", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("if ${}:\n ${}\nelse:\n ${}", { + label: "if", + detail: "/ else block", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("class ${name}:\n def __init__(self, ${params}):\n ${}", { + label: "class", + detail: "definition", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("import ${module}", { + label: "import", + detail: "statement", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("from ${module} import ${names}", { + label: "from", + detail: "import", + type: "keyword" + }) + ]; + var globalCompletion = /* @__PURE__ */ ifNotIn(dontComplete2, /* @__PURE__ */ completeFromList(/* @__PURE__ */ globals.concat(snippets2))); + function innerBody(context) { + let { node, pos } = context; + let lineIndent = context.lineIndent(pos, -1); + let found = null; + for (; ; ) { + let before = node.childBefore(pos); + if (!before) { + break; + } else if (before.name == "Comment") { + pos = before.from; + } else if (before.name == "Body" || before.name == "MatchBody") { + if (context.baseIndentFor(before) + context.unit <= lineIndent) + found = before; + node = before; + } else if (before.name == "MatchClause") { + node = before; + } else if (before.type.is("Statement")) { + node = before; + } else { + break; + } + } + return found; + } + function indentBody(context, node) { + let base2 = context.baseIndentFor(node); + let line = context.lineAt(context.pos, -1), to = line.from + line.text.length; + if (/^\s*($|#)/.test(line.text) && context.node.to < to + 100 && !/\S/.test(context.state.sliceDoc(to, context.node.to)) && context.lineIndent(context.pos, -1) <= base2) + return null; + if (/^\s*(else:|elif |except |finally:|case\s+[^=:]+:)/.test(context.textAfter) && context.lineIndent(context.pos, -1) > base2) + return null; + return base2 + context.unit; + } + var pythonLanguage = /* @__PURE__ */ LRLanguage.define({ + name: "python", + parser: /* @__PURE__ */ parser5.configure({ + props: [ + /* @__PURE__ */ indentNodeProp.add({ + Body: (context) => { + var _a2; + let body = /^\s*(#|$)/.test(context.textAfter) && innerBody(context) || context.node; + return (_a2 = indentBody(context, body)) !== null && _a2 !== void 0 ? _a2 : context.continue(); + }, + MatchBody: (context) => { + var _a2; + let inner = innerBody(context); + return (_a2 = indentBody(context, inner || context.node)) !== null && _a2 !== void 0 ? _a2 : context.continue(); + }, + IfStatement: (cx) => /^\s*(else:|elif )/.test(cx.textAfter) ? cx.baseIndent : cx.continue(), + "ForStatement WhileStatement": (cx) => /^\s*else:/.test(cx.textAfter) ? cx.baseIndent : cx.continue(), + TryStatement: (cx) => /^\s*(except[ :]|finally:|else:)/.test(cx.textAfter) ? cx.baseIndent : cx.continue(), + MatchStatement: (cx) => { + if (/^\s*case /.test(cx.textAfter)) + return cx.baseIndent + cx.unit; + return cx.continue(); + }, + "TupleExpression ComprehensionExpression ParamList ArgList ParenthesizedExpression": /* @__PURE__ */ delimitedIndent({ closing: ")" }), + "DictionaryExpression DictionaryComprehensionExpression SetExpression SetComprehensionExpression": /* @__PURE__ */ delimitedIndent({ closing: "}" }), + "ArrayExpression ArrayComprehensionExpression": /* @__PURE__ */ delimitedIndent({ closing: "]" }), + MemberExpression: (cx) => cx.baseIndent + cx.unit, + "String FormatString": () => null, + Script: (context) => { + var _a2; + let inner = innerBody(context); + return (_a2 = inner && indentBody(context, inner)) !== null && _a2 !== void 0 ? _a2 : context.continue(); + } + }), + /* @__PURE__ */ foldNodeProp.add({ + "ArrayExpression DictionaryExpression SetExpression TupleExpression": foldInside, + Body: (node, state) => ({ from: node.from + 1, to: node.to - (node.to == state.doc.length ? 0 : 1) }), + "String FormatString": (node, state) => ({ from: state.doc.lineAt(node.from).to, to: node.to }) + }) + ] + }), + languageData: { + closeBrackets: { + brackets: ["(", "[", "{", "'", '"', "'''", '"""'], + stringPrefixes: [ + "f", + "fr", + "rf", + "r", + "u", + "b", + "br", + "rb", + "F", + "FR", + "RF", + "R", + "U", + "B", + "BR", + "RB" + ] + }, + commentTokens: { line: "#" }, + // Indent logic logic are triggered upon below input patterns + indentOnInput: /^\s*([\}\]\)]|else:|elif |except |finally:|case\s+[^:]*:?)$/ + } + }); + function python() { + return new LanguageSupport(pythonLanguage, [ + pythonLanguage.data.of({ autocomplete: localCompletionSource2 }), + pythonLanguage.data.of({ autocomplete: globalCompletion }) + ]); + } + + // node_modules/@lezer/json/dist/index.js + var jsonHighlighting = styleTags({ + String: tags.string, + Number: tags.number, + "True False": tags.bool, + PropertyName: tags.propertyName, + Null: tags.null, + ", :": tags.separator, + "[ ]": tags.squareBracket, + "{ }": tags.brace + }); + var parser6 = LRParser.deserialize({ + version: 14, + states: "$bOVQPOOOOQO'#Cb'#CbOnQPO'#CeOvQPO'#ClOOQO'#Cr'#CrQOQPOOOOQO'#Cg'#CgO}QPO'#CfO!SQPO'#CtOOQO,59P,59PO![QPO,59PO!aQPO'#CuOOQO,59W,59WO!iQPO,59WOVQPO,59QOqQPO'#CmO!nQPO,59`OOQO1G.k1G.kOVQPO'#CnO!vQPO,59aOOQO1G.r1G.rOOQO1G.l1G.lOOQO,59X,59XOOQO-E6k-E6kOOQO,59Y,59YOOQO-E6l-E6l", + stateData: "#O~OeOS~OQSORSOSSOTSOWQO_ROgPO~OVXOgUO~O^[O~PVO[^O~O]_OVhX~OVaO~O]bO^iX~O^dO~O]_OVha~O]bO^ia~O", + goto: "!kjPPPPPPkPPkqwPPPPk{!RPPP!XP!e!hXSOR^bQWQRf_TVQ_Q`WRg`QcZRicQTOQZRQe^RhbRYQR]R", + nodeNames: "\u26A0 JsonText True False Null Number String } { Object Property PropertyName : , ] [ Array", + maxTerm: 25, + nodeProps: [ + ["isolate", -2, 6, 11, ""], + ["openedBy", 7, "{", 14, "["], + ["closedBy", 8, "}", 15, "]"] + ], + propSources: [jsonHighlighting], + skippedNodes: [0], + repeatNodeCount: 2, + tokenData: "(|~RaXY!WYZ!W]^!Wpq!Wrs!]|}$u}!O$z!Q!R%T!R![&c![!]&t!}#O&y#P#Q'O#Y#Z'T#b#c'r#h#i(Z#o#p(r#q#r(w~!]Oe~~!`Wpq!]qr!]rs!xs#O!]#O#P!}#P;'S!];'S;=`$o<%lO!]~!}Og~~#QXrs!]!P!Q!]#O#P!]#U#V!]#Y#Z!]#b#c!]#f#g!]#h#i!]#i#j#m~#pR!Q![#y!c!i#y#T#Z#y~#|R!Q![$V!c!i$V#T#Z$V~$YR!Q![$c!c!i$c#T#Z$c~$fR!Q![!]!c!i!]#T#Z!]~$rP;=`<%l!]~$zO]~~$}Q!Q!R%T!R![&c~%YRT~!O!P%c!g!h%w#X#Y%w~%fP!Q![%i~%nRT~!Q![%i!g!h%w#X#Y%w~%zR{|&T}!O&T!Q![&Z~&WP!Q![&Z~&`PT~!Q![&Z~&hST~!O!P%c!Q![&c!g!h%w#X#Y%w~&yO[~~'OO_~~'TO^~~'WP#T#U'Z~'^P#`#a'a~'dP#g#h'g~'jP#X#Y'm~'rOR~~'uP#i#j'x~'{P#`#a(O~(RP#`#a(U~(ZOS~~(^P#f#g(a~(dP#i#j(g~(jP#X#Y(m~(rOQ~~(wOW~~(|OV~", + tokenizers: [0], + topRules: { "JsonText": [0, 1] }, + tokenPrec: 0 + }); + + // node_modules/@codemirror/lang-json/dist/index.js + var jsonLanguage = /* @__PURE__ */ LRLanguage.define({ + name: "json", + parser: /* @__PURE__ */ parser6.configure({ + props: [ + /* @__PURE__ */ indentNodeProp.add({ + Object: /* @__PURE__ */ continuedIndent({ except: /^\s*\}/ }), + Array: /* @__PURE__ */ continuedIndent({ except: /^\s*\]/ }) + }), + /* @__PURE__ */ foldNodeProp.add({ + "Object Array": foldInside + }) + ] + }), + languageData: { + closeBrackets: { brackets: ["[", "{", '"'] }, + indentOnInput: /^\s*[\}\]]$/ + } + }); + function json() { + return new LanguageSupport(jsonLanguage); + } + + // node_modules/@codemirror/lang-sql/dist/index.js + var whitespace = 36; + var LineComment2 = 1; + var BlockComment2 = 2; + var String$12 = 3; + var Number2 = 4; + var Bool2 = 5; + var Null = 6; + var ParenL2 = 7; + var ParenR = 8; + var BraceL2 = 9; + var BraceR = 10; + var BracketL2 = 11; + var BracketR = 12; + var Semi = 13; + var Dot = 14; + var Operator = 15; + var Punctuation2 = 16; + var SpecialVar = 17; + var Identifier3 = 18; + var QuotedIdentifier = 19; + var Keyword = 20; + var Type2 = 21; + var Bits = 22; + var Bytes = 23; + var Builtin = 24; + function isAlpha2(ch) { + return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch >= 48 && ch <= 57; + } + function isHexDigit(ch) { + return ch >= 48 && ch <= 57 || ch >= 97 && ch <= 102 || ch >= 65 && ch <= 70; + } + function readLiteral(input, endQuote, backslashEscapes) { + for (let escaped = false; ; ) { + if (input.next < 0) + return; + if (input.next == endQuote && !escaped) { + input.advance(); + return; + } + escaped = backslashEscapes && !escaped && input.next == 92; + input.advance(); + } + } + function readDoubleDollarLiteral(input, tag) { + scan: for (; ; ) { + if (input.next < 0) + return; + if (input.next == 36) { + input.advance(); + for (let i = 0; i < tag.length; i++) { + if (input.next != tag.charCodeAt(i)) + continue scan; + input.advance(); + } + if (input.next == 36) { + input.advance(); + return; + } + } else { + input.advance(); + } + } + } + function readPLSQLQuotedLiteral(input, openDelim) { + let matchingDelim = "[{<(".indexOf(String.fromCharCode(openDelim)); + let closeDelim = matchingDelim < 0 ? openDelim : "]}>)".charCodeAt(matchingDelim); + for (; ; ) { + if (input.next < 0) + return; + if (input.next == closeDelim && input.peek(1) == 39) { + input.advance(2); + return; + } + input.advance(); + } + } + function readWord(input, result) { + for (; ; ) { + if (input.next != 95 && !isAlpha2(input.next)) + break; + if (result != null) + result += String.fromCharCode(input.next); + input.advance(); + } + return result; + } + function readWordOrQuoted(input) { + if (input.next == 39 || input.next == 34 || input.next == 96) { + let quote = input.next; + input.advance(); + readLiteral(input, quote, false); + } else { + readWord(input); + } + } + function readBits(input, endQuote) { + while (input.next == 48 || input.next == 49) + input.advance(); + if (endQuote && input.next == endQuote) + input.advance(); + } + function readNumber(input, sawDot) { + for (; ; ) { + if (input.next == 46) { + if (sawDot) + break; + sawDot = true; + } else if (input.next < 48 || input.next > 57) { + break; + } + input.advance(); + } + if (input.next == 69 || input.next == 101) { + input.advance(); + if (input.next == 43 || input.next == 45) + input.advance(); + while (input.next >= 48 && input.next <= 57) + input.advance(); + } + } + function eol(input) { + while (!(input.next < 0 || input.next == 10)) + input.advance(); + } + function inString(ch, str) { + for (let i = 0; i < str.length; i++) + if (str.charCodeAt(i) == ch) + return true; + return false; + } + var Space = " \r\n"; + function keywords2(keywords4, types2, builtin) { + let result = /* @__PURE__ */ Object.create(null); + result["true"] = result["false"] = Bool2; + result["null"] = result["unknown"] = Null; + for (let kw of keywords4.split(" ")) + if (kw) + result[kw] = Keyword; + for (let tp of types2.split(" ")) + if (tp) + result[tp] = Type2; + for (let kw of (builtin || "").split(" ")) + if (kw) + result[kw] = Builtin; + return result; + } + var SQLTypes = "array binary bit boolean char character clob date decimal double float int integer interval large national nchar nclob numeric object precision real smallint time timestamp varchar varying "; + var SQLKeywords = "absolute action add after all allocate alter and any are as asc assertion at authorization before begin between both breadth by call cascade cascaded case cast catalog check close collate collation column commit condition connect connection constraint constraints constructor continue corresponding count create cross cube current current_date current_default_transform_group current_transform_group_for_type current_path current_role current_time current_timestamp current_user cursor cycle data day deallocate declare default deferrable deferred delete depth deref desc describe descriptor deterministic diagnostics disconnect distinct do domain drop dynamic each else elseif end end-exec equals escape except exception exec execute exists exit external fetch first for foreign found from free full function general get global go goto grant group grouping handle having hold hour identity if immediate in indicator initially inner inout input insert intersect into is isolation join key language last lateral leading leave left level like limit local localtime localtimestamp locator loop map match method minute modifies module month names natural nesting new next no none not of old on only open option or order ordinality out outer output overlaps pad parameter partial path prepare preserve primary prior privileges procedure public read reads recursive redo ref references referencing relative release repeat resignal restrict result return returns revoke right role rollback rollup routine row rows savepoint schema scroll search second section select session session_user set sets signal similar size some space specific specifictype sql sqlexception sqlstate sqlwarning start state static system_user table temporary then timezone_hour timezone_minute to trailing transaction translation treat trigger under undo union unique unnest until update usage user using value values view when whenever where while with without work write year zone "; + var defaults2 = { + backslashEscapes: false, + hashComments: false, + spaceAfterDashes: false, + slashComments: false, + doubleQuotedStrings: false, + doubleDollarQuotedStrings: false, + unquotedBitLiterals: false, + treatBitsAsBytes: false, + charSetCasts: false, + plsqlQuotingMechanism: false, + operatorChars: "*+-%<>!=&|~^/", + specialVar: "?", + identifierQuotes: '"', + caseInsensitiveIdentifiers: false, + words: /* @__PURE__ */ keywords2(SQLKeywords, SQLTypes) + }; + function dialect(spec, kws, types2, builtin) { + let dialect2 = {}; + for (let prop in defaults2) + dialect2[prop] = (spec.hasOwnProperty(prop) ? spec : defaults2)[prop]; + if (kws) + dialect2.words = keywords2(kws, types2 || "", builtin); + return dialect2; + } + function tokensFor(d) { + return new ExternalTokenizer((input) => { + var _a2; + let { next } = input; + input.advance(); + if (inString(next, Space)) { + while (inString(input.next, Space)) + input.advance(); + input.acceptToken(whitespace); + } else if (next == 36 && d.doubleDollarQuotedStrings) { + let tag = readWord(input, ""); + if (input.next == 36) { + input.advance(); + readDoubleDollarLiteral(input, tag); + input.acceptToken(String$12); + } + } else if (next == 39 || next == 34 && d.doubleQuotedStrings) { + readLiteral(input, next, d.backslashEscapes); + input.acceptToken(String$12); + } else if (next == 35 && d.hashComments || next == 47 && input.next == 47 && d.slashComments) { + eol(input); + input.acceptToken(LineComment2); + } else if (next == 45 && input.next == 45 && (!d.spaceAfterDashes || input.peek(1) == 32)) { + eol(input); + input.acceptToken(LineComment2); + } else if (next == 47 && input.next == 42) { + input.advance(); + for (let depth = 1; ; ) { + let cur2 = input.next; + if (input.next < 0) + break; + input.advance(); + if (cur2 == 42 && input.next == 47) { + depth--; + input.advance(); + if (!depth) + break; + } else if (cur2 == 47 && input.next == 42) { + depth++; + input.advance(); + } + } + input.acceptToken(BlockComment2); + } else if ((next == 101 || next == 69) && input.next == 39) { + input.advance(); + readLiteral(input, 39, true); + input.acceptToken(String$12); + } else if ((next == 110 || next == 78) && input.next == 39 && d.charSetCasts) { + input.advance(); + readLiteral(input, 39, d.backslashEscapes); + input.acceptToken(String$12); + } else if (next == 95 && d.charSetCasts) { + for (let i = 0; ; i++) { + if (input.next == 39 && i > 1) { + input.advance(); + readLiteral(input, 39, d.backslashEscapes); + input.acceptToken(String$12); + break; + } + if (!isAlpha2(input.next)) + break; + input.advance(); + } + } else if (d.plsqlQuotingMechanism && (next == 113 || next == 81) && input.next == 39 && input.peek(1) > 0 && !inString(input.peek(1), Space)) { + let openDelim = input.peek(1); + input.advance(2); + readPLSQLQuotedLiteral(input, openDelim); + input.acceptToken(String$12); + } else if (inString(next, d.identifierQuotes)) { + const endQuote = next == 91 ? 93 : next; + readLiteral(input, endQuote, false); + input.acceptToken(QuotedIdentifier); + } else if (next == 40) { + input.acceptToken(ParenL2); + } else if (next == 41) { + input.acceptToken(ParenR); + } else if (next == 123) { + input.acceptToken(BraceL2); + } else if (next == 125) { + input.acceptToken(BraceR); + } else if (next == 91) { + input.acceptToken(BracketL2); + } else if (next == 93) { + input.acceptToken(BracketR); + } else if (next == 59) { + input.acceptToken(Semi); + } else if (d.unquotedBitLiterals && next == 48 && input.next == 98) { + input.advance(); + readBits(input); + input.acceptToken(Bits); + } else if ((next == 98 || next == 66) && (input.next == 39 || input.next == 34)) { + const quoteStyle = input.next; + input.advance(); + if (d.treatBitsAsBytes) { + readLiteral(input, quoteStyle, d.backslashEscapes); + input.acceptToken(Bytes); + } else { + readBits(input, quoteStyle); + input.acceptToken(Bits); + } + } else if (next == 48 && (input.next == 120 || input.next == 88) || (next == 120 || next == 88) && input.next == 39) { + let quoted = input.next == 39; + input.advance(); + while (isHexDigit(input.next)) + input.advance(); + if (quoted && input.next == 39) + input.advance(); + input.acceptToken(Number2); + } else if (next == 46 && input.next >= 48 && input.next <= 57) { + readNumber(input, true); + input.acceptToken(Number2); + } else if (next == 46) { + input.acceptToken(Dot); + } else if (next >= 48 && next <= 57) { + readNumber(input, false); + input.acceptToken(Number2); + } else if (inString(next, d.operatorChars)) { + while (inString(input.next, d.operatorChars)) + input.advance(); + input.acceptToken(Operator); + } else if (inString(next, d.specialVar)) { + if (input.next == next) + input.advance(); + readWordOrQuoted(input); + input.acceptToken(SpecialVar); + } else if (next == 58 || next == 44) { + input.acceptToken(Punctuation2); + } else if (isAlpha2(next)) { + let word = readWord(input, String.fromCharCode(next)); + input.acceptToken(input.next == 46 || input.peek(-word.length - 1) == 46 ? Identifier3 : (_a2 = d.words[word.toLowerCase()]) !== null && _a2 !== void 0 ? _a2 : Identifier3); + } + }); + } + var tokens = /* @__PURE__ */ tokensFor(defaults2); + var parser$1 = /* @__PURE__ */ LRParser.deserialize({ + version: 14, + states: "%vQ]QQOOO#wQRO'#DSO$OQQO'#CwO%eQQO'#CxO%lQQO'#CyO%sQQO'#CzOOQQ'#DS'#DSOOQQ'#C}'#C}O'UQRO'#C{OOQQ'#Cv'#CvOOQQ'#C|'#C|Q]QQOOQOQQOOO'`QQO'#DOO(xQRO,59cO)PQQO,59cO)UQQO'#DSOOQQ,59d,59dO)cQQO,59dOOQQ,59e,59eO)jQQO,59eOOQQ,59f,59fO)qQQO,59fOOQQ-E6{-E6{OOQQ,59b,59bOOQQ-E6z-E6zOOQQ,59j,59jOOQQ-E6|-E6|O+VQRO1G.}O+^QQO,59cOOQQ1G/O1G/OOOQQ1G/P1G/POOQQ1G/Q1G/QP+kQQO'#C}O+rQQO1G.}O)PQQO,59cO,PQQO'#Cw", + stateData: ",[~OtOSPOSQOS~ORUOSUOTUOUUOVROXSOZTO]XO^QO_UO`UOaPObPOcPOdUOeUOfUOgUOhUO~O^]ORvXSvXTvXUvXVvXXvXZvX]vX_vX`vXavXbvXcvXdvXevXfvXgvXhvX~OsvX~P!jOa_Ob_Oc_O~ORUOSUOTUOUUOVROXSOZTO^tO_UO`UOa`Ob`Oc`OdUOeUOfUOgUOhUO~OWaO~P$ZOYcO~P$ZO[eO~P$ZORUOSUOTUOUUOVROXSOZTO^QO_UO`UOaPObPOcPOdUOeUOfUOgUOhUO~O]hOsoX~P%zOajObjOcjO~O^]ORkaSkaTkaUkaVkaXkaZka]ka_ka`kaakabkackadkaekafkagkahka~Oska~P'kO^]O~OWvXYvX[vX~P!jOWnO~P$ZOYoO~P$ZO[pO~P$ZO^]ORkiSkiTkiUkiVkiXkiZki]ki_ki`kiakibkickidkiekifkigkihki~Oski~P)xOWkaYka[ka~P'kO]hO~P$ZOWkiYki[ki~P)xOasObsOcsO~O", + goto: "#hwPPPPPPPPPPPPPPPPPPPPPPPPPPx||||!Y!^!d!xPPP#[TYOZeUORSTWZbdfqT[OZQZORiZSWOZQbRQdSQfTZgWbdfqQ^PWk^lmrQl_Qm`RrseVORSTWZbdfq", + nodeNames: "\u26A0 LineComment BlockComment String Number Bool Null ( ) { } [ ] ; . Operator Punctuation SpecialVar Identifier QuotedIdentifier Keyword Type Bits Bytes Builtin Script Statement CompositeIdentifier Parens Braces Brackets Statement", + maxTerm: 38, + nodeProps: [ + ["isolate", -4, 1, 2, 3, 19, ""] + ], + skippedNodes: [0, 1, 2], + repeatNodeCount: 3, + tokenData: "RORO", + tokenizers: [0, tokens], + topRules: { "Script": [0, 25] }, + tokenPrec: 0 + }); + function tokenBefore(tree) { + let cursor = tree.cursor().moveTo(tree.from, -1); + while (/Comment/.test(cursor.name)) + cursor.moveTo(cursor.from, -1); + return cursor.node; + } + function idName(doc2, node) { + let text = doc2.sliceString(node.from, node.to); + let quoted = /^([`'"\[])(.*)([`'"\]])$/.exec(text); + return quoted ? quoted[2] : text; + } + function plainID(node) { + return node && (node.name == "Identifier" || node.name == "QuotedIdentifier"); + } + function pathFor(doc2, id2) { + if (id2.name == "CompositeIdentifier") { + let path = []; + for (let ch = id2.firstChild; ch; ch = ch.nextSibling) + if (plainID(ch)) + path.push(idName(doc2, ch)); + return path; + } + return [idName(doc2, id2)]; + } + function parentsFor(doc2, node) { + for (let path = []; ; ) { + if (!node || node.name != ".") + return path; + let name2 = tokenBefore(node); + if (!plainID(name2)) + return path; + path.unshift(idName(doc2, name2)); + node = tokenBefore(name2); + } + } + function sourceContext(state, startPos) { + let pos = syntaxTree(state).resolveInner(startPos, -1); + let aliases = getAliases(state.doc, pos); + if (pos.name == "Identifier" || pos.name == "QuotedIdentifier" || pos.name == "Keyword") { + return { + from: pos.from, + quoted: pos.name == "QuotedIdentifier" ? state.doc.sliceString(pos.from, pos.from + 1) : null, + parents: parentsFor(state.doc, tokenBefore(pos)), + aliases + }; + } + if (pos.name == ".") { + return { from: startPos, quoted: null, parents: parentsFor(state.doc, pos), aliases }; + } else { + return { from: startPos, quoted: null, parents: [], empty: true, aliases }; + } + } + var EndFrom = /* @__PURE__ */ new Set(/* @__PURE__ */ "where group having order union intersect except all distinct limit offset fetch for".split(" ")); + function getAliases(doc2, at) { + let statement; + for (let parent = at; !statement; parent = parent.parent) { + if (!parent) + return null; + if (parent.name == "Statement") + statement = parent; + } + let aliases = null; + for (let scan = statement.firstChild, sawFrom = false, prevID = null; scan; scan = scan.nextSibling) { + let kw = scan.name == "Keyword" ? doc2.sliceString(scan.from, scan.to).toLowerCase() : null; + let alias = null; + if (!sawFrom) { + sawFrom = kw == "from"; + } else if (kw == "as" && prevID && plainID(scan.nextSibling)) { + alias = idName(doc2, scan.nextSibling); + } else if (kw && EndFrom.has(kw)) { + break; + } else if (prevID && plainID(scan)) { + alias = idName(doc2, scan); + } + if (alias) { + if (!aliases) + aliases = /* @__PURE__ */ Object.create(null); + aliases[alias] = pathFor(doc2, prevID); + } + prevID = /Identifier$/.test(scan.name) ? scan : null; + } + return aliases; + } + function maybeQuoteCompletions(openingQuote, closingQuote, completions) { + return completions.map((c) => ({ ...c, label: c.label[0] == openingQuote ? c.label : openingQuote + c.label + closingQuote, apply: void 0 })); + } + var Span = /^\w*$/; + var QuotedSpan = /^[`'"\[]?\w*[`'"\]]?$/; + function isSelfTag(namespace) { + return namespace.self && typeof namespace.self.label == "string"; + } + var CompletionLevel = class _CompletionLevel { + constructor(idQuote, idCaseInsensitive) { + this.idQuote = idQuote; + this.idCaseInsensitive = idCaseInsensitive; + this.list = []; + this.children = void 0; + } + child(name2) { + let children = this.children || (this.children = /* @__PURE__ */ Object.create(null)); + let found = children[name2]; + if (found) + return found; + if (name2 && !this.list.some((c) => c.label == name2)) + this.list.push(nameCompletion(name2, "type", this.idQuote, this.idCaseInsensitive)); + return children[name2] = new _CompletionLevel(this.idQuote, this.idCaseInsensitive); + } + maybeChild(name2) { + return this.children ? this.children[name2] : null; + } + addCompletion(option) { + let found = this.list.findIndex((o) => o.label == option.label); + if (found > -1) + this.list[found] = option; + else + this.list.push(option); + } + addCompletions(completions) { + for (let option of completions) + this.addCompletion(typeof option == "string" ? nameCompletion(option, "property", this.idQuote, this.idCaseInsensitive) : option); + } + addNamespace(namespace) { + if (Array.isArray(namespace)) { + this.addCompletions(namespace); + } else if (isSelfTag(namespace)) { + this.addNamespace(namespace.children); + } else { + this.addNamespaceObject(namespace); + } + } + addNamespaceObject(namespace) { + for (let name2 of Object.keys(namespace)) { + let children = namespace[name2], self = null; + let parts = name2.replace(/\\?\./g, (p) => p == "." ? "\0" : p).split("\0"); + let scope = this; + if (isSelfTag(children)) { + self = children.self; + children = children.children; + } + for (let i = 0; i < parts.length; i++) { + if (self && i == parts.length - 1) + scope.addCompletion(self); + scope = scope.child(parts[i].replace(/\\\./g, ".")); + } + scope.addNamespace(children); + } + } + }; + function nameCompletion(label, type, idQuote, idCaseInsensitive) { + if (new RegExp("^[a-z_][a-z_\\d]*$", idCaseInsensitive ? "i" : "").test(label)) + return { label, type }; + return { label, type, apply: idQuote + label + getClosingQuote(idQuote) }; + } + function getClosingQuote(openingQuote) { + return openingQuote === "[" ? "]" : openingQuote; + } + function completeFromSchema(schema, tables, schemas, defaultTableName, defaultSchemaName, dialect2) { + var _a2; + let idQuote = ((_a2 = dialect2 === null || dialect2 === void 0 ? void 0 : dialect2.spec.identifierQuotes) === null || _a2 === void 0 ? void 0 : _a2[0]) || '"'; + let top2 = new CompletionLevel(idQuote, !!(dialect2 === null || dialect2 === void 0 ? void 0 : dialect2.spec.caseInsensitiveIdentifiers)); + let defaultSchema = defaultSchemaName ? top2.child(defaultSchemaName) : null; + top2.addNamespace(schema); + if (tables) + (defaultSchema || top2).addCompletions(tables); + if (schemas) + top2.addCompletions(schemas); + if (defaultSchema) + top2.addCompletions(defaultSchema.list); + if (defaultTableName) + top2.addCompletions((defaultSchema || top2).child(defaultTableName).list); + return (context) => { + let { parents, from, quoted, empty: empty2, aliases } = sourceContext(context.state, context.pos); + if (empty2 && !context.explicit) + return null; + if (aliases && parents.length == 1) + parents = aliases[parents[0]] || parents; + let level = top2; + for (let name2 of parents) { + while (!level.children || !level.children[name2]) { + if (level == top2 && defaultSchema) + level = defaultSchema; + else if (level == defaultSchema && defaultTableName) + level = level.child(defaultTableName); + else + return null; + } + let next = level.maybeChild(name2); + if (!next) + return null; + level = next; + } + let options = level.list; + if (level == top2 && aliases) + options = options.concat(Object.keys(aliases).map((name2) => ({ label: name2, type: "constant" }))); + if (quoted) { + let openingQuote = quoted[0]; + let closingQuote = getClosingQuote(openingQuote); + let quoteAfter = context.state.sliceDoc(context.pos, context.pos + 1) == closingQuote; + return { + from, + to: quoteAfter ? context.pos + 1 : void 0, + options: maybeQuoteCompletions(openingQuote, closingQuote, options), + validFor: QuotedSpan + }; + } else { + return { + from, + options, + validFor: Span + }; + } + }; + } + function completionType(tokenType) { + return tokenType == Type2 ? "type" : tokenType == Keyword ? "keyword" : "variable"; + } + function completeKeywords(keywords4, upperCase, build) { + let completions = Object.keys(keywords4).map((keyword2) => build(upperCase ? keyword2.toUpperCase() : keyword2, completionType(keywords4[keyword2]))); + return ifNotIn(["QuotedIdentifier", "String", "LineComment", "BlockComment", "."], completeFromList(completions)); + } + var parser7 = /* @__PURE__ */ parser$1.configure({ + props: [ + /* @__PURE__ */ indentNodeProp.add({ + Statement: /* @__PURE__ */ continuedIndent() + }), + /* @__PURE__ */ foldNodeProp.add({ + Statement(tree, state) { + return { from: Math.min(tree.from + 100, state.doc.lineAt(tree.from).to), to: tree.to }; + }, + BlockComment(tree) { + return { from: tree.from + 2, to: tree.to - 2 }; + } + }), + /* @__PURE__ */ styleTags({ + Keyword: tags.keyword, + Type: tags.typeName, + Builtin: /* @__PURE__ */ tags.standard(tags.name), + Bits: tags.number, + Bytes: tags.string, + Bool: tags.bool, + Null: tags.null, + Number: tags.number, + String: tags.string, + Identifier: tags.name, + QuotedIdentifier: /* @__PURE__ */ tags.special(tags.string), + SpecialVar: /* @__PURE__ */ tags.special(tags.name), + LineComment: tags.lineComment, + BlockComment: tags.blockComment, + Operator: tags.operator, + "Semi Punctuation": tags.punctuation, + "( )": tags.paren, + "{ }": tags.brace, + "[ ]": tags.squareBracket + }) + ] + }); + var SQLDialect = class _SQLDialect { + constructor(dialect2, language2, spec) { + this.dialect = dialect2; + this.language = language2; + this.spec = spec; + } + /** + Returns the language for this dialect as an extension. + */ + get extension() { + return this.language.extension; + } + /** + Reconfigure the parser used by this dialect. Returns a new + dialect object. + */ + configureLanguage(options, name2) { + return new _SQLDialect(this.dialect, this.language.configure(options, name2), this.spec); + } + /** + Define a new dialect. + */ + static define(spec) { + let d = dialect(spec, spec.keywords, spec.types, spec.builtin); + let language2 = LRLanguage.define({ + name: "sql", + parser: parser7.configure({ + tokenizers: [{ from: tokens, to: tokensFor(d) }] + }), + languageData: { + commentTokens: { line: "--", block: { open: "/*", close: "*/" } }, + closeBrackets: { brackets: ["(", "[", "{", "'", '"', "`"] } + } + }); + return new _SQLDialect(d, language2, spec); + } + }; + function defaultKeyword(label, type) { + return { label, type, boost: -1 }; + } + function keywordCompletionSource(dialect2, upperCase = false, build) { + return completeKeywords(dialect2.dialect.words, upperCase, build || defaultKeyword); + } + function schemaCompletionSource(config2) { + return config2.schema ? completeFromSchema(config2.schema, config2.tables, config2.schemas, config2.defaultTable, config2.defaultSchema, config2.dialect || StandardSQL) : () => null; + } + function schemaCompletion(config2) { + return config2.schema ? (config2.dialect || StandardSQL).language.data.of({ + autocomplete: schemaCompletionSource(config2) + }) : []; + } + function sql(config2 = {}) { + let lang = config2.dialect || StandardSQL; + return new LanguageSupport(lang.language, [ + schemaCompletion(config2), + lang.language.data.of({ + autocomplete: keywordCompletionSource(lang, config2.upperCaseKeywords, config2.keywordCompletion) + }) + ]); + } + var StandardSQL = /* @__PURE__ */ SQLDialect.define({}); + var PostgreSQL = /* @__PURE__ */ SQLDialect.define({ + charSetCasts: true, + doubleDollarQuotedStrings: true, + operatorChars: "+-*/<>=~!@#%^&|`?", + specialVar: "", + keywords: SQLKeywords + "abort abs absent access according ada admin aggregate alias also always analyse analyze array_agg array_max_cardinality asensitive assert assignment asymmetric atomic attach attribute attributes avg backward base64 begin_frame begin_partition bernoulli bit_length blocked bom cache called cardinality catalog_name ceil ceiling chain char_length character_length character_set_catalog character_set_name character_set_schema characteristics characters checkpoint class class_origin cluster coalesce cobol collation_catalog collation_name collation_schema collect column_name columns command_function command_function_code comment comments committed concurrently condition_number configuration conflict connection_name constant constraint_catalog constraint_name constraint_schema contains content control conversion convert copy corr cost covar_pop covar_samp csv cume_dist current_catalog current_row current_schema cursor_name database datalink datatype datetime_interval_code datetime_interval_precision db debug defaults defined definer degree delimiter delimiters dense_rank depends derived detach detail dictionary disable discard dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue document dump dynamic_function dynamic_function_code element elsif empty enable encoding encrypted end_frame end_partition endexec enforced enum errcode error event every exclude excluding exclusive exp explain expression extension extract family file filter final first_value flag floor following force foreach fortran forward frame_row freeze fs functions fusion generated granted greatest groups handler header hex hierarchy hint id ignore ilike immediately immutable implementation implicit import include including increment indent index indexes info inherit inherits inline insensitive instance instantiable instead integrity intersection invoker isnull key_member key_type label lag last_value lead leakproof least length library like_regex link listen ln load location lock locked log logged lower mapping matched materialized max max_cardinality maxvalue member merge message message_length message_octet_length message_text min minvalue mod mode more move multiset mumps name namespace nfc nfd nfkc nfkd nil normalize normalized nothing notice notify notnull nowait nth_value ntile nullable nullif nulls number occurrences_regex octet_length octets off offset oids operator options ordering others over overlay overriding owned owner parallel parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partition pascal passing passthrough password percent percent_rank percentile_cont percentile_disc perform period permission pg_context pg_datatype_name pg_exception_context pg_exception_detail pg_exception_hint placing plans pli policy portion position position_regex power precedes preceding prepared print_strict_params procedural procedures program publication query quote raise range rank reassign recheck recovery refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex rename repeatable replace replica requiring reset respect restart restore result_oid returned_cardinality returned_length returned_octet_length returned_sqlstate returning reverse routine_catalog routine_name routine_schema routines row_count row_number rowtype rule scale schema_name schemas scope scope_catalog scope_name scope_schema security selective self sensitive sequence sequences serializable server server_name setof share show simple skip slice snapshot source specific_name sqlcode sqlerror sqrt stable stacked standalone statement statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset subscription substring substring_regex succeeds sum symmetric sysid system system_time table_name tables tablesample tablespace temp template ties token top_level_count transaction_active transactions_committed transactions_rolled_back transform transforms translate translate_regex trigger_catalog trigger_name trigger_schema trim trim_array truncate trusted type types uescape unbounded uncommitted unencrypted unlink unlisten unlogged unnamed untyped upper uri use_column use_variable user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema vacuum valid validate validator value_of var_pop var_samp varbinary variable_conflict variadic verbose version versioning views volatile warning whitespace width_bucket window within wrapper xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate yes", + types: SQLTypes + "bigint int8 bigserial serial8 varbit bool box bytea cidr circle precision float8 inet int4 json jsonb line lseg macaddr macaddr8 money numeric pg_lsn point polygon float4 int2 smallserial serial2 serial serial4 text timetz timestamptz tsquery tsvector txid_snapshot uuid xml" + }); + var MySQLKeywords = "accessible algorithm analyze asensitive authors auto_increment autocommit avg avg_row_length binlog btree cache catalog_name chain change changed checkpoint checksum class_origin client_statistics coalesce code collations columns comment committed completion concurrent consistent contains contributors convert database databases day_hour day_microsecond day_minute day_second delay_key_write delayed delimiter des_key_file dev_pop dev_samp deviance directory disable discard distinctrow div dual dumpfile enable enclosed ends engine engines enum errors escaped even event events every explain extended fast field fields flush force found_rows fulltext grants handler hash high_priority hosts hour_microsecond hour_minute hour_second ignore ignore_server_ids import index index_statistics infile innodb insensitive insert_method install invoker iterate keys kill linear lines list load lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modify mutex mysql_errno no_write_to_binlog offline offset one online optimize optionally outfile pack_keys parser partition partitions password phase plugin plugins prev processlist profile profiles purge query quick range read_write rebuild recover regexp relaylog remove rename reorganize repair repeatable replace require resume rlike row_format rtree schedule schema_name schemas second_microsecond security sensitive separator serializable server share show slave slow snapshot soname spatial sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result ssl starting starts std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace terminated triggers truncate uncommitted uninstall unlock upgrade use use_frm user_resources user_statistics utc_date utc_time utc_timestamp variables views warnings xa xor year_month zerofill"; + var MySQLTypes = SQLTypes + "bool blob long longblob longtext medium mediumblob mediumint mediumtext tinyblob tinyint tinytext text bigint int1 int2 int3 int4 int8 float4 float8 varbinary varcharacter precision datetime unsigned signed"; + var MySQLBuiltin = "charset clear edit ego help nopager notee nowarning pager print prompt quit rehash source status system tee"; + var MySQL = /* @__PURE__ */ SQLDialect.define({ + operatorChars: "*+-%<>!=&|^", + charSetCasts: true, + doubleQuotedStrings: true, + unquotedBitLiterals: true, + hashComments: true, + spaceAfterDashes: true, + specialVar: "@?", + identifierQuotes: "`", + keywords: SQLKeywords + "group_concat " + MySQLKeywords, + types: MySQLTypes, + builtin: MySQLBuiltin + }); + var MariaSQL = /* @__PURE__ */ SQLDialect.define({ + operatorChars: "*+-%<>!=&|^", + charSetCasts: true, + doubleQuotedStrings: true, + unquotedBitLiterals: true, + hashComments: true, + spaceAfterDashes: true, + specialVar: "@?", + identifierQuotes: "`", + keywords: SQLKeywords + "always generated groupby_concat hard persistent shutdown soft virtual " + MySQLKeywords, + types: MySQLTypes, + builtin: MySQLBuiltin + }); + var MSSQLBuiltin = ( + // Aggregate https://msdn.microsoft.com/en-us/library/ms173454.aspx + "approx_count_distinct approx_percentile_cont approx_percentile_disc avg checksum_agg count count_big grouping grouping_id max min product stdev stdevp sum var varp ai_generate_embeddings ai_generate_chunks cume_dist first_value lag last_value lead percentile_cont percentile_disc percent_rank left_shift right_shift bit_count get_bit set_bit collationproperty tertiary_weights @@datefirst @@dbts @@langid @@language @@lock_timeout @@max_connections @@max_precision @@nestlevel @@options @@remserver @@servername @@servicename @@spid @@textsize @@version cast convert parse try_cast try_convert try_parse asymkey_id asymkeyproperty certproperty cert_id crypt_gen_random decryptbyasymkey decryptbycert decryptbykey decryptbykeyautoasymkey decryptbykeyautocert decryptbypassphrase encryptbyasymkey encryptbycert encryptbykey encryptbypassphrase hashbytes is_objectsigned key_guid key_id key_name signbyasymkey signbycert symkeyproperty verifysignedbycert verifysignedbyasymkey @@cursor_rows @@fetch_status cursor_status datalength ident_current ident_incr ident_seed identity sql_variant_property @@datefirst current_timestamp current_timezone current_timezone_id date_bucket dateadd datediff datediff_big datefromparts datename datepart datetime2fromparts datetimefromparts datetimeoffsetfromparts datetrunc day eomonth getdate getutcdate isdate month smalldatetimefromparts switchoffset sysdatetime sysdatetimeoffset sysutcdatetime timefromparts todatetimeoffset year edit_distance edit_distance_similarity jaro_winkler_distance jaro_winkler_similarity edge_id_from_parts graph_id_from_edge_id graph_id_from_node_id node_id_from_parts object_id_from_edge_id object_id_from_node_id json isjson json_array json_contains json_modify json_object json_path_exists json_query json_value regexp_like regexp_replace regexp_substr regexp_instr regexp_count regexp_matches regexp_split_to_table abs acos asin atan atn2 ceiling cos cot degrees exp floor log log10 pi power radians rand round sign sin sqrt square tan choose greatest iif least @@procid app_name applock_mode applock_test assemblyproperty col_length col_name columnproperty databasepropertyex db_id db_name file_id file_idex file_name filegroup_id filegroup_name filegroupproperty fileproperty filepropertyex fulltextcatalogproperty fulltextserviceproperty index_col indexkey_property indexproperty next value for object_definition object_id object_name object_schema_name objectproperty objectpropertyex original_db_name parsename schema_id schema_name scope_identity serverproperty stats_date type_id type_name typeproperty dense_rank ntile rank row_number publishingservername certenclosed certprivatekey current_user database_principal_id has_dbaccess has_perms_by_name is_member is_rolemember is_srvrolemember loginproperty original_login permissions pwdencrypt pwdcompare session_user sessionproperty suser_id suser_name suser_sid suser_sname system_user user user_id user_name ascii char charindex concat concat_ws difference format left len lower ltrim nchar patindex quotename replace replicate reverse right rtrim soundex space str string_agg string_escape stuff substring translate trim unicode upper $partition @@error @@identity @@pack_received @@rowcount @@trancount binary_checksum checksum compress connectionproperty context_info current_request_id current_transaction_id decompress error_line error_message error_number error_procedure error_severity error_state formatmessage get_filestream_transaction_context getansinull host_id host_name isnull isnumeric min_active_rowversion newid newsequentialid rowcount_big session_context xact_state @@connections @@cpu_busy @@idle @@io_busy @@pack_sent @@packet_errors @@timeticks @@total_errors @@total_read @@total_write textptr textvalid columns_updated eventdata trigger_nestlevel vector_distance vectorproperty vector_search generate_series opendatasource openjson openquery openrowset openxml predict string_split coalesce nullif apply catch filter force include keep keepfixed modify optimize parameterization parameters partition recompile sequence set" + ); + var MSSQL = /* @__PURE__ */ SQLDialect.define({ + keywords: SQLKeywords + // Reserved Keywords https://learn.microsoft.com/en-us/sql/t-sql/language-elements/reserved-keywords-transact-sql?view=sql-server-ver17 + "add external procedure all fetch public alter file raiserror and fillfactor read any for readtext as foreign reconfigure asc freetext references authorization freetexttable replication backup from restore begin full restrict between function return break goto revert browse grant revoke bulk group right by having rollback cascade holdlock rowcount case identity rowguidcol check identity_insert rule checkpoint identitycol save close if schema clustered in securityaudit coalesce index select collate inner semantickeyphrasetable column insert semanticsimilaritydetailstable commit intersect semanticsimilaritytable compute into session_user constraint is set contains join setuser containstable key shutdown continue kill some convert left statistics create like system_user cross lineno table current load tablesample current_date merge textsize current_time national then current_timestamp nocheck to current_user nonclustered top cursor not tran database null transaction dbcc nullif trigger deallocate of truncate declare off try_convert default offsets tsequal delete on union deny open unique desc opendatasource unpivot disk openquery update distinct openrowset updatetext distributed openxml use double option user drop or values dump order varying else outer view end over waitfor errlvl percent when escape pivot where except plan while exec precision with execute primary within group exists print writetext exit proc noexpand index forceseek forcescan holdlock nolock nowait paglock readcommitted readcommittedlock readpast readuncommitted repeatableread rowlock serializable snapshot spatial_window_max_cells tablock tablockx updlock xlock keepidentity keepdefaults ignore_constraints ignore_triggers", + types: SQLTypes + "smalldatetime datetimeoffset datetime2 datetime bigint smallint smallmoney tinyint money real text nvarchar ntext varbinary image hierarchyid uniqueidentifier sql_variant xml", + builtin: MSSQLBuiltin, + operatorChars: "*+-%<>!=^&|/", + specialVar: "@", + identifierQuotes: '"[' + }); + var SQLite = /* @__PURE__ */ SQLDialect.define({ + keywords: SQLKeywords + "abort analyze attach autoincrement conflict database detach exclusive fail glob ignore index indexed instead isnull notnull offset plan pragma query raise regexp reindex rename replace temp vacuum virtual", + types: SQLTypes + "bool blob long longblob longtext medium mediumblob mediumint mediumtext tinyblob tinyint tinytext text bigint int2 int8 unsigned signed real", + builtin: "auth backup bail changes clone databases dbinfo dump echo eqp explain fullschema headers help import imposter indexes iotrace lint load log mode nullvalue once print prompt quit restore save scanstats separator shell show stats system tables testcase timeout timer trace vfsinfo vfslist vfsname width", + operatorChars: "*+-%<>!=&|/~", + identifierQuotes: '`"', + specialVar: "@:?$" + }); + var Cassandra = /* @__PURE__ */ SQLDialect.define({ + keywords: "add all allow alter and any apply as asc authorize batch begin by clustering columnfamily compact consistency count create custom delete desc distinct drop each_quorum exists filtering from grant if in index insert into key keyspace keyspaces level limit local_one local_quorum modify nan norecursive nosuperuser not of on one order password permission permissions primary quorum rename revoke schema select set storage superuser table three to token truncate ttl two type unlogged update use user users using values where with writetime infinity NaN", + types: SQLTypes + "ascii bigint blob counter frozen inet list map static text timeuuid tuple uuid varint", + slashComments: true + }); + var PLSQL = /* @__PURE__ */ SQLDialect.define({ + keywords: SQLKeywords + "abort accept access add all alter and any arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body by case cast char_base check close cluster clusters colauth column comment commit compress connected constant constraint crash create current currval cursor data_base database dba deallocate debugoff debugon declare default definition delay delete desc digits dispose distinct do drop else elseif elsif enable end entry exception exception_init exchange exclusive exists external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base of off offline on online only option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw rebuild record ref references refresh rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work", + builtin: "appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define echo editfile embedded feedback flagger flush heading headsep instance linesize lno loboffset logsource longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar repfooter repheader serveroutput shiftinout show showmode spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout timing trimout trimspool ttitle underline verify version wrap", + types: SQLTypes + "ascii bfile bfilename bigserial bit blob dec long number nvarchar nvarchar2 serial smallint string text uid varchar2 xml", + operatorChars: "*/+-%<>!=~", + doubleQuotedStrings: true, + charSetCasts: true, + plsqlQuotingMechanism: true + }); + + // node_modules/@lezer/yaml/dist/index.js + var blockEnd = 63; + var eof2 = 64; + var DirectiveEnd = 1; + var DocEnd = 2; + var sequenceStartMark = 3; + var sequenceContinueMark = 4; + var explicitMapStartMark = 5; + var explicitMapContinueMark = 6; + var flowMapMark = 7; + var mapStartMark = 65; + var mapContinueMark = 66; + var Literal = 8; + var QuotedLiteral = 9; + var Anchor = 10; + var Alias = 11; + var Tag2 = 12; + var BlockLiteralContent = 13; + var BracketL3 = 19; + var FlowSequence = 20; + var Colon = 29; + var BraceL3 = 33; + var FlowMapping = 34; + var BlockLiteralHeader = 47; + var type_Top = 0; + var type_Seq = 1; + var type_Map = 2; + var type_Flow = 3; + var type_Lit = 4; + var Context3 = class { + constructor(parent, depth, type) { + this.parent = parent; + this.depth = depth; + this.type = type; + this.hash = (parent ? parent.hash + parent.hash << 8 : 0) + depth + (depth << 4) + type; + } + }; + Context3.top = new Context3(null, -1, type_Top); + function findColumn2(input, pos) { + for (let col = 0, p = pos - input.pos - 1; ; p--, col++) { + let ch = input.peek(p); + if (isBreakSpace(ch) || ch == -1) return col; + } + } + function isNonBreakSpace(ch) { + return ch == 32 || ch == 9; + } + function isBreakSpace(ch) { + return ch == 10 || ch == 13; + } + function isSpace(ch) { + return isNonBreakSpace(ch) || isBreakSpace(ch); + } + function isSep(ch) { + return ch < 0 || isSpace(ch); + } + var indentation2 = new ContextTracker({ + start: Context3.top, + reduce(context, term) { + return context.type == type_Flow && (term == FlowSequence || term == FlowMapping) ? context.parent : context; + }, + shift(context, term, stack, input) { + if (term == sequenceStartMark) + return new Context3(context, findColumn2(input, input.pos), type_Seq); + if (term == mapStartMark || term == explicitMapStartMark) + return new Context3(context, findColumn2(input, input.pos), type_Map); + if (term == blockEnd) + return context.parent; + if (term == BracketL3 || term == BraceL3) + return new Context3(context, 0, type_Flow); + if (term == BlockLiteralContent && context.type == type_Lit) + return context.parent; + if (term == BlockLiteralHeader) { + let indent2 = /[1-9]/.exec(input.read(input.pos, stack.pos)); + if (indent2) return new Context3(context, context.depth + +indent2[0], type_Lit); + } + return context; + }, + hash(context) { + return context.hash; + } + }); + function three(input, ch, off2 = 0) { + return input.peek(off2) == ch && input.peek(off2 + 1) == ch && input.peek(off2 + 2) == ch && isSep(input.peek(off2 + 3)); + } + var newlines2 = new ExternalTokenizer((input, stack) => { + if (input.next == -1 && stack.canShift(eof2)) + return input.acceptToken(eof2); + let prev = input.peek(-1); + if ((isBreakSpace(prev) || prev < 0) && stack.context.type != type_Flow) { + if (three( + input, + 45 + /* '-' */ + )) { + if (stack.canShift(blockEnd)) input.acceptToken(blockEnd); + else return input.acceptToken(DirectiveEnd, 3); + } + if (three( + input, + 46 + /* '.' */ + )) { + if (stack.canShift(blockEnd)) input.acceptToken(blockEnd); + else return input.acceptToken(DocEnd, 3); + } + let depth = 0; + while (input.next == 32) { + depth++; + input.advance(); + } + if ((depth < stack.context.depth || depth == stack.context.depth && stack.context.type == type_Seq && (input.next != 45 || !isSep(input.peek(1)))) && // Not blank + input.next != -1 && !isBreakSpace(input.next) && input.next != 35) + input.acceptToken(blockEnd, -depth); + } + }, { contextual: true }); + var blockMark = new ExternalTokenizer((input, stack) => { + if (stack.context.type == type_Flow) { + if (input.next == 63) { + input.advance(); + if (isSep(input.next)) input.acceptToken(flowMapMark); + } + return; + } + if (input.next == 45) { + input.advance(); + if (isSep(input.next)) + input.acceptToken(stack.context.type == type_Seq && stack.context.depth == findColumn2(input, input.pos - 1) ? sequenceContinueMark : sequenceStartMark); + } else if (input.next == 63) { + input.advance(); + if (isSep(input.next)) + input.acceptToken(stack.context.type == type_Map && stack.context.depth == findColumn2(input, input.pos - 1) ? explicitMapContinueMark : explicitMapStartMark); + } else { + let start = input.pos; + for (; ; ) { + if (isNonBreakSpace(input.next)) { + if (input.pos == start) return; + input.advance(); + } else if (input.next == 33) { + readTag(input); + } else if (input.next == 38) { + readAnchor(input); + } else if (input.next == 42) { + readAnchor(input); + break; + } else if (input.next == 39 || input.next == 34) { + if (readQuoted(input, true)) break; + return; + } else if (input.next == 91 || input.next == 123) { + if (!scanBrackets(input)) return; + break; + } else { + readPlain(input, true, false, 0); + break; + } + } + while (isNonBreakSpace(input.next)) input.advance(); + if (input.next == 58) { + if (input.pos == start && stack.canShift(Colon)) return; + let after = input.peek(1); + if (isSep(after)) + input.acceptTokenTo(stack.context.type == type_Map && stack.context.depth == findColumn2(input, start) ? mapContinueMark : mapStartMark, start); + } + } + }, { contextual: true }); + function uriChar(ch) { + return ch > 32 && ch < 127 && ch != 34 && ch != 37 && ch != 44 && ch != 60 && ch != 62 && ch != 92 && ch != 94 && ch != 96 && ch != 123 && ch != 124 && ch != 125; + } + function hexChar(ch) { + return ch >= 48 && ch <= 57 || ch >= 97 && ch <= 102 || ch >= 65 && ch <= 70; + } + function readUriChar(input, quoted) { + if (input.next == 37) { + input.advance(); + if (hexChar(input.next)) input.advance(); + if (hexChar(input.next)) input.advance(); + return true; + } else if (uriChar(input.next) || quoted && input.next == 44) { + input.advance(); + return true; + } + return false; + } + function readTag(input) { + input.advance(); + if (input.next == 60) { + input.advance(); + for (; ; ) { + if (!readUriChar(input, true)) { + if (input.next == 62) input.advance(); + break; + } + } + } else { + while (readUriChar(input, false)) { + } + } + } + function readAnchor(input) { + input.advance(); + while (!isSep(input.next) && charTag(input.next) != "f") input.advance(); + } + function readQuoted(input, scan) { + let quote = input.next, lineBreak = false, start = input.pos; + input.advance(); + for (; ; ) { + let ch = input.next; + if (ch < 0) break; + input.advance(); + if (ch == quote) { + if (ch == 39) { + if (input.next == 39) input.advance(); + else break; + } else { + break; + } + } else if (ch == 92 && quote == 34) { + if (input.next >= 0) input.advance(); + } else if (isBreakSpace(ch)) { + if (scan) return false; + lineBreak = true; + } else if (scan && input.pos >= start + 1024) { + return false; + } + } + return !lineBreak; + } + function scanBrackets(input) { + for (let stack = [], end = input.pos + 1024; ; ) { + if (input.next == 91 || input.next == 123) { + stack.push(input.next); + input.advance(); + } else if (input.next == 39 || input.next == 34) { + if (!readQuoted(input, true)) return false; + } else if (input.next == 93 || input.next == 125) { + if (stack[stack.length - 1] != input.next - 2) return false; + stack.pop(); + input.advance(); + if (!stack.length) return true; + } else if (input.next < 0 || input.pos > end || isBreakSpace(input.next)) { + return false; + } else { + input.advance(); + } + } + } + var charTable = "iiisiiissisfissssssssssssisssiiissssssssssssssssssssssssssfsfssissssssssssssssssssssssssssfif"; + function charTag(ch) { + if (ch < 33) return "u"; + if (ch > 125) return "s"; + return charTable[ch - 33]; + } + function isSafe(ch, inFlow) { + let tag = charTag(ch); + return tag != "u" && !(inFlow && tag == "f"); + } + function readPlain(input, scan, inFlow, indent2) { + if (charTag(input.next) == "s" || (input.next == 63 || input.next == 58 || input.next == 45) && isSafe(input.peek(1), inFlow)) { + input.advance(); + } else { + return false; + } + let start = input.pos; + for (; ; ) { + let next = input.next, off2 = 0, lineIndent = indent2 + 1; + while (isSpace(next)) { + if (isBreakSpace(next)) { + if (scan) return false; + lineIndent = 0; + } else { + lineIndent++; + } + next = input.peek(++off2); + } + let safe = next >= 0 && (next == 58 ? isSafe(input.peek(off2 + 1), inFlow) : next == 35 ? input.peek(off2 - 1) != 32 : isSafe(next, inFlow)); + if (!safe || !inFlow && lineIndent <= indent2 || lineIndent == 0 && !inFlow && (three(input, 45, off2) || three(input, 46, off2))) + break; + if (scan && charTag(next) == "f") return false; + for (let i = off2; i >= 0; i--) input.advance(); + if (scan && input.pos > start + 1024) return false; + } + return true; + } + var literals = new ExternalTokenizer((input, stack) => { + if (input.next == 33) { + readTag(input); + input.acceptToken(Tag2); + } else if (input.next == 38 || input.next == 42) { + let token = input.next == 38 ? Anchor : Alias; + readAnchor(input); + input.acceptToken(token); + } else if (input.next == 39 || input.next == 34) { + readQuoted(input, false); + input.acceptToken(QuotedLiteral); + } else if (readPlain(input, false, stack.context.type == type_Flow, stack.context.depth)) { + input.acceptToken(Literal); + } + }); + var blockLiteral = new ExternalTokenizer((input, stack) => { + let indent2 = stack.context.type == type_Lit ? stack.context.depth : -1, upto = input.pos; + scan: for (; ; ) { + let depth = 0, next = input.next; + while (next == 32) next = input.peek(++depth); + if (!depth && (three(input, 45, depth) || three(input, 46, depth))) break; + if (!isBreakSpace(next)) { + if (indent2 < 0) indent2 = Math.max(stack.context.depth + 1, depth); + if (depth < indent2) break; + } + for (; ; ) { + if (input.next < 0) break scan; + let isBreak = isBreakSpace(input.next); + input.advance(); + if (isBreak) continue scan; + upto = input.pos; + } + } + input.acceptTokenTo(BlockLiteralContent, upto); + }); + var yamlHighlighting = styleTags({ + DirectiveName: tags.keyword, + DirectiveContent: tags.attributeValue, + "DirectiveEnd DocEnd": tags.meta, + QuotedLiteral: tags.string, + BlockLiteralHeader: tags.special(tags.string), + BlockLiteralContent: tags.content, + Literal: tags.content, + "Key/Literal Key/QuotedLiteral": tags.definition(tags.propertyName), + "Anchor Alias": tags.labelName, + Tag: tags.typeName, + Comment: tags.lineComment, + ": , -": tags.separator, + "?": tags.punctuation, + "[ ]": tags.squareBracket, + "{ }": tags.brace + }); + var parser8 = LRParser.deserialize({ + version: 14, + states: "5lQ!ZQgOOO#PQfO'#CpO#uQfO'#DOOOQR'#Dv'#DvO$qQgO'#DRO%gQdO'#DUO%nQgO'#DUO&ROaO'#D[OOQR'#Du'#DuO&{QgO'#D^O'rQgO'#D`OOQR'#Dt'#DtO(iOqO'#DbOOQP'#Dj'#DjO(zQaO'#CmO)YQgO'#CmOOQP'#Cm'#CmQ)jQaOOQ)uQgOOQ]QgOOO*PQdO'#CrO*nQdO'#CtOOQO'#Dw'#DwO+]Q`O'#CxO+hQdO'#CwO+rQ`O'#CwOOQO'#Cv'#CvO+wQdO'#CvOOQO'#Cq'#CqO,UQ`O,59[O,^QfO,59[OOQR,59[,59[OOQO'#Cx'#CxO,eQ`O'#DPO,pQdO'#DPOOQO'#Dx'#DxO,zQdO'#DxO-XQ`O,59jO-aQfO,59jOOQR,59j,59jOOQR'#DS'#DSO-hQcO,59mO-sQgO'#DVO.TQ`O'#DVO.YQcO,59pOOQR'#DX'#DXO#|QfO'#DWO.hQcO'#DWOOQR,59v,59vO.yOWO,59vO/OOaO,59vO/WOaO,59vO/cQgO'#D_OOQR,59x,59xO0VQgO'#DaOOQR,59z,59zOOQP,59|,59|O0yOaO,59|O1ROaO,59|O1aOqO,59|OOQP-E7h-E7hO1oQgO,59XOOQP,59X,59XO2PQaO'#DeO2_QgO'#DeO2oQgO'#DkOOQP'#Dk'#DkQ)jQaOOO3PQdO'#CsOOQO,59^,59^O3kQdO'#CuOOQO,59`,59`OOQO,59c,59cO4VQdO,59cO4aQdO'#CzO4kQ`O'#CzOOQO,59b,59bOOQU,5:Q,5:QOOQR1G.v1G.vO4pQ`O1G.vOOQU-E7d-E7dO4xQdO,59kOOQO,59k,59kO5SQdO'#DQO5^Q`O'#DQOOQO,5:d,5:dOOQU,5:R,5:ROOQR1G/U1G/UO5cQ`O1G/UOOQU-E7e-E7eO5kQgO'#DhO5xQcO1G/XOOQR1G/X1G/XOOQR,59q,59qO6TQgO,59qO6eQdO'#DiO6lQgO'#DiO7PQcO1G/[OOQR1G/[1G/[OOQR,59r,59rO#|QfO,59rOOQR1G/b1G/bO7_OWO1G/bO7dOaO1G/bOOQR,59y,59yOOQR,59{,59{OOQP1G/h1G/hO7lOaO1G/hO7tOaO1G/hO8POaO1G/hOOQP1G.s1G.sO8_QgO,5:POOQP,5:P,5:POOQP,5:V,5:VOOQP-E7i-E7iOOQO,59_,59_OOQO,59a,59aOOQO1G.}1G.}OOQO,59f,59fO8oQdO,59fOOQR7+$b7+$bP,XQ`O'#DfOOQO1G/V1G/VOOQO,59l,59lO8yQdO,59lOOQR7+$p7+$pP9TQ`O'#DgOOQR'#DT'#DTOOQR,5:S,5:SOOQR-E7f-E7fOOQR7+$s7+$sOOQR1G/]1G/]O9YQgO'#DYO9jQ`O'#DYOOQR,5:T,5:TO#|QfO'#DZO9oQcO'#DZOOQR-E7g-E7gOOQR7+$v7+$vOOQR1G/^1G/^OOQR7+$|7+$|O:QOWO7+$|OOQP7+%S7+%SO:VOaO7+%SO:_OaO7+%SOOQP1G/k1G/kOOQO1G/Q1G/QOOQO1G/W1G/WOOQR,59t,59tO:jQgO,59tOOQR,59u,59uO#|QfO,59uOOQR<YAN>Y", + stateData: ";S~O!fOS!gOS^OS~OP_OQbORSOTUOWROXROYYOZZO[XOcPOqQO!PVO!V[O!cTO~O`cO~P]OVkOWROXROYeOZfO[dOcPOmhOqQO~OboO~P!bOVtOWROXROYeOZfO[dOcPOmrOqQO~OpwO~P#WORSOTUOWROXROYYOZZO[XOcPOqQO!PVO!cTO~OSvP!avP!bvP~P#|OWROXROYeOZfO[dOcPOqQO~OmzO~P%OOm!OOUzP!azP!bzP!dzP~P#|O^!SO!b!QO!f!TO!g!RO~ORSOTUOWROXROcPOqQO!PVO!cTO~OY!UOP!QXQ!QX!V!QX!`!QXS!QX!a!QX!b!QXU!QXm!QX!d!QX~P&aO[!WOP!SXQ!SX!V!SX!`!SXS!SX!a!SX!b!SXU!SXm!SX!d!SX~P&aO^!ZO!W![O!b!YO!f!]O!g!YO~OP!_O!V[OQaX!`aX~OPaXQaX!VaX!`aX~P#|OP!bOQ!cO!V[O~OP_O!V[O~P#|OWROXROY!fOcPOqQObfXmfXofXpfX~OWROXRO[!hOcPOqQObhXmhXohXphX~ObeXmlXoeX~ObkXokX~P%OOm!kO~Om!lObnPonP~P%OOb!pOo!oO~Ob!pO~P!bOm!sOosXpsX~OosXpsX~P%OOm!uOotPptP~P%OOo!xOp!yO~Op!yO~P#WOS!|O!a#OO!b#OO~OUyX!ayX!byX!dyX~P#|Om#QO~OU#SO!a#UO!b#UO!d#RO~Om#WOUzX!azX!bzX!dzX~O]#XO~O!b#XO!g#YO~O^#ZO!b#XO!g#YO~OP!RXQ!RX!V!RX!`!RXS!RX!a!RX!b!RXU!RXm!RX!d!RX~P&aOP!TXQ!TX!V!TX!`!TXS!TX!a!TX!b!TXU!TXm!TX!d!TX~P&aO!b#^O!g#^O~O^#_O!b#^O!f#`O!g#^O~O^#_O!W#aO!b#^O!g#^O~OPaaQaa!Vaa!`aa~P#|OP#cO!V[OQ!XX!`!XX~OP!XXQ!XX!V!XX!`!XX~P#|OP_O!V[OQ!_X!`!_X~P#|OWROXROcPOqQObgXmgXogXpgX~OWROXROcPOqQObiXmiXoiXpiX~Obkaoka~P%OObnXonX~P%OOm#kO~Ob#lOo!oO~Oosapsa~P%OOotXptX~P%OOm#pO~Oo!xOp#qO~OSwP!awP!bwP~P#|OS!|O!a#vO!b#vO~OUya!aya!bya!dya~P#|Om#xO~P%OOm#{OU}P!a}P!b}P!d}P~P#|OU#SO!a$OO!b$OO!d#RO~O]$QO~O!b$QO!g$RO~O!b$SO!g$SO~O^$TO!b$SO!g$SO~O^$TO!b$SO!f$UO!g$SO~OP!XaQ!Xa!V!Xa!`!Xa~P#|Obnaona~P%OOotapta~P%OOo!xO~OU|X!a|X!b|X!d|X~P#|Om$ZO~Om$]OU}X!a}X!b}X!d}X~O]$^O~O!b$_O!g$_O~O^$`O!b$_O!g$_O~OU|a!a|a!b|a!d|a~P#|O!b$cO!g$cO~O", + goto: ",]!mPPPPPPPPPPPPPPPPP!nPP!v#v#|$`#|$c$f$j$nP%VPPP!v%Y%^%a%{&O%a&R&U&X&_&b%aP&e&{&e'O'RPP']'a'g'm's'y(XPPPPPPPP(_)e*X+c,VUaObcR#e!c!{ROPQSTUXY_bcdehknrtvz!O!U!W!_!b!c!f!h!k!l!s!u!|#Q#R#S#W#c#k#p#x#{$Z$]QmPR!qnqfPQThknrtv!k!l!s!u#R#k#pR!gdR!ieTlPnTjPnSiPnSqQvQ{TQ!mkQ!trQ!vtR#y#RR!nkTsQvR!wt!RWOSUXY_bcz!O!U!W!_!b!c!|#Q#S#W#c#x#{$Z$]RySR#t!|R|TR|UQ!PUR#|#SR#z#RR#z#SyZOSU_bcz!O!_!b!c!|#Q#S#W#c#x#{$Z$]R!VXR!XYa]O^abc!a!c!eT!da!eQnPR!rnQvQR!{vQ!}yR#u!}Q#T|R#}#TW^Obc!cS!^^!aT!aa!eQ!eaR#f!eW`Obc!cQxSS}U#SQ!`_Q#PzQ#V!OQ#b!_Q#d!bQ#s!|Q#w#QQ$P#WQ$V#cQ$Y#xQ$[#{Q$a$ZR$b$]xZOSU_bcz!O!_!b!c!|#Q#S#W#c#x#{$Z$]Q!VXQ!XYQ#[!UR#]!W!QWOSUXY_bcz!O!U!W!_!b!c!|#Q#S#W#c#x#{$Z$]pfPQThknrtv!k!l!s!u#R#k#pQ!gdQ!ieQ#g!fR#h!hSgPn^pQTkrtv#RQ!jhQ#i!kQ#j!lQ#n!sQ#o!uQ$W#kR$X#pQuQR!zv", + nodeNames: "\u26A0 DirectiveEnd DocEnd - - ? ? ? Literal QuotedLiteral Anchor Alias Tag BlockLiteralContent Comment Stream BOM Document ] [ FlowSequence Item Tagged Anchored Anchored Tagged FlowMapping Pair Key : Pair , } { FlowMapping Pair Pair BlockSequence Item Item BlockMapping Pair Pair Key Pair Pair BlockLiteral BlockLiteralHeader Tagged Anchored Anchored Tagged Directive DirectiveName DirectiveContent Document", + maxTerm: 74, + context: indentation2, + nodeProps: [ + ["isolate", -3, 8, 9, 14, ""], + ["openedBy", 18, "[", 32, "{"], + ["closedBy", 19, "]", 33, "}"] + ], + propSources: [yamlHighlighting], + skippedNodes: [0], + repeatNodeCount: 6, + tokenData: "-Y~RnOX#PXY$QYZ$]Z]#P]^$]^p#Ppq$Qqs#Pst$btu#Puv$yv|#P|}&e}![#P![!]'O!]!`#P!`!a'i!a!}#P!}#O*g#O#P#P#P#Q+Q#Q#o#P#o#p+k#p#q'i#q#r,U#r;'S#P;'S;=`#z<%l?HT#P?HT?HU,o?HUO#PQ#UU!WQOY#PZp#Ppq#hq;'S#P;'S;=`#z<%lO#PQ#kTOY#PZs#Pt;'S#P;'S;=`#z<%lO#PQ#}P;=`<%l#P~$VQ!f~XY$Qpq$Q~$bO!g~~$gS^~OY$bZ;'S$b;'S;=`$s<%lO$b~$vP;=`<%l$bR%OX!WQOX%kXY#PZ]%k]^#P^p%kpq#hq;'S%k;'S;=`&_<%lO%kR%rX!WQ!VPOX%kXY#PZ]%k]^#P^p%kpq#hq;'S%k;'S;=`&_<%lO%kR&bP;=`<%l%kR&lUoP!WQOY#PZp#Ppq#hq;'S#P;'S;=`#z<%lO#PR'VUmP!WQOY#PZp#Ppq#hq;'S#P;'S;=`#z<%lO#PR'p[!PP!WQOY#PZp#Ppq#hq{#P{|(f|}#P}!O(f!O!R#P!R![)p![;'S#P;'S;=`#z<%lO#PR(mW!PP!WQOY#PZp#Ppq#hq!R#P!R![)V![;'S#P;'S;=`#z<%lO#PR)^U!PP!WQOY#PZp#Ppq#hq;'S#P;'S;=`#z<%lO#PR)wY!PP!WQOY#PZp#Ppq#hq{#P{|)V|}#P}!O)V!O;'S#P;'S;=`#z<%lO#PR*nUcP!WQOY#PZp#Ppq#hq;'S#P;'S;=`#z<%lO#PR+XUbP!WQOY#PZp#Ppq#hq;'S#P;'S;=`#z<%lO#PR+rUqP!WQOY#PZp#Ppq#hq;'S#P;'S;=`#z<%lO#PR,]UpP!WQOY#PZp#Ppq#hq;'S#P;'S;=`#z<%lO#PR,vU`P!WQOY#PZp#Ppq#hq;'S#P;'S;=`#z<%lO#P", + tokenizers: [newlines2, blockMark, literals, blockLiteral, 0, 1], + topRules: { "Stream": [0, 15] }, + tokenPrec: 0 + }); + + // node_modules/@codemirror/lang-yaml/dist/index.js + var parser9 = /* @__PURE__ */ LRParser.deserialize({ + version: 14, + states: "!vOQOPOOO]OPO'#C_OhOPO'#C^OOOO'#Cc'#CcOpOPO'#CaQOOOOOO{OPOOOOOO'#Cb'#CbO!WOPO'#C`O!`OPO,58xOOOO-E6a-E6aOOOO-E6`-E6`OOOO'#C_'#C_OOOO1G.d1G.d", + stateData: "!h~OXPOYROWTP~OWVXXRXYRX~OYVOXSP~OXROYROWTX~OXROYROWTP~OYVOXSX~OX[O~OXY~", + goto: "vWPPX[beioRUOQQOR]XRXQTTOUQWQRZWSSOURYS", + nodeNames: "\u26A0 Document Frontmatter DashLine FrontmatterContent Body", + maxTerm: 10, + skippedNodes: [0], + repeatNodeCount: 2, + tokenData: "$z~RXOYnYZ!^Z]n]^!^^}n}!O!i!O;'Sn;'S;=`!c<%lOn~qXOYnYZ!^Z]n]^!^^;'Sn;'S;=`!c<%l~n~On~~!^~!cOY~~!fP;=`<%ln~!lZOYnYZ!^Z]n]^!^^}n}!O#_!O;'Sn;'S;=`!c<%l~n~On~~!^~#bZOYnYZ!^Z]n]^!^^}n}!O$T!O;'Sn;'S;=`!c<%l~n~On~~!^~$WXOYnYZ$sZ]n]^$s^;'Sn;'S;=`!c<%l~n~On~~$s~$zOX~Y~", + tokenizers: [0], + topRules: { "Document": [0, 1] }, + tokenPrec: 67 + }); + var yamlLanguage = /* @__PURE__ */ LRLanguage.define({ + name: "yaml", + parser: /* @__PURE__ */ parser8.configure({ + props: [ + /* @__PURE__ */ indentNodeProp.add({ + Stream: (cx) => { + for (let before = cx.node.resolve(cx.pos, -1); before && before.to >= cx.pos; before = before.parent) { + if (before.name == "BlockLiteralContent" && before.from < before.to) + return cx.baseIndentFor(before); + if (before.name == "BlockLiteral") + return cx.baseIndentFor(before) + cx.unit; + if (before.name == "BlockSequence" || before.name == "BlockMapping") + return cx.column(before.firstChild.from, 1); + if (before.name == "QuotedLiteral") + return null; + if (before.name == "Literal") { + let col = cx.column(before.from, 1); + if (col == cx.lineIndent(before.from, 1)) + return col; + if (before.to > cx.pos) + return null; + } + } + return null; + }, + FlowMapping: /* @__PURE__ */ delimitedIndent({ closing: "}" }), + FlowSequence: /* @__PURE__ */ delimitedIndent({ closing: "]" }) + }), + /* @__PURE__ */ foldNodeProp.add({ + "FlowMapping FlowSequence": foldInside, + "Item Pair BlockLiteral": (node, state) => ({ from: state.doc.lineAt(node.from).to, to: node.to }) + }) + ] + }), + languageData: { + commentTokens: { line: "#" }, + indentOnInput: /^\s*[\]\}]$/ + } + }); + function yaml() { + return new LanguageSupport(yamlLanguage); + } + var frontmatterLanguage = /* @__PURE__ */ LRLanguage.define({ + name: "yaml-frontmatter", + parser: /* @__PURE__ */ parser9.configure({ + props: [/* @__PURE__ */ styleTags({ DashLine: tags.meta })] + }) + }); + + // node_modules/@lezer/go/dist/index.js + var insertedSemi = 177; + var space$1 = 179; + var identifier4 = 184; + var String2 = 12; + var closeParen$1 = 13; + var Number3 = 17; + var Rune = 20; + var closeBrace$1 = 25; + var closeBracket = 53; + var IncDecOp = 95; + var _return = 142; + var _break = 144; + var _continue = 145; + var fallthrough = 148; + var newline4 = 10; + var carriageReturn2 = 13; + var space5 = 32; + var tab2 = 9; + var slash3 = 47; + var closeParen = 41; + var closeBrace = 125; + var semicolon2 = new ExternalTokenizer((input, stack) => { + for (let scan = 0, next = input.next; ; ) { + if (stack.context && (next < 0 || next == newline4 || next == carriageReturn2 || next == slash3 && input.peek(scan + 1) == slash3) || next == closeParen || next == closeBrace) + input.acceptToken(insertedSemi); + if (next != space5 && next != tab2) break; + next = input.peek(++scan); + } + }, { contextual: true }); + var trackedTokens = /* @__PURE__ */ new Set([ + IncDecOp, + identifier4, + Rune, + String2, + Number3, + _break, + _continue, + _return, + fallthrough, + closeParen$1, + closeBracket, + closeBrace$1 + ]); + var trackTokens = new ContextTracker({ + start: false, + shift: (context, term) => term == space$1 ? context : trackedTokens.has(term) + }); + var goHighlighting = styleTags({ + "func interface struct chan map const type var": tags.definitionKeyword, + "import package": tags.moduleKeyword, + "switch for go select return break continue goto fallthrough case if else defer": tags.controlKeyword, + "range": tags.keyword, + Bool: tags.bool, + String: tags.string, + Rune: tags.character, + Number: tags.number, + Nil: tags.null, + VariableName: tags.variableName, + DefName: tags.definition(tags.variableName), + TypeName: tags.typeName, + LabelName: tags.labelName, + FieldName: tags.propertyName, + "FunctionDecl/DefName": tags.function(tags.definition(tags.variableName)), + "TypeSpec/DefName": tags.definition(tags.typeName), + "CallExpr/VariableName": tags.function(tags.variableName), + LineComment: tags.lineComment, + BlockComment: tags.blockComment, + LogicOp: tags.logicOperator, + ArithOp: tags.arithmeticOperator, + BitOp: tags.bitwiseOperator, + "DerefOp .": tags.derefOperator, + "UpdateOp IncDecOp": tags.updateOperator, + CompareOp: tags.compareOperator, + "= :=": tags.definitionOperator, + "<-": tags.operator, + '~ "*"': tags.modifier, + "; ,": tags.separator, + "... :": tags.punctuation, + "( )": tags.paren, + "[ ]": tags.squareBracket, + "{ }": tags.brace + }); + var spec_identifier4 = { __proto__: null, package: 10, import: 18, true: 380, false: 380, nil: 383, struct: 48, func: 68, interface: 78, chan: 94, map: 118, make: 157, new: 159, const: 204, type: 212, var: 224, if: 236, else: 238, switch: 242, case: 248, default: 250, for: 260, range: 266, go: 270, select: 274, return: 284, break: 288, continue: 290, goto: 292, fallthrough: 296, defer: 300 }; + var parser10 = LRParser.deserialize({ + version: 14, + states: "!=xO#{QQOOP$SOQOOO&UQTO'#CbO&]QRO'#FlO]QQOOOOQP'#Cn'#CnOOQP'#Co'#CoO&eQQO'#C|O(kQQO'#C{O)]QRO'#GiO+tQQO'#D_OOQP'#Ge'#GeO+{QQO'#GeO.aQTO'#GaO.hQQO'#D`OOQP'#Gm'#GmO.mQRO'#GdO/hQQO'#DgOOQP'#Gd'#GdO/uQQO'#DrO2bQQO'#DsO4QQTO'#GqO,^QTO'#GaO4XQQO'#DxO4^QQO'#D{OOQO'#EQ'#EQOOQO'#ER'#EROOQO'#ES'#ESOOQO'#ET'#ETO4cQQO'#EPO5}QQO'#EPOOQP'#Ga'#GaO6UQQO'#E`O6^QQO'#EcOOQP'#G`'#G`O6cQQO'#EsOOQP'#G_'#G_O&]QRO'#FnOOQO'#Fn'#FnO9QQQO'#G^QOQQOOO&]QROOO9XQQO'#C`O9^QSO'#CdO9lQQO'#C}O9tQQO'#DSO9yQQO'#D[O:kQQO'#CsO:pQQO'#DhO:uQQO'#EeO:}QQO'#EiO;VQQO'#EoO;_QQO'#EuOPQSO7+%hOOQP7+%h7+%hO4cQQO7+%hOOQP1G0Q1G0QO!>^QQO1G0QOOQP1G0U1G0UO!>fQQO1G0UOF|QQO1G0UOOQO,5nAN>nO4cQQOAN>nO!IsQSOAN>nOOQP<nQQO'#FrOOQO,5vAN>vO!LtQQOAN>vP.hQQO'#F|OOQPG25XG25XO!LyQQOG25bO!MOQQO'#FPOOQPG25bG25bO!MZQQOG25bOOQPLD)tLD)tOOQPG24bG24bO!JqQQOLD*|O!9OQQO'#GQO!McQQO,5;kOOQP,5;k,5;kO?tQQO'#FQO!MnQQO'#FQO!MsQQOLD*|OOQP!$'Nh!$'NhOOQO,5VO^!hOh!POr-TOw}O!P-_O!Q-`O!W-^O!]-eO%O!eO%Y!fO~OZ!sO~O^#uO~O!P$xO~On!lO#W%]aV%]a^%]ah%]ar%]aw%]a!P%]a!Q%]a!W%]a!]%]a#T%]a$w%]a%O%]a%Y%]au%]a~O]${O^#QO~OZ#RO^#VO!W#SO%Y#XO%`#ZO%fiO%giO%i#ZO%j#YO%k#XO%l#XO%m#YO%n#YO%o#YO%p#[O%q#]O~O]$|O!|,WO~PBROj!qOn%QO!QnOi%cP~P*aO!V%WO!|#`O~PBRO!V%YO~OV!}O[oO^YOaoOdoOh!POjcOr!pOw}O!P!OO!QnO!WaO!]!QO!phO!qhO#Y!RO#^!SO#d!TO#j!UO#m!VO#v!WO#{!XO#}!YO$S!ZO$U![O$V![O$W!]O$Y!^O$[!_O%OQO%UTO%VUO%YVO%fiO%giO%hjO%ikO%jlO~Oi%dX#p%dX#q%dX~PDQOi%]O~O[oO^YOaoOdoOh!POr!pOw}O!P!OO!Q-QO!WaO!]!QO!phO!qhO%O+{O%UTO%VUO%YVO%fiO%giO%hjO%ikO%jlO~O^%aO%O%_O~O!QnO!a%cO~P*aO!QnOn$mX#T$mX#U$mXV$mX$w$mX!a$mX~P*aOn#TO#T%ea#U%eaV%ea$w%ea!a%ea~O]%fO~PF|OV#ga$w#ga~PDTO[%sO~OZ#rO[#qO]%vO%O#oO~O^!hOh!POn%zOr-TOu%xOw}O!P-_O!Q-`O!W-^O!]-eO%O,dO%Y!fO]%[P~O^&OOh!POr!jOw}O!P!OO!Q!kO!WaO!]!QO%Y!fO^%ZXj%ZX~O%O%}O~PKfOjcO^qa]qanqa!Vqa~O^#uO!W&SO~O^!hOh!POr-TOw}O{&WO!P-_O!Q-`O!W-^O!]-eO%O,xO%Y!fO~Oi&^O~PL{O^!hOh!POr!jOw}O!Q!kO!WaO!]!QO%O!eO%Y!fO~O!P#hO~PMwOi&eO%O,yO%Y!fO~O#T&gOV#ZX$w#ZX~P?tO]&kO%O#oO~O^!hOh!POr-TOw}O!P-_O!Q-`O!]-eO%O!eO%Y!fO~O!W&lO#T&mO~P! _O]&qO%O#oO~O#T&sOV#eX$w#eX~P?tO]&vO%O#oO~OjeX~P$XOjcO!|,XO~P2gOn!lO#W&yO#W%]X~O^#VOn#TO!Q#cO!W#SO!|,XO#R#dO%Y#XO%`#ZO%fiO%giO%i#ZO%j#YO%k#XO%l#XO%m#YO%n#YO%o#YO%p#[O%q#]OV`X#T%eX#U%eX~OZ&zOj$`O$w`X~P!#cOi'OO#p'PO#q'QO~OZ#ROjcO~P!#cO#T'TO#U#iO~O#W'UO~OV'WO!QnO~P*aOV'XO~OjcO~O!|#`OV#za$w#za~PBROi'[O#p']O#q'^O~On#TO!|#`OV%eX$w%eX!a%eX~PBRO!|#`OV$Za$w$Za~PBRO${$rO$|$rO$}'`O~O]${O~O%O!eO]%ZXn%ZX!V%ZX~PKfO!|#`Oi!_Xn!_X!a!`X~PBROi!_Xn!_X!a!`X~O!a'aO~On'bOi%cX~Oi'dO~On'eO!V%bX!a%bX~O!V'gO~O]'jOn'kO!|,YO~PBROn'nO!V'mO!a'oO!|#`O~PBRO!QnO!V'qO!a'rO~P*aO!|#`On$ma#T$ma#U$maV$ma$w$ma!a$ma~PBRO]'sOu'tO~O%Y#XO%j#YO%k#XO%l#XO%m#YO%n#YO%o#YOV!xiZ!xi^!xin!xi!Q!xi!W!xi!|!xi#R!xi#T!xi#U!xi$w!xi%`!xi%f!xi%g!xi%i!xi%p!xi%q!xi~O!V!xii!xi!a!xi~P!+YO%Y#XO%`#ZO%fiO%giO%i#ZO%j#YO%k#XO%l#XO%m#YO%n#YO%o#YOV!xiZ!xi^!xin!xi!Q!xi!W!xi#R!xi#T!xi#U!xi$w!xi%p!xi%q!xi!V!xii!xi!a!xi~O!|!xi~P!-TO!|#`O~P!-TO%Y#XO%`#ZO%fiO%giO%i#ZO%j#YO%k#XO%l#XO%m#YO%n#YO%o#YO%p#[OV!xiZ!xi^!xin!xi!Q!xi!W!xi#R!xi#T!xi#U!xi$w!xi%q!xi~O!|#`O!V!xii!xi!a!xi~P!/VO!|#`OV#Pi$w#Pi!a#Pi~PBRO]'uOn'wOu'vO~OZ#rO[#qO]'zO%O#oO~Ou'|O~P?tOn'}O]%[X~O](PO~OZeX^mX^!TXj!TX!W!TX~OjcOV$]i$w$]i~O%`(ZOV%^X$w%^Xn%^X!V%^X~Oi(`O~PL{O[(aO!W!tOVlX$wlX~On(bO~P?tO[(aOVlX$wlX~Oi(hO%O,yO%Y!fO~O!V(iO~O#T(kO~O](nO%O#oO~O[oO^YOaoOdoOh!POr!pOu-bOw}O!P!OO!QnO!V-UO!WaO!]!QO!phO!qhO%UTO%VUO%YVO%fiO%giO%hjO%ikO%jlO~O%O+zO~P!4vO](sO%O#oO~O#T(tOV#ea$w#ea~O](xO%O#oO~O#k(yOV#ii$w#ii~O[oO^YOaoOdoOh!POr!pOw}O!P!OO!Q-PO!WaO!]!QO!phO!qhO%O+xO%UTO%VUO%YVO%fiO%giO%hjO%ikO%jlO~O^(|O%O%_O~O#p%dP#q%dP~P/uOi)PO#p'PO#q'QO~O!a)RO~O!QnO#y)VO~P*aOV)WO!|#`O~PBROj#wa~P;_OV)WO!QnO~P*aOi)]O#p']O#q'^O~O[oO^YOaoOdoOh!POr!pOw}O!P!OO!QnO!WaO!]!QO!phO!qhO%UTO%VUO%YVO%fiO%giO%hjO%ikO%jlO~O%O,eO~P!:lO!a)bO~Oj!qO!QnO~P*aOj!qO!QnOi%ca~P*aOn)iOi%ca~O!V%ba!a%ba~P?tOn)lO!V%ba!a%ba~O])nO~O])oO~O!V)pO~O!QnO!V)rO!a)sO~P*aO!V)rO!a)sO!|#`O~PBRO])uOn)vO~O])wOn)xO~O^!hOh!POr-TOu%xOw}O!P-_O!Q-`O!W-^O!]-eO%O,dO%Y!fO~O]%[a~P!>nOn)|O]%[a~O]${O]tXntX~OjcOV$^q$w$^q~On*PO{&WO~P?tOn*SO!V%rX~O!V*UO~OjcOV$]q$w$]q~O%`(ZOV|a$w|an|a!V|a~O[*]OVla$wla~O[*]O!W!tOVla$wla~On*PO{&WO!W*`O^%WXj%WX~P! _OjcO#j!UO~OjcO!|,XO~PBROZ*dO^#VO!W#SO%Y#XO%`#ZO%fiO%giO%i#ZO%j#YO%k#XO%l#XO%m#YO%n#YO%o#YO%p#[O%q#]O~O!|#`O~P!BoO#^*eO~P?tO!a*fO~Oj$`O!|,XO~P!BoO#W*hO~Oj#wi~P;_OV*kO!|#`O~PBROn#TO!Q#cO!|#`O!a$QX#T%eX~PBRO#T*lO~O#W*lO~O!a*mO~O!|#`Oi!_in!_i~PBRO!|#`Oi!bXn!bX!a!cX~PBROi!bXn!bX!a!cX~O!a*nO~Oj!qO!QnOi%ci~P*aO!V%bi!a%bi~P?tO!V*qO!a*rO!|#`O~PBRO!V*qO!|#`O~PBRO]*tO~O]*uO~O]*uOu*vO~O]%[i~P!>nO%O!eO!V%ra~On*|O!V%ra~O[+OOVli$wli~O%O+yO~P!4vO#k+QOV#iy$w#iy~O^+RO%O%_O~O]+SO~O!|,XOj#xq~PBROj#wq~P;_O!V+ZO!|#`O~PBRO]+[On+]O~O%O!eO!V%ri~O^#QOn'eO!V%bX~O#^+`O~P?tOj+aO~O^#VO!W#SO!|#`O%Y#XO%`#ZO%fiO%giO%i#ZO%j#YO%k#XO%l#XO%m#YO%n#YO%o#YO%p#[O%q#]O~OZ+cO~P!JvO!|#`O!a$Qi~PBRO!|#`Oi!bin!bi~PBRO!V+dO!|#`O~PBRO]+eO~O]+fO~Oi+iO#p+jO#q+kO~O^+lO%O%_O~Oi+pO#p+jO#q+kO~O!a+rO~O#^+sO~P?tO!a+tO~O]+uO~OZeX^eX^!TXj!TX!WeX!W!TX!|eX%YeX%`eX%feX%geX%ieX%jeX%keX%leX%meX%neX%oeX%peX%qeXVeXneX!QeX#ReX#TeX#UeX$weX~O]eX]!TX!VeXieX!aeX~P!NUOjeX~P!NUOZeX^eX^!TXj!TX!WeX!W!TX!|eX%YeX%`eX%feX%geX%ieX%jeX%keX%leX%meX%neX%oeX%peX%qeXn!TX!VeX~O]eX!V!TX~P#!gOh!TXr!TXw!TX{!TX!P!TX!Q!TX!]!TX%O!TX%Y!TX~P#!gOZeX^eX^!TXj!TXneX!WeX!W!TX!|eX%YeX%`eX%feX%geX%ieX%jeX%keX%leX%meX%neX%oeX%peX%qeX~O]eXueX~P#$xO]$mXn$mXu$mX~PF|Oj$mXn$mX~P!7`On+|O]%eau%ea~On+}Oj%ea~O[oO^YOaoOdoOh!POr!pOw}O!P!OO!Q-OO!WaO!]!QO!phO!qhO%O+yO%UTO%VUO%YVO%fiO%giO%hjO%ikO%jlO~OZeX]!TX^UXhUXnUXn!TXrUXuUXwUX!PUX!QUX!WUX!W!TX!]UX%OUX%YUX~OnUX!QeX!aeX#TeX#WUX~P#$xOn+|O!|,YO]%eXu%eX~PBROn+}O!|,XOj%eX~PBRO^&OOV%ZXj%ZX$w%ZX]%ZXn%ZX!V%ZXu%ZX%`%ZX#T%ZX[%ZX!a%ZX~P?wO!|,YO]$man$mau$ma~PBRO!|,XOj$man$ma~PBRO%Y#XO%j#YO%k#XO%l#XO%m#YO%n#YO%o#YOZ!xi]!xi^!xi!W!xi!|!xi%`!xi%f!xi%g!xi%i!xi%p!xi%q!xi~Oj!xi~P!+YOn!xiu!xi~P#,hO%Y#XO%`#ZO%fiO%giO%i#ZO%j#YO%k#XO%l#XO%m#YO%n#YO%o#YOZ!xi]!xi^!xi!W!xi!|!xi%p!xi%q!xi~O%Y#XO%`#ZO%fiO%giO%i#ZO%j#YO%k#XO%l#XO%m#YO%n#YO%o#YOV!xiZ!xi^!xij!xin!xi!Q!xi!W!xi#R!xi#T!xi#U!xi$w!xi%p!xi%q!xi~O!|!xi~P#/_On!xiu!xi~P#.TO%Y#XO%`#ZO%fiO%giO%i#ZO%j#YO%k#XO%l#XO%m#YO%n#YO%o#YOZ!xi]!xi^!xi!W!xi%p!xi%q!xi~O!|,WO~P#1^O!|,XO~P#/_O!|,YOn!xiu!xi~P#1^O%Y#XO%`#ZO%fiO%giO%i#ZO%j#YO%k#XO%l#XO%m#YO%n#YO%o#YO%p#[OZ!xi]!xi^!xi!W!xi%q!xi~O!|,WO~P#3QO!|,XOj!xi~P!/VO!|,YOn!xiu!xi~P#3QO!|,XOj#Pi~PBROV!TXZeX^mX!W!TX$w!TX~O%`!TX~P#5RO[!TXhmXnmXrmXwmX!PmX!QmX!WmX!]mX%OmX%YmX~P#5ROn#TO!Q,aO!|,XO#R#dOj`X#T%eX#U%eX~PBRO[oO^YOaoOdoOh!POr!pOw}O!P#hO!WaO!]!QO!phO!qhO%UTO%VUO%YVO%fiO%giO%hjO%ikO%jlO~O!Q-OO%O+yO~P#6{O!Q-PO%O+xO~P#6{O!Q-QO%O+{O~P#6{O#T,bO#U,bO~O#W,cO~O^!hOh!POr-TOw}O!P-_O!Q-WO!W-^O!]-eO%O!eO%Y!fO~O^!hOh!POr-TOw}O!Q-`O!W-^O!]-eO%O!eO%Y!fO~O!P-VO~P#9zO%O+wO~P!4vO!P-XO~O!V-YO!|#`O~PBRO!V-ZO~O!V-[O~O!W-dO~OP%ka%Oa~", + goto: "!FW%sPP%tP%wP%zP'SP'XPPPP'`'cP'u'uP)w'u-_PPP0j0m0qP1V4b1VP7s8WP1VP8a8d8hP8p8w1VPP1V8{<`?vPPCY-_-_-_PCdCuCxPC{DQ'u'uDV'uES'u'u'u'uGUIW'uPPJR'uJUMjMjMj'u! r! r!#SP!$`!%d!&d'cP'cPP'cP!&yP!'V!'^!&yP!'a!'h!'n!'w!&yP!'z!(R!&y!(U!(fPP!&yP!(x!)UPP!&y!)Y!)c!&yP!)g!)gP!&yP!&yP!)j!)m!&v!&yP!&yPPP!&yP!&yP!)q!)q!)w!)}!*U!*[!*d!*j!*p!*w!*}!+T!+Z!.q!.x!/O!/X!/m!/s!/z!0Q!0W!0^!0d!0jPPPPPPPPP!0p!1f!1k!1{!2kPP!7P!:^P!>u!?Z!?_!@Z!@fP!@p!D_!Df!Di!DuPPPPPPPPPPPP!FSR!aPRyO!WXOScw!R!T!U!W#O#k#n#u$R$X&O&j&u&|'W'Y']'})W)|*k*w+gQ#pzU#r{#s%uQ#x|U$T!S$U&pQ$^!VQ$y!lR)U'RVROS#nQ#t{T%t#s%uR#t{qrOScw!U!V!W#O#k#n&|'W'Y)W*k+g%PoOSYacmnw!U!V!W!X!Z!_!q#O#Q#S#T#V#^#_#`#a#b#c#i#j#k#n$f%c&g&l&s&x&y&|'P'R'T'U'W'X'Y']'a'b'o'r'w(k(t)V)W)i)s*`*h*k*l*n*o*r+g+|+},Q,R,S,T,U,V,W,X,Y,Z,[,],^,_,`,a,b,c,{,|,}-O-P-Q-^%O]OSYacmnw!U!V!W!X!Z!_!q#O#Q#S#T#V#^#_#`#a#b#c#i#j#k#n$f%c&g&l&s&x&y&|'P'R'T'U'W'X'Y']'a'b'o'r'w(k(t)V)W)i)s*`*h*k*l*n*o*r+g+|+},Q,R,S,T,U,V,W,X,Y,Z,[,],^,_,`,a,b,c,{,|,}-O-P-Q-^#u!iW^!O!h!t!z#e#h#u#v#y#|#}$P$Q$T$W$v$x%W%Y%a%x%y&O&S&W&]&`&b&d&m'e'|'}(S([(c(i(o(|)l)|*P*Q*S*p*w*|+R+^+j+l,h-U-V-W-X-Y-Z-[-]-_-d'cbOSWYacmnw!O!U!V!W!X!Z!_!h!q!t!z#O#Q#S#T#V#^#_#`#a#b#c#e#h#i#j#k#n#u#v#y#|$P$Q$T$W$f$v$x%W%Y%a%c%x%y&O&W&]&`&g&l&m&s&x&y&|'P'R'T'U'W'X'Y']'a'b'e'o'r'w'|'}(S([(c(i(k(o(t(|)V)W)i)l)s)|*Q*`*h*k*l*n*o*p*r*w+R+g+j+l+|+},Q,R,S,T,U,V,W,X,Y,Z,[,],^,_,`,a,b,c,h,{,|,}-O-P-Q-U-V-W-X-Y-Z-[-]-^-_-dR$O!PT&c#}&dW%`#R&z*d+cQ&Q#vS&V#y&]S&`#}&dR*Y(b'cZOSWYacmnw!O!U!V!W!X!Z!_!h!q!t!z#O#Q#S#T#V#^#_#`#a#b#c#e#h#i#j#k#n#u#v#y#|$P$Q$T$W$f$v$x%W%Y%a%c%x%y&O&W&]&`&g&l&m&s&x&y&|'P'R'T'U'W'X'Y']'a'b'e'o'r'w'|'}(S([(c(i(k(o(t(|)V)W)i)l)s)|*Q*`*h*k*l*n*o*p*r*w+R+g+j+l+|+},Q,R,S,T,U,V,W,X,Y,Z,[,],^,_,`,a,b,c,h,{,|,}-O-P-Q-U-V-W-X-Y-Z-[-]-^-_-d%fWOSWYacmnw!O!U!V!W!X!Z!_!q!z#O#Q#S#T#V#^#_#`#a#b#c#h#i#j#k#n#v#|$f$v$x%W%Y%c&g&l&s&x&y&|'P'R'T'U'W'X'Y']'a'b'o'r'w(i(k(t)V)W)i)s*`*h*k*l*n*o*r+g+|+},Q,R,S,T,U,V,W,X,Y,Z,[,],^,_,`,a,b,c,{,|,}-O-P-Q-^S&b#}&d!{-]!h!t#e#u#y$P$Q$T$W%a%x%y&O&W&]&`&m'e'|'}(S([(c(o(|)l)|*Q*p*w+R+j+l,h-U-V-W-X-Y-Z-[-]-_-dQ#v|S$v!j!pU&P#v$v,hZ,h#x&Q&U&V-TS%{#u&OV){'})|*wR#z}T&[#y&]]&X#y&](S([(o*QZ&Z#y&](S(o*QT([&Y(]'s_OSWYacmnw!O!U!V!W!X!Z!_!h!q!t!z#O#Q#S#T#V#^#_#`#a#b#c#e#h#i#j#k#n#u#v#y#|#}$P$Q$T$W$f$v$x%W%Y%a%c%x%y&O&S&W&]&`&b&d&g&l&m&s&x&y&|'P'R'T'U'W'X'Y']'a'b'e'o'r'w'|'}(S([(c(i(k(o(t(|)V)W)i)l)s)|*P*Q*S*`*h*k*l*n*o*p*r*w*|+R+^+g+j+l+|+},Q,R,S,T,U,V,W,X,Y,Z,[,],^,_,`,a,b,c,h,{,|,}-O-P-Q-U-V-W-X-Y-Z-[-]-^-_-d'r_OSWYacmnw!O!U!V!W!X!Z!_!h!q!t!z#O#Q#S#T#V#^#_#`#a#b#c#e#h#i#j#k#n#u#v#y#|#}$P$Q$T$W$f$v$x%W%Y%a%c%x%y&O&S&W&]&`&b&d&g&l&m&s&x&y&|'P'R'T'U'W'X'Y']'a'b'e'o'r'w'|'}(S([(c(i(k(o(t(|)V)W)i)l)s)|*P*Q*S*`*h*k*l*n*o*p*r*w*|+R+^+g+j+l+|+},Q,R,S,T,U,V,W,X,Y,Z,[,],^,_,`,a,b,c,h,{,|,}-O-P-Q-U-V-W-X-Y-Z-[-]-^-_-dR!w^'bbOSWYacmnw!O!U!V!W!X!Z!_!h!q!t!z#O#Q#S#T#V#^#_#`#a#b#c#e#h#i#j#k#n#u#v#y#|$P$Q$T$W$f$v$x%W%Y%a%c%x%y&O&W&]&`&g&l&m&s&x&y&|'P'R'T'U'W'X'Y']'a'b'e'o'r'w'|'}(S([(c(i(k(o(t(|)V)W)i)l)s)|*Q*`*h*k*l*n*o*p*r*w+R+g+j+l+|+},Q,R,S,T,U,V,W,X,Y,Z,[,],^,_,`,a,b,c,h,{,|,}-O-P-Q-U-V-W-X-Y-Z-[-]-^-_-dS&a#}&dR(d&bS!u]fX!x`&_(e(oQ!r[Q%O!qQ)d'aU)f'b)i*oR+X*nR%R!qR%P!qV)h'b)i*oV)g'b)i*odtOScw#O#k#n&|'Y+gQ$h!WQ&R#wQ&w$[S'S$c$iQ(V&TQ*O(RQ*V(WQ*b(yQ*c(zR+_+Q%PfOSYacmnw!U!V!W!X!Z!_!q#O#Q#S#T#V#^#_#`#a#b#c#i#j#k#n$f%c&g&l&s&x&y&|'P'R'T'U'W'X'Y']'a'b'o'r'w(k(t)V)W)i)s*`*h*k*l*n*o*r+g+|+},Q,R,S,T,U,V,W,X,Y,Z,[,],^,_,`,a,b,c,{,|,}-O-P-Q-^%PgOSYacmnw!U!V!W!X!Z!_!q#O#Q#S#T#V#^#_#`#a#b#c#i#j#k#n$f%c&g&l&s&x&y&|'P'R'T'U'W'X'Y']'a'b'o'r'w(k(t)V)W)i)s*`*h*k*l*n*o*r+g+|+},Q,R,S,T,U,V,W,X,Y,Z,[,],^,_,`,a,b,c,{,|,}-O-P-Q-^!q#Weg!o!y$[$_$c$j$m$q$}%^%b%d%m'V'p(z({)S)Y)^)c)e)q)t*i*s+T+V+W+Y,f,g,i,j,w,z-aR#fh#^mOSacmnw!X!Z!_!q#O#S#T#^#_#`#a#b#c#i#j#k#n$f%c&g&l&s&y&|'P'T'U'X'Y']'a'b'o'r(k(t)i)s*`*h*l*n*o*r+g-^!W#_e!y$j$m$q$}%b%d%j%k%l%m'V'p({)Y)^)c)e)q)t*s+T+V+W+Y-aW,T!o,n,q,tj,U$[$_$c(z)S*i,g,j,o,r,u,w,z[,V%^,f,i,p,s,v`,{Y,Q,T,W,Z,^,{-Ox,|!U!V!W&x'R'W)V)W*k+},R,U,X,[,_,a,b,c,|-Pg,}#Q#V'w+|,S,V,Y,],`,}-Q#^mOSacmnw!X!Z!_!q#O#S#T#^#_#`#a#b#c#i#j#k#n$f%c&g&l&s&y&|'P'T'U'X'Y']'a'b'o'r(k(t)i)s*`*h*l*n*o*r+g-^`,{Y,Q,T,W,Z,^,{-Ox,|!U!V!W&x'R'W)V)W*k+},R,U,X,[,_,a,b,c,|-Pg,}#Q#V'w+|,S,V,Y,],`,}-Q!Y#^e!y$j$m$q$}%b%d%i%j%k%l%m'V'p({)Y)^)c)e)q)t*s+T+V+W+Y-aY,Q!o,k,n,q,tl,R$[$_$c(z)S*i,g,j,l,o,r,u,w,z_,S%^,f,i,m,p,s,v!W#_e!y$j$m$q$}%b%d%j%k%l%m'V'p({)Y)^)c)e)q)t*s+T+V+W+Y-aW,T!o,n,q,tj,U$[$_$c(z)S*i,g,j,o,r,u,w,z],V%^,f,i,p,s,v!S#ae!y$j$m$q$}%b%d%l%m'V'p({)Y)^)c)e)q)t*s+T+V+W+Y-aS,Z!o,tf,[$[$_$c(z)S*i,g,j,u,w,zX,]%^,f,i,v!Q#be!y$j$m$q$}%b%d%m'V'p({)Y)^)c)e)q)t*s+T+V+W+Y-aQ,^!od,_$[$_$c(z)S*i,g,j,w,zV,`%^,f,iprOScw!U!V!W#O#k#n&|'W'Y)W*k+gR)a']etOScw#O#k#n&|'Y+gQ$S!RT&i$R&jR$S!RQ$V!ST&o$U&pQ&U#xR&m$TS(T&S&lV*{*S*|+^R$V!SQ$Y!TT&t$X&uR$Y!TdsOScw#O#k#n&|'Y+gT$p![!]dtOScw#O#k#n&|'Y+gQ*b(yR+_+QQ$a!VQ&{$_Q)T'RR*g)ST&|$`&}Q+b+SQ+m+fR+v+uT+g+a+hR$i!WR$l!YT'Y$k'ZXuOSw#nQ$s!`R'_$sSSO#nR!dSQ%u#sR'y%uUwOS#nR#mwQ&d#}R(g&dQ(c&`R*Z(cS!mX$^R$z!mQ(O%{R)}(OQ&]#yR(_&]Q(]&YR*X(]'r^OSWYacmnw!O!U!V!W!X!Z!_!h!q!t!z#O#Q#S#T#V#^#_#`#a#b#c#e#h#i#j#k#n#u#v#y#|#}$P$Q$T$W$f$v$x%W%Y%a%c%x%y&O&S&W&]&`&b&d&g&l&m&s&x&y&|'P'R'T'U'W'X'Y']'a'b'e'o'r'w'|'}(S([(c(i(k(o(t(|)V)W)i)l)s)|*P*Q*S*`*h*k*l*n*o*p*r*w*|+R+^+g+j+l+|+},Q,R,S,T,U,V,W,X,Y,Z,[,],^,_,`,a,b,c,h,{,|,}-O-P-Q-U-V-W-X-Y-Z-[-]-^-_-dR!v^S'f%T+PR)m'fQ'c%RR)j'cW#Oc&|'Y+gR%[#O^#Ue$[$_$c$m)^,zU%e#U,O,PQ,O,fR,P,gQ&j$RR(m&jS*Q(S(oR*y*QQ*T(TR*}*TQ&p$UR(r&pQ&u$XR(w&uQ&}$`R)O&}Q+h+aR+o+hQ'Z$kR)['ZQ!cRQ#luQ#nyQ%Z!|Q&x$]Q'R$bQ'x%tQ(^&[Q(f&cQ(l&iQ(q&oR(v&tVxOS#nWuOSw#nY!|c#O&|'Y+gR%r#kdtOScw#O#k#n&|'Y+gQ$]!UQ$b!VQ$g!WQ)X'WQ*j)WR+U*kdeOScw#O#k#n&|'Y+gQ!oYQ!ya`#gmn,{,|,}-O-P-QQ$[!UQ$_!VQ$c!WQ$j!Xd$m!Z#i#j&g&s'P'T'U(k(tQ$q!_Q$}!qQ%^#QQ%b#SQ%d#TW%h#^,Q,R,SQ%i#_Q%j#`Q%k#aQ%l#bQ%m#cQ'V$fQ'p%cQ(z&xQ({&yQ)S'RQ)Y'XQ)^']Q)c'aU)e'b)i*oQ)q'oQ)t'rQ*i)VQ*s)sQ+T*hQ+V*lQ+W*nQ+Y*rS,f#V'wS,g,b,cQ,i+|Q,j+}Q,k,TQ,l,UQ,m,VQ,n,WQ,o,XQ,p,YQ,q,ZQ,r,[Q,s,]Q,t,^Q,u,_Q,v,`Q,w,aU,z'W)W*kV-a&l*`-^#bZW!O!h!t!z#e#h#u#v#y#|$P$Q$T$W$v$x%W%Y%a%x%y&O&W&]&`&m'e'|'}(S([(c(i(o(|)l)|*Q*p*w+R+j+l,h-U-V-W-X-Y-Z-[-]-_-d%P[OSYacmnw!U!V!W!X!Z!_!q#O#Q#S#T#V#^#_#`#a#b#c#i#j#k#n$f%c&g&l&s&x&y&|'P'R'T'U'W'X'Y']'a'b'o'r'w(k(t)V)W)i)s*`*h*k*l*n*o*r+g+|+},Q,R,S,T,U,V,W,X,Y,Z,[,],^,_,`,a,b,c,{,|,}-O-P-Q-^$zdOSacmnw!U!V!W!X!Z!_!q#O#Q#S#T#V#^#_#`#a#b#c#i#j#k#n$f%c&g&l&s&x&y&|'P'R'T'U'W'X'Y']'a'b'o'r'w(k(t)V)W)i)s*h*k*l*n*o*r+g+|+},Q,R,S,T,U,V,W,X,Y,Z,[,],^,_,`,a,b,c,{,|,}-O-P-Q-^S!gW-]Q!nYS#{!O-_Q$u!hS%T!t+jS%X!z-UQ%n#e[%o#h#|$x-V-W-XW%w#u'})|*wU&P#v$v,h[&X#y&](S([(o*QQ&f$PQ&h$QQ&n$TQ&r$WS'h%W-YS'i%Y-ZW'l%a(|+R+lS'{%x%yQ(Q&OQ(Y&WQ(d&`Q(p&mU)k'e)l*pQ)z'|Q*[(cS*^(i-[Q+P*`R-c-dS#w|!pS$w!j-TQ&T#xQ(R&QQ(W&UR(X&VT%|#u&OhqOScw!U!V#O#k#n&|'Y+gU$Q!R$R&jU$W!T$X&uQ$e!WY%y#u&O'})|*wQ)`']V-S'W)W*kS&[#y&]S*R(S(oR*z*QY&Y#y&](S(o*QR*W(['``OSWYacmnw!O!U!V!W!X!Z!_!h!q!t!z#O#Q#S#T#V#^#_#`#a#b#c#e#h#i#j#k#n#u#v#y#|$P$Q$T$W$f$v$x%W%Y%a%c%x%y&O&W&]&`&g&m&s&x&y&|'P'R'T'U'W'X'Y']'a'b'e'o'r'w'|'}(S([(c(i(k(o(t(|)V)W)i)l)s)|*Q*`*h*k*l*n*o*p*r*w+R+g+j+l+|+},Q,R,S,T,U,V,W,X,Y,Z,[,],^,_,`,a,b,c,h,{,|,}-O-P-Q-U-V-W-X-Y-Z-[-]-^-_-dS&_#}&dW(S&S*S*|+^Q(e&bQ(o&lR*x*PS%U!t*`R+q+jR%S!qQ#PcQ(}&|Q)Z'YR+n+ghpOScw!U!V#O#k#n&|'Y+gQ$d!WQ$n!ZQ%g#VU%p#i'T,bU%q#j'U,cQ(j&gQ(u&sQ)Q'PQ)_']Q)y'wQ*_(kQ*a(tV-R'W)W*kT(U&S&l", + nodeNames: "\u26A0 LineComment BlockComment SourceFile PackageClause package DefName ; ImportDecl import ImportSpec . String ) ( SpecList ExprStatement Number Bool Nil Rune VariableName TypedLiteral StructType struct } { StructBody FieldDecl FieldName , PointerType * FunctionType func Parameters Parameter ... InterfaceType interface InterfaceBody MethodElem UnderlyingType ~ TypeElem LogicOp ChannelType chan <- ParenthesizedType QualifiedType TypeName ParameterizedType ] [ TypeArgs ArrayType SliceType MapType map LiteralValue Element Key : Element Key ParenthesizedExpr FunctionLiteral Block Conversion SelectorExpr IndexExpr SliceExpr TypeAssertion CallExpr ParameterizedExpr Arguments CallExpr make new Arguments UnaryExp ArithOp LogicOp BitOp DerefOp BinaryExp ArithOp BitOp BitOp CompareOp LogicOp LogicOp SendStatement IncDecStatement IncDecOp Assignment = UpdateOp VarDecl := ConstDecl const ConstSpec SpecList TypeDecl type TypeSpec TypeParams TypeParam SpecList VarDecl var VarSpec SpecList LabeledStatement LabelName IfStatement if else SwitchStatement switch SwitchBlock Case case default TypeSwitchStatement SwitchBlock Case ForStatement for ForClause RangeClause range GoStatement go SelectStatement select SelectBlock Case ReceiveStatement ReturnStatement return GotoStatement break continue goto FallthroughStatement fallthrough DeferStatement defer FunctionDecl MethodDecl", + maxTerm: 218, + context: trackTokens, + nodeProps: [ + ["isolate", -3, 2, 12, 20, ""], + ["group", -18, 12, 17, 18, 19, 20, 21, 22, 66, 67, 69, 70, 71, 72, 73, 74, 77, 81, 86, "Expr", -20, 16, 68, 93, 94, 96, 99, 101, 105, 111, 115, 117, 120, 126, 129, 134, 136, 141, 143, 147, 149, "Statement", -12, 23, 31, 33, 38, 46, 49, 50, 51, 52, 56, 57, 58, "Type"], + ["openedBy", 13, "(", 25, "{", 53, "["], + ["closedBy", 14, ")", 26, "}", 54, "]"] + ], + propSources: [goHighlighting], + skippedNodes: [0, 1, 2, 153], + repeatNodeCount: 23, + tokenData: ":b~RvXY#iYZ#i]^#ipq#iqr#zrs$Xuv&Pvw&^wx&yxy(qyz(vz{({{|)T|})e}!O)j!O!P)u!P!Q+}!Q!R,y!R![-t![!]2^!]!^2k!^!_2p!_!`3]!`!a3e!c!}3x!}#O4j#P#Q4o#Q#R4t#R#S4|#S#T9X#T#o3x#o#p9q#p#q9v#q#r:W#r#s:]$g;'S3x;'S;=`4d<%lO3x~#nS$y~XY#iYZ#i]^#ipq#iU$PP%hQ!_!`$SS$XO!|S~$^W[~OY$XZr$Xrs$vs#O$X#O#P${#P;'S$X;'S;=`%y<%lO$X~${O[~~%ORO;'S$X;'S;=`%X;=`O$X~%^X[~OY$XZr$Xrs$vs#O$X#O#P${#P;'S$X;'S;=`%y;=`<%l$X<%lO$X~%|P;=`<%l$X~&UP%l~!_!`&X~&^O#U~~&cR%j~vw&l!_!`&X#Q#R&q~&qO%p~~&vP%o~!_!`&X~'OWd~OY&yZw&ywx'hx#O&y#O#P'm#P;'S&y;'S;=`(k<%lO&y~'mOd~~'pRO;'S&y;'S;=`'y;=`O&y~(OXd~OY&yZw&ywx'hx#O&y#O#P'm#P;'S&y;'S;=`(k;=`<%l&y<%lO&y~(nP;=`<%l&y~(vO^~~({O]~~)QP%Y~!_!`&X~)YQ%f~{|)`!_!`&X~)eO#R~~)jOn~~)oQ%g~}!O)`!_!`&X~)zRZS!O!P*T!Q![*`#R#S+w~*WP!O!P*Z~*`Ou~Q*eTaQ!Q![*`!g!h*t#R#S+w#X#Y*t#]#^+rQ*wS{|+T}!O+T!Q![+^#R#S+lQ+WQ!Q![+^#R#S+lQ+cRaQ!Q![+^#R#S+l#]#^+rQ+oP!Q![+^Q+wOaQQ+zP!Q![*`~,SR%k~z{,]!P!Q,b!_!`&X~,bO$z~~,gSP~OY,bZ;'S,b;'S;=`,s<%lO,b~,vP;=`<%l,bQ-O[aQ!O!P*`!Q![-t!d!e.c!g!h*t!q!r/Z!z!{/x#R#S.]#U#V.c#X#Y*t#]#^+r#c#d/Z#l#m/xQ-yUaQ!O!P*`!Q![-t!g!h*t#R#S.]#X#Y*t#]#^+rQ.`P!Q![-tQ.fR!Q!R.o!R!S.o#R#S/QQ.tSaQ!Q!R.o!R!S.o#R#S/Q#]#^+rQ/TQ!Q!R.o!R!S.oQ/^Q!Q!Y/d#R#S/rQ/iRaQ!Q!Y/d#R#S/r#]#^+rQ/uP!Q!Y/dQ/{T!O!P0[!Q![1c!c!i1c#R#S2Q#T#Z1cQ0_S!Q![0k!c!i0k#R#S1V#T#Z0kQ0pVaQ!Q![0k!c!i0k!r!s*t#R#S1V#T#Z0k#]#^+r#d#e*tQ1YR!Q![0k!c!i0k#T#Z0kQ1hWaQ!O!P0k!Q![1c!c!i1c!r!s*t#R#S2Q#T#Z1c#]#^+r#d#e*tQ2TR!Q![1c!c!i1c#T#Z1c~2cP!a~!_!`2f~2kO#W~~2pOV~~2uR!|S}!O3O!^!_3T!_!`$S~3TO!Q~~3YP%m~!_!`&X~3bP#T~!_!`$S~3jQ!|S!_!`$S!`!a3p~3uP%n~!_!`&X~3}V%O~!Q![3x!c!}3x#R#S3x#T#o3x$g;'S3x;'S;=`4d<%lO3x~4gP;=`<%l3x~4oO!W~~4tO!V~~4yP%i~!_!`&X~5RV%O~!Q![5h!c!}3x#R#S3x#T#o3x$g;'S3x;'S;=`4d<%lO3x~5o^aQ%O~!O!P*`!Q![5h!c!g3x!g!h6k!h!}3x#R#S4|#T#X3x#X#Y6k#Y#]3x#]#^8k#^#o3x$g;'S3x;'S;=`4d<%lO3x~6pX%O~{|+T}!O+T!Q![7]!c!}3x#R#S8P#T#o3x$g;'S3x;'S;=`4d<%lO3x~7dXaQ%O~!Q![7]!c!}3x#R#S8P#T#]3x#]#^8k#^#o3x$g;'S3x;'S;=`4d<%lO3x~8UV%O~!Q![7]!c!}3x#R#S3x#T#o3x$g;'S3x;'S;=`4d<%lO3x~8rVaQ%O~!Q![3x!c!}3x#R#S3x#T#o3x$g;'S3x;'S;=`4d<%lO3x~9[TO#S9X#S#T$v#T;'S9X;'S;=`9k<%lO9X~9nP;=`<%l9X~9vOj~~9{Q%`~!_!`&X#p#q:R~:WO%q~~:]Oi~~:bO{~", + tokenizers: [semicolon2, 1, 2, new LocalTokenGroup("j~RQYZXz{^~^O$|~~aP!P!Qd~iO$}~~", 25, 181)], + topRules: { "SourceFile": [0, 3] }, + dynamicPrecedences: { "19": 1, "51": -1, "55": 2, "69": -1, "108": -1 }, + specialized: [{ term: 184, get: (value) => spec_identifier4[value] || -1 }], + tokenPrec: 5451 + }); + + // node_modules/@codemirror/lang-go/dist/index.js + var snippets3 = [ + /* @__PURE__ */ snippetCompletion("func ${name}(${params}) ${type} {\n ${}\n}", { + label: "func", + detail: "declaration", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("func (${receiver}) ${name}(${params}) ${type} {\n ${}\n}", { + label: "func", + detail: "method declaration", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("var ${name} = ${value}", { + label: "var", + detail: "declaration", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("type ${name} ${type}", { + label: "type", + detail: "declaration", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("const ${name} = ${value}", { + label: "const", + detail: "declaration", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("type ${name} = ${type}", { + label: "type", + detail: "alias declaration", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("for ${init}; ${test}; ${update} {\n ${}\n}", { + label: "for", + detail: "loop", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("for ${i} := range ${value} {\n ${}\n}", { + label: "for", + detail: "range", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("select {\n ${}\n}", { + label: "select", + detail: "statement", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("case ${}:\n${}", { + label: "case", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("switch ${} {\n ${}\n}", { + label: "switch", + detail: "statement", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("switch ${}.(${type}) {\n ${}\n}", { + label: "switch", + detail: "type statement", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("if ${} {\n ${}\n}", { + label: "if", + detail: "block", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion("if ${} {\n ${}\n} else {\n ${}\n}", { + label: "if", + detail: "/ else block", + type: "keyword" + }), + /* @__PURE__ */ snippetCompletion('import ${name} "${module}"\n${}', { + label: "import", + detail: "declaration", + type: "keyword" + }) + ]; + var cache3 = /* @__PURE__ */ new NodeWeakMap(); + var ScopeNodes3 = /* @__PURE__ */ new Set([ + "SourceFile", + "Block", + "FunctionDecl", + "MethodDecl", + "FunctionLiteral", + "ForStatement", + "SwitchStatement", + "TypeSwitchStatement", + "IfStatement" + ]); + function defIDs(type, spec) { + return (node, def) => { + outer: for (let cur2 = node.node.firstChild, depth = 0, parent = null; ; ) { + while (!cur2) { + if (!depth) + break outer; + depth--; + cur2 = parent.nextSibling; + parent = parent.parent; + } + if (spec && cur2.name == spec || cur2.name == "SpecList") { + depth++; + parent = cur2; + cur2 = cur2.firstChild; + } else { + if (cur2.name == "DefName") + def(cur2, type); + cur2 = cur2.nextSibling; + } + } + return true; + }; + } + var gatherCompletions3 = { + FunctionDecl: /* @__PURE__ */ defIDs("function"), + VarDecl: /* @__PURE__ */ defIDs("var", "VarSpec"), + ConstDecl: /* @__PURE__ */ defIDs("constant", "ConstSpec"), + TypeDecl: /* @__PURE__ */ defIDs("type", "TypeSpec"), + ImportDecl: /* @__PURE__ */ defIDs("constant", "ImportSpec"), + Parameter: /* @__PURE__ */ defIDs("var"), + __proto__: null + }; + function getScope3(doc2, node) { + let cached = cache3.get(node); + if (cached) + return cached; + let completions = [], top2 = true; + function def(node2, type) { + let name2 = doc2.sliceString(node2.from, node2.to); + completions.push({ label: name2, type }); + } + node.cursor(IterMode.IncludeAnonymous).iterate((node2) => { + if (top2) { + top2 = false; + } else if (node2.name) { + let gather = gatherCompletions3[node2.name]; + if (gather && gather(node2, def) || ScopeNodes3.has(node2.name)) + return false; + } else if (node2.to - node2.from > 8192) { + for (let c of getScope3(doc2, node2.node)) + completions.push(c); + return false; + } + }); + cache3.set(node, completions); + return completions; + } + var Identifier4 = /^[\w$\xa1-\uffff][\w$\d\xa1-\uffff]*$/; + var dontComplete3 = [ + "String", + "LineComment", + "BlockComment", + "DefName", + "LabelName", + "FieldName", + ".", + "?." + ]; + var localCompletionSource3 = (context) => { + let inner = syntaxTree(context.state).resolveInner(context.pos, -1); + if (dontComplete3.indexOf(inner.name) > -1) + return null; + let isWord = inner.name == "VariableName" || inner.to - inner.from < 20 && Identifier4.test(context.state.sliceDoc(inner.from, inner.to)); + if (!isWord && !context.explicit) + return null; + let options = []; + for (let pos = inner; pos; pos = pos.parent) { + if (ScopeNodes3.has(pos.name)) + options = options.concat(getScope3(context.state.doc, pos)); + } + return { + options, + from: isWord ? inner.from : context.pos, + validFor: Identifier4 + }; + }; + var goLanguage = /* @__PURE__ */ LRLanguage.define({ + name: "go", + parser: /* @__PURE__ */ parser10.configure({ + props: [ + /* @__PURE__ */ indentNodeProp.add({ + IfStatement: /* @__PURE__ */ continuedIndent({ except: /^\s*({|else\b)/ }), + LabeledStatement: flatIndent, + "SwitchBlock SelectBlock": (context) => { + let after = context.textAfter, closed = /^\s*\}/.test(after), isCase = /^\s*(case|default)\b/.test(after); + return context.baseIndent + (closed || isCase ? 0 : context.unit); + }, + Block: /* @__PURE__ */ delimitedIndent({ closing: "}" }), + BlockComment: () => null, + Statement: /* @__PURE__ */ continuedIndent({ except: /^{/ }) + }), + /* @__PURE__ */ foldNodeProp.add({ + "Block SwitchBlock SelectBlock LiteralValue InterfaceType StructType SpecList": foldInside, + BlockComment(tree) { + return { from: tree.from + 2, to: tree.to - 2 }; + } + }) + ] + }), + languageData: { + closeBrackets: { brackets: ["(", "[", "{", "'", '"', "`"] }, + commentTokens: { line: "//", block: { open: "/*", close: "*/" } }, + indentOnInput: /^\s*(?:case\b|default\b|\})$/ + } + }); + var kwCompletion2 = (name2) => ({ label: name2, type: "keyword" }); + var keywords3 = /* @__PURE__ */ "interface struct chan map package go return break continue goto fallthrough else defer range true false nil".split(" ").map(kwCompletion2); + function go() { + let completions = snippets3.concat(keywords3); + return new LanguageSupport(goLanguage, [ + goLanguage.data.of({ + autocomplete: ifNotIn(dontComplete3, completeFromList(completions)) + }), + goLanguage.data.of({ + autocomplete: localCompletionSource3 + }) + ]); + } + + // node_modules/@lezer/rust/dist/index.js + var closureParamDelim = 1; + var tpOpen = 2; + var tpClose = 3; + var RawString = 4; + var Float = 5; + var _b = 98; + var _e = 101; + var _f = 102; + var _r = 114; + var _E = 69; + var Zero = 48; + var Dot2 = 46; + var Plus = 43; + var Minus = 45; + var Hash = 35; + var Quote = 34; + var Pipe = 124; + var LessThan = 60; + var GreaterThan = 62; + function isNum(ch) { + return ch >= 48 && ch <= 57; + } + function isNum_(ch) { + return isNum(ch) || ch == 95; + } + var literalTokens = new ExternalTokenizer((input, stack) => { + if (isNum(input.next)) { + let isFloat = false; + do { + input.advance(); + } while (isNum_(input.next)); + if (input.next == Dot2) { + isFloat = true; + input.advance(); + if (isNum(input.next)) { + do { + input.advance(); + } while (isNum_(input.next)); + } else if (input.next == Dot2 || input.next > 127 || /\w/.test(String.fromCharCode(input.next))) { + return; + } + } + if (input.next == _e || input.next == _E) { + isFloat = true; + input.advance(); + if (input.next == Plus || input.next == Minus) input.advance(); + if (!isNum_(input.next)) return; + do { + input.advance(); + } while (isNum_(input.next)); + } + if (input.next == _f) { + let after = input.peek(1); + if (after == Zero + 3 && input.peek(2) == Zero + 2 || after == Zero + 6 && input.peek(2) == Zero + 4) { + input.advance(3); + isFloat = true; + } else { + return; + } + } + if (isFloat) input.acceptToken(Float); + } else if (input.next == _b || input.next == _r) { + if (input.next == _b) input.advance(); + if (input.next != _r) return; + input.advance(); + let count2 = 0; + while (input.next == Hash) { + count2++; + input.advance(); + } + if (input.next != Quote) return; + input.advance(); + content: for (; ; ) { + if (input.next < 0) return; + let isQuote = input.next == Quote; + input.advance(); + if (isQuote) { + for (let i = 0; i < count2; i++) { + if (input.next != Hash) continue content; + input.advance(); + } + input.acceptToken(RawString); + return; + } + } + } + }); + var closureParam = new ExternalTokenizer((input) => { + if (input.next == Pipe) input.acceptToken(closureParamDelim, 1); + }); + var tpDelim = new ExternalTokenizer((input) => { + if (input.next == LessThan) input.acceptToken(tpOpen, 1); + else if (input.next == GreaterThan) input.acceptToken(tpClose, 1); + }); + var rustHighlighting = styleTags({ + "const macro_rules struct union enum type fn impl trait let static": tags.definitionKeyword, + "mod use crate": tags.moduleKeyword, + "pub unsafe async mut extern default move": tags.modifier, + "for if else loop while match continue break return await": tags.controlKeyword, + "as in ref": tags.operatorKeyword, + "where _ crate super dyn": tags.keyword, + "self": tags.self, + String: tags.string, + Char: tags.character, + RawString: tags.special(tags.string), + Boolean: tags.bool, + Identifier: tags.variableName, + "CallExpression/Identifier": tags.function(tags.variableName), + BoundIdentifier: tags.definition(tags.variableName), + "FunctionItem/BoundIdentifier": tags.function(tags.definition(tags.variableName)), + LoopLabel: tags.labelName, + FieldIdentifier: tags.propertyName, + "CallExpression/FieldExpression/FieldIdentifier": tags.function(tags.propertyName), + Lifetime: tags.special(tags.variableName), + ScopeIdentifier: tags.namespace, + TypeIdentifier: tags.typeName, + "MacroInvocation/Identifier MacroInvocation/ScopedIdentifier/Identifier": tags.macroName, + "MacroInvocation/TypeIdentifier MacroInvocation/ScopedIdentifier/TypeIdentifier": tags.macroName, + '"!"': tags.macroName, + UpdateOp: tags.updateOperator, + LineComment: tags.lineComment, + BlockComment: tags.blockComment, + Integer: tags.integer, + Float: tags.float, + ArithOp: tags.arithmeticOperator, + LogicOp: tags.logicOperator, + BitOp: tags.bitwiseOperator, + CompareOp: tags.compareOperator, + "=": tags.definitionOperator, + ".. ... => ->": tags.punctuation, + "( )": tags.paren, + "[ ]": tags.squareBracket, + "{ }": tags.brace, + ". DerefOp": tags.derefOperator, + "&": tags.operator, + ", ; ::": tags.separator, + "Attribute/...": tags.meta + }); + var spec_identifier5 = { __proto__: null, self: 28, super: 32, crate: 34, impl: 46, true: 72, false: 72, pub: 88, in: 92, const: 96, unsafe: 104, async: 108, move: 110, if: 114, let: 118, ref: 142, mut: 144, _: 198, else: 200, match: 204, as: 248, return: 252, await: 262, break: 270, continue: 276, while: 312, loop: 316, for: 320, macro_rules: 327, mod: 334, extern: 342, struct: 346, where: 364, union: 379, enum: 382, type: 390, default: 395, fn: 396, trait: 412, use: 420, static: 438, dyn: 476 }; + var parser11 = LRParser.deserialize({ + version: 14, + states: "$2xQ]Q_OOP$wOWOOO&sQWO'#CnO)WQWO'#I`OOQP'#I`'#I`OOQQ'#Ie'#IeO)hO`O'#C}OOQR'#Ih'#IhO)sQWO'#IuOOQO'#Hk'#HkO)xQWO'#DpOOQR'#Iw'#IwO)xQWO'#DpO*ZQWO'#DpOOQO'#Iv'#IvO,SQWO'#J`O,ZQWO'#EiOOQV'#Hp'#HpO,cQYO'#F{OOQV'#El'#ElOOQV'#Em'#EmOOQV'#En'#EnO.YQ_O'#EkO0_Q_O'#EoO2gQWOOO4QQ_O'#FPO7hQWO'#J`OOQV'#FY'#FYO7{Q_O'#F^O:WQ_O'#FaOOQO'#F`'#F`O=sQ_O'#FcO=}Q_O'#FbO@VQWO'#FgOOQO'#J`'#J`OOQV'#Io'#IoOA]Q_O'#InOEPQWO'#InOOQV'#Fw'#FwOF[QWO'#JuOFcQWO'#F|OOQO'#IO'#IOOGrQWO'#GhOOQV'#Im'#ImOOQV'#Il'#IlOOQV'#Hj'#HjQGyQ_OOOKeQ_O'#DUOKlQYO'#CqOOQP'#I_'#I_OOQV'#Hg'#HgQ]Q_OOOLuQWO'#I`ONsQYO'#DXO!!eQWO'#JuO!!lQWO'#JuO!!vQ_O'#DfO!%]Q_O'#E}O!(sQ_O'#FWO!,ZQWO'#FZO!.^QXO'#FbO!.cQ_O'#EeO!!vQ_O'#FmO!0uQWO'#FoO!0zQWO'#FoO!1PQ^O'#FqO!1WQWO'#JuO!1_QWO'#FtO!1dQWO'#FxO!2WQWO'#JjO!2_QWO'#GOO!2_QWO'#G`O!2_QWO'#GbO!2_QWO'#GsOOQO'#Ju'#JuO!2dQWO'#GhO!2lQYO'#GpO!2_QWO'#GqO!3uQ^O'#GtO!3|QWO'#GuO!4hQWO'#HOP!4sOpO'#CcPOOO)CC})CC}OOOO'#Hi'#HiO!5OO`O,59iOOQV,59i,59iO!5ZQYO,5?aOOQO-E;i-E;iOOQO,5:[,5:[OOQP,59Z,59ZO)xQWO,5:[O)xQWO,5:[O!5oQWO,5?kO!5zQYO,5;qO!6PQYO,5;TO!6hQWO,59QO!7kQXO'#CnO!7xQXO'#I`O!9SQWO'#CoO,^QWO'#EiOOQV-E;n-E;nO!9eQWO'#FsOOQV,5WQWO,5:fOOQP,5:h,5:hO!1PQ^O,5:hO!1PQ^O,5:mO$>]QYO,5gQ_O'#HsO$>tQXO,5@QOOQV1G1i1G1iOOQP,5:e,5:eO$>|QXO,5]QYO,5=vO$LRQWO'#KRO$L^QWO,5=xOOQR,5=y,5=yO$LcQWO,5=zO$>]QYO,5>PO$>]QYO,5>POOQO1G.w1G.wO$>]QYO1G.wO$LnQYO,5=pO$LvQZO,59^OOQR,59^,59^O$>]QYO,5=wO% YQZO,5=}OOQR,5=},5=}O%#lQWO1G/_O!6PQYO1G/_O#FYQYO1G2vO%#qQWO1G2vO%$PQYO1G2vOOQV1G/i1G/iO%%YQWO,5:SO%%bQ_O1G/lO%*kQWO1G1^O%+RQWO1G1hOOQO1G1h1G1hO$>]QYO1G1hO%+iQ^O'#EgOOQV1G0k1G0kOOQV1G1s1G1sO!!vQ_O1G1sO!0zQWO1G1uO!1PQ^O1G1wO!.cQ_O1G1wOOQP,5:j,5:jO$>]QYO1G/^OOQO'#Cn'#CnO%+vQWO1G1zOOQV1G2O1G2OO%,OQWO'#CnO%,WQWO1G3TO%,]QWO1G3TO%,bQYO'#GQO%,sQWO'#G]O%-UQYO'#G_O%.hQYO'#GXOOQV1G2U1G2UO%/wQWO1G2UO%/|QWO1G2UO$ARQWO1G2UOOQV1G2f1G2fO%/wQWO1G2fO#CpQWO1G2fO%0UQWO'#GdOOQV1G2h1G2hO%0gQWO1G2hO#C{QWO1G2hO%0lQYO'#GSO$>]QYO1G2lO$AdQWO1G2lOOQV1G2y1G2yO%1xQWO1G2yO%3hQ^O'#GkO%3rQWO1G2nO#DfQWO1G2nO%4QQYO,5]QYO1G2vOOQV1G2w1G2wO%5tQWO1G2wO%5yQWO1G2wO#HXQWO1G2wOOQV1G2z1G2zO.YQ_O1G2zO$>]QYO1G2zO%6RQWO1G2zOOQO,5>l,5>lOOQO-E]QYO1G3UPOOO-E;d-E;dPOOO1G.i1G.iOOQO7+*g7+*gO%7VQYO'#IcO%7nQYO'#IfO%7yQYO'#IfO%8RQYO'#IfO%8^QYO,59eOOQO7+%b7+%bOOQP7+$a7+$aO%8cQ!fO'#JTOOQS'#EX'#EXOOQS'#EY'#EYOOQS'#EZ'#EZOOQS'#JT'#JTO%;UQWO'#EWOOQS'#E`'#E`OOQS'#JR'#JROOQS'#Hn'#HnO%;ZQ!fO,5:oOOQV,5:o,5:oOOQV'#JQ'#JQO%;bQ!fO,5:{OOQV,5:{,5:{O%;iQ!fO,5:|OOQV,5:|,5:|OOQV7+'e7+'eOOQV7+&Z7+&ZO%;pQ!fO,59TOOQO,59T,59TO%>YQWO7+$WO%>_QWO1G1yOOQV1G1y1G1yO!9SQWO1G.uO%>dQWO,5?}O%>nQ_O'#HqO%@|QWO,5?}OOQO1G1X1G1XOOQO7+&}7+&}O%AUQWO,5>^OOQO-E;p-E;pO%AcQWO7+'OO.YQ_O7+'OOOQO7+'O7+'OOOQO7+'P7+'PO%AjQWO7+'POOQO7+'W7+'WOOQP1G0V1G0VO%ArQXO1G/tO!M{QWO1G/tO%BsQXO1G0RO%CkQ^O'#HlO%C{QWO,5?eOOQP1G/u1G/uO%DWQWO1G/uO%D]QWO'#D_OOQO'#Dt'#DtO%DhQWO'#DtO%DmQWO'#I{OOQO'#Iz'#IzO%DuQWO,5:_O%DzQWO'#DtO%EPQWO'#DtOOQP1G0Q1G0QOOQP1G0S1G0SOOQP1G0X1G0XO%EXQXO1G1jO%EdQXO'#FeOOQP,5>_,5>_O!1PQ^O'#FeOOQP-E;q-E;qO$>]QYO1G1jOOQO7+'S7+'SOOQO,5]QYO7+$xOOQV7+'j7+'jO%FsQWO7+(oO%FxQWO7+(oOOQV7+'p7+'pO%/wQWO7+'pO%F}QWO7+'pO%GVQWO7+'pOOQV7+(Q7+(QO%/wQWO7+(QO#CpQWO7+(QOOQV7+(S7+(SO%0gQWO7+(SO#C{QWO7+(SO$>]QYO7+(WO%GeQWO7+(WO#HUQYO7+(cO%GjQWO7+(YO#DfQWO7+(YOOQV7+(c7+(cO%5tQWO7+(cO%5yQWO7+(cO#HXQWO7+(cOOQV7+(g7+(gO$>]QYO7+(pO%GxQWO7+(pO!1dQWO7+(pOOQV7+$v7+$vO%G}QWO7+$vO%HSQZO1G3ZO%JfQWO1G4jOOQO1G4j1G4jOOQR1G.}1G.}O#.WQWO1G.}O%JkQWO'#KQOOQO'#HW'#HWO%J|QWO'#HXO%KXQWO'#KQOOQO'#KP'#KPO%KaQWO,5=qO%KfQYO'#H[O%LrQWO'#GmO%L}QYO'#CtO%MXQWO'#GmO$>]QYO1G3ZOOQR1G3g1G3gO#7aQWO1G3ZO%M^QZO1G3bO$>]QYO1G3bO& mQYO'#IVO& }QWO,5@mOOQR1G3d1G3dOOQR1G3f1G3fO.YQ_O1G3fOOQR1G3k1G3kO&!VQYO7+$cO&!_QYO'#KOOOQQ'#J}'#J}O&!gQYO1G3[O&!lQZO1G3cOOQQ7+$y7+$yO&${QWO7+$yO&%QQWO7+(bOOQV7+(b7+(bO%5tQWO7+(bO$>]QYO7+(bO#FYQYO7+(bO&%YQWO7+(bO!.cQ_O1G/nO&%hQWO7+%WO$?[QWO7+'SO&%pQWO'#EhO&%{Q^O'#EhOOQU'#Ho'#HoO&%{Q^O,5;ROOQV,5;R,5;RO&&VQWO,5;RO&&[Q^O,5;RO!0zQWO7+'_OOQV7+'a7+'aO&&iQWO7+'cO&&qQWO7+'cO&&xQWO7+$xO&'TQ!fO7+'fO&'[Q!fO7+'fOOQV7+(o7+(oO!1dQWO7+(oO&'cQYO,5]QYO'#JrOOQO'#Jq'#JqO&*YQWO,5]QYO'#GUO&,SQYO'#JkOOQQ,5]QYO7+(YO&0SQYO'#HxO&0hQYO1G2WOOQQ1G2W1G2WOOQQ,5]QYO,5]QYO7+(fO&1dQWO'#IRO&1nQWO,5@hOOQO1G3Q1G3QOOQO1G2}1G2}OOQO1G3P1G3POOQO1G3R1G3ROOQO1G3S1G3SOOQO1G3O1G3OO&1vQWO7+(pO$>]QYO,59fO&2RQ^O'#ISO&2xQYO,5?QOOQR1G/P1G/PO&3QQ!bO,5:pO&3VQ!fO,5:rOOQS-E;l-E;lOOQV1G0Z1G0ZOOQV1G0g1G0gOOQV1G0h1G0hO&3^QWO'#JTOOQO1G.o1G.oOOQV<]O&3qQWO,5>]OOQO-E;o-E;oOOQO<WOOQO-E;j-E;jOOQP7+%a7+%aO!1PQ^O,5:`O&5cQWO'#HmO&5wQWO,5?gOOQP1G/y1G/yOOQO,5:`,5:`O&6PQWO,5:`O%DzQWO,5:`O$>]QYO,5`,5>`OOQO-E;r-E;rOOQV7+'l7+'lO&6yQWO<]QYO<]QYO<]QYO<]QYO7+(uOOQO7+*U7+*UOOQR7+$i7+$iO&8cQWO,5@lOOQO'#Gm'#GmO&8kQWO'#GmO&8vQYO'#IUO&8cQWO,5@lOOQR1G3]1G3]O&:cQYO,5=vO&;rQYO,5=XO&;|QWO,5=XOOQO,5=X,5=XOOQR7+(u7+(uO&eQZO7+(|O&@tQWO,5>qOOQO-E]QYO<]QYO,5]QYO,5@^O&D^QYO'#H|O&EsQWO,5@^OOQO1G2e1G2eO%,nQWO,5]QYO,5PO&I]QYO,5@VOOQV<]QYO,5=WO&KuQWO,5@cO&K}QWO,5@cO&MvQ^O'#IPO&KuQWO,5@cOOQO1G2q1G2qO&NTQWO,5=WO&N]QWO<oO&NvQYO,5>dO' UQYO,5>dOOQQ,5>d,5>dOOQQ-E;v-E;vOOQQ7+'r7+'rO' aQYO1G2]O$>]QYO1G2^OOQV<m,5>mOOQO-EnOOQQ,5>n,5>nO'!fQYO,5>nOOQQ-EX,5>XOOQO-E;k-E;kO!1PQ^O1G/zOOQO1G/z1G/zO'%oQWO1G/zO'%tQXO1G1kO$>]QYO1G1kO'&PQWO7+'[OOQVANA`ANA`O'&ZQWOANA`O$>]QYOANA`O'&cQWOANA`OOQVAN>OAN>OO.YQ_OAN>OO'&qQWOANAuOOQVAN@vAN@vO'&vQWOAN@vOOQVANAWANAWOOQVANAYANAYOOQVANA^ANA^O'&{QWOANA^OOQVANAiANAiO%5tQWOANAiO%5yQWOANAiO''TQWOANA`OOQVANAvANAvO.YQ_OANAvO''cQWOANAvO$>]QYOANAvOOQR<pOOQO'#HY'#HYO''vQWO'#HZOOQO,5>p,5>pOOQO-E]QYO<o,5>oOOQQ-E]QYOANAhO'(bQWO1G1rO')UQ^O1G0nO.YQ_O1G0nO'*zQWO,5;UO'+RQWO1G0nP'+WQWO'#ERP&%{Q^O'#HpOOQV7+&X7+&XO'+cQWO7+&XO&&qQWOAN@iO'+hQWOAN>OO!5oQWO,5a,5>aO'+oQWOAN@lO'+tQWOAN@lOOQS-E;s-E;sOOQVAN@lAN@lO'+|QWOAN@lOOQVANAuANAuO',UQWO1G5vO',^QWO1G2dO$>]QYO1G2dO&'|QWO,5>gOOQO,5>g,5>gOOQO-E;y-E;yO',iQWO1G5xO',qQWO1G5xO&(nQYO,5>hO',|QWO,5>hO$>]QYO,5>hOOQO-E;z-E;zO'-XQWO'#JnOOQO1G2a1G2aOOQO,5>f,5>fOOQO-E;x-E;xO&'cQYO,5iOOQO,5>i,5>iOOQO-E;{-E;{OOQQ,5>c,5>cOOQQ-E;u-E;uO'.pQWO1G2sO'/QQWO1G2rO'/]QWO1G5}O'/eQ^O,5>kOOQO'#Go'#GoOOQO,5>k,5>kO'/lQWO,5>kOOQO-E;}-E;}O$>]QYO1G2rO'/zQYO7+'xO'0VQWOANAlOOQVANAlANAlO.YQ_OANAlO'0^QWOANAvOOQS7+%x7+%xO'0eQWO7+%xO'0pQ!fO7+%xO'0}QWO7+%fO!1PQ^O7+%fO'1YQXO7+'VOOQVG26zG26zO'1eQWOG26zO'1sQWOG26zO$>]QYOG26zO'1{QWOG23jOOQVG27aG27aOOQVG26bG26bOOQVG26xG26xOOQVG27TG27TO%5tQWOG27TO'2SQWOG27bOOQVG27bG27bO.YQ_OG27bO'2ZQWOG27bOOQO1G4[1G4[OOQO7+(_7+(_OOQRANA{ANA{OOQVG27SG27SO%5tQWOG27SO&0uQWOG27SO'2fQ^O7+&YO'4PQWO7+'^O'4sQ^O7+&YO.YQ_O7+&YP.YQ_O,5;SP'6PQWO,5;SP'6UQWO,5;SOOQV<]QYO1G4SO%,nQWO'#HyO'7UQWO,5@YO'7dQWO7+(VO.YQ_O7+(VOOQO1G4T1G4TOOQO1G4V1G4VO'7nQWO1G4VO'7|QWO7+(^OOQVG27WG27WO'8XQWOG27WOOQS<e,5>eOOQO-E;w-E;wO'?rQWO<wD_DpPDvHQPPPPPPK`P! P! _PPPPP!!VP!$oP!$oPP!&oP!(rP!(w!)n!*f!*f!*f!(w!+]P!(w!.Q!.TPP!.ZP!(w!(w!(w!(wP!(w!(wP!(w!(w!.y!/dP!/dJ}J}J}PPPP!/d!.y!/sPP!$oP!0^!0a!0g!1h!1t!3t!3t!5r!7t!1t!1t!9p!;_!=O!>k!@U!Am!CS!De!1t!1tP!1tP!1t!1t!Et!1tP!Ge!1t!1tP!Ie!1tP!1t!7t!7t!1t!7t!1t!Kl!Mt!Mw!7t!1t!Mz!M}!M}!M}!NR!$oP!$oP!$oP! P! PP!N]! P! PP!Ni# }! PP! PP#!^##c##k#$Z#$_#$e#$e#$mP#&s#&s#&y#'o#'{! PP! PP#(]#(l! PP! PPP#(x#)W#)d#)|#)^! P! PP! P! P! PP#*S#*S#*Y#*`#*S#*S! P! PP#*m#*v#+Q#+Q#,x#.l#.x#.x#.{#.{5a5a5a5a5a5a5a5aP5a#/O#/U#/p#1{#2R#2b#6^#6d#6j#6|#7W#8w#9R#9b#9h#9n#9x#:S#:Y#:g#:m#:s#:}#;]#;g#=u#>R#>`#>f#>n#>u#?PPPPPPPP#?V#BaP#F^#Jx#Ls#Nr$&^P$&aPPP$)_$)h$)z$/U$1d$1m$3fP!(w$4`$7r$:i$>T$>^$>c$>fPPP$>i$A`$A|P$BaPPPPPPPPPP$BvP$EU$EX$E[$Eb$Ee$Eh$Ek$En$Et$HO$HR$HU$HX$H[$H_$Hb$He$Hh$Hk$Hn$Jt$Jw$Jz#*S$KW$K^$Ka$Kd$Kh$Kl$Ko$KrQ!tPT'V!s'Wi!SOlm!P!T$T$W$y%b)U*f/gQ'i#QR,n'l(OSOY[bfgilmop!O!P!T!Y!Z![!_!`!c!p!q!|!}#Q#U#Z#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W$`$a$e$g$h$q$r$y%X%_%b&U&Y&[&b&u&z&|'P'a'l'n'o'}(W(Y(b(d(e(f(j(o(p(r(|)S)U)i*Z*f*i*k*l+Z+n+z,q,s,z-R-T-g-m-t.}/^/b/d/g0e0g0m0}1P1h1r1|3_3a3f3h3k4W4c4h4v4|5[5g5t6]6a7S7^7g7m7{8W8X8k8|9U9h9s9t9u9v9w9x9z9{9|9}:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:f:gS(z$v-oQ*p&eQ*t&hQ-k(yQ-y)ZW0Z+Q0Y4Z7UR4Y0[&w!RObfgilmop!O!P!T!Y!Z![!_!`!c!p#Q#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W$e$g$h$q$r$y%_%b&U&Y&[&b&u'l'}(W(Y(b(f(j(o(p(r(|)S)U)i*Z*f*i*k*l+Z+n,s,z-T-g-m-t.}/^/b/d/g0e0g0m0}1h1r1|3_3a3f3h3k4W4c4h4v4|5[5g5t6]6a7S7^7g7m7{8W8X8k8|9U9h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:f#r]Ofgilmp!O!P!T!Z![#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W%_%b&Y&['}(W(Y(|)i+n,s,z-m.}0}1h1|3_3a3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9hb#[b#Q$y'l(b)S)U*Z-t!h$bo!c!p$e$g$h$q$r&U&b&u(f(j(o(p(r*f*k+Z-T-g/b/d/g0e0g0m1r3f4c4h5[6a7^7m$b%k!Q!n$O$u%o%p%q%y%{&P&o&p&r'](q)s)x)y*O*P*R*V*[*^*e*n*w*x+U+V+h+o+}-i-v.U.`.p.t.x.y/Z/[/{/}0`0r0w1O1Y1Z1y2a2h2j2m2s2v3V3u3{3|4R4U4_4e4t5`5d5v6R6Y6p6v6x7c7r8g!W:y!Y!_!`*i*l/^3h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:fR:|%n$_%u!Q!n$O$u%o%p%q&P&o&p&r'](q)s)x)y*O*P*R*V*[*^*e*n*w*x+U+V+h+o+}-i-v.U.`.p.t.x.y/Z/[/{/}0`0r0w1O1Y1Z1y2a2h2j2m2s2v3V3u3{3|4R4U4_4e4t5`5d5v6R6Y6p6v6x7c7r8g$e%l!Q!n$O$u%n%o%p%q%y%{&P&o&p&r'](q)s)x)y*O*P*R*V*[*^*e*n*w*x+U+V+h+o+}-i-v.U.`.p.t.x.y/Z/[/{/}0`0r0w1O1Y1Z1y2a2h2j2m2s2v3V3u3{3|4R4U4_4e4t5`5d5v6R6Y6p6v6x7c7r8g'hZOY[fgilmop!O!P!T!Y!Z![!_!`!c!p!|!}#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W$`$a$e$g$h$q$r%_%b%i%j&U&Y&[&b&u'a'}(W(Y(d(e(f(j(o(p(r(|)i)p)q*f*i*k*l+Z+n,s,z-R-T-g-m.i.}/^/b/d/g0e0g0m0}1h1r1|3_3a3f3h3k4W4c4h4v4|5[5g5t6]6a7S7^7g7m7{8W8X8k8|9U9h9s9t9u9v9w9x9z9{9|9}:O:P:Q:R:S:T:U:V:W:X:Y:Z:`:a:e:f:g:t:u:x$^%l!Q!n$O$u%n%o%p%q%y%{&P&p&r(q)s)x)y*O*P*R*V*[*^*e*n*w*x+U+V+h+o+}-i-v.U.`.p.t.x.y/Z/[/{/}0`0r0w1O1Y1y2a2h2j2m2s2v3V3u3{3|4R4U4_4e4t5`5d5v6R6Y6p6v6x7c7r8gQ&j!hQ&k!iQ&l!jQ&m!kQ&s!oQ)[%QQ)]%RQ)^%SQ)_%TQ)b%WQ+`&oS,R']1ZQ.W)`S/r*u4TR4n0s+yTOY[bfgilmop!O!P!Q!T!Y!Z![!_!`!c!n!p!q!|!}#Q#U#Z#e#o#p#q#r#s#t#u#v#w#x#y#z#}$O$T$W$`$a$e$g$h$q$r$u$y%X%_%b%i%j%n%o%p%q%y%{&P&U&Y&[&b&o&p&r&u&z&|'P']'a'l'n'o'}(W(Y(b(d(e(f(j(o(p(q(r(|)S)U)i)p)q)s)x)y*O*P*R*V*Z*[*^*e*f*i*k*l*n*w*x+U+V+Z+h+n+o+z+},q,s,z-R-T-g-i-m-t-v.U.`.i.p.t.x.y.}/Z/[/^/b/d/g/{/}0`0e0g0m0r0w0}1O1P1Y1Z1h1r1y1|2a2h2j2m2s2v3V3_3a3f3h3k3u3{3|4R4U4W4_4c4e4h4t4v4|5[5`5d5g5t5v6R6Y6]6a6p6v6x7S7^7c7g7m7r7{8W8X8g8k8|9U9h9s9t9u9v9w9x9z9{9|9}:O:P:Q:R:S:T:U:V:W:X:Y:Z:`:a:e:f:g:t:u:xQ'[!xQ'h#PQ)l%gU)r%m*T*WR.f)kQ,T']R5P1Z#t%s!Q!n$O$u%p%q&P&p&r(q)x)y*O*R*V*[*^*e*n*w+V+h+o+}-i-v.U.`.t.x.y/Z/[/{/}0`0r0w1O1Y1y2a2h2j2m2v3V3u3{3|4U4e4t5`5d5v6R6Y6p6v6x7c7r8gQ)x%oQ+_&oQ,U']n,^'b'c'd,c,f,h,l/m/n1_3n3q5T5U7kS.q)s2sQ/O*PQ/Q*SQ/q*uS0Q*x4RQ0a+U[0o+Z.j0g4h5y7^Q2v.pS4d0e2rQ4m0sQ5Q1ZQ6T3RQ6z4PQ7O4TQ7X4_R9Y8h&jVOfgilmop!O!P!T!Y!Z![!_!`!c!p#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W$e$g$h$q$r%_%b&U&Y&[&b&u']'}(W(Y(b(f(j(o(p(r(|)i*f*i*k*l+Z+n,s,z-T-g-m.}/^/b/d/g0e0g0m0}1Z1h1r1|3_3a3f3h3k4W4c4h4v4|5[5g5t6]6a7S7^7g7m7{8W8X8k8|9U9h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:fU&g!g%P%[o,^'b'c'd,c,f,h,l/m/n1_3n3q5T5U7k$nsOfgilm!O!P!T!Y!Z![!_!`#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W%_%b&Y'}(W(Y(|)i*i*l+n,s,z-m.}/^0}1h1|3_3a3h3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9h9u9v9z9{:O:P:Q:R:S:T:U:V:W:X:Y:eS$tp9xS&O!W#bS&Q!X#cQ&`!bQ*_&RQ*a&VS*d&[:fQ*h&^Q,T']Q-j(wQ/i*jQ0p+[S2f.X0qQ3]/_Q3^/`Q3g/hQ3i/kQ5P1ZU5b2R2g4lU7o5c5e5rQ8]6dS8u7p7qS9_8v8wR9i9`i{Ob!O!P!T$y%_%b)S)U)i-thxOb!O!P!T$y%_%b)S)U)i-tW/v*v/t3w6qQ/}*wW0[+Q0Y4Z7UQ3{/{Q6x3|R8g6v!h$do!c!p$e$g$h$q$r&U&b&u(f(j(o(p(r*f*k+Z-T-g/b/d/g0e0g0m1r3f4c4h5[6a7^7mQ&d!dQ&f!fQ&n!mW&x!q%X&|1PQ'S!rQ)X$}Q)Y%OQ)a%VU)d%Y'T'UQ*s&hS+s&z'PS-Y(k1sQ-u)WQ-x)ZS.a)e)fS0x+c/sQ1S+zQ1W+{S1v-_-`Q2k.bQ3s/pQ5]1xR5h2V${sOfgilmp!O!P!T!Y!Z![!_!`#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W%_%b&Y&['}(W(Y(|)i*i*l+n,s,z-m.}/^0}1h1|3_3a3h3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:f$zsOfgilmp!O!P!T!Y!Z![!_!`#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W%_%b&Y&['}(W(Y(|)i*i*l+n,s,z-m.}/^0}1h1|3_3a3h3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:fR3]/_V&T!Y!`*i!i$lo!c!p$e$g$h$q$r&U&b&u(f(j(o(p(r*f*k+Z-T-g/b/d/g0e0g0m1r3f4c4h5[6a7^7m!k$^o!c!p$e$g$h$q$r&U&b&u(b(f(j(o(p(r*f*k+Z-T-g/b/d/g0e0g0m1r3f4c4h5[6a7^7m!i$co!c!p$e$g$h$q$r&U&b&u(f(j(o(p(r*f*k+Z-T-g/b/d/g0e0g0m1r3f4c4h5[6a7^7m&e^Ofgilmop!O!P!T!Y!Z![!_!`!c!p#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W$e$g$h$q$r%_%b&U&Y&[&b&u'}(W(Y(f(j(o(p(r(|)i*f*i*k*l+Z+n,s,z-T-g-m.}/^/b/d/g0e0g0m0}1h1r1|3_3a3f3h3k4W4c4h4v4|5[5g5t6]6a7S7^7g7m7{8W8X8k8|9U9h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:fR(l$fQ-[(kR5Y1sQ(S#|S({$v-oS-Z(k1sQ-l(yW/u*v/t3w6qS1w-_-`Q3v/vR5^1xQ'e#Or,e'b'c'd'j'p)u,c,f,h,l/m/n1_3n3q5U6fR,o'mk,a'b'c'd,c,f,h,l/m/n1_3n3q5UQ'f#Or,e'b'c'd'j'p)u,c,f,h,l/m/n1_3n3q5U6fR,p'mR*g&]X/c*f/d/g3f!}aOb!O!P!T#z$v$y%_%b'}(y)S)U)i)s*f*v*w+Q+Z,s-o-t.j/b/d/g/t/{0Y0g1h2s3f3w3|4Z4h5y6a6q6v7U7^Q3`/aQ6_3bQ8Y6`R9V8Z${rOfgilmp!O!P!T!Y!Z![!_!`#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W%_%b&Y&['}(W(Y(|)i*i*l+n,s,z-m.}/^0}1h1|3_3a3h3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:f#nfOfglmp!O!P!T!Z![#e#o#p#q#r#s#t#u#v#w#x#z#}$T$W%_%b&Y&['}(W(Y(|)i+n,s,z-m.}0}1h1|3_3a3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9h!T9u!Y!_!`*i*l/^3h9u9v9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:e:f#rfOfgilmp!O!P!T!Z![#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W%_%b&Y&['}(W(Y(|)i+n,s,z-m.}0}1h1|3_3a3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9h!X9u!Y!_!`*i*l/^3h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:f$srOfglmp!O!P!T!Y!Z![!_!`#e#o#p#q#r#s#t#u#v#w#x#z#}$T$W%_%b&Y&['}(W(Y(|)i*i*l+n,s,z-m.}/^0}1h1|3_3a3h3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9h9u9v9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:e:f#U#oh#d$P$Q$V$s%^&W&X'q't'u'v'w'x'y'z'{'|(O(U([(`*b*c,r,w,y-n0z1i1l1}3P4w5V5a6^6e7R7e7h7s7y8j8q8{9[9b}:P&S&]/k3[6d:[:]:c:d:h:j:k:l:m:n:o:p:q:r:v:w:{#W#ph#d$P$Q$V$s%^&W&X'q'r't'u'v'w'x'y'z'{'|(O(U([(`*b*c,r,w,y-n0z1i1l1}3P4w5V5a6^6e7R7e7h7s7y8j8q8{9[9b!P:Q&S&]/k3[6d:[:]:c:d:h:i:j:k:l:m:n:o:p:q:r:v:w:{#S#qh#d$P$Q$V$s%^&W&X'q'u'v'w'x'y'z'{'|(O(U([(`*b*c,r,w,y-n0z1i1l1}3P4w5V5a6^6e7R7e7h7s7y8j8q8{9[9b{:R&S&]/k3[6d:[:]:c:d:h:k:l:m:n:o:p:q:r:v:w:{#Q#rh#d$P$Q$V$s%^&W&X'q'v'w'x'y'z'{'|(O(U([(`*b*c,r,w,y-n0z1i1l1}3P4w5V5a6^6e7R7e7h7s7y8j8q8{9[9by:S&S&]/k3[6d:[:]:c:d:h:l:m:n:o:p:q:r:v:w:{#O#sh#d$P$Q$V$s%^&W&X'q'w'x'y'z'{'|(O(U([(`*b*c,r,w,y-n0z1i1l1}3P4w5V5a6^6e7R7e7h7s7y8j8q8{9[9bw:T&S&]/k3[6d:[:]:c:d:h:m:n:o:p:q:r:v:w:{!|#th#d$P$Q$V$s%^&W&X'q'x'y'z'{'|(O(U([(`*b*c,r,w,y-n0z1i1l1}3P4w5V5a6^6e7R7e7h7s7y8j8q8{9[9bu:U&S&]/k3[6d:[:]:c:d:h:n:o:p:q:r:v:w:{!x#vh#d$P$Q$V$s%^&W&X'q'z'{'|(O(U([(`*b*c,r,w,y-n0z1i1l1}3P4w5V5a6^6e7R7e7h7s7y8j8q8{9[9bq:W&S&]/k3[6d:[:]:c:d:h:p:q:r:v:w:{!v#wh#d$P$Q$V$s%^&W&X'q'{'|(O(U([(`*b*c,r,w,y-n0z1i1l1}3P4w5V5a6^6e7R7e7h7s7y8j8q8{9[9bo:X&S&]/k3[6d:[:]:c:d:h:q:r:v:w:{$]#{h#`#d$P$Q$V$s%^&S&W&X&]'q'r's't'u'v'w'x'y'z'{'|(O(U([(`*b*c,r,w,y-n/k0z1i1l1}3P3[4w5V5a6^6d6e7R7e7h7s7y8j8q8{9[9b:[:]:c:d:h:i:j:k:l:m:n:o:p:q:r:v:w:{${jOfgilmp!O!P!T!Y!Z![!_!`#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W%_%b&Y&['}(W(Y(|)i*i*l+n,s,z-m.}/^0}1h1|3_3a3h3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:f$v!aOfgilmp!O!P!T!Y!Z!_!`#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W%_%b&Y&['}(W(Y(|)i*i*l+n,s,z-m.}/^0}1h1|3_3a3h3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9h9u9v9w9x9z:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:fQ&Y![Q&Z!]R:e9{#rpOfgilmp!O!P!T!Z![#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W%_%b&Y&['}(W(Y(|)i+n,s,z-m.}0}1h1|3_3a3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9hQ&[!^!W9x!Y!_!`*i*l/^3h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:fR:f:zR$moR-f(rR$wqT(}$v-oQ/f*fS3d/d/gR6c3fQ3m/mQ3p/nQ6i3nR6l3qQ$zwQ)V${Q*q&fQ+f&qQ+i&sQ-w)YW.Z)b+j+k+lS/X*]+gW2b.W.[.].^U3W/Y/]0yU5o2c2d2eS6W3X3ZS7w5p5qS8Q6V6XQ8y7xS8}8R8SR9c9O^|O!O!P!T%_%b)iX)R$y)S)U-tQ&r!nQ*^&PQ*|&jQ+P&kQ+T&lQ+W&mQ+]&nQ+l&sQ-})[Q.Q)]Q.T)^Q.V)_Q.Y)aQ.^)bQ2S-uQ2e.WR4U0VU+a&o*u4TR4o0sQ+Y&mQ+k&sS.])b+l^0v+_+`/q/r4m4n7OS2d.W.^S4Q0R0SR5q2eS0R*x4RQ0a+UR7X4_U+d&o*u4TR4p0sQ*z&jQ+O&kQ+S&lQ+g&qQ+j&sS-{)[*|S.P)]+PS.S)^+TU.[)b+k+lQ/Y*]Q0X*{Q0q+[Q2X-|Q2Y-}Q2].QQ2_.TU2c.W.].^Q2g.XS3Z/]0yS5c2R4lQ5j2ZS5p2d2eQ6X3XS7q5e5rQ7x5qQ8R6VQ8v7pQ9O8SR9`8wQ0T*xR6|4RQ*y&jQ*}&kU-z)[*z*|U.O)]+O+PS2W-{-}S2[.P.QQ4X0ZQ5i2YQ5k2]R7T4YQ/w*vQ3t/tQ6r3wR8d6qQ*{&jS-|)[*|Q2Z-}Q4X0ZR7T4YQ+R&lU.R)^+S+TS2^.S.TR5l2_Q0]+QQ4V0YQ7V4ZR8l7UQ+[&nS.X)a+]S2R-u.YR5e2SQ0i+ZQ4f0gQ7`4hR8m7^Q.m)sQ0i+ZQ2p.jQ4f0gQ5|2sQ7`4hQ7}5yR8m7^Q0i+ZR4f0gX'O!q%X&|1PX&{!q%X&|1PW'O!q%X&|1PS+u&z'PR1U+z_|O!O!P!T%_%b)iQ%a!PS)h%_%bR.d)i$^%u!Q!n$O$u%o%p%q&P&o&p&r'](q)s)x)y*O*P*R*V*[*^*e*n*w*x+U+V+h+o+}-i-v.U.`.p.t.x.y/Z/[/{/}0`0r0w1O1Y1Z1y2a2h2j2m2s2v3V3u3{3|4R4U4_4e4t5`5d5v6R6Y6p6v6x7c7r8gQ*U%yR*X%{$c%n!Q!n$O$u%o%p%q%y%{&P&o&p&r'](q)s)x)y*O*P*R*V*[*^*e*n*w*x+U+V+h+o+}-i-v.U.`.p.t.x.y/Z/[/{/}0`0r0w1O1Y1Z1y2a2h2j2m2s2v3V3u3{3|4R4U4_4e4t5`5d5v6R6Y6p6v6x7c7r8gW)t%m%x*T*WQ.e)jR2{.vR.m)sR5|2sQ'W!sR,O'WQ!TOQ$TlQ$WmQ%b!P[%|!T$T$W%b)U/gQ)U$yR/g*f$b%i!Q!n$O$u%o%p%q%y%{&P&o&p&r'](q)s)x)y*O*P*R*V*[*^*e*n*w*x+U+V+h+o+}-i-v.U.`.p.t.x.y/Z/[/{/}0`0r0w1O1Y1Z1y2a2h2j2m2s2v3V3u3{3|4R4U4_4e4t5`5d5v6R6Y6p6v6x7c7r8g[)n%i)p.i:`:t:xQ)p%jQ.i)qQ:`%nQ:t:aR:x:uQ!vUR'Y!vS!OO!TU%]!O%_)iQ%_!PR)i%b#rYOfgilmp!O!P!T!Z![#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W%_%b&Y&['}(W(Y(|)i+n,s,z-m.}0}1h1|3_3a3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9hh!yY!|#U$`'a'n(d,q-R9s9|:gQ!|[b#Ub#Q$y'l(b)S)U*Z-t!h$`o!c!p$e$g$h$q$r&U&b&u(f(j(o(p(r*f*k+Z-T-g/b/d/g0e0g0m1r3f4c4h5[6a7^7mQ'a!}Q'n#ZQ(d$aQ,q'oQ-R(e!W9s!Y!_!`*i*l/^3h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:fQ9|9tR:g9}Q-U(gR1p-UQ1t-[R5Z1tQ,c'bQ,f'cQ,h'dW1`,c,f,h5UR5U1_Q/d*fS3c/d3fR3f/gfbO!O!P!T$y%_%b)S)U)i-tp#Wb'}(y.j/b/t/{0Y0g1h5y6a6q6v7U7^Q'}#zS(y$v-oQ.j)sW/b*f/d/g3fQ/t*vQ/{*wQ0Y+QQ0g+ZQ1h,sQ5y2sQ6q3wQ6v3|Q7U4ZR7^4hQ,t(OQ1g,rT1j,t1gS(X$Q([Q(^$VU,x(X(^,}R,}(`Q(s$mR-h(sQ-p)OR2P-pQ3n/mQ3q/nT6j3n3qQ)S$yS-r)S-tR-t)UQ4`0aR7Y4``0t+^+_+`+a+d/q/r7OR4q0tQ8i6zR9Z8iQ4S0TR6}4SQ3x/wQ6n3tT6s3x6nQ3}/|Q6t3zU6y3}6t8eR8e6uQ4[0]Q7Q4VT7W4[7QhzOb!O!P!T$y%_%b)S)U)i-tQ$|xW%Zz$|%f)v$b%f!Q!n$O$u%o%p%q%y%{&P&o&p&r'](q)s)x)y*O*P*R*V*[*^*e*n*w*x+U+V+h+o+}-i-v.U.`.p.t.x.y/Z/[/{/}0`0r0w1O1Y1Z1y2a2h2j2m2s2v3V3u3{3|4R4U4_4e4t5`5d5v6R6Y6p6v6x7c7r8gR)v%nS4i0i0nS7]4f4gT7b4i7]W&z!q%X&|1PS+r&z+zR+z'PQ1Q+wR4z1QU1[,S,T,UR5R1[S3S/Q7OR6U3SQ2t.mQ5x2pT5}2t5xQ.z)zR3O.z^_O!O!P!T%_%b)iY#Xb$y)S)U-t$l#_fgilmp!Y!Z![!_!`#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W&Y&['}(W(Y(|*i*l+n,s,z-m.}/^0}1h1|3_3a3h3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:f!h$io!c!p$e$g$h$q$r&U&b&u(f(j(o(p(r*f*k+Z-T-g/b/d/g0e0g0m1r3f4c4h5[6a7^7mS'j#Q'lQ-P(bR/V*Z&v!RObfgilmop!O!P!T!Y!Z![!_!`!c!p#Q#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W$e$g$h$q$r$y%_%b&U&Y&[&b&u'l'}(W(Y(b(f(j(o(p(r(|)S)U)i*Z*f*i*k*l+Z+n,s,z-T-g-m-t.}/^/b/d/g0e0g0m0}1h1r1|3_3a3f3h3k4W4c4h4v4|5[5g5t6]6a7S7^7g7m7{8W8X8k8|9U9h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:f[!{Y[#U#Z9s9tW&{!q%X&|1P['`!|!}'n'o9|9}S(c$`$aS+t&z'PU,X'a,q:gS-Q(d(eQ1T+zR1n-RS%t!Q&oQ&q!nQ(V$OQ(w$uS)w%o.pQ)z%pQ)}%qS*]&P&rQ+e&pQ,S']Q-d(qQ.l)sU.w)x)y2vS/O*O*PQ/P*RQ/T*VQ/W*[Q/]*^Q/`*eQ/l*nQ/|*wS0S*x4RQ0a+UQ0c+VQ0y+hQ0{+oQ1X+}Q1{-iQ2T-vQ2`.UQ2i.`Q2z.tQ2|.xQ2}.yQ3X/ZQ3Y/[S3z/{/}Q4^0`Q4l0rQ4s0wQ4x1OQ4}1YQ5O1ZQ5_1yQ5n2aQ5r2hQ5u2jQ5w2mQ5{2sQ6V3VQ6o3uQ6u3{Q6w3|Q7P4UQ7X4_Q7[4eQ7d4tQ7n5`Q7p5dQ7|5vQ8P6RQ8S6YQ8c6pS8f6v6xQ8o7cQ8w7rR9X8g$^%m!Q!n$O$u%o%p%q&P&o&p&r'](q)s)x)y*O*P*R*V*[*^*e*n*w*x+U+V+h+o+}-i-v.U.`.p.t.x.y/Z/[/{/}0`0r0w1O1Y1Z1y2a2h2j2m2s2v3V3u3{3|4R4U4_4e4t5`5d5v6R6Y6p6v6x7c7r8gQ)j%nQ*T%yR*W%{$y%h!Q!n$O$u%i%j%n%o%p%q%y%{&P&o&p&r'](q)p)q)s)x)y*O*P*R*V*[*^*e*n*w*x+U+V+h+o+}-i-v.U.`.i.p.t.x.y/Z/[/{/}0`0r0w1O1Y1Z1y2a2h2j2m2s2v3V3u3{3|4R4U4_4e4t5`5d5v6R6Y6p6v6x7c7r8g:`:a:t:u:x'pWOY[bfgilmop!O!P!T!Y!Z![!_!`!c!p!|!}#Q#U#Z#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W$`$a$e$g$h$q$r$y%_%b&U&Y&[&b&u'a'l'n'o'}(W(Y(b(d(e(f(j(o(p(r(|)S)U)i*Z*f*i*k*l+Z+n,q,s,z-R-T-g-m-t.}/^/b/d/g0e0g0m0}1h1r1|3_3a3f3h3k4W4c4h4v4|5[5g5t6]6a7S7^7g7m7{8W8X8k8|9U9h9s9t9u9v9w9x9z9{9|9}:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:f:g$x%g!Q!n$O$u%i%j%n%o%p%q%y%{&P&o&p&r'](q)p)q)s)x)y*O*P*R*V*[*^*e*n*w*x+U+V+h+o+}-i-v.U.`.i.p.t.x.y/Z/[/{/}0`0r0w1O1Y1Z1y2a2h2j2m2s2v3V3u3{3|4R4U4_4e4t5`5d5v6R6Y6p6v6x7c7r8g:`:a:t:u:x_&y!q%X&z&|'P+z1PR,V']$zrOfgilmp!O!P!T!Y!Z![!_!`#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W%_%b&Y&['}(W(Y(|)i*i*l+n,s,z-m.}/^0}1h1|3_3a3h3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:f!j$]o!c!p$e$g$h$q$r&U&b&u(b(f(j(o(p(r*f*k+Z-T-g/b/d/g0e0g0m1r3f4c4h5[6a7^7mQ,T']R5P1Z_}O!O!P!T%_%b)i^|O!O!P!T%_%b)iQ#YbX)R$y)S)U-tbhO!O!T3_6]8W8X9U9hS#`f9uQ#dgQ$PiQ$QlQ$VmQ$spW%^!P%_%b)iU&S!Y!`*iQ&W!ZQ&X![Q&]!_Q'q#eQ'r#oS's#p:QQ't#qQ'u#rQ'v#sQ'w#tQ'x#uQ'y#vQ'z#wQ'{#xQ'|#yQ(O#zQ(U#}Q([$TQ(`$WQ*b&YQ*c&[Q,r'}Q,w(WQ,y(YQ-n(|Q/k*lQ0z+nQ1i,sQ1l,zQ1}-mQ3P.}Q3[/^Q4w0}Q5V1hQ5a1|Q6^3aQ6d3hQ6e3kQ7R4WQ7e4vQ7h4|Q7s5gQ7y5tQ8j7SQ8q7gQ8{7{Q9[8kQ9b8|Q:[9wQ:]9xQ:c9zQ:d9{Q:h:OQ:i:PQ:j:RQ:k:SQ:l:TQ:m:UQ:n:VQ:o:WQ:p:XQ:q:YQ:r:ZQ:v:eQ:w:fR:{9v^tO!O!P!T%_%b)i$`#afgilmp!Y!Z![!_!`#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W&Y&['}(W(Y(|*i*l+n,s,z-m.}/^0}1h1|3a3h3k4W4v4|5g5t7S7g7{8k8|9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:fQ6[3_Q8V6]Q9R8WQ9T8XQ9g9UR9m9hQ&V!YQ&^!`R/h*iQ$joQ&a!cQ&t!pU(g$e$g(jS(n$h0eQ(u$qQ(v$rQ*`&UQ*m&bQ+p&uQ-S(fS-b(o4cQ-c(pQ-e(rW/a*f/d/g3fQ/j*kW0f+Z0g4h7^Q1o-TQ1z-gQ3b/bQ4k0mQ5X1rQ7l5[Q8Z6aR8t7m!h$_o!c!p$e$g$h$q$r&U&b&u(f(j(o(p(r*f*k+Z-T-g/b/d/g0e0g0m1r3f4c4h5[6a7^7mR-P(b'qXOY[bfgilmop!O!P!T!Y!Z![!_!`!c!p!|!}#Q#U#Z#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W$`$a$e$g$h$q$r$y%_%b&U&Y&[&b&u'a'l'n'o'}(W(Y(b(d(e(f(j(o(p(r(|)S)U)i*Z*f*i*k*l+Z+n,q,s,z-R-T-g-m-t.}/^/b/d/g0e0g0m0}1h1r1|3_3a3f3h3k4W4c4h4v4|5[5g5t6]6a7S7^7g7m7{8W8X8k8|9U9h9s9t9u9v9w9x9z9{9|9}:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:f:g$zqOfgilmp!O!P!T!Y!Z![!_!`#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W%_%b&Y&['}(W(Y(|)i*i*l+n,s,z-m.}/^0}1h1|3_3a3h3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:f!i$fo!c!p$e$g$h$q$r&U&b&u(f(j(o(p(r*f*k+Z-T-g/b/d/g0e0g0m1r3f4c4h5[6a7^7m&d^Ofgilmop!O!P!T!Y!Z![!_!`!c!p#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W$e$g$h$q$r%_%b&U&Y&[&b&u'}(W(Y(f(j(o(p(r(|)i*f*i*k*l+Z+n,s,z-T-g-m.}/^/b/d/g0e0g0m0}1h1r1|3_3a3f3h3k4W4c4h4v4|5[5g5t6]6a7S7^7g7m7{8W8X8k8|9U9h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:f[!zY[$`$a9s9t['_!|!}(d(e9|9}W)o%i%j:`:aU,W'a-R:gW.h)p)q:t:uT2o.i:xQ(i$eQ(m$gR-W(jV(h$e$g(jR-^(kR-](k$znOfgilmp!O!P!T!Y!Z![!_!`#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W%_%b&Y&['}(W(Y(|)i*i*l+n,s,z-m.}/^0}1h1|3_3a3h3k4W4v4|5g5t6]7S7g7{8W8X8k8|9U9h9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:f!i$ko!c!p$e$g$h$q$r&U&b&u(f(j(o(p(r*f*k+Z-T-g/b/d/g0e0g0m1r3f4c4h5[6a7^7mS'g#O'pj,a'b'c'd,c,f,h,l/m/n1_3n3q5UQ,m'jQ.u)uR8_6f`,b'b'c'd,c,f,h1_5UQ1e,lX3l/m/n3n3qj,a'b'c'd,c,f,h,l/m/n1_3n3q5UQ7j5TR8s7k^uO!O!P!T%_%b)i$`#afgilmp!Y!Z![!_!`#e#o#p#q#r#s#t#u#v#w#x#y#z#}$T$W&Y&['}(W(Y(|*i*l+n,s,z-m.}/^0}1h1|3a3h3k4W4v4|5g5t7S7g7{8k8|9u9v9w9x9z9{:O:P:Q:R:S:T:U:V:W:X:Y:Z:e:fQ6Z3_Q8U6]Q9Q8WQ9S8XQ9f9UR9l9hR(Q#zR(P#zQ$SlR(]$TR$ooR$noR)Q$vR)P$vQ)O$vR2O-ohwOb!O!P!T$y%_%b)S)U)i-t$l!lz!Q!n$O$u$|%f%n%o%p%q%y%{&P&o&p&r'](q)s)v)x)y*O*P*R*V*[*^*e*n*w*x+U+V+h+o+}-i-v.U.`.p.t.x.y/Z/[/{/}0`0r0w1O1Y1Z1y2a2h2j2m2s2v3V3u3{3|4R4U4_4e4t5`5d5v6R6Y6p6v6x7c7r8gR${xR0b+UR0W*xR0U*xR6{4PR/y*vR/x*vR0P*wR0O*wR0_+QR0^+Q%XyObxz!O!P!Q!T!n$O$u$y$|%_%b%f%n%o%p%q%y%{&P&o&p&r'](q)S)U)i)s)v)x)y*O*P*R*V*[*^*e*n*w*x+U+V+h+o+}-i-t-v.U.`.p.t.x.y/Z/[/{/}0`0r0w1O1Y1Z1y2a2h2j2m2s2v3V3u3{3|4R4U4_4e4t5`5d5v6R6Y6p6v6x7c7r8gR0k+ZR0j+ZQ'R!qQ)c%XQ+w&|R4y1PX'Q!q%X&|1PR+y&|R+x&|T/S*S4TT/R*S4TR.o)sR.n)sR){%p", + nodeNames: "\u26A0 | < > RawString Float LineComment BlockComment SourceFile ] InnerAttribute ! [ MetaItem self Metavariable super crate Identifier ScopedIdentifier :: QualifiedScope AbstractType impl SelfType MetaType TypeIdentifier ScopedTypeIdentifier ScopeIdentifier TypeArgList TypeBinding = Lifetime String Escape Char Boolean Integer } { Block ; ConstItem Vis pub ( in ) const BoundIdentifier : UnsafeBlock unsafe AsyncBlock async move IfExpression if LetDeclaration let LiteralPattern ArithOp MetaPattern SelfPattern ScopedIdentifier TuplePattern ScopedTypeIdentifier , StructPattern FieldPatternList FieldPattern ref mut FieldIdentifier .. RefPattern SlicePattern CapturedPattern ReferencePattern & MutPattern RangePattern ... OrPattern MacroPattern ParenthesizedTokens TokenBinding Identifier TokenRepetition ArithOp BitOp LogicOp UpdateOp CompareOp -> => ArithOp BracketedTokens BracedTokens _ else MatchExpression match MatchBlock MatchArm Attribute Guard UnaryExpression ArithOp DerefOp LogicOp ReferenceExpression TryExpression BinaryExpression ArithOp ArithOp BitOp BitOp BitOp BitOp LogicOp LogicOp AssignmentExpression TypeCastExpression as ReturnExpression return RangeExpression CallExpression ArgList AwaitExpression await FieldExpression GenericFunction BreakExpression break LoopLabel ContinueExpression continue IndexExpression ArrayExpression TupleExpression MacroInvocation UnitExpression ClosureExpression ParamList Parameter Parameter ParenthesizedExpression StructExpression FieldInitializerList ShorthandFieldInitializer FieldInitializer BaseFieldInitializer MatchArm WhileExpression while LoopExpression loop ForExpression for MacroInvocation MacroDefinition macro_rules MacroRule EmptyStatement ModItem mod DeclarationList AttributeItem ForeignModItem extern StructItem struct TypeParamList ConstrainedTypeParameter TraitBounds HigherRankedTraitBound RemovedTraitBound OptionalTypeParameter ConstParameter WhereClause where LifetimeClause TypeBoundClause FieldDeclarationList FieldDeclaration OrderedFieldDeclarationList UnionItem union EnumItem enum EnumVariantList EnumVariant TypeItem type FunctionItem default fn ParamList Parameter SelfParameter VariadicParameter VariadicParameter ImplItem TraitItem trait AssociatedType LetDeclaration UseDeclaration use ScopedIdentifier UseAsClause ScopedIdentifier UseList ScopedUseList UseWildcard ExternCrateDeclaration StaticItem static ExpressionStatement ExpressionStatement GenericType FunctionType ForLifetimes ParamList VariadicParameter Parameter VariadicParameter Parameter ReferenceType PointerType TupleType UnitType ArrayType MacroInvocation EmptyType DynamicType dyn BoundedType", + maxTerm: 359, + nodeProps: [ + ["isolate", -4, 4, 6, 7, 33, ""], + ["group", -42, 4, 5, 14, 15, 16, 17, 18, 19, 33, 35, 36, 37, 40, 51, 53, 56, 101, 107, 111, 112, 113, 122, 123, 125, 127, 128, 130, 132, 133, 134, 137, 139, 140, 141, 142, 143, 144, 148, 149, 155, 157, 159, "Expression", -16, 22, 24, 25, 26, 27, 222, 223, 230, 231, 232, 233, 234, 235, 236, 237, 239, "Type", -20, 42, 161, 162, 165, 166, 169, 170, 172, 188, 190, 194, 196, 204, 205, 207, 208, 209, 217, 218, 220, "Statement", -17, 49, 60, 62, 63, 64, 65, 68, 74, 75, 76, 77, 78, 80, 81, 83, 84, 99, "Pattern"], + ["openedBy", 9, "[", 38, "{", 47, "("], + ["closedBy", 12, "]", 39, "}", 45, ")"] + ], + propSources: [rustHighlighting], + skippedNodes: [0, 6, 7, 240], + repeatNodeCount: 32, + tokenData: "$%h_R!XOX$nXY5gYZ6iZ]$n]^5g^p$npq5gqr7Xrs9cst:Rtu;Tuv>vvwAQwxCbxy!+Tyz!,Vz{!-X{|!/_|}!0g}!O!1i!O!P!3v!P!Q!8[!Q!R!Bw!R![!Dr![!]#+q!]!^#-{!^!_#.}!_!`#1b!`!a#3o!a!b#6S!b!c#7U!c!}#8W!}#O#:T#O#P#;V#P#Q#Cb#Q#R#Dd#R#S#8W#S#T$n#T#U#8W#U#V#El#V#f#8W#f#g#Ic#g#o#8W#o#p$ S#p#q$!U#q#r$$f#r${$n${$|#8W$|4w$n4w5b#8W5b5i$n5i6S#8W6S;'S$n;'S;=`4s<%lO$nU$u]'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$nU%uV'_Q'OSOz&[z{&v{!P&[!P!Q'x!Q;'S&[;'S;=`*s<%lO&[S&aV'OSOz&[z{&v{!P&[!P!Q'x!Q;'S&[;'S;=`*s<%lO&[S&yVOz'`z{&v{!P'`!P!Q*y!Q;'S'`;'S;=`*m<%lO'`S'cVOz&[z{&v{!P&[!P!Q'x!Q;'S&[;'S;=`*s<%lO&[S'{UOz'`{!P'`!P!Q(_!Q;'S'`;'S;=`*m<%lO'`S(bUOz(t{!P(t!P!Q(_!Q;'S(t;'S;=`*a<%lO(tS(wVOz)^z{)z{!P)^!P!Q(_!Q;'S)^;'S;=`*g<%lO)^S)eV'PS'OSOz)^z{)z{!P)^!P!Q(_!Q;'S)^;'S;=`*g<%lO)^S)}UOz(tz{)z{!P(t!Q;'S(t;'S;=`*a<%lO(tS*dP;=`<%l(tS*jP;=`<%l)^S*pP;=`<%l'`S*vP;=`<%l&[S+OO'PSU+T]'_QOY+|YZ-xZr+|rs'`sz+|z{+O{!P+|!P!Q4y!Q#O+|#O#P'`#P;'S+|;'S;=`4m<%lO+|U,R]'_QOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$nU-P]'_QOY+|YZ-xZr+|rs'`sz+|z{.d{!P+|!P!Q/Z!Q#O+|#O#P'`#P;'S+|;'S;=`4m<%lO+|U-}V'_QOz&[z{&v{!P&[!P!Q'x!Q;'S&[;'S;=`*s<%lO&[Q.iV'_QOY.dYZ/OZr.ds#O.d#P;'S.d;'S;=`/T<%lO.dQ/TO'_QQ/WP;=`<%l.dU/`]'_QOY0XYZ3uZr0Xrs(tsz0Xz{.d{!P0X!P!Q/Z!Q#O0X#O#P(t#P;'S0X;'S;=`4a<%lO0XU0^]'_QOY1VYZ2XZr1Vrs)^sz1Vz{2w{!P1V!P!Q/Z!Q#O1V#O#P)^#P;'S1V;'S;=`4g<%lO1VU1`]'_Q'PS'OSOY1VYZ2XZr1Vrs)^sz1Vz{2w{!P1V!P!Q/Z!Q#O1V#O#P)^#P;'S1V;'S;=`4g<%lO1VU2bV'_Q'PS'OSOz)^z{)z{!P)^!P!Q(_!Q;'S)^;'S;=`*g<%lO)^U2|]'_QOY0XYZ3uZr0Xrs(tsz0Xz{2w{!P0X!P!Q.d!Q#O0X#O#P(t#P;'S0X;'S;=`4a<%lO0XU3zV'_QOz)^z{)z{!P)^!P!Q(_!Q;'S)^;'S;=`*g<%lO)^U4dP;=`<%l0XU4jP;=`<%l1VU4pP;=`<%l+|U4vP;=`<%l$nU5QV'_Q'PSOY.dYZ/OZr.ds#O.d#P;'S.d;'S;=`/T<%lO.d_5p]'_Q&|X'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_6rV'_Q&|X'OSOz&[z{&v{!P&[!P!Q'x!Q;'S&[;'S;=`*s<%lO&[_7b_ZX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q!_$n!_!`8a!`#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_8j]#PX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_9lV']Q'OS'^XOz&[z{&v{!P&[!P!Q'x!Q;'S&[;'S;=`*s<%lO&[_:[]'QX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_;^i'_Q'vW'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q!c$n!c!}<{!}#O$n#O#P&[#P#R$n#R#S<{#S#T$n#T#o<{#o${$n${$|<{$|4w$n4w5b<{5b5i$n5i6S<{6S;'S$n;'S;=`4s<%lO$n_=Uj'_Q_X'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q![<{![!c$n!c!}<{!}#O$n#O#P&[#P#R$n#R#S<{#S#T$n#T#o<{#o${$n${$|<{$|4w$n4w5b<{5b5i$n5i6S<{6S;'S$n;'S;=`4s<%lO$n_?P_(TP'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q!_$n!_!`@O!`#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_@X]#OX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_AZa!qX'_Q'OSOY$nYZ%nZr$nrs&[sv$nvwB`wz$nz{+O{!P$n!P!Q,z!Q!_$n!_!`@O!`#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_Bi]'}X'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_Cik'_Q'OSOYE^YZGfZrE^rsHvswE^wxFdxzE^z{Ih{!PE^!P!QKl!Q!cE^!c!}Lp!}#OE^#O#P!!l#P#RE^#R#SLp#S#TE^#T#oLp#o${E^${$|Lp$|4wE^4w5bLp5b5iE^5i6SLp6S;'SE^;'S;=`!*}<%lOE^_Ee_'_Q'OSOY$nYZ%nZr$nrs&[sw$nwxFdxz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_Fm]'_Q'OSsXOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_GmX'_Q'OSOw&[wxHYxz&[z{&v{!P&[!P!Q'x!Q;'S&[;'S;=`*s<%lO&[]HaV'OSsXOz&[z{&v{!P&[!P!Q'x!Q;'S&[;'S;=`*s<%lO&[]H{X'OSOw&[wxHYxz&[z{&v{!P&[!P!Q'x!Q;'S&[;'S;=`*s<%lO&[_Im_'_QOY+|YZ-xZr+|rs'`sw+|wxJlxz+|z{+O{!P+|!P!Q4y!Q#O+|#O#P'`#P;'S+|;'S;=`4m<%lO+|_Js]'_QsXOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_Kq_'_QOY+|YZ-xZr+|rs'`sw+|wxJlxz+|z{.d{!P+|!P!Q/Z!Q#O+|#O#P'`#P;'S+|;'S;=`4m<%lO+|_Lyl'_Q'OS'ZXOY$nYZ%nZr$nrs&[sw$nwxFdxz$nz{+O{!P$n!P!Q,z!Q![Nq![!c$n!c!}Nq!}#O$n#O#P&[#P#R$n#R#SNq#S#T$n#T#oNq#o${$n${$|Nq$|4w$n4w5bNq5b5i$n5i6SNq6S;'S$n;'S;=`4s<%lO$n_Nzj'_Q'OS'ZXOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q![Nq![!c$n!c!}Nq!}#O$n#O#P&[#P#R$n#R#SNq#S#T$n#T#oNq#o${$n${$|Nq$|4w$n4w5bNq5b5i$n5i6SNq6S;'S$n;'S;=`4s<%lO$n]!!qZ'OSOzHvz{!#d{!PHv!P!Q!$n!Q#iHv#i#j!%Z#j#lHv#l#m!'V#m;'SHv;'S;=`!*w<%lOHv]!#gXOw'`wx!$Sxz'`z{&v{!P'`!P!Q*y!Q;'S'`;'S;=`*m<%lO'`]!$XVsXOz&[z{&v{!P&[!P!Q'x!Q;'S&[;'S;=`*s<%lO&[]!$qWOw'`wx!$Sxz'`{!P'`!P!Q(_!Q;'S'`;'S;=`*m<%lO'`]!%`^'OSOz&[z{&v{!P&[!P!Q'x!Q![!&[![!c&[!c!i!&[!i#T&[#T#Z!&[#Z#o&[#o#p!({#p;'S&[;'S;=`*s<%lO&[]!&a['OSOz&[z{&v{!P&[!P!Q'x!Q![!'V![!c&[!c!i!'V!i#T&[#T#Z!'V#Z;'S&[;'S;=`*s<%lO&[]!'[['OSOz&[z{&v{!P&[!P!Q'x!Q![!(Q![!c&[!c!i!(Q!i#T&[#T#Z!(Q#Z;'S&[;'S;=`*s<%lO&[]!(V['OSOz&[z{&v{!P&[!P!Q'x!Q![Hv![!c&[!c!iHv!i#T&[#T#ZHv#Z;'S&[;'S;=`*s<%lO&[]!)Q['OSOz&[z{&v{!P&[!P!Q'x!Q![!)v![!c&[!c!i!)v!i#T&[#T#Z!)v#Z;'S&[;'S;=`*s<%lO&[]!){^'OSOz&[z{&v{!P&[!P!Q'x!Q![!)v![!c&[!c!i!)v!i#T&[#T#Z!)v#Z#q&[#q#rHv#r;'S&[;'S;=`*s<%lO&[]!*zP;=`<%lHv_!+QP;=`<%lE^_!+^]}X'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_!,`]!PX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_!-`_(QX'_QOY+|YZ-xZr+|rs'`sz+|z{+O{!P+|!P!Q4y!Q!_+|!_!`!._!`#O+|#O#P'`#P;'S+|;'S;=`4m<%lO+|_!.f]#OX'_QOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_!/h_(PX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q!_$n!_!`@O!`#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_!0p]!eX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_!1r`'gX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q!_$n!_!`@O!`!a!2t!a#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_!2}]#QX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_!4P^(OX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!O$n!O!P!4{!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_!5U`!lX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!O$n!O!P!6W!P!Q,z!Q!_$n!_!`!7Y!`#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_!6a]!tX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$nV!7c]'qP'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_!8c_'_Q'xXOY+|YZ-xZr+|rs'`sz+|z{!9b{!P+|!P!Q!:O!Q!_+|!_!`!._!`#O+|#O#P'`#P;'S+|;'S;=`4m<%lO+|_!9iV&}]'_QOY.dYZ/OZr.ds#O.d#P;'S.d;'S;=`/T<%lO.d_!:V]'_QUXOY!;OYZ3uZr!;Ors!>jsz!;Oz{!Aq{!P!;O!P!Q!:O!Q#O!;O#O#P!>j#P;'S!;O;'S;=`!Bk<%lO!;O_!;V]'_QUXOY!jYZ(tZz!>jz{!=x{!P!>j!P!Q!?|!Q;'S!>j;'S;=`!@e<%lO!>j]!>oXUXOY!=SYZ)^Zz!=Sz{!=x{!P!=S!P!Q!?[!Q;'S!=S;'S;=`!@k<%lO!=S]!?aXUXOY!>jYZ(tZz!>jz{!?|{!P!>j!P!Q!?[!Q;'S!>j;'S;=`!@e<%lO!>jX!@RSUXOY!?|Z;'S!?|;'S;=`!@_<%lO!?|X!@bP;=`<%l!?|]!@hP;=`<%l!>j]!@nP;=`<%l!=S_!@x]'_QUXOY!;OYZ3uZr!;Ors!>jsz!;Oz{!@q{!P!;O!P!Q!Aq!Q#O!;O#O#P!>j#P;'S!;O;'S;=`!Bk<%lO!;OZ!AxX'_QUXOY!AqYZ/OZr!Aqrs!?|s#O!Aq#O#P!?|#P;'S!Aq;'S;=`!Be<%lO!AqZ!BhP;=`<%l!Aq_!BnP;=`<%l!;O_!BtP;=`<%l!o![!c&[!c!i#>o!i#T&[#T#Z#>o#Z#o&[#o#p#A`#p;'S&[;'S;=`*s<%lO&[U#>t['OSOz&[z{&v{!P&[!P!Q'x!Q![#?j![!c&[!c!i#?j!i#T&[#T#Z#?j#Z;'S&[;'S;=`*s<%lO&[U#?o['OSOz&[z{&v{!P&[!P!Q'x!Q![#@e![!c&[!c!i#@e!i#T&[#T#Z#@e#Z;'S&[;'S;=`*s<%lO&[U#@j['OSOz&[z{&v{!P&[!P!Q'x!Q![#;}![!c&[!c!i#;}!i#T&[#T#Z#;}#Z;'S&[;'S;=`*s<%lO&[U#Ae['OSOz&[z{&v{!P&[!P!Q'x!Q![#BZ![!c&[!c!i#BZ!i#T&[#T#Z#BZ#Z;'S&[;'S;=`*s<%lO&[U#B`^'OSOz&[z{&v{!P&[!P!Q'x!Q![#BZ![!c&[!c!i#BZ!i#T&[#T#Z#BZ#Z#q&[#q#r#;}#r;'S&[;'S;=`*s<%lO&[U#C_P;=`<%l#;}_#Ck]XX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_#Dm_'{X'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q!_$n!_!`@O!`#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_#Ewl'_Q'OS!yW'TPOY$nYZ%nZr$nrs#Gosw$nwx#H]xz$nz{+O{!P$n!P!Q,z!Q![#8W![!c$n!c!}#8W!}#O$n#O#P&[#P#R$n#R#S#8W#S#T$n#T#o#8W#o${$n${$|#8W$|4w$n4w5b#8W5b5i$n5i6S#8W6S;'S$n;'S;=`4s<%lO$n]#GvV'OS'^XOz&[z{&v{!P&[!P!Q'x!Q;'S&[;'S;=`*s<%lO&[_#Hd_'_Q'OSOYE^YZGfZrE^rsHvswE^wxFdxzE^z{Ih{!PE^!P!QKl!Q#OE^#O#P!!l#P;'SE^;'S;=`!*}<%lOE^_#Ink'_Q'OS!yW'TPOY$nYZ%nZr$nrs&[st#Kctz$nz{+O{!P$n!P!Q,z!Q![#8W![!c$n!c!}#8W!}#O$n#O#P&[#P#R$n#R#S#8W#S#T$n#T#o#8W#o${$n${$|#8W$|4w$n4w5b#8W5b5i$n5i6S#8W6S;'S$n;'S;=`4s<%lO$nV#Kji'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q!c$n!c!}#MX!}#O$n#O#P&[#P#R$n#R#S#MX#S#T$n#T#o#MX#o${$n${$|#MX$|4w$n4w5b#MX5b5i$n5i6S#MX6S;'S$n;'S;=`4s<%lO$nV#Mbj'_Q'OS'TPOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q![#MX![!c$n!c!}#MX!}#O$n#O#P&[#P#R$n#R#S#MX#S#T$n#T#o#MX#o${$n${$|#MX$|4w$n4w5b#MX5b5i$n5i6S#MX6S;'S$n;'S;=`4s<%lO$n_$ ]]wX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_$!_a'rX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q!_$n!_!`@O!`#O$n#O#P&[#P#p$n#p#q$#d#q;'S$n;'S;=`4s<%lO$n_$#m]'|X'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n_$$o]vX'_Q'OSOY$nYZ%nZr$nrs&[sz$nz{+O{!P$n!P!Q,z!Q#O$n#O#P&[#P;'S$n;'S;=`4s<%lO$n", + tokenizers: [closureParam, tpDelim, literalTokens, 0, 1, 2, 3], + topRules: { "SourceFile": [0, 8] }, + specialized: [{ term: 281, get: (value) => spec_identifier5[value] || -1 }], + tokenPrec: 15596 + }); + + // node_modules/@codemirror/lang-rust/dist/index.js + var rustLanguage = /* @__PURE__ */ LRLanguage.define({ + name: "rust", + parser: /* @__PURE__ */ parser11.configure({ + props: [ + /* @__PURE__ */ indentNodeProp.add({ + IfExpression: /* @__PURE__ */ continuedIndent({ except: /^\s*({|else\b)/ }), + "String BlockComment": () => null, + "AttributeItem": (cx) => cx.continue(), + "Statement MatchArm": /* @__PURE__ */ continuedIndent() + }), + /* @__PURE__ */ foldNodeProp.add((type) => { + if (/(Block|edTokens|List)$/.test(type.name)) + return foldInside; + if (type.name == "BlockComment") + return (tree) => ({ from: tree.from + 2, to: tree.to - 2 }); + return void 0; + }) + ] + }), + languageData: { + commentTokens: { line: "//", block: { open: "/*", close: "*/" } }, + indentOnInput: /^\s*(?:\{|\})$/, + closeBrackets: { stringPrefixes: ["b", "r", "br"] } + } + }); + function rust() { + return new LanguageSupport(rustLanguage); + } + + // node_modules/@lezer/java/dist/index.js + var javaHighlighting = styleTags({ + null: tags.null, + instanceof: tags.operatorKeyword, + this: tags.self, + "new super assert open to with void": tags.keyword, + "class interface extends implements enum var": tags.definitionKeyword, + "module package import": tags.moduleKeyword, + "switch while for if else case default do break continue return try catch finally throw": tags.controlKeyword, + ["requires exports opens uses provides public private protected static transitive abstract final strictfp synchronized native transient volatile throws"]: tags.modifier, + IntegerLiteral: tags.integer, + FloatingPointLiteral: tags.float, + "StringLiteral TextBlock": tags.string, + CharacterLiteral: tags.character, + LineComment: tags.lineComment, + BlockComment: tags.blockComment, + BooleanLiteral: tags.bool, + PrimitiveType: tags.standard(tags.typeName), + TypeName: tags.typeName, + Identifier: tags.variableName, + "MethodName/Identifier": tags.function(tags.variableName), + Definition: tags.definition(tags.variableName), + ArithOp: tags.arithmeticOperator, + LogicOp: tags.logicOperator, + BitOp: tags.bitwiseOperator, + CompareOp: tags.compareOperator, + AssignOp: tags.definitionOperator, + UpdateOp: tags.updateOperator, + Asterisk: tags.punctuation, + Label: tags.labelName, + "( )": tags.paren, + "[ ]": tags.squareBracket, + "{ }": tags.brace, + ".": tags.derefOperator, + ", ;": tags.separator + }); + var spec_identifier6 = { __proto__: null, true: 34, false: 34, null: 42, void: 46, byte: 48, short: 48, int: 48, long: 48, char: 48, float: 48, double: 48, boolean: 48, extends: 62, super: 64, class: 76, this: 78, new: 84, public: 100, protected: 102, private: 104, abstract: 106, static: 108, final: 110, strictfp: 112, default: 114, synchronized: 116, native: 118, transient: 120, volatile: 122, throws: 150, implements: 160, interface: 166, enum: 176, instanceof: 238, open: 267, module: 269, requires: 274, transitive: 276, exports: 278, to: 280, opens: 282, uses: 284, provides: 286, with: 288, package: 292, import: 296, if: 308, else: 310, while: 314, for: 318, var: 325, assert: 332, switch: 336, case: 342, do: 346, break: 350, continue: 354, return: 358, throw: 364, try: 368, catch: 372, finally: 380 }; + var parser12 = LRParser.deserialize({ + version: 14, + states: "##jQ]QPOOQ$wQPOOO(bQQO'#H^O*iQQO'#CbOOQO'#Cb'#CbO*pQPO'#CaO*xOSO'#CpOOQO'#Hc'#HcOOQO'#Cu'#CuO,eQPO'#D_O-OQQO'#HmOOQO'#Hm'#HmO/gQQO'#HhO/nQQO'#HhOOQO'#Hh'#HhOOQO'#Hg'#HgO1rQPO'#DUO2PQPO'#GnO4wQPO'#D_O5OQPO'#DzO*pQPO'#E[O5qQPO'#E[OOQO'#DV'#DVO7SQQO'#HaO9^QQO'#EeO9eQPO'#EdO9jQPO'#EfOOQO'#Hb'#HbO7jQQO'#HbO:pQQO'#FhO:wQPO'#ExO:|QPO'#E}O:|QPO'#FPOOQO'#Ha'#HaOOQO'#HY'#HYOOQO'#Gh'#GhOOQO'#HX'#HXO<^QPO'#FiOOQO'#HW'#HWOOQO'#Gg'#GgQ]QPOOOOQO'#Hs'#HsOQQPO'#GSO>]QPO'#GUO=kQPO'#GWO:|QPO'#GXO>dQPO'#GZO?QQQO'#HiO?mQQO'#CuO?tQPO'#HxO@SQPO'#D_O@rQPO'#DpO?wQPO'#DqO@|QPO'#HxOA_QPO'#DpOAgQPO'#IROAlQPO'#E`OOQO'#Hr'#HrOOQO'#Gm'#GmQ$wQPOOOAtQPO'#HsOOQO'#H^'#H^OCsQQO,58{OOQO'#H['#H[OOOO'#Gi'#GiOEfOSO,59[OOQO,59[,59[OOQO'#Hi'#HiOFVQPO,59eOGXQPO,59yOOQO-E:f-E:fO*pQPO,58zOG{QPO,58zO*pQPO,5;}OHQQPO'#DQOHVQPO'#DQOOQO'#Gk'#GkOIVQQO,59jOOQO'#Dm'#DmOJqQPO'#HuOJ{QPO'#DlOKZQPO'#HtOKcQPO,5<_OKhQPO,59^OLRQPO'#CxOOQO,59c,59cOLYQPO,59bOLeQQO'#H^ONgQQO'#CbO!!iQPO'#D_O!#nQQO'#HmO!$OQQO,59pO!$VQPO'#DvO!$eQPO'#H|O!$mQPO,5:`O!$rQPO,5:`O!%YQPO,5;nO!%eQPO'#ITO!%pQPO,5;eO!%uQPO,5=YOOQO-E:l-E:lOOQO,5:f,5:fO!']QPO,5:fO!'dQPO,5:vO?tQPO,5<_O*pQPO,5:vO_,5>_O!*sQPO,5:gO!+RQPO,5:qO!+ZQPO,5:lO!+fQPO,5>[O!$VQPO,5>[O!'iQPO,59UO!+qQQO,58zO!+yQQO,5;}O!,RQQO,5gQPO,5gQPO,5<}O!2mQPO,59jO!2zQPO'#HuO!3RQPO,59xO!3WQPO,5>dO?tQPO,59xO!3cQPO,5:[OAlQPO,5:zO!3kQPO'#DrO?wQPO'#DrO!3vQPO'#HyO!4OQPO,5:]O?tQPO,5>dO!(hQPO,5>dOAgQPO,5>mOOQO,5:[,5:[O!$rQPO'#DtOOQO,5>m,5>mO!4TQPO'#EaOOQO,5:z,5:zO!7UQPO,5:zO!(hQPO'#DxOOQO-E:k-E:kOOQO,5:y,5:yO*pQPO,58}O!7ZQPO'#ChOOQO1G.k1G.kOOOO-E:g-E:gOOQO1G.v1G.vO!+qQQO1G.fO*pQPO1G.fO!7eQQO1G1iOOQO,59l,59lO!7mQPO,59lOOQO-E:i-E:iO!7rQPO,5>aO!8ZQPO,5:WO`OOQO1G1y1G1yOOQO1G.x1G.xO!8{QPO'#CyO!9kQPO'#HmO!9uQPO'#CzO!:TQPO'#HlO!:]QPO,59dOOQO1G.|1G.|OLYQPO1G.|O!:sQPO,59eO!;QQQO'#H^O!;cQQO'#CbOOQO,5:b,5:bOhOOQO1G/z1G/zO!oOOQO1G1P1G1POOQO1G0Q1G0QO!=oQPO'#E]OOQO1G0b1G0bO!>`QPO1G1yO!'dQPO1G0bO!*sQPO1G0RO!+RQPO1G0]O!+ZQPO1G0WOOQO1G/]1G/]O!>eQQO1G.pO9eQPO1G0jO*pQPO1G0jOgQPO'#GaOOQO1G2a1G2aO#2zQPO1G2iO#6xQPO,5>gOOQO1G/d1G/dOOQO1G4O1G4OO#7ZQPO1G/dOOQO1G/v1G/vOOQO1G0f1G0fO!7UQPO1G0fOOQO,5:^,5:^O!(hQPO'#DsO#7`QPO,5:^O?wQPO'#GrO#7kQPO,5>eOOQO1G/w1G/wOAgQPO'#H{O#7sQPO1G4OO?tQPO1G4OOOQO1G4X1G4XO!#YQPO'#DvO!!iQPO'#D_OOQO,5:{,5:{O#8OQPO,5:{O#8OQPO,5:{O#8VQQO'#HaO#9hQQO'#HbO#9rQQO'#EbO#9}QPO'#EbO#:VQPO'#IOOOQO,5:d,5:dOOQO1G.i1G.iO#:bQQO'#EeO#:rQQO'#H`O#;SQPO'#FTOOQO'#H`'#H`O#;^QPO'#H`O#;{QPO'#IWO#WOOQO1G/O1G/OOOQO7+$h7+$hOOQO1G/{1G/{O#=cQQO1G/{OOQO1G/}1G/}O#=hQPO1G/{OOQO1G/|1G/|OdQPO,5:wOOQO,5:w,5:wOOQO7+'e7+'eOOQO7+%|7+%|OOQO7+%m7+%mO!KqQPO7+%mO!KvQPO7+%mO!LOQPO7+%mOOQO7+%w7+%wO!LnQPO7+%wOOQO7+%r7+%rO!MmQPO7+%rO!MrQPO7+%rOOQO7+&U7+&UOOQO'#Ee'#EeO9eQPO7+&UO9eQPO,5>[O#?TQPO7+$[OOQO7+&T7+&TOOQO7+&W7+&WO:|QPO'#GlO#?cQPO,5>]OOQO1G/_1G/_O:|QPO7+&lO#?nQQO,59eO#@tQPO,59vOOQO,59v,59vOOQO,5:h,5:hOOQO'#EP'#EPOOQO,5:i,5:iO#@{QPO'#EYOgQPO,5jO#M{QPO,59TO#NSQPO'#IVO#N[QPO,5;oO*pQPO'#G{O#NaQPO,5>rOOQO1G.n1G.nOOQO<Z,5>ZOOQO,5=U,5=UOOQO-E:h-E:hO#NvQPO7+%gOOQO7+%g7+%gOOQO7+%i7+%iOOQO<kO$%tQPO'#EZOOQO1G0_1G0_O$%{QPO1G0_O?tQPO,5:pOOQO-E:s-E:sOOQO1G0Z1G0ZOOQO1G0n1G0nO$&QQQO1G0nOOQO<qOOQO1G1Z1G1ZO$+dQPO'#FUOOQO,5=g,5=gOOQO-E:y-E:yO$+iQPO'#GoO$+vQPO,5>cOOQO1G/u1G/uOOQO<sAN>sO!KqQPOAN>sOOQOAN>xAN>xOOQOAN?[AN?[O9eQPOAN?[OOQO1G0`1G0`O$,_QPO1G0`OOQO,5=b,5=bOOQO-E:t-E:tO$,mQPO,5:uOOQO7+%y7+%yOOQO7+&Y7+&YOOQO1G1`1G1`O$,tQQO1G1`OOQO-E:{-E:{O$,|QQO'#IYO$,wQPO1G1`O$&gQPO1G1`O*pQPO1G1`OOQOAN@]AN@]O$-XQQO<tO$.qQPO7+&zO$.vQQO'#IZOOQOAN@nAN@nO$/RQQOAN@nOOQOAN@jAN@jO$/YQPOAN@jO$/_QQO<uOOQOG26YG26YOOQOG26UG26UOOQO<lOWiXuiX%}iX&PiX&RiX&_iX~OZ!aX~P?XOu#OO%}TO&P#SO&R#SO~O%}TO~P3gOg^Oh^Ov#pO!u#rO!z#qO&_!hO&t#oO~O&P!cO&R!dO~P@ZOg^Oh^O%}TO&P!cO&R!dO~O}cO!P%aO~OZ%bO~O}%dO!m%gO~O}cOg&gXh&gXv&gX!S&gX!T&gX!U&gX!V&gX!W&gX!X&gX!Y&gX!Z&gX!]&gX!^&gX!_&gX!u&gX!z&gX%}&gX&P&gX&R&gX&_&gX&t&gX~OW%jOZ%kOgTahTa%}Ta&PTa&RTa~OvTa!STa!TTa!UTa!VTa!WTa!XTa!YTa!ZTa!]Ta!^Ta!_Ta!uTa!zTa#yTa#zTa$WTa$hTa&tTa&_TauTaYTaqTa|Ta!PTa~PC[O&W%nO&Y!tO~Ou#OO%}TOqma&^maYma&nma!Pma~O&vma}ma!rma~PEnO!SyO!TyO!UyO!VyO!WyO!XyO!YyO!ZzO!]yO!^yO!_yO~Og!Rah!Rav!Ra!u!Ra!z!Ra$h!Ra&P!Ra&R!Ra&t!Ra&_!Ra~PFdO#z%pO~Os%rO~Ou%sO%}TO~Ou#OO%}ra&Pra&Rra&vraYrawra&nra&qra!Pra&^raqra~OWra#_ra#ara#bra#dra#era#fra#gra#hra#ira#kra#ora#rra&_ra#prasra|ra~PH_Ou#OO%}TOq&iX!P&iX!b&iX~OY&iX#p&iX~PJ`O!b%vOq!`X!P!`XY!`X~Oq%wO!P&hX~O!P%yO~Ov%zO~Og^Oh^O%}0oO&P!wO&RWO&b%}O~O&^&`P~PKmO%}TO&P!wO&RWO~OW&QXYiXY!aXY&QXZ&QXq!aXu&QXwiX!b&QX#]&QX#_&QX#a&QX#b&QX#d&QX#e&QX#f&QX#g&QX#h&QX#i&QX#k&QX#o&QX#r&QX&^&QX&_&QX&niX&n&QX&qiX&viX&v&QX&x!aX~P?XOWUXYUXY!aXY&]XZUXq!aXuUXw&]X!bUX#]UX#_UX#aUX#bUX#dUX#eUX#fUX#gUX#hUX#iUX#kUX#oUX#rUX&^UX&_UX&nUX&n&]X&q&]X&vUX&v&]X&x!aX~P>lOg^Oh^O%}TO&P!wO&RWOg!RXh!RX&P!RX&R!RX~PFdOu#OOw&XO%}TO&P&UO&R&TO&q&WO~OW#XOY&aX&n&aX&v&aX~P!#YOY&ZO~P9oOg^Oh^O&P!wO&RWO~Oq&]OY&pX~OY&_O~Og^Oh^O%}TO&P!wO&RWOY&pP~PFdOY&dO&n&bO&v#vO~Oq&eO&x$ZOY&wX~OY&gO~O%}TOg%bah%bav%ba!S%ba!T%ba!U%ba!V%ba!W%ba!X%ba!Y%ba!Z%ba!]%ba!^%ba!_%ba!u%ba!z%ba$h%ba&P%ba&R%ba&t%ba&_%ba~O|&hO~P]O}&iO~Op&uOw&vO&PSO&R!qO&_#YO~Oz&tO~P!'iOz&xO&PSO&R!qO&_#YO~OY&eP~P:|Og^Oh^O%}TO&P!wO&RWO~O}cO~P:|OW#XOu#OO%}TO&v&aX~O#r$WO!P#sa#_#sa#a#sa#b#sa#d#sa#e#sa#f#sa#g#sa#h#sa#i#sa#k#sa#o#sa&^#sa&_#sa&n#saY#sa#p#sas#saq#sa|#sa~Oo'_O}'^O!r'`O&_!hO~O}'eO!r'`O~Oo'iO}'hO&_!hO~OZ#xOu'mO%}TO~OW%jO}'sO~OW%jO!P'uO~OW'vO!P'wO~O$h!WO&P0qO&R0pO!P&eP~P/uO!P(SO#p(TO~P9oO}(UO~O$c(WO~O!P(XO~O!P(YO~O!P(ZO~P9oO!P(]O~P9oOZ$lO_VO`VOaVObVOcVOeVOg^Oh^Op!POwkOz!OO%}TO&P(_O&R(^O&XUO~PFdO%Q(hO%U(iOZ$}a_$}a`$}aa$}ab$}ac$}ae$}ag$}ah$}ap$}av$}aw$}az$}a}$}a!P$}a!S$}a!T$}a!U$}a!V$}a!W$}a!X$}a!Y$}a!Z$}a![$}a!]$}a!^$}a!_$}a!u$}a!z$}a#f$}a#r$}a#t$}a#u$}a#y$}a#z$}a$W$}a$Y$}a$`$}a$c$}a$e$}a$h$}a$l$}a$n$}a$s$}a$u$}a$w$}a$y$}a$|$}a%O$}a%w$}a%}$}a&P$}a&R$}a&X$}a&t$}a|$}a$a$}a$q$}a~O}ra!rra'Ora~PH_OZ%bO~PJ`O!P(mO~O!m%gO}&la!P&la~O}cO!P(pO~Oo(tOq!fX&^!fX~Oq(vO&^&mX~O&^(xO~OZ`O_VO`VOaVObVOcVOeVOg^Oh^Op)UOv{Ow)TOz!OO|)PO}cO!PvO![!`O!u}O!z|O#fpO#roO#tpO#upO#y!RO#z!QO$W!SO$Y!TO$`!UO$c!VO$e!XO$h!WO$l!YO$n!ZO$s![O$u!]O$w!^O$y!_O$|!aO%O!bO%}TO&PRO&RQO&XUO&_#YO&tdO~PFdO}%dO~O})]OY&zP~P:|OW%jO!P)dO~Os)eO~Ou#OO%}TOq&ia!P&ia!b&iaY&ia#p&ia~O})fO~P:|Oq%wO!P&ha~Og^Oh^O%}0oO&P!wO&RWO~O&b)mO~P!8jOu#OO%}TOq&aX&^&aXY&aX&n&aX!P&aX~O}&aX!r&aX~P!9SOo)oOp)oOqnX&^nX~Oq)pO&^&`X~O&^)rO~Ou#OOw)tO%}TO&PSO&R!qO~OYma&nma&vma~P!:bOW&QXY!aXq!aXu!aX%}!aX~OWUXY!aXq!aXu!aX%}!aX~OW)wO~Ou#OO%}TO&P#SO&R#SO&q)yO~Og^Oh^O%}TO&P!wO&RWO~PFdOq&]OY&pa~Ou#OO%}TO&P#SO&R#SO&q&WO~OY)|O~OY*PO&n&bO~Oq&eOY&wa~Og^Oh^Ov{O|*XO!u}O%}TO&P!wO&RWO&tdO~PFdO!P*YO~OW^iZ#XXu^i!P^i!b^i#]^i#_^i#a^i#b^i#d^i#e^i#f^i#g^i#h^i#i^i#k^i#o^i#r^i&^^i&_^i&n^i&v^iY^i#p^is^iq^i|^i~OW*iO~Os*jO~P9oOz*kO&PSO&R!qO~O!P]iY]i#p]is]iq]i|]i~P9oOq*lOY&eX!P&eX~P9oOY*nO~O#f$SO#g$TO#k$YO#r$WO!P#^i#_#^i#a#^i#b#^i#d#^i#e#^i#o#^i&^#^i&_#^i&n#^iY#^i#p#^is#^iq#^i|#^i~O#h$UO#i$UO~P!AmO#_#|O#d$QO#e$RO#f$SO#g$TO#h$UO#i$UO#k$YO#r$WO&^#zO&_#zO&n#{O!P#^i#b#^i#o#^iY#^i#p#^is#^iq#^i|#^i~O#a#^i~P!CUO#a#}O~P!CUO#_#|O#f$SO#g$TO#h$UO#i$UO#k$YO#r$WO&^#zO&_#zO!P#^i#a#^i#b#^i#d#^i#e#^i#o#^iY#^i#p#^is#^iq#^i|#^i~O&n#^i~P!DtO&n#{O~P!DtO#f$SO#g$TO#k$YO#r$WO!P#^i#a#^i#b#^i#e#^i#o#^iY#^i#p#^is#^iq#^i|#^i~O#_#|O#d$QO#h$UO#i$UO&^#zO&_#zO&n#{O~P!FdO#k$YO#r$WO!P#^i#_#^i#a#^i#b#^i#d#^i#e#^i#f#^i#h#^i#i#^i#o#^i&^#^i&_#^i&n#^iY#^i#p#^is#^iq#^i|#^i~O#g$TO~P!G{O#g#^i~P!G{O#h#^i#i#^i~P!AmO#p*oO~P9oO#_&aX#a&aX#b&aX#d&aX#e&aX#f&aX#g&aX#h&aX#i&aX#k&aX#o&aX#r&aX&_&aX#p&aXs&aX|&aX~P!9SO!P#liY#li#p#lis#liq#li|#li~P9oO|*rO~P$wO}'^O~O}'^O!r'`O~Oo'_O}'^O!r'`O~O%}TO&P#SO&R#SO|&sP!P&sP~PFdO}'eO~Og^Oh^Ov{O|+PO!P*}O!u}O!z|O%}TO&P!wO&RWO&_!hO&tdO~PFdO}'hO~Oo'iO}'hO~Os+RO~P:|Ou+TO%}TO~Ou'mO})fO%}TOW#Zi!P#Zi#_#Zi#a#Zi#b#Zi#d#Zi#e#Zi#f#Zi#g#Zi#h#Zi#i#Zi#k#Zi#o#Zi#r#Zi&^#Zi&_#Zi&n#Zi&v#ZiY#Zi#p#Zis#Ziq#Zi|#Zi~O}'^OW&diu&di!P&di#_&di#a&di#b&di#d&di#e&di#f&di#g&di#h&di#i&di#k&di#o&di#r&di&^&di&_&di&n&di&v&diY&di#p&dis&diq&di|&di~O#}+]O$P+^O$R+^O$S+_O$T+`O~O|+[O~P##nO$Z+aO&PSO&R!qO~OW+bO!P+cO~O$a+dOZ$_i_$_i`$_ia$_ib$_ic$_ie$_ig$_ih$_ip$_iv$_iw$_iz$_i}$_i!P$_i!S$_i!T$_i!U$_i!V$_i!W$_i!X$_i!Y$_i!Z$_i![$_i!]$_i!^$_i!_$_i!u$_i!z$_i#f$_i#r$_i#t$_i#u$_i#y$_i#z$_i$W$_i$Y$_i$`$_i$c$_i$e$_i$h$_i$l$_i$n$_i$s$_i$u$_i$w$_i$y$_i$|$_i%O$_i%w$_i%}$_i&P$_i&R$_i&X$_i&t$_i|$_i$q$_i~Og^Oh^O$h#sO&P!wO&RWO~O!P+hO~P:|O!P+iO~OZ`O_VO`VOaVObVOcVOeVOg^Oh^Op!POv{OwkOz!OO}cO!PvO!SyO!TyO!UyO!VyO!WyO!XyO!YyO!Z+nO![!`O!]yO!^yO!_yO!u}O!z|O#fpO#roO#tpO#upO#y!RO#z!QO$W!SO$Y!TO$`!UO$c!VO$e!XO$h!WO$l!YO$n!ZO$q+oO$s![O$u!]O$w!^O$y!_O$|!aO%O!bO%}TO&PRO&RQO&XUO&tdO~O|+mO~P#)QOW&QXY&QXZ&QXu&QX!P&QX&viX&v&QX~P?XOWUXYUXZUXuUX!PUX&vUX&v&]X~P>lOW#tOu#uO&v#vO~OW&UXY%XXu&UX!P%XX&v&UX~OZ#XX~P#.VOY+uO!P+sO~O%Q(hO%U(iOZ$}i_$}i`$}ia$}ib$}ic$}ie$}ig$}ih$}ip$}iv$}iw$}iz$}i}$}i!P$}i!S$}i!T$}i!U$}i!V$}i!W$}i!X$}i!Y$}i!Z$}i![$}i!]$}i!^$}i!_$}i!u$}i!z$}i#f$}i#r$}i#t$}i#u$}i#y$}i#z$}i$W$}i$Y$}i$`$}i$c$}i$e$}i$h$}i$l$}i$n$}i$s$}i$u$}i$w$}i$y$}i$|$}i%O$}i%w$}i%}$}i&P$}i&R$}i&X$}i&t$}i|$}i$a$}i$q$}i~OZ+xO~O%Q(hO%U(iOZ%Vi_%Vi`%Via%Vib%Vic%Vie%Vig%Vih%Vip%Viv%Viw%Viz%Vi}%Vi!P%Vi!S%Vi!T%Vi!U%Vi!V%Vi!W%Vi!X%Vi!Y%Vi!Z%Vi![%Vi!]%Vi!^%Vi!_%Vi!u%Vi!z%Vi#f%Vi#r%Vi#t%Vi#u%Vi#y%Vi#z%Vi$W%Vi$Y%Vi$`%Vi$c%Vi$e%Vi$h%Vi$l%Vi$n%Vi$s%Vi$u%Vi$w%Vi$y%Vi$|%Vi%O%Vi%w%Vi%}%Vi&P%Vi&R%Vi&X%Vi&t%Vi|%Vi$a%Vi$q%Vi~Ou#OO%}TO}&oa!P&oa!m&oa~O!P,OO~Oo(tOq!fa&^!fa~Oq(vO&^&ma~O!m%gO}&li!P&li~O|,XO~P]OW,ZO~P5xOW&UXu&UX#_&UX#a&UX#b&UX#d&UX#e&UX#f&UX#g&UX#h&UX#i&UX#k&UX#o&UX#r&UX&^&UX&_&UX&n&UX&v&UX~OZ#xO!P&UX~P#8^OW$gOZ#xO&v#vO~Op,]Ow,]O~Oq,^O}&rX!P&rX~O!b,`O#]#wOY&UXZ#XX~P#8^OY&SXq&SX|&SX!P&SX~P9oO})]O|&yP~P:|OY&SXg%[Xh%[X%}%[X&P%[X&R%[Xq&SX|&SX!P&SX~Oq,cOY&zX~OY,eO~O})fO|&kP~P:|Oq&jX!P&jX|&jXY&jX~P9oO&bTa~PC[Oo)oOp)oOqna&^na~Oq)pO&^&`a~OW,mO~Ow,nO~Ou#OO%}TO&P,rO&R,qO~Og^Oh^Ov#pO!u#rO&P!wO&RWO&t#oO~Og^Oh^Ov{O|,wO!u}O%}TO&P!wO&RWO&tdO~PFdOw-SO&PSO&R!qO&_#YO~Oq*lOY&ea!P&ea~O#_ma#ama#bma#dma#ema#fma#gma#hma#ima#kma#oma#rma&_ma#pmasma|ma~PEnO|-WO~P$wOZ#xO}'^Oq!|X|!|X!P!|X~Oq-[O|&sX!P&sX~O|-_O!P-^O~O&_!hO~P5VOg^Oh^Ov{O|-cO!P*}O!u}O!z|O%}TO&P!wO&RWO&_!hO&tdO~PFdOs-dO~P9oOs-dO~P:|O}'^OW&dqu&dq!P&dq#_&dq#a&dq#b&dq#d&dq#e&dq#f&dq#g&dq#h&dq#i&dq#k&dq#o&dq#r&dq&^&dq&_&dq&n&dq&v&dqY&dq#p&dqs&dqq&dq|&dq~O|-hO~P##nO!W-lO$O-lO&PSO&R!qO~O!P-oO~O$Z-pO&PSO&R!qO~O!b%vO#p-rOq!`X!P!`X~O!P-tO~P9oO!P-tO~P:|O!P-wO~P9oO|-yO~P#)QO![$aO#p-zO~O!P-|O~O!b-}O~OY.QOZ$lO_VO`VOaVObVOcVOeVOg^Oh^Op!POwkOz!OO%}TO&P(_O&R(^O&XUO~PFdOY.QO!P.RO~O%Q(hO%U(iOZ%Vq_%Vq`%Vqa%Vqb%Vqc%Vqe%Vqg%Vqh%Vqp%Vqv%Vqw%Vqz%Vq}%Vq!P%Vq!S%Vq!T%Vq!U%Vq!V%Vq!W%Vq!X%Vq!Y%Vq!Z%Vq![%Vq!]%Vq!^%Vq!_%Vq!u%Vq!z%Vq#f%Vq#r%Vq#t%Vq#u%Vq#y%Vq#z%Vq$W%Vq$Y%Vq$`%Vq$c%Vq$e%Vq$h%Vq$l%Vq$n%Vq$s%Vq$u%Vq$w%Vq$y%Vq$|%Vq%O%Vq%w%Vq%}%Vq&P%Vq&R%Vq&X%Vq&t%Vq|%Vq$a%Vq$q%Vq~Ou#OO%}TO}&oi!P&oi!m&oi~O&n&bOq!ga&^!ga~O!m%gO}&lq!P&lq~O|.^O~P]Op.`Ow&vOz&tO&PSO&R!qO&_#YO~O!P.aO~Oq,^O}&ra!P&ra~O})]O~P:|Oq.gO|&yX~O|.iO~Oq,cOY&za~Oq.mO|&kX~O|.oO~Ow.pO~Oq!aXu!aX!P!aX!b!aX%}!aX~OZ&QX~P#N{OZUX~P#N{O!P.qO~OZ.rO~OW^yZ#XXu^y!P^y!b^y#]^y#_^y#a^y#b^y#d^y#e^y#f^y#g^y#h^y#i^y#k^y#o^y#r^y&^^y&_^y&n^y&v^yY^y#p^ys^yq^y|^y~OY%`aq%`a!P%`a~P9oO!P#nyY#ny#p#nys#nyq#ny|#ny~P9oO}'^Oq!|a|!|a!P!|a~OZ#xO}'^Oq!|a|!|a!P!|a~O%}TO&P#SO&R#SOq%jX|%jX!P%jX~PFdOq-[O|&sa!P&sa~O|!}X~P$wO|/PO~Os/QO~P9oOW%jO!P/RO~OW%jO$Q/WO&PSO&R!qO!P&|P~OW%jO$U/XO~O!P/YO~O!b%vO#p/[Oq!`X!P!`X~OY/^O~O!P/_O~P9oO#p/`O~P9oO!b/bO~OY/cOZ$lO_VO`VOaVObVOcVOeVOg^Oh^Op!POwkOz!OO%}TO&P(_O&R(^O&XUO~PFdOW#[Ou&[X%}&[X&P&[X&R&[X'O&[X~O&_#YO~P$)QOu#OO%}TO'O/eO&P%SX&R%SX~O&n&bOq!gi&^!gi~Op/iO&PSO&R!qO~OW*iOZ#xO~O!P/kO~OY&SXq&SX~P9oO})]Oq%nX|%nX~P:|Oq.gO|&ya~O!b/nO~O})fOq%cX|%cX~P:|Oq.mO|&ka~OY/qO~O!P/rO~OZ/sO~O}'^Oq!|i|!|i!P!|i~O|!}a~P$wOW%jO!P/wO~OW%jOq/xO!P&|X~OY/|O~P9oOY0OO~OY%Xq!P%Xq~P9oO'O/eO&P%Sa&R%Sa~OY0TO~O!P0WO~Ou#OO!P0YO!Z0ZO%}TO~OY0[O~Oq/xO!P&|a~O!P0_O~OW%jOq/xO!P&}X~OY0aO~P9oOY0bO~OY%Xy!P%Xy~P9oOu#OO%}TO&P%ua&R%ua'O%ua~OY0cO~O!P0dO~Ou#OO!P0eO!Z0fO%}TO~OW%jOq%ra!P%ra~Oq/xO!P&}a~O!P0jO~Ou#OO!P0jO!Z0kO%}TO~O!P0lO~O!P0nO~O#p&QXY&QXs&QXq&QX|&QX~P&bO#pUXYUXsUXqUX|UX~P(iO`Q_P#g%y&P&Xc&X~", + goto: "#+S'OPPPP'P'd*x.OP'dPP.d.h0PPPPPP1nP3ZPP4v7l:[WP!?[P!Ap!BW!E]3ZPPP!F|!Jm!MaPP#!P#!SP#$`#$f#&V#&f#&n#'p#(Y#)T#)^#)a#)oP#)r#*OP#*V#*^P#*aP#*lP#*o#*r#*u#*y#+PstOcx![#l$_$m$n$p$q%d(U)Q)R+d+l,Y'urOPXY`acopx!Y![!_!a!e!f!h!i!o!x#P#T#Y#[#_#`#e#i#l#n#u#w#x#|#}$O$P$Q$R$S$T$U$V$Y$Z$[$]$_$e$l$m$n$o$p$q%O%S%V%Z%^%_%b%d%g%k%u%v%{%|&R&S&[&]&`&b&d&i'X'^'_'`'e'h'i'm'n'p'{'|(O(T(U(`(l(t(v({(})O)Q)R)])f)o)p*P*T*W*l*o*p*q*z*{+O+T+d+f+h+i+l+o+r+s+x+},W,Y,^,`,u-[-^-a-r-t-}.R.V.g.m/O/[/_/b/d/n/q0R0X0Z0[0f0h0k0r#xhO`copx!Y![!_!a#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$l$m$n$o$p$q%d%v&d'm(O(T(U)Q)R)])f*P*l*o+T+d+h+i+l+o,Y,`-r-t-}.g.m/[/_/b/n0Z0f0kt!sT!Q!S!T!{!}$k%p+]+^+_+`-k-m/W/X/x0oQ#mdS&Y#`(}Q&l#oU&q#t$g,ZQ&x#vW(b%O+s.R/dU)Y%j'v+bQ)Z%kS)u&S,WU*f&s-R._Q*k&yQ,t*TQ-P*iQ.j,cR.t,uu!sT!Q!S!T!{!}$k%p+]+^+_+`-k-m/W/X/x0oT%l!r)l#{qO`copx!Y![!_!a#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$l$m$n$o$p$q%d%k%v&d'm(O(T(U)Q)R)])f*P*l*o+T+d+h+i+l+o,Y,`-r-t-}.g.m/[/_/b/n0Z0f0k#zlO`copx!Y![!_!a#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$l$m$n$o$p$q%d%k%v&d'm(O(T(U)Q)R)])f*P*l*o+T+d+h+i+l+o,Y,`-r-t-}.g.m/[/_/b/n0Z0f0kX(c%O+s.R/d$TVO`copx!Y![!_!a#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$l$m$n$o$p$q%O%d%k%v&d'm(O(T(U)Q)R)])f*P*l*o+T+d+h+i+l+o+s,Y,`-r-t-}.R.g.m/[/_/b/d/n0Z0f0k$TkO`copx!Y![!_!a#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$l$m$n$o$p$q%O%d%k%v&d'm(O(T(U)Q)R)])f*P*l*o+T+d+h+i+l+o+s,Y,`-r-t-}.R.g.m/[/_/b/d/n0Z0f0k&O[OPX`ceopx!O!Y![!_!a!g!i!o#Y#_#b#e#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Y$Z$[$_$f$l$m$n$o$p$q%O%_%b%d%g%k%v%{&]&b&d&i&t'^'_'`'h'i'm'{'}(O(T(U(d(t)O)Q)R)])f)o)p*P*U*W*l*o*q*{*|+O+T+d+h+i+l+o+s,Y,^,`-^-r-t-}.R.g.m/O/[/_/b/d/n0Z0f0k0rQ&Q#[Q)s&RV.T+x.X/e&O[OPX`ceopx!O!Y![!_!a!g!i!o#Y#_#b#e#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Y$Z$[$_$f$l$m$n$o$p$q%O%_%b%d%g%k%v%{&]&b&d&i&t'^'_'`'h'i'm'{'}(O(T(U(d(t)O)Q)R)])f)o)p*P*U*W*l*o*q*{*|+O+T+d+h+i+l+o+s,Y,^,`-^-r-t-}.R.g.m/O/[/_/b/d/n0Z0f0k0rV.T+x.X/e&O]OPX`ceopx!O!Y![!_!a!g!i!o#Y#_#b#e#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Y$Z$[$_$f$l$m$n$o$p$q%O%_%b%d%g%k%v%{&]&b&d&i&t'^'_'`'h'i'm'{'}(O(T(U(d(t)O)Q)R)])f)o)p*P*U*W*l*o*q*{*|+O+T+d+h+i+l+o+s,Y,^,`-^-r-t-}.R.g.m/O/[/_/b/d/n0Z0f0k0rV.U+x.X/eS#Z[.TS$f!O&tS&s#t$gQ&y#vQ)V%dQ-R*iR._,Z$kZO`copx!Y![!_!a#Y#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Y$Z$_$l$m$n$o$p$q%O%d%g%k%v&b&d'_'`'i'm(O(T(U(t)Q)R)])f)o)p*P*l*o+T+d+h+i+l+o+s,Y,^,`-r-t-}.R.g.m/[/_/b/d/n0Z0f0kQ&O#YR,k)p&P_OPX`ceopx!Y![!_!a!g!i!o#Y#_#b#e#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Y$Z$[$_$l$m$n$o$p$q%O%_%b%d%g%k%v%{&]&b&d&i'^'_'`'h'i'm'{'}(O(T(U(d(t)O)Q)R)])f)o)p*P*U*W*l*o*q*{*|+O+T+d+h+i+l+o+s+x,Y,^,`-^-r-t-}.R.X.g.m/O/[/_/b/d/e/n0Z0f0k0r!o#QY!e!x#R#T#`#n$]%R%S%V%^%u%|&S&[&`'X'|(`(l({(}*T*p*z+f+r+},W,u-a.V/q0R0X0[0h$SkO`copx!Y![!_!a#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$l$m$n$o$p$q%O%d%k%v&d'm(O(T(U)Q)R)])f*P*l*o+T+d+h+i+l+o+s,Y,`-r-t-}.R.g.m/[/_/b/d/n0Z0f0kQ$m!UQ$n!VQ$s!ZQ$|!`R+p(WQ#yiS'q$e*hQ*e&rQ+X'rS,[)T)UQ-O*gQ-Y*vQ.b,]Q.x-QQ.{-ZQ/j.`Q/u.yR0V/iQ'a$bW*[&m'b'c'dQ+W'qU,x*]*^*_Q-X*vQ-f+XS.u,y,zS.z-Y-ZQ/t.vR/v.{]!mP!o'^*q-^/OreOcx![#l$_$m$n$p$q%d(U)Q)R+d+l,Y[!gP!o'^*q-^/OW#b`#e%b&]Q'}$oW(d%O+s.R/dS*U&i*WS*w'e-[S*|'h+OR.X+xh#VY!W!e#n#s%V'|*T*z+f,u-aQ)j%wQ)v&WR,o)y#xnOcopx!Y![!_!a#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$l$m$n$o$p$q%d%k%v&d'm(O(T(U)Q)R)])f*P*l*o+T+d+h+i+l+o,Y,`-r-t-}.g.m/[/_/b/n0Z0f0k^!kP!g!o'^*q-^/Ov#TY!W#`#n#s%w&W&[&`'|(`(})y*T+f+r,u.W/hQ#g`Q$b{Q$c|Q$d}W%S!e%V*z-aS%Y!h(vQ%`!iQ&m#pQ&n#qQ&o#rQ(u%ZS(y%^({Q*R&eS*v'e-[R-Z*wU)h%v)f.mR+V'p[!mP!o'^*q-^/OT*}'h+O^!iP!g!o'^*q-^/OQ'd$bQ'l$dQ*_&mQ*d&oV*{'h*|+OQ%[!hR,S(vQ(s%YR,R(u#znO`copx!Y![!_!a#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$l$m$n$o$p$q%d%k%v&d'm(O(T(U)Q)R)])f*P*l*o+T+d+h+i+l+o,Y,`-r-t-}.g.m/[/_/b/n0Z0f0kQ%c!kS(l%S(yR(|%`T#e`%bU#c`#e%bR)z&]Q%f!lQ(n%UQ(r%XQ,U(zR.],VrvOcx![#l$_$m$n$p$q%d(U)Q)R+d+l,Y[!mP!o'^*q-^/OQ%P!bQ%a!jQ%i!pQ'[$ZQ([$|Q(k%QQ(p%WQ+z(iR.Y+yrtOcx![#l$_$m$n$p$q%d(U)Q)R+d+l,Y[!mP!o'^*q-^/OS*V&i*WT*}'h+OQ'c$bS*^&m'dR,z*_Q'b$bQ'g$cU*]&m'c'dQ*a&nS,y*^*_R.v,zQ*u'`R+Q'iQ'k$dS*c&o'lR,}*dQ'j$dU*b&o'k'lS,|*c*dR.w,}rtOcx![#l$_$m$n$p$q%d(U)Q)R+d+l,Y[!mP!o'^*q-^/OT*}'h+OQ'f$cS*`&n'gR,{*aQ*x'eR.|-[R-`*yQ&j#mR*Z&lT*V&i*WQ%e!lS(q%X%fR,P(rR)R%dWk%O+s.R/d#{lO`copx!Y![!_!a#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$l$m$n$o$p$q%d%k%v&d'm(O(T(U)Q)R)])f*P*l*o+T+d+h+i+l+o,Y,`-r-t-}.g.m/[/_/b/n0Z0f0k$SiO`copx!Y![!_!a#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$l$m$n$o$p$q%O%d%k%v&d'm(O(T(U)Q)R)])f*P*l*o+T+d+h+i+l+o+s,Y,`-r-t-}.R.g.m/[/_/b/d/n0Z0f0kU&r#t$g,ZS*g&s._Q-Q*iR.y-RT'o$e'p!_#|m#a$r$z$}&w&z&{'O'P'Q'R'S'W'Z)[)g+S+g+j-T-V-e-v-{.e/Z/a/}0Q!]$Pm#a$r$z$}&w&z&{'O'P'R'S'W'Z)[)g+S+g+j-T-V-e-v-{.e/Z/a/}0Q#{nO`copx!Y![!_!a#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$l$m$n$o$p$q%d%k%v&d'm(O(T(U)Q)R)])f*P*l*o+T+d+h+i+l+o,Y,`-r-t-}.g.m/[/_/b/n0Z0f0ka)^%k)],`.g/n0Z0f0kQ)`%kR.k,cQ't$hQ)b%oR,f)cT+Y's+ZsvOcx![#l$_$m$n$p$q%d(U)Q)R+d+l,YruOcx![#l$_$m$n$p$q%d(U)Q)R+d+l,YQ$w!]R$y!^R$p!XrvOcx![#l$_$m$n$p$q%d(U)Q)R+d+l,YR(O$oR$q!XR(V$sT+k(U+lX(f%P(g(k+{R+y(hQ.W+xR/h.XQ(j%PQ+w(gQ+|(kR.Z+{R%Q!bQ(e%OV.P+s.R/dQxOQ#lcW$`x#l)Q,YQ)Q%dR,Y)RrXOcx![#l$_$m$n$p$q%d(U)Q)R+d+l,Yn!fP!o#e&]&i'^'e'h*W*q+O+x-[-^/Ol!zX!f#P#_#i$[%Z%_%{&R'n'{)O0r!j#PY!e!x#T#`#n$]%S%V%^%u%|&S&[&`'X'|(`(l({(}*T*p*z+f+r+},W,u-a.V/q0R0X0[0hQ#_`Q#ia#d$[op!Y!_!a#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$l%g%k%v&b&d'_'`'i'm(O(T(t)])f)o*P*l*o+T+h+i+o,^,`-r-t-}.g.m/[/_/b/n0Z0f0kS%Z!h(vS%_!i*{S%{#Y)pQ&R#[S'n$e'pY'{$o%O+s.R/dQ)O%bR0r$YQ!uUR%m!uQ)q&OR,l)q^#RY#`$]'X'|(`*px%R!e!x#n%V%^%|&S&[&`({(}*T*z+f+r,W,u-a.V0R[%t#R%R%u+}0X0hS%u#T%SQ+}(lQ0X/qR0h0[Q*m&{R-U*mQ!oPU%h!o*q/OQ*q'^R/O-^!pbOP`cx![!o#e#l$_$m$n$o$p$q%O%b%d&]&i'^'e'h(U)Q)R*W*q+O+d+l+s+x,Y-[-^.R/O/dY!yX!f#_'{)OT#jb!yQ.n,gR/p.nQ%x#VR)k%xQ&c#fS*O&c.[R.[,QQ(w%[R,T(wQ&^#cR){&^Q,_)WR.d,_Q+O'hR-b+OQ-]*xR.}-]Q*W&iR,v*WQ'p$eR+U'pQ&f#gR*S&fQ.h,aR/m.hQ,d)`R.l,dQ+Z'sR-g+ZQ-k+]R/T-kQ/y/US0^/y0`R0`/{Q+l(UR-x+lQ(g%PS+v(g+{R+{(kQ/f.VR0S/fQ+t(eR.S+t`wOcx#l%d)Q)R,YQ$t![Q']$_Q'y$mQ'z$nQ(Q$pQ(R$qS+k(U+lR-q+d'dsOPXY`acopx!Y![!_!a!e!f!h!i!o!x#P#T#Y#[#_#`#e#i#l#n#u#w#x#|#}$O$P$Q$R$S$T$U$V$Y$Z$[$]$_$e$l$m$n$o$p$q%O%S%V%Z%^%_%b%d%g%u%v%{%|&R&S&[&]&`&b&d&i'X'^'_'`'e'h'i'm'n'p'{'|(O(T(U(`(l(t(v({(})O)Q)R)f)o)p*P*T*W*l*o*p*q*z*{+O+T+d+f+h+i+l+o+r+s+x+},W,Y,^,u-[-^-a-r-t-}.R.V.m/O/[/_/b/d/q0R0X0[0h0ra)_%k)],`.g/n0Z0f0kQ!rTQ$h!QQ$i!SQ$j!TQ%o!{Q%q!}Q'x$kQ)c%pQ)l0oS-i+]+_Q-m+^Q-n+`Q/S-kS/U-m/WQ/{/XR0]/x%uSOT`cdopx!Q!S!T!Y![!_!a!{!}#`#l#o#t#u#v#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$g$k$l$m$n$o$p$q%O%d%j%k%p%v&S&d&s&y'm'v(O(T(U(})Q)R)])f*P*T*i*l*o+T+]+^+_+`+b+d+h+i+l+o+s,W,Y,Z,`,c,u-R-k-m-r-t-}.R._.g.m/W/X/[/_/b/d/n/x0Z0f0k0oQ)a%kQ,a)]S.f,`/nQ/l.gQ0g0ZQ0i0fR0m0krmOcx![#l$_$m$n$p$q%d(U)Q)R+d+l,YS#a`$lQ$WoQ$^pQ$r!YQ$z!_Q$}!aQ&w#uQ&z#wY&{#x$o+h-t/_Q&}#|Q'O#}Q'P$OQ'Q$PQ'R$QQ'S$RQ'T$SQ'U$TQ'V$UQ'W$VQ'Z$Z^)[%k)].g/n0Z0f0kU)g%v)f.mQ*Q&dQ+S'mQ+g(OQ+j(TQ,p*PQ-T*lQ-V*oQ-e+TQ-v+iQ-{+oQ.e,`Q/Z-rQ/a-}Q/}/[R0Q/b#xgO`copx!Y![!_!a#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$l$m$n$o$p$q%k%v&d'm(O(T(U)Q)R)])f*P*l*o+T+d+h+i+l+o,Y,`-r-t-}.g.m/[/_/b/n0Z0f0kW(a%O+s.R/dR)S%drYOcx![#l$_$m$n$p$q%d(U)Q)R+d+l,Y[!eP!o'^*q-^/OW!xX$[%{'{Q#``Q#ne#S$]op!Y!_!a#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$l%k%v&d'm(O(T)])f*P*l*o+T+h+i+o,`-r-t-}.g.m/[/_/b/n0Z0f0kQ%V!gS%^!i*{d%|#Y%g&b'_'`'i(t)o)p,^Q&S#_Q&[#bS&`#e&]Q'X$YQ'|$oW(`%O+s.R/dQ({%_Q(}%bS*T&i*WQ*p0rS*z'h+OQ+f'}Q+r(dQ,W)OQ,u*UQ-a*|S.V+x.XR0R/e&O_OPX`ceopx!Y![!_!a!g!i!o#Y#_#b#e#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Y$Z$[$_$l$m$n$o$p$q%O%_%b%d%g%k%v%{&]&b&d&i'^'_'`'h'i'm'{'}(O(T(U(d(t)O)Q)R)])f)o)p*P*U*W*l*o*q*{*|+O+T+d+h+i+l+o+s+x,Y,^,`-^-r-t-}.R.X.g.m/O/[/_/b/d/e/n0Z0f0k0rQ$e!OQ'r$fR*h&t&ZWOPX`ceopx!O!Y![!_!a!g!i!o#Y#[#_#b#e#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Y$Z$[$_$f$l$m$n$o$p$q%O%_%b%d%g%k%v%{&R&]&b&d&i&t'^'_'`'h'i'm'{'}(O(T(U(d(t)O)Q)R)])f)o)p*P*U*W*l*o*q*{*|+O+T+d+h+i+l+o+s+x,Y,^,`-^-r-t-}.R.X.g.m/O/[/_/b/d/e/n0Z0f0k0rR&P#Y$QjOcopx!Y![!_!a#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$l$m$n$o$p$q%O%d%k%v&d'm(O(T(U)Q)R)])f*P*l*o+T+d+h+i+l+o+s,Y,`-r-t-}.R.g.m/[/_/b/d/n0Z0f0kQ#f`Q&O#YQ'Y$YU)W%g'`'iQ)}&bQ*s'_Q,Q(tQ,j)oQ,k)pR.c,^Q)n%}R,i)m$SfO`copx!Y![!_!a#l#u#w#x#|#}$O$P$Q$R$S$T$U$V$Z$_$l$m$n$o$p$q%O%d%k%v&d'm(O(T(U)Q)R)])f*P*l*o+T+d+h+i+l+o+s,Y,`-r-t-}.R.g.m/[/_/b/d/n0Z0f0kT&p#t,ZQ&|#xQ(P$oQ-u+hQ/]-tR0P/_]!nP!o'^*q-^/O#PaOPX`bcx![!f!o!y#_#e#l$_$m$n$o$p$q%O%b%d&]&i'^'e'h'{(U)O)Q)R*W*q+O+d+l+s+x,Y-[-^.R/O/dU#WY!W'|Q%T!eU&k#n#s+fQ(o%VS,s*T*zT.s,u-aj#UY!W!e#n#s%V%w&W)y*T*z,u-aU&V#`&`(}Q)x&[Q+e'|Q+q(`Q-s+fQ.O+rQ/g.WR0U/hQ)i%vQ,g)fR/o.mR,h)f`!jP!o'^'h*q+O-^/OT%W!g*|R%]!hW%U!e%V*z-aQ(z%^R,V({S#d`%bR&a#eQ)X%gT*t'`'iR*y'e[!lP!o'^*q-^/OR%X!gR#h`R,b)]R)a%kT-j+]-kQ/V-mR/z/WR/z/X", + nodeNames: "\u26A0 LineComment BlockComment Program ModuleDeclaration MarkerAnnotation Identifier ScopedIdentifier . Annotation ) ( AnnotationArgumentList AssignmentExpression FieldAccess IntegerLiteral FloatingPointLiteral BooleanLiteral CharacterLiteral StringLiteral TextBlock null ClassLiteral void PrimitiveType TypeName ScopedTypeName GenericType TypeArguments AnnotatedType Wildcard extends super , ArrayType ] Dimension [ class this ParenthesizedExpression ObjectCreationExpression new ArgumentList } { ClassBody ; FieldDeclaration Modifiers public protected private abstract static final strictfp default synchronized native transient volatile VariableDeclarator Definition AssignOp ArrayInitializer MethodDeclaration TypeParameters TypeParameter TypeBound FormalParameters ReceiverParameter FormalParameter SpreadParameter Throws throws Block ClassDeclaration Superclass SuperInterfaces implements InterfaceTypeList InterfaceDeclaration interface ExtendsInterfaces InterfaceBody ConstantDeclaration EnumDeclaration enum EnumBody EnumConstant EnumBodyDeclarations AnnotationTypeDeclaration AnnotationTypeBody AnnotationTypeElementDeclaration StaticInitializer ConstructorDeclaration ConstructorBody ExplicitConstructorInvocation ArrayAccess MethodInvocation MethodName MethodReference ArrayCreationExpression Dimension AssignOp BinaryExpression CompareOp CompareOp LogicOp LogicOp BitOp BitOp BitOp ArithOp ArithOp ArithOp BitOp InstanceofExpression instanceof LambdaExpression InferredParameters TernaryExpression LogicOp : UpdateExpression UpdateOp UnaryExpression LogicOp BitOp CastExpression ElementValueArrayInitializer ElementValuePair open module ModuleBody ModuleDirective requires transitive exports to opens uses provides with PackageDeclaration package ImportDeclaration import Asterisk ExpressionStatement LabeledStatement Label IfStatement if else WhileStatement while ForStatement for ForSpec LocalVariableDeclaration var EnhancedForStatement ForSpec AssertStatement assert SwitchStatement switch SwitchBlock SwitchLabel case DoStatement do BreakStatement break ContinueStatement continue ReturnStatement return SynchronizedStatement ThrowStatement throw TryStatement try CatchClause catch CatchFormalParameter CatchType FinallyClause finally TryWithResourcesStatement ResourceSpecification Resource ClassContent", + maxTerm: 276, + nodeProps: [ + ["isolate", -4, 1, 2, 18, 19, ""], + ["group", -26, 4, 47, 76, 77, 82, 87, 92, 145, 147, 150, 151, 153, 156, 158, 161, 163, 165, 167, 172, 174, 176, 178, 180, 181, 183, 191, "Statement", -25, 6, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 39, 40, 41, 99, 100, 102, 103, 106, 118, 120, 122, 125, 127, 130, "Expression", -7, 23, 24, 25, 26, 27, 29, 34, "Type"], + ["openedBy", 10, "(", 44, "{"], + ["closedBy", 11, ")", 45, "}"] + ], + propSources: [javaHighlighting], + skippedNodes: [0, 1, 2], + repeatNodeCount: 28, + tokenData: "#'f_R!_OX%QXY'fYZ)bZ^'f^p%Qpq'fqr*|rs,^st%Qtu4euv5zvw7[wx8rxyAZyzAwz{Be{|CZ|}Dq}!OE_!O!PFx!P!Q! r!Q!R!,h!R![!0`![!]!>p!]!^!@Q!^!_!@n!_!`!BX!`!a!B{!a!b!Di!b!c!EX!c!}!LT!}#O!Mj#O#P%Q#P#Q!NW#Q#R!Nt#R#S4e#S#T%Q#T#o4e#o#p# h#p#q#!U#q#r##n#r#s#$[#s#y%Q#y#z'f#z$f%Q$f$g'f$g#BY4e#BY#BZ#$x#BZ$IS4e$IS$I_#$x$I_$I|4e$I|$JO#$x$JO$JT4e$JT$JU#$x$JU$KV4e$KV$KW#$x$KW&FU4e&FU&FV#$x&FV;'S4e;'S;=`5t<%lO4eS%VV&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QS%qO&YSS%tVOY&ZYZ%lZr&Zrs&ys;'S&Z;'S;=`'`<%lO&ZS&^VOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QS&vP;=`<%l%QS&|UOY&ZYZ%lZr&Zs;'S&Z;'S;=`'`<%lO&ZS'cP;=`<%l&Z_'mk&YS%yZOX%QXY'fYZ)bZ^'f^p%Qpq'fqr%Qrs%qs#y%Q#y#z'f#z$f%Q$f$g'f$g#BY%Q#BY#BZ'f#BZ$IS%Q$IS$I_'f$I_$I|%Q$I|$JO'f$JO$JT%Q$JT$JU'f$JU$KV%Q$KV$KW'f$KW&FU%Q&FU&FV'f&FV;'S%Q;'S;=`&s<%lO%Q_)iY&YS%yZX^*Xpq*X#y#z*X$f$g*X#BY#BZ*X$IS$I_*X$I|$JO*X$JT$JU*X$KV$KW*X&FU&FV*XZ*^Y%yZX^*Xpq*X#y#z*X$f$g*X#BY#BZ*X$IS$I_*X$I|$JO*X$JT$JU*X$KV$KW*X&FU&FV*XV+TX#tP&YSOY%QYZ%lZr%Qrs%qs!_%Q!_!`+p!`;'S%Q;'S;=`&s<%lO%QU+wV#_Q&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QT,aXOY,|YZ%lZr,|rs3Ys#O,|#O#P2d#P;'S,|;'S;=`3S<%lO,|T-PXOY-lYZ%lZr-lrs.^s#O-l#O#P.x#P;'S-l;'S;=`2|<%lO-lT-qX&YSOY-lYZ%lZr-lrs.^s#O-l#O#P.x#P;'S-l;'S;=`2|<%lO-lT.cVcPOY&ZYZ%lZr&Zrs&ys;'S&Z;'S;=`'`<%lO&ZT.}V&YSOY-lYZ/dZr-lrs1]s;'S-l;'S;=`2|<%lO-lT/iW&YSOY0RZr0Rrs0ns#O0R#O#P0s#P;'S0R;'S;=`1V<%lO0RP0UWOY0RZr0Rrs0ns#O0R#O#P0s#P;'S0R;'S;=`1V<%lO0RP0sOcPP0vTOY0RYZ0RZ;'S0R;'S;=`1V<%lO0RP1YP;=`<%l0RT1`XOY,|YZ%lZr,|rs1{s#O,|#O#P2d#P;'S,|;'S;=`3S<%lO,|T2QUcPOY&ZYZ%lZr&Zs;'S&Z;'S;=`'`<%lO&ZT2gVOY-lYZ/dZr-lrs1]s;'S-l;'S;=`2|<%lO-lT3PP;=`<%l-lT3VP;=`<%l,|T3_VcPOY&ZYZ%lZr&Zrs3ts;'S&Z;'S;=`'`<%lO&ZT3yR&WSXY4SYZ4`pq4SP4VRXY4SYZ4`pq4SP4eO&XP_4lb&YS&PZOY%QYZ%lZr%Qrs%qst%Qtu4eu!Q%Q!Q![4e![!c%Q!c!}4e!}#R%Q#R#S4e#S#T%Q#T#o4e#o$g%Q$g;'S4e;'S;=`5t<%lO4e_5wP;=`<%l4eU6RX#hQ&YSOY%QYZ%lZr%Qrs%qs!_%Q!_!`6n!`;'S%Q;'S;=`&s<%lO%QU6uV#]Q&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QV7cZ&nR&YSOY%QYZ%lZr%Qrs%qsv%Qvw8Uw!_%Q!_!`6n!`;'S%Q;'S;=`&s<%lO%QU8]V#aQ&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QT8wZ&YSOY9jYZ%lZr9jrs:xsw9jwx%Qx#O9j#O#PhYZ%lZr>hrs?dsw>hwx;hx#O>h#O#P&Z#P;'S>h;'S;=`@}<%lO>hT>kZOYhYZ%lZr>hrs@Ysw>hwx;hx#O>h#O#P&Z#P;'S>h;'S;=`@}<%lO>hP@]VOY@YZw@Ywx@rx#O@Y#P;'S@Y;'S;=`@w<%lO@YP@wObPP@zP;=`<%l@YTAQP;=`<%l>hTAWP;=`<%l9j_AbVZZ&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QVBOVYR&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QVBnX$ZP&YS#gQOY%QYZ%lZr%Qrs%qs!_%Q!_!`6n!`;'S%Q;'S;=`&s<%lO%QVCbZ#fR&YSOY%QYZ%lZr%Qrs%qs{%Q{|DT|!_%Q!_!`6n!`;'S%Q;'S;=`&s<%lO%QVD[V#rR&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QVDxVqR&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QVEf[#fR&YSOY%QYZ%lZr%Qrs%qs}%Q}!ODT!O!_%Q!_!`6n!`!aF[!a;'S%Q;'S;=`&s<%lO%QVFcV&xR&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%Q_GPZWY&YSOY%QYZ%lZr%Qrs%qs!O%Q!O!PGr!P!Q%Q!Q![IQ![;'S%Q;'S;=`&s<%lO%QVGwX&YSOY%QYZ%lZr%Qrs%qs!O%Q!O!PHd!P;'S%Q;'S;=`&s<%lO%QVHkV&qR&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QTIXc&YS`POY%QYZ%lZr%Qrs%qs!Q%Q!Q![IQ![!f%Q!f!gJd!g!hKQ!h!iJd!i#R%Q#R#SNz#S#W%Q#W#XJd#X#YKQ#Y#ZJd#Z;'S%Q;'S;=`&s<%lO%QTJkV&YS`POY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QTKV]&YSOY%QYZ%lZr%Qrs%qs{%Q{|LO|}%Q}!OLO!O!Q%Q!Q![Lp![;'S%Q;'S;=`&s<%lO%QTLTX&YSOY%QYZ%lZr%Qrs%qs!Q%Q!Q![Lp![;'S%Q;'S;=`&s<%lO%QTLwc&YS`POY%QYZ%lZr%Qrs%qs!Q%Q!Q![Lp![!f%Q!f!gJd!g!h%Q!h!iJd!i#R%Q#R#SNS#S#W%Q#W#XJd#X#Y%Q#Y#ZJd#Z;'S%Q;'S;=`&s<%lO%QTNXZ&YSOY%QYZ%lZr%Qrs%qs!Q%Q!Q![Lp![#R%Q#R#SNS#S;'S%Q;'S;=`&s<%lO%QT! PZ&YSOY%QYZ%lZr%Qrs%qs!Q%Q!Q![IQ![#R%Q#R#SNz#S;'S%Q;'S;=`&s<%lO%Q_! y]&YS#gQOY%QYZ%lZr%Qrs%qsz%Qz{!!r{!P%Q!P!Q!)e!Q!_%Q!_!`6n!`;'S%Q;'S;=`&s<%lO%Q_!!wX&YSOY!!rYZ!#dZr!!rrs!%Psz!!rz{!&_{;'S!!r;'S;=`!'s<%lO!!r_!#iT&YSOz!#xz{!$[{;'S!#x;'S;=`!$y<%lO!#xZ!#{TOz!#xz{!$[{;'S!#x;'S;=`!$y<%lO!#xZ!$_VOz!#xz{!$[{!P!#x!P!Q!$t!Q;'S!#x;'S;=`!$y<%lO!#xZ!$yOQZZ!$|P;=`<%l!#x_!%SXOY!%oYZ!#dZr!%ors!'ysz!%oz{!(i{;'S!%o;'S;=`!)_<%lO!%o_!%rXOY!!rYZ!#dZr!!rrs!%Psz!!rz{!&_{;'S!!r;'S;=`!'s<%lO!!r_!&dZ&YSOY!!rYZ!#dZr!!rrs!%Psz!!rz{!&_{!P!!r!P!Q!'V!Q;'S!!r;'S;=`!'s<%lO!!r_!'^V&YSQZOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%Q_!'vP;=`<%l!!r_!'|XOY!%oYZ!#dZr!%ors!#xsz!%oz{!(i{;'S!%o;'S;=`!)_<%lO!%o_!(lZOY!!rYZ!#dZr!!rrs!%Psz!!rz{!&_{!P!!r!P!Q!'V!Q;'S!!r;'S;=`!'s<%lO!!r_!)bP;=`<%l!%o_!)lV&YSPZOY!)eYZ%lZr!)ers!*Rs;'S!)e;'S;=`!+X<%lO!)e_!*WVPZOY!*mYZ%lZr!*mrs!+_s;'S!*m;'S;=`!,b<%lO!*m_!*rVPZOY!)eYZ%lZr!)ers!*Rs;'S!)e;'S;=`!+X<%lO!)e_!+[P;=`<%l!)e_!+dVPZOY!*mYZ%lZr!*mrs!+ys;'S!*m;'S;=`!,b<%lO!*mZ!,OSPZOY!+yZ;'S!+y;'S;=`!,[<%lO!+yZ!,_P;=`<%l!+y_!,eP;=`<%l!*mT!,ou&YS_POY%QYZ%lZr%Qrs%qs!O%Q!O!P!/S!P!Q%Q!Q![!0`![!d%Q!d!e!3j!e!f%Q!f!gJd!g!hKQ!h!iJd!i!n%Q!n!o!2U!o!q%Q!q!r!5h!r!z%Q!z!{!7`!{#R%Q#R#S!2r#S#U%Q#U#V!3j#V#W%Q#W#XJd#X#YKQ#Y#ZJd#Z#`%Q#`#a!2U#a#c%Q#c#d!5h#d#l%Q#l#m!7`#m;'S%Q;'S;=`&s<%lO%QT!/Za&YS`POY%QYZ%lZr%Qrs%qs!Q%Q!Q![IQ![!f%Q!f!gJd!g!hKQ!h!iJd!i#W%Q#W#XJd#X#YKQ#Y#ZJd#Z;'S%Q;'S;=`&s<%lO%QT!0gi&YS_POY%QYZ%lZr%Qrs%qs!O%Q!O!P!/S!P!Q%Q!Q![!0`![!f%Q!f!gJd!g!hKQ!h!iJd!i!n%Q!n!o!2U!o#R%Q#R#S!2r#S#W%Q#W#XJd#X#YKQ#Y#ZJd#Z#`%Q#`#a!2U#a;'S%Q;'S;=`&s<%lO%QT!2]V&YS_POY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QT!2wZ&YSOY%QYZ%lZr%Qrs%qs!Q%Q!Q![!0`![#R%Q#R#S!2r#S;'S%Q;'S;=`&s<%lO%QT!3oY&YSOY%QYZ%lZr%Qrs%qs!Q%Q!Q!R!4_!R!S!4_!S;'S%Q;'S;=`&s<%lO%QT!4f`&YS_POY%QYZ%lZr%Qrs%qs!Q%Q!Q!R!4_!R!S!4_!S!n%Q!n!o!2U!o#R%Q#R#S!3j#S#`%Q#`#a!2U#a;'S%Q;'S;=`&s<%lO%QT!5mX&YSOY%QYZ%lZr%Qrs%qs!Q%Q!Q!Y!6Y!Y;'S%Q;'S;=`&s<%lO%QT!6a_&YS_POY%QYZ%lZr%Qrs%qs!Q%Q!Q!Y!6Y!Y!n%Q!n!o!2U!o#R%Q#R#S!5h#S#`%Q#`#a!2U#a;'S%Q;'S;=`&s<%lO%QT!7e_&YSOY%QYZ%lZr%Qrs%qs!O%Q!O!P!8d!P!Q%Q!Q![!:r![!c%Q!c!i!:r!i#T%Q#T#Z!:r#Z;'S%Q;'S;=`&s<%lO%QT!8i]&YSOY%QYZ%lZr%Qrs%qs!Q%Q!Q![!9b![!c%Q!c!i!9b!i#T%Q#T#Z!9b#Z;'S%Q;'S;=`&s<%lO%QT!9gc&YSOY%QYZ%lZr%Qrs%qs!Q%Q!Q![!9b![!c%Q!c!i!9b!i!r%Q!r!sKQ!s#R%Q#R#S!8d#S#T%Q#T#Z!9b#Z#d%Q#d#eKQ#e;'S%Q;'S;=`&s<%lO%QT!:yi&YS_POY%QYZ%lZr%Qrs%qs!O%Q!O!P!wX#pR&YSOY%QYZ%lZr%Qrs%qs![%Q![!]!?d!];'S%Q;'S;=`&s<%lO%QV!?kV&vR&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QV!@XV!PR&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%Q_!@uY&_Z&YSOY%QYZ%lZr%Qrs%qs!^%Q!^!_!Ae!_!`+p!`;'S%Q;'S;=`&s<%lO%QU!AlX#iQ&YSOY%QYZ%lZr%Qrs%qs!_%Q!_!`6n!`;'S%Q;'S;=`&s<%lO%QV!B`X!bR&YSOY%QYZ%lZr%Qrs%qs!_%Q!_!`+p!`;'S%Q;'S;=`&s<%lO%QV!CSY&^R&YSOY%QYZ%lZr%Qrs%qs!_%Q!_!`+p!`!a!Cr!a;'S%Q;'S;=`&s<%lO%QU!CyY#iQ&YSOY%QYZ%lZr%Qrs%qs!_%Q!_!`6n!`!a!Ae!a;'S%Q;'S;=`&s<%lO%Q_!DrV&bX#oQ&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%Q_!E`X%}Z&YSOY%QYZ%lZr%Qrs%qs#]%Q#]#^!E{#^;'S%Q;'S;=`&s<%lO%QV!FQX&YSOY%QYZ%lZr%Qrs%qs#b%Q#b#c!Fm#c;'S%Q;'S;=`&s<%lO%QV!FrX&YSOY%QYZ%lZr%Qrs%qs#h%Q#h#i!G_#i;'S%Q;'S;=`&s<%lO%QV!GdX&YSOY%QYZ%lZr%Qrs%qs#X%Q#X#Y!HP#Y;'S%Q;'S;=`&s<%lO%QV!HUX&YSOY%QYZ%lZr%Qrs%qs#f%Q#f#g!Hq#g;'S%Q;'S;=`&s<%lO%QV!HvX&YSOY%QYZ%lZr%Qrs%qs#Y%Q#Y#Z!Ic#Z;'S%Q;'S;=`&s<%lO%QV!IhX&YSOY%QYZ%lZr%Qrs%qs#T%Q#T#U!JT#U;'S%Q;'S;=`&s<%lO%QV!JYX&YSOY%QYZ%lZr%Qrs%qs#V%Q#V#W!Ju#W;'S%Q;'S;=`&s<%lO%QV!JzX&YSOY%QYZ%lZr%Qrs%qs#X%Q#X#Y!Kg#Y;'S%Q;'S;=`&s<%lO%QV!KnV&tR&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%Q_!L[b&RZ&YSOY%QYZ%lZr%Qrs%qst%Qtu!LTu!Q%Q!Q![!LT![!c%Q!c!}!LT!}#R%Q#R#S!LT#S#T%Q#T#o!LT#o$g%Q$g;'S!LT;'S;=`!Md<%lO!LT_!MgP;=`<%l!LT_!MqVuZ&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QV!N_VsR&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QU!N{X#eQ&YSOY%QYZ%lZr%Qrs%qs!_%Q!_!`6n!`;'S%Q;'S;=`&s<%lO%QV# oV}R&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%Q_#!_Z'OX#dQ&YSOY%QYZ%lZr%Qrs%qs!_%Q!_!`6n!`#p%Q#p#q##Q#q;'S%Q;'S;=`&s<%lO%QU##XV#bQ&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QV##uV|R&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%QT#$cV#uP&YSOY%QYZ%lZr%Qrs%qs;'S%Q;'S;=`&s<%lO%Q_#%Ru&YS%yZ&PZOX%QXY'fYZ)bZ^'f^p%Qpq'fqr%Qrs%qst%Qtu4eu!Q%Q!Q![4e![!c%Q!c!}4e!}#R%Q#R#S4e#S#T%Q#T#o4e#o#y%Q#y#z'f#z$f%Q$f$g'f$g#BY4e#BY#BZ#$x#BZ$IS4e$IS$I_#$x$I_$I|4e$I|$JO#$x$JO$JT4e$JT$JU#$x$JU$KV4e$KV$KW#$x$KW&FU4e&FU&FV#$x&FV;'S4e;'S;=`5t<%lO4e", + tokenizers: [0, 1, 2, 3], + topRules: { "Program": [0, 3], "ClassContent": [1, 194] }, + dynamicPrecedences: { "27": 1, "232": -1, "243": -1 }, + specialized: [{ term: 231, get: (value) => spec_identifier6[value] || -1 }], + tokenPrec: 7144 + }); + + // node_modules/@codemirror/lang-java/dist/index.js + var javaLanguage = /* @__PURE__ */ LRLanguage.define({ + name: "java", + parser: /* @__PURE__ */ parser12.configure({ + props: [ + /* @__PURE__ */ indentNodeProp.add({ + IfStatement: /* @__PURE__ */ continuedIndent({ except: /^\s*({|else\b)/ }), + TryStatement: /* @__PURE__ */ continuedIndent({ except: /^\s*({|catch|finally)\b/ }), + LabeledStatement: flatIndent, + SwitchBlock: (context) => { + let after = context.textAfter, closed = /^\s*\}/.test(after), isCase = /^\s*(case|default)\b/.test(after); + return context.baseIndent + (closed ? 0 : isCase ? 1 : 2) * context.unit; + }, + Block: /* @__PURE__ */ delimitedIndent({ closing: "}" }), + BlockComment: () => null, + Statement: /* @__PURE__ */ continuedIndent({ except: /^{/ }) + }), + /* @__PURE__ */ foldNodeProp.add({ + ["Block SwitchBlock ClassBody ElementValueArrayInitializer ModuleBody EnumBody ConstructorBody InterfaceBody ArrayInitializer"]: foldInside, + BlockComment(tree) { + return { from: tree.from + 2, to: tree.to - 2 }; + } + }) + ] + }), + languageData: { + commentTokens: { line: "//", block: { open: "/*", close: "*/" } }, + indentOnInput: /^\s*(?:case |default:|\{|\})$/ + } + }); + function java() { + return new LanguageSupport(javaLanguage); + } + + // node_modules/@lezer/cpp/dist/index.js + var RawString2 = 1; + var templateArgsEndFallback = 2; + var MacroName = 3; + var R = 82; + var L = 76; + var u = 117; + var U = 85; + var a = 97; + var z = 122; + var A = 65; + var Z = 90; + var Underscore = 95; + var Zero2 = 48; + var Quote2 = 34; + var ParenL3 = 40; + var ParenR2 = 41; + var Space2 = 32; + var GreaterThan2 = 62; + var rawString = new ExternalTokenizer((input) => { + if (input.next == L || input.next == U) { + input.advance(); + } else if (input.next == u) { + input.advance(); + if (input.next == Zero2 + 8) input.advance(); + } + if (input.next != R) return; + input.advance(); + if (input.next != Quote2) return; + input.advance(); + let marker = ""; + while (input.next != ParenL3) { + if (input.next == Space2 || input.next <= 13 || input.next == ParenR2) return; + marker += String.fromCharCode(input.next); + input.advance(); + } + input.advance(); + for (; ; ) { + if (input.next < 0) + return input.acceptToken(RawString2); + if (input.next == ParenR2) { + let match = true; + for (let i = 0; match && i < marker.length; i++) + if (input.peek(i + 1) != marker.charCodeAt(i)) match = false; + if (match && input.peek(marker.length + 1) == Quote2) + return input.acceptToken(RawString2, 2 + marker.length); + } + input.advance(); + } + }); + var fallback = new ExternalTokenizer((input) => { + if (input.next == GreaterThan2) { + if (input.peek(1) == GreaterThan2) + input.acceptToken(templateArgsEndFallback, 1); + } else { + let sawLetter = false, i = 0; + for (; ; i++) { + if (input.next >= A && input.next <= Z) sawLetter = true; + else if (input.next >= a && input.next <= z) return; + else if (input.next != Underscore && !(input.next >= Zero2 && input.next <= Zero2 + 9)) break; + input.advance(); + } + if (sawLetter && i > 1) input.acceptToken(MacroName); + } + }, { extend: true }); + var cppHighlighting = styleTags({ + "typedef struct union enum class typename decltype auto template operator friend noexcept namespace using requires concept import export module __attribute__ __declspec __based": tags.definitionKeyword, + "extern MsCallModifier MsPointerModifier extern static register thread_local inline const volatile restrict _Atomic mutable constexpr constinit consteval virtual explicit VirtualSpecifier Access": tags.modifier, + "if else switch for while do case default return break continue goto throw try catch": tags.controlKeyword, + "co_return co_yield co_await": tags.controlKeyword, + "new sizeof delete static_assert": tags.operatorKeyword, + "NULL nullptr": tags.null, + this: tags.self, + "True False": tags.bool, + "TypeSize PrimitiveType": tags.standard(tags.typeName), + TypeIdentifier: tags.typeName, + FieldIdentifier: tags.propertyName, + "CallExpression/FieldExpression/FieldIdentifier": tags.function(tags.propertyName), + "ModuleName/Identifier": tags.namespace, + "PartitionName": tags.labelName, + StatementIdentifier: tags.labelName, + "Identifier DestructorName": tags.variableName, + "CallExpression/Identifier": tags.function(tags.variableName), + "CallExpression/ScopedIdentifier/Identifier": tags.function(tags.variableName), + "FunctionDeclarator/Identifier FunctionDeclarator/DestructorName": tags.function(tags.definition(tags.variableName)), + NamespaceIdentifier: tags.namespace, + OperatorName: tags.operator, + ArithOp: tags.arithmeticOperator, + LogicOp: tags.logicOperator, + BitOp: tags.bitwiseOperator, + CompareOp: tags.compareOperator, + AssignOp: tags.definitionOperator, + UpdateOp: tags.updateOperator, + LineComment: tags.lineComment, + BlockComment: tags.blockComment, + Number: tags.number, + String: tags.string, + "RawString SystemLibString": tags.special(tags.string), + CharLiteral: tags.character, + EscapeSequence: tags.escape, + "UserDefinedLiteral/Identifier": tags.literal, + PreprocArg: tags.meta, + "PreprocDirectiveName #include #ifdef #ifndef #if #define #else #endif #elif": tags.processingInstruction, + MacroName: tags.special(tags.name), + "( )": tags.paren, + "[ ]": tags.squareBracket, + "{ }": tags.brace, + "< >": tags.angleBracket, + ". ->": tags.derefOperator, + ", ;": tags.separator + }); + var spec_identifier7 = { __proto__: null, bool: 36, char: 36, int: 36, float: 36, double: 36, void: 36, size_t: 36, ssize_t: 36, intptr_t: 36, uintptr_t: 36, charptr_t: 36, int8_t: 36, int16_t: 36, int32_t: 36, int64_t: 36, uint8_t: 36, uint16_t: 36, uint32_t: 36, uint64_t: 36, char8_t: 36, char16_t: 36, char32_t: 36, char64_t: 36, const: 70, volatile: 72, restrict: 74, _Atomic: 76, mutable: 78, constexpr: 80, constinit: 82, consteval: 84, struct: 88, __declspec: 92, final: 148, override: 148, public: 152, private: 152, protected: 152, virtual: 154, extern: 160, static: 162, register: 164, inline: 166, thread_local: 168, __attribute__: 172, __based: 178, __restrict: 180, __uptr: 180, __sptr: 180, _unaligned: 180, __unaligned: 180, noexcept: 194, requires: 198, TRUE: 798, true: 798, FALSE: 800, false: 800, typename: 218, class: 220, template: 234, throw: 248, __cdecl: 256, __clrcall: 256, __stdcall: 256, __fastcall: 256, __thiscall: 256, __vectorcall: 256, try: 260, catch: 264, export: 282, import: 286, case: 296, default: 298, if: 308, else: 314, switch: 318, do: 322, while: 324, for: 330, return: 334, break: 338, continue: 342, goto: 346, co_return: 350, co_yield: 354, using: 362, typedef: 366, namespace: 380, new: 398, delete: 400, co_await: 402, concept: 406, enum: 410, static_assert: 414, friend: 422, union: 424, explicit: 430, operator: 444, module: 456, signed: 518, unsigned: 518, long: 518, short: 518, decltype: 528, auto: 530, sizeof: 566, NULL: 572, nullptr: 586, this: 588 }; + var spec_ = { __proto__: null, "<": 767 }; + var spec_templateArgsEnd = { __proto__: null, ">": 135 }; + var spec_scopedIdentifier = { __proto__: null, operator: 388, new: 576, delete: 582 }; + var parser13 = LRParser.deserialize({ + version: 14, + states: "$<[Q!QQVOOP'gOUOOO([OWO'#CdO,UQUO'#CgO,`QUO'#FjO-vQbO'#CxO.XQUO'#CxO0WQUO'#KaO0_QUO'#CwO0jOpO'#DvO0rQ!dO'#D]OOQR'#JP'#JPO5[QVO'#GUO5iQUO'#JWOOQQ'#JW'#JWO8}QUO'#KtOxQVO'#IbO!(}QVO'#IdO!?SQUO'#IgO!?ZQVO'#IjP!AQO!LQO'#CaP!A]{,UO'#CbP!6q{,UO'#CbP!Ah{7[O'#CbP!6q{,UO'#CbP!Am{,UO'#CbP!AxOSO'#IzPOOO)CEp)CEpOOOO'#I}'#I}O!BSOWO,59OOOQR,59O,59OO!(}QVO,59VOOQQ,59X,59XOOQR'#Do'#DoO!(}QVO,5;ROOQR,5qOOQR'#IX'#IXOOQR'#IY'#IYOOQR'#IZ'#IZOOQR'#I['#I[O!(}QVO,5>rO!(}QVO,5>rO!(}QVO,5>rO!(}QVO,5>rO!(}QVO,5>rO!(}QVO,5>rO!(}QVO,5>rO!(}QVO,5>rO!(}QVO,5>rO!(}QVO,5>rO!D^QVO,5>zOOQQ,5?W,5?WO!FPQVO'#CjO!IxQUO'#CzOOQQ,59d,59dOOQQ,59c,59cOOQQ,5<},5<}O!JVQ&lO,5=mO!?SQUO,5?RO!LyQVO,5?UO!MQQbO,59dO!M]QVO'#FYOOQQ,5?P,5?PO!MmQVO,59WO!MtO`O,5:bO!MyQbO'#D^O!N[QbO'#KeO!NjQbO,59wO!NrQbO'#CxO# TQUO'#CxO# YQUO'#KaO# dQUO'#CwOOQR-E<}-E<}O# oQUO,5AvO# vQVO'#EfO@[QVO'#EiOBXQUO,5;kOOQR,5l,5>lO#3uQUO'#CgO#4kQUO,5>pO#6^QUO'#IeOOQR'#JO'#JOO#6fQUO,5:xO#7SQUO,5:xO#7sQUO,5:xO#8hQUO'#CuO!0TQUO'#CmOOQQ'#JX'#JXO#7SQUO,5:xO#8pQUO,5;QO!4{QUO'#DOO#9yQUO,5;QO#:OQUO,5>QO#;[QUO'#DOO#;rQUO,5>{O#;wQUO'#LOO#=QQUO,5;TO#=YQVO,5;TO#=dQUO,5;TOOQQ,5;T,5;TO#?]QUO'#LdO#?dQUO,5>UO#?iQbO'#CxO#?tQUO'#GcO#?yQUO'#E^O#@jQUO,5;kO#ARQUO'#LUO#AZQUO,5;rOKnQUO'#HfOBXQUO'#HgO#A`QUO'#KxO!6qQUO'#HjO#BWQUO'#CuO!0wQVO,5PO$(fQUO'#E[O$(sQUO,5>ROOQQ,5>S,5>SO$,aQVO'#C|OOQQ-E=q-E=qOOQQ,5>d,5>dOOQQ,59a,59aO$,kQUO,5>wO$.kQUO,5>zO!6qQUO,59uO$/OQUO,5;qO$/]QUO,5<{O!0TQUO,5:oOOQQ,5:r,5:rO$/hQUO,5;mO$/mQUO'#KtOBXQUO,5;kOOQR,5;x,5;xO$0^QUO'#FbO$0lQUO'#FbO$0qQUO,5;zO$4[QVO'#FmO!0wQVO,5sQUO'#L^O$>{QUO,5T,5>TO$FxQUO,5>TO$GSQUO,5>TO$GXQUO,5>TO$G^QUO,5>TO!6qQUO,5>TO$I[QUO'#KaO$IcQUO,5=oO$InQUO,5=aOKnQUO,5=oO$JhQUO,5=sOOQR,5=s,5=sO$JpQUO,5=sO$L{QVO'#H[OOQQ,5=u,5=uO!;`QUO,5=uO%#vQUO'#KqO%#}QUO'#KbO%$cQUO'#KqO%$mQUO'#DyO%%OQUO'#D|O%'{QUO'#KbOOQQ'#Kb'#KbO%)nQUO'#KbO%#}QUO'#KbO%)sQUO'#KbOOQQ,59s,59sOOQQ,5>a,5>aOOQQ,5>b,5>bO%){QUO'#HzO%*TQUO,5>cOOQQ,5>c,5>cO%-oQUO,5>cO%-zQUO,5>hO%1fQVO,5>iO%1mQUO,5>|O# vQVO'#EfO%4sQUO,5>|OOQQ,5>|,5>|O%5dQUO,5?OO%7hQUO,5?RO!<_QUO,5?RO%9dQUO,5?UO%=PQVO,5?UPOOO'#I|'#I|P%=WO!LQO,58{POOO,58{,58{P!Am{,UO,58|P%=c{,UO,58|P%=q{7[O,58|PO{O'#Jw'#JwP%>S{,UO'#LkPOOO'#Lk'#LkP%>Y{,UO'#LkPOOO,58|,58|POOO,5?f,5?fP%>_OSO,5?fOOOO-E<{-E<{OOQR1G.j1G.jO%>fQUO1G.qO%?lQUO1G0mOOQQ1G0m1G0mO%@xQUO'#CpO%CXQbO'#CxO%CdQUO'#CsO%CiQUO'#CsO%CnQUO1G.uO#BWQUO'#CrOOQQ1G.u1G.uO%EqQUO1G4]O%FwQUO1G4^O%HjQUO1G4^O%J]QUO1G4^O%LOQUO1G4^O%MqQUO1G4^O& dQUO1G4^O&#VQUO1G4^O&$xQUO1G4^O&&kQUO1G4^O&(^QUO1G4^O&*PQUO1G4^O&+rQUO'#KVO&,{QUO'#KVO&-TQUO,59UOOQQ,5=P,5=PO&/]QUO,5=PO&/gQUO,5=PO&/lQUO,5=PO&/qQUO,5=PO!6qQUO,5=PO#NsQUO1G3XO&/{QUO1G4mO!<_QUO1G4mO&1wQUO1G4pO&3jQVO1G4pOOQQ1G/O1G/OOOQQ1G.}1G.}OOQQ1G2i1G2iO!JVQ&lO1G3XO&3qQUO'#LVO@[QVO'#EiO&4zQUO'#F]OOQQ'#Jb'#JbO&5PQUO'#FZO&5[QUO'#LVO&5dQUO,5;tO&5iQUO1G.rOOQQ1G.r1G.rOOQR1G/|1G/|O&7[Q!dO'#JQO&7aQbO,59xO&9rQ!eO'#D`O&9yQ!dO'#JSO&:OQbO,5APO&:OQbO,5APOOQR1G/c1G/cO&:ZQbO1G/cO&:`Q&lO'#GeO&;^QbO,59dOOQR1G7b1G7bO#@jQUO1G1VO&;iQUO1G1^OBXQUO1G1VO&=zQUO'#CzO#+VQbO,59dO&AmQUO1G6zOOQR-E<|-E<|O&CPQUO1G0dO#6fQUO1G0dOOQQ-E=V-E=VO#7SQUO1G0dOOQQ1G0l1G0lO&CtQUO,59jOOQQ1G3l1G3lO&D[QUO,59jO&DrQUO,59jO!MmQVO1G4gO!(}QVO'#JZO&E^QUO,5AjOOQQ1G0o1G0oO!(}QVO1G0oO!6qQUO'#JpO&EfQUO,5BOOOQQ1G3p1G3pOOQR1G1V1G1VO&IcQVO'#FOO!MmQVO,5;sOOQQ,5;s,5;sOBXQUO'#JdO&K_QUO,5ApO&KgQVO'#E[OOQR1G1^1G1^O&NUQUO'#LdOOQR1G1n1G1nOOQR-E=h-E=hOOQR1G7e1G7eO#DvQUO1G7eOGYQUO1G7eO#DvQUO1G7gOOQR1G7g1G7gO&N^QUO'#G}O&NfQUO'#L`OOQQ,5=h,5=hO&NtQUO,5=jO&NyQUO,5=kOOQR1G7h1G7hO#EtQVO1G7hO' OQUO1G7hO'!UQVO,5=kOOQR1G1U1G1UO$/UQUO'#E]O'!zQUO'#E]OOQQ'#LQ'#LQO'#eQUO'#LPO'#pQUO,5;UO'#xQUO'#ElO'$]QUO'#ElO'$pQUO'#EtOOQQ'#J]'#J]O'$uQUO,5;cO'%lQUO,5;cO'&gQUO,5;dO''mQVO,5;dOOQQ,5;d,5;dO''wQVO,5;dO''mQVO,5;dO'(OQUO,5;bO'({QUO,5;eO')WQUO'#KwO')`QUO,5:vO')eQUO,5;fOOQQ1G0n1G0nOOQQ'#J^'#J^O'(OQUO,5;bO!4{QUO'#E}OOQQ,5;b,5;bO'*`QUO'#E`O',YQUO'#E{OHuQUO1G0nO',_QUO'#EbOOQQ'#JY'#JYO'-wQUO'#KyOOQQ'#Ky'#KyO'.qQUO1G0eO'/iQUO1G3kO'0oQVO1G3kOOQQ1G3k1G3kO'0yQVO1G3kO'1QQUO'#LgO'2^QUO'#K_O'2lQUO'#K^O'2wQUO,59hO'3PQUO1G/aO'3UQUO'#FPOOQR1G1]1G1]OOQR1G2g1G2gO$?]QUO1G2gO'3`QUO1G2gO'3kQUO1G0ZOOQR'#Ja'#JaO'3pQVO1G1XO'9iQUO'#FTO'9nQUO1G1VO!6qQUO'#JeO'9|QUO,5;|O$0lQUO,5;|OOQQ'#Fc'#FcOOQQ,5;|,5;|O':[QUO1G1fOOQR1G1f1G1fO':dQUO,5fO(*vQUO'#LeOOQQ1G3}1G3}O(.mQUO1G3}O(.tQUO1G3}O(.{QUO1G4TO(0RQUO1G4TO(0WQUO,5BUO!6qQUO1G4hO!(}QVO'#IiOOQQ1G4m1G4mO(0]QUO1G4mO(2`QVO1G4pPOOO-Em,5>mO$)hQVO'#JuO)+xQUO,5@xOOQQ1G/S1G/SOOQQ7+${7+${O),TQUO7+(RO),YQUO7+(ROOQR7+(R7+(RO$?]QUO7+(ROOQQ7+%u7+%uOOQR-E=_-E=_O!0YQUO,5;oOOQQ,5@P,5@POOQQ-E=c-E=cO$0lQUO1G1hOOQQ1G1h1G1hOOQR7+'Q7+'QOOQR1G1s1G1sOBXQUO,5;rO),vQUO,5yQUO7+(`O)@PQUO7+(dO)@UQVO7+(dOOQQ7+(l7+(lOOQQ7+)Z7+)ZO)@^QUO'#KqO)@hQUO'#KqOOQR,5=b,5=bO)@uQUO,5=bO!;eQUO,5=bO!;eQUO,5=bO!;eQUO,5=bOOQR7+(g7+(gOOQR7+(u7+(uOOQR7+(y7+(yOOQR,5=w,5=wO)@zQUO,5=zO)BQQUO,5=yOOQR,5A},5A}OOQR-E=k-E=kOOQQ1G3b1G3bO)CWQUO,5=xO)C]QVO'#EfOOQQ1G6h1G6hO%)nQUO1G6hO%)sQUO1G6hOOQQ1G0P1G0POOQQ-E=R-E=RO)EtQUO,5A^O(&jQUO'#JUO)FPQUO,5A^O)FPQUO,5A^O)FXQUO,5:iO8}QUO,5:iOOQQ,5>],5>]O)FcQUO,5AyO)FjQUO'#EVO)GtQUO'#EVO)H_QUO,5:iO)HiQUO'#HlO)HiQUO'#HmOOQQ'#Kv'#KvO)IWQUO'#KvO!(}QVO'#HnOOQQ,5:i,5:iO)IxQUO,5:iO!MmQVO,5:iOOQQ-E=T-E=TOOQQ1G0S1G0SOOQQ,5>`,5>`O)I}QUO1G6hO!(}QVO,5>gO)MlQUO'#JtO)MwQUO,5BQOOQQ1G4Q1G4QO)NPQUO,5BPOOQQ,5BP,5BPOOQQ7+)i7+)iO*#nQUO7+)iOOQQ7+)o7+)oO*(mQVO1G7pO**oQUO7+*SO**tQUO,5?TO*+zQUO7+*[POOO7+$S7+$SP*-mQUO'#LnP*-uQUO,5BXP!Am{,UO7+$SPOOO1G7q1G7qO*-zQUO<_QUO1G0xOOQQ1G0y1G0yO*>pQUO'#ElOOQQ1G0z1G0zOOQQ7+&j7+&jO*?UQUO7+&jO*@[QVO7+&jOOQQ7+&h7+&hOOQQ,5@],5@]OOQQ-E=o-E=oO*AWQUO1G1TO*AbQUO1G1TO*A{QUO1G0fOOQQ1G0f1G0fO*CRQUO'#LSO*CZQUO1G1ROOQQ<VO)HiQUO'#JrO*N}QUO1G0TO+ `QVO1G0TOOQQ1G3u1G3uO+ gQUO,5>WO+ rQUO,5>XO+!aQUO,5>YO+#gQUO1G0TO%)sQUO7+,SO+$mQUO1G4ROOQQ,5@`,5@`OOQQ-E=r-E=rOOQQ<n,5>nO+0fQUOANAXOOQRANAXANAXO+0kQUO7+'`OOQRAN@cAN@cO+1wQVOAN@nO+2OQUOAN@nO!0wQVOAN@nO+3XQUOAN@nO+3^QUOAN@}O+3iQUOAN@}O+4oQUOAN@}OOQRAN@nAN@nO!MmQVOAN@}OOQRANAOANAOO+4tQUO7+'|O)8XQUO7+'|OOQQ7+(O7+(OO+5VQUO7+(OO+6]QVO7+(OO+6dQVO7+'hO+6kQUOANAjOOQR7+(h7+(hOOQR7+)P7+)PO+6pQUO7+)PO+6uQUO7+)POOQQ<= n<= nO+6}QUO7+,dO+7VQUO1G5[OOQQ1G5[1G5[O+7bQUO7+%oOOQQ7+%o7+%oO+7sQUO7+%oO+ `QVO7+%oOOQQ7+)a7+)aO+7xQUO7+%oO+9OQUO7+%oO!MmQVO7+%oO+9YQUO1G0]O*MhQUO1G0]O)FjQUO1G0]OOQQ1G0a1G0aO+9wQUO1G3qO+:}QVO1G3qOOQQ1G3q1G3qO+;XQVO1G3qO+;`QUO,5@^OOQQ-E=p-E=pOOQQ1G3r1G3rO%)nQUO<= nOOQQ7+*Z7+*ZPOQQ,5@d,5@dPOQQ-E=v-E=vOOQQ1G/}1G/}OOQQ,5?y,5?yOOQQ-E=]-E=]OOQRG26sG26sO+;wQUOG26YO!0wQVOG26YO+=QQUOG26YOOQRG26YG26YO!MmQVOG26iO!0wQVOG26iO+=VQUOG26iO+>]QUOG26iO+>bQUO<sQUO<xQUO<}QUO<uAN>uO+CmQUOAN>uO+DsQUOAN>uO!MmQVOAN>uO+DxQUO<VQUO'#CzO,>eQbO,59dO,5^QUO7+&OO,;hQUO7+&OO,>pQUO'#EwO,?cQUO'#EzO,@SQUO'#E^O,@XQUO'#GcO,@^QUO'#CwO,@cQUO'#CxO,@hQUO'#CxO,@mQUO'#GcO,@rQUO'#CwO,@wQUO'#KaO,AeQUO'#KaO,AoQUO'#CwO,AzQUO'#CwO,BVQUO'#CwO,;hQUO,5:xO,6xQUO,5:xO,6xQUO,5:xO,BbQUO'#KaO,BuQbO'#CxO,CQQUO'#CsO,CVQUO'#E^", + stateData: ",C{~O(pOSSOSRPQVPQ'ePQ'gPQ'hPQ'iPQ'jPQ'kPQ'lPQ'mPQ(qPQ~O*cOS~OPmO]eOb!]Oe!POmTOs!^Ot!^Ou!^Ov!^Ow!^Ox!^Oy!^Oz!^O|#RO!O!_O!TxO!VfO!X!XO!Y!WO!i!YO!opO!r!`O!s!aO!t!aO!u!bO!v!aO!x!cO!{!dO#V#QO#a#VO#b#TO#i#OO#p!xO#t!fO#v!eO$R!gO$T!hO$Y!vO$Z!wO$`!iO$e!jO$g!kO$h!lO$k!mO$m!nO$o!oO$q!pO$s!qO$u!rO$w!sO${!tO$}!uO%U!yO%_#ZO%`#[O%a#YO%c!zO%e#UO%g!{O%l#SO%o!|O%v!}O%|#PO&m!RO&r#WO&s!TO'Q!WO'R!WO'V#XO'Y![O'a![O'b![O(vQO(xRO)WYO)ZaO)]|O)^{O)`iO)a!ZO)cXO)ocO)pdO~OR#cOV#^O'e#_O'g#`O'h#aO'i#aO'j#bO'k#bO'l#`O'm#`O(q#]O~OX#eO(u#gO(w#eO~O]ZX]jXejXmhXqZXqjXsjXtjXujXvjXwjXxjXyjXzjX!OjX!TjX!VZX!VjX!XZX!YZX![ZX!^ZX!_ZX!aZX!bZX!eZX!fZX!gZX!hZX!rjX!sjX!tjX!ujX!vjX!xjX!{jX%vjX&rjX&sjX(xjX({ZX(|$]X(}ZX)OZX)ZZX)ZjX)[ZX)]ZX)]jX)^ZX)^jX)_ZX)`ZX)aZX)qZX~O)`jX!UZX~P(gO]$PO!V#nO!X#}O!Y#sO![#tO!^#wO!_#xO!a#zO!b#{O!e#{O!f#|O!h#kO({#hO(}#mO)O#mO)Z#oO)[#qO)]#pO)^#rO)_#jO)`#lO)a$OO~Oe$TO%Y$UO'[$VO'_$WO)P$QO~Om$XO~O!T$YO])TXe)TXs)TXt)TXu)TXv)TXw)TXx)TXy)TXz)TX!O)TX!V)TX!r)TX!s)TX!t)TX!u)TX!v)TX!x)TX!{)TX%v)TX&r)TX&s)TX(x)TX)Z)TX)])TX)^)TX)`)TX~Om$XO~P.^Om$XO!g$[O)q$[O~OX$]O)d$]O~O!R$^O)V)XP)a)XP~OPmO]$gOb!]Os!^Ot!^Ou!^Ov!^Ow!^Ox!^Oy!^Oz!^O|#RO!O!_O!TxO!V$hO!X!XO!Y!WO!i!YO!r!aO!s!aO!t!aO!u!aO!v!aO!x!cO#V#QO#a#VO#b#TO#v!eO$Y!vO$Z!wO$`!iO$e!jO$g!kO$h!lO$k!mO$m!nO$o!oO$q!pO$s!qO$u!rO$w!sO%_#ZO%`#[O%a#YO%e#UO%l#SO%v$oO&m!RO&r#WO&s!TO'Q!WO'R!WO'V#XO'Y![O'a![O'b![O(vQO)WYO)Z$mO)^$mO)`iO)a!ZO)cXO)ocO)pdO~Om$aO#t$nO(xRO~P0}O](_Xb'zXe(_Xm'zXm(_Xs'zXs(_Xt'zXt(_Xu'zXu(_Xv'zXv(_Xw'zXw(_Xx'zXx(_Xy'zXy(_Xz'zXz(_X|'zX!O'zX!V(_X!o(_X!r'zX!r(_X!s'zX!s(_X!t'zX!t(_X!u'zX!u(_X!v'zX!v(_X!x'zX!x(_X!{(_X#a'zX#b'zX%e'zX%l'zX%o(_X%v(_X&m'zX&r'zX&s'zX(x'zX(x(_X)Z(_X)](_X)^(_X~Ob!TOm$qOs!^Ot!^Ou!^Ov!^Ow!^Ox!^Oy!^Oz!^O|#RO!O!_O!r!aO!s!aO!t!aO!u!aO!v!aO!x!cO#a#VO#b#TO%e#UO%l#SO&m!RO&r#WO&s!TO(x$pO~Os!^Ot!^Ou!^Ov!^Ow!^Ox!^Oy!^Oz!^O!O!_O!r!aO!s!aO!t!aO!u!aO!v!aO!x!cO&r#WO&s$yO])hXe)hXm)hX!V)hX!{)hX%v)hX(x)hX)Z)hX)])hX)^)hX~O)`$xO~P:qOPmO]eOe!POs!^Ot!^Ou!^Ov!^Ow!^Ox!^Oy!^Oz!^O!VfO!X!XO!Y!WO!i!YO!{!dO#V#QO%_#ZO%`#[O%a#YO%v$oO'Q!WO'R!WO'V#XO'Y![O'a![O'b![O(vQO)ZaO)]|O)^{O)a!ZO)cXO)ocO)pdO~Ob%SOm;UO!|%TO(x$zO~PfP?P?c?wFpMq!&v!-_P!4Y!4}!5rP!6^PPPPPPPP!6wP!8aP!9r!;[P!;bPPPPPP!;eP!;ePP!;ePP!;qPPPPPP!=s!AZP!A^PP!Az!BoPPPPP!BsP?S!DUPP?S!F]!H^!Hl!JR!KrP!K}P!L^!L^# n#$}#&e#)q#,{!H^#-VPP!H^#-^#-d#-V#-V#-gP#-k#.Y#.Y#.Y#.Y!KrP#.s#/U#1kP#2PP#3lP#3p#3x#4m#4x#7W#7`#7`#3pP#3pP#7g#7mP#7wPP#8d#9R#9s#8dP#:e#:qP#8dP#8dPP#8d#8dP#8dP#8dP#8dP#8dP#8dP#8dP#:t#7w#;bP#;wP#<^#<^#<^#<^#S$@Y$@`$@v$AQ$A]$Al$Ar$CQ$DP$DW$D_$De$Dm$Dw$D}$EY$E`$Ei$Eq$E|$FS$F^$Fd$Fn$Ft$F{$G[$Gb$GhP$Gn$Gv$G}$H]$Iy$JP$JV$J^$JjPPPPPPPPPPPP$Jp$JtPPPPP%#v$*i%#y%'R%)ZPP%)h%)kPPPPPPPPPP%)w%*z%+Q%+U%,{%.Y%.{%/S%1c%1iPPP%1s%2O%2R%2X%3`%3c%3m%3w%3{%5P%5r%5x#CeP%6c%6i%6y%6|%7^%7j%7n%7t%7z$*i$*l$*l%7}%8QP%8a%8dQ#dPa(s#b(p(q(r(t/]/_4rR#dP'`mO[aefwx{!W!X!g!k!n!r!s!v!x#X#Y#[#h#k#n#s#t#u#v#w#x#y#z#{#|#}$P$W$Y$[$g$h$m%_%o&S&U&Y&d&h&z&{'O'Q'R'e'l'm'|(c(e(l)q)w*m*n*q*v*w*{+]+_+m+o+p,U,W,s,v,|-d-e-h-n.W.X.]/U/X/d/k/t/v/{/}0p1T1Y1i1j1t1x2S2U2k2n2q3P3U3X3s4Y4]4b4k5d5o5{6i6m6p6r6t7O7Q7V7l7t7w8o8q8w8}9O9]9a9g9i9v9y9z:V:Y:`:b:g:l:pU%qm%r7[Q&o!`Q(p#^d0X*S0U0V0W0Z5X5Y5Z5^8[R7[3_b}Oaewx{!g&U*v&v$k[!W!X!k!n!r!s!v!x#X#Y#[#h#k#n#s#t#u#v#w#x#y#z#{#|#}$P$W$Y$[$g$h$m%_%o&S&Y&d&h&z&{'O'Q'R'e'l'm'|(c(e(l)q)w*m*n*q*w*{+]+_+m+o+p,U,W,s,v,|-d-e-h-n.W.X.]/U/X/d/k/t/v/{/}1T1i1j1t1x2S2U2k2n2q3P3U3X3s4Y4]4b4k5d5o5{6i6m6p6r6t7O7Q7V7l7t7w8o8q8w8}9O9]9a9g9i9v9y9z:V:Y:`:b:g:l:pS%bf0p#d%lgnp|#O$i%O%P%U%f%j%k%y&u'w'x(T*_*e*g*y+b,q,{-f-w.O.m.t.v0e1R1S1W1[2g2r5k6q;b;c;d;j;k;l;y;z;{;| MacroName LineComment BlockComment PreprocDirective #include String EscapeSequence SystemLibString Identifier ) ( ArgumentList ConditionalExpression AssignmentExpression CallExpression PrimitiveType FieldExpression FieldIdentifier DestructorName TemplateMethod ScopedFieldIdentifier NamespaceIdentifier TemplateType TypeIdentifier ScopedTypeIdentifier ScopedNamespaceIdentifier :: NamespaceIdentifier TypeIdentifier TemplateArgumentList < TypeDescriptor const volatile restrict _Atomic mutable constexpr constinit consteval StructSpecifier struct MsDeclspecModifier __declspec Attribute AttributeName Identifier AttributeArgs { } [ ] UpdateOp ArithOp ArithOp ArithOp LogicOp BitOp BitOp BitOp CompareOp CompareOp CompareOp > CompareOp BitOp UpdateOp , Number CharLiteral AttributeArgs VirtualSpecifier BaseClassClause Access virtual FieldDeclarationList FieldDeclaration extern static register inline thread_local AttributeSpecifier __attribute__ PointerDeclarator MsBasedModifier __based MsPointerModifier FunctionDeclarator ParameterList ParameterDeclaration PointerDeclarator FunctionDeclarator Noexcept noexcept RequiresClause requires True False ParenthesizedExpression CommaExpression LambdaExpression LambdaCaptureSpecifier TemplateParameterList OptionalParameterDeclaration TypeParameterDeclaration typename class VariadicParameterDeclaration VariadicDeclarator ReferenceDeclarator OptionalTypeParameterDeclaration VariadicTypeParameterDeclaration TemplateTemplateParameterDeclaration template AbstractFunctionDeclarator AbstractPointerDeclarator AbstractArrayDeclarator AbstractParenthesizedDeclarator AbstractReferenceDeclarator ThrowSpecifier throw TrailingReturnType CompoundStatement FunctionDefinition MsCallModifier TryStatement try CatchClause catch LinkageSpecification Declaration InitDeclarator InitializerList InitializerPair SubscriptDesignator FieldDesignator ExportDeclaration export ImportDeclaration import ModuleName PartitionName HeaderName CaseStatement case default LabeledStatement StatementIdentifier ExpressionStatement IfStatement if ConditionClause Declaration else SwitchStatement switch DoStatement do while WhileStatement ForStatement for ReturnStatement return BreakStatement break ContinueStatement continue GotoStatement goto CoReturnStatement co_return CoYieldStatement co_yield AttributeStatement ForRangeLoop AliasDeclaration using TypeDefinition typedef PointerDeclarator FunctionDeclarator ArrayDeclarator ParenthesizedDeclarator ThrowStatement NamespaceDefinition namespace ScopedIdentifier Identifier OperatorName operator ArithOp BitOp CompareOp LogicOp new delete co_await ConceptDefinition concept UsingDeclaration enum StaticAssertDeclaration static_assert ConcatenatedString TemplateDeclaration FriendDeclaration friend union FunctionDefinition ExplicitFunctionSpecifier explicit FieldInitializerList FieldInitializer DefaultMethodClause DeleteMethodClause FunctionDefinition OperatorCast operator TemplateInstantiation FunctionDefinition FunctionDefinition Declaration ModuleDeclaration module RequiresExpression RequirementList SimpleRequirement TypeRequirement CompoundRequirement ReturnTypeRequirement ConstraintConjuction LogicOp ConstraintDisjunction LogicOp ArrayDeclarator ParenthesizedDeclarator ReferenceDeclarator TemplateFunction OperatorName StructuredBindingDeclarator ArrayDeclarator ParenthesizedDeclarator ReferenceDeclarator BitfieldClause FunctionDefinition FunctionDefinition Declaration FunctionDefinition Declaration AccessSpecifier UnionSpecifier ClassSpecifier EnumSpecifier SizedTypeSpecifier TypeSize EnumeratorList Enumerator DependentType Decltype decltype auto PlaceholderTypeSpecifier ParameterPackExpansion ParameterPackExpansion FieldIdentifier PointerExpression SubscriptExpression BinaryExpression ArithOp LogicOp LogicOp BitOp UnaryExpression LogicOp BitOp UpdateExpression CastExpression SizeofExpression sizeof CoAwaitExpression CompoundLiteralExpression NULL NewExpression new NewDeclarator DeleteExpression delete ParameterPackExpansion nullptr this UserDefinedLiteral ParamPack #define PreprocArg #if #ifdef #ifndef #else #endif #elif PreprocDirectiveName Macro Program", + maxTerm: 433, + nodeProps: [ + ["group", -35, 1, 8, 11, 15, 16, 17, 19, 71, 72, 100, 101, 102, 104, 191, 208, 229, 242, 243, 270, 271, 272, 277, 280, 281, 282, 284, 285, 286, 287, 290, 292, 293, 294, 295, 296, "Expression", -13, 18, 25, 26, 27, 43, 255, 256, 257, 258, 262, 263, 265, 266, "Type", -19, 126, 129, 147, 150, 152, 153, 158, 160, 163, 164, 166, 168, 170, 172, 174, 176, 178, 179, 188, "Statement"], + ["isolate", -4, 4, 5, 8, 10, ""], + ["openedBy", 12, "(", 52, "{", 54, "["], + ["closedBy", 13, ")", 51, "}", 53, "]"] + ], + propSources: [cppHighlighting], + skippedNodes: [0, 3, 4, 5, 6, 7, 10, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 308, 349, 350], + repeatNodeCount: 43, + tokenData: "&AbMfR!UOX$eXY/]YZ5gZ]$e]^1g^p$epq/]qr5}rs8Zst:Ttu$euv!AWvw!Cbwx!Eqxy!Flyz!Gmz{!Hn{|!Iw|}!LX}!O!MY!O!P# m!P!Q#8a!Q!R#@T!R![$'k![!]$@f!]!^$Bn!^!_$Co!_!`%C`!`!a%Dg!a!b%HP!b!c$e!c!n%IQ!n!o%Jl!o!w%IQ!w!x%Jl!x!}%IQ!}#O%Mx#O#P& }#P#Q&3[#Q#R&5a#R#S%IQ#S#T$e#T#i%IQ#i#j&6j#j#o%IQ#o#p&8[#p#q&9]#q#r&;o#r#s&|#Y#o;x#o;'S$e;'S;=`/V<%lO$eGz?Xe)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#Y;x#Y#Z@j#Z#o;x#o;'S$e;'S;=`/V<%lO$eGz@ue)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#];x#]#^BW#^#o;x#o;'S$e;'S;=`/V<%lO$eGzBce)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#b;x#b#cCt#c#o;x#o;'S$e;'S;=`/V<%lO$eGzDPe)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#X;x#X#YEb#Y#o;x#o;'S$e;'S;=`/V<%lO$eGzEoc)d`(wS'e<`'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#o;x#o;'S$e;'S;=`/V<%lO$eGzGVg)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#`;x#`#aHn#a#b;x#b#c!!n#c#o;x#o;'S$e;'S;=`/V<%lO$eGzHyg)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#];x#]#^Jb#^#g;x#g#hMh#h#o;x#o;'S$e;'S;=`/V<%lO$eGzJme)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#Y;x#Y#ZLO#Z#o;x#o;'S$e;'S;=`/V<%lO$eGzL]c)d`(wS'f,U'l<`'m<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#o;x#o;'S$e;'S;=`/V<%lO$eGzMse)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#X;x#X#Y! U#Y#o;x#o;'S$e;'S;=`/V<%lO$eGz! cc)d`(wS'j<`'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#o;x#o;'S$e;'S;=`/V<%lO$eGz!!ye)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#W;x#W#X!$[#X#o;x#o;'S$e;'S;=`/V<%lO$eGz!$ge)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#];x#]#^!%x#^#o;x#o;'S$e;'S;=`/V<%lO$eGz!&Te)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#Y;x#Y#Z!'f#Z#o;x#o;'S$e;'S;=`/V<%lO$eGz!'sc)d`(wS'f,U'k<`'m<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#o;x#o;'S$e;'S;=`/V<%lO$eGz!)Zg)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#Y;x#Y#Z!*r#Z#b;x#b#c!7l#c#o;x#o;'S$e;'S;=`/V<%lO$eGz!+Pg)d`(wS'g<`'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#W;x#W#X!,h#X#b;x#b#c!1[#c#o;x#o;'S$e;'S;=`/V<%lO$eGz!,se)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#X;x#X#Y!.U#Y#o;x#o;'S$e;'S;=`/V<%lO$eGz!.ae)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#Y;x#Y#Z!/r#Z#o;x#o;'S$e;'S;=`/V<%lO$eGz!0Pc)d`(wS'h<`'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#o;x#o;'S$e;'S;=`/V<%lO$eGz!1ge)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#W;x#W#X!2x#X#o;x#o;'S$e;'S;=`/V<%lO$eGz!3Te)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#X;x#X#Y!4f#Y#o;x#o;'S$e;'S;=`/V<%lO$eGz!4qe)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#Y;x#Y#Z!6S#Z#o;x#o;'S$e;'S;=`/V<%lO$eGz!6ac)d`(wS'i<`'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#o;x#o;'S$e;'S;=`/V<%lO$eGz!7we)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#V;x#V#W!9Y#W#o;x#o;'S$e;'S;=`/V<%lO$eGz!9ee)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#`;x#`#a!:v#a#o;x#o;'S$e;'S;=`/V<%lO$eGz!;Re)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#i;x#i#j!Q#X#o;x#o;'S$e;'S;=`/V<%lO$eGz!>]e)d`(wS'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#X;x#X#Y!?n#Y#o;x#o;'S$e;'S;=`/V<%lO$eGz!?{c)d`(wSV<`'f,U'm<`OY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![;x![!c$e!c!};x!}#O$e#O#P'b#P#R$e#R#S;x#S#T$e#T#o;x#o;'S$e;'S;=`/V<%lO$eF`!Ae^)d`(wS%Z#t![8O'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q!_$e!_!`!Ba!`#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eF`!Bl[!g:t)d`(wS'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eF`!Co_)^8O)d`(wS%[#t'f,UOY$eZr$ers%dsv$evw!Dnwx*mx!P$e!P!Q-V!Q!_$e!_!`!Ba!`#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eF`!D{[)]8O%^#t)d`(wS'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eCb!E|Y)bW(wS)c8O'f,UOY*mZr*mrs&Zs!P*m!P!Q+d!Q#O*m#O#P'b#P;'S*m;'S;=`-P<%lO*mLS!Fw[)d`(wS]Kn'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$e-^!Gx[[r)d`(wS'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eF`!H{^)Z8O)d`(wS%Z#t'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q!_$e!_!`!Ba!`#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eF`!JU`)d`(wS%Z#t!Y8O'f,UOY$eZr$ers%dsw$ewx*mx{$e{|!KW|!P$e!P!Q-V!Q!_$e!_!`!Ba!`#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eF`!Kc[)d`!X:t(wS'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eCr!Ld[!h8W)d`(wS'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eF`!Mga)d`(wS%Z#t!Y8O'f,UOY$eZr$ers%dsw$ewx*mx}$e}!O!KW!O!P$e!P!Q-V!Q!_$e!_!`!Ba!`!a!Nl!a#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eF`!Nw[)O:t)d`(wS'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eCr# x^)d`(wS'f,U(}8OOY$eZr$ers%dsw$ewx*mx!O$e!O!P#!t!P!Q-V!Q![#$w![#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eCr#!}])d`(wS'f,UOY$eZr$ers%dsw$ewx*mx!O$e!O!P##v!P!Q-V!Q#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eCr#$R[)a8W)d`(wS'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eCj#%So)d`(wS!i8O'f,UOY$eZr$ers%dsw$ewx#'Tx!P$e!P!Q-V!Q![#$w![!g$e!g!h#1O!h!i#6j!i!n$e!n!o#6j!o!r$e!r!s#1O!s!w$e!w!x#6j!x#O$e#O#P'b#P#X$e#X#Y#1O#Y#Z#6j#Z#`$e#`#a#6j#a#d$e#d#e#1O#e#i$e#i#j#6j#j;'S$e;'S;=`/V<%lO$eCY#'[Z(wS'f,UOY*mZr*mrs&Zs!P*m!P!Q+d!Q![#'}![#O*m#O#P'b#P;'S*m;'S;=`-P<%lO*mCY#(Wo(wS!i8O'f,UOY*mZr*mrs&Zsw*mwx#'Tx!P*m!P!Q+d!Q![#'}![!g*m!g!h#*X!h!i#/a!i!n*m!n!o#/a!o!r*m!r!s#*X!s!w*m!w!x#/a!x#O*m#O#P'b#P#X*m#X#Y#*X#Y#Z#/a#Z#`*m#`#a#/a#a#d*m#d#e#*X#e#i*m#i#j#/a#j;'S*m;'S;=`-P<%lO*mCY#*bm(wS!i8O'f,UOY*mZr*mrs&Zs{*m{|#,]|}*m}!O#,]!O!P*m!P!Q+d!Q![#-c![!c*m!c!h#-c!h!i#-c!i!n*m!n!o#/a!o!w*m!w!x#/a!x#O*m#O#P'b#P#T*m#T#Y#-c#Y#Z#-c#Z#`*m#`#a#/a#a#i*m#i#j#/a#j;'S*m;'S;=`-P<%lO*mCY#,d_(wS'f,UOY*mZr*mrs&Zs!P*m!P!Q+d!Q![#-c![!c*m!c!i#-c!i#O*m#O#P'b#P#T*m#T#Z#-c#Z;'S*m;'S;=`-P<%lO*mCY#-lk(wS!i8O'f,UOY*mZr*mrs&Zsw*mwx#,]x!P*m!P!Q+d!Q![#-c![!c*m!c!h#-c!h!i#-c!i!n*m!n!o#/a!o!w*m!w!x#/a!x#O*m#O#P'b#P#T*m#T#Y#-c#Y#Z#-c#Z#`*m#`#a#/a#a#i*m#i#j#/a#j;'S*m;'S;=`-P<%lO*mCY#/jf(wS!i8O'f,UOY*mZr*mrs&Zs!P*m!P!Q+d!Q!h*m!h!i#/a!i!n*m!n!o#/a!o!w*m!w!x#/a!x#O*m#O#P'b#P#Y*m#Y#Z#/a#Z#`*m#`#a#/a#a#i*m#i#j#/a#j;'S*m;'S;=`-P<%lO*mCj#1Zo)d`(wS!i8O'f,UOY$eZr$ers%dsw$ewx*mx{$e{|#3[|}$e}!O#3[!O!P$e!P!Q-V!Q![#4j![!c$e!c!h#4j!h!i#4j!i!n$e!n!o#6j!o!w$e!w!x#6j!x#O$e#O#P'b#P#T$e#T#Y#4j#Y#Z#4j#Z#`$e#`#a#6j#a#i$e#i#j#6j#j;'S$e;'S;=`/V<%lO$eCj#3ea)d`(wS'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![#4j![!c$e!c!i#4j!i#O$e#O#P'b#P#T$e#T#Z#4j#Z;'S$e;'S;=`/V<%lO$eCj#4uk)d`(wS!i8O'f,UOY$eZr$ers%dsw$ewx#,]x!P$e!P!Q-V!Q![#4j![!c$e!c!h#4j!h!i#4j!i!n$e!n!o#6j!o!w$e!w!x#6j!x#O$e#O#P'b#P#T$e#T#Y#4j#Y#Z#4j#Z#`$e#`#a#6j#a#i$e#i#j#6j#j;'S$e;'S;=`/V<%lO$eCj#6uh)d`(wS!i8O'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q!h$e!h!i#6j!i!n$e!n!o#6j!o!w$e!w!x#6j!x#O$e#O#P'b#P#Y$e#Y#Z#6j#Z#`$e#`#a#6j#a#i$e#i#j#6j#j;'S$e;'S;=`/V<%lO$eMf#8la)d`(wS%Z#t![8OOY$eYZ&ZZr$ers%dsw$ewx*mxz$ez{#9q{!P$e!P!Q#:g!Q!_$e!_!`!Ba!`#O$e#O#P&Z#P;'S$e;'S;=`/V<%lO$eMf#9zX)d`(wS(qMQOY.]Zr.]rs)xsw.]wx,bx#O.]#P;'S.];'S;=`/P<%lO.]Mf#:pY)d`(wSSMQOY#:gZr#:grs#;`sw#:gwx#?Wx#O#:g#O#P#z<%lO#z<%lO#z<%lO#]#P;'S#z<%lO#bWSMQOY#z<%lO#}P;=`<%l#Ov)d`(wS!i8O'f,UOY$eZr$ers%dsw$ewx$3hx!O$e!O!P#NV!P!Q-V!Q![$1R![!c$e!c!g$1R!g!h$9o!h!i$1R!i!n$e!n!o#6j!o!r$e!r!s#1O!s!w$e!w!x#6j!x#O$e#O#P'b#P#T$e#T#U$1R#U#V$1R#V#X$1R#X#Y$9o#Y#Z$1R#Z#`$e#`#a#6j#a#d$e#d#e#1O#e#i$e#i#j#6j#j#l$e#l#m$/s#m;'S$e;'S;=`/V<%lO$eGz$@q^(|9b)d`(wS'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![$e![!]$Am!]#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eFh$Ax[m:|)d`(wS'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eCj$By[)`8O)d`(wS'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q#O$e#O#P'b#P;'S$e;'S;=`/V<%lO$eM^$C|aq8O%]#t)d`(wS'f,UOY$ERYZ$FZZr$ERrs$Fxsw$ERwx%4^x!P$ER!P!Q%8|!Q!^$ER!^!_%=a!_!`%?z!`!a%B_!a#O$ER#O#P%.w#P;'S$ER;'S;=`%=Z<%lO$ER3h$E[_)d`(wS'f,UOY$ERYZ$FZZr$ERrs$Fxsw$ERwx%4^x!P$ER!P!Q%8|!Q!`$ER!`!a%p!`!a%{_!g:t)d`(wS'f,UOY$ERYZ$FZZr$ERrs$Fxsw$ERwx%4^x!P$ER!P!Q%8|!Q!`$ER!`!a%`Zp$epq&>`qr$ers%dsw$ewx*mx!P$e!P!Q-V!Q!c$e!c!}&?z!}#O$e#O#P'b#P#R$e#R#S&?z#S#T$e#T#o&?z#o;'S$e;'S;=`/V<%lO$e,t&>ie)d`(wS'f,UOX$eXY&>`Zp$epq&>`qr$ers%dsw$ewx*mx!P$e!P!Q-V!Q!c$e!c!}&?z!}#O$e#O#P'b#P#R$e#R#S&?z#S#T$e#T#o&?z#o;'S$e;'S;=`/V<%lO$e,t&@Vc)d`(wSeY'f,UOY$eZr$ers%dsw$ewx*mx!P$e!P!Q-V!Q![&?z![!c$e!c!}&?z!}#O$e#O#P'b#P#R$e#R#S&?z#S#T$e#T#o&?z#o;'S$e;'S;=`/V<%lO$e", + tokenizers: [rawString, fallback, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, new LocalTokenGroup("j~RQYZXz{^~^O(s~~aP!P!Qd~iO(t~~", 25, 356)], + topRules: { "Program": [0, 307] }, + dynamicPrecedences: { "17": 1, "65": 1, "87": 1, "94": 1, "119": 1, "184": 1, "187": -10, "240": -10, "241": 1, "244": -1, "246": -10, "247": 1, "262": -1, "267": 2, "268": 2, "306": -10, "371": 3, "425": 1, "426": 3, "427": 1, "428": 1 }, + specialized: [{ term: 362, get: (value) => spec_identifier7[value] || -1 }, { term: 33, get: (value) => spec_[value] || -1 }, { term: 66, get: (value) => spec_templateArgsEnd[value] || -1 }, { term: 369, get: (value) => spec_scopedIdentifier[value] || -1 }], + tokenPrec: 24852 + }); + + // node_modules/@codemirror/lang-cpp/dist/index.js + var cppLanguage = /* @__PURE__ */ LRLanguage.define({ + name: "cpp", + parser: /* @__PURE__ */ parser13.configure({ + props: [ + /* @__PURE__ */ indentNodeProp.add({ + IfStatement: /* @__PURE__ */ continuedIndent({ except: /^\s*({|else\b)/ }), + TryStatement: /* @__PURE__ */ continuedIndent({ except: /^\s*({|catch)\b/ }), + LabeledStatement: flatIndent, + CaseStatement: (context) => context.baseIndent + context.unit, + BlockComment: () => null, + CompoundStatement: /* @__PURE__ */ delimitedIndent({ closing: "}" }), + Statement: /* @__PURE__ */ continuedIndent({ except: /^{/ }) + }), + /* @__PURE__ */ foldNodeProp.add({ + "DeclarationList CompoundStatement EnumeratorList FieldDeclarationList InitializerList": foldInside, + BlockComment(tree) { + return { from: tree.from + 2, to: tree.to - 2 }; + } + }) + ] + }), + languageData: { + commentTokens: { line: "//", block: { open: "/*", close: "*/" } }, + indentOnInput: /^\s*(?:case |default:|\{|\})$/, + closeBrackets: { stringPrefixes: ["L", "u", "U", "u8", "LR", "UR", "uR", "u8R", "R"] } + } + }); + function cpp() { + return new LanguageSupport(cppLanguage); + } + + // node_modules/@codemirror/legacy-modes/mode/shell.js + var words = {}; + function define(style, dict) { + for (var i = 0; i < dict.length; i++) { + words[dict[i]] = style; + } + } + var commonAtoms = ["true", "false"]; + var commonKeywords = [ + "if", + "then", + "do", + "else", + "elif", + "while", + "until", + "for", + "in", + "esac", + "fi", + "fin", + "fil", + "done", + "exit", + "set", + "unset", + "export", + "function" + ]; + var commonCommands = [ + "ab", + "awk", + "bash", + "beep", + "cat", + "cc", + "cd", + "chown", + "chmod", + "chroot", + "clear", + "cp", + "curl", + "cut", + "diff", + "echo", + "find", + "gawk", + "gcc", + "get", + "git", + "grep", + "hg", + "kill", + "killall", + "ln", + "ls", + "make", + "mkdir", + "openssl", + "mv", + "nc", + "nl", + "node", + "npm", + "ping", + "ps", + "restart", + "rm", + "rmdir", + "sed", + "service", + "sh", + "shopt", + "shred", + "source", + "sort", + "sleep", + "ssh", + "start", + "stop", + "su", + "sudo", + "svn", + "tee", + "telnet", + "top", + "touch", + "vi", + "vim", + "wall", + "wc", + "wget", + "who", + "write", + "yes", + "zsh" + ]; + define("atom", commonAtoms); + define("keyword", commonKeywords); + define("builtin", commonCommands); + function tokenBase(stream, state) { + if (stream.eatSpace()) return null; + var sol = stream.sol(); + var ch = stream.next(); + if (ch === "\\") { + stream.next(); + return null; + } + if (ch === "'" || ch === '"' || ch === "`") { + state.tokens.unshift(tokenString(ch, ch === "`" ? "quote" : "string")); + return tokenize(stream, state); + } + if (ch === "#") { + if (sol && stream.eat("!")) { + stream.skipToEnd(); + return "meta"; + } + stream.skipToEnd(); + return "comment"; + } + if (ch === "$") { + state.tokens.unshift(tokenDollar); + return tokenize(stream, state); + } + if (ch === "+" || ch === "=") { + return "operator"; + } + if (ch === "-") { + stream.eat("-"); + stream.eatWhile(/\w/); + return "attribute"; + } + if (ch == "<") { + if (stream.match("<<")) return "operator"; + var heredoc = stream.match(/^<-?\s*(?:['"]([^'"]*)['"]|([^'"\s]*))/); + if (heredoc) { + state.tokens.unshift(tokenHeredoc(heredoc[1] || heredoc[2])); + return "string.special"; + } + } + if (/\d/.test(ch)) { + stream.eatWhile(/\d/); + if (stream.eol() || !/\w/.test(stream.peek())) { + return "number"; + } + } + stream.eatWhile(/[\w-]/); + var cur2 = stream.current(); + if (stream.peek() === "=" && /\w+/.test(cur2)) return "def"; + return words.hasOwnProperty(cur2) ? words[cur2] : null; + } + function tokenString(quote, style) { + var close = quote == "(" ? ")" : quote == "{" ? "}" : quote; + return function(stream, state) { + var next, escaped = false; + while ((next = stream.next()) != null) { + if (next === close && !escaped) { + state.tokens.shift(); + break; + } else if (next === "$" && !escaped && quote !== "'" && stream.peek() != close) { + escaped = true; + stream.backUp(1); + state.tokens.unshift(tokenDollar); + break; + } else if (!escaped && quote !== close && next === quote) { + state.tokens.unshift(tokenString(quote, style)); + return tokenize(stream, state); + } else if (!escaped && /['"]/.test(next) && !/['"]/.test(quote)) { + state.tokens.unshift(tokenStringStart(next, "string")); + stream.backUp(1); + break; + } + escaped = !escaped && next === "\\"; + } + return style; + }; + } + function tokenStringStart(quote, style) { + return function(stream, state) { + state.tokens[0] = tokenString(quote, style); + stream.next(); + return tokenize(stream, state); + }; + } + var tokenDollar = function(stream, state) { + if (state.tokens.length > 1) stream.eat("$"); + var ch = stream.next(); + if (/['"({]/.test(ch)) { + state.tokens[0] = tokenString(ch, ch == "(" ? "quote" : ch == "{" ? "def" : "string"); + return tokenize(stream, state); + } + if (!/\d/.test(ch)) stream.eatWhile(/\w/); + state.tokens.shift(); + return "def"; + }; + function tokenHeredoc(delim) { + return function(stream, state) { + if (stream.sol() && stream.string == delim) state.tokens.shift(); + stream.skipToEnd(); + return "string.special"; + }; + } + function tokenize(stream, state) { + return (state.tokens[0] || tokenBase)(stream, state); + } + var shell = { + name: "shell", + startState: function() { + return { tokens: [] }; + }, + token: function(stream, state) { + return tokenize(stream, state); + }, + languageData: { + autocomplete: commonAtoms.concat(commonKeywords, commonCommands), + closeBrackets: { brackets: ["(", "[", "{", "'", '"', "`"] }, + commentTokens: { line: "#" } + } + }; + + // node_modules/@codemirror/legacy-modes/mode/toml.js + var toml = { + name: "toml", + startState: function() { + return { + inString: false, + stringType: "", + lhs: true, + inArray: 0 + }; + }, + token: function(stream, state) { + let quote; + if (!state.inString && (quote = stream.match(/^('''|"""|'|")/))) { + state.stringType = quote[0]; + state.inString = true; + } + if (stream.sol() && !state.inString && state.inArray === 0) { + state.lhs = true; + } + if (state.inString) { + while (state.inString) { + if (stream.match(state.stringType)) { + state.inString = false; + } else if (stream.peek() === "\\") { + stream.next(); + stream.next(); + } else if (stream.eol()) { + break; + } else { + stream.match(/^.[^\\\"\']*/); + } + } + return state.lhs ? "property" : "string"; + } else if (state.inArray && stream.peek() === "]") { + stream.next(); + state.inArray--; + return "bracket"; + } else if (state.lhs && stream.peek() === "[" && stream.skipTo("]")) { + stream.next(); + if (stream.peek() === "]") stream.next(); + return "atom"; + } else if (stream.peek() === "#") { + stream.skipToEnd(); + return "comment"; + } else if (stream.eatSpace()) { + return null; + } else if (state.lhs && stream.eatWhile(function(c) { + return c != "=" && c != " "; + })) { + return "property"; + } else if (state.lhs && stream.peek() === "=") { + stream.next(); + state.lhs = false; + return null; + } else if (!state.lhs && stream.match(/^\d\d\d\d[\d\-\:\.T]*Z/)) { + return "atom"; + } else if (!state.lhs && (stream.match("true") || stream.match("false"))) { + return "atom"; + } else if (!state.lhs && stream.peek() === "[") { + state.inArray++; + stream.next(); + return "bracket"; + } else if (!state.lhs && stream.match(/^\-?\d+(?:\.\d+)?/)) { + return "number"; + } else if (!stream.eatSpace()) { + stream.next(); + } + return null; + }, + languageData: { + commentTokens: { line: "#" } + } + }; + // node_modules/@codemirror/search/dist/index.js var basicNormalize = typeof String.prototype.normalize == "function" ? (x) => x.normalize("NFKD") : (x) => x; var SearchCursor = class { @@ -28740,13 +32076,13 @@ } langmapString.split(/((?:[^\\,]|\\.)+),/).map((part) => { if (!part) return; - const semicolon2 = part.split(/((?:[^\\;]|\\.)+);/); - if (semicolon2.length == 3) { - const from = getEscaped(semicolon2[1]); - const to = getEscaped(semicolon2[2]); + const semicolon3 = part.split(/((?:[^\\;]|\\.)+);/); + if (semicolon3.length == 3) { + const from = getEscaped(semicolon3[1]); + const to = getEscaped(semicolon3[2]); if (from.length !== to.length) return; for (let i = 0; i < from.length; ++i) keymap2[from[i]] = to[i]; - } else if (semicolon2.length == 1) { + } else if (semicolon3.length == 1) { const pairs = getEscaped(part); if (pairs.length % 2 !== 0) return; for (let i = 0; i < pairs.length; i += 2) keymap2[pairs[i]] = pairs[i + 1]; @@ -30106,12 +33442,12 @@ var repeat = vim2.visualMode ? args.repeat || 1 : 1; if (vim2.visualBlock) { var tabSize = cm.getOption("tabSize"); - var indent = cm.getOption("indentWithTabs") ? " " : " ".repeat(tabSize); + var indent2 = cm.getOption("indentWithTabs") ? " " : " ".repeat(tabSize); var cursor; for (var i = ranges.length - 1; i >= 0; i--) { cursor = cursorMin(ranges[i].anchor, ranges[i].head); if (args.indentRight) { - cm.replaceRange(indent.repeat(repeat), cursor, cursor); + cm.replaceRange(indent2.repeat(repeat), cursor, cursor); } else { var text = cm.getLine(cursor.line); var end = 0; @@ -30121,7 +33457,7 @@ end++; } else if (ch == " ") { end++; - for (var k = 1; k < indent.length; k++) { + for (var k = 1; k < indent2.length; k++) { ch = text[cursor.ch + end]; if (ch !== " ") break; end++; @@ -30562,12 +33898,12 @@ return tabs * tabSize + spaces2 * 1; }; var currentLine = cm.getLine(cm.getCursor().line); - var indent = whitespaceLength(currentLine.match(/^\s*/)[0]); + var indent2 = whitespaceLength(currentLine.match(/^\s*/)[0]); var chompedText = text.replace(/\n$/, ""); var wasChomped = text !== chompedText; var firstIndent = whitespaceLength(text.match(/^\s*/)[0]); var text = chompedText.replace(/^\s*/gm, function(wspace) { - var newIndent = indent + (whitespaceLength(wspace) - firstIndent); + var newIndent = indent2 + (whitespaceLength(wspace) - firstIndent); if (newIndent < 0) { return ""; } else if (cm.getOption("indentWithTabs")) { @@ -31459,7 +34795,7 @@ } function moveToWord(cm, cur2, repeat, forward, wordEnd, bigWord) { var curStart = copyCursor(cur2); - var words = []; + var words2 = []; if (forward && !wordEnd || !forward && wordEnd) { repeat++; } @@ -31468,25 +34804,25 @@ var word = findWord(cm, cur2, forward, bigWord, emptyLineIsWord); if (!word) { var eodCh = lineLength(cm, cm.lastLine()); - words.push(forward ? { line: cm.lastLine(), from: eodCh, to: eodCh } : { line: 0, from: 0, to: 0 }); + words2.push(forward ? { line: cm.lastLine(), from: eodCh, to: eodCh } : { line: 0, from: 0, to: 0 }); break; } - words.push(word); + words2.push(word); cur2 = new Pos2(word.line, forward ? word.to - 1 : word.from); } - var shortCircuit = words.length != repeat; - var firstWord = words[0]; - var lastWord = words.pop(); + var shortCircuit = words2.length != repeat; + var firstWord = words2[0]; + var lastWord = words2.pop(); if (forward && !wordEnd) { if (!shortCircuit && (firstWord.from != curStart.ch || firstWord.line != curStart.line)) { - lastWord = words.pop(); + lastWord = words2.pop(); } return lastWord && new Pos2(lastWord.line, lastWord.from); } else if (forward && wordEnd) { return lastWord && new Pos2(lastWord.line, lastWord.to - 1); } else if (!forward && wordEnd) { if (!shortCircuit && (firstWord.to != curStart.ch || firstWord.line != curStart.line)) { - lastWord = words.pop(); + lastWord = words2.pop(); } return lastWord && new Pos2(lastWord.line, lastWord.to); } else { @@ -31925,13 +35261,13 @@ function splitBySeparator(argString, separator) { var slashes = findUnescapedSeparators(argString, separator) || []; if (!slashes.length) return []; - var tokens = []; + var tokens2 = []; if (slashes[0] !== 0) return; for (var i = 0; i < slashes.length; i++) { if (typeof slashes[i] == "number") - tokens.push(argString.substring(slashes[i] + 1, slashes[i + 1])); + tokens2.push(argString.substring(slashes[i] + 1, slashes[i + 1])); } - return tokens; + return tokens2; } function findUnescapedSeparators(str, separator) { if (!separator) @@ -32081,15 +35417,15 @@ function dom(n) { if (typeof n === "string") n = document.createElement(n); for (var i = 1; i < arguments.length; i++) { - var a = arguments[i]; - if (!a) continue; - if (typeof a !== "object") a = document.createTextNode(a); - if (a.nodeType) n.appendChild(a); - else for (var key in a) { - if (!Object.prototype.hasOwnProperty.call(a, key)) continue; - if (key[0] === "$") n.style[key.slice(1)] = a[key]; - else if (typeof a[key] == "function") n[key] = a[key]; - else n.setAttribute(key, a[key]); + var a2 = arguments[i]; + if (!a2) continue; + if (typeof a2 !== "object") a2 = document.createTextNode(a2); + if (a2.nodeType) n.appendChild(a2); + else for (var key in a2) { + if (!Object.prototype.hasOwnProperty.call(a2, key)) continue; + if (key[0] === "$") n.style[key.slice(1)] = a2[key]; + else if (typeof a2[key] == "function") n[key] = a2[key]; + else n.setAttribute(key, a2[key]); } } return n; @@ -32875,38 +36211,38 @@ } else { textPart = text; } - function compareFn(a, b) { + function compareFn(a2, b) { if (reverse) { var tmp; - tmp = a; - a = b; + tmp = a2; + a2 = b; b = tmp; } if (ignoreCase) { - a = a.toLowerCase(); + a2 = a2.toLowerCase(); b = b.toLowerCase(); } - var amatch = numberRegex2 && numberRegex2.exec(a); + var amatch = numberRegex2 && numberRegex2.exec(a2); var bmatch = numberRegex2 && numberRegex2.exec(b); if (!amatch || !bmatch) { - return a < b ? -1 : 1; + return a2 < b ? -1 : 1; } var anum = parseInt((amatch[1] + amatch[2]).toLowerCase(), radix); var bnum = parseInt((bmatch[1] + bmatch[2]).toLowerCase(), radix); return anum - bnum; } - function comparePatternFn(a, b) { + function comparePatternFn(a2, b) { if (reverse) { var tmp; - tmp = a; - a = b; + tmp = a2; + a2 = b; b = tmp; } if (ignoreCase) { - a[0] = a[0].toLowerCase(); + a2[0] = a2[0].toLowerCase(); b[0] = b[0].toLowerCase(); } - return a[0] < b[0] ? -1 : 1; + return a2[0] < b[0] ? -1 : 1; } numPart.sort(pattern ? comparePatternFn : compareFn); if (pattern) { @@ -32978,11 +36314,11 @@ } var lineStart = params.line !== void 0 ? params.line : cm.firstLine(); var lineEnd2 = params.lineEnd || params.line || cm.lastLine(); - var tokens = splitBySlash(argString); + var tokens2 = splitBySlash(argString); var regexPart = argString, cmd2 = ""; - if (tokens && tokens.length) { - regexPart = tokens[0]; - cmd2 = tokens.slice(1, tokens.length).join("/"); + if (tokens2 && tokens2.length) { + regexPart = tokens2[0]; + cmd2 = tokens2.slice(1, tokens2.length).join("/"); } if (regexPart) { try { @@ -33036,16 +36372,16 @@ throw new Error("Search feature not available. Requires searchcursor.js or any other getSearchCursor implementation."); } var argString = params.argString; - var tokens = argString ? splitBySeparator(argString, argString[0]) : []; + var tokens2 = argString ? splitBySeparator(argString, argString[0]) : []; var regexPart = "", replacePart = "", trailing, flagsPart, count2; var confirm = false; var global = false; - if (tokens && tokens.length) { - regexPart = tokens[0]; + if (tokens2 && tokens2.length) { + regexPart = tokens2[0]; if (getOption("pcre") && regexPart !== "") { regexPart = new RegExp(regexPart).source; } - replacePart = tokens[1]; + replacePart = tokens2[1]; if (replacePart !== void 0) { if (getOption("pcre")) { replacePart = unescapeRegexReplace(replacePart.replace(/([^\\])&/g, "$1$$&")); @@ -33054,7 +36390,7 @@ } vimGlobalState.lastSubstituteReplacePart = replacePart; } - trailing = tokens[2] ? tokens[2].split(" ") : []; + trailing = tokens2[2] ? tokens2[2].split(" ") : []; } else { if (argString && argString.length) { showConfirm(cm, "Substitutions should be of the form :s/pattern/replace/"); @@ -34109,9 +37445,9 @@ if (pos.ch == void 0) pos.ch = Number.MAX_VALUE; var firstOffset = indexFromPos(cm.cm6.state.doc, pos); - var source = query.source.replace(/(\\.|{(?:\d+(?:,\d*)?|,\d+)})|[{}]/g, function(a, b) { + var source = query.source.replace(/(\\.|{(?:\d+(?:,\d*)?|,\d+)})|[{}]/g, function(a2, b) { if (!b) - return "\\" + a; + return "\\" + a2; return b; }); function rCursor(doc2, from = 0, to = doc2.length) { @@ -34460,9 +37796,9 @@ e.preventDefault(); }; CodeMirror.e_stop = function(e) { - var _a2, _b; + var _a2, _b2; (_a2 = e === null || e === void 0 ? void 0 : e.stopPropagation) === null || _a2 === void 0 ? void 0 : _a2.call(e); - (_b = e === null || e === void 0 ? void 0 : e.preventDefault) === null || _b === void 0 ? void 0 : _b.call(e); + (_b2 = e === null || e === void 0 ? void 0 : e.preventDefault) === null || _b2 === void 0 ? void 0 : _b2.call(e); }; CodeMirror.lookupKey = function lookupKey(key, map, handle) { var result = CodeMirror.keys[key]; @@ -34629,7 +37965,7 @@ return null; } function findEnclosingTag(cm, pos) { - var _a2, _b; + var _a2, _b2; var state = cm.cm6.state; var offset = cm.indexFromPos(pos); if (offset < state.doc.length) { @@ -34640,7 +37976,7 @@ var tree = ensureSyntaxTree(state, offset); var node = (tree === null || tree === void 0 ? void 0 : tree.resolve(offset)) || null; while (node) { - if (((_a2 = node.firstChild) === null || _a2 === void 0 ? void 0 : _a2.type.name) == "OpenTag" && ((_b = node.lastChild) === null || _b === void 0 ? void 0 : _b.type.name) == "CloseTag") { + if (((_a2 = node.firstChild) === null || _a2 === void 0 ? void 0 : _a2.type.name) == "OpenTag" && ((_b2 = node.lastChild) === null || _b2 === void 0 ? void 0 : _b2.type.name) == "CloseTag") { return { open: convertRange(state.doc, node.firstChild), close: convertRange(state.doc, node.lastChild) @@ -34685,10 +38021,10 @@ while (row <= endRow) { var line = cm.getLine(row); if (line.length > max) { - var space4 = findSpace(line, max, 5); - if (space4) { - var indentation = (_a2 = /^\s*/.exec(line)) === null || _a2 === void 0 ? void 0 : _a2[0]; - cm.replaceRange("\n" + indentation, new Pos(row, space4.start), new Pos(row, space4.end)); + var space6 = findSpace(line, max, 5); + if (space6) { + var indentation3 = (_a2 = /^\s*/.exec(line)) === null || _a2 === void 0 ? void 0 : _a2[0]; + cm.replaceRange("\n" + indentation3, new Pos(row, space6.start), new Pos(row, space6.end)); } endRow++; } else if (allowMerge && /\S/.test(line) && row != endRow) { @@ -34697,8 +38033,8 @@ var trimmedLine = line.replace(/\s+$/, ""); var trimmedNextLine = nextLine.replace(/^\s+/, ""); var mergedLine = trimmedLine + " " + trimmedNextLine; - var space4 = findSpace(mergedLine, max, 5); - if (space4 && space4.start > trimmedLine.length || mergedLine.length < max) { + var space6 = findSpace(mergedLine, max, 5); + if (space6 && space6.start > trimmedLine.length || mergedLine.length < max) { cm.replaceRange(" ", new Pos(row, trimmedLine.length), new Pos(row + 1, nextLine.length - trimmedNextLine.length)); row--; endRow--; @@ -34875,7 +38211,7 @@ return { left: left - view.scrollDOM.scrollLeft * view.scaleX, top: rect.top - view.scrollDOM.scrollTop * view.scaleY }; } function measureCursor(cm, view, cursor, primary) { - var _a2, _b, _c, _d; + var _a2, _b2, _c, _d; let head = cursor.head; let fatCursor = false; let hCoeff = 1; @@ -34908,7 +38244,7 @@ let node = domAtPos ? domAtPos.node : view.contentDOM; if (node instanceof Text && domAtPos.offset >= node.data.length) { if ((_a2 = node.parentElement) === null || _a2 === void 0 ? void 0 : _a2.nextSibling) { - node = (_b = node.parentElement) === null || _b === void 0 ? void 0 : _b.nextSibling; + node = (_b2 = node.parentElement) === null || _b2 === void 0 ? void 0 : _b2.nextSibling; domAtPos = { node, offset: 0 }; } } @@ -35194,13 +38530,13 @@ provide: () => { return [ EditorView.inputHandler.of((view, from, to, text) => { - var _a2, _b; + var _a2, _b2; var cm = getCM(view); if (!cm) return false; var vim2 = (_a2 = cm.state) === null || _a2 === void 0 ? void 0 : _a2.vim; var vimPlugin2 = cm.state.vimPlugin; - if (vim2 && !vim2.insertMode && !((_b = cm.curOp) === null || _b === void 0 ? void 0 : _b.isVimOp)) { + if (vim2 && !vim2.insertMode && !((_b2 = cm.curOp) === null || _b2 === void 0 ? void 0 : _b2.isVimOp)) { if (text === "\0\0") { return true; } @@ -35334,6 +38670,78 @@ } }); var vimMode = "INSERT"; + function languageExtension(mode) { + switch (String(mode || "").toLowerCase()) { + case "html": + return html(); + case "markdown": + return markdown(); + case "javascript": + return javascript({ jsx: true }); + case "typescript": + return javascript({ jsx: true, typescript: true }); + case "python": + return python(); + case "json": + return json(); + case "css": + return css(); + case "sql": + return sql(); + case "yaml": + return yaml(); + case "go": + return go(); + case "rust": + return rust(); + case "java": + return java(); + case "cpp": + return cpp(); + case "shell": + return StreamLanguage.define(shell); + case "toml": + return StreamLanguage.define(toml); + default: + return null; + } + } + function attachMinimap(view, minimap, text) { + if (!minimap) { + return; + } + const lines = text.split("\n"); + const count2 = Math.max(lines.length, 1); + const step = Math.max(1, Math.ceil(count2 / 2e3)); + for (let index = 0; index < count2; index += step) { + const line = document.createElement("span"); + line.className = "content-code-minimap-line"; + line.style.top = index / count2 * 100 + "%"; + const length = (lines[index] || "").trimEnd().length; + line.style.width = Math.min(96, Math.max(3, length * 1.4)) + "%"; + minimap.appendChild(line); + } + const viewport = document.createElement("span"); + viewport.className = "content-code-minimap-viewport"; + minimap.appendChild(viewport); + const scroller = view.scrollDOM; + const update = () => { + const scrollHeight = Math.max(scroller.scrollHeight, 1); + viewport.style.top = scroller.scrollTop / scrollHeight * 100 + "%"; + viewport.style.height = Math.min(100, scroller.clientHeight / scrollHeight * 100) + "%"; + }; + scroller.addEventListener("scroll", update, { passive: true }); + new ResizeObserver(update).observe(scroller); + minimap.addEventListener("pointerdown", (event) => { + const rect = minimap.getBoundingClientRect(); + const ratio = Math.max( + 0, + Math.min(1, (event.clientY - rect.top) / rect.height) + ); + scroller.scrollTop = ratio * scroller.scrollHeight - scroller.clientHeight / 2; + }); + update(); + } function setEditorMode(mode) { vimMode = mode; const el = document.getElementById("editor-vim-mode"); @@ -35443,6 +38851,28 @@ view.dom.addEventListener("focusin", updateCursor); } window.PagesWikiEditor = { + createViewer(target, text, mode, minimap) { + const extensions = [ + lineNumbers(), + syntaxHighlighting(defaultHighlightStyle), + pagesWikiTheme, + EditorState.readOnly.of(true), + EditorView.editable.of(false) + ]; + const language2 = languageExtension(mode); + if (language2) { + extensions.push(language2); + } + const view = new EditorView({ + state: EditorState.create({ + doc: text, + extensions + }), + parent: target + }); + attachMinimap(view, minimap, text); + return view; + }, create(target, initialText, mode, options = {}) { const keymapName = String(options.keymap || "default").toLowerCase(); const extensions = [ @@ -35484,10 +38914,9 @@ }) ); } - if (mode === "markdown") { - extensions.push(markdown()); - } else { - extensions.push(html()); + const language2 = languageExtension(mode); + if (language2) { + extensions.push(language2); } const view = new EditorView({ state: EditorState.create({ diff --git a/static/vendor/codemirror/editor.bundle.js.map b/static/vendor/codemirror/editor.bundle.js.map index 289b34c..98c49fa 100644 --- a/static/vendor/codemirror/editor.bundle.js.map +++ b/static/vendor/codemirror/editor.bundle.js.map @@ -1,7 +1,7 @@ { "version": 3, - "sources": ["../../../assets/editor/node_modules/@marijn/find-cluster-break/src/index.js", "../../../assets/editor/node_modules/@codemirror/state/dist/index.js", "../../../assets/editor/node_modules/style-mod/src/style-mod.js", "../../../assets/editor/node_modules/w3c-keyname/index.js", "../../../assets/editor/node_modules/@codemirror/view/dist/index.js", "../../../assets/editor/node_modules/@lezer/common/dist/index.js", "../../../assets/editor/node_modules/@lezer/highlight/dist/index.js", "../../../assets/editor/node_modules/@codemirror/language/dist/index.js", "../../../assets/editor/node_modules/@codemirror/commands/dist/index.js", "../../../assets/editor/node_modules/@codemirror/autocomplete/dist/index.js", "../../../assets/editor/node_modules/@lezer/lr/dist/index.js", "../../../assets/editor/node_modules/@lezer/html/dist/index.js", "../../../assets/editor/node_modules/@lezer/css/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-css/dist/index.js", "../../../assets/editor/node_modules/@lezer/javascript/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-javascript/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-html/dist/index.js", "../../../assets/editor/node_modules/@lezer/markdown/dist/index.js", "../../../assets/editor/node_modules/@codemirror/lang-markdown/dist/index.js", "../../../assets/editor/node_modules/@codemirror/search/dist/index.js", "../../../assets/editor/node_modules/@replit/codemirror-vim/dist/index.js", "../../../assets/editor/src/editor.js"], - "sourcesContent": ["// These are filled with ranges (rangeFrom[i] up to but not including\n// rangeTo[i]) of code points that count as extending characters.\nlet rangeFrom = [], rangeTo = []\n\n;(() => {\n // Compressed representation of the Grapheme_Cluster_Break=Extend\n // information from\n // http://www.unicode.org/Public/16.0.0/ucd/auxiliary/GraphemeBreakProperty.txt.\n // Each pair of elements represents a range, as an offet from the\n // previous range and a length. Numbers are in base-36, with the empty\n // string being a shorthand for 1.\n let numbers = \"lc,34,7n,7,7b,19,,,,2,,2,,,20,b,1c,l,g,,2t,7,2,6,2,2,,4,z,,u,r,2j,b,1m,9,9,,o,4,,9,,3,,5,17,3,3b,f,,w,1j,,,,4,8,4,,3,7,a,2,t,,1m,,,,2,4,8,,9,,a,2,q,,2,2,1l,,4,2,4,2,2,3,3,,u,2,3,,b,2,1l,,4,5,,2,4,,k,2,m,6,,,1m,,,2,,4,8,,7,3,a,2,u,,1n,,,,c,,9,,14,,3,,1l,3,5,3,,4,7,2,b,2,t,,1m,,2,,2,,3,,5,2,7,2,b,2,s,2,1l,2,,,2,4,8,,9,,a,2,t,,20,,4,,2,3,,,8,,29,,2,7,c,8,2q,,2,9,b,6,22,2,r,,,,,,1j,e,,5,,2,5,b,,10,9,,2u,4,,6,,2,2,2,p,2,4,3,g,4,d,,2,2,6,,f,,jj,3,qa,3,t,3,t,2,u,2,1s,2,,7,8,,2,b,9,,19,3,3b,2,y,,3a,3,4,2,9,,6,3,63,2,2,,1m,,,7,,,,,2,8,6,a,2,,1c,h,1r,4,1c,7,,,5,,14,9,c,2,w,4,2,2,,3,1k,,,2,3,,,3,1m,8,2,2,48,3,,d,,7,4,,6,,3,2,5i,1m,,5,ek,,5f,x,2da,3,3x,,2o,w,fe,6,2x,2,n9w,4,,a,w,2,28,2,7k,,3,,4,,p,2,5,,47,2,q,i,d,,12,8,p,b,1a,3,1c,,2,4,2,2,13,,1v,6,2,2,2,2,c,,8,,1b,,1f,,,3,2,2,5,2,,,16,2,8,,6m,,2,,4,,fn4,,kh,g,g,g,a6,2,gt,,6a,,45,5,1ae,3,,2,5,4,14,3,4,,4l,2,fx,4,ar,2,49,b,4w,,1i,f,1k,3,1d,4,2,2,1x,3,10,5,,8,1q,,c,2,1g,9,a,4,2,,2n,3,2,,,2,6,,4g,,3,8,l,2,1l,2,,,,,m,,e,7,3,5,5f,8,2,3,,,n,,29,,2,6,,,2,,,2,,2,6j,,2,4,6,2,,2,r,2,2d,8,2,,,2,2y,,,,2,6,,,2t,3,2,4,,5,77,9,,2,6t,,a,2,,,4,,40,4,2,2,4,,w,a,14,6,2,4,8,,9,6,2,3,1a,d,,2,ba,7,,6,,,2a,m,2,7,,2,,2,3e,6,3,,,2,,7,,,20,2,3,,,,9n,2,f0b,5,1n,7,t4,,1r,4,29,,f5k,2,43q,,,3,4,5,8,8,2,7,u,4,44,3,1iz,1j,4,1e,8,,e,,m,5,,f,11s,7,,h,2,7,,2,,5,79,7,c5,4,15s,7,31,7,240,5,gx7k,2o,3k,6o\".split(\",\").map(s => s ? parseInt(s, 36) : 1)\n for (let i = 0, n = 0; i < numbers.length; i++)\n (i % 2 ? rangeTo : rangeFrom).push(n = n + numbers[i])\n})()\n\nexport function isExtendingChar(code) {\n if (code < 768) return false\n for (let from = 0, to = rangeFrom.length;;) {\n let mid = (from + to) >> 1\n if (code < rangeFrom[mid]) to = mid\n else if (code >= rangeTo[mid]) from = mid + 1\n else return true\n if (from == to) return false\n }\n}\n\nfunction isRegionalIndicator(code) {\n return code >= 0x1F1E6 && code <= 0x1F1FF\n}\n\nfunction check(code) {\n for (let i = 0; i < rangeFrom.length; i++) {\n if (rangeTo[i] > code) return rangeFrom[i] <= code\n }\n return false\n}\n\nconst ZWJ = 0x200d\n\nexport function findClusterBreak(str, pos, forward = true, includeExtending = true) {\n return (forward ? nextClusterBreak : prevClusterBreak)(str, pos, includeExtending)\n}\n\nfunction nextClusterBreak(str, pos, includeExtending) {\n if (pos == str.length) return pos\n // If pos is in the middle of a surrogate pair, move to its start\n if (pos && surrogateLow(str.charCodeAt(pos)) && surrogateHigh(str.charCodeAt(pos - 1))) pos--\n let prev = codePointAt(str, pos)\n pos += codePointSize(prev)\n while (pos < str.length) {\n let next = codePointAt(str, pos)\n if (prev == ZWJ || next == ZWJ || includeExtending && isExtendingChar(next)) {\n pos += codePointSize(next)\n prev = next\n } else if (isRegionalIndicator(next)) {\n let countBefore = 0, i = pos - 2\n while (i >= 0 && isRegionalIndicator(codePointAt(str, i))) { countBefore++; i -= 2 }\n if (countBefore % 2 == 0) break\n else pos += 2\n } else {\n break\n }\n }\n return pos\n}\n\nfunction prevClusterBreak(str, pos, includeExtending) {\n while (pos > 0) {\n let found = nextClusterBreak(str, pos - 2, includeExtending)\n if (found < pos) return found\n pos--\n }\n return 0\n}\n\nfunction codePointAt(str, pos) {\n let code0 = str.charCodeAt(pos)\n if (!surrogateHigh(code0) || pos + 1 == str.length) return code0\n let code1 = str.charCodeAt(pos + 1)\n if (!surrogateLow(code1)) return code0\n return ((code0 - 0xd800) << 10) + (code1 - 0xdc00) + 0x10000\n}\n\nfunction surrogateLow(ch) { return ch >= 0xDC00 && ch < 0xE000 }\nfunction surrogateHigh(ch) { return ch >= 0xD800 && ch < 0xDC00 }\nfunction codePointSize(code) { return code < 0x10000 ? 1 : 2 }\n", "import { findClusterBreak as findClusterBreak$1 } from '@marijn/find-cluster-break';\n\n/**\nThe data structure for documents. @nonabstract\n*/\nclass Text {\n /**\n Get the line description around the given position.\n */\n lineAt(pos) {\n if (pos < 0 || pos > this.length)\n throw new RangeError(`Invalid position ${pos} in document of length ${this.length}`);\n return this.lineInner(pos, false, 1, 0);\n }\n /**\n Get the description for the given (1-based) line number.\n */\n line(n) {\n if (n < 1 || n > this.lines)\n throw new RangeError(`Invalid line number ${n} in ${this.lines}-line document`);\n return this.lineInner(n, true, 1, 0);\n }\n /**\n Replace a range of the text with the given content.\n */\n replace(from, to, text) {\n [from, to] = clip(this, from, to);\n let parts = [];\n this.decompose(0, from, parts, 2 /* Open.To */);\n if (text.length)\n text.decompose(0, text.length, parts, 1 /* Open.From */ | 2 /* Open.To */);\n this.decompose(to, this.length, parts, 1 /* Open.From */);\n return TextNode.from(parts, this.length - (to - from) + text.length);\n }\n /**\n Append another document to this one.\n */\n append(other) {\n return this.replace(this.length, this.length, other);\n }\n /**\n Retrieve the text between the given points.\n */\n slice(from, to = this.length) {\n [from, to] = clip(this, from, to);\n let parts = [];\n this.decompose(from, to, parts, 0);\n return TextNode.from(parts, to - from);\n }\n /**\n Test whether this text is equal to another instance.\n */\n eq(other) {\n if (other == this)\n return true;\n if (other.length != this.length || other.lines != this.lines)\n return false;\n let start = this.scanIdentical(other, 1), end = this.length - this.scanIdentical(other, -1);\n let a = new RawTextCursor(this), b = new RawTextCursor(other);\n for (let skip = start, pos = start;;) {\n a.next(skip);\n b.next(skip);\n skip = 0;\n if (a.lineBreak != b.lineBreak || a.done != b.done || a.value != b.value)\n return false;\n pos += a.value.length;\n if (a.done || pos >= end)\n return true;\n }\n }\n /**\n Iterate over the text. When `dir` is `-1`, iteration happens\n from end to start. This will return lines and the breaks between\n them as separate strings.\n */\n iter(dir = 1) { return new RawTextCursor(this, dir); }\n /**\n Iterate over a range of the text. When `from` > `to`, the\n iterator will run in reverse.\n */\n iterRange(from, to = this.length) { return new PartialTextCursor(this, from, to); }\n /**\n Return a cursor that iterates over the given range of lines,\n _without_ returning the line breaks between, and yielding empty\n strings for empty lines.\n \n When `from` and `to` are given, they should be 1-based line numbers.\n */\n iterLines(from, to) {\n let inner;\n if (from == null) {\n inner = this.iter();\n }\n else {\n if (to == null)\n to = this.lines + 1;\n let start = this.line(from).from;\n inner = this.iterRange(start, Math.max(start, to == this.lines + 1 ? this.length : to <= 1 ? 0 : this.line(to - 1).to));\n }\n return new LineCursor(inner);\n }\n /**\n Return the document as a string, using newline characters to\n separate lines.\n */\n toString() { return this.sliceString(0); }\n /**\n Convert the document to an array of lines (which can be\n deserialized again via [`Text.of`](https://codemirror.net/6/docs/ref/#state.Text^of)).\n */\n toJSON() {\n let lines = [];\n this.flatten(lines);\n return lines;\n }\n /**\n @internal\n */\n constructor() { }\n /**\n Create a `Text` instance for the given array of lines.\n */\n static of(text) {\n if (text.length == 0)\n throw new RangeError(\"A document must have at least one line\");\n if (text.length == 1 && !text[0])\n return Text.empty;\n return text.length <= 32 /* Tree.Branch */ ? new TextLeaf(text) : TextNode.from(TextLeaf.split(text, []));\n }\n}\n// Leaves store an array of line strings. There are always line breaks\n// between these strings. Leaves are limited in size and have to be\n// contained in TextNode instances for bigger documents.\nclass TextLeaf extends Text {\n constructor(text, length = textLength(text)) {\n super();\n this.text = text;\n this.length = length;\n }\n get lines() { return this.text.length; }\n get children() { return null; }\n lineInner(target, isLine, line, offset) {\n for (let i = 0;; i++) {\n let string = this.text[i], end = offset + string.length;\n if ((isLine ? line : end) >= target)\n return new Line(offset, end, line, string);\n offset = end + 1;\n line++;\n }\n }\n decompose(from, to, target, open) {\n let text = from <= 0 && to >= this.length ? this\n : new TextLeaf(sliceText(this.text, from, to), Math.min(to, this.length) - Math.max(0, from));\n if (open & 1 /* Open.From */) {\n let prev = target.pop();\n let joined = appendText(text.text, prev.text.slice(), 0, text.length);\n if (joined.length <= 32 /* Tree.Branch */) {\n target.push(new TextLeaf(joined, prev.length + text.length));\n }\n else {\n let mid = joined.length >> 1;\n target.push(new TextLeaf(joined.slice(0, mid)), new TextLeaf(joined.slice(mid)));\n }\n }\n else {\n target.push(text);\n }\n }\n replace(from, to, text) {\n if (!(text instanceof TextLeaf))\n return super.replace(from, to, text);\n [from, to] = clip(this, from, to);\n let lines = appendText(this.text, appendText(text.text, sliceText(this.text, 0, from)), to);\n let newLen = this.length + text.length - (to - from);\n if (lines.length <= 32 /* Tree.Branch */)\n return new TextLeaf(lines, newLen);\n return TextNode.from(TextLeaf.split(lines, []), newLen);\n }\n sliceString(from, to = this.length, lineSep = \"\\n\") {\n [from, to] = clip(this, from, to);\n let result = \"\";\n for (let pos = 0, i = 0; pos <= to && i < this.text.length; i++) {\n let line = this.text[i], end = pos + line.length;\n if (pos > from && i)\n result += lineSep;\n if (from < end && to > pos)\n result += line.slice(Math.max(0, from - pos), to - pos);\n pos = end + 1;\n }\n return result;\n }\n flatten(target) {\n for (let line of this.text)\n target.push(line);\n }\n scanIdentical() { return 0; }\n static split(text, target) {\n let part = [], len = -1;\n for (let line of text) {\n part.push(line);\n len += line.length + 1;\n if (part.length == 32 /* Tree.Branch */) {\n target.push(new TextLeaf(part, len));\n part = [];\n len = -1;\n }\n }\n if (len > -1)\n target.push(new TextLeaf(part, len));\n return target;\n }\n}\n// Nodes provide the tree structure of the `Text` type. They store a\n// number of other nodes or leaves, taking care to balance themselves\n// on changes. There are implied line breaks _between_ the children of\n// a node (but not before the first or after the last child).\nclass TextNode extends Text {\n constructor(children, length) {\n super();\n this.children = children;\n this.length = length;\n this.lines = 0;\n for (let child of children)\n this.lines += child.lines;\n }\n lineInner(target, isLine, line, offset) {\n for (let i = 0;; i++) {\n let child = this.children[i], end = offset + child.length, endLine = line + child.lines - 1;\n if ((isLine ? endLine : end) >= target)\n return child.lineInner(target, isLine, line, offset);\n offset = end + 1;\n line = endLine + 1;\n }\n }\n decompose(from, to, target, open) {\n for (let i = 0, pos = 0; pos <= to && i < this.children.length; i++) {\n let child = this.children[i], end = pos + child.length;\n if (from <= end && to >= pos) {\n let childOpen = open & ((pos <= from ? 1 /* Open.From */ : 0) | (end >= to ? 2 /* Open.To */ : 0));\n if (pos >= from && end <= to && !childOpen)\n target.push(child);\n else\n child.decompose(from - pos, to - pos, target, childOpen);\n }\n pos = end + 1;\n }\n }\n replace(from, to, text) {\n [from, to] = clip(this, from, to);\n if (text.lines < this.lines)\n for (let i = 0, pos = 0; i < this.children.length; i++) {\n let child = this.children[i], end = pos + child.length;\n // Fast path: if the change only affects one child and the\n // child's size remains in the acceptable range, only update\n // that child\n if (from >= pos && to <= end) {\n let updated = child.replace(from - pos, to - pos, text);\n let totalLines = this.lines - child.lines + updated.lines;\n if (updated.lines < (totalLines >> (5 /* Tree.BranchShift */ - 1)) &&\n updated.lines > (totalLines >> (5 /* Tree.BranchShift */ + 1))) {\n let copy = this.children.slice();\n copy[i] = updated;\n return new TextNode(copy, this.length - (to - from) + text.length);\n }\n return super.replace(pos, end, updated);\n }\n pos = end + 1;\n }\n return super.replace(from, to, text);\n }\n sliceString(from, to = this.length, lineSep = \"\\n\") {\n [from, to] = clip(this, from, to);\n let result = \"\";\n for (let i = 0, pos = 0; i < this.children.length && pos <= to; i++) {\n let child = this.children[i], end = pos + child.length;\n if (pos > from && i)\n result += lineSep;\n if (from < end && to > pos)\n result += child.sliceString(from - pos, to - pos, lineSep);\n pos = end + 1;\n }\n return result;\n }\n flatten(target) {\n for (let child of this.children)\n child.flatten(target);\n }\n scanIdentical(other, dir) {\n if (!(other instanceof TextNode))\n return 0;\n let length = 0;\n let [iA, iB, eA, eB] = dir > 0 ? [0, 0, this.children.length, other.children.length]\n : [this.children.length - 1, other.children.length - 1, -1, -1];\n for (;; iA += dir, iB += dir) {\n if (iA == eA || iB == eB)\n return length;\n let chA = this.children[iA], chB = other.children[iB];\n if (chA != chB)\n return length + chA.scanIdentical(chB, dir);\n length += chA.length + 1;\n }\n }\n static from(children, length = children.reduce((l, ch) => l + ch.length + 1, -1)) {\n let lines = 0;\n for (let ch of children)\n lines += ch.lines;\n if (lines < 32 /* Tree.Branch */) {\n let flat = [];\n for (let ch of children)\n ch.flatten(flat);\n return new TextLeaf(flat, length);\n }\n let chunk = Math.max(32 /* Tree.Branch */, lines >> 5 /* Tree.BranchShift */), maxChunk = chunk << 1, minChunk = chunk >> 1;\n let chunked = [], currentLines = 0, currentLen = -1, currentChunk = [];\n function add(child) {\n let last;\n if (child.lines > maxChunk && child instanceof TextNode) {\n for (let node of child.children)\n add(node);\n }\n else if (child.lines > minChunk && (currentLines > minChunk || !currentLines)) {\n flush();\n chunked.push(child);\n }\n else if (child instanceof TextLeaf && currentLines &&\n (last = currentChunk[currentChunk.length - 1]) instanceof TextLeaf &&\n child.lines + last.lines <= 32 /* Tree.Branch */) {\n currentLines += child.lines;\n currentLen += child.length + 1;\n currentChunk[currentChunk.length - 1] = new TextLeaf(last.text.concat(child.text), last.length + 1 + child.length);\n }\n else {\n if (currentLines + child.lines > chunk)\n flush();\n currentLines += child.lines;\n currentLen += child.length + 1;\n currentChunk.push(child);\n }\n }\n function flush() {\n if (currentLines == 0)\n return;\n chunked.push(currentChunk.length == 1 ? currentChunk[0] : TextNode.from(currentChunk, currentLen));\n currentLen = -1;\n currentLines = currentChunk.length = 0;\n }\n for (let child of children)\n add(child);\n flush();\n return chunked.length == 1 ? chunked[0] : new TextNode(chunked, length);\n }\n}\nText.empty = /*@__PURE__*/new TextLeaf([\"\"], 0);\nfunction textLength(text) {\n let length = -1;\n for (let line of text)\n length += line.length + 1;\n return length;\n}\nfunction appendText(text, target, from = 0, to = 1e9) {\n for (let pos = 0, i = 0, first = true; i < text.length && pos <= to; i++) {\n let line = text[i], end = pos + line.length;\n if (end >= from) {\n if (end > to)\n line = line.slice(0, to - pos);\n if (pos < from)\n line = line.slice(from - pos);\n if (first) {\n target[target.length - 1] += line;\n first = false;\n }\n else\n target.push(line);\n }\n pos = end + 1;\n }\n return target;\n}\nfunction sliceText(text, from, to) {\n return appendText(text, [\"\"], from, to);\n}\nclass RawTextCursor {\n constructor(text, dir = 1) {\n this.dir = dir;\n this.done = false;\n this.lineBreak = false;\n this.value = \"\";\n this.nodes = [text];\n this.offsets = [dir > 0 ? 1 : (text instanceof TextLeaf ? text.text.length : text.children.length) << 1];\n }\n nextInner(skip, dir) {\n this.done = this.lineBreak = false;\n for (;;) {\n let last = this.nodes.length - 1;\n let top = this.nodes[last], offsetValue = this.offsets[last], offset = offsetValue >> 1;\n let size = top instanceof TextLeaf ? top.text.length : top.children.length;\n if (offset == (dir > 0 ? size : 0)) {\n if (last == 0) {\n this.done = true;\n this.value = \"\";\n return this;\n }\n if (dir > 0)\n this.offsets[last - 1]++;\n this.nodes.pop();\n this.offsets.pop();\n }\n else if ((offsetValue & 1) == (dir > 0 ? 0 : 1)) {\n this.offsets[last] += dir;\n if (skip == 0) {\n this.lineBreak = true;\n this.value = \"\\n\";\n return this;\n }\n skip--;\n }\n else if (top instanceof TextLeaf) {\n // Move to the next string\n let next = top.text[offset + (dir < 0 ? -1 : 0)];\n this.offsets[last] += dir;\n if (next.length > Math.max(0, skip)) {\n this.value = skip == 0 ? next : dir > 0 ? next.slice(skip) : next.slice(0, next.length - skip);\n return this;\n }\n skip -= next.length;\n }\n else {\n let next = top.children[offset + (dir < 0 ? -1 : 0)];\n if (skip > next.length) {\n skip -= next.length;\n this.offsets[last] += dir;\n }\n else {\n if (dir < 0)\n this.offsets[last]--;\n this.nodes.push(next);\n this.offsets.push(dir > 0 ? 1 : (next instanceof TextLeaf ? next.text.length : next.children.length) << 1);\n }\n }\n }\n }\n next(skip = 0) {\n if (skip < 0) {\n this.nextInner(-skip, (-this.dir));\n skip = this.value.length;\n }\n return this.nextInner(skip, this.dir);\n }\n}\nclass PartialTextCursor {\n constructor(text, start, end) {\n this.value = \"\";\n this.done = false;\n this.cursor = new RawTextCursor(text, start > end ? -1 : 1);\n this.pos = start > end ? text.length : 0;\n this.from = Math.min(start, end);\n this.to = Math.max(start, end);\n }\n nextInner(skip, dir) {\n if (dir < 0 ? this.pos <= this.from : this.pos >= this.to) {\n this.value = \"\";\n this.done = true;\n return this;\n }\n skip += Math.max(0, dir < 0 ? this.pos - this.to : this.from - this.pos);\n let limit = dir < 0 ? this.pos - this.from : this.to - this.pos;\n if (skip > limit)\n skip = limit;\n limit -= skip;\n let { value } = this.cursor.next(skip);\n this.pos += (value.length + skip) * dir;\n this.value = value.length <= limit ? value : dir < 0 ? value.slice(value.length - limit) : value.slice(0, limit);\n this.done = !this.value;\n return this;\n }\n next(skip = 0) {\n if (skip < 0)\n skip = Math.max(skip, this.from - this.pos);\n else if (skip > 0)\n skip = Math.min(skip, this.to - this.pos);\n return this.nextInner(skip, this.cursor.dir);\n }\n get lineBreak() { return this.cursor.lineBreak && this.value != \"\"; }\n}\nclass LineCursor {\n constructor(inner) {\n this.inner = inner;\n this.afterBreak = true;\n this.value = \"\";\n this.done = false;\n }\n next(skip = 0) {\n let { done, lineBreak, value } = this.inner.next(skip);\n if (done && this.afterBreak) {\n this.value = \"\";\n this.afterBreak = false;\n }\n else if (done) {\n this.done = true;\n this.value = \"\";\n }\n else if (lineBreak) {\n if (this.afterBreak) {\n this.value = \"\";\n }\n else {\n this.afterBreak = true;\n this.next();\n }\n }\n else {\n this.value = value;\n this.afterBreak = false;\n }\n return this;\n }\n get lineBreak() { return false; }\n}\nif (typeof Symbol != \"undefined\") {\n Text.prototype[Symbol.iterator] = function () { return this.iter(); };\n RawTextCursor.prototype[Symbol.iterator] = PartialTextCursor.prototype[Symbol.iterator] =\n LineCursor.prototype[Symbol.iterator] = function () { return this; };\n}\n/**\nThis type describes a line in the document. It is created\non-demand when lines are [queried](https://codemirror.net/6/docs/ref/#state.Text.lineAt).\n*/\nclass Line {\n /**\n @internal\n */\n constructor(\n /**\n The position of the start of the line.\n */\n from, \n /**\n The position at the end of the line (_before_ the line break,\n or at the end of document for the last line).\n */\n to, \n /**\n This line's line number (1-based).\n */\n number, \n /**\n The line's content.\n */\n text) {\n this.from = from;\n this.to = to;\n this.number = number;\n this.text = text;\n }\n /**\n The length of the line (not including any line break after it).\n */\n get length() { return this.to - this.from; }\n}\nfunction clip(text, from, to) {\n from = Math.max(0, Math.min(text.length, from));\n return [from, Math.max(from, Math.min(text.length, to))];\n}\n\n/**\nReturns a next grapheme cluster break _after_ (not equal to)\n`pos`, if `forward` is true, or before otherwise. Returns `pos`\nitself if no further cluster break is available in the string.\nMoves across surrogate pairs, extending characters (when\n`includeExtending` is true), characters joined with zero-width\njoiners, and flag emoji.\n*/\nfunction findClusterBreak(str, pos, forward = true, includeExtending = true) {\n return findClusterBreak$1(str, pos, forward, includeExtending);\n}\nfunction surrogateLow(ch) { return ch >= 0xDC00 && ch < 0xE000; }\nfunction surrogateHigh(ch) { return ch >= 0xD800 && ch < 0xDC00; }\n/**\nFind the code point at the given position in a string (like the\n[`codePointAt`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/codePointAt)\nstring method).\n*/\nfunction codePointAt(str, pos) {\n let code0 = str.charCodeAt(pos);\n if (!surrogateHigh(code0) || pos + 1 == str.length)\n return code0;\n let code1 = str.charCodeAt(pos + 1);\n if (!surrogateLow(code1))\n return code0;\n return ((code0 - 0xd800) << 10) + (code1 - 0xdc00) + 0x10000;\n}\n/**\nGiven a Unicode codepoint, return the JavaScript string that\nrespresents it (like\n[`String.fromCodePoint`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/fromCodePoint)).\n*/\nfunction fromCodePoint(code) {\n if (code <= 0xffff)\n return String.fromCharCode(code);\n code -= 0x10000;\n return String.fromCharCode((code >> 10) + 0xd800, (code & 1023) + 0xdc00);\n}\n/**\nThe amount of positions a character takes up in a JavaScript string.\n*/\nfunction codePointSize(code) { return code < 0x10000 ? 1 : 2; }\n\nconst DefaultSplit = /\\r\\n?|\\n/;\n/**\nDistinguishes different ways in which positions can be mapped.\n*/\nvar MapMode = /*@__PURE__*/(function (MapMode) {\n /**\n Map a position to a valid new position, even when its context\n was deleted.\n */\n MapMode[MapMode[\"Simple\"] = 0] = \"Simple\";\n /**\n Return null if deletion happens across the position.\n */\n MapMode[MapMode[\"TrackDel\"] = 1] = \"TrackDel\";\n /**\n Return null if the character _before_ the position is deleted.\n */\n MapMode[MapMode[\"TrackBefore\"] = 2] = \"TrackBefore\";\n /**\n Return null if the character _after_ the position is deleted.\n */\n MapMode[MapMode[\"TrackAfter\"] = 3] = \"TrackAfter\";\nreturn MapMode})(MapMode || (MapMode = {}));\n/**\nA change description is a variant of [change set](https://codemirror.net/6/docs/ref/#state.ChangeSet)\nthat doesn't store the inserted text. As such, it can't be\napplied, but is cheaper to store and manipulate.\n*/\nclass ChangeDesc {\n // Sections are encoded as pairs of integers. The first is the\n // length in the current document, and the second is -1 for\n // unaffected sections, and the length of the replacement content\n // otherwise. So an insertion would be (0, n>0), a deletion (n>0,\n // 0), and a replacement two positive numbers.\n /**\n @internal\n */\n constructor(\n /**\n @internal\n */\n sections) {\n this.sections = sections;\n }\n /**\n The length of the document before the change.\n */\n get length() {\n let result = 0;\n for (let i = 0; i < this.sections.length; i += 2)\n result += this.sections[i];\n return result;\n }\n /**\n The length of the document after the change.\n */\n get newLength() {\n let result = 0;\n for (let i = 0; i < this.sections.length; i += 2) {\n let ins = this.sections[i + 1];\n result += ins < 0 ? this.sections[i] : ins;\n }\n return result;\n }\n /**\n False when there are actual changes in this set.\n */\n get empty() { return this.sections.length == 0 || this.sections.length == 2 && this.sections[1] < 0; }\n /**\n Iterate over the unchanged parts left by these changes. `posA`\n provides the position of the range in the old document, `posB`\n the new position in the changed document.\n */\n iterGaps(f) {\n for (let i = 0, posA = 0, posB = 0; i < this.sections.length;) {\n let len = this.sections[i++], ins = this.sections[i++];\n if (ins < 0) {\n f(posA, posB, len);\n posB += len;\n }\n else {\n posB += ins;\n }\n posA += len;\n }\n }\n /**\n Iterate over the ranges changed by these changes. (See\n [`ChangeSet.iterChanges`](https://codemirror.net/6/docs/ref/#state.ChangeSet.iterChanges) for a\n variant that also provides you with the inserted text.)\n `fromA`/`toA` provides the extent of the change in the starting\n document, `fromB`/`toB` the extent of the replacement in the\n changed document.\n \n When `individual` is true, adjacent changes (which are kept\n separate for [position mapping](https://codemirror.net/6/docs/ref/#state.ChangeDesc.mapPos)) are\n reported separately.\n */\n iterChangedRanges(f, individual = false) {\n iterChanges(this, f, individual);\n }\n /**\n Get a description of the inverted form of these changes.\n */\n get invertedDesc() {\n let sections = [];\n for (let i = 0; i < this.sections.length;) {\n let len = this.sections[i++], ins = this.sections[i++];\n if (ins < 0)\n sections.push(len, ins);\n else\n sections.push(ins, len);\n }\n return new ChangeDesc(sections);\n }\n /**\n Compute the combined effect of applying another set of changes\n after this one. The length of the document after this set should\n match the length before `other`.\n */\n composeDesc(other) { return this.empty ? other : other.empty ? this : composeSets(this, other); }\n /**\n Map this description, which should start with the same document\n as `other`, over another set of changes, so that it can be\n applied after it. When `before` is true, map as if the changes\n in `this` happened before the ones in `other`.\n */\n mapDesc(other, before = false) { return other.empty ? this : mapSet(this, other, before); }\n mapPos(pos, assoc = -1, mode = MapMode.Simple) {\n let posA = 0, posB = 0;\n for (let i = 0; i < this.sections.length;) {\n let len = this.sections[i++], ins = this.sections[i++], endA = posA + len;\n if (ins < 0) {\n if (endA > pos)\n return posB + (pos - posA);\n posB += len;\n }\n else {\n if (mode != MapMode.Simple && endA >= pos &&\n (mode == MapMode.TrackDel && posA < pos && endA > pos ||\n mode == MapMode.TrackBefore && posA < pos ||\n mode == MapMode.TrackAfter && endA > pos))\n return null;\n if (endA > pos || endA == pos && assoc < 0 && !len)\n return pos == posA || assoc < 0 ? posB : posB + ins;\n posB += ins;\n }\n posA = endA;\n }\n if (pos > posA)\n throw new RangeError(`Position ${pos} is out of range for changeset of length ${posA}`);\n return posB;\n }\n /**\n Check whether these changes touch a given range. When one of the\n changes entirely covers the range, the string `\"cover\"` is\n returned.\n */\n touchesRange(from, to = from) {\n for (let i = 0, pos = 0; i < this.sections.length && pos <= to;) {\n let len = this.sections[i++], ins = this.sections[i++], end = pos + len;\n if (ins >= 0 && pos <= to && end >= from)\n return pos < from && end > to ? \"cover\" : true;\n pos = end;\n }\n return false;\n }\n /**\n @internal\n */\n toString() {\n let result = \"\";\n for (let i = 0; i < this.sections.length;) {\n let len = this.sections[i++], ins = this.sections[i++];\n result += (result ? \" \" : \"\") + len + (ins >= 0 ? \":\" + ins : \"\");\n }\n return result;\n }\n /**\n Serialize this change desc to a JSON-representable value.\n */\n toJSON() { return this.sections; }\n /**\n Create a change desc from its JSON representation (as produced\n by [`toJSON`](https://codemirror.net/6/docs/ref/#state.ChangeDesc.toJSON).\n */\n static fromJSON(json) {\n if (!Array.isArray(json) || json.length % 2 || json.some(a => typeof a != \"number\"))\n throw new RangeError(\"Invalid JSON representation of ChangeDesc\");\n return new ChangeDesc(json);\n }\n /**\n @internal\n */\n static create(sections) { return new ChangeDesc(sections); }\n}\n/**\nA change set represents a group of modifications to a document. It\nstores the document length, and can only be applied to documents\nwith exactly that length.\n*/\nclass ChangeSet extends ChangeDesc {\n constructor(sections, \n /**\n @internal\n */\n inserted) {\n super(sections);\n this.inserted = inserted;\n }\n /**\n Apply the changes to a document, returning the modified\n document.\n */\n apply(doc) {\n if (this.length != doc.length)\n throw new RangeError(\"Applying change set to a document with the wrong length\");\n iterChanges(this, (fromA, toA, fromB, _toB, text) => doc = doc.replace(fromB, fromB + (toA - fromA), text), false);\n return doc;\n }\n mapDesc(other, before = false) { return mapSet(this, other, before, true); }\n /**\n Given the document as it existed _before_ the changes, return a\n change set that represents the inverse of this set, which could\n be used to go from the document created by the changes back to\n the document as it existed before the changes.\n */\n invert(doc) {\n let sections = this.sections.slice(), inserted = [];\n for (let i = 0, pos = 0; i < sections.length; i += 2) {\n let len = sections[i], ins = sections[i + 1];\n if (ins >= 0) {\n sections[i] = ins;\n sections[i + 1] = len;\n let index = i >> 1;\n while (inserted.length < index)\n inserted.push(Text.empty);\n inserted.push(len ? doc.slice(pos, pos + len) : Text.empty);\n }\n pos += len;\n }\n return new ChangeSet(sections, inserted);\n }\n /**\n Combine two subsequent change sets into a single set. `other`\n must start in the document produced by `this`. If `this` goes\n `docA` \u2192 `docB` and `other` represents `docB` \u2192 `docC`, the\n returned value will represent the change `docA` \u2192 `docC`.\n */\n compose(other) { return this.empty ? other : other.empty ? this : composeSets(this, other, true); }\n /**\n Given another change set starting in the same document, maps this\n change set over the other, producing a new change set that can be\n applied to the document produced by applying `other`. When\n `before` is `true`, order changes as if `this` comes before\n `other`, otherwise (the default) treat `other` as coming first.\n \n Given two changes `A` and `B`, `A.compose(B.map(A))` and\n `B.compose(A.map(B, true))` will produce the same document. This\n provides a basic form of [operational\n transformation](https://en.wikipedia.org/wiki/Operational_transformation),\n and can be used for collaborative editing.\n */\n map(other, before = false) { return other.empty ? this : mapSet(this, other, before, true); }\n /**\n Iterate over the changed ranges in the document, calling `f` for\n each, with the range in the original document (`fromA`-`toA`)\n and the range that replaces it in the new document\n (`fromB`-`toB`).\n \n When `individual` is true, adjacent changes are reported\n separately.\n */\n iterChanges(f, individual = false) {\n iterChanges(this, f, individual);\n }\n /**\n Get a [change description](https://codemirror.net/6/docs/ref/#state.ChangeDesc) for this change\n set.\n */\n get desc() { return ChangeDesc.create(this.sections); }\n /**\n @internal\n */\n filter(ranges) {\n let resultSections = [], resultInserted = [], filteredSections = [];\n let iter = new SectionIter(this);\n done: for (let i = 0, pos = 0;;) {\n let next = i == ranges.length ? 1e9 : ranges[i++];\n while (pos < next || pos == next && iter.len == 0) {\n if (iter.done)\n break done;\n let len = Math.min(iter.len, next - pos);\n addSection(filteredSections, len, -1);\n let ins = iter.ins == -1 ? -1 : iter.off == 0 ? iter.ins : 0;\n addSection(resultSections, len, ins);\n if (ins > 0)\n addInsert(resultInserted, resultSections, iter.text);\n iter.forward(len);\n pos += len;\n }\n let end = ranges[i++];\n while (pos < end) {\n if (iter.done)\n break done;\n let len = Math.min(iter.len, end - pos);\n addSection(resultSections, len, -1);\n addSection(filteredSections, len, iter.ins == -1 ? -1 : iter.off == 0 ? iter.ins : 0);\n iter.forward(len);\n pos += len;\n }\n }\n return { changes: new ChangeSet(resultSections, resultInserted),\n filtered: ChangeDesc.create(filteredSections) };\n }\n /**\n Serialize this change set to a JSON-representable value.\n */\n toJSON() {\n let parts = [];\n for (let i = 0; i < this.sections.length; i += 2) {\n let len = this.sections[i], ins = this.sections[i + 1];\n if (ins < 0)\n parts.push(len);\n else if (ins == 0)\n parts.push([len]);\n else\n parts.push([len].concat(this.inserted[i >> 1].toJSON()));\n }\n return parts;\n }\n /**\n Create a change set for the given changes, for a document of the\n given length, using `lineSep` as line separator.\n */\n static of(changes, length, lineSep) {\n let sections = [], inserted = [], pos = 0;\n let total = null;\n function flush(force = false) {\n if (!force && !sections.length)\n return;\n if (pos < length)\n addSection(sections, length - pos, -1);\n let set = new ChangeSet(sections, inserted);\n total = total ? total.compose(set.map(total)) : set;\n sections = [];\n inserted = [];\n pos = 0;\n }\n function process(spec) {\n if (Array.isArray(spec)) {\n for (let sub of spec)\n process(sub);\n }\n else if (spec instanceof ChangeSet) {\n if (spec.length != length)\n throw new RangeError(`Mismatched change set length (got ${spec.length}, expected ${length})`);\n flush();\n total = total ? total.compose(spec.map(total)) : spec;\n }\n else {\n let { from, to = from, insert } = spec;\n if (from > to || from < 0 || to > length)\n throw new RangeError(`Invalid change range ${from} to ${to} (in doc of length ${length})`);\n let insText = !insert ? Text.empty : typeof insert == \"string\" ? Text.of(insert.split(lineSep || DefaultSplit)) : insert;\n let insLen = insText.length;\n if (from == to && insLen == 0)\n return;\n if (from < pos)\n flush();\n if (from > pos)\n addSection(sections, from - pos, -1);\n addSection(sections, to - from, insLen);\n addInsert(inserted, sections, insText);\n pos = to;\n }\n }\n process(changes);\n flush(!total);\n return total;\n }\n /**\n Create an empty changeset of the given length.\n */\n static empty(length) {\n return new ChangeSet(length ? [length, -1] : [], []);\n }\n /**\n Create a changeset from its JSON representation (as produced by\n [`toJSON`](https://codemirror.net/6/docs/ref/#state.ChangeSet.toJSON).\n */\n static fromJSON(json) {\n if (!Array.isArray(json))\n throw new RangeError(\"Invalid JSON representation of ChangeSet\");\n let sections = [], inserted = [];\n for (let i = 0; i < json.length; i++) {\n let part = json[i];\n if (typeof part == \"number\") {\n sections.push(part, -1);\n }\n else if (!Array.isArray(part) || typeof part[0] != \"number\" || part.some((e, i) => i && typeof e != \"string\")) {\n throw new RangeError(\"Invalid JSON representation of ChangeSet\");\n }\n else if (part.length == 1) {\n sections.push(part[0], 0);\n }\n else {\n while (inserted.length < i)\n inserted.push(Text.empty);\n inserted[i] = Text.of(part.slice(1));\n sections.push(part[0], inserted[i].length);\n }\n }\n return new ChangeSet(sections, inserted);\n }\n /**\n @internal\n */\n static createSet(sections, inserted) {\n return new ChangeSet(sections, inserted);\n }\n}\nfunction addSection(sections, len, ins, forceJoin = false) {\n if (len == 0 && ins <= 0)\n return;\n let last = sections.length - 2;\n if (last >= 0 && ins <= 0 && ins == sections[last + 1])\n sections[last] += len;\n else if (last >= 0 && len == 0 && sections[last] == 0)\n sections[last + 1] += ins;\n else if (forceJoin) {\n sections[last] += len;\n sections[last + 1] += ins;\n }\n else\n sections.push(len, ins);\n}\nfunction addInsert(values, sections, value) {\n if (value.length == 0)\n return;\n let index = (sections.length - 2) >> 1;\n if (index < values.length) {\n values[values.length - 1] = values[values.length - 1].append(value);\n }\n else {\n while (values.length < index)\n values.push(Text.empty);\n values.push(value);\n }\n}\nfunction iterChanges(desc, f, individual) {\n let inserted = desc.inserted;\n for (let posA = 0, posB = 0, i = 0; i < desc.sections.length;) {\n let len = desc.sections[i++], ins = desc.sections[i++];\n if (ins < 0) {\n posA += len;\n posB += len;\n }\n else {\n let endA = posA, endB = posB, text = Text.empty;\n for (;;) {\n endA += len;\n endB += ins;\n if (ins && inserted)\n text = text.append(inserted[(i - 2) >> 1]);\n if (individual || i == desc.sections.length || desc.sections[i + 1] < 0)\n break;\n len = desc.sections[i++];\n ins = desc.sections[i++];\n }\n f(posA, endA, posB, endB, text);\n posA = endA;\n posB = endB;\n }\n }\n}\nfunction mapSet(setA, setB, before, mkSet = false) {\n // Produce a copy of setA that applies to the document after setB\n // has been applied (assuming both start at the same document).\n let sections = [], insert = mkSet ? [] : null;\n let a = new SectionIter(setA), b = new SectionIter(setB);\n // Iterate over both sets in parallel. inserted tracks, for changes\n // in A that have to be processed piece-by-piece, whether their\n // content has been inserted already, and refers to the section\n // index.\n for (let inserted = -1;;) {\n if (a.done && b.len || b.done && a.len) {\n throw new Error(\"Mismatched change set lengths\");\n }\n else if (a.ins == -1 && b.ins == -1) {\n // Move across ranges skipped by both sets.\n let len = Math.min(a.len, b.len);\n addSection(sections, len, -1);\n a.forward(len);\n b.forward(len);\n }\n else if (b.ins >= 0 && (a.ins < 0 || inserted == a.i || a.off == 0 && (b.len < a.len || b.len == a.len && !before))) {\n // If there's a change in B that comes before the next change in\n // A (ordered by start pos, then len, then before flag), skip\n // that (and process any changes in A it covers).\n let len = b.len;\n addSection(sections, b.ins, -1);\n while (len) {\n let piece = Math.min(a.len, len);\n if (a.ins >= 0 && inserted < a.i && a.len <= piece) {\n addSection(sections, 0, a.ins);\n if (insert)\n addInsert(insert, sections, a.text);\n inserted = a.i;\n }\n a.forward(piece);\n len -= piece;\n }\n b.next();\n }\n else if (a.ins >= 0) {\n // Process the part of a change in A up to the start of the next\n // non-deletion change in B (if overlapping).\n let len = 0, left = a.len;\n while (left) {\n if (b.ins == -1) {\n let piece = Math.min(left, b.len);\n len += piece;\n left -= piece;\n b.forward(piece);\n }\n else if (b.ins == 0 && b.len < left) {\n left -= b.len;\n b.next();\n }\n else {\n break;\n }\n }\n addSection(sections, len, inserted < a.i ? a.ins : 0);\n if (insert && inserted < a.i)\n addInsert(insert, sections, a.text);\n inserted = a.i;\n a.forward(a.len - left);\n }\n else if (a.done && b.done) {\n return insert ? ChangeSet.createSet(sections, insert) : ChangeDesc.create(sections);\n }\n else {\n throw new Error(\"Mismatched change set lengths\");\n }\n }\n}\nfunction composeSets(setA, setB, mkSet = false) {\n let sections = [];\n let insert = mkSet ? [] : null;\n let a = new SectionIter(setA), b = new SectionIter(setB);\n for (let open = false;;) {\n if (a.done && b.done) {\n return insert ? ChangeSet.createSet(sections, insert) : ChangeDesc.create(sections);\n }\n else if (a.ins == 0) { // Deletion in A\n addSection(sections, a.len, 0, open);\n a.next();\n }\n else if (b.len == 0 && !b.done) { // Insertion in B\n addSection(sections, 0, b.ins, open);\n if (insert)\n addInsert(insert, sections, b.text);\n b.next();\n }\n else if (a.done || b.done) {\n throw new Error(\"Mismatched change set lengths\");\n }\n else {\n let len = Math.min(a.len2, b.len), sectionLen = sections.length;\n if (a.ins == -1) {\n let insB = b.ins == -1 ? -1 : b.off ? 0 : b.ins;\n addSection(sections, len, insB, open);\n if (insert && insB)\n addInsert(insert, sections, b.text);\n }\n else if (b.ins == -1) {\n addSection(sections, a.off ? 0 : a.len, len, open);\n if (insert)\n addInsert(insert, sections, a.textBit(len));\n }\n else {\n addSection(sections, a.off ? 0 : a.len, b.off ? 0 : b.ins, open);\n if (insert && !b.off)\n addInsert(insert, sections, b.text);\n }\n open = (a.ins > len || b.ins >= 0 && b.len > len) && (open || sections.length > sectionLen);\n a.forward2(len);\n b.forward(len);\n }\n }\n}\nclass SectionIter {\n constructor(set) {\n this.set = set;\n this.i = 0;\n this.next();\n }\n next() {\n let { sections } = this.set;\n if (this.i < sections.length) {\n this.len = sections[this.i++];\n this.ins = sections[this.i++];\n }\n else {\n this.len = 0;\n this.ins = -2;\n }\n this.off = 0;\n }\n get done() { return this.ins == -2; }\n get len2() { return this.ins < 0 ? this.len : this.ins; }\n get text() {\n let { inserted } = this.set, index = (this.i - 2) >> 1;\n return index >= inserted.length ? Text.empty : inserted[index];\n }\n textBit(len) {\n let { inserted } = this.set, index = (this.i - 2) >> 1;\n return index >= inserted.length && !len ? Text.empty\n : inserted[index].slice(this.off, len == null ? undefined : this.off + len);\n }\n forward(len) {\n if (len == this.len)\n this.next();\n else {\n this.len -= len;\n this.off += len;\n }\n }\n forward2(len) {\n if (this.ins == -1)\n this.forward(len);\n else if (len == this.ins)\n this.next();\n else {\n this.ins -= len;\n this.off += len;\n }\n }\n}\n\n/**\nA single selection range. When\n[`allowMultipleSelections`](https://codemirror.net/6/docs/ref/#state.EditorState^allowMultipleSelections)\nis enabled, a [selection](https://codemirror.net/6/docs/ref/#state.EditorSelection) may hold\nmultiple ranges. By default, selections hold exactly one range.\n*/\nclass SelectionRange {\n constructor(\n /**\n The lower boundary of the range.\n */\n from, \n /**\n The upper boundary of the range.\n */\n to, flags) {\n this.from = from;\n this.to = to;\n this.flags = flags;\n }\n /**\n The anchor of the range\u2014the side that doesn't move when you\n extend it.\n */\n get anchor() { return this.flags & 32 /* RangeFlag.Inverted */ ? this.to : this.from; }\n /**\n The head of the range, which is moved when the range is\n [extended](https://codemirror.net/6/docs/ref/#state.SelectionRange.extend).\n */\n get head() { return this.flags & 32 /* RangeFlag.Inverted */ ? this.from : this.to; }\n /**\n True when `anchor` and `head` are at the same position.\n */\n get empty() { return this.from == this.to; }\n /**\n If this is a cursor that is explicitly associated with the\n character on one of its sides, this returns the side. -1 means\n the character before its position, 1 the character after, and 0\n means no association.\n */\n get assoc() { return this.flags & 8 /* RangeFlag.AssocBefore */ ? -1 : this.flags & 16 /* RangeFlag.AssocAfter */ ? 1 : 0; }\n /**\n The bidirectional text level associated with this cursor, if\n any.\n */\n get bidiLevel() {\n let level = this.flags & 7 /* RangeFlag.BidiLevelMask */;\n return level == 7 ? null : level;\n }\n /**\n The goal column (stored vertical offset) associated with a\n cursor. This is used to preserve the vertical position when\n [moving](https://codemirror.net/6/docs/ref/#view.EditorView.moveVertically) across\n lines of different length.\n */\n get goalColumn() {\n let value = this.flags >> 6 /* RangeFlag.GoalColumnOffset */;\n return value == 16777215 /* RangeFlag.NoGoalColumn */ ? undefined : value;\n }\n /**\n Map this range through a change, producing a valid range in the\n updated document.\n */\n map(change, assoc = -1) {\n let from, to;\n if (this.empty) {\n from = to = change.mapPos(this.from, assoc);\n }\n else {\n from = change.mapPos(this.from, 1);\n to = change.mapPos(this.to, -1);\n }\n return from == this.from && to == this.to ? this : new SelectionRange(from, to, this.flags);\n }\n /**\n Extend this range to cover at least `from` to `to`.\n */\n extend(from, to = from, assoc = 0) {\n if (from <= this.anchor && to >= this.anchor)\n return EditorSelection.range(from, to, undefined, undefined, assoc);\n let head = Math.abs(from - this.anchor) > Math.abs(to - this.anchor) ? from : to;\n return EditorSelection.range(this.anchor, head, undefined, undefined, assoc);\n }\n /**\n Compare this range to another range.\n */\n eq(other, includeAssoc = false) {\n return this.anchor == other.anchor && this.head == other.head && this.goalColumn == other.goalColumn &&\n (!includeAssoc || !this.empty || this.assoc == other.assoc);\n }\n /**\n Return a JSON-serializable object representing the range.\n */\n toJSON() { return { anchor: this.anchor, head: this.head }; }\n /**\n Convert a JSON representation of a range to a `SelectionRange`\n instance.\n */\n static fromJSON(json) {\n if (!json || typeof json.anchor != \"number\" || typeof json.head != \"number\")\n throw new RangeError(\"Invalid JSON representation for SelectionRange\");\n return EditorSelection.range(json.anchor, json.head);\n }\n /**\n @internal\n */\n static create(from, to, flags) {\n return new SelectionRange(from, to, flags);\n }\n}\n/**\nAn editor selection holds one or more selection ranges.\n*/\nclass EditorSelection {\n constructor(\n /**\n The ranges in the selection, sorted by position. Ranges cannot\n overlap (but they may touch, if they aren't empty).\n */\n ranges, \n /**\n The index of the _main_ range in the selection (which is\n usually the range that was added last).\n */\n mainIndex) {\n this.ranges = ranges;\n this.mainIndex = mainIndex;\n }\n /**\n Map a selection through a change. Used to adjust the selection\n position for changes.\n */\n map(change, assoc = -1) {\n if (change.empty)\n return this;\n return EditorSelection.create(this.ranges.map(r => r.map(change, assoc)), this.mainIndex);\n }\n /**\n Compare this selection to another selection. By default, ranges\n are compared only by position. When `includeAssoc` is true,\n cursor ranges must also have the same\n [`assoc`](https://codemirror.net/6/docs/ref/#state.SelectionRange.assoc) value.\n */\n eq(other, includeAssoc = false) {\n if (this.ranges.length != other.ranges.length ||\n this.mainIndex != other.mainIndex)\n return false;\n for (let i = 0; i < this.ranges.length; i++)\n if (!this.ranges[i].eq(other.ranges[i], includeAssoc))\n return false;\n return true;\n }\n /**\n Get the primary selection range. Usually, you should make sure\n your code applies to _all_ ranges, by using methods like\n [`changeByRange`](https://codemirror.net/6/docs/ref/#state.EditorState.changeByRange).\n */\n get main() { return this.ranges[this.mainIndex]; }\n /**\n Make sure the selection only has one range. Returns a selection\n holding only the main range from this selection.\n */\n asSingle() {\n return this.ranges.length == 1 ? this : new EditorSelection([this.main], 0);\n }\n /**\n Extend this selection with an extra range.\n */\n addRange(range, main = true) {\n return EditorSelection.create([range].concat(this.ranges), main ? 0 : this.mainIndex + 1);\n }\n /**\n Replace a given range with another range, and then normalize the\n selection to merge and sort ranges if necessary.\n */\n replaceRange(range, which = this.mainIndex) {\n let ranges = this.ranges.slice();\n ranges[which] = range;\n return EditorSelection.create(ranges, this.mainIndex);\n }\n /**\n Convert this selection to an object that can be serialized to\n JSON.\n */\n toJSON() {\n return { ranges: this.ranges.map(r => r.toJSON()), main: this.mainIndex };\n }\n /**\n Create a selection from a JSON representation.\n */\n static fromJSON(json) {\n if (!json || !Array.isArray(json.ranges) || typeof json.main != \"number\" || json.main >= json.ranges.length)\n throw new RangeError(\"Invalid JSON representation for EditorSelection\");\n return new EditorSelection(json.ranges.map((r) => SelectionRange.fromJSON(r)), json.main);\n }\n /**\n Create a selection holding a single range.\n */\n static single(anchor, head = anchor) {\n return new EditorSelection([EditorSelection.range(anchor, head)], 0);\n }\n /**\n Sort and merge the given set of ranges, creating a valid\n selection.\n */\n static create(ranges, mainIndex = 0) {\n if (ranges.length == 0)\n throw new RangeError(\"A selection needs at least one range\");\n for (let pos = 0, i = 0; i < ranges.length; i++) {\n let range = ranges[i];\n if (range.empty ? range.from <= pos : range.from < pos)\n return EditorSelection.normalized(ranges.slice(), mainIndex);\n pos = range.to;\n }\n return new EditorSelection(ranges, mainIndex);\n }\n /**\n Create a cursor selection range at the given position. You can\n safely ignore the optional arguments in most situations.\n */\n static cursor(pos, assoc = 0, bidiLevel, goalColumn) {\n return SelectionRange.create(pos, pos, (assoc == 0 ? 0 : assoc < 0 ? 8 /* RangeFlag.AssocBefore */ : 16 /* RangeFlag.AssocAfter */) |\n (bidiLevel == null ? 7 : Math.min(6, bidiLevel)) |\n ((goalColumn !== null && goalColumn !== void 0 ? goalColumn : 16777215 /* RangeFlag.NoGoalColumn */) << 6 /* RangeFlag.GoalColumnOffset */));\n }\n /**\n Create a selection range.\n */\n static range(anchor, head, goalColumn, bidiLevel, assoc) {\n let flags = ((goalColumn !== null && goalColumn !== void 0 ? goalColumn : 16777215 /* RangeFlag.NoGoalColumn */) << 6 /* RangeFlag.GoalColumnOffset */) |\n (bidiLevel == null ? 7 : Math.min(6, bidiLevel));\n if (!assoc && anchor != head)\n assoc = head < anchor ? 1 : -1;\n return head < anchor ? SelectionRange.create(head, anchor, 32 /* RangeFlag.Inverted */ | 16 /* RangeFlag.AssocAfter */ | flags)\n : SelectionRange.create(anchor, head, (!assoc ? 0 : assoc < 0 ? 8 /* RangeFlag.AssocBefore */ : 16 /* RangeFlag.AssocAfter */) | flags);\n }\n /**\n @internal\n */\n static normalized(ranges, mainIndex = 0) {\n let main = ranges[mainIndex];\n ranges.sort((a, b) => a.from - b.from);\n mainIndex = ranges.indexOf(main);\n for (let i = 1; i < ranges.length; i++) {\n let range = ranges[i], prev = ranges[i - 1];\n if (range.empty ? range.from <= prev.to : range.from < prev.to) {\n let from = prev.from, to = Math.max(range.to, prev.to);\n if (i <= mainIndex)\n mainIndex--;\n ranges.splice(--i, 2, range.anchor > range.head ? EditorSelection.range(to, from) : EditorSelection.range(from, to));\n }\n }\n return new EditorSelection(ranges, mainIndex);\n }\n}\nfunction checkSelection(selection, docLength) {\n for (let range of selection.ranges)\n if (range.to > docLength)\n throw new RangeError(\"Selection points outside of document\");\n}\n\nlet nextID = 0;\n/**\nA facet is a labeled value that is associated with an editor\nstate. It takes inputs from any number of extensions, and combines\nthose into a single output value.\n\nExamples of uses of facets are the [tab\nsize](https://codemirror.net/6/docs/ref/#state.EditorState^tabSize), [editor\nattributes](https://codemirror.net/6/docs/ref/#view.EditorView^editorAttributes), and [update\nlisteners](https://codemirror.net/6/docs/ref/#view.EditorView^updateListener).\n\nNote that `Facet` instances can be used anywhere where\n[`FacetReader`](https://codemirror.net/6/docs/ref/#state.FacetReader) is expected.\n*/\nclass Facet {\n constructor(\n /**\n @internal\n */\n combine, \n /**\n @internal\n */\n compareInput, \n /**\n @internal\n */\n compare, isStatic, enables) {\n this.combine = combine;\n this.compareInput = compareInput;\n this.compare = compare;\n this.isStatic = isStatic;\n /**\n @internal\n */\n this.id = nextID++;\n this.default = combine([]);\n this.extensions = typeof enables == \"function\" ? enables(this) : enables;\n }\n /**\n Returns a facet reader for this facet, which can be used to\n [read](https://codemirror.net/6/docs/ref/#state.EditorState.facet) it but not to define values for it.\n */\n get reader() { return this; }\n /**\n Define a new facet.\n */\n static define(config = {}) {\n return new Facet(config.combine || ((a) => a), config.compareInput || ((a, b) => a === b), config.compare || (!config.combine ? sameArray : (a, b) => a === b), !!config.static, config.enables);\n }\n /**\n Returns an extension that adds the given value to this facet.\n */\n of(value) {\n return new FacetProvider([], this, 0 /* Provider.Static */, value);\n }\n /**\n Create an extension that computes a value for the facet from a\n state. You must take care to declare the parts of the state that\n this value depends on, since your function is only called again\n for a new state when one of those parts changed.\n \n In cases where your value depends only on a single field, you'll\n want to use the [`from`](https://codemirror.net/6/docs/ref/#state.Facet.from) method instead.\n */\n compute(deps, get) {\n if (this.isStatic)\n throw new Error(\"Can't compute a static facet\");\n return new FacetProvider(deps, this, 1 /* Provider.Single */, get);\n }\n /**\n Create an extension that computes zero or more values for this\n facet from a state.\n */\n computeN(deps, get) {\n if (this.isStatic)\n throw new Error(\"Can't compute a static facet\");\n return new FacetProvider(deps, this, 2 /* Provider.Multi */, get);\n }\n from(field, get) {\n if (!get)\n get = x => x;\n return this.compute([field], state => get(state.field(field)));\n }\n}\nfunction sameArray(a, b) {\n return a == b || a.length == b.length && a.every((e, i) => e === b[i]);\n}\nclass FacetProvider {\n constructor(dependencies, facet, type, value) {\n this.dependencies = dependencies;\n this.facet = facet;\n this.type = type;\n this.value = value;\n this.id = nextID++;\n }\n dynamicSlot(addresses) {\n var _a;\n let getter = this.value;\n let compare = this.facet.compareInput;\n let id = this.id, idx = addresses[id] >> 1, multi = this.type == 2 /* Provider.Multi */;\n let depDoc = false, depSel = false, depAddrs = [];\n for (let dep of this.dependencies) {\n if (dep == \"doc\")\n depDoc = true;\n else if (dep == \"selection\")\n depSel = true;\n else if ((((_a = addresses[dep.id]) !== null && _a !== void 0 ? _a : 1) & 1) == 0)\n depAddrs.push(addresses[dep.id]);\n }\n return {\n create(state) {\n state.values[idx] = getter(state);\n return 1 /* SlotStatus.Changed */;\n },\n update(state, tr) {\n if ((depDoc && tr.docChanged) || (depSel && (tr.docChanged || tr.selection)) || ensureAll(state, depAddrs)) {\n let newVal = getter(state);\n if (multi ? !compareArray(newVal, state.values[idx], compare) : !compare(newVal, state.values[idx])) {\n state.values[idx] = newVal;\n return 1 /* SlotStatus.Changed */;\n }\n }\n return 0;\n },\n reconfigure: (state, oldState) => {\n let newVal, oldAddr = oldState.config.address[id];\n if (oldAddr != null) {\n let oldVal = getAddr(oldState, oldAddr);\n if (this.dependencies.every(dep => {\n return dep instanceof Facet ? oldState.facet(dep) === state.facet(dep) :\n dep instanceof StateField ? oldState.field(dep, false) == state.field(dep, false) : true;\n }) || (multi ? compareArray(newVal = getter(state), oldVal, compare) : compare(newVal = getter(state), oldVal))) {\n state.values[idx] = oldVal;\n return 0;\n }\n }\n else {\n newVal = getter(state);\n }\n state.values[idx] = newVal;\n return 1 /* SlotStatus.Changed */;\n }\n };\n }\n}\nfunction compareArray(a, b, compare) {\n if (a.length != b.length)\n return false;\n for (let i = 0; i < a.length; i++)\n if (!compare(a[i], b[i]))\n return false;\n return true;\n}\nfunction ensureAll(state, addrs) {\n let changed = false;\n for (let addr of addrs)\n if (ensureAddr(state, addr) & 1 /* SlotStatus.Changed */)\n changed = true;\n return changed;\n}\nfunction dynamicFacetSlot(addresses, facet, providers) {\n let providerAddrs = providers.map(p => addresses[p.id]);\n let providerTypes = providers.map(p => p.type);\n let dynamic = providerAddrs.filter(p => !(p & 1));\n let idx = addresses[facet.id] >> 1;\n function get(state) {\n let values = [];\n for (let i = 0; i < providerAddrs.length; i++) {\n let value = getAddr(state, providerAddrs[i]);\n if (providerTypes[i] == 2 /* Provider.Multi */)\n for (let val of value)\n values.push(val);\n else\n values.push(value);\n }\n return facet.combine(values);\n }\n return {\n create(state) {\n for (let addr of providerAddrs)\n ensureAddr(state, addr);\n state.values[idx] = get(state);\n return 1 /* SlotStatus.Changed */;\n },\n update(state, tr) {\n if (!ensureAll(state, dynamic))\n return 0;\n let value = get(state);\n if (facet.compare(value, state.values[idx]))\n return 0;\n state.values[idx] = value;\n return 1 /* SlotStatus.Changed */;\n },\n reconfigure(state, oldState) {\n let depChanged = ensureAll(state, providerAddrs);\n let oldProviders = oldState.config.facets[facet.id], oldValue = oldState.facet(facet);\n if (oldProviders && !depChanged && sameArray(providers, oldProviders)) {\n state.values[idx] = oldValue;\n return 0;\n }\n let value = get(state);\n if (facet.compare(value, oldValue)) {\n state.values[idx] = oldValue;\n return 0;\n }\n state.values[idx] = value;\n return 1 /* SlotStatus.Changed */;\n }\n };\n}\nconst initField = /*@__PURE__*/Facet.define({ static: true });\n/**\nFields can store additional information in an editor state, and\nkeep it in sync with the rest of the state.\n*/\nclass StateField {\n constructor(\n /**\n @internal\n */\n id, createF, updateF, compareF, \n /**\n @internal\n */\n spec) {\n this.id = id;\n this.createF = createF;\n this.updateF = updateF;\n this.compareF = compareF;\n this.spec = spec;\n /**\n @internal\n */\n this.provides = undefined;\n }\n /**\n Define a state field.\n */\n static define(config) {\n let field = new StateField(nextID++, config.create, config.update, config.compare || ((a, b) => a === b), config);\n if (config.provide)\n field.provides = config.provide(field);\n return field;\n }\n create(state) {\n let init = state.facet(initField).find(i => i.field == this);\n return ((init === null || init === void 0 ? void 0 : init.create) || this.createF)(state);\n }\n /**\n @internal\n */\n slot(addresses) {\n let idx = addresses[this.id] >> 1;\n return {\n create: (state) => {\n state.values[idx] = this.create(state);\n return 1 /* SlotStatus.Changed */;\n },\n update: (state, tr) => {\n let oldVal = state.values[idx];\n let value = this.updateF(oldVal, tr);\n if (this.compareF(oldVal, value))\n return 0;\n state.values[idx] = value;\n return 1 /* SlotStatus.Changed */;\n },\n reconfigure: (state, oldState) => {\n let init = state.facet(initField), oldInit = oldState.facet(initField), reInit;\n if ((reInit = init.find(i => i.field == this)) && reInit != oldInit.find(i => i.field == this)) {\n state.values[idx] = reInit.create(state);\n return 1 /* SlotStatus.Changed */;\n }\n if (oldState.config.address[this.id] != null) {\n state.values[idx] = oldState.field(this);\n return 0;\n }\n state.values[idx] = this.create(state);\n return 1 /* SlotStatus.Changed */;\n }\n };\n }\n /**\n Returns an extension that enables this field and overrides the\n way it is initialized. Can be useful when you need to provide a\n non-default starting value for the field.\n */\n init(create) {\n return [this, initField.of({ field: this, create })];\n }\n /**\n State field instances can be used as\n [`Extension`](https://codemirror.net/6/docs/ref/#state.Extension) values to enable the field in a\n given state.\n */\n get extension() { return this; }\n}\nconst Prec_ = { lowest: 4, low: 3, default: 2, high: 1, highest: 0 };\nfunction prec(value) {\n return (ext) => new PrecExtension(ext, value);\n}\n/**\nBy default extensions are registered in the order they are found\nin the flattened form of nested array that was provided.\nIndividual extension values can be assigned a precedence to\noverride this. Extensions that do not have a precedence set get\nthe precedence of the nearest parent with a precedence, or\n[`default`](https://codemirror.net/6/docs/ref/#state.Prec.default) if there is no such parent. The\nfinal ordering of extensions is determined by first sorting by\nprecedence and then by order within each precedence.\n*/\nconst Prec = {\n /**\n The highest precedence level, for extensions that should end up\n near the start of the precedence ordering.\n */\n highest: /*@__PURE__*/prec(Prec_.highest),\n /**\n A higher-than-default precedence, for extensions that should\n come before those with default precedence.\n */\n high: /*@__PURE__*/prec(Prec_.high),\n /**\n The default precedence, which is also used for extensions\n without an explicit precedence.\n */\n default: /*@__PURE__*/prec(Prec_.default),\n /**\n A lower-than-default precedence.\n */\n low: /*@__PURE__*/prec(Prec_.low),\n /**\n The lowest precedence level. Meant for things that should end up\n near the end of the extension order.\n */\n lowest: /*@__PURE__*/prec(Prec_.lowest)\n};\nclass PrecExtension {\n constructor(inner, prec) {\n this.inner = inner;\n this.prec = prec;\n }\n}\n/**\nExtension compartments can be used to make a configuration\ndynamic. By [wrapping](https://codemirror.net/6/docs/ref/#state.Compartment.of) part of your\nconfiguration in a compartment, you can later\n[replace](https://codemirror.net/6/docs/ref/#state.Compartment.reconfigure) that part through a\ntransaction.\n*/\nclass Compartment {\n /**\n Create an instance of this compartment to add to your [state\n configuration](https://codemirror.net/6/docs/ref/#state.EditorStateConfig.extensions).\n */\n of(ext) { return new CompartmentInstance(this, ext); }\n /**\n Create an [effect](https://codemirror.net/6/docs/ref/#state.TransactionSpec.effects) that\n reconfigures this compartment.\n */\n reconfigure(content) {\n return Compartment.reconfigure.of({ compartment: this, extension: content });\n }\n /**\n Get the current content of the compartment in the state, or\n `undefined` if it isn't present.\n */\n get(state) {\n return state.config.compartments.get(this);\n }\n}\nclass CompartmentInstance {\n constructor(compartment, inner) {\n this.compartment = compartment;\n this.inner = inner;\n }\n}\nclass Configuration {\n constructor(base, compartments, dynamicSlots, address, staticValues, facets) {\n this.base = base;\n this.compartments = compartments;\n this.dynamicSlots = dynamicSlots;\n this.address = address;\n this.staticValues = staticValues;\n this.facets = facets;\n this.statusTemplate = [];\n while (this.statusTemplate.length < dynamicSlots.length)\n this.statusTemplate.push(0 /* SlotStatus.Unresolved */);\n }\n staticFacet(facet) {\n let addr = this.address[facet.id];\n return addr == null ? facet.default : this.staticValues[addr >> 1];\n }\n static resolve(base, compartments, oldState) {\n let fields = [];\n let facets = Object.create(null);\n let newCompartments = new Map();\n for (let ext of flatten(base, compartments, newCompartments)) {\n if (ext instanceof StateField)\n fields.push(ext);\n else\n (facets[ext.facet.id] || (facets[ext.facet.id] = [])).push(ext);\n }\n let address = Object.create(null);\n let staticValues = [];\n let dynamicSlots = [];\n for (let field of fields) {\n address[field.id] = dynamicSlots.length << 1;\n dynamicSlots.push(a => field.slot(a));\n }\n let oldFacets = oldState === null || oldState === void 0 ? void 0 : oldState.config.facets;\n for (let id in facets) {\n let providers = facets[id], facet = providers[0].facet;\n let oldProviders = oldFacets && oldFacets[id] || [];\n if (providers.every(p => p.type == 0 /* Provider.Static */)) {\n address[facet.id] = (staticValues.length << 1) | 1;\n if (sameArray(oldProviders, providers)) {\n staticValues.push(oldState.facet(facet));\n }\n else {\n let value = facet.combine(providers.map(p => p.value));\n staticValues.push(oldState && facet.compare(value, oldState.facet(facet)) ? oldState.facet(facet) : value);\n }\n }\n else {\n for (let p of providers) {\n if (p.type == 0 /* Provider.Static */) {\n address[p.id] = (staticValues.length << 1) | 1;\n staticValues.push(p.value);\n }\n else {\n address[p.id] = dynamicSlots.length << 1;\n dynamicSlots.push(a => p.dynamicSlot(a));\n }\n }\n address[facet.id] = dynamicSlots.length << 1;\n dynamicSlots.push(a => dynamicFacetSlot(a, facet, providers));\n }\n }\n let dynamic = dynamicSlots.map(f => f(address));\n return new Configuration(base, newCompartments, dynamic, address, staticValues, facets);\n }\n}\nfunction flatten(extension, compartments, newCompartments) {\n let result = [[], [], [], [], []];\n let seen = new Map();\n function inner(ext, prec) {\n let known = seen.get(ext);\n if (known != null) {\n if (known <= prec)\n return;\n let found = result[known].indexOf(ext);\n if (found > -1)\n result[known].splice(found, 1);\n if (ext instanceof CompartmentInstance)\n newCompartments.delete(ext.compartment);\n }\n seen.set(ext, prec);\n if (Array.isArray(ext)) {\n for (let e of ext)\n inner(e, prec);\n }\n else if (ext instanceof CompartmentInstance) {\n if (newCompartments.has(ext.compartment))\n throw new RangeError(`Duplicate use of compartment in extensions`);\n let content = compartments.get(ext.compartment) || ext.inner;\n newCompartments.set(ext.compartment, content);\n inner(content, prec);\n }\n else if (ext instanceof PrecExtension) {\n inner(ext.inner, ext.prec);\n }\n else if (ext instanceof StateField) {\n result[prec].push(ext);\n if (ext.provides)\n inner(ext.provides, prec);\n }\n else if (ext instanceof FacetProvider) {\n result[prec].push(ext);\n if (ext.facet.extensions)\n inner(ext.facet.extensions, Prec_.default);\n }\n else {\n let content = ext.extension;\n if (!content)\n throw new Error(`Unrecognized extension value in extension set (${ext}). This sometimes happens because multiple instances of @codemirror/state are loaded, breaking instanceof checks.`);\n inner(content, prec);\n }\n }\n inner(extension, Prec_.default);\n return result.reduce((a, b) => a.concat(b));\n}\nfunction ensureAddr(state, addr) {\n if (addr & 1)\n return 2 /* SlotStatus.Computed */;\n let idx = addr >> 1;\n let status = state.status[idx];\n if (status == 4 /* SlotStatus.Computing */)\n throw new Error(\"Cyclic dependency between fields and/or facets\");\n if (status & 2 /* SlotStatus.Computed */)\n return status;\n state.status[idx] = 4 /* SlotStatus.Computing */;\n let changed = state.computeSlot(state, state.config.dynamicSlots[idx]);\n return state.status[idx] = 2 /* SlotStatus.Computed */ | changed;\n}\nfunction getAddr(state, addr) {\n return addr & 1 ? state.config.staticValues[addr >> 1] : state.values[addr >> 1];\n}\n\nconst languageData = /*@__PURE__*/Facet.define();\nconst allowMultipleSelections = /*@__PURE__*/Facet.define({\n combine: values => values.some(v => v),\n static: true\n});\nconst lineSeparator = /*@__PURE__*/Facet.define({\n combine: values => values.length ? values[0] : undefined,\n static: true\n});\nconst changeFilter = /*@__PURE__*/Facet.define();\nconst transactionFilter = /*@__PURE__*/Facet.define();\nconst transactionExtender = /*@__PURE__*/Facet.define();\nconst readOnly = /*@__PURE__*/Facet.define({\n combine: values => values.length ? values[0] : false\n});\n\n/**\nAnnotations are tagged values that are used to add metadata to\ntransactions in an extensible way. They should be used to model\nthings that effect the entire transaction (such as its [time\nstamp](https://codemirror.net/6/docs/ref/#state.Transaction^time) or information about its\n[origin](https://codemirror.net/6/docs/ref/#state.Transaction^userEvent)). For effects that happen\n_alongside_ the other changes made by the transaction, [state\neffects](https://codemirror.net/6/docs/ref/#state.StateEffect) are more appropriate.\n*/\nclass Annotation {\n /**\n @internal\n */\n constructor(\n /**\n The annotation type.\n */\n type, \n /**\n The value of this annotation.\n */\n value) {\n this.type = type;\n this.value = value;\n }\n /**\n Define a new type of annotation.\n */\n static define() { return new AnnotationType(); }\n}\n/**\nMarker that identifies a type of [annotation](https://codemirror.net/6/docs/ref/#state.Annotation).\n*/\nclass AnnotationType {\n /**\n Create an instance of this annotation.\n */\n of(value) { return new Annotation(this, value); }\n}\n/**\nRepresentation of a type of state effect. Defined with\n[`StateEffect.define`](https://codemirror.net/6/docs/ref/#state.StateEffect^define).\n*/\nclass StateEffectType {\n /**\n @internal\n */\n constructor(\n // The `any` types in these function types are there to work\n // around TypeScript issue #37631, where the type guard on\n // `StateEffect.is` mysteriously stops working when these properly\n // have type `Value`.\n /**\n @internal\n */\n map) {\n this.map = map;\n }\n /**\n Create a [state effect](https://codemirror.net/6/docs/ref/#state.StateEffect) instance of this\n type.\n */\n of(value) { return new StateEffect(this, value); }\n}\n/**\nState effects can be used to represent additional effects\nassociated with a [transaction](https://codemirror.net/6/docs/ref/#state.Transaction.effects). They\nare often useful to model changes to custom [state\nfields](https://codemirror.net/6/docs/ref/#state.StateField), when those changes aren't implicit in\ndocument or selection changes.\n*/\nclass StateEffect {\n /**\n @internal\n */\n constructor(\n /**\n @internal\n */\n type, \n /**\n The value of this effect.\n */\n value) {\n this.type = type;\n this.value = value;\n }\n /**\n Map this effect through a position mapping. Will return\n `undefined` when that ends up deleting the effect.\n */\n map(mapping) {\n let mapped = this.type.map(this.value, mapping);\n return mapped === undefined ? undefined : mapped == this.value ? this : new StateEffect(this.type, mapped);\n }\n /**\n Tells you whether this effect object is of a given\n [type](https://codemirror.net/6/docs/ref/#state.StateEffectType).\n */\n is(type) { return this.type == type; }\n /**\n Define a new effect type. The type parameter indicates the type\n of values that his effect holds. It should be a type that\n doesn't include `undefined`, since that is used in\n [mapping](https://codemirror.net/6/docs/ref/#state.StateEffect.map) to indicate that an effect is\n removed.\n */\n static define(spec = {}) {\n return new StateEffectType(spec.map || (v => v));\n }\n /**\n Map an array of effects through a change set.\n */\n static mapEffects(effects, mapping) {\n if (!effects.length)\n return effects;\n let result = [];\n for (let effect of effects) {\n let mapped = effect.map(mapping);\n if (mapped)\n result.push(mapped);\n }\n return result;\n }\n}\n/**\nThis effect can be used to reconfigure the root extensions of\nthe editor. Doing this will discard any extensions\n[appended](https://codemirror.net/6/docs/ref/#state.StateEffect^appendConfig), but does not reset\nthe content of [reconfigured](https://codemirror.net/6/docs/ref/#state.Compartment.reconfigure)\ncompartments.\n*/\nStateEffect.reconfigure = /*@__PURE__*/StateEffect.define();\n/**\nAppend extensions to the top-level configuration of the editor.\n*/\nStateEffect.appendConfig = /*@__PURE__*/StateEffect.define();\n/**\nChanges to the editor state are grouped into transactions.\nTypically, a user action creates a single transaction, which may\ncontain any number of document changes, may change the selection,\nor have other effects. Create a transaction by calling\n[`EditorState.update`](https://codemirror.net/6/docs/ref/#state.EditorState.update), or immediately\ndispatch one by calling\n[`EditorView.dispatch`](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch).\n*/\nclass Transaction {\n constructor(\n /**\n The state from which the transaction starts.\n */\n startState, \n /**\n The document changes made by this transaction.\n */\n changes, \n /**\n The selection set by this transaction, or undefined if it\n doesn't explicitly set a selection.\n */\n selection, \n /**\n The effects added to the transaction.\n */\n effects, \n /**\n @internal\n */\n annotations, \n /**\n Whether the selection should be scrolled into view after this\n transaction is dispatched.\n */\n scrollIntoView) {\n this.startState = startState;\n this.changes = changes;\n this.selection = selection;\n this.effects = effects;\n this.annotations = annotations;\n this.scrollIntoView = scrollIntoView;\n /**\n @internal\n */\n this._doc = null;\n /**\n @internal\n */\n this._state = null;\n if (selection)\n checkSelection(selection, changes.newLength);\n if (!annotations.some((a) => a.type == Transaction.time))\n this.annotations = annotations.concat(Transaction.time.of(Date.now()));\n }\n /**\n @internal\n */\n static create(startState, changes, selection, effects, annotations, scrollIntoView) {\n return new Transaction(startState, changes, selection, effects, annotations, scrollIntoView);\n }\n /**\n The new document produced by the transaction. Contrary to\n [`.state`](https://codemirror.net/6/docs/ref/#state.Transaction.state)`.doc`, accessing this won't\n force the entire new state to be computed right away, so it is\n recommended that [transaction\n filters](https://codemirror.net/6/docs/ref/#state.EditorState^transactionFilter) use this getter\n when they need to look at the new document.\n */\n get newDoc() {\n return this._doc || (this._doc = this.changes.apply(this.startState.doc));\n }\n /**\n The new selection produced by the transaction. If\n [`this.selection`](https://codemirror.net/6/docs/ref/#state.Transaction.selection) is undefined,\n this will [map](https://codemirror.net/6/docs/ref/#state.EditorSelection.map) the start state's\n current selection through the changes made by the transaction.\n */\n get newSelection() {\n return this.selection || this.startState.selection.map(this.changes);\n }\n /**\n The new state created by the transaction. Computed on demand\n (but retained for subsequent access), so it is recommended not to\n access it in [transaction\n filters](https://codemirror.net/6/docs/ref/#state.EditorState^transactionFilter) when possible.\n */\n get state() {\n if (!this._state)\n this.startState.applyTransaction(this);\n return this._state;\n }\n /**\n Get the value of the given annotation type, if any.\n */\n annotation(type) {\n for (let ann of this.annotations)\n if (ann.type == type)\n return ann.value;\n return undefined;\n }\n /**\n Indicates whether the transaction changed the document.\n */\n get docChanged() { return !this.changes.empty; }\n /**\n Indicates whether this transaction reconfigures the state\n (through a [configuration compartment](https://codemirror.net/6/docs/ref/#state.Compartment) or\n with a top-level configuration\n [effect](https://codemirror.net/6/docs/ref/#state.StateEffect^reconfigure).\n */\n get reconfigured() { return this.startState.config != this.state.config; }\n /**\n Returns true if the transaction has a [user\n event](https://codemirror.net/6/docs/ref/#state.Transaction^userEvent) annotation that is equal to\n or more specific than `event`. For example, if the transaction\n has `\"select.pointer\"` as user event, `\"select\"` and\n `\"select.pointer\"` will match it.\n */\n isUserEvent(event) {\n let e = this.annotation(Transaction.userEvent);\n return !!(e && (e == event || e.length > event.length && e.slice(0, event.length) == event && e[event.length] == \".\"));\n }\n}\n/**\nAnnotation used to store transaction timestamps. Automatically\nadded to every transaction, holding `Date.now()`.\n*/\nTransaction.time = /*@__PURE__*/Annotation.define();\n/**\nAnnotation used to associate a transaction with a user interface\nevent. Holds a string identifying the event, using a\ndot-separated format to support attaching more specific\ninformation. The events used by the core libraries are:\n\n - `\"input\"` when content is entered\n - `\"input.type\"` for typed input\n - `\"input.type.compose\"` for composition\n - `\"input.paste\"` for pasted input\n - `\"input.drop\"` when adding content with drag-and-drop\n - `\"input.complete\"` when autocompleting\n - `\"delete\"` when the user deletes content\n - `\"delete.selection\"` when deleting the selection\n - `\"delete.forward\"` when deleting forward from the selection\n - `\"delete.backward\"` when deleting backward from the selection\n - `\"delete.cut\"` when cutting to the clipboard\n - `\"move\"` when content is moved\n - `\"move.drop\"` when content is moved within the editor through drag-and-drop\n - `\"select\"` when explicitly changing the selection\n - `\"select.pointer\"` when selecting with a mouse or other pointing device\n - `\"undo\"` and `\"redo\"` for history actions\n\nUse [`isUserEvent`](https://codemirror.net/6/docs/ref/#state.Transaction.isUserEvent) to check\nwhether the annotation matches a given event.\n*/\nTransaction.userEvent = /*@__PURE__*/Annotation.define();\n/**\nAnnotation indicating whether a transaction should be added to\nthe undo history or not.\n*/\nTransaction.addToHistory = /*@__PURE__*/Annotation.define();\n/**\nAnnotation indicating (when present and true) that a transaction\nrepresents a change made by some other actor, not the user. This\nis used, for example, to tag other people's changes in\ncollaborative editing.\n*/\nTransaction.remote = /*@__PURE__*/Annotation.define();\nfunction joinRanges(a, b) {\n let result = [];\n for (let iA = 0, iB = 0;;) {\n let from, to;\n if (iA < a.length && (iB == b.length || b[iB] >= a[iA])) {\n from = a[iA++];\n to = a[iA++];\n }\n else if (iB < b.length) {\n from = b[iB++];\n to = b[iB++];\n }\n else\n return result;\n if (!result.length || result[result.length - 1] < from)\n result.push(from, to);\n else if (result[result.length - 1] < to)\n result[result.length - 1] = to;\n }\n}\nfunction mergeTransaction(a, b, sequential) {\n var _a;\n let mapForA, mapForB, changes;\n if (sequential) {\n mapForA = b.changes;\n mapForB = ChangeSet.empty(b.changes.length);\n changes = a.changes.compose(b.changes);\n }\n else {\n mapForA = b.changes.map(a.changes);\n mapForB = a.changes.mapDesc(b.changes, true);\n changes = a.changes.compose(mapForA);\n }\n return {\n changes,\n selection: b.selection ? b.selection.map(mapForB) : (_a = a.selection) === null || _a === void 0 ? void 0 : _a.map(mapForA),\n effects: StateEffect.mapEffects(a.effects, mapForA).concat(StateEffect.mapEffects(b.effects, mapForB)),\n annotations: a.annotations.length ? a.annotations.concat(b.annotations) : b.annotations,\n scrollIntoView: a.scrollIntoView || b.scrollIntoView\n };\n}\nfunction resolveTransactionInner(state, spec, docSize) {\n let sel = spec.selection, annotations = asArray(spec.annotations);\n if (spec.userEvent)\n annotations = annotations.concat(Transaction.userEvent.of(spec.userEvent));\n return {\n changes: spec.changes instanceof ChangeSet ? spec.changes\n : ChangeSet.of(spec.changes || [], docSize, state.facet(lineSeparator)),\n selection: sel && (sel instanceof EditorSelection ? sel : EditorSelection.single(sel.anchor, sel.head)),\n effects: asArray(spec.effects),\n annotations,\n scrollIntoView: !!spec.scrollIntoView\n };\n}\nfunction resolveTransaction(state, specs, filter) {\n let s = resolveTransactionInner(state, specs.length ? specs[0] : {}, state.doc.length);\n if (specs.length && specs[0].filter === false)\n filter = false;\n for (let i = 1; i < specs.length; i++) {\n if (specs[i].filter === false)\n filter = false;\n let seq = !!specs[i].sequential;\n s = mergeTransaction(s, resolveTransactionInner(state, specs[i], seq ? s.changes.newLength : state.doc.length), seq);\n }\n let tr = Transaction.create(state, s.changes, s.selection, s.effects, s.annotations, s.scrollIntoView);\n return extendTransaction(filter ? filterTransaction(tr) : tr);\n}\n// Finish a transaction by applying filters if necessary.\nfunction filterTransaction(tr) {\n let state = tr.startState;\n // Change filters\n let result = true;\n for (let filter of state.facet(changeFilter)) {\n let value = filter(tr);\n if (value === false) {\n result = false;\n break;\n }\n if (Array.isArray(value))\n result = result === true ? value : joinRanges(result, value);\n }\n if (result !== true) {\n let changes, back;\n if (result === false) {\n back = tr.changes.invertedDesc;\n changes = ChangeSet.empty(state.doc.length);\n }\n else {\n let filtered = tr.changes.filter(result);\n changes = filtered.changes;\n back = filtered.filtered.mapDesc(filtered.changes).invertedDesc;\n }\n tr = Transaction.create(state, changes, tr.selection && tr.selection.map(back), StateEffect.mapEffects(tr.effects, back), tr.annotations, tr.scrollIntoView);\n }\n // Transaction filters\n let filters = state.facet(transactionFilter);\n for (let i = filters.length - 1; i >= 0; i--) {\n let filtered = filters[i](tr);\n if (filtered instanceof Transaction)\n tr = filtered;\n else if (Array.isArray(filtered) && filtered.length == 1 && filtered[0] instanceof Transaction)\n tr = filtered[0];\n else\n tr = resolveTransaction(state, asArray(filtered), false);\n }\n return tr;\n}\nfunction extendTransaction(tr) {\n let state = tr.startState, extenders = state.facet(transactionExtender), spec = tr;\n for (let i = extenders.length - 1; i >= 0; i--) {\n let extension = extenders[i](tr);\n if (extension && Object.keys(extension).length)\n spec = mergeTransaction(spec, resolveTransactionInner(state, extension, tr.changes.newLength), true);\n }\n return spec == tr ? tr : Transaction.create(state, tr.changes, tr.selection, spec.effects, spec.annotations, spec.scrollIntoView);\n}\nconst none = [];\nfunction asArray(value) {\n return value == null ? none : Array.isArray(value) ? value : [value];\n}\n\n/**\nThe categories produced by a [character\ncategorizer](https://codemirror.net/6/docs/ref/#state.EditorState.charCategorizer). These are used\ndo things like selecting by word.\n*/\nvar CharCategory = /*@__PURE__*/(function (CharCategory) {\n /**\n Word characters.\n */\n CharCategory[CharCategory[\"Word\"] = 0] = \"Word\";\n /**\n Whitespace.\n */\n CharCategory[CharCategory[\"Space\"] = 1] = \"Space\";\n /**\n Anything else.\n */\n CharCategory[CharCategory[\"Other\"] = 2] = \"Other\";\nreturn CharCategory})(CharCategory || (CharCategory = {}));\nconst nonASCIISingleCaseWordChar = /[\\u00df\\u0587\\u0590-\\u05f4\\u0600-\\u06ff\\u3040-\\u309f\\u30a0-\\u30ff\\u3400-\\u4db5\\u4e00-\\u9fcc\\uac00-\\ud7af]/;\nlet wordChar;\ntry {\n wordChar = /*@__PURE__*/new RegExp(\"[\\\\p{Alphabetic}\\\\p{Number}_]\", \"u\");\n}\ncatch (_) { }\nfunction hasWordChar(str) {\n if (wordChar)\n return wordChar.test(str);\n for (let i = 0; i < str.length; i++) {\n let ch = str[i];\n if (/\\w/.test(ch) || ch > \"\\x80\" && (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch)))\n return true;\n }\n return false;\n}\nfunction makeCategorizer(wordChars) {\n return (char) => {\n if (!/\\S/.test(char))\n return CharCategory.Space;\n if (hasWordChar(char))\n return CharCategory.Word;\n for (let i = 0; i < wordChars.length; i++)\n if (char.indexOf(wordChars[i]) > -1)\n return CharCategory.Word;\n return CharCategory.Other;\n };\n}\n\n/**\nThe editor state class is a persistent (immutable) data structure.\nTo update a state, you [create](https://codemirror.net/6/docs/ref/#state.EditorState.update) a\n[transaction](https://codemirror.net/6/docs/ref/#state.Transaction), which produces a _new_ state\ninstance, without modifying the original object.\n\nAs such, _never_ mutate properties of a state directly. That'll\njust break things.\n*/\nclass EditorState {\n constructor(\n /**\n @internal\n */\n config, \n /**\n The current document.\n */\n doc, \n /**\n The current selection.\n */\n selection, \n /**\n @internal\n */\n values, computeSlot, tr) {\n this.config = config;\n this.doc = doc;\n this.selection = selection;\n this.values = values;\n this.status = config.statusTemplate.slice();\n this.computeSlot = computeSlot;\n // Fill in the computed state immediately, so that further queries\n // for it made during the update return this state\n if (tr)\n tr._state = this;\n for (let i = 0; i < this.config.dynamicSlots.length; i++)\n ensureAddr(this, i << 1);\n this.computeSlot = null;\n }\n field(field, require = true) {\n let addr = this.config.address[field.id];\n if (addr == null) {\n if (require)\n throw new RangeError(\"Field is not present in this state\");\n return undefined;\n }\n ensureAddr(this, addr);\n return getAddr(this, addr);\n }\n /**\n Create a [transaction](https://codemirror.net/6/docs/ref/#state.Transaction) that updates this\n state. Any number of [transaction specs](https://codemirror.net/6/docs/ref/#state.TransactionSpec)\n can be passed. Unless\n [`sequential`](https://codemirror.net/6/docs/ref/#state.TransactionSpec.sequential) is set, the\n [changes](https://codemirror.net/6/docs/ref/#state.TransactionSpec.changes) (if any) of each spec\n are assumed to start in the _current_ document (not the document\n produced by previous specs), and its\n [selection](https://codemirror.net/6/docs/ref/#state.TransactionSpec.selection) and\n [effects](https://codemirror.net/6/docs/ref/#state.TransactionSpec.effects) are assumed to refer\n to the document created by its _own_ changes. The resulting\n transaction contains the combined effect of all the different\n specs. For [selection](https://codemirror.net/6/docs/ref/#state.TransactionSpec.selection), later\n specs take precedence over earlier ones.\n */\n update(...specs) {\n return resolveTransaction(this, specs, true);\n }\n /**\n @internal\n */\n applyTransaction(tr) {\n let conf = this.config, { base, compartments } = conf;\n for (let effect of tr.effects) {\n if (effect.is(Compartment.reconfigure)) {\n if (conf) {\n compartments = new Map;\n conf.compartments.forEach((val, key) => compartments.set(key, val));\n conf = null;\n }\n compartments.set(effect.value.compartment, effect.value.extension);\n }\n else if (effect.is(StateEffect.reconfigure)) {\n conf = null;\n base = effect.value;\n }\n else if (effect.is(StateEffect.appendConfig)) {\n conf = null;\n base = asArray(base).concat(effect.value);\n }\n }\n let startValues;\n if (!conf) {\n conf = Configuration.resolve(base, compartments, this);\n let intermediateState = new EditorState(conf, this.doc, this.selection, conf.dynamicSlots.map(() => null), (state, slot) => slot.reconfigure(state, this), null);\n startValues = intermediateState.values;\n }\n else {\n startValues = tr.startState.values.slice();\n }\n let selection = tr.startState.facet(allowMultipleSelections) ? tr.newSelection : tr.newSelection.asSingle();\n new EditorState(conf, tr.newDoc, selection, startValues, (state, slot) => slot.update(state, tr), tr);\n }\n /**\n Create a [transaction spec](https://codemirror.net/6/docs/ref/#state.TransactionSpec) that\n replaces every selection range with the given content.\n */\n replaceSelection(text) {\n if (typeof text == \"string\")\n text = this.toText(text);\n return this.changeByRange(range => ({ changes: { from: range.from, to: range.to, insert: text },\n range: EditorSelection.cursor(range.from + text.length) }));\n }\n /**\n Create a set of changes and a new selection by running the given\n function for each range in the active selection. The function\n can return an optional set of changes (in the coordinate space\n of the start document), plus an updated range (in the coordinate\n space of the document produced by the call's own changes). This\n method will merge all the changes and ranges into a single\n changeset and selection, and return it as a [transaction\n spec](https://codemirror.net/6/docs/ref/#state.TransactionSpec), which can be passed to\n [`update`](https://codemirror.net/6/docs/ref/#state.EditorState.update).\n */\n changeByRange(f) {\n let sel = this.selection;\n let result1 = f(sel.ranges[0]);\n let changes = this.changes(result1.changes), ranges = [result1.range];\n let effects = asArray(result1.effects);\n for (let i = 1; i < sel.ranges.length; i++) {\n let result = f(sel.ranges[i]);\n let newChanges = this.changes(result.changes), newMapped = newChanges.map(changes);\n for (let j = 0; j < i; j++)\n ranges[j] = ranges[j].map(newMapped);\n let mapBy = changes.mapDesc(newChanges, true);\n ranges.push(result.range.map(mapBy));\n changes = changes.compose(newMapped);\n effects = StateEffect.mapEffects(effects, newMapped).concat(StateEffect.mapEffects(asArray(result.effects), mapBy));\n }\n return {\n changes,\n selection: EditorSelection.create(ranges, sel.mainIndex),\n effects\n };\n }\n /**\n Create a [change set](https://codemirror.net/6/docs/ref/#state.ChangeSet) from the given change\n description, taking the state's document length and line\n separator into account.\n */\n changes(spec = []) {\n if (spec instanceof ChangeSet)\n return spec;\n return ChangeSet.of(spec, this.doc.length, this.facet(EditorState.lineSeparator));\n }\n /**\n Using the state's [line\n separator](https://codemirror.net/6/docs/ref/#state.EditorState^lineSeparator), create a\n [`Text`](https://codemirror.net/6/docs/ref/#state.Text) instance from the given string.\n */\n toText(string) {\n return Text.of(string.split(this.facet(EditorState.lineSeparator) || DefaultSplit));\n }\n /**\n Return the given range of the document as a string.\n */\n sliceDoc(from = 0, to = this.doc.length) {\n return this.doc.sliceString(from, to, this.lineBreak);\n }\n /**\n Get the value of a state [facet](https://codemirror.net/6/docs/ref/#state.Facet).\n */\n facet(facet) {\n let addr = this.config.address[facet.id];\n if (addr == null)\n return facet.default;\n ensureAddr(this, addr);\n return getAddr(this, addr);\n }\n /**\n Convert this state to a JSON-serializable object. When custom\n fields should be serialized, you can pass them in as an object\n mapping property names (in the resulting object, which should\n not use `doc` or `selection`) to fields.\n */\n toJSON(fields) {\n let result = {\n doc: this.sliceDoc(),\n selection: this.selection.toJSON()\n };\n if (fields)\n for (let prop in fields) {\n let value = fields[prop];\n if (value instanceof StateField && this.config.address[value.id] != null)\n result[prop] = value.spec.toJSON(this.field(fields[prop]), this);\n }\n return result;\n }\n /**\n Deserialize a state from its JSON representation. When custom\n fields should be deserialized, pass the same object you passed\n to [`toJSON`](https://codemirror.net/6/docs/ref/#state.EditorState.toJSON) when serializing as\n third argument.\n */\n static fromJSON(json, config = {}, fields) {\n if (!json || typeof json.doc != \"string\")\n throw new RangeError(\"Invalid JSON representation for EditorState\");\n let fieldInit = [];\n if (fields)\n for (let prop in fields) {\n if (Object.prototype.hasOwnProperty.call(json, prop)) {\n let field = fields[prop], value = json[prop];\n fieldInit.push(field.init(state => field.spec.fromJSON(value, state)));\n }\n }\n return EditorState.create({\n doc: json.doc,\n selection: EditorSelection.fromJSON(json.selection),\n extensions: config.extensions ? fieldInit.concat([config.extensions]) : fieldInit\n });\n }\n /**\n Create a new state. You'll usually only need this when\n initializing an editor\u2014updated states are created by applying\n transactions.\n */\n static create(config = {}) {\n let configuration = Configuration.resolve(config.extensions || [], new Map);\n let doc = config.doc instanceof Text ? config.doc\n : Text.of((config.doc || \"\").split(configuration.staticFacet(EditorState.lineSeparator) || DefaultSplit));\n let selection = !config.selection ? EditorSelection.single(0)\n : config.selection instanceof EditorSelection ? config.selection\n : EditorSelection.single(config.selection.anchor, config.selection.head);\n checkSelection(selection, doc.length);\n if (!configuration.staticFacet(allowMultipleSelections))\n selection = selection.asSingle();\n return new EditorState(configuration, doc, selection, configuration.dynamicSlots.map(() => null), (state, slot) => slot.create(state), null);\n }\n /**\n The size (in columns) of a tab in the document, determined by\n the [`tabSize`](https://codemirror.net/6/docs/ref/#state.EditorState^tabSize) facet.\n */\n get tabSize() { return this.facet(EditorState.tabSize); }\n /**\n Get the proper [line-break](https://codemirror.net/6/docs/ref/#state.EditorState^lineSeparator)\n string for this state.\n */\n get lineBreak() { return this.facet(EditorState.lineSeparator) || \"\\n\"; }\n /**\n Returns true when the editor is\n [configured](https://codemirror.net/6/docs/ref/#state.EditorState^readOnly) to be read-only.\n */\n get readOnly() { return this.facet(readOnly); }\n /**\n Look up a translation for the given phrase (via the\n [`phrases`](https://codemirror.net/6/docs/ref/#state.EditorState^phrases) facet), or return the\n original string if no translation is found.\n \n If additional arguments are passed, they will be inserted in\n place of markers like `$1` (for the first value) and `$2`, etc.\n A single `$` is equivalent to `$1`, and `$$` will produce a\n literal dollar sign.\n */\n phrase(phrase, ...insert) {\n for (let map of this.facet(EditorState.phrases))\n if (Object.prototype.hasOwnProperty.call(map, phrase)) {\n phrase = map[phrase];\n break;\n }\n if (insert.length)\n phrase = phrase.replace(/\\$(\\$|\\d*)/g, (m, i) => {\n if (i == \"$\")\n return \"$\";\n let n = +(i || 1);\n return !n || n > insert.length ? m : insert[n - 1];\n });\n return phrase;\n }\n /**\n Find the values for a given language data field, provided by the\n the [`languageData`](https://codemirror.net/6/docs/ref/#state.EditorState^languageData) facet.\n \n Examples of language data fields are...\n \n - [`\"commentTokens\"`](https://codemirror.net/6/docs/ref/#commands.CommentTokens) for specifying\n comment syntax.\n - [`\"autocomplete\"`](https://codemirror.net/6/docs/ref/#autocomplete.autocompletion^config.override)\n for providing language-specific completion sources.\n - [`\"wordChars\"`](https://codemirror.net/6/docs/ref/#state.EditorState.charCategorizer) for adding\n characters that should be considered part of words in this\n language.\n - [`\"closeBrackets\"`](https://codemirror.net/6/docs/ref/#autocomplete.CloseBracketConfig) controls\n bracket closing behavior.\n */\n languageDataAt(name, pos, side = -1) {\n let values = [];\n for (let provider of this.facet(languageData)) {\n for (let result of provider(this, pos, side)) {\n if (Object.prototype.hasOwnProperty.call(result, name))\n values.push(result[name]);\n }\n }\n return values;\n }\n /**\n Return a function that can categorize strings (expected to\n represent a single [grapheme cluster](https://codemirror.net/6/docs/ref/#state.findClusterBreak))\n into one of:\n \n - Word (contains an alphanumeric character or a character\n explicitly listed in the local language's `\"wordChars\"`\n language data, which should be a string)\n - Space (contains only whitespace)\n - Other (anything else)\n */\n charCategorizer(at) {\n let chars = this.languageDataAt(\"wordChars\", at);\n return makeCategorizer(chars.length ? chars[0] : \"\");\n }\n /**\n Find the word at the given position, meaning the range\n containing all [word](https://codemirror.net/6/docs/ref/#state.CharCategory.Word) characters\n around it. If no word characters are adjacent to the position,\n this returns null.\n */\n wordAt(pos) {\n let { text, from, length } = this.doc.lineAt(pos);\n let cat = this.charCategorizer(pos);\n let start = pos - from, end = pos - from;\n while (start > 0) {\n let prev = findClusterBreak(text, start, false);\n if (cat(text.slice(prev, start)) != CharCategory.Word)\n break;\n start = prev;\n }\n while (end < length) {\n let next = findClusterBreak(text, end);\n if (cat(text.slice(end, next)) != CharCategory.Word)\n break;\n end = next;\n }\n return start == end ? null : EditorSelection.range(start + from, end + from);\n }\n}\n/**\nA facet that, when enabled, causes the editor to allow multiple\nranges to be selected. Be careful though, because by default the\neditor relies on the native DOM selection, which cannot handle\nmultiple selections. An extension like\n[`drawSelection`](https://codemirror.net/6/docs/ref/#view.drawSelection) can be used to make\nsecondary selections visible to the user.\n*/\nEditorState.allowMultipleSelections = allowMultipleSelections;\n/**\nConfigures the tab size to use in this state. The first\n(highest-precedence) value of the facet is used. If no value is\ngiven, this defaults to 4.\n*/\nEditorState.tabSize = /*@__PURE__*/Facet.define({\n combine: values => values.length ? values[0] : 4\n});\n/**\nThe line separator to use. By default, any of `\"\\n\"`, `\"\\r\\n\"`\nand `\"\\r\"` is treated as a separator when splitting lines, and\nlines are joined with `\"\\n\"`.\n\nWhen you configure a value here, only that precise separator\nwill be used, allowing you to round-trip documents through the\neditor without normalizing line separators.\n*/\nEditorState.lineSeparator = lineSeparator;\n/**\nThis facet controls the value of the\n[`readOnly`](https://codemirror.net/6/docs/ref/#state.EditorState.readOnly) getter, which is\nconsulted by commands and extensions that implement editing\nfunctionality to determine whether they should apply. It\ndefaults to false, but when its highest-precedence value is\n`true`, such functionality disables itself.\n\nNot to be confused with\n[`EditorView.editable`](https://codemirror.net/6/docs/ref/#view.EditorView^editable), which\ncontrols whether the editor's DOM is set to be editable (and\nthus focusable).\n*/\nEditorState.readOnly = readOnly;\n/**\nRegisters translation phrases. The\n[`phrase`](https://codemirror.net/6/docs/ref/#state.EditorState.phrase) method will look through\nall objects registered with this facet to find translations for\nits argument.\n*/\nEditorState.phrases = /*@__PURE__*/Facet.define({\n compare(a, b) {\n let kA = Object.keys(a), kB = Object.keys(b);\n return kA.length == kB.length && kA.every(k => a[k] == b[k]);\n }\n});\n/**\nA facet used to register [language\ndata](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) providers.\n*/\nEditorState.languageData = languageData;\n/**\nFacet used to register change filters, which are called for each\ntransaction (unless explicitly\n[disabled](https://codemirror.net/6/docs/ref/#state.TransactionSpec.filter)), and can suppress\npart of the transaction's changes.\n\nSuch a function can return `true` to indicate that it doesn't\nwant to do anything, `false` to completely stop the changes in\nthe transaction, or a set of ranges in which changes should be\nsuppressed. Such ranges are represented as an array of numbers,\nwith each pair of two numbers indicating the start and end of a\nrange. So for example `[10, 20, 100, 110]` suppresses changes\nbetween 10 and 20, and between 100 and 110.\n*/\nEditorState.changeFilter = changeFilter;\n/**\nFacet used to register a hook that gets a chance to update or\nreplace transaction specs before they are applied. This will\nonly be applied for transactions that don't have\n[`filter`](https://codemirror.net/6/docs/ref/#state.TransactionSpec.filter) set to `false`. You\ncan either return a single transaction spec (possibly the input\ntransaction), or an array of specs (which will be combined in\nthe same way as the arguments to\n[`EditorState.update`](https://codemirror.net/6/docs/ref/#state.EditorState.update)).\n\nWhen possible, it is recommended to avoid accessing\n[`Transaction.state`](https://codemirror.net/6/docs/ref/#state.Transaction.state) in a filter,\nsince it will force creation of a state that will then be\ndiscarded again, if the transaction is actually filtered.\n\n(This functionality should be used with care. Indiscriminately\nmodifying transaction is likely to break something or degrade\nthe user experience.)\n*/\nEditorState.transactionFilter = transactionFilter;\n/**\nThis is a more limited form of\n[`transactionFilter`](https://codemirror.net/6/docs/ref/#state.EditorState^transactionFilter),\nwhich can only add\n[annotations](https://codemirror.net/6/docs/ref/#state.TransactionSpec.annotations) and\n[effects](https://codemirror.net/6/docs/ref/#state.TransactionSpec.effects). _But_, this type\nof filter runs even if the transaction has disabled regular\n[filtering](https://codemirror.net/6/docs/ref/#state.TransactionSpec.filter), making it suitable\nfor effects that don't need to touch the changes or selection,\nbut do want to process every transaction.\n\nExtenders run _after_ filters, when both are present.\n*/\nEditorState.transactionExtender = transactionExtender;\nCompartment.reconfigure = /*@__PURE__*/StateEffect.define();\n\n/**\nUtility function for combining behaviors to fill in a config\nobject from an array of provided configs. `defaults` should hold\ndefault values for all optional fields in `Config`.\n\nThe function will, by default, error\nwhen a field gets two values that aren't `===`-equal, but you can\nprovide combine functions per field to do something else.\n*/\nfunction combineConfig(configs, defaults, // Should hold only the optional properties of Config, but I haven't managed to express that\ncombine = {}) {\n let result = {};\n for (let config of configs)\n for (let key of Object.keys(config)) {\n let value = config[key], current = result[key];\n if (current === undefined)\n result[key] = value;\n else if (current === value || value === undefined) ; // No conflict\n else if (Object.hasOwnProperty.call(combine, key))\n result[key] = combine[key](current, value);\n else\n throw new Error(\"Config merge conflict for field \" + key);\n }\n for (let key in defaults)\n if (result[key] === undefined)\n result[key] = defaults[key];\n return result;\n}\n\n/**\nEach range is associated with a value, which must inherit from\nthis class.\n*/\nclass RangeValue {\n /**\n Compare this value with another value. Used when comparing\n rangesets. The default implementation compares by identity.\n Unless you are only creating a fixed number of unique instances\n of your value type, it is a good idea to implement this\n properly.\n */\n eq(other) { return this == other; }\n /**\n Create a [range](https://codemirror.net/6/docs/ref/#state.Range) with this value.\n */\n range(from, to = from) { return Range.create(from, to, this); }\n}\nRangeValue.prototype.startSide = RangeValue.prototype.endSide = 0;\nRangeValue.prototype.point = false;\nRangeValue.prototype.mapMode = MapMode.TrackDel;\nfunction cmpVal(a, b) {\n return a == b || a.constructor == b.constructor && a.eq(b);\n}\n/**\nA range associates a value with a range of positions.\n*/\nclass Range {\n constructor(\n /**\n The range's start position.\n */\n from, \n /**\n Its end position.\n */\n to, \n /**\n The value associated with this range.\n */\n value) {\n this.from = from;\n this.to = to;\n this.value = value;\n }\n /**\n @internal\n */\n static create(from, to, value) {\n return new Range(from, to, value);\n }\n}\nfunction cmpRange(a, b) {\n return a.from - b.from || a.value.startSide - b.value.startSide;\n}\nclass Chunk {\n constructor(from, to, value, \n // Chunks are marked with the largest point that occurs\n // in them (or -1 for no points), so that scans that are\n // only interested in points (such as the\n // heightmap-related logic) can skip range-only chunks.\n maxPoint) {\n this.from = from;\n this.to = to;\n this.value = value;\n this.maxPoint = maxPoint;\n }\n get length() { return this.to[this.to.length - 1]; }\n // Find the index of the given position and side. Use the ranges'\n // `from` pos when `end == false`, `to` when `end == true`.\n findIndex(pos, side, end, startAt = 0) {\n let arr = end ? this.to : this.from;\n for (let lo = startAt, hi = arr.length;;) {\n if (lo == hi)\n return lo;\n let mid = (lo + hi) >> 1;\n let diff = arr[mid] - pos || (end ? this.value[mid].endSide : this.value[mid].startSide) - side;\n if (mid == lo)\n return diff >= 0 ? lo : hi;\n if (diff >= 0)\n hi = mid;\n else\n lo = mid + 1;\n }\n }\n between(offset, from, to, f) {\n for (let i = this.findIndex(from, -1000000000 /* C.Far */, true), e = this.findIndex(to, 1000000000 /* C.Far */, false, i); i < e; i++)\n if (f(this.from[i] + offset, this.to[i] + offset, this.value[i]) === false)\n return false;\n }\n map(offset, changes) {\n let value = [], from = [], to = [], newPos = -1, maxPoint = -1;\n for (let i = 0; i < this.value.length; i++) {\n let val = this.value[i], curFrom = this.from[i] + offset, curTo = this.to[i] + offset, newFrom, newTo;\n if (curFrom == curTo) {\n let mapped = changes.mapPos(curFrom, val.startSide, val.mapMode);\n if (mapped == null)\n continue;\n newFrom = newTo = mapped;\n if (val.startSide != val.endSide) {\n newTo = changes.mapPos(curFrom, val.endSide);\n if (newTo < newFrom)\n continue;\n }\n }\n else {\n newFrom = changes.mapPos(curFrom, val.startSide);\n newTo = changes.mapPos(curTo, val.endSide);\n if (newFrom > newTo || newFrom == newTo && val.startSide > 0 && val.endSide <= 0)\n continue;\n }\n if ((newTo - newFrom || val.endSide - val.startSide) < 0)\n continue;\n if (newPos < 0)\n newPos = newFrom;\n if (val.point)\n maxPoint = Math.max(maxPoint, newTo - newFrom);\n value.push(val);\n from.push(newFrom - newPos);\n to.push(newTo - newPos);\n }\n return { mapped: value.length ? new Chunk(from, to, value, maxPoint) : null, pos: newPos };\n }\n}\n/**\nA range set stores a collection of [ranges](https://codemirror.net/6/docs/ref/#state.Range) in a\nway that makes them efficient to [map](https://codemirror.net/6/docs/ref/#state.RangeSet.map) and\n[update](https://codemirror.net/6/docs/ref/#state.RangeSet.update). This is an immutable data\nstructure.\n*/\nclass RangeSet {\n constructor(\n /**\n @internal\n */\n chunkPos, \n /**\n @internal\n */\n chunk, \n /**\n @internal\n */\n nextLayer, \n /**\n @internal\n */\n maxPoint) {\n this.chunkPos = chunkPos;\n this.chunk = chunk;\n this.nextLayer = nextLayer;\n this.maxPoint = maxPoint;\n }\n /**\n @internal\n */\n static create(chunkPos, chunk, nextLayer, maxPoint) {\n return new RangeSet(chunkPos, chunk, nextLayer, maxPoint);\n }\n /**\n @internal\n */\n get length() {\n let last = this.chunk.length - 1;\n return last < 0 ? 0 : Math.max(this.chunkEnd(last), this.nextLayer.length);\n }\n /**\n The number of ranges in the set.\n */\n get size() {\n if (this.isEmpty)\n return 0;\n let size = this.nextLayer.size;\n for (let chunk of this.chunk)\n size += chunk.value.length;\n return size;\n }\n /**\n @internal\n */\n chunkEnd(index) {\n return this.chunkPos[index] + this.chunk[index].length;\n }\n /**\n Update the range set, optionally adding new ranges or filtering\n out existing ones.\n \n (Note: The type parameter is just there as a kludge to work\n around TypeScript variance issues that prevented `RangeSet`\n from being a subtype of `RangeSet` when `X` is a subtype of\n `Y`.)\n */\n update(updateSpec) {\n let { add = [], sort = false, filterFrom = 0, filterTo = this.length } = updateSpec;\n let filter = updateSpec.filter;\n if (add.length == 0 && !filter)\n return this;\n if (sort)\n add = add.slice().sort(cmpRange);\n if (this.isEmpty)\n return add.length ? RangeSet.of(add) : this;\n let cur = new LayerCursor(this, null, -1).goto(0), i = 0, spill = [];\n let builder = new RangeSetBuilder();\n while (cur.value || i < add.length) {\n if (i < add.length && (cur.from - add[i].from || cur.startSide - add[i].value.startSide) >= 0) {\n let range = add[i++];\n if (!builder.addInner(range.from, range.to, range.value))\n spill.push(range);\n }\n else if (cur.rangeIndex == 1 && cur.chunkIndex < this.chunk.length &&\n (i == add.length || this.chunkEnd(cur.chunkIndex) < add[i].from) &&\n (!filter || filterFrom > this.chunkEnd(cur.chunkIndex) || filterTo < this.chunkPos[cur.chunkIndex]) &&\n builder.addChunk(this.chunkPos[cur.chunkIndex], this.chunk[cur.chunkIndex])) {\n cur.nextChunk();\n }\n else {\n if (!filter || filterFrom > cur.to || filterTo < cur.from || filter(cur.from, cur.to, cur.value)) {\n if (!builder.addInner(cur.from, cur.to, cur.value))\n spill.push(Range.create(cur.from, cur.to, cur.value));\n }\n cur.next();\n }\n }\n return builder.finishInner(this.nextLayer.isEmpty && !spill.length ? RangeSet.empty\n : this.nextLayer.update({ add: spill, filter, filterFrom, filterTo }));\n }\n /**\n Map this range set through a set of changes, return the new set.\n */\n map(changes) {\n if (changes.empty || this.isEmpty)\n return this;\n let chunks = [], chunkPos = [], maxPoint = -1;\n for (let i = 0; i < this.chunk.length; i++) {\n let start = this.chunkPos[i], chunk = this.chunk[i];\n let touch = changes.touchesRange(start, start + chunk.length);\n if (touch === false) {\n maxPoint = Math.max(maxPoint, chunk.maxPoint);\n chunks.push(chunk);\n chunkPos.push(changes.mapPos(start));\n }\n else if (touch === true) {\n let { mapped, pos } = chunk.map(start, changes);\n if (mapped) {\n maxPoint = Math.max(maxPoint, mapped.maxPoint);\n chunks.push(mapped);\n chunkPos.push(pos);\n }\n }\n }\n let next = this.nextLayer.map(changes);\n return chunks.length == 0 ? next : new RangeSet(chunkPos, chunks, next || RangeSet.empty, maxPoint);\n }\n /**\n Iterate over the ranges that touch the region `from` to `to`,\n calling `f` for each. There is no guarantee that the ranges will\n be reported in any specific order. When the callback returns\n `false`, iteration stops.\n */\n between(from, to, f) {\n if (this.isEmpty)\n return;\n for (let i = 0; i < this.chunk.length; i++) {\n let start = this.chunkPos[i], chunk = this.chunk[i];\n if (to >= start && from <= start + chunk.length &&\n chunk.between(start, from - start, to - start, f) === false)\n return;\n }\n this.nextLayer.between(from, to, f);\n }\n /**\n Iterate over the ranges in this set, in order, including all\n ranges that end at or after `from`.\n */\n iter(from = 0) {\n return HeapCursor.from([this]).goto(from);\n }\n /**\n @internal\n */\n get isEmpty() { return this.nextLayer == this; }\n /**\n Iterate over the ranges in a collection of sets, in order,\n starting from `from`.\n */\n static iter(sets, from = 0) {\n return HeapCursor.from(sets).goto(from);\n }\n /**\n Iterate over two groups of sets, calling methods on `comparator`\n to notify it of possible differences.\n */\n static compare(oldSets, newSets, \n /**\n This indicates how the underlying data changed between these\n ranges, and is needed to synchronize the iteration.\n */\n textDiff, comparator, \n /**\n Can be used to ignore all non-point ranges, and points below\n the given size. When -1, all ranges are compared.\n */\n minPointSize = -1) {\n let a = oldSets.filter(set => set.maxPoint > 0 || !set.isEmpty && set.maxPoint >= minPointSize);\n let b = newSets.filter(set => set.maxPoint > 0 || !set.isEmpty && set.maxPoint >= minPointSize);\n let sharedChunks = findSharedChunks(a, b, textDiff);\n let sideA = new SpanCursor(a, sharedChunks, minPointSize);\n let sideB = new SpanCursor(b, sharedChunks, minPointSize);\n textDiff.iterGaps((fromA, fromB, length) => compare(sideA, fromA, sideB, fromB, length, comparator));\n if (textDiff.empty && textDiff.length == 0)\n compare(sideA, 0, sideB, 0, 0, comparator);\n }\n /**\n Compare the contents of two groups of range sets, returning true\n if they are equivalent in the given range.\n */\n static eq(oldSets, newSets, from = 0, to) {\n if (to == null)\n to = 1000000000 /* C.Far */ - 1;\n let a = oldSets.filter(set => !set.isEmpty && newSets.indexOf(set) < 0);\n let b = newSets.filter(set => !set.isEmpty && oldSets.indexOf(set) < 0);\n if (a.length != b.length)\n return false;\n if (!a.length)\n return true;\n let sharedChunks = findSharedChunks(a, b);\n let sideA = new SpanCursor(a, sharedChunks, 0).goto(from), sideB = new SpanCursor(b, sharedChunks, 0).goto(from);\n for (;;) {\n if (sideA.to != sideB.to ||\n !sameValues(sideA.active, sideB.active) ||\n sideA.point && (!sideB.point || !cmpVal(sideA.point, sideB.point)))\n return false;\n if (sideA.to > to)\n return true;\n sideA.next();\n sideB.next();\n }\n }\n /**\n Iterate over a group of range sets at the same time, notifying\n the iterator about the ranges covering every given piece of\n content. Returns the open count (see\n [`SpanIterator.span`](https://codemirror.net/6/docs/ref/#state.SpanIterator.span)) at the end\n of the iteration.\n */\n static spans(sets, from, to, iterator, \n /**\n When given and greater than -1, only points of at least this\n size are taken into account.\n */\n minPointSize = -1) {\n let cursor = new SpanCursor(sets, null, minPointSize).goto(from), pos = from;\n let openRanges = cursor.openStart;\n for (;;) {\n let curTo = Math.min(cursor.to, to);\n if (cursor.point) {\n let active = cursor.activeForPoint(cursor.to);\n let openCount = cursor.pointFrom < from ? active.length + 1\n : cursor.point.startSide < 0 ? active.length\n : Math.min(active.length, openRanges);\n iterator.point(pos, curTo, cursor.point, active, openCount, cursor.pointRank);\n openRanges = Math.min(cursor.openEnd(curTo), active.length);\n }\n else if (curTo > pos) {\n iterator.span(pos, curTo, cursor.active, openRanges);\n openRanges = cursor.openEnd(curTo);\n }\n if (cursor.to > to)\n return openRanges + (cursor.point && cursor.to > to ? 1 : 0);\n pos = cursor.to;\n cursor.next();\n }\n }\n /**\n Create a range set for the given range or array of ranges. By\n default, this expects the ranges to be _sorted_ (by start\n position and, if two start at the same position,\n `value.startSide`). You can pass `true` as second argument to\n cause the method to sort them.\n */\n static of(ranges, sort = false) {\n let build = new RangeSetBuilder();\n for (let range of ranges instanceof Range ? [ranges] : sort ? lazySort(ranges) : ranges)\n build.add(range.from, range.to, range.value);\n return build.finish();\n }\n /**\n Join an array of range sets into a single set.\n */\n static join(sets) {\n if (!sets.length)\n return RangeSet.empty;\n let result = sets[sets.length - 1];\n for (let i = sets.length - 2; i >= 0; i--) {\n for (let layer = sets[i]; layer != RangeSet.empty; layer = layer.nextLayer)\n result = new RangeSet(layer.chunkPos, layer.chunk, result, Math.max(layer.maxPoint, result.maxPoint));\n }\n return result;\n }\n}\n/**\nThe empty set of ranges.\n*/\nRangeSet.empty = /*@__PURE__*/new RangeSet([], [], null, -1);\nfunction lazySort(ranges) {\n if (ranges.length > 1)\n for (let prev = ranges[0], i = 1; i < ranges.length; i++) {\n let cur = ranges[i];\n if (cmpRange(prev, cur) > 0)\n return ranges.slice().sort(cmpRange);\n prev = cur;\n }\n return ranges;\n}\nRangeSet.empty.nextLayer = RangeSet.empty;\n/**\nA range set builder is a data structure that helps build up a\n[range set](https://codemirror.net/6/docs/ref/#state.RangeSet) directly, without first allocating\nan array of [`Range`](https://codemirror.net/6/docs/ref/#state.Range) objects.\n*/\nclass RangeSetBuilder {\n finishChunk(newArrays) {\n this.chunks.push(new Chunk(this.from, this.to, this.value, this.maxPoint));\n this.chunkPos.push(this.chunkStart);\n this.chunkStart = -1;\n this.setMaxPoint = Math.max(this.setMaxPoint, this.maxPoint);\n this.maxPoint = -1;\n if (newArrays) {\n this.from = [];\n this.to = [];\n this.value = [];\n }\n }\n /**\n Create an empty builder.\n */\n constructor() {\n this.chunks = [];\n this.chunkPos = [];\n this.chunkStart = -1;\n this.last = null;\n this.lastFrom = -1000000000 /* C.Far */;\n this.lastTo = -1000000000 /* C.Far */;\n this.from = [];\n this.to = [];\n this.value = [];\n this.maxPoint = -1;\n this.setMaxPoint = -1;\n this.nextLayer = null;\n }\n /**\n Add a range. Ranges should be added in sorted (by `from` and\n `value.startSide`) order.\n */\n add(from, to, value) {\n if (!this.addInner(from, to, value))\n (this.nextLayer || (this.nextLayer = new RangeSetBuilder)).add(from, to, value);\n }\n /**\n @internal\n */\n addInner(from, to, value) {\n let diff = from - this.lastTo || value.startSide - this.last.endSide;\n if (diff <= 0 && (from - this.lastFrom || value.startSide - this.last.startSide) < 0)\n throw new Error(\"Ranges must be added sorted by `from` position and `startSide`\");\n if (diff < 0)\n return false;\n if (this.from.length == 250 /* C.ChunkSize */)\n this.finishChunk(true);\n if (this.chunkStart < 0)\n this.chunkStart = from;\n this.from.push(from - this.chunkStart);\n this.to.push(to - this.chunkStart);\n this.last = value;\n this.lastFrom = from;\n this.lastTo = to;\n this.value.push(value);\n if (value.point)\n this.maxPoint = Math.max(this.maxPoint, to - from);\n return true;\n }\n /**\n @internal\n */\n addChunk(from, chunk) {\n if ((from - this.lastTo || chunk.value[0].startSide - this.last.endSide) < 0)\n return false;\n if (this.from.length)\n this.finishChunk(true);\n this.setMaxPoint = Math.max(this.setMaxPoint, chunk.maxPoint);\n this.chunks.push(chunk);\n this.chunkPos.push(from);\n let last = chunk.value.length - 1;\n this.last = chunk.value[last];\n this.lastFrom = chunk.from[last] + from;\n this.lastTo = chunk.to[last] + from;\n return true;\n }\n /**\n Finish the range set. Returns the new set. The builder can't be\n used anymore after this has been called.\n */\n finish() { return this.finishInner(RangeSet.empty); }\n /**\n @internal\n */\n finishInner(next) {\n if (this.from.length)\n this.finishChunk(false);\n if (this.chunks.length == 0)\n return next;\n let result = RangeSet.create(this.chunkPos, this.chunks, this.nextLayer ? this.nextLayer.finishInner(next) : next, this.setMaxPoint);\n this.from = null; // Make sure further `add` calls produce errors\n return result;\n }\n}\nfunction findSharedChunks(a, b, textDiff) {\n let inA = new Map();\n for (let set of a)\n for (let i = 0; i < set.chunk.length; i++)\n if (set.chunk[i].maxPoint <= 0)\n inA.set(set.chunk[i], set.chunkPos[i]);\n let shared = new Set();\n for (let set of b)\n for (let i = 0; i < set.chunk.length; i++) {\n let known = inA.get(set.chunk[i]);\n if (known != null && (textDiff ? textDiff.mapPos(known) : known) == set.chunkPos[i] &&\n !(textDiff === null || textDiff === void 0 ? void 0 : textDiff.touchesRange(known, known + set.chunk[i].length)))\n shared.add(set.chunk[i]);\n }\n return shared;\n}\nclass LayerCursor {\n constructor(layer, skip, minPoint, rank = 0) {\n this.layer = layer;\n this.skip = skip;\n this.minPoint = minPoint;\n this.rank = rank;\n }\n get startSide() { return this.value ? this.value.startSide : 0; }\n get endSide() { return this.value ? this.value.endSide : 0; }\n goto(pos, side = -1000000000 /* C.Far */) {\n this.chunkIndex = this.rangeIndex = 0;\n this.gotoInner(pos, side, false);\n return this;\n }\n gotoInner(pos, side, forward) {\n while (this.chunkIndex < this.layer.chunk.length) {\n let next = this.layer.chunk[this.chunkIndex];\n if (!(this.skip && this.skip.has(next) ||\n this.layer.chunkEnd(this.chunkIndex) < pos ||\n next.maxPoint < this.minPoint))\n break;\n this.chunkIndex++;\n forward = false;\n }\n if (this.chunkIndex < this.layer.chunk.length) {\n let rangeIndex = this.layer.chunk[this.chunkIndex].findIndex(pos - this.layer.chunkPos[this.chunkIndex], side, true);\n if (!forward || this.rangeIndex < rangeIndex)\n this.setRangeIndex(rangeIndex);\n }\n this.next();\n }\n forward(pos, side) {\n if ((this.to - pos || this.endSide - side) < 0)\n this.gotoInner(pos, side, true);\n }\n next() {\n for (;;) {\n if (this.chunkIndex == this.layer.chunk.length) {\n this.from = this.to = 1000000000 /* C.Far */;\n this.value = null;\n break;\n }\n else {\n let chunkPos = this.layer.chunkPos[this.chunkIndex], chunk = this.layer.chunk[this.chunkIndex];\n let from = chunkPos + chunk.from[this.rangeIndex];\n this.from = from;\n this.to = chunkPos + chunk.to[this.rangeIndex];\n this.value = chunk.value[this.rangeIndex];\n this.setRangeIndex(this.rangeIndex + 1);\n if (this.minPoint < 0 || this.value.point && this.to - this.from >= this.minPoint)\n break;\n }\n }\n }\n setRangeIndex(index) {\n if (index == this.layer.chunk[this.chunkIndex].value.length) {\n this.chunkIndex++;\n if (this.skip) {\n while (this.chunkIndex < this.layer.chunk.length && this.skip.has(this.layer.chunk[this.chunkIndex]))\n this.chunkIndex++;\n }\n this.rangeIndex = 0;\n }\n else {\n this.rangeIndex = index;\n }\n }\n nextChunk() {\n this.chunkIndex++;\n this.rangeIndex = 0;\n this.next();\n }\n compare(other) {\n return this.from - other.from || this.startSide - other.startSide || this.rank - other.rank ||\n this.to - other.to || this.endSide - other.endSide;\n }\n}\nclass HeapCursor {\n constructor(heap) {\n this.heap = heap;\n }\n static from(sets, skip = null, minPoint = -1) {\n let heap = [];\n for (let i = 0; i < sets.length; i++) {\n for (let cur = sets[i]; !cur.isEmpty; cur = cur.nextLayer) {\n if (cur.maxPoint >= minPoint)\n heap.push(new LayerCursor(cur, skip, minPoint, i));\n }\n }\n return heap.length == 1 ? heap[0] : new HeapCursor(heap);\n }\n get startSide() { return this.value ? this.value.startSide : 0; }\n goto(pos, side = -1000000000 /* C.Far */) {\n for (let cur of this.heap)\n cur.goto(pos, side);\n for (let i = this.heap.length >> 1; i >= 0; i--)\n heapBubble(this.heap, i);\n this.next();\n return this;\n }\n forward(pos, side) {\n for (let cur of this.heap)\n cur.forward(pos, side);\n for (let i = this.heap.length >> 1; i >= 0; i--)\n heapBubble(this.heap, i);\n if ((this.to - pos || this.value.endSide - side) < 0)\n this.next();\n }\n next() {\n if (this.heap.length == 0) {\n this.from = this.to = 1000000000 /* C.Far */;\n this.value = null;\n this.rank = -1;\n }\n else {\n let top = this.heap[0];\n this.from = top.from;\n this.to = top.to;\n this.value = top.value;\n this.rank = top.rank;\n if (top.value)\n top.next();\n heapBubble(this.heap, 0);\n }\n }\n}\nfunction heapBubble(heap, index) {\n for (let cur = heap[index];;) {\n let childIndex = (index << 1) + 1;\n if (childIndex >= heap.length)\n break;\n let child = heap[childIndex];\n if (childIndex + 1 < heap.length && child.compare(heap[childIndex + 1]) >= 0) {\n child = heap[childIndex + 1];\n childIndex++;\n }\n if (cur.compare(child) < 0)\n break;\n heap[childIndex] = cur;\n heap[index] = child;\n index = childIndex;\n }\n}\nclass SpanCursor {\n constructor(sets, skip, minPoint) {\n this.minPoint = minPoint;\n this.active = [];\n this.activeTo = [];\n this.activeRank = [];\n this.minActive = -1;\n // A currently active point range, if any\n this.point = null;\n this.pointFrom = 0;\n this.pointRank = 0;\n this.to = -1000000000 /* C.Far */;\n this.endSide = 0;\n // The amount of open active ranges at the start of the iterator.\n // Not including points.\n this.openStart = -1;\n this.cursor = HeapCursor.from(sets, skip, minPoint);\n }\n goto(pos, side = -1000000000 /* C.Far */) {\n this.cursor.goto(pos, side);\n this.active.length = this.activeTo.length = this.activeRank.length = 0;\n this.minActive = -1;\n this.to = pos;\n this.endSide = side;\n this.openStart = -1;\n this.next();\n return this;\n }\n forward(pos, side) {\n while (this.minActive > -1 && (this.activeTo[this.minActive] - pos || this.active[this.minActive].endSide - side) < 0)\n this.removeActive(this.minActive);\n this.cursor.forward(pos, side);\n }\n removeActive(index) {\n remove(this.active, index);\n remove(this.activeTo, index);\n remove(this.activeRank, index);\n this.minActive = findMinIndex(this.active, this.activeTo);\n }\n addActive(trackOpen) {\n let i = 0, { value, to, rank } = this.cursor;\n // Organize active marks by rank first, then by size\n while (i < this.activeRank.length && (rank - this.activeRank[i] || to - this.activeTo[i]) > 0)\n i++;\n insert(this.active, i, value);\n insert(this.activeTo, i, to);\n insert(this.activeRank, i, rank);\n if (trackOpen)\n insert(trackOpen, i, this.cursor.from);\n this.minActive = findMinIndex(this.active, this.activeTo);\n }\n // After calling this, if `this.point` != null, the next range is a\n // point. Otherwise, it's a regular range, covered by `this.active`.\n next() {\n let from = this.to, wasPoint = this.point;\n this.point = null;\n let trackOpen = this.openStart < 0 ? [] : null;\n for (;;) {\n let a = this.minActive;\n if (a > -1 && (this.activeTo[a] - this.cursor.from || this.active[a].endSide - this.cursor.startSide) < 0) {\n if (this.activeTo[a] > from) {\n this.to = this.activeTo[a];\n this.endSide = this.active[a].endSide;\n break;\n }\n this.removeActive(a);\n if (trackOpen)\n remove(trackOpen, a);\n }\n else if (!this.cursor.value) {\n this.to = this.endSide = 1000000000 /* C.Far */;\n break;\n }\n else if (this.cursor.from > from) {\n this.to = this.cursor.from;\n this.endSide = this.cursor.startSide;\n break;\n }\n else {\n let nextVal = this.cursor.value;\n if (!nextVal.point) { // Opening a range\n this.addActive(trackOpen);\n this.cursor.next();\n }\n else if (wasPoint && this.cursor.to == this.to && this.cursor.from < this.cursor.to) {\n // Ignore any non-empty points that end precisely at the end of the prev point\n this.cursor.next();\n }\n else { // New point\n this.point = nextVal;\n this.pointFrom = this.cursor.from;\n this.pointRank = this.cursor.rank;\n this.to = this.cursor.to;\n this.endSide = nextVal.endSide;\n this.cursor.next();\n this.forward(this.to, this.endSide);\n break;\n }\n }\n }\n if (trackOpen) {\n this.openStart = 0;\n for (let i = trackOpen.length - 1; i >= 0 && trackOpen[i] < from; i--)\n this.openStart++;\n }\n }\n activeForPoint(to) {\n if (!this.active.length)\n return this.active;\n let active = [];\n for (let i = this.active.length - 1; i >= 0; i--) {\n if (this.activeRank[i] < this.pointRank)\n break;\n if (this.activeTo[i] > to || this.activeTo[i] == to && this.active[i].endSide >= this.point.endSide)\n active.push(this.active[i]);\n }\n return active.reverse();\n }\n openEnd(to) {\n let open = 0;\n for (let i = this.activeTo.length - 1; i >= 0 && this.activeTo[i] > to; i--)\n open++;\n return open;\n }\n}\nfunction compare(a, startA, b, startB, length, comparator) {\n a.goto(startA);\n b.goto(startB);\n let endB = startB + length;\n let pos = startB, dPos = startB - startA;\n let bounds = !!comparator.boundChange;\n for (let boundChange = false;;) {\n let dEnd = (a.to + dPos) - b.to, diff = dEnd || a.endSide - b.endSide;\n let end = diff < 0 ? a.to + dPos : b.to, clipEnd = Math.min(end, endB);\n let point = a.point || b.point;\n if (point) {\n if (!(a.point && b.point && cmpVal(a.point, b.point) &&\n sameValues(a.activeForPoint(a.to), b.activeForPoint(b.to))))\n comparator.comparePoint(pos, clipEnd, a.point, b.point);\n boundChange = false;\n }\n else {\n if (boundChange)\n comparator.boundChange(pos);\n if (clipEnd > pos && !sameValues(a.active, b.active))\n comparator.compareRange(pos, clipEnd, a.active, b.active);\n if (bounds && clipEnd < endB && (dEnd || a.openEnd(end) != b.openEnd(end)))\n boundChange = true;\n }\n if (end > endB)\n break;\n pos = end;\n if (diff <= 0)\n a.next();\n if (diff >= 0)\n b.next();\n }\n}\nfunction sameValues(a, b) {\n if (a.length != b.length)\n return false;\n for (let i = 0; i < a.length; i++)\n if (a[i] != b[i] && !cmpVal(a[i], b[i]))\n return false;\n return true;\n}\nfunction remove(array, index) {\n for (let i = index, e = array.length - 1; i < e; i++)\n array[i] = array[i + 1];\n array.pop();\n}\nfunction insert(array, index, value) {\n for (let i = array.length - 1; i >= index; i--)\n array[i + 1] = array[i];\n array[index] = value;\n}\nfunction findMinIndex(value, array) {\n let found = -1, foundPos = 1000000000 /* C.Far */;\n for (let i = 0; i < array.length; i++)\n if ((array[i] - foundPos || value[i].endSide - value[found].endSide) < 0) {\n found = i;\n foundPos = array[i];\n }\n return found;\n}\n\n/**\nCount the column position at the given offset into the string,\ntaking extending characters and tab size into account.\n*/\nfunction countColumn(string, tabSize, to = string.length) {\n let n = 0;\n for (let i = 0; i < to && i < string.length;) {\n if (string.charCodeAt(i) == 9) {\n n += tabSize - (n % tabSize);\n i++;\n }\n else {\n n++;\n i = findClusterBreak(string, i);\n }\n }\n return n;\n}\n/**\nFind the offset that corresponds to the given column position in a\nstring, taking extending characters and tab size into account. By\ndefault, the string length is returned when it is too short to\nreach the column. Pass `strict` true to make it return -1 in that\nsituation.\n*/\nfunction findColumn(string, col, tabSize, strict) {\n for (let i = 0, n = 0;;) {\n if (n >= col)\n return i;\n if (i == string.length)\n break;\n n += string.charCodeAt(i) == 9 ? tabSize - (n % tabSize) : 1;\n i = findClusterBreak(string, i);\n }\n return strict === true ? -1 : string.length;\n}\n\nexport { Annotation, AnnotationType, ChangeDesc, ChangeSet, CharCategory, Compartment, EditorSelection, EditorState, Facet, Line, MapMode, Prec, Range, RangeSet, RangeSetBuilder, RangeValue, SelectionRange, StateEffect, StateEffectType, StateField, Text, Transaction, codePointAt, codePointSize, combineConfig, countColumn, findClusterBreak, findColumn, fromCodePoint };\n", "const C = \"\\u037c\"\nconst COUNT = typeof Symbol == \"undefined\" ? \"__\" + C : Symbol.for(C)\nconst SET = typeof Symbol == \"undefined\" ? \"__styleSet\" + Math.floor(Math.random() * 1e8) : Symbol(\"styleSet\")\nconst top = typeof globalThis != \"undefined\" ? globalThis : typeof window != \"undefined\" ? window : {}\n\n// :: - Style modules encapsulate a set of CSS rules defined from\n// JavaScript. Their definitions are only available in a given DOM\n// root after it has been _mounted_ there with `StyleModule.mount`.\n//\n// Style modules should be created once and stored somewhere, as\n// opposed to re-creating them every time you need them. The amount of\n// CSS rules generated for a given DOM root is bounded by the amount\n// of style modules that were used. So to avoid leaking rules, don't\n// create these dynamically, but treat them as one-time allocations.\nexport class StyleModule {\n // :: (Object +
    {{ template "public-navigation" . }} +
    {{ if .HTML }}
    {{ .HTML }}
    {{ else if eq .Media "image" }}{{ .Title }}{{ else if eq .Media "pdf" }}{{ else if eq .Media "audio" }}{{ else if eq .Media "video" }}{{ else if .Text }}
    {{ .Text }}
    {{ end }}
    +
    {{ end }} diff --git a/templates/pages/auth.gohtml b/templates/pages/auth.gohtml new file mode 100644 index 0000000..60e5240 --- /dev/null +++ b/templates/pages/auth.gohtml @@ -0,0 +1,18 @@ +{{ define "auth.gohtml" }} + +{{ if .Logout }}{{ T "auth.logout" }}{{ else if .MFA }}{{ T "auth.totp" }}{{ else if .Setup }}{{ T "auth.setup" }}{{ else }}{{ T "auth.login" }}{{ end }} · {{ .WikiName }} + + +{{ if .HomeWallpaperURL }}{{ end }} +{{ .WikiName }} +

    {{ if .Logout }}{{ T "auth.logout" }}{{ else if .MFA }}{{ T "auth.totp" }}{{ else if .Setup }}{{ T "auth.setup" }}{{ else }}{{ T "auth.login" }}{{ end }}

    +{{ if .Setup }}

    {{ T "auth.setup_help" }}

    {{ end }}{{ if .Error }}

    {{ .Error }}

    {{ end }} +{{ if .Logout }}
    {{ .WikiName }}
    {{ else if .MFA }}
    {{ else }}
    +{{ if .Setup }}{{ end }} + + +
    +{{ if and (not .Setup) (not .MFA) .OIDCEnabled }}
    {{ T "auth.or" }}
    {{ T "auth.login_oidc" }}{{ end }} +{{ if and (not .Setup) (not .MFA) .LDAPEnabled }}
    {{ T "auth.or" }}
    {{ end }} +{{ if and (not .Setup) (not .MFA) .MagicEnabled }}{{ if .MagicSent }}

    {{ T "auth.magic_sent" }}

    {{ else }}
    {{ end }}{{ end }} +{{ end }}
    {{ end }} diff --git a/templates/pages/auth_admin.gohtml b/templates/pages/auth_admin.gohtml new file mode 100644 index 0000000..808d087 --- /dev/null +++ b/templates/pages/auth_admin.gohtml @@ -0,0 +1,9 @@ +{{ define "auth_admin.gohtml" }} +{{ T "auth.management" }} · {{ .WikiName }} +
    +

    ← Config

    {{ T "auth.management" }}

    {{ if .Saved }}

    ✓

    {{ end }} +

    {{ T "auth.accounts" }}

    +
    +{{ range .Principals }}{{ else }}{{ end }}
    {{ T "auth.display_name" }}{{ T "auth.email" }}{{ T "config.status" }}{{ T "config.operations" }}
    {{ .DisplayName }}{{ .Email }}{{ .State }}
    —
    +

    {{ T "auth.sessions" }}

    {{ range .Sessions }}{{ else }}{{ end }}
    {{ T "auth.account" }}{{ T "auth.auth_time" }}{{ T "auth.expires" }}MFA
    {{ .DisplayName }}{{ .AuthTimeMS }}{{ .ExpiresAtMS }}{{ .MFALevel }}
    —
    +
    {{ end }} diff --git a/templates/pages/browser.gohtml b/templates/pages/browser.gohtml index 00c76b9..6d37cdb 100644 --- a/templates/pages/browser.gohtml +++ b/templates/pages/browser.gohtml @@ -6,16 +6,14 @@ Browser - - + + + + +{{/* Dialogs live outside tables/panels so dense-row rules and hidden panels cannot affect them. */}} +{{ range .Domains }} +{{ $domain := . }}{{ $managed := index $.CampusManaged .CampusUUID }}{{ $entry := index $.DomainEntries .UUID }} + +

    {{ .Title }} · {{ T "periodical.entry_settings" }}

    +
    +
    + +
    + + + + + + +
    +

    {{ T "periodical.federation_help" }}

    +{{ if gt (index $.CampusLegacyPeers .CampusUUID) 0 }}

    {{ T "periodical.capability_required" }}

    {{ end }} +{{ if $managed }}

    {{ T "periodical.controlled" }}

    {{ end }} +
    +

    {{ T "periodical.projection_help" }}

    +{{ range $kind := $.PeriodicalKinds }} +{{ $projection := index $.PeriodicalProjections (printf "%s|%s" $domain.UUID $kind) }} +
    + +
    +{{ T (printf "periodical.%s" $kind) }} + + + +
    +{{ end }} +
    +
    +{{ end }} + {{ end }} diff --git a/templates/pages/editor.gohtml b/templates/pages/editor.gohtml index 4cc974b..468dc8f 100644 --- a/templates/pages/editor.gohtml +++ b/templates/pages/editor.gohtml @@ -1,37 +1,40 @@ {{ define "editor.gohtml" }} - + + {{ .Title }} + + @@ -44,97 +47,139 @@ {{ .WikiName }} - - - - -
    - -
    -
    -
    -{{ .Path }} -
    + + + + + + + + + + + + + + + + + + + + + + + + +
    +{{ if ne .EditType "code" }} - -
    +{{ end }} - - - - -History - - -
    -
    +{{ template "auth-menu" . }} + +
    + +
    @@ -149,6 +194,7 @@ Delete
    @@ -194,48 +240,30 @@ Ln 1, Col 1 value="{{ .EditType }}" > + + + + + +
    - - -

    Select Document Format

    - -
    - - - - - -
    - -
    - - - -
    -
    - - + + - + +{{ if .HomeWallpaperURL }}{{ end }}
    + -
    +{{ template "auth-menu" . }}
    +{{ template "home-bookmarks" . }}
    +
    {{ .RenderedHTML }} @@ -41,6 +58,28 @@
    + + {{ end }} diff --git a/templates/pages/import.gohtml b/templates/pages/import.gohtml new file mode 100644 index 0000000..f635b3c --- /dev/null +++ b/templates/pages/import.gohtml @@ -0,0 +1,16 @@ +{{ define "import.gohtml" }}{{ .Title }} +
    {{ T "tree.title" }}{{ template "auth-menu" . }}
    +{{ if .Session }} +

    ← {{ T "import.title" }}

    {{ .Session.ArchiveName }}

    +
    {{ T "import.status" }}
    {{ .Session.Status }}
    {{ T "import.target" }}
    {{ .Session.TargetPrefix }}
    {{ T "import.files" }}
    {{ .Session.TotalFiles }} (Markdown: {{ .Session.MarkdownFiles }})
    {{ if .Session.Error }}

    {{ .Session.Error }}

    {{ end }} +{{ if or (eq .Session.Status "ready") (eq .Session.Status "failed") }} +{{ if eq .Session.Status "failed" }}

    {{ T "import.retry_pending" }}: {{ len .Items }}

    {{ end }} +

    {{ T "import.preview_help" }}

    {{ if eq .Session.Status "failed" }}{{ end }}
    +
    {{ range .Items }}{{ end }}
    ✓#{{ T "import.source" }}PathTypeQuartierStreetSpot{{ T "import.confidence" }}
    {{ .Sequence }}{{ .SourcePath }}{{ .ContentType }}{{ printf "%.0f%%" (mulFloat .Confidence 100) }}
    +{{ else if or (eq .Session.Status "queued") (eq .Session.Status "analyzing") (eq .Session.Status "queued_import") (eq .Session.Status "importing") }}

    {{ T "import.analyzing" }}

    +{{ else if eq .Session.Status "completed" }}

    {{ T "import.completed" }}

    +{{ else if eq .Session.Status "rolled_back" }}

    {{ T "import.rolled_back" }}

    {{ end }} +{{ else }} +

    {{ T "import.title" }}

    {{ T "import.help" }}

    {{ T "import.sessions" }}

      {{ range .Sessions }}
    • {{ .ArchiveName }} — {{ .Status }} ({{ .TotalFiles }})
    • {{ else }}
    • —
    • {{ end }}
    +{{ end }}
    +{{ end }} diff --git a/templates/pages/link_manager.gohtml b/templates/pages/link_manager.gohtml index 3b3fdbd..ff4af00 100644 --- a/templates/pages/link_manager.gohtml +++ b/templates/pages/link_manager.gohtml @@ -4,8 +4,8 @@ {{ T "link.title" }} - - + + @@ -25,7 +25,7 @@ {{ end }} - +{{ template "auth-menu" . }}
    diff --git a/templates/pages/links.gohtml b/templates/pages/links.gohtml index 84ea01b..5e2a903 100644 --- a/templates/pages/links.gohtml +++ b/templates/pages/links.gohtml @@ -10,12 +10,12 @@ @@ -38,7 +38,7 @@ - +{{ template "auth-menu" . }}
    @@ -85,7 +85,7 @@
    - + diff --git a/templates/pages/markdown_view.gohtml b/templates/pages/markdown_view.gohtml index 3453036..b546cfe 100644 --- a/templates/pages/markdown_view.gohtml +++ b/templates/pages/markdown_view.gohtml @@ -6,7 +6,7 @@ Markdown - {{ .Path }} - + @@ -83,7 +83,7 @@ {{ .Label }} {{ end }} - +{{ template "auth-menu" . }}
    diff --git a/templates/pages/not_found.gohtml b/templates/pages/not_found.gohtml new file mode 100644 index 0000000..e13e317 --- /dev/null +++ b/templates/pages/not_found.gohtml @@ -0,0 +1,8 @@ +{{ define "not_found.gohtml" }} +404 · {{ .WikiName }} +
    {{ template "auth-menu" . }}
    +

    404

    {{ T "not_found.title" }}

    {{ T "not_found.message" }}

    {{ .MissingPath }}

    +

    {{ T "not_found.create" }}

    +{{ if .Suggestions }}

    {{ T "not_found.suggestions" }}

    {{ else if .SuggestionQuery }}

    {{ T "not_found.no_suggestions" }}

    {{ end }} +
    +{{ end }} diff --git a/templates/pages/notifications.gohtml b/templates/pages/notifications.gohtml new file mode 100644 index 0000000..9e43a55 --- /dev/null +++ b/templates/pages/notifications.gohtml @@ -0,0 +1 @@ +{{ define "notifications.gohtml" }}{{ .Title }} · {{ .WikiName }}
    {{ template "auth-menu" . }}
    {{ if .Notification }}

    Notification detail

    ← Back

    {{ if .Broadcast }}{{ .Broadcast.Title }}{{ else }}{{ .Notification.Message }}{{ end }}

    {{ if .Broadcast }}

    {{ .Broadcast.Body }}

    {{ end }}{{ if .Notification.Href }}

    Open related item

    {{ end }}
    {{ else }}

    Notifications

    {{ end }}
    {{ end }} diff --git a/templates/pages/object_editor.gohtml b/templates/pages/object_editor.gohtml index 263a7d7..de9cbe9 100644 --- a/templates/pages/object_editor.gohtml +++ b/templates/pages/object_editor.gohtml @@ -4,8 +4,8 @@ {{ .Title }} - - + + @@ -25,7 +25,7 @@ {{ end }} - +{{ template "auth-menu" . }}
    @@ -40,7 +40,7 @@ Object: @@ -73,11 +73,17 @@ Save value="html" > + +
    - + diff --git a/templates/pages/object_view.gohtml b/templates/pages/object_view.gohtml index 18ece74..f4dc67f 100644 --- a/templates/pages/object_view.gohtml +++ b/templates/pages/object_view.gohtml @@ -4,8 +4,8 @@ {{ .Title }} - - + + @@ -25,7 +25,7 @@ {{ end }} - +{{ template "auth-menu" . }}
    diff --git a/templates/pages/page.gohtml b/templates/pages/page.gohtml index 2b7acfd..ccd2c62 100644 --- a/templates/pages/page.gohtml +++ b/templates/pages/page.gohtml @@ -4,15 +4,26 @@ -{{ .Name }} - - +{{ if .SocialMetadata }}{{ if .SocialMetadata.Title }}{{ .SocialMetadata.Title }}{{ else }}{{ .Title }}{{ end }}{{ else }}{{ .Title }}{{ end }} · {{ .WikiName }} +{{ template "social-metadata" . }} + + + + +{{ if .IsHome }}{{ end }} + + +{{ if eq .ContentView.Kind "code" }} + + +{{ end }} - + +{{ if and .IsHome .HomeWallpaperURL }}{{ end }}
    @@ -20,23 +31,28 @@ {{ .WikiName }} + + -
    +{{ template "auth-menu" . }}
    +{{ if .IsHome }}{{ template "home-bookmarks" . }}{{ end }}
    + + +{{ if .CitySpots }}{{ end }} +{{ if .GovernanceEndpoint }}{{ template "city-governance" . }}{{ end }} +
    +{{ if eq .ContentView.Kind "html" }} {{ .RenderedHTML }} +{{ else if eq .ContentView.Kind "excalidraw" }} +{{ if .ContentView.ExcalidrawValid }} +
    + + +
    +{{ else }} +

    {{ .ContentView.ParseError }}

    +
    {{ .ContentView.Text }}
    +{{ end }} +{{ else if eq .ContentView.Kind "csv" }} +
    + +{{ range $rowIndex, $row := .ContentView.CSVRows }} +{{ if eq $rowIndex 0 }}{{ range $row }}{{ end }}{{ else }}{{ range $row }}{{ end }}{{ end }} +{{ end }} +{{ if .ContentView.CSVRows }}{{ end }} +
    {{ . }}
    {{ . }}
    +
    +{{ if .ContentView.ParseError }}

    {{ .ContentView.ParseError }}

    {{ end }} +{{ if .ContentView.CSVTruncated }}

    {{ T "viewer.csv_truncated" }}

    {{ end }} +{{ else if eq .ContentView.Kind "json" }} +
    +
    Loading…
    +
    +
    +{{ else if eq .ContentView.Kind "code" }} +
    + +
    + +{{ if .ContentView.Windowed }}
    Loading…
    {{ end }} +
    +{{ else if eq .ContentView.Kind "image" }} + + + +{{ .ContentView.Filename }} + +{{ else if eq .ContentView.Kind "audio" }} +
    + +
    +0:00 / 0:00 + +
    +
    +{{ else if eq .ContentView.Kind "video" }} +
    + +
    +0:00 / 0:00 + + + +
    +
    +{{ else if eq .ContentView.Kind "pdf" }} +
    + +1 / {{ if .ContentView.PDFPages }}{{ .ContentView.PDFPages }}{{ else }}?{{ end }} +{{ if eq .ContentView.MetadataStatus "pending" }}{{ T "viewer.metadata_pending" }}{{ else if eq .ContentView.MetadataStatus "failed" }}{{ T "viewer.metadata_failed" }}{{ else if eq .ContentView.MetadataStatus "unavailable" }}{{ T "viewer.metadata_unavailable" }}{{ end }} + + +{{ T "viewer.open_pdf" }} +{{ T "viewer.download" }} +
    +
    +{{ .ContentView.Filename }} +
    +{{ else if eq .ContentView.Kind "archive" }} +
    + +

    {{ if eq .ContentView.MetadataStatus "pending" }}{{ T "viewer.metadata_pending" }}{{ else if eq .ContentView.MetadataStatus "failed" }}{{ T "viewer.metadata_failed" }}{{ else if eq .ContentView.MetadataStatus "unavailable" }}{{ T "viewer.metadata_unavailable" }}{{ else if .ContentView.ParseError }}{{ .ContentView.ParseError }}{{ else if .ContentView.ArchiveTruncated }}{{ len .ContentView.ArchiveEntries }} {{ T "viewer.entry" }} · {{ T "viewer.archive_truncated" }}{{ end }}

    + +{{ if .ComicMode }} +
    +
    + + + + + +
    +
    +{{ range .ContentView.ArchiveEntries }} +{{ if .IsImage }}{{ end }} +{{ end }} +
    +
    +{{ else }} + + + +{{ range .ContentView.ArchiveEntries }} + +{{ end }} + +
    {{ T "viewer.entry" }}{{ T "viewer.size" }}
    {{ if .IsDir }}{{ .Name }}{{ else }}{{ .Name }}{{ end }}{{ .Size }}
    +{{ end }} +
    +{{ else if eq .ContentView.Kind "email" }} + +{{ else if eq .ContentView.Kind "metadata" }} + +{{ else }} +
    +

    {{ .ContentView.Filename }}

    +{{ T "viewer.download" }} +
    +{{ end }}
    + + +{{ if eq .ContentView.Kind "code" }} + +{{ end }} + {{ end }} diff --git a/templates/pages/periodical.gohtml b/templates/pages/periodical.gohtml new file mode 100644 index 0000000..8294faa --- /dev/null +++ b/templates/pages/periodical.gohtml @@ -0,0 +1,9 @@ +{{ define "periodical.gohtml" }}{{ .Title }} · {{ .WikiName }} +{{ if .HomeWallpaperURL }}{{ end }}
    {{ .WikiName }}{{ if not .Public }}{{ template "auth-menu" . }}{{ end }}

    {{ .Title }}

    {{ if not .Public }}

    {{ T "periodical.scope_help" }}

    {{ end }} +{{ if not .Enabled }}

    {{ T "periodical.disabled" }}

    {{ else }} + +
    {{ range .Entries }}{{ else }}{{ end }}
    {{ T "periodical.date" }}{{ T "periodical.title" }}{{ T "config.actions" }}

    {{ .Title }}

    {{ if .CanEdit }}{{ end }}
    {{ T "periodical.empty" }}
    +
    +{{ if not .Public }}

    {{ T "periodical.compose" }}

    {{ T "periodical.prefix" }}: {{ .Prefix }}

    {{ T "periodical.compose_help" }}

    +

    {{ T "periodical.plan" }}

    {{ T "periodical.prefix" }}: {{ .Prefix }}

    +

    {{ T "periodical.register" }}

    {{ T "periodical.registration_help" }}

    {{ end }}{{ end }}
    {{ end }} diff --git a/templates/pages/periodical_new.gohtml b/templates/pages/periodical_new.gohtml new file mode 100644 index 0000000..0e283a4 --- /dev/null +++ b/templates/pages/periodical_new.gohtml @@ -0,0 +1,21 @@ +{{ define "periodical_new.gohtml" }} +{{ .Title }} · {{ .WikiName }} + +
    {{ .WikiName }}{{ template "auth-menu" . }}
    +

    {{ .Title }}

    {{ T "periodical.back_to_list" }}
    +
    +
    +

    {{ T "periodical.prefix" }}: {{ .Prefix }}

    +
    MODE{{ .EditType }}Ln 1, Col 1
    + +

    {{ T "periodical.compose_help" }}

    +
    {{ end }} diff --git a/templates/pages/preview.gohtml b/templates/pages/preview.gohtml index 81b7d06..ed2b17c 100644 --- a/templates/pages/preview.gohtml +++ b/templates/pages/preview.gohtml @@ -7,7 +7,9 @@ Preview + + + + + + +
    + +{{ if eq .ContentView.Kind "html" }} +
    {{ .RenderedHTML }}
    +{{ else if eq .ContentView.Kind "code" }} + +{{ if .ContentView.Windowed }}

    {{ T "viewer.print_truncated" }}

    {{ end }} +{{ else if eq .ContentView.Kind "csv" }} +{{ range $rowIndex, $row := .ContentView.CSVRows }}{{ range $row }}{{ if eq $rowIndex 0 }}{{ else }}{{ end }}{{ end }}{{ end }} +{{ if .ContentView.CSVTruncated }}

    {{ T "viewer.csv_truncated" }}

    {{ end }} +{{ else if eq .ContentView.Kind "image" }} +{{ .ContentView.Filename }} +{{ else if eq .ContentView.Kind "pdf" }} + +{{ else if eq .ContentView.Kind "excalidraw" }} +{{ if .ContentView.ExcalidrawValid }} +
    + + +
    +{{ else }}

    {{ .ContentView.ParseError }}

    {{ end }} +{{ else if eq .ContentView.Kind "archive" }} +
    +

    {{ if eq .ContentView.MetadataStatus "pending" }}{{ T "viewer.metadata_pending" }}{{ else if eq .ContentView.MetadataStatus "failed" }}{{ T "viewer.metadata_failed" }}{{ else if eq .ContentView.MetadataStatus "unavailable" }}{{ T "viewer.metadata_unavailable" }}{{ else }}{{ .ContentView.ParseError }}{{ end }}

    +{{ range .ContentView.ArchiveEntries }}{{ end }} +
    +{{ else if or (eq .ContentView.Kind "audio") (eq .ContentView.Kind "video") }} + +{{ else if or (eq .ContentView.Kind "email") (eq .ContentView.Kind "metadata") }} +
    {{ range .ContentView.Metadata }}
    {{ .Name }}
    {{ .Value }}
    {{ end }}
    {{ if .ContentView.Text }}{{ end }} +{{ else }} +

    {{ .ContentView.ParseError }}

    {{ T "viewer.download" }} +{{ end }} +
    + + +{{ end }} diff --git a/templates/pages/profile.gohtml b/templates/pages/profile.gohtml new file mode 100644 index 0000000..31ef717 --- /dev/null +++ b/templates/pages/profile.gohtml @@ -0,0 +1,23 @@ +{{ define "profile.gohtml" }}{{ T "auth.profile" }} · {{ .WikiName }} +
    {{ template "auth-menu" . }}
    +
    {{ if .Principal.HasAvatar }}{{ else }}{{ printf "%.1s" .Principal.DisplayName }}{{ end }}

    {{ .Principal.DisplayName }}{{ if and .AuthUser (eq .AuthUser.UUID .Principal.UUID) }} ✎{{ end }}

    {{ .Handle }}

    + +{{ if .Editing }}

    {{ T "auth.profile_edit" }}

    {{ if .Saved }}

    ✓ {{ T "config.saved" }}

    {{ end }} +
    +

    {{ T "auth.security" }}

    {{ if .TOTPStatus }}

    {{ T (printf "auth.totp_%s" .TOTPStatus) }}

    {{ end }} +{{ if .TOTPEnabled }}

    {{ T "auth.totp_enabled" }}

    +{{ else if .TOTPSecret }}

    {{ T "auth.totp_scan_help" }}

    {{ .TOTPSecret }}

    otpauth URI{{ .TOTPUri }}
    +{{ else }}
    {{ end }} +

    {{ T "auth.user_space_visibility" }}

    {{ if .VisibilitySaved }}

    ✓ {{ T "config.saved" }}

    {{ end }} +

    {{ T "auth.user_space_visibility_help" }}

    {{ if not .UserSpacePolicy.DomainAllowsPublic }}

    {{ T "auth.user_space_public_ceiling" }}

    {{ end }} +
    +
    + + + + +
    +{{ if .UserSpacePages }}
    {{ T "auth.user_space_overrides" }}

    {{ T "auth.user_space_overrides_help" }}

    {{ range .UserSpacePages }}{{ end }}
    Path{{ T "auth.visibility" }}
    {{ .Path }}
    {{ end }} +
    +

    {{ T "auth.edit_user_wiki" }}

    {{ else }}
    {{ .RenderedHTML }}
    {{ if .PublicHasChildren }}

    {{ T "auth.user_wiki_children" }} →

    {{ end }}{{ end }} +
    {{ end }} diff --git a/templates/pages/public_periodical.gohtml b/templates/pages/public_periodical.gohtml new file mode 100644 index 0000000..ccc3af4 --- /dev/null +++ b/templates/pages/public_periodical.gohtml @@ -0,0 +1,17 @@ +{{ define "public_periodical.gohtml" }} + +{{ .Title }}{{ if .Article }} · {{ .SiteTitle }}{{ end }} + + +{{ if .Canonical }}{{ end }} +
    +
    {{ .SiteTitle }}
    +{{ if not .Article }}

    {{ .SiteTitle }}

    {{ end }} +
    +{{ if .Article }}

    {{ .Article.Title }}

    {{ if .HTML }}{{ .HTML }}{{ else }}
    {{ .Text }}
    {{ end }}
    + +{{ else }}{{ range .Entries }}{{ else }}{{ end }}
    {{ T "periodical.date" }}{{ T "periodical.title" }}

    {{ .Title }}

    {{ T "periodical.empty" }}
    {{ end }} +
    {{ end }} diff --git a/templates/pages/public_tree.gohtml b/templates/pages/public_tree.gohtml new file mode 100644 index 0000000..0c22669 --- /dev/null +++ b/templates/pages/public_tree.gohtml @@ -0,0 +1,6 @@ +{{ define "public_tree.gohtml" }}{{ T "tree.title" }} · {{ .WikiName }} + +
    {{ template "public-navigation" . }}

    {{ if .Directory }}{{ T "public.navigation.browse" }}{{ else }}{{ T "tree.title" }}{{ end }}

    {{ if .Directory }}{{ T "tree.title" }}{{ else }}{{ T "public.navigation.browse" }}{{ end }}

    {{ T "public.navigation.only_published" }}

    +{{ if .Directory }}{{ if .PublicPreviousBatch }}← {{ T "public.navigation.previous_batch" }}{{ end }}
    {{ .PublicChildren }}
    +{{ else }} +{{ end }}
    {{ end }} diff --git a/templates/pages/revision_diff.gohtml b/templates/pages/revision_diff.gohtml index 385ef52..46f191d 100644 --- a/templates/pages/revision_diff.gohtml +++ b/templates/pages/revision_diff.gohtml @@ -7,8 +7,8 @@ {{ .Title }} - - + + @@ -27,12 +27,12 @@
    Before: -{{ .Before.Hash }} +{{ .Before.UUID }}
    After: -{{ .After.Hash }} +{{ .After.UUID }}
    diff --git a/templates/pages/revision_view.gohtml b/templates/pages/revision_view.gohtml index a127d5b..f2c1956 100644 --- a/templates/pages/revision_view.gohtml +++ b/templates/pages/revision_view.gohtml @@ -10,17 +10,19 @@ + + @@ -41,7 +43,7 @@ History - +{{ template "auth-menu" . }}
    @@ -52,8 +54,28 @@ History
    -Revision Hash: -{{ .Revision.Hash }} +Revision UUID: +{{ .Revision.UUID }} +
    + +
    +Document SHA-256: +{{ .Revision.DocumentHash }} +
    + +
    +Language: +{{ .Revision.Language }} +
    + +
    +Content-Type: +{{ .Revision.ContentType }} +
    + +
    +Filename: +{{ if .Revision.Filename }}{{ .Revision.Filename }}{{ else }}—{{ end }}
    @@ -80,7 +102,47 @@ Created:

    Rendered

    +{{ if eq .ContentView.Kind "html" }} {{ .RenderedHTML }} +{{ else if eq .ContentView.Kind "excalidraw" }} +{{ if .ContentView.ExcalidrawValid }} +
    + + +
    +{{ else }}

    {{ .ContentView.ParseError }}

    {{ .ContentView.Text }}
    {{ end }} +{{ else if eq .ContentView.Kind "code" }} +
    {{ .ContentView.Text }}
    +{{ else if eq .ContentView.Kind "image" }} + + + +{{ .ContentView.Filename }} + +{{ else if eq .ContentView.Kind "audio" }} +
    + +
    0:00 / 0:00
    +
    +{{ else if eq .ContentView.Kind "video" }} +
    + +
    0:00 / 0:00
    +
    +{{ else if eq .ContentView.Kind "pdf" }} + +{{ else }} +

    + {{ .Revision.Filename }} · {{ .Revision.ContentType }} + Download +

    +{{ end }}
    diff --git a/templates/pages/revisions.gohtml b/templates/pages/revisions.gohtml index 9fe281d..e239f40 100644 --- a/templates/pages/revisions.gohtml +++ b/templates/pages/revisions.gohtml @@ -1,21 +1,22 @@ {{ define "revisions.gohtml" }} - + -{{ .Title }} + +{{ T "history.title" }} · {{ .WikiName }} @@ -33,17 +34,17 @@ - +{{ template "auth-menu" . }}
    -

    Revision History

    +

    {{ T "history.title" }}

    Object UUID: @@ -61,11 +62,12 @@ Object UUID:

    -{{ $r.Hash }} +{{ $r.UUID }}
    {{ $r.CreatedAt }} + · {{ $r.Language }}
    @@ -78,9 +80,9 @@ Object UUID: -View +{{ T "history.view" }} {{ if lt (add $i 1) (len $.Revisions) }} @@ -89,9 +91,9 @@ View -Diff Prev +{{ T "history.diff_previous" }} {{ end }} @@ -104,6 +106,10 @@ Diff Prev
    +
    diff --git a/templates/pages/search.gohtml b/templates/pages/search.gohtml new file mode 100644 index 0000000..354818c --- /dev/null +++ b/templates/pages/search.gohtml @@ -0,0 +1,140 @@ +{{ define "search.gohtml" }} + + + + + +{{ T "search.title" }} · {{ .WikiName }} + + + + + + + + +
    + + +{{ template "auth-menu" . }}
    +
    + +

    {{ T "search.scope" }} {{ .Scope }}

    +
    +{{ T "search.options" }}{{ if .Filters.Applied }}{{ T "search.options_active" }}{{ end }} +
    + + + + + + +

    {{ T "search.city_filter_hint" }}

    +
    +
    +{{ if .SearchPerformed }} +{{ if .SearchError }} + +{{ else }} +

    {{ T "search.bounded_hint" }}

    +{{ if .CityResults }} +
    +

    {{ T "search.city_results" }}

    +{{ if .CityLimitReached }}

    {{ T "search.city_limit_notice" }}

    {{ end }} +
      +{{ range .CityResults }} +
    • + +
      {{ template "search-text" .PathParts }}{{ if .ContextLabel }}{{ .ContextLabel }}{{ end }}
      +{{ if .NameMatch }}{{ T "search.match_name" }}{{ end }}{{ if .PathMatch }}{{ T "search.match_path" }}{{ end }}{{ if .DescriptionMatch }}{{ T "search.match_description" }}{{ end }} +{{ if .ExcerptParts }}{{ template "search-text" .ExcerptParts }}{{ end }} +{{ if .Updated }}{{ T "search.updated" }} {{ end }} +
    • +{{ end }} +
    +
    +{{ end }} +{{ if .ResultLimitReached }}

    {{ T "search.limit_notice" }}

    {{ end }} +{{ if .Results }} +{{ if .CityResults }}

    {{ T "search.page_results" }}

    {{ end }} +
    + + + + +{{ range .Results }}{{ end }} +
    {{ T "search.name" }} / Path{{ T "search.match" }}{{ T "search.type" }}{{ T "search.updated" }}
    {{ template "search-text" .NameParts }}{{ template "search-text" .PathParts }}{{ template "search-result-context" . }}{{ .ContentType }}{{ .Updated }}
    +
    +{{ else }}{{ if not .CityResults }}

    {{ T "search.no_results" }}

    {{ end }}{{ end }} +{{ end }} +{{ end }} + +
    + + + +{{ end }} + +{{ define "search-text" }}{{ range . }}{{ if .Match }}{{ .Text }}{{ else }}{{ .Text }}{{ end }}{{ end }}{{ end }} +{{ define "search-result-context" }} +{{ if .PathMatch }}{{ T "search.match_path" }}{{ end }}{{ if .FilenameMatch }}{{ T "search.match_filename" }}{{ end }}{{ if .BodyMatch }}{{ T "search.match_body" }}{{ end }} +{{ if .ExcerptParts }}{{ template "search-text" .ExcerptParts }}{{ end }} +{{ if .ExcerptOmitted }}{{ T "search.excerpt_omitted" }}{{ end }} +{{ end }} diff --git a/templates/pages/search_home.gohtml b/templates/pages/search_home.gohtml new file mode 100644 index 0000000..fcb992d --- /dev/null +++ b/templates/pages/search_home.gohtml @@ -0,0 +1,72 @@ +{{ define "search_home.gohtml" }} + + + + + +{{ .WikiName }} +{{ template "social-metadata" . }} + + + + + +{{ if .HomeWallpaperURL }}{{ end }} +

    {{ .WikiName }}

    + +
    +{{ if eq .HomeLayout "directory" }}
    {{ end }} + +{{ if eq .HomeLayout "directory" }} + +
    + +{{ else }} +{{ template "home-bookmarks" . }} +{{ end }} +
    +{{ if .CanConfigureHome }} + + +
    + +

    {{ T "home.appearance" }}

    + +

    {{ T "home.glass_help" }}

    +
    +
    +
    + +{{ end }} +{{ if eq .HomeLayout "directory" }} + + +{{ end }} + + + +{{ end }} diff --git a/templates/pages/task_schedule.gohtml b/templates/pages/task_schedule.gohtml new file mode 100644 index 0000000..475e5d7 --- /dev/null +++ b/templates/pages/task_schedule.gohtml @@ -0,0 +1 @@ +{{ define "task_schedule.gohtml" }}{{ T "tasks.title" }} · {{ .WikiName }}
    {{ template "auth-menu" . }}

    {{ end }} diff --git a/templates/pages/tasks.gohtml b/templates/pages/tasks.gohtml new file mode 100644 index 0000000..77d506f --- /dev/null +++ b/templates/pages/tasks.gohtml @@ -0,0 +1,14 @@ +{{ define "tasks.gohtml" }} +{{ T "tasks.title" }} · {{ .WikiName }} + +
    {{ template "auth-menu" . }}
    +
    +
    +

    {{ T "tasks.title" }}

    +

    + + +

    +
    +

      +
      {{ end }} diff --git a/templates/pages/tree.gohtml b/templates/pages/tree.gohtml index abbe5c8..6387b3c 100644 --- a/templates/pages/tree.gohtml +++ b/templates/pages/tree.gohtml @@ -1,21 +1,17 @@ {{ define "tree.gohtml" }} - + -Tree +{{ T "tree.title" }} - - + + + + +{{ end }} diff --git a/templates/partials/adapter_settings.gohtml b/templates/partials/adapter_settings.gohtml new file mode 100644 index 0000000..4486498 --- /dev/null +++ b/templates/partials/adapter_settings.gohtml @@ -0,0 +1,22 @@ +{{ define "adapter-settings-fields" }} +
      + +
      {{ T "config.adapter_connection" }} + + + + + + +
      +
      {{ T "config.open_behavior" }} + +{{ if eq .Mode "editor" }}{{ end }} +
      +
      {{ T "config.content_conversion" }} + +

      {{ T "config.html_markdown_help" }}

      +
      + +
      +{{ end }} diff --git a/templates/partials/auth_menu.gohtml b/templates/partials/auth_menu.gohtml new file mode 100644 index 0000000..0d647dd --- /dev/null +++ b/templates/partials/auth_menu.gohtml @@ -0,0 +1,25 @@ +{{ define "auth-menu" }} + + + + +
      {{ T "city.map" }}↗
      +{{ if .AuthUser }}

      {{ T "notification.title" }}

      {{ end }} +{{ if .AuthUser }}{{ if .TasksEnabled }} + + +{{ end }}{{ end }} +{{ if .AuthUser }}{{ if .CalendarEnabled }} + + +{{ end }}{{ end }} + +
      +{{ if .AuthUser }} +
      {{ if .AuthUser.HasAvatar }}{{ else }}{{ printf "%.1s" .AuthUser.DisplayName }}{{ end }}{{ .AuthUser.DisplayName }} +
      {{ T "auth.profile" }}{{ if .CalendarEnabled }}{{ T "calendar.title" }}{{ end }}{{ if .TasksEnabled }}{{ T "tasks.title" }}{{ end }}{{ if .AuthIsAdmin }}{{ T "config.title" }}{{ end }}
      +{{ else }}{{ end }} +
      + + +{{ end }} diff --git a/templates/partials/bookmark_settings.gohtml b/templates/partials/bookmark_settings.gohtml new file mode 100644 index 0000000..d4be5bd --- /dev/null +++ b/templates/partials/bookmark_settings.gohtml @@ -0,0 +1,20 @@ +{{ define "bookmark-settings" }} +
      +

      {{ T "home.bookmarks" }}

      {{ T "config.bookmark_help" }}

      +
      + +{{ if .IsHome }}{{ end }} +
      + +{{ range .ManagedBookmarks }} + + + + +{{ end }} +
      {{ T "config.name" }}{{ T "config.bookmark_kind" }}{{ T "config.bookmark_target" }}{{ T "config.operations" }}
      +
      +
      +
      +
      +{{ end }} diff --git a/templates/partials/city_governance.gohtml b/templates/partials/city_governance.gohtml new file mode 100644 index 0000000..1f1c51e --- /dev/null +++ b/templates/partials/city_governance.gohtml @@ -0,0 +1,37 @@ +{{ define "city-governance" }}{{ if .GovernanceEndpoint }} + + + +

      {{ T "city.governance.title" }}

      +

      {{ T "city.governance.gate" }}

      +
      +
      + +
      {{ T "city.governance.superior" }}
      {{ T "city.governance.effective" }}
      +
        +

        {{ T "city.governance.owners" }}

          + + +
          +
          +
          +

          {{ T "city.access.title" }}

          {{ T "city.access.help" }}

          + +
          + +
          +
          +

          {{ T "city.publication.title" }}

          {{ T "city.publication.help" }}

          +

          + + +
          +

          {{ T "city.auto.title" }}

          {{ T "city.auto.help" }}

          +
          + + +

          + +{{ end }}{{ end }} diff --git a/templates/partials/home_bookmarks.gohtml b/templates/partials/home_bookmarks.gohtml new file mode 100644 index 0000000..b981e12 --- /dev/null +++ b/templates/partials/home_bookmarks.gohtml @@ -0,0 +1,26 @@ +{{ define "home-bookmarks" }} + + + +
          +{{ if .CanManageBookmarks }} +
          + +

          {{ T "config.manage_bookmarks" }}

          +{{ template "bookmark-settings" . }} +
          +{{ end }} +{{ if ne .HomeLayout "search" }} +
          +{{ range .BookmarkSections }} +

          {{ .Label }}

          + +{{ if .Source }}{{ end }} +
          +{{ else }}

          {{ T "home.bookmarks_empty" }}

          {{ end }} +
          +{{ end }} +
          +{{ end }} diff --git a/templates/partials/periodical_filters.gohtml b/templates/partials/periodical_filters.gohtml new file mode 100644 index 0000000..31188bb --- /dev/null +++ b/templates/partials/periodical_filters.gohtml @@ -0,0 +1,5 @@ +{{ define "periodical-month-controls" }} + + +{{ end }} +{{ define "periodical-reset-icon" }}{{ end }} diff --git a/templates/partials/periodical_settings.gohtml b/templates/partials/periodical_settings.gohtml new file mode 100644 index 0000000..8bd166e --- /dev/null +++ b/templates/partials/periodical_settings.gohtml @@ -0,0 +1 @@ +{{ define "periodical-settings" }}

          {{ T "periodical.scope_help" }}

          {{ end }} diff --git a/templates/partials/public_navigation.gohtml b/templates/partials/public_navigation.gohtml new file mode 100644 index 0000000..ab26792 --- /dev/null +++ b/templates/partials/public_navigation.gohtml @@ -0,0 +1,6 @@ +{{ define "public-navigation" }} + +{{ T "public.navigation.skip" }} +
          {{ .WikiName }}
          +
          +{{ end }} diff --git a/templates/partials/social_metadata.gohtml b/templates/partials/social_metadata.gohtml new file mode 100644 index 0000000..387b9a6 --- /dev/null +++ b/templates/partials/social_metadata.gohtml @@ -0,0 +1,21 @@ +{{ define "social-metadata" }}{{ with .SocialMetadata }} +{{ if .NoIndex }} +{{ else }} + + + + + + + + + + +{{ if .ImageWidth }} +{{ end }} + + + + + +{{ end }}{{ end }}{{ end }} diff --git a/templates/partials/vim_settings.gohtml b/templates/partials/vim_settings.gohtml new file mode 100644 index 0000000..ff9e4ac --- /dev/null +++ b/templates/partials/vim_settings.gohtml @@ -0,0 +1,24 @@ +{{ define "vim-settings" }} + +
          +

          {{ T "vim.help" }}

          +
          {{ T "vim.display" }} + + +
          +

          {{ T "vim.trust" }}

          +
          vimrc + + + +
          +
          {{ T "vim.colorscheme" }} + + + + +
          +
          +
          {{ T "vim.recovery" }}

          {{ T "vim.safe_help" }}

          /_/adaptor/vim/?safe=1
          +
          +{{ end }} diff --git a/tools/design-export/main.go b/tools/design-export/main.go new file mode 100644 index 0000000..21c2fef --- /dev/null +++ b/tools/design-export/main.go @@ -0,0 +1,150 @@ +// design-export renders the reviewed Japanese handbook; it never writes the DB. +package main + +import ( + "crypto/sha256" + "encoding/hex" + "encoding/json" + "flag" + "fmt" + "html" + "os" + "path/filepath" + "strings" + + xhtml "golang.org/x/net/html" + "pageswiki/internal/render" +) + +const prefix = "/lab/pageswiki-dev" + +var chapters = []string{ + "index", "principles", "address-storage", "campus-federation", "knowledge-city", + "auth-permissions", "publication", "viewer-editor", "navigation-search", + "scheduler-resources", "blog-diary", "extensions", "organizer", "tasks-tickets", + "calendar-contacts", "feeds", "mail", "html-editor", "operations", "i18n", + "roadmap", "decisions", "sources", +} + +type entry struct { + Chapter string `json:"chapter"` + Source string `json:"source"` + File string `json:"file"` + Path string `json:"path"` + Language string `json:"language"` + SourceSHA256 string `json:"source_sha256"` + HTMLSHA256 string `json:"html_sha256"` +} + +func chapterPath(id string) string { + if id == "index" { + return prefix + } + return prefix + "/" + id +} + +func digest(b []byte) string { + h := sha256.Sum256(b) + return hex.EncodeToString(h[:]) +} + +func validateLinks(body string) error { + known := map[string]bool{prefix + "/": true} + for _, id := range chapters { + known[chapterPath(id)] = true + } + n, err := xhtml.Parse(strings.NewReader(body)) + if err != nil { + return err + } + var visit func(*xhtml.Node) error + visit = func(n *xhtml.Node) error { + if n.Type == xhtml.ElementNode && n.Data == "a" { + for _, a := range n.Attr { + if a.Key != "href" { + continue + } + p := strings.SplitN(a.Val, "#", 2)[0] + if strings.HasPrefix(p, "/") && !known[p] { + return fmt.Errorf("unmapped local documentation link: %s", a.Val) + } + } + } + for c := n.FirstChild; c != nil; c = c.NextSibling { + if err := visit(c); err != nil { + return err + } + } + return nil + } + return visit(n) +} + +func export(src, dest string) error { + if dest == "" { + return fmt.Errorf("-out is required (use an empty staging directory)") + } + // Review/validate everything before producing any upload artifact. + type document struct { + entry entry + body []byte + } + var docs []document + for i, id := range chapters { + file := filepath.Join(src, id+".md") + md, err := os.ReadFile(file) + if err != nil { + return err + } + if !strings.HasPrefix(string(md), "# ") { + return fmt.Errorf("missing title: %s", file) + } + body := render.Markdown(string(md)) + if err := validateLinks(body); err != nil { + return fmt.Errorf("%s: %w", file, err) + } + nav := `` + payload := []byte(nav + "\n" + body + "\n" + nav + "\n") + docs = append(docs, document{entry{id, file, id + ".html", chapterPath(id), "ja", digest(md), digest(payload)}, payload}) + } + if err := os.MkdirAll(dest, 0700); err != nil { + return err + } + entries, err := os.ReadDir(dest) + if err != nil { + return err + } + if len(entries) != 0 { + return fmt.Errorf("staging directory must be empty") + } + var manifest []entry + for _, doc := range docs { + if err := os.WriteFile(filepath.Join(dest, doc.entry.File), doc.body, 0600); err != nil { + return err + } + manifest = append(manifest, doc.entry) + } + b, err := json.MarshalIndent(manifest, "", " ") + if err != nil { + return err + } + return os.WriteFile(filepath.Join(dest, "manifest.json"), append(b, '\n'), 0600) +} + +func main() { + src := flag.String("src", "docs/design/ja", "reviewed Markdown source directory") + out := flag.String("out", "", "empty staging directory; no database or network writes") + flag.Parse() + if err := export(*src, *out); err != nil { + fmt.Fprintln(os.Stderr, err) + os.Exit(1) + } + fmt.Printf("Rendered %d Japanese chapters; manifest: %s\n", len(chapters), filepath.Join(*out, "manifest.json")) +} diff --git a/tools/design-export/main_test.go b/tools/design-export/main_test.go new file mode 100644 index 0000000..bee85d7 --- /dev/null +++ b/tools/design-export/main_test.go @@ -0,0 +1,51 @@ +package main + +import ( + "encoding/json" + "os" + "path/filepath" + "strings" + "testing" +) + +func TestExportHandbook(t *testing.T) { + dest := t.TempDir() + if err := export("../../docs/design/ja", dest); err != nil { + t.Fatal(err) + } + b, err := os.ReadFile(filepath.Join(dest, "manifest.json")) + if err != nil { + t.Fatal(err) + } + var manifest []entry + if err := json.Unmarshal(b, &manifest); err != nil { + t.Fatal(err) + } + if len(manifest) != 23 { + t.Fatalf("got %d chapters", len(manifest)) + } + for _, e := range manifest { + b, err := os.ReadFile(filepath.Join(dest, e.File)) + if err != nil { + t.Fatal(err) + } + if e.Language != "ja" || e.HTMLSHA256 != digest(b) || !strings.Contains(string(b), "

          ") { + t.Fatalf("invalid payload: %s", e.Chapter) + } + if err := validateLinks(string(b)); err != nil { + t.Fatal(err) + } + if e.Chapter == "address-storage" && !strings.Contains(string(b), "") { + t.Fatal("Markdown tables lost") + } + } + if err := export("../../docs/design/ja", dest); err == nil { + t.Fatal("must not overwrite staging artifacts") + } +} + +func TestUnknownLink(t *testing.T) { + if validateLinks(`x`) == nil { + t.Fatal("broken chapter link accepted") + } +} -- 2.54.0

          xYDcuEGghcXuz&egX*<6a8 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]F=KWspiC2BP03f0wcC33~MxL&eE%o#D59PFBg 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∈{S`ij>vbsy_j@N{e9wETU(+60 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�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

        • 8S1|klZR7@Ne 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