Separated whitelist/blacklist middleware, added helper functions

Author: arnehendriksen

src/IpRestrictions.php

@@ -0,0 +1,34 @@
+<?php namespace arnehendriksen\LaravelIpRestrictions;
+
+class IpRestrictions
+{
+    /**
+     * Returns whether the given (or current) IP is whitelisted.
+     *
+     * @param null $ip
+     * @return bool
+     */
+    public static function whitelisted($ip = null)
+    {
+        $ip = ($ip ?: request()->ip());
+        $all = config('ip-restrictions.whitelist.all', []);
+        $env = config('ip-restrictions.whitelist.'.config('app.env'), []);
+        $list = array_merge($all, $env);
+        return in_array($ip, $list);
+    }
+
+    /**
+     * Returns whether the given (or current) IP is blacklisted.
+     *
+     * @param null $ip
+     * @return bool
+     */
+    public static function blacklisted($ip = null)
+    {
+        $ip = ($ip ?: request()->ip());
+        $all = config('ip-restrictions.blacklist.all', []);
+        $env = config('ip-restrictions.blacklist.'.config('app.env'), []);
+        $list = array_merge($all, $env);
+        return in_array($ip, $list);
+    }
+}

src/Middleware/Blacklist.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace arnehendriksen\LaravelIpRestrictions\Middleware;
+
+use Closure;
+
+class Blacklist
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $allow = true;
+
+        $blacklist_all = config('ip-restrictions.blacklist.all', []);
+        $blacklist_env = config('ip-restrictions.blacklist.'.config('app.env'), []);
+        $blacklist = array_merge($blacklist_all, $blacklist_env);
+
+        if (in_array($request->ip(), $blacklist)) {
+            $allow = false;
+        }
+
+        if (!$allow) {
+            abort(403);
+        }
+        return $next($request);
+    }
+}

src/Middleware/IpRestrictions.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace arnehendriksen\LaravelIpRestrictions\Middleware;
+
+use Closure;
+
+class Whitelist
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $allow = false;
+
+        $whitelist_all = config('ip-restrictions.whitelist.all', []);
+        $whitelist_env = config('ip-restrictions.whitelist.'.config('app.env'), []);
+        $whitelist = array_merge($whitelist_all, $whitelist_env);
+
+        if (in_array($request->ip(), $whitelist)) {
+            $allow = true;
+        }
+
+        if (!$allow) {
+            abort(403);
+        }
+        return $next($request);
+    }
+}