diff --git a/docs/design/ja/decisions.md b/docs/design/ja/decisions.md index 6002b77..a5dc05a 100644 --- a/docs/design/ja/decisions.md +++ b/docs/design/ja/decisions.md @@ -27,7 +27,7 @@ | 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 | 2026-11-08利用者指定で採用。source単位で正本を分離し、自動fallbackや二重管理はしない。実環境の接続先・版・資格情報は別途指定 | +| ADR-O4 | 簡易利用は内蔵正本、本格運用はFreshRSS正本+PagesWiki connector+newsboat | 2026-11-08利用者指定で採用。内蔵・FreshRSS読取・共通UIまで実装。source単位で正本を分離し、自動fallbackや二重管理はしない。OPML・外部書戻しは残件。実環境の接続先・版・資格情報は別途指定 | | 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で実施 | diff --git a/docs/design/ja/feeds.md b/docs/design/ja/feeds.md index de24a1a..83d895d 100644 --- a/docs/design/ja/feeds.md +++ b/docs/design/ja/feeds.md @@ -1,6 +1,8 @@ # 15. RSSビューア・FreshRSS・newsboat -状態:正本の役割分担は決定、実装は未着手。既存のブログRSS「配信」と、本章の外部RSS「購読」は別機能。 +状態:内蔵簡易reader、FreshRSS読取connector、共通viewer、Wiki保存・タスク化、ダッシュボードを実装。 +FreshRSSへの書戻し・OPMLは残件。本番反映と実FreshRSSへの接続は未実施。 +既存のブログRSS「配信」と、本章の外部RSS「購読」は別機能。 2026-11-08:利用者指定のサブプロジェクト順で最初に実施する。内蔵readerは簡易利用の 正本、本格運用はFreshRSSを正本とする。実環境の接続先・版・資格情報は別途指定する。 @@ -28,11 +30,74 @@ FreshRSS停止時は取得済みcacheと鮮度・接続状態を示し、内蔵 内蔵からFreshRSSへの移行はOPML等による明示的なexport/importとし、初期版では既読・star・ 記事IDの完全移行を保証しません。移行完了の確認前に内蔵データを削除しません。 -## 読取MVP +## 実装済みの読取機能 -購読一覧、フォルダ、記事一覧、外部原文、Wiki保存を提供します。初期段階では表示しただけでFreshRSSへ既読を送りません。UIには「読取専用・既読は同期していない」と明示します。ブラウザへFreshRSS password/tokenを渡さず、backend connectorがsecret参照を使います。 +`/v/feeds` に購読一覧、フォルダ、記事一覧、外部原文へのリンク、Wiki保存を提供します。 +FreshRSSの記事・既読・starは取得しますが、状態の変更は送信しません。UIにも読取専用と明示し、 +FreshRSS passwordを設定時以外にブラウザへ返さず、login tokenはbackend内でのみ利用します。 +資格情報は既存の暗号化機構を使い、Domain・所有者・source UUID・用途に束縛します。 -最小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)。 +cacheはsource UUID、remote item ID、title、安全なテキスト本文、記事URL、公開日時、配信元、 +フォルダ、read/starを保持します。取得時刻・ETag・Last-Modified・失敗分類はsource側に持ちます。 +IDなしRSSは記事URL、URLもなければ題名・日時・本文の組合せから代替キーを作り、題名だけで +重複排除しません。Atomはentry IDを使います。[Atom仕様](https://www.rfc-editor.org/rfc/rfc4287)。 + +### 高密度ビューア + +newsboat/neomuttを参考に、デスクトップは左から購読元・一行記事一覧・本文の3ペインとします。 +一覧には未読/star、日付、配信元、件名を並べます。狭幅は一覧と本文を切り替え、スマホでは +行とボタンのタッチ領域を広げます。設定と保存フォームは本文ペイン内に置き、モーダルを増やしません。 + +`j/k`・上下矢印で移動、`Enter/l`で本文、`Esc/h`で一覧、`/`で件名・配信元検索、`n`で次の未読、 +`m`で既読切替、`*`でstar、`r`で背景更新予約、`?`でキー案内です。フォーム入力・IME変換中は +一覧ショートカットを抑止します。FreshRSSでは`m`と`*`も外部変更を行いません。 + +本文は常にtext表示です。script・画像・CSS・Wiki macroを実行せず、記事表示のための外部画像や +原文サイトのfetchも行いません。検索とページングは保存済みcacheだけを対象にし、画面表示で +feed取得の完了を待ちません。ダッシュボードには任意追加のRSS widgetを用意します。 + +### APIと保存層 + +API prefixは `/_/api/v1/extension/organizer.feeds/`。Domain内の本人専用で、匿名・他人のsourceには +アクセスできません。readonlyアカウントは読取のみです。すべての応答はprivate/no-storeとします。 + +| endpoint | 操作 | +| --- | --- | +| `GET sources` / `POST sources` | source一覧/追加・設定更新。新規はUUIDで再送を識別、更新はversion CAS | +| `POST sources/{uuid}/refresh` | 次回背景取得を予約。画面から外部通信しない | +| `POST sources/{uuid}/delete` | versionを照合してsource・cache・内蔵read/starを削除 | +| `GET items` | source/unread/starred/件名・配信元で絞り込み、100件単位のkeysetページング | +| `GET item?source=…&id=…` | 本人の記事本文 | +| `POST state` | 内蔵read/starの条件付き変更。FreshRSSは拒否 | +| `POST note` | 公開範囲確認付きのWiki単独保存。request_idと入力hashで再送を識別 | + +managed schema `feeds` v1に `feed_sources`、`feed_items`、`feed_states`、`feed_note_receipts`を追加します。 +既存テーブルを破壊・再構成しません。SQLiteのforeign_keys設定に依存せず削除を完遂するtriggerを +持ちます。内蔵read/starを本文cacheから分離し、記事を保持窓から落としても状態は黙って消しません。 +DBは内蔵購読・状態・保存receiptの正本であり、全体を捨てられるcacheとは扱いません。 + +sourceのprovider・URL・資格情報の変更は別sourceを作る契約です。設定versionとworker claimの +両方を照合し、停止/削除/設定更新後に古い取得結果を書き戻しません。完了保存時にも本人の +所属・状態・extension有効状態をwriter transaction内で確認します。 + +### 背景取得の上限 + +| 項目 | 初期実装の値・挙動 | +| --- | --- | +| 個人のsource数 | Domain・本人ごとに32 | +| 定期event | `feed.source.sync`、既定60秒周期、低優先度、1回最大4 sourceを直列取得 | +| source更新間隔 | 5〜1440分、既定30分。取得候補になる間隔であり、混雑時の完了時刻保証ではない | +| 通信予算 | 1 source 8秒、batch 35秒、応答/展開後本文4 MiB | +| 外部接続 | 公開HTTPS/443のみ。DNS検査・接続先固定、内部アドレス・redirect・proxyを拒否 | +| 内蔵記事cache | 1 source最大500件、本文32 KiB。超過本文は切詰めを明示 | +| 内蔵read/star | 1 source最大10,000件。上限では新規状態保存を拒否し、既存状態を捨てない | +| FreshRSS | reading-list最新200件の窓を取得。更新成功時はその窓で置換し、全履歴同期とはしない | +| 再試行 | 次の設定間隔まで待機。手動予約にも最終成功から60秒の制限、取得中の重複claim拒否 | + +内蔵は条件付きGET、304ではcacheを保持します。どちらのproviderも通信・認証・構文失敗で +前回cacheを消しません。sourceには安全な失敗分類と最終成功日時を表示し、イベントログには +成功/失敗件数だけを記録します。資格情報・生本文・秘密を含み得るURLをログへ出しません。 +extension無効化は画面・API・取得・完了保存に適用します。購読を登録するまで外部通信は発生しません。 ## 既読・star同期を追加する条件 @@ -47,7 +112,9 @@ FreshRSS APIに条件付き更新がない操作もあり得るため、対応 既読・starの保持期間を分離し、古い記事を再取得しただけで未読へ戻る挙動を防ぎます。 高度な自動分類、全文収集、reader向け互換APIはFreshRSSとの機能競争として追加しません。 -定期event、条件付きGET、host別同時数、timeout、応答サイズ、展開サイズ、backoffを設けます。XML外部entityを無効にし、feed HTMLを安全化します。redirect/DNSを含むSSRF対策、外部画像の同意、個人購読URLや認証情報の秘匿が必要です。 +初期版では全体を直列化し、上記の予算内で取得します。将来の並列化時にhost別同時数・公平性・ +指数backoff/Retry-Afterを追加します。RSS 2.0とAtomを対象とし、XML外部entityは展開しません。 +外部画像の同意付き表示は未実装で、現在は一律に取得・表示しません。 OPMLは購読の入出力として扱い、既読・star・全本文のバックアップと同一視しません。importはpreview・追加/置換選択・重複確認を行い、既存購読を黙って削除しません。 @@ -55,9 +122,32 @@ OPMLは購読の入出力として扱い、既読・star・全本文のバック 既定はURL、出典、短いメモの保存です。全文保存は取得可能性・利用条件・個人用途等を確認する独立操作とし、feedが短いからといって有料記事を自動取得しません。保存先が自動公開範囲なら内容と添付の公開を明示確認します。 +Wiki単独は親Path配下の `rss-{request UUID}` に新規作成します。既存Pathを上書きせず、Page・Path・ +初回Revision・活動outbox・再送receiptを同じDB transactionで保存します。権限はtransaction内でも +再確認します。初期版の単独保存は通常Wiki空間のみで、独自所有契約を持つ`/u`・`/g`は対象外です。 +タスクも作成する場合は既存capture APIの原子的なWiki+タスク保存を使います。この経路のPathは +既存契約の`mail-{request UUID}`です。途中失敗時は部分的なPage/タスクを残さず、同じ要求で再試行できます。 +保存先の公開範囲確認を必須にし、取得済み本文のコピーは別チェックとします。 + +購読削除で明示保存したWikiやタスクは消しません。内蔵cacheを削除しても既存Wikiへの参照と +再送receiptは残します。文書payloadの不変ファイルは既存Document Storeに保存するため、DB失敗時に +未参照payloadが残る可能性は既存GC契約に従い、参照のないPage/Pathとは区別します。 + ## TODOと受け入れ -RSS-1:read-only FreshRSS fixture。RSS-2:安全な共通一覧と出典付きWiki保存。RSS-3:FreshRSSへの明示的な既読/star操作。RSS-4:内蔵簡易readerとOPML。オフライン、欠落ID、巨大feed、未知HTML、同期再送、他user情報、feed削除後の保存Page維持を試験します。内蔵とFreshRSSの正本を混ぜないこと、停止時の自動切替がないこと、移行後も保存済みWiki/タスクが残ることを両provider共通の受入条件とします。 +- [x] RSS-1:read-only FreshRSS connectorと合成fixture。実接続の受入は別。 +- [x] RSS-2:安全な共通一覧、出典付きWiki保存、任意のタスク化、ダッシュボード。 +- [ ] RSS-3:FreshRSSへの明示的な既読/star操作と送信状態・競合・再送の契約。 +- [x] RSS-4a:内蔵簡易reader、購読設定、既読・star、背景取得。 +- [ ] RSS-4b:OPML export/importのpreview、重複確認、明示移行。 +- [ ] RSS-5:FreshRSS実環境の接続先・版・API資格情報を指定してread-only受入。 +- [ ] RSS-6:大規模利用時の公平性、host別並列上限、Retry-After/backoff、資格情報rotation UI。 +- [ ] RSS-7:FreshRSSの購読一覧・カテゴリを使うnavigation。現在の左ペインはPagesWikiに登録したsourceとそのフォルダで、FreshRSSの全購読一覧ではない。 + +隔離試験はRSS/Atom・FreshRSS login/read、欠落ID・巨大/不正feed、条件付きGET、失敗時cache保持、 +本人分離・失効・readonly、二重送信・版競合・旧worker拒否、migration再実行/失敗rollback、 +Wiki保存失敗の原子性を含みます。Chromiumの1440px/390pxで一覧・本文・検索・キー操作・ +Wiki保存を試験します。実FreshRSS、newsboat、実機Safariの受入はこの合成試験に含めません。 ## 実施段階 @@ -69,7 +159,8 @@ RSS-1:read-only FreshRSS fixture。RSS-2:安全な共通一覧と出典付 待たず、schedulerで有界に更新し、取得済みcacheと鮮度を表示する。source停止・失効も検証する。 3. **Wiki保存とタスク化**:タイトル・URL・出典・短いメモをpreviewし、保存先Pathを選ぶ。 既存captureと権限確認を再利用し、二重送信・保存先競合・自動公開範囲を検査する。全文保存は - 独立した明示操作。タスク作成が失敗しても保存済みWikiを消さず、部分成功と再試行方法を示す。 + 独立した明示操作。Wiki単独保存とWiki+タスクの原子保存を分け、要求内の失敗では部分成功を + 残さない。過去に保存済みのWikiは別のタスク作成失敗で削除しない。 4. **ダッシュボードとprovider完成**:読める記事だけのwidget、内蔵簡易readerとOPML、 FreshRSSの明示的な既読/star操作を段階的に追加する。接続先・対象版の指定後に実環境で read-only→書込の順に受入し、read-only連携を有効化しただけで外部状態を変更しない。 diff --git a/docs/design/ja/implementation-backlog.md b/docs/design/ja/implementation-backlog.md index a1a49bb..358fe40 100644 --- a/docs/design/ja/implementation-backlog.md +++ b/docs/design/ja/implementation-backlog.md @@ -1,6 +1,7 @@ # 実装残件台帳 -更新日:2026-11-08。照合基準は `e65ca56`(作業履歴・日次メールの後続実装まで)。 +更新日:2026-11-08。全体照合基準は `e65ca56`(作業履歴・日次メールの後続実装まで)。 +RSS-01はその後の内蔵reader・FreshRSS読取・共通UI実装まで個別更新。 設計書の大項目をそのまま未実装機能と数えず、既存機能の続きとして着手できる単位に整理する。 実装順は本書、個別契約はリンク先、過去の経緯は[原ロードマップ](../implementation-roadmap.md)と [実装記録](../implementation-status.md)を参照する。将来の更新でも以下のIDを再利用する。 @@ -110,7 +111,7 @@ P0は認可・整合性・復旧の安全条件、P1は日常利用の回復性 | ID / 優先 | 状態・次の作業 | 着手ゲート・最初の検証 | 詳細 | | --- | --- | --- | --- | -| RSS-01 / P2 | 未実装・役割決定済み:内蔵簡易正本+本格運用のFreshRSS正本 | 共通UI、合成fixture→Wiki保存・タスク化。FreshRSSの接続先・版を指定して受入。newsboatは同じFreshRSSへ接続。二重正本・停止時の自動切替なし | [RSS](feeds.md) | +| RSS-01 / P2 | 一部実装:内蔵簡易正本、FreshRSS読取connector、3ペインUI・キー操作、Wiki保存・タスク化・dashboard | 残件はOPML、FreshRSS既読/star書戻し、実接続受入、公平性/backoff。managed schema feeds v1・隔離fixture。本番未反映。二重正本・停止時の自動切替なし | [RSS](feeds.md) | | IMAP-01 / P3 | 未実装・選定待ち:IMAP読取同期 | provider/認証/保持を決める。UIDVALIDITY/UID、添付量、外部画像、失効をfixture化。neomutt captureは実装済みで別 | [メール](mail.md) | | TICKET-01 / P3 | 未実装:queue/番号/workflow/外部依頼者 | 共有範囲と状態遷移を定義、同時採番・失効・監査。既存個人タスクをticketと呼び替えない | [タスクとticket](tasks-tickets.md) | | EXT-01 / P3 | built-inのみ:第三者manifest/署名/隔離runtime、停止・rollback・観測 | capability・secret・host・予算・export契約。任意コードをGoプロセス内へ直接ロードしない | [拡張](extensions.md) | diff --git a/internal/extensions/registry.go b/internal/extensions/registry.go index e21a865..a1972c1 100644 --- a/internal/extensions/registry.go +++ b/internal/extensions/registry.go @@ -21,6 +21,7 @@ type Manifest struct { func Catalog() []Manifest { return []Manifest{ + {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"}, {ID: "organizer.tasks", APIVersion: 1, Version: "0.14.0", 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", "task.digest.deliver"}, 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"}, diff --git a/internal/server/event_handlers.go b/internal/server/event_handlers.go index ee97343..3ac1b73 100644 --- a/internal/server/event_handlers.go +++ b/internal/server/event_handlers.go @@ -16,6 +16,7 @@ func (s *Server) registeredEventHandlers() *dregarnuhr.Registry { s.eventHandlersOnce.Do(func() { registry := &dregarnuhr.Registry{} handlers := map[string]dregarnuhr.Handler{ + store.FeedSyncEventType: s.syncFeedSources, store.TaskDigestEventType: s.deliverTaskDigests, store.NotificationPushEventType: func(ctx context.Context, job *store.EventJob) error { return s.deliverNotificationPushContext(ctx, job) diff --git a/internal/server/event_scheduler.go b/internal/server/event_scheduler.go index b1db5a7..c1558ec 100644 --- a/internal/server/event_scheduler.go +++ b/internal/server/event_scheduler.go @@ -58,6 +58,9 @@ func (s *Server) startEventScheduler() { if s.store == nil { return } + if err := s.store.EnsureFeedEvent(); err != nil { + log.Printf("feed scheduler initialization failed") + } if err := s.store.EnsureBuiltinResourceEvent(); err != nil { log.Printf("resource monitor initialization failed: %v", err) } diff --git a/internal/server/feeds.go b/internal/server/feeds.go new file mode 100644 index 0000000..2173ca9 --- /dev/null +++ b/internal/server/feeds.go @@ -0,0 +1,202 @@ +package server + +import ( + "net/http" + "net/url" + "strconv" + "strings" + + "github.com/google/uuid" + "pageswiki/internal/store" +) + +const feedsAPI = "/_/api/v1/extension/organizer.feeds/" + +func feedRoute(p string) bool { return p == "/v/feeds" || strings.HasPrefix(p, feedsAPI) } +func (s *Server) handleFeeds(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Cache-Control", "private, no-store") + domain := s.domainUUIDForRequest(r) + if !s.systemExtensionEnabled(domain, "organizer.feeds") { + http.NotFound(w, r) + return + } + actor, active := s.calendarActor(r) + if actor == "" { + s.authRequired(w, r) + return + } + if r.Method != "GET" && r.Method != "HEAD" && !active { + taskError(w, store.ErrAccessDenied) + return + } + if r.URL.Path == "/v/feeds" { + if r.Method != "GET" && r.Method != "HEAD" { + w.WriteHeader(405) + return + } + if _, e := s.store.FeedSources(r.Context(), domain, actor); e != nil { + taskError(w, e) + return + } + s.renderWithContext(w, r, "feeds.gohtml", map[string]any{"Title": "RSS", "FeedWritable": active}) + return + } + key := strings.TrimPrefix(r.URL.Path, feedsAPI) + switch { + case key == "note" && r.Method == "POST": + var input struct { + RequestID string `json:"request_id"` + Source string `json:"source"` + ID string `json:"id"` + Path string `json:"path"` + Title string `json:"title"` + Body string `json:"body"` + Confirm bool `json:"confirm_publication"` + } + if !taskJSONLimit(w, r, &input, 128<<10) { + return + } + if !input.Confirm { + taskError(w, store.ErrTaskInvalid) + return + } + for _, capability := range []string{"read", "create", "write"} { + if s.authorizePathRequest(r, capability, input.Path) != nil { + taskError(w, store.ErrAccessDenied) + return + } + } + page, e := s.store.CaptureFeedNote(r.Context(), domain, actor, input.RequestID, input.Source, input.ID, input.Path, input.Title, input.Body) + if e != nil { + taskError(w, e) + return + } + writeEventJSON(w, 201, map[string]string{"page_uuid": page}) + return + case key == "sources" && r.Method == "GET": + sources, e := s.store.FeedSources(r.Context(), domain, actor) + if e != nil { + taskError(w, e) + return + } + writeEventJSON(w, 200, map[string]any{"sources": sources}) + return + case key == "sources" && r.Method == "POST": + var input struct { + store.FeedSource + Username string `json:"username"` + Password string `json:"password"` + } + if !taskJSON(w, r, &input) { + return + } + if !validCalendarSourceURL(input.URL) || len(input.Username) > 256 || len(input.Password) > 4096 { + taskError(w, store.ErrTaskInvalid) + return + } + if input.Provider == "freshrss" { + u, _ := url.Parse(input.URL) + if u.RawQuery != "" || !strings.HasSuffix(strings.TrimRight(u.Path, "/"), "/greader.php") { + taskError(w, store.ErrTaskInvalid) + return + } + } + if input.UUID == "" { + input.UUID = uuid.NewString() + } + if input.Version == 0 && input.Provider == "freshrss" { + if input.Username == "" || input.Password == "" { + taskError(w, store.ErrTaskInvalid) + return + } + cipher, e := s.store.SealFeedCredential(domain, actor, input.UUID, input.Username, input.Password) + if e != nil { + taskError(w, e) + return + } + input.Credential = cipher + } else if input.Username != "" || input.Password != "" { + taskError(w, store.ErrTaskInvalid) + return + } + v, e := s.store.SaveFeedSource(r.Context(), domain, actor, input.FeedSource) + if e != nil { + taskError(w, e) + return + } + writeEventJSON(w, 200, map[string]any{"source": v}) + return + case strings.HasPrefix(key, "sources/") && r.Method == "POST": + parts := strings.Split(key, "/") + if len(parts) != 3 { + http.NotFound(w, r) + return + } + var input struct { + Version int64 `json:"version"` + } + if !taskJSON(w, r, &input) { + return + } + if e := s.store.FeedSourceAction(r.Context(), domain, actor, parts[1], parts[2], input.Version); e != nil { + taskError(w, e) + return + } + writeEventJSON(w, 200, map[string]bool{"ok": true}) + return + case key == "items" && r.Method == "GET": + q := r.URL.Query() + before := int64(-1) + if q.Has("before") { + var e error + before, e = strconv.ParseInt(q.Get("before"), 10, 64) + if e != nil || before < 0 { + taskError(w, store.ErrTaskInvalid) + return + } + } + items, e := s.store.FeedItems(r.Context(), domain, actor, q.Get("source"), q.Get("filter"), q.Get("q"), before, q.Get("key")) + if e != nil { + taskError(w, e) + return + } + more := len(items) > 100 + if more { + items = items[:100] + } + writeEventJSON(w, 200, map[string]any{"items": items, "more": more}) + return + case key == "item" && r.Method == "GET": + v, e := s.store.FeedItem(r.Context(), domain, actor, r.URL.Query().Get("source"), r.URL.Query().Get("id")) + if e != nil { + taskError(w, e) + return + } + writeEventJSON(w, 200, map[string]any{"item": v}) + return + case key == "state" && r.Method == "POST": + var input struct { + Source string `json:"source"` + ID string `json:"id"` + Read bool `json:"read"` + Starred bool `json:"starred"` + Version int64 `json:"version"` + } + if !taskJSON(w, r, &input) { + return + } + if e := s.store.SetFeedState(r.Context(), domain, actor, input.Source, input.ID, input.Read, input.Starred, input.Version); e != nil { + taskError(w, e) + return + } + writeEventJSON(w, 200, map[string]any{"version": input.Version + 1}) + return + } + http.NotFound(w, r) +} +func init() { + translations["en"]["feeds.title"] = "RSS reader" + translations["ja"]["feeds.title"] = "RSSリーダー" + translations["en"]["feeds.help"] = "Private local feeds and read-only FreshRSS integration" + translations["ja"]["feeds.help"] = "個人用の簡易RSSとFreshRSS読取連携" +} diff --git a/internal/server/feeds_fetch.go b/internal/server/feeds_fetch.go new file mode 100644 index 0000000..cfca5a6 --- /dev/null +++ b/internal/server/feeds_fetch.go @@ -0,0 +1,414 @@ +package server + +import ( + "bytes" + "context" + "crypto/sha256" + "encoding/hex" + "encoding/json" + "encoding/xml" + "errors" + "fmt" + "html" + "io" + "net/http" + "net/url" + "strconv" + "strings" + "time" + "unicode/utf8" + + "github.com/microcosm-cc/bluemonday" + "golang.org/x/net/html/charset" + "pageswiki/internal/store" +) + +var errFeedInvalid = errors.New("invalid_feed") +var feedTextPolicy = bluemonday.StrictPolicy() + +func feedText(raw string, limit int) string { + // Text-only reader: no remote images, CSS, script, macros or active HTML. + for _, tag := range []string{"

