2 files changed, 2 insertions, 18 deletions
diff --git a/custom/extensions/auth-file.lua b/custom/extensions/auth-file.lua
index 78e5020..7d4d514 100644
--- a/custom/extensions/auth-file.lua
+++ b/custom/extensions/auth-file.lua
@@ -218,22 +218,14 @@ end
 -- The URL helpers below are adapted from keplerproject/wsapi.
 
 function url_decode(str)
-	if not str then
-		return ""
-	end
 	str = string.gsub(str, "+", " ")
 	str = string.gsub(str, "%%(%x%x)", function(hex)
 		return string.char(tonumber(hex, 16))
 	end)
-	str = string.gsub(str, "\r\n", "\n")
 	return str
 end
 
 function url_encode(str)
-	if not str then
-		return ""
-	end
-	str = string.gsub(str, "\n", "\r\n")
 	str = string.gsub(str, "([^%w ])", function(char)
 		return string.format("%%%02X", string.byte(char))
 	end)
@@ -245,7 +237,7 @@ end
 -- '=', for example a base64 password, so the value runs to the next '&'.
 function parse_query(query)
 	local params = {}
-	for key, value in string.gmatch(query or "", "([^&=]+)=([^&]*)") do
+	for key, value in string.gmatch(query, "([^&=]+)=([^&]*)") do
 		params[url_decode(key)] = url_decode(value)
 	end
 	return params
diff --git a/custom/extensions/auth-inline.lua b/custom/extensions/auth-inline.lua
index f5ee14b..c9aa9f1 100644
--- a/custom/extensions/auth-inline.lua
+++ b/custom/extensions/auth-inline.lua
@@ -164,22 +164,14 @@ end
 -- The URL helpers below are adapted from keplerproject/wsapi.
 
 function url_decode(str)
-	if not str then
-		return ""
-	end
 	str = string.gsub(str, "+", " ")
 	str = string.gsub(str, "%%(%x%x)", function(hex)
 		return string.char(tonumber(hex, 16))
 	end)
-	str = string.gsub(str, "\r\n", "\n")
 	return str
 end
 
 function url_encode(str)
-	if not str then
-		return ""
-	end
-	str = string.gsub(str, "\n", "\r\n")
 	str = string.gsub(str, "([^%w ])", function(char)
 		return string.format("%%%02X", string.byte(char))
 	end)
@@ -191,7 +183,7 @@ end
 -- '=', for example a base64 password, so the value runs to the next '&'.
 function parse_query(query)
 	local params = {}
-	for key, value in string.gmatch(query or "", "([^&=]+)=([^&]*)") do
+	for key, value in string.gmatch(query, "([^&=]+)=([^&]*)") do
 		params[url_decode(key)] = url_decode(value)
 	end
 	return params
-rw-r--r--	custom/extensions/auth-file.lua	10
-rw-r--r--	custom/extensions/auth-inline.lua	10