From 4d2648be3dbc6ff1bc00439278564a3da0de2fe2 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Wed, 10 Oct 2018 21:56:49 +0530 Subject: [PATCH 1/2] Add auth and whitelist cleanup hook Signed-off-by: Riddhesh Sanghvi --- src/helper/hooks.php | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/helper/hooks.php diff --git a/src/helper/hooks.php b/src/helper/hooks.php new file mode 100644 index 0000000..fe494f5 --- /dev/null +++ b/src/helper/hooks.php @@ -0,0 +1,50 @@ + $site_url ] ); + + if ( ! empty( $auths ) ) { + foreach ( $auths as $auth ) { + $auth->delete(); + } + + $site_auth_file = EE_ROOT_DIR . '/services/nginx-proxy/htpasswd/' . $site_url; + $fs->remove( $site_auth_file ); + } + + $whitelists = Whitelist::where( [ 'site_url' => $site_url ] ); + + if ( ! empty( $whitelists ) ) { + foreach ( $whitelists as $whitelist ) { + $whitelist->delete(); + } + + $site_whitelist_file = EE_ROOT_DIR . '/services/nginx-proxy/vhost.d/' . $site_url . '_acl'; + $fs->remove( $site_whitelist_file ); + } + + \EE\Site\Utils\reload_global_nginx_proxy(); +} + +EE::add_hook( 'site_cleanup', 'cleanup_auth_and_whitelist' ); From 6f6b8b2c4acfca48e2b3bfe476d87270862b4f07 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Wed, 10 Oct 2018 21:57:02 +0530 Subject: [PATCH 2/2] Add loading of hook file Signed-off-by: Riddhesh Sanghvi --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index c909835..dff5ba7 100644 --- a/composer.json +++ b/composer.json @@ -14,6 +14,7 @@ }, "files": [ "src/auth-utils.php", + "src/helper/hooks.php", "auth-command.php" ] },