Skip to content

N°4058 - Setup failed when added an encrypted field due to default value NULL non SODIUM compatible #754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
odain-cbd merged 3 commits into from
Oct 10, 2025
Merged

N°4058 - Setup failed when added an encrypted field due to default value NULL non SODIUM compatible #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
941b2da
N°4058 - Setup failed when added an encrypted field due to default v…
odain-cbd Sep 18, 2025
0d9cbc2
N°4058 - Setup failed when added an encrypted field due to default v…
odain-cbd Sep 18, 2025
303f242
change log level to warning
odain-cbd Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions core/simplecrypt.class.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,15 @@ function Encrypt($key, $sString)
*/
function Decrypt($key, $string)
{
return $this->oEngine->Decrypt($key,$string);
try{
return $this->oEngine->Decrypt($key,$string);
} catch(\Exception $e){
if (strlen($string)==0){
IssueLog::Warning("Cannot decrypt empty/null value", null, ['msg' => $e->getMessage(), 'stack' => $e->getTraceAsString()]);
return $string;
}
throw $e;
}
}

/**
Expand Down Expand Up @@ -422,4 +430,4 @@ public function Decrypt($key, $encrypted_data)
return trim($plaintext);
}

}
}
Comment on lines -425 to +433
Copy link
Contributor

@Hipska Hipska Oct 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't remove EOL's at end of the file!

36 changes: 36 additions & 0 deletions tests/php-unit-tests/unitary-tests/core/SympleCryptTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php
/*!
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license http://opensource.org/licenses/AGPL-3.0
*/

namespace Combodo\iTop\Test\UnitTest\Core;

use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
use SodiumException;

/**
* Tests of the ormPassword class
*/
class SympleCryptTest extends ItopDataTestCase
{
public function testDecryptWithNullValue()
{
$oSimpleCrypt = new \SimpleCrypt("Sodium");
$this->assertEquals(null, $oSimpleCrypt->Decrypt("dd", null));
}

public function testDecryptWithEmptyValue()
{
$oSimpleCrypt = new \SimpleCrypt("Sodium");
$this->assertEquals('', $oSimpleCrypt->Decrypt("dd", ""));
}

public function testDecrypNonDecryptableValue()
{
$this->expectException(SodiumException::class);
$oSimpleCrypt = new \SimpleCrypt("Sodium");
$this->assertEquals('', $oSimpleCrypt->Decrypt("dd", "gabuzomeu"));
}

}