@mason-data/cli 0.9.0 → 0.11.0

package/dist/src/cli/user.js

@@ -11,11 +11,11 @@
  * called by the run's command server; so are `disableUser` and `enableUser`.
  */
 import * as path from "node:path";
-import { failed, jsonText, parseCommand, reportText, strict, withEnd } from "./command.js";
+import { failed, jsonText, listFlag, parseCommand, reportText, strict, withEnd } from "./command.js";
 import { reach } from "./state.js";
 import { callRun, RunUnreachable } from "./control.js";
 import { connectionUrl, listenerTips, postgresLink, psqlLine } from "./pg-url.js";
-import { changeUsers, isActive, isDisabled, keyFingerprint, newUserId, readUsers, underKey, userPassword, USER_NAME_RE, USER_NAME_RULE, USERS_FILE } from "../duck/users.js";
+import { changeUsers, isActive, isDisabled, keyFingerprint, newUserId, readUsers, underKey, userPassword, userRanges, USER_NAME_RE, USER_NAME_RULE, USERS_FILE } from "../duck/users.js";
 import { didYouMean } from "../lib/did-you-mean.js";
 import { out as styleOut } from "./style.js";
 import { NO_ROLES } from "../duck/grants.js";
@@ -31,7 +31,8 @@ export const USER = {
     needs: "project",
     name: "user",
     summary: "the users the Postgres API takes: a name and a password that does not expire, for a BI tool or an app",
-    usage: `usage: mason user add <name> [--role <role>] [--set <attribute>=<value> …] [--replica <org>/<name>] [--json]
+    usage: `usage: mason user add <name> [--role <role>] [--set <attribute>=<value> …] [--from <range> …] [--replica <org>/<name>] [--json]
+       mason user from <name> <range> … | --any [--replica <org>/<name>] [--json]
        mason user list [--replica <org>/<name>] [--json]
        mason user disable <name> [--replica <org>/<name>] [--json]
        mason user enable <name> [--replica <org>/<name>] [--json]
@@ -44,6 +45,28 @@ export const USER = {
   The user name a tool sends must be the user's own. A user disabled is kept with its password: its logins are
   refused (as Postgres refuses a role without LOGIN) and its sessions end at their next statement, until enable.
 
+    mason user add metabase                    a user for Metabase: its password and the URL to paste
+    mason user add looker --from 203.0.113.0/24 --from 2001:db8:7::/48    connects from these alone
+    mason user from looker 198.51.100.0/24     its ranges replaced
+    mason user from looker --any               it connects from any address again
+    mason user add agent --role agent          a user held to the role agent
+    mason user add acme --role tenant --set tenant=42      the rows of tenant 42
+    mason user add emea --role region --set regions=eu --set regions=uk
+    mason user list
+    mason user disable metabase                metabase connects no more, until mason user enable metabase
+    mason user enable metabase                 metabase connects again, with the same password
+    mason user remove metabase                 metabase connects no more
+    docker compose exec mason mason user add grafana   beside mason serve, in its data folder
+    mason user add metabase --replica acme/shop          a user of a replica on a hosted Mason service
+
+  <name>                      ${USER_NAME_RULE}
+  --role <role>               add: what the user reads, a role of mason/roles.yml (below)
+  --set <attribute>=<value>   add: its value of an attribute its role declares (below)
+  --from <range>              add: the addresses it connects from (below)
+  --any                       from: its ranges removed, so it connects from any address
+  --replica <org>/<name>      a replica's users on a hosted Mason service, not this project's (below)
+  --json                      as data: its shape is at the end
+
   The list is .mason/users.json (names and ids, no password), beside the running Mason, which reads it again by itself.
   A removed user stays in it, marked removed, so the list shows who was removed and when; its name can be added again.
   Rotating the API key (apiKey in .mason/config.json, MASON_API_KEY under mason serve) removes every user at once.
@@ -84,40 +107,42 @@ export const USER = {
   statement, never answered with no rows: add it again with the --set. Postgres refuses a where: it cannot read
   when the running Mason reads the file, at its key.
 
-    mason user add metabase                    a user for Metabase: its password and the URL to paste
-    mason user add agent --role agent          a user held to the role agent
-    mason user add acme --role tenant --set tenant=42      the rows of tenant 42
-    mason user add emea --role region --set regions=eu --set regions=uk
-    mason user list
-    mason user disable metabase                metabase connects no more, until mason user enable metabase
-    mason user enable metabase                 metabase connects again, with the same password
-    mason user remove metabase                 metabase connects no more
-    docker compose exec mason mason user add grafana   beside mason serve, in its data folder
-    mason user add metabase --replica acme/shop          a user of a replica on a hosted Mason service
+  --from <range> limits the addresses the user connects from (repeat --from for each, or a comma list): an IPv4 or IPv6 range with its
+  prefix length (10.0.0.0/16, 2001:db8::/32) or one address (192.0.2.10). A connection from any other address is
+  refused before its password is checked, as Postgres refuses one no pg_hba.conf line takes (28000, no entry for host
+  …), and in the same words for a name that is no user while any user has ranges, so a user with ranges cannot be
+  told from a missing one (a user without ranges still answers a wrong password 28P01). An address that cannot be read (a public share's socket) is refused too. Behind a TCP proxy the address is
+  the client its PROXY header carries (MASON_PG_PROXY_FROM). A user added without --from connects from any address.
+  mason user from <name> <range> … replaces a user's ranges, and mason user from <name> --any removes them; the sessions
+  it holds from an address outside its new ranges end at their next statement.
 
   --replica <org>/<name> manages the users of a replica on a hosted Mason service instead of this project's (else
-  MASON_REPLICA; each part lower case letters, digits and -): the same subcommands, --role and --set, the same
-  output and --json, the replica's Mason checking each as it does here. It needs no project here, and reads and writes
+  MASON_REPLICA, said on stderr when it chose; each part lower case letters, digits and -): the same subcommands,
+  --role, --set and --from, the same output and --json, which names the replica in its headline and its replica key,
+  the replica's Mason checking each as it does here. It needs no project here, and reads and writes
   nothing of one. The login is MASON_TOKEN, else this machine's (mason login); the service is MASON_CLOUD_URL, else
   the default. A refusal is the service's words, each one line, its code the CLI's own by the HTTP status (not_found,
   refused, failed: never usage), exit 1.
 
-  <name>    ${USER_NAME_RULE}
-  --json    as data: add { user (the name), id, addedAt, password, database, role (the role it reads as: its own
-            or the file's default; absent when none), attributes? ({ name: value, or [values] for a list }), roleFrom (file: its own --role; default: the file's default;
-            none), readsNothing (true: no role under a file with no default), and once Mason runs url, psql (the
-            psql line for url), host, port, sslmode }; list { users: [{ name, id, addedAt, removedAt (null for a user
-            not removed), disabledAt (null for a user not disabled), live (connects now), role?, attributes?,
-            missingAttributes? (the attributes its role's filters read that it lacks: refused until added again), roleFrom, readsNothing?,
-            roleKnown? (the roles file names its own role now), lastUsedAt (its newest statement, null when none within
-            requestLogDays), url (to paste, without the password; null for a removed user or when Mason is not running) }],
-            lastUsedNote (why lastUsedAt is unknown, else null), urlNote (why url is null, else null), requestLogDays
-            (null when unknown) }; disable { disabled: { name, id, addedAt, disabledAt }, already (it was disabled
-            before) }; enable { enabled: { name, id, addedAt }, already (it was not disabled) }; remove { removed: { name,
-            id, addedAt, removedAt } }; next
+  The --json answer: add { user (the name), id, addedAt, password, database, role (the role it reads as: its own
+    or the file's default; absent when none), attributes? ({ name: value, or [values] for a list }), roleFrom (file: its own --role; default: the file's default;
+    none), readsNothing (true: no role under a file with no default), from? (its address ranges, as given
+    to --from in their one form; absent: any address), and once Mason runs url, psql (the
+    psql line for url), host, port, sslmode }; list { users: [{ name, id, addedAt, removedAt (null for a user
+    not removed), disabledAt (null for a user not disabled), live (connects now), from (its address ranges;
+    null: any address), role?, attributes?,
+    missingAttributes? (the attributes its role's filters read that it lacks: refused until added again), roleFrom, readsNothing?,
+    roleKnown? (the roles file names its own role now), lastUsedAt (its newest statement, null when none within
+    requestLogDays), url (to paste, without the password; null for a removed user or when Mason is not running) }],
+    lastUsedNote (why lastUsedAt is unknown, else null), urlNote (why url is null, else null), requestLogDays
+    (null when unknown) }; disable { disabled: { name, id, addedAt, disabledAt }, already (it was disabled
+    before) }; enable { enabled: { name, id, addedAt }, already (it was not disabled) }; from { changed: { name, id,
+    addedAt, from (its ranges now; null: any address) }, already (they were these before) }; remove { removedUser: { name,
+    id, addedAt, removedAt }, removed (the same, kept until 1.0) }; next. With --replica (or MASON_REPLICA) every answer also has replica ("<org>/<name>":
+    the replica it acted on), and a project's never does
 `,
-    options: { json: { type: "boolean", default: false }, role: { type: "string" }, set: { type: "string", multiple: true }, replica: { type: "string" } },
-    json: ["user", "id", "addedAt", "password", "url", "psql", "host", "port", "database", "sslmode", "role", "attributes", "roleFrom", "readsNothing", "users", "disabled", "enabled", "already", "removed", "lastUsedNote", "urlNote", "requestLogDays", "next"],
+    options: { json: { type: "boolean", default: false }, role: { type: "string" }, set: { type: "string", multiple: true }, from: { type: "string", multiple: true }, any: { type: "boolean", default: false }, replica: { type: "string" } },
+    json: ["replica", "user", "id", "addedAt", "password", "url", "psql", "host", "port", "database", "sslmode", "role", "attributes", "roleFrom", "readsNothing", "users", "disabled", "enabled", "already", "removedUser", "removed", "from", "changed", "lastUsedNote", "urlNote", "requestLogDays", "next"],
 };
 /** The users of a project and why one is not live: added under an API key since rotated. */
 const liveOf = (u, apiKey) => underKey(u, apiKey);
@@ -339,7 +364,7 @@ export function listUsers(file, apiKey, link, roles = NO_ROLES) {
             fix: `repair ${file}, or move it aside, which removes every user` };
     // roleKnown only where the file can be read: under a problem the listener refuses every user held to it for the FILE
     return { users: r.users.map((u) => ({ name: u.name, id: u.id, addedAt: u.addedAt, removedAt: u.removedAt ?? null, disabledAt: u.disabledAt ?? null,
-            live: isActive(u) && !isDisabled(u) && liveOf(u, apiKey),
+            live: isActive(u) && !isDisabled(u) && liveOf(u, apiKey), from: u.from ?? null,
             lastUsedAt: null, url: link !== null && isActive(u) ? connectionUrl(link, u.name, null) : null,
             ...roleFields(u, roles), ...(u.attributes !== undefined ? { attributes: u.attributes } : {}),
             ...((m) => m === undefined ? {} : { missingAttributes: m.missing })(usersMissingAttributes([u], roles)[0]),
@@ -373,6 +398,9 @@ export function addUser(file, apiKey, name, o) {
     const usage = userNameProblem("add", name);
     if (usage !== null)
         return { message: usage, code: "usage" };
+    const ranges = o.from === undefined ? null : rangesToSet(o.from, `mason user add ${name}`);
+    if (ranges !== null && "message" in ranges)
+        return ranges;
     const fingerprint = keyFingerprint(apiKey);
     let added;
     let replaced = false;
@@ -386,7 +414,7 @@ export function addUser(file, apiKey, name, o) {
             replaced = was !== undefined;
             const now = new Date().toISOString();
             added = { name, id: newUserId(), addedAt: now, key: fingerprint, ...(o.role !== undefined ? { role: o.role } : {}),
-                ...(o.attributes !== undefined && Object.keys(o.attributes).length > 0 ? { attributes: o.attributes } : {}) };
+                ...(o.attributes !== undefined && Object.keys(o.attributes).length > 0 ? { attributes: o.attributes } : {}), ...(ranges !== null ? { from: ranges.from } : {}) };
             return [...users.map((u) => u === was ? { ...u, removedAt: now } : u), added];
         });
     }
@@ -404,8 +432,58 @@ export function addUser(file, apiKey, name, o) {
     const { link } = o;
     return { user: u.name, id: u.id, addedAt: u.addedAt, password, database: link?.database ?? o.database,
         ...(link !== null ? { url: connectionUrl(link, u.name, password), psql: psqlLine(connectionUrl(link, u.name, password)), host: link.host, port: link.port, sslmode: link.sslmode ?? "disable" } : {}),
-        ...roleFields(u, o.roles ?? NO_ROLES), ...(u.attributes !== undefined ? { attributes: u.attributes } : {}), replaced };
+        ...roleFields(u, o.roles ?? NO_ROLES), ...(u.attributes !== undefined ? { attributes: u.attributes } : {}), ...(u.from !== undefined ? { from: u.from } : {}), replaced };
+}
+/** Address ranges as `--from` (or `/api/users`' `from`) gives them, each read by the one grammar (src/duck/users.ts
+ *  `userRanges`) and in its one form; or a wrong line (`usage`), every entry that is not a range said, nothing written. */
+export function rangesToSet(given, line) {
+    const r = userRanges(given);
+    if ("problem" in r)
+        return { message: `${line}: ${r.problem}`, code: "usage", fix: "an IPv4 or IPv6 range with its prefix length (10.0.0.0/16, 2001:db8::/32) or one address (192.0.2.10), one --from each" };
+    return { from: r.from };
+}
+/**
+ * SET A USER'S ADDRESS RANGES in `file` under its lock, replacing those it had (`from`: the ranges as given; null: any
+ * address, its ranges removed). The listener reads them at the user's next connection and at each statement of a session
+ * it holds, so a session from outside the new ranges ends there. The same ranges as now are said so (`already`), nothing
+ * written. A range that is not one is a wrong line, nothing written.
+ */
+export function setUserFrom(file, name, from) {
+    const usage = userNameProblem("from", name);
+    if (usage !== null)
+        return { message: usage, code: "usage" };
+    const ranges = from === null ? null : rangesToSet(from, `mason user from ${name}`);
+    if (ranges !== null && "message" in ranges)
+        return ranges;
+    const next = ranges === null ? undefined : ranges.from;
+    let found;
+    let live = [];
+    let r;
+    try {
+        r = changeUsers(file, (users) => {
+            found = users.find((u) => u.name === name && isActive(u));
+            live = users.filter(isActive).map((u) => u.name);
+            if (found === undefined)
+                return { refused: "unknown" };
+            if (JSON.stringify(found.from ?? null) === JSON.stringify(next ?? null))
+                return { refused: "already" };
+            return users.map((u) => { if (u !== found)
+                return u; const { from: _, ...rest } = u; return next === undefined ? rest : { ...rest, from: next }; });
+        });
+    }
+    catch (e) {
+        return cantChange(file, e);
+    }
+    if (found === undefined)
+        return noSuchUser(name, live);
+    const u = found;
+    return { changed: { name: u.name, id: u.id, addedAt: u.addedAt, from: next ?? null }, already: !Array.isArray(r) };
 }
+/** a user's ranges as `mason user` says them: `10.0.0.0/16, 2001:db8::/32`, or any address */
+export const rangesText = (from) => from === null || from === undefined ? "any address" : from.join(", ");
+/** What to run after a `mason user from`. */
+export const fromNext = (name, from) => [["mason user list", "the users and the addresses each connects from"],
+    ...(from !== null ? [[`mason user from ${name} --any`, "it connects from any address again"]] : [])];
 /** REMOVE A USER from `file` under its lock: it connects no more. A name the file lacks is refused with the closest it has. */
 export function removeUser(file, name) {
     const usage = userNameProblem("remove", name);
@@ -514,7 +592,7 @@ export function listText(of, l, roles, next, s = styleOut()) {
     const rolesFileShown = roles.file ?? `mason/${ROLES_FILE}`;
     // the last use in the words the web page's Users page says it too (lastUsedText): "last used" before a time or "unknown"
     const used = (u) => { const t = lastUsedText(u.lastUsedAt, lastUsedNote, requestLogDays, u.addedAt); return t === "never" ? "never used" : t.startsWith("not used") ? t : `last used ${t}`; };
-    const lines = active.map((u) => `  ${s.cyan(u.name.padEnd(width))}   ${u.role !== undefined ? `role ${u.role}${u.roleFrom === "default" ? " (default)" : ""}${u.attributes !== undefined ? ` (${attributesText(u.attributes)})` : ""}   ` : ""}${s.dim(`id ${u.id} · added ${stamp(u.addedAt)} UTC · ${used(u)}`)}` +
+    const lines = active.map((u) => `  ${s.cyan(u.name.padEnd(width))}   ${u.role !== undefined ? `role ${u.role}${u.roleFrom === "default" ? " (default)" : ""}${u.attributes !== undefined ? ` (${attributesText(u.attributes)})` : ""}   ` : ""}${u.from !== null ? `from ${rangesText(u.from)}   ` : ""}${s.dim(`id ${u.id} · added ${stamp(u.addedAt)} UTC · ${used(u)}`)}` +
         (u.disabledAt !== null ? `   ${s.yellow(`${disabledText(u.disabledAt)}: does not connect until mason user enable ${u.name}`)}`
             : u.live ? "" : `   ${s.yellow("does not connect: the API key was rotated since it was added")}`) +
         (u.roleKnown === false ? `   ${s.yellow(`its role ${u.role} is not in the roles file: its statements are refused`)}` : "") +
@@ -533,23 +611,34 @@ export function listText(of, l, roles, next, s = styleOut()) {
             ...(roles.problem !== null && active.length ? [rolesProblemText(rolesFileShown, roles.problem)] : []),
             ...(lastUsedNote !== null ? [`Last used: ${lastUsedNote}.`] : [])], next }, s), s);
 }
+/** A user in a headline: its name, and the replica it is a user of when the command acted on one (`on`), so the answer
+ *  says its target. */
+const userOn = (name, on) => on === undefined ? name : `${name} of the replica ${on}`;
 /** `mason user disable` for a person. `up`: Mason runs, so the sessions the user holds end at their next statement. */
-export const disabledReport = (r, up, next, s = styleOut()) => {
-    const d = r.disabled;
-    return reportText({ headline: r.already ? `The user ${d.name} is disabled already: nothing changed` : `The user ${d.name} disabled: it connects no more, until enabled`,
+export const disabledReport = (r, up, next, s = styleOut(), on) => {
+    const d = r.disabled, who = userOn(d.name, on);
+    return reportText({ headline: r.already ? `The user ${who} is disabled already: nothing changed` : `The user ${who} disabled: it connects no more, until enabled`,
         details: [["user", d.name], ["disabled", d.disabledAt], ...(r.already ? [] : [["sessions", up ? "those it holds end at their next statement" : "none: Mason is not running"]])],
         tips: [disableEffect(d.name)], next }, s);
 };
 /** `mason user enable` for a person. */
-export const enabledReport = (r, next, s = styleOut()) => {
-    const e = r.enabled;
-    return reportText({ headline: r.already ? `The user ${e.name} is not disabled: nothing changed, it connects` : `The user ${e.name} enabled: it connects again, with the same password`,
+export const enabledReport = (r, next, s = styleOut(), on) => {
+    const e = r.enabled, who = userOn(e.name, on);
+    return reportText({ headline: r.already ? `The user ${who} is not disabled: nothing changed, it connects` : `The user ${who} enabled: it connects again, with the same password`,
         details: [["user", e.name], ["added", e.addedAt]], next }, s);
 };
+/** `mason user from` for a person. `up`: Mason runs, so a session from outside the new ranges ends at its next statement. */
+export const fromReport = (r, up, next, s = styleOut()) => {
+    const c = r.changed;
+    return reportText({ headline: r.already ? `The user ${c.name} connects from ${rangesText(c.from)} already: nothing changed`
+            : c.from === null ? `The user ${c.name} connects from any address now` : `The user ${c.name} connects from ${rangesText(c.from)} alone now`,
+        details: [["user", c.name], ["from", rangesText(c.from)], ...(r.already || c.from === null ? [] : [["sessions", up ? "those it holds from another address end at their next statement" : "none: Mason is not running"]])],
+        tips: c.from === null ? [] : ["A connection from any other address is refused before its password is checked (28000, no entry for host …)."], next }, s);
+};
 /** `mason user remove` for a person. */
-export const removedReport = (r, up, next, s = styleOut()) => {
+export const removedReport = (r, up, next, s = styleOut(), on) => {
     const gone = r.removed;
-    return reportText({ headline: `The user ${gone.name} removed: it connects no more`,
+    return reportText({ headline: `The user ${userOn(gone.name, on)} removed: it connects no more`,
         details: [["user", gone.name], ["added", gone.addedAt], ["sessions", up ? "those it holds end at their next statement" : "none: Mason is not running"]],
         tips: [`Adding ${gone.name} again makes a new password: the old one never connects again.`], next }, s);
 };
@@ -562,11 +651,12 @@ export const removedReport = (r, up, next, s = styleOut()) => {
 export function addedReport(r, o, s = styleOut()) {
     const { roles } = o;
     return reportText({
-        headline: `The user ${r.user} added${r.replaced === true ? " (in place of one the API key's rotation had removed)" : ""}: its password is printed this once`,
+        headline: `The user ${userOn(r.user, o.on)} added${r.replaced === true ? " (in place of one the API key's rotation had removed)" : ""}: its password is printed this once`,
         details: [
             ...(r.url !== undefined && r.psql !== undefined ? [["url", r.url], ["psql", r.psql]] : []),
             ["user", r.user], ["password", r.password], ["database", r.database],
             ...(r.attributes !== undefined ? [["attributes", attributesText(r.attributes)]] : []),
+            ...(r.from !== undefined ? [["from", `${rangesText(r.from)} (it connects from these alone)`]] : []),
             ...(r.roleFrom === "file" ? [["role", `${r.role} (mason/${ROLES_FILE} names what it reads)`]]
                 : r.roleFrom === "default" ? [["role", `${r.role} (the file's default: ${roles.file ?? `mason/${ROLES_FILE}`})`]]
                     : r.readsNothing === true ? [["role", `none, and ${roles.file ?? `mason/${ROLES_FILE}`} names no default: it reads nothing until one is written`]] : []),
@@ -591,13 +681,26 @@ export async function user(argv) {
     const json = f.values.json === true;
     const usage = (message) => failed("user", { message, code: "usage", usage: USER.usage }, { json });
     const [verb, name, ...rest] = f.positionals;
-    const VERBS = ["add", "list", "disable", "enable", "remove"];
+    const VERBS = ["add", "list", "from", "disable", "enable", "remove"];
     if (verb === undefined)
-        return usage("add, list, disable, enable or remove: mason user add <name> makes a user");
+        return usage("add, list, from, disable, enable or remove: mason user add <name> makes a user");
     if (!VERBS.includes(verb))
-        return usage(`there is no mason user ${verb}: add, list, disable, enable or remove${didYouMean(verb, VERBS)}`);
-    if (verb === "list" ? name !== undefined : rest.length)
+        return usage(`there is no mason user ${verb}: add, list, from, disable, enable or remove${didYouMean(verb, VERBS)}`);
+    if (verb === "list" ? name !== undefined : verb !== "from" && rest.length)
         return usage(`mason user ${verb} takes ${verb === "list" ? "no name" : "one name"}: ${[name, ...rest].filter(Boolean).join(" ")} is too many`);
+    // the address ranges: --from on add, the positionals of from (or its --any); each read by the one grammar, a wrong one a
+    // wrong line before anything is read, written or sent
+    // a comma list or the flag repeated, the same (src/cli/command.ts listFlag): a range holds no comma
+    const fromList = listFlag(f.values.from);
+    const fromFlags = fromList === undefined ? [] : fromList.split(",");
+    if (fromFlags.length > 0 && verb !== "add")
+        return usage(`--from goes with mason user add: mason user add <name> --from ${fromFlags[0]}${verb === "from" ? `, or mason user from <name> ${fromFlags[0]}` : ""}`);
+    const any = f.values.any === true;
+    if (any && verb !== "from")
+        return usage("--any goes with mason user from: mason user from <name> --any removes its address ranges");
+    if (verb === "from" && any === (rest.length > 0))
+        return usage(any ? `mason user from ${name ?? "<name>"}: --any or ranges, not both` : `mason user from ${name ?? "<name>"}: which addresses — one or more ranges (10.0.0.0/16, 2001:db8::/32, 192.0.2.10), or --any`);
+    const given = verb === "add" ? (fromFlags.length > 0 ? fromFlags : null) : verb === "from" && !any ? rest : null;
     const role = typeof f.values.role === "string" ? f.values.role : undefined;
     if (role !== undefined && verb !== "add")
         return usage(`--role goes with mason user add: mason user add <name> --role ${role}`);
@@ -614,6 +717,9 @@ export async function user(argv) {
         if (problem !== null)
             return usage(problem);
     }
+    const ranges = given === null ? null : rangesToSet(given, `mason user ${verb} ${name}`);
+    if (ranges !== null && "message" in ranges)
+        return failed("user", { ...ranges, usage: USER.usage }, { json });
     // A REPLICA ON A HOSTED MASON SERVICE (--replica, else MASON_REPLICA): its users, asked of the service with the same
     // request the run's /api/users takes, printed by the renderers above; nothing of a project here is read or written
     const replica = replicaOf(typeof f.values.replica === "string" ? f.values.replica : undefined, USER.usage);
@@ -623,7 +729,7 @@ export async function user(argv) {
         const named = role === undefined ? null : roleNameProblem(role);
         if (named !== null)
             return usage(named);
-        return hostedUser(replica, { verb: verb, name, role, sets, json });
+        return hostedUser(replica, { verb: verb, name, role, sets, from: ranges?.from ?? null, json });
     }
     const w = await reach(USER, json);
     if (w === null || w.project === null)
@@ -669,6 +775,18 @@ export async function user(argv) {
         out(listText(project.config.name, { users, lastUsedNote, urlNote, requestLogDays }, roles, next));
         return 0;
     }
+    if (verb === "from") {
+        const r = setUserFrom(file, name, ranges?.from ?? null);
+        if ("message" in r)
+            return failed("user", r, { json });
+        const next = fromNext(r.changed.name, r.changed.from);
+        if (json) {
+            out(jsonText(USER, r, next));
+            return 0;
+        }
+        out(fromReport(r, w.state === "up", next));
+        return 0;
+    }
     if (verb === "disable") {
         const r = disableUser(file, name);
         if ("message" in r)
@@ -699,7 +817,7 @@ export async function user(argv) {
             return failed("user", r, { json });
         const next = REMOVED_NEXT;
         if (json) {
-            out(jsonText(USER, r, next));
+            out(jsonText(USER, { removedUser: r.removed, ...r }, next));
             return 0;
         }
         out(removedReport(r, w.state === "up", next));
@@ -723,7 +841,7 @@ export async function user(argv) {
     const attributes = attributesToAdd(name, role ?? userRole({}, roles).role, sets, roles);
     if ("refused" in attributes)
         return failed("user", attributes.refused, { json });
-    const r = addUser(file, apiKey, name, { link, database, roles, ...(role !== undefined ? { role } : {}), attributes: attributes.values });
+    const r = addUser(file, apiKey, name, { link, database, roles, ...(role !== undefined ? { role } : {}), attributes: attributes.values, ...(ranges !== null ? { from: ranges.from } : {}) });
     if ("message" in r)
         return failed("user", r, { json });
     const { replaced: _, ...added } = r;

package/dist/src/duck/users.js

@@ -24,11 +24,19 @@
  * user's session, the file read again when its inode, size or mtime moved), so a removal refuses the next connection
  * at once and ends the sessions that user holds at their next statement, without a restart. FAIL CLOSED: a file that
  * cannot be read refuses every user login with the reason (57P03, "could not tell"), never "live"; no file is no users.
+ *
+ * A USER'S ADDRESS RANGES (`from`, `mason user add --from`, `mason user from`): where it may connect from, read by the one
+ * grammar `MASON_PG_PROXY_FROM` is read by (src/lib/cidr.ts). Judged at login BEFORE the password, on the session's own
+ * address (`Session.clientAddr`, the PROXY header's client behind a named proxy), and again before each statement; an
+ * address that could not be read is outside every list (fail closed). While any user has ranges, a name that is no user
+ * is refused in the same words, and with the same work, as an address outside them: a limited user cannot be told from
+ * a missing one by the answer or its time (a user with no ranges still answers a wrong password 28P01).
  */
 import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { ApiError, USER_DISABLED } from "../api/error.js";
+import { ADDRESS_NOT_ALLOWED, ApiError, USER_DISABLED } from "../api/error.js";
+import { cidrOf, cidrText, inRanges, rangeOf } from "../lib/cidr.js";
 import { tokenProblem } from "./token.js";
 import { ATTRIBUTE_NAME_RE } from "./row-filter.js";
 export const USERS_FILE = "users.json";
@@ -36,6 +44,46 @@ export const USERS_FILE = "users.json";
  *  capitalises it is told so, never another user. */
 export const USER_NAME_RE = /^[a-z0-9][a-z0-9_.-]{0,62}$/;
 export const USER_NAME_RULE = "1 to 63 lower case letters, digits, \"_\", \".\" or \"-\", starting with a letter or digit (e.g. metabase)";
+/**
+ * A user's address ranges as given (`--from`, the file, `/api/users`): each read by the one grammar (src/lib/cidr.ts
+ * `cidrOf`), written back in its one form (`cidrText`: `10.0.0.0/16`, `2001:db8::/32`, `192.0.2.10`), a range given
+ * twice once; or every entry that is not a range, each with what is wrong. An empty list is no list of ranges: the way
+ * to any address is to have none (`mason user from <name> --any`).
+ */
+export function userRanges(list) {
+    if (list.length === 0)
+        return { problem: "no address range: name one or more (10.0.0.0/16, 2001:db8::/32, 192.0.2.10)" };
+    if (list.length > MAX_RANGES)
+        return { problem: `${list.length} address ranges: a user takes at most ${MAX_RANGES}` };
+    const from = [], ranges = [], wrong = [];
+    for (const entry of list) {
+        const c = cidrOf(entry);
+        if ("problem" in c) {
+            wrong.push(c.problem);
+            continue;
+        }
+        const t = cidrText(c);
+        if (!from.includes(t)) {
+            from.push(t);
+            ranges.push(rangeOf(c));
+        }
+    }
+    return wrong.length ? { problem: wrong.join("; ") } : { from, ranges };
+}
+/** The most address ranges one user takes (all input is untrusted: a bound). */
+export const MAX_RANGES = 100;
+/** Whether a user may connect from `address` (`Session.clientAddr`): any address when it has no ranges; with ranges, one
+ *  in them, and never an address that could not be read (null), nor any when its ranges cannot be read (fail closed). */
+export function addressAllowed(u, address) {
+    if (u.from === undefined)
+        return true;
+    if (address === null)
+        return false;
+    const r = userRanges(u.from);
+    return !("problem" in r) && inRanges(r.ranges, address);
+}
+/** an address as a refusal says it */
+export const addressShown = (address) => address === null ? "an address that could not be read" : address;
 /** a user's attributes as the file keeps them: a name each, a string or a list of strings */
 function attributesValid(v) {
     // a NUL ends the statement it is bound into, wherever it is: every statement of the user would fail as a syntax error
@@ -93,7 +141,12 @@ function parseUsers(file, text) {
         if (typeof o !== "object" || o === null || typeof o.name !== "string" || !USER_NAME_RE.test(o.name) || typeof o.id !== "string" || !/^[0-9a-f]{16}$/.test(o.id) ||
             typeof o.addedAt !== "string" || typeof o.key !== "string" || (o.role !== undefined && (typeof o.role !== "string" || !ROLE_RE.test(o.role))) ||
             (o.attributes !== undefined && !attributesValid(o.attributes))) {
-            return { problem: `${file}: users[${i}] is not { name, id, addedAt, key, role?, attributes?[, removedAt][, disabledAt] } as mason user add writes it` };
+            return { problem: `${file}: users[${i}] is not { name, id, addedAt, key, role?, attributes?, from?[, removedAt][, disabledAt] } as mason user add writes it` };
+        }
+        if (o.from !== undefined) {
+            const r = Array.isArray(o.from) && o.from.every((x) => typeof x === "string") ? userRanges(o.from) : { problem: "not a list of strings" };
+            if ("problem" in r)
+                return { problem: `${file}: users[${i}].from is not a list of address ranges as mason user from writes it: ${r.problem}` };
         }
         if (o.removedAt !== undefined && typeof o.removedAt !== "string") {
             return { problem: `${file}: users[${i}].removedAt is not a timestamp as mason user remove writes it` };
@@ -102,7 +155,7 @@ function parseUsers(file, text) {
             return { problem: `${file}: users[${i}].disabledAt is not a timestamp as mason user disable writes it` };
         }
         users.push({ name: o.name, id: o.id, addedAt: o.addedAt, key: o.key, ...(typeof o.role === "string" ? { role: o.role } : {}),
-            ...(attributesValid(o.attributes) ? { attributes: o.attributes } : {}),
+            ...(attributesValid(o.attributes) ? { attributes: o.attributes } : {}), ...(Array.isArray(o.from) ? { from: o.from } : {}),
             ...(o.removedAt !== undefined ? { removedAt: o.removedAt } : {}), ...(o.disabledAt !== undefined ? { disabledAt: o.disabledAt } : {}) });
     }
     return { users };
@@ -184,6 +237,11 @@ export class LiveUsers {
     apiKey;
     seen = null;
     read = { users: [] };
+    /** each live user's ranges, parsed once per read of the file (so a login or a statement costs a lookup, never a parse) */
+    ranges = new Map();
+    /** the longest of those lists: what a name that is no user is judged against, so its refusal costs what a limited
+     *  user's does and the time of the answer does not tell them apart */
+    decoy = [];
     constructor(file, apiKey) { this.file = file; this.apiKey = apiKey; }
     /** the users not removed now (disabled ones included: their login is refused by name); why not, when the file cannot be read */
     now() {
@@ -202,11 +260,38 @@ export class LiveUsers {
             // a removed user is kept in the file for the list: it is no user to the listener
             this.read = "problem" in r ? r : { users: r.users.filter(isActive) };
             this.seen = stamp;
+            this.ranges = new Map();
+            this.decoy = [];
+            for (const u of "problem" in this.read ? [] : this.read.users) {
+                if (u.from === undefined)
+                    continue;
+                const parsed = userRanges(u.from);
+                // the file was read whole, so every list parses; one that would not stays out of the map, which refuses it
+                if ("problem" in parsed)
+                    continue;
+                this.ranges.set(u.id, parsed.ranges);
+                if (parsed.ranges.length > this.decoy.length)
+                    this.decoy = parsed.ranges;
+            }
         }
         return this.read;
     }
-    /** A connection's password, read as a user's: the session's token, or why it is refused. */
-    login(user, password) {
+    /** Whether `address` is inside `ranges` (null: no list, any address); an address not read is inside none. The ranges
+     *  are the parsed ones this read of the file holds, so this is a comparison, never a parse. */
+    inside(ranges, address) {
+        if (ranges === null)
+            return true;
+        return address !== null && inRanges(ranges, address);
+    }
+    /**
+     * A connection's password, read as a user's: the session's token, or why it is refused. `from` is the client's address
+     * (`Session.clientAddr`; null when it could not be read). THE ADDRESS IS JUDGED FIRST, before the password: the user
+     * the startup packet names, held to its ranges (`inside`); and while any user has ranges, a name that is no
+     * user is refused the same way (`ADDRESS_NOT_ALLOWED`, whose words the listener writes from the name and the address
+     * alone), so a connection from outside cannot tell a limited user from a missing one by its answer. Only the log line
+     * says which (the ApiError's message).
+     */
+    login(user, password, from = null) {
         const m = PASSWORD_RE.exec(password);
         if (m === null)
             throw refusal(401, "not a Mason user's password: mason user add <name> makes a user and prints its password", user);
@@ -214,6 +299,13 @@ export class LiveUsers {
         const now = this.now();
         if ("problem" in now)
             throw refusal(503, `the list of users cannot be read, so no user can connect: ${now.problem}`, user);
+        const named = now.users.find((u) => u.name === user);
+        // the same work on both sides: a limited user's own list, or for a name that is no user the longest list there is
+        const inside = this.inside(named === undefined ? this.decoy : named.from === undefined ? null : this.ranges.get(named.id) ?? [], from);
+        if (named !== undefined ? !inside : this.decoy.length > 0) {
+            throw refusal(401, named !== undefined ? `the user "${user}" may not connect from ${addressShown(from)}, outside its address ranges (mason user list shows them)`
+                : `no user "${user}" (from ${addressShown(from)}): refused as an address outside a user's ranges is, since some users have ranges`, user, ADDRESS_NOT_ALLOWED);
+        }
         const found = now.users.find((u) => u.id === id);
         const verifies = (name) => crypto.timingSafeEqual(Buffer.from(mac(this.apiKey, name, id)), Buffer.from(given));
         if (found === undefined) {
@@ -239,7 +331,7 @@ export class LiveUsers {
      * token as the file has the user NOW — its role as `mason user add --role` wrote it, so a role given or taken
      * applies at the user's next statement, without a restart.
      */
-    recheck(token) {
+    recheck(token, from = null) {
         if (token.user === undefined)
             return token;
         const now = this.now();
@@ -250,6 +342,10 @@ export class LiveUsers {
             throw refusal(401, `the user "${token.user}" was removed`, token.user);
         if (isDisabled(found))
             throw refusal(401, `the user "${token.user}" was disabled`, token.user, USER_DISABLED);
+        // its ranges changed since it logged in: a session from outside them ends, as a new connection would be refused
+        if (!this.inside(found.from === undefined ? null : this.ranges.get(found.id) ?? [], from)) {
+            throw refusal(401, `the user "${token.user}" may not connect from ${addressShown(from)}: its address ranges are ${found.from.join(", ")}`, token.user, ADDRESS_NOT_ALLOWED);
+        }
         if (found.role === token.role && JSON.stringify(found.attributes ?? null) === JSON.stringify(token.attributes ?? null))
             return token;
         const { role: _was, attributes: _had, ...rest } = token;
@@ -269,9 +365,9 @@ export const disabledMessage = (name) => `role "${name}" is not permitted to log
  */
 export function listenerLogins(users, apiKey) {
     return {
-        authenticate: (password, user) => {
+        authenticate: (password, user, from) => {
             if (isUserPassword(password))
-                return users.login(user, password);
+                return users.login(user, password, from ?? null);
             if (password.startsWith(SHARE_PASSWORD_PREFIX))
                 throw new Error("a mason share password logs in only at the address mason share printed, never on this port");
             const problem = tokenProblem(apiKey, password);
@@ -279,7 +375,7 @@ export function listenerLogins(users, apiKey) {
                 throw new Error(problem);
             return { filters: [], subject: undefined };
         },
-        recheck: async (t) => users.recheck(t),
+        recheck: async (t, from) => users.recheck(t, from ?? null),
         recheckMs: 0,
     };
 }