Alon Bar-Lev has uploaded a new change for review.
Change subject: extapi: move authn config keys into api
......................................................................
extapi: move authn config keys into api
sync with Base.
Topic: AAA
Change-Id: I5f9104dae94d5992690efbb89b0867ba77926384
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M
backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java
M
backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authn.java
2 files changed, 12 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/32879/1
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 3d970f5..78a686b 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
@@ -18,10 +18,6 @@
public class AuthenticationProfileRepository implements Observer {
- private static final String AUTHN_SERVICE = Authn.class.getName();
- private static final String AUTHN_AUTHZ_PLUGIN =
"ovirt.engine.aaa.authn.authz.plugin";
- private static final String AUTHN_MAPPING_PLUGIN =
"ovirt.engine.aaa.authn.mapping.plugin";
-
private static final Logger log =
LoggerFactory.getLogger(AuthenticationProfileRepository.class);
private static volatile AuthenticationProfileRepository instance = null;
@@ -72,10 +68,10 @@
// For each extension - get the relevant authn extension.
Map<String, AuthenticationProfile> results = new HashMap<>();
- for (ExtensionProxy authnExtension :
EngineExtensionsManager.getInstance().getExtensionsByService(AUTHN_SERVICE)) {
+ for (ExtensionProxy authnExtension :
EngineExtensionsManager.getInstance().getExtensionsByService(Authn.class.getName()))
{
try {
- String mapperName =
authnExtension.getContext().<Properties>get(Base.ContextKeys.CONFIGURATION).getProperty(AUTHN_MAPPING_PLUGIN);
- String authzName =
authnExtension.getContext().<Properties>get(Base.ContextKeys.CONFIGURATION).getProperty(AUTHN_AUTHZ_PLUGIN);
+ 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),
diff --git
a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authn.java
b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authn.java
index 9e38c12..16b73c1 100644
---
a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authn.java
+++
b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authn.java
@@ -12,6 +12,15 @@
public class Authn {
/**
+ * Configuration keys.
+ * Configuration keys for the extension configuration.
+ */
+ public static class ConfigKeys {
+ public static final String AUTHZ_PLUGIN =
"ovirt.engine.aaa.authn.authz.plugin";
+ public static final String MAPPING_PLUGIN =
"ovirt.engine.aaa.authn.mapping.plugin";
+ }
+
+ /**
* Context keys.
*/
public static class ContextKeys {
--
To view, visit http://gerrit.ovirt.org/32879
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f9104dae94d5992690efbb89b0867ba77926384
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
