merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4681 from devansh-webkul/allowed_ip_issue 

Allowed IP Exception Handled
This commit is contained in:
Glenn Hermans 2021-03-01 16:17:26 +01:00 committed by GitHub
parent 9bd52fe7df 6f367e0a69
commit b51a50bcfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/Webkul/Core/src/Http/Middleware/CheckForMaintenanceMode.php
View File

@ -23,7 +23,7 @@ class CheckForMaintenanceMode extends Original
* @var \Webkul\Core\Models\Channel
*/
protected $channel;
/**
* Exclude route names.
*/
@ -35,7 +35,7 @@ class CheckForMaintenanceMode extends Original
protected $except = [];
/**
* Exclude ips.
* Exclude IPs.
*/
protected $excludedIPs = [];
@ -49,14 +49,11 @@ class CheckForMaintenanceMode extends Original
/* application */
$this->app = $app;
/* current channel */
$this->channel = core()->getCurrentChannel();
/* adding exception for admin routes */
$this->except[] = env('APP_ADMIN_URL', 'admin') . '*';
/* adding exception for ips */
$this->excludedIPs = array_map('trim', explode(',', $this->channel->allowed_ips));
/* exclude ips */
$this->setAllowedIps();
}
/**
@ -106,7 +103,7 @@ class CheckForMaintenanceMode extends Original
}
}
if ($this->shouldPassThrough($request))
if ($this->shouldPassThrough($request))
{
return $response;
}
@ -116,4 +113,18 @@ class CheckForMaintenanceMode extends Original
return $next($request);
}
/**
* Set allowed IPs.
*
* @return void
*/
protected function setAllowedIps()
{
$this->channel = core()->getCurrentChannel();
if ($this->channel) {
$this->excludedIPs = array_map('trim', explode(',', $this->channel->allowed_ips));
}
}
}