Ticket 1307 (part1 refactoring) [RFE] Support multiple keySets for different cards for ExternalReg This patch is mainly refactoring the names of the Mapping Resolver framework in preparation for ticket 1307 to support keySet mapping in addition to the original purpose of resolving tokenType mapping. The reason to separate out refactoring from the real code is for ease of reviewing. TPS is currently a Tech Preview feature, so upgrade is not of consideration at the moment.

2 files changed, 92 insertions, 92 deletions

diff --git a/base/tps/shared/conf/CS.cfg.in b/base/tps/shared/conf/CS.cfg.in
index 4fa477dbc..aadcbfcb1 100644
--- a/base/tps/shared/conf/CS.cfg.in
+++ b/base/tps/shared/conf/CS.cfg.in
@@ -789,7 +789,7 @@ op.enroll._032=# Token ATR:
 op.enroll._033=#   Web Store  - 3B759400006202020201
 op.enroll._034=#########################################
 op.enroll.allowUnknownToken=true
-op.enroll.tokenProfileResolver=enrollMappingResolver
+op.enroll.mappingResolver=enrollMappingResolver
 op.enroll.soKey.cuidMustMatchKDD=false
 op.enroll.soKey.enableBoundedGPKeyVersion=true
 op.enroll.soKey.minimumGPKeyVersion=01
@@ -1395,7 +1395,7 @@ op.enroll.userKey.update.applet.requiredVersion=1.4.4d40a449
 op.enroll.userKey.update.symmetricKeys.enable=false
 op.enroll.userKey.update.symmetricKeys.requiredVersion=1
 op.format.allowUnknownToken=true
-op.format.tokenProfileResolver=formatMappingResolver
+op.format.mappingResolver=formatMappingResolver
 op.format.cleanToken.cuidMustMatchKDD=false
 op.format.cleanToken.enableBoundedGPKeyVersion=true
 op.format.cleanToken.minimumGPKeyVersion=01
@@ -1543,7 +1543,7 @@ op.format.userKey.update.applet.encryption=true
 op.format.userKey.update.applet.requiredVersion=1.4.4d40a449
 op.format.userKey.update.symmetricKeys.enable=false
 op.format.userKey.update.symmetricKeys.requiredVersion=1
-op.pinReset.tokenProfileResolver=pinResetMappingResolver
+op.pinReset.mappingResolver=pinResetMappingResolver
 op.pinReset.userKey.cuidMustMatchKDD=false
 op.pinReset.userKey.enableBoundedGPKeyVersion=true
 op.pinReset.userKey.minimumGPKeyVersion=01
@@ -1655,89 +1655,89 @@ preop.system.name=TPS
 preop.wizard.name=TPS Setup Wizard
 proxy.securePort=[PKI_PROXY_SECURE_PORT]
 proxy.unsecurePort=[PKI_PROXY_UNSECURE_PORT]
