refactor(Validator): fix user input extract

1. Fix user input extract in Validator, remove limit to extract user input to only defined public value. Now only prevent {private, protected, static} property will not be rewrite by user input. 2. Fix input file lost record in array `_file_input_name`. 3. Remove function buildDefaultDataForValid(), now we rewrite array `_input` by `array_merge(static::defaultData(), $this->_input);` at start of validate(); Remove function buildDefaultPropBeforeValid() (may revert); Rename function `setData` -> `setInput`, `getData` -> `getInput`. 4. Add Min Limit for PagerTrait. 5. move route `/user` alias `/user/details` but not `/user/panel` 6. Limit user init, the time and ip information ({creat,last_{login,access,upload,download,connect}}_at, {register,last_{login,access,tracker}}_ip) will not get from database.
Rhilip · Aug 13, 2019 · 81bdc8f · 81bdc8f
1 parent db6d5ff
commit 81bdc8f
Show file tree

Hide file tree

Showing 49 changed files with 433 additions and 456 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,11 +8,12 @@
 - **template:** Add git commit hash in `CHANGELOG.md` (76bc527)
 
 ### Feat
-- **Auth:** Sep Auth part from Site to new components (f36884e)
 - **Auth:** Use JWT to set cookies content (bf897c6)
+- **Auth:** Sep Auth part from Site to new components (f36884e)
 - **Auth/Login:** Add full Advanced Options support (6009dc8)
 - **Secret:** Check session and user_id match or not in jwt payload (358ba5d)
 - **Secret:** Protect jwt key for env('APP_SECRET_KEY') (dfa67da)
+- **Sessions:** record user access information at Auth->onRequestAfter() (e2a22a7)
 - **Sessions/List:** Use SessionsListForm to show user sessions (9ecfb97)
 - **ban_ips:** Store banned ip in components/Site (01084c9)
 
@@ -33,6 +34,9 @@
 - **torrent/structure:** Use zui.tree instead javascript `$(this).next('ul').toggle()` (7b20b2c)
 - **view:** Fix helper/username params (720f37e)
 
+### Revert
+- **Redis:** Remove view in redis , use other software install (c5d3378)
+
 
 <a name="v0.1.5-alpha"></a>
 ## [v0.1.5-alpha] - 2019-08-09

