From bcfa152ae9a702c0b4a2281b5dd229fb66bb3fbb Mon Sep 17 00:00:00 2001 From: onjsdnjs Date: Sun, 28 Jan 2024 21:39:18 +0900 Subject: [PATCH 01/82] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EA=B8=B0=EB=B3=B8=EA=B5=AC?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springsecuritymaster/security/configs/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java b/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java index 64fc0883..083adb9b 100644 --- a/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java +++ b/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java @@ -21,7 +21,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti .authorizeHttpRequests(auth -> auth .requestMatchers("/").permitAll() .anyRequest().authenticated()) - .formLogin(Customizer.withDefaults()) + .formLogin(form -> form.loginPage("/login")) ; return http.build(); } From 23203824ea849775a485047ec434f8af2ac558ca Mon Sep 17 00:00:00 2001 From: onjsdnjs Date: Sun, 28 Jan 2024 22:02:26 +0900 Subject: [PATCH 02/82] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EA=B8=B0=EB=B3=B8=EA=B5=AC?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LoginController.java | 12 ++ .../security/configs/SecurityConfig.java | 2 +- src/main/resources/templates/login/login.html | 114 ++++++++++++++++++ 3 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 src/main/java/io/security/springsecuritymaster/controller/LoginController.java create mode 100644 src/main/resources/templates/login/login.html diff --git a/src/main/java/io/security/springsecuritymaster/controller/LoginController.java b/src/main/java/io/security/springsecuritymaster/controller/LoginController.java new file mode 100644 index 00000000..41807196 --- /dev/null +++ b/src/main/java/io/security/springsecuritymaster/controller/LoginController.java @@ -0,0 +1,12 @@ +package io.security.springsecuritymaster.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +public class LoginController { + @GetMapping(value="/login") + public String manager() { + return "login/login"; + } +} diff --git a/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java b/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java index 083adb9b..4fe67ab3 100644 --- a/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java +++ b/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java @@ -21,7 +21,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti .authorizeHttpRequests(auth -> auth .requestMatchers("/").permitAll() .anyRequest().authenticated()) - .formLogin(form -> form.loginPage("/login")) + .formLogin(form -> form.loginPage("/login").permitAll()) ; return http.build(); } diff --git a/src/main/resources/templates/login/login.html b/src/main/resources/templates/login/login.html new file mode 100644 index 00000000..2cbbab8a --- /dev/null +++ b/src/main/resources/templates/login/login.html @@ -0,0 +1,114 @@ + + + + Dashboard + + + + + + + + +
+
+
+
+
+
+
+ +
+
+
+
+ + \ No newline at end of file From a4fbd09272837b50d8d536c0b79b005bb4491aa4 Mon Sep 17 00:00:00 2001 From: onjsdnjs Date: Sun, 28 Jan 2024 22:13:47 +0900 Subject: [PATCH 03/82] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EA=B8=B0=EB=B3=B8=EA=B5=AC?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/admin.html | 8 ++++---- src/main/resources/templates/dashboard.html | 8 ++++---- src/main/resources/templates/login/login.html | 6 +++--- src/main/resources/templates/manager.html | 8 ++++---- src/main/resources/templates/user.html | 8 ++++---- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/resources/templates/admin.html b/src/main/resources/templates/admin.html index 99aca55e..dda2f335 100644 --- a/src/main/resources/templates/admin.html +++ b/src/main/resources/templates/admin.html @@ -63,17 +63,17 @@ -
+
-
+
-
+
-
+
\ No newline at end of file diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html index 184cc8f4..a9c2fa26 100644 --- a/src/main/resources/templates/dashboard.html +++ b/src/main/resources/templates/dashboard.html @@ -63,17 +63,17 @@ -
+
-
+
-
+
-
+
\ No newline at end of file diff --git a/src/main/resources/templates/login/login.html b/src/main/resources/templates/login/login.html index 2cbbab8a..92629fd7 100644 --- a/src/main/resources/templates/login/login.html +++ b/src/main/resources/templates/login/login.html @@ -85,11 +85,11 @@ -
+
-
+
-
+
\ No newline at end of file diff --git a/src/main/resources/templates/manager.html b/src/main/resources/templates/manager.html index 5654a87b..69e4875b 100644 --- a/src/main/resources/templates/manager.html +++ b/src/main/resources/templates/manager.html @@ -63,17 +63,17 @@ -
+
-
+
-
+
-
+
\ No newline at end of file diff --git a/src/main/resources/templates/user.html b/src/main/resources/templates/user.html index 2631a06a..494c9fbc 100644 --- a/src/main/resources/templates/user.html +++ b/src/main/resources/templates/user.html @@ -63,17 +63,17 @@ -
+
-
+
-
+
-
+
\ No newline at end of file From 619f926fb77d0f61cc38cedde6204d94b708582b Mon Sep 17 00:00:00 2001 From: onjsdnjs Date: Sun, 28 Jan 2024 22:22:50 +0900 Subject: [PATCH 04/82] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EA=B8=B0=EB=B3=B8=EA=B5=AC?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springsecuritymaster/controller/LoginController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/security/springsecuritymaster/controller/LoginController.java b/src/main/java/io/security/springsecuritymaster/controller/LoginController.java index 41807196..b456bb55 100644 --- a/src/main/java/io/security/springsecuritymaster/controller/LoginController.java +++ b/src/main/java/io/security/springsecuritymaster/controller/LoginController.java @@ -6,7 +6,7 @@ @Controller public class LoginController { @GetMapping(value="/login") - public String manager() { + public String login() { return "login/login"; } } From bea7634a070d7f6bb5a04df0efdbde817f71833c Mon Sep 17 00:00:00 2001 From: onjsdnjs Date: Sun, 28 Jan 2024 22:26:00 +0900 Subject: [PATCH 05/82] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EA=B8=B0=EB=B3=B8=EA=B5=AC?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springsecuritymaster/security/configs/SecurityConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java b/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java index 4fe67ab3..f0fb4b45 100644 --- a/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java +++ b/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java @@ -21,6 +21,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti .authorizeHttpRequests(auth -> auth .requestMatchers("/").permitAll() .anyRequest().authenticated()) + + //FIXME .formLogin(form -> form.loginPage("/login").permitAll()) ; return http.build(); From 72af7b4b5862a78ba7a9da3dac9edab4a9dc4bd1 Mon Sep 17 00:00:00 2001 From: onjsdnjs Date: Sun, 28 Jan 2024 22:31:45 +0900 Subject: [PATCH 06/82] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EA=B8=B0=EB=B3=B8=EA=B5=AC?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springsecuritymaster/security/configs/SecurityConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java b/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java index f0fb4b45..264d8250 100644 --- a/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java +++ b/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java @@ -5,6 +5,7 @@ import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; @@ -24,6 +25,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti //FIXME .formLogin(form -> form.loginPage("/login").permitAll()) + .csrf(AbstractHttpConfigurer::disable) ; return http.build(); } From 83ea55f226f8c835da80774b3e9de9f6c0cab8f5 Mon Sep 17 00:00:00 2001 From: onjsdnjs Date: Sun, 28 Jan 2024 22:59:36 +0900 Subject: [PATCH 07/82] =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EA=B8=B0=EB=B3=B8=EA=B5=AC?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/configs/SecurityConfig.java | 3 ++- .../static/images/spring-security-project.png | Bin 0 -> 3852 bytes src/main/resources/templates/layout/header.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/static/images/spring-security-project.png diff --git a/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java b/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java index 264d8250..b13eb367 100644 --- a/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java +++ b/src/main/java/io/security/springsecuritymaster/security/configs/SecurityConfig.java @@ -20,7 +20,8 @@ public class SecurityConfig { public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http .authorizeHttpRequests(auth -> auth - .requestMatchers("/").permitAll() + //FIXME + .requestMatchers("/","/css/**", "/images/**", "/js/**", "/favicon.*", "/*/icon-*").permitAll() .anyRequest().authenticated()) //FIXME diff --git a/src/main/resources/static/images/spring-security-project.png b/src/main/resources/static/images/spring-security-project.png new file mode 100644 index 0000000000000000000000000000000000000000..f7518db2a8961d52b5692a5203620784d63e0488 GIT binary patch literal 3852 zcmb`HS5y;RvxdV5NU?ySE4?FC=`DbW(tB44HFO05K}hkF5(K134bp26q)Dh!G)R#u z1ZhH02pvKKA}!=+opt{Eb8*(1S+k$LZ)WzI_q8^45JACJx1GU?3Vw(f!n=8}%6TR()JF~to-6|o{I@-~)6SSt08Vi^8x8mufz|5gcfq8pb)DDq(M%Nim<`fdi6 z?}mdF$NO?ICOF@Ty&oOj-+zP?7b}ITO3O%ms^2$9!mHmUj=Jahsw#qrK;^Du7o?(R zT4PyI4F1u4_u+PLfziJ z@mUeMaU6diRFanR|9r$2^5CCM9)bFJx}h`pqemeyvc~gcg=$Y(m*aXlhgtVK_mAtn zl5Kn^in$5c!;h;-3(%u}|1JbpOrU}`ef6DOpQu2=j_vY2EwbCJRakP5ut2iD?UoWR z*-D3sj`Z9dLh32s9(X_rNoUTI6_B?Z9KmI$oa7cXC7{B<)iEbzD@|f`)rO;Zi&1Wt z+z2i!WiuBJRCE9zxJ;IQ%h}xc@{Ky{hakVF=#60+Tm%i z7GGt_)tuHx*R`-Q%uYm$%)p*rLc$V{xa~ls$p3<`xNR2a9Zl=mOQvTQZ)}{t4ky_* z(_|7#$q#SAqDh8ccpE3sE$aJ;PM#Fo`xl*RIoEs%mBktwJhZ%+Qr>E#^oj__j?u+S z?U$507x%W=DVwM0RFa|C+QrYjCuZ0l3StfEH+bIcJtybilbIh3zta#PFVZkzB=ZcInB;3C zoE8=(Y}5!GkRSsGyvh8!yqW{=;`Mh^UjI%O-Os)k+`WBIh`QVx)OKb85gtG|(DoK_ zc1gUlzknl+3pZ5p zc{reUbycW1Wfz6xT&T73_a5Ie_uHk@u#1x3Aah|Nq_xi-%;5S67IBOb!tYO&Dfqb1 z?{Lx7;-chq;ezIJ3o>wI>l3Rj|8)YNGBvOwF$zZm+b%hrv^uEwux8kBox>|trSSPa zri>pEH{(q^jy=NucvMWCmmb@F+it8ruLaYl%8dFloW`%{;qX zJDFki^jOMB?+%#0U7CP;!?DGZ0jdjPi4wI5T0TrTqOZ`YLW8|_AF`{5NFC)nAymI2 zRa0RYHKGR;7=v?Tpoz_1}bT|-My%X-*Q-QL0= zhd=hbgo<4g+dQi8md~R8Iys?=ZPM7MZ5ke22Mh&H89nqb;QB)5Z=F+DacD(C}TMXyIY5KVBq3*x%(4!=J z=qRfT-7#Y{)Orxh-x=j2^yfy2M7{$EJ^)Hi_g+5x(Yv<36Z`U+oO-j zjGFxZnM%Rx~WECg|3j z;$~-AV$#mG30hDte@@J`*@Lj{Va(720Gv|;a@eTTWUGnf#1MwQn{0dgLNl6Bu@k5$}{OV-!t%aB_i#at&|E99*9{oVc z%F`A3RBn`*U;_AtTgKi#WfQV2MO;XH(FY6H;%ODSIgArsIlXS1ttYrFj;ZL`ae~1- zm)#zaXc(vOsg{jC(P`Jtub+$0rzedJ$_kk=5o(#hPz}kUw9L@P0N-4<>uLoEGr6?{K>D#WkldrYjXWv)|@jgSkEM0w<<*$$~$5b z4Xf)hieoq29&sWHH0fTbNzR(-81{)kB6`0q6LKfD(>c*D@*X;}SHH2?T@t=sUg|6<9~HRL0U= zH&AN7K^*HS_XdPH(y2Z9?5e)UUl*ak&9TlD&!_ZkZ9h1SJXy^Pd5~wl+#k zE=oY9`bN$+D2$VVIgQ(`=b{`o8S9Y^pL~V6I0(j&KY7fCiNxs@$^JSzpAS|f>(b%W zYaR$!9|zF5L;{c}ENOXFfM*XfhahgA|e59xh&GYFmtdsZ0wJ3 zYGtxFC@O>xUGh$Oh+#|Knr0ez` zxg9Wv(=~ZcmQUus3AK!Ki7Wc~g=FO-;A2yGJ!|_fQr`-PO3=Bbba#)@t1W{1C6&>+ zuMRVhv$pQE;cF8Tqhx^@TliR?VZUJDjlsMbCbQH@mhpaavW&3q z8&Q8DQ8kg3vd_A(=zXr)EB@br3IpZIcKkdInGq|gE@&ZsTTc<&#a6#1=k(}_cl5fo z0z$+?c9#(v6aDL+92+yYIZw=`sDFN1(v7$eM!_|w>vw!3r-g%8okG;6c6Afb`0(qu zc2VdXNHKr_N zR}Ztq%pbAYs4ARVw_64rn?8c8)-18gRcl#S<>@vbwK9rOp zLNgD4>J+h%5Sbq^LHt(VGYWyZ(tVPY?@QoPy%wtaU@BTUzFlVxc0$y1HH?>LJV5U} zKvZR)@x*5SWrmBE!zUa$zp9Ix4gV%|y zy9N0cbzQ4APbNN1V`eeW5_r5LKMpk=4;)J^)se4jO7gJ*AD33yd_t?7t9jZti9igY zN?#g>rNvQxA@h%iwBorYx`L_Bt^JaWOe*oEk(LV~xM{})+UF&o4;y8k@My$%yDTe7 z-{O5m)uclAgpCXZNKby~)H-y!GPLBL{*t98>;SpE(wyb22#v(ZB8%CWOivU3 zS9F|!WgXI8)*(jrxKzEKS%=kysCz#p&U6dzZXjKJl=dSSp~{9x>pjQLoROE9R`CwD zS}jhXI=Ou!+T-gGrR)zQV(F&hdW`{vb}@%4IGT9ZNebah`^y=GV|37*`e<`_uvR`C z_3kp(Fh5>NAfK(&z~V%eW*Ons(Mfwl%Ui=5DE$xV-6N{Y&@srnzEtN)&I=$-1}2oE zKHV2TJ(#d8Y3V?M#O5$-5~yuIn#-wd%M&{;rVOy zuf|^O72m&cv^k?itef+%pZY>hOggGch^;n%JhW~bg!3sV{NNv*KfdXk9QfNY_!Ga7 zTS4ntcWK04-WBb<9e`~3uk4JTkQc*=b8-4~P>)R+VSlRCkrh`!K;CCU`EsiLB#(I% zHx6A#WgoTj-qQ{xUF~bIem~Mydc8=dWVGG5;0wyO&k~?)U7lB-^bS}oaT+i&<^5uR zP56NHq)A>?sWUB1Q?*^3Tec0<0&b(nR2@9S++DekV0OJ$BEM+!4tQ lXJRgT)}ZxVs0MnH2PSu_o|^XJLIy+3YsA@V