From 8f34d58521b20b8faef4e4973953db70180c1b66 Mon Sep 17 00:00:00 2001 From: Korkman Date: Wed, 2 Mar 2022 12:19:00 +0100 Subject: [PATCH 1/6] Bump version numbers, fixes #149 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 24ea0ee..7f7a7a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ FROM adoptopenjdk/openjdk16:alpine AS base-builder -ARG SBT_VERSION=1.3.13 +ARG SBT_VERSION=1.6.2 RUN apk add --no-cache bash ENV JAVA_HOME="/usr/lib/jvm/default-jvm/" ENV PATH=$PATH:${JAVA_HOME}/bin RUN \ wget -O sbt-$SBT_VERSION.tgz https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz && \ - tar -xzvf sbt-$SBT_VERSION.tgz && \ - rm sbt-$SBT_VERSION.tgz + tar -xzvf sbt-$SBT_VERSION.tgz && \ + rm sbt-$SBT_VERSION.tgz ENV PATH=$PATH:/sbt/bin/ @@ -30,7 +30,7 @@ ENV PATH=$PATH:${JAVA_HOME}/bin FROM base-core WORKDIR /lc-core -COPY --from=builder /build/target/scala-2.13/LibreCaptcha.jar . +COPY --from=builder /build/target/scala-3.1.1/LibreCaptcha.jar . RUN mkdir data/ EXPOSE 8888 From c3eb078635ce80974930e3bb464fafb894844f56 Mon Sep 17 00:00:00 2001 From: Korkman Date: Wed, 2 Mar 2022 12:25:24 +0100 Subject: [PATCH 2/6] Point docker-compose.yml to "latest" More sane to point docker-compose.yml to "latest" instead of ageing version numbers. Also added commented-out build option which should be obvious but still helps. --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d8a9eec..5d78308 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,8 @@ version: "3.6" services: lc-core: container_name: "libre-captcha" - image: librecaptcha/lc-core:1.0.0-stable + image: librecaptcha/lc-core:latest + #build: . volumes: - "./docker-data:/lc-core/data" ports: From 9f069e140292797813b1ebcaf2006ff5590cf70b Mon Sep 17 00:00:00 2001 From: Korkman Date: Wed, 2 Mar 2022 12:57:12 +0100 Subject: [PATCH 3/6] Commented --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 5d78308..c6f165d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,7 @@ services: lc-core: container_name: "libre-captcha" image: librecaptcha/lc-core:latest + # Comment image & uncomment "build" if you intend to build from source #build: . volumes: - "./docker-data:/lc-core/data" From 7da5a5b9aff05627212b2ab45517c3c229f40fb9 Mon Sep 17 00:00:00 2001 From: Korkman Date: Wed, 2 Mar 2022 12:57:34 +0100 Subject: [PATCH 4/6] Quotes --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index c6f165d..e262418 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: lc-core: container_name: "libre-captcha" image: librecaptcha/lc-core:latest - # Comment image & uncomment "build" if you intend to build from source + # Comment "image" & uncomment "build" if you intend to build from source #build: . volumes: - "./docker-data:/lc-core/data" From 2ee331e6b581a2dee94c77242ec34550ae1cb4b5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 2 Apr 2022 19:26:44 +0200 Subject: [PATCH 5/6] Update scalafmt-core to 3.5.0 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 3d74380..f77a401 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version="3.4.3" +version="3.5.0" maxColumn = 120 runner.dialect = scala3 From c396fe5c4a0278982d20c6b291b527265a64c6bb Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 2 Apr 2022 19:26:52 +0200 Subject: [PATCH 6/6] Reformat with scalafmt 3.5.0 --- src/main/scala/lc/Main.scala | 11 +++++------ src/main/scala/lc/background/taskThread.scala | 10 +++++----- src/main/scala/lc/core/captchaManager.scala | 6 +++--- src/main/scala/lc/database/DB.scala | 3 ++- src/main/scala/lc/server/Server.scala | 8 +++++++- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/main/scala/lc/Main.scala b/src/main/scala/lc/Main.scala index 5bdd849..3d2ac9c 100644 --- a/src/main/scala/lc/Main.scala +++ b/src/main/scala/lc/Main.scala @@ -26,13 +26,12 @@ object LCFramework { corsHeader = config.corsHeader ) - Runtime.getRuntime.addShutdownHook( new Thread { - override def run(): Unit = { - println("Shutting down gracefully...") - backgroundTask.shutdown() - } + Runtime.getRuntime.addShutdownHook(new Thread { + override def run(): Unit = { + println("Shutting down gracefully...") + backgroundTask.shutdown() } - ) + }) server.start() } diff --git a/src/main/scala/lc/background/taskThread.scala b/src/main/scala/lc/background/taskThread.scala index 431c93e..7398e41 100644 --- a/src/main/scala/lc/background/taskThread.scala +++ b/src/main/scala/lc/background/taskThread.scala @@ -26,7 +26,7 @@ class BackgroundTask(config: Config, captchaManager: CaptchaManager) { val countExisting = captchaManager.getCount(param).getOrElse(0) val countRequired = requiredCountPerCombination - countExisting if (countRequired > 0) { - val countCreate = Math.min(1.0 + requiredCountPerCombination/10.0, countRequired).toInt + val countCreate = Math.min(1.0 + requiredCountPerCombination / 10.0, countRequired).toInt println(s"Creating $countCreate of $countRequired captchas for $param") for (i <- 0 until countCreate) { @@ -42,10 +42,10 @@ class BackgroundTask(config: Config, captchaManager: CaptchaManager) { } private def allParameterCombinations(): List[Parameters] = { - (config.captchaConfig).flatMap {captcha => - (captcha.allowedLevels).flatMap {level => - (captcha.allowedMedia).flatMap {media => - (captcha.allowedInputType).map {inputType => + (config.captchaConfig).flatMap { captcha => + (captcha.allowedLevels).flatMap { level => + (captcha.allowedMedia).flatMap { media => + (captcha.allowedInputType).map { inputType => Parameters(level, media, inputType, Some(Size(0, 0))) } } diff --git a/src/main/scala/lc/core/captchaManager.scala b/src/main/scala/lc/core/captchaManager.scala index 96620bf..4943485 100644 --- a/src/main/scala/lc/core/captchaManager.scala +++ b/src/main/scala/lc/core/captchaManager.scala @@ -37,10 +37,10 @@ class CaptchaManager(config: Config, captchaProviders: CaptchaProviders) { captchaProviders.getProvider(param).flatMap { provider => val providerId = provider.getId() val challenge = provider.returnChallenge() - val blob = new ByteArrayInputStream(challenge.content) + val blob = new ByteArrayInputStream(challenge.content) val token = insertCaptcha(provider, challenge, providerId, param, blob) - // println("Added new challenge: " + token.toString) - token.map(_.toInt) + // println("Added new challenge: " + token.toString) + token.map(_.toInt) } } diff --git a/src/main/scala/lc/database/DB.scala b/src/main/scala/lc/database/DB.scala index ee6532f..78111a4 100644 --- a/src/main/scala/lc/database/DB.scala +++ b/src/main/scala/lc/database/DB.scala @@ -3,7 +3,8 @@ package lc.database import java.sql.{Connection, DriverManager, Statement} class DBConn() { - val con: Connection = DriverManager.getConnection("jdbc:h2:./data/H2/captcha2;MAX_COMPACT_TIME=8000;DB_CLOSE_ON_EXIT=FALSE", "sa", "") + val con: Connection = + DriverManager.getConnection("jdbc:h2:./data/H2/captcha2;MAX_COMPACT_TIME=8000;DB_CLOSE_ON_EXIT=FALSE", "sa", "") def getStatement(): Statement = { con.createStatement() diff --git a/src/main/scala/lc/server/Server.scala b/src/main/scala/lc/server/Server.scala index da8f3cf..197a9cc 100644 --- a/src/main/scala/lc/server/Server.scala +++ b/src/main/scala/lc/server/Server.scala @@ -13,7 +13,13 @@ import java.net.InetSocketAddress import java.util import scala.jdk.CollectionConverters._ -class Server(address: String, port: Int, captchaManager: CaptchaManager, playgroundEnabled: Boolean, corsHeader: String) { +class Server( + address: String, + port: Int, + captchaManager: CaptchaManager, + playgroundEnabled: Boolean, + corsHeader: String +) { var headerMap: util.Map[String, util.List[String]] = _ if (corsHeader.nonEmpty) { headerMap = Map("Access-Control-Allow-Origin" -> List(corsHeader).asJava).asJava