[X2Go-Commits] [python-x2go] 01/08: Detect more exceptions in the requests module when authenticating against a session broker.

git-admin at x2go.org git-admin at x2go.org
Mon Oct 20 12:43:08 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch build-main
in repository python-x2go.

commit 2fc8ab673c174a273b70d5f593d050d19f0ed2d1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Oct 20 09:23:21 2014 +0200

    Detect more exceptions in the requests module when authenticating against a session broker.
---
 debian/changelog                     |    2 ++
 x2go/backends/profiles/httpbroker.py |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a36dfdc..97aa7bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -117,6 +117,8 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low
     - Fix creating/renaming/reconfiguring session profiles. Handle host
       option properly (as list).
     - Make sure we do a deepcopy of the default session profile parameters.
+    - Detect more exceptions in the requests module when authenticating against a
+      session broker.
   * debian/control:
     + Add dependencies: python-requests, python-simplejson.
     + Add R (python-x2go): sshfs.
diff --git a/x2go/backends/profiles/httpbroker.py b/x2go/backends/profiles/httpbroker.py
index fd3d971..e27f2ab 100644
--- a/x2go/backends/profiles/httpbroker.py
+++ b/x2go/backends/profiles/httpbroker.py
@@ -28,6 +28,7 @@ __NAME__ = 'x2gosessionprofiles-pylib'
 
 import re
 import requests
+import urllib3.exceptions
 import copy
 import types
 import time
@@ -145,7 +146,7 @@ class X2GoSessionProfiles(base.X2GoSessionProfiles):
                 request_data['password'] = broker_password or ''
             try:
                 r = requests.post(self.broker_url, data=request_data)
-            except requests.exceptions.ConnectionError:
+            except (requests.exceptions.ConnectionError, requests.exceptions.MissingSchema, urllib3.exceptions.LocationParseError):
                 raise x2go.x2go_exceptions.X2GoBrokerConnectionException('Failed to connect to URL %s' % self.broker_url)
             if r.status_code == 200:
                 payload = json.loads(r.text)

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git


More information about the x2go-commits mailing list