Commit Graph

1536 Commits

Author SHA1 Message Date
Andy Wilkinson
10ae5e8f3f Upgrade to Jackson 2.9.0.pr1
As part of the upgrade, this commit removes the use of any API that
has been deprecated in 2.9.0.pr1. This includes the config props
endpoint's use of SerializationFeature.WRITE_NULL_MAP_VALUES. This
has been replaced with configuring serialization inclusion to only
include properties with non-null values. This means that all
null-valued properties will no longer be serialized, not just those
that are an entry in a map.

Closes gh-8604
Closes gh-8537
2017-03-15 16:38:08 +00:00
Stephane Nicoll
1b395ddd9d Merge branch '1.5.x' 2017-03-15 08:57:42 +01:00
Stephane Nicoll
cd8684499d Polish
See gh-8621
2017-03-15 08:57:24 +01:00
Phillip Webb
b76ca0bf8f Restructure web auto-configuration
Restructure `org.springframework.boot.autoconfigure.web` to better align
with the new package structure in `spring-boot`.

Auto-configuration is now split into client, servlet and reactive
sub-packages. In addition a new `http` package now handles common
HTTP concerns.

Fixes gh-8616
2017-03-14 22:06:28 -07:00
Phillip Webb
099e188f9f Unify WebServerFactoryCustomizers
Replace `ReactiveWebServerCustomizer` and `WebServerFactoryCustomizer`
with a unified `WebServerFactoryCustomizer`.

Fixes gh-8558
2017-03-14 21:43:23 -07:00
Madhura Bhave
bfae0d7739 Merge branch '1.5.x' 2017-03-14 13:37:09 -07:00
Madhura Bhave
0dcebdaf7c Merge branch '1.4.x' into 1.5.x 2017-03-14 13:34:41 -07:00
Madhura Bhave
19da8d8271 Fix UnsupportedOperationException
Fixes gh-8602
2017-03-14 11:59:42 -07:00
Phillip Webb
67556ba8ea Restructure embedded web server packages
Rework `org.springframework.boot.context.embedded` to relocate classes
to `org.springframework.boot.web`. Packages are now organized around
the following areas:

Packages for shared concerns, for example the `WebServer` interface
to start/stop a server and the common configuration elements:
- org.springframework.boot.web.context
- org.springframework.boot.web.server

Servlet specific packages:
- org.springframework.boot.web.servlet.server
- org.springframework.boot.web.servlet.context
- org.springframework.boot.web.servlet.filter

Reactive specific packages:
- org.springframework.boot.web.reactive.context
- org.springframework.boot.web.reactive.server

Embedded server implementations (both reactive and servlet):
- org.springframework.boot.web.embedded

In addition:

- Rename `EmbeddedServletContainerFactory` to `ServletWebServerFactory`
  to align with the `ReactiveWebServerFactory`.
- Rename `EmbeddedWebApplicationContext` to
  `ServletWebServerApplicationContext` and
- Rename `EmbeddedReactiveWebApplicationContext` to
  `ReactiveWebServerApplicationContext`.
- Add checkstyle rules to restrict imports.
- Fixup all affected code to use the correct imports and local names.

Fixes gh-8532
2017-03-12 21:08:25 -07:00
Madhura Bhave
f72c5b70c6 Merge branch '1.5.x' 2017-03-08 11:57:24 -08:00
Madhura Bhave
7da70a52fd Mask sensitive placeholders in env endpoint
Closes gh-8282
2017-03-08 10:53:39 -08:00
Madhura Bhave
8f903987da Merge branch '1.5.x' 2017-03-07 11:08:59 -08:00
Madhura Bhave
703b7d9268 Merge branch '1.4.x' into 1.5.x 2017-03-07 11:08:06 -08:00
Madhura Bhave
67068fc83d Ignore unresolvable nested placeholders
The NamePatternEnvironmentFilter used to throw an exception if
placeholders in property values could not be resolved.

Fixes gh-8510
2017-03-07 10:20:42 -08:00
Phillip Webb
2136a39004 Fix checkstyle errors 2017-03-06 17:37:09 -08:00
Phillip Webb
d8f827d224 Cleanup and format code 2017-03-06 17:08:09 -08:00
Phillip Webb
425dbc3e52 Update copyright header for edited files 2017-03-06 15:04:07 -08:00
Phillip Webb
2a592103f0 Polish formatting 2017-03-06 15:03:43 -08:00
Phillip Webb
91a7bf92e6 Merge branch '1.5.x' 2017-03-06 12:04:55 -08:00
Phillip Webb
fedd7b9506 Polish 2017-03-06 12:01:05 -08:00
Spring Buildmaster
d23fa24340 Next Development Version 2017-03-03 16:18:26 +00:00
Spring Buildmaster
2a83e80a9b Next Development Version 2017-03-03 14:39:21 +00:00
Madhura Bhave
8f26dc09b7 Merge branch '1.5.x' 2017-03-02 13:35:19 -08:00
Madhura Bhave
d4b52a3538 Expose Health details if user has authority
If the Princial is a Spring Security Authentication object and the
request doesn't have the right roles, check the authorities.

