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

PMCORE-3582

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2021-12-01 18:23:51 +00:00
parent d2f6c1ed78
commit 4ac9347640
9 changed files with 253 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@@ -64,7 +64,8 @@
"phpmyadmin/sql-parser": "^5.3",
"aws/aws-sdk-php": "~3.0",
"cretueusebiu/laravel-javascript": "^0.2.1",
"stevenmaguire/oauth2-microsoft": "^2.2"
"stevenmaguire/oauth2-microsoft": "^2.2",
"phpseclib/mcrypt_compat": "^2.0"
},
"require-dev": {
"guzzlehttp/guzzle": "^6.3",

250
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "0cfdbd7bd38cb8bdeebe9625a7d66455",
"content-hash": "5bcf521c2f8df8459b05200fbdef3ed7",
"packages": [
{
"name": "aws/aws-crt-php",
@@ -2357,6 +2357,73 @@
],
"time": "2021-04-09T13:42:10+00:00"
},
{
"name": "paragonie/constant_time_encoding",
"version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/paragonie/constant_time_encoding.git",
"reference": "f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c",
"reference": "f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c",
"shasum": ""
},
"require": {
"php": "^7|^8"
},
"require-dev": {
"phpunit/phpunit": "^6|^7|^8|^9",
"vimeo/psalm": "^1|^2|^3|^4"
},
"type": "library",
"autoload": {
"psr-4": {
"ParagonIE\\ConstantTime\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Paragon Initiative Enterprises",
"email": "security@paragonie.com",
"homepage": "https://paragonie.com",
"role": "Maintainer"
},
{
"name": "Steve 'Sc00bz' Thomas",
"email": "steve@tobtu.com",
"homepage": "https://www.tobtu.com",
"role": "Original Developer"
}
],
"description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
"keywords": [
"base16",
"base32",
"base32_decode",
"base32_encode",
"base64",
"base64_decode",
"base64_encode",
"bin2hex",
"encoding",
"hex",
"hex2bin",
"rfc4648"
],
"support": {
"email": "info@paragonie.com",
"issues": "https://github.com/paragonie/constant_time_encoding/issues",
"source": "https://github.com/paragonie/constant_time_encoding"
},
"time": "2020-12-06T15:14:20+00:00"
},
{
"name": "paragonie/random_compat",
"version": "v9.99.100",
@@ -3045,6 +3112,185 @@
],
"time": "2021-02-05T14:33:29+00:00"
},
{
"name": "phpseclib/mcrypt_compat",
"version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/mcrypt_compat.git",
"reference": "299da4c7e7e41c8d4964e894a90ca4c96175846b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/299da4c7e7e41c8d4964e894a90ca4c96175846b",
"reference": "299da4c7e7e41c8d4964e894a90ca4c96175846b",
"shasum": ""
},
"require": {
"php": ">=5.6.1",
"phpseclib/phpseclib": ">=3.0.12 <4.0.0"
},
"provide": {
"ext-mcrypt": "5.6.40"
},
"require-dev": {
"phpunit/phpunit": "^5.7|^6.0|^9.4"
},
"suggest": {
"ext-openssl": "Will enable faster cryptographic operations"
},
"type": "library",
"autoload": {
"files": [
"lib/mcrypt.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jim Wigginton",
"email": "terrafrost@php.net",
"homepage": "http://phpseclib.sourceforge.net"
}
],
"description": "PHP 5.x/7.x polyfill for mcrypt extension",
"keywords": [
"cryptograpy",
"encryption",
"mcrypt",
"polyfill"
],
"support": {
"email": "terrafrost@php.net",
"issues": "https://github.com/phpseclib/mcrypt_compat/issues",
"source": "https://github.com/phpseclib/mcrypt_compat"
},
"funding": [
{
"url": "https://www.patreon.com/phpseclib",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/phpseclib/mcrypt_compat",
"type": "tidelift"
}
],
"time": "2021-11-29T02:38:47+00:00"
},
{
"name": "phpseclib/phpseclib",
"version": "3.0.12",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "89bfb45bd8b1abc3b37e910d57f5dbd3174f40fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/89bfb45bd8b1abc3b37e910d57f5dbd3174f40fb",
"reference": "89bfb45bd8b1abc3b37e910d57f5dbd3174f40fb",
"shasum": ""
},
"require": {
"paragonie/constant_time_encoding": "^1|^2",
"paragonie/random_compat": "^1.4|^2.0|^9.99.99",
"php": ">=5.6.1"
},
"require-dev": {
"phing/phing": "~2.7",
"phpunit/phpunit": "^5.7|^6.0|^9.4",
"squizlabs/php_codesniffer": "~2.0"
},
"suggest": {
"ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
"ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
"ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
"ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
},
"type": "library",
"autoload": {
"files": [
"phpseclib/bootstrap.php"
],
"psr-4": {
"phpseclib3\\": "phpseclib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jim Wigginton",
"email": "terrafrost@php.net",
"role": "Lead Developer"
},
{
"name": "Patrick Monnerat",
"email": "pm@datasphere.ch",
"role": "Developer"
},
{
"name": "Andreas Fischer",
"email": "bantu@phpbb.com",
"role": "Developer"
},
{
"name": "Hans-Jürgen Petrich",
"email": "petrich@tronic-media.com",
"role": "Developer"
},
{
"name": "Graham Campbell",
"email": "graham@alt-three.com",
"role": "Developer"
}
],
"description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
"homepage": "http://phpseclib.sourceforge.net",
"keywords": [
"BigInteger",
"aes",
"asn.1",
"asn1",
"blowfish",
"crypto",
"cryptography",
"encryption",
"rsa",
"security",
"sftp",
"signature",
"signing",
"ssh",
"twofish",
"x.509",
"x509"
],
"support": {
"issues": "https://github.com/phpseclib/phpseclib/issues",
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.12"
},
"funding": [
{
"url": "https://github.com/terrafrost",
"type": "github"
},
{
"url": "https://www.patreon.com/phpseclib",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
"type": "tidelift"
}
],
"time": "2021-11-28T23:46:03+00:00"
},
{
"name": "predis/predis",
"version": "v1.1.1",
@@ -8143,5 +8389,5 @@
"php": ">=7.1"
},
"platform-dev": [],
"plugin-api-version": "1.1.0"
"plugin-api-version": "2.0.0"
}

