@@ -32,7 +32,7 @@ $admin_options = [ $label) : ?> - + diff --git a/public/app/views/admin/edit_lesson.php b/public/app/views/admin/edit_lesson.php new file mode 100644 index 0000000..30dd42f --- /dev/null +++ b/public/app/views/admin/edit_lesson.php @@ -0,0 +1,152 @@ + + + +

+ +

+ + +

+ + + + + + +

+ Τίτλος +

+ +

+ Κατηγορία +

+ +

+ + +

+ Κείμενο +

+ +

+ Κατάσταση +

+ +

+ Επίπεδο Πρόσβασης +

+ +

+ Σύντομη Περιγραφή +

+ +

+ Αρχεία +

+ + + + +

+ + +

+ Πληροφορίες +

+ + +

+ +

+ + +

+ +

+ + + +

+ diff --git a/public/app/views/admin/new_lesson.php b/public/app/views/admin/new_lesson.php deleted file mode 100644 index c48fc82..0000000 --- a/public/app/views/admin/new_lesson.php +++ /dev/null @@ -1,144 +0,0 @@ - - - -

Επεξεργασία Μαθήματος

- -

- - -

- - - - - - -

- Τίτλος -

- -

- Κατηγορία -

- -

- - -

- Κείμενο -

- -

- Κατάσταση -

- -

- Επίπεδο Πρόσβασης -

- -

- Σύντομη Περιγραφή -

- -

- Αρχεία -

- - - - -

- - -

- Πληροφορίες -

- - -

- -

- - -

- -

- - - -

- diff --git a/public/app/views/admin/skeleton.php b/public/app/views/admin/skeleton.php index fea346f..927bd2d 100644 --- a/public/app/views/admin/skeleton.php +++ b/public/app/views/admin/skeleton.php @@ -7,7 +7,9 @@ true]); + Render::view('components/header_includes', //////////////////////////// + ['administration' => true] + ); ?> @@ -17,16 +19,26 @@

$action - ]) - ?> - - $action, + 'id' => $id + ]); + + // render main content + //////////////////////////////////////////////////////////////////// + Render::view("admin/{$action}",[ 'id' => $id ]); //////////////// ?>

+ + diff --git a/public/assets/css/overides.css b/public/assets/css/overides.css index 0709f4d..b217f65 100644 --- a/public/assets/css/overides.css +++ b/public/assets/css/overides.css @@ -85,9 +85,8 @@ ul.select2-results__options li { font-size: 14px; padding: 4px 8px; } /* hack select2 caret styling * (like bootstrap5 select caret) - * ----------------------------------------------------------------------------- + * ----------------------------------------------------------------------- start */ - .select2-container--default .select2-selection--single .select2-selection__arrow b { background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e"); background-color: transparent; @@ -101,5 +100,11 @@ ul.select2-results__options li { font-size: 14px; padding: 4px 8px; } height: 14px; } .select2-container--default .select2-selection--single .select2-selection__arrow { width: 24px; } -.select2-container--default .select2-selection--single { height: 31px; } - \ No newline at end of file +.select2-container--default .select2-selection--single { height: 31px; } +/* ------------------------------------------------------------------------- end +*/ + +.admin-container .edit-post textarea[name=body] { height: calc(100vh - 420px); } /* almost all avialable height */ +.admin-container .edit-post textarea[name=intro] { height: 73px ;} /* almost 3 (half-)lines */ + + diff --git a/public/assets/js/admin/edit_lesson.js b/public/assets/js/admin/edit_lesson.js new file mode 100644 index 0000000..e69de29 diff --git a/tests/algo-hashes.php b/tests/algo-hashes.php new file mode 100644 index 0000000..8457949 --- /dev/null +++ b/tests/algo-hashes.php @@ -0,0 +1,52 @@ +cryptPassword('102030!!!'); + +$user = (new User()) + ->setUserName('geo@roptron.gr') + ->setPassword($password) + ->setRoles([1]); + +$userManager->createUserToken($user); + + +$algos = [ + [ PASSWORD_DEFAULT, 10 ], + [ PASSWORD_ARGON2I, 10 ], + [ CRYPT_BLOWFISH, 10 ], + [ PASSWORD_DEFAULT, 9 ], + [ PASSWORD_ARGON2I, 9 ], + [ CRYPT_BLOWFISH, 9 ], + [ PASSWORD_DEFAULT, 11 ], + [ PASSWORD_ARGON2I, 11 ], + [ CRYPT_BLOWFISH, 11 ], + [ PASSWORD_DEFAULT, 12 ], + [ PASSWORD_ARGON2I, 12 ], + [ CRYPT_BLOWFISH, 12 ], + [ PASSWORD_DEFAULT, 8 ], + [ PASSWORD_ARGON2I, 8 ], + [ CRYPT_BLOWFISH, 8 ], + [ PASSWORD_DEFAULT, 7 ], + [ PASSWORD_ARGON2I, 7 ], + [ CRYPT_BLOWFISH, 7] +] +?> + + + + +

+
+ $algo[1]]) )
+        ."\nbase64=". base64_encode($x);
+}
+
+?>
+
+

