fedipod-server 0.19.0 → 0.20.0

package/dist/claims.js

@@ -19,7 +19,8 @@ function claims(input, frontHost) {
     const bare = String(input.host).split(':')[0].toLowerCase();
     if (bare !== String(frontHost).toLowerCase())
         return false; // a pod subdomain → not ours
-    return FRONT_PATHS.has(input.pathname) || input.pathname.startsWith('/u/');
+    return FRONT_PATHS.has(input.pathname) || input.pathname.startsWith('/u/')
+        || input.pathname.startsWith('/@'); // the short profile address
 }
 // What an identity answers on its own pod's origin: the protocol routes other
 // software addresses it by, and the one path its owner's pages live under.
@@ -35,7 +36,7 @@ const AGENT_PATHS = new Set([
     // at this name before, so no pod resource is displaced.
     '/.well-known/oauth-authorization-server',
 ]);
-const AGENT_PREFIXES = ['/api/', '/oauth/'];
+const AGENT_PREFIXES = ['/api/', '/oauth/', '/@']; // /@handle: the short profile address
 // An identity's inbox is the container `/<root>/ap/inbox/`, matched by shape
 // rather than a fixed root. A POST here is a delivery, verified at the door
 // before it is written; the handler checks the exact path per identity. The

package/lib/core/publisher/index.mjs

@@ -143,7 +143,7 @@ export class Publisher {
     }
 
     await discovery.writeWebfinger(this.remote, urls,
-      wire.jrd({ handle: this.config.handle, host, actor: urls.actor }));
+      wire.jrd({ handle: this.config.handle, host, actor: urls.actor, page: urls.profileHtml }));
     await discovery.writeHostMeta(this.remote, urls, wire.hostMeta(urls.base));
 
     const nodeinfoDocUrl = urls.home + 'ap/nodeinfo-2.0';

package/lib/core/wire.mjs

@@ -52,11 +52,14 @@ export function hostMeta(base) {
   return `<?xml version="1.0" encoding="UTF-8"?>\n<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">\n  <Link rel="lrdd" template="${base}.well-known/webfinger?resource={uri}"/>\n</XRD>\n`;
 }
 
