holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Setup: fix post_install.php breaking bcrypt header_admin_password

Browse Source 
$ in password needs to be escaped as they otherwise address captures in preg_replace
This commit is contained in:
Ralf Becker 2019-09-15 10:58:49 +02:00
parent 5980266fc7
commit 14381800e6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/rpm-build/post_install.php
View File

@ -521,12 +521,20 @@ function patch_header($filename,&$user,$password)
{
bail_out(99,"$filename is no regular EGroupware header.inc.php!");
}
file_put_contents($filename,preg_replace('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '", '/')."([^']*)';/m",
"\$GLOBALS['egw_info']['server']['header_admin_password'] = '".$password."';",$header));
//error_log(__FUNCTION__."('$filename', '$user', '$password') header_admin_password was '$pmatches[1]'");
file_put_contents($filename,$header_new=preg_replace('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '", '/')."([^']*)';/m",
// $ in password needs to be escaped as they otherwise address captures in the regualar expression
"\$GLOBALS['egw_info']['server']['header_admin_password'] = '".str_replace('$', '\\$', $password)."';",$header));
/*$xmatches = null;
preg_match('/'.preg_quote("\$GLOBALS['egw_info']['server']['header_admin_password'] = '", '/')."([^']*)';/m",$header_new,$xmatches);
error_log(__FUNCTION__."('$filename', '$user', '$password') header_admin_password now '$xmatches[1]' returning '$pmatches[1]'");*/
$user = $umatches[1];
return $pmatches[1];
// try fixing crypt passwords broken by unescaped replace
return str_replace('{crypt}a$', '{crypt}$2a$12$', $pmatches[1]);
}
/**