From 308869aa73c7c03d7e9fad2a780bf132e03c8c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Fri, 21 Jul 2017 17:27:03 +0200
Subject: Do not ignore empty values when receiving a data form

Otherwise, these fields cannot be emptied by the user

fix #3281
---
 src/xmpp/biboumi_adhoc_commands.cpp | 30 ++++++++++--------------------
 tests/end_to_end/__main__.py        | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/src/xmpp/biboumi_adhoc_commands.cpp b/src/xmpp/biboumi_adhoc_commands.cpp
index 27b079b..60af506 100644
--- a/src/xmpp/biboumi_adhoc_commands.cpp
+++ b/src/xmpp/biboumi_adhoc_commands.cpp
@@ -399,24 +399,20 @@ void ConfigureIrcServerStep2(XmppComponent&, AdhocSession& session, XmlNode& com
               options.col<Database::VerifyCert>() = val;
             }
 
-          else if (field->get_tag("var") == "fingerprint" && value &&
-                   !value->get_inner().empty())
+          else if (field->get_tag("var") == "fingerprint" && value)
             {
               options.col<Database::TrustedFingerprint>() = value->get_inner();
             }
 
 #endif // BOTAN_FOUND
 
-          else if (field->get_tag("var") == "pass" &&
-                   value && !value->get_inner().empty())
+          else if (field->get_tag("var") == "pass" && value)
             options.col<Database::Pass>() = value->get_inner();
 
-          else if (field->get_tag("var") == "after_connect_command" &&
-                   value && !value->get_inner().empty())
+          else if (field->get_tag("var") == "after_connect_command")
             options.col<Database::AfterConnectionCommand>() = value->get_inner();
 
-          else if (field->get_tag("var") == "username" &&
-                   value && !value->get_inner().empty())
+          else if (field->get_tag("var") == "username" && value)
             {
               auto username = value->get_inner();
               // The username must not contain spaces
@@ -424,16 +420,13 @@ void ConfigureIrcServerStep2(XmppComponent&, AdhocSession& session, XmlNode& com
               options.col<Database::Username>() = username;
             }
 
-          else if (field->get_tag("var") == "realname" &&
-                   value && !value->get_inner().empty())
+          else if (field->get_tag("var") == "realname" && value)
             options.col<Database::Realname>() = value->get_inner();
 
-          else if (field->get_tag("var") == "encoding_out" &&
-                   value && !value->get_inner().empty())
+          else if (field->get_tag("var") == "encoding_out" && value)
             options.col<Database::EncodingOut>() = value->get_inner();
 
-          else if (field->get_tag("var") == "encoding_in" &&
-                   value && !value->get_inner().empty())
+          else if (field->get_tag("var") == "encoding_in" && value)
             options.col<Database::EncodingIn>() = value->get_inner();
 
         }