diff --git a/apps/controllers/AuthController.php b/apps/controllers/AuthController.php
@@ -21,7 +21,7 @@ public function actionRegister()
     {
         if (app()->request->isPost()) {
             $register_form = new Auth\UserRegisterForm();
-            $register_form->setData(app()->request->post());
+            $register_form->setInput(app()->request->post());
             $success = $register_form->validate();
             if (!$success) {
                 return $this->render('action/action_fail', [
@@ -48,7 +48,7 @@ public function actionRegister()
     public function actionConfirm()
     {
         $confirm = new Auth\UserConfirmForm();
-        $confirm->setData(app()->request->get());
+        $confirm->setInput(app()->request->get());
         $success = $confirm->validate();
         if (!$success) {
             return $this->render('action/action_fail', [
@@ -68,7 +68,7 @@ public function actionRecover()
     {
         if (app()->request->isPost()) {
             $form = new Auth\UserRecoverForm();
-            $form->setData(app()->request->post());
+            $form->setInput(app()->request->post());
             $success = $form->validate();
             if (!$success) {
                 return $this->render('action/action_fail', [

diff --git a/apps/controllers/LinksController.php b/apps/controllers/LinksController.php
@@ -22,7 +22,7 @@ public function actionApply()
     {
         if (app()->request->isPost()) {
             $form = new Links\ApplyForm();
-            $form->setData(app()->request->post());
+            $form->setInput(app()->request->post());
             $success = $form->validate();
             if ($success) {
                 $form->flush();
@@ -40,7 +40,7 @@ public function actionManage()
         if (app()->request->isPost()) {
             if (app()->request->post('action') == 'link_edit') {
                 $edit_form = new Links\EditForm();
-                $edit_form->setData(app()->request->post());
+                $edit_form->setInput(app()->request->post());
                 $success = $edit_form->validate();
                 if ($success) {
                     $edit_form->flush();
@@ -50,7 +50,7 @@ public function actionManage()
                 }
             } elseif (app()->request->post('action') == 'link_delete') {
                 $delete_form = new Links\RemoveForm();
-                $delete_form->setData(app()->request->post());
+                $delete_form->setInput(app()->request->post());
                 $success = $delete_form->validate();
                 if ($success) {
                     $delete_form->flush();

diff --git a/apps/controllers/ManageController.php b/apps/controllers/ManageController.php
@@ -18,7 +18,7 @@ public function actionCategories()
         if (app()->request->isPost()) {
             if (app()->request->post('action') == 'cat_edit') {
                 $edit_form = new Categories\EditForm();
-                $edit_form->setData(app()->request->post());
+                $edit_form->setInput(app()->request->post());
                 $success = $edit_form->validate();
                 if ($success) {
                     $edit_form->flush();
@@ -28,7 +28,7 @@ public function actionCategories()
                 }
             } elseif (app()->request->post('action') == 'cat_delete') {
                 $delete_form = new Categories\RemoveForm();
-                $delete_form->setData(app()->request->post());
+                $delete_form->setInput(app()->request->post());
                 $success = $delete_form->validate();
                 if ($success) {
                     $delete_form->flush();

diff --git a/apps/controllers/NewsController.php b/apps/controllers/NewsController.php
@@ -16,7 +16,7 @@ class NewsController extends Controller
 {
     public function actionIndex() {
         $pager = new News\SearchForm();
-        $pager->setData(app()->request->get());
+        $pager->setInput(app()->request->get());
 
         $success = $pager->validate();
         if (!$success) {
@@ -29,7 +29,7 @@ public function actionIndex() {
     public function actionNew() {
         if (app()->request->isPost()) {
             $newform = new News\EditForm();
-            $newform->setData(app()->request->post());
+            $newform->setInput(app()->request->post());
             $success = $newform->validate();
             if (!$success) {
                 return $this->render('action/action_fail', ['title' => 'new blog failed', 'msg' => $newform->getError()]);
@@ -47,7 +47,7 @@ public function actionEdit()
     {
         if (app()->request->isPost()) {
             $newform = new News\EditForm();
-            $newform->setData(app()->request->post());
+            $newform->setInput(app()->request->post());
             $success = $newform->validate();
             if (!$success) {
                 return $this->render('action/action_fail', ['title' => 'Upload Failed', 'msg' => $newform->getError()]);

diff --git a/apps/controllers/TorrentController.php b/apps/controllers/TorrentController.php
@@ -19,7 +19,7 @@ public function actionDetails()
         $details = new Torrent\DetailsForm();
         $success = $details->validate();
         if (!$success) {
-            return $this->render('action/action_fail');
+            return $this->render('action/action_fail', ['msg' => $details->getError()]);
         }
 
         return $this->render('torrent/details', ['details' => $details]);

diff --git a/apps/controllers/TorrentsController.php b/apps/controllers/TorrentsController.php
@@ -24,7 +24,7 @@ public function actionSearch()
     {
         // TODO add URI level Cache
         $pager = new Torrents\SearchForm();
-        $pager->setData(app()->request->get());
+        $pager->setInput(app()->request->get());
         $success = $pager->validate();
         if (!$success) {
             return $this->render('action/action_fail');
@@ -38,8 +38,8 @@ public function actionUpload()
         // TODO Check user upload pos
         if (app()->request->isPost()) {
             $uploadForm = new Torrents\UploadForm();
-            $uploadForm->setData(app()->request->post());
-            $uploadForm->setFileData(app()->request->files());
+            $uploadForm->setInput(app()->request->post());
+            $uploadForm->setFileInput(app()->request->files());
             $success = $uploadForm->validate();
             if (!$success) {
                 return $this->render('action/action_fail', ['title' => 'Upload Failed', 'msg' => $uploadForm->getError()]);
@@ -50,7 +50,7 @@ public function actionUpload()
                     return $this->render('action/action_fail', ['title' => 'Upload Failed', 'msg' => $e->getMessage()]);
                 }
 
-                return app()->response->redirect('/torrent/details?id=' . $uploadForm->id);
+                return app()->response->redirect('/torrent/details?id=' . $uploadForm->getId());
             }
         } else {
             return $this->render('torrents/upload');
@@ -61,7 +61,7 @@ public function actionUpload()
     public function actionTags()
     {
         $pager = new Torrents\TagsForm();
-        $pager->setData(app()->request->get());
+        $pager->setInput(app()->request->get());
         $success = $pager->validate();
 
         if (!$success) {

diff --git a/apps/controllers/UserController.php b/apps/controllers/UserController.php
@@ -17,7 +17,7 @@ class UserController extends Controller
 
     public function actionIndex()
     {
-        return $this->actionPanel();
+        return $this->actionDetails();
     }
 
     public function actionSetting()
@@ -30,7 +30,7 @@ public function actionInvite()
         $msg = '';
         if (app()->request->isPost()) {
             $form = new User\InviteForm();
-            $form->setData(app()->request->post());
+            $form->setInput(app()->request->post());
             $success = $form->validate();
             if ($success) {
                 $form->flush();
@@ -53,7 +53,7 @@ public function actionInvite()
         // FIXME By using Form Class
         if (!is_null(app()->request->get('action'))) {
             $action_form = new User\InviteActionForm();
-            $action_form->setData(app()->request->get());
+            $action_form->setInput(app()->request->get());
             $success = $action_form->validate();
             if ($success) {
                 $msg = $action_form->flush();
@@ -66,15 +66,14 @@ public function actionInvite()
     }
 
 
-    public function actionPanel()
+    public function actionDetails()
     {
-        $uid = app()->request->get('id');
-        if ($uid && $uid != app()->auth->getCurUser()->getId()) {
-            $user = app()->site->getUser($uid);
-        } else {
-            $user = app()->auth->getCurUser();
+        $panel = new User\UserDetailsForm();
+        if (!$panel->validate()) {
+            return $this->render('action/action_fail', ['msg' => $panel->getError()]);
         }
-        return $this->render('user/panel', ['user' => $user]);
+
+        return $this->render('user/details', ['details' => $panel]);
     }
 
     public function actionSessions()

diff --git a/apps/controllers/api/v1/TorrentController.php b/apps/controllers/api/v1/TorrentController.php
@@ -16,7 +16,7 @@ class TorrentController extends ApiController
     public function actionBookmark() {
         if ($this->checkMethod('POST')) {
             $bookmark = new TorrentsForm();
-            $bookmark->setData(app()->request->post());
+            $bookmark->setInput(app()->request->post());
             $success = $bookmark->validate();
             if (!$success) {
                 return [
@@ -38,7 +38,7 @@ public function actionBookmark() {
     public function actionFileList() {
         if ($this->checkMethod('GET')) {
             $filelist = new TorrentsForm();
-            $filelist->setData(app()->request->get());
+            $filelist->setInput(app()->request->get());
             $success = $filelist->validate();
             if (!$success) {
                 return [
@@ -62,7 +62,7 @@ public function actionNfoFileContent()
     {
         if ($this->checkMethod('GET')) {
             $filelist = new TorrentsForm();
-            $filelist->setData(app()->request->get());
+            $filelist->setInput(app()->request->get());
             $success = $filelist->validate();
             if (!$success) {
                 return [

diff --git a/apps/libraries/GeoIP/GeoIPInterface.php b/apps/libraries/GeoIP/GeoIPInterface.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Rhilip
+ * Date: 8/13/2019
+ * Time: 2019
+ */
+
+namespace apps\libraries\GeoIP;
+
+
+interface GeoIPInterface
+{
+    public static function getLocation();
+}