diff --git a/docs/design/ja/extensions.md b/docs/design/ja/extensions.md index 2a6a155..61176f6 100644 --- a/docs/design/ja/extensions.md +++ b/docs/design/ja/extensions.md @@ -60,7 +60,13 @@ CSVをPage本文へ複製せず、認可済みの別Documentをテーブルと 交換形式は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権限を本文から許可しません。 +スライドはローカル同梱のReveal.js 6.0.2で表示します。`/v/slides/{path}` は通常のPath閲覧権限でHTML/Markdownの最新Revisionを取得し、HTMLページのスライドアイコンや「連携アダプタで開く」から移動できます。組み込みHTML/Markdownエディタのスライドアイコンは、未保存の本文を通常プレビューと同じ変換経路で投影します。表示DOMを保存せず、保存・下書き・競合処理は既存エディタに任せます。Markdownの空行で囲んだ `---`、HTMLの直下の `
` が横方向の区切りで、直下の `
` も1枚として扱います。コードブロック内の区切りは分割しません。 + +Reveal実行は `allow-scripts allow-popups` のsandbox iframeに隔離し、`allow-same-origin` は付けません。本文のscript・CSS・iframe・フォーム・任意data属性を渡さず、独自プラグインや外部Markdownを読み込みません。画像は同一originだけ、リンクはHTTP(S)だけです。矢印キー・タッチ・画面内コントロールで移動し、履歴やURL hashを変更しません。ビューアは全画面に対応し、背景・文字色はテーマから引き継ぎます。ライブラリ読込失敗時は静的なサニタイズ済み本文へfallbackします。本文256 KiB・100枚・DOM 10,000ノード/深さ64を上限とし、常時バックグラウンド生成や共有キャッシュは持ちません。`viewer.slides` は拡張設定でドメイン単位に停止でき、停止後のページではビューア・編集切替・アダプタ候補を表示しません。MITライセンス・固定版・配布元・hashは `static/vendor/reveal/` に同梱します。DBスキーマ変更はありません。 + +700px以下の編集画面ではスライドプレビューを全幅表示し、既存のプレビュー非表示ボタンでソースへ戻ります。小画面で自動スクロール形式に変わらないよう `scrollActivationWidth: null` を指定します([Reveal.js公式仕様](https://revealjs.com/scroll-view/))。 + +縦方向のスライド、fragments、発表者ノート、macroの非同期展開、スライド専用印刷、外部画像の承認連携は残件です。HedgeDoc、Slidevは外部originのホスト型アダプタとして、保存・公開・ユーザー情報をPages Wikiの権限へ自動昇格させず、read-only preview→明示的なimport/saveの順にします。JSを使用できない環境向けには、CSS scroll-snap/`:target`/print CSSだけでページ送りできるCSS-only Slide Editorを別実装します。 ネットワーク図では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を明示します。 diff --git a/docs/design/ja/implementation-backlog.md b/docs/design/ja/implementation-backlog.md index e695181..0a03863 100644 --- a/docs/design/ja/implementation-backlog.md +++ b/docs/design/ja/implementation-backlog.md @@ -104,7 +104,7 @@ P0は認可・整合性・復旧の安全条件、P1は日常利用の回復性 | COLLAB-01 / P2 | 一部実装:Page等の変更購読、最近閲覧/編集、集約通知。コメント/反応/評価は未実装 | OUT-01。現在権限で再投影、private履歴のopt-in/保持。inline commentはRevision変更時の孤立・再接続を扱う | [拡張](extensions.md) | | BLOG-01 / P2 | 一部実装:安全なtDiary import、最近コメント、遠隔ブログ射影 | COLLAB-01、遠隔はFED-01。importは再開/重複抑止/dry-run。同一instance射影を再実装しない | [ブログ・日記](blog-diary.md) | | CSV-01 / P2 | viewer・有界CSV macro・既存CSVの表編集/複数セル貼り付けを実装。残件:新規作成UI、大容量編集、矩形選択/範囲コピー、匿名投影、asset指定、ODS境界 | BOM/改行保持、25行描画、行列・セル・総量上限、貼り付けの一括検証/Undo、Revision CAS、権限、競合確認/履歴復元fixture。表示HTMLをCSV正本へ逆流させない | [表設計](extensions.md) | -| DIAGRAM-01 / P2 | 一部実装:nwdiag/Draw.io provider、slide preview/editor | RENDER-01。安全なSVG・include拒否・renderer版固定、ticket/CAS保存、print。既存Excalidraw/Krokiとは分ける | [Kunstzeal](kunstzeal.md) | +| DIAGRAM-01 / P2 | Reveal.jsビューア/編集プレビューを実装。残件:nwdiag/Draw.io provider、縦スライド・notes・専用print | RENDER-01。有界入力、sandbox、固定版ローカル同梱、ドメイン単位停止、Path認可。SVG・include拒否・ticket/CAS保存はprovider別に検証 | [Kunstzeal](kunstzeal.md)、[スライド](extensions.md) | | RECIPE-01 / P2 | 未実装:構造化レシピmetadataとPage投影の初期slice | 材料・数量・未知単位を保持、人数変更は派生値、Asset認可、版競合、出典・公開確認 | [料理レシピ](recipe-management.md) | ## D. 選定・別サブプロジェクト diff --git a/docs/design/ja/kunstzeal.md b/docs/design/ja/kunstzeal.md index d1a1d8b..142875a 100644 --- a/docs/design/ja/kunstzeal.md +++ b/docs/design/ja/kunstzeal.md @@ -111,7 +111,8 @@ Cache-Control: private, no-store - [ ] ディスクcacheの容量・TTL・清掃、renderer更新時の不整合、障害後の一時ファイル残留を管理する。 - [ ] provider宛通信と描画サービス内の外部参照を分け、送信許可・接続先・ネットワーク隔離・バージョン固定を契約化する。 - [ ] nwdiagの有界parser・安全なSVG出力・編集preview、Draw.io等のproviderを追加する。現在のregistryにnwdiagは実装されていない。 -- [ ] Reveal互換・HedgeDoc・Slidev・CSS-onlyスライドのimport/save/printを独立providerとして設計する。 +- [x] Reveal.jsの有界ビューア・既存HTML/Markdownエディタ内previewをローカル固定版で接続する。Path認可・sandbox・ドメイン停止を持ち、正本への保存は既存エディタを利用する([スライド設計](extensions.md))。 +- [ ] Revealの縦スライド・発表者notes・専用print、HedgeDoc・Slidev・CSS-onlyスライドのimport/save/printを独立providerとして設計する。 - [ ] Excalidrawのhosted/browser実行とPDF/動画サムネイル・metadata subprocessを、各々の安全境界を維持したまま段階的に接続する。 ## 検証と反映 diff --git a/internal/extensions/registry.go b/internal/extensions/registry.go index a36cea0..a78176d 100644 --- a/internal/extensions/registry.go +++ b/internal/extensions/registry.go @@ -21,6 +21,7 @@ type Manifest struct { func Catalog() []Manifest { return []Manifest{ + {ID: "viewer.slides", APIVersion: 1, Version: "0.1.0", Kind: "viewer", Scope: "domain", NameKey: "slides.title", DescriptionKey: "slides.help", Capabilities: []string{"path.read"}, Events: []string{}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "client-compute+bounded-read"}, {ID: "viewer.gecko", APIVersion: 1, Version: "0.1.0", Kind: "viewer", Scope: "domain", NameKey: "feeds.gecko", DescriptionKey: "feeds.gecko_help", Capabilities: []string{"feeds.own.read"}, Events: []string{}, SettingsPanel: "extensions", Builtin: true, Enabled: false, ResourceClass: "client-compute+relay-network"}, {ID: "organizer.feeds", APIVersion: 1, Version: "0.1.0", Kind: "feeds", Scope: "domain", NameKey: "feeds.title", DescriptionKey: "feeds.help", Capabilities: []string{"feeds.own.read", "feeds.own.write"}, Events: []string{"feed.source.sync"}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "background+network+index"}, {ID: "organizer.contacts", APIVersion: 1, Version: "0.2.0", Kind: "contacts", Scope: "domain", NameKey: "contacts.title", DescriptionKey: "contacts.help", Capabilities: []string{"contacts.own.read", "contacts.own.write"}, Events: []string{}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "foreground+index"}, diff --git a/internal/kunstzeal/adapters.go b/internal/kunstzeal/adapters.go index 3d560f4..8eed0f2 100644 --- a/internal/kunstzeal/adapters.go +++ b/internal/kunstzeal/adapters.go @@ -227,4 +227,9 @@ func textMediaType(descriptor Descriptor) bool { } // Catalog returns a copy; callers cannot reorder or disable the shared registry. -func Catalog() []Adapter { return append([]Adapter(nil), projectionAdapters...) } +func Catalog() []Adapter { + items := append([]Adapter(nil), projectionAdapters...) + // Explicitly selected projection. It must not replace normal HTML/text + // viewing in the automatic MIME classifier. + return append(items, Adapter{ID: "reveal", Kind: "slides", Delivery: DeliveryRawFrame, Match: func(Descriptor) bool { return false }}) +} diff --git a/internal/kunstzeal/adapters_test.go b/internal/kunstzeal/adapters_test.go index d912bbf..aed588f 100644 --- a/internal/kunstzeal/adapters_test.go +++ b/internal/kunstzeal/adapters_test.go @@ -47,7 +47,7 @@ func TestAdapterCatalogIsCopyAndConcurrent(t *testing.T) { for _, a := range catalog { ids = append(ids, a.ID) } - if strings.Join(ids, ",") != "html,excalidraw,csv,archive,debian-package,eml,pe,json,text,image,audio,video,pdf,download" { + if strings.Join(ids, ",") != "html,excalidraw,csv,archive,debian-package,eml,pe,json,text,image,audio,video,pdf,download,reveal" { t.Fatal("catalog order changed", ids) } catalog[0].ID = "corrupt" diff --git a/internal/server/adapter_plugins.go b/internal/server/adapter_plugins.go index bafe658..be2b122 100644 --- a/internal/server/adapter_plugins.go +++ b/internal/server/adapter_plugins.go @@ -185,6 +185,9 @@ func (s *Server) adapterActionsForPath(r *http.Request, semanticPath string) ([] {ID: "download", Name: "download", Mode: "viewer", Builtin: true, OpenURL: rawProjectionURL("rev:" + revision.UUID)}, } + if (mediaType == "text/html" || mediaType == "text/markdown" || mediaType == "text/x-markdown") && s.systemExtensionEnabled(domainUUID, "viewer.slides") { + actions = append(actions, adapterAction{ID: "reveal", Name: "Reveal.js", Mode: "viewer", Builtin: true, OpenURL: "/v/slides" + semanticPath}) + } if selected.NeedsText || selected.ID == "html" || selected.ID == "excalidraw" { actions = append(actions, adapterAction{ ID: "editor", Name: "Pages Wiki Editor", Mode: "editor", diff --git a/internal/server/endpoint_policy.go b/internal/server/endpoint_policy.go index 10a7479..ff3ed15 100644 --- a/internal/server/endpoint_policy.go +++ b/internal/server/endpoint_policy.go @@ -189,7 +189,7 @@ func readEndpointResolver(path string) (endpointTargetResolver, string) { 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"): + case strings.HasPrefix(path, "/v/preview"), strings.HasPrefix(path, "/v/plain"), strings.HasPrefix(path, "/v/markdown"), path == "/v/slides", strings.HasPrefix(path, "/v/slides/"): return resolveViewPath, "read" case strings.HasPrefix(path, "/o/e/"): return resolveObjectURL, "write" diff --git a/internal/server/endpoint_target.go b/internal/server/endpoint_target.go index 7a44ba5..10ba3c1 100644 --- a/internal/server/endpoint_target.go +++ b/internal/server/endpoint_target.go @@ -268,7 +268,7 @@ func objectIDFromRoute(path string) string { } func semanticViewPath(route string) string { - for _, prefix := range []string{"/v/preview", "/v/plain", "/v/markdown", "/v/browser"} { + for _, prefix := range []string{"/v/preview", "/v/plain", "/v/markdown", "/v/browser", "/v/slides"} { if strings.HasPrefix(route, prefix) { path := strings.TrimPrefix(route, prefix) if path == "" { diff --git a/internal/server/html_projection_csp.go b/internal/server/html_projection_csp.go index 755eebe..91481f5 100644 --- a/internal/server/html_projection_csp.go +++ b/internal/server/html_projection_csp.go @@ -37,7 +37,7 @@ func parseTrustedTemplates(t *template.Template) (*template.Template, error) { func safeProjectionTemplate(name string) bool { switch name { - case "periodical.gohtml", "public_periodical.gohtml", "periodical_new.gohtml": + case "periodical.gohtml", "public_periodical.gohtml", "periodical_new.gohtml", "slides.gohtml": return true case "city_map.gohtml", "public_tree.gohtml", "anonymous_view.gohtml", "page.gohtml", "home.gohtml", "search_home.gohtml", "object_view.gohtml", "revision_view.gohtml", "preview.gohtml", "print.gohtml", "profile.gohtml", "editor.gohtml", "object_editor.gohtml": return true diff --git a/internal/server/request_context.go b/internal/server/request_context.go index 5538913..82f256f 100644 --- a/internal/server/request_context.go +++ b/internal/server/request_context.go @@ -69,6 +69,7 @@ func (s *Server) renderWithContext( data["TasksEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.tasks") data["ContactsEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.contacts") data["FeedsEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.feeds") + data["SlidesEnabled"] = s.systemExtensionEnabled(domainUUID, "viewer.slides") data["OrganizerSection"] = organizerSection(r.URL.Path) if r.URL.Path == "/" { data["IsHome"] = true diff --git a/internal/server/routes/ui.go b/internal/server/routes/ui.go index 620b2c3..9f960ed 100644 --- a/internal/server/routes/ui.go +++ b/internal/server/routes/ui.go @@ -16,6 +16,7 @@ type UIHandlers struct { Preview http.HandlerFunc PlainView http.HandlerFunc MarkdownView http.HandlerFunc + Slides http.HandlerFunc CompileMarkdown http.HandlerFunc CompileDiagram http.HandlerFunc Config http.HandlerFunc @@ -93,6 +94,8 @@ func RegisterUIRoutes( handleIfNotNil(mux, "/v/markdown", h.MarkdownView) handleIfNotNil(mux, "/v/markdown/", h.MarkdownView) + handleIfNotNil(mux, "/v/slides", h.Slides) + handleIfNotNil(mux, "/v/slides/", h.Slides) handleIfNotNil(mux, "/:/compile/markdown", h.CompileMarkdown) handleIfNotNil(mux, "/:/compile/markdown/", h.CompileMarkdown) diff --git a/internal/server/server.go b/internal/server/server.go index 827003e..2350d0c 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -257,6 +257,7 @@ func (s *Server) registerRoutes() { Preview: s.handlePreview, PlainView: s.handlePlainView, MarkdownView: s.handleMarkdownView, + Slides: s.handleSlides, CompileMarkdown: s.handleCompileMarkdown, CompileDiagram: s.handleCompileDiagram, Config: s.handleConfig, diff --git a/internal/server/slides.go b/internal/server/slides.go new file mode 100644 index 0000000..bd74f7c --- /dev/null +++ b/internal/server/slides.go @@ -0,0 +1,68 @@ +package server + +import ( + "net/http" + "strings" + "unicode/utf8" + + "pageswiki/internal/grammaratur" +) + +const maxSlideSourceBytes = 256 << 10 + +func (s *Server) handleSlides(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 + } + domain := s.domainUUIDForRequest(r) + if !s.systemExtensionEnabled(domain, "viewer.slides") { + http.NotFound(w, r) + return + } + path := semanticViewPath(r.URL.Path) + if !s.requestCanReadPath(r, path) { + http.NotFound(w, r) + return + } + object, err := s.store.ResolvePathInDomain(domain, path) + if err != nil { + http.NotFound(w, r) + return + } + revision, err := s.store.GetLatestRevisionMetadataForLanguagesContext(r.Context(), object, s.revisionLanguageCandidates(r)) + if err != nil || revision == nil { + http.NotFound(w, r) + return + } + media := strings.ToLower(strings.TrimSpace(strings.Split(revision.ContentType, ";")[0])) + if media != "text/html" && media != "text/markdown" && media != "text/x-markdown" { + http.Error(w, "slides require HTML or Markdown", http.StatusUnsupportedMediaType) + return + } + size, err := s.store.DocumentSizeContext(r.Context(), revision.DocumentHash) + if err != nil { + http.NotFound(w, r) + return + } + if size > maxSlideSourceBytes { + http.Error(w, "slides source exceeds 256 KiB", http.StatusRequestEntityTooLarge) + return + } + window, err := s.store.ReadDocumentWindowContext(r.Context(), revision.DocumentHash, 0, maxSlideSourceBytes) + if err != nil || window.Truncated || !utf8.Valid(window.Data) { + http.Error(w, "invalid slides source", http.StatusUnsupportedMediaType) + return + } + source := string(window.Data) + if media != "text/html" { + source = grammaratur.MarkdownAuthoringHTML(source) + } + source = s.safeHTMLProjection(r, source, path, false) + w.Header().Set("Cache-Control", "private, no-store") + if r.Method == http.MethodHead { + return + } + s.renderWithContext(w, r, "slides.gohtml", map[string]any{"Title": path, "Path": path, "SlideSource": source}) +} diff --git a/internal/server/slides_i18n.go b/internal/server/slides_i18n.go new file mode 100644 index 0000000..5b87f04 --- /dev/null +++ b/internal/server/slides_i18n.go @@ -0,0 +1,12 @@ +package server + +func init() { + for lang, entries := range map[string]map[string]string{ + "en": {"slides.title": "Slides", "slides.help": "Local Reveal.js viewer and editor preview. Separate slides with a horizontal rule.", "slides.preview": "Slide preview", "slides.close": "Return to page", "slides.fullscreen": "Fullscreen", "slides.error": "Slides could not be displayed. Use the document view (limit: 256 KiB, 100 slides)."}, + "ja": {"slides.title": "スライド", "slides.help": "ローカル同梱のReveal.jsで閲覧・編集プレビュー。水平線でスライドを区切ります。", "slides.preview": "スライドプレビュー", "slides.close": "ページへ戻る", "slides.fullscreen": "全画面", "slides.error": "スライドを表示できません。通常表示を使用してください(上限256 KiB・100枚)。"}, + } { + for key, value := range entries { + translations[lang][key] = value + } + } +} diff --git a/internal/server/slides_test.go b/internal/server/slides_test.go new file mode 100644 index 0000000..a920631 --- /dev/null +++ b/internal/server/slides_test.go @@ -0,0 +1,143 @@ +package server + +import ( + "context" + "html" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "strings" + "testing" + "time" + + "pageswiki/internal/server/routes" +) + +const slideFixture = `

First slide

日本語のスライド


Second slide

` + +func TestSlidesAccessAndLimits(t *testing.T) { + s, token, domain, _ := editorFixture(t) + routes.RegisterUIRoutes(s.mux, routes.UIHandlers{Slides: s.handleSlides}) + s.mux.HandleFunc("/deck", s.handleSemanticRoute) + object, err := s.store.CreatePageAtPathInDomain(domain, "/deck") + if err != nil { + t.Fatal(err) + } + save := func(body, media string) { + t.Helper() + if _, e := s.store.SaveRevisionContent(object, []byte(body), "", "und", media, ""); e != nil { + t.Fatal(e) + } + } + save(slideFixture, "text/html") + w := configRequest(s, token, "GET", "/v/slides/deck", nil) + if w.Code != 200 || !strings.Contains(w.Body.String(), "data-slides-viewer") || !strings.Contains(w.Body.String(), "<h1>First slide") { + t.Fatalf("slides %d %s", w.Code, w.Body.String()) + } + if !strings.Contains(w.Header().Get("Content-Security-Policy"), "'nonce-") { + t.Fatal("missing CSP") + } + page := configRequest(s, token, "GET", "/deck", nil) + if !strings.Contains(page.Body.String(), `href="/v/slides/deck"`) { + t.Fatal("viewer action missing") + } + editor := configRequest(s, token, "GET", "/e/-/deck", nil) + if !strings.Contains(editor.Body.String(), `data-editor-action="slides"`) { + t.Fatal("preview action missing") + } + // A missing or unauthorized semantic path is not exposed via the new view. + req := httptest.NewRequest("GET", "http://localhost/v/slides/deck", nil) + denied := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(denied, req) + if denied.Code == 200 || strings.Contains(denied.Body.String(), "First slide") { + t.Fatal("anonymous private content exposed") + } + if configRequest(s, token, "GET", "/v/slides/missing", nil).Code != 404 { + t.Fatal("missing deck") + } + if p := policyForRequest(httptest.NewRequest("GET", "/v/slides/deck", nil)); p.Resolver != resolveViewPath || p.Capability != "read" { + t.Fatal("wrong policy") + } + if semanticViewPath("/v/slides/deck") != "/deck" { + t.Fatal("wrong target") + } + save("# Markdown\n\n---\n\n## Second", "text/markdown") + if w = configRequest(s, token, "GET", "/v/slides/deck", nil); w.Code != 200 || !strings.Contains(w.Body.String(), "<hr") { + t.Fatal("markdown projection", w.Code) + } + save("%PDF-synthetic", "application/pdf") + if configRequest(s, token, "GET", "/v/slides/deck", nil).Code != 415 { + t.Fatal("binary accepted") + } + save(strings.Repeat("x", maxSlideSourceBytes+1), "text/html") + if configRequest(s, token, "GET", "/v/slides/deck", nil).Code != 413 { + t.Fatal("oversize accepted") + } + save(slideFixture, "text/html") + if err = s.setSystemExtensionEnabled(domain, "viewer.slides", false); err != nil { + t.Fatal(err) + } + if configRequest(s, token, "GET", "/v/slides/deck", nil).Code != 404 { + t.Fatal("disabled viewer active") + } + editor = configRequest(s, token, "GET", "/e/-/deck", nil) + if strings.Contains(editor.Body.String(), `data-editor-action="slides"`) { + t.Fatal("disabled preview action") + } +} + +func TestSlidesChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + for _, mode := range []string{"viewer", "editor"} { + for _, width := range []string{"1280", "390"} { + t.Run(mode+width, func(t *testing.T) { + s, token, domain, _ := editorFixture(t) + routes.RegisterUIRoutes(s.mux, routes.UIHandlers{Slides: s.handleSlides}) + object, err := s.store.CreatePageAtPathInDomain(domain, "/deck") + if err != nil { + t.Fatal(err) + } + if _, err = s.store.SaveRevisionContent(object, []byte(slideFixture), "", "und", "text/html", ""); err != nil { + t.Fatal(err) + } + script, err := os.ReadFile("internal/server/testdata/slides.js") + if err != nil { + t.Fatal(err) + } + route := "/v/slides/deck" + if mode == "editor" { + route = "/e/-/deck" + } + 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 == route { + rec := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(rec, r) + for k, v := range rec.Header() { + w.Header()[k] = v + } + w.WriteHeader(rec.Code) + _, policy, _ := strings.Cut(rec.Header().Get("Content-Security-Policy"), "'nonce-") + nonce, _, _ := strings.Cut(policy, "'") + 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() + cmd := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", server.URL+route, t.TempDir(), "/tmp/pageswiki-slides-"+mode+width+".png", width, "850") + cmd.Env = append(os.Environ(), "PAGESWIKI_SLIDES_BROWSER=1") + out, err := cmd.CombinedOutput() + if err != nil { + t.Fatalf("browser %v: %s", err, out) + } + }) + } + } +} diff --git a/internal/server/testdata/slides.js b/internal/server/testdata/slides.js new file mode 100644 index 0000000..76acae2 --- /dev/null +++ b/internal/server/testdata/slides.js @@ -0,0 +1,33 @@ +(async()=>{ + const assert=(ok,msg)=>{if(!ok)throw Error(msg)},delay=ms=>new Promise(r=>setTimeout(r,ms)); + const wait=async fn=>{for(let n=0;n<300;n++){if(fn())return;await delay(25)}throw Error('Timeout '+fn)}; + const ready=()=>document.querySelector('.slides-frame[data-ready=true]'); + await wait(()=>window.PagesSlides); + const e=window.PagesEditor; + if(e){await wait(()=>document.querySelector('[data-editor-action=slides]')&&e.preview);e.paused=true;document.querySelector('[data-editor-action=slides]').click();} + await wait(ready); + const frame=ready(),source=e?.text(),historyLength=history.length; + assert(frame.dataset.count==='2','Wrong slide count'); + assert(frame.sandbox.contains('allow-scripts')&&!frame.sandbox.contains('allow-same-origin'),'Isolation missing'); + let isolated=false;try{isolated=!frame.contentDocument}catch{isolated=true}assert(isolated,'Frame can access parent origin'); + assert(frame.getBoundingClientRect().height>=240,'Slide frame collapsed'); + assert(frame.getBoundingClientRect().width<=innerWidth,'Mobile slide overflow'); + if(e&&innerWidth<=700){assert(getComputedStyle(document.querySelector('.editor-pane')).display==='none','Mobile preview not full width');setEditorPreviewVisible(false);assert(getComputedStyle(document.querySelector('.editor-pane')).display!=='none','Mobile source inaccessible');setEditorPreviewVisible(true);} + const host=frame.parentElement; + // Verify the defensive DOM boundary independently of server sanitization. + PagesSlides.render(host,'

Safe

{{ end }} @@ -130,6 +131,7 @@
{{ if and (ne .EditType "code") (ne .EditType "plain") }} +{{ if .SlidesEnabled }}{{ end }}
{{ if .ObjectUUID }} +{{ if and .SlidesEnabled (eq .ContentView.Kind "html") }}{{ end }} diff --git a/templates/pages/slides.gohtml b/templates/pages/slides.gohtml new file mode 100644 index 0000000..f15e3ad --- /dev/null +++ b/templates/pages/slides.gohtml @@ -0,0 +1,12 @@ +{{ define "slides.gohtml" }} + + +{{ .Title }} · {{ .WikiName }} + + + +
←{{ .Path }}
+
+ + +{{ end }}