Alon Bar-Lev has uploaded a new change for review. Change subject: aaa: normalize extension name within ENGINE_EXTENSION_ENABLED_ ......................................................................
aaa: normalize extension name within ENGINE_EXTENSION_ENABLED_ needed to keep the format shell compatible. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1184895 Change-Id: I3a06518ff7c96ec7483b26591408cd2977636e36 Signed-off-by: Alon Bar-Lev <alo...@redhat.com> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java M packaging/services/ovirt-engine/ovirt-engine.conf.in 2 files changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/37221/1 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 bf5ccf4..3a04026 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 @@ -97,9 +97,10 @@ for (ExtensionProxy extension : getLoadedExtensions()) { if ( EngineLocalConfig.getInstance().getBoolean( - ( - ENGINE_EXTENSION_ENABLED + extension.getContext() - .<String> get(Base.ContextKeys.INSTANCE_NAME) + ENGINE_EXTENSION_ENABLED + normalizeName( + extension.getContext().<String> get( + Base.ContextKeys.INSTANCE_NAME + ) ), Boolean.parseBoolean( extension.getContext().<Properties> get( @@ -115,6 +116,18 @@ dump(); } + private String normalizeName(String s) { + StringBuilder ret = new StringBuilder(); + for (char c : s.toCharArray()) { + if (c == '_' || Character.isLetterOrDigit(c)) { + ret.append(c); + } else { + ret.append('_'); + } + } + return ret.toString(); + } + private void createInternalAAAConfigurations() { Properties authConfig = new Properties(); authConfig.put(Base.ConfigKeys.NAME, "builtin-authn-internal"); diff --git a/packaging/services/ovirt-engine/ovirt-engine.conf.in b/packaging/services/ovirt-engine/ovirt-engine.conf.in index 3b1189a..98998f8 100644 --- a/packaging/services/ovirt-engine/ovirt-engine.conf.in +++ b/packaging/services/ovirt-engine/ovirt-engine.conf.in @@ -233,3 +233,9 @@ ENGINE_REPORTS_NOT_INSTALLED_URL=/ovirt-engine/ReportsNotInstalled.html ENGINE_EXTENSION_PATH="${ENGINE_USR}/extensions.d:${ENGINE_ETC}/extensions.d" + +# +# Disable extensions (override extension configuration) +# +# ENGINE_EXTENSION_ENABLED_<name> = false +# -- To view, visit http://gerrit.ovirt.org/37221 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3a06518ff7c96ec7483b26591408cd2977636e36 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
