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.

Sign up for GitHub

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

Jump to bottom

EAP7 2183 signature verification #763

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

EAP7 2183 signature verification #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d7742ba
Upgrade wildfly-channels
spyrkob Sep 12, 2024
864616a
Adding bouncycastle and gpg-validator dependencies
spyrkob Sep 12, 2024
4250f3a
Implementation of PGP store
spyrkob Sep 12, 2024
b06b6de
Adding certificate store operations
spyrkob Sep 12, 2024
2868001
Add Console operation to confirm signature
spyrkob Sep 12, 2024
2f45fc4
Support signatures when provisioning a server
spyrkob Sep 12, 2024
474ceba
Support signatures when updating a server
spyrkob Sep 12, 2024
8a00219
Support signatures when reverting a server
spyrkob Sep 12, 2024
59a53c6
Support server restore with GPG check
spyrkob Sep 12, 2024
1ddb35c
fix for 474ceba19b30802ace370231f55b3c24d919cc4e
spyrkob Oct 11, 2024
d0bcc2b
Add provisioning options to modify the GPG settings
spyrkob Oct 11, 2024
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
1 change: 1 addition & 0 deletions dist/common/src/main/resources/modules/system/layers/base/org/jboss/prospero/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<main-class name="org.wildfly.prospero.cli.CliMain"/>
<resources>
<artifact name="${org.wildfly.channel:channel-core}"/>
<artifact name="${org.wildfly.channel:gpg-validator}"/>
<artifact name="${org.wildfly.channel:maven-resolver}"/>
<artifact name="${org.codehaus.plexus:plexus-interpolation}"/>
<artifact name="${org.codehaus.plexus:plexus-utils}"/>
Expand Down
41 changes: 41 additions & 0 deletions dist/standalone-galleon-pack/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,16 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.wildfly.channel</groupId>
<artifactId>gpg-validator</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.wildfly.channel</groupId>
<artifactId>maven-resolver</artifactId>
Expand All @@ -111,6 +121,37 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
Expand Down
3 changes: 3 additions & 0 deletions ...pack/src/main/resources/modules/system/layers/base/org/jboss/prospero-dep/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
<artifact name="${commons-io:commons-io}"/>
<artifact name="${commons-codec:commons-codec}"/>
<artifact name="${org.apache.commons:commons-lang3}"/>
<artifact name="${org.bouncycastle:bcpg-jdk18on}"/>
<artifact name="${org.bouncycastle:bcprov-jdk18on}"/>
<artifact name="${org.bouncycastle:bcutil-jdk18on}"/>
<artifact name="${org.wildfly.common:wildfly-common}"/>
<artifact name="${org.wildfly.installation-manager:installation-manager-api}"/>
<artifact name="${org.apache.httpcomponents:httpclient}"/>
Expand Down
11 changes: 11 additions & 0 deletions dist/wildfly-galleon-pack/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,17 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.wildfly.channel</groupId>
<artifactId>gpg-validator</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.wildfly.channel</groupId>
<artifactId>maven-resolver</artifactId>
Expand Down
1 change: 1 addition & 0 deletions ...pack/src/main/resources/modules/system/layers/base/org/jboss/prospero-dep/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<dependencies>
<module name="org.apache.commons.io" export="true"/>
<module name="org.apache.commons.codec" export="true"/>
<module name="org.bouncycastle.bcpg" export="true"/>
<module name="com.googlecode.javaewah" export="true"/>
<module name="org.apache.commons.lang3" export="true"/>
<module name="org.apache.httpcomponents.core" export="true"/>
Expand Down
7 changes: 7 additions & 0 deletions integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@
<artifactId>xnio-nio</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.pgpainless</groupId>
<artifactId>pgpainless-core</artifactId>
<version>1.6.1</version>
<scope>test</scope>
</dependency>


</dependencies>

Expand Down
5 changes: 5 additions & 0 deletions integration-tests/src/test/java/org/wildfly/prospero/it/AcceptingConsole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,9 @@ public void buildUpdatesComplete() {
public boolean confirmBuildUpdates() {
return true;
}

@Override
public boolean acceptPublicKey(String key) {
return true;
}
}
2 changes: 1 addition & 1 deletion integration-tests/src/test/java/org/wildfly/prospero/it/commonapi/SimpleProvisionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public void installWildflyCore_ChannelsWithEmptyNamesAreNamed() throws Exception
// make sure the channel names are empty
List<Channel> emptyNameChannels = MetadataTestUtils.readChannels(channelsFile).stream()
.map(c -> new Channel(c.getSchemaVersion(), null, null, null, c.getRepositories(),
c.getManifestCoordinate(), null, null)).collect(Collectors.toList());
c.getManifestCoordinate(), null, null, false, null)).collect(Collectors.toList());
MetadataTestUtils.writeChannels(channelsFile, emptyNameChannels);

final ProvisioningDefinition provisioningDefinition = defaultWfCoreDefinition()
Expand Down
Loading