From 294c25507d2e52420ea9ee7ff719fcd4c9092bf1 Mon Sep 17 00:00:00 2001 From: Ivan Chirkov Date: Wed, 26 Jul 2017 18:48:24 +0200 Subject: [PATCH] Set productName as UserAgent for requests to plugin repository --- .../src/com/intellij/ide/plugins/RepositoryHelper.java | 2 +- .../intellij/openapi/updateSettings/impl/PluginDownloader.java | 2 +- .../impl/pluginsAdvertisement/PluginsAdvertiser.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java b/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java index 569cc9d3b92c..a31305ddf3ce 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java @@ -145,7 +145,7 @@ public class RepositoryHelper { indicator.setText2(IdeBundle.message("progress.connecting.to.plugin.manager", host)); } - RequestBuilder request = HttpRequests.request(url).forceHttps(forceHttps).tuner(connection -> connection.setRequestProperty("If-None-Match", eTag)); + RequestBuilder request = HttpRequests.request(url).forceHttps(forceHttps).tuner(connection -> connection.setRequestProperty("If-None-Match", eTag)).productNameAsUserAgent(); return process(repositoryUrl, request.connect(new HttpRequests.RequestProcessor>() { @Override public List process(@NotNull HttpRequests.Request request) throws IOException { diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginDownloader.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginDownloader.java index 620fcf0383ba..de462197d50b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginDownloader.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginDownloader.java @@ -239,7 +239,7 @@ public class PluginDownloader { indicator.checkCanceled(); indicator.setText2(IdeBundle.message("progress.downloading.plugin", getPluginName())); - return HttpRequests.request(myPluginUrl).gzip(false).forceHttps(myForceHttps).connect(new HttpRequests.RequestProcessor() { + return HttpRequests.request(myPluginUrl).gzip(false).forceHttps(myForceHttps).productNameAsUserAgent().connect(new HttpRequests.RequestProcessor() { @Override public File process(@NotNull HttpRequests.Request request) throws IOException { request.saveToFile(file, indicator); diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java index 474ca139a353..b2264c23b80f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java @@ -170,7 +170,7 @@ public class PluginsAdvertiser implements StartupActivity { params.forEach((key, value) -> uriBuilder.addParameter(key, value)); boolean forceHttps = IdeaApplication.isLoaded() && UpdateSettings.getInstance().canUseSecureConnection(); - return HttpRequests.request(uriBuilder.toString()).forceHttps(forceHttps).connect(requestProcessor, errorValue, LOG); + return HttpRequests.request(uriBuilder.toString()).forceHttps(forceHttps).productNameAsUserAgent().connect(requestProcessor, errorValue, LOG); } public static void ensureDeleted() {