net.dns: Ensure all pending requests get notified of a timeout when looking up a...

[prosody.git] / util / dataforms.lua

diff --git a/util/dataforms.lua b/util/dataforms.lua
index ae745e03ed334d08c4ef9d284ce900b69527943f..01a8eef327c1ac566a0ecfabb997c03207f6f237 100644 (file)
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -8,9 +8,10 @@
 
 local setmetatable = setmetatable;
 local pairs, ipairs = pairs, ipairs;
-local tostring, type = tostring, type;
+local tostring, type, next = tostring, type, next;
 local t_concat = table.concat;
 local st = require "util.stanza";
+local jid_prep = require "util.jid".prep;
 
 module "dataforms"
 
@@ -52,7 +53,7 @@ function form_t.form(layout, data, formtype)
                        elseif field_type == "boolean" then
                                form:tag("value"):text((value and "1") or "0"):up();
                        elseif field_type == "fixed" then
-                               
+                               form:tag("value"):text(value):up();
                        elseif field_type == "jid-multi" then
                                for _, jid in ipairs(value) do
                                        form:tag("value"):text(jid):up();
@@ -92,6 +93,15 @@ function form_t.form(layout, data, formtype)
                                end
                        end
                end
+
+               local media = field.media;
+               if media then
+                       form:tag("media", { xmlns = "urn:xmpp:media-element", height = media.height, width = media.width });
+                       for _, val in ipairs(media) do
+                               form:tag("uri", { type = val.type }):text(val.uri):up()
+                       end
+                       form:up();
+               end
                
                if field.required then
                        form:tag("required"):up();
@@ -107,30 +117,41 @@ local field_readers = {};
 
 function form_t.data(layout, stanza)
        local data = {};
-       
-       for field_tag in stanza:childtags() do
-               local field_type;
-               for n, field in ipairs(layout) do
+       local errors = {};
+
+       for _, field in ipairs(layout) do
+               local tag;
+               for field_tag in stanza:childtags() do
                        if field.name == field_tag.attr.var then
-                               field_type = field.type;
+                               tag = field_tag;
                                break;
                        end
                end
-               
-               local reader = field_readers[field_type];
-               if reader then
-                       data[field_tag.attr.var] = reader(field_tag);
+
+               if not tag then
+                       if field.required then
+                               errors[field.name] = "Required value missing";
+                       end
+               else
+                       local reader = field_readers[field.type];
+                       if reader then
+                               data[field.name], errors[field.name] = reader(tag, field.required);
+                       end
                end
-               
+       end
+       if next(errors) then
+               return data, errors;
        end
        return data;
 end
 
 field_readers["text-single"] =
-       function (field_tag)
-               local value = field_tag:child_with_name("value");
-               if value then
-                       return value[1];
+       function (field_tag, required)
+               local data = field_tag:get_child_text("value");
+               if data and #data > 0 then
+                       return data
+               elseif required then
+                       return nil, "Required value missing";
                end
        end
 
@@ -138,64 +159,85 @@ field_readers["text-private"] =
        field_readers["text-single"];
 
 field_readers["jid-single"] =
-       field_readers["text-single"];
+       function (field_tag, required)
+               local raw_data = field_tag:get_child_text("value")
+               local data = jid_prep(raw_data);
+               if data and #data > 0 then
+                       return data
+               elseif raw_data then
+                       return nil, "Invalid JID: " .. raw_data;
+               elseif required then
+                       return nil, "Required value missing";
+               end
+       end
 
 field_readers["jid-multi"] =
-       function (field_tag)
+       function (field_tag, required)
                local result = {};
-               for value_tag in field_tag:childtags() do
-                       if value_tag.name == "value" then
-                               result[#result+1] = value_tag[1];
+               local err = {};
+               for value_tag in field_tag:childtags("value") do
+                       local raw_value = value_tag:get_text();
+                       local value = jid_prep(raw_value);
+                       result[#result+1] = value;
+                       if raw_value and not value then
+                               err[#err+1] = ("Invalid JID: " .. raw_value);
                        end
                end
-               return result;
+               if #result > 0 then
+                       return result, (#err > 0 and t_concat(err, "\n") or nil);
+               elseif required then
+                       return nil, "Required value missing";
+               end
        end
 
-field_readers["text-multi"] =
-       function (field_tag)
+field_readers["list-multi"] =
+       function (field_tag, required)
                local result = {};
-               for value_tag in field_tag:childtags() do
-                       if value_tag.name == "value" then
-                               result[#result+1] = value_tag[1];
-                       end
+               for value in field_tag:childtags("value") do
+                       result[#result+1] = value:get_text();
+               end
+               if #result > 0 then
+                       return result;
+               elseif required then
+                       return nil, "Required value missing";
+               end
+       end
+
+field_readers["text-multi"] =
+       function (field_tag, required)
+               local data, err = field_readers["list-multi"](field_tag, required);
+               if data then
+                       data = t_concat(data, "\n");
                end
-               return t_concat(result, "\n");
+               return data, err;
        end
 
 field_readers["list-single"] =
        field_readers["text-single"];
 
-field_readers["list-multi"] =
-       function (field_tag)
-               local result = {};
-               for value_tag in field_tag:childtags() do
-                       if value_tag.name == "value" then
-                               result[#result+1] = value_tag[1];
-                       end
-               end
-               return result;
-       end
+local boolean_values = {
+       ["1"] = true, ["true"] = true,
+       ["0"] = false, ["false"] = false,
+};
 
 field_readers["boolean"] =
-       function (field_tag)
-               local value = field_tag:child_with_name("value");
-               if value then
-                       if value[1] == "1" or value[1] == "true" then
-                               return true;
-                       else
-                               return false;
-                       end
+       function (field_tag, required)
+               local raw_value = field_tag:get_child_text("value");
+               local value = boolean_values[raw_value ~= nil and raw_value];
+               if value ~= nil then
+                       return value;
+               elseif raw_value then
+                       return nil, "Invalid boolean representation";
+               elseif required then
+                       return nil, "Required value missing";
                end
        end
 
 field_readers["hidden"] =
        function (field_tag)
-               local value = field_tag:child_with_name("value");
-               if value then
-                       return value[1];
-               end
+               return field_tag:get_child_text("value");
        end
-       
+
 return _M;