From d233fdedbe8db69e64e40dfbe474a7cf8f22e3b1 Mon Sep 17 00:00:00 2001
From: Chenx221 <chenx221@yandex.com>
Date: Thu, 8 Jun 2023 12:03:07 +0800
Subject: [PATCH] use sha256 encrypt password

Signed-off-by: Chenx221 <chenx221@yandex.com>
---
 .../chenx221/controller/UserController.class  | Bin 1801 -> 4206 bytes
 .../cyou/chenx221/mapper/UserMapper.class     | Bin 279 -> 331 bytes
 .../classes/cyou/chenx221/pojo/User.class     | Bin 1165 -> 1310 bytes
 .../WEB-INF/classes/mapper/UserMapper.xml     |   5 ++-
 .../WEB-INF/views/login.jsp                   |  36 +++++++++++++++++-
 .../chenx221/controller/UserController.java   |  24 ++++++++----
 project2/web/WEB-INF/views/login.jsp          |  10 ++++-
 7 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/UserController.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/controller/UserController.class
index 964c78d9119fb0e7c0a7885de3797b0376904ec8..15d763082f650ae0dd2f27a483c229ac26409407 100644
GIT binary patch
literal 4206
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

delta 555
zcmX|;%TE(g6vlsd+F^!vAUc)DKr0|Vun!B$!xm9M5MSt06IRtukVI`VW8#vXQC22*
z)s-8!BoGV+O<Zc?N)!JDHEi6uGlnxGlF9wPd**)UeCM9~tN%rN>hs@sAAl)tZKhJH
zEyWQ!EIJ*!=+<>LlkTC{BI}UjsQ#+P^Zg3zkspS&W#8tQ!ui>JzuSEF<N3?)Yp>EA
z=Y+*chf@sc5#wnwugC;`eI@YkKdF}MweZ2cMlGn@6eZOUf=00Tzt|c5%@}JPR+tYP
z%PWt!ew%AbzqStPOiQP}YiD(z{Y8Ijy}il+HimSq1k*UeBNDX;pA|NQ%{V$IQCT7-
zZ06shHsj+_!AK14j0r{sM8G%`!ir(elORf77dC|}`8QaF9oh`4$yG1;k(`&@CR5zT
zYjU{c_PGN)3?{hap57?A1-G;xl{X|iLFCvYp3os~T{6sWhVUrRE3VnNi_w2h`(22q
zeAT$K3X`&nE?nUPQ-Kt8C~=WXB$<}qHtG)rOWrP;Lr#)rL_WKO3c1YO5{Az_S0Y&8
csz|(qXs*e+9!kxF?W7zT+=%h!!Auun53Tc4I{*Lx

diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/mapper/UserMapper.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/mapper/UserMapper.class
index ae211d6e3b11c99b9b36f466481767e6cbe8dbea..92691044bbc58034d47165f7baea1871996b57d7 100644
GIT binary patch
delta 82
zcmbQvbef6l)W2Q(7#J9A8F(jhHSuNU6{i-JgaQdh1{sZs1(HmfVG}#^)tOir8CV(E
d7#M&wI|Bz$0}}%$nB-#M2GVQ{j0`*s3;<{$4n+U}

delta 53
zcmX@jG@Xg-)W2Q(7#J9A8Mr5MHBH=+BhSdf$iT|L1{7mrU<Z>N44gokje(JYi-7?E
DSm6jL

diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/pojo/User.class b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/cyou/chenx221/pojo/User.class
index 36437399d6d4464681e62b63cfe68032028abc66..c324c8a39fa2761caabf81a7de62e5c884a90605 100644
GIT binary patch
delta 295
zcmZvW&5gn^6okiitR)dF%Wnujn*a_$36y|D8?=D9bE5+;>pMN51+Bz^0w{tKC}G7A
zI3i2q@q6>V=dHW*yvzUT3}A+2@6Clw#=isM3E|qQJTEoc5U8`ifP~^*PX8d%?1)l2
zIij*>Nuoim!l72ERk*0(lUS3L=!wBci!Tn~`Qp%rtI<jN4!ZUxP2lH5G4JXZA<)CO
z%~Y&A(9B(xZ&#|ILPU10Oc1_h`WV;)nIRcNCR9U2KaL5Kw{gSx%!zfz_#|JkaS9(X
IKPfS~1FE?p4FCWD

delta 210
zcmbQo)yv6s>ff$?3=9mm3~C#>92h5;Fg{}Bm>kZuk6DUAdh$dTVJ-FzKxrlhQ6S02
zzz8IT7{q`i517r$AkH8G<S{bHFvw2c!>r0G#sCzXoX;XY`7bjEvmApw$dJj>EP|3!
zSoJ9|C{A`|QDv0_>XQfRlV?@}>rs(Z!m3^wsQw&Ky&6!xI@lh5Rt|O*pc|MNQ~?7_
B9Nho_

diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/mapper/UserMapper.xml b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/mapper/UserMapper.xml
index d330f74..a6100bf 100644
--- a/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/mapper/UserMapper.xml
+++ b/project2/out/artifacts/project2_war_exploded/WEB-INF/classes/mapper/UserMapper.xml
@@ -8,5 +8,8 @@
         FROM user
         WHERE username = #{username}
     </select>
-
+    <insert id="insertUser" parameterType="cyou.chenx221.pojo.User">
+        INSERT INTO user (username, password)
+        VALUES (#{username}, #{password})
+    </insert>
 </mapper>
diff --git a/project2/out/artifacts/project2_war_exploded/WEB-INF/views/login.jsp b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/login.jsp
index e9ad369..8dd3c4c 100644
--- a/project2/out/artifacts/project2_war_exploded/WEB-INF/views/login.jsp
+++ b/project2/out/artifacts/project2_war_exploded/WEB-INF/views/login.jsp
@@ -124,7 +124,7 @@
                             </div>
                             <div class="tab-pane fade" id="pills-register" role="tabpanel"
                                  aria-labelledby="tab-register">
-                                <form>
+                                <form action="signup" method="post">
                                     <h1 class="text-center mb-4" style="font-family: 'Noto Sans SC Light',serif">
                                         用户注册</h1>
                                     <div class="form-outline mb-4">
@@ -182,6 +182,27 @@
             </div>
         </div>
     </div>
+    <!-- Modal -->
+    <div class="modal fade" id="exampleModal2" tabindex="-1" aria-labelledby="exampleModalLabel2" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="exampleModalLabel2">
+                        <i class="fas fa-circle-check me-2"></i>成功
+                    </h5>
+                    <button type="button" class="btn-close" data-mdb-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <c:if test="${not empty successMessage}">
+                        ${successMessage}
+                    </c:if>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-primary" data-mdb-dismiss="modal">OK</button>
+                </div>
+            </div>
+        </div>
+    </div>
 </main>
 
 <footer>
@@ -192,10 +213,21 @@
 <script type="text/javascript" src="${pageContext.request.contextPath}/resources/js/mdb.min.js"></script>
 <script>
     $(document).ready(function () {
+        // 判断先前是否来自reg/log页
+        <c:if test="${not empty comeFrom && comeFrom eq 'reg'}">
+        document.getElementById("tab-register").click();
+        </c:if>
+        <c:if test="${not empty comeFrom && comeFrom eq 'log'}">
+        document.getElementById("tab-login").click();
+        </c:if>
         <%-- 判断模型中是否存在错误信息 --%>
-        <c:if test="${not empty errorMessage}">
+        <c:if test="${not empty errorMessage && errorMessage ne 'null'}">
         $('#exampleModal').modal('show');
         </c:if>
+        <%-- 判断模型中是否存在成功信息 --%>
+        <c:if test="${not empty successMessage && successMessage ne 'null'}">
+        $('#exampleModal2').modal('show');
+        </c:if>
     });
 </script>
 </body>
diff --git a/project2/src/main/java/cyou/chenx221/controller/UserController.java b/project2/src/main/java/cyou/chenx221/controller/UserController.java
index 033a328..a4102e6 100644
--- a/project2/src/main/java/cyou/chenx221/controller/UserController.java
+++ b/project2/src/main/java/cyou/chenx221/controller/UserController.java
@@ -1,6 +1,7 @@
 package cyou.chenx221.controller;
 
 import cyou.chenx221.mapper.UserMapper;
+import cyou.chenx221.pojo.Password;
 import cyou.chenx221.pojo.User;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,16 +11,19 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.security.NoSuchAlgorithmException;
+
 @Controller
 public class UserController {
     @Autowired
     private UserMapper userMapper;
 
     @RequestMapping(path = "/signin", method = {RequestMethod.GET, RequestMethod.POST}) //登录
-    public String login(@RequestParam("username") String username, @RequestParam("password") String password, Model model) {
+    public String login(@RequestParam("username") String username, @RequestParam("password") String password, Model model) throws NoSuchAlgorithmException {
         User user = userMapper.getUserByUsername(username);
-//        System.out.println("username:" + username + " try-password:" + password + " real-password:"+user.getPassword());
-        if (user != null && user.getPassword().equals(password)) {
+        Password pw = new Password(password);
+//        System.out.println("username:" + username + " try to login with password: " + password + " encrypted-password:"+pw.getEncryptedPassword());
+        if (user != null && user.getPassword().equals(pw.getEncryptedPassword())) {
             model.addAttribute("message", "登陆成功");
             return "redirect:/dashboard"; // 重定向到 dashboard 页面
         } else {
@@ -29,10 +33,11 @@ public class UserController {
     }
 
     @RequestMapping(path = "/signup", method = {RequestMethod.GET, RequestMethod.POST}) //注册
-    public String register(@RequestParam("username") String username, @RequestParam("password") String password, @RequestParam("re-password") String repassword, Model model) {
+    public String register(@RequestParam("username") String username, @RequestParam("password") String password, @RequestParam("re-password") String repassword, Model model) throws NoSuchAlgorithmException {
         //debug start
-        System.out.println("username:" + username + " password:" + password + " repassword:" + repassword);
+//        System.out.println("username:" + username);
         //debug end
+        model.addAttribute("comeFrom","reg");
         //检查两次输入的密码是否相同
         if (!password.equals(repassword)) {
             model.addAttribute("errorMessage", "两次输入的密码不一致，请重新输入。");
@@ -63,13 +68,16 @@ public class UserController {
                     }
                 }
                 if (!hasNumber || !hasLetter || hasinValidChar) {
-                    model.addAttribute("errorMessage", "密码不符合要求，请重新输入。");
+                    model.addAttribute("errorMessage", "密码强度不符合要求，请重新输入。要求：8~32位，需要有数字和字母，允许大小写英文字母、数字、密码常见符号");
                     return "login";
                 }
                 // start to register
-                user = new User(username, password);
+                Password pw=new Password(password);
+                System.out.println("username:" + username + " password:" + pw.getEncryptedPassword()); //debug
+                user = new User(username, pw.getEncryptedPassword());
                 userMapper.insertUser(user);
-                model.addAttribute("message", "注册成功");
+                model.addAttribute("comeFrom","log");
+                model.addAttribute("successMessage", "注册成功");
                 return "login";
             }
         } else {
diff --git a/project2/web/WEB-INF/views/login.jsp b/project2/web/WEB-INF/views/login.jsp
index 775cd99..8dd3c4c 100644
--- a/project2/web/WEB-INF/views/login.jsp
+++ b/project2/web/WEB-INF/views/login.jsp
@@ -124,7 +124,7 @@
                             </div>
                             <div class="tab-pane fade" id="pills-register" role="tabpanel"
                                  aria-labelledby="tab-register">
-                                <form action="singup" method="post">
+                                <form action="signup" method="post">
                                     <h1 class="text-center mb-4" style="font-family: 'Noto Sans SC Light',serif">
                                         用户注册</h1>
                                     <div class="form-outline mb-4">
@@ -213,10 +213,18 @@
 <script type="text/javascript" src="${pageContext.request.contextPath}/resources/js/mdb.min.js"></script>
 <script>
     $(document).ready(function () {
+        // 判断先前是否来自reg/log页
+        <c:if test="${not empty comeFrom && comeFrom eq 'reg'}">
+        document.getElementById("tab-register").click();
+        </c:if>
+        <c:if test="${not empty comeFrom && comeFrom eq 'log'}">
+        document.getElementById("tab-login").click();
+        </c:if>
         <%-- 判断模型中是否存在错误信息 --%>
         <c:if test="${not empty errorMessage && errorMessage ne 'null'}">
         $('#exampleModal').modal('show');
         </c:if>
+        <%-- 判断模型中是否存在成功信息 --%>
         <c:if test="${not empty successMessage && successMessage ne 'null'}">
         $('#exampleModal2').modal('show');
         </c:if>