Revize fab2885e

re #7978 added functionality of only showing assemblies with correct role (same as user), added functionality of showing only logged in users's configurations in "Rychle k"

src/main/java/vldc/aswi/configuration/AppConfig.java

@@ -81 +81 @@
 
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
+		// TODO: 04.05.2020 Error pages
 		http
 		.authorizeRequests()
 			.mvcMatchers("/login").permitAll()

src/main/java/vldc/aswi/dao/AssemblyRepository.java

@@ -3 +3 @@
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 import vldc.aswi.domain.Assembly;
+import vldc.aswi.domain.Role;
 
 import java.util.List;
 
@@ -27 +28 @@
     Assembly findFirst1ByOrderByAssemblyOrder();
 
     /**
-     * Find assemblies order by order
+     * Find assemblies, order by order
      * @return ordered assemblies
      */
     List<Assembly> getByOrderByAssemblyOrderAsc();
+
+    /**
+     * Find assemblies with role, order by order
+     * @return ordered assemblies
+     */
+    List<Assembly> getByRolesContainingOrderByAssemblyOrderAsc(Role role);
 }

src/main/java/vldc/aswi/dao/ConfigurationRepository.java

@@ -2 +2 @@
 
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
-import vldc.aswi.domain.Assembly;
 import vldc.aswi.domain.Configuration;
+import vldc.aswi.domain.User;
 
 import java.util.List;
 
@@ -26 +26 @@
      * @return List of configurations.
      */
     List<Configuration> getByAssemblyId(Long assemblyId);
+
+    /**
+     * Get list of configurations by user.
+     * @param user - user.
+     * @return List of configurations.
+     */
+    List<Configuration> getByUserEquals(User user);
 }

src/main/java/vldc/aswi/service/AssemblyManager.java

@@ -56 +56 @@
      * @return True if delete was successful, otherwise false.
      */
     boolean deleteAssembly(Long id);
+
+    /**
+     * Get all Assemblies from database with role, ordered.
+     * @return List of assemblies.
+     */
+    List<Assembly> getAssembliesWithRoleOrdered(Role role);
 }

src/main/java/vldc/aswi/service/AssemblyManagerImpl.java

@@ -77 +77 @@
         return this.assemblyRepository.getByOrderByAssemblyOrderAsc();
     }
 
+    /**
+     * Get all Assemblies from database with role, ordered.
+     * @return List of assemblies.
+     */
+    @Override
+    public List<Assembly> getAssembliesWithRoleOrdered(Role role) {
+        return this.assemblyRepository.getByRolesContainingOrderByAssemblyOrderAsc(role);
+    }
+
     /**
      * Get assembly by id.
      * @param id - ID of assembly.

src/main/java/vldc/aswi/service/ConfigurationManagerImpl.java

@@ -5 +5 @@
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.annotation.Order;
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import vldc.aswi.dao.*;
 import vldc.aswi.dao.parameter.ParameterInConfigurationRepository;
-import vldc.aswi.dao.parameter.ParameterTypeRepository;
-import vldc.aswi.domain.Assembly;
-import vldc.aswi.domain.Configuration;
-import vldc.aswi.domain.Function;
+import vldc.aswi.domain.*;
 import vldc.aswi.domain.parameter.ParameterInConfiguration;
 import vldc.aswi.service.parameter.ParameterInConfigurationManager;
 import vldc.aswi.service.parameter.ParameterTypeManager;
+import vldc.aswi.utils.AuthControl;
 
 import javax.transaction.Transactional;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 
 @Service
@@ -83 +83 @@
      */
     @Override
     public List<Configuration> getConfigurations() {
-        List<Configuration> retVal = new LinkedList<>();
-        this.configurationRepository.findAll().forEach(retVal::add);
-        return retVal;
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        String username;
+        if (!(authentication instanceof AnonymousAuthenticationToken)) {
+            username = authentication.getName();
+        }
+        else {
+            // TODO: 04.05.2020 error message, user not authenticated
+            return null;
+        }
+        User user = userRepository.findByUsername(username);
+
+        return configurationRepository.getByUserEquals(user);
     }
 
     /**
@@ -106 +115 @@
      */
     @Override
     public Configuration saveConfiguration(Configuration newConfiguration, String id) {
-        if(id.equals("")) {
+        if (id.equals("")) {
             return addConfiguration(newConfiguration);
         }
         else {
@@ -158 +167 @@
      * @return saved configuration
      */
     private Configuration addConfiguration(Configuration newConfiguration) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        String username = AuthControl.getUserName();
+        if (username == null) {
+            // TODO: 04.05.2020 error message, user not authenticated
+        }
         Configuration configuration = new Configuration();
         Assembly assembly = assemblyRepository.getById(newConfiguration.getAssembly().getId());
         configuration.setAssembly(assembly);
         configuration.setName(newConfiguration.getName());
         configuration.setTableName(newConfiguration.getTableName());
-        configuration.setUser(userRepository.getById((long) 1));
+        configuration.setUser(userRepository.findByUsername(username));
         Configuration savedConfiguration = configurationRepository.save(configuration);
 
         savedConfiguration.setParametersInConfiguration(new ArrayList<>());

src/main/java/vldc/aswi/service/RoleManager.java

@@ -20 +20 @@
      * @param name Name of role.
      */
     void addRole(String name);
+
+    /**
+     * Get role from database by name.
+     * @param name name of the role
+     * @return List of roles.
+     */
+    public Role getRole(String name);
 }

src/main/java/vldc/aswi/service/RoleManagerImpl.java

@@ -62 +62 @@
         this.roleRepository.findAll().forEach(retVal::add);
         return retVal;
     }
+
+    /**
+     * Get role from database by name.
+     * @param name name of the role
+     * @return List of roles.
+     */
+    @Override
+    public Role getRole(String name) {
+        return roleRepository.getByName(name);
+    }
 }

