prefix links in m3u-files with host+port of the node to allow for local playback with arbitrary keys #691

ArneBab · 2020-01-29T23:10:10Z

This leaks host+port of the node into the file,
but otherwise we would not be able to support arbitrary keys:
we would have to stick to files within the same prefix (i.e. SSK@…/) as the m3u file.

ArneBab · 2020-06-01T21:13:05Z

^ this gives me working m3u playlists over Freenet, usable like normal web-radio. It should get us to the point where we can live-stream audio.

src/freenet/client/filter/GenericReadFilterCallback.java

src/freenet/client/filter/M3UFilter.java

ArneBab · 2020-08-16T00:06:15Z

Here’s an example with all working keys:

USK@sDzl0PU80nmJrgyx2kRtXROaAfgYa8~cQQXCIblGQWw,6WvK00wFVFfky60q9kEmFxUi3t9fL3RV18dgswGbcU0,AQACAAE/freenet-stream-mp3s/6/stream.m3u?type=text/plain

With this change you can now actually play the stream with
mpv http://localhost:8888/freenet:USK@sDzl0PU80nmJrgyx2kRtXROaAfgYa8~cQQXCIblGQWw,6WvK00wFVFfky60q9kEmFxUi3t9fL3RV18dgswGbcU0,AQACAAE/freenet-stream-mp3s/7/stream.m3u

test/freenet/client/filter/m3u/safe.m3u

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

…al playback with arbitrary keys. This leaks host+port of the node into the file, but otherwise we would not be able to support arbitrary keys: we would have to stick to files within the same prefix (i.e. SSK@…/) as the m3u file.

…licit license for Libre-JS

src/freenet/client/filter/GenericReadFilterCallback.java

src/freenet/client/filter/ContentFilter.java

ArneBab · 2020-08-20T21:58:25Z

To simplify review, disable display of whitespace changes. IntelliJ auto-cleaned up a lot of empty-except-for-spaces lines.

Bombe · 2020-08-26T18:54:52Z

To simplify review, disable display of whitespace changes. IntelliJ auto-cleaned up a lot of empty-except-for-spaces lines.

Yeah, don’t do any large formatting changes in the middle of a whole bunch of changes, this will make this quite unhandy to review…

ArneBab · 2020-08-26T19:00:52Z

Those formatting changes came in unintentionally via IntelliJ auto-fixes and are pretty hard to undo after the commit is done :-/

I could try a rebase -i with squash and edit, but I’m not sure that that will make it easier.

Bombe

Not completely done, will review more tomorrow!

src/freenet/client/FetchContext.java

src/freenet/clients/http/FProxyToadlet.java

src/freenet/client/FetchContext.java

src/freenet/client/async/ClientGetWorkerThread.java

src/freenet/client/filter/ContentFilter.java

src/freenet/client/filter/FilterCallback.java

src/freenet/client/filter/GenericReadFilterCallback.java

src/freenet/client/filter/M3UFilter.java

src/freenet/client/async/USKRetriever.java

src/freenet/client/filter/M3UFilter.java

src/freenet/node/NodeClientCore.java

test/freenet/client/filter/CSSParserTest.java

test/freenet/client/filter/ContentFilterTest.java

test/freenet/client/filter/JPEGFilterTest.java

test/freenet/client/filter/M3UFilterTest.java

src/freenet/client/FetchContext.java

src/freenet/client/async/SingleFileFetcher.java

src/freenet/client/filter/M3UFilter.java

src/freenet/clients/http/FProxyToadlet.java

src/freenet/client/FetchContext.java

src/freenet/client/filter/ContentFilter.java

src/freenet/clients/http/staticfiles/js/checkall.js

src/freenet/clients/http/staticfiles/js/progresspage.js

src/freenet/pluginmanager/OfficialPlugins.java

src/freenet/support/MultiValueTable.java

test/freenet/client/filter/ContentFilterTest.java

test/freenet/client/filter/PNGFilterTest.java

test/freenet/clients/http/utils/UriFilterProxyHeaderParserTest.java

thanks to Bombe! For #691

For #691

Bombe

We’re nearing the end of it! :)

src/freenet/clients/http/staticfiles/js/checkall.js

src/freenet/pluginmanager/OfficialPlugins.java

src/freenet/clients/http/utils/UriFilterProxyHeaderParser.java

test/freenet/clients/http/utils/UriFilterProxyHeaderParserTest.java

thanks to Bombe! For #691

For #691

Bombe

That looks good! Is there already a ticket for the next changes in the header-parsing code? As soon as there is, this is good to go, IMHO.

src/freenet/clients/http/utils/UriFilterProxyHeaderParser.java

ArneBab · 2020-11-27T21:57:57Z

There’s no ticket for the next changes, but a pull-request: #716

ArneBab · 2020-11-27T22:07:49Z

Thank you for helping me make this work! You’re awesome!

Bombe · 2020-11-27T22:27:29Z

There’s no ticket for the next changes, but a pull-request: #716

Even better! :)

ArneBab requested a review from Bombe June 2, 2020 15:29

Bombe requested changes Jun 2, 2020

View reviewed changes

src/freenet/client/filter/GenericReadFilterCallback.java Outdated Show resolved Hide resolved

src/freenet/client/filter/GenericReadFilterCallback.java Outdated Show resolved Hide resolved

Bombe requested changes Jun 2, 2020

View reviewed changes

src/freenet/client/filter/M3UFilter.java Outdated Show resolved Hide resolved

ArneBab commented Aug 16, 2020

View reviewed changes

test/freenet/client/filter/m3u/safe.m3u Show resolved Hide resolved

test/freenet/client/filter/m3u/unsafe_madesafe.m3u Show resolved Hide resolved

