From 9b29327b40ab007dbbeb751ccd62bb1c3b917a08 Mon Sep 17 00:00:00 2001 From: Jnewbon <48688400+Jnewbon@users.noreply.github.com> Date: Wed, 26 Aug 2020 19:19:13 +0100 Subject: [PATCH 1/7] #6750 Change build type to debug to prevent optimization --- .github/workflows/job-sonarcloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/job-sonarcloud.yml b/.github/workflows/job-sonarcloud.yml index b5181263d..055cdff7f 100644 --- a/.github/workflows/job-sonarcloud.yml +++ b/.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 From 6f02038ef7aace650307333eaa50cec8b7f60a63 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 1 Sep 2020 13:41:07 +0100 Subject: [PATCH 2/7] Added job to add issue to jira automatically --- .github/workflows/job-jira-issues.yml | 40 +++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/job-jira-issues.yml diff --git a/.github/workflows/job-jira-issues.yml b/.github/workflows/job-jira-issues.yml new file mode 100644 index 000000000..1bbfedec3 --- /dev/null +++ b/.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 }} \ No newline at end of file From 4c5e5eddc576fde0567db105c4e106e935a55539 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Tue, 8 Sep 2020 12:50:46 +0100 Subject: [PATCH 3/7] Set stage and version --- cmake/Version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 8de43b9b5..a7c686f51 100644 --- a/cmake/Version.cmake +++ b/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 From 8c94568c310d536592c090f03e773aad3348c88a Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Thu, 10 Sep 2020 12:15:08 +0100 Subject: [PATCH 4/7] #6758 Added quotes round the tls path incase there are spaces. --- src/gui/src/MainWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 4cc156abb..2bcf21776 100644 --- a/src/gui/src/MainWindow.cpp +++ b/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) From 6805841cac7076c8b1a433dfd1591a17daebc043 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Thu, 10 Sep 2020 12:16:16 +0100 Subject: [PATCH 5/7] #6758 Updated ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 81a0ca3c2..e4270bed7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ v1.12.x-snapshot =========== Bug fixes: - #6753 Fixed a number of vulnerabilities detected by static analysis +- #6758 Account name with space on windows causes synergy to error when starting Enhancements: - #6750 Integrate SonarCloud for static analysis and test coverage From 5fd2130428f94ec178b7b614d58608d2f632d61a Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Thu, 10 Sep 2020 13:30:33 +0100 Subject: [PATCH 6/7] #6760 Added fix to keep the key in config if the new config doesn't contain one --- src/gui/src/AppConfig.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp index 029c326fc..f62afe0df 100644 --- a/src/gui/src/AppConfig.cpp +++ b/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", From 83942b62ff539c41603d51bcb0301d7a1c773eaa Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Thu, 10 Sep 2020 13:31:25 +0100 Subject: [PATCH 7/7] #6760 Update ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 81a0ca3c2..db5cd5e88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ v1.12.x-snapshot =========== Bug fixes: - #6753 Fixed a number of vulnerabilities detected by static analysis +- #6760 Synergy loses license when creating a System scope config Enhancements: - #6750 Integrate SonarCloud for static analysis and test coverage