Implement email support with per-user permission model (closes #2)
New modules: - server/mailer.mjs: nodemailer transport wrapper - server/mail_perms.mjs: runtime permission store, persisted to disk New actions: - send-email: checks (caller, to, topic) permission before sending - set-mail-permission: grant/revoke permissions, gated by canApprove - get-mail-permissions: list current permissions Handler signature extended to handler(params, ctx) where ctx carries caller, users, mail_perm_store and mailer_send. Existing handlers ignore ctx so the change is backwards-compatible. SMTP config lives in secrets.json under optional 'smtp' key. Mail permissions path via --mail-perms or CONDUIT_MAIL_PERMS. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -2,7 +2,8 @@
|
||||
// policy: "auto-accept" | "auto-deny" | "queue"
|
||||
|
||||
|
||||
import { resolve_path, exec } from "./helpers.mjs";
|
||||
import { resolve_path, exec } from './helpers.mjs';
|
||||
import { check_can_approve } from './auth.mjs';
|
||||
|
||||
export const actions = {
|
||||
"list-actions": {
|
||||
@@ -67,4 +68,56 @@ export const actions = {
|
||||
return { opened: resolved };
|
||||
},
|
||||
},
|
||||
|
||||
'send-email': {
|
||||
description: 'Send an email to a permitted recipient',
|
||||
params: [
|
||||
{ name: 'to', required: true, type: 'string' },
|
||||
{ name: 'subject', required: true, type: 'string' },
|
||||
{ name: 'body', required: true, type: 'string' },
|
||||
{ name: 'topic', required: true, type: 'string' },
|
||||
],
|
||||
policy: 'auto-accept',
|
||||
handler: async ({ to, subject, body, topic }, { caller, mail_perm_store, mailer_send }) => {
|
||||
if (!mail_perm_store.check(caller, to, topic)) {
|
||||
throw new Error(`Mail permission denied: ${caller} → ${to} [${topic}]`);
|
||||
}
|
||||
await mailer_send(to, subject, body);
|
||||
return { sent: true, to, topic };
|
||||
},
|
||||
},
|
||||
|
||||
'set-mail-permission': {
|
||||
description: 'Grant or revoke permission for a user to send email to a recipient/topic',
|
||||
params: [
|
||||
{ name: 'target_user', required: true, type: 'string' },
|
||||
{ name: 'to', required: true, type: 'string' },
|
||||
{ name: 'topic', required: true, type: 'string' },
|
||||
{ name: 'allow', required: true, type: 'boolean' },
|
||||
],
|
||||
policy: 'auto-accept',
|
||||
handler: ({ target_user, to, topic, allow }, { caller, users, mail_perm_store }) => {
|
||||
if (!check_can_approve(users, caller, target_user)) {
|
||||
throw new Error(`Not authorized to set mail permissions for '${target_user}'`);
|
||||
}
|
||||
if (allow) {
|
||||
mail_perm_store.add(target_user, to, topic);
|
||||
} else {
|
||||
mail_perm_store.remove(target_user, to, topic);
|
||||
}
|
||||
return { target_user, to, topic, allow, permissions: mail_perm_store.list() };
|
||||
},
|
||||
},
|
||||
|
||||
'get-mail-permissions': {
|
||||
description: 'List current mail permissions, optionally filtered by user',
|
||||
params: [
|
||||
{ name: 'target_user', required: false, type: 'string' },
|
||||
],
|
||||
policy: 'auto-accept',
|
||||
handler: ({ target_user }, { mail_perm_store }) => {
|
||||
const all = mail_perm_store.list();
|
||||
return { permissions: target_user ? all.filter(e => e.user === target_user) : all };
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3,6 +3,8 @@ import { actions } from './actions.mjs';
|
||||
import { enqueue, get_entry, list_pending, resolve } from './queue.mjs';
|
||||
import { load_secrets } from './secrets.mjs';
|
||||
import { create_auth_middleware, check_can_approve } from './auth.mjs';
|
||||
import { create_mailer } from './mailer.mjs';
|
||||
import { load_mail_perms } from './mail_perms.mjs';
|
||||
|
||||
function get_arg(argv, flag) {
|
||||
const i = argv.indexOf(flag);
|
||||
@@ -17,7 +19,9 @@ const PORT = process.env.CONDUIT_PORT || 3015;
|
||||
const BIND = get_arg(process.argv, '--bind') || process.env.CONDUIT_BIND || '127.0.0.1';
|
||||
const VERBOSE = process.argv.includes('--verbose');
|
||||
|
||||
const secrets_path = get_arg(process.argv, '--secrets');
|
||||
const secrets_path = get_arg(process.argv, '--secrets');
|
||||
const mail_perms_path = get_arg(process.argv, '--mail-perms') || process.env.CONDUIT_MAIL_PERMS || null;
|
||||
|
||||
let secrets;
|
||||
try {
|
||||
secrets = load_secrets(secrets_path);
|
||||
@@ -25,7 +29,21 @@ try {
|
||||
console.error(`Fatal: ${err.message}`);
|
||||
process.exit(1);
|
||||
}
|
||||
const { users } = secrets;
|
||||
const { users, smtp } = secrets;
|
||||
|
||||
let mail_perm_store;
|
||||
try {
|
||||
mail_perm_store = load_mail_perms(mail_perms_path);
|
||||
} catch (err) {
|
||||
console.error(`Fatal: ${err.message}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if (!mail_perms_path) {
|
||||
console.warn('Warning: --mail-perms not set; mail permissions will not persist across restarts');
|
||||
}
|
||||
|
||||
const mailer_send = create_mailer(smtp);
|
||||
|
||||
const app = express();
|
||||
app.use(express.json({
|
||||
@@ -75,9 +93,11 @@ app.post('/action', async (req, res) => {
|
||||
return res.status(403).json({ status: 'denied', reason: 'Policy: auto-deny' });
|
||||
}
|
||||
|
||||
const ctx = { caller: req.conduit_user, users, mail_perm_store, mailer_send };
|
||||
|
||||
if (def.policy === 'auto-accept') {
|
||||
try {
|
||||
const result = await def.handler(params);
|
||||
const result = await def.handler(params, ctx);
|
||||
return res.json({ status: 'accepted', result });
|
||||
} catch (err) {
|
||||
return res.status(500).json({ status: 'error', error: err.message });
|
||||
@@ -111,9 +131,10 @@ app.post('/queue/:id/approve', async (req, res) => {
|
||||
entry.resolved_by = req.conduit_user;
|
||||
resolve(req.params.id, 'approved');
|
||||
|
||||
const ctx = { caller: entry.submitted_by, users, mail_perm_store, mailer_send };
|
||||
const def = actions[entry.action];
|
||||
try {
|
||||
const result = await def.handler(entry.params);
|
||||
const result = await def.handler(entry.params, ctx);
|
||||
res.json({ status: 'approved', result });
|
||||
} catch (err) {
|
||||
res.status(500).json({ status: 'error', error: err.message });
|
||||
|
||||
49
server/mail_perms.mjs
Normal file
49
server/mail_perms.mjs
Normal file
@@ -0,0 +1,49 @@
|
||||
import { readFileSync, writeFileSync, existsSync } from 'fs';
|
||||
|
||||
export function load_mail_perms(file_path) {
|
||||
let allowed = [];
|
||||
|
||||
if (file_path && existsSync(file_path)) {
|
||||
try {
|
||||
const parsed = JSON.parse(readFileSync(file_path, 'utf8'));
|
||||
if (!Array.isArray(parsed.allowed)) {
|
||||
throw new Error("'allowed' must be an array");
|
||||
}
|
||||
allowed = parsed.allowed;
|
||||
} catch (err) {
|
||||
throw new Error(`Cannot load mail permissions from ${file_path}: ${err.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
function write() {
|
||||
if (!file_path) {
|
||||
return;
|
||||
}
|
||||
writeFileSync(file_path, JSON.stringify({ allowed }, null, '\t') + '\n', 'utf8');
|
||||
}
|
||||
|
||||
function check(user, to, topic) {
|
||||
return allowed.some(e => e.user === user && e.to === to && e.topic === topic);
|
||||
}
|
||||
|
||||
function add(user, to, topic) {
|
||||
if (!check(user, to, topic)) {
|
||||
allowed.push({ user, to, topic });
|
||||
write();
|
||||
}
|
||||
}
|
||||
|
||||
function remove(user, to, topic) {
|
||||
const before = allowed.length;
|
||||
allowed = allowed.filter(e => !(e.user === user && e.to === to && e.topic === topic));
|
||||
if (allowed.length !== before) {
|
||||
write();
|
||||
}
|
||||
}
|
||||
|
||||
function list() {
|
||||
return [...allowed];
|
||||
}
|
||||
|
||||
return { check, add, remove, list };
|
||||
}
|
||||
18
server/mailer.mjs
Normal file
18
server/mailer.mjs
Normal file
@@ -0,0 +1,18 @@
|
||||
import nodemailer from 'nodemailer';
|
||||
|
||||
// Returns an async send(to, subject, body) function.
|
||||
// If smtp_config is absent, returns a stub that always throws.
|
||||
export function create_mailer(smtp_config) {
|
||||
if (!smtp_config) {
|
||||
return async () => {
|
||||
throw new Error('SMTP not configured');
|
||||
};
|
||||
}
|
||||
|
||||
const { from, ...transport_config } = smtp_config;
|
||||
const transporter = nodemailer.createTransport(transport_config);
|
||||
|
||||
return async function send(to, subject, body) {
|
||||
await transporter.sendMail({ from, to, subject, text: body });
|
||||
};
|
||||
}
|
||||
@@ -16,8 +16,8 @@ export function load_secrets(file_path) {
|
||||
} catch (err) {
|
||||
throw new Error(`Secrets file is not valid JSON: ${err.message}`);
|
||||
}
|
||||
if (!parsed.users || typeof parsed.users !== "object") {
|
||||
if (!parsed.users || typeof parsed.users !== 'object') {
|
||||
throw new Error("Secrets file must have a top-level 'users' object");
|
||||
}
|
||||
return parsed;
|
||||
return parsed; // callers destructure { users, smtp }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user