Skip to content
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] Split Elytron SSL into its own subsystem and layer #2

Closed
Closed
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
6465a7e
Subsystem Template
nekdozjam May 13, 2022
67bc79e
Template refactor
nekdozjam Jun 3, 2022
8bfe3a4
WIP
nekdozjam Jun 29, 2022
8da7871
[WFCORE-5729] import, modify deps for SSLContextDefinitions
jessicarod7 Jul 6, 2022
2dc8ee7
[WFCORE-5279] updating ServiceBuilders and deps for SSLContextDefinit…
jessicarod7 Jul 7, 2022
95222b5
[WFCORE-5279] remove wildcard imports, update start() exception
jessicarod7 Jul 8, 2022
01bfaa4
[WFCORE-5279] add LocalDescriptions.properties
jessicarod7 Jul 9, 2022
82a6970
[WFCORE-5279] created XML parser
jessicarod7 Jul 11, 2022
4fdb9d2
[WFCORE-5279] update filepaths for licenses
jessicarod7 Jul 11, 2022
57472fd
[WFCORE-5279] Readd elytron-tls-dependency to build
jessicarod7 Jul 13, 2022
1ac9b50
[WFCORE-5279] add missing parts of serverOrHostController determination
jessicarod7 Jul 18, 2022
7cd9549
[WFCORE-5279] comment out manager objects temporarily
jessicarod7 Jul 19, 2022
88ccc12
[WFCORE-5279] add some providers, revocation attributes, responder ke…
jessicarod7 Jul 19, 2022
0f74a41
[WFCORE-5279] add method for creating suppliers, working on creating …
jessicarod7 Jul 19, 2022
6b1ed93
[WFCORE-5279] updated ssl context def to use one service builder type
jessicarod7 Jul 20, 2022
65e057d
[WFCORE-5279] add security properties and providers, convert to Service
jessicarod7 Jul 20, 2022
911da15
[WFCORE-5279] add expression resolver and credential stores
jessicarod7 Jul 22, 2022
2b326d3
[WFCORE-5279] add custom supplier class, successfully creates server-…
jessicarod7 Jul 25, 2022
0cad9a1
[WFCORE-5279] add utility test classes, rename test package
jessicarod7 Jul 27, 2022
2211056
[WFCORE-5279] reorganize and add deps for test cases
jessicarod7 Jul 28, 2022
edd7e69
[WFCORE-5279] working on integration and regular test config
jessicarod7 Jul 28, 2022
8f4b26c
[WFCORE-5279] configured TlsTestCase, added client & default-ssl-context
jessicarod7 Jul 28, 2022
c7df446
[WFCORE-5279] Refactored TlsTestCase, updated Elytron to 1.20 snapshots
jessicarod7 Aug 2, 2022
945b88d
[WFCORE-5279] Updated TestEnvironment and Subsystem test case
jessicarod7 Aug 3, 2022
842f7c4
[WFCORE-5279] Verifying test cases, updated import order
jessicarod7 Aug 9, 2022
0c06d64
[WFCORE-5279] Restored parser structure, added WIP key store and mana…
jessicarod7 Aug 10, 2022
77d9811
[WFCORE-5279] Fixed attribute defs; restored naming of references
jessicarod7 Aug 10, 2022
4bdec66
[WFCORE-5279] Verified XSD, most definitions; added VS Code files to …
jessicarod7 Aug 15, 2022
3b61ebe
[WFCORE-5279] added self-signed certs, expression test case
jessicarod7 Aug 18, 2022
22ea044
[WFCORE-5279] Update manager defs, basic subsystem complete
jessicarod7 Aug 19, 2022
f7b100e
[WFCORE-5279] Add Certificate Authorities (Accounts)
jessicarod7 Aug 19, 2022
845aff5
[WFCORE-5279] Remove duplicate layer, update feature-pack dependencies
jessicarod7 Aug 22, 2022
18ad20b
[WFCORE-5279] Add feature pack modules
jessicarod7 Aug 22, 2022
4f62625
[WFCORE-5279] Updated feature-pack modules
jessicarod7 Aug 24, 2022
e4b8b06
[WFCORE-5279] Update deps, create new feature group
jessicarod7 Aug 25, 2022
ea46ac2
[WFCORE-5279] commented out keystore/manager objects, added missing c…
jessicarod7 Aug 26, 2022
f5b3e54
[WFCORE-5279] Add missing deps, correct capability names
jessicarod7 Sep 2, 2022
14f0987
[WFCORE-5279] Correct subsystem name for test cases
jessicarod7 Sep 2, 2022
49f1063
[WFCORE-5279] Start proper Service API update, see CertAuthAcctDef
jessicarod7 Sep 9, 2022
9a8aaa5
[WFCORE-5279] KeyStoreService new API, add missing deployment processors
jessicarod7 Sep 12, 2022
94a5679
[WFCORE-5279] Add executors for new MSC API
jessicarod7 Sep 20, 2022
69089d7
[WFCORE-5279] Refactored elytron-tls value executor
jessicarod7 Sep 20, 2022
fe9a7e8
[WFCORE-5279] Completed basic runtime service planning
jessicarod7 Sep 22, 2022
a61f749
[WFCORE-5279] started impl of RuntimeServiceProvider
jessicarod7 Sep 22, 2022
4a3b0cf
[WFCORE-5279] Finalizing structure of servive runtime supplier
jessicarod7 Sep 23, 2022
9b386dc
[WFCORE-5279] Completed RuntimeServiceSupplier
jessicarod7 Sep 23, 2022
4163630
[WFCORE-5279] Fixes to handling of runtime params
jessicarod7 Sep 27, 2022
fb297a3
[WFCORE-5279] Added functions for KeyStoreService
jessicarod7 Sep 27, 2022
5e3168b
[WFCORE-5279] Moved runtime methods to new class
jessicarod7 Sep 28, 2022
48486cb
[WFCORE-5279] Complete Service update for KeyStore
jessicarod7 Sep 29, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 150 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
name: Galleon Pack Template Java CI

