Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Explicitly disable security on management endpoints if requested
Previously the management endpoint filter was applied to all requests if the user had disabled security.management.enabled, but since it had no security applied it was letting all requests through. The fix was to explicitly exclude the whole enclosing configuration and carefully ignore the management endpoints in the normal security chain. Fixes gh-100.
- Loading branch information
Dave Syer
committed
Oct 31, 2013
1 parent
5e9b8c3
commit 63a2d06
Showing
3 changed files
with
145 additions
and
20 deletions.
There are no files selected for viewing
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
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
113 changes: 113 additions & 0 deletions
113
...org/springframework/boot/sample/ops/UnsecureManagementSampleActuatorApplicationTests.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,113 @@ | ||
/* | ||
* Copyright 2012-2013 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.boot.sample.ops; | ||
|
||
import static org.junit.Assert.assertEquals; | ||
import static org.junit.Assert.assertFalse; | ||
import static org.junit.Assert.assertTrue; | ||
|
||
import java.io.IOException; | ||
import java.util.Map; | ||
import java.util.concurrent.Callable; | ||
import java.util.concurrent.Executors; | ||
import java.util.concurrent.Future; | ||
import java.util.concurrent.TimeUnit; | ||
|
||
import org.junit.AfterClass; | ||
import org.junit.BeforeClass; | ||
import org.junit.Test; | ||
import org.springframework.boot.SpringApplication; | ||
import org.springframework.context.ConfigurableApplicationContext; | ||
import org.springframework.http.HttpStatus; | ||
import org.springframework.http.ResponseEntity; | ||
import org.springframework.http.client.ClientHttpResponse; | ||
import org.springframework.web.client.DefaultResponseErrorHandler; | ||
import org.springframework.web.client.RestTemplate; | ||
|
||
/** | ||
* Integration tests for unsecured service endpoints (even with Spring Security on | ||
* classpath). | ||
* | ||
* @author Dave Syer | ||
*/ | ||
public class UnsecureManagementSampleActuatorApplicationTests { | ||
|
||
private static ConfigurableApplicationContext context; | ||
|
||
@BeforeClass | ||
public static void start() throws Exception { | ||
Future<ConfigurableApplicationContext> future = Executors | ||
.newSingleThreadExecutor().submit( | ||
new Callable<ConfigurableApplicationContext>() { | ||
@Override | ||
public ConfigurableApplicationContext call() throws Exception { | ||
return (ConfigurableApplicationContext) SpringApplication | ||
.run(SampleActuatorApplication.class, | ||
"--security.management.enabled=false"); | ||
} | ||
}); | ||
context = future.get(60, TimeUnit.SECONDS); | ||
} | ||
|
||
@AfterClass | ||
public static void stop() { | ||
if (context != null) { | ||
context.close(); | ||
} | ||
} | ||
|
||
@Test | ||
public void testHomeIsSecure() throws Exception { | ||
@SuppressWarnings("rawtypes") | ||
ResponseEntity<Map> entity = getRestTemplate().getForEntity( | ||
"http://localhost:8080", Map.class); | ||
assertEquals(HttpStatus.UNAUTHORIZED, entity.getStatusCode()); | ||
@SuppressWarnings("unchecked") | ||
Map<String, Object> body = entity.getBody(); | ||
assertEquals("Wrong body: " + body, "Unauthorized", body.get("error")); | ||
assertFalse("Wrong headers: " + entity.getHeaders(), entity.getHeaders() | ||
.containsKey("Set-Cookie")); | ||
} | ||
|
||
@Test | ||
public void testMetrics() throws Exception { | ||
try { | ||
testHomeIsSecure(); // makes sure some requests have been made | ||
} catch (AssertionError e) { | ||
// ignore; | ||
} | ||
@SuppressWarnings("rawtypes") | ||
ResponseEntity<Map> entity = getRestTemplate().getForEntity( | ||
"http://localhost:8080/metrics", Map.class); | ||
assertEquals(HttpStatus.OK, entity.getStatusCode()); | ||
@SuppressWarnings("unchecked") | ||
Map<String, Object> body = entity.getBody(); | ||
assertTrue("Wrong body: " + body, body.containsKey("counter.status.401.root")); | ||
} | ||
|
||
private RestTemplate getRestTemplate() { | ||
RestTemplate restTemplate = new RestTemplate(); | ||
restTemplate.setErrorHandler(new DefaultResponseErrorHandler() { | ||
@Override | ||
public void handleError(ClientHttpResponse response) throws IOException { | ||
} | ||
}); | ||
return restTemplate; | ||
|
||
} | ||
|
||
} |