Fix #381 format code, add license info

config/src/main/java/com/alibaba/nacos/config/server/model/User.java

@@ -1,5 +1,25 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.alibaba.nacos.config.server.model;
 
+/**
+ * user info
+ *
+ * @author wfnuser
+ */
 public class User {
     private String username;
     private String password;

console/src/main/java/com/alibaba/nacos/console/config/WebSecurityConfig.java

@@ -1,6 +1,22 @@
-package com.alibaba.nacos;
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.nacos.console.config;
 
 import com.alibaba.nacos.console.filter.JwtAuthenticationTokenFilter;
+import com.alibaba.nacos.console.security.CustomUserDetailsService;
 import com.alibaba.nacos.console.security.JwtAuthenticationEntryPoint;
 import com.alibaba.nacos.console.utils.JWTTokenUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,14 +28,11 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.web.filter.GenericFilterBean;
 
 /**
  * Spring security config
@@ -27,7 +40,6 @@ import org.springframework.web.filter.GenericFilterBean;
  * @author Nacos
  */
 @Configuration
-@EnableWebSecurity(debug = true)
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
@@ -36,9 +48,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     public static final String AUTHORIZATION_TOKEN = "access_token";
 
     @Autowired
-    private UserDetailsService userDetailsService;
+    private CustomUserDetailsService userDetailsService;
 
-    // 自定义token验证异常处理逻辑类
     @Autowired
     private JwtAuthenticationEntryPoint unauthorizedHandler;
 
@@ -53,15 +64,11 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Override
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth
-            //自定义获取用户信息
-            .userDetailsService(userDetailsService)
-            //设置密码加密
-            .passwordEncoder(passwordEncoder());
+        auth.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder());
     }
 
     @Override
-    public void configure(WebSecurity web) throws Exception {
+    public void configure(WebSecurity web) {
         // TODO: we should use a better way to match the resources
         // requests for resource and auth api are always allowed
         web.ignoring()

console/src/main/java/com/alibaba/nacos/console/controller/AuthController.java

@@ -15,7 +15,7 @@
  */
 package com.alibaba.nacos.console.controller;
 
-import com.alibaba.nacos.WebSecurityConfig;
+import com.alibaba.nacos.console.config.WebSecurityConfig;
 import com.alibaba.nacos.config.server.model.RestResult;
 import com.alibaba.nacos.console.utils.JWTTokenUtils;
 import org.slf4j.Logger;
@@ -27,12 +27,13 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * @author <a href="mailto:huangxiaoyu1018@gmail.com">hxy1991</a>
+ * auth
+ *
+ * @author wfnuser
  */
 @RestController("auth")
 @RequestMapping("/v1/auth")
@@ -61,7 +62,6 @@ public class AuthController {
         UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
         RestResult<String> rr = new RestResult<String>();
 
-        // TODO: 去数据库查询是否存在该用户
         try {
             //通过 AuthenticationManager（默认实现为ProviderManager）的authenticate方法验证 Authentication 对象
             Authentication authentication = authenticationManager.authenticate(authenticationToken);

console/src/main/java/com/alibaba/nacos/console/domain/User.java

@@ -1,22 +0,0 @@
-package com.alibaba.nacos.console.domain;
-
-public class User {
-    private String username;
-    private String password;
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-}

console/src/main/java/com/alibaba/nacos/console/filter/JwtAuthenticationTokenFilter.java

@@ -1,33 +1,47 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.alibaba.nacos.console.filter;
 
-import com.alibaba.nacos.WebSecurityConfig;
+import com.alibaba.nacos.console.config.WebSecurityConfig;
 import com.alibaba.nacos.console.utils.JWTTokenUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
-import org.springframework.web.filter.GenericFilterBean;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-
+/**
+ * jwt auth token filter
+ *
+ * @author wfnuser
+ */
 public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
 
     private static final Logger log = LoggerFactory.getLogger(JwtAuthenticationTokenFilter.class);
 
     private JWTTokenUtils tokenProvider;
 
-    public JwtAuthenticationTokenFilter(JWTTokenUtils tokenProvider){
+    public JwtAuthenticationTokenFilter(JWTTokenUtils tokenProvider) {
         this.tokenProvider = tokenProvider;
     }
 

console/src/main/java/com/alibaba/nacos/console/security/CustomAuthenticationProvider.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.alibaba.nacos.console.security;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -6,13 +21,18 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Component;
 
+/**
+ * auth provider
+ *
+ * @author wfnuser
+ */
 @Component
 public class CustomAuthenticationProvider implements AuthenticationProvider {
+
     @Autowired
-    private UserDetailsService userDetailsService;
+    private CustomUserDetailsService userDetailsService;
 
     @Override
     public Authentication authenticate(Authentication authentication) throws AuthenticationException {

console/src/main/java/com/alibaba/nacos/console/security/CustomUserDetails.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.alibaba.nacos.console.security;
 
 import com.alibaba.nacos.config.server.model.User;
@@ -8,9 +23,11 @@ import org.springframework.security.core.userdetails.UserDetails;
 import java.util.Collection;
 
 /**
- * Created by wfnuser on 2018/12/28.
+ * custem user
+ *
+ * @author wfnuser
  */
-public class CustomUserDetails implements UserDetails{
+public class CustomUserDetails implements UserDetails {
 
     private User user;
 

console/src/main/java/com/alibaba/nacos/console/security/CustomUserDetailsService.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.alibaba.nacos.console.security;
 
 
@@ -9,7 +24,11 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
-
+/**
+ * Custem user service
+ *
+ * @author wfnuser
+ */
 @Service
 public class CustomUserDetailsService implements UserDetailsService {
 
@@ -18,7 +37,7 @@ public class CustomUserDetailsService implements UserDetailsService {
 
     @Override
     public UserDetails loadUserByUsername(String userName) throws UsernameNotFoundException {
-    // 持久层写一个获取用户信息的sql
+        // 持久层写一个获取用户信息的sql
         User user = persistService.findUserByUsername(userName);
         if (user == null) {
             throw new UsernameNotFoundException(userName);

console/src/main/java/com/alibaba/nacos/console/security/JwtAuthenticationEntryPoint.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.alibaba.nacos.console.security;
 
 import org.slf4j.Logger;
@@ -12,7 +27,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
- * Created by wfnuser on 2018/12/28.
+ * jwt auth fail point
+ *
+ * @author wfnuser
  */
 @Component
 public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {

console/src/main/java/com/alibaba/nacos/console/utils/JWTTokenUtils.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.alibaba.nacos.console.utils;
 
 import io.jsonwebtoken.*;
@@ -15,6 +30,11 @@ import java.util.Date;
 import java.util.List;
 
 
+/**
+ * Jwt token tool
+ *
+ * @author wfnuser
+ */
 @Component
 public class JWTTokenUtils {
 
@@ -31,12 +51,9 @@ public class JWTTokenUtils {
     @PostConstruct
     public void init() {
         this.secretKey = "SecretKey";
-        int secondIn1day = 1000 * 60 * 60 * 24;
-        this.tokenValidityInMilliseconds = secondIn1day * 2L;
+        this.tokenValidityInMilliseconds = 1000 * 60 * 30L;
     }
 
-    private final static long EXPIRATIONTIME = 432000000;
-
     // 创建Token
     public String createToken(Authentication authentication) {
         // 获取当前时间戳
@@ -56,7 +73,6 @@ public class JWTTokenUtils {
 
     // 获取用户权限
     public Authentication getAuthentication(String token) {
-        System.out.println("token:" + token);
         // 解析Token的payload
         Claims claims = Jwts.parser()
             .setSigningKey(secretKey)