FAST token-based authentication

.clang-format

@@ -29,6 +29,7 @@ IncludeCategories:
  Priority: 4
 InsertBraces: true
 Language: Cpp
+NamespaceIndentation: None
 PointerAlignment: Right
 ReflowComments: true
 SortIncludes: true

doc/doap.xml

@@ -41,6 +41,7 @@ SPDX-License-Identifier: CC0-1.0
  <implements rdf:resource='https://xmpp.org/rfcs/rfc6121.html'/>
  <implements rdf:resource='https://xmpp.org/rfcs/rfc7590.html'/>
  <implements rdf:resource='https://xmpp.org/rfcs/rfc7622.html'/>
+ <implements rdf:resource='https://www.ietf.org/archive/id/draft-schmaus-kitten-sasl-ht-09.html'/>
  <implements>
  <xmpp:SupportedXep>
  <xmpp:xep rdf:resource='https://xmpp.org/extensions/xep-0004.html'/>
@@ -684,6 +685,14 @@ SPDX-License-Identifier: CC0-1.0
  <xmpp:since>1.6</xmpp:since>
  </xmpp:SupportedXep>
  </implements>
+ <implements>
+ <xmpp:SupportedXep>
+ <xmpp:xep rdf:resource='https://xmpp.org/extensions/xep-0484.html'/>
+ <xmpp:status>complete</xmpp:status>
+ <xmpp:version>0.1.0</xmpp:version>
+ <xmpp:since>1.8</xmpp:since>
+ </xmpp:SupportedXep>
+ </implements>
  <release>
  <Version>
  <revision>1.7.0</revision>

src/CMakeLists.txt

@@ -114,6 +114,7 @@ set(INSTALL_HEADER_FILES
  client/QXmppClient.h
  client/QXmppClientExtension.h
  client/QXmppConfiguration.h
+ client/QXmppCredentials.h
  client/QXmppDiscoveryManager.h
  client/QXmppE2eeExtension.h
  client/QXmppEntityTimeManager.h

src/base/Algorithms.h

@@ -6,15 +6,25 @@
 #define ALGORITHMS_H
 
 #include <algorithm>
+#include <functional>
+
+namespace std {
+template<typename T>
+class optional;
+}
 
 namespace QXmpp::Private {
 
 template<typename OutputVector, typename InputVector, typename Converter>
-auto transform(InputVector &input, Converter convert)
+auto transform(const InputVector &input, Converter convert)
 {
  OutputVector output;
- output.reserve(input.size());
- std::transform(input.begin(), input.end(), std::back_inserter(output), std::forward<Converter>(convert));
+ if constexpr (std::ranges::sized_range<InputVector>) {
+ output.reserve(input.size());
+ }
+ for (const auto &value : input) {
+ output.push_back(std::invoke(convert, value));
+ }
  return output;
 }
 
@@ -24,6 +34,24 @@ auto contains(const Vec &vec, const T &value)
  return std::find(std::begin(vec), std::end(vec), value) != std::end(vec);
 }
 
+template<typename T, typename Function>
+auto map(Function mapValue, std::optional<T> &&optValue) -> std::optional<std::invoke_result_t<Function, T &&>>
+{
+ if (optValue) {
+ return mapValue(std::move(*optValue));
+ }
+ return {};
+}
+
+template<typename To, typename From>
+auto into(std::optional<From> &&value) -> std::optional<To>
+{
+ if (value) {
+ return To { *value };
+ }
+ return {};
+}
+
 } // namespace QXmpp::Private
 
 #endif // ALGORITHMS_H

src/base/QXmppConstants_p.h

@@ -25,6 +25,7 @@ constexpr int XMPP_DEFAULT_PORT = 5222;
 }
 
 // QXmpp
+inline constexpr QStringView ns_qxmpp_credentials = u"org.qxmpp.credentials";
 inline constexpr QStringView ns_qxmpp_export = u"org.qxmpp.export";
 // XMPP
 inline constexpr QStringView ns_stream = u"http://etherx.jabber.org/streams";
@@ -258,5 +259,7 @@ inline constexpr QStringView ns_esfs = u"urn:xmpp:esfs:0";
 inline constexpr QStringView ns_atm = u"urn:xmpp:atm:1";
 // XEP-0482: Call Invites
 inline constexpr QStringView ns_call_invites = u"urn:xmpp:call-invites:0";
+// XEP-0484: Fast Authentication Streamlining Tokens
+inline constexpr auto ns_fast = u"urn:xmpp:fast:0";
 
 #endif // QXMPPCONSTANTS_H