+ + diff --git a/tests/dotnet-pass.php b/tests/dotnet-pass.php new file mode 100644 index 0000000..eeba77f --- /dev/null +++ b/tests/dotnet-pass.php @@ -0,0 +1,503 @@ + 128 bits; TODO: die if not + $subKeyLength = 32; + + echo "\nalgo= ". $algorithm; + + $salt = substr($hash, 13, $saltLength); + // calculate derived + $derived = hash_pbkdf2($algorithm, $value, $salt, $iterations, $subKeyLength, true); + // pack all parts to construct the $newHash (to be compaired against $hash) + $newHash = chr(0x01) . pack('N3', $prf, $iterations, $saltLength) . $salt . $derived; + + + } // TODO: else { ERROR on version ; die() } + + + + echo "\nnewHash= ". base64_encode($newHash); + + return $hash === $newHash; + } + + +} + + +class SomeUserClass +{ + use DotNetHasherChecker; +} + + +?> + + + + +

+
+
+Verify_AspNet_HashedPassword(
+        '3212',
+        'AMHM+lMKiSdmucVv8KhQ9yyF/sVj8Pay16HJkBDORJxvHDm0WFP2vww9DBVo3JTEoA=='
+    );
+
+    echo "\nresult= ". json_encode([ 'match' => $result ]);
+?>
+
+
+

+ + + + + + /// Implements the standard Identity password hashing. + /// + /// The type used to represent a user. + public class PasswordHasher : IPasswordHasher where TUser : class + { + // ======================= + // HASHED PASSWORD FORMATS + // ======================= + // + // Version 2: + // PBKDF2 with HMAC-SHA1, 128-bit salt, 256-bit subkey, 1000 iterations. + // (See also: SDL crypto guidelines v5.1, Part III) + // Format: { 0x00, salt, subkey } + // + // Version 3: + // PBKDF2 with HMAC-SHA256, 128-bit salt, 256-bit subkey, 10000 iterations. + // Format: { 0x01, prf (UInt32), iter count (UInt32), salt length (UInt32), salt, subkey } + // (All UInt32s are stored big-endian.) + /// + + private readonly PasswordHasherCompatibilityMode _compatibilityMode; + private readonly int _iterCount; + private readonly RandomNumberGenerator _rng; + + ///

+ /// Creates a new instance of . + ///

+ /// The options for this instance. + public PasswordHasher(IOptions optionsAccessor = null) + { + var options = optionsAccessor?.Value ?? new PasswordHasherOptions(); + + _compatibilityMode = options.CompatibilityMode; + switch (_compatibilityMode) + { + case PasswordHasherCompatibilityMode.IdentityV2: + // nothing else to do + break; + + case PasswordHasherCompatibilityMode.IdentityV3: + _iterCount = options.IterationCount; + if (_iterCount < 1) + { + throw new InvalidOperationException(Resources.InvalidPasswordHasherIterationCount); + } + break; + + default: + throw new InvalidOperationException(Resources.InvalidPasswordHasherCompatibilityMode); + } + + _rng = options.Rng; + } + + // Compares two byte arrays for equality. The method is specifically written so that the loop is not optimized. + [MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)] + private static bool ByteArraysEqual(byte[] a, byte[] b) + { + if (a == null && b == null) + { + return true; + } + if (a == null || b == null || a.Length != b.Length) + { + return false; + } + var areSame = true; + for (var i = 0; i < a.Length; i++) + { + areSame &= (a[i] == b[i]); + } + return areSame; + } + + ///

+ /// Returns a hashed representation of the supplied for the specified . + ///

