Merge branch 'stable' into develop

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>

Conflicts:
	libresonic-main/pom.xml
	libresonic-rest-api/pom.xml
	libresonic-sonos-api/pom.xml
	pom.xml

libresonic-main/pom.xml

@@ -196,9 +196,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org</groupId>
+            <groupId>net.jthink</groupId>
             <artifactId>jaudiotagger</artifactId>
-            <version>2.0.3</version>
+            <version>2.2.3</version>
         </dependency>
 
         <dependency>
@@ -401,7 +401,6 @@
             <version>1.7.24</version>
         </dependency>
 
-
         <!-- Embedded tomcat -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -425,6 +424,16 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.8.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.8.7</version>
+        </dependency>
     </dependencies>
 
     <build>

libresonic-main/src/main/java/org/libresonic/player/boot/Application.java

@@ -11,6 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerA
 import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
 import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.MultipartAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
@@ -32,6 +33,7 @@ import java.lang.reflect.Method;
         JdbcTemplateAutoConfiguration.class,
         DataSourceAutoConfiguration.class,
         DataSourceTransactionManagerAutoConfiguration.class,
+        MultipartAutoConfiguration.class, // TODO: update to use spring boot builtin multipart support
         LiquibaseAutoConfiguration.class})
 @Configuration
 @ImportResource(value = {"classpath:/applicationContext-service.xml",

libresonic-main/src/main/java/org/libresonic/player/controller/AvatarUploadController.java

@@ -24,7 +24,7 @@ import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.libresonic.player.Logger;
 import org.libresonic.player.domain.Avatar;
 import org.libresonic.player.service.SecurityService;
@@ -38,7 +38,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
@@ -66,8 +65,8 @@ public class AvatarUploadController  {
     @Autowired
     private SecurityService securityService;
 
-    @RequestMapping(method = RequestMethod.GET)
-    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    @RequestMapping(method = RequestMethod.POST)
+    protected ModelAndView handleRequestInternal(HttpServletRequest request) throws Exception {
 
         String username = securityService.getCurrentUsername(request);
 

libresonic-main/src/main/java/org/libresonic/player/controller/ImportPlaylistController.java

@@ -32,10 +32,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import java.util.HashMap;
 import java.util.List;
@@ -55,8 +54,10 @@ public class ImportPlaylistController {
     @Autowired
     private PlaylistService playlistService;
 
-    @RequestMapping(method = RequestMethod.GET)
-    protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    @RequestMapping(method = RequestMethod.POST)
+    protected String handlePost(RedirectAttributes redirectAttributes,
+                                           HttpServletRequest request
+                                           ) throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
 
         try {
@@ -85,7 +86,13 @@ public class ImportPlaylistController {
             map.put("error", e.getMessage());
         }
 
-        return new ModelAndView("importPlaylist","model",map);
+        redirectAttributes.addFlashAttribute("model", map);
+        return "redirect:importPlaylist";
+    }
+
+    @RequestMapping(method = RequestMethod.GET)
+    public String handleGet() {
+        return "importPlaylist";
     }
 
 

libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java

@@ -19,6 +19,7 @@
 package org.libresonic.player.controller;
 
 import org.apache.commons.lang.StringUtils;
+import org.libresonic.player.service.NetworkService;
 import org.libresonic.player.service.SettingsService;
 import org.libresonic.player.service.SonosService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,8 +81,8 @@ public class SonosSettingsController {
         settingsService.setSonosServiceName(sonosServiceName);
         settingsService.save();
 
-        sonosService.setMusicServiceEnabled(false);
-        sonosService.setMusicServiceEnabled(sonosEnabled);
+        sonosService.setMusicServiceEnabled(false, NetworkService.getBaseUrl(request));
+        sonosService.setMusicServiceEnabled(sonosEnabled, NetworkService.getBaseUrl(request));
     }
 
     public void setSettingsService(SettingsService settingsService) {

libresonic-main/src/main/java/org/libresonic/player/controller/UploadController.java

@@ -70,7 +70,7 @@ public class UploadController {
     private SettingsService settingsService;
     public static final String UPLOAD_STATUS = "uploadStatus";
 
-    @RequestMapping(method = RequestMethod.GET)
+    @RequestMapping(method = { RequestMethod.POST })
     protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
 
         Map<String, Object> map = new HashMap<>();

libresonic-main/src/main/java/org/libresonic/player/dao/MediaFileDao.java

@@ -24,6 +24,7 @@ import org.libresonic.player.domain.Genre;
 import org.libresonic.player.domain.MediaFile;
 import org.libresonic.player.domain.MusicFolder;
 import org.libresonic.player.domain.RandomSearchCriteria;
+import org.libresonic.player.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.RowMapper;
@@ -165,6 +166,8 @@ public class MediaFileDao extends AbstractDao {
                      "version=? " +
                      "where path=?";
 
+        logger.trace("Updating media file {}", Util.debugObject(file));
+
         int n = update(sql,
                        file.getFolder(), file.getMediaType().name(), file.getFormat(), file.getTitle(), file.getAlbumName(), file.getArtist(),
                        file.getAlbumArtist(), file.getDiscNumber(), file.getTrackNumber(), file.getYear(), file.getGenre(), file.getBitRate(),

libresonic-main/src/main/java/org/libresonic/player/security/GlobalSecurityConfig.java

@@ -125,7 +125,7 @@ public class GlobalSecurityConfig extends GlobalAuthenticationConfigurerAdapter
                     .frameOptions()
                     .sameOrigin()
                     .and().authorizeRequests()
-                    .antMatchers("recover.view", "accessDenied.view",
+                    .antMatchers("/recover.view", "/accessDenied.view",
                             "/style/**", "/icons/**", "/flash/**", "/script/**",
                             "/sonos/**", "/crossdomain.xml", "/login", "/error")
                     .permitAll()

libresonic-main/src/main/java/org/libresonic/player/service/SonosService.java

@@ -106,7 +106,7 @@ public class SonosService implements SonosSoap {
     @Resource
     private WebServiceContext context;
 
-    public void setMusicServiceEnabled(boolean enabled) {
+    public void setMusicServiceEnabled(boolean enabled, String baseUrl) {
         List<String> sonosControllers = upnpService.getSonosControllerHosts();
         if (sonosControllers.isEmpty()) {
             LOG.info("No Sonos controller found");
@@ -116,11 +116,10 @@ public class SonosService implements SonosSoap {
 
         String sonosServiceName = settingsService.getSonosServiceName();
         int sonosServiceId = settingsService.getSonosServiceId();
-        String libresonicBaseUrl = NetworkService.getBaseUrl(getRequest());
 
         for (String sonosController : sonosControllers) {
             try {
-                new SonosServiceRegistration().setEnabled(libresonicBaseUrl, sonosController, enabled,
+                new SonosServiceRegistration().setEnabled(baseUrl, sonosController, enabled,
                                                           sonosServiceName, sonosServiceId);
                 break;
             } catch (IOException x) {

libresonic-main/src/main/java/org/libresonic/player/service/metadata/JaudiotaggerParser.java

@@ -26,7 +26,7 @@ import org.jaudiotagger.audio.AudioFileIO;
 import org.jaudiotagger.audio.AudioHeader;
 import org.jaudiotagger.tag.FieldKey;
 import org.jaudiotagger.tag.Tag;
-import org.jaudiotagger.tag.datatype.Artwork;
+import org.jaudiotagger.tag.images.Artwork;
 import org.jaudiotagger.tag.reference.GenreTypes;
 import org.libresonic.player.Logger;
 import org.libresonic.player.domain.MediaFile;

libresonic-main/src/main/java/org/libresonic/player/util/Util.java

@@ -19,12 +19,16 @@
  */
 package org.libresonic.player.util;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.libresonic.player.Logger;
 
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Miscellaneous general utility methods.
@@ -102,4 +106,14 @@ public final class Util {
         }
         return result;
     }
+
+    static ObjectMapper objectMapper = new ObjectMapper();
+    public static String debugObject(Object object) {
+        try {
+            return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(object);
+        } catch (JsonProcessingException e) {
+            LOG.warn("Cant output debug object", e);
+            return "";
+        }
+    }
 }

libresonic-main/src/main/resources/liquibase/legacy/schema52.xml

@@ -16,6 +16,7 @@
         </rollback>
     </changeSet>
     <changeSet id="schema52_002" author="muff1nman">
+        <validCheckSum>7:8fde86035edbca443a54b1861ae70819</validCheckSum>
         <preConditions onFail="MARK_RAN">
             <not>
                 <tableExists tableName="music_folder_user" />
@@ -32,6 +33,13 @@
         <createIndex tableName="music_folder_user" indexName="idx_music_folder_user_username">
             <column name="username"/>
         </createIndex>
+        <sql>
+            insert into music_folder_user select music_folder.id, u.username
+            from music_folder, ${userTableQuote}user${userTableQuote} u
+        </sql>
+        <rollback>
+            <dropTable tableName="music_folder_user" />
+        </rollback>
     </changeSet>
     <changeSet id="schema52_003" author="muff1nman">
         <preConditions onFail="MARK_RAN">

libresonic-main/src/main/webapp/WEB-INF/jsp/importPlaylist.jsp

@@ -29,8 +29,7 @@
 <div style="padding-bottom: 0.25em">
     <fmt:message key="importPlaylist.text"/>
 </div>
-<form method="post" enctype="multipart/form-data" action="importPlaylist.view">
-    <sec:csrfInput />
+<form method="post" enctype="multipart/form-data" action="importPlaylist.view?${_csrf.parameterName}=${_csrf.token}">
     <input type="file" id="file" name="file" size="40"/>
     <input type="submit" value="<fmt:message key="common.ok"/>"/>
 </form>

libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp

@@ -290,8 +290,7 @@
         <span style="vertical-align: middle"><fmt:message key="more.upload.title"/></span>
     </h2>
 
-    <form method="post" enctype="multipart/form-data" action="upload.view">
-        <sec:csrfInput />
+    <form method="post" enctype="multipart/form-data" action="upload.view?${_csrf.parameterName}=${_csrf.token}">
         <table>
             <tr>
                 <td><fmt:message key="more.upload.source"/></td>

libresonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp

@@ -242,8 +242,7 @@
     </p>
 </form:form>
 
-<form method="post" enctype="multipart/form-data" action="avatarUpload.view">
-    <sec:csrfInput />
+<form method="post" enctype="multipart/form-data" action="avatarUpload.view?${_csrf.parameterName}=${_csrf.token}">
     <table>
         <tr>
             <td style="padding-right:1em"><fmt:message key="personalsettings.avatar.changecustom"/></td>