Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
f0905ffa
Commit
f0905ffa
authored
Feb 16, 2018
by
mtrejo
Committed by
Andy Wilkinson
Feb 27, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set host when creating Jetty SSL connector
See gh-12120
parent
14ff776f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
9 deletions
+32
-9
JettyEmbeddedServletContainerFactory.java
.../embedded/jetty/JettyEmbeddedServletContainerFactory.java
+12
-9
JettyEmbeddedServletContainerFactoryTests.java
...dded/jetty/JettyEmbeddedServletContainerFactoryTests.java
+20
-0
No files found.
spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
View file @
f0905ffa
...
@@ -180,7 +180,7 @@ public class JettyEmbeddedServletContainerFactory
...
@@ -180,7 +180,7 @@ public class JettyEmbeddedServletContainerFactory
SslContextFactory
sslContextFactory
=
new
SslContextFactory
();
SslContextFactory
sslContextFactory
=
new
SslContextFactory
();
configureSsl
(
sslContextFactory
,
getSsl
());
configureSsl
(
sslContextFactory
,
getSsl
());
AbstractConnector
connector
=
getSslServerConnectorFactory
()
AbstractConnector
connector
=
getSslServerConnectorFactory
()
.
getConnector
(
server
,
sslContextFactory
,
port
);
.
createConnector
(
server
,
sslContextFactory
,
address
);
server
.
setConnectors
(
new
Connector
[]
{
connector
});
server
.
setConnectors
(
new
Connector
[]
{
connector
});
}
}
for
(
JettyServerCustomizer
customizer
:
getServerCustomizers
())
{
for
(
JettyServerCustomizer
customizer
:
getServerCustomizers
())
{
...
@@ -700,8 +700,8 @@ public class JettyEmbeddedServletContainerFactory
...
@@ -700,8 +700,8 @@ public class JettyEmbeddedServletContainerFactory
*/
*/
private
interface
SslServerConnectorFactory
{
private
interface
SslServerConnectorFactory
{
AbstractConnector
get
Connector
(
Server
server
,
SslContextFactory
sslContextFactory
,
AbstractConnector
create
Connector
(
Server
server
,
SslContextFactory
sslContextFactory
,
int
port
);
InetSocketAddress
address
);
}
}
...
@@ -712,8 +712,8 @@ public class JettyEmbeddedServletContainerFactory
...
@@ -712,8 +712,8 @@ public class JettyEmbeddedServletContainerFactory
implements
SslServerConnectorFactory
{
implements
SslServerConnectorFactory
{
@Override
@Override
public
ServerConnector
get
Connector
(
Server
server
,
public
ServerConnector
create
Connector
(
Server
server
,
SslContextFactory
sslContextFactory
,
int
port
)
{
SslContextFactory
sslContextFactory
,
InetSocketAddress
address
)
{
HttpConfiguration
config
=
new
HttpConfiguration
();
HttpConfiguration
config
=
new
HttpConfiguration
();
config
.
setSendServerVersion
(
false
);
config
.
setSendServerVersion
(
false
);
config
.
addCustomizer
(
new
SecureRequestCustomizer
());
config
.
addCustomizer
(
new
SecureRequestCustomizer
());
...
@@ -722,7 +722,8 @@ public class JettyEmbeddedServletContainerFactory
...
@@ -722,7 +722,8 @@ public class JettyEmbeddedServletContainerFactory
sslContextFactory
,
HttpVersion
.
HTTP_1_1
.
asString
());
sslContextFactory
,
HttpVersion
.
HTTP_1_1
.
asString
());
ServerConnector
serverConnector
=
new
ServerConnector
(
server
,
ServerConnector
serverConnector
=
new
ServerConnector
(
server
,
sslConnectionFactory
,
connectionFactory
);
sslConnectionFactory
,
connectionFactory
);
serverConnector
.
setPort
(
port
);
serverConnector
.
setPort
(
address
.
getPort
());
serverConnector
.
setHost
(
address
.
getHostString
());
return
serverConnector
;
return
serverConnector
;
}
}
...
@@ -735,8 +736,8 @@ public class JettyEmbeddedServletContainerFactory
...
@@ -735,8 +736,8 @@ public class JettyEmbeddedServletContainerFactory
implements
SslServerConnectorFactory
{
implements
SslServerConnectorFactory
{
@Override
@Override
public
AbstractConnector
get
Connector
(
Server
server
,
public
AbstractConnector
create
Connector
(
Server
server
,
SslContextFactory
sslContextFactory
,
int
port
)
{
SslContextFactory
sslContextFactory
,
InetSocketAddress
address
)
{
try
{
try
{
Class
<?>
connectorClass
=
Class
Class
<?>
connectorClass
=
Class
.
forName
(
"org.eclipse.jetty.server.ssl.SslSocketConnector"
);
.
forName
(
"org.eclipse.jetty.server.ssl.SslSocketConnector"
);
...
@@ -744,7 +745,9 @@ public class JettyEmbeddedServletContainerFactory
...
@@ -744,7 +745,9 @@ public class JettyEmbeddedServletContainerFactory
.
getConstructor
(
SslContextFactory
.
class
)
.
getConstructor
(
SslContextFactory
.
class
)
.
newInstance
(
sslContextFactory
);
.
newInstance
(
sslContextFactory
);
connector
.
getClass
().
getMethod
(
"setPort"
,
int
.
class
).
invoke
(
connector
,
connector
.
getClass
().
getMethod
(
"setPort"
,
int
.
class
).
invoke
(
connector
,
port
);
address
.
getPort
());
connector
.
getClass
().
getMethod
(
"setHost"
,
String
.
class
).
invoke
(
connector
,
address
.
getHostString
());
return
connector
;
return
connector
;
}
}
catch
(
Exception
ex
)
{
catch
(
Exception
ex
)
{
...
...
spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
View file @
f0905ffa
...
@@ -244,6 +244,26 @@ public class JettyEmbeddedServletContainerFactoryTests
...
@@ -244,6 +244,26 @@ public class JettyEmbeddedServletContainerFactoryTests
.
isEqualTo
(
new
String
[]
{
"TLSv1.1"
});
.
isEqualTo
(
new
String
[]
{
"TLSv1.1"
});
}
}
@Test
public
void
sslEnabledSpecificIPAddress
()
throws
Exception
{
Ssl
ssl
=
new
Ssl
();
ssl
.
setKeyStore
(
"src/test/resources/test.jks"
);
ssl
.
setKeyStorePassword
(
"secret"
);
ssl
.
setKeyPassword
(
"password"
);
JettyEmbeddedServletContainerFactory
factory
=
getFactory
();
factory
.
setSsl
(
ssl
);
factory
.
setAddress
(
InetAddress
.
getByAddress
(
InetAddress
.
getLocalHost
().
getAddress
()));
this
.
container
=
factory
.
getEmbeddedServletContainer
();
this
.
container
.
start
();
JettyEmbeddedServletContainer
jettyContainer
=
(
JettyEmbeddedServletContainer
)
this
.
container
;
ServerConnector
connector
=
(
ServerConnector
)
jettyContainer
.
getServer
()
.
getConnectors
()[
0
];
assertThat
(
connector
.
getHost
()).
isEqualTo
(
factory
.
getAddress
().
getHostAddress
());
}
private
void
assertTimeout
(
JettyEmbeddedServletContainerFactory
factory
,
private
void
assertTimeout
(
JettyEmbeddedServletContainerFactory
factory
,
int
expected
)
{
int
expected
)
{
this
.
container
=
factory
.
getEmbeddedServletContainer
();
this
.
container
=
factory
.
getEmbeddedServletContainer
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment