Skip to content

Commit

Permalink
ytdl_hook: fix safe url checking with EDL urls
Browse files Browse the repository at this point in the history
  • Loading branch information
wiiaboo committed Jan 26, 2018
1 parent f8263e8 commit ce42a96
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions player/lua/ytdl_hook.lua
Original file line number Diff line number Diff line change
Expand Up @@ -264,18 +264,17 @@ local function add_single_video(json)
edl_track = edl_track_joined(track.fragments,
track.protocol, json.is_live,
track.fragment_base_url)
local url = edl_track or track.url
if not url_is_safe(url) then
if not edl_track and not url_is_safe(track.url) then
return
end
if track.acodec and track.acodec ~= "none" then
-- audio track
mp.commandv("audio-add",
url, "auto",
edl_track or track.url, "auto",
track.format_note or "")
elseif track.vcodec and track.vcodec ~= "none" then
-- video track
streamurl = url
streamurl = edl_track or track.url
end
end

Expand All @@ -284,6 +283,9 @@ local function add_single_video(json)
edl_track = edl_track_joined(json.fragments, json.protocol,
json.is_live, json.fragment_base_url)

if not edl_track and not url_is_safe(json.url) then
return
end
-- normal video or single track
streamurl = edl_track or json.url
set_http_headers(json.http_headers)
Expand All @@ -294,13 +296,7 @@ local function add_single_video(json)

msg.debug("streamurl: " .. streamurl)

streamurl = streamurl:gsub("^data:", "data://", 1)

if not url_is_safe(streamurl) then
return
end

mp.set_property("stream-open-filename", streamurl)
mp.set_property("stream-open-filename", streamurl:gsub("^data:", "data://", 1))

mp.set_property("file-local-options/force-media-title", json.title)

Expand Down Expand Up @@ -499,6 +495,10 @@ mp.add_hook(o.try_ytdl_first and "on_load" or "on_load_fail", 10, function ()

msg.debug("EDL: " .. playlist)

if not playlist then
return
end

-- can't change the http headers for each entry, so use the 1st
if json.entries[1] then
set_http_headers(json.entries[1].http_headers)
Expand Down

0 comments on commit ce42a96

Please sign in to comment.