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

Adds decodeURIComponent in ConnectionConfig#parseUrl #1621

Closed
wants to merge 2 commits into from
Closed

Adds decodeURIComponent in ConnectionConfig#parseUrl #1621

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f08b3be
Adds decodeURIComponent in ConnectionConfig#parseUrl
Paultje52 Aug 31, 2022
ed0cb99
Changes the parser to support more characters
Paultje52 Sep 3, 2022
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
26 changes: 22 additions & 4 deletions lib/connection_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

'use strict';

const { URL } = require('url');
const ClientConstants = require('./constants/client');
const Charsets = require('./constants/charsets');
const { URL } = require('url');
let SSLProfiles = null;

const validOptions = {
Expand Down Expand Up @@ -249,13 +249,31 @@ class ConnectionConfig {
}

static parseUrl(url) {
const parsedUrl = new URL(url);
// First, split the url. Take the mysql:// part. The username is after that.
// Then, split at the : - usernames cannot contain a :
let user = url.split("mysql://")[1];
if (user) user = user.split(":")[0];
else throw new Error("Invalid connection string");

// Now, get the password. Remove the mysql://<USER>: part from the connection string,
// Continue until the last @ - that indicates the host is after it.
let password = url.substring(8 + user.length + 1);
if (password) {
const passwordParts = password.split("@");
password = passwordParts.splice(0, passwordParts.length-1).join("@");
} else throw new Error("Invalid connection string");

// Now, let node handle the rest of the url parsing (for the host, port and database)
// Also, remove the username and password and replace them with placeholders.
// This way, we do not get an error when the username or password contains special characters.
const parsedUrl = new URL(url.replace(user, "_PLACEHOLDER_").replace(password, "_PLACEHOLDER_"));

const options = {
host: parsedUrl.hostname,
port: parsedUrl.port,
database: parsedUrl.pathname.slice(1),
user: parsedUrl.username,
password: parsedUrl.password
user,
password
};
parsedUrl.searchParams.forEach((value, key) => {
try {
Expand Down