Fixes gh-8471
2017-03-02 12:37:47 -08:00
Stephane Nicoll
cb40ea485b Merge branch '1.5.x' 2017-03-02 14:31:49 +01:00
Stephane Nicoll
5cc569fc91 Improve execution speed of CacheAutoConfigurationTests
As of Hazelcast 3.7, the bootstrap is pretty slow by default due to the
networking discovery. This commit disables both TCP/IP and multicast
discoveries.
2017-03-02 14:28:33 +01:00
Phillip Webb
58ac67eb27 Merge branch '1.5.x' 2017-03-02 00:09:56 -08:00
Phillip Webb
3ee7dae09b Merge branch '1.4.x' into 1.5.x 2017-03-01 23:44:40 -08:00
Phillip Webb
f1012c104a Polish 2017-03-01 23:29:20 -08:00
Phillip Webb
c06a9771c2 Support list based role properties
Update `HealthMvcEndpoint` to respect `ManagementServerProperties`
roles. Prior to this commit the `HealthMvcEndpoint` directly loaded
roles rather than using bound properties. This meant that list values
from yaml were not respected.

Fixes gh-8314
2017-03-01 21:35:50 -08:00
Madhura Bhave
94a14dbcd8 Merge branch '1.5.x' 2017-03-01 20:16:43 -08:00
Madhura Bhave
031c9bf191 Validate authorities in MvcSecurityInterceptor
If Spring Security is on the classpath and `isUserInRole` returns false,
check if user has the authority to access the actuator endpoints.

Fixes gh-8255
2017-03-01 17:55:30 -08:00
Madhura Bhave
e5e1f24d1f Revert "Skip MvcSecurityInterceptor if Spring Security present"
Instead of entirely skipping the interceptor, we will be additionally
checking for authorities.
2017-03-01 16:31:36 -08:00
Madhura Bhave
ad5cb8a3cd Skip MvcSecurityInterceptor if Spring Security present
If Spring Security is on the classpath, the role check can be done
as part of the ManagementWebSecurityConfigurerAdapter.

Fixes gh-8255
2017-03-01 14:44:06 -08:00
Phillip Webb
a4bcd20b64 Merge branch '1.5.x' 2017-02-27 20:43:18 -08:00
Phillip Webb
ca1540cefe Update header copyright for changed files 2017-02-27 20:41:18 -08:00
Phillip Webb
5867cd6175 Polish 2017-02-27 20:41:18 -08:00
Phillip Webb
47fd5f4fac Merge branch '1.4.x' into 1.5.x 2017-02-27 14:00:46 -08:00
Phillip Webb
47b00c086c Polish 2017-02-27 13:56:17 -08:00
Andy Wilkinson
3164330139 Correct HAL Browser location to reflect version of web jar
See gh-8382
2017-02-22 16:53:29 +00:00
Stephane Nicoll
3c956441b5 Merge branch '1.5.x' 2017-02-17 10:33:08 +01:00
Stephane Nicoll
121ab0a71e Merge branch '1.4.x' into 1.5.x 2017-02-17 10:32:49 +01:00
Vedran Pavic
1c8f1c709c Fix audit events related documentation
Closes gh-8319
2017-02-17 10:30:07 +01:00
Brian Clozel
a5bdbd0dc2 Introduce EmbeddedWebServerInitializedEvent
This commit adds `EmbeddedWebServerInitializedEvent`, which holds the
`EmbeddedWebServer` information when the application context starts.
The `EmbeddedServletContainerInitializedEvent` now inherits from that
type and holds additional information, the
`EmbeddedWebApplicationContext`.

Closes gh-8208
2017-02-14 14:30:49 +01:00
Andy Wilkinson
54b95973bb Merge branch '1.5.x' 2017-02-14 11:23:36 +00:00
Andy Wilkinson
e2a12e77b7 Merge branch '1.4.x' into 1.5.x 2017-02-14 11:23:25 +00:00
Andy Wilkinson
bbe9394228 Tests that lists of lists are sanitized correctly
See gh-8263
2017-02-14 11:22:04 +00:00
Johnny Lim
88afc43d44 Ensure that entries in a list of lists are not lost during sanitization
Closes gh-8263
See gh-8197
2017-02-14 11:20:14 +00:00
Madhura Bhave
ffd35aaf5f Merge branch '1.5.x' 2017-02-09 17:15:20 -08:00
Madhura Bhave
77e5c585f4 Validate kid in Cloud Foundry token header
Instead of validating the signature against all the public keys,
we can validate it only against the public key with the kid that
matches the one in the token header.

Closes gh-8126
2017-02-09 16:47:44 -08:00