[evolvis-commits] r17887: captcha pending merges (bugfix):↵ Thorsten Glaser 2011-12-13 enforce a valid host_uuid
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Dec 13 19:11:14 CET 2011
Author: mirabilos
Date: 2011-12-13 19:11:13 +0100 (Tue, 13 Dec 2011)
New Revision: 17887
Modified:
trunk/gforge_base/evolvisforge-5.1/src/common/include/config-vars.php
trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/web-apache2.postinst.dsfh-in
Log:
captcha pending merges (bugfix):
Thorsten Glaser 2011-12-13 enforce a valid host_uuid
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/config-vars.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/config-vars.php 2011-12-13 18:11:09 UTC (rev 17886)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/config-vars.php 2011-12-13 18:11:13 UTC (rev 17887)
@@ -154,6 +154,12 @@
forge_define_config_item ('compression_method', 'core', 'gzip') ;
+if (strlen(forge_get_config('host_uuid')) < 12 ||
+ /* also catch MD5(empty string) */
+ forge_get_config('host_uuid') == 'd41d8cd98f00') {
+ exit_error('ATTN sysadmin: upgrade your host_uuid');
+}
+
// Arch plugin
if (file_exists ($gfconfig.'plugins/scmarch/config.php')) {
require_once $gfconfig.'plugins/scmarch/config.php' ;
Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/web-apache2.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/web-apache2.postinst.dsfh-in 2011-12-13 18:11:09 UTC (rev 17886)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/dsf-in/web-apache2.postinst.dsfh-in 2011-12-13 18:11:13 UTC (rev 17887)
@@ -112,11 +112,10 @@
[ -e $config_path ] || mkdir -p $config_path
- if ! [ -e $config_path/uuid.ini ] ; then
- {
- echo [core]
- dd if=/dev/urandom count=1 bs=8 2> /dev/null | md5sum | cut -b1-8
- } > $config_path/uuid.ini
+ if ! grep host_uuid $config_path/uuid.ini >/dev/null 2>&1; then
+ printf '[core]\nhost_uuid=%s\n' \
+ $(dd if=/dev/urandom count=1 bs=8 2>/dev/null | md5sum | cut -b1-12) \
+ >$config_path/uuid.ini
fi
# Make Apache see these new changes
More information about the evolvis-commits
mailing list