3 files changed, 68 insertions, 26 deletions

diff --git a/louloulibs/xmpp/auth.cpp b/louloulibs/xmpp/auth.cpp
index c20f95d..8a34a4e 100644
--- a/louloulibs/xmpp/auth.cpp
+++ b/louloulibs/xmpp/auth.cpp
@@ -2,20 +2,7 @@
 
 #include <utils/sha1.hpp>
 
-#include <iomanip>
-#include <sstream>
-
 std::string get_handshake_digest(const std::string& stream_id, const std::string& secret)
 {
-  sha1nfo sha1;
-  sha1_init(&sha1);
-  sha1_write(&sha1, stream_id.data(), stream_id.size());
-  sha1_write(&sha1, secret.data(), secret.size());
-  const uint8_t* result = sha1_result(&sha1);
-
-  std::ostringstream digest;
-  for (int i = 0; i < HASH_LENGTH; i++)
-    digest << std::hex << std::setfill('0') << std::setw(2) << static_cast<int>(result[i]);
-
-  return digest.str();
+  return sha1(stream_id + secret);
 }
diff --git a/louloulibs/xmpp/jid.cpp b/louloulibs/xmpp/jid.cpp
index 7b62f3e..46e01ea 100644
--- a/louloulibs/xmpp/jid.cpp
+++ b/louloulibs/xmpp/jid.cpp
@@ -6,6 +6,11 @@
 #include <louloulibs.h>
 #ifdef LIBIDN_FOUND
  #include <stringprep.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
+ #include <utils/scopeguard.hpp>
+ #include <set>
 #endif
 
 #include <logger/logger.hpp>
@@ -58,19 +63,68 @@ std::string jidprep(const std::string& original)
 
   char domain[max_jid_part_len] = {};
   memcpy(domain, jid.domain.data(), std::min(max_jid_part_len, jid.domain.size()));
-  rc = static_cast<Stringprep_rc>(::stringprep(domain, max_jid_part_len,
-       static_cast<Stringprep_profile_flags>(0), stringprep_nameprep));
-  if (rc != STRINGPREP_OK)
+
   {
-    log_error(error_msg + stringprep_strerror(rc));
-    return "";
+    // Using getaddrinfo, check if the domain part is a valid IPv4 (then use
+    // it as is), or IPv6 (surround it with []), or a domain name (run
+    // nameprep)
+    struct addrinfo hints;
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_flags = AI_NUMERICHOST;
+    hints.ai_family = AF_UNSPEC;
+
+    struct addrinfo* addr_res = nullptr;
+    const auto ret = ::getaddrinfo(domain, nullptr, &hints, &addr_res);
+    auto addrinfo_deleter = utils::make_scope_guard([addr_res] { if (addr_res) freeaddrinfo(addr_res); });
+    if (ret || !addr_res || (addr_res->ai_family != AF_INET && addr_res->ai_family != AF_INET6))
+      { // Not an IP, run nameprep on it
+        rc = static_cast<Stringprep_rc>(::stringprep(domain, max_jid_part_len,
+                                                     static_cast<Stringprep_profile_flags>(0), stringprep_nameprep));
+        if (rc != STRINGPREP_OK)
+          {
+            log_error(error_msg + stringprep_strerror(rc));
+            return "";
+          }
+
+        // Make sure it contains only allowed characters
+        using std::begin;
+        using std::end;
+        char* domain_end = domain + ::strlen(domain);
+        std::replace_if(std::begin(domain), domain + ::strlen(domain),
+                        [](const char c) -> bool
+                        {
+                          return !((c >= 'a' && c <= 'z') || c == '-' ||
+                                   (c >= '0' && c <= '9') || c == '.');
+                        }, '-');
+        // Make sure there are no doubled - or .
+        std::set<char> special_chars{'-', '.'};
+        domain_end = std::unique(begin(domain), domain + ::strlen(domain), [&special_chars](const char& a, const char& b) -> bool
+        {
+          return special_chars.count(a) && special_chars.count(b);
+        });
+        // remove leading and trailing -. if any
+        if (domain_end != domain && special_chars.count(*(domain_end - 1)))
+          --domain_end;
+        if (domain_end != domain && special_chars.count(domain[0]))
+          {
+            std::memmove(domain, domain + 1, domain_end - domain + 1);
+            --domain_end;
+          }
+        // And if the final result is an empty string, return a dummy hostname
+        if (domain_end == domain)
+          ::strcpy(domain, "empty");
+        else
+          *domain_end = '\0';
+      }
+    else if (addr_res->ai_family == AF_INET6)
+      { // IPv6, surround it with []. The length is always enough:
+        // the longest possible IPv6 is way shorter than max_jid_part_len
+        ::memmove(domain + 1, domain, jid.domain.size());
+        domain[0] = '[';
+        domain[jid.domain.size() + 1] = ']';
+      }
   }
-  std::replace_if(std::begin(domain), domain + ::strlen(domain),
-                  [](const char c) -> bool
-                  {
-                    return !((c >= 'a' && c <= 'z') || c == '-' ||
-                      (c >= '0' && c <= '9') || c == '.');
-                  }, '-');
+
 
   // If there is no resource, stop here
   if (jid.resource.empty())
diff --git a/louloulibs/xmpp/xmpp_component.cpp b/louloulibs/xmpp/xmpp_component.cpp
index e1b6131..e40b1e4 100644
--- a/louloulibs/xmpp/xmpp_component.cpp
+++ b/louloulibs/xmpp/xmpp_component.cpp
@@ -5,6 +5,7 @@
 
 #include <xmpp/xmpp_component.hpp>
 #include <config/config.hpp>
+#include <utils/system.hpp>
 #include <utils/time.hpp>
 #include <xmpp/auth.hpp>
 #include <xmpp/jid.hpp>
@@ -585,7 +586,7 @@ void XmppComponent::send_version(const std::string& id, const std::string& jid_t
         }
         {
           XmlSubNode os(query, "os");
-          os.set_inner(SYSTEM_NAME);
+          os.set_inner(utils::get_system_name());
         }
     }
     else