client/tools/osad/osad.spec | 5 ++++-
client/tools/osad/src/jabber_lib.py | 3 ++-
rel-eng/packages/osad | 2 +-
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
spacewalk/certs-tools/sslToolLib.py | 3 ++-
6 files changed, 14 insertions(+), 6 deletions(-)
New commits:
commit 69a78ae0134c2deb8025320d8e566ac4c9fde9df
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 14:27:58 2011 +0200
Automatic commit of package [osad] release [5.10.23-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 08f4699..66bb930 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,7 +16,7 @@ Group: System Environment/Daemons
License: GPLv2
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.22
+Version: 5.10.23
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -275,6 +275,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Fri Sep 30 2011 Jan Pazdziora 5.10.23-1
+- 689939 - match star in common name.
+
* Fri Sep 30 2011 Jan Pazdziora 5.10.22-1
- 621531 - move /etc/rhn/default to /usr/share/rhn/config-defaults (osa-
dispatcher).
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index c742f95..f781633 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.22-1 client/tools/osad/
+5.10.23-1 client/tools/osad/
commit a18a99590e2d50b4122470ec1196fda1307d94e6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 14:27:48 2011 +0200
Automatic commit of package [spacewalk-certs-tools] release [1.6.5-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools
b/rel-eng/packages/spacewalk-certs-tools
index 7b5a192..1282b4d 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.6.4-1 spacewalk/certs-tools/
+1.6.5-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec
b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index cb8e9c2..73ba3fc 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.6.4
+Version: 1.6.5
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Fri Sep 30 2011 Jan Pazdziora 1.6.5-1
+- 689939 - allow rhn-ssl-tool to work with --set-hostname='*.example.com'.
+
* Wed Aug 24 2011 Miroslav Suchý 1.6.4-1
- if subjectAltName is used, hostname must be present in dNSName
commit 3801ed7115cc0a5c8573d643173389b4790bb419
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 14:25:22 2011 +0200
689939 - match star in common name.
diff --git a/client/tools/osad/src/jabber_lib.py b/client/tools/osad/src/jabber_lib.py
index 63514ef..5ee3473 100644
--- a/client/tools/osad/src/jabber_lib.py
+++ b/client/tools/osad/src/jabber_lib.py
@@ -22,6 +22,7 @@ import socket
import jabber
import random
import string
+import fnmatch
from optparse import OptionParser, Option
import traceback
from cStringIO import StringIO
@@ -679,7 +680,7 @@ class JabberClient(jabber.Client):
if hdot[-1] != '.':
hdot = hdot + '.'
- if common_name != hdot:
+ if common_name != hdot and not fnmatch.fnmatchcase(hdot, common_name):
raise SSLVerifyError("Mismatch: peer name: %s; common name: %s" %
(self._host, common_name))
commit 097d996912dbf488e4d6e0d836c510fadf0ab057
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 14:24:30 2011 +0200
689939 - allow rhn-ssl-tool to work with --set-hostname='*.example.com'.
diff --git a/spacewalk/certs-tools/sslToolLib.py b/spacewalk/certs-tools/sslToolLib.py
index 9cd4fb0..262d988 100644
--- a/spacewalk/certs-tools/sslToolLib.py
+++ b/spacewalk/certs-tools/sslToolLib.py
@@ -80,8 +80,9 @@ def getMachineName(hostname):
yyy.zzz.com --> yyy
zzz.com -->
zzz.com
xxx --> xxx
+ *.yyy.zzz.com --> _star_.yyy
"""
- hn = string.split(hostname, '.')
+ hn = string.split(hostname.replace('*', '_star_'), '.')
if len(hn) < 3:
return hostname
return string.join(hn[:-2], '.')