tracker
All repositories: gitoria
9.4 KB
// hl:crypto — passwords first. JS transpiler twin of plugins/crypto/crypto.zig.//// Parity contract with the native plugin:// hash(password, options) → a PHC string, freshly salted every call// verify(password, stored) → boolean, timing-safe comparison// parsePhc(stored) → the stored string described, or null// kdf() → the algorithm THIS engine hashes with// sha256(data) → 64 lowercase hex characters// randomBytes(n, encoding) → "hex" (default) or "base64"// toBase64(data) → base64 of a String's UTF-8 or of a Bytes (ticket #90)// fromBase64(text) → a Bytes, or null when text is not base64//// The PHC STRING FORMAT, the strictness of the parser, the cost knob and its cap,// and the salt/output lengths are identical on both engines — a `$scrypt$` string// written by either one verifies on the other, byte for byte, because RFC 7914 is// RFC 7914 whether it is reached through Node's crypto or through libcrypto's// EVP_PBE_scrypt.//// THE ONE DIFFERENCE, stated rather than hidden: Node has no argon2 of any kind,// so this engine hashes with scrypt where the native plugin prefers argon2id on a// host whose libcrypto has it. `parsePhc` still reads argon2id strings here — the// format is just a string — but `verify` on one THROWS instead of answering// `false`, because "I cannot compute this algorithm" is not "wrong password".import { createHash, randomBytes as nodeRandomBytes, scryptSync, timingSafeEqual } from 'node:crypto';// Bytes are the runtime's: this file is copied to hl-modules/crypto.js, beside hl-runtime.js.import { hlMakeBytes, hlIsBytes } from '../hl-runtime.js';// The cost knob: base-2 log of the working memory in KiB. Same numbers as the// native plugin — 15 is 32 MiB (scrypt N = 2^15, r = 8, p = 1 is 128·N·r bytes).const COST_DEFAULT = 15;const COST_MIN = 10; // 1 MiBconst COST_MAX = 17; // 128 MiB — see the note in crypto.zig; the two engines// must cap at the same number or a string one of them// wrote would be out of range for the other.const SALT_LEN = 16;const HASH_LEN = 32;// The floor a stored string must clear to be READ at all — see decodePhc().const MIN_SALT_LEN = 8;const MIN_HASH_LEN = 16;const SCRYPT_R = 8;const SCRYPT_P = 1;// Node refuses a derivation whose 128·N·r exceeds maxmem, default 32 MiB — which// the DEFAULT cost sits exactly on. Raised past the cost cap so the cap is the// only thing that limits anything.const SCRYPT_MAXMEM = 2 * 1024 * 1024 * 1024;const B64_CHARS = /^[A-Za-z0-9+/]+$/;function b64(buf) {return buf.toString('base64').replace(/=+$/, '');}// Deliberately strict, to match the Zig decoder, and BOTH halves of that are// load-bearing:// • Node's base64 reader silently skips characters outside the alphabet, so a// string with junk in it would parse rather than be refused;// • it also drops NON-CANONICAL TRAILING BITS. A 32-byte hash is 43 base64// characters, whose last character carries only two significant bits — so// "…L8E" and "…L8F" decode to the SAME 32 bytes and, before this check,// editing the last character of a stored hash did not change what it// verified against. Zig's decoder refuses that outright; re-encoding is how// this engine reaches the same answer.function unb64(text) {if (!B64_CHARS.test(text)) return null;const buf = Buffer.from(text, 'base64');if (buf.length === 0) return null;if (b64(buf) !== text) return null;return buf;}function paramValue(field, key) {for (const pair of field.split(',')) {const eq = pair.indexOf('=');if (eq < 0) continue;if (pair.slice(0, eq) !== key) continue;const raw = pair.slice(eq + 1);if (!/^[0-9]+$/.test(raw)) return null;const n = Number(raw);return Number.isSafeInteger(n) ? n : null;}return null;}/** Strict PHC decode. Any deviation at all is null — that is what makes a* tampered string fail rather than half-parse into something comparable.** Including the LENGTH FLOOR: a KDF derives as many bytes as it is asked for,* so a stored string whose hash field had been cut down to eight base64* characters derived six bytes and compared six bytes — and six bytes of a* correct derivation match. Truncating the stored value was a way to make a* wrong password verify until this check existed (both engines had it). */function decodePhc(stored) {if (typeof stored !== 'string' || stored.length < 2 || stored[0] !== '$') return null;const parts = stored.slice(1).split('$');if (parts.length > 8) return null;if (parts[0] === 'argon2id') {if (parts.length !== 5) return null;if (!parts[1].startsWith('v=') || !/^[0-9]+$/.test(parts[1].slice(2))) return null;const version = Number(parts[1].slice(2));const m = paramValue(parts[2], 'm');const t = paramValue(parts[2], 't');const p = paramValue(parts[2], 'p');if (m === null || t === null || p === null) return null;const salt = unb64(parts[3]);const hash = unb64(parts[4]);if (!salt || !hash) return null;if (salt.length < MIN_SALT_LEN || hash.length < MIN_HASH_LEN) return null;return { kdf: 'argon2id', version, m, t, p, salt, hash };}if (parts[0] === 'scrypt') {if (parts.length !== 4) return null;const ln = paramValue(parts[1], 'ln');const r = paramValue(parts[1], 'r');const p = paramValue(parts[1], 'p');if (ln === null || r === null || p === null) return null;const salt = unb64(parts[2]);const hash = unb64(parts[3]);if (!salt || !hash) return null;if (salt.length < MIN_SALT_LEN || hash.length < MIN_HASH_LEN) return null;return { kdf: 'scrypt', version: null, ln, r, p, salt, hash };}return null;}function clampCost(value) {if (typeof value !== 'number' || Number.isNaN(value)) return COST_DEFAULT;return Math.trunc(Math.max(COST_MIN, Math.min(COST_MAX, value)));}export function hash(password, options) {if (typeof password !== 'string') throw new Error('hl:crypto hash() expects a string password');const opts = options && typeof options === 'object' ? options : {};const cost = clampCost(opts.cost);const want = typeof opts.kdf === 'string' ? opts.kdf : 'scrypt';if (want === 'argon2id') {throw new Error('hl:crypto hash(): this engine has no argon2id — Node ships no argon2');}if (want !== 'scrypt') {throw new Error('hl:crypto hash(): unknown kdf — expected "argon2id" or "scrypt"');}const salt = nodeRandomBytes(SALT_LEN);const derived = scryptSync(password, salt, HASH_LEN, {N: 2 ** cost, r: SCRYPT_R, p: SCRYPT_P, maxmem: SCRYPT_MAXMEM,});return `$scrypt$ln=${cost},r=${SCRYPT_R},p=${SCRYPT_P}$${b64(salt)}$${b64(derived)}`;}export function verify(password, stored) {if (typeof password !== 'string') return false;const phc = decodePhc(stored);if (phc === null) return false;if (phc.hash.length === 0 || phc.hash.length > 64) return false;if (phc.kdf === 'argon2id') {throw new Error('hl:crypto verify(): stored password is argon2id and this engine has none — Node ships no argon2');}if (phc.ln === 0 || phc.ln > 30 || phc.r === 0 || phc.p === 0) return false;let computed;try {computed = scryptSync(password, phc.salt, phc.hash.length, {N: 2 ** phc.ln, r: phc.r, p: phc.p, maxmem: SCRYPT_MAXMEM,});} catch {// A stored string asking for more memory than this host will give is not a// wrong password, but it is also not something to crash a login over.return false;}return timingSafeEqual(computed, phc.hash);}export function parsePhc(stored) {const phc = decodePhc(stored);if (phc === null) return null;const params = phc.kdf === 'argon2id'? { m: phc.m, t: phc.t, p: phc.p }: { ln: phc.ln, r: phc.r, p: phc.p };return {kdf: phc.kdf,version: phc.version,params,saltLen: phc.salt.length,hashLen: phc.hash.length,};}export function kdf() {return 'scrypt';}export function sha256(data) {if (typeof data !== 'string') throw new Error('hl:crypto sha256() expects a string');return createHash('sha256').update(data, 'utf8').digest('hex');}export function randomBytes(n, encoding) {if (typeof n !== 'number' || !(n >= 1) || n > 1024) {throw new Error('hl:crypto randomBytes(): count must be between 1 and 1024');}const buf = nodeRandomBytes(Math.trunc(n));const enc = typeof encoding === 'string' ? encoding : 'hex';if (enc === 'hex') return buf.toString('hex');if (enc === 'base64') return buf.toString('base64');throw new Error('hl:crypto randomBytes(): encoding must be "hex" or "base64"');}// Base64, standard alphabet (ticket #90) — the rules are crypto.zig's: encoding// pads; decoding takes padded or unpadded text and answers null for anything an// encoder would not have written. Node's own decoder skips what it does not// understand, so the text is checked first and the result re-encoded after.export function toBase64(data) {if (hlIsBytes(data)) return Buffer.from(data._d).toString('base64');if (typeof data !== 'string') throw new Error('hl:crypto toBase64() expects a String or a Bytes');return Buffer.from(data, 'utf8').toString('base64');}export function fromBase64(text) {if (typeof text !== 'string') throw new Error('hl:crypto fromBase64() expects a String');let core = text;if (core.length % 4 === 0) core = core.replace(/={1,2}$/, '');if (core.length % 4 === 1 || !/^[A-Za-z0-9+/]*$/.test(core)) return null;const buf = Buffer.from(core, 'base64');if (buf.toString('base64').replace(/=+$/, '') !== core) return null;return hlMakeBytes(new Uint8Array(buf));}
Branches
- mainmain branch
Latest commits
- 5cb85d75deploy.sh: a backup taken while a background job writes (tar exit 1) is a warning; archive checked with gzip -tmre
- 9abda75dtracker: report 035mre
- 12595e47mission 035: theme re-vendored from layouts.worldapi.org 0222f67 (two corner radii: radiusSmall 5px, radiusLarge 10px); the tracker's 18 own radii -> radiusSmall/radiusLarge (--layout-radius is gone); check-theme 0; gates 379/0, 32/0, 53/0, 229/0, 26/0; real copy: every computed radius in {0, 5px, 10px, 50%}mre
- e7305014tracker: report 032 (art + photos)mre
- fbb903cctracker#33/#37 (mission 032): a title without a TMDB poster gets its backdrop (w780, posterFromBackdrop, shown 2:3 centre-cropped); movies store runtime, the page shows release date + runtime; art backfill (public titles without poster file / movies without runtime) and person photo backfill (tmdbProfile / photoCheck) as the last start jobs (TRACKER_ART, TRACKER_PHOTOS; off in every gate start); gates 379/0, 32/0, 53/0, 229/0, 26/0, check-theme 0; live copy: art 4977 titles in 42 min (115 posters, 15 backdrops, 4609 runtimes), The Remaining shows its backdrop + 7 minmre
- 4ecc67b2tracker: STATUS/LOG for the t38 + t40 merge (gates 374/0, 32/0, 53/0, 229/0, 26/0, check-theme 0; live copy checks)mre
- e5945d2fMerge t40 (tracker#40 curated franchises, Franchises menu, superseded collections) into main: deploy.sh lists all six gates (browser, kinds, franchises, pager, franchiseseed, check-theme); search.hl keeps #37's personPhotoOf + #40's importWithCredits; pager gate runs with TRACKER_FRANCHISE_SEED=0; gates 374/0, 32/0, 53/0, 229/0, 26/0, check-theme 0mre
- b638e99dMerge t38 (tracker#38 pagination, #35 Returning/Airing label) into main: LOG/STATUS keep both sides; pager gate follows #37's /people (everyone, last updated first: seed updatedAt); gates pager 229/0, browser 374/0mre
- f8ffa4dbtracker: report 032 + The Remaining + #39mre
- 7565a863tracker: LOG timemre
- b10f00c8tracker#39: double episodes — migrated episodes whose TMDB id TMDB replaced are adopted by their number in the sync (old id -> migratedTmdbId); merge.hl step 3 merges each season's doubles at start (keeper: most watches > synced > first; watches moved/parked; tombstones into mergedEpisodes, nothing deleted); tools/count-duplicate-episodes.hl; gate fixture + paths-m039; live copy 850 -> 0 in 64 s; gates 373/0, 32/0, 52/0mre
- 8f1d4542tracker#40: superseded collections — a TMDB collection timeline whose titles are all in one curated timeline is hidden (supersededBy; kept: own page + editor finder), set by the collection seed when it makes one and by the curated build (lifted when the cover is gone); partly covered ones join that franchise; no second widget (First Contact: only Star Trek — Prime); gate franchiseseed 26/0, browser 365/0, kinds 32/0, franchises 53/0, check-theme 0; real copy 24 supersededmre
- 9448d643tracker#35 follow-up (mission 033): TVmaze 'Running' is labelled 'Returning', or 'Airing' while a non-special episode of the two newest seasons is released within today +-7 days (data unchanged); gate fixtures Running/Airing/Aired + a special; browser 366/0, kinds 32/0, franchises 52/0, pager 229/0, check-theme 0mre
- 7d4b293dtracker#40: "Franchises" in the main menu (desktop header after People, phone sidebar) → /franchises, marked on franchise and timeline pages; gates 365/0, 32/0, 53/0, 24/0, check-theme 0mre
- 8751adb8tracker: report 032mre
- 9bce1f65tracker mission 032: STATUS gate files + the hour-boundary flakemre
- 718bfb89tracker#37 (mission 032): /people = everyone, last updated first (updatedAt stamped by the person fill; view built at boot, touched people first at once), photo + name tiles (person colour) with the /movies pagination, /people/<letter> removed; photo = our file, tmdbProfile, a cast/crew entry's profile (in-memory map at boot), else the new 'no photo' placeholder; new cast/crew/created_by people keep tmdbProfile; search people rows with the photo; /settings = the heading only; util.hl sortDesc starts from sorted runs (same result, 105k: 1.6 s -> 0.15 s); gates 369/0, 32/0, 52/0, check-theme 0; README/STATUS/LOGmre
- 93dfb0batracker#40 (mission 034): the curated franchises — data/franchises.json (17 franchises, 31 timelines, 285 TMDB titles, movies + series, in-universe/release order, 12 TMDB collections attached); lib/franchiseseed.hl + jobs.hl franchiseSeedTick (last start job, imports missing titles via details.hl importWithCredits = the search's Add, one per step paced, then one build; franchiseseed.db: editor changes win, the creator's same-name franchise adopted / timeline left alone, 404 remembered, resumable, idempotent); timeline heads 'N titles · in-universe order' (orderKind) and wrap on a phone; series pages show the widget; new gate tests/franchiseseed.mjs (5th in deploy.sh), the others run with TRACKER_FRANCHISE_SEED=0; gates 365/0, 32/0, 52/0, 24/0, check-theme 0; real copy 196 imported, 0 failed, 7 min, restart unchanged=31mre
- 03ec792ftracker#38 (mission 033): pagination goes exactly to the clicked page — tilelist read the clicked button's text after pagination.hl's own handler had rebuilt the buttons (real clicks only); now li.current, else the button's own text; new gate tests/pager.mjs (5 lists x 11 pages, 390/1280, real + script clicks, Back/Forward) 229/0; browser 365/0, kinds 32/0, franchises 52/0, check-theme 0mre
- 96ba683adeploy.sh: a gate without a 'passed,' line (check-theme) no longer ends the scriptmre