Skip to content

Commit 4a703a0

Browse files
authored
improvement(tools): update mysql to respect ssl pref (#1205)
1 parent a969d09 commit 4a703a0

File tree

11 files changed

+14
-12
lines changed

11 files changed

+14
-12
lines changed

apps/sim/app/api/tools/mysql/delete/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const DeleteSchema = z.object({
1212
database: z.string().min(1, 'Database name is required'),
1313
username: z.string().min(1, 'Username is required'),
1414
password: z.string().min(1, 'Password is required'),
15-
ssl: z.enum(['disabled', 'required', 'preferred']).default('required'),
15+
ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
1616
table: z.string().min(1, 'Table name is required'),
1717
where: z.string().min(1, 'WHERE clause is required'),
1818
})

apps/sim/app/api/tools/mysql/execute/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const ExecuteSchema = z.object({
1212
database: z.string().min(1, 'Database name is required'),
1313
username: z.string().min(1, 'Username is required'),
1414
password: z.string().min(1, 'Password is required'),
15-
ssl: z.enum(['disabled', 'required', 'preferred']).default('required'),
15+
ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
1616
query: z.string().min(1, 'Query is required'),
1717
})
1818

apps/sim/app/api/tools/mysql/insert/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const InsertSchema = z.object({
1212
database: z.string().min(1, 'Database name is required'),
1313
username: z.string().min(1, 'Username is required'),
1414
password: z.string().min(1, 'Password is required'),
15-
ssl: z.enum(['disabled', 'required', 'preferred']).default('required'),
15+
ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
1616
table: z.string().min(1, 'Table name is required'),
1717
data: z.union([
1818
z

apps/sim/app/api/tools/mysql/query/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const QuerySchema = z.object({
1212
database: z.string().min(1, 'Database name is required'),
1313
username: z.string().min(1, 'Username is required'),
1414
password: z.string().min(1, 'Password is required'),
15-
ssl: z.enum(['disabled', 'required', 'preferred']).default('required'),
15+
ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
1616
query: z.string().min(1, 'Query is required'),
1717
})
1818

apps/sim/app/api/tools/mysql/update/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const UpdateSchema = z.object({
1212
database: z.string().min(1, 'Database name is required'),
1313
username: z.string().min(1, 'Username is required'),
1414
password: z.string().min(1, 'Password is required'),
15-
ssl: z.enum(['disabled', 'required', 'preferred']).default('required'),
15+
ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
1616
table: z.string().min(1, 'Table name is required'),
1717
data: z.union([
1818
z

apps/sim/app/api/tools/mysql/utils.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export interface MySQLConnectionConfig {
66
database: string
77
username: string
88
password: string
9-
ssl?: string
9+
ssl?: 'disabled' | 'required' | 'preferred'
1010
}
1111

1212
export async function createMySQLConnection(config: MySQLConnectionConfig) {
@@ -18,7 +18,9 @@ export async function createMySQLConnection(config: MySQLConnectionConfig) {
1818
password: config.password,
1919
}
2020

21-
if (config.ssl === 'required') {
21+
if (config.ssl === 'disabled') {
22+
// Don't set ssl property at all to disable SSL
23+
} else if (config.ssl === 'required') {
2224
connectionConfig.ssl = { rejectUnauthorized: true }
2325
} else if (config.ssl === 'preferred') {
2426
connectionConfig.ssl = { rejectUnauthorized: false }

apps/sim/app/api/tools/postgresql/delete/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const DeleteSchema = z.object({
1212
database: z.string().min(1, 'Database name is required'),
1313
username: z.string().min(1, 'Username is required'),
1414
password: z.string().min(1, 'Password is required'),
15-
ssl: z.enum(['disabled', 'required', 'preferred']).default('required'),
15+
ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
1616
table: z.string().min(1, 'Table name is required'),
1717
where: z.string().min(1, 'WHERE clause is required'),
1818
})

apps/sim/app/api/tools/postgresql/execute/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const ExecuteSchema = z.object({
1616
database: z.string().min(1, 'Database name is required'),
1717
username: z.string().min(1, 'Username is required'),
1818
password: z.string().min(1, 'Password is required'),
19-
ssl: z.enum(['disabled', 'required', 'preferred']).default('required'),
19+
ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
2020
query: z.string().min(1, 'Query is required'),
2121
})
2222

apps/sim/app/api/tools/postgresql/insert/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const InsertSchema = z.object({
1212
database: z.string().min(1, 'Database name is required'),
1313
username: z.string().min(1, 'Username is required'),
1414
password: z.string().min(1, 'Password is required'),
15-
ssl: z.enum(['disabled', 'required', 'preferred']).default('required'),
15+
ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
1616
table: z.string().min(1, 'Table name is required'),
1717
data: z.union([
1818
z

apps/sim/app/api/tools/postgresql/query/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const QuerySchema = z.object({
1212
database: z.string().min(1, 'Database name is required'),
1313
username: z.string().min(1, 'Username is required'),
1414
password: z.string().min(1, 'Password is required'),
15-
ssl: z.enum(['disabled', 'required', 'preferred']).default('required'),
15+
ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
1616
query: z.string().min(1, 'Query is required'),
1717
})
1818

0 commit comments

Comments
 (0)