move config to database

zstucsat · Oct 26, 2017 · ff5f8f9 · ff5f8f9
1 parent 7ddf41e
commit ff5f8f9
Show file tree

Hide file tree

Showing 10 changed files with 135 additions and 59 deletions.
diff --git a/app/Http/Controllers/ChallengeController.php b/app/Http/Controllers/ChallengeController.php
@@ -125,21 +125,33 @@ public function list(Request $request)
         $categories = Category::with(["levels", 'challenges'])->get();
         $validLevels = collect([]);
         $result = collect([]);
-        $categories->each(function ($category) use ($validLevels, $team) {
-            collect($category->levels)->each(function ($level) use ($validLevels, $team) {
-                if ((new RuleValidator($team->team_id, $level->rules))->check($team->logs) && Carbon::now()->gt(Carbon::parse($level->release_time))) {
-                    $validLevels->push($level->level_id);
-                }
+        try{
+            $categories->each(function ($category) use ($validLevels, $team) {
+                collect($category->levels)->each(function ($level) use ($validLevels, $team) {
+                    if ((new RuleValidator($team->team_id, $level->rules))->check($team->logs) && Carbon::now()->gt(Carbon::parse($level->release_time))) {
+                        $validLevels->push($level->level_id);
+                    }
+                });
             });
-        });
 
-        $categories->each(function ($category) use ($validLevels, $result) {
-            $result[$category->category_name] = $category->challenges->filter(function ($challenge) use ($validLevels) {
-                return $validLevels->contains($challenge->level_id) && Carbon::now()->gt(Carbon::parse($challenge->release_time));
-            })->groupBy('level_id');
-        });
+            $categories->each(function ($category) use ($validLevels, $result) {
+                $result[$category->category_name] = $category->challenges->filter(function ($challenge) use ($validLevels) {
+                    return $validLevels->contains($challenge->level_id) && Carbon::now()->gt(Carbon::parse($challenge->release_time));
+                })->groupBy('level_id');
+            });
 
-        return APIReturn::success($result);
+            $placeholders = [
+                'teamId' => hash('sha256', ((string)$team->team_id) . 'Nanjolno')
+            ];
+        }
+        catch (\Exception $e){
+            dump($e);
+        }
+
+        return APIReturn::success([
+            'placeholders' => $placeholders,
+            'challenges' => $result
+        ]);
     }
 
     /**
@@ -368,8 +380,9 @@ public function submitFlag(Request $request)
         }
         try {
             $flag = Flag::where('flag', $request->input('flag'))->first();
-            $flagPrefix = \Config::get("ctf.flagPrefix");
-            $flagSuffix = \Config::get("ctf.flagSuffix");
+            $config = collect(\DB::table("config")->get())->pluck('value', 'key');
+            $flagPrefix = $config["flag_prefix"];
+            $flagSuffix = $config["flag_suffix"];
 
             if (!$flag) {
                 //  Flag 不正确

diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php
@@ -16,8 +16,6 @@ class IndexController extends Controller
 {
     public function index(Request $request)
     {
-        Carbon::now()->toDateTimeString();
-        $title = 'hctf';
         return APIReturn::success([
             'hello' => "hctf"
         ]);

diff --git a/app/Http/Controllers/LevelController.php b/app/Http/Controllers/LevelController.php
@@ -38,7 +38,7 @@ public function create(Request $request)
             $newLevel = new Level();
             $newLevel->level_name = $request->input('levelName');
             $newLevel->release_time = Carbon::parse($request->input('releaseTime'))->setTimezone('UTC')->toDateTimeString();
-            $newLevel->rules = '[]';
+            $newLevel->rules = [];
 
             $category->levels()->save($newLevel);
 

diff --git a/app/Http/Controllers/SystemController.php b/app/Http/Controllers/SystemController.php
@@ -4,7 +4,6 @@
 
 use APIReturn;
 use Carbon\Carbon;
-use Config;
 use Illuminate\Http\Request;
 
 class SystemController extends Controller
@@ -17,14 +16,21 @@ class SystemController extends Controller
      */
     public function getMetaInfo(Request $request)
     {
-        return \APIReturn::success([
-            "startTime" => Carbon::parse(Config::get("ctf.startTime"))->toIso8601String(),
-            "endTime" => Carbon::parse(Config::get("ctf.endTime"))->toIso8601String(),
-            "flagPrefix" => Config::get("ctf.flagPrefix"),
-            "flagSuffix" => Config::get("ctf.flagSuffix")
+        $config = collect(\DB::table("config")->get())->pluck('value', 'key');
+        return APIReturn::success([
+            'startTime' => Carbon::parse($config['start_time'], 'UTC')->toIso8601String(),
+            'endTime' => Carbon::parse($config['end_time'], 'UTC')->toIso8601String(),
+            'flagPrefix' => $config['flag_prefix'],
+            'flagSuffix' => $config['flag_suffix']
         ]);
     }
 
+    /**
+     * 编辑系统设置
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     * @author Eridanus Sora <[email protected]>
+     */
     public function editMetaInfo(Request $request){
         $validator = \Validator::make($request->only(['startTime', 'endTime', 'flagPrefix', 'flagSuffix']), [
            'startTime' => 'required|date',
@@ -37,7 +43,24 @@ public function editMetaInfo(Request $request){
             return APIReturn::error('invalid_parameters', $validator->errors()->all(), 400);
         }
 
-        Config::set('ctf.startTime', $request->input('startTime'));
-        Config::set('ctf.endTime', $request->input('endTime'));
+        try{
+            \DB::table("config")->where('key', '=', 'start_time')->update([
+                'value' => Carbon::parse($request->input('startTime'))->setTimezone('UTC')->toDateTimeString()
+            ]);
+            \DB::table("config")->where('key', '=', 'end_time')->update([
+                'value' => Carbon::parse($request->input('endTime'))->setTimezone('UTC')->toDateTimeString()
+            ]);
+            \DB::table("config")->where('key', '=', 'flag_prefix')->update([
+                'value' => $request->input('flagPrefix')
+            ]);
+            \DB::table("config")->where('key', '=', 'flag_suffix')->update([
+                'value' => $request->input('flagSuffix')
+            ]);
+        }
+        catch (\Exception $e){
+            return \APIReturn::error("database_error", "数据库读写错误", 500);
+        }
+
+        return APIReturn::success();
     }
 }
diff --git a/app/Http/Middleware/TimeCheck.php b/app/Http/Middleware/TimeCheck.php
@@ -12,8 +12,9 @@
  */
 class TimeCheck {
     public function handle($request, Closure $next){
-        $start = Carbon::parse(\Config::get("ctf.startTime"));
-        $end = Carbon::parse(\Config::get("ctf.endTime"));
+        $config = collect(\DB::table("config")->get())->pluck('value', 'key');
+        $start = Carbon::parse($config["start_time"], 'UTC');
+        $end = Carbon::parse($config["end_time"], 'UTC');
         $now = Carbon::now("Asia/Shanghai");
         if ($now->lt($start) || $now->gt($end)){
             return \APIReturn::error("under_maintenance", [

diff --git a/app/Services/RuleValidator.php b/app/Services/RuleValidator.php
@@ -60,7 +60,7 @@ public function check($logs)
         // 记录开放时间
         if ($result === true) {
             if (!Cache::has($this->teamId . '-' . $this->rulesHash)) {
-                Cache::forever($this->teamId . '-' . $this->rulesHash, Carbon::now('Asia/Shanghai')->toDateTimeString());
+                Cache::forever($this->teamId . '-' . $this->rulesHash, Carbon::now()->toIso8601String());
             }
         }
         return $result;
@@ -76,7 +76,7 @@ public function secondsAfterOpen()
         if (!Cache::has($this->teamId . '-' . $this->rulesHash)) {
             return 0;
         } else {
-            return Carbon::parse(Cache::get($this->teamId . '-' . $this->rulesHash), 'Asia/Shanghai')->diffInSeconds(Carbon::now('Asia/Shanghai'));
+            return Carbon::parse(Cache::get($this->teamId . '-' . $this->rulesHash))->diffInSeconds(Carbon::now());
         }
     }
 }
diff --git a/config/ctf.php b/config/ctf.php
diff --git a/database/migrations/2017_10_26_154016_add_config_table.php b/database/migrations/2017_10_26_154016_add_config_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddConfigTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create("config", function(Blueprint $table){
+            $table->string('key')->unique();
+            $table->string('value');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/database/seeds/ConfigTableSeeder.php b/database/seeds/ConfigTableSeeder.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Seeder;
+
+class ConfigTableSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        DB::table('config')->delete();
+
+        $config = [
+            [
+                'key' => 'start_time',
+                'value' => '2017-11-11T08:00:00+08:00'
+            ],
+            [
+                'key' => 'end_time',
+                'value' => '2017-11-13T08:00:00+08:00'
+            ],
+            [
+                'key' => 'flag_prefix',
+                'value' => 'hctf{'
+            ],
+            [
+                'key' => 'flag_suffix',
+                'value' => '}'
+            ]
+        ];
+
+        DB::table('config')->insert($config);
+    }
+}
diff --git a/routes/web.php b/routes/web.php
@@ -85,4 +85,7 @@
 
 Route::group(['prefix' => 'System'], function(){
    Route::get('meta', 'SystemController@getMetaInfo');
+   Route::group(['middleware' => ['jwt.auth.mod', 'AdminCheck']], function(){
+      Route::post('edit', 'SystemController@editMetaInfo');
+   });
 });