backend/satellite_exporter/satexport.py | 24 ++++++++++++++++++++++++
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 30 insertions(+), 2 deletions(-)
New commits:
commit 9e6fc53958a0e90d89a824cea83d0b36257349a1
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue May 21 16:54:43 2013 -0400
Automatic commit of package [spacewalk-backend] release [1.8.86-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 4da67eb..6e871b1 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.85
+Version: 1.8.86
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue May 21 2013 Grant Gainey <ggainey(a)redhat.com> 1.8.86-1
+- Turn off a pylint warning
+- 959457 - Fix ISS authentication hole
+
* Wed Oct 31 2012 Jan Pazdziora 1.8.85-1
- add org_id to DistChannelMap backend class
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index edf2176..096bb9f 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.85-1 backend/
+1.8.86-1 backend/
commit e8b28afc33fbe5dc097bd1b1bd970bca50fdc034
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue May 21 16:15:33 2013 -0400
Turn off a pylint warning
diff --git a/backend/satellite_exporter/satexport.py
b/backend/satellite_exporter/satexport.py
index a33000f..f3a8472 100644
--- a/backend/satellite_exporter/satexport.py
+++ b/backend/satellite_exporter/satexport.py
@@ -183,6 +183,7 @@ class ApacheServer(BaseApacheServer):
log_debug(4, "Exiting OK")
return apache.OK
+ # pylint: disable=R0201
def get_function(self, method_name, req):
self.auth_system(req)
# Get the module name
commit d0619697488303edeeb7bc6e45a8e36629b0cc5c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 21 13:50:39 2013 -0400
959457 - Fix ISS authentication hole
diff --git a/backend/satellite_exporter/satexport.py
b/backend/satellite_exporter/satexport.py
index 60413c7..a33000f 100644
--- a/backend/satellite_exporter/satexport.py
+++ b/backend/satellite_exporter/satexport.py
@@ -29,6 +29,8 @@ from spacewalk.server import rhnSQL, rhnImport
from spacewalk.satellite_tools.disk_dumper.dumper import ClosedConnectionError
from spacewalk.satellite_tools import constants
+from rhn.connections import idn_ascii_to_pune
+
class BaseApacheServer:
def __init__(self):
# Init log to stderr
@@ -182,6 +184,7 @@ class ApacheServer(BaseApacheServer):
return apache.OK
def get_function(self, method_name, req):
+ self.auth_system(req)
# Get the module name
idx = method_name.rfind('.')
module_name, function_name = method_name[:idx], method_name[idx+1:]
@@ -199,6 +202,26 @@ class ApacheServer(BaseApacheServer):
(module_name, function_name))
return f
+ def auth_system(self, req):
+ if CFG.DISABLE_ISS:
+ raise rhnFault(2005, _('ISS is disabled on this satellite.'))
+
+ if CFG.ALLOWED_ISS_SLAVES:
+ if not isinstance(CFG.ALLOWED_ISS_SLAVES, list):
+ allowed_iss_slaves = [CFG.ALLOWED_ISS_SLAVES]
+ else:
+ allowed_iss_slaves = CFG.ALLOWED_ISS_SLAVES
+ allowed_iss_slaves = [idn_ascii_to_pune(x) for x in allowed_iss_slaves]
+ else:
+ allowed_iss_slaves = []
+
+ remote_hostname = req.get_remote_host(apache.REMOTE_DOUBLE_REV)
+ if remote_hostname not in allowed_iss_slaves:
+ raise rhnFault(2004,
+ _('Server "%s" is not enabled for ISS.')
+ % remote_hostname)
+ return remote_hostname
+
@staticmethod
def _validate_version(req):
server_version = constants.PROTOCOL_VERSION