Skip to content
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

Fix to handle special characters in username and database name #1

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Fix to handle special characters in username and database name #1

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
28 changes: 14 additions & 14 deletions handler/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ const handleCreate = async (event: CreateEvent): Promise<Response> => {
onCreateIfExists: event.ResourceProperties.onCreateIfExists,
});

const createUserQuery = `CREATE USER ${userCredentials.username} IDENTIFIED BY '${userCredentials.password}'; GRANT ALL PRIVILEGES ON ${event.ResourceProperties.databaseName}.* TO ${userCredentials.username}@'%';`;
const createUserQuery = `CREATE USER '${userCredentials.username}' IDENTIFIED BY '${userCredentials.password}'; GRANT ALL PRIVILEGES ON \`${event.ResourceProperties.databaseName}\`.* TO '${userCredentials.username}'@'%';`;

try {
await adminClient.query(createUserQuery);
Expand All @@ -270,17 +270,17 @@ const handleCreate = async (event: CreateEvent): Promise<Response> => {

if (event.ResourceProperties.onCreateIfExists === 'Adopt' && e.code === MysqlErrorCodes.DUPLICATE_OBJECT) {
// User already exists, so we'll just adopt it. Set the password to the new value and grant CREATEDB and LOGIN
await adminClient.query(`ALTER USER ${userCredentials.username} WITH PASSWORD '${userCredentials.password}';`);
await adminClient.query(`GRANT ALL PRIVILEGES ON ${event.ResourceProperties.databaseName}.* TO ${userCredentials.username}@'%';`);
await adminClient.query(`ALTER USER '${userCredentials.username}' WITH PASSWORD '${userCredentials.password}';`);
await adminClient.query(`GRANT ALL PRIVILEGES ON \`${event.ResourceProperties.databaseName}\`.* TO '${userCredentials.username}'@'%';`);
} else if (event.ResourceProperties.onCreateIfExists === 'DeleteAndRecreate' && e.code === MysqlErrorCodes.DUPLICATE_OBJECT) {
await adminClient.query(`DROP USER ${userCredentials.username};`);
await adminClient.query(`DROP USER '${userCredentials.username}';`);
await adminClient.query(createUserQuery);
} else {
throw e;
}
}

const createDatabaseQuery = `CREATE DATABASE ${event.ResourceProperties.databaseName};`;
const createDatabaseQuery = `CREATE DATABASE \`${event.ResourceProperties.databaseName}\`;`;

const userClient = await userClientManager.getClient();
try {
Expand All @@ -297,11 +297,11 @@ const handleCreate = async (event: CreateEvent): Promise<Response> => {
if (event.ResourceProperties.onCreateIfExists === 'Adopt' && e.code === MysqlErrorCodes.DUPLICATE_DATABASE) {
// Database already exists, so we'll just adopt it
log('Database already exists, adopting');
await adminClient.query(`GRANT ALL PRIVILEGES ON ${event.ResourceProperties.databaseName}.* TO ${userCredentials.username}@'%';`);
await adminClient.query(`GRANT ALL PRIVILEGES ON \`${event.ResourceProperties.databaseName}\`.* TO '${userCredentials.username}'@'%';`);
} else if (event.ResourceProperties.onCreateIfExists === 'DeleteAndRecreate') {
if (e.code === MysqlErrorCodes.DUPLICATE_DATABASE) {
log('Database already exists, deleting and recreating');
await adminClient.query(`DROP DATABASE ${event.ResourceProperties.databaseName};`);
await adminClient.query(`DROP DATABASE \`${event.ResourceProperties.databaseName}\`;`);
await userClient.query(createDatabaseQuery);
}
} else {
Expand Down Expand Up @@ -341,7 +341,7 @@ const handleUpdate = async (event: UpdateEvent): Promise<Response> => {
log('Creating user if it does not exist', { username: userCredentials.username });
try {
const client = await adminClient.getClient();
await client.query(`CREATE USER ${userCredentials.username} IDENTIFIED BY '${userCredentials.password}';`);
await client.query(`CREATE USER '${userCredentials.username}' IDENTIFIED BY '${userCredentials.password}';`);
} catch (e) {
if (!isMysqlError(e)) {
throw e;
Expand All @@ -360,15 +360,15 @@ const handleUpdate = async (event: UpdateEvent): Promise<Response> => {
if (event.ResourceProperties.onUpdateSetUserPassword === 'Always') {
log('Setting user password', { username: userCredentials.username });
const client = await adminClient.getClient();
await client.query(`ALTER USER ${userCredentials.username} WITH PASSWORD '${userCredentials.password}';`);
await client.query(`ALTER USER '${userCredentials.username}' WITH PASSWORD '${userCredentials.password}';`);
} else {
log('Not setting user password', { username: userCredentials.username });
}

if (event.ResourceProperties.onUpdateSetUserPermissions === 'Always') {
log('Setting user permissions', { username: userCredentials.username });
const client = await adminClient.getClient();
await client.query(`GRANT ALL PRIVILEGES ON ${event.ResourceProperties.databaseName}.* TO ${userCredentials.username}@'%';`);
await client.query(`GRANT ALL PRIVILEGES ON \`${event.ResourceProperties.databaseName}\`.* TO '${userCredentials.username}'@'%';`);
} else {
log('Not setting user permissions', { username: userCredentials.username });
}
Expand All @@ -377,7 +377,7 @@ const handleUpdate = async (event: UpdateEvent): Promise<Response> => {
log('Creating database if it does not exist', { databaseName: event.ResourceProperties.databaseName });
try {
const client = await userClient.getClient();
await client.query(`CREATE DATABASE ${event.ResourceProperties.databaseName};`);
await client.query(`CREATE DATABASE \`${event.ResourceProperties.databaseName}\`;`);
} catch (e) {
if (!isMysqlError(e)) {
throw e;
Expand All @@ -396,7 +396,7 @@ const handleUpdate = async (event: UpdateEvent): Promise<Response> => {
if (event.ResourceProperties.onUpdateSetDatabaseOwnership === 'Always') {
log('Setting database ownership', { databaseName: event.ResourceProperties.databaseName });
const client = await adminClient.getClient();
await client.query(`GRANT ALL PRIVILEGES ON ${event.ResourceProperties.databaseName}.* TO ${userCredentials.username}@'%';`);
await client.query(`GRANT ALL PRIVILEGES ON \`${event.ResourceProperties.databaseName}\`.* TO '${userCredentials.username}'@'%';`);
} else {
log('Not setting database ownership', { databaseName: event.ResourceProperties.databaseName });
}
Expand Down Expand Up @@ -440,10 +440,10 @@ const handleDelete = async (event: DeleteEvent): Promise<Response> => {
const adminClient = await adminClientManager.getClient();

log('Dropping database if exists', { databaseName: event.ResourceProperties.databaseName });
await adminClient.query(`DROP DATABASE IF EXISTS ${event.ResourceProperties.databaseName};`);
await adminClient.query(`DROP DATABASE IF EXISTS \`${event.ResourceProperties.databaseName}\`;`);

log('Dropping user if exists', { databaseName: event.ResourceProperties.databaseName });
await adminClient.query(`DROP USER IF EXISTS ${userCredentials.username};`);
await adminClient.query(`DROP USER IF EXISTS '${userCredentials.username}';`);

await adminClient.end();

Expand Down