Edited some requests, security fixes

This commit is contained in:
redtea committed 2022-09-02 16:11:25 +03:00
1 parent c7cca9a77e
commit 00374da288
6 files changed
+20 -21

No files matched your search

@@ -6,10 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import site.easystartup.web.domain.model.User; import site.easystartup.web.domain.model.User;
import site.easystartup.web.domain.validation.ResponseErrorValidation; import site.easystartup.web.domain.validation.ResponseErrorValidation;
import site.easystartup.web.dto.UserDto; import site.easystartup.web.dto.UserDto;
@@ -21,6 +18,7 @@ import site.easystartup.web.project.service.ProjectService;
import site.easystartup.web.request.UserRequest; import site.easystartup.web.request.UserRequest;
import site.easystartup.web.service.UserService; import site.easystartup.web.service.UserService;
import javax.validation.Valid;
import java.security.Principal; import java.security.Principal;
@RestController @RestController
@@ -35,8 +33,8 @@ public class UserController {
return ResponseEntity.ok().body(modelMapper.map(userService.getUserByUsername(username), UserDto.class)); return ResponseEntity.ok().body(modelMapper.map(userService.getUserByUsername(username), UserDto.class));
} }
@PostMapping("/user/{username}/edit") @PutMapping("/user/edit/{username}")
public ResponseEntity<Object> userEdit(@PathVariable String username, UserRequest userRequest, public ResponseEntity<Object> userEdit(@PathVariable String username,@Valid @RequestBody UserRequest userRequest,
BindingResult bindingResult, Principal principal) { BindingResult bindingResult, Principal principal) {
if(!principal.getName().equals(username) && !userService.getUserByPrincipal(principal).isAdmin()) if(!principal.getName().equals(username) && !userService.getUserByPrincipal(principal).isAdmin())
throw new NoPermissionException(String.format("User %s can not edit profile of user %s", principal.getName(), throw new NoPermissionException(String.format("User %s can not edit profile of user %s", principal.getName(),
@@ -86,7 +86,7 @@ public class ForumController {
return ResponseEntity.ok().body(modelMapper.map(forumService.getDiscussionById(discussion_id), DiscussionDto.class)); return ResponseEntity.ok().body(modelMapper.map(forumService.getDiscussionById(discussion_id), DiscussionDto.class));
} }
@PostMapping("/{topic_id}/new") @PostMapping("/new/{topic_id}")
public ResponseEntity<Object> discussionNew(@PathVariable long topic_id, public ResponseEntity<Object> discussionNew(@PathVariable long topic_id,
@Valid @RequestBody DiscussionRequest discussionRequest, @Valid @RequestBody DiscussionRequest discussionRequest,
BindingResult bindingResult, BindingResult bindingResult,
@@ -98,7 +98,7 @@ public class ForumController {
return ResponseEntity.ok().body(modelMapper.map(discussion, DiscussionDto.class)); return ResponseEntity.ok().body(modelMapper.map(discussion, DiscussionDto.class));
} }
@PutMapping("/discussion/{discussion_id}/edit") @PutMapping("/discussion/edit/{discussion_id}")
public ResponseEntity<Object> discussionEdit(@Valid @RequestBody DiscussionRequest discussionRequest, public ResponseEntity<Object> discussionEdit(@Valid @RequestBody DiscussionRequest discussionRequest,
@PathVariable long discussion_id, @PathVariable long discussion_id,
BindingResult bindingResult, BindingResult bindingResult,
@@ -110,7 +110,7 @@ public class ForumController {
return ResponseEntity.ok().body(modelMapper.map(discussionUpdated, DiscussionDto.class)); return ResponseEntity.ok().body(modelMapper.map(discussionUpdated, DiscussionDto.class));
} }
@PostMapping("/discussion/{discussion_id}/new") @PostMapping("/discussion/new/{discussion_id}")
public ResponseEntity<Object> messageAdd(@PathVariable long discussion_id, public ResponseEntity<Object> messageAdd(@PathVariable long discussion_id,
@Valid @RequestBody DiscussionMessageRequest messageRequest, @Valid @RequestBody DiscussionMessageRequest messageRequest,
BindingResult bindingResult, BindingResult bindingResult,
@@ -127,7 +127,7 @@ public class ForumController {
return ResponseEntity.ok().body(modelMapper.map(forumService.getDiscussionMessageById(message_id), DiscussionMessageDto.class)); return ResponseEntity.ok().body(modelMapper.map(forumService.getDiscussionMessageById(message_id), DiscussionMessageDto.class));
} }
@PutMapping("/message/{message_id}/edit") @PutMapping("/message/edit/{message_id}")
public ResponseEntity<Object> messageEdit(@Valid @RequestBody DiscussionMessageRequest messageRequest, public ResponseEntity<Object> messageEdit(@Valid @RequestBody DiscussionMessageRequest messageRequest,
@PathVariable long message_id, @PathVariable long message_id,
BindingResult bindingResult, BindingResult bindingResult,
@@ -139,7 +139,7 @@ public class ForumController {
return ResponseEntity.ok().body(modelMapper.map(messageUpdated, DiscussionMessageDto.class)); return ResponseEntity.ok().body(modelMapper.map(messageUpdated, DiscussionMessageDto.class));
} }
@DeleteMapping("/message/{message_id}/delete") @DeleteMapping("/message/delete/{message_id}")
public ResponseEntity<Object> messageDelete(@PathVariable long message_id, Principal principal) { public ResponseEntity<Object> messageDelete(@PathVariable long message_id, Principal principal) {
DiscussionMessage message = forumService.getDiscussionMessageById(message_id); DiscussionMessage message = forumService.getDiscussionMessageById(message_id);
User user = userService.getUserByPrincipal(principal); User user = userService.getUserByPrincipal(principal);
@@ -47,7 +47,7 @@ public class PostController {
if (!ObjectUtils.isEmpty(errors)) return errors; if (!ObjectUtils.isEmpty(errors)) return errors;
Post post = postService.createPost(postRequest, principal); Post post = postService.createPost(postRequest, principal);
return ResponseEntity.ok().body(modelMapper.map(post, PostRequest.class)); return ResponseEntity.ok().body(modelMapper.map(post, PostDto.class));
} }
@GetMapping("/user/{username}") @GetMapping("/user/{username}")
@@ -57,17 +57,17 @@ public class PostController {
return ResponseEntity.ok().body(posts); return ResponseEntity.ok().body(posts);
} }
@GetMapping("/{post_id}/edit/") @PutMapping("/edit/{post_id}")
public ResponseEntity<Object> edit(@Valid @RequestBody PostRequest postRequest, BindingResult bindingResult, public ResponseEntity<Object> edit(@Valid @RequestBody PostRequest postRequest, BindingResult bindingResult,
Principal principal, @PathVariable long post_id) { Principal principal, @PathVariable long post_id) {
var errors = responseErrorValidation.mapValidationService(bindingResult); var errors = responseErrorValidation.mapValidationService(bindingResult);
if (!ObjectUtils.isEmpty(errors)) return errors; if (!ObjectUtils.isEmpty(errors)) return errors;
Post post = postService.edit(postRequest, post_id, principal); Post post = postService.edit(postRequest, post_id, principal);
return ResponseEntity.ok().body(modelMapper.map(post, PostRequest.class)); return ResponseEntity.ok().body(modelMapper.map(post, PostDto.class));
} }
@DeleteMapping("/{post_id}/delete") @DeleteMapping("/delete/{post_id}/")
public void delete(@PathVariable long post_id, public void delete(@PathVariable long post_id,
Principal principal) { Principal principal) {
Post post = postService.getPostById(post_id); Post post = postService.getPostById(post_id);
@@ -76,7 +76,7 @@ public class PostController {
else postService.delete(post); else postService.delete(post);
} }
@PutMapping("/{post_id}/like/") @PutMapping("/like/{post_id}/")
public ResponseEntity<Object> like(Principal principal, @PathVariable long post_id) { public ResponseEntity<Object> like(Principal principal, @PathVariable long post_id) {
Post post = postService.getPostById(post_id); Post post = postService.getPostById(post_id);
@@ -84,7 +84,7 @@ public class PostController {
return ResponseEntity.ok().body(modelMapper.map(edited, PostRequest.class)); return ResponseEntity.ok().body(modelMapper.map(edited, PostRequest.class));
} }
@PutMapping("/{post_id}/dislike/") @PutMapping("/dislike/{post_id}/")
public ResponseEntity<Object> dislike(Principal principal, @PathVariable long post_id) { public ResponseEntity<Object> dislike(Principal principal, @PathVariable long post_id) {
Post post = postService.getPostById(post_id); Post post = postService.getPostById(post_id);
@@ -9,6 +9,7 @@ import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@@ -41,6 +41,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
.and() .and()
.authorizeRequests() .authorizeRequests()
.antMatchers(SecurityConstants.SIGN_UP_URLS).permitAll() .antMatchers(SecurityConstants.SIGN_UP_URLS).permitAll()
.antMatchers("/auth/*").anonymous()
.antMatchers("/").permitAll() .antMatchers("/").permitAll()
.anyRequest().authenticated(); .anyRequest().authenticated();
http.addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class); http.addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class);
@@ -9,6 +9,7 @@ import site.easystartup.web.domain.model.User;
import site.easystartup.web.domain.request.SignupRequest; import site.easystartup.web.domain.request.SignupRequest;
import site.easystartup.web.repo.UserRepo; import site.easystartup.web.repo.UserRepo;
import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
@@ -27,10 +28,8 @@ public class AuthService {
user.setEmail(signupRequest.getEmail()); user.setEmail(signupRequest.getEmail());
user.setUsername(signupRequest.getUsername()); user.setUsername(signupRequest.getUsername());
user.setPassword(passwordEncoder.encode(signupRequest.getPassword())); user.setPassword(passwordEncoder.encode(signupRequest.getPassword()));
Set<Role> roles = new HashSet<>(); user.setRoles(Collections.singleton(Role.USER));
signupRequest.getRoles().forEach(role -> roles.add(Role.valueOf(role))); user.setActive(true);
user.setRoles(roles);
return userRepo.save(user); return userRepo.save(user);
} }
} }