@novacraft-engineering/mailbox 0.4.17 → 0.4.19

package/app/mail/page.module.css

@@ -1086,6 +1086,8 @@
 
 .riskBanner strong { display: block; font-weight: 650; }
 .riskBannerWhy { display: block; margin-top: 3px; opacity: 0.92; font-size: 12.5px; }
+.riskBannerReasons { margin: 4px 0 0; padding-left: 16px; opacity: 0.92; font-size: 12.5px; list-style: disc; }
+.riskBannerReasons li { margin-top: 2px; }
 
 .riskNoteIcon,
 .riskBannerIcon { display: inline-flex; flex-shrink: 0; }

package/app/mail/page.tsx

@@ -6312,7 +6312,11 @@ export default function DevMailPage() {
                         : 'This message may not be from who it claims'}
                   </strong>
                   {(inbound.riskReasons ?? []).length > 0 && (
-                    <span className={styles.riskBannerWhy}>{(inbound.riskReasons ?? []).join(' \u00b7 ')}</span>
+                    <ul className={styles.riskBannerReasons}>
+                      {(inbound.riskReasons ?? []).map(reason => (
+                        <li key={reason}>{reason}</li>
+                      ))}
+                    </ul>
                   )}
                   <span className={styles.riskBannerWhy}>
                     Treat links and attachments here with care, and do not enter passwords or payment details.

package/lib/mailbox.ts