-tokenProfileResolver.list=formatMappingResolver,enrollMappingResolver,pinResetMappingResolver
-tokenProfileResolver.enrollMappingResolver.class_id=mappingTokenProfileResolverImpl
-tokenProfileResolver.enrollMappingResolver.mapping.0.filter.appletMajorVersion=1
-tokenProfileResolver.enrollMappingResolver.mapping.0.filter.appletMinorVersion=
-tokenProfileResolver.enrollMappingResolver.mapping.0.filter.tokenATR=
-tokenProfileResolver.enrollMappingResolver.mapping.0.filter.tokenCUID.end=
-tokenProfileResolver.enrollMappingResolver.mapping.0.filter.tokenCUID.start=
-tokenProfileResolver.enrollMappingResolver.mapping.0.filter.tokenType=userKey
-tokenProfileResolver.enrollMappingResolver.mapping.0.target.tokenType=userKey
-tokenProfileResolver.enrollMappingResolver.mapping.1.filter.appletMajorVersion=
-tokenProfileResolver.enrollMappingResolver.mapping.1.filter.appletMinorVersion=
-tokenProfileResolver.enrollMappingResolver.mapping.1.filter.tokenATR=
-tokenProfileResolver.enrollMappingResolver.mapping.1.filter.tokenCUID.end=
-tokenProfileResolver.enrollMappingResolver.mapping.1.filter.tokenCUID.start=
-tokenProfileResolver.enrollMappingResolver.mapping.1.filter.tokenType=soKey
-tokenProfileResolver.enrollMappingResolver.mapping.1.target.tokenType=soKey
-tokenProfileResolver.enrollMappingResolver.mapping.2.filter.appletMajorVersion=
-tokenProfileResolver.enrollMappingResolver.mapping.2.filter.appletMinorVersion=
-tokenProfileResolver.enrollMappingResolver.mapping.2.filter.tokenATR=
-tokenProfileResolver.enrollMappingResolver.mapping.2.filter.tokenCUID.end=
-tokenProfileResolver.enrollMappingResolver.mapping.2.filter.tokenCUID.start=
-tokenProfileResolver.enrollMappingResolver.mapping.2.filter.tokenType=
-tokenProfileResolver.enrollMappingResolver.mapping.2.target.tokenType=userKey
-tokenProfileResolver.enrollMappingResolver.mapping.order=0,1,2
-tokenProfileResolver.formatMappingResolver.class_id=mappingTokenProfileResolverImpl
-tokenProfileResolver.formatMappingResolver.mapping.0.filter.appletMajorVersion=
-tokenProfileResolver.formatMappingResolver.mapping.0.filter.appletMinorVersion=
-tokenProfileResolver.formatMappingResolver.mapping.0.filter.tokenATR=
-tokenProfileResolver.formatMappingResolver.mapping.0.filter.tokenCUID.end=
-tokenProfileResolver.formatMappingResolver.mapping.0.filter.tokenCUID.start=
-tokenProfileResolver.formatMappingResolver.mapping.0.filter.tokenType=soCleanUserToken
-tokenProfileResolver.formatMappingResolver.mapping.0.target.tokenType=soCleanUserToken
-tokenProfileResolver.formatMappingResolver.mapping.1.filter.appletMajorVersion=
-tokenProfileResolver.formatMappingResolver.mapping.1.filter.appletMinorVersion=
-tokenProfileResolver.formatMappingResolver.mapping.1.filter.tokenATR=
-tokenProfileResolver.formatMappingResolver.mapping.1.filter.tokenCUID.end=
-tokenProfileResolver.formatMappingResolver.mapping.1.filter.tokenCUID.start=
-tokenProfileResolver.formatMappingResolver.mapping.1.filter.tokenType=soUserKey
-tokenProfileResolver.formatMappingResolver.mapping.1.target.tokenType=soUserKey
-tokenProfileResolver.formatMappingResolver.mapping.2.filter.appletMajorVersion=
-tokenProfileResolver.formatMappingResolver.mapping.2.filter.appletMinorVersion=
-tokenProfileResolver.formatMappingResolver.mapping.2.filter.tokenATR=
-tokenProfileResolver.formatMappingResolver.mapping.2.filter.tokenCUID.end=
-tokenProfileResolver.formatMappingResolver.mapping.2.filter.tokenCUID.start=
-tokenProfileResolver.formatMappingResolver.mapping.2.filter.tokenType=soKey
-tokenProfileResolver.formatMappingResolver.mapping.2.target.tokenType=soKey
-tokenProfileResolver.formatMappingResolver.mapping.3.filter.appletMajorVersion=
-tokenProfileResolver.formatMappingResolver.mapping.3.filter.appletMinorVersion=
-tokenProfileResolver.formatMappingResolver.mapping.3.filter.tokenATR=
-tokenProfileResolver.formatMappingResolver.mapping.3.filter.tokenCUID.end=
-tokenProfileResolver.formatMappingResolver.mapping.3.filter.tokenCUID.start=
-tokenProfileResolver.formatMappingResolver.mapping.3.filter.tokenType=userKey
-tokenProfileResolver.formatMappingResolver.mapping.3.target.tokenType=userKey
-tokenProfileResolver.formatMappingResolver.mapping.4.filter.appletMajorVersion=
-tokenProfileResolver.formatMappingResolver.mapping.4.filter.appletMinorVersion=
-tokenProfileResolver.formatMappingResolver.mapping.4.filter.tokenATR=
-tokenProfileResolver.formatMappingResolver.mapping.4.filter.tokenCUID.end=
-tokenProfileResolver.formatMappingResolver.mapping.4.filter.tokenCUID.start=
-tokenProfileResolver.formatMappingResolver.mapping.4.filter.tokenType=soCleanSOToken
-tokenProfileResolver.formatMappingResolver.mapping.4.target.tokenType=soCleanSOToken
-tokenProfileResolver.formatMappingResolver.mapping.5.filter.appletMajorVersion=
-tokenProfileResolver.formatMappingResolver.mapping.5.filter.appletMinorVersion=
-tokenProfileResolver.formatMappingResolver.mapping.5.filter.tokenATR=
-tokenProfileResolver.formatMappingResolver.mapping.5.filter.tokenCUID.end=
-tokenProfileResolver.formatMappingResolver.mapping.5.filter.tokenCUID.start=
-tokenProfileResolver.formatMappingResolver.mapping.5.filter.tokenType=cleanToken
-tokenProfileResolver.formatMappingResolver.mapping.5.target.tokenType=cleanToken
-tokenProfileResolver.formatMappingResolver.mapping.6.filter.appletMajorVersion=
-tokenProfileResolver.formatMappingResolver.mapping.6.filter.appletMinorVersion=
-tokenProfileResolver.formatMappingResolver.mapping.6.filter.tokenATR=
-tokenProfileResolver.formatMappingResolver.mapping.6.filter.tokenCUID.end=
-tokenProfileResolver.formatMappingResolver.mapping.6.filter.tokenCUID.start=
-tokenProfileResolver.formatMappingResolver.mapping.6.target.tokenType=tokenKey
-tokenProfileResolver.formatMappingResolver.mapping.order=0,1,2,3,4,5,6
-tokenProfileResolver.pinResetMappingResolver.class_id=mappingTokenProfileResolverImpl
-tokenProfileResolver.pinResetMappingResolver.mapping.0.filter.appletMajorVersion=
-tokenProfileResolver.pinResetMappingResolver.mapping.0.filter.appletMinorVersion=
-tokenProfileResolver.pinResetMappingResolver.mapping.0.filter.tokenATR=
-tokenProfileResolver.pinResetMappingResolver.mapping.0.filter.tokenCUID.end=
-tokenProfileResolver.pinResetMappingResolver.mapping.0.filter.tokenCUID.start=
-tokenProfileResolver.pinResetMappingResolver.mapping.0.filter.tokenType=
-tokenProfileResolver.pinResetMappingResolver.mapping.0.target.tokenType=userKey
-tokenProfileResolver.pinResetMappingResolver.mapping.order=0
+mappingResolver.list=formatMappingResolver,enrollMappingResolver,pinResetMappingResolver
+mappingResolver.enrollMappingResolver.class_id=filterMappingResolverImpl
+mappingResolver.enrollMappingResolver.mapping.0.filter.appletMajorVersion=1
+mappingResolver.enrollMappingResolver.mapping.0.filter.appletMinorVersion=
+mappingResolver.enrollMappingResolver.mapping.0.filter.tokenATR=
+mappingResolver.enrollMappingResolver.mapping.0.filter.tokenCUID.end=
+mappingResolver.enrollMappingResolver.mapping.0.filter.tokenCUID.start=
+mappingResolver.enrollMappingResolver.mapping.0.filter.tokenType=userKey
+mappingResolver.enrollMappingResolver.mapping.0.target.tokenType=userKey
+mappingResolver.enrollMappingResolver.mapping.1.filter.appletMajorVersion=
+mappingResolver.enrollMappingResolver.mapping.1.filter.appletMinorVersion=
+mappingResolver.enrollMappingResolver.mapping.1.filter.tokenATR=
+mappingResolver.enrollMappingResolver.mapping.1.filter.tokenCUID.end=
+mappingResolver.enrollMappingResolver.mapping.1.filter.tokenCUID.start=
+mappingResolver.enrollMappingResolver.mapping.1.filter.tokenType=soKey
+mappingResolver.enrollMappingResolver.mapping.1.target.tokenType=soKey
+mappingResolver.enrollMappingResolver.mapping.2.filter.appletMajorVersion=
+mappingResolver.enrollMappingResolver.mapping.2.filter.appletMinorVersion=
+mappingResolver.enrollMappingResolver.mapping.2.filter.tokenATR=
+mappingResolver.enrollMappingResolver.mapping.2.filter.tokenCUID.end=
+mappingResolver.enrollMappingResolver.mapping.2.filter.tokenCUID.start=
+mappingResolver.enrollMappingResolver.mapping.2.filter.tokenType=
+mappingResolver.enrollMappingResolver.mapping.2.target.tokenType=userKey
+mappingResolver.enrollMappingResolver.mapping.order=0,1,2
+mappingResolver.formatMappingResolver.class_id=filterMappingResolverImpl
+mappingResolver.formatMappingResolver.mapping.0.filter.appletMajorVersion=
+mappingResolver.formatMappingResolver.mapping.0.filter.appletMinorVersion=
+mappingResolver.formatMappingResolver.mapping.0.filter.tokenATR=
+mappingResolver.formatMappingResolver.mapping.0.filter.tokenCUID.end=
+mappingResolver.formatMappingResolver.mapping.0.filter.tokenCUID.start=
+mappingResolver.formatMappingResolver.mapping.0.filter.tokenType=soCleanUserToken
+mappingResolver.formatMappingResolver.mapping.0.target.tokenType=soCleanUserToken
+mappingResolver.formatMappingResolver.mapping.1.filter.appletMajorVersion=
+mappingResolver.formatMappingResolver.mapping.1.filter.appletMinorVersion=
+mappingResolver.formatMappingResolver.mapping.1.filter.tokenATR=
+mappingResolver.formatMappingResolver.mapping.1.filter.tokenCUID.end=
+mappingResolver.formatMappingResolver.mapping.1.filter.tokenCUID.start=
+mappingResolver.formatMappingResolver.mapping.1.filter.tokenType=soUserKey
+mappingResolver.formatMappingResolver.mapping.1.target.tokenType=soUserKey
+mappingResolver.formatMappingResolver.mapping.2.filter.appletMajorVersion=
+mappingResolver.formatMappingResolver.mapping.2.filter.appletMinorVersion=
+mappingResolver.formatMappingResolver.mapping.2.filter.tokenATR=
+mappingResolver.formatMappingResolver.mapping.2.filter.tokenCUID.end=
+mappingResolver.formatMappingResolver.mapping.2.filter.tokenCUID.start=
+mappingResolver.formatMappingResolver.mapping.2.filter.tokenType=soKey
+mappingResolver.formatMappingResolver.mapping.2.target.tokenType=soKey
+mappingResolver.formatMappingResolver.mapping.3.filter.appletMajorVersion=
+mappingResolver.formatMappingResolver.mapping.3.filter.appletMinorVersion=
+mappingResolver.formatMappingResolver.mapping.3.filter.tokenATR=
+mappingResolver.formatMappingResolver.mapping.3.filter.tokenCUID.end=
+mappingResolver.formatMappingResolver.mapping.3.filter.tokenCUID.start=
+mappingResolver.formatMappingResolver.mapping.3.filter.tokenType=userKey
+mappingResolver.formatMappingResolver.mapping.3.target.tokenType=userKey
+mappingResolver.formatMappingResolver.mapping.4.filter.appletMajorVersion=
+mappingResolver.formatMappingResolver.mapping.4.filter.appletMinorVersion=
+mappingResolver.formatMappingResolver.mapping.4.filter.tokenATR=
+mappingResolver.formatMappingResolver.mapping.4.filter.tokenCUID.end=
+mappingResolver.formatMappingResolver.mapping.4.filter.tokenCUID.start=
+mappingResolver.formatMappingResolver.mapping.4.filter.tokenType=soCleanSOToken
+mappingResolver.formatMappingResolver.mapping.4.target.tokenType=soCleanSOToken
+mappingResolver.formatMappingResolver.mapping.5.filter.appletMajorVersion=
+mappingResolver.formatMappingResolver.mapping.5.filter.appletMinorVersion=
+mappingResolver.formatMappingResolver.mapping.5.filter.tokenATR=
+mappingResolver.formatMappingResolver.mapping.5.filter.tokenCUID.end=
+mappingResolver.formatMappingResolver.mapping.5.filter.tokenCUID.start=
+mappingResolver.formatMappingResolver.mapping.5.filter.tokenType=cleanToken
+mappingResolver.formatMappingResolver.mapping.5.target.tokenType=cleanToken
+mappingResolver.formatMappingResolver.mapping.6.filter.appletMajorVersion=
+mappingResolver.formatMappingResolver.mapping.6.filter.appletMinorVersion=
+mappingResolver.formatMappingResolver.mapping.6.filter.tokenATR=
+mappingResolver.formatMappingResolver.mapping.6.filter.tokenCUID.end=
+mappingResolver.formatMappingResolver.mapping.6.filter.tokenCUID.start=
+mappingResolver.formatMappingResolver.mapping.6.target.tokenType=tokenKey
+mappingResolver.formatMappingResolver.mapping.order=0,1,2,3,4,5,6
+mappingResolver.pinResetMappingResolver.class_id=filterMappingResolverImpl
+mappingResolver.pinResetMappingResolver.mapping.0.filter.appletMajorVersion=
+mappingResolver.pinResetMappingResolver.mapping.0.filter.appletMinorVersion=
+mappingResolver.pinResetMappingResolver.mapping.0.filter.tokenATR=
+mappingResolver.pinResetMappingResolver.mapping.0.filter.tokenCUID.end=
+mappingResolver.pinResetMappingResolver.mapping.0.filter.tokenCUID.start=
+mappingResolver.pinResetMappingResolver.mapping.0.filter.tokenType=
+mappingResolver.pinResetMappingResolver.mapping.0.target.tokenType=userKey
+mappingResolver.pinResetMappingResolver.mapping.order=0
 registry.file=[PKI_INSTANCE_PATH]/conf/tps/registry.cfg
 selftests._000=##
 selftests._001=## Self Tests
