fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing many issues related to password hash method changed

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-10-02 17:21:33 -04:00
parent e6eb308515
commit 0448d0e6db
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.pmFunctions.php
View File

@@ -378,7 +378,7 @@ function evaluateFunction ($aGrid, $sExpresion)
* @link http://wiki.processmaker.com/index.php/ProcessMaker_Functions#WSLogin.28.29 * @link http://wiki.processmaker.com/index.php/ProcessMaker_Functions#WSLogin.28.29
* *
* @param string(32) | $user | Username of the user | The username of the user who will login to ProcessMaker. All subsequent actions will be limited to the permissions of that user. * @param string(32) | $user | Username of the user | The username of the user who will login to ProcessMaker. All subsequent actions will be limited to the permissions of that user.
* @param string(32) | $pass | Password encrypted | The user's password encrypted as an MD5 hash with 'md5:' prepended. * @param string(32) | $pass | Password encrypted | The user's password encrypted as an MD5 or SHA256 hash with '{hashType}:' prepended.
* @param string(32) | $endpoint="" | URI of the WSDL | The URI (address) of the WSDL definition of the ProcessMaker web services. * @param string(32) | $endpoint="" | URI of the WSDL | The URI (address) of the WSDL definition of the ProcessMaker web services.
* @return string | $unique ID | Unique Id |The unique ID for the initiated session. * @return string | $unique ID | Unique Id |The unique ID for the initiated session.
* *
@@ -2849,7 +2849,7 @@ function PMFAddAttachmentToArray($arrayData, $index, $value, $suffix = " Copy({i
* *
* @name PMFRemoveMask * @name PMFRemoveMask
* @label PMF Remove Mask * @label PMF Remove Mask
* *
* @param string | $field | Value the field * @param string | $field | Value the field
* @param string | $separator | Separator of thousands (, or .) * @param string | $separator | Separator of thousands (, or .)
* @param string | $currency | symbol of currency * @param string | $currency | symbol of currency

4
workflow/engine/classes/model/CaseScheduler.php
View File

@@ -338,7 +338,7 @@ class CaseScheduler extends BaseCaseScheduler
$processId = $aRow["PRO_UID"]; $processId = $aRow["PRO_UID"];
$taskId = $aRow["TAS_UID"]; $taskId = $aRow["TAS_UID"];
$client = new SoapClient( $defaultEndpoint ); $client = new SoapClient( $defaultEndpoint );
$params = array ('userid' => $user,'password' => 'md5:' . $pass); $params = array ('userid' => $user,'password' => Bootstrap::hashPassword($pass, '', true));
$result = $client->__SoapCall( 'login', array ($params) ); $result = $client->__SoapCall( 'login', array ($params) );
eprint( " - Logging as user $user............." ); eprint( " - Logging as user $user............." );
if ($result->status_code == 0) { if ($result->status_code == 0) {
@@ -500,7 +500,7 @@ class CaseScheduler extends BaseCaseScheduler
$processId = $aRow["PRO_UID"]; $processId = $aRow["PRO_UID"];
$taskId = $aRow["TAS_UID"]; $taskId = $aRow["TAS_UID"];
$client = new SoapClient( $defaultEndpoint ); $client = new SoapClient( $defaultEndpoint );
$params = array ('userid' => $user,'password' => 'md5:' . $pass); $params = array ('userid' => $user,'password' => Bootstrap::hashPassword($pass, '', true));
$result = $client->__SoapCall( 'login', array ($params) ); $result = $client->__SoapCall( 'login', array ($params) );
eprint( " - Logging as user $user............." ); eprint( " - Logging as user $user............." );
if ($result->status_code == 0) { if ($result->status_code == 0) {

2
workflow/engine/controllers/webEntryProxy.php
View File

@@ -185,7 +185,7 @@ class webEntryProxy extends HttpProxyController
$template->assign( 'dynaformUid', $sDYNAFORM ); $template->assign( 'dynaformUid', $sDYNAFORM );
$template->assign( 'taskUid', $sTASKS ); $template->assign( 'taskUid', $sTASKS );
$template->assign( 'wsUser', $sWS_USER ); $template->assign( 'wsUser', $sWS_USER );
$template->assign( 'wsPass', 'md5:' . md5( $sWS_PASS ) ); $template->assign( 'wsPass', Bootstrap::hashPassword($sWS_PASS, '', true) );
$template->assign( 'wsRoundRobin', $sWS_ROUNDROBIN ); $template->assign( 'wsRoundRobin', $sWS_ROUNDROBIN );
if ($sWE_USR == "2") { if ($sWE_USR == "2") {

2
workflow/engine/methods/processes/processes_webEntryGenerate.php
View File

@@ -71,7 +71,7 @@ try {
$template->assign( 'dynaformUid', $sDYNAFORM ); $template->assign( 'dynaformUid', $sDYNAFORM );
$template->assign( 'taskUid', $sTASKS ); $template->assign( 'taskUid', $sTASKS );
$template->assign( 'wsUser', $sWS_USER ); $template->assign( 'wsUser', $sWS_USER );
$template->assign( 'wsPass', 'md5:' . md5( $sWS_PASS ) ); $template->assign( 'wsPass', Bootstrap::hashPassword($sWS_PASS, '', true) );
$template->assign( 'wsRoundRobin', $sWS_ROUNDROBIN ); $template->assign( 'wsRoundRobin', $sWS_ROUNDROBIN );
if ($sWE_USR == "2") { if ($sWE_USR == "2") {

2
workflow/engine/src/ProcessMaker/BusinessModel/ProjectUser.php
View File

@@ -336,7 +336,7 @@ class ProjectUser
$params = array( $params = array(
"userid" => $username, "userid" => $username,
"password" => "md5:" . md5($password) "password" => Bootstrap::hashPassword($password, '', true)
); );
$response = $client->login($params); $response = $client->login($params);

2
workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
View File

@@ -396,7 +396,7 @@ class WebEntry
$template->assign("dynaformUid", $dynaFormUid); $template->assign("dynaformUid", $dynaFormUid);
$template->assign("taskUid", $taskUid); $template->assign("taskUid", $taskUid);
$template->assign("wsUser", $usrUsername); $template->assign("wsUser", $usrUsername);
$template->assign("wsPass", "md5:" . $usrPassword); $template->assign("wsPass", Bootstrap::hashPassword($usrPassword, '', true));
$template->assign("wsRoundRobin", $wsRoundRobin); $template->assign("wsRoundRobin", $wsRoundRobin);
if ($webEntryInputDocumentAccess == 0) { if ($webEntryInputDocumentAccess == 0) {