[X2Go-Commits] x2gobroker.git - master-inai (branch) updated: a131f337a4ff78a1390aabd576d9e1f8c25b8ff1
X2Go dev team
git-admin at x2go.org
Tue Apr 23 21:08:17 CEST 2013
The branch, master-inai has been updated
via a131f337a4ff78a1390aabd576d9e1f8c25b8ff1 (commit)
from 737e3bfe0febd88f3be07647b2840950c5c4c8a0 (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:
x2gobroker/web/html.py | 3 +++
x2gobroker/web/plain.py | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py
index fa2f294..07802eb 100644
--- a/x2gobroker/web/html.py
+++ b/x2gobroker/web/html.py
@@ -80,6 +80,9 @@ $output
global_config = broker_backend.get_global_config()
backend_config = broker_backend.get_backend_config(backend)
+ if not backend_config['enable']:
+ return web.notfound()
+
data = web.input()
try: username = data.user
except AttributeError: username = ''
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index bed72f1..a05a4cb 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -56,6 +56,9 @@ class X2GoBrokerWebPlain:
global_config = broker_backend.get_global_config()
backend_config = broker_backend.get_backend_config(backend)
+ if not backend_config['enable']:
+ return web.notfound()
+
data = web.input()
try: username = data.user
except AttributeError: username = ''
@@ -71,7 +74,6 @@ class X2GoBrokerWebPlain:
except AttributeError: new_password = ''
output = ''
-
self._gen_http_header()
if broker_backend.check_access(username=username, password=password, authid=authid):
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