+ /// The user whose password is to be hashed. + /// The password to hash. + /// A hashed representation of the supplied for the specified . + public virtual string HashPassword(TUser user, string password) + { + if (password == null) + { + throw new ArgumentNullException(nameof(password)); + } + + if (_compatibilityMode == PasswordHasherCompatibilityMode.IdentityV2) + { + return Convert.ToBase64String(HashPasswordV2(password, _rng)); + } + else + { + return Convert.ToBase64String(HashPasswordV3(password, _rng)); + } + } + + private static byte[] HashPasswordV2(string password, RandomNumberGenerator rng) + { + const KeyDerivationPrf Pbkdf2Prf = KeyDerivationPrf.HMACSHA1; // default for Rfc2898DeriveBytes + const int Pbkdf2IterCount = 1000; // default for Rfc2898DeriveBytes + const int Pbkdf2SubkeyLength = 256 / 8; // 256 bits + const int SaltSize = 128 / 8; // 128 bits + + // Produce a version 2 (see comment above) text hash. + byte[] salt = new byte[SaltSize]; + rng.GetBytes(salt); + byte[] subkey = KeyDerivation.Pbkdf2(password, salt, Pbkdf2Prf, Pbkdf2IterCount, Pbkdf2SubkeyLength); + + var outputBytes = new byte[1 + SaltSize + Pbkdf2SubkeyLength]; + outputBytes[0] = 0x00; // format marker + Buffer.BlockCopy(salt, 0, outputBytes, 1, SaltSize); + Buffer.BlockCopy(subkey, 0, outputBytes, 1 + SaltSize, Pbkdf2SubkeyLength); + return outputBytes; + } + + private byte[] HashPasswordV3(string password, RandomNumberGenerator rng) + { + return HashPasswordV3(password, rng, + prf: KeyDerivationPrf.HMACSHA256, + iterCount: _iterCount, + saltSize: 128 / 8, + numBytesRequested: 256 / 8); + } + + private static byte[] HashPasswordV3(string password, RandomNumberGenerator rng, KeyDerivationPrf prf, int iterCount, int saltSize, int numBytesRequested) + { + // Produce a version 3 (see comment above) text hash. + byte[] salt = new byte[saltSize]; + rng.GetBytes(salt); + byte[] subkey = KeyDerivation.Pbkdf2(password, salt, prf, iterCount, numBytesRequested); + + var outputBytes = new byte[13 + salt.Length + subkey.Length]; + outputBytes[0] = 0x01; // format marker + WriteNetworkByteOrder(outputBytes, 1, (uint)prf); + WriteNetworkByteOrder(outputBytes, 5, (uint)iterCount); + WriteNetworkByteOrder(outputBytes, 9, (uint)saltSize); + Buffer.BlockCopy(salt, 0, outputBytes, 13, salt.Length); + Buffer.BlockCopy(subkey, 0, outputBytes, 13 + saltSize, subkey.Length); + return outputBytes; + } + + private static uint ReadNetworkByteOrder(byte[] buffer, int offset) + { + return ((uint)(buffer[offset + 0]) << 24) + | ((uint)(buffer[offset + 1]) << 16) + | ((uint)(buffer[offset + 2]) << 8) + | ((uint)(buffer[offset + 3])); + } + + ///

+ /// Returns a indicating the result of a password hash comparison. + ///

