-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
WFCORE-5279 #3
base: main
Are you sure you want to change the base?
WFCORE-5279 #3
Conversation
970957d
to
d613775
Compare
a83927a
to
68b2c00
Compare
[WFCORE-5729] import, modify deps for SSLContextDefinitions [WFCORE-5279] updating ServiceBuilders and deps for SSLContextDefinitions [WFCORE-5279] remove wildcard imports, update start() exception
[WFCORE-5279] add LocalDescriptions.properties [WFCORE-5279] created XML parser - Temporarily disabled key/trust manager objects for SSLContext, key store objects for key/trust managers. Acts the same as references.
Project successfully builds as-is
[WFCORE-5279] add missing parts of serverOrHostController determination [WFCORE-5279] comment out manager objects temporarily [WFCORE-5279] add some providers, revocation attributes, responder keystore [WFCORE-5279] add method for creating suppliers, working on creating new service builders [WFCORE-5279] updated ssl context def to use one service builder type [WFCORE-5279] add security properties and providers, convert to Service - Started to convert most components to use Service, as opposed to deprecated Service<T> and InjectedValue<T> [WFCORE-5279] add expression resolver and credential stores [WFCORE-5279] add custom supplier class, successfully creates server-ssl-context
[WFCORE-5279] add utility test classes, rename test package [WFCORE-5279] reorganize and add deps for test cases [WFCORE-5279] working on integration and regular test config [WFCORE-5279] configured TlsTestCase, added client & default-ssl-context [WFCORE-5279] Refactored TlsTestCase, updated Elytron to 1.20 snapshots [WFCORE-5279] Updated TestEnvironment and Subsystem test case [WFCORE-5279] Verifying test cases, updated import order
[WFCORE-5279] Restored parser structure, added WIP key store and manager definitions [WFCORE-5279] Fixed attribute defs; restored naming of references - Manager/keystore objects are now suffixed with "-object", references retain their original naming [WFCORE-5279] Verified XSD, most definitions; added VS Code files to gitignore
[WFCORE-5279] added self-signed certs, expression test case [WFCORE-5279] Update manager defs, basic subsystem complete [WFCORE-5279] Add Certificate Authorities (Accounts)
[WFCORE-5279] Remove duplicate layer, update feature-pack dependencies [WFCORE-5279] Add feature pack modules [WFCORE-5279] Updated feature-pack modules [WFCORE-5279] Update deps, create new feature group - Removed unneeded artifacts for feature packs - Added missing dependencies for WildflyAcmeClient - Created new feature group with full Elytron for early testing - Removed redundant elytron-tls-base feature group
[WFCORE-5279] commented out keystore/manager objects, added missing capability references [WFCORE-5279] Add missing deps, correct capability names [WFCORE-5279] Correct subsystem name for test cases [WFCORE-5279] Correct feature-pack ssl dep, test error codes [WFCORE-5279] Add processor for default SSL context
[WFCORE-5279] Restored original Service API [WFCORE-5279] Add missing test resources, fix XML marshalling
[WFCORE-5279] Update dependency exclusions, services not starting [WFCORE-5279] Refactor deps and test cases, subsystem successfully builds [WFCORE-5279] All tests passing, init build complete - Reorganized integration tests, readded security manager to module.xml
68b2c00
to
81ff3e8
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @cam-rod, I've just done a pass through the build related files and have started with some initial comments. I'm going to do a pass through the Java code next.
* [WildFly 20](https://github.com/wildfly/wildfly-feature-pack-template/tree/wildfly-20) | ||
* [WildFly 23](https://github.com/wildfly/wildfly-feature-pack-template/tree/wildfly-23) | ||
|
||
## Building the Galleon feature pack |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would be good to update the README to include information about building the corresponding Elytron branch before building the elytron-tls branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, will update the README for this project next.
<feature-packs> | ||
<feature-pack> | ||
<groupId>org.wildfly</groupId> | ||
<artifactId>wildfly-galleon-pack</artifactId> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be good to use wildfly-preview-feature-pack
here instead since that's a good place for trying out experimental features.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Haven't looked into it before, from my understanding of the docs it acts as a basis for a Preview Galleon installation and also will attempt to update APIs to jakarta.*
?
I can give it a try and see if any issues pop up. Also a next step in general would be moving to Jakarta EE dependencies.
dependency/src/main/java/org/wildfly/feature/pack/elytron/tls/dependency/ExampleProducer.java
Outdated
Show resolved
Hide resolved
<version.org.wildfly.component.matrix>26.1.1.Final</version.org.wildfly.component.matrix> | ||
<version.org.wildfly.core>18.1.1.Final</version.org.wildfly.core> | ||
<version.org.wildfly.common>1.6.0.Final</version.org.wildfly.common> | ||
<version.org.wildfly.security.elytron>1.20.1.CR1-SNAPSHOT</version.org.wildfly.security.elytron> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since WildFly Core / WildFly now rely on Elytron 2.x, it would be good to look at porting the Elytron changes from 1.x to 2.x so that the Elytron and WildFly versions here can be updated.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sounds good, will be part of the second set of updates
<version.org.jboss.arquillian.junit>1.6.0.Final</version.org.jboss.arquillian.junit> | ||
<version.org.jboss.galleon>4.2.8.Final</version.org.jboss.galleon> | ||
<version.org.jmockit>1.39</version.org.jmockit> | ||
<version.org.mockserver>5.8.1</version.org.mockserver> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since the versions in this file were likely initially determined when Martin was working on this, would be good to check the versions to make sure they align with WildFly now.
example/src/main/java/org/wildfly/extension/feature/pack/elytron/tls/example/JaxRsResource.java
Outdated
Show resolved
Hide resolved
@cam-rod Was just trying manually and noticed that the server ssl context cannot be added:
I am not sure why yet since you seem to have module org.wildfly.security.elytron-base as dependency. EDIT: I misread, the elytron-tls module has dependency on elytron-base but elytron-tls-dependency does not |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just adding some initial comments from a first pass through the Java code. Will take a closer look at the SSL context related code next.
...a/org/wildfly/extension/elytron/tls/subsystem/AbstractCredentialStoreResourceDefinition.java
Outdated
Show resolved
Hide resolved
subsystem/src/main/java/org/wildfly/extension/elytron/tls/subsystem/AcmeAccountService.java
Outdated
Show resolved
Hide resolved
subsystem/src/main/java/org/wildfly/extension/elytron/tls/subsystem/Capabilities.java
Outdated
Show resolved
Hide resolved
subsystem/src/main/java/org/wildfly/extension/elytron/tls/subsystem/Capabilities.java
Outdated
Show resolved
Hide resolved
subsystem/src/main/java/org/wildfly/extension/elytron/tls/subsystem/Constants.java
Outdated
Show resolved
Hide resolved
...stem/src/main/java/org/wildfly/extension/elytron/tls/subsystem/ExpressionResolverParser.java
Outdated
Show resolved
Hide resolved
subsystem/src/main/java/org/wildfly/extension/elytron/tls/subsystem/SSLContextDefinitions.java
Outdated
Show resolved
Hide resolved
subsystem/src/main/java/org/wildfly/extension/elytron/tls/subsystem/SSLContextDefinitions.java
Outdated
Show resolved
Hide resolved
subsystem/src/main/java/org/wildfly/extension/elytron/tls/subsystem/SSLContextDefinitions.java
Outdated
Show resolved
Hide resolved
subsystem/src/main/java/org/wildfly/extension/elytron/tls/subsystem/SSLContextDefinitions.java
Outdated
Show resolved
Hide resolved
subsystem/src/main/java/org/wildfly/extension/elytron/tls/subsystem/SSLContextDefinitions.java
Outdated
Show resolved
Hide resolved
subsystem/src/main/java/org/wildfly/extension/elytron/tls/subsystem/SSLContextDefinitions.java
Outdated
Show resolved
Hide resolved
subsystem/src/main/java/org/wildfly/extension/elytron/tls/subsystem/SSLContextDefinitions.java
Outdated
Show resolved
Hide resolved
subsystem/src/main/java/org/wildfly/extension/elytron/tls/subsystem/SSLContextDefinitions.java
Outdated
Show resolved
Hide resolved
...rc/main/java/org/wildfly/extension/elytron/tls/subsystem/SecurityPropertiesWriteHandler.java
Outdated
Show resolved
Hide resolved
...em/src/main/java/org/wildfly/extension/elytron/tls/subsystem/_private/WildFlyAcmeClient.java
Outdated
Show resolved
Hide resolved
...rc/main/java/org/wildfly/extension/elytron/tls/subsystem/deployment/DependencyProcessor.java
Outdated
Show resolved
Hide resolved
subsystem/src/main/resources/schema/wildfly-credential-reference_1_1.xsd
Show resolved
Hide resolved
subsystem/src/test/java/org/wildfly/extension/elytron/tls/subsystem/JdkUtils.java
Outdated
Show resolved
Hide resolved
@Skyllarr Right, not surprising since |
.../main/resources/modules/system/layers/base/org/wildfly/extension/elytron-tls/main/module.xml
Outdated
Show resolved
Hide resolved
I see. And yes, the above command is working now and server ssl context can be added. |
subsystem/src/main/java/org/wildfly/extension/elytron/tls/SSLContextDefinitions.java
Show resolved
Hide resolved
fa11cba
to
4093609
Compare
Definition files cannot currently be removed since they are not available in Maven. Will need to modify WFCORE.
4093609
to
38da5b0
Compare
PoC for elytron-tls-subsystem. Will derive from changes in ELY-2084 of wildfly-elytron. Continuing from #2.
Related issues:
https://issues.redhat.com/browse/WFCORE-5279
https://issues.redhat.com/browse/ELY-2084
https://issues.redhat.com/browse/EAP7-1564