From 943e4a3de8d15be42b3eddefd90176412a434c35 Mon Sep 17 00:00:00 2001 From: Kavin <20838718+FireMasterK@users.noreply.github.com> Date: Tue, 28 Jun 2022 18:13:29 +0100 Subject: [PATCH] Add some parameter checking to search and feed routes. (#294) --- .../java/me/kavin/piped/utils/ResponseHelper.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/kavin/piped/utils/ResponseHelper.java b/src/main/java/me/kavin/piped/utils/ResponseHelper.java index 297365d..d0e56f2 100644 --- a/src/main/java/me/kavin/piped/utils/ResponseHelper.java +++ b/src/main/java/me/kavin/piped/utils/ResponseHelper.java @@ -491,6 +491,9 @@ public class ResponseHelper { public static byte[] suggestionsResponse(String query) throws IOException, ExtractionException { + if (StringUtils.isEmpty(query)) + return mapper.writeValueAsBytes(new InvalidRequestResponse()); + return mapper.writeValueAsBytes(YOUTUBE_SERVICE.getSuggestionExtractor().suggestionList(query)); } @@ -498,6 +501,9 @@ public class ResponseHelper { public static byte[] opensearchSuggestionsResponse(String query) throws IOException, ExtractionException { + if (StringUtils.isEmpty(query)) + return mapper.writeValueAsBytes(new InvalidRequestResponse()); + return mapper.writeValueAsBytes(Arrays.asList( query, YOUTUBE_SERVICE.getSuggestionExtractor().suggestionList(query) @@ -836,6 +842,9 @@ public class ResponseHelper { public static byte[] feedResponse(String session) throws IOException { + if (StringUtils.isBlank(session)) + return mapper.writeValueAsBytes(new AuthenticationFailureResponse()); + User user = DatabaseHelper.getUserFromSession(session); if (user != null) { @@ -876,6 +885,9 @@ public class ResponseHelper { public static byte[] feedResponseRSS(String session) throws IOException, FeedException { + if (StringUtils.isBlank(session)) + return mapper.writeValueAsBytes(new AuthenticationFailureResponse()); + User user = DatabaseHelper.getUserFromSession(session); if (user != null) { @@ -1062,7 +1074,7 @@ public class ResponseHelper { s.remove(playlist); tr.commit(); - Multithreading.runAsync(() -> pruneUnusedPlaylistVideos()); + Multithreading.runAsync(ResponseHelper::pruneUnusedPlaylistVideos); } return mapper.writeValueAsBytes(new AcceptedResponse());