Author: solomax
Date: Thu Feb 23 11:11:03 2017
New Revision: 1784109
URL: http://svn.apache.org/viewvc?rev=1784109&view=rev
Log:
[OPENMEETINGS-1574] client rights are checked for external video, code clean-up
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java?rev=1784109&r1=1784108&r2=1784109&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
Thu Feb 23 11:11:03 2017
@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHa
public class WhiteboardObjectList {
private Long roomId;
- private Map<Long, WhiteboardObject> whiteboardObjects = new
ConcurrentHashMap<Long, WhiteboardObject>();
+ private Map<Long, WhiteboardObject> whiteboardObjects = new
ConcurrentHashMap<>();
public WhiteboardObjectList() {}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx?rev=1784109&r1=1784108&r2=1784109&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx
Thu Feb 23 11:11:03 2017
@@ -25,7 +25,6 @@
The order of views is important in this class
otherwise the scrollbar of the swfPresentation would be not visible or
partly overlayed
-
this is the selection Box for all Whiteboard Objects
-->
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1784109&r1=1784108&r2=1784109&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Thu Feb 23 11:11:03 2017
@@ -255,6 +255,10 @@ public class Application extends Authent
if (client == null) {
if (!Strings.isEmpty(rcl.getSecurityCode())) {
client =
getOnlineClient(rcl.getSecurityCode());
+ if (client != null &&
!client.hasRight(Right.audio) && !client.hasRight(Right.video)) {
+ client = null;
+ log.warn("Parent client has no
AV rights, going reject client");
+ }
} else if (rcl.isMobile()) {
//Mobile client enters the room
client = new Client(rcl,
getBean(UserDao.class));
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html?rev=1784109&r1=1784108&r2=1784109&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
Thu Feb 23 11:11:03 2017
@@ -26,3 +26,4 @@
</div>
</wicket:panel>
</html>
+
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java?rev=1784109&r1=1784108&r2=1784109&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
Thu Feb 23 11:11:03 2017
@@ -33,6 +33,10 @@ public class ExtendedClientProperties ex
return codebase;
}
+ public void setSettings(JSONObject s) {
+ settings = s.toString();
+ }
+
public JSONObject getSettings() {
try {
return new JSONObject(settings.toString());
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java?rev=1784109&r1=1784108&r2=1784109&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/WhiteboardObjectList.java
Thu Feb 23 11:11:03 2017
@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHa
public class WhiteboardObjectList {
private Long roomId;
- private Map<Long, WhiteboardObject> whiteboardObjects = new
ConcurrentHashMap<Long, WhiteboardObject>();
+ private Map<Long, WhiteboardObject> whiteboardObjects = new
ConcurrentHashMap<>();
public WhiteboardObjectList() {}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1784109&r1=1784108&r2=1784109&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Thu Feb 23 11:11:03 2017
@@ -255,6 +255,10 @@ public class Application extends Authent
if (client == null) {
if (!Strings.isEmpty(rcl.getSecurityCode())) {
client =
getOnlineClient(rcl.getSecurityCode());
+ if (client != null &&
!client.hasRight(Right.audio) && !client.hasRight(Right.video)) {
+ client = null;
+ log.warn("Parent client has no
AV rights, going reject client");
+ }
} else if (rcl.isMobile()) {
//Mobile client enters the room
client = new Client(rcl,
getBean(UserDao.class));
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html?rev=1784109&r1=1784108&r2=1784109&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html
Thu Feb 23 11:11:03 2017
@@ -26,3 +26,4 @@
</div>
</wicket:panel>
</html>
+
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java?rev=1784109&r1=1784108&r2=1784109&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
Thu Feb 23 11:11:03 2017
@@ -33,6 +33,10 @@ public class ExtendedClientProperties ex
return codebase;
}
+ public void setSettings(JSONObject s) {
+ settings = s.toString();
+ }
+
public JSONObject getSettings() {
try {
return new JSONObject(settings.toString());
