fix: http handler not handling unicode gracefully

Sonoran-Software · Aug 20, 2020 · 096ee15 · 096ee15
1 parent e299599
commit 096ee15
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/sonorancad/core/http.js b/sonorancad/core/http.js
@@ -1,5 +1,7 @@
+function byteCount(s) {
+    return encodeURI(s).split(/%..|./).length - 1;
+}
 
-//url, cb, method, data, headers
 exports('HandleHttpRequest', (dest, callback, method, data, headers) => {
     const urlObj = url.parse(dest)
     const options = {
@@ -10,7 +12,7 @@ exports('HandleHttpRequest', (dest, callback, method, data, headers) => {
     }
     if (method == "POST") {
         options.headers['Content-Type'] = 'application/json',
-        options.headers['Content-Length'] = data.length
+        options.headers['Content-Length'] = byteCount(data)
     }
     else if (method != "GET") {
         console.error("Invalid request. Only GET/POST supported. Method: " + method);

diff --git a/sonorancad/core/server.lua b/sonorancad/core/server.lua
@@ -79,9 +79,9 @@ function performApiRequest(postData, type, cb)
         apiUrl = "https://api.sonoransoftware.com/"
     end
     PerformHttpRequest(apiUrl..tostring(endpoint), function(statusCode, res, headers)
-        debugPrint(("type %s called with post data %s to url %s"):format(type, json.encode(payload), Config.apiUrl..tostring(endpoint)))
+        --debugPrint(("type %s called with post data %s to url %s"):format(type, json.encode(payload), Config.apiUrl..tostring(endpoint)))
         if statusCode == 200 and res ~= nil then
-            debugPrint("result: "..tostring(res))
+            --debugPrint("result: "..tostring(res))
             cb(res, true)
         elseif statusCode == 404 then -- handle 404 requests, like from CHECK_APIID
             cb(res, false)

diff --git a/sonorancad/plugins/apicheck b/sonorancad/plugins/apicheck
diff --git a/sonorancad/plugins/livemap b/sonorancad/plugins/livemap
diff --git a/sonorancad/plugins/lookups b/sonorancad/plugins/lookups
diff --git a/sonorancad/plugins/pushevents b/sonorancad/plugins/pushevents
diff --git a/sonorancad/plugins/wraithv2 b/sonorancad/plugins/wraithv2
+8 −0		README.md
+6 −1		livemap/cl_livemap.lua
+1 −1		livemap/sv_esx.lua
+7 −0		livemap/sv_livemap.lua
+3 −2		livemap/version_livemap.json
+3 −1		README.md
+144 −59		lookups/sv_lookups.lua
+1 −1		lookups/version_lookups.json
+6 −0		README.md
+9 −2		pushevents/sv_listener_pushevents.js
+1 −1		pushevents/version_pushevents.json
+3 −1		README.md
+1 −0		wraithv2/CHANGEMEconfig_wraithv2.lua
+70 −45		wraithv2/sv_wraithv2.lua
+2 −2		wraithv2/version_wraithv2.json