Merge branch 'release/3.2.1'

Author: LEDfan

.gitignore

@@ -9,4 +9,3 @@
 .project
 .classpath
 .settings
-

.pre-commit-config.yaml

@@ -0,0 +1,40 @@
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v6.0.0
+  hooks:
+    - id: check-added-large-files
+      args: ['--maxkb=1024']
+    - id: check-merge-conflict
+    - id: check-vcs-permalinks
+    - id: forbid-new-submodules
+    - id: end-of-file-fixer
+    - id: trailing-whitespace
+      args: [--markdown-linebreak-ext=md]
+      exclude: CHANGELOG.md
+    - id: check-yaml
+      args: [--allow-multiple-documents]
+    - id: check-executables-have-shebangs
+    - id: check-symlinks
+    - id: destroyed-symlinks
+
+    # Cross platform
+    - id: check-case-conflict
+    - id: mixed-line-ending
+      args: [--fix=lf]
+
+    # Security
+    - id: detect-aws-credentials
+      args: ['--allow-missing-credentials']
+    - id: detect-private-key
+- repo: local
+  hooks:
+    - id: license-check
+      name: format license headers using maven
+      always_run: true
+      language: script
+      entry: /bin/sh -c "mvn validate license:format"
+      pass_filenames: false
+- repo: https://github.com/crate-ci/typos
+  rev: v1.35.8
+  hooks:
+    - id: typos

LICENSE

@@ -199,4 +199,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

kubernetesPod.yaml

@@ -4,6 +4,7 @@ metadata:
   labels:
     ci: shinyproxy-build
 spec:
+  hostUsers: false
   volumes:
     - name: docker-socket
       emptyDir: { }

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>eu.openanalytics</groupId>
     <artifactId>shinyproxy</artifactId>
-    <version>3.2.0</version>
+    <version>3.2.1</version>
     <packaging>jar</packaging>
     <inceptionYear>2016</inceptionYear>
 
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.5</version>
+        <version>3.4.11</version>
         <relativePath/>
     </parent>
 
@@ -31,15 +31,16 @@
         <maven.compiler.target>21</maven.compiler.target>
         <resource.delimiter>&amp;</resource.delimiter>
         <!-- Dependency versions -->
-        <containerproxy.version>1.2.0</containerproxy.version>
-        <spring-boot.version>3.4.5</spring-boot.version>
+        <containerproxy.version>1.2.1</containerproxy.version>
+        <spring-boot.version>3.4.11</spring-boot.version>
         <datatables.version>1.13.5</datatables.version>
         <datatables-buttons.version>2.4.1</datatables-buttons.version>
         <datatables-responsive.version>2.2.7</datatables-responsive.version>
         <handlebars.version>4.7.7</handlebars.version>
         <!-- Plugin versions -->
         <maven.license-plugin.version>4.6</maven.license-plugin.version>
         <maven.build-helper-maven.plugin.version>3.6.0</maven.build-helper-maven.plugin.version>
+        <maven.dependency-check-plugin.version>12.1.7</maven.dependency-check-plugin.version>
     </properties>
 
     <distributionManagement>
@@ -320,7 +321,7 @@
                     <plugin>
                         <groupId>org.owasp</groupId>
                         <artifactId>dependency-check-maven</artifactId>
-                        <version>9.0.9</version>
+                        <version>${maven.dependency-check-plugin.version}</version>
                         <configuration>
                             <suppressionFiles>
                                 <suppressionFile>owasp-suppression.xml</suppressionFile>

src/main/java/eu/openanalytics/shinyproxy/AppRequestInfo.java

@@ -29,7 +29,7 @@ public class AppRequestInfo {
 
     private static final Pattern APP_INSTANCE_PATTERN = Pattern.compile(".*?/(app_i|app_direct_i)/([^/]*)/([^/]*)(/?.*)");
     private static final Pattern APP_PATTERN = Pattern.compile(".*?/(app|app_direct)/([^/]*)(/?.*)");
-    private static final Pattern INSTANCE_NAME_PATTERN = Pattern.compile("^[a-zA-Z0-9_.-]*$");
+    public static final Pattern INSTANCE_NAME_PATTERN = Pattern.compile("^[a-zA-Z0-9_.-]*$");
 
     private final String appName;
     private final String appInstance;