[jira] [Commented] (OPENMEETINGS-2551) There should be way to limit NetTest client count
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2551?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17274541#comment-17274541 ] ASF subversion and git services commented on OPENMEETINGS-2551: --- Commit 060a3114ad759931aeb42cd9afa9d1ebb39d3075 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=060a311 ] [OPENMEETINGS-2551] more work on client count > There should be way to limit NetTest client count > - > > Key: OPENMEETINGS-2551 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2551 > Project: Openmeetings > Issue Type: Improvement > Components: Testing-Tool >Affects Versions: 5.1.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 6.0.0 > > > Currently there can be unlimited clients of Network testing tool > It should be possible to limit -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2551] more work on client count
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 060a311 [OPENMEETINGS-2551] more work on client count
060a311 is described below
commit 060a3114ad759931aeb42cd9afa9d1ebb39d3075
Author: Maxim Solodovnik
AuthorDate: Fri Jan 29 23:13:41 2021 +0700
[OPENMEETINGS-2551] more work on client count
---
.../openmeetings/web/pages/InternalErrorPage.java | 4 +-
.../openmeetings/webservice/NetTestWebService.java | 82 +++---
.../webservice/util/RateLimitRequestFilter.java| 8 +++
3 files changed, 50 insertions(+), 44 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InternalErrorPage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InternalErrorPage.java
index 939b5d1..55a4664 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InternalErrorPage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InternalErrorPage.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.web.pages;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.StatelessForm;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.IRequestParameters;
@@ -33,7 +33,7 @@ public class InternalErrorPage extends BaseInitedPage {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Form("form").add(
+ add(new StatelessForm("form").add(
new BootstrapButton("home", new
ResourceModel("124"), Buttons.Type.Outline_Primary) {
private static final long
serialVersionUID = 1L;
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
index 0af9d02..44f0b50 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
@@ -33,7 +33,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.Response.Status;
import org.apache.openmeetings.webservice.util.RateLimited;
@@ -57,10 +56,8 @@ public class NetTestWebService {
private static final int PING_PACKET_SIZE = 64;
private static final int JITTER_PACKET_SIZE = 1024;
private static final int MAX_UPLOAD_SIZE = 16 * 1024 * 1024;
- private AtomicInteger clientCount = new AtomicInteger();
-
- @Value("${nettest.max.clients}")
- private int maxClients = 100;
+ public static final AtomicInteger CLIENT_COUNT = new AtomicInteger();
+ public static int maxClients = 100;
@PostConstruct
private void report() {
@@ -78,10 +75,6 @@ public class NetTestWebService {
if (TestType.UNKNOWN == testType) {
return Response.status(Status.BAD_REQUEST).build();
}
- if (clientCount.intValue() > maxClients) {
- log.error("Download: Max client count reached");
- return
Response.status(Status.TOO_MANY_REQUESTS).build();
- }
// choose data to send
switch (testType) {
@@ -92,38 +85,42 @@ public class NetTestWebService {
size = JITTER_PACKET_SIZE;
break;
default:
- clientCount.incrementAndGet();
+ final int count =
CLIENT_COUNT.incrementAndGet();
+ log.info("... download: client count: {}",
count);
size = inSize;
break;
}
- ResponseBuilder response =
Response.ok().type(MediaType.APPLICATION_OCTET_STREAM).entity(new InputStream()
{
- int pos = 0;
-
- @Override
- public int read() throws IOException {
- pos++;
- return pos > size ? -1 :
ThreadLocalRandom.current().nextInt(0, 0xFF);
- }
-
- @Override
- public int available() throws IOException {
- return size - pos;
- }
-
-
[jira] [Commented] (OPENMEETINGS-2561) Captcha should be configurable
[
https://issues.apache.org/jira/browse/OPENMEETINGS-2561?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17274413#comment-17274413
]
ASF subversion and git services commented on OPENMEETINGS-2561:
---
Commit aebf69b54f8bfb9ea2c0d392aea7553b1095784a in openmeetings's branch
refs/heads/master from Ali Alhaidary
[ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=aebf69b ]
[OPENMEETINGS-2561] arabic localization
> Captcha should be configurable
> --
>
> Key: OPENMEETINGS-2561
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2561
> Project: Openmeetings
> Issue Type: New Feature
> Components: Security, UI
>Affects Versions: 5.1.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Major
> Fix For: 6.0.0
>
> Attachments: captchi.png, github_edit.png
>
>
> Currently captcha is {{'a'-'z'}} and non-configurable
> This should be improved:
> following attributes should be added to language.xml:
> # 'tip' - short text describing this captcha for ex. "Enter uppercase English
> letters"
> # 'rangeStart' - initial letter/code of possible captcha characters
> # 'rangeEnd' - final letter/code of possible captcha characters
> {{'tip'}} above should be displayed as placeholder
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2561] arabic localization
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 aebf69b [OPENMEETINGS-2561] arabic localization aebf69b is described below commit aebf69b54f8bfb9ea2c0d392aea7553b1095784a Author: Ali Alhaidary <75235623+ali-alhaid...@users.noreply.github.com> AuthorDate: Fri Jan 29 15:50:15 2021 +0300 [OPENMEETINGS-2561] arabic localization --- openmeetings-web/src/main/webapp/languages/languages.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmeetings-web/src/main/webapp/languages/languages.xml b/openmeetings-web/src/main/webapp/languages/languages.xml index b3704e6..aeeed0e 100644 --- a/openmeetings-web/src/main/webapp/languages/languages.xml +++ b/openmeetings-web/src/main/webapp/languages/languages.xml @@ -32,7 +32,7 @@ chinese simplified chinese traditional korean - arabic + عربي japanese indonesian hungarian
[jira] [Resolved] (OPENMEETINGS-2564) Video does not play on WB
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2564?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-2564. Fix Version/s: 6.0.0 Resolution: Fixed > Video does not play on WB > - > > Key: OPENMEETINGS-2564 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2564 > Project: Openmeetings > Issue Type: Bug > Components: Recordings, UI, WhiteBoard >Affects Versions: 5.1.0 >Reporter: Ali Alhaidary >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 6.0.0 > > > My steps are: > 1) enter the room as moderator in FF or MS, > 2) enter the same room as regular user in FF or MS, on another PC over the > internet. > 3) As moderator drop video to WB from 'My recordings'. > Result: regular user not can see the video on WB > 4) As moderator, I click play. > Result: regular user not can see the video on WB, however, if he hovers over > the WB, he can see only a frame (boarder) of the video, as if there is > 'something' there. (I could not capture it :() > BUT, if the moderator drops a video into the WB from 'Public recordings', all > works as expected, regardless of browser type or OS. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Updated] (OPENMEETINGS-2564) Video does not play on WB
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2564?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik updated OPENMEETINGS-2564: --- Affects Version/s: (was: 6.0.0) 5.1.0 > Video does not play on WB > - > > Key: OPENMEETINGS-2564 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2564 > Project: Openmeetings > Issue Type: Bug > Components: Recordings, UI, WhiteBoard >Affects Versions: 5.1.0 >Reporter: Ali Alhaidary >Assignee: Maxim Solodovnik >Priority: Major > > My steps are: > 1) enter the room as moderator in FF or MS, > 2) enter the same room as regular user in FF or MS, on another PC over the > internet. > 3) As moderator drop video to WB from 'My recordings'. > Result: regular user not can see the video on WB > 4) As moderator, I click play. > Result: regular user not can see the video on WB, however, if he hovers over > the WB, he can see only a frame (boarder) of the video, as if there is > 'something' there. (I could not capture it :() > BUT, if the moderator drops a video into the WB from 'Public recordings', all > works as expected, regardless of browser type or OS. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2564) Video does not play on WB
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2564?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17274409#comment-17274409 ] ASF subversion and git services commented on OPENMEETINGS-2564: --- Commit feff086dc0894e1f90627fdf01c6ef697831df73 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=feff086 ] [OPENMEETINGS-2564] personal recording being played on WB as expected > Video does not play on WB > - > > Key: OPENMEETINGS-2564 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2564 > Project: Openmeetings > Issue Type: Bug > Components: Recordings, UI, WhiteBoard >Affects Versions: 6.0.0 >Reporter: Ali Alhaidary >Assignee: Maxim Solodovnik >Priority: Major > > My steps are: > 1) enter the room as moderator in FF or MS, > 2) enter the same room as regular user in FF or MS, on another PC over the > internet. > 3) As moderator drop video to WB from 'My recordings'. > Result: regular user not can see the video on WB > 4) As moderator, I click play. > Result: regular user not can see the video on WB, however, if he hovers over > the WB, he can see only a frame (boarder) of the video, as if there is > 'something' there. (I could not capture it :() > BUT, if the moderator drops a video into the WB from 'Public recordings', all > works as expected, regardless of browser type or OS. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2564] personal recording being played on WB as expected
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 feff086 [OPENMEETINGS-2564] personal recording being played on WB as
expected
feff086 is described below
commit feff086dc0894e1f90627fdf01c6ef697831df73
Author: Maxim Solodovnik
AuthorDate: Fri Jan 29 19:46:27 2021 +0700
[OPENMEETINGS-2564] personal recording being played on WB as expected
---
.../web/room/RoomResourceReference.java| 22 ++---
.../web/room/wb/WbWebSocketHelper.java | 2 +-
.../user/record/RecordingResourceReference.java| 24 ---
.../web/util/FileItemResourceReference.java| 28 ++
4 files changed, 36 insertions(+), 40 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
index e59b390..98636ed 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.web.room;
-import static org.apache.openmeetings.db.dto.room.Whiteboard.ATTR_FILE_ID;
import static org.apache.openmeetings.db.dto.room.Whiteboard.ATTR_SLIDE;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PNG;
import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE;
@@ -27,27 +26,20 @@ import static
org.apache.openmeetings.util.OmFileHelper.getImagesDir;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import java.io.File;
-import java.util.Map.Entry;
import org.apache.openmeetings.db.dao.file.FileItemDao;
import org.apache.openmeetings.db.dao.user.GroupUserDao;
-import org.apache.openmeetings.db.dto.room.Whiteboard;
-import org.apache.openmeetings.db.dto.room.Whiteboards;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.web.app.ClientManager;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.app.WhiteboardManager;
import org.apache.openmeetings.web.util.FileItemResourceReference;
import org.apache.wicket.injection.Injector;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.string.StringValue;
-import org.apache.wicket.util.string.Strings;
-
-import com.github.openjson.JSONObject;
public class RoomResourceReference extends FileItemResourceReference
{
private static final long serialVersionUID = 1L;
@@ -57,8 +49,6 @@ public class RoomResourceReference extends
FileItemResourceReference {
@SpringBean
private FileItemDao fileDao;
@SpringBean
- private WhiteboardManager wbManager;
- @SpringBean
private GroupUserDao groupUserDao;
public RoomResourceReference() {
@@ -114,16 +104,8 @@ public class RoomResourceReference extends
FileItemResourceReference {
}
String ruid = params.get("ruid").toString();
String wuid = params.get("wuid").toString();
- if (c.getRoom() != null) {
- Whiteboards wbs = wbManager.get(c.getRoom().getId());
- if (!Strings.isEmpty(wuid) && !Strings.isEmpty(ruid) &&
ruid.equals(wbs.getUid())) {
- for (Entry e :
wbs.getWhiteboards().entrySet()) {
- JSONObject file =
e.getValue().get(wuid);
- if (file != null &&
f.getId().equals(file.optLong(ATTR_FILE_ID))) {
- return f; // item IS on WB
- }
- }
- }
+ if (isAtWb(c, ruid, wuid, f.getId())) {
+ return f; // item IS on WB
}
if (f.getGroupId() != null &&
groupUserDao.isUserInGroup(f.getGroupId(), getUserId())) {
return f;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
index 43225b3..d3ca670 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
@@ -143,7 +143,7 @@ p
