Skip to content

Commit 8d2c0a8

Browse files
committed
Merge remote-tracking branch 'origin/master' into chore/ux-enhancements
2 parents a5addc4 + 8939deb commit 8d2c0a8

8 files changed

Lines changed: 500 additions & 599 deletions

File tree

spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/sample/SecurityPermitAllConfig.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,13 @@ public SecurityPermitAllConfig(AdminServerProperties adminServer) {
4444
@Bean
4545
protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
4646

47-
http.authorizeHttpRequests((authorizeRequest) -> authorizeRequest.anyRequest().permitAll());
47+
http.authorizeHttpRequests((authorizeRequest) ->
48+
authorizeRequest
49+
.requestMatchers(
50+
PathPatternRequestMatcher.withDefaults().matcher((this.adminServer.path("/actuator"))))
51+
.denyAll()
52+
.anyRequest().permitAll()
53+
);
4854

4955
http.addFilterAfter(new CustomCsrfFilter(), BasicAuthenticationFilter.class)
5056
.csrf((csrf) -> csrf.csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())

spring-boot-admin-server-ui/package-lock.json

Lines changed: 0 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spring-boot-admin-server-ui/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"description": "Spring Boot Admin UI",
55
"scripts": {
66
"build": "vite build --emptyOutDir --sourcemap",
7-
"build:dev": "cross-env NODE_ENV=development vite build --emptyOutDir --sourcemap --mode development",
8-
"build:watch": "cross-env NODE_ENV=development vite build --emptyOutDir --sourcemap --watch --mode development",
7+
"build:dev": "vite build --emptyOutDir --sourcemap --mode development",
8+
"build:watch": "vite build --emptyOutDir --sourcemap --watch --mode development",
99
"dev": "vite",
1010
"test": "vitest run --silent",
1111
"test:watch": "vitest",
@@ -86,7 +86,6 @@
8686
"@vitejs/plugin-vue": "6.0.6",
8787
"@vue/test-utils": "2.4.10",
8888
"axios-mock-adapter": "^2.1.0",
89-
"cross-env": "^10.1.0",
9089
"eslint": "^10.0.0",
9190
"eslint-config-prettier": "^10.0.0",
9291
"eslint-plugin-prettier": "^5.0.0",

0 commit comments

Comments
 (0)