Changeset 2033509

Timestamp:

02/18/2019 05:05:58 PM (7 years ago)

Author:

freediver

Message:

version 4.6.5

Location:

worker/trunk

Files:

• functions.php (modified) (1 diff)
• init.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• src/MWP/EventListener/MasterRequest/AuthenticateRequest.php (modified) (1 diff)
• src/MWP/EventListener/PublicRequest/AddConnectionKeyInfo.php (modified) (3 diffs)
• src/MWP/Worker/Configuration.php (modified) (1 diff)
• src/MWP/Worker/Exception.php (modified) (1 diff)
• version (modified) (1 diff)

worker/trunk/functions.php

@@ -790 +790 @@
     }
 
+    mwp_context()->optionSet('mwp_public_keys_refresh_time', time(), true);
     mwp_context()->optionSet('mwp_public_keys', $liveKeys, true);
 }

worker/trunk/init.php

@@ -4 +4 @@
 Plugin URI: https://managewp.com
 Description: We help you efficiently manage all your WordPress websites. <strong>Updates, backups, 1-click login, migrations, security</strong> and more, on one dashboard. This service comes in two versions: standalone <a href="https://managewp.com">ManageWP</a> service that focuses on website management, and <a href="https://godaddy.com/pro">GoDaddy Pro</a> that includes additional tools for hosting, client management, lead generation, and more.
-Version: 4.6.4
+Version: 4.6.5
 Author: ManageWP
 Author URI: https://managewp.com
@@ -569 +569 @@
         register_activation_hook(__FILE__, 'mwp_activation_hook');
 
-        $GLOBALS['MMB_WORKER_VERSION']  = '4.6.4';
-        $GLOBALS['MMB_WORKER_REVISION'] = '2019-02-05 00:00:00';
+        $GLOBALS['MMB_WORKER_VERSION']  = '4.6.5';
+        $GLOBALS['MMB_WORKER_REVISION'] = '2019-02-18 00:00:00';
 
         // Ensure PHP version compatibility.

worker/trunk/readme.txt

@@ -3 +3 @@
 Tags: manage multiple sites, backup, security, migrate, performance, analytics, Manage WordPress, Managed WordPress, WordPress management, WordPress manager, WordPress management, site management, control multiple sites, WordPress management dashboard, administration, automate, automatic, comments, clone, dashboard, duplicate, google analytics, login, manage, managewp, multiple, multisite, remote, seo, spam
 Requires at least: 3.1
-Tested up to: 5.0
+Tested up to: 5.1
 Stable tag: trunk
 License: GPLv3 or later
@@ -56 +56 @@
 
 == Changelog ==
+
+= 4.6.5 =
+
+- Fix: Edge cases where the Worker plugin might not be able to communicate with our system.
 
 = 4.6.4 =

worker/trunk/src/MWP/EventListener/MasterRequest/AuthenticateRequest.php

@@ -47 +47 @@
 
         if (!empty($establishedNewCommunication) && !empty($siteId)) {
-            throw new MWP_Worker_Exception(MWP_Worker_Exception::AUTHENTICATION_PUBLIC_KEY_EMPTY, "Authentication failed. Deactivate and activate the ManageWP Worker plugin on this site, then re-add it to your ManageWP account.");
+            throw new MWP_Worker_Exception(MWP_Worker_Exception::AUTHENTICATION_INVALID_SERVICE_SIGNATURE, "Invalid message signature. Please re-add this website to your ManageWP account.");
         }
 

worker/trunk/src/MWP/EventListener/PublicRequest/AddConnectionKeyInfo.php

@@ -47 +47 @@
         $this->context->enqueueStyle('wp-jquery-ui');
         $this->context->enqueueStyle('wp-jquery-ui-dialog');
+    }
+
+    protected function checkForKeyRefresh()
+    {
+        if (empty($_GET['mwp_force_key_refresh'])) {
+            return false;
+        }
+
+        mwp_refresh_live_public_keys(array());
+        return true;
     }
 
@@ -219 +229 @@
             return;
         }
+
+        $refreshedKeys = $this->checkForKeyRefresh();
 
         ob_start();
@@ -302 +314 @@
                     data-clipboard-target="#connection-key">Copy
             </button>
+
+            <?php if ($refreshedKeys) { ?>
+                <p>Currently loaded keys:</p>
+                <pre><?php
+                    if (version_compare(PHP_VERSION, '5.4', '>=') && defined('JSON_PRETTY_PRINT')) {
+                        echo trim(json_encode($this->context->optionGet('mwp_public_keys', null), JSON_PRETTY_PRINT));
+                    } else {
+                        echo trim(json_encode($this->context->optionGet('mwp_public_keys', null)));
+                    }
+                    ?></pre>
+                <?php
+            }
+            ?>
         </div>
         <?php

worker/trunk/src/MWP/Worker/Configuration.php

@@ -87 +87 @@
     protected function findKeyData($keyName)
     {
+        $key = $this->findKey($keyName);
+
+        if (!empty($key)) {
+            return $key;
+        }
+
+        $time         = time();
+        $keys         = $this->context->optionGet('mwp_public_keys', null);
+        $refresh_time = $this->context->optionGet('mwp_public_keys_refresh_time', $time - 100000);
+
+        // if the keys were refreshed recently, give up
+        if (!empty($keys) && $time - $refresh_time < 86400) {
+            return null;
+        }
+
+        mwp_refresh_live_public_keys(array());
+
+        return $this->findKey($keyName);
+    }
+
+    private function findKey($keyName)
+    {
         $keys = $this->context->optionGet('mwp_public_keys', null);
-
-        if (empty($keys)) {
-            mwp_refresh_live_public_keys(array());
-            $keys = $this->context->optionGet('mwp_public_keys', null);
-        }
 
         if (empty($keys) || !is_array($keys)) {

worker/trunk/src/MWP/Worker/Exception.php

@@ -28 +28 @@
     const AUTHENTICATION_PUBLIC_KEY_EMPTY = 10017;
     const AUTHENTICATION_INVALID_SIGNATURE = 10019;
+    const AUTHENTICATION_INVALID_SERVICE_SIGNATURE = 10040;
     const ACTION_NOT_REGISTERED = 10020;
     const CONNECTION_PUBLIC_KEY_NOT_PROVIDED = 10021;

worker/trunk/version

@@ -1 @@
-4.6.4
-2019-02-05 00:00:00
+4.6.5
+2019-02-18 00:00:00