Merge pull request #1143 from petlyh/peertube-non-urls

TobiGr · web-flow · commit 038ebdedc4f9 · 2023-12-29T12:47:30.000+01:00
Avoid PeerTube accepting non-URLs
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeChannelLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeChannelLinkHandlerFactory.java
@@ -5,6 +5,8 @@
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 import org.schabi.newpipe.extractor.utils.Parser;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.List;
 
 public final class PeertubeChannelLinkHandlerFactory extends ListLinkHandlerFactory {
@@ -51,8 +53,13 @@ public String getUrl(final String id,
 
     @Override
     public boolean onAcceptUrl(final String url) {
-        return url.contains("/accounts/") || url.contains("/a/")
-                || url.contains("/video-channels/") || url.contains("/c/");
+        try {
+            new URL(url);
+            return url.contains("/accounts/") || url.contains("/a/")
+                    || url.contains("/video-channels/") || url.contains("/c/");
+        } catch (final MalformedURLException e) {
+            return false;
+        }
     }
 
     /**
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeCommentsLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeCommentsLinkHandlerFactory.java
@@ -5,6 +5,8 @@
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.List;
 
 public final class PeertubeCommentsLinkHandlerFactory extends ListLinkHandlerFactory {
@@ -27,7 +29,12 @@ public String getId(final String url) throws ParsingException, UnsupportedOperat
 
     @Override
     public boolean onAcceptUrl(final String url) throws FoundAdException {
-        return url.contains("/videos/") || url.contains("/w/");
+        try {
+            new URL(url);
+            return url.contains("/videos/") || url.contains("/w/");
+        } catch (final MalformedURLException e) {
+            return false;
+        }
     }
 
     @Override
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubePlaylistLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubePlaylistLinkHandlerFactory.java
@@ -6,6 +6,8 @@
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 import org.schabi.newpipe.extractor.utils.Parser;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.List;
 
 public final class PeertubePlaylistLinkHandlerFactory extends ListLinkHandlerFactory {
@@ -52,9 +54,10 @@ public String getId(final String url) throws ParsingException, UnsupportedOperat
     @Override
     public boolean onAcceptUrl(final String url) {
         try {
+            new URL(url);
             getId(url);
             return true;
-        } catch (final ParsingException e) {
+        } catch (final ParsingException | MalformedURLException e) {
             return false;
         }
     }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeStreamLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeStreamLinkHandlerFactory.java
@@ -6,6 +6,9 @@
 import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;
 import org.schabi.newpipe.extractor.utils.Parser;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 public final class PeertubeStreamLinkHandlerFactory extends LinkHandlerFactory {
 
     private static final PeertubeStreamLinkHandlerFactory INSTANCE
@@ -47,9 +50,10 @@ public boolean onAcceptUrl(final String url) throws FoundAdException {
             return false;
         }
         try {
+            new URL(url);
             getId(url);
             return true;
-        } catch (final ParsingException e) {
+        } catch (final ParsingException | MalformedURLException e) {
             return false;
         }
     }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeTrendingLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeTrendingLinkHandlerFactory.java
@@ -4,6 +4,8 @@
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.List;
 import java.util.Map;
 
@@ -69,8 +71,13 @@ public String getId(final String url) throws ParsingException, UnsupportedOperat
 
     @Override
     public boolean onAcceptUrl(final String url) {
-        return url.contains("/videos?") || url.contains("/videos/trending")
-                || url.contains("/videos/most-liked") || url.contains("/videos/recently-added")
-                || url.contains("/videos/local");
+        try {
+            new URL(url);
+            return url.contains("/videos?") || url.contains("/videos/trending")
+                    || url.contains("/videos/most-liked") || url.contains("/videos/recently-added")
+                    || url.contains("/videos/local");
+        } catch (final MalformedURLException e) {
+            return false;
+        }
     }
 }
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelLinkHandlerFactoryTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelLinkHandlerFactoryTest.java
@@ -7,9 +7,9 @@
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubeChannelLinkHandlerFactory;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.schabi.newpipe.extractor.ServiceList.PeerTube;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeLinkHandlerFactoryTestHelper.testDoNotAcceptNonURLs;
 
 /**
  * Test for {@link PeertubeChannelLinkHandlerFactory}
@@ -33,6 +33,8 @@ public void acceptUrlTest() throws ParsingException {
         assertTrue(linkHandler.acceptUrl("https://peertube.stream/video-channels/kranti_channel@videos.squat.net/videos"));
         assertTrue(linkHandler.acceptUrl("https://peertube.stream/c/kranti_channel@videos.squat.net/videos"));
         assertTrue(linkHandler.acceptUrl("https://peertube.stream/api/v1/video-channels/7682d9f2-07be-4622-862e-93ec812e2ffa"));
+
+        testDoNotAcceptNonURLs(linkHandler);
     }
 
     @Test
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeCommentsLinkHandlerFactoryTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeCommentsLinkHandlerFactoryTest.java
@@ -9,6 +9,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeLinkHandlerFactoryTestHelper.testDoNotAcceptNonURLs;
 
 /**
  * Test for {@link PeertubeCommentsLinkHandlerFactory}
@@ -31,6 +32,8 @@ public void acceptUrlTest() throws ParsingException {
         assertTrue(linkHandler.acceptUrl("https://framatube.org/videos/watch/9c9de5e8-0a1e-484a-b099-e80766180a6d"));
         assertTrue(linkHandler.acceptUrl("https://framatube.org/w/9c9de5e8-0a1e-484a-b099-e80766180a6d"));
         assertTrue(linkHandler.acceptUrl("https://framatube.org/api/v1/videos/9c9de5e8-0a1e-484a-b099-e80766180a6d/comment-threads?start=0&count=10&sort=-createdAt"));
+
+        testDoNotAcceptNonURLs(linkHandler);
     }
 
     @Test
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeLinkHandlerFactoryTestHelper.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeLinkHandlerFactoryTestHelper.java
@@ -0,0 +1,40 @@
+package org.schabi.newpipe.extractor.services.peertube;
+
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+public class PeertubeLinkHandlerFactoryTestHelper {
+
+    public static void testDoNotAcceptNonURLs(LinkHandlerFactory linkHandler)
+            throws ParsingException {
+        assertFalse(linkHandler.acceptUrl("orchestr/a/"));
+        assertFalse(linkHandler.acceptUrl("/a/"));
+        assertFalse(linkHandler.acceptUrl("something/c/"));
+        assertFalse(linkHandler.acceptUrl("/c/"));
+        assertFalse(linkHandler.acceptUrl("videos/"));
+        assertFalse(linkHandler.acceptUrl("I-hate-videos/"));
+        assertFalse(linkHandler.acceptUrl("/w/"));
+        assertFalse(linkHandler.acceptUrl("ksmg/w/"));
+        assertFalse(linkHandler.acceptUrl("a reandom search query"));
+        assertFalse(linkHandler.acceptUrl("test 230 "));
+        assertFalse(linkHandler.acceptUrl("986513"));
+    }
+
+    public static void testDoNotAcceptNonURLs(ListLinkHandlerFactory linkHandler)
+            throws ParsingException {
+        assertFalse(linkHandler.acceptUrl("orchestr/a/"));
+        assertFalse(linkHandler.acceptUrl("/a/"));
+        assertFalse(linkHandler.acceptUrl("something/c/"));
+        assertFalse(linkHandler.acceptUrl("/c/"));
+        assertFalse(linkHandler.acceptUrl("videos/"));
+        assertFalse(linkHandler.acceptUrl("I-hate-videos/"));
+        assertFalse(linkHandler.acceptUrl("/w/"));
+        assertFalse(linkHandler.acceptUrl("ksmg/w/"));
+        assertFalse(linkHandler.acceptUrl("a reandom search query"));
+        assertFalse(linkHandler.acceptUrl("test 230 "));
+        assertFalse(linkHandler.acceptUrl("986513"));
+    }
+}
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubePlaylistLinkHandlerFactoryTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubePlaylistLinkHandlerFactoryTest.java
@@ -10,6 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeLinkHandlerFactoryTestHelper.testDoNotAcceptNonURLs;
 
 /**
  * Test for {@link PeertubePlaylistLinkHandlerFactory}
@@ -33,6 +34,8 @@ void acceptUrlTest() throws ParsingException {
         assertTrue(linkHandler.acceptUrl("https://framatube.org/w/p/dacdc4ef-5160-4846-9b70-a655880da667"));
         assertTrue(linkHandler.acceptUrl("https://framatube.org/videos/watch/playlist/96b0ee2b-a5a7-4794-8769-58d8ccb79ab7"));
         assertTrue(linkHandler.acceptUrl("https://framatube.org/w/p/96b0ee2b-a5a7-4794-8769-58d8ccb79ab7"));
+
+        testDoNotAcceptNonURLs(linkHandler);
     }
 
     @Test
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamLinkHandlerFactoryTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamLinkHandlerFactoryTest.java
@@ -9,6 +9,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.schabi.newpipe.extractor.ServiceList.PeerTube;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeLinkHandlerFactoryTestHelper.testDoNotAcceptNonURLs;
 
 /**
  * Test for {@link PeertubeStreamLinkHandlerFactory}
@@ -71,5 +72,7 @@ public void testAcceptUrl() throws ParsingException {
         // make sure playlists aren't accepted
         assertFalse(linkHandler.acceptUrl("https://framatube.org/w/p/dacdc4ef-5160-4846-9b70-a655880da667"));
         assertFalse(linkHandler.acceptUrl("https://framatube.org/videos/watch/playlist/dacdc4ef-5160-4846-9b70-a655880da667"));
+
+        PeertubeLinkHandlerFactoryTestHelper.testDoNotAcceptNonURLs(linkHandler);
     }
 }
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeTrendingLinkHandlerFactoryTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeTrendingLinkHandlerFactoryTest.java
@@ -11,6 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.schabi.newpipe.extractor.ServiceList.PeerTube;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeLinkHandlerFactoryTestHelper.testDoNotAcceptNonURLs;
 
 /**
  * Test for {@link PeertubeTrendingLinkHandlerFactory}
@@ -57,5 +58,7 @@ public void acceptUrl() throws ParsingException {
 
         assertTrue(LinkHandlerFactory.acceptUrl("https://peertube.mastodon.host/videos/local"));
         assertTrue(LinkHandlerFactory.acceptUrl("https://peertube.mastodon.host/videos/local?adsf=fjaj#fhe"));
+
+        PeertubeLinkHandlerFactoryTestHelper.testDoNotAcceptNonURLs(LinkHandlerFactory);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`	`import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;`
`7`	`7`	`import org.schabi.newpipe.extractor.utils.Parser;`
`8`	`8`
	`9`	`+import java.net.MalformedURLException;`
	`10`	`+import java.net.URL;`
	`11`	`+`
`9`	`12`	`public final class PeertubeStreamLinkHandlerFactory extends LinkHandlerFactory {`
`10`	`13`
`11`	`14`	`private static final PeertubeStreamLinkHandlerFactory INSTANCE`
`@@ -47,9 +50,10 @@ public boolean onAcceptUrl(final String url) throws FoundAdException {`
`47`	`50`	`return false;`
`48`	`51`	`}`
`49`	`52`	`try {`
	`53`	`+ new URL(url);`
`50`	`54`	`getId(url);`
`51`	`55`	`return true;`
`52`		`- } catch (final ParsingException e) {`
	`56`	`+ } catch (final ParsingException \| MalformedURLException e) {`
`53`	`57`	`return false;`
`54`	`58`	`}`
`55`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`import static org.junit.jupiter.api.Assertions.*;`
`11`	`11`	`import static org.schabi.newpipe.extractor.ServiceList.PeerTube;`
	`12`	`+import static org.schabi.newpipe.extractor.services.peertube.PeertubeLinkHandlerFactoryTestHelper.testDoNotAcceptNonURLs;`
`12`	`13`
`13`	`14`	`/**`
`14`	`15`	`* Test for {@link PeertubeStreamLinkHandlerFactory}`
`@@ -71,5 +72,7 @@ public void testAcceptUrl() throws ParsingException {`
`71`	`72`	`// make sure playlists aren't accepted`
`72`	`73`	`assertFalse(linkHandler.acceptUrl("https://framatube.org/w/p/dacdc4ef-5160-4846-9b70-a655880da667"));`
`73`	`74`	`assertFalse(linkHandler.acceptUrl("https://framatube.org/videos/watch/playlist/dacdc4ef-5160-4846-9b70-a655880da667"));`
	`75`	`+`
	`76`	`+ PeertubeLinkHandlerFactoryTestHelper.testDoNotAcceptNonURLs(linkHandler);`
`74`	`77`	`}`
`75`	`78`	`}`