Fast: Add SaslHtClient

lnjX · May 22, 2024 · 4741748 · 4741748
1 parent 9721f0b
commit 4741748
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/src/base/QXmppSasl.cpp b/src/base/QXmppSasl.cpp
@@ -1018,8 +1018,8 @@ std::unique_ptr<QXmppSaslClient> QXmppSaslClient::create(SaslMechanism mechanism
  [&](SaslScramMechanism scram) {
  return std::make_unique<QXmppSaslClientScram>(scram, parent);
  },
- [&](SaslHtMechanism) {
- return nullptr;
+ [&](SaslHtMechanism ht) {
+ return std::make_unique<QXmppSaslClientHt>(ht, parent);
  },
  [&](SaslPlainMechanism) {
  return std::make_unique<QXmppSaslClientPlain>(parent);
@@ -1636,3 +1636,24 @@ QByteArray QXmppSaslDigestMd5::serializeMessage(const QMap<QByteArray, QByteArra
  }
  return ba;
 }
+
+std::optional<QByteArray> QXmppSaslClientHt::respond(const QByteArray &challenge)
+{
+ // TODO: verify <additional-data/> provided by SASL 2 (hmac key 'Responder' + cb data).
+
+ Q_ASSERT(m_mechanism.channelBindingType == QXmpp::Private::SaslHtMechanism::None);
+
+ if (m_done || !challenge.isEmpty()) {
+ return {};
+ }
+
+ // key: 'Initiator' + channel-binding data
+ const auto key = QByteArrayLiteral("Initiator");
+ QMessageAuthenticationCode hmac(
+ ianaHashAlgorithmToQt(m_mechanism.hashAlgorithm),
+ key);
+ hmac.addData(password().toUtf8());
+
+ m_done = true;
+ return hmac.result();
+}
diff --git a/src/base/QXmppSasl_p.h b/src/base/QXmppSasl_p.h
@@ -519,6 +519,25 @@ class QXmppSaslClientScram : public QXmppSaslClient
  QByteArray m_nonce;
 };
 
+class QXmppSaslClientHt : public QXmppSaslClient
+{
+ Q_OBJECT
+ using HtMechanism = QXmpp::Private::SaslHtMechanism;
+
+public:
+ QXmppSaslClientHt(HtMechanism mechanism, QObject *parent)
+ : QXmppSaslClient(parent), m_mechanism(mechanism)
+ {
+ }
+
+ QString mechanism() const override { return m_mechanism.toString(); }
+ std::optional<QByteArray> respond(const QByteArray &challenge) override;
+
+private:
+ HtMechanism m_mechanism;
+ bool m_done = false;
+};
+
 class QXmppSaslClientWindowsLive : public QXmppSaslClient
 {
  Q_OBJECT