Skip to content
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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moved nested /case/.../ calls to the top of the routing table. #1493

Merged
merged 1 commit into from
Sep 2, 2020
Merged

Moved nested /case/.../ calls to the top of the routing table. #1493

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
56 changes: 28 additions & 28 deletions thehive/app/org/thp/thehive/controllers/v0/Router.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,34 @@ class Router @Inject() (
case DELETE(p"/case/share/$shareId") => shareCtrl.removeShare(shareId)
case PATCH(p"/case/share/$shareId") => shareCtrl.updateShare(shareId)

case GET(p"/case/task") => queryExecutor.task.search
case POST(p"/case/$caseId/task") => taskCtrl.create(caseId) // Audit ok
case GET(p"/case/task/$taskId") => taskCtrl.get(taskId)
case PATCH(p"/case/task/$taskId") => taskCtrl.update(taskId) // Audit ok
case POST(p"/case/task/_search") => queryExecutor.task.search
//case POST(p"/case/$caseId/task/_search") => taskCtrl.search
case POST(p"/case/task/_stats") => queryExecutor.task.stats

//case GET(p"/case/task/$taskId/log") => logCtrl.findInTask(taskId)
//case POST(p"/case/task/$taskId/log/_search") => logCtrl.findInTask(taskId)
case POST(p"/case/task/log/_search") => queryExecutor.log.search
case POST(p"/case/task/log/_stats") => queryExecutor.log.stats
case POST(p"/case/task/$taskId/log") => logCtrl.create(taskId) // Audit ok
case PATCH(p"/case/task/log/$logId") => logCtrl.update(logId) // Audit ok
case DELETE(p"/case/task/log/$logId") => logCtrl.delete(logId) // Audit ok, weird logs/silent errors though (stream related)
// case GET(p"/case/task/log/$logId") => logCtrl.get(logId)

case POST(p"/case/artifact/_search") => queryExecutor.observable.search
// case POST(p"/case/:caseId/artifact/_search") ⇒ observableCtrl.findInCase(caseId)
case POST(p"/case/artifact/_stats") => queryExecutor.observable.stats
case POST(p"/case/$caseId/artifact") => observableCtrl.create(caseId) // Audit ok
case GET(p"/case/artifact/$observableId") => observableCtrl.get(observableId)
case DELETE(p"/case/artifact/$observableId") => observableCtrl.delete(observableId) // Audit ok
case PATCH(p"/case/artifact/_bulk") => observableCtrl.bulkUpdate // Audit ok
case PATCH(p"/case/artifact/$observableId") => observableCtrl.update(observableId) // Audit ok
case GET(p"/case/artifact/$observableId/similar") => observableCtrl.findSimilar(observableId)
case POST(p"/case/artifact/$observableId/shares") => shareCtrl.shareObservable(observableId)

case GET(p"/case") => queryExecutor.`case`.search
case POST(p"/case") => caseCtrl.create // Audit ok
case GET(p"/case/$caseId") => caseCtrl.get(caseId)
Expand Down Expand Up @@ -107,34 +135,6 @@ class Router @Inject() (
case PUT(p"/organisation/$organisationId1/links") => organisationCtrl.bulkLink(organisationId1)
case DELETE(p"/organisation/$organisationId1/link/$organisationId2") => organisationCtrl.unlink(organisationId1, organisationId2)

case GET(p"/case/task") => queryExecutor.task.search
case POST(p"/case/$caseId/task") => taskCtrl.create(caseId) // Audit ok
case GET(p"/case/task/$taskId") => taskCtrl.get(taskId)
case PATCH(p"/case/task/$taskId") => taskCtrl.update(taskId) // Audit ok
case POST(p"/case/task/_search") => queryExecutor.task.search
//case POST(p"/case/$caseId/task/_search") => taskCtrl.search
case POST(p"/case/task/_stats") => queryExecutor.task.stats

//case GET(p"/case/task/$taskId/log") => logCtrl.findInTask(taskId)
//case POST(p"/case/task/$taskId/log/_search") => logCtrl.findInTask(taskId)
case POST(p"/case/task/log/_search") => queryExecutor.log.search
case POST(p"/case/task/log/_stats") => queryExecutor.log.stats
case POST(p"/case/task/$taskId/log") => logCtrl.create(taskId) // Audit ok
case PATCH(p"/case/task/log/$logId") => logCtrl.update(logId) // Audit ok
case DELETE(p"/case/task/log/$logId") => logCtrl.delete(logId) // Audit ok, weird logs/silent errors though (stream related)
// case GET(p"/case/task/log/$logId") => logCtrl.get(logId)

case POST(p"/case/artifact/_search") => queryExecutor.observable.search
// case POST(p"/case/:caseId/artifact/_search") ⇒ observableCtrl.findInCase(caseId)
case POST(p"/case/artifact/_stats") => queryExecutor.observable.stats
case POST(p"/case/$caseId/artifact") => observableCtrl.create(caseId) // Audit ok
case GET(p"/case/artifact/$observableId") => observableCtrl.get(observableId)
case DELETE(p"/case/artifact/$observableId") => observableCtrl.delete(observableId) // Audit ok
case PATCH(p"/case/artifact/_bulk") => observableCtrl.bulkUpdate // Audit ok
case PATCH(p"/case/artifact/$observableId") => observableCtrl.update(observableId) // Audit ok
case GET(p"/case/artifact/$observableId/similar") => observableCtrl.findSimilar(observableId)
case POST(p"/case/artifact/$observableId/shares") => shareCtrl.shareObservable(observableId)

case GET(p"/customField") => customFieldCtrl.list
case POST(p"/customField") => customFieldCtrl.create
case GET(p"/customField/$id") => customFieldCtrl.get(id)
Expand Down