MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2581 from Budibase/fix/enable-redis-ssl 

Fix/enable redis ssl
This commit is contained in:
Martin McKeaveney 2021-09-09 18:34:50 +01:00 committed by GitHub
parent 60a5602a61 febe5c1f6f
commit 26cfc9eabc
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/auth/src/redis/index.js
View File

@ -56,9 +56,13 @@ function init() {
if (CLIENT) { if (CLIENT) {
CLIENT.disconnect() CLIENT.disconnect()
} }
const { opts, host, port } = getRedisOptions(CLUSTERED)
const { redisProtocolUrl, opts, host, port } = getRedisOptions(CLUSTERED)
if (CLUSTERED) { if (CLUSTERED) {
CLIENT = new Redis.Cluster([{ host, port }], opts) CLIENT = new Redis.Cluster([{ host, port }], opts)
} else if (redisProtocolUrl) {
CLIENT = new Redis(redisProtocolUrl)
} else { } else {
CLIENT = new Redis(opts) CLIENT = new Redis(opts)
} }

10
packages/auth/src/redis/utils.js
View File

@ -19,6 +19,14 @@ exports.SEPARATOR = SEPARATOR
exports.getRedisOptions = (clustered = false) => { exports.getRedisOptions = (clustered = false) => {
const [host, port] = REDIS_URL.split(":") const [host, port] = REDIS_URL.split(":")
let redisProtocolUrl
// fully qualified redis URL
if (/rediss?/.test(host)) {
redisProtocolUrl = REDIS_URL
}
const opts = { const opts = {
connectTimeout: CONNECT_TIMEOUT_MS, connectTimeout: CONNECT_TIMEOUT_MS,
} }
@ -33,7 +41,7 @@ exports.getRedisOptions = (clustered = false) => {
opts.port = port opts.port = port
opts.password = REDIS_PASSWORD opts.password = REDIS_PASSWORD
} }
return { opts, host, port } return { opts, host, port, redisProtocolUrl }
} }
exports.addDbPrefix = (db, key) => { exports.addDbPrefix = (db, key) => {