Remove Reference to Directus IP Whitelist

directus · Jan 4, 2016 · 83c7b55 · 83c7b55
1 parent 9a60ffb
commit 83c7b55
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 100 deletions.
diff --git a/api/api.php b/api/api.php
@@ -54,7 +54,7 @@
 use Directus\Util;
 use Directus\View\JsonView;
 use Directus\View\ExceptionView;
-use Directus\Db\TableGateway\DirectusIPWhitelist;
+// use Directus\Db\TableGateway\DirectusIPWhitelist;
 use Zend\Db\Sql\Expression;
 
 // API Version shortcut for routes:
@@ -215,17 +215,17 @@
     $groupId = $user['group'];
     $directusGroupsTableGateway = new DirectusGroupsTableGateway($acl, $ZendDb);
     $group = $directusGroupsTableGateway->find($groupId);
-
-    if (1 == $group['restrict_to_ip_whitelist']) {
-        $directusIPWhitelist = new DirectusIPWhitelist($acl, $ZendDb);
-        if (!$directusIPWhitelist->hasIP($_SERVER['REMOTE_ADDR'])) {
-            return JsonView::render(array(
-                'message' => 'Request not allowed from IP address',
-                'success' => false,
-                'all_nonces' => $requestNonceProvider->getAllNonces()
-            ));
-        }
-    }
+    
+    // if (1 == $group['restrict_to_ip_whitelist']) {
+    //     $directusIPWhitelist = new DirectusIPWhitelist($acl, $ZendDb);
+    //     if (!$directusIPWhitelist->hasIP($_SERVER['REMOTE_ADDR'])) {
+    //         return JsonView::render(array(
+    //             'message' => 'Request not allowed from IP address',
+    //             'success' => false,
+    //             'all_nonces' => $requestNonceProvider->getAllNonces()
+    //         ));
+    //     }
+    // }
 
     if (!$user) {
         return JsonView::render($response);

diff --git a/api/core/Directus/Db/TableGateway/DirectusIPWhitelist.php b/api/core/Directus/Db/TableGateway/DirectusIPWhitelist.php
diff --git a/api/core/Directus/Db/TableGateway/DirectusPreferencesTableGateway.php b/api/core/Directus/Db/TableGateway/DirectusPreferencesTableGateway.php
@@ -196,7 +196,6 @@ public function fetchAllByUser($user_id, $assoc = false) {
         ->isNull('title');
       $select->where('table_name NOT IN(
                     "directus_columns",
-                    "directus_ip_whitelist",
                     "directus_preferences",
                     "directus_privileges",
                     "directus_settings",
@@ -211,7 +210,6 @@ public function fetchAllByUser($user_id, $assoc = false) {
       $tables = $metadata->getTableNames(DB_NAME);
 
       $tables = array_diff($tables, array("directus_columns",
-                    "directus_ip_whitelist",
                     "directus_preferences",
                     "directus_privileges",
                     "directus_settings",

diff --git a/api/core/Directus/Db/TableGateway/DirectusPrivilegesTableGateway.php b/api/core/Directus/Db/TableGateway/DirectusPrivilegesTableGateway.php
@@ -125,7 +125,6 @@ public function fetchPerTable($groupId) {
         // Don't include tables that can't have privileges changed
         /*$blacklist = array(
             'directus_columns',
-            'directus_ip_whitelist',
             'directus_messages_recipients',
             'directus_preferences',
             'directus_privileges',

diff --git a/api/core/Directus/Db/TableSchema.php b/api/core/Directus/Db/TableSchema.php
@@ -668,7 +668,6 @@ public static function getTableSchemas() {
                 (
                     ST.TABLE_NAME NOT IN (
                         "directus_columns",
-                        "directus_ip_whitelist",
                         "directus_preferences",
                         "directus_privileges",
                         "directus_settings",

diff --git a/api/migrations/directus/20150204012338_CreateDirectusIpWhitelistTable.php b/api/migrations/directus/20150204012338_CreateDirectusIpWhitelistTable.php
diff --git a/api/migrations/directus/20150204024327_CreateDirectusPrivilegesTable.php b/api/migrations/directus/20150204024327_CreateDirectusPrivilegesTable.php
@@ -90,13 +90,12 @@ public function up()
   (9,'directus_tables','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL),
   (10,'directus_ui','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL),
   (11,'directus_users','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL),
-  (12,'directus_ip_whitelist','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL),
-  (13,'directus_social_feeds','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL),
-  (14,'directus_messages_recipients','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL),
-  (15,'directus_social_posts','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL),
-  (16,'directus_storage_adapters','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL),
-  (17,'directus_tab_privileges','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL),
-  (18,'directus_bookmarks','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL);");
+  (12,'directus_social_feeds','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL),
+  (13,'directus_messages_recipients','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL),
+  (14,'directus_social_posts','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL),
+  (15,'directus_storage_adapters','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL),
+  (16,'directus_tab_privileges','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL),
+  (17,'directus_bookmarks','add,edit,bigedit,delete,bigdelete,alter,view,bigview',1,NULL,NULL,NULL);");
     }//up()
 
     public function down()