fedipod-server 0.17.0 → 0.18.0

package/web/app/index.html

@@ -110,20 +110,30 @@ a { color: var(--accent); }
 </section>
 
 <!-- Shown only on a browser that has signed in but has never opened the signing
-     key. The key is kept on the pod encrypted under the account password, so
-     the pod's host cannot sign as you; a browser opens it once and remembers. -->
+     key. The key is kept on the pod encrypted under the sign-up password, so
+     the pod's host cannot sign as you; a browser opens it once and remembers.
+     The second block is for someone who no longer has that password: a new
+     key, locked under the password they use now. -->
 <section id="unlock" hidden>
   <h2>Unlock your signing key</h2>
-  <p>Your signing key is stored on your pod, locked under your account password,
-  so nobody who can read your pod — your pod's host included — can post as you.
-  This browser has not opened it yet.</p>
+  <p>Your signing key is stored on your pod, locked under the password you gave
+  when you signed up, so nobody who can read your pod — your pod's host included
+  — can post as you. This browser has not opened it yet.</p>
   <p class="row">
     <input type="password" id="unlock-password" autocomplete="current-password"
-      placeholder="Your account password" aria-label="Your account password">
+      placeholder="Your password" aria-label="Your password">
     <button type="button" class="primary" id="unlock-go">unlock</button>
   </p>
   <p class="err" id="unlock-error" role="alert"></p>
   <p class="hint">This browser only — it is not sent anywhere.</p>
+  <h2>Changed your pod password, or lost the old one?</h2>
+  <p>Make a new signing key, locked under the password you use now. Your account,
+  address, posts and followers stay as they are; other servers learn the new key
+  the next time they hear from you.</p>
+  <p><button type="button" id="unlock-newkey">make a new signing key</button></p>
+  <p id="unlock-newkey-confirm" hidden>This replaces the key on your pod. Type the
+  password you use now in the field above, then
+  <button type="button" id="unlock-newkey-go">make the new key</button></p>
 </section>
 
 

package/web/app/site/admin/index.html

