Merge pull request #383 from linlinjie/develop

Fix NullPointerException when logging in
opengoofy · Jul 24, 2022 · e8beaaf · e8beaaf
2 parents 9d0e2cf + 547ce00
commit e8beaaf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java
@@ -26,6 +26,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
@@ -65,14 +66,18 @@ public JWTAuthenticationFilter(AuthenticationManager authenticationManager) {
     public Authentication attemptAuthentication(HttpServletRequest request,
                                                 HttpServletResponse response) throws AuthenticationException {
         // Get logged in information from the input stream.
+        Authentication authenticate = null;
         try {
             LoginUser loginUser = new ObjectMapper().readValue(request.getInputStream(), LoginUser.class);
             rememberMe.set(loginUser.getRememberMe());
-            return authenticationManager.authenticate(
+            authenticate = authenticationManager.authenticate(
                     new UsernamePasswordAuthenticationToken(loginUser.getUsername(), loginUser.getPassword(), new ArrayList()));
-        } catch (IOException e) {
-            logger.error("attemptAuthentication error :{}", e);
-            return null;
+        } catch (BadCredentialsException e) {
+            log.warn("BadCredentialsException:{}", e.getMessage());
+        } catch (Exception e) {
+            log.error("attemptauthentication error:", e);
+        } finally {
+            return authenticate;
         }
     }
 
@@ -102,7 +107,7 @@ protected void successfulAuthentication(HttpServletRequest request,
     }
 
     @Override
-    protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response, AuthenticationException failed) throws IOException, ServletException {
+    protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response, AuthenticationException failed) throws IOException {
         response.setCharacterEncoding("UTF-8");
         response.getWriter().write(JSONUtil.toJsonStr(new ReturnT(-1, "Server Error")));
     }

diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserDetailsServiceImpl.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserDetailsServiceImpl.java
@@ -21,18 +21,21 @@
 import cn.hippo4j.auth.model.UserInfo;
 import cn.hippo4j.auth.model.biz.user.JwtUser;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
 import javax.annotation.Resource;
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Set;
 
 /**
  * User details service impl.
  */
+@Slf4j
 public class UserDetailsServiceImpl implements UserDetailsService {
 
     @Resource
@@ -41,6 +44,10 @@ public class UserDetailsServiceImpl implements UserDetailsService {
     @Override
     public UserDetails loadUserByUsername(String userName) throws UsernameNotFoundException {
         UserInfo userInfo = userMapper.selectOne(Wrappers.lambdaQuery(UserInfo.class).eq(UserInfo::getUserName, userName));
+        if (Objects.isNull(userInfo)) {
+            log.warn("User {} not found", userName);
+            throw new UsernameNotFoundException(userName);
+        }
         JwtUser jwtUser = new JwtUser();
         jwtUser.setId(userInfo.getId());
         jwtUser.setUsername(userName);