Yair Zaslavsky has uploaded a new change for review.
Change subject: aaa: Cleaning AuthzUtils from non aaa code
......................................................................
aaa: Cleaning AuthzUtils from non aaa code
This patch removes from AuthzUtils methods with
DirectoryXXX and DbXXX methods.
This methods were moved to DirectoryUtils.
Bll should work with DirectoryUtils, until it is decided whether to drop it or
not.
Change-Id: Idfa1864df2cd2353504be4f10b3b6431a6fdea76
Topic: AAA
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M
backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/DirectoryUtils.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryGroupByIdQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryUserByIdQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java
11 files changed, 284 insertions(+), 188 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/29912/1
diff --git
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
index b217e68..47b1ed3 100644
---
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
+++
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java
@@ -1,15 +1,12 @@
package org.ovirt.engine.core.aaa;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import org.ovirt.engine.api.extensions.Base;
import org.ovirt.engine.api.extensions.ExtMap;
import org.ovirt.engine.api.extensions.aaa.Authn;
import org.ovirt.engine.api.extensions.aaa.Authz;
-import org.ovirt.engine.api.extensions.aaa.Authz.QueryEntity;
import org.ovirt.engine.core.extensions.mgr.ExtensionProxy;
public class AuthzUtils {
@@ -42,109 +39,7 @@
return ret;
}
- public static List<DirectoryUser> findPrincipalsByQuery(
- final ExtensionProxy extension,
- final String namespace,
- final String query) {
- return queryPrincipals(
- extension,
- namespace,
- SearchQueryParsingUtils.generateQueryMap(
- query,
- Authz.QueryEntity.PRINCIPAL
- ),
- false,
- false);
- }
-
- public static List<DirectoryUser> findPrincipalsByIds(
- final ExtensionProxy extension,
- final String namespace,
- final List<String> ids,
- final boolean groupsResolving,
- final boolean groupsResolvingRecursive
- ) {
- List<DirectoryUser> results = new ArrayList<>();
- for (List<String> batch :
SearchQueryParsingUtils.getIdsBatches(extension.getContext(), ids)) {
- results.addAll(
- queryPrincipals(
- extension,
- namespace,
- SearchQueryParsingUtils.generateQueryMap(
- batch,
- Authz.QueryEntity.PRINCIPAL
- ),
- groupsResolving,
- groupsResolvingRecursive
- )
- );
- }
- return results;
- }
-
- public static DirectoryUser findPrincipalById(
- final ExtensionProxy extension,
- final String namespace,
- final String id,
- final boolean groupsResolving,
- final boolean groupsResolvingRecursive
- ) {
- List<DirectoryUser> users =
- findPrincipalsByIds(extension, namespace, Arrays.asList(id),
groupsResolving, groupsResolvingRecursive);
- if (users.isEmpty()) {
- return null;
- }
- return users.get(0);
- }
-
- public static List<DirectoryGroup> findGroupsByQuery(
- final ExtensionProxy extension,
- final String namespace,
- final String query) {
- return queryGroups(
- extension,
- namespace,
- SearchQueryParsingUtils.generateQueryMap(query,
Authz.QueryEntity.GROUP),
- false,
- false
- );
- }
-
- public static List<DirectoryGroup> findGroupsByIds(
- final ExtensionProxy extension,
- final String namespace,
- final List<String> ids,
- final boolean resolveGroups,
- final boolean resolveGroupsRecursive) {
- List<DirectoryGroup> results = new ArrayList<>();
- for (List<String> batch :
SearchQueryParsingUtils.getIdsBatches(extension.getContext(), ids)) {
- results.addAll(
- queryGroups(
- extension,
- namespace,
- SearchQueryParsingUtils.generateQueryMap(batch,
QueryEntity.GROUP),
- resolveGroups,
- resolveGroupsRecursive
- )
- );
- }
- return results;
- }
-
- public static DirectoryGroup findGroupById(final ExtensionProxy extension,
- String namespace,
- final String id,
- final boolean resolveGroups,
- final boolean resolveGroupsRecursive
- ) {
- List<DirectoryGroup> groups = findGroupsByIds(extension, namespace,
Arrays.asList(id), resolveGroups, resolveGroupsRecursive);
- if (groups.isEmpty()) {
- return null;
- }
- return groups.get(0);
- }
-
- private static List<DirectoryUser> queryPrincipals(
+ public static List<ExtMap> queryPrincipalRecords(
final ExtensionProxy extension,
final String namespace,
final ExtMap filter,
@@ -164,50 +59,53 @@
Authz.InvokeKeys.NAMESPACE,
namespace
);
- return populatePrincipals(
+ return populatePrincipalRecords(
extension,
namespace,
inputMap);
}
-
- private static List<DirectoryGroup> queryGroups(
+ public static List<ExtMap> queryGroupRecords(
final ExtensionProxy extension,
final String namespace,
final ExtMap filter,
- boolean resolveGroups,
- boolean recursiveGroupResolving
+ boolean groupsResolving,
+ boolean groupsResolvingRecursive
) {
+ ExtMap inputMap = new ExtMap().mput(
+ Authz.InvokeKeys.QUERY_ENTITY,
+ Authz.QueryEntity.GROUP
+ ).mput(
+ Authz.InvokeKeys.QUERY_FLAGS,
+ queryFlagValue(groupsResolving,
groupsResolvingRecursive)
+ ).mput(
+ Authz.InvokeKeys.QUERY_FILTER,
+ filter
+ ).mput(
+ Authz.InvokeKeys.NAMESPACE,
+ namespace
+ );
return populateGroups(
extension,
namespace,
- new ExtMap().mput(
- Authz.InvokeKeys.QUERY_ENTITY,
- Authz.QueryEntity.GROUP
- ).mput(
- Authz.InvokeKeys.QUERY_FILTER,
- filter
- ).mput(
- Authz.InvokeKeys.QUERY_FLAGS,
- queryFlagValue(resolveGroups,
recursiveGroupResolving)
- )
- );
+ inputMap);
+
}
- private static List<DirectoryUser> populatePrincipals(
+ public static List<ExtMap> populatePrincipalRecords(
final ExtensionProxy extension,
final String namespace,
final ExtMap input) {
- final List<DirectoryUser> directoryUsers = new ArrayList<>();
+ final List<ExtMap> principalRecords = new ArrayList<>();
queryImpl(extension, namespace, input, new QueryResultHandler() {
@Override
public boolean handle(List<ExtMap> queryResults) {
boolean result = true;
for (ExtMap queryResult : queryResults) {
- if (directoryUsers.size() < QUERIES_RESULTS_LIMIT) {
- directoryUsers.add(mapPrincipalRecord(extension,
queryResult));
+ if (principalRecords.size() < QUERIES_RESULTS_LIMIT) {
+ principalRecords.add(queryResult);
} else {
result = false;
break;
@@ -216,20 +114,20 @@
return result;
}
});
- return directoryUsers;
+ return principalRecords;
}
- private static List<DirectoryGroup> populateGroups(final ExtensionProxy
extension, final String namespace,
+ public static List<ExtMap> populateGroups(final ExtensionProxy extension,
final String namespace,
final ExtMap input) {
- final List<DirectoryGroup> directoryGroups = new ArrayList<>();
+ final List<ExtMap> groups = new ArrayList<>();
queryImpl(extension, namespace, input, new QueryResultHandler() {
@Override
public boolean handle(List<ExtMap> queryResults) {
boolean result = true;
for (ExtMap queryResult : queryResults) {
- if (directoryGroups.size() < QUERIES_RESULTS_LIMIT) {
- directoryGroups.add(mapGroupRecord(extension,
queryResult));
+ if (groups.size() < QUERIES_RESULTS_LIMIT) {
+ groups.add(queryResult);
} else {
result = false;
}
@@ -238,7 +136,7 @@
}
});
- return directoryGroups;
+ return groups;
}
private static void queryImpl(
@@ -285,46 +183,54 @@
}
}
- public static DirectoryUser mapPrincipalRecord(final ExtensionProxy
extension, final ExtMap principalRecord) {
- DirectoryUser directoryUser = null;
- if (principalRecord != null) {
- directoryUser = new DirectoryUser(
- extension.getContext().<String>
get(Base.ContextKeys.INSTANCE_NAME),
- principalRecord.<String>
get(Authz.PrincipalRecord.NAMESPACE),
- principalRecord.<String> get(Authz.PrincipalRecord.ID),
- principalRecord.<String> get(Authz.PrincipalRecord.NAME)
+ public static List<ExtMap> findPrincipalsByIds(
+ final ExtensionProxy extension,
+ final String namespace,
+ final List<String> ids,
+ final boolean groupsResolving,
+ final boolean groupsResolvingRecursive
+ ) {
+ List<ExtMap> results = new ArrayList<>();
+ for (List<String> batch :
SearchQueryParsingUtils.getIdsBatches(extension.getContext(), ids)) {
+ results.addAll(
+ queryPrincipalRecords(
+ extension,
+ namespace,
+ SearchQueryParsingUtils.generateQueryMap(
+ batch,
+ Authz.QueryEntity.PRINCIPAL
+ ),
+ groupsResolving,
+ groupsResolvingRecursive
+ )
);
- directoryUser.setDepartment(principalRecord.<String>
get(Authz.PrincipalRecord.DEPARTMENT));
- directoryUser.setFirstName(principalRecord.<String>
get(Authz.PrincipalRecord.FIRST_NAME));
- directoryUser.setLastName(principalRecord.<String>
get(Authz.PrincipalRecord.LAST_NAME));
- directoryUser.setEmail(principalRecord.<String>
get(Authz.PrincipalRecord.EMAIL));
- directoryUser.setTitle(principalRecord.<String>
get(Authz.PrincipalRecord.TITLE));
- List<DirectoryGroup> directoryGroups = new
ArrayList<DirectoryGroup>();
- List<ExtMap> groups = principalRecord.<List<ExtMap>>
get(Authz.PrincipalRecord.GROUPS);
- if (groups != null) {
- for (ExtMap group : groups) {
- directoryGroups.add(mapGroupRecord(extension, group));
- }
- }
- directoryUser.setGroups(directoryGroups);
}
- return directoryUser;
+ return results;
}
- private static DirectoryGroup mapGroupRecord(final ExtensionProxy
extension, final ExtMap group) {
- DirectoryGroup directoryGroup = null;
- if (group != null) {
- directoryGroup = new DirectoryGroup(
- extension.getContext().<String>
get(Base.ContextKeys.INSTANCE_NAME),
- group.<String> get(Authz.GroupRecord.NAMESPACE),
- group.<String> get(Authz.GroupRecord.ID),
- group.<String> get(Authz.GroupRecord.NAME)
+ public static List<ExtMap> findGroupRecordsByIds(
+ final ExtensionProxy extension,
+ final String namespace,
+ final List<String> ids,
+ final boolean groupsResolving,
+ final boolean groupsResolvingRecursive
+ ) {
+ List<ExtMap> results = new ArrayList<>();
+ for (List<String> batch :
SearchQueryParsingUtils.getIdsBatches(extension.getContext(), ids)) {
+ results.addAll(
+ queryGroupRecords(
+ extension,
+ namespace,
+ SearchQueryParsingUtils.generateQueryMap(
+ batch,
+ Authz.QueryEntity.GROUP
+ ),
+ groupsResolving,
+ groupsResolvingRecursive
+ )
);
- for (ExtMap memberOf : group.<List<ExtMap>>
get(Authz.GroupRecord.GROUPS, Collections.<ExtMap> emptyList())) {
- directoryGroup.getGroups().add(mapGroupRecord(extension,
memberOf));
- }
}
- return directoryGroup;
+ return results;
}
private static int queryFlagValue(boolean resolveGroups, boolean
resolveGroupsRecursive) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/DirectoryUtils.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/DirectoryUtils.java
index 41c4cd7..a98c863 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/DirectoryUtils.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/DirectoryUtils.java
@@ -1,23 +1,27 @@
package org.ovirt.engine.core.aaa;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.ovirt.engine.api.extensions.ExtMap;
+import org.ovirt.engine.api.extensions.aaa.Authz;
import org.ovirt.engine.core.common.businessentities.DbGroup;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dao.DbGroupDAO;
+import org.ovirt.engine.core.extensions.mgr.ExtensionProxy;
public class DirectoryUtils {
public static HashSet<Guid> getGroupIdsFromUser(DirectoryUser
directoryUser) {
HashSet<Guid> results = new HashSet<Guid>();
- Set<DirectoryGroup> groupsSet = new HashSet<DirectoryGroup>();
- flatGroups(groupsSet, directoryUser.getGroups());
DbGroupDAO dao = DbFacade.getInstance().getDbGroupDao();
- if (groupsSet != null) {
- for (DirectoryGroup group : groupsSet) {
+ if (directoryUser.getGroups() != null) {
+ for (DirectoryGroup group : directoryUser.getGroups()) {
DbGroup dbGroup =
dao.getByExternalId(group.getDirectoryName(), group.getId());
if (dbGroup != null) {
results.add(dbGroup.getId());
@@ -27,6 +31,188 @@
return results;
}
+ public static List<DirectoryUser> findDirectoryUsersByQuery(
+ final ExtensionProxy extension,
+ final String namespace,
+ final String query) {
+ return queryDirectoryUsers(
+ extension,
+ namespace,
+ SearchQueryParsingUtils.generateQueryMap(
+ query,
+ Authz.QueryEntity.PRINCIPAL
+ ),
+ false,
+ false);
+ }
+
+ public static DirectoryGroup findDirectoryGroupById(final ExtensionProxy
extension,
+ String namespace,
+ final String id,
+ final boolean resolveGroups,
+ final boolean resolveGroupsRecursive
+ ) {
+ List<DirectoryGroup> groups =
+ findDirectoryGroupsByIds(extension, namespace,
Arrays.asList(id), resolveGroups, resolveGroupsRecursive);
+ if (groups.isEmpty()) {
+ return null;
+ }
+ return groups.get(0);
+ }
+
+ public static List<DirectoryUser> findDirectoryUserByIds(
+ final ExtensionProxy extension,
+ final String namespace,
+ final List<String> ids,
+ final boolean groupsResolving,
+ final boolean groupsResolvingRecursive
+ ) {
+ return mapPrincipalRecords(
+ AuthzUtils.getName(extension),
+ AuthzUtils.findPrincipalsByIds(
+ extension,
+ namespace,
+ ids,
+ groupsResolving,
+ groupsResolvingRecursive
+ )
+ );
+ }
+
+ public static DirectoryUser findDirectoryUserById(
+ final ExtensionProxy extension,
+ final String namespace,
+ final String id,
+ final boolean groupsResolving,
+ final boolean groupsResolvingRecursive
+ ) {
+ List<DirectoryUser> users =
+ findDirectoryUserByIds(
+ extension,
+ namespace,
+ Arrays.asList(id),
+ groupsResolving,
+ groupsResolvingRecursive);
+ if (users.isEmpty()) {
+ return null;
+ }
+ return users.get(0);
+ }
+
+ public static List<DirectoryGroup> findDirectoryGroupsByQuery(
+ final ExtensionProxy extension,
+ final String namespace,
+ final String query) {
+ return queryDirectoryGroups(
+ extension,
+ namespace,
+ SearchQueryParsingUtils.generateQueryMap(query,
Authz.QueryEntity.GROUP),
+ false,
+ false);
+ }
+
+ public static List<DirectoryGroup> findDirectoryGroupsByIds(
+ final ExtensionProxy extension,
+ final String namespace,
+ final List<String> ids,
+ final boolean resolveGroups,
+ final boolean resolveGroupsRecursive) {
+ return mapGroupRecords(AuthzUtils.getName(extension),
+ AuthzUtils.findGroupRecordsByIds(
+ extension,
+ namespace,
+ ids,
+ resolveGroups,
+ resolveGroupsRecursive)
+ );
+ }
+
+ public static DirectoryUser mapPrincipalRecord(final String authzName,
final ExtMap principalRecord) {
+ DirectoryUser directoryUser = null;
+ if (principalRecord != null) {
+ directoryUser = new DirectoryUser(
+ authzName,
+ principalRecord.<String>
get(Authz.PrincipalRecord.NAMESPACE),
+ principalRecord.<String> get(Authz.PrincipalRecord.ID),
+ principalRecord.<String> get(Authz.PrincipalRecord.NAME)
+ );
+ directoryUser.setDepartment(principalRecord.<String>
get(Authz.PrincipalRecord.DEPARTMENT));
+ directoryUser.setFirstName(principalRecord.<String>
get(Authz.PrincipalRecord.FIRST_NAME));
+ directoryUser.setLastName(principalRecord.<String>
get(Authz.PrincipalRecord.LAST_NAME));
+ directoryUser.setEmail(principalRecord.<String>
get(Authz.PrincipalRecord.EMAIL));
+ directoryUser.setTitle(principalRecord.<String>
get(Authz.PrincipalRecord.TITLE));
+ List<DirectoryGroup> directoryGroups = new
ArrayList<DirectoryGroup>();
+ List<ExtMap> groups = principalRecord.<List<ExtMap>>
get(Authz.PrincipalRecord.GROUPS);
+ if (groups != null) {
+ for (ExtMap group : groups) {
+ directoryGroups.add(mapGroupRecord(authzName, group));
+ }
+ }
+ directoryUser.setGroups(directoryGroups);
+ }
+ return directoryUser;
+ }
+
+ public static DirectoryGroup mapGroupRecord(final String authzName, final
ExtMap group) {
+ DirectoryGroup directoryGroup = null;
+ if (group != null) {
+ directoryGroup = new DirectoryGroup(
+ authzName,
+ group.<String> get(Authz.GroupRecord.NAMESPACE),
+ group.<String> get(Authz.GroupRecord.ID),
+ group.<String> get(Authz.GroupRecord.NAME)
+ );
+ for (ExtMap memberOf : group.<List<ExtMap>>
get(Authz.GroupRecord.GROUPS, Collections.<ExtMap> emptyList())) {
+ directoryGroup.getGroups().add(mapGroupRecord(authzName,
memberOf));
+ }
+ }
+ return directoryGroup;
+ }
+
+ public static List<DirectoryGroup> mapGroupRecords(final String authzName,
final List<ExtMap> groups) {
+ List<DirectoryGroup> results = new ArrayList<>();
+ for (ExtMap group : groups) {
+ results.add(mapGroupRecord(authzName, group));
+ }
+ return results;
+ }
+
+ public static List<DirectoryUser> mapPrincipalRecords(final String
authzName, final List<ExtMap> users) {
+ List<DirectoryUser> results = new ArrayList<>();
+ for (ExtMap user : users) {
+ results.add(mapPrincipalRecord(authzName, user));
+ }
+ return results;
+ }
+
+ private static List<DirectoryUser> queryDirectoryUsers(
+ final ExtensionProxy extension,
+ final String namespace,
+ final ExtMap filter,
+ boolean groupsResolving,
+ boolean groupsResolvingRecursive
+ ) {
+ return mapPrincipalRecords(AuthzUtils.getName(extension),
AuthzUtils.queryPrincipalRecords(extension,
+ namespace,
+ filter,
+ groupsResolving,
+ groupsResolvingRecursive));
+ }
+
+ private static List<DirectoryGroup> queryDirectoryGroups(
+ final ExtensionProxy extension,
+ final String namespace,
+ final ExtMap filter,
+ boolean groupsResolving,
+ boolean groupsResolvingRecursive
+ ) {
+ List<DirectoryGroup> directoryGroups = new ArrayList<>();
+ for (ExtMap group :
AuthzUtils.queryPrincipalRecords(extension, namespace, filter, groupsResolving,
groupsResolvingRecursive)) {
+
directoryGroups.add(mapGroupRecord(AuthzUtils.getName(extension), group));
+ }
+ return directoryGroups;
+ }
+
private static void flatGroups(Set<DirectoryGroup> accumulator,
List<DirectoryGroup> groupsFrom) {
for (DirectoryGroup group : groupsFrom) {
flatGroups(accumulator, group.getGroups());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java
index bd9d8ac..9a4a495 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AdGroupsHandlingCommandBase.java
@@ -4,8 +4,8 @@
import java.util.List;
import org.ovirt.engine.api.extensions.aaa.Authz;
-import org.ovirt.engine.core.aaa.AuthzUtils;
import org.ovirt.engine.core.aaa.DirectoryGroup;
+import org.ovirt.engine.core.aaa.DirectoryUtils;
import org.ovirt.engine.core.bll.utils.PermissionSubject;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.IdParameters;
@@ -50,7 +50,12 @@
ExtensionProxy authz =
EngineExtensionsManager.getInstance().getExtensionByName(dbGroup.getDomain());
if (authz != null) {
for (String namespace : authz.getContext().<List<String>>
get(Authz.ContextKeys.AVAILABLE_NAMESPACES)) {
- mGroup = AuthzUtils.findGroupById(authz, namespace,
dbGroup.getExternalId(), false, false);
+ mGroup =
+ DirectoryUtils.findDirectoryGroupById(authz,
+ namespace,
+ dbGroup.getExternalId(),
+ false,
+ false);
if (mGroup != null) {
break;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java
index 2da61d9..35efe86 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java
@@ -5,8 +5,8 @@
import java.util.List;
import org.ovirt.engine.api.extensions.aaa.Authz;
-import org.ovirt.engine.core.aaa.AuthzUtils;
import org.ovirt.engine.core.aaa.DirectoryGroup;
+import org.ovirt.engine.core.aaa.DirectoryUtils;
import org.ovirt.engine.core.bll.context.CommandContext;
import org.ovirt.engine.core.bll.utils.PermissionSubject;
import org.ovirt.engine.core.common.AuditLogType;
@@ -53,7 +53,7 @@
boolean foundGroup = false;
for (String namespace : getParameters().getNamespace() != null ?
Arrays.asList(getParameters().getNamespace())
: authz.getContext().<List<String>>
get(Authz.ContextKeys.AVAILABLE_NAMESPACES)) {
- directoryGroup = AuthzUtils.findGroupById(authz, namespace, id,
true, true);
+ directoryGroup = DirectoryUtils.findDirectoryGroupById(authz,
namespace, id, true, true);
if (directoryGroup != null) {
foundGroup = true;
break;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java
index f9e74a7..5e9fe93 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java
@@ -6,7 +6,6 @@
import java.util.List;
import org.ovirt.engine.api.extensions.aaa.Authz;
-import org.ovirt.engine.core.aaa.AuthzUtils;
import org.ovirt.engine.core.aaa.DirectoryUser;
import org.ovirt.engine.core.aaa.DirectoryUtils;
import org.ovirt.engine.core.bll.context.CommandContext;
@@ -79,7 +78,7 @@
boolean foundUser = false;
for (String namespace : getParameters().getNamespace() != null ?
Arrays.asList(getParameters().getNamespace())
: authz.getContext().<List<String>>
get(Authz.ContextKeys.AVAILABLE_NAMESPACES)) {
- directoryUser = AuthzUtils.findPrincipalById(authz, namespace, id,
true, true);
+ directoryUser = DirectoryUtils.findDirectoryUserById(authz,
namespace, id, true, true);
if (directoryUser != null) {
foundUser = true;
break;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
index 9327143..b873251 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
@@ -135,7 +135,7 @@
for (String namespace : idsPerNamespace.keySet()) {
List<DirectoryUser> directoryUsers = null;
if (authz != null) {
- directoryUsers = AuthzUtils.findPrincipalsByIds(authz,
namespace, ids, true, false);
+ directoryUsers = DirectoryUtils.findDirectoryUserByIds(authz,
namespace, ids, true, false);
}
else {
directoryUsers = Collections.emptyList();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryGroupByIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryGroupByIdQuery.java
index 154d9ea..08065b4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryGroupByIdQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryGroupByIdQuery.java
@@ -3,8 +3,8 @@
import java.util.List;
import org.ovirt.engine.api.extensions.aaa.Authz;
-import org.ovirt.engine.core.aaa.AuthzUtils;
import org.ovirt.engine.core.aaa.DirectoryGroup;
+import org.ovirt.engine.core.aaa.DirectoryUtils;
import org.ovirt.engine.core.common.queries.DirectoryIdQueryParameters;
import org.ovirt.engine.core.extensions.mgr.ExtensionProxy;
import org.ovirt.engine.core.utils.extensionsmgr.EngineExtensionsManager;
@@ -24,7 +24,7 @@
getQueryReturnValue().setSucceeded(false);
} else {
for (String namespace : authz.getContext().<List<String>>
get(Authz.ContextKeys.AVAILABLE_NAMESPACES)) {
- final DirectoryGroup group = AuthzUtils.findGroupById(authz,
namespace, id, false, false);
+ final DirectoryGroup group =
DirectoryUtils.findDirectoryGroupById(authz, namespace, id, false, false);
if (group != null) {
getQueryReturnValue().setReturnValue(group);
break;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryUserByIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryUserByIdQuery.java
index 80bb4f1..503f4d2 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryUserByIdQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryUserByIdQuery.java
@@ -3,8 +3,8 @@
import java.util.List;
import org.ovirt.engine.api.extensions.aaa.Authz;
-import org.ovirt.engine.core.aaa.AuthzUtils;
import org.ovirt.engine.core.aaa.DirectoryUser;
+import org.ovirt.engine.core.aaa.DirectoryUtils;
import org.ovirt.engine.core.common.queries.DirectoryIdQueryParameters;
import org.ovirt.engine.core.extensions.mgr.ExtensionProxy;
import org.ovirt.engine.core.utils.extensionsmgr.EngineExtensionsManager;
@@ -24,7 +24,7 @@
getQueryReturnValue().setSucceeded(false);
} else {
for (String namespace : authz.getContext().<List<String>>
get(Authz.ContextKeys.AVAILABLE_NAMESPACES)) {
- DirectoryUser user = AuthzUtils.findPrincipalById(authz,
namespace, id, false, false);
+ DirectoryUser user =
DirectoryUtils.findDirectoryUserById(authz, namespace, id, false, false);
if (user != null) {
getQueryReturnValue().setReturnValue(user);
break;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
index 901e846..94fdb64 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
@@ -254,7 +254,7 @@
return false;
}
- DirectoryUser directoryUser =
AuthzUtils.mapPrincipalRecord(profile.getAuthz(), principalRecord);
+ DirectoryUser directoryUser =
DirectoryUtils.mapPrincipalRecord(AuthzUtils.getName(profile.getAuthz()),
principalRecord);
// Check that the user exists in the database, if it doesn't exist
then we need to add it now:
DbUser dbUser =
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
index da09f8b..479946d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
@@ -8,9 +8,9 @@
import org.ovirt.engine.api.extensions.aaa.Authz;
import org.ovirt.engine.core.aaa.AuthenticationProfileRepository;
-import org.ovirt.engine.core.aaa.AuthzUtils;
import org.ovirt.engine.core.aaa.DirectoryGroup;
import org.ovirt.engine.core.aaa.DirectoryUser;
+import org.ovirt.engine.core.aaa.DirectoryUtils;
import org.ovirt.engine.core.bll.quota.QuotaManager;
import org.ovirt.engine.core.common.businessentities.AuditLog;
import org.ovirt.engine.core.common.businessentities.DbGroup;
@@ -34,8 +34,8 @@
import
org.ovirt.engine.core.common.errors.SearchEngineIllegalCharacterException;
import org.ovirt.engine.core.common.errors.SqlInjectionException;
import org.ovirt.engine.core.common.queries.SearchParameters;
-import org.ovirt.engine.core.common.utils.ListUtils.Filter;
import org.ovirt.engine.core.common.utils.ListUtils;
+import org.ovirt.engine.core.common.utils.ListUtils.Filter;
import org.ovirt.engine.core.compat.DateTime;
import org.ovirt.engine.core.compat.TimeSpan;
import org.ovirt.engine.core.dao.SearchDAO;
@@ -180,7 +180,7 @@
ExtensionProxy authz =
AuthenticationProfileRepository.getInstance().getProfile(data.getDomain()).getAuthz();
List<DirectoryUser> results = new ArrayList<>();
for (String namespace : authz.getContext().<List<String>>
get(Authz.ContextKeys.AVAILABLE_NAMESPACES)) {
- results.addAll(AuthzUtils.findPrincipalsByQuery(authz, namespace,
data.getQuery()));
+ results.addAll(DirectoryUtils.findDirectoryUsersByQuery(authz,
namespace, data.getQuery()));
}
return results;
@@ -196,7 +196,7 @@
ExtensionProxy authz =
AuthenticationProfileRepository.getInstance().getProfile(data.getDomain()).getAuthz();
List<DirectoryGroup> results = new ArrayList<>();
for (String namespace : authz.getContext().<List<String>>
get(Authz.ContextKeys.AVAILABLE_NAMESPACES)) {
- results.addAll(AuthzUtils.findGroupsByQuery(authz, namespace,
data.getQuery()));
+ results.addAll(DirectoryUtils.findDirectoryGroupsByQuery(authz,
namespace, data.getQuery()));
}
return results;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java
index 4f39303..ca1d5ef 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java
@@ -4,8 +4,8 @@
import java.util.List;
import org.ovirt.engine.api.extensions.aaa.Authz;
-import org.ovirt.engine.core.aaa.AuthzUtils;
import org.ovirt.engine.core.aaa.DirectoryUser;
+import org.ovirt.engine.core.aaa.DirectoryUtils;
import org.ovirt.engine.core.bll.utils.PermissionSubject;
import org.ovirt.engine.core.common.action.IdParameters;
import org.ovirt.engine.core.common.businessentities.DbUser;
@@ -66,7 +66,7 @@
}
boolean foundUser = false;
for (String namespace :
authz.getContext().<List<String>>get(Authz.ContextKeys.AVAILABLE_NAMESPACES)) {
- DirectoryUser directoryUser =
AuthzUtils.findPrincipalById(authz, namespace, id, false, false);
+ DirectoryUser directoryUser =
DirectoryUtils.findDirectoryUserById(authz, namespace, id, false, false);
if (directoryUser != null) {
dbUser = new DbUser(directoryUser);
dbUser.setId(Guid.newGuid());
--
To view, visit http://gerrit.ovirt.org/29912
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfa1864df2cd2353504be4f10b3b6431a6fdea76
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
