fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in feature/PMC-1158 (pull request #7089)

Browse Source 
PMC-721 PMCORE-1015

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2020-01-17 12:25:49 +00:00
committed by Julio Cesar Laura Avendaño
parent a1b92c852e 99abd1b33b
commit a4a71f9324
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
View File

@@ -3,6 +3,7 @@ namespace ProcessMaker\Services\OAuth2;
use Luracast\Restler\iAuthenticate; use Luracast\Restler\iAuthenticate;
use Luracast\Restler\RestException; use Luracast\Restler\RestException;
use OAuth2\Request;
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
use ProcessMaker\ChangeLog\ChangeLog; use ProcessMaker\ChangeLog\ChangeLog;
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
@@ -411,6 +412,19 @@ class Server implements iAuthenticate
public static function getUserId() public static function getUserId()
{ {
// If is empty, get the User Uid using the current request
if (empty(self::$userId) && !empty(self::$dsn)) {
// Get current request object
$request = Request::createFromGlobals();
// Get token data
$serverInstance = new Server();
$server = $serverInstance->getServer();
$tokenData = $server->getAccessTokenData($request);
// Set the User Uid
self::$userId = $tokenData['user_id'];
}
return self::$userId; return self::$userId;
} }

12
workflow/engine/src/ProcessMaker/Validation/ValidationUploadedFiles.php
View File

@@ -70,18 +70,18 @@ class ValidationUploadedFiles
->validate($file, function($file) { ->validate($file, function($file) {
$systemConfiguration = System::getSystemConfiguration('', '', config("system.workspace")); $systemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));
$filesWhiteList = explode(',', $systemConfiguration['upload_attempts_limit_per_user']); $filesWhiteList = explode(',', $systemConfiguration['upload_attempts_limit_per_user']);
$userId = Server::getUserId(); $userId = !empty($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : Server::getUserId();
$key = config("system.workspace") . '/' . $userId; $key = config("system.workspace") . '/' . $userId;
$attemps = (int) trim($filesWhiteList[0]); $attempts = (int) trim($filesWhiteList[0]);
$minutes = (int) trim($filesWhiteList[1]); $minutes = (int) trim($filesWhiteList[1]);
$pastAttemps = Cache::remember($key, $minutes, function() { $pastAttempts = Cache::remember($key, $minutes, function() {
return 1; return 1;
}); });
//We only increase when the file path exists, useful when pre-validation is done. //We only increase when the file path exists, useful when pre-validation is done.
if (isset($file->path)) { if (isset($file->path)) {
Cache::increment($key, 1); Cache::increment($key, 1);
} }
if ($pastAttemps <= $attemps) { if ($pastAttempts <= $attempts) {
return false; return false;
} }
return true; return true;