Alon Bar-Lev has uploaded a new change for review. Change subject: bll: GetCACertificateQuery: cleanup: reuse host install CA certificate logic ......................................................................
bll: GetCACertificateQuery: cleanup: reuse host install CA certificate logic assuming the CA certificate file can be sent as is is invalid as it can contain other attributes. reuse the logic elsewhere to encode certificate. Change-Id: I75cf38996085b96f811c7365da0bf319913b4586 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java 1 file changed, 6 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/20792/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java index 7d7833c..0cebd04 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java @@ -1,11 +1,7 @@ package org.ovirt.engine.core.bll; -import java.io.File; -import java.io.IOException; - import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; -import org.ovirt.engine.core.utils.EngineLocalConfig; -import org.ovirt.engine.core.utils.FileUtil; +import org.ovirt.engine.core.utils.hostinstall.OpenSslCAWrapper; public class GetCACertificateQuery<P extends VdcQueryParametersBase> extends QueriesCommandBase<P> { public GetCACertificateQuery(P parameters) { @@ -14,16 +10,12 @@ @Override protected void executeQueryCommand() { - getQueryReturnValue().setSucceeded(false); - File path = EngineLocalConfig.getInstance().getPKICACert(); - if (path.exists()) { - try { - getQueryReturnValue().setReturnValue(FileUtil.readAllText(path.getAbsolutePath())); - } catch (IOException e) { - getQueryReturnValue().setExceptionString(e.getMessage()); - return; - } + try { + getQueryReturnValue().setSucceeded(false); + getQueryReturnValue().setReturnValue(OpenSslCAWrapper.getCACertificate()); getQueryReturnValue().setSucceeded(true); + } catch (Exception e) { + getQueryReturnValue().setExceptionString(e.getMessage()); } } } -- To view, visit http://gerrit.ovirt.org/20792 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I75cf38996085b96f811c7365da0bf319913b4586 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
