From e3ed0ba24de20a56ed437d96a5a97a24816a637a Mon Sep 17 00:00:00 2001 From: eikek Date: Fri, 18 Mar 2022 23:57:36 +0100 Subject: [PATCH 1/2] Use temporary files when receiving large data --- .../restserver/routes/UploadRoutes.scala | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/UploadRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/UploadRoutes.scala index 70c67945..8a18cd6c 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/routes/UploadRoutes.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/routes/UploadRoutes.scala @@ -20,7 +20,6 @@ import docspell.restserver.http4s.ResponseGenerator import org.http4s._ import org.http4s.circe.CirceEntityEncoder._ import org.http4s.dsl.Http4sDsl -import org.http4s.multipart.Multipart import org.log4s._ object UploadRoutes { @@ -80,17 +79,26 @@ object UploadRoutes { ): F[Response[F]] = { import dsl._ - for { - multipart <- req.as[Multipart[F]] - updata <- readMultipart( - multipart, - "webapp", - logger, - prio, - cfg.backend.files.validMimeTypes - ) - result <- backend.upload.submitEither(updata, accOrSrc, true, itemId) - res <- Ok(basicResult(result)) - } yield res + val decodeMultipart = + EntityDecoder + .mixedMultipartResource( + maxSizeBeforeWrite = 10 * 1024 * 1024 + ) + .evalMap(_.decode(req, strict = false).value) + .rethrow + + decodeMultipart.use { multipart => + for { + updata <- readMultipart( + multipart, + "webapp", + logger, + prio, + cfg.backend.files.validMimeTypes + ) + result <- backend.upload.submitEither(updata, accOrSrc, true, itemId) + res <- Ok(basicResult(result)) + } yield res + } } } From 57bcea7ae36db6b35732c3d9a0347f642736e096 Mon Sep 17 00:00:00 2001 From: eikek Date: Sat, 19 Mar 2022 00:19:27 +0100 Subject: [PATCH 2/2] Allow to configure some http server details --- .../src/main/resources/reference.conf | 11 +++++++ .../scala/docspell/restserver/Config.scala | 8 ++++- .../docspell/restserver/RestServer.scala | 3 ++ nix/module-server.nix | 29 +++++++++++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/modules/restserver/src/main/resources/reference.conf b/modules/restserver/src/main/resources/reference.conf index d3306679..ee9bd476 100644 --- a/modules/restserver/src/main/resources/reference.conf +++ b/modules/restserver/src/main/resources/reference.conf @@ -38,6 +38,17 @@ docspell.server { port = 7880 } + # Options for tuning the http server + server-options { + enable-http-2 = false + + # Maximum allowed connections + max-connections = 1024 + + # Timeout for waiting for the first output of the response + response-timeout = 45s + } + # This is a hard limit to restrict the size of a batch that is # returned when searching for items. The user can set this limit # within the client config, but it is restricted by the server to diff --git a/modules/restserver/src/main/scala/docspell/restserver/Config.scala b/modules/restserver/src/main/scala/docspell/restserver/Config.scala index bfce9652..d0032b6f 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/Config.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/Config.scala @@ -13,7 +13,7 @@ import docspell.ftssolr.SolrConfig import docspell.logging.LogConfig import docspell.oidc.ProviderConfig import docspell.pubsub.naive.PubSubConfig -import docspell.restserver.Config.OpenIdConfig +import docspell.restserver.Config.{OpenIdConfig, ServerOptions} import docspell.restserver.auth.OpenId import docspell.restserver.http4s.InternalHeader @@ -26,6 +26,7 @@ case class Config( internalUrl: LenientUri, logging: LogConfig, bind: Config.Bind, + serverOptions: ServerOptions, backend: BackendConfig, auth: Login.Config, showClassificationSettings: Boolean, @@ -50,6 +51,11 @@ case class Config( object Config { + case class ServerOptions( + responseTimeout: Duration, + enableHttp2: Boolean, + maxConnections: Int + ) case class Bind(address: String, port: Int) case class AdminEndpoint(secret: String) diff --git a/modules/restserver/src/main/scala/docspell/restserver/RestServer.scala b/modules/restserver/src/main/scala/docspell/restserver/RestServer.scala index a4d4fb6d..25d59cc0 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/RestServer.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/RestServer.scala @@ -52,6 +52,9 @@ object RestServer { BlazeServerBuilder[F] .bindHttp(cfg.bind.port, cfg.bind.address) .withoutBanner + .withResponseHeaderTimeout(cfg.serverOptions.responseTimeout.toScala) + .enableHttp2(cfg.serverOptions.enableHttp2) + .withMaxConnections(cfg.serverOptions.maxConnections) .withHttpWebSocketApp( createHttpApp(setting, pubSub, restApp) ) diff --git a/nix/module-server.nix b/nix/module-server.nix index 12c8dea1..c7c0a2ca 100644 --- a/nix/module-server.nix +++ b/nix/module-server.nix @@ -21,6 +21,11 @@ let address = "localhost"; port = 7880; }; + server-options = { + enable-http-2 = false; + max-connections = 1024; + response-timeout = "45s"; + }; logging = { minimum-level = "Info"; format = "Fancy"; @@ -214,6 +219,30 @@ in { description = "Address and port bind the rest server."; }; + server-options = mkOption { + type = types.submodule({ + options = { + enable-http-2 = mkOption { + type = types.bool; + default = defaults.server-options.enable-http-2; + description = "Whether to enable http2"; + }; + max-connections = mkOption { + type = types.int; + default = defaults.server-options.max-connections; + description = "Maximum number of client connections"; + }; + response-timeout = mkOption { + type = types.str; + default = defaults.server-options.response-timeout; + description = "Timeout when waiting for the response."; + }; + }; + }); + default = defaults.server-options; + description = "Tuning the http server"; + }; + logging = mkOption { type = types.submodule({ options = {