Compare commits

..

220 Commits

Author SHA1 Message Date
hrj a53903a757 update scala version in scripts 2024-12-29 18:59:53 +05:30
hrj 12ddf59bd1
Merge pull request #260 from scala-steward/update/scala3-library-3.6.2
Update scala3-library to 3.6.2
2024-12-18 13:31:22 +05:30
hrj 5a5c9a73d9 setup sbt explicitly 2024-12-17 21:14:34 +05:30
Scala Steward a8f50f6098
Update scala3-library to 3.6.2
Signed-off-by: Scala Steward <scala_steward@virtuslab.com>
2024-12-11 17:38:27 +00:00
hrj ab1387814c
Merge pull request #259 from scala-steward/update/scrimage-core-4.3.0
Update scrimage-core, scrimage-filters to 4.3.0
2024-12-04 08:47:38 +05:30
Scala Steward f0d2ddda44
Update scrimage-core, scrimage-filters to 4.3.0
Signed-off-by: Scala Steward <scala_steward@virtuslab.com>
2024-12-03 20:03:13 +00:00
hrj 2fefc62ba2
Merge pull request #258 from scala-steward/update/sbt-1.10.6
Update sbt, scripted-plugin to 1.10.6
2024-12-02 09:56:05 +05:30
Scala Steward 2ec93c4b95
Update sbt, scripted-plugin to 1.10.6
Signed-off-by: Scala Steward <scala_steward@virtuslab.com>
2024-12-01 20:13:15 +00:00
hrj f60cb8dd05 Merge remote-tracking branch 'origin/master' 2024-11-06 06:54:59 +05:30
hrj 5c73a0fea0 scala steward config to signoff commits 2024-11-06 06:54:17 +05:30
hrj 45299fb8eb
Merge pull request #257 from scala-steward/update/sbt-1.10.5
Update sbt, scripted-plugin to 1.10.5
2024-11-06 06:50:50 +05:30
Scala Steward 3c6bbe8c9f
Update sbt, scripted-plugin to 1.10.5 2024-11-05 19:38:15 +00:00
hrj e122976878
Merge pull request #256 from scala-steward/update/sbt-1.10.4
Update sbt, scripted-plugin to 1.10.4
2024-10-31 11:32:55 +05:30
Scala Steward f702a22dcd
Update sbt, scripted-plugin to 1.10.4 2024-10-28 17:16:37 +00:00
hrj b9bd305599 update scala version in test script 2024-10-25 10:45:44 +05:30
hrj f4737424f7 update scala version in scripts 2024-10-25 10:03:18 +05:30
hrj 355e8c553a
Merge pull request #255 from scala-steward/update/scala3-library-3.5.2
Update scala3-library to 3.5.2
2024-10-25 09:52:14 +05:30
Scala Steward 777be7cf08
Update scala3-library to 3.5.2 2024-10-24 18:24:36 +00:00
hrj c7c89a6396
Merge pull request #252 from scala-steward/update/sbt-scalafix-0.13.0
Update sbt-scalafix to 0.13.0
2024-10-24 16:46:43 +05:30
hrj 471a5828cd
Merge pull request #254 from scala-steward/update/sbt-1.10.3
Update sbt, scripted-plugin to 1.10.3
2024-10-22 09:13:04 +05:30
Scala Steward c7327f07ee
Update sbt, scripted-plugin to 1.10.3 2024-10-20 17:55:01 +00:00
hrj aa31b2d9cf
Merge pull request #253 from scala-steward/update/sbt-assembly-2.3.0
Update sbt-assembly to 2.3.0
2024-10-20 22:36:51 +05:30
Scala Steward 592a85257e
Update sbt-assembly to 2.3.0 2024-10-08 17:02:29 +00:00
Scala Steward 5c3160157a
Update sbt-scalafix to 0.13.0 2024-09-28 19:03:49 +00:00
hrj 24ac9c5ee7
Merge pull request #249 from scala-steward/update/sbt-1.10.2
Update sbt to 1.10.2
2024-09-20 22:55:14 +05:30
Scala Steward 6cf0b322fc
Update sbt to 1.10.2 2024-09-16 16:11:09 +00:00
hrj 967145b73b update scala in scripts 2024-08-24 11:17:08 +05:30
hrj 332aac57f0
Merge pull request #248 from scala-steward/update/scala3-library-3.5.0
Update scala3-library to 3.5.0
2024-08-24 11:12:34 +05:30
Scala Steward f6e0130a53
Update scala3-library to 3.5.0 2024-08-23 15:33:05 +00:00
hrj 20f32bdabb update scripts for scala 3.4.3 2024-08-16 10:55:07 +05:30
hrj 660d18d6f2
Merge pull request #247 from scala-steward/update/scala3-library-3.4.3
Update scala3-library to 3.4.3
2024-08-16 10:53:11 +05:30
Scala Steward b786330bff
Update scala3-library to 3.4.3 2024-08-15 16:10:43 +00:00
hrj dbb675b975
Merge pull request #244 from scala-steward/update/scalafmt-core-3.8.3
Update scalafmt-core to 3.8.3
2024-08-15 15:00:11 +05:30
hrj 220eec02b0
Merge pull request #245 from scala-steward/update/scrimage-core-4.2.0
Update scrimage-core, scrimage-filters to 4.2.0
2024-08-13 11:47:38 +05:30
Scala Steward 3e822ef02a
Update scrimage-core, scrimage-filters to 4.2.0 2024-08-12 23:02:17 +00:00
Scala Steward 1c273c1996
Update scalafmt-core to 3.8.3 2024-07-29 18:24:04 +00:00
hrj 7887622040
Merge pull request #243 from scala-steward/update/sbt-1.10.1
Update sbt to 1.10.1
2024-07-11 08:38:27 +05:30
Scala Steward bf303108aa
Update sbt to 1.10.1 2024-07-10 16:58:41 +00:00
hrj cc7e1232f2
Merge pull request #242 from scala-steward/update/scalafmt-core-3.8.2
Update scalafmt-core to 3.8.2
2024-06-14 23:13:16 +05:30
Scala Steward a9b148c1a9
Update scalafmt-core to 3.8.2 2024-06-14 16:56:30 +00:00
hrj 13459fbf21 update scala version in scripts 2024-06-01 16:07:15 +05:30
hrj fa366be315
Merge pull request #241 from scala-steward/update/scala3-library-3.4.2
Update scala3-library to 3.4.2
2024-06-01 15:47:13 +05:30
Scala Steward 9e39f6d293
Update scala3-library to 3.4.2 2024-05-17 16:20:08 +00:00
hrj f0050494a1
Merge pull request #239 from scala-steward/update/sbt-scalafix-0.12.1
Update sbt-scalafix to 0.12.1
2024-05-08 12:24:38 +05:30
hrj 52156b1677
Merge pull request #240 from scala-steward/update/sbt-1.10.0
Update sbt to 1.10.0
2024-05-08 11:33:41 +05:30
Scala Steward 4749486112
Update sbt to 1.10.0 2024-05-07 21:49:03 +00:00
Scala Steward 7c7d7f6633
Update sbt-scalafix to 0.12.1 2024-05-05 16:32:23 +00:00
hrj 17db5767f4
Merge pull request #238 from scala-steward/update/scrimage-core-4.1.3
Update scrimage-core, scrimage-filters to 4.1.3
2024-04-27 21:57:21 +05:30
Scala Steward 3d7b7e8bd9
Update scrimage-core, scrimage-filters to 4.1.3 2024-04-27 16:16:50 +00:00
hrj 1991375d6b
Merge pull request #236 from scala-steward/update/scalafmt-core-3.8.1
Update scalafmt-core to 3.8.1
2024-04-26 08:45:39 +05:30
hrj b77bd94ae6
Merge pull request #237 from scala-steward/update/scrimage-core-4.1.2
Update scrimage-core, scrimage-filters to 4.1.2
2024-04-26 08:45:17 +05:30
Scala Steward b14415add5
Update scrimage-core, scrimage-filters to 4.1.2 2024-04-25 16:16:42 +00:00
hrj ac44980f50 update scripts to scala 3.4.1 2024-04-17 22:59:58 +05:30
hrj fba5b10e77
Merge pull request #235 from scala-steward/update/scala3-library-3.4.1
Update scala3-library to 3.4.1
2024-04-17 22:57:30 +05:30
Scala Steward c4515d3f77
Update scalafmt-core to 3.8.1 2024-03-30 19:11:05 +00:00
Scala Steward 7c394b4359
Update scala3-library to 3.4.1 2024-03-28 17:44:28 +00:00
hrj 6db9934bec
Merge pull request #234 from scala-steward/update/sbt-assembly-2.2.0
Update sbt-assembly to 2.2.0
2024-03-15 09:03:31 +05:30
Scala Steward 39b776fde8
Update sbt-assembly to 2.2.0 2024-03-14 17:32:47 +00:00
hrj 4c3a7ad0fa update dejava font package name 2024-03-04 09:32:39 +05:30
hrj 7f70d60dbb try 17 jre jammy docker image 2024-03-04 09:27:07 +05:30
hrj 4d79567227 use eclipse-temurin containers from adoptium 2024-03-04 09:12:57 +05:30
hrj f6b7278ed1 update scripts to scala 3.3.3 2024-03-04 08:32:35 +05:30
hrj 984bbacb69
Merge pull request #233 from scala-steward/update/scala3-library-3.3.3
Update scala3-library to 3.3.3
2024-03-04 08:27:44 +05:30
hrj 0dd00f5d3e
Merge pull request #232 from scala-steward/update/sbt-scalafix-0.12.0
Update sbt-scalafix to 0.12.0
2024-03-04 08:27:14 +05:30
Scala Steward d355333bd4
Update scala3-library to 3.3.3 2024-03-02 18:55:20 +00:00
Scala Steward 55064c8532
Update sbt-scalafix to 0.12.0 2024-03-02 18:55:14 +00:00
hrj 1742772de1 update jdk version in dockerfile 2024-02-24 09:13:16 +05:30
hrj 1234bd4acb
Merge pull request #230 from scala-steward/update/scalafmt-core-3.8.0
Update scalafmt-core to 3.8.0
2024-02-24 08:49:23 +05:30
hrj df82593d90
Merge pull request #231 from scala-steward/update/sbt-1.9.9
Update sbt to 1.9.9
2024-02-24 08:49:05 +05:30
Scala Steward b782ded765
Update sbt to 1.9.9 2024-02-23 19:34:34 +00:00
Scala Steward aa6a6a1015
Update scalafmt-core to 3.8.0 2024-02-19 23:16:43 +00:00
hrj 157054d9d8
Merge pull request #229 from scala-steward/update/sbt-1.9.8
Update sbt to 1.9.8
2024-01-14 17:03:50 +05:30
Scala Steward daa8903933
Update sbt to 1.9.8 2024-01-12 23:23:08 +00:00
hrj de3a2bad6f
Merge pull request #228 from scala-steward/update/sbt-1.9.7
Update sbt to 1.9.7
2023-12-04 08:03:30 +05:30
hrj 121b190c32
Merge pull request #227 from scala-steward/update/json4s-jackson-4.0.7
Update json4s-jackson to 4.0.7
2023-12-04 08:02:53 +05:30
Scala Steward b95350b1e2
Update sbt to 1.9.7 2023-12-03 16:35:11 +00:00
Scala Steward 26bc159342
Update json4s-jackson to 4.0.7 2023-12-03 16:35:07 +00:00
hrj 476ef499e3
Merge pull request #226 from scala-steward/update/sbt-scalafmt-2.5.2
Update sbt-scalafmt to 2.5.2
2023-12-02 08:26:37 +05:30
hrj 3b925adfde
Merge branch 'master' into update/sbt-scalafmt-2.5.2 2023-12-02 08:15:55 +05:30
hrj 16a8282206
Merge pull request #225 from scala-steward/update/sbt-1.8.3
Update sbt to 1.8.3
2023-12-02 08:14:13 +05:30
hrj 4cedff874d
Merge pull request #224 from scala-steward/update/sbt-assembly-2.1.5
Update sbt-assembly to 2.1.5
2023-12-02 08:13:38 +05:30
hrj d8360c6192
Merge pull request #223 from scala-steward/update/sbt-scalafix-0.11.1
Update sbt-scalafix to 0.11.1
2023-12-02 08:12:46 +05:30
Scala Steward e81e8a77e8
Update sbt-scalafmt to 2.5.2 2023-12-01 17:39:20 +00:00
Scala Steward c045682708
Update sbt to 1.8.3 2023-12-01 17:39:15 +00:00
Scala Steward 414c07beaf
Update sbt-assembly to 2.1.5 2023-12-01 17:39:02 +00:00
Scala Steward aa6607237a
Update sbt-scalafix to 0.11.1 2023-12-01 17:38:57 +00:00
hrj 931ab0a086
Merge pull request #222 from scala-steward/update/scalafmt-core-3.7.17
Update scalafmt-core to 3.7.17
2023-11-19 08:07:43 +05:30
Scala Steward bc4acb1bae
Update scalafmt-core to 3.7.17 2023-11-17 20:29:03 +00:00
hrj 2dc2066ad8
Merge pull request #220 from scala-steward/update/scalafmt-core-3.7.15
Update scalafmt-core to 3.7.15
2023-10-25 07:50:44 +05:30
Scala Steward bc8c6ad227
Update scalafmt-core to 3.7.15 2023-10-24 21:15:37 +00:00
hrj be0612b94d
Merge pull request #219 from scala-steward/update/scrimage-core-4.1.1
Update scrimage-core, scrimage-filters to 4.1.1
2023-10-17 06:59:21 +05:30
Scala Steward fe2315fc89
Update scrimage-core, scrimage-filters to 4.1.1 2023-10-16 22:35:56 +00:00
hrj 1696050702
Merge pull request #218 from scala-steward/update/scrimage-core-4.1.0
Update scrimage-core, scrimage-filters to 4.1.0
2023-09-21 13:47:45 +05:30
Scala Steward 5ddfab95d1
Update scrimage-core, scrimage-filters to 4.1.0 2023-09-20 16:34:22 +00:00
hrj 15c95747e8
Merge pull request #217 from scala-steward/update/scrimage-core-4.0.42
Update scrimage-core, scrimage-filters to 4.0.42
2023-09-20 08:16:41 +05:30
Scala Steward 12bb1dd1e7
Update scrimage-core, scrimage-filters to 4.0.42 2023-09-18 18:01:05 +00:00
hrj 1de046362d update scala version in scripts 2023-09-09 08:31:18 +05:30
hrj f9a089bed1
Merge pull request #216 from scala-steward/update/scalafmt-core-3.7.14
Update scalafmt-core to 3.7.14
2023-09-09 08:27:40 +05:30
hrj caac0552c3
Merge pull request #215 from scala-steward/update/scala3-library-3.3.1
Update scala3-library to 3.3.1
2023-09-09 08:27:02 +05:30
Scala Steward 1701a497b6
Update scalafmt-core to 3.7.14 2023-09-08 22:21:34 +00:00
Scala Steward ecabb6baae
Update scala3-library to 3.3.1 2023-09-08 22:21:25 +00:00
hrj 065748e339
Merge pull request #213 from scala-steward/update/scalafmt-core-3.7.12
Update scalafmt-core to 3.7.12
2023-08-07 09:19:35 +05:30
Scala Steward 707d02a71f
Update scalafmt-core to 3.7.12 2023-08-05 16:15:44 +00:00
hrj a69bd1afaf
Merge pull request #212 from scala-steward/update/scalafmt-core-3.7.11
Update scalafmt-core to 3.7.11
2023-07-31 23:23:56 +05:30
Scala Steward f0f62eb4fc
Update scalafmt-core to 3.7.11 2023-07-30 16:52:14 +00:00
hrj fbaa0f24a8
Merge pull request #211 from scala-steward/update/scalafmt-core-3.7.10
Update scalafmt-core to 3.7.10
2023-07-17 21:47:17 +05:30
hrj ddd4054db1
Merge pull request #210 from scala-steward/update/scrimage-core-4.0.38
Update scrimage-core, scrimage-filters to 4.0.38
2023-07-17 21:46:57 +05:30
Scala Steward 66c93c5069
Update scalafmt-core to 3.7.10 2023-07-16 16:43:51 +00:00
Scala Steward 75ac7b2f88
Update scrimage-core, scrimage-filters to 4.0.38 2023-07-16 16:43:44 +00:00
hrj 367eef011f
Merge pull request #209 from scala-steward/update/scalafmt-core-3.7.8
Update scalafmt-core to 3.7.8
2023-07-13 20:06:36 +05:30
Scala Steward 8be4ad2be8
Update scalafmt-core to 3.7.8 2023-07-12 18:34:15 +00:00
hrj f7568ffd5f
Merge pull request #208 from scala-steward/update/scalafmt-core-3.7.7
Update scalafmt-core to 3.7.7
2023-07-09 18:00:07 +05:30
Scala Steward 061dc82c68
Update scalafmt-core to 3.7.7 2023-07-08 20:45:06 +00:00
hrj 6ef321c418
Merge pull request #207 from scala-steward/update/scalafmt-core-3.7.6
Update scalafmt-core to 3.7.6
2023-07-06 09:09:47 +05:30
Scala Steward d3048b3b4a
Update scalafmt-core to 3.7.6 2023-07-04 17:50:54 +00:00
hrj 33fbd9a49b
Merge pull request #206 from scala-steward/update/scalafmt-core-3.7.5
Update scalafmt-core to 3.7.5
2023-07-01 10:23:01 +05:30
Scala Steward f9e626415d
Update scalafmt-core to 3.7.5 2023-06-30 19:19:09 +00:00
hrj ddb333a1df
Merge pull request #205 from scala-steward/update/scrimage-core-4.0.37
Update scrimage-core, scrimage-filters to 4.0.37
2023-06-22 11:10:23 +05:30
Scala Steward 62c0c5c363
Update scrimage-core, scrimage-filters to 4.0.37 2023-06-20 16:18:54 +00:00
hrj cff297a48f
Merge pull request #204 from scala-steward/update/scrimage-core-4.0.36
Update scrimage-core, scrimage-filters to 4.0.36
2023-06-14 08:01:52 +05:30
Scala Steward 10ca28ba07
Update scrimage-core, scrimage-filters to 4.0.36 2023-06-12 16:41:50 +00:00
hrj afab1b4803 update scala version in scripts 2023-06-02 17:34:13 +05:30
hrj 205e652e1e
Merge pull request #203 from scala-steward/update/scalafmt-core-3.7.4
Update scalafmt-core to 3.7.4
2023-06-02 17:27:53 +05:30
hrj 03ac5e5e83
Merge pull request #202 from scala-steward/update/scala3-library-3.3.0
Update scala3-library to 3.3.0
2023-06-02 17:26:50 +05:30
Scala Steward ce71407d74
Update scalafmt-core to 3.7.4 2023-05-31 19:36:09 +00:00
Scala Steward 2a33fe1e90
Update scala3-library to 3.3.0 2023-05-31 19:36:00 +00:00
hrj 9399adf2c3
Merge pull request #201 from scala-steward/update/scalafmt-core-3.7.3
Update scalafmt-core to 3.7.3
2023-04-01 07:35:30 +05:30
Scala Steward ef19bbc0c1
Update scalafmt-core to 3.7.3 2023-03-30 18:55:16 +00:00
hrj 1c95665f67
Merge pull request #200 from scala-steward/update/scrimage-core-4.0.34
Update scrimage-core, scrimage-filters to 4.0.34
2023-03-27 22:36:48 +05:30
Scala Steward 6bb9fbd7ea
Update scrimage-core, scrimage-filters to 4.0.34 2023-03-26 15:20:14 +00:00
hrj 6e6daf6c36
Merge pull request #198 from scala-steward/update/scalafmt-core-3.7.2
Update scalafmt-core to 3.7.2
2023-02-27 16:06:13 +05:30
Scala Steward daa6c49f8a
Update scalafmt-core to 3.7.2 2023-02-26 16:53:56 +00:00
hrj cb9b0d361b
Merge pull request #197 from scala-steward/update/sbt-assembly-2.1.1
Update sbt-assembly to 2.1.1
2023-02-15 06:41:07 +05:30
Scala Steward ae9163d106
Update sbt-assembly to 2.1.1 2023-02-14 16:36:59 +00:00
hrj ba21b133fc update scala to 3.2.2 2023-02-01 08:41:21 +05:30
hrj 3b0b464109
Merge pull request #196 from scala-steward/update/scala3-library-3.2.2
Update scala3-library to 3.2.2
2023-02-01 08:39:41 +05:30
Scala Steward 1663e2b306
Update scala3-library to 3.2.2 2023-01-31 18:39:59 +00:00
hrj d77bc658a0
Merge pull request #195 from scala-steward/update/scalafmt-core-3.7.1
Update scalafmt-core to 3.7.1
2023-01-26 08:04:51 +05:30
Scala Steward 33ad07c768
Update scalafmt-core to 3.7.1 2023-01-25 18:06:58 +00:00
hrj beccf4dff6 Merge remote-tracking branch 'origin/master' 2023-01-22 22:52:09 +05:30
hrj e2688f7e51
Merge pull request #194 from scala-steward/update/scalafmt-core-3.7.0
Update scalafmt-core to 3.7.0
2023-01-22 14:25:33 +05:30
Scala Steward ef4d1690e1
Update scalafmt-core to 3.7.0 2023-01-21 16:51:30 +00:00
hrj 43291222a2 README: explain podman usage and publish ports in example 2023-01-18 20:07:01 +05:30
hrj 044d39ad44
Merge pull request #191 from scala-steward/update/scrimage-core-4.0.33
Update scrimage-core, scrimage-filters to 4.0.33
2023-01-18 07:40:53 +05:30
Scala Steward b0f75677c9
Update scrimage-core, scrimage-filters to 4.0.33 2023-01-17 18:16:23 +00:00
hrj cda8bf6aa5 In Runner, use apt instead of apk 2023-01-15 08:21:03 +05:30
hrj 57b43e0f31 In Runner dockerfile use the same docker base as normal Dockerfile 2023-01-15 08:15:04 +05:30
hrj bfa2cfdc88
Merge pull request #190 from gheorghiuradu/feature/multi-platform-docker-support
Add multi platform docker support
2023-01-14 22:44:28 +05:30
gheorghiuradu 5cbb23b714
add arm platforms to build 2023-01-13 15:37:43 +02:00
gheorghiuradu a1739e5288
Update to use multi-platform images 2023-01-13 15:35:27 +02:00
hrj d5f7fdcad1
Merge pull request #189 from scala-steward/update/sbt-1.8.2
Update sbt to 1.8.2
2023-01-08 17:54:16 +05:30
Scala Steward 5950e42973
Update sbt to 1.8.2 2023-01-07 20:14:36 +00:00
hrj 59934539a7
Merge pull request #188 from scala-steward/update/sbt-assembly-2.1.0
Update sbt-assembly to 2.1.0
2022-12-11 07:39:50 +05:30
Scala Steward 399ee06b62
Update sbt-assembly to 2.1.0 2022-12-10 16:41:58 +00:00
hrj 5d7ccbb1c5 update scala version in scripts 2022-11-30 09:51:52 +05:30
hrj 25fb901e9e bump scala to 3.2.1 2022-11-30 09:49:04 +05:30
hrj dd48e9e4e7
Merge pull request #187 from scala-steward/update/sbt-scalafmt-2.5.0
Update sbt-scalafmt to 2.5.0
2022-11-15 06:20:15 +05:30
hrj 43cb991e16
Merge pull request #186 from scala-steward/update/sbt-1.8.0
Update sbt to 1.8.0
2022-11-15 06:19:48 +05:30
Scala Steward 737ebd76ae
Update sbt-scalafmt to 2.5.0 2022-11-14 22:59:30 +00:00
Scala Steward 30c978ea1c
Update sbt to 1.8.0 2022-11-14 22:59:24 +00:00
hrj 7721df414b
Merge pull request #184 from scala-steward/update/scalafmt-core-3.6.1
Update scalafmt-core to 3.6.1
2022-11-03 09:22:49 +05:30
hrj 901759e06e
Merge pull request #183 from scala-steward/update/sbt-1.7.3
Update sbt to 1.7.3
2022-11-03 09:22:06 +05:30
Scala Steward 2dab3e0638
Add 'Reformat with scalafmt 3.6.1' to .git-blame-ignore-revs 2022-11-02 18:33:05 +00:00
Scala Steward f2b19baca8
Reformat with scalafmt 3.6.1
Executed command: scalafmt --non-interactive
2022-11-02 18:33:05 +00:00
Scala Steward 56b42801d9
Update scalafmt-core to 3.6.1 2022-11-02 18:32:55 +00:00
Scala Steward 448bb5fe9f
Update sbt to 1.7.3 2022-11-02 18:32:47 +00:00
hrj fadfffafb0
Merge pull request #182 from scala-steward/update/scalafmt-core-3.6.0
Update scalafmt-core to 3.6.0
2022-10-24 10:45:01 +05:30
hrj f7d38f5f88
Merge pull request #181 from scala-steward/update/sbt-1.7.2
Update sbt to 1.7.2
2022-10-24 10:43:20 +05:30
hrj 85cfdf642c
Merge pull request #180 from scala-steward/update/json4s-jackson-4.0.6
Update json4s-jackson to 4.0.6
2022-10-24 10:42:55 +05:30
hrj 7dea087e2d
Merge pull request #179 from scala-steward/update/sbt-java-formatter-0.8.0
Update sbt-java-formatter to 0.8.0
2022-10-24 10:42:30 +05:30
hrj f7d03ac5cf
Merge branch 'master' into update/sbt-java-formatter-0.8.0 2022-10-24 10:12:59 +05:30
hrj a40b33d492
Merge pull request #178 from scala-steward/update/sbt-assembly-2.0.0
Update sbt-assembly to 2.0.0
2022-10-24 10:11:01 +05:30
Scala Steward 6eb38929d2
Update scalafmt-core to 3.6.0 2022-10-23 18:04:51 +00:00
Scala Steward a88068b865
Update sbt to 1.7.2 2022-10-23 18:04:45 +00:00
Scala Steward 5e9c9e2d5d
Update json4s-jackson to 4.0.6 2022-10-23 18:04:37 +00:00
Scala Steward f9ae1e3970
Add 'Reformat with sbt-java-formatter 0.8.0' to .git-blame-ignore-revs 2022-10-23 18:04:16 +00:00
Scala Steward 57ce691a00
Reformat with sbt-java-formatter 0.8.0
Executed command: sbt javafmtAll
2022-10-23 18:04:16 +00:00
Scala Steward 55e68d23f4
Update sbt-java-formatter to 0.8.0 2022-10-23 18:03:11 +00:00
Scala Steward b27bcc8e52
Update sbt-assembly to 2.0.0 2022-10-23 18:03:00 +00:00
hrj 6ce5bff8c5
Merge pull request #177 from scala-steward/update/sbt-scalafix-0.10.4
Update sbt-scalafix to 0.10.4
2022-10-15 07:14:49 +05:30
Scala Steward 9ef3d162f2
Update sbt-scalafix to 0.10.4 2022-10-15 00:52:24 +00:00
hrj 515782ea8b update docker image version in readme 2022-10-11 10:52:16 +05:30
hrj 70ca5673d1 fix #162: update h2 2022-10-11 10:23:01 +05:30
hrj 2a092b777e fix jar path in Runner.Dockerfile 2022-10-11 07:38:09 +05:30
hrj a2fc659eda fix jar paths in dockerfile and tests 2022-10-11 07:36:35 +05:30
hrj a020426329 update sbt in dockerfile 2022-10-11 07:36:21 +05:30
hrj 907210f229 show a message when playground is enabled 2022-10-11 07:30:58 +05:30
hrj 58c6e96dc9 fix #175: playgroundEnabled config option was not effective 2022-10-11 07:30:46 +05:30
hrj 7beecd7b80
Merge pull request #174 from scala-steward/update/scala3-library-3.2.0
Update scala3-library to 3.2.0
2022-09-08 10:13:57 +05:30
Scala Steward 2f18edef10
Update scala3-library to 3.2.0 2022-09-07 17:37:10 +00:00
hrj 76dcd1b41e
Merge pull request #173 from scala-steward/update/scrimage-core-4.0.32
Update scrimage-core, scrimage-filters to 4.0.32
2022-08-29 09:06:37 +05:30
Scala Steward 32ac8f5baa
Update scrimage-core, scrimage-filters to 4.0.32 2022-08-28 14:32:06 +00:00
hrj 5794693f51
Merge pull request #172 from scala-steward/update/scalafmt-core-3.5.9
Update scalafmt-core to 3.5.9
2022-08-12 22:13:39 +05:30
Scala Steward c02f284cc9
Update scalafmt-core to 3.5.9 2022-08-12 16:09:22 +00:00
hrj 055525bd74
Merge pull request #171 from scala-steward/update/sbt-1.7.1
Update sbt to 1.7.1
2022-07-14 18:44:49 +05:30
Scala Steward dc5d9d86ff
Update sbt to 1.7.1 2022-07-13 22:14:53 +00:00
hrj ffe3142fbf
Merge pull request #168 from scala-steward/update/scala3-library-3.1.3
Update scala3-library to 3.1.3
2022-07-10 12:50:48 +05:30
hrj 5537d907a1
Merge pull request #169 from scala-steward/update/scalafmt-core-3.5.8
Update scalafmt-core to 3.5.8
2022-07-10 12:18:34 +05:30
hrj 15dfc1576e
Merge pull request #167 from scala-steward/update/sbt-scalafix-0.10.1
Update sbt-scalafix to 0.10.1
2022-07-10 09:20:46 +05:30
Scala Steward 603e6eda22
Update scalafmt-core to 3.5.8 2022-07-09 22:40:38 +00:00
Scala Steward 3532f2ec29
Update scala3-library to 3.1.3 2022-07-09 22:40:33 +00:00
Scala Steward 0a4ca07ed4
Update sbt-scalafix to 0.10.1 2022-07-09 22:40:23 +00:00
hrj 95a7ee1710
Merge pull request #166 from scala-steward/update/scalafmt-core-3.5.3
Update scalafmt-core to 3.5.3
2022-05-15 06:53:46 +05:30
Scala Steward aa484e4bc0
Update scalafmt-core to 3.5.3 2022-05-15 00:38:11 +02:00
hrj 0549d9cfcf
Merge pull request #165 from scala-steward/update/scalafmt-core-3.5.2
Update scalafmt-core to 3.5.2
2022-05-01 06:04:55 +05:30
Scala Steward 94dddd99c0
Update scalafmt-core to 3.5.2 2022-04-30 21:44:09 +02:00
hrj 353ecaa1eb
Merge pull request #164 from scala-steward/update/scalafmt-core-3.5.1
Update scalafmt-core to 3.5.1
2022-04-17 00:20:09 +05:30
Scala Steward b402d34be8
Reformat with scalafmt 3.5.1 2022-04-16 20:42:16 +02:00
Scala Steward 37d840b365
Update scalafmt-core to 3.5.1 2022-04-16 20:42:09 +02:00
hrj a9b630724d update to scala 3.1.2 2022-04-13 07:34:11 +05:30
hrj b50df7ec2f
Merge pull request #161 from scala-steward/update/sbt-scalafix-0.10.0
Update sbt-scalafix to 0.10.0
2022-04-08 08:38:55 +05:30
Scala Steward b3c0a83594
Update sbt-scalafix to 0.10.0 2022-04-08 02:47:20 +02:00
hrj 35909261ce
Merge pull request #160 from vinceh121/patch-1
Update curl example for v2 changes
2022-04-07 21:48:01 +05:30
Vincent 073740b98b
Update curl example for v2 changes
Signed-off-by: vinceh121 <contact@vinceh121.me>
2022-04-07 16:08:40 +02:00
hrj c7726edc1c set next release version 2022-04-06 20:29:04 +05:30
hrj e35d569cbb
Merge pull request #155 from scala-steward/update/json4s-jackson-4.0.5
Update json4s-jackson to 4.0.5
2022-04-05 23:17:17 +05:30
hrj e6b09b8d33
Merge pull request #158 from JacobPozaic/master
Updated javascript example usage in README.md for 2.0.0 changes.
2022-04-05 22:48:49 +05:30
JacobPozaic a43b18587e Updated javascript example usage in README.md for 2.0.0 changes.
Signed-off-by: jacobp <jacobpozaic@gmail.com>
2022-04-05 10:30:31 -04:00
Scala Steward fb1bfbd881
Update json4s-jackson to 4.0.5 2022-04-05 14:45:59 +02:00
hrj 41afb10cb5 update version in sbt 2022-04-05 10:41:15 +05:30
25 changed files with 171 additions and 128 deletions

