[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.2-4-gee43705

[X2Go dev team]

The branch, master has been updated
       via  ee4370574c9fae00886bdaf0ac11eaf1d527720e (commit)
      from  d019af7fc3de6d899a88959524cb55bf5766b11e (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 -----------------------------------------------------------------
commit ee4370574c9fae00886bdaf0ac11eaf1d527720e
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Dec 17 23:32:48 2013 +0100

    Protect x2goplugin.html. Make it only available from the local host.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                    |    4 ++++
 provider/etc/x2goplugin-apache.conf |   14 ++++++++++++++
 2 files changed, 18 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c8f4961..6a3ef6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ x2goclient (4.0.1.3-0x2go1) UNRELEASED; urgency=low
     - changed keyboard settings. Supported modes: auto, none and config with
       model/layout(variant)
 
+  [ Orion Poplawski ]
+  * New upstream version (4.0.1.3):
+    - Protect x2goplugin.html. Make it only available from the local host.
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 17 Dec 2013 15:34:49 +0100
 
 x2goclient (4.0.1.2-0x2go2) unstable; urgency=low
diff --git a/provider/etc/x2goplugin-apache.conf b/provider/etc/x2goplugin-apache.conf
index 76e827e..b5bcb82 100644
--- a/provider/etc/x2goplugin-apache.conf
+++ b/provider/etc/x2goplugin-apache.conf
@@ -1 +1,15 @@
 Alias /x2goplugin.html /usr/share/x2go/plugin/x2goplugin.html
+
+<Directory /usr/share/x2go/plugin>
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require local
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+         # Apache 2.2
+         Order Deny,Allow
+         Deny from all
+         Allow from 127.0.0.1
+         Allow from ::1
+    </IfModule>
+</Directory>


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

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 "x2goclient.git" (X2Go Client).