@@ -1810,7 +1810,7 @@ target.Generals.displayname=General
 target.Generals.pattern=^applet\..*\|^general\..*\|^failover.pod.enable\|^channel\..*
 target.Profile_Mappings.displayname=Token Profile Mapping Resolvers
 target.Profile_Mappings.list=enrollMappingResolver,formatMappingResolver,pinResetMappingResolver
-target.Profile_Mappings.pattern=tokenProfileResolver\.$name\.mapping\..*
+target.Profile_Mappings.pattern=mappingResolver\.$name\.mapping\..*
 target.Profiles.displayname=Token Profile
 target.Profiles.list=userKey,soKey,soCleanUserToken,soUserKey,cleanToken,soCleanSoToken,tokenKey
 target.Profiles.pattern=op\..*\.$name\..*
diff --git a/base/tps/shared/conf/registry.cfg b/base/tps/shared/conf/registry.cfg
index dc26ae861..4315b2f3f 100644
--- a/base/tps/shared/conf/registry.cfg
+++ b/base/tps/shared/conf/registry.cfg
@@ -1,5 +1,5 @@
-types=tpsTokenProfileResolver
-tpsTokenProfileResolver.ids=mappingTokenProfileResolverImpl
-tpsTokenProfileResolver.mappingTokenProfileResolverImpl.class=org.dogtagpki.server.tps.profile.MappingTokenProfileResolver
-tpsTokenProfileResolver.mappingTokenProfileResolverImpl.desc=Mapping-based Token profile resolver
-tpsTokenProfileResolver.mappingTokenProfileResolverImpl.name=Mapping-based Token profile resolver
+types=tpsMappingResolver
+tpsMappingResolver.ids=filterMappingResolverImpl
+tpsMappingResolver.filterMappingResolverImpl.class=org.dogtagpki.server.tps.mapping.FilterMappingResolver
+tpsMappingResolver.filterMappingResolverImpl.desc=filter-based Token mapping resolver
+tpsMappingResolver.filterMappingResolverImpl.name=filter-based Token mapping resolver