svn commit: r1779126 - in /openmeetings/application: branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java

[solomax]

Author: solomax
Date: Tue Jan 17 02:58:38 2017
New Revision: 1779126

URL: http://svn.apache.org/viewvc?rev=1779126&view=rev
Log:
[OPENMEETINGS-1455] security hash is fixed

Modified:
    
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
    
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1779126&r1=1779125&r2=1779126&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
 Tue Jan 17 02:58:38 2017
@@ -306,7 +306,7 @@ public class WebSession extends Abstract
                userId = u.getId();
                if (rights == null || rights.isEmpty()) {
                        Set<Right> r = new HashSet<>(u.getRights());
-                       if (!AuthLevelUtil.hasAdminLevel(r)) {
+                       if (u.getGroupUsers() != null && 
!AuthLevelUtil.hasAdminLevel(r)) {
                                for (GroupUser gu : u.getGroupUsers()) {
                                        if (gu.isModerator()) {
                                                r.add(Right.GroupAdmin);

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1779126&r1=1779125&r2=1779126&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
 Tue Jan 17 02:58:38 2017
@@ -306,7 +306,7 @@ public class WebSession extends Abstract
                userId = u.getId();
                if (rights == null || rights.isEmpty()) {
                        Set<Right> r = new HashSet<>(u.getRights());
-                       if (!AuthLevelUtil.hasAdminLevel(r)) {
+                       if (u.getGroupUsers() != null && 
!AuthLevelUtil.hasAdminLevel(r)) {
                                for (GroupUser gu : u.getGroupUsers()) {
                                        if (gu.isModerator()) {
                                                r.add(Right.GroupAdmin);