Yair Zaslavsky has uploaded a new change for review.
Change subject: aaa: search by user and groups name when added via rest-api
......................................................................
aaa: search by user and groups name when added via rest-api
Topic: AAA
Change-Id: I76c5d7647d8dff5c9f2f67e42e094e883ac2164b
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapQueryMetadataFactoryImpl.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java
5 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/31709/1
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapQueryMetadataFactoryImpl.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapQueryMetadataFactoryImpl.java
index 75dc899..d57b91c 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapQueryMetadataFactoryImpl.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/LdapQueryMetadataFactoryImpl.java
@@ -439,7 +439,7 @@
ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$CN, "cn");
ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$USER_ACCOUNT_NAME,
"uid");
ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$SN, "SN");
- ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$SAMACCOUNTNAME,
"SAMACCOUNTNAME");
+ ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$SAMACCOUNTNAME, "uid");
ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$DEPARTMENT,
"DEPARTMENT");
ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$TITLE, "TITLE");
ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$USER_ID,
"ipaUniqueID");
@@ -454,7 +454,7 @@
dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$CN, "cn");
dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$USER_ACCOUNT_NAME,
"uid");
dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$SN, "SN");
- dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$SAMACCOUNTNAME,
"SAMACCOUNTNAME");
+ dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$SAMACCOUNTNAME, "uid");
dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$DEPARTMENT,
"DEPARTMENT");
dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$TITLE, "TITLE");
dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$USER_ID, "nsuniqueid");
@@ -469,7 +469,7 @@
itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$USER_ACCOUNT_NAME,
"uid");
itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$SN, "SN");
itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$SAMACCOUNTNAME,
"SAMACCOUNTNAME");
- itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$DEPARTMENT,
"DEPARTMENT");
+ itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$DEPARTMENT, "sn");
itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$TITLE, "TITLE");
itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$USER_ID, "uid");
itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$GROUP_ID, "uid");
@@ -482,7 +482,7 @@
openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$CN, "cn");
openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$USER_ACCOUNT_NAME, "uid");
openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$SN, "SN");
- openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$SAMACCOUNTNAME,
"SAMACCOUNTNAME");
+ openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$SAMACCOUNTNAME,
"uid");
openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$DEPARTMENT,
"DEPARTMENT");
openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$TITLE, "TITLE");
openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$USER_ID,
"entryUUID");
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResource.java
index 89c38c9..d524491 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResource.java
@@ -109,7 +109,7 @@
sb.append(MessageFormat.format(ResourceConstants.AAA_GROUPS_SEARCH_TEMPLATE,
domain, ""));
sb.append(StringUtils.isEmpty(constraint) ?
- "allnames=" + groupname
+ "name=" + groupname
:
constraint);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java
index e821bf7..66286be 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java
@@ -119,7 +119,7 @@
namespace != null ? namespace : ""));
sb.append(StringUtils.isEmpty(constraint) ?
- "allnames=" + username
+ "username=" + username
:
constraint);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java
index 1184e46..7999513 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java
@@ -205,7 +205,7 @@
public void testAddGroupWithExplicitDirectoryName() throws Exception {
setUriInfo(setUpBasicUriExpectations());
setUpGetEntityExpectations(
- "ADGROUP@" + DOMAIN + ":: allnames=" + NAMES[0],
+ "ADGROUP@" + DOMAIN + ":: name=" + NAMES[0],
SearchType.DirectoryGroup,
getDirectoryGroup(0)
);
@@ -244,7 +244,7 @@
public void testAddGroupWithImplicitDirectoryName() throws Exception {
setUriInfo(setUpBasicUriExpectations());
setUpGetEntityExpectations(
- "ADGROUP@" + DOMAIN + ":: allnames=" + NAMES[0],
+ "ADGROUP@" + DOMAIN + ":: name=" + NAMES[0],
SearchType.DirectoryGroup,
getDirectoryGroup(0)
);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java
index b5059be..3030936 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java
@@ -129,7 +129,7 @@
@Test
public void testAddUser_2() throws Exception {
- setUpAddUserExpectations("ADUSER@" + DOMAIN + ":: allnames=" +
NAMES[0]);
+ setUpAddUserExpectations("ADUSER@" + DOMAIN + ":: username=" +
NAMES[0]);
User model = new User();
Domain domain = new Domain();
domain.setName(DOMAIN);
@@ -141,7 +141,7 @@
@Test
public void testAddUser_3() throws Exception {
- setUpAddUserExpectations("ADUSER@" + DOMAIN + ":: allnames=" +
NAMES[0]);
+ setUpAddUserExpectations("ADUSER@" + DOMAIN + ":: username=" +
NAMES[0]);
User model = new User();
model.setUserName(NAMES[0] + "@" + DOMAIN);
@@ -156,7 +156,7 @@
new String[] { },
new Object[] { },
setUpDomains());
- setUpAddUserExpectations("ADUSER@" + DOMAIN + ":: allnames=" +
NAMES[0]);
+ setUpAddUserExpectations("ADUSER@" + DOMAIN + ":: username=" +
NAMES[0]);
User model = new User();
model.setUserName(NAMES[0]);
Domain domain = new Domain();
--
To view, visit http://gerrit.ovirt.org/31709
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76c5d7647d8dff5c9f2f67e42e094e883ac2164b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
