Attachment 585262 Details for Bug 822359 – catalog and environment patch switching to https from http

[patch] catalog and environment patch switching to https from http

catalog.patch (text/plain), 1.81 KB, created by Greg Nichols on 2012-05-17 16:00:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2012-05-17 16:00:40 UTC

Size: 1.81 KB

patch

obsolete

>Index: catalog.py
>===================================================================
>--- catalog.py	(revision 1302)
>+++ catalog.py	(working copy)
>@@ -18,8 +18,7 @@
> # Notes:
> # The catalog instance (server URL) is taken from the enviroment (/etc/v7.xml).
> 
>-import xmlrpclib
>-import urllib2
>+import re, xmlrpclib, urllib2
> 
> from v7.controller import Controller
> from v7.environment import Environment
>@@ -36,9 +35,15 @@
>         
>     def getCatalogServer(self):
>         catalogServer = self.environment.getCatalogURL()
>-        # get just the server URL by stripping off the end of the URL (find the / at least 7 characters from the left).
>-        return catalogServer[0:catalogServer.index('/', 7)]
>+        pattern = re.compile("(?P<protocol>[^:]+)://(?P<host>[^/^\?]+)")
>+        match = pattern.match(self.environment.getCatalogURL())
>+        if match and match.group("host") and match.group("protocol"):
>+            return "%s://%s" % (match.group("protocol"), match.group("host"))
>+        # otherwise
>+        print "Error: could not parse server hostname from catalog URL \"%s\"" % self.environment.getCatalogURL()
>+        return None
>         
>+        
>     def isReachable(self):
>         """ check to see that the catalog server is reachable """
>         try:
>Index: environment.py
>===================================================================
>--- environment.py	(revision 1258)
>+++ environment.py	(working copy)
>@@ -48,7 +48,7 @@
>         self.defaultResultsWarningSize = 12 * 1048576 # bytes
>         self.defaultFVGuestTimelimit = 60 # minutes
>         self.defaultRebootTimelimit = 10 # minutes
>-        self.defaultCatalogURL="http://partner-hwcert.redhat.com/xmlrpc.cgi"
>+        self.defaultCatalogURL="https://partner-hwcert.redhat.com/xmlrpc.cgi"
>         
>         try:
>             self.load(self.environmentFile)

Actions: View | Diff

Attachments on bug 822359: 585262