Merge branch 'master' into issue-6755-vreadf-vulnerability

.github/workflows/job-jira-issues.yml

@@ -0,0 +1,40 @@
+on:
+  issues:
+    types: [ opened ]
+
+name: Send Issue to Jira
+jobs:
+  jiraIssueCreation:
+    name: Jira Issue Creation Demo
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Login
+        uses: atlassian/gajira-login@master
+        env:
+          JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
+          JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
+          JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
+
+      - name: Create
+        id: create
+        uses: atlassian/gajira-create@master
+        with:
+          project: SYNERGY
+          issuetype: Task
+          summary: |
+            ${{ github.event.issue.title }}
+          description: |
+            Opened by: ${{ github.event.issue.user.login }}
+            Link: ${{ github.event.issue.html_url }}
+            ${{ github.event.issue.body }}
+
+      - name: Create comment
+        uses: jungwinter/comment@v1
+        id: createComment
+        with:
+          type: create
+          body: |
+            Jira Issue: [${{ steps.create.outputs.issue }}](https://symless.atlassian.net/browse/${{ steps.create.outputs.issue }})
+          issue_number: ${{ github.event.issue.number }}
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/job-sonarcloud.yml

@@ -45,7 +45,7 @@ jobs:
         export PATH=$HOME/.sonar/build-wrapper-linux-x86:$PATH
         mkdir build-release
         cd build-release
-        cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_COVERAGE=ON ..
+        cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=ON ..
         . ./version
         build-wrapper-linux-x86-64 --out-dir bw-output make -j
 

ChangeLog

@@ -3,6 +3,8 @@ v1.12.x-snapshot
 Bug fixes:
 - #6753 Fixed a number of vulnerabilities detected by static analysis
 - #6755 Fixed Vulnerability in vreadf function detected by Static analysis
+- #6758 Account name with space on windows causes synergy to error when starting
+- #6760 Synergy loses license when creating a System scope config
 
 Enhancements:
 - #6750 Integrate SonarCloud for static analysis and test coverage

cmake/Version.cmake

@@ -7,7 +7,7 @@ cmake_minimum_required (VERSION 3.4)
 set (SYNERGY_VERSION_MAJOR 1)
 set (SYNERGY_VERSION_MINOR 12)
 set (SYNERGY_VERSION_PATCH 0)
-set (SYNERGY_VERSION_STAGE "stable")
+set (SYNERGY_VERSION_STAGE "snapshot")
 
 #
 # Version from CI

src/gui/src/AppConfig.cpp

@@ -238,7 +238,6 @@ void AppConfig::loadSettings()
     m_ActivateEmail             = loadSetting(kActivateEmail, "").toString();
     m_CryptoEnabled             = loadSetting(kCryptoEnabled, true).toBool();
     m_AutoHide                  = loadSetting(kAutoHide, false).toBool();
-    m_Serialkey                 = loadSetting(kSerialKey, "").toString().trimmed();
     m_lastVersion               = loadSetting(kLastVersion, "Unknown").toString();
     m_LastExpiringWarningTime   = loadSetting(kLastExpireWarningTime, 0).toInt();
     m_ActivationHasRun          = loadSetting(kActivationHasRun, false).toBool();
@@ -251,6 +250,16 @@ void AppConfig::loadSettings()
     m_ClientGroupChecked        = loadSetting(kGroupClientCheck, true).toBool();
     m_ServerHostname            = loadSetting(kServerHostname).toString();
 
+    //only change the serial key if the settings being loaded contains a key
+    bool updateSerial = GUI::Config::ConfigWriter::make()
+            ->hasSetting(settingName(kLoadSystemSettings),GUI::Config::ConfigWriter::kCurrent);
+    //if the setting exists and is not empty
+    updateSerial = updateSerial && !loadSetting(kSerialKey, "").toString().trimmed().isEmpty();
+
+    if (updateSerial) {
+        m_Serialkey                 = loadSetting(kSerialKey, "").toString().trimmed();
+    }
+
     //Set the default path of the TLS certificate file in the users DIR
     QString certificateFilename = QString("%1/%2/%3").arg(m_CoreInterface.getProfileDir(),
                                                           "SSL",

src/gui/src/MainWindow.cpp

@@ -670,7 +670,7 @@ void MainWindow::startSynergy()
 
     if (m_AppConfig->getCryptoEnabled()) {
         args << "--enable-crypto";
-        args << "--tls-cert" << m_AppConfig->getTLSCertPath();
+        args << "--tls-cert" <<  QString("\"%1\"").arg(m_AppConfig->getTLSCertPath());
     }
 
 #if defined(Q_OS_WIN)