move CSP and Nonce out of modules/common

jbampton · Apr 29, 2023 · 4e89317 · 4e89317
1 parent b3405ba
commit 4e89317
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 13 deletions.
diff --git a/app/controllers/LilaController.scala b/app/controllers/LilaController.scala
@@ -10,14 +10,13 @@ import play.api.mvc.*
 import scala.annotation.nowarn
 import scalatags.Text.Frag
 
-import lila.api.{ BodyContext, Context, HeaderContext, PageData }
+import lila.api.{ BodyContext, Context, HeaderContext, PageData, Nonce }
 import lila.app.{ *, given }
-import lila.common.{ ApiVersion, HTTPRequest, Nonce }
+import lila.common.{ ApiVersion, HTTPRequest, config }
 import lila.i18n.{ I18nKey, I18nLangPicker }
 import lila.oauth.{ OAuthScope, OAuthServer }
 import lila.security.{ AppealUser, FingerPrintedUser, Granter, Permission }
 import lila.user.{ Holder, User as UserModel, UserContext }
-import lila.common.config
 
 abstract private[controllers] class LilaController(val env: Env)
     extends BaseController

diff --git a/...mmon/src/main/ContentSecurityPolicy.scala → app/http/ContentSecurityPolicy.scala b/...mmon/src/main/ContentSecurityPolicy.scala → app/http/ContentSecurityPolicy.scala
@@ -1,4 +1,6 @@
-package lila.common
+package lila.app
+
+import lila.api.Nonce
 
 case class ContentSecurityPolicy(
     defaultSrc: List[String],

diff --git a/app/http/ErrorHandler.scala b/app/http/ErrorHandler.scala
@@ -28,7 +28,7 @@ final class ErrorHandler(
         val errorCtx = lila.api.Context.error(
           req,
           lila.i18n.defaultLang,
-          HTTPRequest.isSynchronousHttp(req) option lila.common.Nonce.random
+          HTTPRequest.isSynchronousHttp(req) option lila.api.Nonce.random
         )
         InternalServerError(views.html.site.bits.errorPage(using errorCtx))
       else InternalServerError("Sorry, something went wrong.")

diff --git a/app/templating/AssetHelper.scala b/app/templating/AssetHelper.scala
@@ -3,9 +3,9 @@ package templating
 
 import play.api.mvc.RequestHeader
 
-import lila.api.Context
+import lila.api.{ Context, Nonce }
 import lila.app.ui.ScalatagsTemplate.*
-import lila.common.{ AssetVersion, ContentSecurityPolicy, Nonce }
+import lila.common.AssetVersion
 
 trait AssetHelper extends HasEnv { self: I18nHelper with SecurityHelper =>
 

diff --git a/app/ui/EmbedConfig.scala b/app/ui/EmbedConfig.scala
@@ -4,7 +4,7 @@ package ui
 import play.api.mvc.RequestHeader
 import play.api.i18n.Lang
 
-import lila.common.Nonce
+import lila.api.Nonce
 
 case class EmbedConfig(
     bg: String,

diff --git a/app/views/base/layout.scala b/app/views/base/layout.scala
@@ -4,13 +4,13 @@ import controllers.report.routes.{ Report as reportRoutes }
 import controllers.routes
 import play.api.i18n.Lang
 
-import lila.api.{ AnnounceStore, Context }
+import lila.api.{ Nonce, AnnounceStore, Context }
 import lila.app.templating.Environment.{ given, * }
+import lila.app.ContentSecurityPolicy
 import lila.app.ui.ScalatagsTemplate.{ *, given }
 import lila.common.base.StringUtils.escapeHtmlRaw
-import lila.common.LangPath
 import lila.common.String.html.safeJsonValue
-import lila.common.{ ContentSecurityPolicy, Nonce }
+import lila.common.LangPath
 
 object layout:
 

diff --git a/modules/api/src/main/Context.scala b/modules/api/src/main/Context.scala
@@ -3,7 +3,7 @@ package lila.api
 import play.api.i18n.Lang
 import play.api.mvc.RequestHeader
 
-import lila.common.{ HTTPRequest, Nonce }
+import lila.common.HTTPRequest
 import lila.pref.Pref
 import lila.user.{ BodyUserContext, HeaderUserContext, UserContext }
 import lila.notify.Notification.UnreadCount

diff --git a/modules/common/src/main/Nonce.scala → modules/api/src/main/Nonce.scala b/modules/common/src/main/Nonce.scala → modules/api/src/main/Nonce.scala
@@ -1,4 +1,4 @@
-package lila.common
+package lila.api
 
 import ornicar.scalalib.SecureRandom