refactor: Add Aspect AOP for davinci share module

1. adapt pre-version share token 2. check token and data permission
edp963 · xxxllluuu · Aug 21, 2020 · Apr 22, 2020 · Apr 23, 2020 · Apr 23, 2020
commit 220a240f784f9036e84aa661ab779cc255b0cda4
diff --git a/server/pom.xml b/server/pom.xml
@@ -424,7 +424,7 @@
             <scope>runtime</scope>
         </dependency>
 
-		<!--oracle -->
+        <!--oracle -->
 		<!--<dependency> -->
 		<!--<groupId>com.oracle</groupId> -->
 		<!--<artifactId>ojdbc6</artifactId> -->

diff --git a/server/src/main/java/edp/core/annotation/AuthShare.java b/server/src/main/java/edp/core/annotation/AuthShare.java
@@ -19,6 +19,9 @@
 
 package edp.core.annotation;
 
+import edp.davinci.service.share.ShareOperation;
+import edp.davinci.service.share.ShareType;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -31,4 +34,7 @@
 @Target({ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AuthShare {
+    ShareType type();
+
+    ShareOperation operation() default ShareOperation.READ;
 }
diff --git a/server/src/main/java/edp/davinci/controller/DownloadController.java b/server/src/main/java/edp/davinci/controller/DownloadController.java
@@ -26,6 +26,7 @@
 import edp.core.utils.FileUtils;
 import edp.davinci.common.controller.BaseController;
 import edp.davinci.core.common.Constants;
+import edp.davinci.core.common.ErrorMsg;
 import edp.davinci.core.common.ResultMap;
 import edp.davinci.core.enums.DownloadType;
 import edp.davinci.core.enums.FileTypeEnum;
@@ -35,6 +36,8 @@
 import edp.davinci.model.User;
 import edp.davinci.service.DownloadService;
 import edp.davinci.service.ShareDownloadService;
+import edp.davinci.service.share.ShareOperation;
+import edp.davinci.service.share.ShareType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -124,61 +127,38 @@ public ResponseEntity submitDownloadTask(@PathVariable String type,
 
 
     @ApiOperation(value = "submit share download")
-    @PostMapping(value = "/share/submit/{type}/{uuid}/{dataToken:.*}", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    @AuthShare
-    public ResponseEntity submitShareDownloadTask(@PathVariable(name = "type") String type,
+    @PostMapping(value = "/share/submit/{type}/{uuid}/{token:.*}", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @AuthShare(type = ShareType.DATA, operation = ShareOperation.DOWNLOAD)
+    public ResponseEntity submitShareDownloadTask(@PathVariable(name = "token") String token,
+                                                  @RequestParam(required = false) String password,
                                                   @PathVariable(name = "uuid") String uuid,
-                                                  @PathVariable(name = "dataToken") String dataToken,
+                                                  @PathVariable(name = "type") String type,
                                                   @Valid @RequestBody(required = false) DownloadViewExecuteParam[] params,
                                                   @ApiIgnore @CurrentUser User user,
                                                   HttpServletRequest request) {
-
-
-        if (StringUtils.isEmpty(dataToken)) {
-            ResultMap resultMap = new ResultMap().fail().message("Invalid share token");
+        if (StringUtils.isEmpty(token)) {
+            ResultMap resultMap = new ResultMap().fail().message(ErrorMsg.ERR_INVALID_TOKEN);
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
 
         List<DownloadViewExecuteParam> downloadViewExecuteParams = Arrays.asList(params);
-        boolean rst = shareDownloadService.submit(DownloadType.getDownloadType(type), uuid, dataToken, user, downloadViewExecuteParams);
+        boolean rst = shareDownloadService.submit(DownloadType.getDownloadType(type), uuid, token, user, downloadViewExecuteParams);
 
         return ResponseEntity.ok(rst ? new ResultMap().success() : new ResultMap().fail());
     }
 
-
-    @ApiOperation(value = "get share download record page")
-    @GetMapping(value = "/share/page/{uuid}/{token:.*}", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    @AuthShare
-    public ResponseEntity getShareDownloadRecordPage(@PathVariable(name = "uuid") String uuid,
-                                                     @PathVariable(name = "token") String token,
-                                                     @ApiIgnore @CurrentUser User user,
-                                                     HttpServletRequest request) {
-        if (StringUtils.isEmpty(token)) {
-            ResultMap resultMap = new ResultMap().fail().message("Invalid share token");
-            return ResponseEntity.status(resultMap.getCode()).body(resultMap);
-        }
-
-        List<ShareDownloadRecord> records = shareDownloadService.queryDownloadRecordPage(uuid, token, user);
-
-        if (null == user) {
-            return ResponseEntity.ok(new ResultMap(tokenUtils).payloads(records));
-        } else {
-            return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payloads(records));
-        }
-    }
-
-
     @ApiOperation(value = "get download record file")
     @GetMapping(value = "/share/record/file/{id}/{uuid}/{token:.*}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
-    @AuthShare
-    public ResponseEntity getShareDownloadRecordFile(@PathVariable(name = "id") String id,
+    @AuthShare(type = ShareType.FILE, operation = ShareOperation.DOWNLOAD)
+    public ResponseEntity getShareDownloadRecordFile(@PathVariable(name = "token") String token,
+                                                     @RequestParam(required = false) String password,
                                                      @PathVariable(name = "uuid") String uuid,
-                                                     @PathVariable(name = "token") String token,
+                                                     @PathVariable(name = "id") String id,
                                                      @ApiIgnore @CurrentUser User user,
                                                      HttpServletRequest request,
                                                      HttpServletResponse response) {
         if (StringUtils.isEmpty(token)) {
-            ResultMap resultMap = new ResultMap().fail().message("Invalid share token");
+            ResultMap resultMap = new ResultMap().fail().message(ErrorMsg.ERR_INVALID_TOKEN);
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
 
@@ -196,6 +176,28 @@ public ResponseEntity getShareDownloadRecordFile(@PathVariable(name = "id") Stri
         return null;
     }
 
+    @ApiOperation(value = "get share download record page")
+    @GetMapping(value = "/share/page/{uuid}/{token:.*}", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @AuthShare(type = ShareType.RECORD, operation = ShareOperation.DOWNLOAD)
+    public ResponseEntity getShareDownloadRecordPage(@PathVariable(name = "token") String token,
+                                                     @RequestParam(required = false) String password,
+                                                     @PathVariable(name = "uuid") String uuid,
+                                                     @ApiIgnore @CurrentUser User user,
+                                                     HttpServletRequest request) {
+        if (StringUtils.isEmpty(token)) {
+            ResultMap resultMap = new ResultMap().fail().message(ErrorMsg.ERR_INVALID_TOKEN);
+            return ResponseEntity.status(resultMap.getCode()).body(resultMap);
+        }
+
+        List<ShareDownloadRecord> records = shareDownloadService.queryDownloadRecordPage(uuid, token, user);
+
+        if (null == user) {
+            return ResponseEntity.ok(new ResultMap(tokenUtils).payloads(records));
+        } else {
+            return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payloads(records));
+        }
+    }
+
 
     private void encodeFileName(HttpServletRequest request, HttpServletResponse response, String filename) throws UnsupportedEncodingException {
         response.setHeader("Content-Type", "application/force-download");

diff --git a/server/src/main/java/edp/davinci/controller/ShareController.java b/server/src/main/java/edp/davinci/controller/ShareController.java
@@ -27,6 +27,7 @@
 import edp.core.model.Paginate;
 import edp.davinci.common.controller.BaseController;
 import edp.davinci.core.common.Constants;
+import edp.davinci.core.common.ErrorMsg;
 import edp.davinci.core.common.ResultMap;
 import edp.davinci.dto.shareDto.ShareDashboard;
 import edp.davinci.dto.shareDto.ShareDisplay;
@@ -37,6 +38,8 @@
 import edp.davinci.dto.viewDto.ViewExecuteParam;
 import edp.davinci.model.User;
 import edp.davinci.service.ShareService;
+import edp.davinci.service.share.ShareOperation;
+import edp.davinci.service.share.ShareType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -105,13 +108,14 @@ public ResponseEntity shareLogin(@PathVariable String token,
      * @return
      */
     @ApiOperation(value = "get share dashboard")
-    @AuthShare
+    @AuthShare(type = ShareType.DASHBOARD, operation = ShareOperation.READ)
     @GetMapping("/dashboard/{token}")
     public ResponseEntity getShareDashboard(@PathVariable String token,
+                                            @RequestParam(required = false) String password,
                                             @ApiIgnore @CurrentUser User user,
                                             HttpServletRequest request) {
         if (StringUtils.isEmpty(token)) {
-            ResultMap resultMap = new ResultMap().fail().message("Invalid share token");
+            ResultMap resultMap = new ResultMap().fail().message(ErrorMsg.ERR_INVALID_TOKEN);
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
 
@@ -133,13 +137,14 @@ public ResponseEntity getShareDashboard(@PathVariable String token,
      * @return
      */
     @ApiOperation(value = "get share display")
-    @AuthShare
+    @AuthShare(type = ShareType.DISPLAY, operation = ShareOperation.READ)
     @GetMapping("/display/{token}")
     public ResponseEntity getShareDisplay(@PathVariable String token,
+                                          @RequestParam(required = false) String password,
                                           @ApiIgnore @CurrentUser User user,
                                           HttpServletRequest request) {
         if (StringUtils.isEmpty(token)) {
-            ResultMap resultMap = new ResultMap().fail().message("Invalid share token");
+            ResultMap resultMap = new ResultMap().fail().message(ErrorMsg.ERR_INVALID_TOKEN);
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
 
@@ -161,13 +166,14 @@ public ResponseEntity getShareDisplay(@PathVariable String token,
      * @return
      */
     @ApiOperation(value = "get share widget")
-    @AuthShare
+    @AuthShare(type = ShareType.WIDGET, operation = ShareOperation.READ)
     @GetMapping("/widget/{token}")
     public ResponseEntity getShareWidget(@PathVariable String token,
+                                         @RequestParam(required = false) String password,
                                          @ApiIgnore @CurrentUser User user,
                                          HttpServletRequest request) {
         if (StringUtils.isEmpty(token)) {
-            ResultMap resultMap = new ResultMap().fail().message("Invalid share token");
+            ResultMap resultMap = new ResultMap().fail().message(ErrorMsg.ERR_INVALID_TOKEN);
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
 
@@ -190,15 +196,16 @@ public ResponseEntity getShareWidget(@PathVariable String token,
      * @return
      */
     @ApiOperation(value = "get share data")
-    @AuthShare
+    @AuthShare(type = ShareType.DATA, operation = ShareOperation.LOAD_DATA)
     @PostMapping(value = "/data/{token}", consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity getShareData(@PathVariable String token,
+                                       @RequestParam(required = false) String password,
                                        @RequestBody(required = false) ViewExecuteParam executeParam,
                                        @ApiIgnore @CurrentUser User user,
                                        HttpServletRequest request) throws SQLException {
 
         if (StringUtils.isEmpty(token)) {
-            ResultMap resultMap = new ResultMap().fail().message("Invalid share token");
+            ResultMap resultMap = new ResultMap().fail().message(ErrorMsg.ERR_INVALID_TOKEN);
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
 
@@ -223,17 +230,18 @@ public ResponseEntity getShareData(@PathVariable String token,
      * @return
      */
     @ApiOperation(value = "get share data")
-    @AuthShare
+    @AuthShare(type = ShareType.DATA, operation = ShareOperation.LOAD_DATA)
     @PostMapping(value = "/data/{token}/distinctvalue/{viewId}", consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity getDistinctValue(@PathVariable("token") String token,
+                                           @RequestParam(required = false) String password,
                                            @PathVariable("viewId") Long viewId,
                                            @Valid @RequestBody DistinctParam param,
                                            @ApiIgnore BindingResult bindingResult,
                                            @ApiIgnore @CurrentUser User user,
                                            HttpServletRequest request) {
 
         if (StringUtils.isEmpty(token)) {
-            ResultMap resultMap = new ResultMap().fail().message("Invalid share token");
+            ResultMap resultMap = new ResultMap().fail().message(ErrorMsg.ERR_INVALID_TOKEN);
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
 
@@ -248,43 +256,14 @@ public ResponseEntity getDistinctValue(@PathVariable("token") String token,
         }
 
         try {
-            ResultMap resultMap = shareService.getDistinctValue(token, viewId, param, user, request);
+            //TODO
+//            shareService.getDistinctValue(token, viewId, param, user, request);
+            ResultMap resultMap = null;
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         } catch (Exception e) {
             e.printStackTrace();
             log.error(e.getMessage());
             return ResponseEntity.status(HttpCodeEnum.SERVER_ERROR.getCode()).body(HttpCodeEnum.SERVER_ERROR.getMessage());
         }
     }
-
-
-    /**
-     * share页获取csv信息
-     *
-     * @param token
-     * @param executeParam
-     * @param user
-     * @param request
-     * @return
-     */
-    @ApiOperation(value = "get share data csv")
-    @AuthShare
-    @PostMapping(value = "/csv/{token}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity generationShareDataCsv(@PathVariable String token,
-                                                 @RequestBody(required = false) ViewExecuteParam executeParam,
-                                                 @ApiIgnore @CurrentUser User user,
-                                                 HttpServletRequest request) {
-
-        if (StringUtils.isEmpty(token)) {
-            ResultMap resultMap = new ResultMap().fail().message("Invalid share token");
-            return ResponseEntity.status(resultMap.getCode()).body(resultMap);
-        }
-
-        String filePath = shareService.generationShareDataCsv(executeParam, user, token);
-        if (null == user) {
-            return ResponseEntity.ok(new ResultMap().success().payload(filePath));
-        } else {
-            return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payload(filePath));
-        }
-    }
 }
diff --git a/server/src/main/java/edp/davinci/dao/RelRoleUserMapper.java b/server/src/main/java/edp/davinci/dao/RelRoleUserMapper.java
@@ -26,6 +26,7 @@
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Set;
 
 public interface RelRoleUserMapper {
     int insert(RelRoleUser relRoleUser);
@@ -56,6 +57,9 @@ public interface RelRoleUserMapper {
     List<RelRoleUser> getByIds(List<Long> ids);
 
 
+    Set<RelRoleUser> selectByUserAndRoles(@Param("userId") Long userId, @Param("roleIds") Set<Long> roleIds);
+
+
     @Select({
             "SELECT rru.id, u.id as 'user.id', IFNULL(u.`name`, u.username) as 'user.username', u.avatar",
             "FROM rel_role_user rru LEFT JOIN `user` u on u.id = rru.user_id",

diff --git a/server/src/main/java/edp/davinci/dto/shareDto/ShareEntity.java b/server/src/main/java/edp/davinci/dto/shareDto/ShareEntity.java
@@ -19,7 +19,6 @@
 package edp.davinci.dto.shareDto;
 
 import edp.core.utils.CollectionUtils;
-import edp.davinci.core.common.Constants;
 import edp.davinci.service.share.ShareDataPermission;
 import edp.davinci.service.share.ShareMode;
 import lombok.Data;
@@ -54,14 +53,7 @@ public class ShareEntity {
      * <p>
      * for mode == 3
      */
-    private Set<Long> viewerIds;
-
-    /**
-     * viewer email
-     * <p>
-     * for mode == 3
-     */
-    private Set<String> viewerEmails;
+    private Set<Long> viewers;
 
     /**
      * role id
@@ -83,23 +75,16 @@ public void valid() throws IllegalArgumentException {
                 }
                 break;
             case AUTH:
-                if (CollectionUtils.isEmpty(this.viewerEmails) && CollectionUtils.isEmpty(this.roles) && CollectionUtils.isEmpty(viewerEmails)) {
+                if (CollectionUtils.isEmpty(this.viewers) && CollectionUtils.isEmpty(this.roles)) {
                     throw new IllegalArgumentException("Invalid shared user in AUTH share mode");
                 }
-                if (!CollectionUtils.isEmpty(viewerIds)) {
-                    viewerIds.forEach(id -> {
+                if (!CollectionUtils.isEmpty(viewers)) {
+                    viewers.forEach(id -> {
                         if (id < 1L) {
                             throw new IllegalArgumentException("Invalid viewer: " + id);
                         }
                     });
                 }
-                if (!CollectionUtils.isEmpty(viewerEmails)) {
-                    viewerEmails.forEach(email -> {
-                        if (!Constants.PATTERN_EMAIL_FORMAT.matcher(email).find()) {
-                            throw new IllegalArgumentException("Invalid email: " + email);
-                        }
-                    });
-                }
                 if (!CollectionUtils.isEmpty(roles)) {
                     roles.forEach(id -> {
                         if (id < 1L) {