[BUGFIX] Fix wrong configuration values for password hashes 91/57891/3
authorMarkus Klein <markus.klein@typo3.org>
Tue, 14 Aug 2018 08:42:26 +0000 (10:42 +0200)
committerBenni Mack <benni@typo3.org>
Tue, 14 Aug 2018 09:10:50 +0000 (11:10 +0200)
And also fix wrong backwards compatibility class declarations.

Resolves: #85838
Related: #85833
Releases: master
Change-Id: I6140f999c99e6903e08f6fa726e06bdf295b8f5b
Reviewed-on: https://review.typo3.org/57891
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml
typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php

index d3f5019..aafb71c 100644 (file)
@@ -360,10 +360,10 @@ BE:
                 className:
                     type: dropdown
                     allowedValues:
-                        'TYPO3\CMS\Saltedpasswords\Salt\Argon2iSalt': 'Good password hash mechanism. Used by default if available.'
-                        'TYPO3\CMS\Saltedpasswords\Salt\BcryptSalt': 'Good password hash mechanism.'
-                        'TYPO3\CMS\Saltedpasswords\Salt\Pbkdf2Salt': 'Fallback hash mechanism if argon and bcrypt are not available.'
-                        'TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt': 'Fallback hash mechanism if none of the above are avalaible.'
+                        'TYPO3\CMS\Core\Crypto\PasswordHashing\Argon2iPasswordHash': 'Good password hash mechanism. Used by default if available.'
+                        'TYPO3\CMS\Core\Crypto\PasswordHashing\BcryptPasswordHash': 'Good password hash mechanism.'
+                        'TYPO3\CMS\Core\Crypto\PasswordHashing\Pbkdf2PasswordHash': 'Fallback hash mechanism if argon and bcrypt are not available.'
+                        'TYPO3\CMS\Core\Crypto\PasswordHashing\PhpassPasswordHash': 'Fallback hash mechanism if none of the above are available.'
                 options:
                     type: array
                     description: 'Special settings for specific hashes.'
@@ -500,10 +500,10 @@ FE:
                 className:
                     type: dropdown
                     allowedValues:
-                        'TYPO3\CMS\Saltedpasswords\Salt\Argon2iSalt': 'Good password hash mechanism. Used by default if available.'
-                        'TYPO3\CMS\Saltedpasswords\Salt\BcryptSalt': 'Good password hash mechanism.'
-                        'TYPO3\CMS\Saltedpasswords\Salt\Pbkdf2Salt': 'Fallback hash mechanism if argon and bcrypt are not available.'
-                        'TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt': 'Fallback hash mechanism if none of the above are avalaible.'
+                        'TYPO3\CMS\Core\Crypto\PasswordHashing\Argon2iPasswordHash': 'Good password hash mechanism. Used by default if available.'
+                        'TYPO3\CMS\Core\Crypto\PasswordHashing\BcryptPasswordHash': 'Good password hash mechanism.'
+                        'TYPO3\CMS\Core\Crypto\PasswordHashing\Pbkdf2PasswordHash': 'Fallback hash mechanism if argon and bcrypt are not available.'
+                        'TYPO3\CMS\Core\Crypto\PasswordHashing\PhpassPasswordHash': 'Fallback hash mechanism if none of the above are available.'
                 options:
                     type: array
                     description: 'Special settings for specific hashes.'
index 60579af..a2e1bf6 100644 (file)
@@ -37,10 +37,10 @@ namespace TYPO3\CMS\Saltedpasswords\Exception {
 }
 
 namespace TYPO3\CMS\Saltedpasswords\Salt {
-    class AbstractSalt extends \TYPO3\CMS\Core\Crypto\PasswordHashing\AbstractComposedSalt
+    abstract class AbstractSalt extends \TYPO3\CMS\Core\Crypto\PasswordHashing\AbstractComposedSalt
     {
     }
-    class AbstractComposedSalt extends \TYPO3\CMS\Core\Crypto\PasswordHashing\AbstractComposedSalt
+    abstract class AbstractComposedSalt extends \TYPO3\CMS\Core\Crypto\PasswordHashing\AbstractComposedSalt
     {
     }
     class Argon2iSalt extends \TYPO3\CMS\Core\Crypto\PasswordHashing\Argon2iPasswordHash
@@ -52,7 +52,7 @@ namespace TYPO3\CMS\Saltedpasswords\Salt {
     class BlowfishSalt extends \TYPO3\CMS\Core\Crypto\PasswordHashing\BlowfishPasswordHash
     {
     }
-    class ComposedSaltInterface extends \TYPO3\CMS\Core\Crypto\PasswordHashing\ComposedPasswordHashInterface
+    interface ComposedSaltInterface extends \TYPO3\CMS\Core\Crypto\PasswordHashing\ComposedPasswordHashInterface
     {
     }
     class Md5Salt extends \TYPO3\CMS\Core\Crypto\PasswordHashing\Md5PasswordHash
@@ -61,7 +61,7 @@ namespace TYPO3\CMS\Saltedpasswords\Salt {
     class SaltFactory extends \TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashFactory
     {
     }
-    class SaltInterface extends \TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashInterface
+    interface SaltInterface extends \TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashInterface
     {
     }
     class Pbkdf2Salt extends \TYPO3\CMS\Core\Crypto\PasswordHashing\Pbkdf2PasswordHash