forked from elastic/kibana
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix/elastic#1962
- Loading branch information
Showing
68 changed files
with
894 additions
and
1,313 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,4 +36,4 @@ | |
| "maxerr": 10, | ||
| "scripturl": true, | ||
| "evil": true | ||
| } | ||
| } | ||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "extends": "../.jshintrc", | ||
| "node": true | ||
| } | ||
|
|
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| var express = require('express'); | ||
| var path = require('path'); | ||
| var favicon = require('serve-favicon'); | ||
| var requestLogger = require('./lib/requestLogger'); | ||
| var appHeaders = require('./lib/appHeaders'); | ||
| var cookieParser = require('cookie-parser'); | ||
| var bodyParser = require('body-parser'); | ||
| var compression = require('compression'); | ||
| var config = require('./config'); | ||
|
|
||
| var routes = require('./routes/index'); | ||
| var proxy = require('./routes/proxy'); | ||
|
|
||
| var app = express(); | ||
|
|
||
| // view engine setup | ||
| app.set('views', path.join(__dirname, 'views')); | ||
| app.set('view engine', 'jade'); | ||
| app.set('x-powered-by', false); | ||
|
|
||
| app.use(favicon(path.join(config.public_folder, 'styles', 'theme', 'elk.ico'))); | ||
| app.use(requestLogger()); | ||
| app.use(appHeaders()); | ||
|
|
||
| if (app.get('env') === 'development') { | ||
| require('./dev')(app); | ||
| } | ||
|
|
||
| // The proxy must be set up before all the other middleware. | ||
| // TODO: WE might want to move the middleware to each of the individual routes | ||
| // so we don't have weird conflicts in the future. | ||
| app.use('/elasticsearch', proxy); | ||
| app.use('/enforcer', require('./lib/enforce')); | ||
|
|
||
| app.use(bodyParser.json()); | ||
| app.use(bodyParser.urlencoded({ extended: false })); | ||
| app.use(cookieParser()); | ||
| app.use(compression()); | ||
| app.use(express.static(config.public_folder)); | ||
| if (config.external_plugins_folder) app.use('/plugins', express.static(config.external_plugins_folder)); | ||
|
|
||
| app.use('/', routes); | ||
|
|
||
|
|
||
| // catch 404 and forward to error handler | ||
| app.use(function (req, res, next) { | ||
| var err = new Error('Not Found'); | ||
| err.status = 404; | ||
| next(err); | ||
| }); | ||
|
|
||
| // error handlers | ||
|
|
||
| // development error handler | ||
| // will print stacktrace | ||
| if (app.get('env') === 'development') { | ||
| app.use(function (err, req, res, next) { | ||
| res.status(err.status || 500); | ||
| res.render('error', { | ||
| message: err.message, | ||
| error: err | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| // production error handler | ||
| // no stacktraces leaked to user | ||
| app.use(function (err, req, res, next) { | ||
| res.status(err.status || 500); | ||
| res.render('error', { | ||
| message: err.message, | ||
| error: {} | ||
| }); | ||
| }); | ||
|
|
||
|
|
||
| module.exports = app; |
Oops, something went wrong.