From 0448d0e6db7b7aca9a6b3228471f5230dc1812c4 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Thu, 2 Oct 2014 17:21:33 -0400 Subject: [PATCH] Fixing many issues related to password hash method changed --- workflow/engine/classes/class.pmFunctions.php | 4 ++-- workflow/engine/classes/model/CaseScheduler.php | 4 ++-- workflow/engine/controllers/webEntryProxy.php | 2 +- .../engine/methods/processes/processes_webEntryGenerate.php | 2 +- .../engine/src/ProcessMaker/BusinessModel/ProjectUser.php | 2 +- workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php index 776ef207e..de3d3accf 100755 --- a/workflow/engine/classes/class.pmFunctions.php +++ b/workflow/engine/classes/class.pmFunctions.php @@ -378,7 +378,7 @@ function evaluateFunction ($aGrid, $sExpresion) * @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) | $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. * @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 * @label PMF Remove Mask - * + * * @param string | $field | Value the field * @param string | $separator | Separator of thousands (, or .) * @param string | $currency | symbol of currency diff --git a/workflow/engine/classes/model/CaseScheduler.php b/workflow/engine/classes/model/CaseScheduler.php index fb86245ff..3e02adf4d 100755 --- a/workflow/engine/classes/model/CaseScheduler.php +++ b/workflow/engine/classes/model/CaseScheduler.php @@ -338,7 +338,7 @@ class CaseScheduler extends BaseCaseScheduler $processId = $aRow["PRO_UID"]; $taskId = $aRow["TAS_UID"]; $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) ); eprint( " - Logging as user $user............." ); if ($result->status_code == 0) { @@ -500,7 +500,7 @@ class CaseScheduler extends BaseCaseScheduler $processId = $aRow["PRO_UID"]; $taskId = $aRow["TAS_UID"]; $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) ); eprint( " - Logging as user $user............." ); if ($result->status_code == 0) { diff --git a/workflow/engine/controllers/webEntryProxy.php b/workflow/engine/controllers/webEntryProxy.php index 28acafe36..6601dcda1 100755 --- a/workflow/engine/controllers/webEntryProxy.php +++ b/workflow/engine/controllers/webEntryProxy.php @@ -185,7 +185,7 @@ class webEntryProxy extends HttpProxyController $template->assign( 'dynaformUid', $sDYNAFORM ); $template->assign( 'taskUid', $sTASKS ); $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 ); if ($sWE_USR == "2") { diff --git a/workflow/engine/methods/processes/processes_webEntryGenerate.php b/workflow/engine/methods/processes/processes_webEntryGenerate.php index c3277b202..a46b97dfb 100755 --- a/workflow/engine/methods/processes/processes_webEntryGenerate.php +++ b/workflow/engine/methods/processes/processes_webEntryGenerate.php @@ -71,7 +71,7 @@ try { $template->assign( 'dynaformUid', $sDYNAFORM ); $template->assign( 'taskUid', $sTASKS ); $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 ); if ($sWE_USR == "2") { diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ProjectUser.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProjectUser.php index 7f7ab9fa0..a1f9f591b 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/ProjectUser.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProjectUser.php @@ -336,7 +336,7 @@ class ProjectUser $params = array( "userid" => $username, - "password" => "md5:" . md5($password) + "password" => Bootstrap::hashPassword($password, '', true) ); $response = $client->login($params); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php index fdff6acf0..45c463354 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php @@ -396,7 +396,7 @@ class WebEntry $template->assign("dynaformUid", $dynaFormUid); $template->assign("taskUid", $taskUid); $template->assign("wsUser", $usrUsername); - $template->assign("wsPass", "md5:" . $usrPassword); + $template->assign("wsPass", Bootstrap::hashPassword($usrPassword, '', true)); $template->assign("wsRoundRobin", $wsRoundRobin); if ($webEntryInputDocumentAccess == 0) {