#1437 Prevent query failure on isOwner extraData

TheHive-Project · Jul 16, 2020 · e0bd0d1 · e0bd0d1
1 parent dce5882
commit e0bd0d1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/thehive/app/org/thp/thehive/controllers/v1/CaseRenderer.scala b/thehive/app/org/thp/thehive/controllers/v1/CaseRenderer.scala
@@ -56,7 +56,7 @@ trait CaseRenderer {
   def isOwnerStats(
       caseSteps: CaseSteps
   )(implicit authContext: AuthContext): Traversal[JsValue, JsValue] =
-    caseSteps.origin.name.map(org => JsBoolean(org == authContext.organisation))
+    caseSteps.origin.has("name", authContext.organisation).fold.map(l => JsBoolean(!l.isEmpty))
 
   def shareCountStats(caseSteps: CaseSteps): Traversal[JsValue, JsValue] =
     caseSteps.organisations.count.map(c => JsNumber(c - 1))

diff --git a/thehive/app/org/thp/thehive/controllers/v1/ObservableRenderer.scala b/thehive/app/org/thp/thehive/controllers/v1/ObservableRenderer.scala
@@ -39,7 +39,7 @@ trait ObservableRenderer {
   def isOwner(
       observableSteps: ObservableSteps
   )(implicit authContext: AuthContext): Traversal[JsValue, JsValue] =
-    observableSteps.origin.name.map(orgName => JsBoolean(orgName == authContext.organisation))
+    observableSteps.origin.has("name", authContext.organisation).fold.map(l => JsBoolean(!l.isEmpty))
 
   def observableLinks(observableSteps: ObservableSteps): Traversal[JsValue, JsValue] =
     observableSteps.coalesce(

diff --git a/thehive/app/org/thp/thehive/controllers/v1/TaskRenderer.scala b/thehive/app/org/thp/thehive/controllers/v1/TaskRenderer.scala
@@ -31,7 +31,7 @@ trait TaskRenderer {
     taskSteps.organisations.count.map(c => JsNumber(c - 1))
 
   def isOwner(taskSteps: TaskSteps)(implicit authContext: AuthContext): Traversal[JsValue, JsValue] =
-    taskSteps.origin.name.map(orgName => JsBoolean(orgName == authContext.organisation))
+    taskSteps.origin.has("name", authContext.organisation).fold.map(l => JsBoolean(!l.isEmpty))
 
   def taskStatsRenderer(extraData: Set[String])(
       implicit authContext: AuthContext,