[openmeetings] branch master updated: [OPENMEETINGS-2765] paths are being validated

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 8e65a1344 [OPENMEETINGS-2765] paths are being validated
8e65a1344 is described below

commit 8e65a1344157b2898f2922d49a0bd2105687c4a5
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Thu Mar 30 16:42:01 2023 +0700

    [OPENMEETINGS-2765] paths are being validated
---
 .../java/org/apache/openmeetings/db/entity/basic/Configuration.java  | 1 +
 .../src/main/java/org/apache/openmeetings/backup/BackupImport.java   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
index f1a79b1ae..6b94bb824 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
@@ -70,6 +70,7 @@ public class Configuration extends HistoricalEntity {
                , NUMBER
                , BOOL
                , HOTKEY
+               , PATH
        }
        @Id
        @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index ec9e84dbf..6ec134772 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -314,6 +314,11 @@ public class BackupImport {
                        , entry(CONFIG_MIC_NOISE, Configuration.Type.BOOL)
                        , entry(CONFIG_EXT_PROCESS_TTL, 
Configuration.Type.NUMBER)
                        , entry(CONFIG_RECORDING_ENABLED, 
Configuration.Type.BOOL)
+                       // ConfigForm.PATHS should also be updated
+                       , entry(CONFIG_PATH_FFMPEG, Configuration.Type.PATH)
+                       , entry(CONFIG_PATH_IMAGEMAGIC, Configuration.Type.PATH)
+                       , entry(CONFIG_PATH_OFFICE, Configuration.Type.PATH)
+                       , entry(CONFIG_PATH_SOX, Configuration.Type.PATH)
                        );
        private static final Pattern UUID_PATTERN = 
Pattern.compile("^[\\da-f]{8}(?:-[\\da-f]{4}){3}-[\\da-f]{12}$");