Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	CHANGELOG.md

Author: freyacodes

CHANGELOG.md

@@ -3,6 +3,18 @@
 Each release usually includes various fixes and improvements.
 The most noteworthy of these, as well as any features and breaking changes, are listed here.
 
+## v3.2.1
+
+* Update dependencies -- fixes frequent youtube HTTP errors
+* Return `FriendlyException` message on `LOAD_FAILED` #174
+* Add option to disable `ytsearch` and `scsearch` #194
+
+Contributors:
+[@Devoxin](https://github.com/Devoxin),
+[@duncte123](https://github.com/duncte123),
+[@Frederikam](https://github.com/Frederikam), and
+[@napstr](https://github.com/napstr)
+
 ## v3.2.0.3
 * Add compatibility for Java 8-10
 

IMPLEMENTATION.md

@@ -307,6 +307,22 @@ Additionally, in every `/loadtracks` response, a `loadType` property is returned
 * `NO_MATCHES` - Returned if no matches/sources could be found for a given identifier.
 * `LOAD_FAILED` - Returned if Lavaplayer failed to load something for some reason.
 
+If the loadType is `LOAD_FAILED`, the response will contain an `exception` object with `message` and `severity` properties.
+`message` is a string detailing why the track failed to load, and is okay to display to end-users. Severity represents how common the error is.
+A severity level of `COMMON` indicates that the error is non-fatal and that the issue is not from Lavalink itself.
+
+```json
+{
+  "loadType": "LOAD_FAILED",
+  "playlistInfo": {},
+  "tracks": [],
+  "exception": {
+    "message": "The uploader has not made this video available in your country.",
+    "severity": "COMMON"
+  }
+}
+```
+
 All REST responses from Lavalink include a `Lavalink-Api-Version` header.
 
 ### Resuming Lavalink sessions

LavalinkServer/application.yml.example

@@ -18,6 +18,8 @@ lavalink:
       local: false
     bufferDurationMs: 400
     youtubePlaylistLoadLimit: 6 # Number of pages at 100 each
+    youtubeSearchEnabled: true
+    soundcloudSearchEnabled: true
     gc-warnings: true
 
 metrics:

LavalinkServer/build.gradle

@@ -6,6 +6,7 @@ apply plugin: 'com.gorylenko.gradle-git-properties'
 apply plugin: 'org.ajoberstar.grgit'
 apply plugin: 'kotlin'
 apply plugin: 'kotlin-spring'
+apply plugin: "com.adarshr.test-logger"
 
 description = 'Play audio to discord voice channels'
 mainClassName = "lavalink.server.Launcher"
@@ -32,10 +33,6 @@ bootRun {
     }
 }
 
-test {
-    useJUnitPlatform()
-}
-
 dependencies {
     compile group: 'club.minnced', name: 'magma', version: magmaVersion
     compile group: 'com.sedmelluq', name: 'lavaplayer', version: lavaplayerVersion
@@ -60,6 +57,8 @@ dependencies {
     compile group: 'io.prometheus', name: 'simpleclient_hotspot', version: prometheusVersion
     compile group: 'io.prometheus', name: 'simpleclient_logback', version: prometheusVersion
     compile group: 'io.prometheus', name: 'simpleclient_servlet', version: prometheusVersion
+
+    testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion
 }
 
 processResources {

LavalinkServer/src/main/java/lavalink/server/Launcher.java

@@ -32,6 +32,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
 import org.springframework.boot.context.event.ApplicationFailedEvent;
+import org.springframework.boot.web.servlet.ServletComponentScan;
 
 import java.time.Instant;
 import java.time.ZoneId;

LavalinkServer/src/main/java/lavalink/server/config/AudioPlayerConfiguration.java

@@ -31,14 +31,14 @@ public Supplier<AudioPlayerManager> audioPlayerManagerSupplier(AudioSourcesConfi
             }
 
             if (sources.isYoutube()) {
-                YoutubeAudioSourceManager youtube = new YoutubeAudioSourceManager();
+                YoutubeAudioSourceManager youtube = new YoutubeAudioSourceManager(serverConfig.isYoutubeSearchEnabled());
                 Integer playlistLoadLimit = serverConfig.getYoutubePlaylistLoadLimit();
 
                 if (playlistLoadLimit != null) youtube.setPlaylistPageCount(playlistLoadLimit);
                 audioPlayerManager.registerSourceManager(youtube);
             }
             if (sources.isBandcamp()) audioPlayerManager.registerSourceManager(new BandcampAudioSourceManager());
-            if (sources.isSoundcloud()) audioPlayerManager.registerSourceManager(new SoundCloudAudioSourceManager());
+            if (sources.isSoundcloud()) audioPlayerManager.registerSourceManager(new SoundCloudAudioSourceManager(serverConfig.isSoundcloudSearchEnabled()));
             if (sources.isTwitch()) audioPlayerManager.registerSourceManager(new TwitchStreamAudioSourceManager());
             if (sources.isVimeo()) audioPlayerManager.registerSourceManager(new VimeoAudioSourceManager());
             if (sources.isMixer()) audioPlayerManager.registerSourceManager(new BeamAudioSourceManager());

LavalinkServer/src/main/java/lavalink/server/config/RequestAuthorizationFilter.java

@@ -0,0 +1,58 @@
+package lavalink.server.config;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Configuration
+public class RequestAuthorizationFilter implements HandlerInterceptor, WebMvcConfigurer {
+
+    private static final Logger log = LoggerFactory.getLogger(RequestAuthorizationFilter.class);
+    private ServerConfig serverConfig;
+    private MetricsPrometheusConfigProperties metricsConfig;
+
+    public RequestAuthorizationFilter(ServerConfig serverConfig, MetricsPrometheusConfigProperties metricsConfig) {
+        this.serverConfig = serverConfig;
+        this.metricsConfig = metricsConfig;
+    }
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+        // Collecting metrics is anonymous
+        if (!metricsConfig.getEndpoint().isEmpty()
+                && request.getServletPath().equals(metricsConfig.getEndpoint())) return true;
+
+        if (request.getServletPath().equals("/error")) return true;
+
+        String authorization = request.getHeader("Authorization");
+
+        if (authorization == null || !authorization.equals(serverConfig.getPassword())) {
+            String method = request.getMethod();
+            String path = request.getRequestURI().substring(request.getContextPath().length());
+            String ip = request.getRemoteAddr();
+
+            if (authorization == null) {
+                log.warn("Authorization missing for {} on {} {}", ip, method, path);
+                response.setStatus(HttpStatus.UNAUTHORIZED.value());
+                return false;
+            }
+            log.warn("Authorization failed for {} on {} {}", ip, method, path);
+            response.setStatus(HttpStatus.FORBIDDEN.value());
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(this);
+    }
+}

LavalinkServer/src/main/java/lavalink/server/config/ServerConfig.java

@@ -38,6 +38,8 @@ public class ServerConfig {
     @Nullable
     private Integer youtubePlaylistLoadLimit;
     private boolean gcWarnings = true;
+    private boolean youtubeSearchEnabled = true;
+    private boolean soundcloudSearchEnabled = true;
 
     public String getPassword() {
         return password;
@@ -84,4 +86,20 @@ public boolean isGcWarnings() {
     public void setGcWarnings(boolean gcWarnings) {
         this.gcWarnings = gcWarnings;
     }
+
+    public boolean isYoutubeSearchEnabled() {
+        return youtubeSearchEnabled;
+    }
+
+    public void setYoutubeSearchEnabled(boolean youtubeSearchEnabled) {
+        this.youtubeSearchEnabled = youtubeSearchEnabled;
+    }
+
+    public boolean isSoundcloudSearchEnabled() {
+        return soundcloudSearchEnabled;
+    }
+
+    public void setSoundcloudSearchEnabled(boolean soundcloudSearchEnabled) {
+        this.soundcloudSearchEnabled = soundcloudSearchEnabled;
+    }
 }

LavalinkServer/src/main/java/lavalink/server/info/InfoRestHandler.java

@@ -0,0 +1,22 @@
+package lavalink.server.info;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by napster on 08.03.19.
+ */
+@RestController
+public class InfoRestHandler {
+
+    private final AppInfo appInfo;
+
+    public InfoRestHandler(AppInfo appInfo) {
+        this.appInfo = appInfo;
+    }
+
+    @GetMapping("/version")
+    public String version() {
+        return appInfo.getVersionBuild();
+    }
+}

LavalinkServer/src/main/java/lavalink/server/player/AudioLoader.java

@@ -40,10 +40,8 @@
 public class AudioLoader implements AudioLoadResultHandler {
 
     private static final Logger log = LoggerFactory.getLogger(AudioLoader.class);
-    private static final LoadResult NO_MATCHES = new LoadResult(Collections.emptyList(),
-            null, ResultStatus.NO_MATCHES, null);
-    private static final LoadResult LOAD_FAILED = new LoadResult(Collections.emptyList(),
-            null, ResultStatus.LOAD_FAILED, null);
+    private static final LoadResult NO_MATCHES = new LoadResult(ResultStatus.NO_MATCHES, Collections.emptyList(),
+            null, null);
 
     private final AudioPlayerManager audioPlayerManager;
 
@@ -71,7 +69,7 @@ public void trackLoaded(AudioTrack audioTrack) {
         log.info("Loaded track " + audioTrack.getInfo().title);
         ArrayList<AudioTrack> result = new ArrayList<>();
         result.add(audioTrack);
-        this.loadResult.complete(new LoadResult(result, null, ResultStatus.TRACK_LOADED, null));
+        this.loadResult.complete(new LoadResult(ResultStatus.TRACK_LOADED, result, null, null));
     }
 
     @Override
@@ -88,7 +86,7 @@ public void playlistLoaded(AudioPlaylist audioPlaylist) {
         ResultStatus status = audioPlaylist.isSearchResult() ? ResultStatus.SEARCH_RESULT : ResultStatus.PLAYLIST_LOADED;
         List<AudioTrack> loadedItems = audioPlaylist.getTracks();
 
-        this.loadResult.complete(new LoadResult(loadedItems, playlistName, status, selectedTrack));
+        this.loadResult.complete(new LoadResult(status, loadedItems, playlistName, selectedTrack));
     }
 
     @Override
@@ -100,7 +98,7 @@ public void noMatches() {
     @Override
     public void loadFailed(FriendlyException e) {
         log.error("Load failed", e);
-        this.loadResult.complete(LOAD_FAILED);
+        this.loadResult.complete(new LoadResult(e));
     }
 
-}
+}