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

Jump to bottom

PIN-4557: Safer mongodb regex filters #197

Merged
merged 1 commit into from
Feb 13, 2024
Merged

PIN-4557: Safer mongodb regex filters #197

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: 2 additions & 2 deletions ...ain/scala/it/pagopa/interop/purposeprocess/common/readmodel/ReadModelPurposeQueries.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ object ReadModelPurposeQueries extends ReadModelQuery {
val eServicesIdsFilter = mapToVarArgs(eServicesIds.map(Filters.eq("data.eserviceId", _)))(Filters.or)
val consumersIdsFilter = mapToVarArgs(consumersIds.map(Filters.eq("data.consumerId", _)))(Filters.or)
val titleFilter =
if (exactMatchOnTitle) title.map(n => Filters.regex("data.title", s"^$n$$", "i"))
else title.map(Filters.regex("data.title", _, "i"))
if (exactMatchOnTitle) title.map(n => safeRegex("data.title", s"^$n$$", "i"))
else title.map(safeRegex("data.title", _, "i"))
mapToVarArgs(
eServicesIdsFilter.toList ++ consumersIdsFilter.toList ++ statesFilter.toList ++ titleFilter.toList // :+ permissionFilter
)(Filters.and).getOrElse(Filters.empty())
Expand Down
7 changes: 7 additions & 0 deletions src/main/scala/it/pagopa/interop/purposeprocess/common/readmodel/ReadModelQuery.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
package it.pagopa.interop.purposeprocess.common.readmodel

import org.mongodb.scala.bson.conversions.Bson
import org.mongodb.scala.model.Filters

trait ReadModelQuery {
def mapToVarArgs[A, B](l: Seq[A])(f: Seq[A] => B): Option[B] = Option.when(l.nonEmpty)(f(l))

def escape(str: String): String = str.replaceAll("([.*+?^${}()|\\[\\]\\\\])", "\\\\$1")
def safeRegex(fieldName: String, pattern: String, options: String): Bson =
Filters.regex(fieldName, escape(pattern), options)
}
Loading