+ /// The user whose password should be verified. + /// The hash value for a user's stored password. + /// The password supplied for comparison. + /// A indicating the result of a password hash comparison. + /// Implementations of this method should be time consistent. + public virtual PasswordVerificationResult VerifyHashedPassword(TUser user, string hashedPassword, string providedPassword) + { + if (hashedPassword == null) + { + throw new ArgumentNullException(nameof(hashedPassword)); + } + if (providedPassword == null) + { + throw new ArgumentNullException(nameof(providedPassword)); + } + + byte[] decodedHashedPassword = Convert.FromBase64String(hashedPassword); + + // read the format marker from the hashed password + if (decodedHashedPassword.Length == 0) + { + return PasswordVerificationResult.Failed; + } + switch (decodedHashedPassword[0]) + { + case 0x00: + if (VerifyHashedPasswordV2(decodedHashedPassword, providedPassword)) + { + // This is an old password hash format - the caller needs to rehash if we're not running in an older compat mode. + return (_compatibilityMode == PasswordHasherCompatibilityMode.IdentityV3) + ? PasswordVerificationResult.SuccessRehashNeeded + : PasswordVerificationResult.Success; + } + else + { + return PasswordVerificationResult.Failed; + } + + case 0x01: + int embeddedIterCount; + if (VerifyHashedPasswordV3(decodedHashedPassword, providedPassword, out embeddedIterCount)) + { + // If this hasher was configured with a higher iteration count, change the entry now. + return (embeddedIterCount < _iterCount) + ? PasswordVerificationResult.SuccessRehashNeeded + : PasswordVerificationResult.Success; + } + else + { + return PasswordVerificationResult.Failed; + } + + default: + return PasswordVerificationResult.Failed; // unknown format marker + } + } + + private static bool VerifyHashedPasswordV2(byte[] hashedPassword, string password) + { + const KeyDerivationPrf Pbkdf2Prf = KeyDerivationPrf.HMACSHA1; // default for Rfc2898DeriveBytes + const int Pbkdf2IterCount = 1000; // default for Rfc2898DeriveBytes + const int Pbkdf2SubkeyLength = 256 / 8; // 256 bits + const int SaltSize = 128 / 8; // 128 bits + + // We know ahead of time the exact length of a valid hashed password payload. + if (hashedPassword.Length != 1 + SaltSize + Pbkdf2SubkeyLength) + { + return false; // bad size + } + + byte[] salt = new byte[SaltSize]; + Buffer.BlockCopy(hashedPassword, 1, salt, 0, salt.Length); + + byte[] expectedSubkey = new byte[Pbkdf2SubkeyLength]; + Buffer.BlockCopy(hashedPassword, 1 + salt.Length, expectedSubkey, 0, expectedSubkey.Length); + + // Hash the incoming password and verify it + byte[] actualSubkey = KeyDerivation.Pbkdf2(password, salt, Pbkdf2Prf, Pbkdf2IterCount, Pbkdf2SubkeyLength); + return ByteArraysEqual(actualSubkey, expectedSubkey); + } + + private static bool VerifyHashedPasswordV3(byte[] hashedPassword, string password, out int iterCount) + { + iterCount = default(int); + + try + { + // Read header information + KeyDerivationPrf prf = (KeyDerivationPrf)ReadNetworkByteOrder(hashedPassword, 1); + iterCount = (int)ReadNetworkByteOrder(hashedPassword, 5); + int saltLength = (int)ReadNetworkByteOrder(hashedPassword, 9); + + // Read the salt: must be >= 128 bits + if (saltLength < 128 / 8) + { + return false; + } + byte[] salt = new byte[saltLength]; + Buffer.BlockCopy(hashedPassword, 13, salt, 0, salt.Length); + + // Read the subkey (the rest of the payload): must be >= 128 bits + int subkeyLength = hashedPassword.Length - 13 - salt.Length; + if (subkeyLength < 128 / 8) + { + return false; + } + byte[] expectedSubkey = new byte[subkeyLength]; + Buffer.BlockCopy(hashedPassword, 13 + salt.Length, expectedSubkey, 0, expectedSubkey.Length); + + // Hash the incoming password and verify it + byte[] actualSubkey = KeyDerivation.Pbkdf2(password, salt, prf, iterCount, subkeyLength); + return ByteArraysEqual(actualSubkey, expectedSubkey); + } + catch + { + // This should never occur except in the case of a malformed payload, where + // we might go off the end of the array. Regardless, a malformed payload + // implies verification failed. + return false; + } + } + + private static void WriteNetworkByteOrder(byte[] buffer, int offset, uint value) + { + buffer[offset + 0] = (byte)(value >> 24); + buffer[offset + 1] = (byte)(value >> 16); + buffer[offset + 2] = (byte)(value >> 8); + buffer[offset + 3] = (byte)(value >> 0); + } + } +} + +--- +*/ \ No newline at end of file diff --git a/tests/register.php b/tests/register.php deleted file mode 100644 index 7f778af..0000000 --- a/tests/register.php +++ /dev/null @@ -1,43 +0,0 @@ -cryptPassword('102030!!!'); - -$user = (new User()) - ->setUserName('geo@roptron.gr') - ->setPassword($password) - ->setRoles([1]); - -$userManager->createUserToken($user); - - -$algos = [ - password_hash('root1234', PASSWORD_DEFAULT, ['cost' => 10 ]), - password_hash('root1234', PASSWORD_ARGON2I, ['cost' => 10 ]), - password_hash('root1234', CRYPT_BLOWFISH, ['cost' => 10 ]), - password_hash('root1234', PASSWORD_DEFAULT, ['cost' => 9 ]), - password_hash('root1234', PASSWORD_ARGON2I, ['cost' => 9 ]), - password_hash('root1234', CRYPT_BLOWFISH, ['cost' => 9 ]), - password_hash('root1234', PASSWORD_DEFAULT, ['cost' => 11 ]), - password_hash('root1234', PASSWORD_ARGON2I, ['cost' => 11 ]), - password_hash('root1234', CRYPT_BLOWFISH, ['cost' => 11 ]), - password_hash('root1234', PASSWORD_DEFAULT, ['cost' => 12 ]), - password_hash('root1234', PASSWORD_ARGON2I, ['cost' => 12 ]), - password_hash('root1234', CRYPT_BLOWFISH, ['cost' => 12 ]), - password_hash('root1234', PASSWORD_DEFAULT, ['cost' => 8 ]), - password_hash('root1234', PASSWORD_ARGON2I, ['cost' => 8 ]), - password_hash('root1234', CRYPT_BLOWFISH, ['cost' => 8 ]), - password_hash('root1234', PASSWORD_DEFAULT, ['cost' => 7 ]), - password_hash('root1234', PASSWORD_ARGON2I, ['cost' => 7 ]), - password_hash('root1234', CRYPT_BLOWFISH, ['cost' => 7 ]) - -] -?>

\ No newline at end of file -- cgit v1.2.3