[openmeetings] 02/02: [OPENMEETINGS-2724] default CSP style is improved

[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

commit 557ab17777af96973cccb1ea85feddc49e280d4c
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Wed Apr 20 23:01:21 2022 +0700

    [OPENMEETINGS-2724] default CSP style is improved
---
 .../java/org/apache/openmeetings/installation/ImportInitvalues.java     | 1 +
 .../main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
index 2a045bab0..4dea4de8c 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
@@ -403,6 +403,7 @@ public class ImportInitvalues {
                                + "United, Yeti", "6.1.0");
                return list;
        }
+
        public void loadConfiguration(InstallationConfig cfg) {
                for (Configuration c : initialCfgs(cfg)) {
                        cfgDao.update(c, null);
diff --git 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
index 69341f313..6f83e62c6 100644
--- 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
+++ 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
@@ -130,7 +130,7 @@ public class OpenmeetingsVariables {
        public static final String DEFAULT_BASE_URL = 
"https://localhost:5443/openmeetings/";;
        public static final String DEFAULT_SIP_CONTEXT = "rooms";
        public static final String DEFAULT_CSP_FONT = 
"https://fonts.gstatic.com";;
-       public static final String DEFAULT_CSP_STYLE = 
"https://fonts.googleapis.com/css2";;
+       public static final String DEFAULT_CSP_STYLE = SELF.getValue() + 
",https://fonts.googleapis.com/css2";;
        public static final String DEFAULT_CSP_DATA = SELF.getValue() + 
",data:";
 
        private static String cryptClassName = null;