", "", "
", "
", "
", ""} { + raw = strings.ReplaceAll(raw, tag, tag+"\n") + } + text := strings.TrimSpace(html.UnescapeString(feedTextPolicy.Sanitize(raw))) + if len(text) > limit { + text = text[:limit-16] + for !utf8.ValidString(text) { + text = text[:len(text)-1] + } + text += "\n[… truncated]" + } + return text +} +func feedLink(base, raw string) string { + if strings.TrimSpace(raw) == "" || len(raw) > 4096 { + return "" + } + u, e := url.Parse(strings.TrimSpace(raw)) + if e != nil { + return "" + } + b, e := url.Parse(base) + if e != nil { + return "" + } + u = b.ResolveReference(u) + if (u.Scheme != "https" && u.Scheme != "http") || u.Hostname() == "" || u.User != nil { + return "" + } + result := u.String() + if len(result) > 4096 { + return "" + } + return result +} +func feedDate(v string) int64 { + for _, layout := range []string{time.RFC3339Nano, time.RFC1123Z, time.RFC1123, time.RFC822Z, time.RFC822, "2006-01-02T15:04:05-0700"} { + if t, e := time.Parse(layout, v); e == nil && t.UnixMilli() > 0 && t.Before(time.Now().AddDate(1, 0, 0)) { + return t.UnixMilli() + } + } + return 0 +} + +type rssEntry struct { + ID string `xml:"guid"` + Title string `xml:"title"` + Link string `xml:"link"` + Description string `xml:"description"` + Content string `xml:"encoded"` + Date string `xml:"pubDate"` + Category string `xml:"category"` +} +type atomEntry struct { + ID string `xml:"id"` + Title string `xml:"title"` + Links []struct { + Href string `xml:"href,attr"` + Rel string `xml:"rel,attr"` + } `xml:"link"` + Summary string `xml:"summary"` + Content struct { + Text string `xml:",chardata"` + Inner string `xml:",innerxml"` + } `xml:"content"` + Published string `xml:"published"` + Updated string `xml:"updated"` + Category struct { + Term string `xml:"term,attr"` + } `xml:"category"` +} + +func parseFeed(raw []byte, base string) ([]store.FeedItem, error) { + if len(raw) > 4<<20 { + return nil, errors.New("limit") + } + d := xml.NewDecoder(bytes.NewReader(raw)) + d.CharsetReader = charset.NewReaderLabel + root := "" + title := "" + depth := 0 + out := []store.FeedItem{} + seen := map[string]bool{} + for { + tok, e := d.Token() + if e == io.EOF { + break + } + if e != nil { + return nil, errFeedInvalid + } + switch t := tok.(type) { + case xml.Directive: + return nil, errFeedInvalid // DTD/entities have no role in a feed. + case xml.StartElement: + depth++ + if depth == 1 && root != "" { + return nil, errFeedInvalid + } + if depth > 64 { + return nil, errFeedInvalid + } + if root == "" { + root = t.Name.Local + if root != "rss" && root != "feed" { + return nil, errFeedInvalid + } + } + var item store.FeedItem + isItem := false + if root == "rss" && t.Name.Local == "item" && depth == 3 { + var v rssEntry + if d.DecodeElement(&v, &t) != nil { + return nil, errFeedInvalid + } + depth-- + body := v.Content + if body == "" { + body = v.Description + } + item = store.FeedItem{ID: v.ID, Title: v.Title, URL: feedLink(base, v.Link), Body: body, PublishedMS: feedDate(v.Date), Folder: v.Category} + isItem = true + } else if root == "feed" && t.Name.Local == "entry" && depth == 2 { + var v atomEntry + if d.DecodeElement(&v, &t) != nil { + return nil, errFeedInvalid + } + depth-- + body := v.Content.Text + if body == "" { + body = v.Content.Inner + } + if body == "" { + body = v.Summary + } + link := "" + for _, l := range v.Links { + if l.Rel == "" || l.Rel == "alternate" { + link = feedLink(base, l.Href) + break + } + } + date := v.Published + if date == "" { + date = v.Updated + } + item = store.FeedItem{ID: v.ID, Title: v.Title, URL: link, Body: body, PublishedMS: feedDate(date), Folder: v.Category.Term} + isItem = true + } else if t.Name.Local == "title" && ((root == "rss" && depth == 3) || (root == "feed" && depth == 2)) { + if d.DecodeElement(&title, &t) != nil { + return nil, errFeedInvalid + } + depth-- + } + if isItem { + if len(out) >= 500 { + return nil, errors.New("limit") + } + item.Title = feedText(item.Title, 2048) + item.Body = feedText(item.Body, 32768) + item.Feed = feedText(title, 512) + item.Folder = feedText(item.Folder, 512) + if item.ID == "" { + key := item.URL + if key == "" { + key = item.Title + "\x00" + strconv.FormatInt(item.PublishedMS, 10) + "\x00" + item.Body + } + h := sha256.Sum256([]byte(key)) + item.ID = "sha256:" + hex.EncodeToString(h[:]) + } + if len(item.ID) > 1024 || seen[item.ID] { + return nil, errFeedInvalid + } + seen[item.ID] = true + out = append(out, item) + } + case xml.EndElement: + depth-- + } + } + if root == "" || depth != 0 { + return nil, errFeedInvalid + } + return out, nil +} + +func feedRequest(ctx context.Context, client *http.Client, method, target, auth string, form url.Values, headers map[string]string) ([]byte, http.Header, int, error) { + var body io.Reader + if form != nil { + body = strings.NewReader(form.Encode()) + } + r, e := http.NewRequestWithContext(ctx, method, target, body) + if e != nil { + return nil, nil, 0, errFeedInvalid + } + if auth != "" { + r.Header.Set("Authorization", "GoogleLogin auth="+auth) + } + if form != nil { + r.Header.Set("Content-Type", "application/x-www-form-urlencoded") + } + r.Header.Set("User-Agent", "PagesWiki-Feeds/0.1") + for k, v := range headers { + r.Header.Set(k, v) + } + res, e := client.Do(r) + if e != nil { + return nil, nil, 0, errors.New("network") + } + defer res.Body.Close() + if res.StatusCode == 401 || res.StatusCode == 403 { + return nil, nil, res.StatusCode, errors.New("credentials") + } + if res.StatusCode == 304 { + return nil, res.Header, 304, nil + } + if res.StatusCode != 200 { + return nil, nil, res.StatusCode, errors.New("remote_error") + } + raw, e := io.ReadAll(io.LimitReader(res.Body, (4<<20)+1)) + if e != nil { + return nil, nil, 0, errors.New("network") + } + if len(raw) > 4<<20 { + return nil, nil, 0, errors.New("limit") + } + return raw, res.Header, res.StatusCode, nil +} +func fetchFreshRSS(ctx context.Context, client *http.Client, v store.FeedSource, user, password string) ([]store.FeedItem, error) { + base := strings.TrimRight(v.URL, "/") + raw, _, _, e := feedRequest(ctx, client, "POST", base+"/accounts/ClientLogin", "", url.Values{"Email": {user}, "Passwd": {password}}, nil) + if e != nil { + return nil, e + } + auth := "" + for _, line := range strings.Split(string(raw), "\n") { + if strings.HasPrefix(line, "Auth=") { + auth = strings.TrimSpace(strings.TrimPrefix(line, "Auth=")) + } + } + if auth == "" || len(auth) > 4096 || strings.ContainsAny(auth, "\r\n") { + return nil, errors.New("credentials") + } + raw, _, _, e = feedRequest(ctx, client, "GET", base+"/reader/api/0/stream/contents/reading-list?output=json&n=200", auth, nil, nil) + if e != nil { + return nil, e + } + var response struct { + Items []struct { + ID string `json:"id"` + Title string `json:"title"` + Published int64 `json:"published"` + Categories []string `json:"categories"` + Origin struct { + Title string `json:"title"` + } `json:"origin"` + Alternate []struct { + Href string `json:"href"` + } `json:"alternate"` + Summary struct { + Content string `json:"content"` + } `json:"summary"` + Content struct { + Content string `json:"content"` + } `json:"content"` + } `json:"items"` + } + if json.Unmarshal(raw, &response) != nil || response.Items == nil || len(response.Items) > 200 { + return nil, errFeedInvalid + } + out := []store.FeedItem{} + seen := map[string]bool{} + for _, i := range response.Items { + if i.ID == "" || len(i.ID) > 1024 || seen[i.ID] { + return nil, errFeedInvalid + } + seen[i.ID] = true + item := store.FeedItem{ID: i.ID, Title: feedText(i.Title, 2048), Feed: feedText(i.Origin.Title, 512)} + if i.Published > 0 && i.Published < time.Now().AddDate(1, 0, 0).Unix() { + item.PublishedMS = i.Published * 1000 + } + body := i.Summary.Content + if body == "" { + body = i.Content.Content + } + item.Body = feedText(body, 32768) + if len(i.Alternate) > 0 { + item.URL = feedLink(base, i.Alternate[0].Href) + } + for _, c := range i.Categories { + if strings.HasSuffix(c, "/state/com.google/read") { + item.Read = true + } + if strings.HasSuffix(c, "/state/com.google/starred") { + item.Starred = true + } + if pos := strings.Index(c, "/label/"); pos >= 0 { + item.Folder = feedText(c[pos+7:], 512) + } + } + out = append(out, item) + } + return out, nil +} +func (s *Server) syncFeedSources(ctx context.Context, job *store.EventJob) error { + client := calendarSourceClient() + client.CheckRedirect = func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse } + defer client.CloseIdleConnections() + return s.syncFeedSourcesWithClient(ctx, job, client) +} + +// Tests inject a synthetic transport; production always uses the DNS-pinned, +// public HTTPS-only transport above, never a user-configurable HTTP client. +func (s *Server) syncFeedSourcesWithClient(ctx context.Context, job *store.EventJob, client *http.Client) error { + ctx, cancel := context.WithTimeout(ctx, 35*time.Second) + defer cancel() + sources, e := s.store.DueFeedSources(ctx) + if e != nil { + return e + } + done, failed := 0, 0 + for _, v := range sources { + if ctx.Err() != nil { + break + } + if !s.systemExtensionEnabled(v.Domain, "organizer.feeds") { + continue + } + v, e = s.store.ClaimFeed(ctx, v) + if e != nil { + continue + } + child, stop := context.WithTimeout(ctx, 8*time.Second) + var items []store.FeedItem + etag, modified := v.ETag, v.Modified + unchanged := false + if !validCalendarSourceURL(v.URL) { + e = errFeedInvalid + } else if v.Provider == "freshrss" { + var user, password string + user, password, e = s.store.OpenFeedCredential(v) + if e == nil { + items, e = fetchFreshRSS(child, client, v, user, password) + } else { + e = errors.New("credentials") + } + } else { + var raw []byte + var h http.Header + var status int + raw, h, status, e = feedRequest(child, client, "GET", v.URL, "", nil, map[string]string{"If-None-Match": v.ETag, "If-Modified-Since": v.Modified}) + if e == nil { + unchanged = status == 304 + if !unchanged { + items, e = parseFeed(raw, v.URL) + etag, modified = h.Get("ETag"), h.Get("Last-Modified") + } + } + } + stop() + if e == nil && (len(etag) > 1024 || len(modified) > 1024) { + e = errors.New("limit") + etag, modified = v.ETag, v.Modified + items = nil + } + code := "" + if e != nil { + code = e.Error() + switch code { + case "network", "invalid_feed", "credentials", "remote_error", "limit": + default: + code = "invalid_feed" + } + failed++ + } else { + done++ + } + if e = s.store.CompleteFeed(ctx, v, items, etag, modified, code, unchanged); e != nil && !errors.Is(e, store.ErrAccessDenied) && !errors.Is(e, store.ErrTaskConflict) { + return e + } + } + s.addEventProgressLog(ctx, job, fmt.Sprintf("feed sources updated=%d failed=%d", done, failed)) + return nil +} diff --git a/internal/server/feeds_test.go b/internal/server/feeds_test.go new file mode 100644 index 0000000..1a9d822 --- /dev/null +++ b/internal/server/feeds_test.go @@ -0,0 +1,535 @@ +package server + +import ( + "context" + "encoding/json" + "errors" + "fmt" + "io" + "net/http" + "net/http/httptest" + "net/url" + "os" + "os/exec" + "strings" + "testing" + "time" + + "github.com/google/uuid" + "pageswiki/internal/store" +) + +func feedFixture(t *testing.T) (*Server, string, string, string, store.FeedSource) { + t.Helper() + s, token, domain, actor := taskFixture(t) + source, e := s.store.SaveFeedSource(context.Background(), domain, actor, store.FeedSource{UUID: uuid.NewString(), Provider: "local", Title: "Synthetic news", Folder: "Tech", URL: "https://example.org/feed.xml", Enabled: true, Interval: 300}) + if e != nil { + t.Fatal(e) + } + sources, e := s.store.FeedSources(context.Background(), domain, actor) + if e != nil || len(sources) != 1 { + t.Fatal(e) + } + source = sources[0] + return s, token, domain, actor, source +} +func feedRequestTest(s *Server, token, method, key string, body any) *httptest.ResponseRecorder { + raw, _ := json.Marshal(body) + r := httptest.NewRequest(method, "http://localhost"+feedsAPI+key, strings.NewReader(string(raw))) + r.Header.Set("Content-Type", "application/json") + if token != "" { + r.Header.Set("Authorization", "Bearer "+token) + } + w := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(w, r) + return w +} +func TestFeedReaderStateIsolationAndFencing(t *testing.T) { + s, token, domain, actor, source := feedFixture(t) + ctx := context.Background() + claim, e := s.store.ClaimFeed(ctx, source) + if e != nil { + t.Fatal(e) + } + if _, e = s.store.ClaimFeed(ctx, source); !errors.Is(e, store.ErrTaskConflict) { + t.Fatal("double claim", e) + } + item := store.FeedItem{ID: "one", Title: "日本語 news", Body: "safe text", URL: "https://example.org/one", PublishedMS: 1} + if e = s.store.CompleteFeed(ctx, claim, []store.FeedItem{item}, "e1", "", "", false); e != nil { + t.Fatal(e) + } + if w := feedRequestTest(s, token, "GET", "items", nil); w.Code != 200 || !strings.Contains(w.Body.String(), "日本語") { + t.Fatal(w.Code, w.Body) + } + if w := feedRequestTest(s, "", "GET", "items", nil); w.Code == 200 { + t.Fatal("anonymous") + } + if _, e = s.store.FeedItem(ctx, domain, uuid.NewString(), source.UUID, "one"); !errors.Is(e, store.ErrAccessDenied) { + t.Fatal(e) + } + state := map[string]any{"source": source.UUID, "id": "one", "read": true, "starred": true, "version": 0} + if w := feedRequestTest(s, token, "POST", "state", state); w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + if w := feedRequestTest(s, token, "POST", "state", state); w.Code != 412 { + t.Fatal("stale state", w.Code, w.Body) + } + got, e := s.store.FeedItem(ctx, domain, actor, source.UUID, "one") + if e != nil || !got.Read || !got.Starred || got.Version != 1 { + t.Fatal(got, e) + } + if e = s.store.CompleteFeed(ctx, claim, nil, "", "", "", false); !errors.Is(e, store.ErrTaskConflict) { + t.Fatal("old completion", e) + } + // Re-fetch must preserve local read/star; config edits invalidate in-flight work. + source.Version = 1 + source, e = s.store.SaveFeedSource(ctx, domain, actor, source) + if e != nil { + t.Fatal(e) + } + sources, _ := s.store.FeedSources(ctx, domain, actor) + claim, e = s.store.ClaimFeed(ctx, sources[0]) + if e != nil { + t.Fatal(e) + } + if e = s.store.CompleteFeed(ctx, claim, []store.FeedItem{item}, "", "", "", false); e != nil { + t.Fatal(e) + } + got, _ = s.store.FeedItem(ctx, domain, actor, source.UUID, "one") + if !got.Read || !got.Starred { + t.Fatal("lost state") + } + source, e = s.store.SaveFeedSource(ctx, domain, actor, source) + if e != nil { + t.Fatal(e) + } + sources, _ = s.store.FeedSources(ctx, domain, actor) + claim, e = s.store.ClaimFeed(ctx, sources[0]) + if e != nil { + t.Fatal(e) + } + source.Enabled = false + source, e = s.store.SaveFeedSource(ctx, domain, actor, source) + if e != nil { + t.Fatal(e) + } + if e = s.store.CompleteFeed(ctx, claim, []store.FeedItem{item}, "", "", "", false); !errors.Is(e, store.ErrTaskConflict) { + t.Fatal("disabled late commit", e) + } + if e = s.setSystemExtensionEnabled(domain, "organizer.feeds", false); e != nil { + t.Fatal(e) + } + if _, e = s.store.FeedItems(ctx, domain, actor, "", "", "", -1, ""); !errors.Is(e, store.ErrAccessDenied) { + t.Fatal(e) + } + if w := feedRequestTest(s, token, "GET", "items", nil); w.Code != 404 { + t.Fatal(w.Code) + } +} +func TestFeedParserSafetyAndFormats(t *testing.T) { + rss := `Newsid日本語/oneHello

