Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: Admin user is not properly synchronized ......................................................................
aaa: Admin user is not properly synchronized Change-Id: I48f68ac6160e4e8c09526ac23a5180feac43361e Topic: AAA Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthz.java 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/34054/1 diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthz.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthz.java index 0cec7c2..7139da6 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthz.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthz.java @@ -25,6 +25,8 @@ private String userName; + private Properties configuration; + private static class Opaque { private boolean firstCall; @@ -81,9 +83,12 @@ private boolean doQueryOpenImpl(ExtMap filter) { boolean found = false; if (filter.<Integer> get(Authz.QueryFilterRecord.OPERATOR) == Authz.QueryFilterOperator.EQ) { - if (filter.<ExtKey> get(Authz.QueryFilterRecord.KEY).equals(Authz.PrincipalRecord.NAME)) { + ExtKey extKey = filter.<ExtKey> get(Authz.QueryFilterRecord.KEY); + if (extKey.equals(Authz.PrincipalRecord.NAME)) { String name = filter.<String> get(Authz.PrincipalRecord.NAME); found = userName.matches(name.replace("*", ".*")); + } else if (extKey.equals(Authz.PrincipalRecord.ID)) { + found = filter.<String>get(Authz.PrincipalRecord.ID).equals(configuration.getProperty("config.authz.user.id")); } else { found = false; } @@ -113,7 +118,7 @@ private void doLoad(ExtMap input, ExtMap output) { context = input.<ExtMap> get(Base.InvokeKeys.CONTEXT); - Properties configuration = context.<Properties> get(Base.ContextKeys.CONFIGURATION); + configuration = context.<Properties> get(Base.ContextKeys.CONFIGURATION); context.mput( Base.ContextKeys.AUTHOR, "The oVirt Project" -- To view, visit http://gerrit.ovirt.org/34054 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I48f68ac6160e4e8c09526ac23a5180feac43361e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
