added the opCheckAllowedAccessWebAPI filter to authenticate using OAuth or IP limitation

Author: Kousuke Ebihara

apps/api/modules/feeds/actions/actions.class.php

@@ -19,9 +19,6 @@ class feedsActions extends sfActions
 {
   public function preExecute()
   {
-    $list = Doctrine::getTable('SnsConfig')->get('op_web_api_plugin_ip_list', '127.0.0.1');
-    $this->forward404Unless(in_array(@$_SERVER['REMOTE_ADDR'], explode("\n", $list)));
-
     $this->getResponse()->setHttpHeader('Content-Type', 'application/atom+xml');
 
     $request = sfContext::getInstance()->getRequest();

apps/api/modules/feeds/config/filters.yml

@@ -1,7 +1,7 @@
 rendering: ~
 
 check_oauth:
-  class: opCheckOAuthAccessTokenFilter
+  class: opCheckAllowedAccessWebAPI
 
 security: ~
 

lib/opCheckAllowedAccessWebAPI.class.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opCheckAllowedAccessWebAPI
+ *
+ * @package    OpenPNE
+ * @subpackage filter
+ * @author     Kousuke Ebihara <[email protected]>
+ */
+class opCheckAllowedAccessWebAPI extends opCheckOAuthAccessTokenFilter
+{
+  public function execute($filterChain)
+  {
+    if (Doctrine::getTable('SnsConfig')->get('op_web_api_plugin_is_limit_ip', false))
+    {
+      $list = Doctrine::getTable('SnsConfig')->get('op_web_api_plugin_ip_list', '127.0.0.1');
+      if (in_array(@$_SERVER['REMOTE_ADDR'], explode("\n", $list)))
+      {
+        sfContext::getInstance()->getUser()->setAuthenticated(true);
+      }
+
+      $filterChain->execute();
+    }
+    else
+    {
+      parent::execute($filterChain);
+    }
+  }
+}