diff options
| author | Linus Jahn <lnj@kaidan.im> | 2019-11-16 22:52:49 +0100 |
|---|---|---|
| committer | LNJ <lnj@kaidan.im> | 2019-12-06 22:26:12 +0100 |
| commit | 69050deaffe471a603eddc55289c1a3a1e1e7850 (patch) | |
| tree | 01b1320fd9489275b433c41ae3d2eabe3cca6e45 | |
| parent | c470dbdfe053ef0e8d7e196982013f1edf2aaff5 (diff) | |
| download | qxmpp-69050deaffe471a603eddc55289c1a3a1e1e7850.tar.gz | |
Implement XEP-0231: Bits of Binary: IQ
This implements parsing and serialization of the BoB IQ from
XEP-0231: Bits of Binary in version 1.0.
| -rw-r--r-- | doc/xep.doc | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/base/QXmppBitsOfBinaryData.cpp | 168 | ||||
| -rw-r--r-- | src/base/QXmppBitsOfBinaryData.h | 78 | ||||
| -rw-r--r-- | src/base/QXmppBitsOfBinaryIq.cpp | 68 | ||||
| -rw-r--r-- | src/base/QXmppBitsOfBinaryIq.h | 50 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp | 221 |
8 files changed, 591 insertions, 0 deletions
diff --git a/doc/xep.doc b/doc/xep.doc index bb48412b..2bb50793 100644 --- a/doc/xep.doc +++ b/doc/xep.doc @@ -35,6 +35,7 @@ Complete: - XEP-0203: Delayed Delivery - XEP-0221: Data Forms Media Element - XEP-0224: Attention +- XEP-0231: Bits of Binary (v1.0.0) - XEP-0237: Roster Versioning (partially) - XEP-0280: Message Carbons - XEP-0308: Last Message Correction diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 48f32756..1d01ce16 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,6 +17,8 @@ set(INSTALL_HEADER_FILES base/QXmppArchiveIq.h base/QXmppBindIq.h base/QXmppBitsOfBinaryContentId.h + base/QXmppBitsOfBinaryData.h + base/QXmppBitsOfBinaryIq.h base/QXmppBookmarkSet.h base/QXmppByteStreamIq.h base/QXmppDataForm.h @@ -94,6 +96,8 @@ set(SOURCE_FILES base/QXmppArchiveIq.cpp base/QXmppBindIq.cpp base/QXmppBitsOfBinaryContentId.cpp + base/QXmppBitsOfBinaryData.cpp + base/QXmppBitsOfBinaryIq.cpp base/QXmppBookmarkSet.cpp base/QXmppByteStreamIq.cpp base/QXmppCodec.cpp diff --git a/src/base/QXmppBitsOfBinaryData.cpp b/src/base/QXmppBitsOfBinaryData.cpp new file mode 100644 index 00000000..c36ded3b --- /dev/null +++ b/src/base/QXmppBitsOfBinaryData.cpp @@ -0,0 +1,168 @@ +/* + * Copyright (C) 2008-2019 The QXmpp developers + * + * Author: + * Linus Jahn + * + * Source: + * https://github.com/qxmpp-project/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + +#include "QXmppBitsOfBinaryData.h" + +#include <QDomElement> +#include <QSharedData> +#include <QMimeType> +#include <QMimeDatabase> +#include <QXmlStreamWriter> + +#include "QXmppBitsOfBinaryContentId.h" +#include "QXmppConstants_p.h" +#include "QXmppUtils.h" + +class QXmppBitsOfBinaryDataPrivate : public QSharedData +{ +public: + QXmppBitsOfBinaryDataPrivate(); + + QXmppBitsOfBinaryContentId cid; + int maxAge; + QMimeType contentType; + QByteArray data; +}; + +QXmppBitsOfBinaryDataPrivate::QXmppBitsOfBinaryDataPrivate() + : maxAge(-1) +{ +} + +QXmppBitsOfBinaryData::QXmppBitsOfBinaryData() + : d(new QXmppBitsOfBinaryDataPrivate) +{ +} + +QXmppBitsOfBinaryData::QXmppBitsOfBinaryData(const QXmppBitsOfBinaryData &) = default; + +QXmppBitsOfBinaryData::~QXmppBitsOfBinaryData() = default; + +QXmppBitsOfBinaryData &QXmppBitsOfBinaryData::operator=(const QXmppBitsOfBinaryData &) = default; + +/// Returns the content id of the data + +QXmppBitsOfBinaryContentId QXmppBitsOfBinaryData::cid() const +{ + return d->cid; +} + +/// Sets the content id of the data + +void QXmppBitsOfBinaryData::setCid(const QXmppBitsOfBinaryContentId &cid) +{ + d->cid = cid; +} + +/// Returns the time in seconds the data should be cached +/// +/// A value of 0 means that the data should not be cached, while a value of -1 +/// means that nothing was set. +/// +/// The default value is -1. + +int QXmppBitsOfBinaryData::maxAge() const +{ + return d->maxAge; +} + +/// Sets the time in seconds the data should be cached +/// +/// A value of 0 means that the data should not be cached, while a value of -1 +/// means that nothing was set. +/// +/// The default value is -1. + +void QXmppBitsOfBinaryData::setMaxAge(int maxAge) +{ + d->maxAge = maxAge; +} + +/// Returns the content type of the data +/// +/// \note This is the advertised content type and may differ from the actual +/// content type of the data. + +QMimeType QXmppBitsOfBinaryData::contentType() const +{ + return d->contentType; +} + +/// Sets the content type of the data + +void QXmppBitsOfBinaryData::setContentType(const QMimeType &contentType) +{ + d->contentType = contentType; +} + +/// Returns the included data in binary form + +QByteArray QXmppBitsOfBinaryData::data() const +{ + return d->data; +} + +/// Sets the data in binary form + +void QXmppBitsOfBinaryData::setData(const QByteArray &data) +{ + d->data = data; +} + +/// Returns true, if \c element is a XEP-0231: Bits of Binary data element + +bool QXmppBitsOfBinaryData::isBitsOfBinaryData(const QDomElement &element) +{ + return element.tagName() == QStringLiteral("data") && element.namespaceURI() == ns_bob; +} + +/// \cond +void QXmppBitsOfBinaryData::parseElementFromChild(const QDomElement &dataElement) +{ + d->cid = QXmppBitsOfBinaryContentId::fromContentId(dataElement.attribute("cid")); + d->maxAge = dataElement.attribute("max-age", "-1").toInt(); + d->contentType = QMimeDatabase().mimeTypeForName(dataElement.attribute("type")); + d->data = QByteArray::fromBase64(dataElement.text().toUtf8()); +} + +void QXmppBitsOfBinaryData::toXmlElementFromChild(QXmlStreamWriter *writer) const +{ + writer->writeStartElement("data"); + writer->writeAttribute("xmlns", ns_bob); + helperToXmlAddAttribute(writer, "cid", d->cid.toContentId()); + if (d->maxAge > -1) + helperToXmlAddAttribute(writer, "max-age", QString::number(d->maxAge)); + helperToXmlAddAttribute(writer, "type", d->contentType.name()); + writer->writeCharacters(d->data.toBase64()); + writer->writeEndElement(); +} +/// \endcond + +bool QXmppBitsOfBinaryData::operator==(const QXmppBitsOfBinaryData &other) const +{ + return d->cid == other.cid() && + d->maxAge == other.maxAge() && + d->contentType == other.contentType() && + d->data == other.data(); +} + diff --git a/src/base/QXmppBitsOfBinaryData.h b/src/base/QXmppBitsOfBinaryData.h new file mode 100644 index 00000000..38f5475d --- /dev/null +++ b/src/base/QXmppBitsOfBinaryData.h @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2008-2019 The QXmpp developers + * + * Author: + * Linus Jahn + * + * Source: + * https://github.com/qxmpp-project/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + +#ifndef QXMPPBITSOFBINARYDATA_H +#define QXMPPBITSOFBINARYDATA_H + +#include <QSharedDataPointer> + +#include "QXmppGlobal.h" + +class QDomElement; +class QMimeType; +class QXmlStreamWriter; +class QXmppBitsOfBinaryDataPrivate; +class QXmppBitsOfBinaryContentId; + +/// \class QXmppBitsOfBinaryData represents a data element for XEP-0231: Bits +/// of Binary. It can be used as an extension in other stanzas. +/// +/// \see QXmppBitsOfBinaryIq, QXmppBitsOfBinaryDataList +/// +/// \since QXmpp 1.2 + +class QXMPP_EXPORT QXmppBitsOfBinaryData +{ +public: + QXmppBitsOfBinaryData(); + QXmppBitsOfBinaryData(const QXmppBitsOfBinaryData &); + ~QXmppBitsOfBinaryData(); + + QXmppBitsOfBinaryData &operator=(const QXmppBitsOfBinaryData &); + + QXmppBitsOfBinaryContentId cid() const; + void setCid(const QXmppBitsOfBinaryContentId &cid); + + int maxAge() const; + void setMaxAge(int maxAge); + + QMimeType contentType() const; + void setContentType(const QMimeType &contentType); + + QByteArray data() const; + void setData(const QByteArray &data); + + bool static isBitsOfBinaryData(const QDomElement &element); + + /// \cond + void parseElementFromChild(const QDomElement &dataElement); + void toXmlElementFromChild(QXmlStreamWriter *writer) const; + /// \endcond + + bool operator==(const QXmppBitsOfBinaryData &other) const; + +private: + QSharedDataPointer<QXmppBitsOfBinaryDataPrivate> d; +}; + +#endif // QXMPPBITSOFBINARYDATA_H diff --git a/src/base/QXmppBitsOfBinaryIq.cpp b/src/base/QXmppBitsOfBinaryIq.cpp new file mode 100644 index 00000000..21b1cb2a --- /dev/null +++ b/src/base/QXmppBitsOfBinaryIq.cpp @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2008-2019 The QXmpp developers + * + * Author: + * Linus Jahn + * + * Source: + * https://github.com/qxmpp-project/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + +#include "QXmppBitsOfBinaryIq.h" + +#include "QXmppConstants_p.h" + +#include <QDomElement> +#include <QSharedData> + +QXmppBitsOfBinaryIq::QXmppBitsOfBinaryIq() = default; + +QXmppBitsOfBinaryIq::~QXmppBitsOfBinaryIq() = default; + +/// Returns true, if \c element is a XEP-0231: Bits of Binary IQ +/// +/// \note This may also return true, if the IQ is not a Bits of Binary IQ in +/// first place, but only contains a Bits of Binary data element. + +bool QXmppBitsOfBinaryIq::isBitsOfBinaryIq(const QDomElement &element) +{ + QDomElement child = element.firstChildElement(); + while (!child.isNull()) { + if (QXmppBitsOfBinaryData::isBitsOfBinaryData(child)) + return true; + child = child.nextSiblingElement(); + } + return false; +} + +/// \cond +void QXmppBitsOfBinaryIq::parseElementFromChild(const QDomElement &element) +{ + QDomElement child = element.firstChildElement(); + while (!child.isNull()) { + if (QXmppBitsOfBinaryData::isBitsOfBinaryData(child)) { + QXmppBitsOfBinaryData::parseElementFromChild(child); + break; + } + child = child.nextSiblingElement(); + } +} + +void QXmppBitsOfBinaryIq::toXmlElementFromChild(QXmlStreamWriter *writer) const +{ + QXmppBitsOfBinaryData::toXmlElementFromChild(writer); +} +/// \endcond diff --git a/src/base/QXmppBitsOfBinaryIq.h b/src/base/QXmppBitsOfBinaryIq.h new file mode 100644 index 00000000..be6a4150 --- /dev/null +++ b/src/base/QXmppBitsOfBinaryIq.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2008-2019 The QXmpp developers + * + * Author: + * Linus Jahn + * + * Source: + * https://github.com/qxmpp-project/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + +#ifndef QXMPPBITSOFBINARYIQ_H +#define QXMPPBITSOFBINARYIQ_H + +#include "QXmppIq.h" +#include "QXmppBitsOfBinaryData.h" + +/// \class QXmppBitsOfBinaryIq represents a XEP-0231: Bits of Binary IQ to +/// request and transmit Bits of Binary data elements. +/// +/// \since QXmpp 1.2 + +class QXMPP_EXPORT QXmppBitsOfBinaryIq : public QXmppIq, public QXmppBitsOfBinaryData +{ +public: + QXmppBitsOfBinaryIq(); + ~QXmppBitsOfBinaryIq(); + + static bool isBitsOfBinaryIq(const QDomElement &element); + +protected: + /// \cond + void parseElementFromChild(const QDomElement &element) override; + void toXmlElementFromChild(QXmlStreamWriter *writer) const override; + /// \endcond +}; + +#endif // QXMPPBITSOFBINARYIQ_H diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9ea9d79a..a9c3e87d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -17,6 +17,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_simple_test(qxmpparchiveiq) add_simple_test(qxmppbindiq) add_simple_test(qxmppbitsofbinarycontentid) +add_simple_test(qxmppbitsofbinaryiq) add_simple_test(qxmppcallmanager) add_simple_test(qxmppcarbonmanager) add_simple_test(qxmppclient) diff --git a/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp b/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp new file mode 100644 index 00000000..f22360b7 --- /dev/null +++ b/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp @@ -0,0 +1,221 @@ +/* + * Copyright (C) 2008-2019 The QXmpp developers + * + * Author: + * Linus Jahn + * + * Source: + * https://github.com/qxmpp-project/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + +#include <QMimeType> +#include <QObject> + +#include "QXmppBitsOfBinaryContentId.h" +#include "QXmppBitsOfBinaryIq.h" +#include "util.h" + +class tst_QXmppBitsOfBinaryIq : public QObject +{ + Q_OBJECT + +private slots: + void testBasic(); + void testResult(); + void testOtherSubelement(); + void testIsBobIq(); +}; + +void tst_QXmppBitsOfBinaryIq::testBasic() +{ + const QByteArray xml( + "<iq id=\"get-data-1\" " + "to=\"ladymacbeth@shakespeare.lit/castle\" " + "from=\"doctor@shakespeare.lit/pda\" " + "type=\"get\">" + "<data xmlns=\"urn:xmpp:bob\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>" + "</iq>" + ); + + QXmppBitsOfBinaryIq iq; + parsePacket(iq, xml); + QCOMPARE(iq.from(), QStringLiteral("doctor@shakespeare.lit/pda")); + QCOMPARE(iq.id(), QStringLiteral("get-data-1")); + QCOMPARE(iq.to(), QStringLiteral("ladymacbeth@shakespeare.lit/castle")); + QCOMPARE(iq.type(), QXmppIq::Get); + QCOMPARE(iq.cid().toContentId(), QStringLiteral("sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org")); + QCOMPARE(iq.contentType(), QMimeType()); + QCOMPARE(iq.data(), QByteArray()); + QCOMPARE(iq.maxAge(), -1); + serializePacket(iq, xml); + + iq = QXmppBitsOfBinaryIq(); + iq.setFrom(QStringLiteral("doctor@shakespeare.lit/pda")); + iq.setId(QStringLiteral("get-data-1")); + iq.setTo(QStringLiteral("ladymacbeth@shakespeare.lit/castle")); + iq.setType(QXmppIq::Get); + iq.setCid(QXmppBitsOfBinaryContentId::fromContentId(QStringLiteral("sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org"))); + serializePacket(iq, xml); +} + +void tst_QXmppBitsOfBinaryIq::testResult() +{ + const QByteArray xml = QByteArrayLiteral( + "<iq id=\"data-result\" " + "to=\"doctor@shakespeare.lit/pda\" " + "from=\"ladymacbeth@shakespeare.lit/castle\" " + "type=\"result\">" + "<data xmlns=\"urn:xmpp:bob\" " + "cid=\"sha1+5a4c38d44fc64805cbb2d92d8b208be13ff40c0f@bob.xmpp.org\" " + "max-age=\"86400\" " + "type=\"image/png\">" + "iVBORw0KGgoAAAANSUhEUgAAALQAAAA8BAMAAAA9AI20AAAAG1BMVEX///8AAADf39+" + "/v79/f39fX1+fn58/Pz8fHx/8ACGJAAAACXBIWXMAAA7EAAAOxAGVKw4bAAADS0lEQV" + "RYhe2WS3MSQRCAYTf7OKY1kT0CxsRjHmh5BENIjqEk6pHVhFzdikqO7CGyP9t59Ox2z" + "y6UeWBVqugLzM70Nz39mqnV1lIWgBWiYXV0BYfNZ0mvwypds1r62vH/gf76ZL/88Qlc" + "41zeAnQrpx5H3z1Npfr5ovmHusa9SpRiNNIOcdrto6PJ5LLfb5bp9zM+VDq/vptxDEa" + "a1sql9I3R5KhtfQsA5gNCWYyulV3TyTUDdfL56BvdDl4x7RiybDq9uBgxh1TTPUHDvA" + "qNQb+LpT5sWehxJZKKcU2MZ6sDE7PMgW2mdlBGdy6ODe6fJFdMI+us95dNqftDMdwU6" + "+MhpuTS9slcy5TFAcwq0Jt6qssJMTQGp4BGURlmSsNoo5oHL4kqc66NdkDO75mIfCxm" + "RAlvHxMLdcb7JONavMJbttXXKoMSneYu3OQTlwkUh4mNayi6js55/2VcsZOQfXIYelz" + "xLcntEGc3WVCsCORJVCc5r0ajAcq+EO1Q0oPm7n7+X/3jEReGdL6qT7Ml6FCjY+quJC" + "r+D01f6BG0SaHG56ZG32DnY2jcEV1+pU0kxTaEwaGcekN7jyu50U/TV4q6YeieyiNTu" + "klDKZLukyjKVNwotCUB3B0XO1WjHT3c0DHSO2zACwut8GOiljJIHaJsrlof/fpWNzGM" + "os6TgIY0hZNpJshzSi4igOhy3cl4qK+YgnqHkAYcZEgdW6/HyrEK7afoY7RCFzArLl2" + "LLDdrdmmHZfROajwIDfWj8yQG+rzwlA3WvdJiMHtjUekiNrp1oCbmyZDEyKROGjFVDr" + "PRzlkR9UAfG/OErnPxrop5BwpoEpXQorq2zcGxbnBJndx8Bh0yljGiGv0B4E8+YP3Xp" + "2rGydZNy4csW8W2pIvWhvijoujRJ0luXsoymV+8AXvE9HjII72+oReS6OfomHe3xWg/" + "f2coSbDa1XZ1CvGMjy1nH9KBl83oPnQKi+vAXKLjCrRvvT2WCMkPmSFbquiVuTH1qjv" + "p4j/u7CWyI5/Hn3KAaJJ90eP0Zp1Kjets4WPaElkxheF7cpBESzXuIdLwyFjSub07tB" + "6JjxH3DGiu+zwHHimdtFsMvKqG/nBxm2TwbvyU6LWs5RnJX4dSldg3QhDLAAAAAElFT" + "kSuQmCC" + "</data>" + "</iq>" + ); + + const auto data = QByteArray::fromBase64(QByteArrayLiteral( + "iVBORw0KGgoAAAANSUhEUgAAALQAAAA8BAMAAAA9AI20AAAAG1BMVEX///8AAADf39+" + "/v79/f39fX1+fn58/Pz8fHx/8ACGJAAAACXBIWXMAAA7EAAAOxAGVKw4bAAADS0lEQV" + "RYhe2WS3MSQRCAYTf7OKY1kT0CxsRjHmh5BENIjqEk6pHVhFzdikqO7CGyP9t59Ox2z" + "y6UeWBVqugLzM70Nz39mqnV1lIWgBWiYXV0BYfNZ0mvwypds1r62vH/gf76ZL/88Qlc" + "41zeAnQrpx5H3z1Npfr5ovmHusa9SpRiNNIOcdrto6PJ5LLfb5bp9zM+VDq/vptxDEa" + "a1sql9I3R5KhtfQsA5gNCWYyulV3TyTUDdfL56BvdDl4x7RiybDq9uBgxh1TTPUHDvA" + "qNQb+LpT5sWehxJZKKcU2MZ6sDE7PMgW2mdlBGdy6ODe6fJFdMI+us95dNqftDMdwU6" + "+MhpuTS9slcy5TFAcwq0Jt6qssJMTQGp4BGURlmSsNoo5oHL4kqc66NdkDO75mIfCxm" + "RAlvHxMLdcb7JONavMJbttXXKoMSneYu3OQTlwkUh4mNayi6js55/2VcsZOQfXIYelz" + "xLcntEGc3WVCsCORJVCc5r0ajAcq+EO1Q0oPm7n7+X/3jEReGdL6qT7Ml6FCjY+quJC" + "r+D01f6BG0SaHG56ZG32DnY2jcEV1+pU0kxTaEwaGcekN7jyu50U/TV4q6YeieyiNTu" + "klDKZLukyjKVNwotCUB3B0XO1WjHT3c0DHSO2zACwut8GOiljJIHaJsrlof/fpWNzGM" + "os6TgIY0hZNpJshzSi4igOhy3cl4qK+YgnqHkAYcZEgdW6/HyrEK7afoY7RCFzArLl2" + "LLDdrdmmHZfROajwIDfWj8yQG+rzwlA3WvdJiMHtjUekiNrp1oCbmyZDEyKROGjFVDr" + "PRzlkR9UAfG/OErnPxrop5BwpoEpXQorq2zcGxbnBJndx8Bh0yljGiGv0B4E8+YP3Xp" + "2rGydZNy4csW8W2pIvWhvijoujRJ0luXsoymV+8AXvE9HjII72+oReS6OfomHe3xWg/" + "f2coSbDa1XZ1CvGMjy1nH9KBl83oPnQKi+vAXKLjCrRvvT2WCMkPmSFbquiVuTH1qjv" + "p4j/u7CWyI5/Hn3KAaJJ90eP0Zp1Kjets4WPaElkxheF7cpBESzXuIdLwyFjSub07tB" + "6JjxH3DGiu+zwHHimdtFsMvKqG/nBxm2TwbvyU6LWs5RnJX4dSldg3QhDLAAAAAElFT" + "kSuQmCC" + )); + + QXmppBitsOfBinaryIq iq; + parsePacket(iq, xml); + QCOMPARE(iq.type(), QXmppIq::Result); + QCOMPARE(iq.id(), QStringLiteral("data-result")); + QCOMPARE(iq.cid().algorithm(), QCryptographicHash::Sha1); + QCOMPARE(iq.cid().hash(), QByteArray::fromHex(QByteArrayLiteral("5a4c38d44fc64805cbb2d92d8b208be13ff40c0f"))); + QCOMPARE(iq.contentType(), QMimeDatabase().mimeTypeForName(QStringLiteral("image/png"))); + QCOMPARE(iq.maxAge(), 86400); + QCOMPARE(iq.data(), data); + serializePacket(iq, xml); + + iq = QXmppBitsOfBinaryIq(); + iq.setId(QStringLiteral("data-result")); + iq.setFrom(QStringLiteral("ladymacbeth@shakespeare.lit/castle")); + iq.setTo(QStringLiteral("doctor@shakespeare.lit/pda")); + iq.setType(QXmppIq::Result); + iq.setCid(QXmppBitsOfBinaryContentId::fromContentId( + QStringLiteral("sha1+5a4c38d44fc64805cbb2d92d8b208be13ff40c0f@bob.xmpp.org") + )); + iq.setContentType(QMimeDatabase().mimeTypeForName(QStringLiteral("image/png"))); + iq.setMaxAge(86400); + iq.setData(data); + serializePacket(iq, xml); +} + +void tst_QXmppBitsOfBinaryIq::testOtherSubelement() +{ + const QByteArray xml( + "<iq id=\"get-data-1\" " + "to=\"ladymacbeth@shakespeare.lit/castle\" " + "from=\"doctor@shakespeare.lit/pda\" " + "type=\"get\">" + "<data xmlns=\"org.example.other.data\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>" + "<data xmlns=\"urn:xmpp:bob\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>" + "</iq>" + ); + + QXmppBitsOfBinaryIq iq; + parsePacket(iq, xml); + QCOMPARE(iq.from(), QStringLiteral("doctor@shakespeare.lit/pda")); + QCOMPARE(iq.id(), QStringLiteral("get-data-1")); + QCOMPARE(iq.to(), QStringLiteral("ladymacbeth@shakespeare.lit/castle")); + QCOMPARE(iq.type(), QXmppIq::Get); + QCOMPARE(iq.cid().toContentId(), QStringLiteral("sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org")); + QCOMPARE(iq.contentType(), QMimeType()); + QCOMPARE(iq.data(), QByteArray()); + QCOMPARE(iq.maxAge(), -1); +} + +void tst_QXmppBitsOfBinaryIq::testIsBobIq() +{ + QDomDocument doc; + + const QByteArray xmlSimple( + "<iq id=\"get-data-1\" " + "to=\"ladymacbeth@shakespeare.lit/castle\" " + "from=\"doctor@shakespeare.lit/pda\" " + "type=\"get\">" + "<data xmlns=\"urn:xmpp:bob\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>" + "</iq>" + ); + QCOMPARE(doc.setContent(xmlSimple, true), true); + QCOMPARE(QXmppBitsOfBinaryIq::isBitsOfBinaryIq(doc.documentElement()), true); + + const QByteArray xmlMultipleElements( + "<iq id=\"get-data-1\" " + "to=\"ladymacbeth@shakespeare.lit/castle\" " + "from=\"doctor@shakespeare.lit/pda\" " + "type=\"get\">" + "<data xmlns=\"urn:xmpp:other-data-format:0\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>" + "<data xmlns=\"urn:xmpp:bob\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>" + "</iq>" + ); + QCOMPARE(doc.setContent(xmlMultipleElements, true), true); + QCOMPARE(QXmppBitsOfBinaryIq::isBitsOfBinaryIq(doc.documentElement()), true); + + const QByteArray xmlWithoutBobData( + "<iq id=\"get-data-1\" " + "to=\"ladymacbeth@shakespeare.lit/castle\" " + "from=\"doctor@shakespeare.lit/pda\" " + "type=\"get\">" + "<data xmlns=\"urn:xmpp:other-data-format:0\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>" + "</iq>" + ); + QCOMPARE(doc.setContent(xmlWithoutBobData, true), true); + QCOMPARE(QXmppBitsOfBinaryIq::isBitsOfBinaryIq(doc.documentElement()), false); +} + +QTEST_MAIN(tst_QXmppBitsOfBinaryIq) +#include "tst_qxmppbobiq.moc" |
