Fix #336, fix #335, fix #334, fix #337

MAIF · Nov 26, 2019 · e5c5812 · e5c5812
1 parent efa7cc2
commit e5c5812
Show file tree

Hide file tree

Showing 28 changed files with 592 additions and 317 deletions.
diff --git a/otoroshi/app/actions/api.scala b/otoroshi/app/actions/api.scala
@@ -21,6 +21,7 @@ case class ApiActionContext[A](apiKey: ApiKey, request: Request[A]) {
       .get(env.Headers.OtoroshiAdminProfile)
       .flatMap(p => Try(Json.parse(new String(Base64.getDecoder.decode(p), Charsets.UTF_8))).toOption)
   def from: String = request.headers.get("X-Forwarded-For").getOrElse(request.remoteAddress)
+  def ua: String = request.headers.get("User-Agent").getOrElse("none")
 }
 
 class ApiAction(val parser: BodyParser[AnyContent])(implicit env: Env)

diff --git a/otoroshi/app/actions/backoffice.scala b/otoroshi/app/actions/backoffice.scala
@@ -21,10 +21,12 @@ import scala.concurrent.{ExecutionContext, Future}
 case class BackOfficeActionContext[A](request: Request[A], user: Option[BackOfficeUser]) {
   def connected: Boolean = user.isDefined
   def from: String       = request.headers.get("X-Forwarded-For").getOrElse(request.remoteAddress)
+  def ua: String = request.headers.get("User-Agent").getOrElse("none")
 }
 
 case class BackOfficeActionContextAuth[A](request: Request[A], user: BackOfficeUser) {
   def from: String = request.headers.get("X-Forwarded-For").getOrElse(request.remoteAddress)
+  def ua: String = request.headers.get("User-Agent").getOrElse("none")
 }
 
 class BackOfficeAction(val parser: BodyParser[AnyContent])(implicit env: Env)
@@ -82,7 +84,7 @@ class BackOfficeActionAuth(val parser: BodyParser[AnyContent])(implicit env: Env
               case Some(user) => {
                 env.datastores.backOfficeUserDataStore.blacklisted(user.email).flatMap {
                   case true => {
-                    Alerts.send(BlackListedBackOfficeUserAlert(env.snowflakeGenerator.nextIdStr(), env.env, user))
+                    Alerts.send(BlackListedBackOfficeUserAlert(env.snowflakeGenerator.nextIdStr(), env.env, user, request.headers.get("X-Forwarded-For").getOrElse(request.remoteAddress), request.headers.get("User-Agent").getOrElse("none")))
                     FastFuture.successful(
                       Results.NotFound(views.html.otoroshi.error("Error", env)).removingFromSession("bousr")(request)
                     )

diff --git a/otoroshi/app/actions/privateapps.scala b/otoroshi/app/actions/privateapps.scala
@@ -13,6 +13,8 @@ case class PrivateAppsActionContext[A](request: Request[A],
                                        user: Option[PrivateAppsUser],
                                        globalConfig: models.GlobalConfig) {
   def connected: Boolean = user.isDefined
+  def from: String = request.headers.get("X-Forwarded-For").getOrElse(request.remoteAddress)
+  def ua: String = request.headers.get("User-Agent").getOrElse("none")
 }
 
 class PrivateAppsAction(val parser: BodyParser[AnyContent])(implicit env: Env)

diff --git a/otoroshi/app/controllers/AnalyticsController.scala b/otoroshi/app/controllers/AnalyticsController.scala
@@ -50,6 +50,7 @@ class AnalyticsController(ApiAction: ApiAction, UnAuthApiAction: UnAuthApiAction
         "ACCESS_SERVICE_STATS",
         s"User accessed a service descriptor stats",
         ctx.from,
+        ctx.ua,
         Json.obj("serviceId" -> serviceId)
       )
     )
@@ -150,6 +151,7 @@ class AnalyticsController(ApiAction: ApiAction, UnAuthApiAction: UnAuthApiAction
         "ACCESS_GLOBAL_STATS",
         s"User accessed a global stats",
         ctx.from,
+        ctx.ua,
         Json.obj()
       )
     )
@@ -245,6 +247,7 @@ class AnalyticsController(ApiAction: ApiAction, UnAuthApiAction: UnAuthApiAction
           "ACCESS_SERVICE_EVENTS",
           s"User accessed a service descriptor events",
           ctx.from,
+          ctx.ua,
           Json.obj("serviceId" -> serviceId)
         )
       )