Skip to content

Commit a0c6ec8

Browse files
committed
#39 Support elastic search on SSL. Currently, the config key es_using_ssl was unused.
1 parent c53fda1 commit a0c6ec8

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require('./lib/cas-auth.js').configureCas(express, app, config);
2727

2828
// Setup ES proxy
2929
require('./lib/es-proxy').configureESProxy(app, config.es_host, config.es_port,
30-
config.es_username, config.es_password);
30+
config.es_username, config.es_password, config.es_using_ssl);
3131

3232
// Serve config.js for kibana3
3333
// We should use special config.js for the frontend and point the ES to __es/

lib/es-proxy.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
* http://www.catonmat.net/http-proxy-in-nodejs/
66
*/
77
var http = require('http');
8+
var https = require('https');
89

9-
function proxyRequest(request, response, host, port, user, password, getProxiedRequestPath, isUI) {
10+
function proxyRequest(request, response, host, port, user, password, useSSL, getProxiedRequestPath, isUI) {
1011
var filteredHeaders = {};
1112
Object.keys(request.headers).forEach(function(header) {
1213
if (header === 'host') {
@@ -35,7 +36,7 @@ function proxyRequest(request, response, host, port, user, password, getProxiedR
3536
options.auth = password ? user + ':' + password : user;
3637
}
3738

38-
var proxyReq = http.request(options);
39+
var proxyReq = useSSL ? https.request(options) : http.request(options);
3940

4041
proxyReq.addListener('error', function(err){
4142
response.status(500).send('Unable to process your request, ' + err.code);
@@ -83,15 +84,15 @@ function proxyRequest(request, response, host, port, user, password, getProxiedR
8384
});
8485
}
8586

86-
exports.configureESProxy = function(app, esHost, esPort, esUser, esPassword) {
87+
exports.configureESProxy = function(app, esHost, esPort, esUser, esPassword, useSSL) {
8788
app.use("/__es", function(request, response, next) {
88-
proxyRequest(request, response, esHost, esPort, esUser, esPassword,
89+
proxyRequest(request, response, esHost, esPort, esUser, esPassword, useSSL,
8990
function getProxiedRequestPath(request) {
9091
return request.url;
9192
});
9293
});
9394
app.use("/_plugin", function(request, response, next) {
94-
proxyRequest(request, response, esHost, esPort, esUser, esPassword,
95+
proxyRequest(request, response, esHost, esPort, esUser, esPassword, useSSL,
9596
function getProxiedRequestPath(request) {
9697
return request.originalUrl;
9798
}, true);

0 commit comments

Comments
 (0)