fedipod 1.4.1 → 1.6.0

package/lib/pod/urls.mjs

@@ -65,6 +65,20 @@ export function apUrls(remotePod, root, { publicBase = null } = {}) {
 // here. @name@host is looked up at https://host/.well-known/webfinger, so only
 // a pod that owns the root of its host can answer for one; a pod living at
 // https://server/name/ may publish the document but nothing will ever ask.
+/**
+ * The pod a WebID lives in: the URL up to the profile document's container.
+ * `https://alice.pod/profile/card#me` → `https://alice.pod/`, and on a shared
+ * host `https://server/alice/profile/card#me` → `https://server/alice/`. Taking
+ * the origin alone named the wrong pod for the second, which is every pod on a
+ * path.
+ */
+export function podBaseOfWebId(webId) {
+  const u = new URL(webId);
+  u.hash = ''; u.search = '';
+  const dir = u.pathname.replace(/profile\/card$/u, '').replace(/[^/]*$/u, '');
+  return `${u.origin}${dir.endsWith('/') ? dir : dir + '/'}`;
+}
+
 export function webfingerHost(podUrl) {
   const u = new URL(podUrl);
   return u.pathname === '/' ? u.host : null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fedipod",
-  "version": "1.4.1",
+  "version": "1.6.0",
   "description": "Standalone single-actor ActivityPub agent whose wire face, RDF truth and state all live on a Solid pod (CSS). Bundles a Phanpy UI and a Mastodon client-API facade.",
   "type": "module",
   "license": "MIT",

package/web/admin/setup/index.html

@@ -130,9 +130,20 @@ button:disabled { opacity: .5; cursor: default; }
         <label for="issuer-new">Solid pod provider</label>
         <select id="issuer-new" name="issuerNew" aria-describedby="issuer-new-hint">
           <option value="https://solidcommunity.net">solidcommunity.net</option>
+          <option value="https://privatedatapod.com">privatedatapod.com</option>
+          <option value="https://solid.redpencil.io">redpencil.io</option>
+          <option value="https://pods.solidcommunity.au">solidcommunity.au</option>
+          <option value="https://solidweb.me">solidweb.me</option>
+          <option value="https://teamid.live">teamid.live</option>
+          <option value="">Other…</option>
         </select>
-        <p class="hint" id="issuer-new-hint">Providers that give each pod its own subdomain, so the
-          Fediverse address works everywhere.</p>
+        <div id="row-issuer-other" hidden>
+          <label for="issuerOther">Provider address</label>
+          <input type="url" id="issuerOther" name="issuerOther" autocomplete="url" placeholder="https://pods.example.org">
+        </div>
+        <p class="hint" id="issuer-new-hint">The Community Solid Server providers from
+          solidproject.org. A provider that puts pods on paths gives your address at a
+          gateway instead.</p>
       </div>
 
       <div id="row-issuer-existing" hidden>
@@ -170,6 +181,18 @@ button:disabled { opacity: .5; cursor: default; }
       Wrong account or pod?
       <button type="button" id="form-reenter" title="   Discard the credential and enter the account and pod again">Re-enter credentials</button></p>
 
+    <fieldset id="fs-shape" hidden>
+      <legend>Where your address lives</legend>
+      <label class="choice"><input type="radio" name="shape" value="pod" checked> On your pod</label>
+      <label class="choice"><input type="radio" name="shape" value="front"> At a gateway</label>
+      <div id="row-gateway" hidden>
+        <label for="gatewayOrigin">Gateway</label>
+        <input type="url" id="gatewayOrigin" name="gatewayOrigin" value="https://fedipod.net" autocomplete="url">
+        <p class="hint">The gateway answers your address and forwards your mail to your pod.</p>
+      </div>
+      <p class="hint" id="shape-note" hidden></p>
+    </fieldset>
+
     <h2>You will be</h2>
     <p class="address" id="preview">…</p>
     <div id="preview-notes"></div>

package/web/admin/setup/setup.js

@@ -93,12 +93,18 @@ function answers() {
   const f = $('form').elements;
   const kind = f.kind.value;
   const mode = state.resumable ? 'existing' : f.mode.value;
+  const issuer = mode === 'new'
+    ? (f.issuerNew.value || (f.issuerOther ? f.issuerOther.value : '')).trim()
+    : f.issuer.value.trim();
   const a = {
     kind,
     mode,
     handle: f.handle.value.trim(),
-    issuer: (mode === 'new' ? f.issuerNew.value : f.issuer.value).trim(),
+    issuer,
     email: f.email.value.trim(),
+    // Where the address lives; a group cannot front (yet), so it stays 'pod'.
+    shape: (kind === 'group') ? 'pod' : (f.shape ? f.shape.value : 'pod'),
+    gatewayOrigin: (f.gatewayOrigin ? f.gatewayOrigin.value.trim() : '') || 'https://fedipod.net',
   };
   if (mode === 'new') a.podName = f.podName.value.trim() || a.handle;
   else a.pod = f.pod.value.trim();
@@ -128,6 +134,9 @@ function onEdit() {
   $('row-pod').hidden = mode === 'new';
   $('row-issuer-new').hidden = mode !== 'new';
   $('row-issuer-existing').hidden = mode === 'new';
+  const f = $('form').elements;
+  if ($('row-issuer-other')) $('row-issuer-other').hidden = !(mode === 'new' && f.issuerNew.value === '');
+  if ($('row-gateway')) $('row-gateway').hidden = !(f.shape && f.shape.value === 'front');
   clearTimeout(editTimer);
   editTimer = setTimeout(preview, 150);
 }
@@ -140,6 +149,26 @@ async function preview() {
   const { json } = await postJson('/setup/check', a);
   if (!json) return;
   $('preview').textContent = json.address || '…';
+  // The address-shape choice: hidden for a group (a group cannot front yet),
+  // locked to the gateway for a pod on a suffix-based host, an open choice
+  // for a pod at its own host.
+  const f = $('form').elements;
+  const shapeFs = $('fs-shape');
+  if (shapeFs) {
+    const isGroup = a.kind === 'group';
+    shapeFs.hidden = isGroup || (a.mode === 'existing' && !a.pod);
+    const forced = !!json.forced;
+    for (const r of f.shape) r.disabled = forced;
+    if (forced) { for (const r of f.shape) r.checked = r.value === 'front'; }
+    if ($('row-gateway')) $('row-gateway').hidden = !(f.shape.value === 'front');
+    const note = $('shape-note');
+    if (note) {
+      note.hidden = !forced;
+      note.textContent = forced
+        ? 'Your pod is on a suffix-based host, so its address lives at the gateway. Your posts, key and data stay on your pod.'
+        : '';
+    }
+  }
   const notes = $('preview-notes');
   for (const w of json.warnings || []) {
     const p = document.createElement('p');

package/web/app/README.md

@@ -72,6 +72,6 @@ See the `MastoApi` options in `agent.mjs`.
 | **Streaming** | a service worker answers fetches, not sockets. No streaming URL is advertised, so clients poll. |
 | **Web push** | `shims/web-push.mjs` is a no-op. `vapid` is omitted, and a client that subscribes anyway gets a 422 rather than a subscription nothing will push to. |
 | **Scheduled posts** | nothing runs between now and the scheduled time. A `scheduled_at` is refused with a 422 that says so — accepting one was silent loss. |
-| **Groups** | sign-up makes personal identities only (`signup.mjs`), and the moderation surface is not here. Joining a group works; hosting one needs the installed agent. See `groups.md`. |
-| **A fronted `@you@front` handle** | the browser model is `@you@yourpod` with the gateway as a mail door. `admin-facade.mjs` refuses a fronted attach, and `stage-site.mjs` hides the radio that offered it. |
+| **Groups** | sign-up makes personal identities only (`signup.mjs`), and the moderation surface is not here. Joining a group works; hosting one needs the DeviceAgent. See `groups.md`. |
+| **Changing where the address lives** | the shape is chosen at sign-up (`signup.mjs`): on the pod, `@you@yourpod` with the gateway as a mail door, or at the gateway, `@you@front` — and a pod on a suffix-based host is always fronted. `admin-facade.mjs` refuses changing it afterwards, because a rename needs a restart a browser does not have. |
 | **Moving the private half** | `/state-move` is about filesystem paths and `credential.json`. A browser has neither; its private half is always on the pod. |

package/web/app/admin-facade.mjs

@@ -317,7 +317,7 @@ export class AdminFacade {
         const aliases = [...(cfg.aliases || [])];
         if (body.add) {
           if (!webfingerHost(urls.base) && !cfg.gateway?.frontActor) {
-            return json(400, { error: 'this pod is a path on a shared host, so other servers could never resolve it as a Move target' });
+            return json(400, { error: 'this pod is a suffix-based host, so other servers could never resolve it as a Move target' });
           }
           const id = await this.resolveActor(body.add);
           if (!id) return json(400, { error: `could not fetch the old account (${body.add}) — enter its URL or @user@host, and it must answer` });

package/web/app/agent.mjs

@@ -17,7 +17,7 @@ import { MastoApi } from '../../lib/client/masto/index.mjs';
 import { TagFeed } from '../../lib/connections/tagfeed.mjs';
 import { makeDpopSession } from './pod-auth.mjs';
 import { BrowserRemotePod } from './pod-remote.mjs';
-import { importSigningKey, loadKeysFromPod, cacheOpenedKeys } from './keys-browser.mjs';
+import { importSigningKey, loadKeysFromPod, cacheOpenedKeys, podActorOf } from './keys-browser.mjs';
 import { generateKeys, wrapKeys } from './keystore.mjs';
 import { RelayDeliverer, doorKeyOf } from './deliver-relay.mjs';
 import { AdminFacade } from './admin-facade.mjs';
@@ -26,6 +26,7 @@ import { BskyFeed } from '../../lib/connections/bskyfeed.mjs';
 import { BrowserFediAccounts } from './fediacct-browser.mjs';
 import { AcctFeed } from '../../lib/connections/acctfeed.mjs';
 import { followActor, unfollowActor, resolveHandle } from '../../lib/core/social.mjs';
+import { podBaseOfWebId } from '../../lib/pod/urls.mjs';
 import { ImportWorker } from '../../lib/connections/import.mjs';
 
 // The authorities this identity answers on: exactly one, this origin. The Node
@@ -159,7 +160,7 @@ export class BrowserAgent {
     if (oidc) {
       session = { fetch: (u, i) => oidc.fetch(u, i) };
       webId = oidc.webId;
-      remotePod = new URL(webId).origin + '/';
+      remotePod = podBaseOfWebId(webId);              // the pod, which on a suffix-based host is a path
     } else {
       const dpop = await makeDpopSession(credential);
       session = { fetch: (u, i) => dpop.fetch(u, i) };
@@ -169,6 +170,8 @@ export class BrowserAgent {
     this.webId = webId;
     const root = (config && config.root) || 'fedipod/';
     this.remote = new BrowserRemotePod(session, { webId, log: this.log });
+    // Pod-native for now: the state store below is read with these, and only
+    // the config it holds says whether this identity is fronted.
     this.urls = apUrls(remotePod, root);
 
     // State store, on the pod.
@@ -189,9 +192,18 @@ export class BrowserAgent {
     // document it published landed under `activitypods-js/`. One root, decided
     // once, carried by the config everything downstream reads.
     this.store.setConfig({ ...(this.store.getConfig() || {}), ...cfg, root });
+    config = this.store.getConfig();
+    // A fronted identity (config.gateway.frontActor) advertises its ids at the
+    // gateway; the documents stay on the pod. Same three lines as the Node
+    // agent (run-agent.mjs connect): the advertised urls, and the map that
+    // turns an advertised url back into the pod one at the transport's single
+    // write and read choke point. State and media stay pod-native either way.
+    const publicBase = config.gateway?.frontActor
+      ? config.gateway.frontActor.replace(/ap\/actor\/?$/, '') : null;
+    this.urls = apUrls(remotePod, root, { publicBase });
+    if (this.urls.toPod) this.remote.setUrlMap(this.urls.toPod);
     // Keys: handed in (offline), or the owner-only keys.json read from the pod.
     const keys = keysRecord ? await importSigningKey(keysRecord) : await loadKeysFromPod(this.remote, this.urls);
-    config = this.store.getConfig();
 
 
     // `passive`: no queue-drain timer until this device is the active one.
@@ -212,7 +224,7 @@ export class BrowserAgent {
     this.publisher = new Publisher({
       config: this.store.getConfig(), remote: this.remote, store: this.store,
       deliverer: this.deliverer, publicKeyPem: keys.rsaPublicPem, assertionKey: null, log: this.log,
-      // Who a post names, resolved — the same lookup the installed agent
+      // Who a post names, resolved — the same lookup the DeviceAgent
       // gives its publisher. Without it no mention from the browser ever
       // resolved: a direct message went to nobody, a mention notified no one.
       resolveMention: (h) => resolveHandle(this, h),
@@ -370,7 +382,7 @@ export class BrowserAgent {
     const rec = await generateKeys();
     rec.mintedFor = this.urls.actor;                  // one key, one actor (lib/keys.mjs)
     await podState.writeWrappedKeys(this.remote, this.urls, await wrapKeys(rec, password));
-    const keys = await cacheOpenedKeys(this.urls.actor, rec);
+    const keys = await cacheOpenedKeys(podActorOf(this.urls), rec);
     this.publisher.publicKeyPem = keys.rsaPublicPem;
     this.deliverer.rsaPrivate = keys.rsaPrivate;
     await this.publisher.publishProfile();

package/web/app/boot.mjs

@@ -12,6 +12,8 @@
 import { signUp, handleProblem, AP_ROOT } from './signup.mjs';
 import * as podActor from '../../lib/pod/actor.mjs';
 import * as podState from '../../lib/pod/state.mjs';
+import { podBaseOfWebId } from '../../lib/pod/urls.mjs';
+import { podLayout } from '../../lib/pod/root.mjs';
 import { BrowserRemotePod } from './pod-remote.mjs';
 import { beginLogin, completeLogin, getSession, signOut } from './oidc-session.mjs';
 import { unwrapKeys, isKeyEnvelope } from './keystore.mjs';
@@ -68,7 +70,7 @@ window.fedipodUnlock = async (password) => {
   if (!session) throw new Error('Sign in first.');
   // The config on the pod says where this account's state lives; the key sits
   // beside it. Both are read with the session, as the owner.
-  const podFromWebId = new URL(session.webId).origin + '/';
+  const podFromWebId = podBaseOfWebId(session.webId);   // a suffix-based host, or its own host
   const state = `${podFromWebId}${AP_ROOT}ap-state/`;
   // Through the transport rather than the bare session: this is a pod read
   // like any other, and going round it skipped the retry ladder that exists
@@ -112,21 +114,38 @@ export function parseAddress(input) {
 }
 async function issuerForPod(pod) {
   // The pod's actor says where a client signs in (oauthAuthorizationEndpoint's
-  // origin); failing that, the account provider is the pod host's parent domain.
+  // origin); failing that, the account provider is the pod host's parent
+  // domain for a subdomain pod, and the host itself for a pod on a path.
   try {
     const authz = await podActor.readIssuer(`${pod}${AP_ROOT}ap/actor`);
     if (authz) return new URL(authz).origin;
   } catch { /* fall through */ }
-  const host = new URL(pod).host;
-  const parent = host.split('.').slice(1).join('.');
-  return `https://${parent || host}`;
+  const u = new URL(pod);
+  if (u.pathname !== '/') return u.origin;
+  const parent = u.host.split('.').slice(1).join('.');
+  return `https://${parent || u.host}`;
+}
+// An address at this site names a fronted identity. Its documents live on a
+// pod this site's WebFinger names as an alias — the pod's own actor id.
+async function podForFrontedAddress(handle) {
+  const res = await fetch(`/.well-known/webfinger?resource=${encodeURIComponent(`acct:${handle}@${location.host}`)}`,
+    { headers: { accept: 'application/jrd+json, application/json' } }).catch(() => null);
+  if (!res || res.status >= 400) throw new Error(`nobody at this site is called @${handle}@${location.host}`);
+  const doc = await res.json().catch(() => ({}));
+  const podActorId = (doc.aliases || []).find((a) => /\/ap\/actor$/u.test(String(a)));
+  if (!podActorId) throw new Error(`@${handle}@${location.host} lives here but names no pod to sign in to`);
+  const tail = `${AP_ROOT}ap/actor`;
+  if (!podActorId.endsWith(tail)) throw new Error(`the pod actor ${podActorId} is not where a FediPod pod keeps one`);
+  return podActorId.slice(0, -tail.length);
 }
 window.fedipodSignin = async ({ address }) => {
   const parsed = parseAddress(address);
   if (!parsed) throw new Error('Enter your address as @you@yourpod (for example @alice@alice.solidcommunity.net).');
   const bad = handleProblem(parsed.handle);
   if (bad) throw new Error(bad);
-  const pod = `https://${parsed.host}/`;
+  const pod = parsed.host === location.host.toLowerCase()
+    ? await podForFrontedAddress(parsed.handle)
+    : `https://${parsed.host}/`;
   const issuer = await issuerForPod(pod);
   const { authorizationUrl } = await beginLogin({ issuer, redirectUri: REDIRECT });
   location.href = authorizationUrl;
@@ -262,24 +281,61 @@ if (typeof document !== 'undefined') (async () => {
   // --- register form: two screens, pod first then Fediverse identity ---
   const f = () => $('form').elements;
   // The pod provider is a free-text URL; default and normalise to a scheme.
-  const providerUrl = () => { let v = f().provider.value.trim(); if (!v) v = 'https://solidcommunity.net'; if (!/^https?:\/\//i.test(v)) v = 'https://' + v; return v; };
+  // The provider is picked from the list, or typed under "Other…".
+  const providerUrl = () => { let v = (f().provider.value || f().providerOther.value).trim(); if (!v) return ''; if (!/^https?:\/\//i.test(v)) v = 'https://' + v; return v; };
   const providerHost = () => { try { return new URL(providerUrl()).host; } catch { return ''; } };
-  // The pod is always a subdomain of the provider, so both new and existing pods
-  // resolve to https://<subdomain>.<provider-host>/ and carry a host-root address.
+  // A new pod is named by its subdomain under the provider; an existing pod is
+  // brought by its address, which may be its own host or a path on a shared one.
   const podHostOf = () => { const sub = f().podName.value.trim().toLowerCase(); const ph = providerHost(); return (sub && ph) ? `${sub}.${ph}` : ''; };
+  const podUrl = () => { let v = f().pod.value.trim(); if (!v) return ''; if (!/^https?:\/\//i.test(v)) v = 'https://' + v; if (!v.endsWith('/')) v += '/'; try { return new URL(v).href; } catch { return ''; } };
+  // A pod on a suffix-based host cannot answer WebFinger, so its address
+  // lives at this site; a pod at its own host root gets the choice.
+  const isPathPod = (u) => { try { return new URL(u).pathname !== '/'; } catch { return false; } };
+  // Where the chosen provider puts new pods, asked of the provider itself
+  // (lib/pod/root.mjs podLayout) and remembered per provider: 'host', 'path',
+  // or null when it would not say.
+  const layouts = new Map();
+  let layout = null;
+  const learnLayout = async () => {
+    const origin = providerHost() ? new URL(providerUrl()).origin : '';
+    if (!origin) { layout = null; return; }
+    if (!layouts.has(origin)) layouts.set(origin, podLayout(fetch, origin).catch(() => null));
+    const known = await layouts.get(origin);
+    if (providerHost() && new URL(providerUrl()).origin === origin) { layout = known; applyShape(); previewAddr(); }
+  };
+  const pathPod = () => (f().mode.value === 'existing' ? isPathPod(podUrl()) : layout === 'path');
+  const shape = () => (pathPod() ? 'front' : f().shape.value);
   const answers = () => {
     const mode = f().mode.value;
     const a = { mode, handle: f().handle.value.trim().toLowerCase(), email: f().email.value.trim(),
-      password: f().password.value, issuer: providerUrl() };
+      password: f().password.value, issuer: providerUrl(), shape: shape() };
     if (mode === 'new') a.podName = f().podName.value.trim().toLowerCase();
-    else a.pod = `https://${podHostOf()}/`;
+    else a.pod = podUrl();
     return a;
   };
   const previewAddr = () => {
-    const handle = f().handle.value.trim().toLowerCase(); const ph = podHostOf();
-    $('preview').textContent = (handle && ph) ? `@${handle}@${ph}` : '@…@…';
+    const handle = f().handle.value.trim().toLowerCase();
+    const host = shape() === 'front' ? location.host
+      : (f().mode.value === 'existing' ? (podUrl() ? new URL(podUrl()).host : '') : podHostOf());
+    $('preview').textContent = (handle && host) ? `@${handle}@${host}` : '@…@…';
+  };
+  // The shape choice is fixed for a path pod, and open for a host-root pod.
+  // A path pod has no choice to make: the radios go away and the note says why.
+  const applyShape = () => {
+    const fixed = pathPod();
+    for (const r of f().shape) { if (fixed) r.checked = r.value === 'front'; }
+    $('shape-group').hidden = fixed;
+    $('shape-hint').hidden = !fixed;
   };
-  for (const el of $('form').elements) el.addEventListener('input', previewAddr);
+  const applyMode = () => {
+    const existing = f().mode.value === 'existing';
+    $('pod-field').hidden = !existing;
+    $('podname-field').hidden = existing;
+    $('provider-other-field').hidden = f().provider.value !== '';
+  };
+  for (const el of $('form').elements) for (const evt of ['input', 'change']) el.addEventListener(evt, () => { applyMode(); applyShape(); previewAddr(); });
+  for (const evt of ['input', 'change']) { $('provider').addEventListener(evt, learnLayout); $('providerOther').addEventListener(evt, learnLayout); }
+  applyMode(); learnLayout();
 
   // Step machine: one screen at a time, each gated by its own validation.
   const STEP_IDS = ['step-1', 'step-2'];
@@ -287,15 +343,19 @@ if (typeof document !== 'undefined') (async () => {
   const goStep = (n) => {
     STEP_IDS.forEach((id, i) => { $(id).hidden = i !== n - 1; });
     $('err-1').textContent = ''; $('form-error').textContent = '';
-    if (n === 2) previewAddr();
+    if (n === 2) { applyShape(); previewAddr(); learnLayout(); }
     if (FOCUS[n]) $(FOCUS[n]).focus();
   };
   const validateStep1 = () => {
-    if (!providerHost()) return 'A valid pod provider URL is required.';
-    const sub = f().podName.value.trim().toLowerCase();
-    if (!sub) return 'A pod username/subdomain is required.';
-    const sp = window.fedipodHandleProblem(sub);
-    if (sp) return `Pod username: ${sp}`;
+    if (!providerHost()) return f().provider.value === '' ? 'A pod provider address is required under Other….' : 'A valid pod provider URL is required.';
+    if (f().mode.value === 'existing') {
+      if (!podUrl()) return 'A pod address is required, like https://alice.solidcommunity.net/ or https://server.example/alice/.';
+    } else {
+      const sub = f().podName.value.trim().toLowerCase();
+      if (!sub) return 'A pod username/subdomain is required.';
+      const sp = window.fedipodHandleProblem(sub);
+      if (sp) return `Pod username: ${sp}`;
+    }
     if (!f().email.value.trim()) return 'A pod email is required.';
     if (!f().password.value) return 'A pod password is required.';
     return null;