Merge pull request #361 from FlowCI/develop

Develop

Author: gy2006

core/pom.xml

@@ -64,6 +64,12 @@
       <artifactId>minio</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-all</artifactId>
+      <type>pom</type>
+    </dependency>
+
     <dependency>
       <groupId>com.github.ben-manes.caffeine</groupId>
       <artifactId>caffeine</artifactId>

core/src/main/java/com/flowci/core/agent/domain/CreateOrUpdateSshAgentHost.java

@@ -20,6 +20,8 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.HashSet;
@@ -39,12 +41,21 @@ public class CreateOrUpdateSshAgentHost {
     @NotEmpty
     private String name;
 
+    @NotEmpty
     private String secret;
 
+    @NotEmpty
     private String user;
 
+    @NotEmpty
     private String ip;
 
+    @Min(1)
+    @Max(Integer.MAX_VALUE)
+    private int port = 22;
+
+    @Min(1)
+    @Max(Integer.MAX_VALUE)
     private int maxSize = 5;
 
     public AgentHost toObj() {
@@ -57,6 +68,7 @@ public AgentHost toObj() {
             host.setIp(ip);
             host.setTags(tags);
             host.setMaxSize(maxSize);
+            host.setPort(port);
             return host;
         }
 

core/src/main/java/com/flowci/core/agent/domain/ShellIn.java

@@ -1,8 +1,10 @@
 package com.flowci.core.agent.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.flowci.domain.DockerOption;
 import com.flowci.domain.StringVars;
 import com.flowci.domain.Vars;
+import com.flowci.util.StringHelper;
 import com.google.common.base.Strings;
 import lombok.Getter;
 import lombok.Setter;
@@ -31,6 +33,9 @@ public final class ShellIn extends CmdIn {
 
     private List<DockerOption> dockers;
 
+    @JsonIgnore
+    private String condition;
+
     private List<String> scripts = new LinkedList<>();
 
     private int timeout = 1800;
@@ -57,4 +62,9 @@ public void addEnvFilters(Set<String> exports) {
     public void addInputs(StringVars vars) {
         inputs.putAll(vars);
     }
+
+    @JsonIgnore
+    public boolean hasCondition() {
+        return StringHelper.hasValue(condition);
+    }
 }

core/src/main/java/com/flowci/core/agent/domain/SshAgentHost.java

@@ -35,7 +35,7 @@ public class SshAgentHost extends AgentHost {
     @NonNull
     private String ip;
 
-    private int port = 22;
+    private int port;
 
     public SshAgentHost() {
         setType(Type.SSH);

core/src/main/java/com/flowci/core/auth/AuthController.java

@@ -71,6 +71,6 @@ private User getFromAuthorization(String authorization) {
         String email = values[0];
         String passwordOnMd5 = values[1];
 
-        return new User(email, passwordOnMd5, null);
+        return new User(email, passwordOnMd5, null, null);
     }
 }

core/src/main/java/com/flowci/core/auth/WebAuth.java

@@ -45,8 +45,6 @@
 @Component("webAuth")
 public class WebAuth implements HandlerInterceptor {
 
-    private static final String MagicToken = "helloflowciadmin";
-
     private static final String HeaderToken = "Token";
 
     private static final String ParameterToken = "token";
@@ -91,15 +89,10 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
                 return true;
             }
 
-            return authService.setAsDefaultAdmin();
+            return true;
         }
 
         String token = getToken(request);
-
-        if (Objects.equals(token, MagicToken)) {
-            return authService.setAsDefaultAdmin();
-        }
-
         if (!authService.set(token)) {
             throw new AuthenticationException("Invalid token");
         }

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

@@ -65,8 +65,4 @@ public interface AuthService {
      */
     Optional<User> get(String token);
 
-    /**
-     * Set current user from default admin form config properties
-     */
-    boolean setAsDefaultAdmin();
 }

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

@@ -153,11 +153,4 @@ public Optional<User> get(String token) {
 
         return Optional.empty();
     }
-
-    @Override
-    public boolean setAsDefaultAdmin() {
-        User defaultAdmin = userService.defaultAdmin();
-        sessionManager.set(defaultAdmin);
-        return true;
-    }
 }

core/src/main/java/com/flowci/core/common/config/AppProperties.java

@@ -60,12 +60,6 @@ public class AppProperties {
 
     private boolean socketContainer;
 
-    @Bean("adminProperties")
-    @ConfigurationProperties(prefix = "app.admin")
-    public Admin admin() {
-        return new Admin();
-    }
-
     @Bean("zkProperties")
     @ConfigurationProperties(prefix = "app.zookeeper")
     public Zookeeper zk() {
@@ -108,18 +102,6 @@ public Minio minio() {
         return new Minio();
     }
 
-    @Data
-    @Validated
-    public static class Admin {
-
-        @NotBlank
-        @Email
-        private String defaultEmail;
-
-        @NotBlank
-        private String defaultPassword;
-    }
-
     @Data
     public static class Flow {
 

core/src/main/java/com/flowci/core/common/config/WebConfig.java

@@ -78,6 +78,7 @@ public void addInterceptors(InterceptorRegistry registry) {
 
                 registry.addInterceptor(webAuth)
                         .addPathPatterns("/users/**")
+                        .excludePathPatterns("/users/default")
                         .addPathPatterns("/flows/**")
                         .addPathPatterns("/jobs/**")
                         .addPathPatterns("/agents/**")