From 22dcf7a88e9381341be8a5d9d9f3038fd47234d0 Mon Sep 17 00:00:00 2001
From: Kavin <20838718+FireMasterK@users.noreply.github.com>
Date: Fri, 4 Nov 2022 19:42:05 +0000
Subject: [PATCH] When parameter is not provided, throw an ErrorResponse.

---
 .../me/kavin/piped/server/ServerLauncher.java  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/me/kavin/piped/server/ServerLauncher.java b/src/main/java/me/kavin/piped/server/ServerLauncher.java
index a0bdd98..4d482f4 100644
--- a/src/main/java/me/kavin/piped/server/ServerLauncher.java
+++ b/src/main/java/me/kavin/piped/server/ServerLauncher.java
@@ -18,10 +18,7 @@ import me.kavin.piped.server.handlers.auth.AuthPlaylistHandlers;
 import me.kavin.piped.server.handlers.auth.FeedHandlers;
 import me.kavin.piped.server.handlers.auth.UserHandlers;
 import me.kavin.piped.utils.*;
-import me.kavin.piped.utils.resp.DeleteUserRequest;
-import me.kavin.piped.utils.resp.LoginRequest;
-import me.kavin.piped.utils.resp.StackTraceResponse;
-import me.kavin.piped.utils.resp.SubscriptionUpdateRequest;
+import me.kavin.piped.utils.resp.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.hibernate.Session;
@@ -289,7 +286,7 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
                 })).map(GET, "/feed/unauthenticated", AsyncServlet.ofBlocking(executor, request -> {
                     try {
                         return getJsonResponse(FeedHandlers.unauthenticatedFeedResponse(
-                                Objects.requireNonNull(request.getQueryParameter("channels")).split(",")
+                                getArray(request.getQueryParameter("channels"))
                         ), "public, s-maxage=120");
                     } catch (Exception e) {
                         return getErrorResponse(e, request.getPath());
@@ -297,7 +294,7 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
                 })).map(GET, "/feed/unauthenticated/rss", AsyncServlet.ofBlocking(executor, request -> {
                     try {
                         return getRawResponse(FeedHandlers.unauthenticatedFeedResponseRSS(
-                                Objects.requireNonNull(request.getQueryParameter("channels")).split(",")
+                                getArray(request.getQueryParameter("channels"))
                         ), "application/atom+xml", "public, s-maxage=120");
                     } catch (Exception e) {
                         return getErrorResponse(e, request.getPath());
@@ -409,6 +406,15 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
         return new CustomServletDecorator(router);
     }
 
+    private static String[] getArray(String s) {
+
+        if (s == null) {
+            ExceptionHandler.throwErrorResponse(new InvalidRequestResponse());
+        }
+
+        return s.split(",");
+    }
+
     @Override
     protected Module getOverrideModule() {
         return new AbstractModule() {