natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added ticket 391, password storage configuration variable for Mercurial.

Browse Source
This commit is contained in:
Loic d'Anterroches 2010-02-06 14:24:11 +01:00
parent 93d379f293
commit 2b107c1610
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/syncmercurial.mdtext
View File

@ -67,6 +67,14 @@ You also need to provide the base definition of the hgrc file. For example:
'extensions' => array(), 'extensions' => array(),
); );
If you are note using Apache but Nginx, you may need to create the
passwords as plain text passwords (see ticket 391). You can configure
the password storage with the format you want. The default is `sha`
you can set it to `plain` for nginx.
$cfg['idf_plugin_syncmercurial_passwd_mode'] = 'sha';
See the [`FILE_PASSWD_*` constants](http://euk1.php.net/package/File_Passwd/docs/latest/File_Passwd/_File_Passwd-1.1.7---Passwd.php.html) for more choices.
## Cron configuration ## Cron configuration

6
src/IDF/Plugin/SyncMercurial.php
View File

@ -97,7 +97,8 @@ class IDF_Plugin_SyncMercurial
} }
$ht = new File_Passwd_Authbasic($passwd_file); $ht = new File_Passwd_Authbasic($passwd_file);
$ht->load(); $ht->load();
$ht->setMode(FILE_PASSWD_SHA); $ht->setMode(Pluf::f('idf_plugin_syncmercurial_passwd_mode',
FILE_PASSWD_SHA));
if ($ht->userExists($user->login)) { if ($ht->userExists($user->login)) {
$ht->changePasswd($user->login, $this->getMercurialPass($user)); $ht->changePasswd($user->login, $this->getMercurialPass($user));
} else { } else {
@ -138,7 +139,8 @@ class IDF_Plugin_SyncMercurial
throw new Exception (sprintf(__('%s does not exist or is not writable.'), $passwd_file)); throw new Exception (sprintf(__('%s does not exist or is not writable.'), $passwd_file));
} }
$ht = new File_Passwd_Authbasic($passwd_file); $ht = new File_Passwd_Authbasic($passwd_file);
$ht->setMode(FILE_PASSWD_SHA); $ht->setMode(Pluf::f('idf_plugin_syncmercurial_passwd_mode',
FILE_PASSWD_SHA));
$ht->load(); $ht->load();
$mem = $project->getMembershipData(); $mem = $project->getMembershipData();
$members = array_merge((array)$mem['members'], (array)$mem['owners'], $members = array_merge((array)$mem['members'], (array)$mem['owners'],