manual reload

Author: Benjamin Pick

admin-ui.php

@@ -252,6 +252,33 @@ function geoip_detect_option_page() {
 }
 
 function geoip_detect_option_client_ip_page() {
+	if (!is_admin() || !current_user_can('manage_options'))
+		return;
+
+	$last_update = get_option('geoip_detect2_dynamic-reverse-proxies_last_updated');
+
+	$successMessage = '';
+	$errorMessage = '';
+	$action = isset($_POST['action']) ? sanitize_key($_POST['action']) : '';
+	if (geoip_detect_verify_nonce($action)) {
+		switch($action)
+		{
+			case 'reload-proxies':
+				$manager = \YellowTree\GeoipDetect\DynamicReverseProxies\getDataManager();
+				if ($manager)  {
+					$success = $manager->reload(true);
+					if ($success) {
+						$successMessage = 'Dynamic Reverse Proxy list was reloaded successfully.';
+					} else {
+						$errorMessage = 'There was an error reloading the dynamic reverse proxy list.';
+					}
+				} else {
+					$errorMessage = 'No DataManager found.';
+				}
+				break;
+		}
+	}
+
 	include_once(GEOIP_PLUGIN_DIR . '/views/client-ip.php');
 }
 

lib/dynamic-reverse-proxies/abstract.php

@@ -2,34 +2,43 @@
 
 namespace YellowTree\GeoipDetect\DynamicReverseProxies;
 
-require_once(__DIR__ . '/aws.php');
-require_once(__DIR__ . '/cloudflare.php');
-
 interface DataProvider {
     function getIps() : array;
 }
 
-function init() : void {
+require_once(__DIR__ . '/aws.php');
+require_once(__DIR__ . '/cloudflare.php');
+
+
+function initFilters() : void {
     $enabled = get_option('geoip-detect-dynamic_reverse_proxies', 0);
     if (!$enabled) return;
 
     add_filter('geoip_detect2_client_ip_whitelist', __NAMESPACE__ . '\addDynamicIps');
     add_filter('geoip_detect2_client_ip_use_whitelist', '__return_true');
 }
 add_filter('plugins_loaded', function() {
-    init();
+    initFilters();
 });
 
+
 function addDynamicIps($ipList = []) : array {
-    $type = get_option('geoip-detect-dynamic_reverse_proxy_type', '');
-    if (!$type) return $ipList;
+    $manager = getDataManager();
+    if (!$manager) return $ipList;
 
-    $manager = new DataManager($type);
     $ipList = array_merge($ipList, $manager->getIpsFromCache());
 
     return $ipList;
 }
 
+
+function getDataManager() : ?DataManager {
+    $type = get_option('geoip-detect-dynamic_reverse_proxy_type', '');
+    if (!$type) return null;
+
+    return new DataManager($type);
+}
+
 class DataManager {
     protected $name;
 
@@ -61,6 +70,7 @@ public function reload($forceSave = false) : bool {
             return false;
         }
         update_option(self::CACHE_OPTION_NAME, $this->name . '|' . $ip_list);
+        update_option('geoip_detect2_dynamic-reverse-proxies_last_updated', time());
 
         return true;
     }
@@ -81,3 +91,58 @@ public function getIpsFromCache() : array {
     }
 }
 
+
+class UpdateDynamicReverseProxiesCron {
+    public function addFilter() {
+        add_action('geoipdetectdynamicproxiesupdate', [ $this, 'hook_cron', 10, 1 ]);
+    }
+
+    public function hook_cron() {
+		/**
+		 * Filter:
+		 * Cron has fired.
+		 * Find out if dynamic reverse proxy data should be updated now.
+		 *
+		 * @param $do_it 
+		 */
+        $do_it = apply_filters('geoip_detect2_dynamic-reverse-proxies_do_automatic_update', true);
+        
+        $this->schedule();
+
+        if ($do_it) {
+            $this->run();
+        }
+    }
+
+    public function run() {
+        $last = get_option('geoip_detect2_dynamic-reverse-proxies_last_updated');
+        $now = time();
+        if( $now - $last < HOUR_IN_SECONDS) {
+            return false;
+        }
+
+        $manager = getDataManager();
+        if ($manager) {
+            $manager->reload();
+        }
+    }
+
+    public function schedule($forceReschedule = false) {
+        $next = wp_next_scheduled('geoipdetectdynamicproxiesupdate');
+
+        if (!$next || $forceReschedule) {
+            $this->schedule_next_cron_run();
+        }
+
+        if ($forceReschedule) {
+            $this->run();
+        }
+    }
+
+    protected function schedule_next_cron_run() {
+        $next = time() + DAY_IN_SECONDS;
+        $next += mt_rand(1, HOUR_IN_SECONDS);
+        wp_schedule_single_event($next, 'geoipdetectdynamicproxiesupdate');
+    }
+}
+(new UpdateDynamicReverseProxiesCron)->addFilter();

views/client-ip.php

@@ -1,4 +1,16 @@
 <div class="wrap geoip-detect-wrap">
+
+	<?php if (!empty($errorMessage)): ?>
+			<p class="geoip_detect_error">
+			<?php echo $errorMessage; ?>
+			</p>
+	<?php endif; ?>
+	<?php if (!empty($successMessage)): ?>
+			<p class="geoip_detect_error geoip_detect_success">
+			<?php echo $successMessage; ?>
+			</p>
+	<?php endif; ?>
+
 	<!-- This page cannot be translated yet, as I am not sure how it will look like in the long-term.
 The final goal would be to have a step-by-step wizard helping to set all the relevant options semi-automatically. -->
 	<h1><?php _e('Geolocation IP Detection', 'geoip-detect');?> - Client IP Debug Panel</h1>
@@ -45,6 +57,15 @@
 		<li>Add known proxies of a cloud provider enabled: <b><?php echo get_option('geoip-detect-dynamic_reverse_proxies') ? 'Yes, ' . ucfirst(get_option('geoip-detect-dynamic_reverse_proxy_type', '')) : 'No'; ?></b>
 			<span class="detail-box">If your site is hosted by CloudFlare or AWS, this should probably be enabled. It will automatically retrieve the many IP adresses that a reverse proxy of this provider can have, and update the list daily.</span>
 			<span class="detail-box">Here is the current list of IP adresses: <b><?= implode(', ', \YellowTree\GeoipDetect\DynamicReverseProxies\addDynamicIps()) ?: '(Empty)' ?></b></span>
+			<span class="detail-box">
+				Last updated: <b><?= geoip_detect_format_localtime($last_update); ?></b><br>
+				Next update:  <b><?= geoip_detect_format_localtime(wp_next_scheduled('geoipdetectdynamicproxiesupdate')); ?></b>
+				<form method="POST">
+					<?php wp_nonce_field( 'geoip_detect_reload-proxies' ); ?>
+					<input type="hidden" name="action" value="reload-proxies" />
+					<input type="submit" class="button button-primary" value="Reload now" />
+				</form>
+			</span>
 		</li>
 	</ul>
 

views/footer.php

@@ -35,6 +35,10 @@
     padding-top: 11px;
     text-align: left;
 }
+.geoip_detect_success {
+	border-left: #00a32a solid 4px;
+}
+
 .detail-box {
 	display: block;
 	margin-left: 50px;