@@ -593,7 +593,15 @@ export type RiskJudgement = { risk: Risk; reasons: string[]; score: number; quar
 export function judgeMessage(signals: RiskSignals, standing: SenderStanding): RiskJudgement {
   const reasons: string[] = []
   let score = 0
-  const add = (weight: number, why: string) => { score += weight; reasons.push(why) }
+  // A finding is "telling" when it is hard to trip by accident. Failing an authentication
+  // check or shouting in the subject line is neither: ordinary mail does both. Holding a
+  // message back takes at least one finding of the first kind, however the weights add up.
+  let telling = 0
+  const add = (weight: number, why: string, isTelling = false) => {
+    score += weight
+    if (isTelling) telling += 1
+    reasons.push(why)
+  }
 
   if (/^fail$/i.test((signals.virus ?? '').trim())) {
     return { risk: 'virus', reasons: ['A virus scan failed on this message'], score: 100, quarantine: true }
@@ -604,12 +612,12 @@ export function judgeMessage(signals: RiskSignals, standing: SenderStanding): Ri
   const trusted = standing.replied > 0 && standing.markedSpam === 0
   if (standing.markedSpam > 0) {
     add(4 + Math.min(standing.markedSpam, 4),
-      `You marked ${standing.markedSpam} earlier message${standing.markedSpam === 1 ? '' : 's'} from this sender as spam`)
+      `You marked ${standing.markedSpam} earlier message${standing.markedSpam === 1 ? '' : 's'} from this sender as spam`, true)
   } else if (standing.trashed >= 3 && standing.replied === 0) {
-    add(3, `You have deleted ${standing.trashed} messages from this sender without ever replying`)
+    add(3, `You have deleted ${standing.trashed} messages from this sender without ever replying`, true)
   }
 
-  if (/^fail$/i.test((signals.spam ?? '').trim())) add(4, 'The provider\u2019s spam filter flagged this message')
+  if (/^fail$/i.test((signals.spam ?? '').trim())) add(4, 'The provider\u2019s spam filter flagged this message', true)
 
   const authenticated = /^pass$/i.test((signals.dmarc ?? '').trim())
   // Heavy, but not enough on its own to hide a message: mail forwarded through a list
@@ -628,14 +636,14 @@ export function judgeMessage(signals: RiskSignals, standing: SenderStanding): Ri
   const free = freeProviders()
   const freeReply = replyDomains.find(entry => free.has(entry))
   if (freeReply && fromDomain && !free.has(fromDomain)) {
-    add(4, `Replies to this message go to ${freeReply}, not to ${fromDomain}`)
+    add(4, `Replies to this message go to ${freeReply}, not to ${fromDomain}`, true)
   } else if (replyDomains.length) {
     add(1, `Replies go to ${replyDomains[0]} rather than ${fromDomain || 'the sender'}`)
   }
 
   const tld = fromDomain.split('.').pop() ?? ''
-  if (throwawayTlds().has(tld)) add(2, `The sender\u2019s domain ends in .${tld}, which is cheap to register and often disposable`)
-  if (/^\d{4,}$/.test(fromDomain.split('.')[0] ?? '')) add(2, 'The sender\u2019s domain name is just a string of digits')
+  if (throwawayTlds().has(tld)) add(2, `The sender\u2019s domain ends in .${tld}, which is cheap to register and often disposable`, true)
+  if (/^\d{4,}$/.test(fromDomain.split('.')[0] ?? '')) add(2, 'The sender\u2019s domain name is just a string of digits', true)
 
   const subject = (signals.subject ?? '').trim()
   const letters = subject.replace(/[^A-Za-z]/g, '')
@@ -643,7 +651,7 @@ export function judgeMessage(signals: RiskSignals, standing: SenderStanding): Ri
 
   const body = (signals.text ?? '').toLowerCase()
   const hits = scamPhrases().filter(phrase => body.includes(phrase))
-  if (hits.length >= 2) add(3, `The wording follows a known advance-fee approach (${hits.slice(0, 3).join(', ')})`)
+  if (hits.length >= 2) add(3, `The wording follows a known advance-fee approach (${hits.slice(0, 3).join(', ')})`, true)
   else if (hits.length === 1) add(1, `Wording associated with advance-fee mail (${hits[0]})`)
 
   // Never heard from before is not suspicious by itself — everyone writes once for the
@@ -660,7 +668,7 @@ export function judgeMessage(signals: RiskSignals, standing: SenderStanding): Ri
   // time teaches the reader to ignore the warning.
   if (score < flagAt()) return { risk: 'clean', reasons: [], score, quarantine: false }
 
-  const quarantine = score >= limit
+  const quarantine = score >= limit && telling > 0
   return { risk: quarantine ? 'spam' : 'suspicious', reasons, score, quarantine }
 }
 
@@ -1103,7 +1111,7 @@ export async function refreshThread(ownerRaw: string, threadId: string): Promise
   const head = latest[0]
   await sql`
     INSERT INTO mail_threads (owner, thread_id, subject_key, subject, first_at, latest_at, latest_id, count,
-      unread_count, starred_count, inbox_count, archived_count, trashed_count, spam_count, attach_count, senders, snippet, labels, addressed)
+      unread_count, starred_count, inbox_count, archived_count, trashed_count, spam_count, attach_count, senders, snippet, labels, addressed, risk)
     VALUES (${owner}, ${threadId}, ${subjectKey(String(head?.subject ?? ''))}, ${head?.subject ?? null},
       ${String(agg[0].first_at)}, ${String(agg[0].latest_at)}, ${head?.id ?? null}, ${total},
       ${Number(agg[0].unread ?? 0)}, ${Number(agg[0].starred ?? 0)}, ${Number(agg[0].inbox ?? 0)},
@@ -1361,7 +1369,12 @@ export async function rejudgeStored(options: { before?: string; limit?: number }
     // they put it — back-fill may label it, never move it out from under them.
     const untouched = !Number(row.read) && !Number(row.starred) && !Number(row.archived) && !Number(row.trashed)
     const quarantine = verdict.quarantine && untouched
-    if (String(row.risk ?? 'clean') === verdict.risk && Boolean(Number(row.spam)) === quarantine) continue
+    if (String(row.risk ?? 'clean') === verdict.risk && Boolean(Number(row.spam)) === quarantine) {
+      // The verdict is unchanged, but the conversation summary the list reads from may still
+      // predate it — worth one refresh for the few that carry a warning.
+      if (verdict.risk !== 'clean') await rethreadAfterChange(String(row.id))
+      continue
+    }
 
     await sql`
       UPDATE mail_inbox

package/lib/schema.test.ts

@@ -0,0 +1,50 @@
+import assert from 'node:assert/strict'
+import { readdirSync, readFileSync, statSync } from 'node:fs'
+import { join } from 'node:path'
+
+const sourceFiles = (dir: string): string[] =>
+  readdirSync(dir).flatMap(entry => {
+    const path = join(dir, entry)
+    if (entry === 'node_modules' || entry === '.next') return []
+    if (statSync(path).isDirectory()) return sourceFiles(path)
+    return path.endsWith('.ts') || path.endsWith('.tsx') ? [path] : []
+  })
+
+const valueCount = (values: string): number => {
+  let depth = 0
+  let count = 1
+  for (const character of values) {
+    if ('([{'.includes(character)) depth += 1
+    else if (')]}'.includes(character)) depth -= 1
+    else if (character === ',' && depth === 0) count += 1
+  }
+  return count
+}
+
+const closingIndex = (text: string): number => {
+  let depth = 1
+  for (let index = 0; index < text.length; index += 1) {
+    if (text[index] === '(') depth += 1
+    else if (text[index] === ')') { depth -= 1; if (!depth) return index }
+  }
+  return -1
+}
+
+let checked = 0
+for (const path of [...sourceFiles('lib'), ...sourceFiles('app')]) {
+  const text = readFileSync(path, 'utf8')
+  const pattern = /INSERT\s+(?:OR\s+\w+\s+)?INTO\s+(\w+)\s*\(([^)]*)\)\s*\n?\s*VALUES\s*\(/gi
+  for (const match of text.matchAll(pattern)) {
+    const [table, columns] = [match[1], match[2]]
+    const tail = text.slice(match.index + match[0].length)
+    const end = closingIndex(tail)
+    if (end < 0) continue
+    const expected = columns.split(',').filter(column => column.trim()).length
+    const actual = valueCount(tail.slice(0, end))
+    assert.equal(actual, expected, `${path}: INSERT INTO ${table} lists ${expected} columns but ${actual} values`)
+    checked += 1
+  }
+}
+
+assert.ok(checked > 20, `expected to check many inserts, checked ${checked}`)
+console.log(`ok - ${checked} inserts balance their column and value lists`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novacraft-engineering/mailbox",
-  "version": "0.4.17",
+  "version": "0.4.19",
   "description": "A shared webmail app: one codebase, one deployment per mailbox. Threads, a rich composer with signatures, attachments on S3-compatible storage, sharing links, full-text search, web push and PWA install.",
   "keywords": [
     "webmail",