Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: Stop constant synchronization of admin@internal ......................................................................
aaa: Stop constant synchronization of admin@internal The following changes are required - a. when reading group_ids from db - an empty string of group_ids should not become a a set containing the "zero" guid, but should be an empty set. b. group_ids should not have sub strings of "zero" guids c. equals of DbUser should not check isAdmin Bug-Url: https://bugzilla.redhat.com/1175046 Change-Id: I5a7660f813b7926b4193ebeb39b3c2a5f07550b4 Topic: AAA Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/DbUser.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java A packaging/dbscripts/upgrade/03_05_1200_fix_admin_internal_constant_sync.sql 3 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/36230/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/DbUser.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/DbUser.java index d2de0f8..c601c4d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/DbUser.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/DbUser.java @@ -274,7 +274,6 @@ && ObjectUtils.objectsEqual(namespace, other.namespace) && ObjectUtils.objectsEqual(email, other.email) && ObjectUtils.objectsEqual(groupNames, other.groupNames) - && isAdmin == other.isAdmin && ObjectUtils.objectsEqual(firstName, other.firstName) && ObjectUtils.objectsEqual(note, other.note) && ObjectUtils.objectsEqual(role, other.role) diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java index 30bd069..7434d1f 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java @@ -47,7 +47,7 @@ private LinkedList<Guid> convertToGuidList(String str, char delimiter) { LinkedList<Guid> results = new LinkedList<>(); - if (str != null) { + if (StringUtils.isNotEmpty(str)) { for (String id : str.split(String.format(" *%s *", delimiter))) { results.add(Guid.createGuidFromString(id)); } diff --git a/packaging/dbscripts/upgrade/03_05_1200_fix_admin_internal_constant_sync.sql b/packaging/dbscripts/upgrade/03_05_1200_fix_admin_internal_constant_sync.sql new file mode 100644 index 0000000..b094ff8 --- /dev/null +++ b/packaging/dbscripts/upgrade/03_05_1200_fix_admin_internal_constant_sync.sql @@ -0,0 +1 @@ +update users set group_ids = regexp_replace(group_ids, '([,]*)00000000-0000-0000-0000-000000000000([,]*)', ''); -- To view, visit http://gerrit.ovirt.org/36230 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a7660f813b7926b4193ebeb39b3c2a5f07550b4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
