From f168733da2f1c8629497a9aaf88ef7b8380473c7 Mon Sep 17 00:00:00 2001 From: Danila_Mochalov Date: Tue, 16 May 2023 10:53:56 +0400 Subject: [PATCH] =?UTF-8?q?Lab=206=20MVC=20+=20SPA=20(=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=84=D0=B8=D0=BB=D0=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data.mv.db | Bin 151552 -> 143360 bytes front/vue_front/src/components/Profile.vue | 19 ++-- .../lab1/SecurityConfiguration.java | 45 ++++---- .../lab1/SecurityConfigurationSPA.java | 105 ++++++++++++++++++ src/main/resources/application.properties | 1 + src/main/resources/templates/error.html | 13 +++ 6 files changed, 156 insertions(+), 27 deletions(-) create mode 100644 src/main/java/com/webproglabs/lab1/SecurityConfigurationSPA.java create mode 100644 src/main/resources/templates/error.html diff --git a/data.mv.db b/data.mv.db index 3be22bde93dc78468dab39cd8023743df465f463..6deb6d78451fb45e3384145ec9df0b216d459d21 100644 GIT binary patch delta 11445 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 delta 13080 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

Профили

-

Список профилей

  • @@ -107,12 +104,18 @@ export default { this.refreshList(); }, async editUser() { - const response = await axios.put('http://localhost:8080/api/1.0/profile/' + this.selectedProfileId + '?login=' + this.loginModal + '&password=' + this.passwordModal, - { + // const response = await axios.put('http://localhost:8080/api/1.0/profile/' + this.selectedProfileId + '?login=' + this.loginModal + '&password=' + this.passwordModal, + // { + // headers: { + // 'Authorization': 'Bearer ' + localStorage.token + // } + // }); + await fetch('http://localhost:8080/api/1.0/profile/' + this.selectedProfileId + '?login=' + this.loginModal + '&password=' + this.passwordModal, { + method: 'PUT', headers: { - 'Authorization': 'Bearer ' + localStorage.token - } - }); + 'Authorization':'Bearer ' + localStorage['token'] + }, + }) this.refreshList(); }, async refreshList() { diff --git a/src/main/java/com/webproglabs/lab1/SecurityConfiguration.java b/src/main/java/com/webproglabs/lab1/SecurityConfiguration.java index 9baced0..7b54521 100644 --- a/src/main/java/com/webproglabs/lab1/SecurityConfiguration.java +++ b/src/main/java/com/webproglabs/lab1/SecurityConfiguration.java @@ -7,7 +7,9 @@ import com.webproglabs.lab1.lab34.model.UserRole; import com.webproglabs.lab1.lab34.services.ProfileService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; import org.springframework.http.HttpMethod; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; @@ -16,11 +18,20 @@ import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.security.web.authentication.DelegatingAuthenticationEntryPoint; +import org.springframework.security.web.authentication.Http403ForbiddenEntryPoint; +import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.security.web.util.matcher.AntPathRequestMatcher; +import org.springframework.security.web.util.matcher.RequestMatcher; + +import java.util.LinkedHashMap; @Configuration @EnableWebSecurity @EnableGlobalMethodSecurity(securedEnabled = true) +@Profile("mvc") public class SecurityConfiguration extends WebSecurityConfigurerAdapter { private final Logger log = LoggerFactory.getLogger(SecurityConfiguration.class); private static final String LOGIN_URL = "/login"; @@ -46,8 +57,10 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { } } -/* @Override + @Override protected void configure(HttpSecurity http) throws Exception { + + http.exceptionHandling().authenticationEntryPoint(delegatingEntryPoint()); http.headers().frameOptions().sameOrigin().and() .cors().and() .csrf().disable() @@ -60,24 +73,6 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { .loginPage(LOGIN_URL).permitAll() .and() .logout().permitAll(); - }*/ - - @Override - protected void configure(HttpSecurity http) throws Exception { - log.info("Creating security configuration"); - http.cors() - .and() - .csrf().disable() - .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) - .and() - .authorizeRequests() - .antMatchers("/", SPA_URL_MASK).permitAll() - .antMatchers(HttpMethod.POST, WebConfiguration.REST_API + "/profile" + ProfileController.URL_LOGIN).permitAll() - .anyRequest() - .authenticated() - .and() - .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class) - .anonymous(); } @Override @@ -95,4 +90,16 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { .antMatchers("/swagger-resources/**") .antMatchers("/v3/api-docs/**"); } + + @Bean + public AuthenticationEntryPoint delegatingEntryPoint() { + final LinkedHashMap map = new LinkedHashMap(); + map.put(new AntPathRequestMatcher("/"), new LoginUrlAuthenticationEntryPoint("/login")); + map.put(new AntPathRequestMatcher("/api/1.0/**"), new Http403ForbiddenEntryPoint()); + + final DelegatingAuthenticationEntryPoint entryPoint = new DelegatingAuthenticationEntryPoint(map); + entryPoint.setDefaultEntryPoint(new LoginUrlAuthenticationEntryPoint("/login")); + + return entryPoint; + } } \ No newline at end of file diff --git a/src/main/java/com/webproglabs/lab1/SecurityConfigurationSPA.java b/src/main/java/com/webproglabs/lab1/SecurityConfigurationSPA.java new file mode 100644 index 0000000..1508432 --- /dev/null +++ b/src/main/java/com/webproglabs/lab1/SecurityConfigurationSPA.java @@ -0,0 +1,105 @@ +package com.webproglabs.lab1; + +import com.webproglabs.lab1.lab34.controller.ProfileController; +import com.webproglabs.lab1.lab34.controller.mvc_controllers.UserSignupMvcController; +import com.webproglabs.lab1.lab34.jwt.JwtFilter; +import com.webproglabs.lab1.lab34.model.UserRole; +import com.webproglabs.lab1.lab34.services.ProfileService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; +import org.springframework.http.HttpMethod; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.builders.WebSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.security.web.authentication.DelegatingAuthenticationEntryPoint; +import org.springframework.security.web.authentication.Http403ForbiddenEntryPoint; +import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.security.web.util.matcher.AntPathRequestMatcher; +import org.springframework.security.web.util.matcher.RequestMatcher; + +import java.util.LinkedHashMap; + +@Configuration +@EnableWebSecurity +@EnableGlobalMethodSecurity(securedEnabled = true) +@Profile("spa") +public class SecurityConfigurationSPA extends WebSecurityConfigurerAdapter { + private final Logger log = LoggerFactory.getLogger(SecurityConfiguration.class); + private static final String LOGIN_URL = "/login"; + public static final String SPA_URL_MASK = "/{path:[^\\.]*}"; + private final ProfileService userService; + private final JwtFilter jwtFilter; + + public SecurityConfigurationSPA(ProfileService userService) { + this.userService = userService; + this.jwtFilter = new JwtFilter(userService); + createAdminOnStartup(); + } + + private void createAdminOnStartup() { + final String admin = "admin"; + if (userService.findByLogin(admin) == null) { + log.info("Admin user successfully created"); + try { + userService.createUser(admin, admin, admin, UserRole.ADMIN); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + log.info("Creating security configuration"); + http.cors() + .and() + .csrf().disable() + .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) + .and() + .authorizeRequests() + .antMatchers("/", SPA_URL_MASK).permitAll() + .antMatchers(HttpMethod.POST, WebConfiguration.REST_API + "/profile" + ProfileController.URL_LOGIN).permitAll() + .anyRequest() + .authenticated() + .and() + .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class) + .anonymous(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.userDetailsService(userService); + } + + @Override + public void configure(WebSecurity web) { + web.ignoring() + .antMatchers("/css/**") + .antMatchers("/js/**") + .antMatchers("/templates/**") + .antMatchers("/webjars/**") + .antMatchers("/swagger-resources/**") + .antMatchers("/v3/api-docs/**"); + } + + @Bean + public AuthenticationEntryPoint delegatingEntryPoint() { + final LinkedHashMap map = new LinkedHashMap(); + map.put(new AntPathRequestMatcher("/"), new LoginUrlAuthenticationEntryPoint("/login")); + map.put(new AntPathRequestMatcher("/api/1.0/**"), new Http403ForbiddenEntryPoint()); + + final DelegatingAuthenticationEntryPoint entryPoint = new DelegatingAuthenticationEntryPoint(map); + entryPoint.setDefaultEntryPoint(new LoginUrlAuthenticationEntryPoint("/login")); + + return entryPoint; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6455a46..e84707d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -13,3 +13,4 @@ spring.h2.console.settings.web-allow-others=false spring.security.user.password=user jwt.dev-token=my-secret-jwt jwt.dev=true +spring.profiles.active=mvc diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html new file mode 100644 index 0000000..9d66499 --- /dev/null +++ b/src/main/resources/templates/error.html @@ -0,0 +1,13 @@ + + + +
    +
    + +
    + На главную +
    + + \ No newline at end of file