Commenting, ability to specify middleware directives via middleware & more.

Author: olsgreen

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "boxed-code/laravel-ip-authorization",
-    "description": "Authorize access based on IP address, range or subnet.",
+    "description": "Authorize access based on IPv4 & IPv6 addresses, ranges, subnets or wildcards.",
     "type": "library",
     "license": "MIT",
     "authors": [
@@ -32,7 +32,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "BoxedCode\\Laravel\\Auth\\Ip\\AuthServiceProvider"
+                "BoxedCode\\Laravel\\Auth\\Ip\\IpAuthServiceProvider"
             ]
         }
     }

config/ip_auth.php

@@ -1,42 +1,100 @@
 <?php
 
 return [
+    /*
+    |--------------------------------------------------------------------------
+    | Default Action
+    |--------------------------------------------------------------------------
+    |
+    | By default, if the request matches none of the defined derivatives we can 
+    | either deny or allow the user. You can specify this default action here.
+    |
+    */
 
-    'repositories' => [
-        'default' => 'config',
+    'default_action' => 'deny',
+ 
+    /*
+    |--------------------------------------------------------------------------
+    | Directives
+    |--------------------------------------------------------------------------
+    |
+    | Directives specify which groups of addresses are allowed or denied access. 
+    | A directive consists of a list name and an action to take if an address exists 
+    | within that list. Directives are processed sequentially, the result of the first 
+    | matched directive will be returned. By default, the blacklist is processed before 
+    | the whitelist, if an address was in both lists it would denied as the first 
+    | directive to be processed is the blacklist. You can reorder the directives to 
+    | suit your needs.
+    |
+    | You can create as many directives as you would like, by default there are two 
+    | whitelist & blacklist.
+    |
+    */   
+
+    'directives' => [
+        'blacklist' => 'deny',
+        'whitelist' => 'allow',
+    ],
 
-        'configuration' => [
+    /*
+    |--------------------------------------------------------------------------
+    | List Repositories
+    |--------------------------------------------------------------------------
+    |
+    | Out of the box the package supports loading address lists from configuration 
+    | or the database. The default is configuration, you may configure whitelisted 
+    | or blacklisted addresses at the bottom of this file.
+    |
+    */
+
+    'default_repository' => 'config',
+
+    'repositories' => [
 
-            'eloquent' => [
-                'model' => null,
-            ]
+        'config' => [
+            'key' => 'ip_auth',
+        ],
 
+        'database' => [
+            'connection' => null,
+            'table' => 'ip_auth_access_list',
         ]
-    ],
 
-    'default' => 'deny',
-    
-    'directives' => [
-        'address_whitelisted' => 'allow',
-        'address_blacklisted' => 'deny',
     ],
 
-    'whitelist' => [
-        //'127.0.0.1',
-        //192.168.1.*
-        //192.168.1/24
-        //192.168.1.1/255.255.255.0
-        //192.168.1.1-192.168.1.10
-        //2001:cdba:0000:0000:0000:0000:3257:*
-    ],
+    /*
+    |--------------------------------------------------------------------------
+    | Configuration Based Address Lists
+    |--------------------------------------------------------------------------
+    |
+    | If you decide to use the default configuration list repository, you can 
+    | simply add the addresses you wish to control below.
+    |
+    */
+   
+    'addresses' => [
 
-    'blacklist' => [
-        //'127.0.0.1',
-        //'192.168.99.1',
-        //192.168.1.*
-        //192.168.1/24
-        //192.168.1.1/255.255.255.0
-        //192.168.1.1-192.168.1.10
-        //2001:cdba:0000:0000:0000:0000:3257:*
+        'whitelist' => [
+            //'127.0.0.1',
+            //'192.168.1.*',
+            //192.168.1.0/24
+            //192.168.1.1 255.255.255.0
+            //192.168.1.1-192.168.1.10
+            //2001:cdba:0000:0000:0000:0000:3257:*
+        ],
+
+        'blacklist' => [
+            //'127.0.0.1',
+            //'192.168.99.1',
+            //192.168.1.*
+            //192.168.1.0/24
+            //192.168.1.1 255.255.255.0
+            //192.168.1.1-192.168.1.10
+            //2001:cdba:0000:0000:0000:0000:3257:*
+        ],
+
+        'custom_list' => [
+            // place custom address definitions here.
+        ]
     ]
 ];

migrations/2019_07_26_080322_ip_auth_access_list.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class IpAuthAccessList extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('ip_auth_access_list', function($table) {
+            $table->increments('id');
+            $table->string('label');
+            $table->string('list');
+            $table->string('type');
+            $table->bigInteger('range_start')->unsigned();
+            $table->bigInteger('range_end')->unsigned();
+            $table->timestamp('created_at')->useCurrent();
+
+            $table->index(['list', 'type', 'range_start', 'range_end'], 'range_index');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('ip_auth_access_list');
+    }
+}