Attachment 870617 Details for Bug 1071466 – New patch to fix logic for fence_cisco_ucs and fence_vmware_soap

[patch] New patch to fix logic for fence_cisco_ucs and fence_vmware_soap

supercazzola.diff (text/plain), 5.09 KB, created by Fabio Massimo Di Nitto on 2014-03-04 20:16:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabio Massimo Di Nitto

Created: 2014-03-04 20:16:16 UTC

Size: 5.09 KB

patch

obsolete

>diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py
>index 71782cb..1e9d983 100644
>--- a/fence/agents/cisco_ucs/fence_cisco_ucs.py
>+++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py
>@@ -85,8 +85,14 @@ def send_command(opt, command, timeout):
> 	c.setopt(pycurl.POSTFIELDS, command)
> 	c.setopt(pycurl.WRITEFUNCTION, b.write)
> 	c.setopt(pycurl.TIMEOUT, timeout)
>-	c.setopt(pycurl.SSL_VERIFYPEER, 0)
>-	c.setopt(pycurl.SSL_VERIFYHOST, 0)
>+	if opt.has_key("--ssl") or opt.has_key("--ssl-secure"):
>+		c.setopt(pycurl.SSL_VERIFYPEER, 1)
>+		c.setopt(pycurl.SSL_VERIFYHOST, 2)
>+
>+	if opt.has_key("--ssl-insecure"):
>+		c.setopt(pycurl.SSL_VERIFYPEER, 0)
>+		c.setopt(pycurl.SSL_VERIFYHOST, 0)
>+		
> 	c.perform()
> 	result = b.getvalue()
> 
>diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
>index 2006f0d..e40cbb2 100644
>--- a/fence/agents/lib/fencing.py.py
>+++ b/fence/agents/lib/fencing.py.py
>@@ -170,6 +170,20 @@ all_opt = {
> 		"required" : "0",
> 		"shortdesc" : "SSL connection",
> 		"order" : 1 },
>+	"ssl_insecure" : {
>+		"getopt" : "9",
>+		"longopt" : "ssl-insecure",
>+		"help" : "--ssl-insecure                 Use ssl connection without verifying certificate",
>+		"required" : "0",
>+		"shortdesc" : "SSL connection without verifying fence device's certificate",
>+		"order" : 1 },
>+	"ssl_secure" : {
>+		"getopt" : "9",
>+		"longopt" : "ssl-secure",
>+		"help" : "--ssl-secure                   Use ssl connection with verifying certificate",
>+		"required" : "0",
>+		"shortdesc" : "SSL connection with verifying fence device's certificate",
>+		"order" : 1 },
> 	"notls" : {
> 		"getopt" : "t",
> 		"longopt" : "notls",
>@@ -370,6 +384,7 @@ DEPENDENCY_OPT = {
> 		"secure" : [ "identity_file", "ssh_options" ],
> 		"ipaddr" : [ "ipport", "inet4_only", "inet6_only" ],
> 		"port" : [ "separator" ],
>+		"ssl" : [ "ssl_secure", "ssl_insecure" ],
> 		"community" : [ "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", \
> 			"snmp_priv_passwd", "snmp_priv_passwd_script" ]
> 	}
>@@ -645,7 +660,7 @@ def check_input(device_opt, opt):
> 		elif options.has_key("--ssh"):
> 			all_opt["ipport"]["default"] = 22
> 			all_opt["ipport"]["help"] = "-u, --ipport=[port]            TCP/UDP port to use (default 22)"
>-		elif options.has_key("--ssl"):
>+		elif options.has_key("--ssl") or options.has_key("--ssl-secure") or options.has_key("--ssl-insecure"):
> 			all_opt["ipport"]["default"] = 443
> 			all_opt["ipport"]["help"] = "-u, --ipport=[port]            TCP/UDP port to use (default 443)"
> 		elif device_opt.count("web"):
>@@ -738,7 +753,7 @@ def check_input(device_opt, opt):
> 	if options.has_key("--ipport") == False:
> 		if options.has_key("--ssh"):
> 			options["--ipport"] = 22
>-		elif options.has_key("--ssl"):
>+		elif options.has_key("--ssl") or options.has_key("--ssl-secure") or options.has_key("--ssl-insecure"):
> 			options["--ipport"] = 443
> 		elif device_opt.count("web"):
> 			options["--ipport"] = 80
>@@ -968,11 +983,17 @@ def fence_login(options, re_login_string = "(login\s*: )|(Login Name:  )|(userna
> 		re_pass  = re.compile("(password)|(pass phrase)", re.IGNORECASE)
> 
> 		if options.has_key("--ssl"):
>-			gnutls_opts=""
>+			gnutls_opts = ""
>+			ssl_opts = ""
>+
> 			if options.has_key("--notls"):
> 				gnutls_opts = "--priority \"NORMAL:-VERS-TLS1.2:-VERS-TLS1.1:-VERS-TLS1.0:+VERS-SSL3.0\""
> 
>-			command = '%s %s --insecure --crlf -p %s %s' % (SSL_PATH, gnutls_opts, options["--ipport"], options["--ip"])
>+			# --ssl is same as the --ssl-secure
>+			if options.has_key("--ssl-insecure"):
>+				ssl_opts = "--insecure"
>+
>+			command = '%s %s %s --crlf -p %s %s' % (SSL_PATH, gnutls_opts, ssl_opts, options["--ipport"], options["--ip"])
> 			try:
> 				conn = fspawn(options, command)
> 			except pexpect.ExceptionPexpect, ex:
>diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py
>index ff3d19f..6098071 100644
>--- a/fence/agents/rhevm/fence_rhevm.py
>+++ b/fence/agents/rhevm/fence_rhevm.py
>@@ -84,9 +84,14 @@ def send_command(opt, command, method = "GET"):
> 	c.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_BASIC)
> 	c.setopt(pycurl.USERPWD, opt["--username"] + ":" + opt["--password"])
> 	c.setopt(pycurl.TIMEOUT, int(opt["--shell-timeout"]))
>-	c.setopt(pycurl.SSL_VERIFYPEER, 0)
>-	c.setopt(pycurl.SSL_VERIFYHOST, 0)
>-
>+	if opt.has_key("--ssl") or opt.has_key("--ssl-secure"):
>+		c.setopt(pycurl.SSL_VERIFYPEER, 1)
>+		c.setopt(pycurl.SSL_VERIFYHOST, 2)
>+
>+	if opt.has_key("--ssl-insecure"):
>+		c.setopt(pycurl.SSL_VERIFYPEER, 0)
>+		c.setopt(pycurl.SSL_VERIFYHOST, 0)
>+                                                                               
> 	if (method == "POST"):
> 		c.setopt(pycurl.POSTFIELDS, "<action />")
> 
>diff --git a/fence/agents/vmware_soap/fence_vmware_soap.py b/fence/agents/vmware_soap/fence_vmware_soap.py
>index bbac1c5..6c4e474 100644
>--- a/fence/agents/vmware_soap/fence_vmware_soap.py
>+++ b/fence/agents/vmware_soap/fence_vmware_soap.py
>@@ -7,6 +7,8 @@ sys.path.append("@FENCEAGENTSLIBDIR@")
> 
> from suds.client import Client
> from suds.sudsobject import Property
>+from suds.transport.http import HttpAuthenticated
>+from suds.transport import Reply, TransportError
> from fencing import *
> 
> #BEGIN_VERSION_GENERATION

Actions: View | Diff

Attachments on bug 1071466: 870423 | 870617 | 870924