diff options
| author | vlad <vlad@driver.xyz> | 2017-06-15 13:28:03 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-06-15 13:28:03 -0700 |
| commit | a8a379001dba4697c217f8c831290d01c4c5660b (patch) | |
| tree | 4d3fbc40777cb79676c3b4fa2aebfa1559b95a76 | |
| parent | 770e0bd7e7e035f99ed319fd10566345d4b437ae (diff) | |
| download | driver-core-0.13.7.tar.gz driver-core-0.13.7.tar.bz2 driver-core-0.13.7.zip | |
Optional `Origin` header and `Access-Control-Allow-Headers`v0.13.7
| -rw-r--r-- | src/main/scala/xyz/driver/core/app.scala | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/main/scala/xyz/driver/core/app.scala b/src/main/scala/xyz/driver/core/app.scala index 891b14e..6d70c81 100644 --- a/src/main/scala/xyz/driver/core/app.scala +++ b/src/main/scala/xyz/driver/core/app.scala @@ -69,6 +69,13 @@ object app { private def extractHeader(request: HttpRequest)(headerName: String): Option[String] = request.headers.find(_.name().toLowerCase === headerName).map(_.value()) + private val allowHeaders = + `Access-Control-Allow-Headers`("Origin", "X-Requested–With", "Content-Type", "Accept") + + private def allowOrigin(originHeader: Option[Origin]) = + `Access-Control-Allow-Origin`( + originHeader.fold[HttpOriginRange](HttpOriginRange.*)(h => HttpOriginRange(h.origins: _*))) + protected implicit def rejectionHandler = RejectionHandler .newBuilder() @@ -77,9 +84,8 @@ object app { lazy val names = methods map (_.name) mkString ", " options { ctx => - headerValueByType[Origin]() { origin => - respondWithHeaders( - List[HttpHeader](Allow(methods), `Access-Control-Allow-Origin`(HttpOriginRange(origin.origins: _*)))) { + optionalHeaderValueByType[Origin]() { originHeader => + respondWithHeaders(List[HttpHeader](Allow(methods), allowOrigin(originHeader), allowHeaders)) { complete(s"Supported methods: $names.") } }(ctx) @@ -98,7 +104,7 @@ object app { http.bindAndHandle( route2HandlerFlow(extractHost { origin => extractClientIP { ip => - headerValueByType[Origin]() { + optionalHeaderValueByType[Origin]() { originHeader => { ctx => val trackingId = rest.extractTrackingId(ctx.request) @@ -122,9 +128,9 @@ object app { handleExceptions(ExceptionHandler(exceptionHandler))({ c => requestLogging.flatMap { _ => - val responseHeaders = - List[HttpHeader](RawHeader(ContextHeaders.TrackingIdHeader, trackingId), - `Access-Control-Allow-Origin`(HttpOriginRange(originHeader.origins: _*))) + val tracingHeader = RawHeader(ContextHeaders.TrackingIdHeader, trackingId) + + val responseHeaders = List[HttpHeader](tracingHeader, allowOrigin(originHeader), allowHeaders) respondWithHeaders(responseHeaders) { modules.map(_.route).foldLeft(versionRt ~ healthRoute ~ swaggerRoutes)(_ ~ _) |