MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

Update messages for signature checker dialog

Browse Source 
GitOrigin-RevId: 059d6f5725acae0b948412129d353dc6aba953f3
This commit is contained in:
Alexander Prendota
2021-07-01 09:16:21 +00:00
committed by intellij-monorepo-bot
parent 3e06e7e0ec
commit 5ed47c5cb1
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/platform-api/resources/messages/IdeBundle.properties
View File

@@ -1086,7 +1086,7 @@ third.party.plugins.privacy.note.no=Cancel
plugin.signature.not.signed=<html><body>The ''{0}'' plugin has not been digitally signed, and its authenticity cannot be verified. Installing or updating unsigned plugins may expose your system to risk.<br/><br/>Plugin details: vendor: {1}, id: {2}, version: {3}</body></html>
jetbrains.certificate.not.found=JetBrains certificate is not found.
jetbrains.certificate.invalid=JetBrains certificate is invalid. Please contact JetBrains support.
plugin.signature.missing=Plugin file is not signed by any of the trusted certificates. Please add a certificate.
plugin.invalid.signature.result=Digital signature verification of the ''{0}'' plugin failed with the following message: ''{1}'''.
plugin.signature.checker.progress=Checking plugin signature: ''{0}''
plugin.signature.checker.title=Plugin Security Warning
plugin.signature.checker.revoked.cert=<html><body>The ''{0}'' plugin has revoked the JetBrains certificate</body></html>

15
platform/platform-impl/src/com/intellij/ide/plugins/marketplace/PluginSignatureChecker.kt
View File

@@ -76,7 +76,8 @@ internal object PluginSignatureChecker {
pluginFile: File,
certificates: List<Certificate> = emptyList()
): Boolean {
val jbCert = jetbrainsCertificate ?: return processSignatureCheckerVerdict(descriptor, IdeBundle.message("jetbrains.certificate.not.found"))
val jbCert = jetbrainsCertificate
?: return processSignatureCheckerVerdict(descriptor, IdeBundle.message("jetbrains.certificate.not.found"))
val isRevoked = try {
isJetBrainsCertificateRevoked()
}
@@ -146,11 +147,11 @@ internal object PluginSignatureChecker {
return when (val verificationResult = ZipVerifier.verify(file)) {
is InvalidSignatureResult -> {
PluginManagerUsageCollector.signatureCheckResult(descriptor, SignatureVerificationResult.INVALID_SIGNATURE)
verificationResult.errorMessage
IdeBundle.message("plugin.invalid.signature.result", descriptor.name, verificationResult.errorMessage)
}
is MissingSignatureResult -> {
PluginManagerUsageCollector.signatureCheckResult(descriptor, SignatureVerificationResult.MISSING_SIGNATURE)
IdeBundle.message("plugin.signature.missing")
getSignatureWarningMessage(descriptor)
}
is SuccessfulVerificationResult -> {
val isSigned = certificates.any { certificate ->
@@ -158,8 +159,7 @@ internal object PluginSignatureChecker {
}
if (!isSigned) {
PluginManagerUsageCollector.signatureCheckResult(descriptor, SignatureVerificationResult.WRONG_SIGNATURE)
val vendor = if (descriptor.organization.isNullOrBlank()) descriptor.vendor else descriptor.organization
IdeBundle.message("plugin.signature.not.signed", descriptor.name, vendor, descriptor.pluginId.idString, descriptor.version)
getSignatureWarningMessage(descriptor)
}
else {
PluginManagerUsageCollector.signatureCheckResult(descriptor, SignatureVerificationResult.SUCCESSFUL)
@@ -169,6 +169,11 @@ internal object PluginSignatureChecker {
}
}
private fun getSignatureWarningMessage(descriptor: IdeaPluginDescriptor): String {
val vendor = if (descriptor.organization.isNullOrBlank()) descriptor.vendor else descriptor.organization
return IdeBundle.message("plugin.signature.not.signed", descriptor.name, vendor, descriptor.pluginId.idString, descriptor.version)
}
private fun processSignatureCheckerVerdict(descriptor: IdeaPluginDescriptor, @Nls message: String): Boolean {
val title = IdeBundle.message("plugin.signature.checker.title")
val yesText = IdeBundle.message("plugin.signature.checker.yes")