ISPN-12617 Transport Security #9511
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tristantarrant
force-pushed
the
ISPN-12617/transport_security
branch
from
61b6549
to
2c99244
Compare
pruivo
reviewed
Sep 8, 2021
core/src/main/java/org/infinispan/configuration/parsing/ConfigurationBuilderHolder.java
Outdated
Show resolved
Hide resolved
core/src/main/java/org/infinispan/configuration/parsing/Attribute.java
Outdated
Show resolved
Hide resolved
| @@ -667,6 +677,11 @@ private void buildChannel() { | |||
| throw CLUSTER.errorCreatingChannelFromConfigFile(DEFAULT_JGROUPS_CONFIGURATION_FILE, e); | |||
| } | |||
| } | |||
|
|
|||
| if (props.containsKey(SOCKET_FACTORY)) { | |||
There was a problem hiding this comment.
I believe this is overwriting the SocketFactory set in line 620.
There was a problem hiding this comment.
Fixed. I really would like to avoid the silly Transport abstraction we have and use a proper configuration object to pass things to the JGroupsTransport
core/src/main/resources/default-configs/default-jgroups-tcp.xml
Outdated
Show resolved
Hide resolved
...er/runtime/src/main/java/org/infinispan/server/configuration/ServerConfigurationBuilder.java
Outdated
Show resolved
Hide resolved
...c/main/java/org/infinispan/server/configuration/security/TransportSecurityConfiguration.java
Outdated
Show resolved
Hide resolved
| @@ -1596,4 +1596,13 @@ | |||
| <xs:complexType name="security-realm-trust"> | |||
| <xs:attribute type="xs:string" name="name"/> | |||
| </xs:complexType> | |||
|
|
|||
| <xs:attribute name="security-realm" type="xs:string"> | |||
There was a problem hiding this comment.
I believe this is not supposed to be here, right?
There was a problem hiding this comment.
Yes it is. The security-realm is in the server namespace but it applies to the transport which is declared in the infinispan-config schema (look for <xs:anyAttribute/>)
tristantarrant
force-pushed
the
ISPN-12617/transport_security
branch
from
2c99244
to
bcb36d5
Compare
pruivo
reviewed
Sep 16, 2021
server/runtime/src/main/java/org/infinispan/server/configuration/ServerConfigurationParser.java
Outdated
Show resolved
Hide resolved
tristantarrant
force-pushed
the
ISPN-12617/transport_security
branch
3 times, most recently
from
ea69393
to
c879e14
Compare
|
@pruivo updated with the JGroups |
pruivo
reviewed
Sep 20, 2021
| throw ParseUtils.unexpectedAttribute(reader, attributeName); | ||
| } | ||
| } else { | ||
| throw ParseUtils.unexpectedAttribute(reader, attributeIndex); |
There was a problem hiding this comment.
should be element and not attribute.
Suggested change
| throw ParseUtils.unexpectedAttribute(reader, attributeIndex); | |
| throw ParseUtils.unexpectedElement(reader, org.infinispan.configuration.parsing.Element.forName(elementName)); |
pruivo
reviewed
Sep 20, 2021
| </xs:attribute> | ||
| <xs:attribute name="cluster" type="xs:string"> | ||
| <xs:annotation> | ||
| <xs:documentation>Defines the name for the underlying group communication cluster. If unspecified, the default-cluster name will be used.</xs:documentation> |
There was a problem hiding this comment.
if not specified, remote-sites.cluster will be used.
tristantarrant
force-pushed
the
ISPN-12617/transport_security
branch
from
c879e14
to
613c7da
Compare
pruivo
approved these changes
Sep 20, 2021
|
integrated! thanks @tristantarrant ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.redhat.com/browse/ISPN-12617