Disable webaudio whitelist and add pls files to blacklisted filetypes (#69)

* add convar and hook to disable whitelist and file checking

* use hooks instead of convars for file content check

* add new check to checkStreamContents

* remove unused convars

* return when onError called for checkStreamContents

* include id in error message for checking stream content

* whitespace changes

* whitespace changes

Author: plally

lua/autorun/webaudio.lua

@@ -681,6 +681,9 @@ local function isWhitelistedURL(url)
 	if not isstring(url) then return false end
 	url = url:Trim()
 
+	local isWhitelisted = hook.Run("WA_IsWhitelistedURL", url)
+	if isWhitelisted ~= nil then return isWhitelisted end
+
 	local relative = url:match("^https?://www%.(.*)") or url:match("^https?://(.*)")
 	if not relative then return false end
 
@@ -797,4 +800,4 @@ else
 	include("webaudio/interface.lua")
 end
 
-return WebAudio.Common
+return WebAudio.Common

lua/webaudio/receiver.lua

@@ -90,6 +90,29 @@ timer.Create("wa_think", 100 / 1000, 0, function()
 	end
 end)
 
+---@param url string
+---@param onSuccess fun()
+---@param onError fun(err: string)
+local function checkStreamContents(url, onSuccess, onError)
+	if hook.Run("WA_ShouldCheckStreamContent", url) == false then
+		return onSuccess()
+	end
+
+	http.Fetch(url, function(body, _, _)
+		if body:find("#EXTM3U", 1, true) then
+			return onError("Cannot create stream with unwhitelisted file format (m3u)")
+		end
+
+		if body:find("[playlist]", 1, true) then
+			return onError("Cannot create stream with unwhitelisted file format (pls)")
+		end
+
+		onSuccess()
+	end, function(err)
+		onError("HTTP error:" .. err)
+	end)
+end
+
 net.Receive("wa_create", function(len)
 	local id, url, owner = WebAudio.readID(), net.ReadString(), net.ReadEntity()
 	local verbosity = Verbosity:GetInt()
@@ -141,12 +164,7 @@ net.Receive("wa_create", function(len)
 
 	notify("User %s(%s) created WebAudio object with url [%q]", owner:Nick(), owner:SteamID64() or "multirun", url)
 
-	http.Fetch(url, function(body, size, headers)
-		if body:find("#EXTM3U", 1, true) then
-			streamFailed()
-			return warn("User %s(%s) tried to create WebAudio object with unwhitelisted file format (m3u)", owner:Nick(), owner:SteamID64() or "multirun")
-		end
-
+	checkStreamContents(url, function()
 		sound.PlayURL(url, "3d noblock noplay", function(bass, errid, errname)
 			if errid then
 				streamFailed()
@@ -209,7 +227,7 @@ net.Receive("wa_create", function(len)
 		end)
 	end, function(err)
 		streamFailed()
-		return warn("HTTP error when creating WebAudio receiver with id %d, Error [%q]", id, err)
+		return warn("Error when creating WebAudio object with id: %s, User %s(%s), Error: %s", id, owner:Nick(), owner:SteamID64() or "multirun", err)
 	end)
 
 	WebAudio.new(url, owner, nil, id) -- Register object
@@ -403,4 +421,4 @@ cvars.AddChangeCallback("wa_enable", function(convar, old, new)
 	net.Start("wa_enable", true)
 		net.WriteBool(enabled) -- Tell the server to subscribe/unsubscribe us from net messages
 	net.SendToServer()
-end, "wa_enable")
+end, "wa_enable")