T12.4: CR-020 CSV upload (usernames only)

POST /api/auth/bulk-users/resolve reads a list of usernames (first
column; comma, semicolon or tab; header skipped) and answers line by
line, the CR-005 validate-and-report pattern. A line is rejected, with
its number and reason, when it names nobody the caller can see ('User
not found', as everywhere else), an account they may not change (the
single route's own reason), their own account, or a username already
listed (duplicate of line N). An email address resolves only when
exactly one account has it. Nothing is changed by this route.

The console's 'Select from CSV' turns the accepted accounts into the
ordinary selection (filter reset so every selected row is visible) and
lists every rejected line. The action, confirm and per-row report are
the checkbox ones, through the same T12.1 routes, which re-check each
row: a CSV cannot reach an account a checkbox could not.
Usernames only, action in the toolbar (decided 2026-10-06). Files over
1 MB are refused before upload; FileReader fallback for browsers
without Blob.text().

bulk_users_check.py: 61/61. DOM harness: 40/40.
This commit is contained in:
2026-10-06 11:04:01 -07:00
parent 681048197a
commit 74d3bc4af7
4 changed files with 197 additions and 4 deletions

View File

@@ -38,8 +38,10 @@
.whoami-chip strong{ color:var(--text); }
/* CR-020: row selection and the bulk bar. Tokens only (the token rule). */
#sel-banner:not(:empty), #bulk-banner:not(:empty){ margin-bottom:var(--s3); }
#bulk-banner ul{ margin:var(--s1) 0 0; padding-left:var(--s5); font-weight:400; }
#sel-banner:not(:empty), #bulk-banner:not(:empty), #csv-banner:not(:empty){ margin-bottom:var(--s3); }
#bulk-banner ul, #csv-banner ul{ margin:var(--s1) 0 0; padding-left:var(--s5); font-weight:400;
max-height:220px; overflow:auto; }
#csv-btn[hidden]{ display:none; }
table.grid th.selcell, table.grid td.selcell{ width:1%; padding:0 var(--s1); text-align:center; }
/* The label is the hit area: the 16px box alone is under the 24px floor. */
.selhit{ display:inline-flex; align-items:center; justify-content:center;
@@ -111,8 +113,14 @@
<option value="disabled">Disabled only</option>
<option value="mine">Accounts I manage</option>
</select>
<!-- CR-020 (T12.4): a list of usernames from a file becomes the selection.
Managers only; users.js shows it. -->
<button type="button" id="csv-btn" onclick="pickCsv()" hidden
title="A CSV with one username (or email) per line, first column. The action is chosen in the bulk bar.">Select from CSV…</button>
<input type="file" id="csv-file" accept=".csv,.txt,text/csv,text/plain" hidden>
</div>
<div id="users-banner"></div>
<div id="csv-banner"></div>
<!-- CR-020: bulk actions on the selected rows. Present only while at least one
row is selected (the hidden attribute also takes it out of the tab order). -->
<div id="bulk-bar" class="bulkbar" role="region" aria-label="Bulk actions on the selected users" hidden>

View File

@@ -184,6 +184,8 @@ document.addEventListener('change', e => {
// can only fail.
function renderBulkActions(){
const box = document.getElementById('bulk-actions');
const csvBtn = document.getElementById('csv-btn');
if(csvBtn) csvBtn.hidden = !manages();
if(!box || !manages()) return;
const grantable = PERM_ROLES.filter(r => (_scope.grantable_roles || []).indexOf(r) >= 0);
const projects = (_scope.managed_projects || []).slice()
@@ -290,6 +292,70 @@ function bulkProject(op){
: 'Remove '+people(n)+' from '+pname+'?\n\nTheir other projects stay as they are.'});
}
// ── CSV upload (CR-020, T12.4) ────────────────────────────────────────────────
// The file holds usernames only (decided 2026-10-06). The server reads it and
// answers line by line; the accepted accounts become the ordinary selection, so
// the action, its confirmation and its row-by-row report are the same ones the
// checkboxes use. A CSV cannot reach an account a checkbox could not: the bulk
// route re-checks every row.
const CSV_MAX_BYTES = 1024 * 1024;
// Blob.text() where the browser has it, FileReader where it does not (older
// tablet browsers).
function readFileText(file){
if(typeof file.text === 'function') return file.text();
return new Promise((resolve, reject) => {
const r = new FileReader();
r.onload = () => resolve(String(r.result || ''));
r.onerror = () => reject(r.error);
r.readAsText(file);
});
}
function pickCsv(){
const f = document.getElementById('csv-file');
if(f){ f.value = ''; f.click(); }
}
document.addEventListener('change', e => {
if(e.target && e.target.id === 'csv-file' && e.target.files && e.target.files[0]) loadCsv(e.target.files[0]);
});
async function loadCsv(file){
if(file.size > CSV_MAX_BYTES){
bannerHtml('csv-banner', 'bad', '✕ '+uesc(file.name)+' is larger than 1 MB. Split it and load the parts one at a time.');
return;
}
let text = '';
try { text = await readFileText(file); }
catch(_){ bannerHtml('csv-banner', 'bad', '✕ Could not read '+uesc(file.name)+'.'); return; }
bannerHtml('csv-banner', '', 'Reading '+uesc(file.name)+'…');
const { status, json } = await api('POST', '/api/auth/bulk-users/resolve', { text });
if(status !== 200 || !json || !Array.isArray(json.rows)){
bannerHtml('csv-banner', 'bad', '✕ '+uesc(apiError(status, json, 'Could not read the list')));
return;
}
// Show everyone, so every accepted account is a visible, checked row: a
// selection must never include a row the filter hides.
const s = document.getElementById('user-search'), f = document.getElementById('user-filter');
if(s) s.value = '';
if(f) f.value = '';
await loadUsers();
const want = new Set(json.user_ids || []);
_shownSelectable.forEach(id => { if(want.has(id)) _selected.add(id); });
updateSelectionUI();
const missed = [...want].filter(id => !_selected.has(id)).length;
const rejected = json.rows.filter(r => r.status !== 'ok');
const lead = (rejected.length || missed ? '⚠ ' : '✓ ')+uesc(file.name)+': '+json.read+' line'+(json.read===1?'':'s')+' read, '+
_selected.size+' selected'+(rejected.length ? ', '+rejected.length+' rejected' : '')+'.'+
(missed ? ' '+missed+' accepted account'+(missed===1?' is':'s are')+' no longer in the directory; reload and try again.' : '')+
(_selected.size ? ' Pick an action in the bulk bar to apply it to the selected accounts.' : '');
const list = rejected.length
? '<ul>'+rejected.map(r => '<li>Line '+r.line+' ('+uesc(r.text)+'): '+uesc(r.reason)+'</li>').join('')+'</ul>'
: '';
bannerHtml('csv-banner', (rejected.length || missed) ? 'warn' : 'ok', lead + list);
}
function selCell(u){
if(!selectable(u)){
const why = u.id === _meId ? 'Your own account: change it one setting at a time'

View File

@@ -1387,6 +1387,77 @@ def bulk_set_project(body: BulkProjectIn, actor: models.User = Depends(require_u
return run_bulk(db, actor, body.user_ids, "project_" + body.op, apply)
class BulkResolveIn(BaseModel):
text: str = Field(default="", max_length=200_000)
_CSV_HEADER_WORDS = ("username", "user", "login", "email", "user name")
@app.post("/api/auth/bulk-users/resolve")
def bulk_resolve(body: BulkResolveIn, actor: models.User = Depends(require_user_manager), db: Session = Depends(get_db)):
"""CR-020 (T12.4): turn an uploaded list of usernames into the account ids a
bulk action will run on - a second way IN to the same four bulk routes, not a
third copy of their rules. The CSV holds usernames only (decided 2026-10-06);
the action is chosen in the console and applies to every accepted row.
Validate and report, the CR-005 pattern: every line is either accepted or
rejected WITH ITS LINE NUMBER and a reason - never silently skipped. A line is
rejected when it names nobody this caller can see (the same 'not found' a
hidden account gets everywhere else), an account they may not change (with
the same reason the single route would give), their own account, or a
username already listed on an earlier line. Nothing is changed here; the
bulk route the console calls next re-checks every row anyway."""
rows = []
seen: dict[str, int] = {}
visible = visible_user_ids(db, actor)
cache: dict = {}
for line_no, raw in enumerate((body.text or "").splitlines(), start=1):
line = raw.strip().lstrip("")
if not line:
continue
cell = re.split(r"[,;\t]", line, maxsplit=1)[0].strip().strip('"').strip()
if not cell:
rows.append({"line": line_no, "text": line[:120], "status": "rejected",
"reason": "no username in the first column"})
continue
if line_no == 1 and cell.lower() in _CSV_HEADER_WORDS:
continue # header row
row = {"line": line_no, "text": cell[:120], "status": "rejected", "reason": "",
"user_id": None, "username": ""}
if any(ord(ch) < 32 for ch in cell) or len(cell) > 120:
row["reason"] = "not a valid username"
rows.append(row)
continue
key = cell.lower()
if key in seen:
row["reason"] = f"duplicate of line {seen[key]}"
rows.append(row)
continue
seen[key] = line_no
u = db.scalars(select(models.User).where(func.lower(models.User.username) == key)).first()
if u is None:
# An offboarding list usually carries email addresses. Accepted only
# when exactly one account has that address, so a shared or reused
# address can never pick the wrong person.
by_mail = db.scalars(select(models.User).where(func.lower(models.User.email) == key)).all()
u = by_mail[0] if len(by_mail) == 1 else None
if u is None or (visible is not None and u.id not in visible):
row["reason"] = "User not found"
elif u.id == actor.id:
row["reason"] = "your own account - change it one setting at a time"
else:
problem = manage_user_problem(db, actor, u, cache)
if problem:
row["reason"] = problem
else:
row.update(status="ok", user_id=u.id, username=u.username)
rows.append(row)
accepted = [r for r in rows if r["status"] == "ok"]
return {"read": len(rows), "accepted": len(accepted), "rejected": len(rows) - len(accepted),
"user_ids": [r["user_id"] for r in accepted], "rows": rows}
@app.post("/api/auth/bulk-users/delete")
def bulk_delete(body: BulkUsersIn, actor: models.User = Depends(require_user_manager), db: Session = Depends(get_db)):
"""Hard delete, the same as DELETE /api/auth/users/{id} (decided 2026-09-17:

View File

@@ -242,8 +242,56 @@ def bulk_delete():
check("the deleted account's memberships went with it", roles_of("user_u5") == {})
def csv_resolve():
print("\n6. CSV upload: usernames in, a line-by-line report out (T12.4)")
text = ("username\n" # header, skipped
"u3\n"
"U3\n" # same person, different case: a duplicate
"nobody\n"
"\n" # blank lines are not rows
"u6\n" # visible to the super user, but also on a project they don't run
"u7\n" # not visible to the super user at all
"super\n" # the caller themself
"u8@example.test,extra column\n" # an email address, matched to exactly one account
",\n") # an empty first column
r = cs.post("/api/auth/bulk-users/resolve", json={"text": text})
j = r.json()
rows = {x["line"]: x for x in j["rows"]}
check("200 with a row for every non-blank line after the header",
r.status_code == 200 and sorted(rows) == [2, 3, 4, 6, 7, 8, 9, 10], sorted(rows))
check("a valid username is accepted", rows[2]["status"] == "ok" and rows[2]["user_id"] == "user_u3")
check("a repeated username is rejected as a duplicate of its first line, not applied twice",
rows[3]["status"] == "rejected" and rows[3]["reason"] == "duplicate of line 2")
check("an unknown username: 'User not found', with its line number", rows[4]["reason"] == "User not found")
check("an account the caller may not change: rejected with the single route's own reason",
rows[6]["status"] == "rejected" and "don't administer" in rows[6]["reason"], rows[6]["reason"])
check("an account the caller cannot see: 'User not found' (a CSV leaks no more than the table)",
rows[7]["reason"] == "User not found")
check("the caller's own account is rejected with a clear reason", "your own account" in rows[8]["reason"])
check("an email address resolves when exactly one account has it",
rows[9]["status"] == "ok" and rows[9]["user_id"] == "user_u8")
check("an empty first column is rejected, not skipped", rows[10]["reason"] == "no username in the first column")
check("the ids handed back are exactly the accepted rows",
j["user_ids"] == ["user_u3", "user_u8"] and (j["accepted"], j["rejected"]) == (2, 6), str(j["user_ids"]))
r = cs.post("/api/auth/bulk-users/active", json={"user_ids": j["user_ids"] + ["user_u7"], "is_active": False})
res = by_user(r)
check("the CSV's ids go through the same bulk route and the same guards: an id slipped in by hand "
"is still refused", res["user_u7"]["status"] == "failed" and res["user_u3"]["status"] == "ok")
ca.post("/api/auth/bulk-users/active", json={"user_ids": ["user_u3", "user_u8"], "is_active": True})
r = cp.post("/api/auth/bulk-users/resolve", json={"text": "u3"})
check("a plain project user cannot resolve a list (403)", r.status_code == 403)
r = cs.post("/api/auth/bulk-users/resolve", json={"text": "x" * 200_001})
check("an oversized upload is refused (422)", r.status_code == 422)
s = fresh()
s.add(models.User(id="user_twin1", username="twin1", email="shared@example.test"))
s.add(models.User(id="user_twin2", username="twin2", email="shared@example.test"))
s.commit()
r = ca.post("/api/auth/bulk-users/resolve", json={"text": "shared@example.test"})
check("an email shared by two accounts matches neither", r.json()["rows"][0]["reason"] == "User not found")
def gates():
print("\n5. who may call, and how much")
print("\n7. who may call, and how much")
for path, body in (("role", {"role": "project_user"}), ("active", {"is_active": False}),
("projects", {"project_id": "proj1", "op": "add"}), ("delete", {})):
r = cp.post(f"/api/auth/bulk-users/{path}", json={"user_ids": ["user_u3"], **body})
@@ -254,7 +302,7 @@ def gates():
check("more than 500 ids in one request is refused (422)", r.status_code == 422, str(r.status_code))
SECTIONS = [single_routes, bulk_role, bulk_active, bulk_projects, bulk_delete, gates]
SECTIONS = [single_routes, bulk_role, bulk_active, bulk_projects, bulk_delete, csv_resolve, gates]
def main() -> int: