Skip to content

Fix 404 for rules, templates, folders and silence in subfolders (Express 5 routes) #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
siccous wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix 404 for rules, templates, folders and silence in subfolders (Express 5 routes) #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/handlers/folders/delete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ export default function folderDeleteHandler(request, response) {
* @type {ElastalertServer}
*/
let server = request.app.get('server');
let pathParts = request.originalUrl.split('/');
let pathIndex = pathParts.indexOf(request.params.type) + 1;
let path = pathParts.slice(pathIndex).join('/');
let path = request.params.path.join('/');

server.foldersController.delete(request.params.type, path)
.then(function () {
Expand Down
4 changes: 1 addition & 3 deletions src/handlers/folders/put.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ export default function folderPostHandler(request, response) {
* @type {ElastalertServer}
*/
let server = request.app.get('server');
let pathParts = request.originalUrl.split('/');
let pathIndex = pathParts.indexOf(request.params.type) + 1;
let path = pathParts.slice(pathIndex).join('/');
let path = request.params.path.join('/');

server.foldersController.create(request.params.type, path)
.then(function () {
Expand Down
4 changes: 1 addition & 3 deletions src/handlers/rules/id/delete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ export default function ruleDeleteHandler(request, response) {
* @type {ElastalertServer}
*/
let server = request.app.get('server');
let pathParts = request.originalUrl.split('/');
let idIndex = pathParts.indexOf('rules') + 1;
let path = pathParts.slice(idIndex).join('/');
let path = request.params.id.join('/');

server.rulesController.rule(path)
.then(function (rule) {
Expand Down
4 changes: 1 addition & 3 deletions src/handlers/rules/id/get.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ export default function ruleGetHandler(request, response) {
*/
let server = request.app.get('server');

let pathParts = request.originalUrl.split('/');
let idIndex = pathParts.indexOf('rules') + 1;
let path = pathParts.slice(idIndex).join('/');
let path = request.params.id.join('/');

server.rulesController.rule(path)
.then(function (rule) {
Expand Down
4 changes: 1 addition & 3 deletions src/handlers/rules/id/post.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ export default function rulePostHandler(request, response) {
*/
let server = request.app.get('server');
let body = request.body ? request.body.yaml : undefined;
let pathParts = request.originalUrl.split('/');
let idIndex = pathParts.indexOf('rules') + 1;
let path = pathParts.slice(idIndex).join('/');
let path = request.params.id.join('/');

server.rulesController.rule(path)
.then(function (rule) {
Expand Down
4 changes: 1 addition & 3 deletions src/handlers/silence/post.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ export default function silencePostHandler(request, response) {
sendRequestError(response, body.error);
}

let pathParts = request.originalUrl.split('/');
let pathIndex = pathParts.indexOf('silence') + 1;
let path = pathParts.slice(pathIndex).join('/');
let path = request.params.path.join('/');

server.silenceController.silenceRule(path, body.unit, body.duration)
.then(function (consoleOutput) {
Expand Down
4 changes: 1 addition & 3 deletions src/handlers/templates/id/delete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ export default function templateDeleteHandler(request, response) {
* @type {ElastalertServer}
*/
let server = request.app.get('server');
let pathParts = request.originalUrl.split('/');
let idIndex = pathParts.indexOf('templates') + 1;
let path = pathParts.slice(idIndex).join('/');
let path = request.params.id.join('/');

server.templatesController.template(path)
.then(function (template) {
Expand Down
4 changes: 1 addition & 3 deletions src/handlers/templates/id/get.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ export default function templateGetHandler(request, response) {
* @type {ElastalertServer}
*/
let server = request.app.get('server');
let pathParts = request.originalUrl.split('/');
let idIndex = pathParts.indexOf('templates') + 1;
let path = pathParts.slice(idIndex).join('/');
let path = request.params.id.join('/');

server.templatesController.template(path)
.then(function (template) {
Expand Down
4 changes: 1 addition & 3 deletions src/handlers/templates/id/post.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ export default function templatePostHandler(request, response) {
*/
let server = request.app.get('server');
let body = request.body ? request.body.yaml : undefined;
let pathParts = request.originalUrl.split('/');
let idIndex = pathParts.indexOf('templates') + 1;
let path = pathParts.slice(idIndex).join('/');
let path = request.params.id.join('/');

server.templatesController.template(path)
.then(function (template) {
Expand Down
8 changes: 4 additions & 4 deletions src/routes/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ let routes = [
method: 'GET',
handler: rulesHandler
}, {
path: 'rules/:id',
path: 'rules/*id',
method: ['GET', 'POST', 'DELETE'],
handler: [ruleGetHandler, rulePostHandler, ruleDeleteHandler]
}, {
Expand All @@ -67,11 +67,11 @@ let routes = [
handler: templatesHandler
}, {
method: ['GET', 'POST', 'DELETE'],
path: 'templates/:id',
path: 'templates/*id',
handler: [templateGetHandler, templatePostHandler, templateDeleteHandler]
},
{
path: 'folders/:type/:path',
path: 'folders/:type/*path',
method: ['PUT', 'DELETE'],
handler: [folderPutHandler, folderDeleteHandler]
},
Expand All @@ -81,7 +81,7 @@ let routes = [
handler: testPostHandler
},
{
path: 'silence/:path',
path: 'silence/*path',
method: 'POST',
handler: silencePostHandler
},
Expand Down