Updates bug fixes.

react/src/PiPedalModel.tsx

@@ -781,7 +781,6 @@ export class PiPedalModel //implements PiPedalModel
 
     onSocketConnectionLost() {
         // remove all the events and subscriptions we have.
-        // yyy
         this.vuSubscriptions = [];
         this.monitorPatchPropertyListeners = [];
 

react/src/UpdateDialog.tsx

@@ -126,7 +126,7 @@ export default class UpdateDialog extends React.Component<UpdateDialogProps, Upd
     upToDate(): boolean {
         let updateStatus = this.state.updateStatus;
         let updateRelease: UpdateRelease = updateStatus.getActiveRelease();
-        return updateStatus.isValid && !updateRelease.updateAvailable
+        return !updateRelease.updateAvailable
     }
     canUpgrade(): boolean {
         let updateStatus = this.state.updateStatus;
@@ -153,6 +153,7 @@ export default class UpdateDialog extends React.Component<UpdateDialogProps, Upd
         let upToDate = this.upToDate();
         let canUpgrade = this.canUpgrade();
         let compact = this.state.compactLandscape;
+        let showUpgradeVersion = !upToDate && updateStatus.isValid && updateRelease.upgradeVersionDisplayName !== "";
         return (
             <DialogEx tag="update" open={this.props.open} onClose={() => { this.handleClose(); }}
                 style={{ userSelect: "none" }}
@@ -202,7 +203,7 @@ export default class UpdateDialog extends React.Component<UpdateDialogProps, Upd
                             <Typography noWrap variant="body2" color="textSecondary" >
                                 Current version:
                             </Typography>
-                            {(!upToDate) && (
+                            {(showUpgradeVersion) && (
                                 <Typography noWrap variant="body2" color="textSecondary" style={{ marginTop: 4 }} >
                                     Update  version:
                                 </Typography>
@@ -213,7 +214,7 @@ export default class UpdateDialog extends React.Component<UpdateDialogProps, Upd
                             <Typography noWrap variant="body2" color="textSecondary" >
                                 {updateStatus.currentVersionDisplayName}
                             </Typography>
-                            {(!upToDate) && (
+                            {(showUpgradeVersion) && (
                                 <Typography noWrap variant="body2" color="textSecondary" style={{ marginTop: 4 }} >
                                     {updateRelease.upgradeVersionDisplayName}
                                 </Typography>

src/AdminInstallUpdate.cpp

@@ -178,7 +178,7 @@ void pipedal::AdminInstallUpdate(const std::filesystem::path path)
    }
     catch (const std::exception &e)
     {
-        updateLog(e.what());
+        updateLog(SS("Error: " << e.what()));
 
         updateResults.updated_ = false;
         updateResults.updateSuccessful_ = false;

src/ConfigMain.cpp

@@ -792,10 +792,8 @@ void InstallPgpKey()
         std::stringstream ss;
         ss << (CHOWN_BIN " -R " SERVICE_GROUP_NAME ":" SERVICE_GROUP_NAME " ") << homeDir.c_str();
         std::string cmd = ss.str();
-        cout << cmd << endl;
         sysExec(cmd.c_str());
     }
-    cout << "Debug: Finished creating keystring." << endl;
 }
 void Install(const fs::path &programPrefix, const std::string endpointAddress)
 {

src/PiPedalModel.cpp

@@ -66,6 +66,7 @@ PiPedalModel::PiPedalModel()
     : pluginHost(),
       atomConverter(pluginHost.GetMapFeature())
 {
+    this->currentUpdateStatus = updater.GetCurrentStatus();
     this->pedalboard = Pedalboard::MakeDefault();
 #if JACK_HOST
     this->jackServerSettings = this->storage.GetJackServerSettings(); // to get onboarding flag.
@@ -1258,7 +1259,6 @@ void PiPedalModel::OnNotifyMidiValueChanged(int64_t instanceId, int portIndex, f
         {
             if (portIndex == -1)
             {
-                // bypass! yyy this->value!!!
                 this->pedalboard.SetItemEnabled(instanceId, value != 0);
                 // take a snapshot incase a client unsusbscribes in the notification handler (in which case the mutex won't protect us)
                 IPiPedalModelSubscriber **t = new IPiPedalModelSubscriber *[this->subscribers.size()];
@@ -2168,7 +2168,7 @@ void PiPedalModel::FireUpdateStatusChanged(const UpdateStatus &updateStatus)
 UpdateStatus PiPedalModel::GetUpdateStatus()
 {
     std::lock_guard<std::recursive_mutex> lock(mutex);
-    return currentUpdateStatus;
+    return updater.GetCurrentStatus();
 }
 
 void PiPedalModel::UpdateNow(const std::string &updateUrl)

src/Updater.cpp

@@ -63,7 +63,7 @@ static UpdateStatus GetCachedUpdateStatus()
         if (std::filesystem::exists(UPDATE_STATUS_CACHE_FILE))
         {
             std::ifstream f{UPDATE_STATUS_CACHE_FILE};
-            if (!f.is_open())
+            if (f.is_open())
             {
                 json_reader reader(f);
                 UpdateStatus status;
@@ -100,7 +100,7 @@ static void SetCachedUpdateStatus(UpdateStatus &updateStatus)
 Updater::Updater()
 {
     cachedUpdateStatus = GetCachedUpdateStatus();
-    updatePolicy = cachedUpdateStatus.UpdatePolicy();
+    this->updatePolicy = cachedUpdateStatus.UpdatePolicy();
     currentResult = cachedUpdateStatus;
 
     int fds[2];
@@ -382,6 +382,36 @@ UpdateRelease Updater::getUpdateRelease(
     return UpdateRelease();
 }
 
+static void CheckUpdateHttpResponse(std::string errorCode)
+{
+    if (errorCode.starts_with("%"))
+    {
+        errorCode = errorCode.substr(1);
+    }
+    int code = -999;
+    {
+        std::istringstream ss{errorCode};
+        ss >> code;
+    }
+    if (code == -999)
+    {
+        throw std::runtime_error(SS("Invalid curl response: " << errorCode));
+    }
+    if (code == 200)
+    {
+        return;
+    }
+    if (code == 0)
+    {
+        throw std::runtime_error("PiPedal server can't reach the internet.");
+    }
+
+    {
+        std::string message = SS("HTTP error " << code << "");
+        throw std::runtime_error(message);
+    }
+}
+
 void Updater::CheckForUpdate(bool useCache)
 {
     UpdateStatus updateResult;
@@ -400,7 +430,13 @@ void Updater::CheckForUpdate(bool useCache)
         }
         updateResult = this->currentResult;
     }
-    std::string args = SS("-s " << GITHUB_RELEASES_URL);
+
+    const std::string responseOption = "-w \"%{response_code}\"";
+#ifdef WIN32
+    responseOption = "-w \"%%{response_code}\""; // windows shell requires doubling of the %%.
+#endif
+
+    std::string args = SS("-s -L " << responseOption << " " << GITHUB_RELEASES_URL);
 
     updateResult.errorMessage_ = "";
 
@@ -413,6 +449,10 @@ void Updater::CheckForUpdate(bool useCache)
         }
         else
         {
+            if (result.output.length() == 0)
+            {
+                throw std::runtime_error("Server has no internet access.");
+            }
             std::stringstream ss(result.output);
             json_reader reader(ss);
             json_variant vResult(reader);
@@ -535,8 +575,6 @@ void Updater::SetUpdatePolicy(UpdatePolicyT updatePolicy)
     if (updatePolicy == this->updatePolicy)
         return;
     this->updatePolicy = updatePolicy;
-    if (this->currentResult.UpdatePolicy() != updatePolicy)
-    {
     this->currentResult.UpdatePolicy(updatePolicy);
     SetCachedUpdateStatus(this->currentResult);
     if (listener)
@@ -544,7 +582,6 @@ void Updater::SetUpdatePolicy(UpdatePolicyT updatePolicy)
         listener(currentResult);
     }
 }
-}
 void Updater::ForceUpdateCheck()
 {
     uint64_t value = UNCACHED_CHECK_NOW_EVENT;
@@ -721,22 +758,25 @@ static void removeOldSiblings(int numberToKeep, const std::filesystem::path &fil
     }
 }
 
-static std::string getKeyId(const std::string&gpgText)
+static std::string getFingerprint(const std::string &gpgText)
 {
     std::string keyPosition = "using RSA key ";
     size_t nPos = gpgText.find(keyPosition);
-    if (nPos = std::string::npos)
+    if (nPos == std::string::npos)
     {
         return "";
     }
-    nPos += keyPosition.size();
+    nPos += keyPosition.length();
-
+    while (nPos < gpgText.length() && gpgText[nPos] == ' ')
+    {
+        ++nPos;
+    }
     auto start = nPos;
 
     while (true)
     {
         char c = gpgText[nPos];
-        if (nPos >= gpgText.length() || c == ' ' || c == '\r' &&  c == '\n' && c == '\t')
+        if (nPos >= gpgText.length() || c == ' ' || c == '\r' || c == '\n' || c == '\t')
         {
             break;
         }
@@ -744,6 +784,13 @@ static std::string getKeyId(const std::string&gpgText)
     }
     return gpgText.substr(start, nPos - start);
 }
+static bool IsSignatureGood(const std::string&gpgText)
+{
+       std::string originPosition = "gpg: Good signature from \"";
+
+    size_t nPos = gpgText.find(originPosition);
+    return nPos != std::string::npos;
+}
 static std::string getAddress(const std::string &gpgText)
 {
     std::string originPosition = "gpg: Good signature from \"";
@@ -753,6 +800,7 @@ static std::string getAddress(const std::string&gpgText)
     {
         return "";
     }
+    nPos += originPosition.length();
     auto start = nPos;
     while (true)
     {
@@ -763,7 +811,6 @@ static std::string getAddress(const std::string&gpgText)
         ++nPos;
     }
     return gpgText.substr(start, nPos - start);
-
 }
 void Updater::ValidateSignature(const std::filesystem::path &file, const std::filesystem::path &signatureFile)
 {
@@ -773,10 +820,11 @@ void Updater::ValidateSignature(const std::filesystem::path&file, const std::fil
     // gpg:                using RSA key 381124E2BB4478D225D2313B2AEF3F7BD53EAA59
     // gpg: Good signature from "Robin Davies <rerdavies@gmail.com>" [ultimate]
     std::ostringstream ss;
-    ss << "-home " << PGP_UPDATE_KEYRING_PATH
+    ss << "--home " << PGP_UPDATE_KEYRING_PATH
        << " --verify "
        << signatureFile << " " << file;
 
+    Lv2Log::info(SS("/usr/bin/gpg " << ss.str()));
     auto gpgOutput = sysExecForOutput("/usr/bin/gpg", ss.str());
     if (gpgOutput.exitCode != EXIT_SUCCESS)
     {
@@ -784,16 +832,22 @@ void Updater::ValidateSignature(const std::filesystem::path&file, const std::fil
     }
     const std::string &gpgText = gpgOutput.output;
 
-    std::string keyId = getKeyId(gpgText);
+    if (!IsSignatureGood(gpgText))
+    {
+        throw std::runtime_error("Update signature is not valid.");
+    }
+    std::string keyId = getFingerprint(gpgText);
+
+    Lv2Log::info(unCRLF(gpgText)); // yyy delete me.
 
     if (keyId != UPDATE_GPG_FINGERPRINT)
     {
-        throw std::runtime_error("Update signature has the wrong fingerprint.");
+        throw std::runtime_error(SS("Update signature has the wrong fingerprint: " << keyId));
     }
     std::string origin = getAddress(gpgText);
     if (origin != UPDATE_GPG_ADDRESS)
     {
-        throw std::runtime_error("Update signature has an incorrect address.");
+        throw std::runtime_error(SS("Update signature has an incorrect address." << origin));
     }
 }
 
@@ -801,9 +855,39 @@ static bool badOutput(const std::filesystem::path &filePath)
 {
     if (!fs::is_regular_file(filePath))
     {
-        return false;
+        return true;
+    }
+    return fs::file_size(filePath) == 0;
+}
+
+static void checkCurlHttpResponse(std::string errorCode)
+{
+    if (errorCode.starts_with("%"))
+    {
+        errorCode = errorCode.substr(1);
+    }
+    int code = -999;
+    {
+        std::istringstream ss{errorCode};
+        ss >> code;
+    }
+    if (code == -999)
+    {
+        throw std::runtime_error(SS("Download failed. Invalid curl response: " << errorCode));
+    }
+    if (code == 200)
+    {
+        return;
+    }
+    if (code == 0)
+    {
+        throw std::runtime_error("PiPedal server can't reach the internet.");
+    }
+
+    {
+        std::string message = SS("Download failed (HTTP error " << code << ")");
+        throw std::runtime_error(message);
     }
-    return fs::file_size(filePath) != 0;
 }
 void Updater::DownloadUpdate(const std::string &url, std::filesystem::path *file, std::filesystem::path *signatureFile)
 {
@@ -836,22 +920,30 @@ void Updater::DownloadUpdate(const std::string &url, std::filesystem::path *file
         fs::remove(downloadFilePath);
         fs::remove(downloadSignaturePath);
 
-        std::string args = SS("-s -L " << url << " -o " << downloadFilePath << " 2>&1");
+        const std::string responseOption = "-w \"%{response_code}\"";
-        auto curlOutput = sysExecForOutput("curl", args);
+#ifdef WIN32
+        responseOption = "-w \"%%{response_code}\""; // windows shell requires doubling of the %%.
+#endif
+        std::string args = SS("-s -L " << responseOption << " " << url << " -o " << downloadFilePath.c_str());
+        Lv2Log::info(SS("/usr/bin/curl " << args)); // yyy delete me.
+        auto curlOutput = sysExecForOutput("/usr/bin/curl", args);
         if (curlOutput.exitCode != EXIT_SUCCESS || badOutput(downloadFilePath))
         {
             Lv2Log::error(SS("Update download failed. " << unCRLF(curlOutput.output)));
             throw std::runtime_error("PiPedal server does not have access to the internet.");
         }
+        checkCurlHttpResponse(curlOutput.output);
 
-        args = SS("-s -L " << signatureUrl << " -o " << downloadSignaturePath << " 2>&1");
+        args = SS("-s -L " << responseOption << " " << signatureUrl << " -o " << downloadSignaturePath.c_str());
+        Lv2Log::info(SS("/usr/bin/curl " << args));
 
-        curlOutput = sysExecForOutput("curl", args);
+        curlOutput = sysExecForOutput("/usr/bin/curl", args);
         if (curlOutput.exitCode != EXIT_SUCCESS || badOutput(downloadSignaturePath))
         {
             Lv2Log::error(SS("Update download failed. " << unCRLF(curlOutput.output)));
             throw std::runtime_error("PiPedal server does not have access to the internet.");
         }
+        checkCurlHttpResponse(curlOutput.output);
 
         try
         {

src/Updater.hpp

@@ -42,6 +42,8 @@ namespace pipedal
         ReleaseOnly = 0,
         ReleaseOrBeta = 1,
         Development = 2,
+        Disabled = 3
+
     };
     class UpdateRelease
     {
@@ -123,6 +125,7 @@ namespace pipedal
         void SetUpdatePolicy(UpdatePolicyT updatePolicy);
         void ForceUpdateCheck();
         void DownloadUpdate(const std::string &url, std::filesystem::path*file, std::filesystem::path*signatureFile);
+        UpdateStatus GetCurrentStatus() const { return this->currentResult; }
     private:
         std::string GetUpdateFilename(const std::string &url);
         std::string GetSignatureUrl(const std::string &url);