backend/server/apacheAuth.py | 9 +++++++--
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 888b51f267d06e780fa19e39f319531f52d44d4b
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Aug 27 11:04:19 2012 -0400
Automatic commit of package [spacewalk-backend] release [1.8.63-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c7e00b1..ed54ec1 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.62
+Version: 1.8.63
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -647,6 +647,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Aug 27 2012 Stephen Herr <sherr(a)redhat.com> 1.8.63-1
+- 848475 - Adding IPv6 ip-address detection to proxy auth fix
+
* Sun Aug 26 2012 Aron Parsons <aronparsons(a)gmail.com> 1.8.62-1
- add --no-errata option to spacewalk-repo-sync
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index e525103..627daee 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.62-1 backend/
+1.8.63-1 backend/
commit 4b4c1147351dd2c210d1d907ec53f47cd71e9914
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Aug 27 11:03:56 2012 -0400
848475 - Adding IPv6 ip-address detection to proxy auth fix
diff --git a/backend/server/apacheAuth.py b/backend/server/apacheAuth.py
index 82b66f2..12d0962 100644
--- a/backend/server/apacheAuth.py
+++ b/backend/server/apacheAuth.py
@@ -50,8 +50,13 @@ def _verifyProxyAuthToken(auth_token):
log_debug(4, auth_token)
token, hostname = splitProxyAuthToken(auth_token)
hostname = hostname.strip()
- ip_regex =
'^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$'
- hostname_is_ip_address = re.match(ip_regex, hostname)
+ ipv4_regex =
'^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$'
+ # This ipv6 regex was develeoped by Stephen Ryan at Dataware.
+ # (
http://forums.intermapper.com/viewtopic.php?t=452) It is licenced
+ # under a Creative Commons Attribution-ShareAlike 3.0 Unported
+ # License, so we are free to use it as long as we attribute it to him.
+ ipv6_regex =
'^((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-
f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?$'
+ hostname_is_ip_address = re.match(ipv4_regex, hostname) or re.match(ipv6_regex,
hostname)
headers = rhnFlags.get('outputTransportOptions')
if len(token) < 5: