develop #6

Merged
Petr merged 2 commits from develop into master 2025-02-20 12:22:53 +00:00
Showing only changes of commit f6ca912ed1 - Show all commits

View File

@ -5,7 +5,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity; 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.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UserDetailsService;
@ -33,21 +32,13 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
http.csrf().disable() http.csrf().disable()
.authorizeRequests() .authorizeRequests()
.antMatchers("/h2-console/**").permitAll() .antMatchers("/h2-console/**").permitAll()
.antMatchers("/api/v1/images/**").permitAll() .antMatchers("/api/v1/**").hasAnyAuthority("ROLE_USER", "ROLE_ADMIN")
.antMatchers("/api/v1/volunteers/login").permitAll() .antMatchers("/api/v1/authorization/login").permitAll()
.antMatchers("/api/v1/volunteers/register").permitAll() .antMatchers("/api/v1/authorization/register").permitAll()
.antMatchers("/api/v1/**").permitAll()
//.antMatchers("/api/v1/**").hasAnyAuthority("ROLE_USER", "ROLE_ADMIN")
.anyRequest().authenticated() .anyRequest().authenticated()
.and() .and()
.httpBasic() .httpBasic()
.and() .and()
.headers().frameOptions().disable(); .headers().frameOptions().disable();
} }
@Override
public void configure(WebSecurity web) {
web.ignoring().antMatchers("/api/v1/volunteers/images");
}
} }