4
workflow/engine/content/languages/translation.en
View File

File diff suppressed because one or more lines are too long

6
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -19169,12 +19169,6 @@ msgstr "Cookie Lifetime (Seconds)"
msgid "The maximun limit of columns for a database table is 255, you already have them defined!"
msgstr "The maximun limit of columns for a database table is 255, you already have them defined!"
# TRANSLATION
# LABEL/ID_MCRYPT_SUPPORT
#: LABEL/ID_MCRYPT_SUPPORT
msgid "Mcrypt Support"
msgstr "Mcrypt Support"
# TRANSLATION
# LABEL/ID_MEDIA
#: LABEL/ID_MEDIA

5
workflow/engine/controllers/InstallerModule.php
View File

@@ -203,7 +203,6 @@ class InstallerModule extends Controller
$info->multibyte = new stdclass();
$info->soap = new stdclass();
$info->ldap = new stdclass();
$info->mcrypt = new stdclass();
$info->memory = new stdclass();
$info->php->version = $phpVer;
@@ -272,10 +271,6 @@ class InstallerModule extends Controller
$info->soap->version = G::LoadTranslation('ID_ENABLED');
}
//mcrypt info
$info->mcrypt->result = extension_loaded('mcrypt');
$info->mcrypt->version = $info->mcrypt->result ? G::LoadTranslation('ID_ENABLED') : G::LoadTranslation('ID_NOT_ENABLED');
// ldap info
$info->ldap->result = false;
$info->ldap->version = G::LoadTranslation('ID_NOT_ENABLED');

1
workflow/engine/data/mysql/insert.sql
View File

