Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

database/factories/ModelFactory.php

@@ -221,3 +221,22 @@ $factory->define(Pterodactyl\Models\DaemonKey::class, function (Faker\Generator
         'expires_at' => \Carbon\Carbon::now()->addMinutes(10)->toDateTimeString(),
     ];
 });
+
+$factory->define(Pterodactyl\Models\APIKey::class, function (Faker\Generator $faker) {
+    return [
+        'id' => $faker->unique()->randomNumber(),
+        'user_id' => $faker->randomNumber(),
+        'token' => str_random(Pterodactyl\Models\APIKey::KEY_LENGTH),
+        'memo' => 'Test Function Key',
+        'created_at' => \Carbon\Carbon::now()->toDateTimeString(),
+        'updated_at' => \Carbon\Carbon::now()->toDateTimeString(),
+    ];
+});
+
+$factory->define(Pterodactyl\Models\APIPermission::class, function (Faker\Generator $faker) {
+    return [
+        'id' => $faker->unique()->randomNumber(),
+        'key_id' => $faker->randomNumber(),
+        'permission' => mb_strtolower($faker->word),
+    ];
+});

database/migrations/2017_11_19_122708_MigratePubPrivFormatToSingleKey.php

@@ -0,0 +1,59 @@
+<?php
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Contracts\Encryption\DecryptException;
+
+class MigratePubPrivFormatToSingleKey extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        DB::transaction(function () {
+            DB::table('api_keys')->get()->each(function ($item) {
+                try {
+                    $decrypted = Crypt::decrypt($item->secret);
+                } catch (DecryptException $exception) {
+                    $decrypted = str_random(32);
+                } finally {
+                    DB::table('api_keys')->where('id', $item->id)->update([
+                        'secret' => $decrypted,
+                    ]);
+                }
+            });
+        });
+
+        Schema::table('api_keys', function (Blueprint $table) {
+            $table->dropColumn('public');
+            $table->string('secret', 32)->change();
+        });
+
+        DB::statement('ALTER TABLE `api_keys` CHANGE `secret` `token` CHAR(32) NOT NULL, ADD UNIQUE INDEX `api_keys_token_unique` (`token`(32))');
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        DB::statement('ALTER TABLE `api_keys` CHANGE `token` `secret` TEXT, DROP INDEX `api_keys_token_unique`');
+
+        Schema::table('api_keys', function (Blueprint $table) {
+            $table->char('public', 16)->after('user_id');
+        });
+
+        DB::transaction(function () {
+            DB::table('api_keys')->get()->each(function ($item) {
+                DB::table('api_keys')->where('id', $item->id)->update([
+                    'public' => str_random(16),
+                    'secret' => Crypt::encrypt($item->secret),
+                ]);
+            });
+        });
+    }
+}