@@ -277,6 +277,8 @@ pre { overflow-x: auto; background: #0001; padding: .6rem; border-radius: .3rem;
 
 <section id="pane-identity" hidden>
   <dl id="facts"></dl>
+  <!-- State documents the agent could not read on its last load, if any. -->
+  <p class="err" id="state-skipped" role="alert" hidden></p>
   <!-- Declared here, and render() puts these on the kind row — the row they
        belong to is generated, so this is the only place they can be written
        down. Each reads as the setting it would change, so what it shows IS the

package/web/app/site/admin/upkeep.js

@@ -145,8 +145,16 @@ const INBOX_PROMPT_AT = 500;
 let dismissed = false;
 
 async function renderInbox() {
-  if (dismissed) return;
   const { json: st } = await api('/status');
+  // A state document the last load could not read is a timeline or a contact
+  // list quietly missing; the page says which, under the facts.
+  const skipped = st?.stateSkipped || [];
+  const line = $('state-skipped');
+  line.hidden = !skipped.length;
+  line.textContent = skipped.length
+    ? `${skipped.length} state document${skipped.length === 1 ? '' : 's'} could not be read on the last load: ${skipped.join(', ')}.`
+    : '';
+  if (dismissed) return;
   const box = st?.inbox;
   const panel = $('pane-inbox');
   if (!box || box.count < INBOX_PROMPT_AT) { panel.hidden = true; return; }

package/web/app/site/boot.js

@@ -33075,7 +33075,7 @@ var PodTransport = class {
    * says all of it. The parsed graph must mention the WebID before anything is
    * written back — an empty or foreign body must never become the new profile.
    */
-  async linkAccountInProfile({ actorUrl, accountName, kind = "person" }) {
+  async linkAccountInProfile({ actorUrl, accountName, kind = "person", outbox = null }) {
     const docUrl = this.webId.split("#")[0];
     const res = await this.fetch(docUrl, { headers: { accept: "text/turtle" } });
     if (res.status >= 400) throw new Error(`[${this.label}] GET ${docUrl} \u2192 ${res.status}`);
@@ -33091,10 +33091,16 @@ var PodTransport = class {
       [me, FOAF("account"), actor],
       [actor, RDF3("type"), FOAF("OnlineAccount")],
       [actor, RDF3("type"), kind === "group" ? AS("Group") : AS("Person")],
-      [actor, FOAF("accountName"), literal2(accountName)]
+      [actor, FOAF("accountName"), literal2(accountName)],
+      // Where a Solid client posts on this person's behalf (`as:outbox` on the
+      // WebID is what dokieli reads); only where a door exists to take it.
+      ...outbox ? [[me, AS("outbox"), namedNode2(outbox)]] : []
     ];
     const missing = wanted.filter(([s, p, o]) => !g.holds(s, p, o, doc));
-    const stale = g.statementsMatching(actor, FOAF("accountName"), null, doc).filter((st2) => st2.object.value !== accountName);
+    const stale = [
+      ...g.statementsMatching(actor, FOAF("accountName"), null, doc).filter((st2) => st2.object.value !== accountName),
+      ...outbox ? g.statementsMatching(me, AS("outbox"), null, doc).filter((st2) => st2.object.value !== outbox) : []
+    ];
     if (!missing.length && !stale.length) return false;
     const deletes = stale.map((st2) => [st2.subject, st2.predicate, st2.object]);
     if (await this.patchDocument(docUrl, missing, deletes)) return true;
@@ -33202,12 +33208,54 @@ var BrowserRemotePod = class extends PodTransport {
 // lib/pod/state.mjs
 var readWrappedKeys = (pod, urls) => pod.getJson(urls.state + "keys.json");
 var readConfig = (pod, urls) => pod.getJson(urls.state + "config.json");
+var writeWrappedKeys = (pod, urls, envelope) => pod.putJson(urls.state + "keys.json", envelope, "application/json");
 var writeConfig = (pod, urls, config) => pod.putJson(urls.state + "config.json", config, "application/json");
 async function provisionKey(pod, { stateUrl, keysUrl, envelope }) {
   await pod.setAcl(stateUrl, []);
   await pod.putJson(keysUrl, envelope, "application/json");
 }
 
+// lib/pod/root.mjs
+var OWNER_LOOKUP_MS = 5e3;
+var PUBLIC_DOC_MAX_BYTES = 1024 * 1024;
+async function podLayout(fetchImpl, providerOrigin, { timeoutMs = OWNER_LOOKUP_MS } = {}) {
+  let origin;
+  try {
+    origin = new URL(providerOrigin).origin;
+  } catch {
+    return null;
+  }
+  let res;
+  try {
+    res = await fetchImpl(
+      `${origin}/.well-known/solid`,
+      { headers: { accept: "text/turtle" }, signal: AbortSignal.timeout(timeoutMs) }
+    );
+  } catch {
+    return null;
+  }
+  if (res.status === 501) return "host";
+  if (res.status !== 200) return null;
+  let body = "";
+  try {
+    body = await readCapped(res, 64 * 1024);
+  } catch {
+    return null;
+  }
+  return /ns\/pim\/space#Storage|pim:Storage/u.test(body) ? "path" : null;
+}
+async function resourceExists(fetchImpl, url, { timeoutMs = OWNER_LOOKUP_MS } = {}) {
+  try {
+    const res = await fetchImpl(
+      url,
+      { headers: { accept: "application/activity+json" }, signal: AbortSignal.timeout(timeoutMs) }
+    );
+    return !!res && res.status === 200;
+  } catch {
+    return false;
+  }
+}
+
 // web/app/idb-kv.mjs
 var DB = "fedipod-accounts";
 function open() {
@@ -33310,6 +33358,7 @@ async function signUp(answers, { onStep = () => {
       acct.running("checking your pod");
       const head = await fetch(brought, { method: "HEAD" }).catch(() => null);
       if (!head || head.status >= 400) throw new Error(`the pod at ${brought} did not answer (HTTP ${head?.status || "no response"})`);
+      if (await resourceExists(fetch, actorUrlFor(brought))) throw new Error("The pod already hosts a FediPod account. If you want a second account, put it on a different pod.");
       prog.pod = brought;
       acct.skip("using the pod you brought");
     }
@@ -33450,36 +33499,6 @@ function podBaseOfWebId(webId) {
   return `${u.origin}${dir.endsWith("/") ? dir : dir + "/"}`;
 }
 
-// lib/pod/root.mjs
-var OWNER_LOOKUP_MS = 5e3;
-var PUBLIC_DOC_MAX_BYTES = 1024 * 1024;
-async function podLayout(fetchImpl, providerOrigin, { timeoutMs = OWNER_LOOKUP_MS } = {}) {
-  let origin;
-  try {
-    origin = new URL(providerOrigin).origin;
-  } catch {
-    return null;
-  }
-  let res;
-  try {
-    res = await fetchImpl(
-      `${origin}/.well-known/solid`,
-      { headers: { accept: "text/turtle" }, signal: AbortSignal.timeout(timeoutMs) }
-    );
-  } catch {
-    return null;
-  }
-  if (res.status === 501) return "host";
-  if (res.status !== 200) return null;
-  let body = "";
-  try {
-    body = await readCapped(res, 64 * 1024);
-  } catch {
-    return null;
-  }
-  return /ns\/pim\/space#Storage|pim:Storage/u.test(body) ? "path" : null;
-}
-
 // web/app/oidc-session.mjs
 var DB2 = "fedipod-oidc";
 var STORE = "session";
@@ -33725,8 +33744,7 @@ async function bootWorker({ reset = false } = {}) {
   worker.postMessage({ type: "boot", frontOrigin: location.origin });
   await booted;
 }
-window.fedipodUnlock = async (password) => {
-  if (!password) throw new Error("Enter your account password.");
+async function readAccountState() {
   const session = await getSession();
   if (!session) throw new Error("Sign in first.");
   const podFromWebId = podBaseOfWebId(session.webId);
@@ -33738,13 +33756,28 @@ window.fedipodUnlock = async (password) => {
     readConfig(remote, urls),
     readWrappedKeys(remote, urls)
   ]);
-  if (!cfg || !doc) throw new Error(`could not read this account's config and key under ${state}`);
+  if (!cfg) throw new Error(`could not read this account's config under ${state}`);
+  const actorUrl = `${cfg.remotePod}${cfg.root || AP_ROOT}ap/actor`;
+  return { remote, urls, cfg, doc, actorUrl };
+}
+window.fedipodUnlock = async (password) => {
+  if (!password) throw new Error("Enter your password.");
+  const { doc, actorUrl } = await readAccountState();
+  if (!doc) throw new Error("could not read this account's key on the pod");
   if (!isKeyEnvelope(doc)) throw new Error("this account's key is not locked \u2014 nothing to unlock");
   const rec = await unwrapKeys(doc, password);
-  const actorUrl = `${cfg.remotePod}${cfg.root || AP_ROOT}ap/actor`;
   await cacheOpenedKeys(actorUrl, rec);
   await bootWorker();
 };
+window.fedipodNewKey = async (password) => {
+  if (!password) throw new Error("Enter the password you use for your pod now.");
+  const { remote, urls, cfg, actorUrl } = await readAccountState();
+  const keys = await generateKeys();
+  keys.mintedFor = cfg.gateway?.frontActor || actorUrl;
+  await writeWrappedKeys(remote, urls, await wrapKeys(keys, password));
+  await cacheOpenedKeys(actorUrl, keys);
+  await bootWorker();
+};
 window.fedipodSignup = async ({ onStep, ...answers }) => {
   await signUp(answers, { onStep, frontOrigin: location.origin });
   const { authorizationUrl } = await beginLogin({ issuer: answers.issuer, redirectUri: REDIRECT });
@@ -33849,6 +33882,25 @@ if (typeof document !== "undefined") (async () => {
   $("unlock-password")?.addEventListener("keydown", (e) => {
     if (e.key === "Enter") doUnlock();
   });
+  $("unlock-newkey")?.addEventListener("click", () => {
+    $("unlock-newkey-confirm").hidden = false;
+    $("unlock-password").focus();
+  });
+  const doNewKey = async () => {
+    $("unlock-error").textContent = "";
+    const btn = $("unlock-newkey-go");
+    btn.disabled = true;
+    try {
+      await window.fedipodNewKey($("unlock-password").value);
+      $("unlock-password").value = "";
+      location.href = "/admin/client/";
+    } catch (err) {
+      $("unlock-error").textContent = err.message || String(err);
+      btn.disabled = false;
+      $("unlock-password").select();
+    }
+  };
+  $("unlock-newkey-go")?.addEventListener("click", doNewKey);
   if (params.has("signout") || params.has("add")) {
     if (params.has("signout")) {
       try {

package/web/app/site/index.html

@@ -110,20 +110,30 @@ a { color: var(--accent); }
 </section>
 
 <!-- Shown only on a browser that has signed in but has never opened the signing
-     key. The key is kept on the pod encrypted under the account password, so
-     the pod's host cannot sign as you; a browser opens it once and remembers. -->
+     key. The key is kept on the pod encrypted under the sign-up password, so
+     the pod's host cannot sign as you; a browser opens it once and remembers.
+     The second block is for someone who no longer has that password: a new
+     key, locked under the password they use now. -->
 <section id="unlock" hidden>
   <h2>Unlock your signing key</h2>
-  <p>Your signing key is stored on your pod, locked under your account password,
-  so nobody who can read your pod — your pod's host included — can post as you.
-  This browser has not opened it yet.</p>
+  <p>Your signing key is stored on your pod, locked under the password you gave
+  when you signed up, so nobody who can read your pod — your pod's host included
+  — can post as you. This browser has not opened it yet.</p>
   <p class="row">
     <input type="password" id="unlock-password" autocomplete="current-password"
-      placeholder="Your account password" aria-label="Your account password">
+      placeholder="Your password" aria-label="Your password">
     <button type="button" class="primary" id="unlock-go">unlock</button>
   </p>
   <p class="err" id="unlock-error" role="alert"></p>
   <p class="hint">This browser only — it is not sent anywhere.</p>
+  <h2>Changed your pod password, or lost the old one?</h2>
+  <p>Make a new signing key, locked under the password you use now. Your account,
+  address, posts and followers stay as they are; other servers learn the new key
+  the next time they hear from you.</p>
+  <p><button type="button" id="unlock-newkey">make a new signing key</button></p>
+  <p id="unlock-newkey-confirm" hidden>This replaces the key on your pod. Type the
+  password you use now in the field above, then
+  <button type="button" id="unlock-newkey-go">make the new key</button></p>
 </section>