Merge pull request kaakaww#25 from kaakaww/feature/SCAN-300/add-multi-tenancy

d-co-white · web-flow · commit 416bac4f7b0e · 2022-08-03T18:59:32.000-06:00
Feature/scan 300/add multi tenancy
diff --git a/src/main/java/hawk/Application.java b/src/main/java/hawk/Application.java
@@ -3,6 +3,7 @@
 import java.util.Arrays;
 import java.util.stream.Stream;
 
+import hawk.context.TenantContext;
 import hawk.entity.Item;
 import hawk.entity.User;
 import hawk.repos.ItemRepo;
@@ -60,13 +61,22 @@ public CommandLineRunner commandLineRunner(ApplicationContext ctx, ItemRepo repo
             if (userRepo.count() == 0) {
                 userRepo.findAll().forEach(item -> System.out.println(String.format("item: %s", item.getName())));
 
+                TenantContext.setCurrentTenant("1234567");
                 Stream.of(1, 2, 3).forEach(i -> {
+                    System.out.println(String.format("Adding user%d", i));
+                    userRepo.save(new User(String.format("user%d", i), String.format("we have the best users, users%d", i), "1234567"));
+                });
+                userRepo.save(new User("user", "The auth user", "1234567"));
+
+                TenantContext.setCurrentTenant("12345678");
+                Stream.of(4, 5, 6).forEach(i -> {
                     System.out.println(String.format("Adding item%d", i));
-                    userRepo.save(new User(String.format("user%d", i), String.format("we have the best users, users%d", i)));
+                    userRepo.save(new User(String.format("user%d", i), String.format("we have the best users, users%d", i), "12345678"));
                 });
 
+
                 System.out.println(String.format("Items in DB %d", userRepo.count()));
-                userRepo.findAll().forEach(item -> System.out.println(String.format("item: %s", item.getName())));
+                userRepo.findAll().forEach(item -> System.out.println(String.format("user: %s", item.getName())));
             }
 
         };
diff --git a/src/main/java/hawk/Config.java b/src/main/java/hawk/Config.java
@@ -1,6 +1,7 @@
 package hawk;
 
 import hawk.service.SearchService;
+import hawk.service.UserSearchService;
 import hawk.service.UserService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -10,12 +11,13 @@
 @Configuration
 @EnableJpaRepositories
 public class Config implements WebMvcConfigurer {
-
     @Bean
     public SearchService searchService(){
         return new SearchService();
     }
     @Bean
+    public UserSearchService userSearchService() { return new UserSearchService(); }
+    @Bean
     public UserService userService() { return new UserService(); }
 
 }
diff --git a/src/main/java/hawk/api/AuthenticationRequest.java b/src/main/java/hawk/api/AuthenticationRequest.java
@@ -15,4 +15,5 @@ public class AuthenticationRequest implements Serializable {
     private static final long serialVersionUID = -6986746375915710855L;
     private String username;
     private String password;
+    private String tenant;
 }
diff --git a/src/main/java/hawk/api/jwt/JwtAuthController.java b/src/main/java/hawk/api/jwt/JwtAuthController.java
@@ -1,6 +1,7 @@
 package hawk.api.jwt;
 
 import hawk.api.AuthenticationRequest;
