Merge pull request #164 from FederatedAI/develop-1.11.1

Develop 1.11.1

RELEASE.md

@@ -1,3 +1,11 @@
+# Release 1.11.1
+
+#### Major Features and Improvements
+**Major Features**
+
+* Optimize authentication mechanism for websocket.
+* Optimize page rendering
+
 # Release 1.11.0
 
 #### Major Features and Improvements

bin/service.sh

@@ -60,10 +60,10 @@ status() {
   if [[ -n ${pid} ]]; then
     echo "status:
         $(ps aux | grep ${pid} | grep -v grep)"
-    return 1
+    return 0
   else
     echo "service not running"
-    return 0
+    return 1
   fi
 }
 

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fateboard</groupId>
     <artifactId>fateboard</artifactId>
-    <version>1.11.0</version>
+    <version>1.11.1</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -37,6 +37,13 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>5.3.26</version>
+            <scope>compile</scope>
+        </dependency>
+
         <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -58,7 +65,7 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
         </dependency>
 
         <dependency>

src/main/java/com/webank/ai/fate/board/bootstrap/Bootstrap.java

@@ -20,6 +20,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.session.SessionAutoConfiguration;
+import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
@@ -29,11 +30,13 @@
 
 
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, SessionAutoConfiguration.class})
+@ServletComponentScan(basePackages = {"com.webank.ai.fate.board.conf"})
 @ComponentScan(basePackages = {"com.webank.ai.fate.*"})
 @PropertySource(value = "classpath:application.properties", ignoreResourceNotFound = true)
 @Configuration
 @EnableScheduling
 @EnableFeignClients(basePackages = "com.webank.ai.fate.*")
+
 public class Bootstrap {
     public static void main(String[] args) {
         try {

src/main/java/com/webank/ai/fate/board/conf/WebsocketFilter.java

@@ -0,0 +1,43 @@
+package com.webank.ai.fate.board.conf;
+
+import com.alibaba.fastjson.JSON;
+import com.webank.ai.fate.board.global.ErrorCode;
+import com.webank.ai.fate.board.global.ResponseResult;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.core.annotation.Order;
+
+import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.websocket.server.HandshakeRequest;
+import java.io.IOException;
+
+@Slf4j
+@Order(1)
+@WebFilter(filterName = "websocketFilter", urlPatterns = {"/websocket/progress/*","/log/new/*"})
+public class WebsocketFilter implements Filter {
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
+        HttpServletResponse resp = (HttpServletResponse) response;
+        HttpServletRequest req = (HttpServletRequest) request;
+
+        HttpSession session = req.getSession(false);
+        if (session == null) {
+            resp.getWriter().write(JSON.toJSONString(new ResponseResult<>(ErrorCode.LOGIN_ERROR)));
+            return ;
+        }
+        Object user = session.getAttribute("USER");
+        if (user == null) {
+            resp.getWriter().write(JSON.toJSONString(new ResponseResult<>(ErrorCode.LOGIN_ERROR)));
+            return ;
+        }
+
+        chain.doFilter(request, response);
+    }
+
+}