mirror of
https://github.com/lingble/clickhouse.git
synced 2025-11-02 03:57:53 +00:00
Merge pull request #87 from hlopetz/issue-86
Addressing Issue 86: HTTPS expected to have port 443 by default
This commit is contained in:
13
README.md
13
README.md
@@ -198,9 +198,20 @@ const result = await rs.pipe(tf).pipe(ws).exec();
|
||||
|
||||
***
|
||||
|
||||
**Run Tests**:
|
||||
|
||||
```
|
||||
npm install
|
||||
npm run test
|
||||
# or
|
||||
# node_modules/.bin/mocha --timeout 60000 --slow 5000 -f "SPECIFIC TEST NAME"
|
||||
```
|
||||
|
||||
***
|
||||
|
||||
**Changelogs**:
|
||||
* 2020-11-02 (v2.2.0) ___Backward Incompatible Change___
|
||||
- port from url more important then port from config
|
||||
- port from url more important than port from config
|
||||
* 2020-04-17 (v2.1.0)
|
||||
- Fix query with totals. For json formats work perfect, but for another - doesn't
|
||||
* 2019-02-13
|
||||
|
||||
2
index.js
2
index.js
@@ -817,7 +817,7 @@ class ClickHouse {
|
||||
|
||||
const u = new URL(url);
|
||||
|
||||
if (u.protocol === 'https:' && port === 443) {
|
||||
if (u.protocol === 'https:' && (port === 443 || !opts.port)) {
|
||||
u.port = '';
|
||||
} else if (! u.port && port) {
|
||||
u.port = port;
|
||||
|
||||
@@ -1,23 +1,28 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIDzzCCAregAwIBAgIUDzKBotexlW7YFFocZxAq9mw20k8wDQYJKoZIhvcNAQEL
|
||||
BQAwdzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
|
||||
GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDESMBAGA1UEAwwJbG9jYWxob3N0MRww
|
||||
GgYJKoZIhvcNAQkBFg10ZXN0QHRlc3QuY29tMB4XDTIwMDQxMDExMzkxM1oXDTIx
|
||||
MDQxMDExMzkxM1owdzELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUtU3RhdGUx
|
||||
ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDESMBAGA1UEAwwJbG9j
|
||||
YWxob3N0MRwwGgYJKoZIhvcNAQkBFg10ZXN0QHRlc3QuY29tMIIBIjANBgkqhkiG
|
||||
9w0BAQEFAAOCAQ8AMIIBCgKCAQEArZ0OuAPFFVM5eOtVi7Swiow8QxBQ7Ds8zUXh
|
||||
Bb/DFSsqMJSCb2j8NRmUz7kNaZnCCPKvC+YQ1szx6FUCXZ2OVt917qVAZwtjE/k7
|
||||
JrqMXyPpm6DegYamwwUEnsE//mRGi2eia0wCRnCvMbEcYVVJd4YQk6or4EtK6+LQ
|
||||
X20Bx4/prVD6VS14ZQmGnHriJRa4Hut4INvdr2vLTxn9JosZyG0Yg86t12TxCbnT
|
||||
4PfGcyIM+Ju59XuNQE9wLlzZPy1oxPgk7upZMCRlyRAcQRJEOGLGclmPD/b6tNII
|
||||
37ChB6qouFvypjZmixiznAyJB34xX54cFR5jr8Zly31+JOIyxQIDAQABo1MwUTAd
|
||||
BgNVHQ4EFgQUvInOZAW3a2wGOEj1wUkVbYIFJAwwHwYDVR0jBBgwFoAUvInOZAW3
|
||||
a2wGOEj1wUkVbYIFJAwwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
|
||||
AQEApkHjgCmSGjULATLWijxslXnSKn/IJTF5ckIJGriLoOhRj4iA586bYNPjoZM0
|
||||
YOfNCQJJt7L9bz1StDqGy57d2zKBdsk0LrhY/OivU3T9itXCHFxvMbZv0nM/NRZb
|
||||
5AvUmoD5Hs0N96LVUp7GSGFyjbbvDvrmb9lg6gn/PY0OwkCl1nz3/n08OWl0b3u5
|
||||
+DpOiYF6Wc16mWPWqWZU6JQqOo/+N5ExONA+CEIfXUPv+52u/2MTSXftislefjKe
|
||||
/lSF/oPRYeYMhyERpTe4TMEVyIl0Fu5eL6gstv5yoB5Qdqs1i+36bww3rULtDYB3
|
||||
vypgPujlakjsqPUbsl0CU0ibHQ==
|
||||
MIIEvjCCAqYCCQDI8x8ZQg/1izANBgkqhkiG9w0BAQsFADAhMQswCQYDVQQGEwJS
|
||||
VTESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTIxMDYxNzE0Mjg0OVoXDTI0MDQwNjE0
|
||||
Mjg0OVowITELMAkGA1UEBhMCUlUxEjAQBgNVBAMMCWxvY2FsaG9zdDCCAiIwDQYJ
|
||||
KoZIhvcNAQEBBQADggIPADCCAgoCggIBAKW1lwkw3/mW2fyu43OAOyeAt3B/59fg
|
||||
OpooilKAWl6Vr05jh36rSLmZzZ2pSfT6hgxwVe0uAKqFxEOHfEQifgo3tBjC0C3X
|
||||
1aAEJHsqLQV/TvN8OTufIagwus/xYG0JvvmIVU9H70M+FxM+u5s8oPu4LyexI5rM
|
||||
enGYEfdZyipQz1Z5QGEs4Hid5ye0G2hxrY3+M6t42XAzUGbRk/8uJMXJ0B5JhpDj
|
||||
39CDnfQj+YPTsphSji+lcDx1webUmNbMi3UJsi51wMXd8KdTOoFOVgLW+2jMNkPH
|
||||
3hBHY4rbY8pHX85oEXzE/+UdAAN6N5Et5t8UlF2VmJa5ZCusNqNHs5GnfpNPCW5d
|
||||
dLvlsCsFCok78QstVYE1yeo/e7XjKqXFrWkLM+pDfbPt2962t4pwaas/skkAxsuJ
|
||||
41hQSGjXFbboNV3Hns7EoRoB7fh3pTQeVGNKkvsl1lwNWCnWpFTbwOOwKwaAQdzT
|
||||
b3PpyUktKhWUmRwEq894wdaLwzp7EN7bfPkujqTVdFTwD5Z46k6A24KsZM7khnhl
|
||||
O7Feuf5PY0L6WYgTOw/OTVGJUmEaNx72eF+B/HlaC4BixABu8g9K08xDmNlv2gyW
|
||||
XVPfrje9eZ30G7G6w99EB1cPSYAKAZmkpZTEGNeBAI/+YQ6eL2IT+Q6z1d2pWsiG
|
||||
+13sorO77KCzAgMBAAEwDQYJKoZIhvcNAQELBQADggIBAJPTHk3rKzbW0LcTGZhx
|
||||
DmNnKycPMxS117jIoiUfAfeu2GaHObZcszlXVgiP1vnjCaJ75Z5KxuYTYClnxWKh
|
||||
bjJH5dwvrKKTs4vFCLmXKiQV8SXD2jZ3FzOCgV9BlpGb7tMFTA1MbS4dQ1xoPP6i
|
||||
vosD8oYDyC8qi4HmXKb/hJAvwK1osI4nHPvKXGtcSFDXFD2fe5vSIMKvaQh2nUF2
|
||||
5nGq4AWxVPZgohW2mE34rv7HlzSkc9faVJYrUhNPWdsIQmtlE9hSlY+ioMGYPEeD
|
||||
4jdkx6LBCkQXYPBkKsRYVmwoRJE3R4xmfWCQVWLLR2K9gvC24y5Bw6wl8IJe/wck
|
||||
d0hTCSbzMcVxR40hjaTzWdbTGlj6HINjepIoJCgfbyBAHTCVu02bbxFqCEC+WVRi
|
||||
LDFGnLZQDQR9Qs0KkYvLc6bwZBYEU3ICFKM872GJOliRk8SJEPqAmZ1jKQHI6PAU
|
||||
q/AchvCW9ycKqYHWI8PPL18cUBJtrFLd9fLAMj5ssmIH76fYVz9OPA8yUEQfirxC
|
||||
cuOKJkKtJ1VNIs7dnnS8z1Zv8+3E4TBeXaVaaPlLcHUCRhX4ELPBVoyWiFwfA2gg
|
||||
957FExkLNPWC8svzX7E0a+kbAU0C9yMDyxIESPWKbnS/Cs+U+b6BM/DunZV+fODT
|
||||
UJ59O1z0kbQW6d7n+dWYxPjD
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
@@ -1,28 +1,52 @@
|
||||
-----BEGIN PRIVATE KEY-----
|
||||
MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQCtnQ64A8UVUzl4
|
||||
61WLtLCKjDxDEFDsOzzNReEFv8MVKyowlIJvaPw1GZTPuQ1pmcII8q8L5hDWzPHo
|
||||
VQJdnY5W33XupUBnC2MT+TsmuoxfI+mboN6BhqbDBQSewT/+ZEaLZ6JrTAJGcK8x
|
||||
sRxhVUl3hhCTqivgS0rr4tBfbQHHj+mtUPpVLXhlCYaceuIlFrge63gg292va8tP
|
||||
Gf0mixnIbRiDzq3XZPEJudPg98ZzIgz4m7n1e41AT3AuXNk/LWjE+CTu6lkwJGXJ
|
||||
EBxBEkQ4YsZyWY8P9vq00gjfsKEHqqi4W/KmNmaLGLOcDIkHfjFfnhwVHmOvxmXL
|
||||
fX4k4jLFAgMBAAECgf9QBhTCvPoa2kGjetXzj1XQhtNAFkU2nhdohs0x2TISj9Li
|
||||
kZGNyNZ3o1L0bFfCVR0bAsGsul8Io27dqFFu1TDG2jmBxqno1VbV3gtlzpblQ6hq
|
||||
E7x795TmT2nRw0G8AHyDxUEYM/DYhxg5z2lFdAppDWKWrdmLiSj/kYx6b8RiNzCU
|
||||
6sFrYAyAkF0a9zMhJlypUIO+Oi0Oezwa8tL7UYSYK6+p6tm+060Yn3TEoAwmn3xd
|
||||
gS68sdBcVEiQ+rgwh7MPQD8vRFo+QdDc1Bso9T6/8PeK/cssGLZKiWOxO+CEnc1d
|
||||
lu4yYtkvz291FPqLS04AteDS2VScvZ1BQpE9+4ECgYEA439jaSaLcye7ujEHlwoN
|
||||
X0h1MmlIJ7rvHFW3Xtbl8uxZo15fn528cOGioQrmbelW6+RTgnj3n/uio9QG1ZyB
|
||||
MLYY8wXHq0j4zPklTUt59oi7j9FKTDhsaBNAvHFVlejXzaKrVJ4UiUcxks0m3FUM
|
||||
DMXdxfv7iE2YM3J7shxVJ/UCgYEAw11s1eA/YJ/FaVc14sN/mlT+kYY9G04t8yAJ
|
||||
0oe+GggkNGu3s9aPuLr3oKHS1K9jyCfUC5J6DbDWymjzxFqJv3TyDkD4SytFgLAl
|
||||
c92XbLFrFQlJG2+k242AorbEHQO4IIwpd3HAI52XrT6WoH3JQCjnpTXudGq0NrI6
|
||||
luBOrZECgYAg14INawAUprbGIU/cMRpPGBG7LlG5UpY0O/eV3GYj1JT4LaaWT1ol
|
||||
3ZzxrLYpRddDhJm9qyLsWJJZHkHCUq6fzpn5c2sowgcQ6CLHbs7zlTemgms8Z6TW
|
||||
vXjJ+36EfrGwwPwE4jFKxBlW/QDQLALqUSI7862TNshzHOLYipiMhQKBgFcz63Go
|
||||
EAIMLuzvTZEznFCCIcNJPRtkESSVp2y+xH8QJUD01+HBIxPc+M1NjjL7OrnL9V1Y
|
||||
+3wC9E0S/cQmeZfpFmaAX5QF85cWiREn1wBgTSDtrSE++0I47jMzC2S8FUMJ7TRw
|
||||
pMgA/wQIjOmEXAF0gLmA0jhKrLhBY9+WrefRAoGBAKMn2FaNoa1qYXPFblPnu7Cy
|
||||
eXY84lPwMPlFXH2rsBbfCe2DzJ3hRdPNP+EwkfcnxDp6tOLzaDXZlYMTOgdRtAUa
|
||||
9n7rNwFrmKkzvYCKz0Xjxky2rGuq7sLp/1KWBVG3GRlSrenjTEJToQjYJJ5ySKMW
|
||||
WkN4m2opC8z7GxpjJvRO
|
||||
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
|
||||
mHDbdt3ZRNxhHGSiih0iX9YZT7yg
|
||||
-----END PRIVATE KEY-----
|
||||
|
||||
@@ -425,6 +425,13 @@ describe('TLS/SSL Protocol', () => {
|
||||
throw err;
|
||||
}
|
||||
});
|
||||
it('default HTTPS port is 433', async () => {
|
||||
const clickhouse = new ClickHouse({
|
||||
...config,
|
||||
url : 'https://localhost'
|
||||
});
|
||||
expect(clickhouse.opts.url).to.match(/localhost\//);
|
||||
});
|
||||
});
|
||||
|
||||
describe('queries', () => {
|
||||
|
||||
Reference in New Issue
Block a user