5
.git-blame-ignore-revs Normal file
View File

@ -0,0 +1,5 @@
# Scala Steward: Reformat with sbt-java-formatter 0.8.0
57ce691a00babb03e0cae03a26fe56d63fc609af
# Scala Steward: Reformat with scalafmt 3.6.1
f2b19baca828a4d88b46bc009aef6d7115e63924

3
.github/scala-steward.conf vendored Normal file
View File

@ -0,0 +1,3 @@
# If true, Scala Steward will sign off all commits (e.g. `git --signoff`).
# Default: false
signoffCommits = true

View File

@ -16,6 +16,7 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.11
- uses: sbt/setup-sbt@v1
- name: Run tests
run: sbt test assembly
- name: Run linter

View File

@ -54,6 +54,10 @@ jobs:
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
platforms: |
linux/amd64
linux/arm64
linux/arm/v7
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}

View File

@ -1,3 +1,3 @@
version="3.5.0"
version="3.8.3"
maxColumn = 120
runner.dialect = scala3

View File

@ -1,9 +1,10 @@
FROM adoptopenjdk/openjdk16:alpine AS base-builder
ARG SBT_VERSION=1.6.2
RUN apk add --no-cache bash
FROM eclipse-temurin:17-jre-jammy AS base-builder
ARG SBT_VERSION=1.7.1
ENV JAVA_HOME="/usr/lib/jvm/default-jvm/"
ENV PATH=$PATH:${JAVA_HOME}/bin
RUN \
apt update && \
apt install -y wget && \
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
@ -22,15 +23,15 @@ FROM sbt-builder as builder
COPY src/ src/
RUN sbt assembly
FROM adoptopenjdk/openjdk16:alpine-jre AS base-core
FROM eclipse-temurin:17-jre-jammy AS base-core
ENV JAVA_HOME="/usr/lib/jvm/default-jvm/"
RUN apk add --update ttf-dejavu
RUN apt update && apt install -y fonts-dejavu
ENV PATH=$PATH:${JAVA_HOME}/bin
FROM base-core
WORKDIR /lc-core
COPY --from=builder /build/target/scala-3.1.1/LibreCaptcha.jar .
COPY --from=builder /build/target/scala-3.6.2/LibreCaptcha.jar .
RUN mkdir data/
EXPOSE 8888

