From f6a31e6ed0b7eb430fc866bcfa080dccb2a140b0 Mon Sep 17 00:00:00 2001 From: anthonyp-cns <75483753+anthonyp-cns@users.noreply.github.com> Date: Wed, 19 Jun 2024 01:14:52 -0400 Subject: [PATCH 01/78] Update README.md adjusting system to security as shown later in the readme for consistency (#1488) Update README.md Updated readme changing system to security tag to make enabling logins easy to find / implement for new users via docker environment variable --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fe65de6c..3e4aaa3b 100644 --- a/README.md +++ b/README.md @@ -219,11 +219,11 @@ Environment variables are also supported and would override the settings file For example in the settings.yml you have ```yaml -system: +security: enableLogin: 'true' ``` -To have this via an environment variable you would have ``SYSTEM_ENABLELOGIN`` +To have this via an environment variable you would have ``SECURITY_ENABLELOGIN`` The Current list of settings is From 34e198d8e6b845ff2305bdac9333f566ab3136b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:24:09 +0100 Subject: [PATCH 02/78] Bump com.twelvemonkeys.imageio:imageio-jpeg from 3.10.1 to 3.11.0 (#1486) Bumps com.twelvemonkeys.imageio:imageio-jpeg from 3.10.1 to 3.11.0. --- updated-dependencies: - dependency-name: com.twelvemonkeys.imageio:imageio-jpeg dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8f97854a..a8e8f28c 100644 --- a/build.gradle +++ b/build.gradle @@ -133,7 +133,7 @@ dependencies { // implementation "com.twelvemonkeys.imageio:imageio-hdr:3.10.1" // implementation "com.twelvemonkeys.imageio:imageio-icns:3.10.1" // implementation "com.twelvemonkeys.imageio:imageio-iff:3.10.1" - implementation "com.twelvemonkeys.imageio:imageio-jpeg:3.10.1" + implementation "com.twelvemonkeys.imageio:imageio-jpeg:3.11.0" // implementation "com.twelvemonkeys.imageio:imageio-pcx:3.10.1" // implementation "com.twelvemonkeys.imageio:imageio-pict:3.10.1" // implementation "com.twelvemonkeys.imageio:imageio-pnm:3.10.1" From c7d18939fc0bd25c3571601d7ce7619cf803b356 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:25:09 +0100 Subject: [PATCH 03/78] Bump org.springframework:spring-webmvc from 6.1.5 to 6.1.9 (#1462) Bumps [org.springframework:spring-webmvc](https://github.com/spring-projects/spring-framework) from 6.1.5 to 6.1.9. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.1.5...v6.1.9) --- updated-dependencies: - dependency-name: org.springframework:spring-webmvc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a8e8f28c..1c04334b 100644 --- a/build.gradle +++ b/build.gradle @@ -97,7 +97,7 @@ dependencies { //security updates implementation "ch.qos.logback:logback-classic:1.5.6" implementation "ch.qos.logback:logback-core:1.5.6" - implementation "org.springframework:spring-webmvc:6.1.8" + implementation "org.springframework:spring-webmvc:6.1.9" implementation("io.github.pixee:java-security-toolkit:1.1.3") From e766a5f583b3d480027808c1ca9d41bcc9deac8a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:37:43 +0100 Subject: [PATCH 04/78] Update 3rd Party Licenses (#1490) Signed-off-by: GitHub Action Co-authored-by: GitHub Action --- .../resources/static/3rdPartyLicenses.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/resources/static/3rdPartyLicenses.json b/src/main/resources/static/3rdPartyLicenses.json index 4290126c..2d4fe8ef 100644 --- a/src/main/resources/static/3rdPartyLicenses.json +++ b/src/main/resources/static/3rdPartyLicenses.json @@ -176,19 +176,19 @@ }, { "moduleName": "com.twelvemonkeys.common:common-image", - "moduleVersion": "3.10.1", + "moduleVersion": "3.11.0", "moduleLicense": "The BSD License", "moduleLicenseUrl": "https://github.com/haraldk/TwelveMonkeys#license" }, { "moduleName": "com.twelvemonkeys.common:common-io", - "moduleVersion": "3.10.1", + "moduleVersion": "3.11.0", "moduleLicense": "The BSD License", "moduleLicenseUrl": "https://github.com/haraldk/TwelveMonkeys#license" }, { "moduleName": "com.twelvemonkeys.common:common-lang", - "moduleVersion": "3.10.1", + "moduleVersion": "3.11.0", "moduleLicense": "The BSD License", "moduleLicenseUrl": "https://github.com/haraldk/TwelveMonkeys#license" }, @@ -206,19 +206,19 @@ }, { "moduleName": "com.twelvemonkeys.imageio:imageio-core", - "moduleVersion": "3.10.1", + "moduleVersion": "3.11.0", "moduleLicense": "The BSD License", "moduleLicenseUrl": "https://github.com/haraldk/TwelveMonkeys#license" }, { "moduleName": "com.twelvemonkeys.imageio:imageio-jpeg", - "moduleVersion": "3.10.1", + "moduleVersion": "3.11.0", "moduleLicense": "The BSD License", "moduleLicenseUrl": "https://github.com/haraldk/TwelveMonkeys#license" }, { "moduleName": "com.twelvemonkeys.imageio:imageio-metadata", - "moduleVersion": "3.10.1", + "moduleVersion": "3.11.0", "moduleLicense": "The BSD License", "moduleLicenseUrl": "https://github.com/haraldk/TwelveMonkeys#license" }, @@ -313,21 +313,21 @@ { "moduleName": "io.swagger.core.v3:swagger-annotations-jakarta", "moduleUrl": "https://github.com/swagger-api/swagger-core/modules/swagger-annotations", - "moduleVersion": "2.2.21", + "moduleVersion": "2.2.15", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "io.swagger.core.v3:swagger-core-jakarta", "moduleUrl": "https://github.com/swagger-api/swagger-core/modules/swagger-core", - "moduleVersion": "2.2.21", + "moduleVersion": "2.2.15", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, { "moduleName": "io.swagger.core.v3:swagger-models-jakarta", "moduleUrl": "https://github.com/swagger-api/swagger-core/modules/swagger-models", - "moduleVersion": "2.2.21", + "moduleVersion": "2.2.15", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, @@ -859,19 +859,19 @@ }, { "moduleName": "org.springdoc:springdoc-openapi-starter-common", - "moduleVersion": "2.5.0", + "moduleVersion": "2.2.0", "moduleLicense": "The Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" }, { "moduleName": "org.springdoc:springdoc-openapi-starter-webmvc-api", - "moduleVersion": "2.5.0", + "moduleVersion": "2.2.0", "moduleLicense": "The Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" }, { "moduleName": "org.springdoc:springdoc-openapi-starter-webmvc-ui", - "moduleVersion": "2.5.0", + "moduleVersion": "2.2.0", "moduleLicense": "The Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" }, @@ -1137,7 +1137,7 @@ { "moduleName": "org.springframework:spring-webmvc", "moduleUrl": "https://github.com/spring-projects/spring-framework", - "moduleVersion": "6.1.8", + "moduleVersion": "6.1.9", "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, @@ -1175,7 +1175,7 @@ { "moduleName": "org.webjars:swagger-ui", "moduleUrl": "http://webjars.org", - "moduleVersion": "5.13.0", + "moduleVersion": "5.2.0", "moduleLicense": "Apache 2.0", "moduleLicenseUrl": "https://github.com/swagger-api/swagger-ui" }, From 202b996c2b7e339cf233fdfd256368b6b600c0a4 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Wed, 19 Jun 2024 21:05:56 +0100 Subject: [PATCH 05/78] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3e4aaa3b..4d2c69a9 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,8 @@ All files and PDFs exist either exclusively on the client side, reside in server - Get all information on a PDF to view or export as JSON. For a overview of the tasks and the technology each uses please view [Endpoint-groups.md](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/Endpoint-groups.md) -Demo of the app is available [here](https://stirlingpdf.io). username: demo, password: demo + +Demo of the app is available [here](https://stirlingpdf.io). ## Technologies used From c8a2789caf815fff971c49f62532371c99094027 Mon Sep 17 00:00:00 2001 From: ProvaTeams <142001287+ProvaTeams@users.noreply.github.com> Date: Thu, 20 Jun 2024 21:39:59 +0200 Subject: [PATCH 06/78] Missing description for Split function in top bar (#1492) --- src/main/resources/templates/fragments/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index e53861aa..39bd8051 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -274,7 +274,7 @@