world]]>
Fri, 06 Nov 2026 10:00:00 +0000
` + items, e := parseFeed([]byte(rss), "https://example.org/feed") + if e != nil || len(items) != 1 || items[0].URL != "https://example.org/one" || strings.Contains(items[0].Body, "alert") || strings.Contains(items[0].Body, "pixel") || items[0].PublishedMS == 0 { + t.Fatal(items, e) + } + atom := `Atomurn:oneOne2026-11-01T10:00:00Z<p>Body</p>` + items, e = parseFeed([]byte(atom), "https://example.org") + if e != nil || len(items) != 1 || items[0].Body != "Body" { + t.Fatal(items, e) + } + for _, raw := range []string{`]>`, `error`, ``, `xx`, strings.Repeat("x", (4<<20)+1)} { + if _, e = parseFeed([]byte(raw), "https://example.org"); e == nil { + t.Fatal("accepted malformed feed") + } + } + if feedLink("https://example.org", "javascript:alert(1)") != "" || feedLink("https://example.org", "https://user:pass@example.org") != "" { + t.Fatal("unsafe link") + } + items, e = parseFeed([]byte(`No ID or linkFirst bodyNo ID or linkSecond body`), "https://example.org/feed") + if e != nil || len(items) != 2 || items[0].ID == items[1].ID || items[0].URL != "" { + t.Fatal("missing IDs must not collapse to the feed URL", items, e) + } +} +func TestFreshRSSReadOnlyContract(t *testing.T) { + requests := []string{} + remote := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + requests = append(requests, r.Method+" "+r.URL.Path) + switch r.URL.Path { + case "/api/greader.php/accounts/ClientLogin": + if r.Method != "POST" { + t.Error("login method") + } + r.ParseForm() + if r.Form.Get("Email") != "reader" || r.Form.Get("Passwd") != "api-secret" { + t.Error("login form") + } + fmt.Fprint(w, "SID=x\nAuth=reader/token\n") + case "/api/greader.php/reader/api/0/stream/contents/reading-list": + if r.Header.Get("Authorization") != "GoogleLogin auth=reader/token" || r.URL.Query().Get("n") != "200" { + t.Error("request contract") + } + fmt.Fprint(w, `{"items":[{"id":"tag:1","title":"Title","summary":{"content":"

Text

"},"published":1793500000,"categories":["user/reader/state/com.google/read","user/reader/state/com.google/starred","user/reader/label/Tech"],"origin":{"title":"Feed"},"alternate":[{"href":"https://example.org/article"}]}]}`) + default: + t.Error("unexpected mutation", r.URL.Path) + w.WriteHeader(404) + } + })) + defer remote.Close() + items, e := fetchFreshRSS(context.Background(), remote.Client(), store.FeedSource{URL: remote.URL + "/api/greader.php"}, "reader", "api-secret") + if e != nil || len(items) != 1 || !items[0].Read || !items[0].Starred || items[0].Folder != "Tech" || items[0].Body != "Text" || len(requests) != 2 { + t.Fatal(items, e, requests) + } + for _, bad := range []string{"http://example.org/feed", "https://127.0.0.1/feed", "https://10.0.0.1/feed", "https://example.org:8443/feed", "https://user:pass@example.org/feed"} { + if validCalendarSourceURL(bad) { + t.Fatal("SSRF URL", bad) + } + } +} +func TestFeedPaginationFailureAndDelete(t *testing.T) { + s, token, domain, actor, source := feedFixture(t) + ctx := context.Background() + claim, e := s.store.ClaimFeed(ctx, source) + if e != nil { + t.Fatal(e) + } + items := []store.FeedItem{} + for i := 0; i < 205; i++ { + items = append(items, store.FeedItem{ID: fmt.Sprintf("id-%03d", i), Title: "Title", Body: "Body", PublishedMS: 100}) + } + if e = s.store.CompleteFeed(ctx, claim, items, "old", "", "", false); e != nil { + t.Fatal(e) + } + seen := map[string]bool{} + before := int64(-1) + key := "" + for { + batch, e := s.store.FeedItems(ctx, domain, actor, "", "", "", before, key) + if e != nil { + t.Fatal(e) + } + more := len(batch) > 100 + if more { + batch = batch[:100] + } + for _, item := range batch { + if seen[item.ID] { + t.Fatal("duplicate") + } + seen[item.ID] = true + } + if !more { + break + } + last := batch[len(batch)-1] + before = last.PublishedMS + key = last.Source + ":" + last.ID + } + if len(seen) != 205 { + t.Fatal(len(seen)) + } + source, e = s.store.SaveFeedSource(ctx, domain, actor, source) + if e != nil { + t.Fatal(e) + } + sources, _ := s.store.FeedSources(ctx, domain, actor) + claim, e = s.store.ClaimFeed(ctx, sources[0]) + if e != nil { + t.Fatal(e) + } + if e = s.store.CompleteFeed(ctx, claim, nil, "", "", "network", false); e != nil { + t.Fatal(e) + } + if _, e = s.store.FeedItem(ctx, domain, actor, source.UUID, "id-001"); e != nil { + t.Fatal("cache lost on failure", e) + } + if w := feedRequestTest(s, token, "POST", "sources/"+source.UUID+"/delete", map[string]int64{"version": source.Version}); w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + var count int + if e = s.store.DB.QueryRow(`SELECT count(*) FROM feed_items`).Scan(&count); e != nil || count != 0 { + t.Fatal("cascade", count, e) + } + var integrity string + if e = s.store.DB.QueryRow(`PRAGMA integrity_check`).Scan(&integrity); e != nil || integrity != "ok" { + t.Fatal(integrity, e) + } +} +func TestFeedSourceAPIAndCredentialBinding(t *testing.T) { + s, token, domain, actor, _ := feedFixture(t) + input := map[string]any{"uuid": uuid.NewString(), "provider": "freshrss", "title": "Remote", "url": "https://rss.example.org/api/greader.php", "interval_seconds": 300, "enabled": true, "username": "reader", "password": "top-secret"} + w := feedRequestTest(s, token, "POST", "sources", input) + if w.Code != 200 || strings.Contains(w.Body.String(), "secret") { + t.Fatal(w.Code, w.Body) + } + // Each HTTP retry seals a different ciphertext, but identical credentials and + // request UUID must still return the same source, not create a duplicate. + if retry := feedRequestTest(s, token, "POST", "sources", input); retry.Code != 200 || retry.Body.String() != w.Body.String() { + t.Fatal("source replay", retry.Code, retry.Body) + } + input["password"] = "changed-secret" + if retry := feedRequestTest(s, token, "POST", "sources", input); retry.Code != 412 { + t.Fatal("changed source replay", retry.Code, retry.Body) + } + input["password"] = "top-secret" + sources, e := s.store.FeedSources(context.Background(), domain, actor) + if e != nil { + t.Fatal(e) + } + if len(sources) != 2 { + t.Fatal("duplicate source", len(sources)) + } + var remote store.FeedSource + for _, v := range sources { + if v.Provider == "freshrss" { + remote = v + } + } + u, p, e := s.store.OpenFeedCredential(remote) + if e != nil || u != "reader" || p != "top-secret" { + t.Fatal("credential", e) + } + remote.Owner = uuid.NewString() + if _, _, e = s.store.OpenFeedCredential(remote); e == nil { + t.Fatal("credential rebound") + } + if w = feedRequestTest(s, token, "GET", "sources", nil); w.Code != 200 || strings.Contains(w.Body.String(), "top-secret") || strings.Contains(w.Body.String(), "credential") { + t.Fatal(w.Code, w.Body) + } + input["url"] = "https://127.0.0.1/api/greader.php" + if w = feedRequestTest(s, token, "POST", "sources", input); w.Code != 422 { + t.Fatal(w.Code, w.Body) + } +} + +func TestFeedFreshRSSAuthorityAndRevocation(t *testing.T) { + s, token, domain, actor, local := feedFixture(t) + ctx := context.Background() + v, e := s.store.SaveFeedSource(ctx, domain, actor, store.FeedSource{UUID: uuid.NewString(), Provider: "freshrss", Title: "FreshRSS", URL: "https://example.org/api/greader.php", Enabled: true, Interval: 300}) + if e != nil { + t.Fatal(e) + } + claim := func() store.FeedSource { + t.Helper() + // Simulate the next scheduler tick without a wall-clock wait. + if _, err := s.store.DB.Exec(`UPDATE feed_sources SET next_ms=0 WHERE uuid=?`, v.UUID); err != nil { + t.Fatal(err) + } + all, err := s.store.FeedSources(ctx, domain, actor) + if err != nil { + t.Fatal(err) + } + for _, source := range all { + if source.UUID == v.UUID { + v = source + } + } + c, err := s.store.ClaimFeed(ctx, v) + if err != nil { + t.Fatal(err) + } + return c + } + c := claim() + if e = s.store.CompleteFeed(ctx, c, []store.FeedItem{{ID: "removed", Title: "Removed"}, {ID: "kept", Title: "Kept", Read: true, Starred: true}}, "", "", "", false); e != nil { + t.Fatal(e) + } + if e = s.store.SetFeedState(ctx, domain, actor, v.UUID, "kept", false, false, 0); !errors.Is(e, store.ErrAccessDenied) { + t.Fatal("remote state mutation", e) + } + c = claim() + if e = s.store.CompleteFeed(ctx, c, []store.FeedItem{{ID: "kept", Title: "Changed elsewhere", Read: false}}, "", "", "", false); e != nil { + t.Fatal(e) + } + items, e := s.store.FeedItems(ctx, domain, actor, v.UUID, "", "", -1, "") + if e != nil || len(items) != 1 || items[0].Read || items[0].Starred || items[0].Title != "Changed elsewhere" { + t.Fatal("non-authoritative cache", items, e) + } + c = claim() + if e = s.store.SetPrincipalState(domain, actor, "readonly"); e != nil { + t.Fatal(e) + } + // Changing principal state invalidates the previous session. + token, e = s.store.CreateAuthSession(domain, actor) + if e != nil { + t.Fatal(e) + } + if _, e = s.store.FeedItems(ctx, domain, actor, "", "", "", -1, ""); e != nil { + t.Fatal("readonly read", e) + } + if e = s.store.CompleteFeed(ctx, c, nil, "", "", "", false); !errors.Is(e, store.ErrAccessDenied) { + t.Fatal("late revoked worker", e) + } + if w := feedRequestTest(s, token, "POST", "sources/"+local.UUID+"/delete", map[string]int64{"version": 1}); w.Code != 403 { + t.Fatal("readonly API", w.Code, w.Body) + } + if due, err := s.store.DueFeedSources(ctx); err != nil || len(due) != 0 { + t.Fatal("inactive source starves queue", due, err) + } + if e = s.store.SetPrincipalState(domain, actor, "active"); e != nil { + t.Fatal(e) + } + if e = s.setSystemExtensionEnabled(domain, "organizer.feeds", false); e != nil { + t.Fatal(e) + } + if due, err := s.store.DueFeedSources(ctx); err != nil || len(due) != 0 { + t.Fatal("disabled extension starves queue", due, err) + } +} + +func TestFeedNoteAtomicReceiptAndPermissions(t *testing.T) { + s, token, domain, _, source := feedFixture(t) + ctx := context.Background() + claim, e := s.store.ClaimFeed(ctx, source) + if e != nil { + t.Fatal(e) + } + if e = s.store.CompleteFeed(ctx, claim, []store.FeedItem{{ID: "note", Title: "Title", Body: "Body"}}, "", "", "", false); e != nil { + t.Fatal(e) + } + id := uuid.NewString() + input := map[string]any{"request_id": id, "source": source.UUID, "id": "note", "path": "/notes/rss-" + id, "title": "RSS title", "body": "Source: https://example.org\n{{children}} ", "confirm_publication": true} + w := feedRequestTest(s, token, "POST", "note", input) + if w.Code != 201 { + t.Fatal(w.Code, w.Body) + } + original := w.Body.String() + if w = feedRequestTest(s, token, "POST", "note", input); w.Code != 201 || w.Body.String() != original { + t.Fatal("replay", w.Code, w.Body) + } + var response map[string]string + json.Unmarshal(w.Body.Bytes(), &response) + rev, e := s.store.GetLatestRevision(response["page_uuid"]) + if e != nil || strings.Contains(rev.Body, "{{children}}") || strings.Contains(rev.Body, " {{children}}\n\nSource content stays inert.", Feed: "技術ニュース", URL: "https://example.org/article", PublishedMS: int64(1793500000000 + i)}) + } + if e = s.store.CompleteFeed(context.Background(), claim, items, "", "", "", false); e != nil { + t.Fatal(e) + } + _ = domain + _ = actor + s.store.BackgroundJobsDisabled = true + s = New(s.store) + script, e := os.ReadFile("internal/server/testdata/feeds.js") + if e != nil { + t.Fatal(e) + } + handler := s.handler() + web := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + if r.URL.Path == "/fixture" { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + fmt.Fprint(w, "") + return + } + handler.ServeHTTP(w, r) + })) + defer web.Close() + for _, width := range []string{"1440", "390"} { + ctx, cancel := context.WithTimeout(context.Background(), 45*time.Second) + args := []string{"internal/server/testdata/vim-browser-smoke.mjs", web.URL + "/fixture?width=" + url.QueryEscape(width), t.TempDir(), "/tmp/pageswiki-feeds-" + width + ".png", width, "850"} + out, e := exec.CommandContext(ctx, "node", args...).CombinedOutput() + cancel() + if e != nil { + t.Fatalf("browser %s: %v %s", width, e, out) + } + } +} diff --git a/internal/server/organizer_dashboard.go b/internal/server/organizer_dashboard.go index f1e2884..ce0161b 100644 --- a/internal/server/organizer_dashboard.go +++ b/internal/server/organizer_dashboard.go @@ -93,6 +93,8 @@ func (s *Server) handleDashboardData(w http.ResponseWriter, r *http.Request, act func organizerSection(path string) string { switch { + case feedRoute(path): + return "feeds" case path == "/v/plan/dashboard": return "dashboard" case strings.HasPrefix(path, "/-/sys/config"): diff --git a/internal/server/request_context.go b/internal/server/request_context.go index 206b4eb..5538913 100644 --- a/internal/server/request_context.go +++ b/internal/server/request_context.go @@ -68,6 +68,7 @@ func (s *Server) renderWithContext( data["CalendarEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.calendar") data["TasksEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.tasks") data["ContactsEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.contacts") + data["FeedsEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.feeds") data["OrganizerSection"] = organizerSection(r.URL.Path) if r.URL.Path == "/" { data["IsHome"] = true diff --git a/internal/server/tasks_handler.go b/internal/server/tasks_handler.go index 9ef735a..aa81345 100644 --- a/internal/server/tasks_handler.go +++ b/internal/server/tasks_handler.go @@ -20,6 +20,9 @@ import ( const tasksAPI = "/_/api/v1/extension/organizer.tasks/" func taskRoute(p string) bool { + if feedRoute(p) { + return true + } if p == "/v/plan/dashboard" { return true } @@ -30,6 +33,8 @@ func taskRoute(p string) bool { } func (s *Server) registerTaskRoutes() { + s.mux.HandleFunc("/v/feeds", s.handleFeeds) + s.mux.HandleFunc(feedsAPI, s.handleFeeds) s.mux.HandleFunc("/v/plan/dashboard", s.handleOrganizerDashboard) s.mux.HandleFunc(contactDAV, s.handleContactDAV) s.mux.HandleFunc(strings.TrimSuffix(contactDAV, "/"), s.handleContactDAV) diff --git a/internal/server/testdata/feeds.js b/internal/server/testdata/feeds.js new file mode 100644 index 0000000..c2fd10c --- /dev/null +++ b/internal/server/testdata/feeds.js @@ -0,0 +1,21 @@ +(async()=>{ + const delay=ms=>new Promise(r=>setTimeout(r,ms)),assert=(ok,msg)=>{if(!ok)throw Error(msg);}; + const wait=async check=>{for(let i=0;i<200;i++){if(check())return;await delay(30);}throw Error('Timeout: '+check);}; + const frame=document.createElement('iframe');frame.style='display:block;width:100%;height:100vh;border:0';document.body.append(frame); + try{ + await new Promise(resolve=>{frame.onload=resolve;frame.src='/v/feeds';});const d=frame.contentDocument,w=frame.contentWindow; + await wait(()=>d.querySelectorAll('.feed-row').length===100); + assert(d.documentElement.scrollWidth<=w.innerWidth,'Viewport overflow'); + d.getElementById('feed-rows').focus();d.dispatchEvent(new w.KeyboardEvent('keydown',{key:'j',bubbles:true})); + await wait(()=>d.querySelector('#feed-reader .feed-body'));assert(d.querySelector('#feed-reader .feed-body').textContent.includes('{{ end }} diff --git a/templates/pages/organizer_settings.gohtml b/templates/pages/organizer_settings.gohtml index a3a68ca..a3e8576 100644 --- a/templates/pages/organizer_settings.gohtml +++ b/templates/pages/organizer_settings.gohtml @@ -3,6 +3,7 @@
{{ template "auth-menu" . }}
{{ template "organizer-nav" . }}

{{ T "organizer.settings" }}

{{ T "organizer.private" }}

+{{ if .FeedsEnabled }}

{{ T "feeds.title" }}

{{ T "feeds.help" }}

⚙ {{ T "feeds.title" }}
{{ end }} {{ if .TasksEnabled }}

{{ end }} {{ if .CalendarEnabled }}

{{ T "organizer.calendar_defaults" }}

{{ end }}
{{ end }} diff --git a/templates/partials/organizer_nav.gohtml b/templates/partials/organizer_nav.gohtml index d9f8754..26d8765 100644 --- a/templates/partials/organizer_nav.gohtml +++ b/templates/partials/organizer_nav.gohtml @@ -1,12 +1,14 @@ {{ define "organizer-nav" }} {{ end }} {{ define "organizer-shortcuts" }} +{{ if .FeedsEnabled }}{{ end }} {{ if .TasksEnabled }}{{ end }} {{ if .ContactsEnabled }}{{ end }} {{ end }}