src/main/java/vldc/aswi/utils/AuthControl.java

@@ +1 @@
+package vldc.aswi.utils;
+
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Classed used for getting names and roles of logged in users
+ */
+public class AuthControl {
+
+    /**
+     * Gets the name of current user
+     * @return name of current user
+     */
+    public static String getRoleName() {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        Set<String> roles;
+        if (!(authentication instanceof AnonymousAuthenticationToken)) {
+            roles = authentication.getAuthorities().stream()
+                    .map(GrantedAuthority::getAuthority).collect(Collectors.toSet());
+            return roles.iterator().next().replace("ROLE_", "");
+        } else {
+            // TODO: 04.05.2020 error message, user not authenticated
+            return null;
+        }
+    }
+
+    /**
+     * Gets the role name of the current user
+     * @return role name of the current user
+     */
+    public static String getUserName() {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (!(authentication instanceof AnonymousAuthenticationToken)) {
+            return authentication.getName();
+        } else {
+            // TODO: 04.05.2020 error message, user not authenticated
+            return null;
+        }
+    }
+}

src/main/java/vldc/aswi/web/controller/AssemblyController.java

@@ -1 +1 @@
 package vldc.aswi.web.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.BindingResult;
@@ -12 +16 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import vldc.aswi.domain.Assembly;
-import vldc.aswi.domain.Configuration;
-import vldc.aswi.domain.Location;
-import vldc.aswi.domain.Operator;
+import vldc.aswi.domain.*;
 import vldc.aswi.domain.parameter.Parameter;
 import vldc.aswi.domain.parameter.ParameterInConfiguration;
 import vldc.aswi.service.*;
 import vldc.aswi.service.parameter.ParameterManager;
 import vldc.aswi.service.parameter.ParameterTypeManager;
+import vldc.aswi.utils.AuthControl;
 import vldc.aswi.validators.AssemblyValidator;
 import vldc.aswi.utils.Utils;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Controller for assemblies and configurations
@@ -104 +108 @@
 
         Assembly assembly = this.assemblyManager.getAssemblyById(Long.parseLong(id));
 
+        // TODO: 04.05.2020 error page when id doesn't exist
+
+        String roleName = AuthControl.getRoleName();
+
+        if (roleName == null) {
+            // TODO: 04.05.2020 error message, user not authenticated
+        }
+
+        Role role = roleManager.getRole(roleName);
+
+        if (!assembly.getRoles().contains(role)) {
+            // TODO: 04.05.2020 Error page, wrong role
+            return new ModelAndView("redirect:/");
+        }
+
         Configuration configuration = new Configuration();
 
         configuration.setAssembly(assembly);

src/main/java/vldc/aswi/web/controller/ConfigurationController.java

@@ -1 +1 @@
 package vldc.aswi.web.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.BindingResult;
@@ -14 +17 @@
 import vldc.aswi.domain.Operator;
 import vldc.aswi.domain.parameter.ParameterInConfiguration;
 import vldc.aswi.service.ConfigurationManager;
+import vldc.aswi.utils.AuthControl;
 import vldc.aswi.utils.Utils;
 
 import javax.validation.Valid;
@@ -44 +48 @@
 
         Configuration configuration = configurationManager.getConfigurationById(Long.parseLong(id));
 
+        // TODO: 04.05.2020 error page when id doesn't exist
+
+        String userName = AuthControl.getUserName();
+
+        if (userName == null) {
+            // TODO: 04.05.2020 error message, user not authenticated
+        }
+        else if (!userName.equals(configuration.getUser().getUsername())) {
+            // TODO: 04.05.2020 error page wrong user
+            return new ModelAndView("redirect:/");
+        }
+
         List<ParameterInConfiguration> parametersInConfiguration = new ArrayList<>(configuration.getParametersInConfiguration());
         configuration.setParametersInConfiguration(parametersInConfiguration);
 
@@ -69 +85 @@
         ModelAndView modelAndView = new ModelAndView();
 
         if (bindingResult.hasErrors()) {
+            // TODO: 04.05.2020 Error message
             modelAndView.setViewName("redirect:/");
 
             return modelAndView;

src/main/java/vldc/aswi/web/controller/IndexController.java

@@ -6 +6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import vldc.aswi.domain.Assembly;
+import vldc.aswi.domain.Role;
 import vldc.aswi.domain.parameter.Parameter;
 import vldc.aswi.service.AssemblyManager;
 import vldc.aswi.service.ConfigurationManager;
+import vldc.aswi.service.RoleManager;
 import vldc.aswi.service.SqlQueryManager;
+import vldc.aswi.utils.AuthControl;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
@@ -44 +47 @@
 	@Autowired
 	private ConfigurationManager configurationManager;
 
+	/**
+	 * Autowired role manager
+	 */
+	@Autowired
+	private RoleManager roleManager;
+
 	/**
 	 * Shows index page
 	 * @return modelAndView with index page
@@ -54 +63 @@
 
 		ModelMap modelMap = modelAndView.getModelMap();
 
-		List<Assembly> assemblies = assemblyManager.getAssembliesOrdered();
+		String roleName = AuthControl.getRoleName();
+
+		if (roleName == null) {
+			// TODO: 04.05.2020 error message, user not authenticated
+		}
+
+		Role role = roleManager.getRole(roleName);
 
+		List<Assembly> assemblies = assemblyManager.getAssembliesWithRoleOrdered(role);
 
 		modelMap.addAttribute("assemblies", assemblies);
 		modelMap.addAttribute("attributes", createAttributesString(assemblies));