Fix security config
The management endpoints were still all mixed up with the user endpoints. Fixed that and extracted user endpoints in to conditional block so not protected if path explicitly set to empty string. [#53029715]
This commit is contained in:
@@ -28,7 +28,6 @@ import java.util.concurrent.TimeUnit;
|
||||
import org.junit.After;
|
||||
import org.junit.Test;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.sample.ops.SampleActuatorApplication;
|
||||
import org.springframework.context.ConfigurableApplicationContext;
|
||||
import org.springframework.http.HttpRequest;
|
||||
import org.springframework.http.HttpStatus;
|
||||
@@ -64,7 +63,7 @@ public class EndpointsPropertiesSampleActuatorApplicationTests {
|
||||
.run(configuration, args);
|
||||
}
|
||||
});
|
||||
this.context = future.get(10, TimeUnit.SECONDS);
|
||||
this.context = future.get(60, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
@After
|
||||
|
||||
@@ -71,7 +71,7 @@ public class ManagementAddressSampleActuatorApplicationTests {
|
||||
.run(SampleActuatorApplication.class, args);
|
||||
}
|
||||
});
|
||||
context = future.get(30, TimeUnit.SECONDS);
|
||||
context = future.get(60, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
@AfterClass
|
||||
|
||||
@@ -27,7 +27,6 @@ import org.junit.AfterClass;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.sample.ops.SampleActuatorApplication;
|
||||
import org.springframework.context.ConfigurableApplicationContext;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
@@ -62,7 +61,7 @@ public class ManagementSampleActuatorApplicationTests {
|
||||
.run(SampleActuatorApplication.class, args);
|
||||
}
|
||||
});
|
||||
context = future.get(30, TimeUnit.SECONDS);
|
||||
context = future.get(60, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
@AfterClass
|
||||
|
||||
@@ -69,7 +69,7 @@ public class NoManagementSampleActuatorApplicationTests {
|
||||
.run(SampleActuatorApplication.class, args);
|
||||
}
|
||||
});
|
||||
context = future.get(10, TimeUnit.SECONDS);
|
||||
context = future.get(60, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
@AfterClass
|
||||
|
||||
@@ -67,7 +67,7 @@ public class SampleActuatorApplicationTests {
|
||||
.run(SampleActuatorApplication.class);
|
||||
}
|
||||
});
|
||||
context = future.get(30, TimeUnit.SECONDS);
|
||||
context = future.get(60, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
@AfterClass
|
||||
|
||||
@@ -66,7 +66,7 @@ public class ShutdownSampleActuatorApplicationTests {
|
||||
.run(SampleActuatorApplication.class);
|
||||
}
|
||||
});
|
||||
context = future.get(10, TimeUnit.SECONDS);
|
||||
context = future.get(60, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
@AfterClass
|
||||
|
||||
@@ -27,7 +27,6 @@ import org.junit.AfterClass;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.sample.ops.SampleActuatorApplication;
|
||||
import org.springframework.context.ConfigurableApplicationContext;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
@@ -60,7 +59,7 @@ public class UnsecureSampleActuatorApplicationTests {
|
||||
"--security.basic.enabled=false");
|
||||
}
|
||||
});
|
||||
context = future.get(10, TimeUnit.SECONDS);
|
||||
context = future.get(60, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
@AfterClass
|
||||
|
||||
Reference in New Issue
Block a user