ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-22 02:06:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-2974 Fixing x500Prinicipal matching (#5186)

Browse Source
This commit is contained in:
Michal Kit 2019-06-11 16:07:52 +01:00 committed by Shams Asari
parent 3b73e60605
commit d72ec57c1c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/kotlin/net/corda/core/identity/CordaX500Name.kt
View File

@ -83,12 +83,12 @@ data class CordaX500Name(val commonName: String?,
@JvmStatic @JvmStatic
fun build(principal: X500Principal): CordaX500Name { fun build(principal: X500Principal): CordaX500Name {
val attrsMap = principal.toAttributesMap(supportedAttributes) val attrsMap = principal.toAttributesMap(supportedAttributes)
val CN = attrsMap[BCStyle.CN]?.toString() val CN = attrsMap[BCStyle.CN]
val OU = attrsMap[BCStyle.OU]?.toString() val OU = attrsMap[BCStyle.OU]
val O = requireNotNull(attrsMap[BCStyle.O]?.toString()) { "Corda X.500 names must include an O attribute" } val O = requireNotNull(attrsMap[BCStyle.O]) { "Corda X.500 names must include an O attribute" }
val L = requireNotNull(attrsMap[BCStyle.L]?.toString()) { "Corda X.500 names must include an L attribute" } val L = requireNotNull(attrsMap[BCStyle.L]) { "Corda X.500 names must include an L attribute" }
val ST = attrsMap[BCStyle.ST]?.toString() val ST = attrsMap[BCStyle.ST]
val C = requireNotNull(attrsMap[BCStyle.C]?.toString()) { "Corda X.500 names must include an C attribute" } val C = requireNotNull(attrsMap[BCStyle.C]) { "Corda X.500 names must include an C attribute" }
return CordaX500Name(CN, OU, O, L, ST, C) return CordaX500Name(CN, OU, O, L, ST, C)
} }

6
core/src/main/kotlin/net/corda/core/internal/X500Utils.kt
View File

@ -41,14 +41,14 @@ fun X500Principal.toX500Name(): X500Name = X500Name.getInstance(this.encoded)
* @throws IllegalArgumentException if this principal consists of duplicated attributes or the attribute is not supported. * @throws IllegalArgumentException if this principal consists of duplicated attributes or the attribute is not supported.
* *
*/ */
fun X500Principal.toAttributesMap(supportedAttributes: Set<ASN1ObjectIdentifier> = emptySet()): Map<ASN1ObjectIdentifier, ASN1Encodable> { fun X500Principal.toAttributesMap(supportedAttributes: Set<ASN1ObjectIdentifier> = emptySet()): Map<ASN1ObjectIdentifier, String> {
val x500Name = this.toX500Name() val x500Name = this.toX500Name()
val attrsMap: Map<ASN1ObjectIdentifier, ASN1Encodable> = x500Name.rdNs val attrsMap: Map<ASN1ObjectIdentifier, String> = x500Name.rdNs
.flatMap { it.typesAndValues.asList() } .flatMap { it.typesAndValues.asList() }
.groupBy(AttributeTypeAndValue::getType, AttributeTypeAndValue::getValue) .groupBy(AttributeTypeAndValue::getType, AttributeTypeAndValue::getValue)
.mapValues { .mapValues {
require(it.value.size == 1) { "Duplicate attribute ${it.key}" } require(it.value.size == 1) { "Duplicate attribute ${it.key}" }
it.value[0] it.value[0].toString()
} }
if (supportedAttributes.isNotEmpty()) { if (supportedAttributes.isNotEmpty()) {
(attrsMap.keys - supportedAttributes).let { unsupported -> (attrsMap.keys - supportedAttributes).let { unsupported ->