Merge pull request #15 from LittleJake/develop

Develop
LittleJake · Feb 7, 2024 · fa48d1a · fa48d1a
2 parents cb81965 + 4f64ac0
commit fa48d1a
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 22 deletions.
diff --git a/.env.example b/.env.example
@@ -1,5 +1,7 @@
 [MONITOR]
 OFFLINE_THRESHOLD = 600
+DATA_TIMEOUT = 259200
+RETENTION_TIME = 86400
 
 [REDIS]
 HOST = ''

diff --git a/application/api/controller/Report.php b/application/api/controller/Report.php
@@ -5,20 +5,21 @@
 use app\common\lib\SystemMonitor;
 use think\Controller;
 
+//TODO: Input sanitization.
 class Report extends Controller
 {
-    protected $middleware = ['FlowControl', 'CheckToken', 'CheckUUID', 'CheckJson'];
+    protected $middleware = ['FlowControl', 'CheckToken', 'CheckUUID' => ['except' => ['hash']]];
 
 
     public function collection($uuid = '')
     {
-        $json = $this-> request -> input();
-        return json(SystemMonitor::setCollection($uuid, $json));
+        $json = $this-> request -> post();
+        return json(SystemMonitor::setCollection($uuid, json_encode($json)));
     }
 
     public function info($uuid = '')
     {
-        $json = $this-> request -> input();
+        $json = $this-> request -> post();
         return json(SystemMonitor::setInfo($uuid, $json));
     }
 

diff --git a/application/common/lib/SystemMonitor.php b/application/common/lib/SystemMonitor.php
@@ -6,6 +6,7 @@
 use think\facade\Cache;
 use think\facade\Env;
 use think\facade\Log;
+use think\exception\HttpException;
 
 class SystemMonitor
 {
@@ -49,8 +50,20 @@ static public function getUUIDs()
 
     static public function setUUID($uuid, $ip)
     {
-        return Cache::store('redis')->handler()
-            ->hSet("system_monitor:hashes", $uuid, $ip);
+        try {
+            Cache::store('redis')->handler()->hSet("system_monitor:hashes", $uuid, $ip);
+            Cache::store('redis')->handler()->expire("system_monitor:hashes", Env::get("MONITOR.DATA_TIMEOUT"));
+            $uuids = SystemMonitor::getUUIDs();
+            if (empty($uuids[$uuid])) {
+                Cache::rm("system_monitor:hashes");
+                return ['code' => 200, 'message' => "Authorization OK, welcome aboard."];
+            }
+
+            return ['code' => 200, 'message' => "OK"];
+        } catch (Exception $e) {
+            Log::error($e->getMessage());
+            return ['code' => 500, 'message' => "Fail."];
+        }
     }
 
     static public function getLatest($uuid)
@@ -87,7 +100,8 @@ static public function getInfo($uuid)
     static public function setInfo($uuid, $data)
     {
         try {
-            Cache::store('redis')->handler()->hSetAll("system_monitor:info:$uuid", $data);
+            Cache::store('redis')->handler()->hMset("system_monitor:info:$uuid", $data);
+            Cache::store('redis')->handler()->expire("system_monitor:info:$uuid", Env::get("MONITOR.DATA_TIMEOUT"));
             return ['code' => 200, 'message' => "OK"];
         } catch (Exception $e) {
             Log::error($e->getMessage());
@@ -152,6 +166,9 @@ static public function setCollection($uuid, $data)
         try {
             Cache::store('redis')->handler()
                 ->zAdd("system_monitor:collection:$uuid", time(), $data);
+            Cache::store('redis')->handler()
+                ->zRemRangeByScore("system_monitor:collection:$uuid", 0, time() - Env::get("MONITOR.RETENTION_TIME"));
+            Cache::store('redis')->handler()->expire("system_monitor:collection:$uuid", Env::get("MONITOR.DATA_TIMEOUT"));
             return ['code' => 200, 'message' => "OK"];
         } catch (Exception $e) {
             Log::error($e->getMessage());
@@ -237,7 +254,7 @@ static public function getIPByUUID($uuid)
     {
         $uuids = SystemMonitor::getUUIDs();
         if (empty($uuids[$uuid]))
-            throw new Exception("Wrong Token", 403);
+            throw new HttpException(403, "Wrong Token");
         return $uuids[$uuid];
     }
 

diff --git a/application/http/middleware/CheckJson.php b/application/http/middleware/CheckJson.php
@@ -2,14 +2,14 @@
 
 namespace app\http\middleware;
 
-use think\Exception;
+use think\exception\HttpException;
 
 class CheckJson
 {
     public function handle($request, \Closure $next)
     {
         if(!$request -> isJson())
-            throw new Exception("Not Allow", 405);
+            throw new HttpException(405, 'Method Not Allowed');
 
         return $next($request);
     }

diff --git a/application/http/middleware/CheckToken.php b/application/http/middleware/CheckToken.php
@@ -2,7 +2,8 @@
 
 namespace app\http\middleware;
 
-use think\Exception;
+use think\exception\HttpException;
+use think\facade\Cache;
 
 class CheckToken
 {
@@ -12,7 +13,7 @@ public function handle($request, \Closure $next)
         $auth = $request->header('authorization');
         $node_token = Cache::store('token')->has("node_token")?json_decode(Cache::store("token")->get("node_token"), true):[];
         if($node_token[$uuid] != $auth)
-            throw new Exception("Authorization Failed.", 403);
+            throw new HttpException(403, "Authorization Failed.");
 
         return $next($request);
     }

diff --git a/application/http/middleware/CheckUUID.php b/application/http/middleware/CheckUUID.php
@@ -3,15 +3,15 @@
 namespace app\http\middleware;
 
 use app\common\lib\SystemMonitor;
-use think\Exception;
+use think\exception\HttpException;
 
 class CheckUUID
 {
     public function handle($request, \Closure $next)
     {
         $uuid = $request->param('uuid');
         if(strlen($uuid) != 32 || empty(SystemMonitor::getUUIDs()[$uuid]))
-            throw new Exception("Wrong UUID", 403);
+            throw new HttpException(403, "Wrong UUID");
 
         return $next($request);
     }

diff --git a/application/http/middleware/FlowControl.php b/application/http/middleware/FlowControl.php
@@ -2,7 +2,7 @@
 
 namespace app\http\middleware;
 
-use think\Exception;
+use think\exception\HttpException;
 use think\facade\Cache;
 
 class FlowControl
@@ -11,7 +11,7 @@ public function handle($request, \Closure $next)
     {
         $ip = $request->ip();
         if(Cache::inc("FlowControl:$ip") > 50)
-            throw new Exception("Trigger Flow Control", 503);
+            throw new HttpException(503, "Trigger Flow Control");
         else
             Cache::set("FlowControl:$ip", 0, 1);
         return $next($request);

diff --git a/config/cache.php b/config/cache.php
@@ -23,7 +23,7 @@
         // 缓存前缀
         'prefix'=> 'monitor',
         // 缓存目录
-        'path' => preg_match("/cli/i", php_sapi_name())?'./runtime/cache/':'../runtime/cache/',
+        'path' => __DIR__.'/../runtime/cache/',
     ],
     'redis' => [
         'type'       => 'Redis',
@@ -44,12 +44,12 @@
         // 缓存前缀
         'prefix'=> 'flag',
         // 缓存目录
-        'path' => preg_match("/cli/i", php_sapi_name())?'./runtime/cache/':'../runtime/cache/',
+        'path' => __DIR__.'/../runtime/cache/',
     ],
     'token' => [
         'type' => 'file',
         'expire' => 0,
         'prefix' => 'token',
-        'path' => preg_match("/cli/i", php_sapi_name())?'./runtime/cache/':'../runtime/cache/',
+        'path' => __DIR__.'/../runtime/cache/',
     ]
 ];
diff --git a/route/route.php b/route/route.php
@@ -18,15 +18,16 @@
 Route::get('api/network/:uuid','api/network/get');
 Route::get('api/thermal/:uuid','api/thermal/get');
 Route::get('api/battery/:uuid','api/battery/get');
-Route::post('api/report/collection/:uuid','api/collection/info');
+
+Route::post('api/report/collection/:uuid','api/report/collection');
 Route::post('api/report/info/:uuid','api/report/info');
 Route::post('api/report/hash/:uuid','api/report/hash');
+
 Route::any('admin/info/:uuid','admin/info/index');
 Route::any('admin/','admin/index/index');
+
 Route::rule('admin/login','admin/index/login', 'GET|POST');
 Route::rule('admin/logout','admin/index/logout', 'GET');
-
-
 Route::rule('/manifest.json','index/index/manifest', 'GET');
 
 return [];