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 54f1386 [OPENMEETINGS-1671] correct rights for file server are set
54f1386 is described below
commit 54f13869850268c5459a516fcf52adacfa0028f8
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Mon Aug 13 23:00:55 2018 +0700
[OPENMEETINGS-1671] correct rights for file server are set
---
.../apache/openmeetings/installation/ImportInitvalues.java | 6 +++++-
.../java/org/apache/openmeetings/AbstractJUnitDefaults.java | 12 ++++++++++--
.../openmeetings/webservice/AbstractWebServiceTest.java | 4 ++--
.../org/apache/openmeetings/webservice/FileWebService.java | 4 ++--
4 files changed, 19 insertions(+), 7 deletions(-)
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 2200477..345ecb5 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
@@ -104,6 +104,7 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.getExtProcessTt
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.function.Consumer;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.label.LabelDao;
@@ -451,11 +452,14 @@ public class ImportInitvalues {
}
}
- public User createSystemUser(User u, String group, String login, String
pass, boolean groupAdmin) throws Exception {
+ public User createSystemUser(User u, String group, String login, String
pass, boolean groupAdmin, Consumer<User> postprocess) throws Exception {
GroupUser gu = new GroupUser(groupDao.get(group), u);
gu.setModerator(groupAdmin);
u.getGroupUsers().add(gu);
u.setLogin(login);
+ if (postprocess != null) {
+ postprocess.accept(u);
+ }
return userDao.update(u, pass, null);
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
index 762eb38..fc47a04 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
@@ -51,6 +51,7 @@ public abstract class AbstractJUnitDefaults extends
AbstractSpringTest {
public static final int ONE_HOUR = 60 * 60 * 1000;
public static final String adminUsername = "admin";
public static final String regularUsername = "user";
+ public static final String soapUsername = "soap";
protected static final String groupAdminUsername = "groupAdmin";
public static final String userpass = "Q!w2e3r4t5";
public static final String group = "smoketest";
@@ -213,10 +214,17 @@ public abstract class AbstractJUnitDefaults extends
AbstractSpringTest {
cfg.setTimeZone(timeZone);
importInitvalues.loadAll(cfg, false);
// regular user
-
importInitvalues.createSystemUser(getUser(UUID.randomUUID().toString()), group,
regularUsername, userpass, false);
+
importInitvalues.createSystemUser(getUser(UUID.randomUUID().toString()), group,
regularUsername, userpass, false, null);
+
+ // soap user
+
importInitvalues.createSystemUser(getUser(UUID.randomUUID().toString()), group,
soapUsername, userpass, false, u -> {
+ u.getRights().remove(User.Right.Room);
+ u.getRights().remove(User.Right.Dashboard);
+ u.getRights().add(User.Right.Soap);
+ });
// group admin
-
importInitvalues.createSystemUser(getUser(UUID.randomUUID().toString()), group,
groupAdminUsername, userpass, true);
+
importInitvalues.createSystemUser(getUser(UUID.randomUUID().toString()), group,
groupAdminUsername, userpass, true, null);
}
public User getContact(String uuid, Long ownerId) {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
index 77ba996..eb7a2c8 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java
@@ -19,9 +19,9 @@
package org.apache.openmeetings.webservice;
import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
-import static org.apache.openmeetings.AbstractJUnitDefaults.adminUsername;
import static org.apache.openmeetings.AbstractJUnitDefaults.createPass;
import static org.apache.openmeetings.AbstractJUnitDefaults.ensureSchema;
+import static org.apache.openmeetings.AbstractJUnitDefaults.soapUsername;
import static org.apache.openmeetings.AbstractJUnitDefaults.userpass;
import static
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
import static org.apache.openmeetings.util.OmFileHelper.getOmHome;
@@ -89,7 +89,7 @@ public class AbstractWebServiceTest {
}
public static ServiceResult login() {
- return login(adminUsername, userpass);
+ return login(soapUsername, userpass);
}
public static ServiceResult loginNoCheck(String user, String pass) {
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
index dd2c863..c9fe464 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
@@ -150,7 +150,7 @@ public class FileWebService extends BaseWebService {
, @Multipart(value = "stream", type =
MediaType.APPLICATION_OCTET_STREAM, required = false) @WebParam(name="stream")
InputStream stream
)
{
- return performCall(sid, User.Right.Room, sd -> {
+ return performCall(sid, User.Right.Soap, sd -> {
FileItem f = file == null ? null : file.get();
if (f == null || f.getId() != null) {
throw new ServiceException("Bad id");
@@ -189,7 +189,7 @@ public class FileWebService extends BaseWebService {
)
{
log.debug("getRoom::roomId {}", roomId);
- return performCall(sid, User.Right.Room, sd -> {
+ return performCall(sid, User.Right.Soap, sd -> {
FileExplorerObject fileExplorerObject = new
FileExplorerObject();
// Home File List
