Skip to content
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

TYPO3 9 compatibility #118

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

TYPO3 9 compatibility #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a6456f
Enhance typo3:beuser command to use modern hashing algorithms
kitzberger Jun 20, 2019
e072110
FIX: argon2id not supported by TYPO3 yet
kitzberger Dec 15, 2019
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
23 changes: 8 additions & 15 deletions src/app/CliTools/Console/Command/TYPO3/BeUserCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,10 @@ protected function configure()
InputArgument::OPTIONAL,
'Password'
)
->addOption(
'plain',
null,
InputOption::VALUE_NONE,
'Do not crypt password (non salted password)'
->addArgument(
'hash',
InputArgument::OPTIONAL,
'Choose the hashing algorithm for saving the password: md5, md5_salted, bcrypt, argon2i, argon2id'
);
}

Expand Down Expand Up @@ -103,18 +102,12 @@ public function execute(InputInterface $input, OutputInterface $output)
$output->writeln('<p>Using pass: "' . htmlspecialchars($password) . '"</p>');

// ##################
// Salting
// Password hashing
// ##################

if ($input->getOption('plain')) {
// Standard md5
$password = Typo3Utility::generatePassword($password, Typo3Utility::PASSWORD_TYPE_MD5);
$this->output->writeln('<p>Generating plain (non salted) md5 password</p>');
} else {
// Salted md5
$password = Typo3Utility::generatePassword($password, Typo3Utility::PASSWORD_TYPE_MD5_SALTED);
$this->output->writeln('<p>Generating salted md5 password</p>');
}
$hash = $input->getArgument('hash');
list($password, $hash) = Typo3Utility::generatePassword($password, $hash);
$this->output->writeln('<p>Generating password with "' . htmlspecialchars($hash) . '" hashing algorithm</p>');

// ##############
// Loop through databases
Expand Down
47 changes: 33 additions & 14 deletions src/app/CliTools/Utility/Typo3Utility.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@
class Typo3Utility
{

const PASSWORD_TYPE_MD5_SALTED = 'md5_salted';
const PASSWORD_TYPE_MD5 = 'md5';
const PASSWORD_TYPE_MD5_SALTED = 'md5_salted';
const PASSWORD_TYPE_BCRYPT = 'bcrypt';
const PASSWORD_TYPE_ARGON2I = 'argon2i';
const PASSWORD_TYPE_ARGON2ID = 'argon2id';

/**
* Generate TYPO3 password
Expand All @@ -42,31 +45,47 @@ public static function generatePassword($password, $type = null)
{
$ret = null;

if ($type === null) {
$type = self::PASSWORD_TYPE_MD5_SALTED;
}

switch ($type) {

// ##############
// Salted MD5
// ##############
case self::PASSWORD_TYPE_MD5:
$ret = md5($password);
break;

case self::PASSWORD_TYPE_MD5_SALTED:
// Salted md5
$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
$salt = '$1$' . substr(str_shuffle($chars), 0, 6) . '$';
$ret = crypt($password, $salt);
break;

// ##############
// MD5
// ##############
case self::PASSWORD_TYPE_MD5:
$ret = md5($password);
case self::PASSWORD_TYPE_BCRYPT:
$ret = password_hash($password, PASSWORD_BCRYPT);
break;

case self::PASSWORD_TYPE_ARGON2I:
$ret = password_hash($password, PASSWORD_ARGON2I);
break;

case self::PASSWORD_TYPE_ARGON2ID:
$ret = password_hash($password, PASSWORD_ARGON2ID);
break;

default:
$possibleAlgorithms = [];
# Commented out since TYPO3 9.5 doesn't support argon2id yet
#defined('PASSWORD_ARGON2ID') && $possibleAlgorithms[PASSWORD_ARGON2ID] = self::PASSWORD_TYPE_ARGON2ID;
defined('PASSWORD_ARGON2I') && $possibleAlgorithms[PASSWORD_ARGON2I] = self::PASSWORD_TYPE_ARGON2I;
defined('PASSWORD_BCRYPT') && $possibleAlgorithms[PASSWORD_BCRYPT] = self::PASSWORD_TYPE_BCRYPT;

foreach ($possibleAlgorithms as $algorithm => $algorithmName) {
$hash = password_hash($password, $algorithm);
if ($hash !== false) {
return [$hash, $algorithmName];
}
}
}

return $ret;
return [$ret, $type];
}


Expand Down