spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-06 17:29:19 +00:00
Code Issues Projects Releases Wiki Activity
9,396 Commits 25 Branches 395 Tags
372cfb3dff53f0e65b17c8d386c5ccdb179b60fd
Commit Graph
9396 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Bhave 372cfb3dff Merge branch '1.5.x' 2016-11-07 15:39:00 -08:00
Madhura Bhave 82f89b4ac1 Add custom headers to allowed CORS headers for CF actuators 
Update CORS configuration to support Authorization and X-Cf-App-Instance.

See gh-7108
 2016-11-07 15:37:09 -08:00
Stephane Nicoll af82cbbfa9 Relaxed test assertion 2016-11-07 22:55:25 +01:00
Stephane Nicoll 0a4a84d357 Merge branch '1.5.x' 2016-11-06 11:44:27 +01:00
Stephane Nicoll 3018e95261 Merge branch '1.4.x' into 1.5.x 2016-11-06 11:44:12 +01:00
Stephane Nicoll d405265e83 Merge pull request #7326 from sebastiankirsch:master 
* pr/7326:
  Polish contribution
  Add @Inherited to all AutoConfigure* classes
 2016-11-06 11:43:58 +01:00
Stephane Nicoll ebfd86ea26 Polish contribution 
Closes gh-7326
 2016-11-06 11:42:45 +01:00
sebastiankirsch e8b0a64872 Add @Inherited to all AutoConfigure* classes 
See gh-7326
 2016-11-06 11:39:12 +01:00
Stephane Nicoll 7e643395f3 Merge branch '1.5.x' 2016-11-06 11:36:31 +01:00
Stephane Nicoll 101528f41a Merge branch '1.4.x' into 1.5.x 2016-11-06 11:36:16 +01:00
Stephane Nicoll f80dbd1a21 Upgrade to joda-time 2.9.5 
Closes gh-7308
 2016-11-06 11:34:13 +01:00
Stephane Nicoll ea35da0305 Merge branch '1.5.x' 2016-11-06 11:26:58 +01:00
Stephane Nicoll b51f92d9a4 Merge branch '1.4.x' into 1.5.x 2016-11-06 11:25:44 +01:00
Stephane Nicoll 32950bfec1 Merge pull request #7299 from vpavic:resource-server-config 
* pr/7299:
  Fix JWT token URI derivation
 2016-11-06 11:25:15 +01:00
Vedran Pavic 5783cd5593 Fix JWT token URI derivation 
Closes gh-7299
 2016-11-06 11:24:50 +01:00
Stephane Nicoll d32da0d692 Merge branch '1.5.x' 2016-11-05 11:16:09 +01:00
Stephane Nicoll 01e66ecbd5 Merge branch '1.4.x' into 1.5.x 2016-11-05 11:15:27 +01:00
Stephane Nicoll 4311cf333f Remove sample reference in build 2016-11-05 11:14:50 +01:00
Stephane Nicoll 2c71cb8efd Polish 2016-11-05 11:10:17 +01:00
Stephane Nicoll 4407194c00 Replace sample by integration test 
Closes gh-3888
 2016-11-05 11:09:36 +01:00
Stephane Nicoll 71bbd9faaf Polish 
See gh-7322
 2016-11-05 07:45:32 +01:00
Stephane Nicoll e4be5c6102 Merge branch '1.5.x' 2016-11-05 07:44:48 +01:00
Stephane Nicoll 389acb094b Merge branch '1.4.x' into 1.5.x 2016-11-05 07:43:09 +01:00
Stephane Nicoll 44a32d0a5b Merge pull request #7322 from izeye:polish-20161105 
* pr/7322:
  Polish
 2016-11-05 07:42:50 +01:00
Johnny Lim ec9f0ab6b4 Polish 
Closes gh-7322
 2016-11-05 07:42:37 +01:00
Phillip Webb 3435fdf7fd Merge branch '1.5.x' 2016-11-04 17:29:59 -07:00
Phillip Webb 6c76353682 Default management.cloudfoundry.enabled to true 
Update `CloudFoundryActuatorAutoConfiguration` so that it is enabled
when `management.cloudfoundry.enabled` is missing.

See gh-7108
 2016-11-04 17:26:25 -07:00
Madhura Bhave a77cfc3b0e Skip SSL validation when calling Cloud Foundry 
Update CloudFoundrySecurityService so that SSL validation is not
required. We're unlikely to have configured public keys for the
REST endpoints we need to call. Since the endpoints are provided via
environment variables we can implicitly trust them.

