refactor optimize tty auth

Author: gy2006

core/src/main/java/com/flowci/core/auth/service/AuthServiceImpl.java

@@ -25,17 +25,16 @@
 import com.flowci.core.common.manager.SessionManager;
 import com.flowci.core.user.domain.User;
 import com.flowci.core.user.service.UserService;
-import com.flowci.exception.ArgumentException;
 import com.flowci.exception.AuthenticationException;
 import com.flowci.util.HashingHelper;
-import java.util.Objects;
-import java.util.Optional;
-
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+import java.util.Optional;
+
 @Log4j2
 @Service
 public class AuthServiceImpl implements AuthService {
@@ -68,7 +67,7 @@ public Tokens login(String email, String passwordOnMd5) {
         User user = userService.getByEmail(email);
 
         if (!Objects.equals(user.getPasswordOnMd5(), passwordOnMd5)) {
-            throw new ArgumentException("Invalid password");
+            throw new AuthenticationException("Invalid password");
         }
 
         // create token

core/src/main/java/com/flowci/core/job/controller/TtyController.java

@@ -1,6 +1,9 @@
 package com.flowci.core.job.controller;
 
+import com.flowci.core.agent.domain.TtyCmd;
 import com.flowci.core.auth.WebAuth;
+import com.flowci.core.common.manager.SpringEventManager;
+import com.flowci.core.job.event.TtyStatusUpdateEvent;
 import com.flowci.core.job.service.TtyService;
 import com.flowci.core.user.domain.User;
 import com.flowci.exception.AuthenticationException;
@@ -11,7 +14,6 @@
 import org.springframework.messaging.handler.annotation.MessageExceptionHandler;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.Payload;
-import org.springframework.messaging.simp.annotation.SendToUser;
 import org.springframework.stereotype.Controller;
 
 @Log4j2
@@ -21,37 +23,65 @@ public class TtyController {
     @Autowired
     private WebAuth webAuth;
 
+    @Autowired
+    private SpringEventManager eventManager;
+
     @Autowired
     private TtyService ttyService;
 
     @MessageExceptionHandler(AuthenticationException.class)
-    @SendToUser("/topic/tty/errors")
-    public Exception handleExceptions(AuthenticationException e) {
-        return e;
+    public void onAuthException(AuthenticationException e) {
+        TtyCmd.In in = (TtyCmd.In) e.getExtra();
+
+        TtyCmd.Out out = new TtyCmd.Out()
+                .setId(in.getId())
+                .setAction(in.getAction())
+                .setSuccess(false)
+                .setError(e.getMessage());
+
+        eventManager.publish(new TtyStatusUpdateEvent(this, out));
     }
 
     @MessageMapping("/tty/{jobId}/open")
     public void open(@DestinationVariable String jobId, MessageHeaders headers) {
-        validate(headers);
-        ttyService.open(jobId);
+        TtyCmd.In in = new TtyCmd.In()
+                .setId(jobId)
+                .setAction(TtyCmd.Action.OPEN);
+
+        validate(in, headers);
+        ttyService.execute(in);
     }
 
     @MessageMapping("/tty/{jobId}/shell")
     public void shell(@DestinationVariable String jobId, @Payload String script, MessageHeaders headers) {
-        validate(headers);
-        ttyService.shell(jobId, script);
+        TtyCmd.In in = new TtyCmd.In()
+                .setId(jobId)
+                .setAction(TtyCmd.Action.SHELL)
+                .setInput(script);
+
+        validate(in, headers);
+        ttyService.execute(in);
     }
 
     @MessageMapping("/tty/{jobId}/close")
     public void close(@DestinationVariable String jobId, MessageHeaders headers) {
-        validate(headers);
-        ttyService.close(jobId);
+        TtyCmd.In in = new TtyCmd.In()
+                .setId(jobId)
+                .setAction(TtyCmd.Action.CLOSE);
+
+        validate(in, headers);
+        ttyService.execute(in);
     }
 
-    private void validate(MessageHeaders headers) {
-        User user = webAuth.validate(headers);
-        if (!user.isAdmin()) {
-            throw new AuthenticationException("Admin permission is required");
+    private void validate(TtyCmd.In in, MessageHeaders headers) {
+        try {
+            User user = webAuth.validate(headers);
+            if (!user.isAdmin()) {
+                throw new AuthenticationException("Admin permission is required");
+            }
+        } catch (AuthenticationException e) {
+            e.setExtra(in);
+            throw e;
         }
     }
 }

core/src/main/java/com/flowci/core/job/service/TtyService.java

@@ -1,22 +1,11 @@
 package com.flowci.core.job.service;
 
+import com.flowci.core.agent.domain.TtyCmd;
+
 /**
  * @author yang
  */
 public interface TtyService {
 
-    /**
-     * Send 'Open' to current agent to open tty session
-     */
-    void open(String jobId);
-
-    /**
-     * Send shell script to agent
-     */
-    void shell(String jobId, String script);
-
-    /**
-     * Close current tty session
-     */
-    void close(String jobId);
+    void execute(TtyCmd.In in);
 }

core/src/main/java/com/flowci/core/job/service/TtyServiceImpl.java

@@ -26,28 +26,7 @@ public class TtyServiceImpl implements TtyService {
     private SpringEventManager eventManager;
 
     @Override
-    public void open(String jobId) {
-        dispatch(new TtyCmd.In()
-                .setId(jobId)
-                .setAction(TtyCmd.Action.OPEN));
-    }
-
-    @Override
-    public void shell(String jobId, String script) {
-        dispatch(new TtyCmd.In()
-                .setId(jobId)
-                .setAction(TtyCmd.Action.SHELL)
-                .setInput(script));
-    }
-
-    @Override
-    public void close(String jobId) {
-        dispatch(new TtyCmd.In()
-                .setId(jobId)
-                .setAction(TtyCmd.Action.CLOSE));
-    }
-
-    private void dispatch(TtyCmd.In in) {
+    public void execute(TtyCmd.In in) {
         try {
             Agent agent = getAgent(in.getId());