[openmeetings] branch csp updated: [OPENMEETINGS-2165] minor CSP related changes

[solomax]

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

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


The following commit(s) were added to refs/heads/csp by this push:
     new d028c6d  [OPENMEETINGS-2165] minor CSP related changes
d028c6d is described below

commit d028c6dd023e375016bf6909e42c20f28997eba8
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Mon Feb 3 14:05:45 2020 +0700

    [OPENMEETINGS-2165] minor CSP related changes
---
 .../src/main/java/org/apache/openmeetings/web/app/Application.java  | 6 +++---
 openmeetings-web/src/main/webapp/css/raw-general.css                | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 70d9cfb..c2fe0c4 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -246,7 +246,7 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
                //chain of Resource Loaders, if not found it will search in 
Wicket's internal
                //Resource Loader for a the property key
                getResourceSettings().getStringResourceLoaders().add(0, new 
LabelResourceLoader());
-               final CSPHeaderConfiguration cspConfig = 
getcspConfig().strict();
+               final CSPHeaderConfiguration cspConfig = 
getCspConfig().strict();
                getRequestCycleListeners().add(new 
WebSocketAwareCsrfPreventionRequestCycleListener() {
                        @Override
                        public void onEndRequest(RequestCycle cycle) {
@@ -332,9 +332,9 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
                        Version.logOMStarted();
                        recordingDao.resetProcessingStatus(); //we are starting 
so all processing recordings are now errors
 
+                       getCsp().blocking().disabled(); //FIXME TODO due to 
`reporting-only enabled`
                        oauthDao.getActive().forEach(oauth -> {
                                if (!Strings.isEmpty(oauth.getIconUrl())) {
-                                       
getCsp().blocking().add(CSPDirective.IMG_SRC, oauth.getIconUrl()); //FIXME TODO
                                        cspConfig.add(CSPDirective.IMG_SRC, 
oauth.getIconUrl());
                                }
                        });
@@ -368,7 +368,7 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
                }
        }
 
-       public CSPHeaderConfiguration getcspConfig() {
+       public CSPHeaderConfiguration getCspConfig() {
                return getCsp().reporting();
        }
 
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css 
b/openmeetings-web/src/main/webapp/css/raw-general.css
index 9afef55..5122847 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -17,10 +17,6 @@ html, body {
 {
        height: 100%;
 }
-* {
-       box-sizing: content-box; /* IE */
-       box-sizing: initial; /*reset bootstrap box sizing*/
-}
 .signin .oauth-section {
        padding-bottom: 20px;
 }