wip

README.md

@@ -44,8 +44,8 @@ php artisan vendor:publish --tag="laravel-trusted-proxies-cloudflare-views"
 ## Usage
 
 ```php
-$laravelTrustedProxiesCloudflare = new Vormkracht10\LaravelTrustedProxiesCloudflare();
-echo $laravelTrustedProxiesCloudflare->echoPhrase('Hello, Vormkracht10!');
+$TrustedProxiesCloudflare = new Vormkracht10\TrustedProxiesCloudflare();
+echo $TrustedProxiesCloudflare->echoPhrase('Hello, Vormkracht10!');
 ```
 
 ## Testing
@@ -68,8 +68,8 @@ Please review [our security policy](../../security/policy) on how to report secu
 
 ## Credits
 
-- [Mark van Eijk](https://github.com/markvaneijk)
-- [All Contributors](../../contributors)
+-   [Mark van Eijk](https://github.com/markvaneijk)
+-   [All Contributors](../../contributors)
 
 ## License
 

composer.json

@@ -34,13 +34,13 @@
     },
     "autoload": {
         "psr-4": {
-            "Vormkracht10\\LaravelTrustedProxiesCloudflare\\": "src/",
-            "Vormkracht10\\LaravelTrustedProxiesCloudflare\\Database\\Factories\\": "database/factories/"
+            "Vormkracht10\\TrustedProxiesCloudflare\\": "src/",
+            "Vormkracht10\\TrustedProxiesCloudflare\\Database\\Factories\\": "database/factories/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Vormkracht10\\LaravelTrustedProxiesCloudflare\\Tests\\": "tests/"
+            "Vormkracht10\\TrustedProxiesCloudflare\\Tests\\": "tests/"
         }
     },
     "scripts": {
@@ -60,13 +60,13 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Vormkracht10\\LaravelTrustedProxiesCloudflare\\LaravelTrustedProxiesCloudflareServiceProvider"
+                "Vormkracht10\\TrustedProxiesCloudflare\\TrustedProxiesCloudflareServiceProvider"
             ],
             "aliases": {
-                "LaravelTrustedProxiesCloudflare": "Vormkracht10\\LaravelTrustedProxiesCloudflare\\Facades\\LaravelTrustedProxiesCloudflare"
+                "TrustedProxiesCloudflare": "Vormkracht10\\TrustedProxiesCloudflare\\Facades\\TrustedProxiesCloudflare"
             }
         }
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}

config/trusted-proxies-cloudflare.php

@@ -1,6 +1,15 @@
 <?php
 
-// config for Vormkracht10/LaravelTrustedProxiesCloudflare
 return [
+    'enabled' => (bool) env('TRUSTED_PROXIES_CLOUDFLARE_ENABLED', false),
 
+    'cache' => [
+        'key' => env('TRUSTED_PROXIES_CLOUDFLARE_CACHE_KEY', 'trusted-proxies-cloudflare'),
+        'store' => env('TRUSTED_PROXIES_CLOUDFLARE_CACHE_STORE', 'file'),
+    ],
+
+    'api' => [
+        'ipv4' => 'https://www.cloudflare.com/ips-v4',
+        'ipv6' => 'https://www.cloudflare.com/ips-v6',
+    ],
 ];

src/Actions/GetCloudflareIPs.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Vormkracht10\TrustedProxiesCloudflare\Actions;
+
+class GetCloudflareIPs
+{
+    public function __invoke()
+    {
+        $ipv4 = explode(PHP_EOL, trim(file_get_contents(config('trusted-proxies-cloudflare.api.ipv4')));
+        $ipv6 = explode(PHP_EOL, trim(file_get_contents(config('trusted-proxies-cloudflare.api.ipv4')));
+
+        return $ipv4 + $ipv6;
+    }
+}

src/Commands/CacheCloudflareProxies.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Vormkracht10\TrustedProxiesCloudflare\Commands;
+
+use Illuminate\Console\Command;
+use Vormkracht10\TrustedProxiesCloudflare\Actions\GetCloudflareIPs;
+
+class CacheCloudflareProxies extends Command
+{
+    public $signature = 'cloudflare:cache-trusted-proxies';
+
+    public $description = '';
+
+    public function handle(): int
+    {
+        $ips = (new GetCloudflareIPs)();
+
+        dd($ips);
+
+        $this->comment('All done');
+
+        return self::SUCCESS;
+    }
+}

src/Facades/TrustedProxiesCloudflare.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Vormkracht10\TrustedProxiesCloudflare\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+/**
+ * @see \Vormkracht10\TrustedProxiesCloudflare\TrustedProxiesCloudflare
+ */
+class TrustedProxiesCloudflare extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return \Vormkracht10\TrustedProxiesCloudflare\TrustedProxiesCloudflare::class;
+    }
+}

src/TrustedProxiesCloudflare.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Vormkracht10\TrustedProxiesCloudflare;
+
+class TrustedProxiesCloudflare
+{
+}

src/LaravelTrustedProxiesCloudflareServiceProvider.php → src/TrustedProxiesCloudflareServiceProvider.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Vormkracht10\LaravelTrustedProxiesCloudflare;
+namespace Vormkracht10\TrustedProxiesCloudflare;
 
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
-use Vormkracht10\LaravelTrustedProxiesCloudflare\Commands\LaravelTrustedProxiesCloudflareCommand;
+use Vormkracht10\TrustedProxiesCloudflare\Commands\CacheCloudflareProxies;
 
-class LaravelTrustedProxiesCloudflareServiceProvider extends PackageServiceProvider
+class TrustedProxiesCloudflareServiceProvider extends PackageServiceProvider
 {
     public function configurePackage(Package $package): void
     {
@@ -18,8 +18,6 @@ public function configurePackage(Package $package): void
         $package
             ->name('laravel-trusted-proxies-cloudflare')
             ->hasConfigFile()
-            ->hasViews()
-            ->hasMigration('create_laravel-trusted-proxies-cloudflare_table')
-            ->hasCommand(LaravelTrustedProxiesCloudflareCommand::class);
+            ->hasCommand(CacheCloudflareProxies::class);
     }
 }

tests/Pest.php

@@ -1,5 +1,5 @@
 <?php
 
-use Vormkracht10\LaravelTrustedProxiesCloudflare\Tests\TestCase;
+use Vormkracht10\TrustedProxiesCloudflare\Tests\TestCase;
 
 uses(TestCase::class)->in(__DIR__);

tests/TestCase.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Vormkracht10\LaravelTrustedProxiesCloudflare\Tests;
+namespace Vormkracht10\TrustedProxiesCloudflare\Tests;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Orchestra\Testbench\TestCase as Orchestra;
-use Vormkracht10\LaravelTrustedProxiesCloudflare\LaravelTrustedProxiesCloudflareServiceProvider;
+use Vormkracht10\TrustedProxiesCloudflare\TrustedProxiesCloudflareServiceProvider;
 
 class TestCase extends Orchestra
 {
@@ -13,14 +13,14 @@ protected function setUp(): void
         parent::setUp();
 
         Factory::guessFactoryNamesUsing(
-            fn (string $modelName) => 'Vormkracht10\\LaravelTrustedProxiesCloudflare\\Database\\Factories\\'.class_basename($modelName).'Factory'
+            fn (string $modelName) => 'Vormkracht10\\TrustedProxiesCloudflare\\Database\\Factories\\'.class_basename($modelName).'Factory'
         );
     }
 
     protected function getPackageProviders($app)
     {
         return [
-            LaravelTrustedProxiesCloudflareServiceProvider::class,
+            TrustedProxiesCloudflareServiceProvider::class,
         ];
     }