Skip to content

Commit 851e4a5

Browse files
ArneBabArneBab
committed
Merge branch 'm3u-filter-up-to-256-mib-transparent-passthrough' of github.com:ArneBab/fred-staging-1 into next
2 parents b3887bf + 84abbd8 commit 851e4a5

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

‎src/freenet/client/filter/M3UFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class M3UFilter implements ContentDataFilter {
5151
{ (byte)'\r' };
5252
static final int MAX_URI_LENGTH = 16384;
5353
static final String badUriReplacement = "#bad-uri-removed";
54-
private final long MAX_LENGTH_NO_PROGRESS = (100*1024*1024 * 11) / 10; // 100MiB: playlists are a different usecase, and we want to allow transparent pass-through for most files accessed via a playlist, likely through an external palyer. See FProxyToadlet.MAX_LENGTH_NO_PROGRESS for the default. This value must be synchronized with the test data!
54+
private final long MAX_LENGTH_NO_PROGRESS = (200L*1024*1024 * 11) / 10; // 200MiB: playlists are a different usecase, and we want to allow transparent pass-through for most files accessed via a playlist, likely through an external palyer. See FProxyToadlet.MAX_LENGTH_NO_PROGRESS for the default. This value must be synchronized with the test data!
5555
// TODO: Add parsing of ext-comments to allow for gapless playback.
5656
// static final int COMMENT_EXT_SIZE = 4;
5757
// static final byte[] COMMENT_EXT_START =

‎test/freenet/client/filter/m3u/safe_madesafe.m3u

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname.mp3?type=audio/mpeg&max-size=115343360
2-
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname2.mp3?type=audio/mpeg&max-size=115343360
3-
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname3.m3u?type=audio/mpegurl&max-size=115343360
4-
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname3.ogg?type=application/ogg&max-size=115343360
5-
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname3.oga?type=audio/ogg&max-size=115343360
6-
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname3.ogv?type=video/ogg&max-size=115343360
7-
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname3.flac?type=audio/flac&max-size=115343360
8-
http://localhost:8888/CHK@qtpnyOzrg~aiAbnw6AoKbX8ZlTCwznjY4G1y-JiiCgg,b0wkEgRPKWMvedueAKLkyv0S83xOrGUT4S7FaN5J3nI,AAMC--8/Infinite-Hands-free-software.mp3?type=audio/mpeg&max-size=115343360
9-
http://localhost:8888/CHK@qtpnyOzrg~aiAbnw6AoKbX8ZlTCwznjY4G1y-JiiCgg,b0wkEgRPKWMvedueAKLkyv0S83xOrGUT4S7FaN5J3nI,AAMC--8/next.m3u?type=audio/mpegurl&max-size=115343360
10-
http://localhost:8888/CHK@qtpnyOzrg~aiAbnw6AoKbX8ZlTCwznjY4G1y-JiiCgg,b0wkEgRPKWMvedueAKLkyv0S83xOrGUT4S7FaN5J3nI,AAMC--8/Infinite-Hands-free-software.mp3?type=audio/mpeg&max-size=115343360
11-
http://localhost:8888/CHK@qtpnyOzrg~aiAbnw6AoKbX8ZlTCwznjY4G1y-JiiCgg,b0wkEgRPKWMvedueAKLkyv0S83xOrGUT4S7FaN5J3nI,AAMC--8/next.m3u?type=audio/mpegurl&max-size=115343360
12-
http://localhost:8888/CHK@qtpnyOzrg~aiAbnw6AoKbX8ZlTCwznjY4G1y-JiiCgg,b0wkEgRPKWMvedueAKLkyv0S83xOrGUT4S7FaN5J3nI,AAMC--8/Infinite-Hands-free-software.mp3?type=audio/mpeg&max-size=115343360
13-
http://localhost:8888/CHK@aYtI6p96mfkDrIXQdnGZWeTxLm~hEjFy8xz~Bw5oZSw,6gcO31K9NqkpyXk4kTfZbwBp0LvvN5NFLIfDnQ8uEXo,AAMC--8/mrtsaman3.mp3?type=audio/mpeg&max-size=115343360
14-
http://localhost:8888/CHK@ONyIPZXETM4dDiObUZkyfQzaOtHxmGIDcB0Eofo9UGA,C85PHfP~LjC~uxntvUi~H9cjXx7poU6wLOu8YEwDKTw,AAMC--8/Home-At-The-Grange.mp3?type=audio/mpeg&max-size=115343360
15-
http://localhost:8888/CHK@q74q2YCWmxGFOivrnLJt3ysXeN3mGJANFQQYt34K3Ag,ISATE9J8ah0V65IZE1H8MENt5U8K9~2DthcPirqh4sk,AAMC--8/cecilos-song-v2.0.mp3?type=audio/mpeg&max-size=115343360
16-
http://localhost:8888/CHK@0FbKGEpOeRN1VEXRlg~o855V9B6OxeV5h4UEHiq3ngw,oEPkK1k0XWvY82ZlmpGF7jGWuIcNbozwiYnhtEnqWzg,AAMC--8/cecilos-songbest-version.mp3?type=audio/mpeg&max-size=115343360
17-
http://localhost:8888/CHK@ZcvI6zgqtQtV65sI9gntyhIJYNEP5X3I2ylmia0FiOg,aDL29QdbwzipSELt~1jsHqgqZ5YA9sZ-34I8~ZFWrwA,AAMC--8/BonnieAlba.mp3?type=audio/mpeg&max-size=115343360
18-
http://localhost:8888/CHK@~A-SETPFf0jekBWw06yNxsfcsoj-v6V1tT8ntd7ns7I,Cy33kB2jkDR7eeqP54DjHLhILOTw253dUVYrTmO3f90,AAMC--8/AlbanAnthem.mp3?type=audio/mpeg&max-size=115343360
19-
http://localhost:8888/CHK@dq~3Ojv3QItpqNhp7b8W8QrKQo~66duficuXXofHeYY,advGQWcuQbogNX~Kq2to8bWZi7w~YW2aravk1fC4T5M,AAMC--8/BereksBlood.mp3?type=audio/mpeg&max-size=115343360
1+
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname.mp3?type=audio/mpeg&max-size=230686720
2+
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname2.mp3?type=audio/mpeg&max-size=230686720
3+
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname3.m3u?type=audio/mpegurl&max-size=230686720
4+
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname3.ogg?type=application/ogg&max-size=230686720
5+
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname3.oga?type=audio/ogg&max-size=230686720
6+
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname3.ogv?type=video/ogg&max-size=230686720
7+
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname3.flac?type=audio/flac&max-size=230686720
8+
http://localhost:8888/CHK@qtpnyOzrg~aiAbnw6AoKbX8ZlTCwznjY4G1y-JiiCgg,b0wkEgRPKWMvedueAKLkyv0S83xOrGUT4S7FaN5J3nI,AAMC--8/Infinite-Hands-free-software.mp3?type=audio/mpeg&max-size=230686720
9+
http://localhost:8888/CHK@qtpnyOzrg~aiAbnw6AoKbX8ZlTCwznjY4G1y-JiiCgg,b0wkEgRPKWMvedueAKLkyv0S83xOrGUT4S7FaN5J3nI,AAMC--8/next.m3u?type=audio/mpegurl&max-size=230686720
10+
http://localhost:8888/CHK@qtpnyOzrg~aiAbnw6AoKbX8ZlTCwznjY4G1y-JiiCgg,b0wkEgRPKWMvedueAKLkyv0S83xOrGUT4S7FaN5J3nI,AAMC--8/Infinite-Hands-free-software.mp3?type=audio/mpeg&max-size=230686720
11+
http://localhost:8888/CHK@qtpnyOzrg~aiAbnw6AoKbX8ZlTCwznjY4G1y-JiiCgg,b0wkEgRPKWMvedueAKLkyv0S83xOrGUT4S7FaN5J3nI,AAMC--8/next.m3u?type=audio/mpegurl&max-size=230686720
12+
http://localhost:8888/CHK@qtpnyOzrg~aiAbnw6AoKbX8ZlTCwznjY4G1y-JiiCgg,b0wkEgRPKWMvedueAKLkyv0S83xOrGUT4S7FaN5J3nI,AAMC--8/Infinite-Hands-free-software.mp3?type=audio/mpeg&max-size=230686720
13+
http://localhost:8888/CHK@aYtI6p96mfkDrIXQdnGZWeTxLm~hEjFy8xz~Bw5oZSw,6gcO31K9NqkpyXk4kTfZbwBp0LvvN5NFLIfDnQ8uEXo,AAMC--8/mrtsaman3.mp3?type=audio/mpeg&max-size=230686720
14+
http://localhost:8888/CHK@ONyIPZXETM4dDiObUZkyfQzaOtHxmGIDcB0Eofo9UGA,C85PHfP~LjC~uxntvUi~H9cjXx7poU6wLOu8YEwDKTw,AAMC--8/Home-At-The-Grange.mp3?type=audio/mpeg&max-size=230686720
15+
http://localhost:8888/CHK@q74q2YCWmxGFOivrnLJt3ysXeN3mGJANFQQYt34K3Ag,ISATE9J8ah0V65IZE1H8MENt5U8K9~2DthcPirqh4sk,AAMC--8/cecilos-song-v2.0.mp3?type=audio/mpeg&max-size=230686720
16+
http://localhost:8888/CHK@0FbKGEpOeRN1VEXRlg~o855V9B6OxeV5h4UEHiq3ngw,oEPkK1k0XWvY82ZlmpGF7jGWuIcNbozwiYnhtEnqWzg,AAMC--8/cecilos-songbest-version.mp3?type=audio/mpeg&max-size=230686720
17+
http://localhost:8888/CHK@ZcvI6zgqtQtV65sI9gntyhIJYNEP5X3I2ylmia0FiOg,aDL29QdbwzipSELt~1jsHqgqZ5YA9sZ-34I8~ZFWrwA,AAMC--8/BonnieAlba.mp3?type=audio/mpeg&max-size=230686720
18+
http://localhost:8888/CHK@~A-SETPFf0jekBWw06yNxsfcsoj-v6V1tT8ntd7ns7I,Cy33kB2jkDR7eeqP54DjHLhILOTw253dUVYrTmO3f90,AAMC--8/AlbanAnthem.mp3?type=audio/mpeg&max-size=230686720
19+
http://localhost:8888/CHK@dq~3Ojv3QItpqNhp7b8W8QrKQo~66duficuXXofHeYY,advGQWcuQbogNX~Kq2to8bWZi7w~YW2aravk1fC4T5M,AAMC--8/BereksBlood.mp3?type=audio/mpeg&max-size=230686720

‎test/freenet/client/filter/m3u/unsafe_madesafe.m3u

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#bad-uri-removed
22
#bad-uri-removed
33
#bad-uri-removed
4-
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname.mp3?type=audio/mpeg&max-size=115343360
4+
http://localhost:8888/USK@0I8gctpUE32CM0iQhXaYpCMvtPPGfT4pjXm01oid5Zc,3dAcn4fX2LyxO6uCnWFTx-2HKZ89uruurcKwLSCxbZ4,AQACAAE/FakeM3UHostingFreesite/23/simplepathname.mp3?type=audio/mpeg&max-size=230686720
55
#bad-uri-removed
66
#bad-uri-removed

0 commit comments

Comments
 (0)