From f71190e286b53466b8daa92ad1873903945ee7ba Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Sun, 30 Oct 2016 14:12:22 +0800
Subject: [PATCH] update ciphers

---
 .env.example                              |  2 +-
 app/Events/PlayerWillBeAdded.php          | 21 +++++++++++++++++++++
 app/Http/Controllers/PlayerController.php |  3 +++
 app/Services/Cipher/CrazyCrypt1.php       | 22 ----------------------
 app/Services/Cipher/SALTED2SHA256.php     | 17 +++++++++++++++++
 app/Services/Cipher/SALTED2SHA512.php     | 17 +++++++++++++++++
 app/Services/Cipher/SHA256.php            |  2 +-
 app/Services/Cipher/SHA512.php            | 17 +++++++++++++++++
 8 files changed, 77 insertions(+), 24 deletions(-)
 create mode 100644 app/Events/PlayerWillBeAdded.php
 delete mode 100644 app/Services/Cipher/CrazyCrypt1.php
 create mode 100644 app/Services/Cipher/SALTED2SHA256.php
 create mode 100644 app/Services/Cipher/SALTED2SHA512.php
 create mode 100644 app/Services/Cipher/SHA512.php

diff --git a/.env.example b/.env.example
index 7a04de6e..eb61f69d 100644
--- a/.env.example
+++ b/.env.example
@@ -29,7 +29,7 @@ DB_PREFIX       = null
 
 # Encrypt Method for Passwords.
 #
-# Available values: MD5, SALTED2MD5, SHA256
+# Available values: MD5, SALTED2MD5, (SALTED2)SHA256, (SALTED2)SHA512
 PWD_METHOD      = SALTED2MD5
 
 # Salt
diff --git a/app/Events/PlayerWillBeAdded.php b/app/Events/PlayerWillBeAdded.php
new file mode 100644
index 00000000..947f936b
--- /dev/null
+++ b/app/Events/PlayerWillBeAdded.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\Player;
+
+class PlayerWillBeAdded extends Event
+{
+    public $playerName;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($player_name)
+    {
+        $this->playerName = $player_name;
+    }
+
+}
diff --git a/app/Http/Controllers/PlayerController.php b/app/Http/Controllers/PlayerController.php
index 83a3a0d9..15144f76 100644
--- a/app/Http/Controllers/PlayerController.php
+++ b/app/Http/Controllers/PlayerController.php
@@ -13,6 +13,7 @@ use Illuminate\Http\Request;
 use App\Events\PlayerWasAdded;
 use App\Events\PlayerWasDeleted;
 use App\Events\CheckPlayerExists;
+use App\Events\PlayerWillBeAdded;
 use App\Exceptions\PrettyPageException;
 use App\Services\Repositories\UserRepository;
 
@@ -61,6 +62,8 @@ class PlayerController extends Controller
             return json(trans('user.player.add.lack-score'), 7);
         }
 
+        Event::fire(new PlayerWillBeAdded($request->input('player_name')));
+
         $player = new Player;
 
         $player->uid           = $this->user->uid;
diff --git a/app/Services/Cipher/CrazyCrypt1.php b/app/Services/Cipher/CrazyCrypt1.php
deleted file mode 100644
index 13d3896c..00000000
--- a/app/Services/Cipher/CrazyCrypt1.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Services\Cipher;
-
-class CrazyCrypt1 implements EncryptInterface
-{
-    /**
-     * Fucking CrazyCrypt1
-     *
-     * https://github.com/ST-DDT/CrazyLogin/blob/master/php/Encryptors/CrazyCrypt1.php
-     */
-    public function encrypt($raw_passwd, $salt = "") {
-        // salt is username
-        $text = "ÜÄaeut//&/=I " . $raw_passwd . "7421€547" . $salt . "__+IÄIH§%NK " . $raw_passwd;
-        $t1 = unpack("H*", $text);
-        $t2 = substr($t1[1], 0, mb_strlen($text, 'UTF-8')*2);
-        $t3 = pack("H*", $t2);
-        $encrypt = hash("sha512", $t3);
-        return $encrypt;
-    }
-
-}
diff --git a/app/Services/Cipher/SALTED2SHA256.php b/app/Services/Cipher/SALTED2SHA256.php
new file mode 100644
index 00000000..f8c266f6
--- /dev/null
+++ b/app/Services/Cipher/SALTED2SHA256.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Services\Cipher;
+
+class SHA256 implements EncryptInterface
+{
+    /**
+     * Default SHA256 encryption method for Authme
+     *
+     * @see http://pastebin.com/1wy9g2HT
+     */
+    public function encrypt($raw_passwd, $salt = "") {
+        $encrypt = hash('sha256', hash('sha256', $raw_passwd).$salt);
+        return $encrypt;
+    }
+
+}
diff --git a/app/Services/Cipher/SALTED2SHA512.php b/app/Services/Cipher/SALTED2SHA512.php
new file mode 100644
index 00000000..c047aa31
--- /dev/null
+++ b/app/Services/Cipher/SALTED2SHA512.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Services\Cipher;
+
+class SHA256 implements EncryptInterface
+{
+    /**
+     * Default SHA256 encryption method for Authme
+     *
+     * @see http://pastebin.com/1wy9g2HT
+     */
+    public function encrypt($raw_passwd, $salt = "") {
+        $encrypt = hash('sha512', hash('sha256', $raw_passwd).$salt);
+        return $encrypt;
+    }
+
+}
diff --git a/app/Services/Cipher/SHA256.php b/app/Services/Cipher/SHA256.php
index f8c266f6..45ef9567 100644
--- a/app/Services/Cipher/SHA256.php
+++ b/app/Services/Cipher/SHA256.php
@@ -10,7 +10,7 @@ class SHA256 implements EncryptInterface
      * @see http://pastebin.com/1wy9g2HT
      */
     public function encrypt($raw_passwd, $salt = "") {
-        $encrypt = hash('sha256', hash('sha256', $raw_passwd).$salt);
+        $encrypt = hash('sha256', $raw_passwd);
         return $encrypt;
     }
 
diff --git a/app/Services/Cipher/SHA512.php b/app/Services/Cipher/SHA512.php
new file mode 100644
index 00000000..76be4121
--- /dev/null
+++ b/app/Services/Cipher/SHA512.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Services\Cipher;
+
+class SHA256 implements EncryptInterface
+{
+    /**
+     * Default SHA256 encryption method for Authme
+     *
+     * @see http://pastebin.com/1wy9g2HT
+     */
+    public function encrypt($raw_passwd, $salt = "") {
+        $encrypt = hash('sha512', $raw_passwd);
+        return $encrypt;
+    }
+
+}