-export function jrd({ handle, host, actor, aliases = [] }) {
+export function jrd({ handle, host, actor, aliases = [], page = null }) {
   return {
     subject: `acct:${handle}@${host}`,
     ...(aliases.length ? { aliases } : {}),
-    links: [{ rel: 'self', type: 'application/activity+json', href: actor }],
+    links: [
+      { rel: 'self', type: 'application/activity+json', href: actor },
+      ...(page ? [{ rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: page }] : []),
+    ],
   };
 }
 

package/lib/device/admin/surface.mjs

@@ -181,6 +181,14 @@ export function buildAdminSurface({ agent, gate, allowed, log = console.log,
         const scheme = req.socket.encrypted || req.headers['x-forwarded-proto'] === 'https' ? 'https' : 'http';
         return json(res, 200, masto.authorizationServerMetadata(`${scheme}://${req.headers.host}${mount}`));
       }
+      // The short address a person types: /@handle opens the profile page.
+      const at = /^\/@([^/]+)$/u.exec(p);
+      const ownHandle = handle || agent.store?.getConfig?.()?.handle || '';
+      if (at && ownHandle && agent.publisher?.urls?.profileHtml
+        && decodeURIComponent(at[1]).toLowerCase() === String(ownHandle).toLowerCase()) {
+        res.writeHead(302, { location: agent.publisher.urls.profileHtml, 'cache-control': 'no-store' });
+        res.end(); return;
+      }
       if (atDoor && gate(req, res)) return;
       if (p === '/api/v1/streaming/health') {
         res.writeHead(200, { 'content-type': 'text/plain' }); res.end('OK'); return;

package/lib/gateway/front-core.mjs

@@ -26,11 +26,17 @@ import { podBaseOfWebId } from '../pod/urls.mjs';
 // wire.mjs: wire drags the agent's whole HTML pipeline (sanitize-html and
 // friends), which a serverless front must never carry — it crashed the
 // deployed function before it answered its first request.
-const jrd = ({ handle, host, actor, aliases = [] }) => ({
+const jrd = ({ handle, host, actor, aliases = [], page = null }) => ({
   subject: `acct:${handle}@${host}`,
   ...(aliases.length ? { aliases } : {}),
-  links: [{ rel: 'self', type: 'application/activity+json', href: actor }],
+  links: [
+    { rel: 'self', type: 'application/activity+json', href: actor },
+    ...(page ? [{ rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: page }] : []),
+  ],
 });
+// The public profile page of any account the front answers for lives on
+// its pod, whether the address is the front's or the pod's own.
+const profilePageOf = (rec) => (rec?.podHome ? rec.podHome + 'ap/profile.html' : null);
 
 const AP_CT = 'application/activity+json';
 
@@ -600,13 +606,29 @@ async function route(request, ctx) {
     // is the alias, so a client signing in by the fronted address can find
     // the pod (and its login) without a lookup only the host could answer.
     const podActor = rec.inboxOnly ? [] : [rec.podHome + 'ap/actor'];
-    const out = j(200, jrd({ handle: m[1], host: ctx.host, actor: rec.actorUrl, aliases: podActor }),
+    const out = j(200, jrd({ handle: m[1], host: ctx.host, actor: rec.actorUrl, aliases: podActor, page: profilePageOf(rec) }),
       'application/jrd+json');
     // RFC 7033: a JRD is read from any origin.
     out.headers['access-control-allow-origin'] = '*';
     return out;
   }
 
+  // The short address a person types: https://<host>/@handle opens the
+  // profile page, the way most Fediverse servers spell it. /@handle@pod-host
+  // is the same for an account whose address is its pod's, which the front
+  // holds under that full address — the form other servers use for a
+  // profile that lives elsewhere.
+  const at = /^\/@([^/@]+)(?:@([^/@]+))?$/u.exec(pathname);
+  if (at) {
+    const handle = decodeURIComponent(at[1]).toLowerCase();
+    const host = at[2] ? decodeURIComponent(at[2]).toLowerCase() : null;
+    const key = host && host !== String(ctx.host).toLowerCase() ? `${handle}@${host}` : handle;
+    const rec = await ctx.lookup(key);
+    const page = rec && profilePageOf(rec);
+    if (!page) return notFound();
+    return { status: 302, headers: { location: page, 'cache-control': 'no-store' }, body: '' };
+  }
+
   const up = parseUserPath(pathname);
   if (!up) return notFound();
   const rec = await ctx.lookup(up.handle);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fedipod-server",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "The FediPod Server: a full ActivityPub server as a Community Solid Server component.",
   "license": "MIT",
   "main": "dist/index.js",

package/web/app/dist/sw.js

@@ -9664,11 +9664,14 @@ function hostMeta(base) {
 </XRD>
 `;
 }
-function jrd({ handle: handle7, host, actor, aliases = [] }) {
+function jrd({ handle: handle7, host, actor, aliases = [], page: page2 = null }) {
   return {
     subject: `acct:${handle7}@${host}`,
     ...aliases.length ? { aliases } : {},
-    links: [{ rel: "self", type: "application/activity+json", href: actor }]
+    links: [
+      { rel: "self", type: "application/activity+json", href: actor },
+      ...page2 ? [{ rel: "http://webfinger.net/rel/profile-page", type: "text/html", href: page2 }] : []
+    ]
   };
 }
 function followsNeedApproval(config = {}) {
@@ -56784,7 +56787,7 @@ var Publisher = class {
     await writeWebfinger(
       this.remote,
       urls,
-      jrd({ handle: this.config.handle, host, actor: urls.actor })
+      jrd({ handle: this.config.handle, host, actor: urls.actor, page: urls.profileHtml })
     );
     await writeHostMeta(this.remote, urls, hostMeta(urls.base));
     const nodeinfoDocUrl = urls.home + "ap/nodeinfo-2.0";