Ravi Nori has uploaded a new change for review. Change subject: aaa: Remove Authn from backend ......................................................................
aaa: Remove Authn from backend Authn is no longer needed on the backend. All relevant code with authn including Logout and get profiles supporting passwd auth have been moved to sso package Change-Id: Ie97dbdb8540b26cd8b53f8c373970361ddec4d6b Bug-Url: https://bugzilla.redhat.com/1092744 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfile.java M backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java 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/bll/GetAAAProfileListQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutSessionCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/ProfileEntry.java M backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/servlets/LogoutServlet.java M backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/servlets/SSOContextListener.java M backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/utils/AuthenticationUtils.java M backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/utils/SSOConfig.java M backend/manager/modules/enginesso/src/main/webapp/WEB-INF/login.jsp M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java 13 files changed, 60 insertions(+), 119 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/40154/1 diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfile.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfile.java index 305b518..7793978 100644 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfile.java +++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfile.java @@ -1,9 +1,6 @@ package org.ovirt.engine.core.aaa; -import java.util.Properties; - import org.ovirt.engine.api.extensions.Base; -import org.ovirt.engine.api.extensions.aaa.Authn; import org.ovirt.engine.core.extensions.mgr.ExtensionProxy; /** @@ -11,18 +8,9 @@ * is authenticated by the authn extension and then the details are looked up in the authz extension. */ public class AuthenticationProfile { - /** - * The name of the profile. - */ - private String name; - - private ExtensionProxy authn; - private ExtensionProxy authz; private ExtensionProxy mapper; - - private int negotiationPriority; /** * Create a new authentication profile with the given name, authenticator and directory. @@ -32,27 +20,16 @@ * @param mapping the mappinng extension to map the post authn auth record * authenticated */ - public AuthenticationProfile(ExtensionProxy authn, ExtensionProxy authz, ExtensionProxy mapper) { - Properties config = authn.getContext().<Properties> get(Base.ContextKeys.CONFIGURATION); - this.name = config.getProperty(Authn.ConfigKeys.PROFILE_NAME); - this.authn = authn; + public AuthenticationProfile(ExtensionProxy authz, ExtensionProxy mapper) { this.authz = authz; this.mapper = mapper; - this.negotiationPriority = Integer.valueOf(config.getProperty(Authn.ConfigKeys.NEGOTIATION_PRIORITY, "50")); } /** * Get the name of the profile. */ public String getName() { - return name; - } - - /** - * Get a reference to the authenticator. - */ - public ExtensionProxy getAuthn() { - return authn; + return getAuthzName(); } /** @@ -67,15 +44,8 @@ return mapper; } - public String getAuthnName() { - return authn.getContext().<String>get(Base.ContextKeys.INSTANCE_NAME); - } - public String getAuthzName() { return authz.getContext().<String>get(Base.ContextKeys.INSTANCE_NAME); } - public int getNegotiationPriority() { - return negotiationPriority; - } } diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java index cba38ab..c0f23f3 100644 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java +++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java @@ -6,12 +6,10 @@ import java.util.Map; import java.util.Observable; import java.util.Observer; -import java.util.Properties; +import org.ovirt.engine.api.extensions.aaa.Authz; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.ovirt.engine.api.extensions.Base; -import org.ovirt.engine.api.extensions.aaa.Authn; import org.ovirt.engine.core.extensions.mgr.ConfigurationException; import org.ovirt.engine.core.extensions.mgr.ExtensionProxy; import org.ovirt.engine.core.utils.extensionsmgr.EngineExtensionsManager; @@ -75,22 +73,19 @@ // For each extension - get the relevant authn extension. Map<String, AuthenticationProfile> results = new HashMap<>(); - for (ExtensionProxy authnExtension : EngineExtensionsManager.getInstance().getExtensionsByService(Authn.class.getName())) { + for (ExtensionProxy authzExtension : EngineExtensionsManager.getInstance().getExtensionsByService(Authz.class.getName())) { try { - String mapperName = authnExtension.getContext().<Properties>get(Base.ContextKeys.CONFIGURATION).getProperty(Authn.ConfigKeys.MAPPING_PLUGIN); - String authzName = authnExtension.getContext().<Properties>get(Base.ContextKeys.CONFIGURATION).getProperty(Authn.ConfigKeys.AUTHZ_PLUGIN); AuthenticationProfile profile = new AuthenticationProfile( - authnExtension, - EngineExtensionsManager.getInstance().getExtensionByName(authzName), - mapperName != null ? EngineExtensionsManager.getInstance().getExtensionByName(mapperName) : null + authzExtension, + null ); if (results.containsKey(profile.getName())) { log.warn( "Profile name '{}' already registered for '{}', ignoring for '{}'", profile.getName(), - results.get(profile.getName()).getAuthnName(), - profile.getAuthnName() + results.get(profile.getName()).getAuthzName(), + profile.getAuthzName() ); } else { results.put(profile.getName(), profile); 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 ce9c370..aa24039 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 @@ -29,10 +29,6 @@ return proxy.getContext().<String> get(Base.ContextKeys.INSTANCE_NAME); } - public static boolean supportsPasswordAuthentication(ExtensionProxy proxy) { - return (proxy.getContext().<Long> get(Authn.ContextKeys.CAPABILITIES, 0L) & Authn.Capabilities.AUTHENTICATE_PASSWORD) != 0; - } - public static ExtMap fetchPrincipalRecord(final ExtensionProxy extension, ExtMap authRecord) { return fetchPrincipalRecordImpl( extension, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAAAProfileListQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAAAProfileListQuery.java index eac6fc1..5268909 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAAAProfileListQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAAAProfileListQuery.java @@ -22,8 +22,7 @@ List<AuthenticationProfile> profiles = AuthenticationProfileRepository.getInstance().getProfiles(); List<ProfileEntry> names = new ArrayList<>(profiles.size()); for (AuthenticationProfile profile : profiles) { - names.add(new ProfileEntry(profile.getName(), AuthzUtils.getName(profile.getAuthz()), - AuthzUtils.supportsPasswordAuthentication(profile.getAuthn()))); + names.add(new ProfileEntry(profile.getName(), AuthzUtils.getName(profile.getAuthz()))); } Collections.sort(names, new Comparator<ProfileEntry>() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutSessionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutSessionCommand.java index 9245f0c..ed6fe18 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutSessionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LogoutSessionCommand.java @@ -3,9 +3,6 @@ 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.core.aaa.AuthenticationProfile; import org.ovirt.engine.core.bll.CommandBase; import org.ovirt.engine.core.bll.context.CommandContext; @@ -41,15 +38,6 @@ if (profile == null) { setSucceeded(false); } else { - if ((profile.getAuthn().getContext().<Long> get(Authn.ContextKeys.CAPABILITIES) & Authn.Capabilities.LOGOUT) != 0) { - profile.getAuthn().invoke(new ExtMap().mput( - Base.InvokeKeys.COMMAND, - Authn.InvokeCommands.LOGOUT - ).mput( - Authn.InvokeKeys.PRINCIPAL, - SessionDataContainer.getInstance().getPrincipalName(getParameters().getSessionId()) - )); - } SessionDataContainer.getInstance().removeSessionOnLogout(getParameters().getSessionId()); setSucceeded(true); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/ProfileEntry.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/ProfileEntry.java index 551047d..f61f3f9 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/ProfileEntry.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/ProfileEntry.java @@ -8,15 +8,12 @@ private String profile; private String authz; - private boolean supportsPasswordAuthentication; - public ProfileEntry() { } - public ProfileEntry(String profile, String authz, boolean supportsPasswordAuthentication) { + public ProfileEntry(String profile, String authz) { this.profile = profile; this.authz = authz; - this.supportsPasswordAuthentication = supportsPasswordAuthentication; } public String getProfile() { @@ -25,10 +22,6 @@ public String getAuthz() { return authz; - } - - public boolean getSupportsPasswordAuthenication() { - return supportsPasswordAuthentication; } public String toString() { diff --git a/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/servlets/LogoutServlet.java b/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/servlets/LogoutServlet.java index 255f790..838763a 100644 --- a/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/servlets/LogoutServlet.java +++ b/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/servlets/LogoutServlet.java @@ -1,6 +1,11 @@ package org.ovirt.engine.core.sso.servlets; import org.apache.commons.lang.StringUtils; +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.core.sso.utils.AuthenticationProfile; +import org.ovirt.engine.core.sso.utils.AuthenticationProfileRepository; import org.ovirt.engine.core.sso.utils.SSOConfig; import org.ovirt.engine.core.sso.utils.SSOUtils; @@ -10,6 +15,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.IOException; +import java.util.Map; public class LogoutServlet extends HttpServlet { @@ -20,6 +26,23 @@ throws ServletException, IOException { HttpSession existingSession = request.getSession(false); if (existingSession != null) { + Map<String, Object> sessionData = SSOUtils.getSessionData(existingSession.getServletContext(), existingSession.getId()); + AuthenticationProfileRepository repo = (AuthenticationProfileRepository) existingSession.getServletContext().getAttribute(SSOUtils.AUTH_PROFILE_REPOSITORY); + if (sessionData != null && repo != null && sessionData.containsKey(SSOUtils.SSO_PROFILE_ATTR_NAME)) { + AuthenticationProfile authProfile = repo.getProfile((String) sessionData.get(SSOUtils.SSO_PROFILE_ATTR_NAME)); + if ((authProfile.getAuthn().getContext().<Long> get(Authn.ContextKeys.CAPABILITIES) & Authn.Capabilities.LOGOUT) != 0) { + ExtMap authRecord = (ExtMap) sessionData.get(SSOUtils.SSO_AUTH_RECORD_ATTR_NAME); + authProfile.getAuthn().invoke(new ExtMap().mput( + Base.InvokeKeys.COMMAND, + Authn.InvokeCommands.LOGOUT + ).mput( + Authn.InvokeKeys.PRINCIPAL, + authRecord.<String>get(Authn.AuthRecord.PRINCIPAL) + )); + } + + + } existingSession.invalidate(); } if (StringUtils.isNotEmpty(request.getParameter(SSOUtils.POST_LOGIN_URL))) { diff --git a/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/servlets/SSOContextListener.java b/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/servlets/SSOContextListener.java index 0c5d7b8..232e15c 100644 --- a/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/servlets/SSOContextListener.java +++ b/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/servlets/SSOContextListener.java @@ -40,6 +40,7 @@ ctx.setAttribute(SSOUtils.SSO_CONFIG, config); config.setSsoProfiles(AuthenticationUtils.getAvailableProfiles(ctx)); + config.setSsoProfilesSupportingPasswd(AuthenticationUtils.getAvailableProfilesSupportingPasswd(ctx)); config.setWelcomeUrl(localConfig.getProperty(WELCOME_URL)); config.setAcceptBasicAuthHeaders(localConfig.getBoolean(ACCEPT_BASIC_AUTH_HEADERS)); config.setAllowDisableExternalAuth(localConfig.getBoolean(ALLOW_DISABLE_EXTERNAL_AUTH)); diff --git a/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/utils/AuthenticationUtils.java b/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/utils/AuthenticationUtils.java index fc41a79..429fc33 100644 --- a/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/utils/AuthenticationUtils.java +++ b/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/utils/AuthenticationUtils.java @@ -115,4 +115,16 @@ } return profiles; } + + public static List<String> getAvailableProfilesSupportingPasswd(ServletContext ctx) { + SSOConfig ssoConfig = (SSOConfig) ctx.getAttribute(SSOUtils.SSO_CONFIG); + List<String> profiles = new ArrayList<>(); + for (ExtensionProxy authnExtension : ssoConfig.getSsoExtensionsManager().getExtensionsByService(Authn.class.getName())) { + if ((authnExtension.getContext().<Long> get(Authn.ContextKeys.CAPABILITIES, 0L) & Authn.Capabilities.AUTHENTICATE_PASSWORD) != 0) { + Properties config = authnExtension.getContext().get(Base.ContextKeys.CONFIGURATION); + profiles.add(config.getProperty(Authn.ConfigKeys.PROFILE_NAME)); + } + } + return profiles; + } } diff --git a/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/utils/SSOConfig.java b/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/utils/SSOConfig.java index b3a300d..36671fa 100644 --- a/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/utils/SSOConfig.java +++ b/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/utils/SSOConfig.java @@ -7,6 +7,7 @@ private SSOExtensionsManager ssoExtensionsManager; private DBUtils dbUtils; private List<String> ssoProfiles; + private List<String> ssoProfilesSupportingPasswd; private String welcomeUrl; private boolean enableExternalAuth; private boolean allowDisableExternalAuth; @@ -46,6 +47,14 @@ this.ssoProfiles = ssoProfiles; } + public List<String> getSsoProfilesSupportingPasswd() { + return ssoProfilesSupportingPasswd; + } + + public void setSsoProfilesSupportingPasswd(List<String> ssoProfiles) { + this.ssoProfilesSupportingPasswd = ssoProfiles; + } + public String getWelcomeUrl() { return welcomeUrl; } diff --git a/backend/manager/modules/enginesso/src/main/webapp/WEB-INF/login.jsp b/backend/manager/modules/enginesso/src/main/webapp/WEB-INF/login.jsp index 7b1e313..4d3552c 100644 --- a/backend/manager/modules/enginesso/src/main/webapp/WEB-INF/login.jsp +++ b/backend/manager/modules/enginesso/src/main/webapp/WEB-INF/login.jsp @@ -50,7 +50,7 @@ <p> <label for="profile" style="width:70px;"> Profile</label> <select id="profile" name="profile" style="color:black;"> - <c:forEach items="${applicationScope.config.ssoProfiles}" var="profile" > + <c:forEach items="${applicationScope.config.ssoProfilesSupportingPasswd}" var="profile" > <c:choose> <c:when test="${cookie['profile'] != null && cookie['profile'].value == profile}"> <option value="${profile}" selected>${profile}</option> diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java index db00de9..aa4d577 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java @@ -14,7 +14,6 @@ import java.util.Set; import org.ovirt.engine.api.extensions.Base; -import org.ovirt.engine.api.extensions.aaa.Authn; import org.ovirt.engine.api.extensions.aaa.Authz; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; @@ -142,26 +141,6 @@ } private void createInternalAAAConfigurations() { - Properties authConfig = new Properties(); - authConfig.put(Base.ConfigKeys.NAME, "builtin-authn-internal"); - authConfig.put(Base.ConfigKeys.PROVIDES, Authn.class.getName()); - authConfig.put(Base.ConfigKeys.BINDINGS_METHOD, Base.ConfigBindingsMethods.JBOSSMODULE); - authConfig.put(Base.ConfigKeys.BINDINGS_JBOSSMODULE_MODULE, "org.ovirt.engine.extensions.builtin"); - authConfig.put(Base.ConfigKeys.BINDINGS_JBOSSMODULE_CLASS, - "org.ovirt.engine.extensions.aaa.builtin.internal.InternalAuthn"); - authConfig.put("ovirt.engine.aaa.authn.profile.name", "internal"); - authConfig.put("ovirt.engine.aaa.authn.authz.plugin", "internal"); - authConfig.put("config.authn.user.name", Config.<String> getValue(ConfigValues.AdminUser)); - authConfig.put("config.authn.user.password", Config.<String> getValue(ConfigValues.AdminPassword)); - authConfig.put(Base.ConfigKeys.SENSITIVE_KEYS, "config.authn.user.password)"); - try { - load(authConfig); - } catch (Exception ex) { - log.error("Could not load auth config internal aaa extension based on configuration. Exception message is: {}", - ex.getMessage()); - log.debug("", ex); - } - Properties dirConfig = new Properties(); dirConfig.put(Base.ConfigKeys.NAME, "internal"); dirConfig.put(Base.ConfigKeys.PROVIDES, Authz.class.getName()); @@ -206,28 +185,6 @@ for (String domain : Config.<String> getValue(ConfigValues.DomainName).split("[,]", 0)) { domain = domain.trim(); if (!domain.isEmpty()) { - Properties authConfig = new Properties(); - authConfig.put(Base.ConfigKeys.NAME, String.format("builtin-authn-%1$s", domain)); - authConfig.put(Base.ConfigKeys.PROVIDES, Authn.class.getName()); - authConfig.put(Base.ConfigKeys.ENABLED, "true"); - authConfig.put(Base.ConfigKeys.BINDINGS_METHOD, Base.ConfigBindingsMethods.JBOSSMODULE); - authConfig.put(Base.ConfigKeys.BINDINGS_JBOSSMODULE_MODULE, "org.ovirt.engine.extensions.builtin"); - authConfig.put(Base.ConfigKeys.BINDINGS_JBOSSMODULE_CLASS, - "org.ovirt.engine.extensions.aaa.builtin.kerberosldap.KerberosLdapAuthn"); - authConfig.put("ovirt.engine.aaa.authn.profile.name", domain); - authConfig.put("ovirt.engine.aaa.authn.authz.plugin", domain); - authConfig.put("config.change.password.url", blankIfNull(passwordChangeUrlPerDomain.get(domain))); - authConfig.put("config.change.password.msg", blankIfNull(passwordChangeMsgPerDomain.get(domain))); - attachConfigValuesFromDb(authConfig, domain); - try { - load(authConfig); - } catch (Exception ex) { - log.error("Could not load auth config for extension {} based on configuration. Exception message is: {}", - domain, - ex.getMessage()); - log.debug("", ex); - } - Properties dirConfig = new Properties(); dirConfig.put(Base.ConfigKeys.NAME, domain); dirConfig.put(Base.ConfigKeys.PROVIDES, Authz.class.getName()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index d0076c1..1800bbb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -547,7 +547,7 @@ } public void getAAAProfilesListViaPublic(AsyncQuery aQuery, boolean passwordBasedOnly) { - convertAAAProfilesResult(aQuery, passwordBasedOnly); + convertAAAProfilesResult(aQuery); Frontend.getInstance().runPublicQuery(VdcQueryType.GetAAAProfileList, new VdcQueryParametersBase(), aQuery); } @@ -1299,7 +1299,7 @@ } public void getAAAProfilesList(AsyncQuery aQuery) { - convertAAAProfilesResult(aQuery, false); + convertAAAProfilesResult(aQuery); Frontend.getInstance().runQuery(VdcQueryType.GetAAAProfileList, new VdcQueryParametersBase(), aQuery); } @@ -3944,16 +3944,14 @@ } } - private static void convertAAAProfilesResult(AsyncQuery aQuery, final boolean passwordBasedOnly) { + private static void convertAAAProfilesResult(AsyncQuery aQuery) { aQuery.converterCallback = new IAsyncConverter() { @Override public Object Convert(Object source, AsyncQuery _asyncQuery) { List<String> results = new ArrayList<String>(); for (ProfileEntry profileEntry : (Collection<ProfileEntry>) source) { - if (!passwordBasedOnly || profileEntry.getSupportsPasswordAuthenication()) { - results.add(profileEntry.getProfile()); - } + results.add(profileEntry.getProfile()); } return results; } -- To view, visit https://gerrit.ovirt.org/40154 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie97dbdb8540b26cd8b53f8c373970361ddec4d6b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
