fixed to forward member/login for the anonymous access with invalid I…

…D (refs #2096)
balibali · Aug 26, 2011 · e8cafb8 · e8cafb8
1 parent e2b583e
commit e8cafb8
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 1 deletion.
diff --git a/lib/action/opDiaryPluginActions.class.php b/lib/action/opDiaryPluginActions.class.php
@@ -28,7 +28,18 @@ public function preExecute()
   {
     if (is_callable(array($this->getRoute(), 'getObject')))
     {
-      $object = $this->getRoute()->getObject();
+      try
+      {
+        $object = $this->getRoute()->getObject();
+      }
+      catch (sfError404Exception $e)
+      {
+        $this->forwardUnless($this->getUser()->isSNSMember(),
+            sfConfig::get('sf_login_module'), sfConfig::get('sf_login_action'));
+
+        throw $e;
+      }
+
       if ($object instanceof Diary)
       {
         $this->diary = $object;

diff --git a/test/functional/mobile_frontend/diaryOpenTest.php b/test/functional/mobile_frontend/diaryOpenTest.php
@@ -194,3 +194,38 @@
     ->matches('/Your search "'.$keyword.'" did not match any diaries\./')
   ->end()
 ;
+
+$test->info('Invalid Id Test')
+  ->get('/diary/99999')
+  ->isForwardedTo('member', 'login')
+
+  ->get('/diary/listMember/99999')
+  ->isForwardedTo('member', 'login')
+
+  ->get('/diary/listMember/99999/2009/1')
+  ->isForwardedTo('member', 'login')
+
+  ->get('/diary/listMember/99999/2009/1/1')
+  ->isForwardedTo('member', 'login')
+
+  ->get('/diary/edit/99999')
+  ->isForwardedTo('member', 'login')
+
+  ->post('/diary/update/99999')
+  ->isForwardedTo('member', 'login')
+
+  ->get('/diary/deleteConfirm/99999')
+  ->isForwardedTo('member', 'login')
+
+  ->post('/diary/delete/99999')
+  ->isForwardedTo('member', 'login')
+
+  ->post('/diary/99999/comment/create')
+  ->isForwardedTo('member', 'login')
+
+  ->get('/diary/comment/deleteConfirm/99999')
+  ->isForwardedTo('member', 'login')
+
+  ->post('/diary/comment/delete/99999')
+  ->isForwardedTo('member', 'login')
+;
diff --git a/test/functional/pc_frontend/diaryOpenTest.php b/test/functional/pc_frontend/diaryOpenTest.php
@@ -211,3 +211,38 @@
     ->checkElement('#diaryList div.body', "\n".'Your search "'.$keyword.'" did not match any diaries.')
   ->end()
 ;
+
+$test->info('Invalid Id Test')
+  ->get('/diary/99999')
+  ->isForwardedTo('member', 'login')
+
+  ->get('/diary/listMember/99999')
+  ->isForwardedTo('member', 'login')
+
+  ->get('/diary/listMember/99999/2009/1')
+  ->isForwardedTo('member', 'login')
+
+  ->get('/diary/listMember/99999/2009/1/1')
+  ->isForwardedTo('member', 'login')
+
+  ->get('/diary/edit/99999')
+  ->isForwardedTo('member', 'login')
+
+  ->post('/diary/update/99999')
+  ->isForwardedTo('member', 'login')
+
+  ->get('/diary/deleteConfirm/99999')
+  ->isForwardedTo('member', 'login')
+
+  ->post('/diary/delete/99999')
+  ->isForwardedTo('member', 'login')
+
+  ->post('/diary/99999/comment/create')
+  ->isForwardedTo('member', 'login')
+
+  ->get('/diary/comment/deleteConfirm/99999')
+  ->isForwardedTo('member', 'login')
+
+  ->post('/diary/comment/delete/99999')
+  ->isForwardedTo('member', 'login')
+;