[X2Go-Commits] x2gobroker.git - statusflag (branch) updated: 0.0.2.2-5-g650012f

[X2Go dev team]

The branch, statusflag has been updated
       via  650012f7f71d2e983369fd826d716be8a77da109 (commit)
      from  eb38dffa485257cdd3d74af7bbff1ce1aa7eaf3d (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        |    1 +
 x2gobroker/web/plain.py |    4 ++++
 x2gobroker/web/uccs.py  |    4 ++++
 3 files changed, 9 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 180b5af..505affa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x2gobroker (0.0.2.3-0~x2go1) UNRELEASED; urgency=low
       x2gobroker-sessionprofiles.conf.
     - Handle the rootless property automatically for know-by-name desktop
       sessions.
+    - Make enable-plain-output, enable-uccs-output functional.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 22 May 2013 17:42:12 +0200
 
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index d3718ec..6fdfffe 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -71,6 +71,10 @@ class X2GoBrokerWeb(tornado.web.RequestHandler):
 
         global_config = broker_backend.get_global_config()
 
+        # throw a 404 if the WebUI is not enabled
+        if not global_config['enable-plain-output']:
+            raise tornado.web.HTTPError(404)
+
         # if the broker backend is disabled in the configuration, pretend to have nothing on offer
         if not broker_backend.is_enabled():
             raise tornado.web.HTTPError(404)
diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py
index e518640..2f5864b 100644
--- a/x2gobroker/web/uccs.py
+++ b/x2gobroker/web/uccs.py
@@ -102,6 +102,10 @@ class X2GoBrokerWebAPI(tornado.web.RequestHandler):
 
         global_config = self.broker_backend.get_global_config()
 
+        # throw a 404 if the WebUI is not enabled
+        if not global_config['enable-uccs-output']:
+            raise tornado.web.HTTPError(404)
+
         # if the broker backend is disabled in the configuration, pretend to have nothing on offer
         if not self.broker_backend.is_enabled():
             raise tornado.web.HTTPError(404)


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).