[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1671] correct rights for file server are set

[solomax]

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

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


The following commit(s) were added to refs/heads/4.0.x by this push:
     new 775bfd7  [OPENMEETINGS-1671] correct rights for file server are set
775bfd7 is described below

commit 775bfd744cf178c9602669128bbfd8672256b2df
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Mon Aug 13 23:00:55 2018 +0700

    [OPENMEETINGS-1671] correct rights for file server are set
---
 .../org/apache/openmeetings/AbstractJUnitDefaults.java   | 16 ++++++++++++++++
 .../openmeetings/webservice/AbstractWebServiceTest.java  |  2 +-
 .../apache/openmeetings/webservice/FileWebService.java   |  4 ++--
 3 files changed, 19 insertions(+), 3 deletions(-)

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 4c191fb..cfece3b 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertNotNull;
 import java.util.Date;
 import java.util.Random;
 import java.util.UUID;
+import java.util.function.Consumer;
 
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
@@ -49,6 +50,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";
@@ -72,6 +74,13 @@ public abstract class AbstractJUnitDefaults extends 
AbstractSpringTest {
                cfgDao.reinit();
                if (userDao.count() < 1) {
                        makeDefaultScheme();
+                       // soap user
+                       createSystemUser(soapUsername, false, u -> {
+                               u.getRights().remove(User.Right.Room);
+                               u.getRights().remove(User.Right.Dashboard);
+                               u.getRights().add(User.Right.Soap);
+                       });
+
                        // regular user
                        createSystemUser(regularUsername, false);
 
@@ -176,12 +185,19 @@ public abstract class AbstractJUnitDefaults extends 
AbstractSpringTest {
        }
 
        public User createSystemUser(String login, boolean groupAdmin) throws 
Exception {
+               return createSystemUser(login, groupAdmin, null);
+       }
+
+       public User createSystemUser(String login, boolean groupAdmin, 
Consumer<User> postprocess) throws Exception {
                User u = getUser();
                GroupUser gu = new GroupUser(groupDao.get(group), u);
                gu.setModerator(groupAdmin);
                u.getGroupUsers().add(gu);
                u.setLogin(login);
                u.updatePassword(userpass);
+               if (postprocess != null) {
+                       postprocess.accept(u);
+               }
                return createUser(u);
        }
 
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 6490105..bd50bdc 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
@@ -82,7 +82,7 @@ public class AbstractWebServiceTest extends 
AbstractJUnitDefaults {
        }
 
        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 66ce86d..6a4d668 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 -> {
                        FileItemDao dao = getFileDao();
                        FileExplorerObject fileExplorerObject = new 
FileExplorerObject();