mirror of
https://github.com/mpv-player/mpv
synced 2024-12-27 17:42:17 +00:00
1cb9e7efb8
mpv has a very weak and very annoying policy that determines whether a
playlist should be used or not. For example, if you play a remote
playlist, you usually don't want it to be able to read local filesystem
entries. (Although for a media player the impact is small I guess.)
It's weak and annoying as in that it does not prevent certain cases
which could be interpreted as bad in some cases, such as allowing
playlists on the local filesystem to reference remote URLs. It probably
barely makes sense, but we just want to exclude some other "definitely
not a good idea" things, all while playlists generally just work, so
whatever.
The policy is:
- from the command line anything is played
- local playlists can reference anything except "unsafe" streams
("unsafe" means special stream inputs like libavfilter graphs)
- remote playlists can reference only remote URLs
- things like "memory://" and archives are "transparent" to this
This commit does... something. It replaces the weird stream flags with a
slightly clearer "origin" value, which is now consequently passed down
and used everywhere. It fixes some deviations from the described policy.
I wanted to force archives to reference only content within them, but
this would probably have been more complicated (or required different
abstractions), and I'm too lazy to figure it out, so archives are now
"transparent" (playlists within archives behave the same outside).
There may be a lot of bugs in this.
This is unfortunately a very noisy commit because:
- every stream open call now needs to pass the origin
- so does every demuxer open call (=> params param. gets mandatory)
- most stream were changed to provide the "origin" value
- the origin value needed to be passed along in a lot of places
- I was too lazy to split the commit
Fixes: #7274
111 lines
2.5 KiB
C
111 lines
2.5 KiB
C
#include "config.h"
|
|
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#include <errno.h>
|
|
|
|
#include "osdep/io.h"
|
|
|
|
#include "common/common.h"
|
|
#include "common/msg.h"
|
|
#include "common/global.h"
|
|
#include "stream.h"
|
|
#include "options/m_option.h"
|
|
#include "options/path.h"
|
|
#include "player/client.h"
|
|
#include "libmpv/stream_cb.h"
|
|
#include "misc/thread_tools.h"
|
|
|
|
struct priv {
|
|
mpv_stream_cb_info info;
|
|
struct mp_cancel *cancel;
|
|
};
|
|
|
|
static int fill_buffer(stream_t *s, void *buffer, int max_len)
|
|
{
|
|
struct priv *p = s->priv;
|
|
return (int)p->info.read_fn(p->info.cookie, buffer, (size_t)max_len);
|
|
}
|
|
|
|
static int seek(stream_t *s, int64_t newpos)
|
|
{
|
|
struct priv *p = s->priv;
|
|
return p->info.seek_fn(p->info.cookie, newpos) >= 0;
|
|
}
|
|
|
|
static int64_t get_size(stream_t *s)
|
|
{
|
|
struct priv *p = s->priv;
|
|
|
|
if (p->info.size_fn) {
|
|
int64_t size = p->info.size_fn(p->info.cookie);
|
|
if (size >= 0)
|
|
return size;
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
static void s_close(stream_t *s)
|
|
{
|
|
struct priv *p = s->priv;
|
|
p->info.close_fn(p->info.cookie);
|
|
}
|
|
|
|
static int open_cb(stream_t *stream)
|
|
{
|
|
struct priv *p = talloc_ptrtype(stream, p);
|
|
stream->priv = p;
|
|
|
|
bstr bproto = mp_split_proto(bstr0(stream->url), NULL);
|
|
char *proto = bstrto0(stream, bproto);
|
|
|
|
void *user_data;
|
|
mpv_stream_cb_open_ro_fn open_fn;
|
|
|
|
if (!mp_streamcb_lookup(stream->global, proto, &user_data, &open_fn))
|
|
return STREAM_UNSUPPORTED;
|
|
|
|
mpv_stream_cb_info info = {0};
|
|
|
|
int r = open_fn(user_data, stream->url, &info);
|
|
if (r < 0) {
|
|
if (r != MPV_ERROR_LOADING_FAILED)
|
|
MP_WARN(stream, "unknown error from user callback\n");
|
|
return STREAM_ERROR;
|
|
}
|
|
|
|
if (!info.read_fn || !info.close_fn) {
|
|
MP_FATAL(stream, "required read_fn or close_fn callbacks not set.\n");
|
|
return STREAM_ERROR;
|
|
}
|
|
|
|
p->info = info;
|
|
|
|
if (p->info.seek_fn && p->info.seek_fn(p->info.cookie, 0) >= 0) {
|
|
stream->seek = seek;
|
|
stream->seekable = true;
|
|
}
|
|
stream->fast_skip = true;
|
|
stream->fill_buffer = fill_buffer;
|
|
stream->get_size = get_size;
|
|
stream->close = s_close;
|
|
|
|
if (p->info.cancel_fn && stream->cancel) {
|
|
p->cancel = mp_cancel_new(p);
|
|
mp_cancel_set_parent(p->cancel, stream->cancel);
|
|
mp_cancel_set_cb(p->cancel, p->info.cancel_fn, p->info.cookie);
|
|
}
|
|
|
|
return STREAM_OK;
|
|
}
|
|
|
|
const stream_info_t stream_info_cb = {
|
|
.name = "stream_callback",
|
|
.open = open_cb,
|
|
.stream_origin = STREAM_ORIGIN_UNSAFE,
|
|
};
|