See gh-7108
 2016-11-04 17:26:25 -07:00
Madhura Bhave 862a06eb7a Add POST to allowed CORS methods for CF actuators 
Update CORS configuration to support POST.

See gh-7108
 2016-11-04 16:41:49 -07:00
Madhura Bhave 1005feb27d Update discovery endpoint to respect AccessLevel 
Change `CloudFoundryDiscoveryMvcEndpoint` so that `AccessLevel` rights
are consulted so that only accessible links are returned.

See gh-7108
 2016-11-04 16:41:49 -07:00
Madhura Bhave 340f1d5574 Add security for Cloud Foundry actuators 
Add security to Cloud Foundry actuator endpoints. Security is enforced
by a `HanderInterceptor` on `CloudFoundryEndpointHandlerMapping`. Each
endpoint call expects an 'Authorization' header containing a bearer
token. The token signature is checked against the UAA public keys then
passed to the Cloud Controller to obtain an ultimate access level.

The client may either have 'RESTRICTED' or FULL' access, with the latter
only providing access to a limited set of endpoints.

See gh-7108
 2016-11-04 16:41:48 -07:00
Phillip Webb f15e0482c5 Merge branch '1.4.x' into 1.5.x 2016-11-04 16:01:02 -07:00
Phillip Webb 1bd53ea9d8 Support package private requestFactory classes 
Update `RestTemplateBuilder` to support package private `requestFactory`
classes.

Fixes gh-7319
 2016-11-04 15:58:27 -07:00
Andy Wilkinson becf225911 Simplify CLI integration auto-config test by removing use of Artemis 
Artemis seems to be a bit flakey which is causing sporadic build
failures, for example due to an NPE in Artemis' code.
 2016-11-04 20:58:14 +00:00
Phillip Webb 1ff1402d9c Merge branch '1.5.x' 2016-11-04 12:27:03 -07:00
Phillip Webb 221feac3ec User random server port in devtools tests 
Update `LocalDevToolsAutoConfigurationTests` to ensure that a random
server port is used rather than 8080.

Fixes gh-7268
See gh-7039
 2016-11-04 12:24:50 -07:00
Andy Wilkinson 389f2e0f7b Make Rabbit Client milestones available to all profiles 
See gh-7053
 2016-11-04 15:36:43 +00:00
Andy Wilkinson c12126e360 Make Rabbit Client milestones available to the build 
See gh-7053
 2016-11-04 14:55:03 +00:00
Andy Wilkinson 3ac987b2f4 Start building against Spring AMQP 2.0 snapshots 
See gh-7053
 2016-11-04 12:42:28 +00:00
Andy Wilkinson f53ef0e8bd Merge branch '1.5.x' 2016-11-04 07:44:50 +00:00
Andy Wilkinson e5073a7172 Upgrade to Spring Security 4.2.0.RC1 
Closes gh-7186
 2016-11-04 07:44:18 +00:00
Andy Wilkinson a350b66150 Merge branch '1.5.x' 2016-11-03 22:41:14 +00:00
Andy Wilkinson 025bafd911 Polish new Actuator sample 2016-11-03 22:40:12 +00:00
Andy Wilkinson 229691338e Reinstate JsonPath dependency that is no longer pulled in transitively 2016-11-03 21:58:15 +00:00
Phillip Webb 0cdde3b83c Merge branch '1.5.x' 2016-11-03 14:50:26 -07:00
Phillip Webb 81c5753f4d Merge branch '1.4.x' into 1.5.x 2016-11-03 14:49:38 -07:00
Phillip Webb 90afc8ebbe Formatting 2016-11-03 14:48:10 -07:00
Phillip Webb 6a2ac080ac Create our own SessionCreationPolicy enum 
Update `ManagementServerProperties` so that `security.sessions` no
longer uses `SessionCreationPolicy` from Spring Security. We now
use our own enun which allows `management.security.*` properties to
be set without the risk of a `ClassNotFoundException`.

Fixes gh-3888
 2016-11-03 14:36:49 -07:00
Andy Wilkinson 4486d2d209 Upgrade to Reactor 3.0 and start building against SI 5.0 snapshots 
Closes gh-7301
See gh-7029
 2016-11-03 20:49:02 +00:00
Andy Wilkinson f7618cb421 Merge branch '1.5.x' 2016-11-03 20:15:28 +00:00