diff --git a/build.gradle b/build.gradle index b6b034e..766cc84 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'com.h2database:h2:2.1.210' + implementation 'org.springframework.security:spring-security-config:6.0.2' + implementation 'org.springframework.security:spring-security-web:6.1.0' testImplementation 'org.springframework.boot:spring-boot-starter-test' implementation 'io.springfox:springfox-swagger-ui:3.0.0' @@ -23,9 +25,16 @@ dependencies { implementation 'org.springframework.boot:spring-boot-devtools' implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' + implementation 'org.webjars:bootstrap:5.1.3' implementation 'org.webjars:jquery:3.6.0' implementation 'org.webjars:font-awesome:6.1.0' + + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.1.RELEASE' + implementation 'org.springframework.security:spring-security-test' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } jar { manifest { diff --git a/data.mv.db b/data.mv.db index 62d5725..1593f31 100644 Binary files a/data.mv.db and b/data.mv.db differ diff --git a/src/main/java/com/example/demo/WebConfiguration.java b/src/main/java/com/example/demo/WebConfiguration.java index 77980d0..9d30c73 100644 --- a/src/main/java/com/example/demo/WebConfiguration.java +++ b/src/main/java/com/example/demo/WebConfiguration.java @@ -11,7 +11,7 @@ public class WebConfiguration implements WebMvcConfigurer { @Override public void addViewControllers(ViewControllerRegistry registry) { WebMvcConfigurer.super.addViewControllers(registry); - registry.addViewController("appointment"); + registry.addViewController("login"); } @Override diff --git a/src/main/java/com/example/demo/speaker/PasswordEncoderConfiguration.java b/src/main/java/com/example/demo/speaker/PasswordEncoderConfiguration.java new file mode 100644 index 0000000..55130aa --- /dev/null +++ b/src/main/java/com/example/demo/speaker/PasswordEncoderConfiguration.java @@ -0,0 +1,14 @@ +package com.example.demo.speaker; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; + +@Configuration +public class PasswordEncoderConfiguration { + @Bean + public PasswordEncoder createPasswordEncoder() { + return new BCryptPasswordEncoder(); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/speaker/SecurityConfiguration.java b/src/main/java/com/example/demo/speaker/SecurityConfiguration.java new file mode 100644 index 0000000..833e347 --- /dev/null +++ b/src/main/java/com/example/demo/speaker/SecurityConfiguration.java @@ -0,0 +1,69 @@ +package com.example.demo.speaker; + +import com.example.demo.speaker.model.UserRole; +import com.example.demo.speaker.service.UserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Configuration; +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.annotation.web.configuration.WebSecurityConfigurerAdapter; + + +@Configuration +@EnableWebSecurity +@EnableGlobalMethodSecurity(securedEnabled = true) +public class SecurityConfiguration extends WebSecurityConfigurerAdapter { + private final Logger log = LoggerFactory.getLogger(SecurityConfiguration.class); + private static final String LOGIN_URL = "/login"; + private final UserService userService; + + public SecurityConfiguration(UserService userService) { + this.userService = userService; + createAdminOnStartup(); + } + + private void createAdminOnStartup() { + final String admin = "admin"; + if (userService.findByLogin(admin) == null) { + log.info("Admin user successfully created"); + userService.createUser(admin, admin, admin, UserRole.ADMIN); + } + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.headers().frameOptions().sameOrigin().and() + .cors().and() + .csrf().disable() + .authorizeRequests() + .antMatchers(UserSignupMvcController.SIGNUP_URL).permitAll() + .antMatchers(HttpMethod.GET, LOGIN_URL).permitAll() + .anyRequest().authenticated() + .and() + .formLogin() + .loginPage(LOGIN_URL).permitAll() + .and() + .logout().permitAll(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.userDetailsService(userService); + } + + @Override + public void configure(WebSecurity web) { + web.ignoring() + .antMatchers("/css/**") + .antMatchers("/images/**") + .antMatchers("/js/**") + .antMatchers("/templates/**") + .antMatchers("/webjars/**"); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/speaker/controller/DTO/UserDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/UserDTO.java new file mode 100644 index 0000000..6205e6b --- /dev/null +++ b/src/main/java/com/example/demo/speaker/controller/DTO/UserDTO.java @@ -0,0 +1,24 @@ +package com.example.demo.speaker.controller.DTO; + +import com.example.demo.speaker.model.User; +import com.example.demo.speaker.model.UserRole; + +public class UserDTO { + private final long id; + private final String login; + private final UserRole role; + public UserDTO(User user) { + this.id = user.getId(); + this.login = user.getLogin(); + this.role = user.getRole(); + } + public long getId() { + return id; + } + public String getLogin() { + return login; + } + public UserRole getRole() { + return role; + } +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/speaker/controller/DTO/UserSignupDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/UserSignupDTO.java new file mode 100644 index 0000000..2a68bba --- /dev/null +++ b/src/main/java/com/example/demo/speaker/controller/DTO/UserSignupDTO.java @@ -0,0 +1,31 @@ +package com.example.demo.speaker.controller.DTO; + +public class UserSignupDTO { +// @NotBlank +// @Size(min = 3, max = 64) + private String login; +// @NotBlank +// @Size(min = 6, max = 64) + private String password; +// @NotBlank +// @Size(min = 6, max = 64) + private String passwordConfirm; + public String getLogin() { + return login; + } + public void setLogin(String login) { + this.login = login; + } + public String getPassword() { + return password; + } + public void setPassword(String password) { + this.password = password; + } + public String getPasswordConfirm() { + return passwordConfirm; + } + public void setPasswordConfirm(String passwordConfirm) { + this.passwordConfirm = passwordConfirm; + } +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/speaker/controller/MVCController/UserMVCController.java b/src/main/java/com/example/demo/speaker/controller/MVCController/UserMVCController.java new file mode 100644 index 0000000..a64dc5b --- /dev/null +++ b/src/main/java/com/example/demo/speaker/controller/MVCController/UserMVCController.java @@ -0,0 +1,40 @@ +package com.example.demo.speaker.controller.MVCController; + +import com.example.demo.speaker.controller.DTO.UserDTO; +import com.example.demo.speaker.model.UserRole; +import com.example.demo.speaker.service.UserService; +import org.springframework.security.access.annotation.Secured; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.data.domain.Page; +import org.springframework.ui.Model; + +import java.util.List; +import java.util.stream.IntStream; + +@Controller +@RequestMapping("/users") +public class UserMVCController { + private final UserService userService; + public UserMVCController(UserService userService) { + this.userService = userService; + } + @GetMapping + @Secured({UserRole.AsString.ADMIN}) + public String getUsers(@RequestParam(defaultValue = "1") int page, + @RequestParam(defaultValue = "5") int size, + Model model) { + final Page users = userService.findAllPages(page, size) + .map(UserDTO::new); + model.addAttribute("users", users); + final int totalPages = users.getTotalPages(); + final List pageNumbers = IntStream.rangeClosed(1, totalPages) + .boxed() + .toList(); + model.addAttribute("pages", pageNumbers); + model.addAttribute("totalPages", totalPages); + return "users"; + } +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/speaker/controller/MVCController/UserSignupMvcController.java b/src/main/java/com/example/demo/speaker/controller/MVCController/UserSignupMvcController.java new file mode 100644 index 0000000..d1224db --- /dev/null +++ b/src/main/java/com/example/demo/speaker/controller/MVCController/UserSignupMvcController.java @@ -0,0 +1,44 @@ +package com.example.demo.speaker.controller.MVCController; + +import com.example.demo.speaker.controller.DTO.UserSignupDTO; +import com.example.demo.speaker.model.User; +import com.example.demo.speaker.service.UserService; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping(UserSignupMvcController.SIGNUP_URL) +public class UserSignupMvcController { + public static final String SIGNUP_URL = "/signup"; + private final UserService userService; + public UserSignupMvcController(UserService userService) { + this.userService = userService; + } + @GetMapping + public String showSignupForm(Model model) { + model.addAttribute("UserDTO", new UserSignupDTO()); + return "signup"; + } + @PostMapping + public String signup(@ModelAttribute("UserDTO") UserSignupDTO userSignupDTO, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + model.addAttribute("errors", bindingResult.getAllErrors()); + return "signup"; + } + try { + final User user = userService.createUser( + userSignupDTO.getLogin(), userSignupDTO.getPassword(), userSignupDTO.getPasswordConfirm()); + return "redirect:/login?created=" + user.getLogin(); + } catch (Exception e) { + //model.addAttribute("errors", e.getMessage()); + return "signup"; + } + } +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/speaker/model/User.java b/src/main/java/com/example/demo/speaker/model/User.java new file mode 100644 index 0000000..c416cc7 --- /dev/null +++ b/src/main/java/com/example/demo/speaker/model/User.java @@ -0,0 +1,83 @@ +package com.example.demo.speaker.model; + +import jakarta.persistence.*; + + +import java.util.Objects; + +@Entity +@Table(name = "users") +public class User +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + @Column(nullable = false, unique = true, length = 64) +// @NotBlank +// @Size(min = 3, max = 64) + private String login; + @Column(nullable = false, length = 64) +// @NotBlank +// @Size(min = 6, max = 64) + private String password; + private UserRole role; + + public User() { + } + + public User(String login, String password) { + this(login, password, UserRole.USER); + } + + public User(String login, String password, UserRole role) { + this.login = login; + this.password = password; + this.role = role; + } + + public Long getId() { + return id; + } + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public UserRole getRole() { + return role; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + User user = (User) o; + return Objects.equals(id, user.id) && Objects.equals(login, user.login); + } + + @Override + public int hashCode() { + return Objects.hash(id, login); + } + @Override + public String toString() { + return "User{" + + "id=" + id + + ", login='" + login + '\'' + + ", password='" + password + '\'' + + ", role='" + role + '\'' + + '}'; + } +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/speaker/model/UserRole.java b/src/main/java/com/example/demo/speaker/model/UserRole.java new file mode 100644 index 0000000..1180a78 --- /dev/null +++ b/src/main/java/com/example/demo/speaker/model/UserRole.java @@ -0,0 +1,17 @@ +package com.example.demo.speaker.model; + +import org.springframework.security.core.GrantedAuthority; + +public enum UserRole implements GrantedAuthority { + ADMIN, + USER; + private static final String PREFIX = "ROLE_"; + @Override + public String getAuthority() { + return PREFIX + this.name(); + } + public static final class AsString { + public static final String ADMIN = PREFIX + "ADMIN"; + public static final String USER = PREFIX + "USER"; + } +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/speaker/repository/IUserRepository.java b/src/main/java/com/example/demo/speaker/repository/IUserRepository.java new file mode 100644 index 0000000..44c04fb --- /dev/null +++ b/src/main/java/com/example/demo/speaker/repository/IUserRepository.java @@ -0,0 +1,8 @@ +package com.example.demo.speaker.repository; + +import com.example.demo.speaker.model.User; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface IUserRepository extends JpaRepository { + User findOneByLoginIgnoreCase(String login); +} diff --git a/src/main/java/com/example/demo/speaker/service/UserService.java b/src/main/java/com/example/demo/speaker/service/UserService.java new file mode 100644 index 0000000..e0f2afc --- /dev/null +++ b/src/main/java/com/example/demo/speaker/service/UserService.java @@ -0,0 +1,62 @@ +package com.example.demo.speaker.service; + + +import com.example.demo.speaker.model.User; +import com.example.demo.speaker.model.UserRole; +import com.example.demo.speaker.repository.IUserRepository; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.Objects; + +import java.util.Objects; + +@Service +public class UserService implements UserDetailsService { + private final IUserRepository userRepository; + private final PasswordEncoder passwordEncoder; + //private final ValidatorUtil validatorUtil; + public UserService(IUserRepository userRepository, + PasswordEncoder passwordEncoder + /*ValidatorUtil validatorUtil*/) { + this.userRepository = userRepository; + this.passwordEncoder = passwordEncoder; + //this.validatorUtil = validatorUtil; + } + public Page findAllPages(int page, int size) { + return userRepository.findAll(PageRequest.of(page - 1, size, Sort.by("id").ascending())); + } + public User findByLogin(String login) { + return userRepository.findOneByLoginIgnoreCase(login); + } + public User createUser(String login, String password, String passwordConfirm) { + return createUser(login, password, passwordConfirm, UserRole.USER); + } + public User createUser(String login, String password, String passwordConfirm, UserRole role) { + if (findByLogin(login) != null) { + //throw new ValidationException(String.format("User '%s' already exists", login)); + } + final User user = new User(login, passwordEncoder.encode(password), role); + //validatorUtil.validate(user); + if (!Objects.equals(password, passwordConfirm)) { + //throw new ValidationException("Passwords not equals"); + } + return userRepository.save(user); + } + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + final User userEntity = findByLogin(username); + if (userEntity == null) { + throw new UsernameNotFoundException(username); + } + return new org.springframework.security.core.userdetails.User( + userEntity.getLogin(), userEntity.getPassword(), Collections.singleton(userEntity.getRole())); + } +} \ No newline at end of file diff --git a/src/main/resources/templates/appointment.html b/src/main/resources/templates/appointment.html index 99bada8..b4f2c63 100644 --- a/src/main/resources/templates/appointment.html +++ b/src/main/resources/templates/appointment.html @@ -10,10 +10,10 @@
- +
-
@@ -34,12 +34,12 @@ - -
diff --git a/src/main/resources/templates/company.html b/src/main/resources/templates/company.html index b209ab0..316b329 100644 --- a/src/main/resources/templates/company.html +++ b/src/main/resources/templates/company.html @@ -12,7 +12,7 @@ - @@ -35,12 +35,12 @@ - - diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index 6627988..2813984 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -1,7 +1,8 @@ + xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" + xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5"> Site of Company @@ -36,6 +37,8 @@ th:classappend="${#strings.equals(activeLink, '/employee')} ? 'active' : ''">Employee Request + Пользователи + Выход diff --git a/src/main/resources/templates/employee.html b/src/main/resources/templates/employee.html index 98fdcd2..44528ff 100644 --- a/src/main/resources/templates/employee.html +++ b/src/main/resources/templates/employee.html @@ -18,7 +18,7 @@
-
@@ -47,12 +47,12 @@ - - diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html new file mode 100644 index 0000000..5b8e68a --- /dev/null +++ b/src/main/resources/templates/login.html @@ -0,0 +1,34 @@ + + + + + + +
+
+ Пользователь не найден или пароль указан не верно +
+
+ Выход успешно произведен +
+
+ Пользователь '' успешно создан +
+
+
+ +
+
+ +
+ + Регистрация +
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/request.html b/src/main/resources/templates/request.html index 4d542d2..2157465 100644 --- a/src/main/resources/templates/request.html +++ b/src/main/resources/templates/request.html @@ -41,19 +41,19 @@ - - -
-
diff --git a/src/main/resources/templates/signup.html b/src/main/resources/templates/signup.html new file mode 100644 index 0000000..aa70484 --- /dev/null +++ b/src/main/resources/templates/signup.html @@ -0,0 +1,31 @@ + + + + + +
+
+
+
+ +
+
+ +
+
+ +
+
+ + Назад +
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/users.html b/src/main/resources/templates/users.html new file mode 100644 index 0000000..98fdb36 --- /dev/null +++ b/src/main/resources/templates/users.html @@ -0,0 +1,40 @@ + + + + + +
+
+ + + + + + + + + + + + + + + + + +
#IDЛогинРоль
+
+ +
+ + \ No newline at end of file