opensource/beekeeper-studio
1
0
Fork 0
mirror of https://github.com/beekeeper-studio/beekeeper-studio.git synced 2026-03-13 10:12:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2906 from joao-sntos/fix-bug-import-from-url

Browse Source 
fix #2765: Import from URL bad special character handling bug
This commit is contained in:
Day Matchullis
2025-03-27 13:46:40 -06:00
committed by GitHub
parent 1b67e5bbe8 d8979b00fd
commit d263ac2f67
2 changed files with 71 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apps/studio/src/common/appdb/models/saved_connection.ts
View File

@@ -317,7 +317,27 @@ export class SavedConnection extends DbConnectionBase implements IConnection {
}
}
const parsed = new ConnectionString(url.replaceAll(/\s/g, "%20"))
let cleanedUrl = url
let extractedUser = undefined
let extractedPassword = undefined
if (url.includes('@')) {
const lastAtIndex = url.lastIndexOf('@')
let firstDoubleSlash = url.indexOf('//') + 2
if (firstDoubleSlash === 1) firstDoubleSlash = 0
const credentials = url.substring(firstDoubleSlash, lastAtIndex)
const [user, ...passwordParts] = credentials.split(':')
extractedUser = user
extractedPassword = passwordParts.join(':')
cleanedUrl = url.substring(0, firstDoubleSlash) + url.substring(lastAtIndex + 1)
}
const encodedUrl = encodeURI(cleanedUrl)
const parsed = new ConnectionString(encodedUrl)
const parsedUncoded = new ConnectionString(url)
this.connectionType = parsed.protocol as ConnectionType || this.connectionType || 'postgresql'
if (parsed.hostname && parsed.hostname.includes('redshift.amazonaws.com')) {
this.connectionType = 'redshift'
@@ -325,10 +345,10 @@ export class SavedConnection extends DbConnectionBase implements IConnection {
if (parsed.hostname && parsed.hostname.includes('cockroachlabs.cloud')) {
this.connectionType = 'cockroachdb'
if (parsed.params?.options) {
if (parsedUncoded.params?.options) {
// TODO: fix this
const regex = /--cluster=([A-Za-z0-9\-_]+)/
const clusters = parsed.params.options.match(regex)
const clusters = parsedUncoded.params.options.match(regex)
this.options['cluster'] = clusters ? clusters[1] : undefined
}
}
@@ -338,8 +358,8 @@ export class SavedConnection extends DbConnectionBase implements IConnection {
}
this.host = parsed.hostname || this.host
this.port = parsed.port || this.port
this.username = parsed.user || this.username
this.password = parsed.password || this.password
this.username = extractedUser ?? parsed.user
this.password = extractedPassword ?? parsed.password
this.defaultDatabase = parsed.path?.join('/') ?? this.defaultDatabase
return true
} catch (ex) {

46
apps/studio/tests/unit/common/appdb/models/saved_connection.spec.js
View File

@@ -59,6 +59,52 @@ describe("Saved Connection", () => {
"some/path.sqlite3": {connectionType: 'sqlite', defaultDatabase: 'some/path.sqlite3'},
"/Path/to file/with space.sqlite": { connectionType: 'sqlite', defaultDatabase: "/Path/to file/with space.sqlite"},
"postgresql://database.db": {connectionType: 'postgresql', host: 'database.db'},
"mysql://user:p+ssword@localhost/mydatabase": {
connectionType: "mysql",
username: "user",
password: "p+ssword",
host: "localhost",
defaultDatabase: "mydatabase"
},
"mysql://user:p@ssword@localhost/mydatabase": {
connectionType: "mysql",
username: "user",
password: "p@ssword",
host: "localhost",
defaultDatabase: "mydatabase"
},
"postgresql://matthew:pa+sword@free.1.cockroachlabs.cloud:26257/defaultdb?sslmode=verify-full&options=--cluster%3Dbks-tester-12345": {
connectionType: "cockroachdb",
username: "matthew",
password: "pa+sword",
host: "free.1.cockroachlabs.cloud",
port: 26257,
defaultDatabase: "defaultdb"
},
"postgresql://matthew:pa@sword@free.1.cockroachlabs.cloud:26257/defaultdb?sslmode=verify-full&options=--cluster%3Dbks-tester-12345": {
connectionType: "cockroachdb",
username: "matthew",
password: "pa@sword",
host: "free.1.cockroachlabs.cloud",
port: 26257,
defaultDatabase: "defaultdb"
},
"postgresql://user:p+ssword@default.cluster.redshift.amazonaws.com:5439/database": {
connectionType: "redshift",
username: "user",
password: "p+ssword",
host: "default.cluster.redshift.amazonaws.com",
port: 5439,
defaultDatabase: "database"
},
"postgresql://user:p@ssword@default.cluster.redshift.amazonaws.com:5439/database": {
connectionType: "redshift",
username: "user",
password: "p@ssword",
host: "default.cluster.redshift.amazonaws.com",
port: 5439,
defaultDatabase: "database"
},
}
Object.keys(testCases).forEach(url => {