@@ -572,16 +565,13 @@ bool handle_irc_channel_configuration_form(XmppComponent& xmpp_component, const
             {
               const XmlNode *value = field->get_child("value", "jabber:x:data");
 
-              if (field->get_tag("var") == "encoding_out" &&
-                  value && !value->get_inner().empty())
+              if (field->get_tag("var") == "encoding_out" && value)
                 options.col<Database::EncodingOut>() = value->get_inner();
 
-              else if (field->get_tag("var") == "encoding_in" &&
-                       value && !value->get_inner().empty())
+              else if (field->get_tag("var") == "encoding_in" && value)
                 options.col<Database::EncodingIn>() = value->get_inner();
 
-              else if (field->get_tag("var") == "persistent" &&
-                       value)
+              else if (field->get_tag("var") == "persistent" && value)
                 options.col<Database::Persistent>() = to_bool(value->get_inner());
               else if (field->get_tag("var") == "record_history" &&
                        value && !value->get_inner().empty())
diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py
index 8c2d8e9..c6607d0 100644
--- a/tests/end_to_end/__main__.py
+++ b/tests/end_to_end/__main__.py
@@ -2551,6 +2551,41 @@ if __name__ == '__main__':
                              ),
                      partial(send_stanza, "<iq type='set' id='id4' from='{jid_one}/{resource_one}' to='{irc_server_one}'><command xmlns='http://jabber.org/protocol/commands' action='cancel' node='configure' sessionid='{sessionid}' /></iq>"),
                      partial(expect_stanza, "/iq[@type='result']/commands:command[@node='configure'][@status='canceled']"),
+
+                     # Same thing, but try to empty some values
+                     partial(send_stanza, "<iq type='set' id='id1' from='{jid_one}/{resource_one}' to='{irc_server_one}'><command xmlns='http://jabber.org/protocol/commands' node='configure' action='execute' /></iq>"),
+                     partial(expect_stanza, "/iq[@type='result']",
+                             after = partial(save_value, "sessionid", partial(extract_attribute, "/iq[@type='result']/commands:command[@node='configure']", "sessionid"))
+                             ),
+                     partial(send_stanza, "<iq type='set' id='id2' from='{jid_one}/{resource_one}' to='{irc_server_one}'>"
+                                          "<command xmlns='http://jabber.org/protocol/commands' node='configure' sessionid='{sessionid}' action='next'>"
+                                          "<x xmlns='jabber:x:data' type='submit'>"
+                                          "<field var='pass'><value></value></field>"
+                                          "<field var='after_connect_command'><value></value></field>"
+                                          "<field var='username'><value></value></field>"
+                                          "<field var='realname'><value></value></field>"
+                                          "<field var='encoding_out'><value></value></field>"
+                                          "<field var='encoding_in'><value></value></field>"
+                                          "</x></command></iq>"),
+                     partial(expect_stanza, "/iq[@type='result']/commands:command[@node='configure'][@status='completed']/commands:note[@type='info'][text()='Configuration successfully applied.']"),
+
+                     partial(send_stanza, "<iq type='set' id='id3' from='{jid_one}/{resource_one}' to='{irc_server_one}'><command xmlns='http://jabber.org/protocol/commands' node='configure' action='execute' /></iq>"),
+                     partial(expect_stanza, ("/iq[@type='result']/commands:command[@node='configure'][@sessionid][@status='executing']",
+                                             "/iq/commands:command/dataform:x[@type='form']/dataform:title[text()='Configure the IRC server irc.localhost']",
+                                             "/iq/commands:command/dataform:x[@type='form']/dataform:instructions[text()='Edit the form, to configure the settings of the IRC server irc.localhost']",
+                                             "!/iq/commands:command/dataform:x[@type='form']/dataform:field[@var='pass']/dataform:value",
+                                             "!/iq/commands:command/dataform:x[@type='form']/dataform:field[@var='after_connect_command']/dataform:value",
+                                             "!/iq/commands:command/dataform:x[@type='form']/dataform:field[@var='username']/dataform:value",
+                                             "!/iq/commands:command/dataform:x[@type='form']/dataform:field[@var='realname']/dataform:value",
+                                             "!/iq/commands:command/dataform:x[@type='form']/dataform:field[@var='encoding_in']/dataform:value",
+                                             "!/iq/commands:command/dataform:x[@type='form']/dataform:field[@var='encoding_out']/dataform:value",
+                                             "/iq/commands:command/commands:actions/commands:next",
+                                             ),
+                             after = partial(save_value, "sessionid", partial(extract_attribute, "/iq[@type='result']/commands:command[@node='configure']", "sessionid"))
+                             ),
+                     partial(send_stanza, "<iq type='set' id='id4' from='{jid_one}/{resource_one}' to='{irc_server_one}'><command xmlns='http://jabber.org/protocol/commands' action='cancel' node='configure' sessionid='{sessionid}' /></iq>"),
+                     partial(expect_stanza, "/iq[@type='result']/commands:command[@node='configure'][@status='canceled']"),
+
                  ]),
         Scenario("irc_channel_configure",
                  [
-- 
cgit v1.2.3