Added h2 support

dschadow · dschadow · commit 776c879a071c · 2017-10-23T20:51:38.000+02:00
diff --git a/session-handling-spring-security/pom.xml b/session-handling-spring-security/pom.xml
@@ -12,10 +12,8 @@
     <packaging>jar</packaging>
     <name>Session Handling - Spring Security</name>
 
-    <description>Session Handling with Spring Security sample project. Requires a system property (or environment
-        variable or command line argument) named jasypt.encryptor.password with the value
-        session-handling-spring-security present on startup. Start via the main method in the Application class. After
-        launching, open the web application in your browser at http://localhost:8080.
+    <description>Session Handling with Spring Security sample project. Start via the main method in the Application
+        class. After launching, open the web application in your browser at http://localhost:8080.
     </description>
 
     <properties>
@@ -35,10 +33,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <!--
         <dependency>
             <groupId>com.github.ulisesbocchio</groupId>
             <artifactId>jasypt-spring-boot-starter</artifactId>
         </dependency>
+        -->
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>bootstrap</artifactId>
diff --git a/session-handling-spring-security/src/main/java/de/dominikschadow/javasecurity/sessionhandling/config/WebSecurityConfig.java b/session-handling-spring-security/src/main/java/de/dominikschadow/javasecurity/sessionhandling/config/WebSecurityConfig.java
@@ -53,13 +53,19 @@ protected void configure(HttpSecurity http) throws Exception {
         // @formatter:off
         http
             .authorizeRequests()
-                .antMatchers("/*").permitAll()
+                .antMatchers("/*", "/h2-console/**").permitAll()
                 .antMatchers("/user/**").hasAnyRole("USER", "ADMIN")
                 .antMatchers("/admin/**").hasRole("ADMIN")
-            .and()
-                .formLogin()
-            .and()
-                .logout()
+                .and()
+            .csrf()
+                .ignoringAntMatchers("/h2-console/*")
+                .and()
+            .headers()
+                .frameOptions().sameOrigin()
+                .and()
+            .formLogin()
+                .and()
+            .logout()
                 .logoutSuccessUrl("/")
                 .permitAll();
         // @formatter:on
diff --git a/session-handling-spring-security/src/main/resources/application.yml b/session-handling-spring-security/src/main/resources/application.yml
@@ -1,4 +1,8 @@
 spring:
   datasource:
-    username: ses-han-spr-sec-admin
-    password: ENC(9bjqRQFmO73Gj6gh+XVv3qv7IE7iBs76UGi8bWKLQyH4CoE+w6kUgg==)
+    username: admin
+    password: samplePassword
+    name: session-handling
+  h2:
+    console:
+      enabled: true
