[Fusionforge-commits] FusionForge branch master updated. 1439533d6d55ad81234861b00604b10fd7cdb450

Roland Mas lolando at fusionforge.org
Fri Apr 26 14:29:43 CEST 2013


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 "FusionForge".

The branch, master has been updated
       via  1439533d6d55ad81234861b00604b10fd7cdb450 (commit)
       via  0630bd026be49e6662cfb85a975389631e40eb06 (commit)
       via  9f3ee167074178deb15a8aed9b135407dc0a2e9a (commit)
       via  16befa3e5340d13aeadc853ed9cc1a4842e0ed8b (commit)
       via  17996cc8d5c2f8e9011905aaba300acf284ff692 (commit)
      from  73055b3339d6f00492f0980d1a312f9ad165f6db (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 1439533d6d55ad81234861b00604b10fd7cdb450
Author: Roland Mas <lolando at debian.org>
Date:   Fri Apr 26 14:24:43 2013 +0200

    Fixed path to forge_get_config

diff --git a/src/plugins/moinmoin/lib/fusionforge.py.fg_template b/src/plugins/moinmoin/lib/fusionforge.py.fg_template
index 2d55781..a5bb7a8 100644
--- a/src/plugins/moinmoin/lib/fusionforge.py.fg_template
+++ b/src/plugins/moinmoin/lib/fusionforge.py.fg_template
@@ -40,7 +40,7 @@ class FusionForgeLink():
             self.cachedconfig[secname] = {}
         if varname not in self.cachedconfig[secname]:
             self.cachedconfig[secname][varname] = \
-              subprocess.Popen(["@BINARY_PATH@",
+              subprocess.Popen(["@BINARY_PATH@/forge_get_config",
                                varname, secname],
                 stdout=subprocess.PIPE).communicate()[0].rstrip('\n')
         return self.cachedconfig[secname][varname]

commit 0630bd026be49e6662cfb85a975389631e40eb06
Author: Roland Mas <lolando at debian.org>
Date:   Fri Apr 26 14:12:24 2013 +0200

    Create a writable log file on install

diff --git a/src/install/install2 b/src/install/install2
index d1f6f4e..8a9b43d 100755
--- a/src/install/install2
+++ b/src/install/install2
@@ -251,6 +251,13 @@ install2_files(){
 		fi
 	done
 
+	# Create writable log file for Moinmoinwiki plugin
+	if ! [ -e $fusionforge_data_dir/plugins/moinmoin/wikidata/moinmoin.log ] ; then
+	    mkdir -p $fusionforge_data_dir/plugins/moinmoin/wikidata
+	    touch $fusionforge_data_dir/plugins/moinmoin/wikidata/moinmoin.log
+	    chown gforge $fusionforge_data_dir/plugins/moinmoin/wikidata/moinmoin.log
+	fi
+
 	cd $fusionforge_dir
 	if [ ! -d $fusionforge_etc_dir ]
 	then

commit 9f3ee167074178deb15a8aed9b135407dc0a2e9a
Author: Roland Mas <lolando at debian.org>
Date:   Fri Apr 26 14:02:59 2013 +0200

    Added missing dependency on python-pygments

diff --git a/src/install/deps b/src/install/deps
index 87adbed..cf90230 100755
--- a/src/install/deps
+++ b/src/install/deps
@@ -62,7 +62,7 @@ deps_debian() {
 	DEBIAN_FRONTEND=noninteractive
 	export DEBIAN_FRONTEND
 	apt-get -y update
-	apt-get -y --force-yes install apache2 php5 php5-cli php5-pgsql cvs postgresql postgresql-contrib libipc-run-perl liburi-perl libapache2-svn libapache2-mod-php5 subversion subversion-tools php5-curl curl ssh lsb-release php-htmlpurifier python-moinmoin python-psycopg2 libapache2-mod-wsgi php5-cli mediawiki git gitweb
+	apt-get -y --force-yes install apache2 php5 php5-cli php5-pgsql cvs postgresql postgresql-contrib libipc-run-perl liburi-perl libapache2-svn libapache2-mod-php5 subversion subversion-tools php5-curl curl ssh lsb-release php-htmlpurifier python-moinmoin python-psycopg2 python-pygments libapache2-mod-wsgi php5-cli mediawiki git gitweb
 	a2enmod headers
 	a2enmod proxy
 	a2enmod ssl

commit 16befa3e5340d13aeadc853ed9cc1a4842e0ed8b
Author: Roland Mas <lolando at debian.org>
Date:   Fri Apr 26 13:58:13 2013 +0200

    Create a writable log file on install

diff --git a/src/plugins/moinmoin/bin/install.sh b/src/plugins/moinmoin/bin/install.sh
index 85ad045..eb71c31 100755
--- a/src/plugins/moinmoin/bin/install.sh
+++ b/src/plugins/moinmoin/bin/install.sh
@@ -12,6 +12,10 @@ case "$1" in
 	    fi
 	done
 	chown gforge /etc/fusionforge/config.ini.d/debian-install-secrets.ini
+	if ! [ -e $dataprefix/moinmoin.log ] ; then
+	    touch $dataprefix/moinmoin.log
+	    chown gforge $dataprefix/moinmoin.log
+	fi
 	;;
     purge)
 	;;

commit 17996cc8d5c2f8e9011905aaba300acf284ff692
Author: Roland Mas <lolando at debian.org>
Date:   Fri Apr 26 13:45:23 2013 +0200

    Updated copy of fusionforge.py with latest changes

diff --git a/src/plugins/moinmoin/lib/fusionforge.py.fg_template b/src/plugins/moinmoin/lib/fusionforge.py.fg_template
index 9df5d1e..2d55781 100644
--- a/src/plugins/moinmoin/lib/fusionforge.py.fg_template
+++ b/src/plugins/moinmoin/lib/fusionforge.py.fg_template
@@ -9,6 +9,7 @@
 
 import base64
 import hashlib
+import hmac
 import logging
 import psycopg2
 import re
@@ -39,7 +40,7 @@ class FusionForgeLink():
             self.cachedconfig[secname] = {}
         if varname not in self.cachedconfig[secname]:
             self.cachedconfig[secname][varname] = \
-              subprocess.Popen(["@BINARY_PATH@/forge_get_config",
+              subprocess.Popen(["@BINARY_PATH@",
                                varname, secname],
                 stdout=subprocess.PIPE).communicate()[0].rstrip('\n')
         return self.cachedconfig[secname][varname]
@@ -208,19 +209,21 @@ class FusionForgeSessionAuth(BaseAuth):
             cookievalue = \
               urllib.unquote(cookies[cookiename]).decode('iso-8859-1')
 
-            m = re.search('(.*)-\*-(.*)', cookievalue)
+            m = re.search('^([A-Za-z0-9+/=]+)!([A-Za-z0-9+/=]+)$', cookievalue)
             if m is None:
                 continue
             (sserial, shash) = m.group(1, 2)
 
             sdata = base64.b64decode(sserial)
-            if hashlib.md5(sdata + self.session_key).hexdigest() != shash:
+            shash = base64.b64decode(shash)
+            H = hmac.new(self.session_key, sdata, hashlib.sha256)
+            if H.digest() != shash:
                 continue
 
-            m = re.search('(.*)-\*-(.*)-\*-(.*)-\*-(.*)', sdata)
+            m = re.search('(.*)<(.*)<(.*)<(.*)', sdata)
             if m is None:
                 continue
-            (user_id, time, ip, user_agent) = m.group(1, 2, 3, 4)
+            (time, user_id, ip, user_agent) = m.group(1, 2, 3, 4)
 
             conn = self.fflink._conn
             cur = conn.cursor()

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

Summary of changes:
 src/install/deps                                    |    2 +-
 src/install/install2                                |    7 +++++++
 src/plugins/moinmoin/bin/install.sh                 |    4 ++++
 src/plugins/moinmoin/lib/fusionforge.py.fg_template |   11 +++++++----
 4 files changed, 19 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list