[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.3-2-g64a4bbc
X2Go dev team
git-admin at x2go.org
Sun May 19 13:03:16 CEST 2013
The branch, build-main has been updated
via 64a4bbcdb88c6c7c9748da79e11e0cec7fe37bed (commit)
from 7ed759b99d34ebfafaf169816a6e545be555bad8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 +++++-
x2gobroker/brokers/base_broker.py | 9 +++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 80d6878..e32ed19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
x2gobroker (0.0.0.4-0~x2go1) UNRELEASED; urgency=low
- * Continue development...
+ * New upstream version (0.0.0.4):
+ - Capture DNS resolver failures on client ACLs in case the
+ one of the listed hostnames in one client ACL definition is
+ not resolvable. Such a failure will deny access to the
+ corresponding session profile.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 21 Feb 2013 21:47:32 +0100
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 9e811c0..ad3e3e7 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -301,8 +301,13 @@ class X2GoBroker(object):
_acls_clients_deny[idx] = '0.0.0.0/0'
_acls_clients_deny.insert(idx, '::/0')
- _allow_address_set = netaddr.IPSet(_acls_clients_allow)
- _deny_address_set = netaddr.IPSet(_acls_clients_deny)
+ _allow_address_set = []
+ _deny_address_set = ['ALL']
+ try:
+ _allow_address_set = netaddr.IPSet(_acls_clients_allow)
+ _deny_address_set = netaddr.IPSet(_acls_clients_deny)
+ except netaddr.core.AddrFormatError, e:
+ logger_error.error('base_broker.X2GoBroker.check_acls(): netaddr.core.AddrFormatError - {why}'.format(why=str(e)))
_allow_client = self._client_address in _allow_address_set
_deny_client = self._client_address in _deny_address_set
hooks/post-receive
--
x2gobroker.git (HTTP(S) Session broker for X2Go)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).
More information about the x2go-commits
mailing list