From 6b62e2255cf93dbd31dd60e4faded82b4ce8df80 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 27 Dec 2022 23:33:19 -0500 Subject: [PATCH] ... --- src/configs/mockup/loadall.php | 9 +++--- src/configs/mockup/on_sessions.php | 9 +++--- src/mockup/controllers/app/cookie_ctrl.php | 8 +---- src/mockup/controllers/app/enc_ctrl.php | 23 ++++++++------- src/services/mockup/loadall.php | 29 +++++++++++++++---- src/services/mockup/on_html_filter.php | 2 -- src/services/mockup/on_log.php | 2 -- src/services/mockup/on_session_encryption.php | 16 ++++++++++ src/services/mockup/on_templates.php | 2 -- src/services/mockup/on_test_db.php | 2 -- 10 files changed, 60 insertions(+), 42 deletions(-) create mode 100644 src/services/mockup/on_session_encryption.php diff --git a/src/configs/mockup/loadall.php b/src/configs/mockup/loadall.php index 7bff50c..311386e 100644 --- a/src/configs/mockup/loadall.php +++ b/src/configs/mockup/loadall.php @@ -47,13 +47,12 @@ /* Contents of : on_sessions.php */ \main_tts\configure::set('sessions', array( - 'engine' => 'php', // php, db - 'type' => 'none', // Session Type: files, database, or cache - 'session_variable' => 'ses_app_aaa_', // set session variable name for project - 'session_name' => 'aaa_sys_342_', // More secure then PHPSESSID + 'type' => 'cookies', // Session Type: php, files, redis, or cookies + 'session_variable' => 'ses_app_', // set session variable name for project + 'session_name' => 'main_SESS', // More secure then PHPSESSID 'session_table' => false, // DB PHP Session Table name, false = USE FILES 'session_security_level' => 'blaze', // Faster Reqests keep at: blaze - 'session_key' => '6cb0d56f2345917624f2c5473e4d32cd', + 'session_key' => '78a5011b9997cd03a28a3412c66565b7c32715b35e055d7abfc228236308d3b2', )); /* Contents of : on_tts.php */ diff --git a/src/configs/mockup/on_sessions.php b/src/configs/mockup/on_sessions.php index 690daa0..1ca8948 100644 --- a/src/configs/mockup/on_sessions.php +++ b/src/configs/mockup/on_sessions.php @@ -1,11 +1,10 @@ 'php', // php, db - 'type' => 'none', // Session Type: files, database, or cache - 'session_variable' => 'ses_app_aaa_', // set session variable name for project - 'session_name' => 'aaa_sys_342_', // More secure then PHPSESSID + 'type' => 'cookies', // Session Type: php, files, redis, or cookies + 'session_variable' => 'ses_app_', // set session variable name for project + 'session_name' => 'main_SESS', // More secure then PHPSESSID 'session_table' => false, // DB PHP Session Table name, false = USE FILES 'session_security_level' => 'blaze', // Faster Reqests keep at: blaze - 'session_key' => '6cb0d56f2345917624f2c5473e4d32cd', + 'session_key' => '78a5011b9997cd03a28a3412c66565b7c32715b35e055d7abfc228236308d3b2', )); \ No newline at end of file diff --git a/src/mockup/controllers/app/cookie_ctrl.php b/src/mockup/controllers/app/cookie_ctrl.php index 4bc7ad2..e623437 100644 --- a/src/mockup/controllers/app/cookie_ctrl.php +++ b/src/mockup/controllers/app/cookie_ctrl.php @@ -17,13 +17,7 @@ namespace prj\mockup\controllers\app; class cookie_ctrl { public function __construct() { - $key = "78a5011b9997cd03a28a3412c66565b7c32715b35e055d7abfc228236308d3b2"; - $sc = new \tts\services\paragon_crypto\sodium_storage($key); - - $handler = new \tts\services\sessions\cookie_sessions($sc); - session_set_save_handler($handler, true); - - session_start(); + \tts\session_management::start(); } public function save() { diff --git a/src/mockup/controllers/app/enc_ctrl.php b/src/mockup/controllers/app/enc_ctrl.php index 8fc4e53..6410ff0 100644 --- a/src/mockup/controllers/app/enc_ctrl.php +++ b/src/mockup/controllers/app/enc_ctrl.php @@ -12,6 +12,7 @@ namespace prj\mockup\controllers\app; class enc_ctrl { public $page_output; + private $key = "51623a064210f9d3d5162d0885621f53"; private function get_roles(): string { $roles = ['roles'=>'admin, super, rw', 'name'=>'Bob']; @@ -29,22 +30,21 @@ class enc_ctrl { } private function time_enc(array $levels): void { - $enc = new \tts\services\encryption(); + $enc = new \tts\services\encryption($this->key); foreach($levels as $level) { echo "ENC: Level = $level
" . PHP_EOL; $enc->change_security_level($level); // $key = $enc->generate_valid_key(); - $key = "51623a064210f9d3d5162d0885621f53"; - echo "KEY Used: $key
" . PHP_EOL; + echo "KEY Used: $this->key
" . PHP_EOL; $startTime = microtime(true); - $data = $enc->encrypt($key, $this->get_roles()); + $data = $enc->encrypt($this->get_roles()); echo "
$data
" . PHP_EOL; echo "Encrypt Time: " . number_format(( microtime(true) - $startTime), 4) . " Seconds\n"; $startTime = microtime(true); - $decoded = $enc->decrypt($key, $data); + $decoded = $enc->decrypt($data); $this->show_roles($decoded); echo "Decrypt Time: " . number_format(( microtime(true) - $startTime), 4) . " Seconds\n"; echo "

".PHP_EOL; @@ -69,19 +69,20 @@ class enc_ctrl { } public function sodium() { // 0.0041 Seconds - $crypto = new \tts\services\paragon_crypto\crypto(); -// echo $crypto->a_single_key_maker(); $key = "oH5LUubQXkUgC2sXkxahLnzgcZokVFANyxAew+kOvuk="; + $crypto = new \tts\services\paragon_crypto\crypto($key); +// echo $crypto->a_single_key_maker(); + $startTime = microtime(true); - $data = $crypto->safe_encrypt($this->get_roles(), $key, $crypto::single_key); + $data = $crypto->encrypt($this->get_roles()); echo "
$data
" . PHP_EOL; echo "Encrypt Time: " . number_format(( microtime(true) - $startTime), 4) . " Seconds\n"; // $data = "sJWIPEasG1W8ModZJKU8jOR78/i1qUZDl6nX5ew21ceOdEZHNDGwqCA1lD70GuIHP4DJEMQ="; $startTime = microtime(true); - $decoded = $crypto->safe_decrypt($data, $key, $crypto::single_key); + $decoded = $crypto->decrypt($data); $this->show_roles($decoded); echo "Decrypt Time: " . number_format(( microtime(true) - $startTime), 4) . " Seconds\n"; @@ -93,13 +94,13 @@ class enc_ctrl { $sc = new \tts\services\paragon_crypto\sodium_storage($key); $startTime = microtime(true); - $encoded = $sc->encode("admin", $this->get_roles()); + $encoded = $sc->encrypt($this->get_roles()); echo "
$encoded
" . PHP_EOL; echo "Encrypt Time: " . number_format(( microtime(true) - $startTime), 4) . " Seconds\n"; try { $startTime = microtime(true); - $plain_text = $sc->decode("admin", $encoded); + $plain_text = $sc->decrypt($encoded); $this->show_roles($plain_text); echo "Decrypt Time: " . number_format(( microtime(true) - $startTime), 4) . " Seconds\n"; diff --git a/src/services/mockup/loadall.php b/src/services/mockup/loadall.php index 9c63c2f..bb87c6a 100644 --- a/src/services/mockup/loadall.php +++ b/src/services/mockup/loadall.php @@ -1,17 +1,18 @@ -register('html_filter', function() { return new \tts\services\html_filter(); }); /* Contents of : on_log.php */ + \main_tts\registry::get('di')->register('log', function(array $arg) { $file_name = null; if (isset($arg[0]) && is_string($arg[0])) { @@ -29,6 +30,22 @@ declare(strict_types=1); return new \tts\services\log(); }); +/* Contents of : on_session_encryption.php */ + +/** + * @author Robert Strutts + * @copyright Copyright (c) 2022, Robert Strutts. + * @license https://mit-license.org/ + */ + +\main_tts\registry::get('di')->register('session_encryption', function($args) { + try { + $key = \main_tts\configure::get('sessions', 'session_key'); + return new \tts\services\paragon_crypto\sodium_storage($key); + } catch (\Exception $e) { + + } +}); /* Contents of : on_templates.php */ \main_tts\registry::get('di')->register('templates', function(array $arg) { diff --git a/src/services/mockup/on_html_filter.php b/src/services/mockup/on_html_filter.php index 2e609f2..0a3155a 100644 --- a/src/services/mockup/on_html_filter.php +++ b/src/services/mockup/on_html_filter.php @@ -1,7 +1,5 @@ register('html_filter', function() { return new \tts\services\html_filter(); }); \ No newline at end of file diff --git a/src/services/mockup/on_log.php b/src/services/mockup/on_log.php index 5f5c308..91a26fd 100644 --- a/src/services/mockup/on_log.php +++ b/src/services/mockup/on_log.php @@ -1,7 +1,5 @@ register('log', function(array $arg) { $file_name = null; if (isset($arg[0]) && is_string($arg[0])) { diff --git a/src/services/mockup/on_session_encryption.php b/src/services/mockup/on_session_encryption.php new file mode 100644 index 0000000..9ac80e3 --- /dev/null +++ b/src/services/mockup/on_session_encryption.php @@ -0,0 +1,16 @@ + + * @copyright Copyright (c) 2022, Robert Strutts. + * @license https://mit-license.org/ + */ + +\main_tts\registry::get('di')->register('session_encryption', function($args) { + try { + $key = \main_tts\configure::get('sessions', 'session_key'); + return new \tts\services\paragon_crypto\sodium_storage($key); + } catch (\Exception $e) { + + } +}); \ No newline at end of file diff --git a/src/services/mockup/on_templates.php b/src/services/mockup/on_templates.php index 4adf54e..622b755 100644 --- a/src/services/mockup/on_templates.php +++ b/src/services/mockup/on_templates.php @@ -1,7 +1,5 @@ register('templates', function(array $arg) { $file_type = '.tpl'; if (isset($arg[0]) && is_string($arg[0])) { diff --git a/src/services/mockup/on_test_db.php b/src/services/mockup/on_test_db.php index 6b21b33..bdc127b 100644 --- a/src/services/mockup/on_test_db.php +++ b/src/services/mockup/on_test_db.php @@ -1,7 +1,5 @@ register('db_mocker', function($args) { try { $conn = new \PDO('sqlite::memory:');