on: [push, pull_request]

jobs:
# This just runs mvn install like a user would on cloning the repository
raw:
name: Normal checkout

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-

- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: Build and Test
run: |
mvn --version
mvn -B install

- name: Zip Artifacts
run: zip -R artifacts.zip 'server.log' 'surefire-reports/*.txt' 'surefire-reports/*.xml'

- uses: actions/upload-artifact@v1
with:
# Expressions in the name don't seem to get resolved
#name: ci-artifacts-galleon-template-raw-{{job.container.id}}
name: ci-artifacts-galleon-template-raw
path: artifacts.zip


wildfly-master:
# This adjusts the build to use the versions from wildfly master
name: Against WildFly master

runs-on: ubuntu-latest

steps:
- name: Checkout feature pack
uses: actions/checkout@v2
with:
path: main

- name: Checkout wildfly master
uses: actions/checkout@v2
with:
repository: wildfly/wildfly
path: wildfly-master

- uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-

- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: Initialise Feature Pack version
# Needed to download everything from Maven to not pollute the output in the next steps
run:
mvn help:evaluate -Dexpression=project.version -pl .
working-directory: main

- name: Set FEATURE_PACK_VERSION
run: |
TMP="$(mvn help:evaluate -Dexpression=project.version -pl . | grep -v '^\[')"
echo "FEATURE_PACK_VERSION=${TMP}" >> $GITHUB_ENV
echo "TMP ${TMP}"
working-directory: main

- name: Initialise WildFly versions
# Needed to download everything from Maven to not pollute the output in the next steps
run: |
mvn -B help:evaluate -Dexpression=project.version -pl .
mvn -B help:evaluate -Dexpression=version.org.wildfly.core -pl .
working-directory: wildfly-master

- name: Set WILDFLY_VERSION
run: |
TMP="$(mvn help:evaluate -Dexpression=project.version -pl . | grep -v '^\[')"
echo "WILDFLY_VERSION=${TMP}" >> $GITHUB_ENV
working-directory: wildfly-master