ArneBab added 5 commits August 16, 2020 12:53

rewrite checkall, match the class for all input elements, and add exp…

b1fb669

…licit license for Libre-JS

add explicit license for Libre-JS to progresspage.js

59e1fba

cleanup whitespace

1671eb8

use host and port from request, storing it in the fetch context

9a8cf09

ArneBab force-pushed the m3u-with-host-and-port branch from 33dc7c2 to 9a8cf09 Compare August 16, 2020 18:20

FIX: did not skip empty lines terminated with CRLF.

4117888

ArneBab requested a review from Bombe August 20, 2020 21:53

ArneBab commented Aug 20, 2020

View reviewed changes

src/freenet/client/filter/GenericReadFilterCallback.java Show resolved Hide resolved

ArneBab commented Aug 20, 2020

View reviewed changes

src/freenet/client/filter/ContentFilter.java Outdated Show resolved Hide resolved

ArneBab commented Aug 20, 2020

View reviewed changes

src/freenet/client/filter/ContentFilter.java Outdated Show resolved Hide resolved

ArneBab added 6 commits August 21, 2020 00:09

merge next into m3u-with-host-and-port

4a4d465

preserve final linebreak on Windows

a8c997b

fix merge error

1eeee5c

actually fix merge errors

f78aa35

Merge branch 'next' into m3u-with-host-and-port

d860b80

fix merge error

cd4bf76

Bombe requested changes Aug 26, 2020

View reviewed changes

Bombe requested changes Aug 27, 2020

View reviewed changes

host→private hostAndPort, otherParams→otherMimeTypeParams, inline

90dc7e0

Bombe requested changes Aug 27, 2020

View reviewed changes

src/freenet/client/FetchContext.java Show resolved Hide resolved

src/freenet/client/async/SingleFileFetcher.java Outdated Show resolved Hide resolved

src/freenet/client/filter/M3UFilter.java Show resolved Hide resolved

src/freenet/clients/http/FProxyToadlet.java Show resolved Hide resolved

ArneBab requested a review from Bombe September 12, 2020 21:32

Bombe requested changes Oct 22, 2020

View reviewed changes

ArneBab added a commit that referenced this pull request Nov 14, 2020

Get Config settings as Options to benefit from the defaults

8af54a4

thanks to Bombe! For #691

ArneBab added a commit that referenced this pull request Nov 14, 2020

Do not break line unnecessarily

57ca695

thanks to Bombe! For #691

ArneBab added a commit that referenced this pull request Nov 14, 2020

Move scheme host and port parsing to static parse method.

0876565

For #691

ArneBab added a commit that referenced this pull request Nov 14, 2020

Fix tests: Still need port fallback.

11ccbaa

For #691

Bombe requested changes Nov 22, 2020

View reviewed changes

ArneBab added 15 commits November 25, 2020 18:18

move schemeHostAndPort prefix parsing to easily testable class

b95fc4a

add tests and correctly treat default values

fe84531

simplify: filename in exception

edb859b

check against null

d26bf5f

code-style: braces and spaces in FetchContext

8b8c5fd

license: GPLv3+ → GPLv2+ (what it should have been)

a6dab68

kill stray newlines

4b37698

hostAndPort → schemeHostAndPort

00177b8

ContentFilter: Initialize earlier to simplify code

af58e67

kill unused variables and imports, outdated or misleading comments

63f5860

parametrized tests to named test methods

3514c8b

Get Config settings as Options to benefit from the defaults

4551eba

thanks to Bombe! For #691

Do not break line unnecessarily

31bd660

thanks to Bombe! For #691

Move scheme host and port parsing to static parse method.

e77177d

For #691

Fix tests: Still need port fallback.

6d8fc55

For #691

ArneBab force-pushed the m3u-with-host-and-port branch from 11ccbaa to 6d8fc55 Compare November 25, 2020 17:19

ArneBab added 2 commits November 25, 2020 18:25

simplify UriFilterProxyHeaderParser: simple static method

c704733

bubble exceptions to test failure

4b7be4c

Bombe approved these changes Nov 27, 2020

View reviewed changes

src/freenet/clients/http/utils/UriFilterProxyHeaderParser.java Show resolved Hide resolved

ArneBab merged commit 2178f38 into next Nov 27, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

prefix links in m3u-files with host+port of the node to allow for local playback with arbitrary keys #691

prefix links in m3u-files with host+port of the node to allow for local playback with arbitrary keys #691

ArneBab commented Jan 29, 2020

ArneBab commented Jun 1, 2020

ArneBab commented Aug 16, 2020

ArneBab commented Aug 20, 2020

Bombe commented Aug 26, 2020

ArneBab commented Aug 26, 2020 •

edited

Loading

Bombe left a comment

Bombe left a comment

Bombe left a comment

ArneBab commented Nov 27, 2020

ArneBab commented Nov 27, 2020

Bombe commented Nov 27, 2020

prefix links in m3u-files with host+port of the node to allow for local playback with arbitrary keys #691

prefix links in m3u-files with host+port of the node to allow for local playback with arbitrary keys #691

Conversation

ArneBab commented Jan 29, 2020

ArneBab commented Jun 1, 2020

ArneBab commented Aug 16, 2020

ArneBab commented Aug 20, 2020

Bombe commented Aug 26, 2020

ArneBab commented Aug 26, 2020 • edited Loading

Bombe left a comment

Choose a reason for hiding this comment

Bombe left a comment

Choose a reason for hiding this comment

Bombe left a comment

Choose a reason for hiding this comment

ArneBab commented Nov 27, 2020

ArneBab commented Nov 27, 2020

Bombe commented Nov 27, 2020

ArneBab commented Aug 26, 2020 •

edited

Loading