Skip to content

Commit dbff68b

Browse files
baranowbbaranowb
committed
[WFCORE-5744] Bump elytron community schema at to 19
1 parent 27e1e38 commit dbff68b

6 files changed

Lines changed: 6926 additions & 3 deletions

File tree

‎elytron/src/main/java/org/wildfly/extension/elytron/ElytronExtension.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ public class ElytronExtension implements Extension {
7676
static final ModelVersion ELYTRON_17_0_0 = ModelVersion.create(17);
7777
static final ModelVersion ELYTRON_18_0_0 = ModelVersion.create(18);
7878
static final ModelVersion ELYTRON_19_0_0 = ModelVersion.create(19);
79+
static final ModelVersion ELYTRON_20_0_0 = ModelVersion.create(20);
7980

80-
private static final ModelVersion ELYTRON_CURRENT = ELYTRON_19_0_0;
81+
private static final ModelVersion ELYTRON_CURRENT = ELYTRON_20_0_0;
8182

8283
static final String ISO_8601_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
8384

‎elytron/src/main/java/org/wildfly/extension/elytron/ElytronSubsystemSchema.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ public enum ElytronSubsystemSchema implements PersistentSubsystemSchema<ElytronS
5555
VERSION_18_0(18),
5656
VERSION_18_0_COMMUNITY(18, Stability.COMMUNITY),
5757
VERSION_19_0(19),
58+
VERSION_19_0_COMMUNITY(19, Stability.COMMUNITY),
5859
;
59-
static final Map<Stability, ElytronSubsystemSchema> CURRENT = Feature.map(EnumSet.of(VERSION_19_0));
60+
static final Map<Stability, ElytronSubsystemSchema> CURRENT = Feature.map(EnumSet.of(VERSION_19_0, VERSION_19_0_COMMUNITY));
6061

6162
private final VersionedNamespace<IntVersion, ElytronSubsystemSchema> namespace;
6263

@@ -193,7 +194,9 @@ private void addCredentialStoreParser(PersistentResourceXMLDescription.Persisten
193194

194195
private void addTlsParser(PersistentResourceXMLDescription.PersistentResourceXMLBuilder builder) {
195196
TlsParser tlsParser = new TlsParser();
196-
if (this.since(ElytronSubsystemSchema.VERSION_19_0)) {
197+
if (this.since(ElytronSubsystemSchema.VERSION_19_0_COMMUNITY)) {
198+
builder.addChild(tlsParser.tlsParserCommunity_19_0);
199+
} else if (this.since(ElytronSubsystemSchema.VERSION_19_0)) {
197200
builder.addChild(tlsParser.tlsParser_19_0);
198201
} else if (this.since(ElytronSubsystemSchema.VERSION_18_0_COMMUNITY) && this.enables(getDynamicClientSSLContextDefinition())) {
199202
builder.addChild(tlsParser.tlsParserCommunity_18_0);

‎elytron/src/main/java/org/wildfly/extension/elytron/ElytronSubsystemTransformers.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import static org.wildfly.extension.elytron.ElytronExtension.ELYTRON_17_0_0;
5656
import static org.wildfly.extension.elytron.ElytronExtension.ELYTRON_18_0_0;
5757
import static org.wildfly.extension.elytron.ElytronExtension.ELYTRON_19_0_0;
58+
import static org.wildfly.extension.elytron.ElytronExtension.ELYTRON_20_0_0;
5859
import static org.wildfly.extension.elytron.ElytronExtension.ELYTRON_1_2_0;
5960
import static org.wildfly.extension.elytron.ElytronExtension.ELYTRON_2_0_0;
6061
import static org.wildfly.extension.elytron.ElytronExtension.ELYTRON_3_0_0;
@@ -106,6 +107,7 @@ public String getSubsystemName() {
106107
public void registerTransformers(SubsystemTransformerRegistration registration) {
107108
ChainedTransformationDescriptionBuilder chainedBuilder = TransformationDescriptionBuilder.Factory.createChainedSubystemInstance(registration.getCurrentSubsystemVersion());
108109

110+
from20(chainedBuilder);
109111
// 19.0.0 (WildFly 32) to 18.0.0 (WildFly 29)
110112
from19(chainedBuilder);
111113
// 18.0.0 (WildFly 29) to 17.0.0 (WildFly 28)
@@ -149,6 +151,18 @@ public void registerTransformers(SubsystemTransformerRegistration registration)
149151
ELYTRON_8_0_0, ELYTRON_7_0_0, ELYTRON_6_0_0, ELYTRON_5_0_0, ELYTRON_4_0_0, ELYTRON_3_0_0, ELYTRON_2_0_0, ELYTRON_1_2_0 });
150152
}
151153

154+
private static void from20(ChainedTransformationDescriptionBuilder chainedBuilder) {
155+
ResourceTransformationDescriptionBuilder builder = chainedBuilder.createBuilder(ELYTRON_20_0_0, ELYTRON_19_0_0);
156+
157+
builder.addChildResource(PathElement.pathElement(ElytronDescriptionConstants.KEY_STORE))
158+
.getAttributeBuilder()
159+
.addRejectCheck(RejectAttributeChecker.DEFINED, ElytronDescriptionConstants.EXPIRATION_CHECK_DELAY)
160+
.setDiscard(DiscardAttributeChecker.UNDEFINED, ElytronDescriptionConstants.EXPIRATION_CHECK_DELAY)
161+
.addRejectCheck(RejectAttributeChecker.DEFINED, ElytronDescriptionConstants.EXPIRATION_WATERMARK)
162+
.setDiscard(DiscardAttributeChecker.UNDEFINED, ElytronDescriptionConstants.EXPIRATION_WATERMARK)
163+
.end();
164+
}
165+
152166
private static void from19(ChainedTransformationDescriptionBuilder chainedBuilder) {
153167
ResourceTransformationDescriptionBuilder builder = chainedBuilder.createBuilder(ELYTRON_19_0_0, ELYTRON_18_0_0);
154168

‎elytron/src/main/java/org/wildfly/extension/elytron/TlsParser.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,19 @@ class TlsParser {
8585
.addAttribute(FileAttributeDefinitions.RELATIVE_TO)
8686
;
8787

88+
private PersistentResourceXMLBuilder keyStoreParserCommunity_19_0 = PersistentResourceXMLDescription.builder(PathElement.pathElement(KEY_STORE))
89+
.addAttribute(KeyStoreDefinition.TYPE)
90+
.addAttribute(KeyStoreDefinition.PROVIDER_NAME)
91+
.addAttribute(KeyStoreDefinition.PROVIDERS)
92+
.addAttribute(KeyStoreDefinition.CREDENTIAL_REFERENCE)
93+
.addAttribute(KeyStoreDefinition.ALIAS_FILTER)
94+
.addAttribute(KeyStoreDefinition.REQUIRED)
95+
.addAttribute(FileAttributeDefinitions.PATH)
96+
.addAttribute(FileAttributeDefinitions.RELATIVE_TO)
97+
.addAttribute(KeyStoreDefinition.EXPIRATION_CHECK_DELAY)
98+
.addAttribute(KeyStoreDefinition.EXPIRATION_WATERMARK)
99+
;
100+
88101
private PersistentResourceXMLBuilder ldapKeyStoreParser = PersistentResourceXMLDescription.builder(PathElement.pathElement(LDAP_KEY_STORE))
89102
.addAttribute(LdapKeyStoreDefinition.DIR_CONTEXT)
90103
.addAttribute(LdapKeyStoreDefinition.SEARCH_PATH)
@@ -387,4 +400,20 @@ public void marshallSingleElement(AttributeDefinition attribute, ModelNode mappi
387400
.addChild(serverSslSniContextParser)
388401
.addChild(dynamicClientSslContextParser) // new in DEFAULT
389402
.build();
403+
404+
final PersistentResourceXMLDescription tlsParserCommunity_19_0 = decorator(TLS)
405+
.addChild(decorator(KEY_STORES)
406+
.addChild(keyStoreParserCommunity_19_0) // new
407+
.addChild(ldapKeyStoreParser)
408+
.addChild(filteringKeyStoreParser)
409+
)
410+
.addChild(keyManagerParser_12_0)
411+
.addChild(trustManagerParser_14_0)
412+
.addChild(serverSslContextParser_9_0)
413+
.addChild(clientSslContextParser_9_0)
414+
.addChild(certificateAuthorityParser)
415+
.addChild(certificateAuthorityAccountParser)
416+
.addChild(serverSslSniContextParser)
417+
.addChild(dynamicClientSslContextParser) // new in DEFAULT
418+
.build();
390419
}

0 commit comments

Comments
 (0)