MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-161933 Untrusted Server's Certificate dialog: "signed by untrusted authority" warning message fix

Browse Source 
GitOrigin-RevId: 6fad2cc3d23129340e60ebe3112a5b42eeb5a038
This commit is contained in:
Vera Petrenkova
2024-09-13 17:00:46 +00:00
committed by intellij-monorepo-bot
parent 73ebfb987b
commit 715bcbaee1
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/net/ssl/CertificateWarningDialog.kt
+23 -13
View File
@@ -145,7 +145,7 @@ internal class CertificateWarningDialog(
private fun createCertificateTree(): JTree {
val untrusted = certificateErrorsMap.entries.filter { it.value.contains(CertificateError.UNTRUSTED_AUTHORITY) }
val certificatesTree =
if (untrusted.isNotEmpty() && certificates.size > 1) {
if ((untrusted.isNotEmpty() && certificates.size > 1) || certificateErrorsMap.filter { entry -> entry.value.isNotEmpty() }.size > 1) {
val root = CheckedTreeNode("root").apply { isChecked = false }
var lastNode = root
certificates.reversed().forEach {
@@ -225,18 +225,18 @@ internal class CertificateWarningDialog(
private fun getTreeCellTextAndColor(value: Any?): Pair<String, Color> {
val labelForeground = JBUI.CurrentTheme.Label.foreground()
val userObject = (value as? DefaultMutableTreeNode)?.userObject as? X509Certificate ?: return Pair("", labelForeground)
val myWrapper = CertificateWrapper(userObject)
val certErrors = certificateErrorsMap[userObject]!!
val errors = mutableListOf<String>()
if (myWrapper.isNotYetValid) {
if (certErrors.contains(CertificateError.NOT_YET_VALID)) {
errors.add(IdeBundle.message("label.certificate.not.yet.valid"))
}
else if (myWrapper.isExpired) {
else if (certErrors.contains(CertificateError.EXPIRED)) {
errors.add(IdeBundle.message("label.certificate.expired"))
}
if (myWrapper.isSelfSigned) {
if (certErrors.contains(CertificateError.SELF_SIGNED)) {
errors.add(IdeBundle.message("label.certificate.self.signed"))
} else if (certificateErrorsMap[userObject]!!.contains(CertificateError.UNTRUSTED_AUTHORITY)) {
} else if (certErrors.contains(CertificateError.UNTRUSTED_AUTHORITY)) {
val error = if (userObject != certificates.first()) IdeBundle.message("label.certificate.untrusted.authority")
else IdeBundle.message("label.certificate.signed.by.untrusted.authority")
errors.add(error)
@@ -388,19 +388,29 @@ internal class CertificateWarningDialog(
private fun getCertificateErrorsMap(): Map<X509Certificate, List<CertificateError>> {
val result = certificates.associateWith { mutableListOf<CertificateError>() }.toMutableMap()
val errorMessage = "unable to find valid certification path"
val isUntrusted = try {
manager.checkServerTrusted(certificates.toTypedArray(), authType)
false
}
catch (e: CertificateException) {
e.message?.contains(errorMessage) == true
}
certificates.reversed().forEach { cert ->
val model = CertificateWrapper(cert)
val errors = result[cert]!!
if (model.isSelfSigned) errors.add(CertificateError.SELF_SIGNED)
if (model.isNotYetValid) errors.add(CertificateError.NOT_YET_VALID)
if (model.isExpired) errors.add(CertificateError.EXPIRED)
try {
if (errors.contains(CertificateError.SELF_SIGNED)) return@forEach
manager.checkServerTrusted(arrayOf(cert), authType)
}
catch (_: CertificateException) {
errors.add(CertificateError.UNTRUSTED_AUTHORITY)
return@forEach
if (isUntrusted && !errors.contains(CertificateError.SELF_SIGNED)) {
try {
manager.checkServerTrusted(arrayOf(cert), authType)
}
catch (e: CertificateException) {
if (e.message?.contains(errorMessage) == true) {
errors.add(CertificateError.UNTRUSTED_AUTHORITY)
}
}
}
}
return result