diff --git a/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/config/LoginFilter.java b/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/config/LoginFilter.java new file mode 100644 index 0000000000000000000000000000000000000000..f9422bf4e3676ce2aa4003afac9d7abd3ac0a06d --- /dev/null +++ b/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/config/LoginFilter.java @@ -0,0 +1,66 @@ +package org.javaboy.vhr.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.http.MediaType; +import org.springframework.security.authentication.AuthenticationServiceException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +/** + * @作者 江南一点雨 + * @微信公众号 江南一点雨 + * @网站 http://www.javaboy.org + * @微信 a_java_boy + * @GitHub https://github.com/lenve + * @Gitee https://gitee.com/lenve + */ +public class LoginFilter extends UsernamePasswordAuthenticationFilter { + @Override + public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException { + if (!request.getMethod().equals("POST")) { + throw new AuthenticationServiceException( + "Authentication method not supported: " + request.getMethod()); + } + String verify_code = (String) request.getSession().getAttribute("verify_code"); + if (request.getContentType().equals(MediaType.APPLICATION_JSON_VALUE) || request.getContentType().equals(MediaType.APPLICATION_JSON_UTF8_VALUE)) { + Map loginData = new HashMap<>(); + try { + loginData = new ObjectMapper().readValue(request.getInputStream(), Map.class); + String code = loginData.get("code"); + checkCode(response, code, verify_code); + } catch (IOException e) { + } + String username = loginData.get(getUsernameParameter()); + String password = loginData.get(getPasswordParameter()); + if (username == null) { + username = ""; + } + if (password == null) { + password = ""; + } + username = username.trim(); + UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken( + username, password); + setDetails(request, authRequest); + return this.getAuthenticationManager().authenticate(authRequest); + } else { + checkCode(response, request.getParameter("code"), verify_code); + return super.attemptAuthentication(request, response); + } + } + + public void checkCode(HttpServletResponse resp, String code, String verify_code) { + if (code == null || verify_code == null || "".equals(code) || !verify_code.toLowerCase().equals(code.toLowerCase())) { + //验证码不正确 + throw new AuthenticationServiceException("验证码不正确"); + } + } +} diff --git a/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/config/SecurityConfig.java b/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/config/SecurityConfig.java index ee9f06797bc9dc77dc826b0a5b482f50646d3197..93270d0cf802772399e02b05199abb0ec9817704 100644 --- a/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/config/SecurityConfig.java +++ b/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/config/SecurityConfig.java @@ -37,7 +37,6 @@ import java.io.PrintWriter; * @GitHub https://github.com/lenve * @博客 http://wangsong.blog.csdn.net * @网站 http://www.javaboy.org - * @时间 2019-09-20 8:25 */ @Configuration public class SecurityConfig extends WebSecurityConfigurerAdapter { @@ -47,8 +46,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { CustomFilterInvocationSecurityMetadataSource customFilterInvocationSecurityMetadataSource; @Autowired CustomUrlDecisionManager customUrlDecisionManager; - @Autowired - VerificationCodeFilter verificationCodeFilter; @Bean PasswordEncoder passwordEncoder() { @@ -62,14 +59,56 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override public void configure(WebSecurity web) throws Exception { - web.ignoring().antMatchers("/login","/css/**","/js/**","/index.html","/img/**","/fonts/**","/favicon.ico","/verifyCode"); + web.ignoring().antMatchers("/css/**","/js/**","/index.html","/img/**","/fonts/**","/favicon.ico","/verifyCode"); + } + + @Bean + LoginFilter loginFilter() throws Exception { + LoginFilter loginFilter = new LoginFilter(); + loginFilter.setAuthenticationSuccessHandler(new AuthenticationSuccessHandler() { + @Override + public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { + response.setContentType("application/json;charset=utf-8"); + PrintWriter out = response.getWriter(); + Hr hr = (Hr) authentication.getPrincipal(); + hr.setPassword(null); + RespBean ok = RespBean.ok("登录成功!", hr); + String s = new ObjectMapper().writeValueAsString(ok); + out.write(s); + out.flush(); + out.close(); + } + }); + loginFilter.setAuthenticationFailureHandler(new AuthenticationFailureHandler() { + @Override + public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException { + response.setContentType("application/json;charset=utf-8"); + PrintWriter out = response.getWriter(); + RespBean respBean = RespBean.error(exception.getMessage()); + if (exception instanceof LockedException) { + respBean.setMsg("账户被锁定，请联系管理员!"); + } else if (exception instanceof CredentialsExpiredException) { + respBean.setMsg("密码过期，请联系管理员!"); + } else if (exception instanceof AccountExpiredException) { + respBean.setMsg("账户过期，请联系管理员!"); + } else if (exception instanceof DisabledException) { + respBean.setMsg("账户被禁用，请联系管理员!"); + } else if (exception instanceof BadCredentialsException) { + respBean.setMsg("用户名或者密码输入错误，请重新输入!"); + } + out.write(new ObjectMapper().writeValueAsString(respBean)); + out.flush(); + out.close(); + } + }); + loginFilter.setAuthenticationManager(authenticationManagerBean()); + loginFilter.setFilterProcessesUrl("/doLogin"); + return loginFilter; } @Override protected void configure(HttpSecurity http) throws Exception { - http.addFilterBefore(verificationCodeFilter, UsernamePasswordAuthenticationFilter.class); http.authorizeRequests() -// .anyRequest().authenticated() .withObjectPostProcessor(new ObjectPostProcessor() { @Override public O postProcess(O object) { @@ -79,49 +118,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { } }) .and() - .formLogin() - .usernameParameter("username") - .passwordParameter("password") - .loginProcessingUrl("/doLogin") - .loginPage("/login") - .successHandler(new AuthenticationSuccessHandler() { - @Override - public void onAuthenticationSuccess(HttpServletRequest req, HttpServletResponse resp, Authentication authentication) throws IOException, ServletException { - resp.setContentType("application/json;charset=utf-8"); - PrintWriter out = resp.getWriter(); - Hr hr = (Hr) authentication.getPrincipal(); - hr.setPassword(null); - RespBean ok = RespBean.ok("登录成功!", hr); - String s = new ObjectMapper().writeValueAsString(ok); - out.write(s); - out.flush(); - out.close(); - } - }) - .failureHandler(new AuthenticationFailureHandler() { - @Override - public void onAuthenticationFailure(HttpServletRequest req, HttpServletResponse resp, AuthenticationException exception) throws IOException, ServletException { - resp.setContentType("application/json;charset=utf-8"); - PrintWriter out = resp.getWriter(); - RespBean respBean = RespBean.error("登录失败!"); - if (exception instanceof LockedException) { - respBean.setMsg("账户被锁定，请联系管理员!"); - } else if (exception instanceof CredentialsExpiredException) { - respBean.setMsg("密码过期，请联系管理员!"); - } else if (exception instanceof AccountExpiredException) { - respBean.setMsg("账户过期，请联系管理员!"); - } else if (exception instanceof DisabledException) { - respBean.setMsg("账户被禁用，请联系管理员!"); - } else if (exception instanceof BadCredentialsException) { - respBean.setMsg("用户名或者密码输入错误，请重新输入!"); - } - out.write(new ObjectMapper().writeValueAsString(respBean)); - out.flush(); - out.close(); - } - }) - .permitAll() - .and() .logout() .logoutSuccessHandler(new LogoutSuccessHandler() { @Override @@ -152,5 +148,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { out.close(); } }); + http.addFilterAt(loginFilter(), UsernamePasswordAuthenticationFilter.class); } } diff --git a/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/config/VerificationCodeFilter.java b/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/config/VerificationCodeFilter.java deleted file mode 100644 index 8e5a77f4a0e867e75b523cb3d3b2647471db0c11..0000000000000000000000000000000000000000 --- a/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/config/VerificationCodeFilter.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.javaboy.vhr.config; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.javaboy.vhr.model.RespBean; -import org.springframework.stereotype.Component; - -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; - -/** - * @作者 江南一点雨 - * @公众号 江南一点雨 - * @微信号 a_java_boy - * @GitHub https://github.com/lenve - * @博客 http://wangsong.blog.csdn.net - * @网站 http://www.javaboy.org - * @时间 2020-02-28 22:03 - */ -@Component -public class VerificationCodeFilter extends GenericFilter { - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - HttpServletRequest req = (HttpServletRequest) servletRequest; - HttpServletResponse resp = (HttpServletResponse) servletResponse; - if ("POST".equals(req.getMethod()) && "/doLogin".equals(req.getServletPath())) { - //登录请求 - String code = req.getParameter("code"); - String verify_code = (String) req.getSession().getAttribute("verify_code"); - if (code == null || verify_code == null || "".equals(code) || !verify_code.toLowerCase().equals(code.toLowerCase())) { - //验证码不正确 - resp.setContentType("application/json;charset=utf-8"); - PrintWriter out = resp.getWriter(); - out.write(new ObjectMapper().writeValueAsString(RespBean.error("验证码填写错误"))); - out.flush(); - out.close(); - return; - } else { - filterChain.doFilter(req, resp); - } - } else { - filterChain.doFilter(req, resp); - } - } -} diff --git a/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/controller/LoginController.java b/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/controller/LoginController.java index 6f7d5e5fa2f6388d2966d32cd5c2c2206838d28c..349f214fb247452335a890ea61d3c1da389c8f18 100644 --- a/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/controller/LoginController.java +++ b/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/controller/LoginController.java @@ -5,6 +5,7 @@ import org.javaboy.vhr.model.RespBean; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.awt.image.BufferedImage; @@ -27,10 +28,11 @@ public class LoginController { } @GetMapping("/verifyCode") - public void verifyCode(HttpSession session, HttpServletResponse resp) throws IOException { + public void verifyCode(HttpServletRequest request, HttpServletResponse resp) throws IOException { VerificationCode code = new VerificationCode(); BufferedImage image = code.getImage(); String text = code.getText(); + HttpSession session = request.getSession(true); session.setAttribute("verify_code", text); VerificationCode.output(image,resp.getOutputStream()); } diff --git a/vhr/vhrserver/vhr-web/src/main/resources/application.yml b/vhr/vhrserver/vhr-web/src/main/resources/application.yml index abbf256715778329e02fe7456be7cec8c84a9e3b..3c911a877f689931069e47aa417a32c5ef420209 100644 --- a/vhr/vhrserver/vhr-web/src/main/resources/application.yml +++ b/vhr/vhrserver/vhr-web/src/main/resources/application.yml @@ -7,11 +7,11 @@ spring: rabbitmq: username: guest password: guest - host: 192.168.91.128 + host: 127.0.0.1 publisher-confirms: true publisher-returns: true redis: - host: 192.168.91.128 + host: 127.0.0.1 database: 0 port: 6379 password: 123 diff --git a/vuehr/src/views/Login.vue b/vuehr/src/views/Login.vue index 7a13944e32d8123e582860acd10167039f00ae7d..8257c97ffe7f41ee2eb5721762bccfe006de840b 100644 --- a/vuehr/src/views/Login.vue +++ b/vuehr/src/views/Login.vue @@ -58,7 +58,7 @@ this.$refs.loginForm.validate((valid) => { if (valid) { this.loading = true; - this.postKeyValueRequest('/doLogin', this.loginForm).then(resp => { + this.postRequest('/doLogin', this.loginForm).then(resp => { this.loading = false; if (resp) { this.$store.commit('INIT_CURRENTHR', resp.obj); @@ -104,4 +104,4 @@ display: flex; align-items: center; } - \ No newline at end of file +