+import hawk.repos.UserRepo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -27,12 +28,15 @@ public class JwtAuthController {
     private final AuthenticationManager authenticationManager;
     private final JwtTokenProvider jwtTokenProvider;
     private final UserDetailsService userDetailsService;
+    private final UserRepo userRepo;
 
     @Autowired
-    public JwtAuthController(AuthenticationManager authenticationManager, JwtTokenProvider jwtTokenProvider, UserDetailsService userDetailsService) {
+    public JwtAuthController(AuthenticationManager authenticationManager, JwtTokenProvider jwtTokenProvider, UserDetailsService userDetailsService,
+                             UserRepo userRepo) {
         this.authenticationManager = authenticationManager;
         this.jwtTokenProvider = jwtTokenProvider;
         this.userDetailsService = userDetailsService;
+        this.userRepo = userRepo;
     }
 
     @PostMapping("/signin")
@@ -44,8 +48,11 @@ public ResponseEntity signin(@RequestBody AuthenticationRequest data) {
             if (null == userDetails) {
                 throw new UsernameNotFoundException("username");
             }
+
+            String tenantId = this.userRepo.findByName(username).getTenantId();
             String token = jwtTokenProvider.createToken(username,
-                    userDetails.getAuthorities().stream().map(auth -> ((GrantedAuthority) auth).toString()).collect(Collectors.toList()));
+                    userDetails.getAuthorities().stream().map(auth -> ((GrantedAuthority) auth).toString()).collect(Collectors.toList()),
+                    tenantId);
             Map<Object, Object> model = new HashMap<>();
             model.put("username", username);
             model.put("token", token);
diff --git a/src/main/java/hawk/api/jwt/JwtFilter.java b/src/main/java/hawk/api/jwt/JwtFilter.java
@@ -1,6 +1,7 @@
 package hawk.api.jwt;
 
 import hawk.api.jwt.JwtTokenProvider;
+import hawk.context.TenantContext;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.filter.GenericFilterBean;
@@ -28,6 +29,7 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain filter
         if (token != null && jwtTokenProvider.validateToken(token)) {
             Authentication auth = token != null ? jwtTokenProvider.getAuthentication(token) : null;
             SecurityContextHolder.getContext().setAuthentication(auth);
+            TenantContext.setCurrentTenant(jwtTokenProvider.getTenantId(token));
         }
 
         filterChain.doFilter(req, res);
diff --git a/src/main/java/hawk/api/jwt/JwtTokenProvider.java b/src/main/java/hawk/api/jwt/JwtTokenProvider.java
@@ -36,9 +36,10 @@ protected void init() {
         secretKey = Base64.getEncoder().encodeToString(secretKey.getBytes());
     }
 
-    public String createToken(String username, List<String> roles) {
+    public String createToken(String username, List<String> roles, String companyId) {
         Claims claims = Jwts.claims().setSubject(username);
         claims.put("roles", roles);
+        claims.put("tenantId", companyId);
         Date now = new Date();
         Date validity = new Date(now.getTime() + validityInMilliseconds);
         return Jwts.builder()//
@@ -58,6 +59,10 @@ private String getUsername(String token) {
         return Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody().getSubject();
     }
 
+    public String getTenantId(String token) {
+        return Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody().get("tenantId", String.class);
+    }
+
     public String resolveToken(HttpServletRequest req) {
         String bearerToken = req.getHeader("Authorization");
         if (bearerToken != null && bearerToken.startsWith("Bearer ")) {
diff --git a/src/main/java/hawk/api/jwt/JwtUserController.java b/src/main/java/hawk/api/jwt/JwtUserController.java
@@ -1,7 +1,8 @@
 package hawk.api.jwt;
 
+import hawk.entity.User;
 import hawk.form.Search;
-import hawk.service.SearchService;
+import hawk.service.UserSearchService;
 import hawk.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -10,26 +11,37 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/jwt/users")
 public class JwtUserController {
 
     private final UserService userService;
+    private final UserSearchService userSearchService;
 
     @Autowired
-    public JwtUserController(UserService userService) {
+    public JwtUserController(UserService userService, UserSearchService userSearchService) {
         this.userService = userService;
+        this.userSearchService = userSearchService;
     }
 
     @GetMapping("/search/")
     public ResponseEntity searchAll() {
         Search search = new Search("");
-        return ResponseEntity.ok(userService.search(search));
+        return ResponseEntity.ok(this.userService.findUsersByName(""));
     }
 
     @GetMapping("/search/{text}")
     public ResponseEntity search(@PathVariable("text") String text) {
         Search search = new Search(text);
-        return ResponseEntity.ok(userService.search(search));
+        return ResponseEntity.ok(this.userService.findUsersByName(search.getSearchText()));
+    }
+
+    @GetMapping("/search/bad/{text}")
+    public ResponseEntity searchCrappy(@PathVariable("text") String text) {
+        Search search = new Search(text);
+        return ResponseEntity.ok(this.userSearchService.search(search));
     }
 }
diff --git a/src/main/java/hawk/aspect/UserServiceAspect.java b/src/main/java/hawk/aspect/UserServiceAspect.java
@@ -0,0 +1,20 @@
+package hawk.aspect;
+
+import hawk.context.TenantContext;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.hibernate.Session;
+import org.springframework.stereotype.Component;
+import hawk.service.UserService;
+
+@Aspect
+@Component
+public class UserServiceAspect {
+    @Before("execution(* hawk.service.UserService.*(..))&& target(userService) ")
+    public void aroundExecution(JoinPoint pjp, UserService userService) throws Throwable {
+        org.hibernate.Filter filter = userService.entityManager.unwrap(Session.class).enableFilter("tenantFilter");
+        filter.setParameter("tenantId", TenantContext.getCurrentTenant());
+        filter.validate();
+    }
+}
diff --git a/src/main/java/hawk/context/TenantContext.java b/src/main/java/hawk/context/TenantContext.java
@@ -0,0 +1,17 @@
+package hawk.context;
+
+public class TenantContext {
+    private static ThreadLocal<String> currentTenant = new InheritableThreadLocal<>();
+
+    public static String getCurrentTenant() {
+        return currentTenant.get();
+    }
+
+    public static void setCurrentTenant(String tenant) {
+        currentTenant.set(tenant);
+    }
+
+    public static void clear() {
+        currentTenant.set(null);
+    }
+}
diff --git a/src/main/java/hawk/controller/AdminController.java b/src/main/java/hawk/controller/AdminController.java
@@ -1,9 +1,8 @@
 package hawk.controller;
 
-import hawk.entity.Item;
+import hawk.entity.User;
 import hawk.form.Search;
-import hawk.service.SearchService;
-import hawk.service.UserService;
+import hawk.service.UserSearchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -16,7 +15,7 @@
 @Controller
 public class AdminController {
     @Autowired
-    UserService userService;
+    UserSearchService userSearchService;
 
     @GetMapping("/admin")
     public String index(Model model) {
@@ -45,7 +44,7 @@ public String searchForm(Model model) {
 
     @PostMapping( "/admin/search")
     public String searchSubmit(@ModelAttribute Search search, Model model) {
-        List<Item> users = userService.search(search);
+        List<User> users = userSearchService.search(search);
         model.addAttribute("users", users);
         model.addAttribute("search", search);
         model.addAttribute("title", "User Search");
diff --git a/src/main/java/hawk/entity/TenantSupport.java b/src/main/java/hawk/entity/TenantSupport.java
@@ -0,0 +1,5 @@
+package hawk.entity;
+
+public interface TenantSupport {
+    void setTenantId(String tenantId);
+}
diff --git a/src/main/java/hawk/entity/User.java b/src/main/java/hawk/entity/User.java
@@ -1,28 +1,42 @@
 package hawk.entity;
 
+import org.hibernate.annotations.Filter;
+import org.hibernate.annotations.FilterDef;
+import org.hibernate.annotations.ParamDef;
+
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
 
 @Entity
-public class User {
+@Table(name = "user", schema = "public")
+@FilterDef(name = "tenantFilter", parameters = {@ParamDef(name = "tenantId", type = "string")})
+@Filter(name = "tenantFilter", condition = "tenant_id = :tenantId")
+public class User implements TenantSupport, Serializable {
+    private static final long serialVersionUID = -6986746375915710855L;
     @Id
     @GeneratedValue(strategy= GenerationType.AUTO)
     private Long id;
     private String name;
     private String description;
+    @Column(name = "tenant_id")
+    private String tenantId;
 
     protected User() {}
 
-    public User(Long id, String name, String description) {
-        this(name, description);
+    public User(Long id, String name, String description, String tenantId) {
+        this(name, description, tenantId);
         this.id = id;
     }
 
-    public User(String name, String description) {
+    public User(String name, String description, String tenantId) {
         this.name = name;
         this.description = description;
+        this.tenantId = tenantId;
     }
 
     public Long getId() {
@@ -37,4 +51,13 @@ public String getDescription() {
         return description;
     }
 
+    public String getTenantId() {
+        return tenantId;
+    }
+
+
+    @Override
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
 }
diff --git a/src/main/java/hawk/interceptor/DBInterceptor.java b/src/main/java/hawk/interceptor/DBInterceptor.java
@@ -0,0 +1,61 @@
+package hawk.interceptor;
+
+import hawk.context.TenantContext;
+import hawk.entity.TenantSupport;
+import org.hibernate.EmptyInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.hibernate.type.Type;
+
+import javax.sql.DataSource;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+@Configuration
+public class DBInterceptor {
+
+    @Autowired
+    private JpaProperties jpaProperties;
+
+    @Bean
+    public EmptyInterceptor hibernateInterceptor() {
+        return new EmptyInterceptor() {
+
+            @Override
+            public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) {
+                if (entity instanceof TenantSupport) {
+                    ((TenantSupport) entity).setTenantId(TenantContext.getCurrentTenant());
+                }
+            }
+
+
+            @Override
+            public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types) {
+                if (entity instanceof TenantSupport) {
+                    ((TenantSupport) entity).setTenantId(TenantContext.getCurrentTenant());
+                }
+                return false;
+            }
+
+            @Override
+            public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) {
+                if (entity instanceof TenantSupport) {
+                    ((TenantSupport) entity).setTenantId(TenantContext.getCurrentTenant());
+                }
+                return false;
+            }
+        };
+    }
+
+    @Bean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder factory, DataSource dataSource, JpaProperties properties) {
+        Map<String, Object> jpaPropertiesMap = new HashMap<>(jpaProperties.getProperties());
+        jpaPropertiesMap.put("hibernate.ejb.interceptor", hibernateInterceptor());
+        return factory.dataSource(dataSource).packages("hawk.entity").properties(jpaPropertiesMap).build();
+    }
+}
diff --git a/src/main/java/hawk/repos/UserRepo.java b/src/main/java/hawk/repos/UserRepo.java
diff --git a/src/main/java/hawk/service/UserSearchService.java b/src/main/java/hawk/service/UserSearchService.java
diff --git a/src/main/java/hawk/service/UserService.java b/src/main/java/hawk/service/UserService.java

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,5 @@ public class AuthenticationRequest implements Serializable {`
`15`	`15`	`private static final long serialVersionUID = -6986746375915710855L;`
`16`	`16`	`private String username;`
`17`	`17`	`private String password;`
	`18`	`+ private String tenant;`
`18`	`19`	`}`