Skip to content

Email for professionals and teams

fix(security): default remote content to ask for new and existing users (#220)

Hieu Nguyen (Jack)206b344e19ed
diff --git a/drizzle/migrations-mysql/0003_remote_content_ask.sql b/drizzle/migrations-mysql/0003_remote_content_ask.sql
new file mode 100644
index 0000000..185d052
--- /dev/null
+++ b/drizzle/migrations-mysql/0003_remote_content_ask.sql
@@ -0,0 +1 @@
+UPDATE `users` SET `remote_content_mode` = 'ask' WHERE `remote_content_mode` = 'allow';
diff --git a/drizzle/migrations-mysql/meta/_journal.json b/drizzle/migrations-mysql/meta/_journal.json
index 91b954d..a50bec6 100644
--- a/drizzle/migrations-mysql/meta/_journal.json
+++ b/drizzle/migrations-mysql/meta/_journal.json
@@ -22,6 +22,13 @@
"when": 1793174353930,
"tag": "0002_calendar_reminders",
"breakpoints": true
+ },
+ {
+ "idx": 3,
+ "version": "5",
+ "when": 1793260802000,
+ "tag": "0003_remote_content_ask",
+ "breakpoints": true
}
]
-}
\ No newline at end of file
+}
diff --git a/drizzle/migrations-pg/0003_remote_content_ask.sql b/drizzle/migrations-pg/0003_remote_content_ask.sql
new file mode 100644
index 0000000..d3d3f06
--- /dev/null
+++ b/drizzle/migrations-pg/0003_remote_content_ask.sql
@@ -0,0 +1 @@
+UPDATE "users" SET "remote_content_mode" = 'ask' WHERE "remote_content_mode" = 'allow';
diff --git a/drizzle/migrations-pg/meta/_journal.json b/drizzle/migrations-pg/meta/_journal.json
index b543de8..8a17693 100644
--- a/drizzle/migrations-pg/meta/_journal.json
+++ b/drizzle/migrations-pg/meta/_journal.json
@@ -22,6 +22,13 @@
"when": 1793174352247,
"tag": "0002_calendar_reminders",
"breakpoints": true
+ },
+ {
+ "idx": 3,
+ "version": "7",
+ "when": 1793260801000,
+ "tag": "0003_remote_content_ask",
+ "breakpoints": true
}
]
-}
\ No newline at end of file
+}
diff --git a/drizzle/migrations/0079_remote_content_ask.sql b/drizzle/migrations/0079_remote_content_ask.sql
new file mode 100644
index 0000000..185d052
--- /dev/null
+++ b/drizzle/migrations/0079_remote_content_ask.sql
@@ -0,0 +1 @@
+UPDATE `users` SET `remote_content_mode` = 'ask' WHERE `remote_content_mode` = 'allow';
diff --git a/drizzle/migrations/meta/_journal.json b/drizzle/migrations/meta/_journal.json
index 48c5d95..1938edf 100644
--- a/drizzle/migrations/meta/_journal.json
+++ b/drizzle/migrations/meta/_journal.json
@@ -491,6 +491,13 @@
"when": 1792858800000,
"tag": "0078_add_calendar_reminders",
"breakpoints": true
+ },
+ {
+ "idx": 71,
+ "version": "6",
+ "when": 1793260800000,
+ "tag": "0079_remote_content_ask",
+ "breakpoints": true
}
]
}
diff --git a/src/app/api/accounts/create.ts b/src/app/api/accounts/create.ts
index 7666eb8..efdaf24 100644
--- a/src/app/api/accounts/create.ts
+++ b/src/app/api/accounts/create.ts
@@ -60,7 +60,7 @@ export async function createAccountResponse(env: CloudflareEnv, adminUserId: str
try {
const accountInsert = db.insert(users).values({
id: userId, email, passwordHash: hashPassword(input.password), name: username,
- role: input.role, createdByUserId: adminUserId,
+ role: input.role, createdByUserId: adminUserId, remoteContentMode: "ask",
}).returning();
const mailboxInsert = db.insert(mailboxes).values(mailbox);
// Five bound columns per alias: 20 rows fit D1's 100-parameter limit.
diff --git a/src/app/api/auth/register/route.ts b/src/app/api/auth/register/route.ts
index 8f6a938..3bc8263 100644
--- a/src/app/api/auth/register/route.ts
+++ b/src/app/api/auth/register/route.ts
@@ -55,6 +55,8 @@ export async function POST(request: Request) {
const userId = newId("usr");
await db.insert(users).values({
id: userId,
+ // Opening a message must not tell the sender; the column default predates this and stays "allow".
+ remoteContentMode: "ask",
email,
resetEmail: firstRunParsed.data.resetEmail,
passwordHash: hashPassword(password),
diff --git a/src/lib/migrations/bundle-mysql.json b/src/lib/migrations/bundle-mysql.json
index a052314..2ce1e49 100644
--- a/src/lib/migrations/bundle-mysql.json
+++ b/src/lib/migrations/bundle-mysql.json
@@ -248,6 +248,12 @@
"ALTER TABLE `calendar_events` ADD `reminder_minutes` bigint;",
"ALTER TABLE `calendar_events` ADD `last_reminded_start` bigint;"
]
+ },
+ {
+ "name": "0003_remote_content_ask.sql",
+ "statements": [
+ "UPDATE `users` SET `remote_content_mode` = 'ask' WHERE `remote_content_mode` = 'allow';"
+ ]
}
]
}
diff --git a/src/lib/migrations/bundle-postgres.json b/src/lib/migrations/bundle-postgres.json
index bfb4579..4777889 100644
--- a/src/lib/migrations/bundle-postgres.json
+++ b/src/lib/migrations/bundle-postgres.json
@@ -269,6 +269,12 @@
"ALTER TABLE \"calendar_events\" ADD COLUMN \"reminder_minutes\" bigint;",
"ALTER TABLE \"calendar_events\" ADD COLUMN \"last_reminded_start\" bigint;"
]
+ },
+ {
+ "name": "0003_remote_content_ask.sql",
+ "statements": [
+ "UPDATE \"users\" SET \"remote_content_mode\" = 'ask' WHERE \"remote_content_mode\" = 'allow';"
+ ]
}
]
}
diff --git a/src/lib/seed-utils.ts b/src/lib/seed-utils.ts
index 714e2ca..49f78fd 100644
--- a/src/lib/seed-utils.ts
+++ b/src/lib/seed-utils.ts
@@ -245,6 +245,7 @@ export async function ensureDemoUser(env: CloudflareEnv) {
const id = newId("usr");
await db.insert(users).values({
id,
+ remoteContentMode: "ask",
email: demoCredentials.email,
passwordHash: hashPassword(demoCredentials.password),
name: "Demo User",