Skip to content

Commit

Permalink
fix: remove double brackets from the ws url when using raw IPv6 addre…
Browse files Browse the repository at this point in the history
…ss (#2951)
  • Loading branch information
ilkkao committed Feb 12, 2021
1 parent 3ac015b commit 2ec8160
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion client-src/default/utils/createSocketUrl.js
Expand Up @@ -72,14 +72,21 @@ function getSocketUrl(urlParts, loc) {
// all of these sock url params are optionally passed in through
// resourceQuery, so we need to fall back to the default if
// they are not provided
const host = query.host || hostname;
let host = query.host || hostname;
const path = query.path || '/ws';
let portOption = query.port || port;

if (portOption === 'location') {
portOption = loc.port;
}

// In case the host is a raw IPv6 address, it can be enclosed in
// the brackets as the brackets are needed in the final URL string.
// Need to remove those as url.format blindly adds its own set of brackets
// if the host string contains colons. That would lead to non-working
// double brackets (e.g. [[::]]) host
host = typeof host === 'string' ? host.replace(/^\[(.*)\]$/, '$1') : host;

return url.format({
protocol,
auth,
Expand Down

0 comments on commit 2ec8160

Please sign in to comment.