mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-07-11 15:36:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix CI4/CI3 encryption compatibility

Browse Source 
- Removed the CI3 Encryption library as it's no longer needed.
- Added a field to \App\Config\Encryption.php to allow cipher.
- Removed test code for CI3 encryption and added test code for CI4 decryption of CI3 data.
This commit is contained in:
objecttothis
2023-02-19 17:00:39 +04:00
committed by Steve Ireland
parent e8b7f226fa
commit 7d78eec7de
3 changed files with 22 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Controllers/Config.php
View File

@@ -7,6 +7,7 @@ use App\Libraries\Mailchimp_lib;
use App\Libraries\Receiving_lib;
use App\Libraries\Sale_lib;
use App\Libraries\Tax_lib;
use App\Libraries\Ci3encrypt;
use App\Models\Appconfig;
use App\Models\Attribute;
@@ -17,9 +18,9 @@ use App\Models\Enums\Rounding_mode;
use App\Models\Stock_location;
use App\Models\Tax;
use CodeIgniter\Encryption\Encryption;
use CodeIgniter\Encryption\EncrypterInterface;
use CodeIgniter\Files\File;
use Config\Encryption;
use Config\Services;
use DirectoryIterator;
use NumberFormatter;
@@ -278,10 +279,18 @@ class Config extends Secure_Controller
if($this->_check_encryption()) //TODO: Hungarian notation
{
$encrypter = Services::encrypter();
$config = new Encryption();
$config->driver = 'OpenSSL';
$config->key = config('Encryption')->key;
$config->cipher = 'AES-128-CBC';
$config->rawData = false;
$config->encryptKeyInfo = 'encryption';
$config->authKeyInfo = 'authentication';
$data['mailchimp']['api_key'] = $encrypter->decrypt($this->config['mailchimp_api_key']); //TODO: When these keys don't exist decrypt throws an exception. We need to rework this so that if the array elements are null that it doesn't try to call decrypt. Here and in other places.
$data['mailchimp']['list_id'] = $encrypter->decrypt($this->config['mailchimp_list_id']);
$encrypter = Services::encrypter($config, false);
$data['mailchimp']['api_key'] = $encrypter->decrypt($this->config['mailchimp_api_key'] ?? '');
$data['mailchimp']['list_id'] = $encrypter->decrypt($this->config['mailchimp_list_id'] ?? '');
}
else
{
@@ -289,7 +298,6 @@ class Config extends Secure_Controller
$data['mailchimp']['list_id'] = '';
}
// load mailchimp lists associated to the given api key, already XSS cleaned in the private function
$data['mailchimp']['lists'] = $this->_mailchimp();
echo view('configs/manage', $data);