- name: Set WILDFLY_CORE_VERSION
run: |
TMP="$(mvn help:evaluate -Dexpression=version.org.wildfly.core -pl . | grep -v '^\[')"
echo "WILDFLY_CORE_VERSION=${TMP}" >> $GITHUB_ENV
working-directory: wildfly-master

- name: Show read versions
run: |
echo "Feature pack version ${FEATURE_PACK_VERSION}"
echo "WildFly version ${WILDFLY_VERSION}"
echo "WildFly Core version ${WILDFLY_CORE_VERSION}"

- name: Build WildFly master
run: mvn -B install -DskipTests
working-directory: wildfly-master

- name: Build and Test
run: |
mvn --version
mvn -B install -Dversion.org.wildfly=${WILDFLY_VERSION} -Dversion.org.wildfly.core=${WILDFLY_CORE_VERSION}
working-directory: main

- name: Calculate directories to check
run: |
SRV_DIR="build/target/wildfly-${WILDFLY_VERSION}-template-${FEATURE_PACK_VERSION}"
echo "BUILD_SERVER_DIR=${SRV_DIR}" >> $GITHUB_ENV
MODULES_BASE="${SRV_DIR}/modules/system/layers/base"
echo "UNDERTOW_MODULE_XML=${MODULES_BASE}/org/wildfly/extension/undertow/main/module.xml" >> $GITHUB_ENV
echo "CONTROLLER_MODULE_XML=${MODULES_BASE}/org/jboss/as/controller/main/module.xml" >> $GITHUB_ENV

- name: Check versions
run: |
if grep -q org.wildfly:wildfly-undertow:${WILDFLY_VERSION} "${UNDERTOW_MODULE_XML}" && grep -q org.wildfly.core:wildfly-controller:${WILDFLY_CORE_VERSION} "${CONTROLLER_MODULE_XML}"; then
echo "Versions in module.xml files as expected!"
else
echo "Versions in module.xml files not as expected!"
"Expected WildFly version '${WILDFLY_VERSION}' and Core version '${WILDFLY_CORE_VERSION}'"
echo "Showing contents of ${UNDERTOW_MODULE_XML} and ${CONTROLLER_MODULE_XML}"
echo "Exiting..."
exit 1
fi
working-directory: main

- name: Zip Artifacts
run: zip -R artifacts.zip 'server.log' 'surefire-reports/*.txt' 'surefire-reports/*.xml'
working-directory: main

- uses: actions/upload-artifact@v1
with:
# Expressions in the name don't seem to get resolved
#name: ci-artifacts-galleon-template-wf-master-{{job.container.id}}
name: ci-artifacts-galleon-template-wf-master
path: main/artifacts.zip
65 changes: 65 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# ignore .svn metadata files
.svn
# ignore Maven generated target folders
~
target
# ignore downloaded maven
/tools/maven
/tools/maven.zip
/tools/wrapper
# ignore eclipse files
.project
.classpath
.settings
.metadata
.checkstyle
# ignore m2e annotation processing files
.factorypath
# ignore IDEA files
*.iml
*.ipr
*.iws
.idea
# ignore NetBeans files
nbactions.xml
nb-configuration.xml
catalog.xml
#
maven-ant-tasks.jar
test-output
transaction.log
# ignore VS Code files
.vscode/
# vim files
*.swp
/.gitk-tmp.*
atlassian-ide-plugin.xml
# temp files
*~
# maven versions plugin
pom.xml.versionsBackup
# hprof dumps
/*.hprof
# ignore 'randomly' strewn around logs
server.log
# ignore java crashes
hs_err_pid*.log
# H2 databases produced by tests
*.h2.db
# JBoss transaction generated files
PutObjectStoreDirHere
# ignore mvn-rpmbuild repo
/.m2
# ignore eap repo
local-repo-eap
# ignore the build metadata created by the build metadata plugin
build.metadata
#These keep hanging around
arquillian/*/server.log*
client/shade/dependency-reduced-pom.xml

#OS X stuff
.DS_Store

# Zanata files
**/.zanata-cache/
Loading