From 2e09bc9b75fe03c246b0dab98f9d6fce2baa9a82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Cocula?= <rcocula@gmail.com>
Date: Wed, 14 Dec 2016 00:24:58 +0100
Subject: [PATCH] WIP Spring Boot

---
 libresonic-main/pom.xml                       | 25 +++++++++++----
 .../libresonic/player/boot/Application.java   |  8 +++++
 .../applicationContext-cache.xml              |  0
 .../applicationContext-security.xml           | 32 +++++++++----------
 .../applicationContext-service.xml            |  0
 .../applicationContext-sonos.xml              |  0
 .../libresonic-servlet.xml                    |  0
 7 files changed, 43 insertions(+), 22 deletions(-)
 rename libresonic-main/src/main/{webapp/WEB-INF => resources}/applicationContext-cache.xml (100%)
 rename libresonic-main/src/main/{webapp/WEB-INF => resources}/applicationContext-security.xml (73%)
 rename libresonic-main/src/main/{webapp/WEB-INF => resources}/applicationContext-service.xml (100%)
 rename libresonic-main/src/main/{webapp/WEB-INF => resources}/applicationContext-sonos.xml (100%)
 rename libresonic-main/src/main/{webapp/WEB-INF => resources}/libresonic-servlet.xml (100%)

diff --git a/libresonic-main/pom.xml b/libresonic-main/pom.xml
index 949a389a..df895f37 100644
--- a/libresonic-main/pom.xml
+++ b/libresonic-main/pom.xml
@@ -30,23 +30,23 @@
             <version>${project.version}</version>
         </dependency>
 
-        <!-- Metrics -->
+        <!-- Metrics
+             Metrics is a cool framework used here
+             to compute musures and statistics during automated testing
+         -->
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
             <version>${metrics.version}</version>
             <scope>test</scope>
         </dependency>
+        <!-- END Metrics -->
 
-
+        <!-- Spring -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
@@ -69,7 +69,20 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-ldap</artifactId>
         </dependency>
+        <!-- END Spring -->
 
+        <!-- taglibs -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>string</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <!-- END taglibs -->
 
         <dependency>
             <groupId>org.apache.lucene</groupId>
diff --git a/libresonic-main/src/main/java/org/libresonic/player/boot/Application.java b/libresonic-main/src/main/java/org/libresonic/player/boot/Application.java
index 56c1633a..297e3e6d 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/boot/Application.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/boot/Application.java
@@ -4,8 +4,16 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
 
 @SpringBootApplication
+@Configuration
+@ImportResource(value = {"classpath:/applicationContext-service.xml",
+        "classpath:/applicationContext-cache.xml",
+        "classpath:/applicationContext-sonos.xml",
+        "classpath:/applicationContext-security.xml",
+        "classpath:/libresonic-servlet.xml"})
 public class Application extends SpringBootServletInitializer {
 
     @Override
diff --git a/libresonic-main/src/main/webapp/WEB-INF/applicationContext-cache.xml b/libresonic-main/src/main/resources/applicationContext-cache.xml
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/applicationContext-cache.xml
rename to libresonic-main/src/main/resources/applicationContext-cache.xml
diff --git a/libresonic-main/src/main/webapp/WEB-INF/applicationContext-security.xml b/libresonic-main/src/main/resources/applicationContext-security.xml
similarity index 73%
rename from libresonic-main/src/main/webapp/WEB-INF/applicationContext-security.xml
rename to libresonic-main/src/main/resources/applicationContext-security.xml
index e8fe29a1..2bb5347a 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/libresonic-main/src/main/resources/applicationContext-security.xml
@@ -8,21 +8,21 @@
           http://www.springframework.org/schema/security/spring-security.xsd">
 
     <security:http auto-config='true'>
-        <!-- IS_AUTHENTICATED_ANONYMOUSLY -->
-        <security:intercept-url pattern="/login.*" access="IS_AUTHENTICATED_ANONYMOUSLY"/>
-        <security:intercept-url pattern="/recover.view" access="IS_AUTHENTICATED_ANONYMOUSLY" />
-        <security:intercept-url pattern="/accessDenied.view" access="IS_AUTHENTICATED_ANONYMOUSLY" />
-        <security:intercept-url pattern="/coverArt.view" access="IS_AUTHENTICATED_ANONYMOUSLY" />
-        <security:intercept-url pattern="/hls/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
-        <security:intercept-url pattern="/stream/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
-        <security:intercept-url pattern="/ws/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
-        <security:intercept-url pattern="/share/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
-        <security:intercept-url pattern="/style/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
-        <security:intercept-url pattern="/icons/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
-        <security:intercept-url pattern="/flash/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
-        <security:intercept-url pattern="/script/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
-        <security:intercept-url pattern="/sonos/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
-        <security:intercept-url pattern="/crossdomain.xml" access="IS_AUTHENTICATED_ANONYMOUSLY" />
+        <!-- permitAll -->
+        <security:intercept-url pattern="/login.*" access="permitAll"/>
+        <security:intercept-url pattern="/recover.view" access="permitAll" />
+        <security:intercept-url pattern="/accessDenied.view" access="permitAll" />
+        <security:intercept-url pattern="/coverArt.view" access="permitAll" />
+        <security:intercept-url pattern="/hls/**" access="permitAll" />
+        <security:intercept-url pattern="/stream/**" access="permitAll" />
+        <security:intercept-url pattern="/ws/**" access="permitAll" />
+        <security:intercept-url pattern="/share/**" access="permitAll" />
+        <security:intercept-url pattern="/style/**" access="permitAll" />
+        <security:intercept-url pattern="/icons/**" access="permitAll" />
+        <security:intercept-url pattern="/flash/**" access="permitAll" />
+        <security:intercept-url pattern="/script/**" access="permitAll" />
+        <security:intercept-url pattern="/sonos/**" access="permitAll" />
+        <security:intercept-url pattern="/crossdomain.xml" access="permitAll" />
 
         <!-- ROLE_SETTINGS -->
         <security:intercept-url pattern="/personalSettings.view" access="ROLE_SETTINGS" />
@@ -55,7 +55,7 @@
         <security:intercept-url pattern="/podcastReceiverAdmin.view" access="ROLE_PODCAST" />
 
         <!-- ROLE_USER -->
-        <security:intercept-url pattern="/**" access="ROLE_USER" />
+        <security:intercept-url pattern="/**" access="hasRole('ROLE_USER')" />
         <security:form-login login-page="/login.view" default-target-url="/home.view" authentication-failure-url="/login.view?error=1"/>
     </security:http>
 
diff --git a/libresonic-main/src/main/webapp/WEB-INF/applicationContext-service.xml b/libresonic-main/src/main/resources/applicationContext-service.xml
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/applicationContext-service.xml
rename to libresonic-main/src/main/resources/applicationContext-service.xml
diff --git a/libresonic-main/src/main/webapp/WEB-INF/applicationContext-sonos.xml b/libresonic-main/src/main/resources/applicationContext-sonos.xml
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/applicationContext-sonos.xml
rename to libresonic-main/src/main/resources/applicationContext-sonos.xml
diff --git a/libresonic-main/src/main/webapp/WEB-INF/libresonic-servlet.xml b/libresonic-main/src/main/resources/libresonic-servlet.xml
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/libresonic-servlet.xml
rename to libresonic-main/src/main/resources/libresonic-servlet.xml