Alex Lourie has uploaded a new change for review.

Change subject: packaging: Fixed creating objects in an insecure way
......................................................................

packaging: Fixed creating objects in an insecure way

Change-Id: I015c6b5441f0d1e33bb3aae378a59ad8557f9da5
Bug-Url: https://bugzilla.redhat.com/886525
Signed-off-by: Alex Lourie <alou...@redhat.com>
---
M src/engine-iso-uploader.py
1 file changed, 20 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-iso-uploader 
refs/changes/15/10815/1

diff --git a/src/engine-iso-uploader.py b/src/engine-iso-uploader.py
index af9297c..c676529 100644
--- a/src/engine-iso-uploader.py
+++ b/src/engine-iso-uploader.py
@@ -402,13 +402,26 @@
 
             url = "https://"; + self.configuration.get("engine") + "/api"
             try:
-                self.api = API(
-                    url=url,
-                    username=self.configuration.get("user"),
-                    password=self.configuration.get("passwd"),
-                    ca_file=self.configuration.get("engine_ca"),
-                    insecure=self.configuration.get("insecure")
-                )
+                # Create a set of parameters to the API object creation.
+                params = {
+                    "url": url,
+                    "username": self.configuration.get("user"),
+                    "password": self.configuration.get("passwd"),
+                }
+
+                # If "insecure" option was provided, use it during API creation
+                if self.configuration.get("insecure"):
+                    params.update({
+                        "insecure": True,
+                    })
+                # Otherwise, use ca_file
+                else:
+                    params.update({
+                        "ca_file": self.configuration.get("engine_ca"),
+                    })
+
+                # Create an API object
+                self.api = API(**params)
 
                 pi = self.api.get_product_info()
                 if pi is not None:


--
To view, visit http://gerrit.ovirt.org/10815
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I015c6b5441f0d1e33bb3aae378a59ad8557f9da5
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-iso-uploader
Gerrit-Branch: master
Gerrit-Owner: Alex Lourie <alou...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to