Skip to content

GH-34 Fix for ee auth delete global and ee auth delete global --ip#53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PiyushKhurana wants to merge 2 commits into
base:develop
Choose a base branch
from
Open

GH-34 Fix for ee auth delete global and ee auth delete global --ip#53

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6040843
Fix for ee auth delete global
PiyushKhurana Sep 24, 2021
46571f7
Fix for ee auth delete global --ip
PiyushKhurana Oct 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/Auth_Command.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -299,6 +299,12 @@ private function generate_site_auth_files( string $site_url ) {
$site_auth_file = EE_ROOT_DIR . '/services/nginx-proxy/htpasswd/' . $site_url;
$this->fs->remove( $site_auth_file );

// Ensure that sites with only global auths doesn't store it in `htpasswd/site_url` file
$local_auths = Auth::where( 'site_url', $site_url );
if ( empty( $local_auths ) ) {
return;
}

$auths = array_merge(
Auth::get_global_auths(),
Auth::where( 'site_url', $site_url )
Expand DownExpand Up@@ -349,6 +355,14 @@ private function generate_site_whitelist( string $site_url ) {
$site_whitelist_file = EE_ROOT_DIR . '/services/nginx-proxy/vhost.d/' . $site_url . '_acl';
$this->fs->remove( $site_whitelist_file );

// Ensure that sites with only global ip whitelist doesn't store whitelist in `vhost.d/site_url_avl` file
if ( $site_url !== 'default' ) {
$site_specific_whitelist = Whitelist::where( 'site_url', $site_url );
if ( empty( $site_specific_whitelist ) ) {
return;
}
}

$whitelists = array_column(
'default' === $site_url ? Whitelist::get_global_ips() :
array_merge(
Expand Down