Skip to content

fix: sanitize untrusted email fields in remaining interactive receiving commands #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bukinoshita wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: sanitize untrusted email fields in remaining interactive receiving commands #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/commands/emails/receiving/attachment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { runGet } from '../../../lib/actions';
import type { GlobalOpts } from '../../../lib/client';
import { buildHelpText } from '../../../lib/help-text';
import { pickId } from '../../../lib/prompts';
import { safeTerminalText } from '../../../lib/safe-terminal-text';
import {
receivedAttachmentPickerConfig,
receivedEmailPickerConfig,
Expand Down Expand Up @@ -47,7 +48,7 @@ export const getAttachmentCommand = new Command('attachment')
id: attachmentId,
}),
onInteractive: (data) => {
console.log(`${data.filename ?? '(unnamed)'}`);
console.log(`${safeTerminalText(data.filename ?? '(unnamed)')}`);
console.log(`ID: ${data.id}`);
console.log(`Content-Type: ${data.content_type}`);
console.log(`Size: ${data.size} bytes`);
Expand Down
14 changes: 8 additions & 6 deletions src/commands/emails/receiving/get.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { runGet } from '../../../lib/actions';
import type { GlobalOpts } from '../../../lib/client';
import { buildHelpText } from '../../../lib/help-text';
import { pickId } from '../../../lib/prompts';
import { safeTerminalText } from '../../../lib/safe-terminal-text';
import { receivedEmailPickerConfig } from './utils';

export const getReceivingCommand = new Command('get')
Expand Down Expand Up @@ -32,18 +33,19 @@ export const getReceivingCommand = new Command('get')
loading: 'Fetching received email...',
sdkCall: (resend) => resend.emails.receiving.get(id),
onInteractive: (data) => {
console.log(`From: ${data.from}`);
console.log(`To: ${data.to.join(', ')}`);
console.log(`Subject: ${data.subject}`);
console.log(`From: ${safeTerminalText(data.from)}`);
console.log(`To: ${data.to.map(safeTerminalText).join(', ')}`);
console.log(`Subject: ${safeTerminalText(data.subject)}`);
console.log(`Date: ${data.created_at}`);
if (data.attachments.length > 0) {
console.log(`Files: ${data.attachments.length} attachment(s)`);
}
if (data.text) {
const sanitized = safeTerminalText(data.text);
const snippet =
data.text.length > 200
? `${data.text.slice(0, 197)}...`
: data.text;
sanitized.length > 200
? `${sanitized.slice(0, 197)}...`
: sanitized;
console.log(`${snippet}`);
} else if (data.html) {
console.log(
Expand Down
9 changes: 6 additions & 3 deletions src/commands/emails/receiving/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { ListReceivingEmail } from 'resend';
import type { PickerConfig } from '../../../lib/prompts';
import { safeTerminalText } from '../../../lib/safe-terminal-text';
import { renderTable } from '../../../lib/table';

export const receivedEmailPickerConfig: PickerConfig<{
Expand Down Expand Up @@ -33,11 +34,13 @@ export function renderReceivingEmailsTable(
emails: ListReceivingEmail[],
): string {
const rows = emails.map((e) => {
const to = e.to.join(', ');
const from = safeTerminalText(e.from);
const to = e.to.map(safeTerminalText).join(', ');
const toStr = to.length > 40 ? `${to.slice(0, 37)}...` : to;
const rawSubject = safeTerminalText(e.subject);
const subject =
e.subject.length > 50 ? `${e.subject.slice(0, 47)}...` : e.subject;
return [e.from, toStr, subject, e.created_at, e.id];
rawSubject.length > 50 ? `${rawSubject.slice(0, 47)}...` : rawSubject;
return [from, toStr, subject, e.created_at, e.id];
});
return renderTable(
['From', 'To', 'Subject', 'Created At', 'ID'],
Expand Down