diff options
| author | steckbrief <steckbrief@chefmail.de> | 2017-05-02 20:55:42 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2017-05-02 20:55:42 +0200 |
| commit | 471b217ceb7bcf4a1db5eb3f825bb09b5f8d8345 (patch) | |
| tree | 3da9b3b9f62f59aab74a44affa578859a32f64a0 | |
| parent | 62e463bdd57e03c3e51c9db2160e87b39615c7c9 (diff) | |
improved error handling in prosody module
| -rw-r--r-- | prosody-module/mod_http_upload_external/mod_http_upload_external.lua | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/prosody-module/mod_http_upload_external/mod_http_upload_external.lua b/prosody-module/mod_http_upload_external/mod_http_upload_external.lua index 11175ee..23e356e 100644 --- a/prosody-module/mod_http_upload_external/mod_http_upload_external.lua +++ b/prosody-module/mod_http_upload_external/mod_http_upload_external.lua @@ -43,7 +43,12 @@ module:hook("iq/host/"..xmlns_http_upload..":request", function (event) return true; end local slot_type = request.attr.type; + if slot_type then module:log("debug", "incoming request is of type " .. slot_type); + else + module:log("debug", "incoming request has no type - using default type 'upload'"); + end + if not slot_type or slot_type == "upload" then -- validate local filename = request:get_child_text("filename"); @@ -67,7 +72,10 @@ module:hook("iq/host/"..xmlns_http_upload..":request", function (event) -- the request local respbody, statuscode = http.request(external_url, reqbody); - respbody = string.gsub(respbody, "\\/", "/") + -- respbody is nil in case the server is not reachable + if respbody ~= nil then + respbody = string.gsub(respbody, "\\/", "/"); + end local get_url = nil; local put_url = nil; @@ -127,9 +135,12 @@ module:hook("iq/host/"..xmlns_http_upload..":request", function (event) return true; end end - else + elseif respbody ~= nil then origin.send(st.error_reply(stanza, "cancel", "undefined-condition", "status code: " .. statuscode .. " response: " ..respbody)); return true; + else + -- http file service not reachable + origin.send(st.error_reply(stanza, "cancel", "undefined-condition", "status code: " .. statuscode)); end local reply = st.reply(stanza); @@ -148,7 +159,10 @@ module:hook("iq/host/"..xmlns_http_upload..":request", function (event) local reqbody = "xmpp_server_key=" .. xmpp_server_key .. "&slot_type=delete&file_url=" .. fileurl .. "&user_jid=" .. orig_from; -- the request local respbody, statuscode = http.request(external_url, reqbody); - respbody = string.gsub(respbody, "\\/", "/") + -- respbody is nil in case the server is not reachable + if respbody ~= nil then + respbody = string.gsub(respbody, "\\/", "/"); + end local delete_token = nil; -- check the response @@ -192,9 +206,12 @@ module:hook("iq/host/"..xmlns_http_upload..":request", function (event) return true; end end - else + elseif respbody ~= nil then origin.send(st.error_reply(stanza, "cancel", "undefined-condition", "status code: " .. statuscode .. " response: " ..respbody)); return true; + else + -- http file service not reachable + origin.send(st.error_reply(stanza, "cancel", "undefined-condition", "status code: " .. statuscode)); end local reply = st.reply(stanza); |