From f8554db0263cfafff2a6bcffe220f9ae5d8aeee6 Mon Sep 17 00:00:00 2001 From: Nikita Iarychenko Date: Mon, 16 Dec 2024 11:59:36 +0400 Subject: [PATCH] OPENIDE #37 Change links to the marketplace in White List (cherry picked from commit f73957354823f6d503917d50c158ae292fb4ab6f) (cherry picked from commit c18d0fd1f21f34df8a0f24723597a510978b4aae) (cherry picked from commit 46b2a3379cb974f83c2d6fff0c8efe74d2e9b198) (cherry picked from commit 0cbdc0968f062780d25e31dd50d28a28d6225432) (cherry picked from commit d75cf5340dd7e16e81093a6b4f6b2b8ef7f0f65a) --- .../src/org/jetbrains/intellij/build/impl/brokenPlugins.kt | 2 +- .../src/org/jetbrains/ide/InstallPluginService.kt | 3 ++- .../openapi/application/impl/ApplicationInfoImpl.java | 4 ++-- platform/ide-core/src/com/intellij/util/io/WhiteListUrls.kt | 5 +++-- .../src/com/intellij/ide/plugins/newui/LicensePanel.java | 5 ++++- platform/util/resources/misc/registry.properties | 2 +- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt index 08e9d46d398a..eb9364b865f4 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt @@ -11,7 +11,7 @@ import java.io.DataOutputStream import java.util.TreeMap import java.util.TreeSet -private const val MARKETPLACE_BROKEN_PLUGINS_URL = "https://plugins.jetbrains.com/files/brokenPlugins.json" +private const val MARKETPLACE_BROKEN_PLUGINS_URL = "https://plugins.openide.ru/files/brokenPlugins.json" /** * Generate the 'brokenPlugins.txt' file using JetBrains Marketplace. diff --git a/platform/built-in-server/src/org/jetbrains/ide/InstallPluginService.kt b/platform/built-in-server/src/org/jetbrains/ide/InstallPluginService.kt index 8f40d06f6219..1967a994e3f4 100644 --- a/platform/built-in-server/src/org/jetbrains/ide/InstallPluginService.kt +++ b/platform/built-in-server/src/org/jetbrains/ide/InstallPluginService.kt @@ -37,7 +37,8 @@ internal class InstallPluginService : RestService() { "www.jetbrains.com", "www.jetbrains.com.cn", "vision.jetbrains.dev", - "internal.vision.jetbrains.dev" + "internal.vision.jetbrains.dev", + "plugins.openide.ru" ) override fun execute(urlDecoder: QueryStringDecoder, request: FullHttpRequest, context: ChannelHandlerContext): String? { diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java index 68ae0ca9b587..a7a9aa2462de 100644 --- a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java +++ b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java @@ -44,8 +44,8 @@ import static java.util.Objects.requireNonNull; */ @ApiStatus.Internal public final class ApplicationInfoImpl extends ApplicationInfoEx { - public static final String DEFAULT_PLUGINS_HOST = "https://plugins.jetbrains.com"; - public static final String IDEA_PLUGINS_HOST_PROPERTY = "idea.plugins.host"; + public static final String DEFAULT_PLUGINS_HOST = "https://plugins.openide.ru"; + static final String IDEA_PLUGINS_HOST_PROPERTY = "idea.plugins.host"; @ApiStatus.Experimental public static final String SUBSCRIPTION_MODE_SPLASH_MARKER_FILE_NAME = "splash-subscription-mode.txt"; diff --git a/platform/ide-core/src/com/intellij/util/io/WhiteListUrls.kt b/platform/ide-core/src/com/intellij/util/io/WhiteListUrls.kt index 62b362f69087..e2910690f0b6 100644 --- a/platform/ide-core/src/com/intellij/util/io/WhiteListUrls.kt +++ b/platform/ide-core/src/com/intellij/util/io/WhiteListUrls.kt @@ -18,8 +18,9 @@ object WhiteListUrls { "https://pypi.python.org", "http://localhost", "https://services.gradle.org", - "https://plugins.jetbrains.com", // TODO [OpenIDE]: replace url - "https://downloads.marketplace.jetbrains.com/files", // TODO [OpenIDE]: replace url + "https://plugins.openide.ru/", + "https://downloads.marketplace.openide.ru", + "https://downloads.openide.ru", "https://repo1.maven.org/maven2/net/sourceforge/plantuml/plantuml/1.2023.10/plantuml-1.2023.10.jar", "https://amplicode.ru", "https://download.openide.ru" diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/LicensePanel.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/LicensePanel.java index 7aa83fec72db..dea332619aad 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/LicensePanel.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/LicensePanel.java @@ -4,7 +4,9 @@ package com.intellij.ide.plugins.newui; import com.intellij.icons.AllIcons; import com.intellij.ide.BrowserUtil; import com.intellij.ide.IdeBundle; +import com.intellij.ide.plugins.IdeaPluginDescriptor; import com.intellij.ide.plugins.PluginManagerConfigurable; +import com.intellij.ide.plugins.PluginNode; import com.intellij.openapi.application.IdeUrlTrackingParametersProvider; import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.util.text.StringUtil; @@ -26,6 +28,7 @@ import java.awt.BorderLayout; import java.time.Duration; import java.time.Instant; import java.util.Date; +import java.util.List; import java.util.function.Supplier; /** @@ -163,7 +166,7 @@ public final class LicensePanel extends NonOpaquePanel { setLink(IdeBundle.message("plugins.configurable.buy.the.license"), () -> BrowserUtil.browse(IdeUrlTrackingParametersProvider.getInstance() - .augmentUrl("https://plugins.jetbrains.com/purchase-link/" + plugin.getProductCode())), true); + .augmentUrl("https://plugins.openide.ru/purchase-link/" + plugin.getProductCode())), true); if (forUpdate) { updateLink(IdeBundle.message("label.plugin.paid"), false); diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 1215aa1b1173..983c6c954e9d 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -1810,7 +1810,7 @@ ast.loading.filter=false ast.loading.filter.description=Enables the mechanism that disables AST loading in a particular thread marketplace.certificate.signature.check=true -marketplace.certificate.signature.check.description=Verify signatures for plugins downloaded from plugins.jetbrains.com +marketplace.certificate.signature.check.description=Verify signatures for plugins downloaded from plugins.openide.ru custom-repository.certificate.signature.check=false custom-repository.certificate.signature.check.description=Verify signatures for plugins downloaded from custom plugin repositories and installed from disk