Merge branch 'master' into cap302

include/znc/Message.h

@@ -17,19 +17,6 @@
 #ifndef ZNC_MESSAGE_H
 #define ZNC_MESSAGE_H
 
-// Remove this after Feb 2016 when Debian 7 is EOL
-#if __cpp_ref_qualifiers >= 200710
-#define ZNC_LVREFQUAL &
-#elif defined(__clang__)
-#define ZNC_LVREFQUAL &
-#elif __GNUC__ > 4 ||                       \
-    __GNUC__ == 4 && (__GNUC_MINOR__ > 8 || \
-                      __GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ >= 1)
-#define ZNC_LVREFQUAL &
-#else
-#define ZNC_LVREFQUAL
-#endif
-
 #ifdef SWIG
 #define ZNC_MSG_DEPRECATED(msg)
 #else
@@ -166,7 +153,7 @@ class CMessage {
 // Implicit and explicit conversion to a subclass reference.
 #ifndef SWIG
     template <typename M>
-    M& As() ZNC_LVREFQUAL {
+    M& As() & {
         static_assert(std::is_base_of<CMessage, M>{},
                       "Must be subclass of CMessage");
         static_assert(sizeof(M) == sizeof(CMessage),
@@ -175,7 +162,7 @@ class CMessage {
     }
 
     template <typename M>
-    const M& As() const ZNC_LVREFQUAL {
+    const M& As() const& {
         static_assert(std::is_base_of<CMessage, M>{},
                       "Must be subclass of CMessage");
         static_assert(sizeof(M) == sizeof(CMessage),
@@ -185,12 +172,12 @@ class CMessage {
 
     template <typename M, typename = typename std::enable_if<
                               std::is_base_of<CMessage, M>{}>::type>
-    operator M&() ZNC_LVREFQUAL {
+    operator M&() & {
         return As<M>();
     }
     template <typename M, typename = typename std::enable_if<
                               std::is_base_of<CMessage, M>{}>::type>
-    operator const M&() const ZNC_LVREFQUAL {
+    operator const M&() const& {
         return As<M>();
     }
 // REGISTER_ZNC_MESSAGE allows SWIG to instantiate correct .As<> calls.

include/znc/Translation.h

@@ -19,6 +19,7 @@
 
 #include <znc/ZNCString.h>
 #include <unordered_map>
+#include <variant>
 
 struct CTranslationInfo {
     static std::map<CString, CTranslationInfo> GetTranslations();
@@ -83,20 +84,18 @@ class CDelayedTranslation {
 
 class COptionalTranslation {
   public:
-    COptionalTranslation(const CString& sText)
-        : m_bTranslating(false), m_sText(sText) {}
+    COptionalTranslation(const CString& sText) : m_text(sText) {}
     COptionalTranslation(const char* s) : COptionalTranslation(CString(s)) {}
-    COptionalTranslation(const CDelayedTranslation& dTranslation)
-        : m_bTranslating(true), m_dTranslation(dTranslation) {}
+    COptionalTranslation(const CDelayedTranslation& dTranslation) : m_text(dTranslation) {}
     CString Resolve() const {
-        return m_bTranslating ? m_dTranslation.Resolve() : m_sText;
+        if (m_text.index() == 0) {
+            return std::get<0>(m_text);
+        }
+        return std::get<1>(m_text).Resolve();
     }
 
   private:
-    bool m_bTranslating;
-    // TODO switch to std::variant<CString, CDelayedTranslation> after C++17
-    CString m_sText;
-    CDelayedTranslation m_dTranslation;
+    std::variant<CString, CDelayedTranslation> m_text;
 };
 
 // Used by everything except modules.

include/znc/User.h

@@ -45,24 +45,27 @@ class CUser : private CCoreTranslationMixin {
 
     bool ParseConfig(CConfig* Config, CString& sError);
 
-    // TODO refactor this
     enum eHashType {
         HASH_NONE,
         HASH_MD5,
         HASH_SHA256,
+        HASH_ARGON2ID,
 
-        HASH_DEFAULT = HASH_SHA256
+        // This should be kept in sync with CUtils::SaltedHash
+#if ZNC_HAVE_ARGON
+        HASH_DEFAULT = HASH_ARGON2ID,
+#else
+        HASH_DEFAULT = HASH_SHA256,
+#endif
     };
 
-    // If you change the default hash here and in HASH_DEFAULT,
-    // don't forget CUtils::sDefaultHash!
-    // TODO refactor this
     static CString SaltedHash(const CString& sPass, const CString& sSalt) {
-        return CUtils::SaltedSHA256Hash(sPass, sSalt);
+        return CUtils::SaltedHash(sPass, sSalt);
     }
 
     CConfig ToConfig() const;
-    bool CheckPass(const CString& sPass) const;
+    /** Checks password, may upgrade the hash method. */
+    bool CheckPass(const CString& sPass);
     bool AddAllowedHost(const CString& sHostMask);
     bool RemAllowedHost(const CString& sHostMask);
     void ClearAllowedHosts();

include/znc/Utils.h

@@ -51,15 +51,16 @@ class CUtils {
     static void PrintAction(const CString& sMessage);
     static void PrintStatus(bool bSuccess, const CString& sMessage = "");
 
-#ifndef SWIGPERL
-    // TODO refactor this
-    static const CString sDefaultHash;
-#endif
+	/** Asks password from stdin, with confirmation.
+	 *
+	 * @returns Piece of znc.conf with <Pass> block
+	 * */
+    static CString AskSaltedHashPassForConfig();
 
-    static CString GetSaltedHashPass(CString& sSalt);
     static CString GetSalt();
     static CString SaltedMD5Hash(const CString& sPass, const CString& sSalt);
     static CString SaltedSHA256Hash(const CString& sPass, const CString& sSalt);
+    static CString SaltedHash(const CString& sPass, const CString& sSalt);
     static CString GetPass(const CString& sPrompt);
     static bool GetInput(const CString& sPrompt, CString& sRet,
                          const CString& sDefault = "",

include/znc/version.h

@@ -57,9 +57,16 @@ extern const char* ZNC_VERSION_EXTRA;
 #define ZNC_VERSION_TEXT_I18N "no"
 #endif
 
+// This is only here because HASH_DEFAULT has different value
+#ifdef ZNC_HAVE_ARGON
+#define ZNC_VERSION_TEXT_ARGON "yes"
+#else
+#define ZNC_VERSION_TEXT_ARGON "no"
+#endif
+
 #define ZNC_COMPILE_OPTIONS_STRING                                    \
     "IPv6: " ZNC_VERSION_TEXT_IPV6 ", SSL: " ZNC_VERSION_TEXT_SSL     \
     ", DNS: " ZNC_VERSION_TEXT_DNS ", charset: " ZNC_VERSION_TEXT_ICU \
-    ", i18n: " ZNC_VERSION_TEXT_I18N
+    ", i18n: " ZNC_VERSION_TEXT_I18N ", Argon2: " ZNC_VERSION_TEXT_ARGON
 
 #endif  // !ZNC_VERSION_H

include/znc/zncconfig.h.cmake.in

@@ -35,6 +35,7 @@
 #cmakedefine HAVE_IPV6 1
 #cmakedefine HAVE_ZLIB 1
 #cmakedefine HAVE_I18N 1
+#cmakedefine ZNC_HAVE_ARGON 1
 #cmakedefine CSOCK_USE_POLL 1
 
 #cmakedefine HAVE_GETOPT_LONG 1