View File

@ -2,12 +2,12 @@
LibreCaptcha is a framework that allows developers to create their own [CAPTCHA](https://en.wikipedia.org/wiki/CAPTCHA)s.
The framework defines the API for a CAPTCHA generator and takes care of mundane details
such as:
* An HTTP interface for serving CAPTCHAs
* Background workers to pre-compute CAPTCHAs and to store them in a database
* Managing secrets for the CAPTCHAs (tokens, expected answers, etc)
* Safe re-impressions of CAPTCHA images (by creating unique tokens for every impression)
* Garbage collection of stale CAPTCHAs
* Sandboxed plugin architecture (TBD)
* An HTTP interface for serving CAPTCHAs
* Background workers to pre-compute CAPTCHAs and to store them in a database
* Managing secrets for the CAPTCHAs (tokens, expected answers, etc)
* Safe re-impressions of CAPTCHA images (by creating unique tokens for every impression)
* Garbage collection of stale CAPTCHAs
* Sandboxed plugin architecture (TBD)
Some sample CAPTCHA generators are included in the distribution (see below). We will continue adding more samples to the list. For quick
deployments the samples themselves might be sufficient. Projects with more resources might want create their own CAPTCHAs
@ -47,18 +47,25 @@ docker-compose up
Using `docker`:
```
docker run -v lcdata:/lc-core/data librecaptcha/lc-core:1.1.0-stable
docker run -p=8888:8888 -v ./lcdata:/lc-core/data librecaptcha/lc-core:2.0
```
A default `config.json` is automatically created in the mounted volume.
The above commands should work with `podman` as well, if docker.io registry is pre-configured. Otherwise,
you can manually specify the repository like so:
```
podman run -p=8888:8888 -v ./lcdata:/lc-core/data docker.io/librecaptcha/lc-core:2.0
```
## Quick test
Open [localhost:8888/demo/index.html](http://localhost:8888/demo/index.html) in browser.
Alternatively, on the command line, try:
```
> $ curl -d '{"media":"image/png","level":"easy","input_type":"text"}' localhost:8888/v1/captcha
> $ curl -d '{"media":"image/png","level":"easy","input_type":"text","size":"350x100"}' localhost:8888/v2/captcha
{"id":"3bf928ce-a1e7-4616-b34f-8252d777855d"}
> $ curl "localhost:8888/v1/media?id=3bf928ce-a1e7-4616-b34f-8252d777855d" -o sample.png
@ -124,48 +131,48 @@ If a sufficient number of users agree on their answer to the unknown word, it is
The service can be accessed using a simple HTTP API.
### - `/v1/captcha`: `POST`
- Parameters:
- Parameters:
- `level`: `String` -
The difficulty level of a captcha
- easy
- medium
- hard
- easy
- medium
- hard
- `input_type`: `String` -
The type of input option for a captcha
- text
- (More to come)
- text
- (More to come)
- `media`: `String` -
The type of media of a captcha
- image/png
- image/gif
- (More to come)
- image/png
- image/gif
- (More to come)
- `size`: String -
The dimensions of a captcha. It needs to be a string in the format `"widthxheight"` in pixels, and will be matched
with the `allowedSizes` config setting. Example: `size: "450x200"` which requests an image of width 450 and height
200 pixels.
- Returns:
- Returns:
- `id`: `String` - The uuid of the captcha generated
### - `/v1/media`: `GET`
- Parameters:
- Parameters:
- `id`: `String` - The uuid of the captcha
- Returns:
- Returns:
- `image`: `Array[Byte]` - The requested media as bytes
### - `/v1/answer`: `POST`
- Parameter:
- Parameter:
- `id`: `String` - The uuid of the captcha that needs to be solved
- `answer`: `String` - The answer to the captcha that needs to be validated
- Returns:
- Returns:
- `result`: `String` - The result after validation/checking of the answer
- True - If the answer is correct
- False - If the answer is incorrect
- Expired - If the time limit to solve the captcha exceeds
- True - If the answer is correct
- False - If the answer is incorrect
- Expired - If the time limit to solve the captcha exceeds
## Example usage
@ -173,9 +180,9 @@ The service can be accessed using a simple HTTP API.
In javascript:
```js
const resp = await fetch("/v1/captcha", {
method: 'POST',
body: JSON.stringify({level: "easy", media: "image/png", "input_type" : "text"})
const resp = await fetch("/v2/captcha", {
method: 'POST',
body: JSON.stringify({level: "easy", media: "image/png", "input_type" : "text", size: "350x100"})
})
const respJson = await resp.json();
@ -183,19 +190,19 @@ const respJson = await resp.json();
let captchaId = null;
if (resp.ok) {
// The CAPTCHA can be displayed using the data in respJson.
console.log(respJson);
// Store the id somewhere so that it can be used later for answer verification
captchaId = respJson.id;
// The CAPTCHA can be displayed using the data in respJson.
console.log(respJson);
// Store the id somewhere so that it can be used later for answer verification
captchaId = respJson.id;
} else {
console.err(respJson);
console.err(respJson);
}
// When user submits an answer it can be sent to the server for verification thusly:
const resp = await fetch("/v1/answer", {
method: 'POST',
body: JSON.stringify({id: captchaId, answer: "user input"})
const resp = await fetch("/v2/answer", {
method: 'POST',
body: JSON.stringify({id: captchaId, answer: "user input"})
});
const respJson = await resp.json();
console.log(respJson.result);

View File

@ -1,12 +1,12 @@
FROM adoptopenjdk/openjdk16:alpine-jre AS base-core
FROM eclipse-temurin:17-jre-jammy AS base-core
ENV JAVA_HOME="/usr/lib/jvm/default-jvm/"
RUN apk add --update ttf-dejavu
RUN apt update && apt install -y fonts-dejavu
ENV PATH=$PATH:${JAVA_HOME}/bin
FROM base-core
RUN mkdir /lc-core
COPY target/scala-3.1.1/LibreCaptcha.jar /lc-core
COPY target/scala-3.6.2/LibreCaptcha.jar /lc-core
WORKDIR /lc-core
RUN mkdir data/

View File

@ -2,8 +2,8 @@ lazy val root = (project in file(".")).settings(
inThisBuild(
List(
organization := "com.example",
scalaVersion := "3.1.1",
version := "0.1.0-SNAPSHOT",
scalaVersion := "3.6.2",
version := "0.2.1-snapshot",
semanticdbEnabled := true,
semanticdbVersion := scalafixSemanticdb.revision
@ -12,9 +12,9 @@ lazy val root = (project in file(".")).settings(
)
),
name := "LibreCaptcha",
libraryDependencies += "com.sksamuel.scrimage" % "scrimage-core" % "4.0.31",
libraryDependencies += "com.sksamuel.scrimage" % "scrimage-filters" % "4.0.31",
libraryDependencies += "org.json4s" %% "json4s-jackson" % "4.0.4"
libraryDependencies += "com.sksamuel.scrimage" % "scrimage-core" % "4.3.0",
libraryDependencies += "com.sksamuel.scrimage" % "scrimage-filters" % "4.3.0",
libraryDependencies += "org.json4s" %% "json4s-jackson" % "4.0.7"
)
Compile / unmanagedResourceDirectories += { baseDirectory.value / "lib" }

View File

@ -1 +1 @@
sbt.version=1.6.2
sbt.version=1.10.6

View File

@ -1,4 +1,4 @@
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")

View File

@ -5,12 +5,12 @@ import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FilenameFilter;
import java.util.Map;
import java.util.List;
import java.util.Map;
import lc.captchas.interfaces.Challenge;
import lc.captchas.interfaces.ChallengeProvider;
import lc.misc.PngImageWriter;
import lc.misc.HelperFunctions;
import lc.misc.PngImageWriter;
public class FontFunCaptcha implements ChallengeProvider {
@ -58,7 +58,8 @@ public class FontFunCaptcha implements ChallengeProvider {
return null;
}
private byte[] fontFun(final int width, final int height, String captchaText, String level, String path) {
private byte[] fontFun(
final int width, final int height, String captchaText, String level, String path) {
String[] colors = {"#f68787", "#f8a978", "#f1eb9a", "#a4f6a5"};
BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
Graphics2D graphics2D = img.createGraphics();
@ -87,7 +88,8 @@ public class FontFunCaptcha implements ChallengeProvider {
final int width = size2D[0];
final int height = size2D[1];
String path = "./lib/fonts/";
return new Challenge(fontFun(width, height, secret, "medium", path), "image/png", secret.toLowerCase());
return new Challenge(
fontFun(width, height, secret, "medium", path), "image/png", secret.toLowerCase());
}
public boolean checkAnswer(String secret, String answer) {

View File

@ -1,26 +1,26 @@
package lc.captchas;
import java.awt.Font;
import java.awt.RenderingHints;
import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.stream.IntStream;
import java.util.List;
import javax.imageio.stream.MemoryCacheImageOutputStream;
import java.io.ByteArrayOutputStream;
import lc.captchas.interfaces.Challenge;
import lc.captchas.interfaces.ChallengeProvider;
import lc.misc.HelperFunctions;
import lc.misc.GifSequenceWriter;
import lc.misc.HelperFunctions;
public class PoppingCharactersCaptcha implements ChallengeProvider {
private int[] computeOffsets(final Font font, final int width, final int height, final String text) {
private int[] computeOffsets(
final Font font, final int width, final int height, final String text) {
final var img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
final var graphics2D = img.createGraphics();
final var frc = graphics2D.getFontRenderContext();
@ -32,17 +32,20 @@ public class PoppingCharactersCaptcha implements ChallengeProvider {
advances[i] = currX;
currX += font.getStringBounds(String.valueOf(c), frc).getWidth();
currX += spacing;
};
}
;
advances[text.length()] = currX;
graphics2D.dispose();
return advances;
}
private BufferedImage makeImage(final Font font, final int width, final int height, final Consumer<Graphics2D> f) {
private BufferedImage makeImage(
final Font font, final int width, final int height, final Consumer<Graphics2D> f) {
final var img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
final var graphics2D = img.createGraphics();
graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
graphics2D.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
graphics2D.setRenderingHint(
RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
graphics2D.setFont(font);
f.accept(graphics2D);
graphics2D.dispose();
@ -64,24 +67,38 @@ public class PoppingCharactersCaptcha implements ChallengeProvider {
final var expectedWidth = advances[advances.length - 1];
final var scale = width / (float) expectedWidth;
final var prevColor = Color.getHSBColor(0f, 0f, 0.1f);
IntStream.range(0, text.length()).forEach(i -> {
final var color = Color.getHSBColor(HelperFunctions.randomNumber(0, 100)/100.0f, 0.6f, 1.0f);
final var nextImage = makeImage(font, width, height, (g) -> {
g.scale(scale, 1);
if (i > 0) {
final var prevI = (i - 1) % text.length();
g.setColor(prevColor);
g.drawString(String.valueOf(text.charAt(prevI)), advances[prevI] + jitter(), fontHeight*1.1f + jitter());
}
g.setColor(color);
g.drawString(String.valueOf(text.charAt(i)), advances[i] + jitter(), fontHeight*1.1f + jitter());
});
try {
writer.writeToSequence(nextImage);
} catch (final IOException e) {
e.printStackTrace();
}
});
IntStream.range(0, text.length())
.forEach(
i -> {
final var color =
Color.getHSBColor(HelperFunctions.randomNumber(0, 100) / 100.0f, 0.6f, 1.0f);
final var nextImage =
makeImage(
font,
width,
height,
(g) -> {
g.scale(scale, 1);
if (i > 0) {
final var prevI = (i - 1) % text.length();
g.setColor(prevColor);
g.drawString(
String.valueOf(text.charAt(prevI)),
advances[prevI] + jitter(),
fontHeight * 1.1f + jitter());
}
g.setColor(color);
g.drawString(
String.valueOf(text.charAt(i)),
advances[i] + jitter(),
fontHeight * 1.1f + jitter());
});
try {
writer.writeToSequence(nextImage);
} catch (final IOException e) {
e.printStackTrace();
}
});
writer.close();
output.close();
return byteArrayOutputStream.toByteArray();

View File

@ -1,20 +1,18 @@
package lc.captchas;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import java.awt.image.ConvolveOp;
import java.awt.image.Kernel;
import java.io.ByteArrayOutputStream;
import java.util.Map;
import java.util.List;
import lc.misc.HelperFunctions;
import lc.misc.PngImageWriter;
import java.util.Map;
import lc.captchas.interfaces.Challenge;
import lc.captchas.interfaces.ChallengeProvider;
import lc.misc.HelperFunctions;
import lc.misc.PngImageWriter;
public class ShadowTextCaptcha implements ChallengeProvider {
@ -56,20 +54,24 @@ public class ShadowTextCaptcha implements ChallengeProvider {
graphics2D.setPaint(Color.BLACK);
graphics2D.setFont(font);
final var stringWidth = graphics2D.getFontMetrics().stringWidth(text);
final var padding = (stringWidth > width) ? 0 : (width - stringWidth)/2;
final var scaleX = (stringWidth > width) ? width/((double) stringWidth) : 1d;
final var padding = (stringWidth > width) ? 0 : (width - stringWidth) / 2;
final var scaleX = (stringWidth > width) ? width / ((double) stringWidth) : 1d;
graphics2D.scale(scaleX, 1d);
graphics2D.drawString(text, padding, fontHeight*1.1f);
graphics2D.drawString(text, padding, fontHeight * 1.1f);
graphics2D.dispose();
final int kernelSize = (int) Math.ceil((Math.min(width, height) / 50.0));
ConvolveOp op = new ConvolveOp(new Kernel(kernelSize, kernelSize, makeKernel(kernelSize)), ConvolveOp.EDGE_NO_OP, null);
ConvolveOp op =
new ConvolveOp(
new Kernel(kernelSize, kernelSize, makeKernel(kernelSize)),
ConvolveOp.EDGE_NO_OP,
null);
BufferedImage img2 = op.filter(img, null);
Graphics2D g2d = img2.createGraphics();
HelperFunctions.setRenderingHints(g2d);
g2d.setPaint(Color.WHITE);
g2d.scale(scaleX, 1d);
g2d.setFont(font);
g2d.drawString(text, padding-kernelSize, fontHeight*1.1f);
g2d.drawString(text, padding - kernelSize, fontHeight * 1.1f);
g2d.dispose();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {

View File

@ -1,7 +1,7 @@
package lc.captchas.interfaces;
import java.util.Map;
import java.util.List;
import java.util.Map;
public interface ChallengeProvider {
public String getId();

View File

@ -3,12 +3,12 @@
package lc.misc;
import javax.imageio.*;
import javax.imageio.metadata.*;
import javax.imageio.stream.*;
import java.awt.image.*;
import java.io.*;
import java.util.Iterator;
import javax.imageio.*;
import javax.imageio.metadata.*;
import javax.imageio.stream.*;
public class GifSequenceWriter {
protected ImageWriter gifWriter;

View File

@ -1,9 +1,9 @@
package lc.misc;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Iterator;
import javax.imageio.IIOImage;
import javax.imageio.ImageIO;
import javax.imageio.ImageTypeSpecifier;
@ -13,7 +13,6 @@ import javax.imageio.metadata.IIOInvalidTreeException;
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.metadata.IIOMetadataNode;
import javax.imageio.stream.ImageOutputStream;
import java.awt.image.BufferedImage;
public class PngImageWriter {
@ -26,7 +25,8 @@ public class PngImageWriter {
iw.hasNext(); ) {
ImageWriter writer = iw.next();
ImageWriteParam writeParam = writer.getDefaultWriteParam();
ImageTypeSpecifier typeSpecifier = ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB);
ImageTypeSpecifier typeSpecifier =
ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB);
IIOMetadata metadata = writer.getDefaultImageMetadata(typeSpecifier, writeParam);
if (metadata.isReadOnly() || !metadata.isStandardMetadataFormatSupported()) {
continue;

View File

@ -3,21 +3,21 @@
package org.limium.picoserve;
import java.net.InetSocketAddress;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpServer;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.LinkedList;
import java.util.concurrent.Executor;
import java.util.regex.Pattern;
import java.util.Arrays;
import java.util.Optional;
import java.util.stream.Collectors;
import java.net.InetSocketAddress;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import com.sun.net.httpserver.HttpServer;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpExchange;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.Executor;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
public final class Server {
private final HttpServer server;

View File

@ -46,7 +46,7 @@ class BackgroundTask(config: Config, captchaManager: CaptchaManager) {
(captcha.allowedLevels).flatMap { level =>
(captcha.allowedMedia).flatMap { media =>
(captcha.allowedInputType).flatMap { inputType =>
(captcha.allowedSizes).map {size =>
(captcha.allowedSizes).map { size =>
Parameters(level, media, inputType, size)
}
}

View File

@ -43,16 +43,16 @@ class FilterChallenge extends ChallengeProvider {
val height = size2D(1)
val canvas = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB)
val g = canvas.createGraphics()
val fontHeight = (height*0.6).toInt
val fontHeight = (height * 0.6).toInt
g.setColor(Color.WHITE)
g.fillRect(0, 0, canvas.getWidth, canvas.getHeight)
g.setColor(Color.BLACK)
val font = new Font("Serif", Font.BOLD, fontHeight)
g.setFont(font)
val stringWidth = g.getFontMetrics().stringWidth(secret)
val scaleX = if (stringWidth > width) width/(stringWidth.toDouble) else 1d
val scaleX = if (stringWidth > width) width / (stringWidth.toDouble) else 1d
val margin = if (stringWidth > width) 0 else (width - stringWidth)
val xOffset = (margin*r.nextDouble).toInt
val xOffset = (margin * r.nextDouble).toInt
g.scale(scaleX, 1d)
g.drawString(secret, xOffset, fontHeight)
g.dispose()

View File

@ -128,13 +128,13 @@ class RainDropsCP extends ChallengeProvider {
val textX = if (textWidth > width) 0 else ((width - textWidth) / 2)
// this will be overlapped by the following text to show the top outline because of the offset
val yOffset = (fontHeight*0.01).ceil.toInt
val yOffset = (fontHeight * 0.01).ceil.toInt
g.setColor(textHighlightColor)
g.drawString(secret, textX, (fontHeight*1.1).toInt - yOffset)
g.drawString(secret, textX, (fontHeight * 1.1).toInt - yOffset)
// paint the text
g.setColor(textColor)
g.drawString(secret, textX, (fontHeight*1.1).toInt)
g.drawString(secret, textX, (fontHeight * 1.1).toInt)
g.dispose()
writer.writeToSequence(canvas)

View File

@ -36,7 +36,7 @@ case class ConfigField(
lazy val captchaExpiryTimeLimitInt: Option[Int] = mapInt(captchaExpiryTimeLimit)
lazy val threadDelayInt: Option[Int] = mapInt(threadDelay)
lazy val maxAttemptsRatioFloat: Option[Float] = mapFloat(maxAttemptsRatio)
lazy val playgroundEnabledBool: Option[Boolean] = playgroundEnabled.map(_ || true)
lazy val playgroundEnabledBool: Option[Boolean] = playgroundEnabled.map(_ || false)
private def mapInt(x: Option[Integer]): Option[Int] = {
x.map(_ + 0)

View File

@ -82,6 +82,7 @@ class Server(
new StringResponse(200, str)
}
)
println("Playground enabled on /demo/index.html")
}
val server: picoserve.Server = serverBuilder.build()

View File

@ -4,7 +4,7 @@ python3 -m venv testEnv
source ./testEnv/bin/activate
pip install locust
mkdir -p data/
java -jar target/scala-3.1.1/LibreCaptcha.jar &
java -jar target/scala-3.6.2/LibreCaptcha.jar &
JAVA_PID=$!
sleep 4
@ -22,7 +22,7 @@ echo Run functional test
cp data/config.json data/config.json.bak
cp tests/debug-config.json data/config.json
java -jar target/scala-3.1.1/LibreCaptcha.jar &
java -jar target/scala-3.6.2/LibreCaptcha.jar &
JAVA_PID=$!
sleep 4