From 1389151511b840fc40929913a6abd7942f93740c Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Wed, 24 Aug 2016 10:39:51 +0200 Subject: [PATCH] SONAR-7884 update default Update Center URL to HTTPS --- .../org/sonar/process/ProcessTest/sonar.properties | 2 +- .../org/sonar/process/ProcessTest/sonar.properties | 2 +- .../java/org/sonar/server/plugins/UpdateCenterClient.java | 4 ++-- .../resources/org/sonar/server/platform/ws/logs-example.log | 2 +- .../org/sonar/server/plugins/UpdateCenterClientTest.java | 6 +++--- sonar-application/src/main/assembly/conf/sonar.properties | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/sonar-process-monitor/src/test/resources/org/sonar/process/ProcessTest/sonar.properties b/server/sonar-process-monitor/src/test/resources/org/sonar/process/ProcessTest/sonar.properties index 583c4c45f1f..a8e1e222eb7 100644 --- a/server/sonar-process-monitor/src/test/resources/org/sonar/process/ProcessTest/sonar.properties +++ b/server/sonar-process-monitor/src/test/resources/org/sonar/process/ProcessTest/sonar.properties @@ -116,7 +116,7 @@ sonar.jdbc.timeBetweenEvictionRunsMillis=30000 #-------------------------------------------------------------------------------------------------- # UPDATE CENTER -# The Update Center requires an internet connection to request http://update.sonarsource.org +# The Update Center requires an internet connection to request https://update.sonarsource.org # It is enabled by default. #sonar.updatecenter.activate=true diff --git a/server/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties b/server/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties index 583c4c45f1f..a8e1e222eb7 100644 --- a/server/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties +++ b/server/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties @@ -116,7 +116,7 @@ sonar.jdbc.timeBetweenEvictionRunsMillis=30000 #-------------------------------------------------------------------------------------------------- # UPDATE CENTER -# The Update Center requires an internet connection to request http://update.sonarsource.org +# The Update Center requires an internet connection to request https://update.sonarsource.org # It is enabled by default. #sonar.updatecenter.activate=true diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java index cd6c5233090..5057bad35f6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java +++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java @@ -37,7 +37,7 @@ import org.sonar.updatecenter.common.UpdateCenterDeserializer; import org.sonar.updatecenter.common.UpdateCenterDeserializer.Mode; /** - * HTTP client to load data from the remote update center hosted at http://update.sonarsource.org. + * HTTP client to load data from the remote update center hosted at https://update.sonarsource.org. * * @since 2.4 */ @@ -53,7 +53,7 @@ import org.sonar.updatecenter.common.UpdateCenterDeserializer.Mode; type = PropertyType.BOOLEAN), @Property( key = UpdateCenterClient.URL_PROPERTY, - defaultValue = "http://update.sonarsource.org/update-center.properties", + defaultValue = "https://update.sonarsource.org/update-center.properties", name = "Update Center URL", category = "Update Center", project = false, diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/logs-example.log b/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/logs-example.log index 6843140a6ba..020c7b95389 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/logs-example.log +++ b/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/logs-example.log @@ -45,7 +45,7 @@ Picked up JAVA_TOOL_OPTIONS: -Djava.awt.headless=true 2015.11.02 09:22:14 INFO web[o.s.s.p.ServerPluginRepository] Deploy plugin SVN / 1.2 / d04c3cdb21f48905dd8300d1129ec90281aa6db2 2015.11.02 09:22:14 INFO web[o.s.s.d.m.DatabaseMigrator] Create database 2015.11.02 09:22:14 INFO web[o.s.s.p.RailsAppsDeployer] Deploying Ruby on Rails applications -2015.11.02 09:22:15 INFO web[o.s.s.p.UpdateCenterClient] Update center: http://update.sonarsource.org/update-center.properties (no proxy) +2015.11.02 09:22:15 INFO web[o.s.s.p.UpdateCenterClient] Update center: https://update.sonarsource.org/update-center.properties (no proxy) 2015.11.02 09:22:15 INFO web[o.s.s.e.IndexCreator] Create index users 2015.11.02 09:22:15 INFO es[o.e.cluster.metadata] [sonar-1446452521489] [users] creating index, cause [api], templates [], shards [5]/[0], mappings [] 2015.11.02 09:22:15 INFO web[o.s.s.e.IndexCreator] Create type users/user diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java index 8e0ce1dcf36..c91786bc460 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java @@ -41,7 +41,7 @@ import static org.mockito.Mockito.when; public class UpdateCenterClientTest { - static final String BASE_URL = "http://update.sonarsource.org"; + static final String BASE_URL = "https://update.sonarsource.org"; UriReader reader; Settings settings; @@ -51,8 +51,8 @@ public class UpdateCenterClientTest { public void startServer() throws Exception { reader = mock(UriReader.class); settings = new Settings() - .setProperty(UpdateCenterClient.URL_PROPERTY, BASE_URL) - .setProperty(UpdateCenterClient.ACTIVATION_PROPERTY, true); + .setProperty(UpdateCenterClient.URL_PROPERTY, BASE_URL) + .setProperty(UpdateCenterClient.ACTIVATION_PROPERTY, true); underTest = new UpdateCenterClient(reader, settings); } diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index 5fe66664147..ffa770fb371 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -180,7 +180,7 @@ #-------------------------------------------------------------------------------------------------- # UPDATE CENTER -# Update Center requires an internet connection to request http://update.sonarsource.org +# Update Center requires an internet connection to request https://update.sonarsource.org # It is enabled by default. #sonar.updatecenter.activate=true -- 2.39.5