Merge pull request #5787 from niklasf/coop-coep

set coop/coep headers for multi-threaded stockfish (closes #5784)
lichess-org · Dec 19, 2019 · 12c8387 · 12c8387
2 parents 57dc74a + c201b3e
commit 12c8387
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/app/controllers/LilaController.scala b/app/controllers/LilaController.scala
@@ -43,7 +43,7 @@ abstract private[controllers] class LilaController(val env: Env)
   protected val keyPages       = new KeyPages(env)
   protected val renderNotFound = keyPages.notFound _
 
-  implicit protected def LilaFunitToResult(@silent funit: Funit)(implicit ctx: Context): Fu[Result] =
+  implicit protected def LilaFunitToResult(@silent funit: Funit)(implicit req: RequestHeader): Fu[Result] =
     negotiate(
       html = fuccess(Ok("ok")),
       api = _ => fuccess(jsonOkResult)
@@ -53,6 +53,11 @@ abstract private[controllers] class LilaController(val env: Env)
   implicit def ctxReq(implicit ctx: Context)          = ctx.req
   implicit def reqConfig(implicit req: RequestHeader) = ui.EmbedConfig(req)
 
+  protected def EnableSharedArrayBuffer(res: Result): Result = res.withHeaders(
+    "Cross-Origin-Opener-Policy"   -> "same-origin",
+    "Cross-Origin-Embedder-Policy" -> "require-corp"
+  )
+
   protected def NoCache(res: Result): Result = res.withHeaders(
     CACHE_CONTROL -> "no-cache, no-store, must-revalidate",
     EXPIRES       -> "0"

diff --git a/app/controllers/Puzzle.scala b/app/controllers/Puzzle.scala
@@ -33,7 +33,9 @@ final class Puzzle(
   private def renderShow(puzzle: PuzzleModel, mode: String)(implicit ctx: Context) =
     env.puzzle userInfos ctx.me flatMap { infos =>
       renderJson(puzzle = puzzle, userInfos = infos, mode = mode, voted = none) map { json =>
-        views.html.puzzle.show(puzzle, data = json, pref = env.puzzle.jsonView.pref(ctx.pref))
+        EnableSharedArrayBuffer(
+          Ok(views.html.puzzle.show(puzzle, data = json, pref = env.puzzle.jsonView.pref(ctx.pref)))
+        )
       }
     }
 
@@ -43,24 +45,24 @@ final class Puzzle(
         _.map(_.id) ?? env.puzzle.api.puzzle.find
       }) { puzzle =>
         negotiate(
-          html = renderShow(puzzle, "play") map { Ok(_) },
+          html = renderShow(puzzle, "play"),
           api = _ => puzzleJson(puzzle) map { Ok(_) }
-        ) map { NoCache(_) }
+        ) map NoCache
       }
     }
   }
 
   def home = Open { implicit ctx =>
     NoBot {
       env.puzzle.selector(ctx.me) flatMap { puzzle =>
-        renderShow(puzzle, if (ctx.isAuth) "play" else "try") map { Ok(_) }
+        renderShow(puzzle, if (ctx.isAuth) "play" else "try")
       }
     }
   }
 
   def show(id: PuzzleId) = Open { implicit ctx =>
     NoBot {
-      OptionFuOk(env.puzzle.api.puzzle find id) { puzzle =>
+      OptionFuResult(env.puzzle.api.puzzle find id) { puzzle =>
         renderShow(puzzle, "play")
       }
     }

diff --git a/app/controllers/Relay.scala b/app/controllers/Relay.scala
@@ -116,7 +116,7 @@ final class Relay(
         chat     <- studyC.chatOf(sc.study)
         sVersion <- env.study.version(sc.study.id)
         streams  <- studyC.streamsOf(sc.study)
-      } yield Ok(html.relay.show(relay, sc.study, data, chat, sVersion, streams))
+      } yield EnableSharedArrayBuffer(Ok(html.relay.show(relay, sc.study, data, chat, sVersion, streams)))
     }
 
   private def showRoute(r: RelayModel) = routes.Relay.show(r.slug, r.id.value)

diff --git a/app/controllers/Study.scala b/app/controllers/Study.scala
@@ -150,7 +150,7 @@ final class Study(
               chat     <- chatOf(sc.study)
               sVersion <- env.study.version(sc.study.id)
               streams  <- streamsOf(sc.study)
-            } yield Ok(html.study.show(sc.study, data, chat, sVersion, streams)),
+            } yield EnableSharedArrayBuffer(Ok(html.study.show(sc.study, data, chat, sVersion, streams))),
             api = _ =>
               chatOf(sc.study).map { chatOpt =>
                 Ok(

diff --git a/app/controllers/UserAnalysis.scala b/app/controllers/UserAnalysis.scala
@@ -44,7 +44,7 @@ final class UserAnalysis(
     val orientation = get("color").flatMap(chess.Color.apply) | pov.color
     env.api.roundApi
       .userAnalysisJson(pov, ctx.pref, decodedFen, orientation, owner = false, me = ctx.me) map { data =>
-      Ok(html.board.userAnalysis(data, pov))
+      EnableSharedArrayBuffer(Ok(html.board.userAnalysis(data, pov)))
     }
   }