Skip to content

Commit 5d6f355

Browse files
thanosploumisThanos Ploumis
thanosploumis
and
Thanos Ploumis
authored
AJP connector defaults fixes and typos fixes (#109)
* AJP connector defaults fixes and typos fixes * Remove SecureHttpsConnector actions on other connectors Co-authored-by: Thanos Ploumis <[email protected]>
1 parent 7d82072 commit 5d6f355

File tree

4 files changed

+66
-27
lines changed

4 files changed

+66
-27
lines changed

‎core/src/main/groovy/noe/tomcat/configure/ConnectorAttributesTransformer.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ class ConnectorAttributesTransformer {
169169
if (connector.getSslPassword() != null && !connector.getSslPassword().isEmpty()) {
170170
attributes.put('SSLPassword', connector.getSslPassword())
171171
}
172-
if (connector.getSslEnabledProtocols() != null && connector.getSslEnabledProtocols()) {
172+
if (connector.getSslEnabledProtocols() != null) {
173173
attributes.put('sslEnabledProtocols', connector.getSslEnabledProtocols())
174174
}
175175
// ---------------------

‎core/src/main/groovy/noe/tomcat/configure/ConnectorConfiguratorTomcat.groovy‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ class ConnectorConfiguratorTomcat {
5656
createNewConnector(new ConnectorAttributesTransformer(connector).secureHttpConnector())
5757
}
5858

59-
defineRedirectPorts(connector.getPort())
60-
6159
return server
6260
}
6361

@@ -81,11 +79,6 @@ class ConnectorConfiguratorTomcat {
8179
return server
8280
}
8381

84-
private void defineRedirectPorts(Integer port) {
85-
defineHttpConnector(new NonSecureHttpConnectorTomcat().setRedirectPort(port))
86-
defineAjpConnector(new AjpConnectorTomcat().setRedirectPort(port))
87-
}
88-
8982
private Node loadExistingHttpConnector() {
9083
def connectors = server.Service.Connector.findAll { connector -> hasHttpProtocol(connector) && !isSecured(connector) }
9184
if (connectors.size() == 1) {

‎core/src/main/groovy/noe/tomcat/configure/SecureHttpConnectorTomcat.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public class SecureHttpConnectorTomcat extends ConnectorTomcatAbstract<SecureHtt
127127
}
128128

129129
public String getSslCACertificateFile() {
130-
return this.sslCertificateFile
130+
return this.sslCACertificateFile
131131
}
132132

133133
public String getSslCertificateKeyFile() {

‎testsuite/src/test/groovy/noe/tomcat/BindingsTomcatConfiguratorIT.groovy‎

Lines changed: 64 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue
3131
abstract class BindingsTomcatConfiguratorIT extends TomcatTestAbstract {
3232

3333
@Test
34-
void updateExistingHttpConnectorAllAttribtuesGivenSuccessExpected() {
34+
void updateExistingHttpConnectorAllAttributesGivenSuccessExpected() {
3535
def onlyOneNonSecureConnector = 1
3636
Integer testHttpPort = 18080
3737
def testAddress = "my-test-host"
@@ -108,9 +108,6 @@ abstract class BindingsTomcatConfiguratorIT extends TomcatTestAbstract {
108108
assertEquals testSSLCertificateKeyFile, Server.Service.Connector.find { isSecure(it) }.@SSLCertificateKeyFile.toString()
109109
assertEquals testSSLPassword, Server.Service.Connector.find { isSecure(it) }.@SSLPassword.toString()
110110
assertEquals testScheme, Server.Service.Connector.find { isSecure(it) }.@scheme.toString()
111-
112-
assertEquals testHttpsPort, Integer.valueOf(Server.Service.Connector.find { isNotSecuredHttpProtocol(it) }.@redirectPort.toString())
113-
assertEquals testHttpsPort, Integer.valueOf(Server.Service.Connector.find { isAjpProtocol(it) }.@redirectPort.toString())
114111
}
115112

116113
@Test
@@ -125,12 +122,12 @@ abstract class BindingsTomcatConfiguratorIT extends TomcatTestAbstract {
125122

126123
new TomcatConfigurator(tomcat)
127124
.ajpConnector(new AjpConnectorTomcat()
128-
.setAddress(testAddress)
129-
.setPort(testAjpPort)
130-
.setRedirectPort(testRedirectPort)
131-
.setMaxThreads(testMaxThreads)
132-
.setConnectionTimeout(testConnectionTimeout)
133-
.setScheme(testScheme))
125+
.setAddress(testAddress)
126+
.setPort(testAjpPort)
127+
.setRedirectPort(testRedirectPort)
128+
.setMaxThreads(testMaxThreads)
129+
.setConnectionTimeout(testConnectionTimeout)
130+
.setScheme(testScheme))
134131

135132
GPathResult Server = new XmlSlurper().parse(new File(tomcat.basedir, "conf/server.xml"))
136133
assertEquals onlyOneAjpConnector, Server.Service.Connector.find { isAjpProtocol(it) && !isSecure(it) }.size()
@@ -142,6 +139,33 @@ abstract class BindingsTomcatConfiguratorIT extends TomcatTestAbstract {
142139
assertEquals testScheme, Server.Service.Connector.find { isAjpProtocol(it) }.@scheme.toString()
143140
}
144141

142+
@Test
143+
void createNewAjpConnectorSuccessExpected() {
144+
Integer testAjpPort = 18585
145+
String testProtocol = "AJP/1.3"
146+
Integer testRedirectPort = 18989
147+
Boolean testSecretRequired = true
148+
String testSecret = "mysecret"
149+
String testAllowedRequestAttributesPattern = "customAttributesPattern"
150+
151+
new TomcatConfigurator(tomcat)
152+
.ajpConnector(new AjpConnectorTomcat()
153+
.setPort(testAjpPort)
154+
.setProtocol(testProtocol)
155+
.setRedirectPort(testRedirectPort)
156+
.setSecretRequired(testSecretRequired)
157+
.setSecret(testSecret)
158+
.setAllowedRequestAttributesPattern(testAllowedRequestAttributesPattern))
159+
160+
GPathResult Server = new XmlSlurper().parse(new File(tomcat.basedir, "conf/server.xml"))
161+
assertEquals testAjpPort, Integer.valueOf(Server.Service.Connector.find { isAjpProtocol(it) }.@port.toString())
162+
assertEquals testProtocol, Server.Service.Connector.find { isAjpProtocol(it) }.@protocol.toString()
163+
assertEquals testRedirectPort, Integer.valueOf(Server.Service.Connector.find { isAjpProtocol(it) }.@redirectPort.toString())
164+
assertEquals testSecretRequired, Boolean.valueOf(Server.Service.Connector.find { isAjpProtocol(it) }.@secretRequired.toString())
165+
assertEquals testSecret, Server.Service.Connector.find { isAjpProtocol(it) }.@secret.toString()
166+
assertEquals testAllowedRequestAttributesPattern, Server.Service.Connector.find { isAjpProtocol(it) }.@allowedRequestAttributesPattern.toString()
167+
}
168+
145169
@Test
146170
void updateExistingAjpConnectorOneAttribtueGivenSuccessExpected() {
147171
def onlyOneAjpConnector = 1
@@ -158,6 +182,33 @@ abstract class BindingsTomcatConfiguratorIT extends TomcatTestAbstract {
158182
assertEquals defAttributesCountOfAjpConnector, Server.Service.Connector.find { isAjpProtocol(it) }.attributes().size()
159183
}
160184

185+
@Test
186+
void createNewHttpConnectorSuccessExpected() {
187+
Integer testAjpPort = 18585
188+
String testProtocol = "AJP/1.3"
189+
Integer testRedirectPort = 18989
190+
Boolean testSecretRequired = true
191+
String testSecret = "mysecret"
192+
String testAllowedRequestAttributesPattern = "customAttributesPattern"
193+
194+
new TomcatConfigurator(tomcat)
195+
.ajpConnector(new AjpConnectorTomcat()
196+
.setPort(testAjpPort)
197+
.setProtocol(testProtocol)
198+
.setRedirectPort(testRedirectPort)
199+
.setSecretRequired(testSecretRequired)
200+
.setSecret(testSecret)
201+
.setAllowedRequestAttributesPattern(testAllowedRequestAttributesPattern))
202+
203+
GPathResult Server = new XmlSlurper().parse(new File(tomcat.basedir, "conf/server.xml"))
204+
assertEquals testAjpPort, Integer.valueOf(Server.Service.Connector.find { isAjpProtocol(it) }.@port.toString())
205+
assertEquals testProtocol, Server.Service.Connector.find { isAjpProtocol(it) }.@protocol.toString()
206+
assertEquals testRedirectPort, Integer.valueOf(Server.Service.Connector.find { isAjpProtocol(it) }.@redirectPort.toString())
207+
assertEquals testSecretRequired, Boolean.valueOf(Server.Service.Connector.find { isAjpProtocol(it) }.@secretRequired.toString())
208+
assertEquals testSecret, Server.Service.Connector.find { isAjpProtocol(it) }.@secret.toString()
209+
assertEquals testAllowedRequestAttributesPattern, Server.Service.Connector.find { isAjpProtocol(it) }.@allowedRequestAttributesPattern.toString()
210+
}
211+
161212
@Test
162213
void updateShuddownOneAttribtueGivenSuccessExpected() {
163214
Integer testShutdownPort = 18009
@@ -204,7 +255,7 @@ abstract class BindingsTomcatConfiguratorIT extends TomcatTestAbstract {
204255
Integer shiftedAjpPort = 18009
205256

206257
new TomcatConfigurator(tomcat)
207-
.portOffset(testOffset)
258+
.portOffset(testOffset)
208259

209260
GPathResult Server = new XmlSlurper().parse(new File(tomcat.basedir, "conf/server.xml"))
210261
assertEquals shiftedHttpPort, Integer.valueOf(Server.Service.Connector.find { isNotSecuredHttpProtocol(it) }.@port.toString())
@@ -219,18 +270,16 @@ abstract class BindingsTomcatConfiguratorIT extends TomcatTestAbstract {
219270
int testOffset = 10000
220271
Integer testHttpsPort = 18443
221272

222-
new TomcatConfigurator(tomcat)
273+
TomcatConfigurator tconf = new TomcatConfigurator(tomcat)
223274
.httpsConnector(new SecureHttpConnectorTomcat().setPort(testHttpsPort))
224275
.portOffset(testOffset)
225276

226277
GPathResult Server = new XmlSlurper().parse(new File(tomcat.basedir, "conf/server.xml"))
227-
assertEquals testHttpsPort + testOffset, Integer.valueOf(Server.Service.Connector.find { isNotSecuredHttpProtocol(it) }.@redirectPort.toString())
228-
assertEquals testHttpsPort + testOffset, Integer.valueOf(Server.Service.Connector.find { isAjpProtocol(it) }.@redirectPort.toString())
229278
assertEquals testHttpsPort + testOffset, Integer.valueOf(Server.Service.Connector.find { isSecure(it) }.@port.toString())
230279
}
231280

232281
@Test
233-
void shiftPortAndSetHttpsPortDefaltServerXmlChangeExpected() {
282+
void shiftPortAndSetHttpsPortDefaultServerXmlChangeExpected() {
234283
int testOffset = 10000
235284
Integer testHttpsPort = 18443
236285

@@ -239,8 +288,6 @@ abstract class BindingsTomcatConfiguratorIT extends TomcatTestAbstract {
239288
.httpsConnector(new SecureHttpConnectorTomcat().setPort(testHttpsPort))
240289

241290
GPathResult Server = new XmlSlurper().parse(new File(tomcat.basedir, "conf/server.xml"))
242-
assertEquals testHttpsPort, Integer.valueOf(Server.Service.Connector.find { isNotSecuredHttpProtocol(it) }.@redirectPort.toString())
243-
assertEquals testHttpsPort, Integer.valueOf(Server.Service.Connector.find { isAjpProtocol(it) }.@redirectPort.toString())
244291
assertEquals testHttpsPort, Integer.valueOf(Server.Service.Connector.find { isSecuredHttpProtocol(it) }.@port.toString())
245292
assertEquals Tomcat.DEFAULT_HTTP_PORT + testOffset, Integer.valueOf(Server.Service.Connector.find { isNotSecuredHttpProtocol(it) }.@port.toString())
246293
}
@@ -262,7 +309,6 @@ abstract class BindingsTomcatConfiguratorIT extends TomcatTestAbstract {
262309

263310
GPathResult Server = new XmlSlurper().parse(new File(tomcat.basedir, "conf/server.xml"))
264311
assertEquals sslCertificate, Server.Service.Connector.find { isSecuredHttpProtocol(it) }.@SSLCertificateFile.toString()
265-
assertEquals sslCertificate, Server.Service.Connector.find { isSecuredHttpProtocol(it) }.@SSLCACertificateFile.toString()
266312
assertEquals sslCertificateKey, Server.Service.Connector.find { isSecuredHttpProtocol(it) }.@SSLCertificateKeyFile.toString()
267313
assertEquals keystoreFilePath, Server.Service.Connector.find { isSecuredHttpProtocol(it) }.@keystoreFile.toString()
268314
assertEquals password, Server.Service.Connector.find { isSecuredHttpProtocol(it) }.@SSLPassword.toString()

0 commit comments

Comments
 (0)