Ori Liel has uploaded a new change for review. Change subject: restapi: Create User - Validate That Domain Was Passed ......................................................................
restapi: Create User - Validate That Domain Was Passed Change-Id: I2dff7fbca4d3f410e37387922937380f38f7e06e Signed-off-by: Ori Liel <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceBase.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java 3 files changed, 4 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/8329/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java index e908780..7b4d598 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java @@ -39,6 +39,9 @@ @Override public Response add(User user) { validateParameters(user, "userName"); + if (!user.getUserName().contains("@")) { + validateParameters(user, "domain.id|name"); + } String domain = getDomain(user); AdUser adUser = getEntity(AdUser.class, SearchType.AdUser, diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceBase.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceBase.java index 2a1ebe5..eddb1b5 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceBase.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceBase.java @@ -77,7 +77,7 @@ else if (user.isSetUserName() && user.getUserName().contains("@")) { return user.getUserName().substring(user.getUserName().indexOf("@")+1); } - return getCurrentDomain(); + return null; } protected String getCurrentDomain() { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java index 393aa7d..12a5f89 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java @@ -110,16 +110,6 @@ } @Test - public void testAddUser_1() throws Exception { - setUpAddUserExpectations("ADUSER@" + DOMAIN + ": allnames=" + NAMES[0]); - User model = new User(); - model.setUserName(NAMES[0]); - - Response response = collection.add(model); - verifyAddUser(response); - } - - @Test public void testAddUser_2() throws Exception { setUpAddUserExpectations("ADUSER@" + DOMAIN + ": allnames=" + NAMES[0]); User model = new User(); -- To view, visit http://gerrit.ovirt.org/8329 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2dff7fbca4d3f410e37387922937380f38f7e06e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ori Liel <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