@@ -60090,7 +60090,6 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_MAX_INDICATOR_DASHBOARD','en','Maximum number of Indicators','2015-03-31') ,
( 'LABEL','ID_MAX_LIFETIME','en','Cookie Lifetime (Seconds)','2017-02-21') ,
( 'LABEL','ID_MAX_LIMIT_COLUMNS_FOR_DATABASE','en','The maximun limit of columns for a database table is 255, you already have them defined!','2014-01-15') ,
( 'LABEL','ID_MCRYPT_SUPPORT','en','Mcrypt Support','2014-10-17') ,
( 'LABEL','ID_MEDIA','en','Media','2014-01-15') ,
( 'LABEL','ID_MEMBER','en','Member','2014-01-15') ,
( 'LABEL','ID_MEMBERS','en','Members','2014-01-15') ,

1
workflow/engine/methods/setup/systemInfo.php
View File

@@ -42,7 +42,6 @@ switch ($option) {
$oHeadPublisher->assign("SYSINFO_GD", "\"" . $systemInfo->gd->version . "\", " . (($systemInfo->gd->result)? 1 : 0));
$oHeadPublisher->assign("SYSINFO_MULTIBYTESTRING", "\"" . $systemInfo->multibyte->version . "\", " . (($systemInfo->multibyte->result)? 1 : 0));
$oHeadPublisher->assign("SYSINFO_SOAP", "\"" . $systemInfo->soap->version . "\", " . (($systemInfo->soap->result)? 1 : 0));
$oHeadPublisher->assign("SYSINFO_MCRYPT", "\"" . $systemInfo->mcrypt->version . "\", " . (($systemInfo->mcrypt->result)? 1 : 0));
$oHeadPublisher->assign("SYSINFO_LDAP", "\"" . $systemInfo->ldap->version . "\", " . (($systemInfo->ldap->result)? 1 : 0));
$oHeadPublisher->assign("SYSINFO_MEMORYLIMIT", "\"" . $systemInfo->memory->version . "\", " . (($systemInfo->memory->result)? 1 : 0));

8
workflow/engine/templates/installer/installer_cards.js
View File

@@ -67,12 +67,11 @@ Ext.onReady(function () {
Ext.getCmp('gd').setValue(getFieldOutput(response.gd.version, response.gd.result));
Ext.getCmp('multibyte').setValue(getFieldOutput(response.multibyte.version, response.multibyte.result));
Ext.getCmp('soap').setValue(getFieldOutput(response.soap.version, response.soap.result));
Ext.getCmp("mcrypt").setValue(getFieldOutput(response.mcrypt.version, response.mcrypt.result));
Ext.getCmp('ldap').setValue(getFieldOutput(response.ldap.version, response.ldap.result));
Ext.getCmp('memory').setValue(getFieldOutput(response.memory.version, response.memory.result));
dbReq = response.mysql.result;
phpReq = response.php.result && response.curl.result && response.dom.result && response.gd.result && response.multibyte.result && response.soap.result && response.memory.result && response.mcrypt.result;
phpReq = response.php.result && response.curl.result && response.dom.result && response.gd.result && response.multibyte.result && response.soap.result && response.memory.result;
wizard.onClientValidation(0, dbReq && phpReq);
wizard.showLoadMask(false);
},
@@ -323,11 +322,6 @@ Ext.onReady(function () {
fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_SOAP'),
id: 'soap'
},
{
xtype: "displayfield",
id: "mcrypt",
fieldLabel: _("ID_MCRYPT_SUPPORT")
},
{
xtype: 'displayfield',
fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_LDAP'),

6
workflow/engine/templates/setup/systemInfo.js
View File

@@ -135,12 +135,6 @@ systemInfo.application = {
fieldLabel: _("ID_PROCESSMAKER_REQUIREMENTS_SOAP"),
value: eval("fieldFormatValue(" + SYSINFO_SOAP + ");")
},
{
xtype: "displayfield",
id: "mcrypt ",
fieldLabel: _("ID_MCRYPT_SUPPORT"),
value: eval("fieldFormatValue(" + SYSINFO_MCRYPT + ");")
},
{
xtype: "displayfield",
id: "ldap",