add ap timeline fixer

totegamma · totegamma · commit ae725b09e8b2 · 2026-08-08T21:07:58.000+09:00
diff --git a/app/src/views/Activitypub.tsx b/app/src/views/Activitypub.tsx
@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next'
 import { useClient } from '../contexts/Client'
 import { useStack } from '../layouts/Stack'
 import { ApView } from './ApView'
-import { NotFoundError } from '@concrnt/client'
+import { NotFoundError, type Document, type PolicyEntry } from '@concrnt/client'
 import { Schemas, semantics, type Timeline } from '@concrnt/worldlib'
 import { MdPlaylistAdd } from 'react-icons/md'
 import { Subscription } from '../components/Subscription'
@@ -48,11 +48,17 @@ export const Activitypub = () => {
 
     const homeTimelineRegex = new RegExp(`^cckv://${client.ccid}/concrnt\\.world/profiles/([^/]+)/home-timeline$`)
     const inboxUri = apInboxKey(client.ccid)
+    const allowWriters = 'https://policy.concrnt.world/t/allow-writers.json'
 
     // ActivityPubタイムラインはリスト未登録だとknownCommunitiesに出ない上、
     // どのリストにも無いと受信した投稿を見る手段が無いので警告を出す
     const [pinnedLists] = useSubscribe(client.pinnedLists)
     const [inboxListed, setInboxListed] = useState(true)
+
+    // inboxのpolicyがブリッジの現serviceAccountIdを許可していないと配送が全て拒否される
+    // (誤ったIDが広告された期間に設定画面を開くと壊れたpolicyが書き込まれる事故があった)
+    const [inboxPolicyBroken, setInboxPolicyBroken] = useState(false)
+    const [repairError, setRepairError] = useState(false)
     useEffect(() => {
         Promise.all(
             pinnedLists.map(async (pin) => {
@@ -99,7 +105,7 @@ export const Activitypub = () => {
                 const defaultPolicy = {
                     entries: [
                         {
-                            url: 'https://policy.concrnt.world/t/allow-writers.json',
+                            url: allowWriters,
                             params: {
                                 entities: [res.serviceAccountId]
                             }
@@ -110,19 +116,40 @@ export const Activitypub = () => {
                 client.api
                     .getDocument<any>(inboxUri)
                     .then((doc) => {
+                        // 配送時のrequesterはブリッジのserviceAccountIdなので、allow-writersの
+                        // entitiesに現在のIDが含まれていないと受信が全て拒否される
+                        const broken = !(
+                            doc.policy?.entries?.some(
+                                (e: PolicyEntry) =>
+                                    e.url === allowWriters &&
+                                    Array.isArray(e.params?.entities) &&
+                                    e.params.entities.includes(res.serviceAccountId)
+                            ) ?? false
+                        )
                         // 旧クライアントが作ったinboxはuserTimelineスキーマで名前を持てないため、
                         // communityTimelineスキーマに上書き修復する(ポリシーは維持)
-                        if (doc.schema === Schemas.communityTimeline && doc.value?.name) return
+                        if (doc.schema === Schemas.communityTimeline && doc.value?.name) {
+                            setInboxPolicyBroken(broken)
+                            return
+                        }
                         console.log('Inbox has no metadata. repairing...')
-                        client.api.commit({
-                            kind: 'record' as const,
-                            key: inboxUri,
-                            author: client.ccid,
-                            schema: Schemas.communityTimeline,
-                            value: inboxValue,
-                            createdAt: new Date(),
-                            policy: doc.policy ?? defaultPolicy
-                        })
+                        client.api
+                            .commit({
+                                kind: 'record' as const,
+                                key: inboxUri,
+                                author: client.ccid,
+                                schema: Schemas.communityTimeline,
+                                value: inboxValue,
+                                createdAt: new Date(),
+                                policy: doc.policy ?? defaultPolicy
+                            })
+                            // 警告(=修復ボタン)はこのcommitの完了後に出す。in-flightの自動commitが
+                            // 修復ボタンのcommit後に着弾して誤policyを書き戻す競合を避けるため
+                            .then(() => setInboxPolicyBroken(doc.policy ? broken : false))
+                            .catch((err) => {
+                                console.log(err)
+                                setInboxPolicyBroken(broken)
+                            })
                     })
                     .catch((err) => {
                         if (err instanceof NotFoundError) {
@@ -144,6 +171,57 @@ export const Activitypub = () => {
             })
     }, [])
 
+    const repairInboxPolicy = async (): Promise<void> => {
+        setRepairError(false)
+        try {
+            // マウント時のIDは誤ったIDが広告されていた期間のものかもしれないので、押下時点で取り直す
+            const info = await client.api.callConcrntApi<ApServerInfo>(
+                client.server.domain,
+                'net.concrnt.activitypub.info',
+                {}
+            )
+            // staleキャッシュ由来の誤検知のまま上書きしないよう、書き込み前にno-cacheで確定させる
+            let doc: Document<any> | null = null
+            try {
+                doc = await client.api.getDocument<any>(inboxUri, undefined, { cache: 'no-cache' })
+            } catch (err) {
+                if (!(err instanceof NotFoundError)) throw err
+            }
+            const alreadyOk =
+                doc?.policy?.entries?.some(
+                    (e: PolicyEntry) =>
+                        e.url === allowWriters &&
+                        Array.isArray(e.params?.entities) &&
+                        e.params.entities.includes(info.serviceAccountId)
+                ) ?? false
+            if (alreadyOk) {
+                setInboxPolicyBroken(false)
+                return
+            }
+            // allow-writers系entryは全て除去して正規形1本に置換(誤IDに書き込み権を残さない)。
+            // restrict-readers等の他entryは温存
+            const entries = (doc?.policy?.entries ?? []).filter((e: PolicyEntry) => e.url !== allowWriters)
+            entries.push({ url: allowWriters, params: { entities: [info.serviceAccountId] } })
+            const value =
+                doc?.schema === Schemas.communityTimeline && doc.value?.name
+                    ? doc.value
+                    : { name: 'ActivityPub', shortname: 'activitypub', description: 'ActivityPub home stream' }
+            await client.api.commit({
+                kind: 'record' as const,
+                key: inboxUri,
+                author: client.ccid,
+                schema: Schemas.communityTimeline,
+                value,
+                createdAt: new Date(),
+                policy: { entries }
+            })
+            setInboxPolicyBroken(false)
+        } catch (err) {
+            console.error('failed to repair inbox policy:', err)
+            setRepairError(true)
+        }
+    }
+
     const updateListenTimelines = () => {
         const listenTimelines = [
             ...(listenHome ? [semantics.homeTimeline(client.ccid, listenProfile)] : []),
@@ -236,6 +314,21 @@ export const Activitypub = () => {
                                 </Button>
                             </div>
                         )}
+                        {inboxPolicyBroken && (
+                            <div style={{ display: 'flex', alignItems: 'center', gap: CssVar.space(1) }}>
+                                <Text variant="caption" style={{ color: 'red' }}>
+                                    {t('inboxPolicyBroken')}
+                                </Text>
+                                <Button variant="text" busyChildren={t('repairing')} onClick={repairInboxPolicy}>
+                                    {t('repair')}
+                                </Button>
+                            </div>
+                        )}
+                        {repairError && (
+                            <Text variant="caption" style={{ color: 'red' }}>
+                                {t('repairFailed')}
+                            </Text>
+                        )}
                         <Divider />
                         <Text>{t('forwardTimeline')}</Text>
                         <Text>{t('forwardTimelineDesc')}</Text>
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@concrnt/client",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
diff --git a/client/src/crypto.ts b/client/src/crypto.ts
@@ -172,6 +172,8 @@ export const ValidateSignature = (body: string, signature: string, expectedKeyID
 }
 
 export const LoadKey = (privateKey: string): KeyPair | null => {
+    // ellipticは非hex文字列からも黙って鍵を導出してしまうため、ここで弾く
+    if (!/^[0-9a-f]{64}$/i.test(privateKey)) return null
     try {
         const ellipsis = new Ec('secp256k1')
         const keyPair = ellipsis.keyFromPrivate(privateKey)
diff --git a/locales/en/translation.json b/locales/en/translation.json
@@ -345,6 +345,10 @@
             "forwardTimelineDesc": "Your posts to the selected timelines will be forwarded to ActivityPub. If none are set, your home timeline is used.",
             "inboxNotListed": "The ActivityPub timeline is not in any of your lists. Add it to a list to see incoming posts.",
             "addToList": "Add to list",
+            "inboxPolicyBroken": "There is a problem with the inbox list permissions. Posts from ActivityPub cannot be delivered.",
+            "repair": "Repair",
+            "repairing": "Repairing...",
+            "repairFailed": "Repair failed. Please try again later.",
             "update": "Update",
             "inquiry": "Inquiry"
         },
diff --git a/locales/ja/translation.json b/locales/ja/translation.json
@@ -345,6 +345,10 @@
             "forwardTimelineDesc": "選択したタイムラインへの自分の投稿がActivityPubへ転送されます。未設定の場合はホームタイムラインが使用されます。",
             "inboxNotListed": "ActivityPubタイムラインがどのリストにも登録されていません。リストに追加しないと受信した投稿が表示されません。",
             "addToList": "リストに追加",
+            "inboxPolicyBroken": "受信リストの権限設定に問題があり、ActivityPubからの投稿が届かない状態です。",
+            "repair": "修復する",
+            "repairing": "修復中...",
+            "repairFailed": "修復に失敗しました。時間をおいて再度お試しください。",
             "update": "更新",
             "inquiry": "照会"
         },
diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@concrnt/ui",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "type": "module",
   "files": [
     "dist"
diff --git a/web/src/views/Activitypub.tsx b/web/src/views/Activitypub.tsx
@@ -3,7 +3,7 @@ import { CssVar } from '../types/Theme'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useClient } from '../contexts/Client'
-import { NotFoundError } from '@concrnt/client'
+import { NotFoundError, type Document, type PolicyEntry } from '@concrnt/client'
 import { useNavigate } from 'react-router-dom'
 import { Schemas, semantics, type Timeline } from '@concrnt/worldlib'
 import { MdPlaylistAdd } from 'react-icons/md'
@@ -47,11 +47,17 @@ export const Activitypub = () => {
 
     const homeTimelineRegex = new RegExp(`^cckv://${client.ccid}/concrnt\\.world/profiles/([^/]+)/home-timeline$`)
     const inboxUri = apInboxKey(client.ccid)
+    const allowWriters = 'https://policy.concrnt.world/t/allow-writers.json'
 
     // ActivityPubタイムラインはリスト未登録だとknownCommunitiesに出ない上、
     // どのリストにも無いと受信した投稿を見る手段が無いので警告を出す
     const [pinnedLists] = useSubscribe(client.pinnedLists)
     const [inboxListed, setInboxListed] = useState(true)
+
+    // inboxのpolicyがブリッジの現serviceAccountIdを許可していないと配送が全て拒否される
+    // (誤ったIDが広告された期間に設定画面を開くと壊れたpolicyが書き込まれる事故があった)
+    const [inboxPolicyBroken, setInboxPolicyBroken] = useState(false)
+    const [repairError, setRepairError] = useState(false)
     useEffect(() => {
         Promise.all(
             pinnedLists.map(async (pin) => {
@@ -98,7 +104,7 @@ export const Activitypub = () => {
                 const defaultPolicy = {
                     entries: [
                         {
-                            url: 'https://policy.concrnt.world/t/allow-writers.json',
+                            url: allowWriters,
                             params: {
                                 entities: [res.serviceAccountId]
                             }
@@ -109,19 +115,40 @@ export const Activitypub = () => {
                 client.api
                     .getDocument<any>(inboxUri)
                     .then((doc) => {
+                        // 配送時のrequesterはブリッジのserviceAccountIdなので、allow-writersの
+                        // entitiesに現在のIDが含まれていないと受信が全て拒否される
+                        const broken = !(
+                            doc.policy?.entries?.some(
+                                (e: PolicyEntry) =>
+                                    e.url === allowWriters &&
+                                    Array.isArray(e.params?.entities) &&
+                                    e.params.entities.includes(res.serviceAccountId)
+                            ) ?? false
+                        )
                         // 旧クライアントが作ったinboxはuserTimelineスキーマで名前を持てないため、
                         // communityTimelineスキーマに上書き修復する(ポリシーは維持)
-                        if (doc.schema === Schemas.communityTimeline && doc.value?.name) return
+                        if (doc.schema === Schemas.communityTimeline && doc.value?.name) {
+                            setInboxPolicyBroken(broken)
+                            return
+                        }
                         console.log('Inbox has no metadata. repairing...')
-                        client.api.commit({
-                            kind: 'record' as const,
-                            key: inboxUri,
-                            author: client.ccid,
-                            schema: Schemas.communityTimeline,
-                            value: inboxValue,
-                            createdAt: new Date(),
-                            policy: doc.policy ?? defaultPolicy
-                        })
+                        client.api
+                            .commit({
+                                kind: 'record' as const,
+                                key: inboxUri,
+                                author: client.ccid,
+                                schema: Schemas.communityTimeline,
+                                value: inboxValue,
+                                createdAt: new Date(),
+                                policy: doc.policy ?? defaultPolicy
+                            })
+                            // 警告(=修復ボタン)はこのcommitの完了後に出す。in-flightの自動commitが
+                            // 修復ボタンのcommit後に着弾して誤policyを書き戻す競合を避けるため
+                            .then(() => setInboxPolicyBroken(doc.policy ? broken : false))
+                            .catch((err) => {
+                                console.log(err)
+                                setInboxPolicyBroken(broken)
+                            })
                     })
                     .catch((err) => {
                         if (err instanceof NotFoundError) {
@@ -143,6 +170,57 @@ export const Activitypub = () => {
             })
     }, [])
 
+    const repairInboxPolicy = async (): Promise<void> => {
+        setRepairError(false)
+        try {
+            // マウント時のIDは誤ったIDが広告されていた期間のものかもしれないので、押下時点で取り直す
+            const info = await client.api.callConcrntApi<ApServerInfo>(
+                client.server.domain,
+                'net.concrnt.activitypub.info',
+                {}
+            )
+            // staleキャッシュ由来の誤検知のまま上書きしないよう、書き込み前にno-cacheで確定させる
+            let doc: Document<any> | null = null
+            try {
+                doc = await client.api.getDocument<any>(inboxUri, undefined, { cache: 'no-cache' })
+            } catch (err) {
+                if (!(err instanceof NotFoundError)) throw err
+            }
+            const alreadyOk =
+                doc?.policy?.entries?.some(
+                    (e: PolicyEntry) =>
+                        e.url === allowWriters &&
+                        Array.isArray(e.params?.entities) &&
+                        e.params.entities.includes(info.serviceAccountId)
+                ) ?? false
+            if (alreadyOk) {
+                setInboxPolicyBroken(false)
+                return
+            }
+            // allow-writers系entryは全て除去して正規形1本に置換(誤IDに書き込み権を残さない)。
+            // restrict-readers等の他entryは温存
+            const entries = (doc?.policy?.entries ?? []).filter((e: PolicyEntry) => e.url !== allowWriters)
+            entries.push({ url: allowWriters, params: { entities: [info.serviceAccountId] } })
+            const value =
+                doc?.schema === Schemas.communityTimeline && doc.value?.name
+                    ? doc.value
+                    : { name: 'ActivityPub', shortname: 'activitypub', description: 'ActivityPub home stream' }
+            await client.api.commit({
+                kind: 'record' as const,
+                key: inboxUri,
+                author: client.ccid,
+                schema: Schemas.communityTimeline,
+                value,
+                createdAt: new Date(),
+                policy: { entries }
+            })
+            setInboxPolicyBroken(false)
+        } catch (err) {
+            console.error('failed to repair inbox policy:', err)
+            setRepairError(true)
+        }
+    }
+
     const updateListenTimelines = () => {
         const listenTimelines = [
             ...(listenHome ? [semantics.homeTimeline(client.ccid, listenProfile)] : []),
@@ -235,6 +313,21 @@ export const Activitypub = () => {
                                 </Button>
                             </div>
                         )}
+                        {inboxPolicyBroken && (
+                            <div style={{ display: 'flex', alignItems: 'center', gap: CssVar.space(1) }}>
+                                <Text variant="caption" style={{ color: 'red' }}>
+                                    {t('inboxPolicyBroken')}
+                                </Text>
+                                <Button variant="text" busyChildren={t('repairing')} onClick={repairInboxPolicy}>
+                                    {t('repair')}
+                                </Button>
+                            </div>
+                        )}
+                        {repairError && (
+                            <Text variant="caption" style={{ color: 'red' }}>
+                                {t('repairFailed')}
+                            </Text>
+                        )}
                         <Divider />
                         <Text>{t('forwardTimeline')}</Text>
                         <Text>{t('forwardTimelineDesc')}</Text>
diff --git a/worldlib/package.json b/worldlib/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@concrnt/client",`
`3`		`- "version": "2.0.4",`
	`3`	`+ "version": "2.0.5",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "dist/cjs/index.js",`
`6`	`6`	`"module": "dist/esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,8 @@ export const ValidateSignature = (body: string, signature: string, expectedKeyID`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`export const LoadKey = (privateKey: string): KeyPair \| null => {`
	`175`	`+ // ellipticは非hex文字列からも黙って鍵を導出してしまうため、ここで弾く`
	`176`	`+ if (!/^[0-9a-f]{64}$/i.test(privateKey)) return null`
`175`	`177`	`try {`
`176`	`178`	`const ellipsis = new Ec('secp256k1')`
`177`	`179`	`const keyPair = ellipsis.keyFromPrivate(privateKey)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@concrnt/ui",`
`3`		`- "version": "2.0.4",`
	`3`	`+ "version": "2.0.5",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"files": [`
`6`	`6`	`"dist"`