From ebe43ac929393787a9a55cf7569b540c73f8048c Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Thu, 10 Jan 2019 16:46:57 +0900
Subject: Security fix: require that state events have state_key

This has been fixed in the past but got undone after the great remaking of the event types system. Further commits will introduce tests to make sure this does not get undone again.

# Conflicts:
#	lib/events/stateevent.cpp
---
 lib/events/stateevent.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/events/stateevent.cpp b/lib/events/stateevent.cpp
index fd5d2642..877d0fae 100644
--- a/lib/events/stateevent.cpp
+++ b/lib/events/stateevent.cpp
@@ -21,7 +21,17 @@
 using namespace QMatrixClient;
 
 [[gnu::unused]] static auto stateEventTypeInitialised =
-        RoomEvent::factory_t::chainFactory<StateEventBase>();
+    RoomEvent::factory_t::addMethod(
+        [] (const QJsonObject& json, const QString& matrixType) -> StateEventPtr
+        {
+            if (!json.contains("state_key"))
+                return nullptr;
+
+            if (auto e = StateEventBase::factory_t::make(json, matrixType))
+                return e;
+
+            return nullptr;
+        });
 
 bool StateEventBase::repeatsState() const
 {
-- 
cgit v1.2.3


From bdbdaff756cbd1402339d75faddc6c2beebc6eed Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Thu, 10 Jan 2019 16:52:31 +0900
Subject: qmc-example: add setTopic test for true and fake state changes

---
 examples/qmc-example.cpp | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/examples/qmc-example.cpp b/examples/qmc-example.cpp
index 9c86d4a9..206501a5 100644
--- a/examples/qmc-example.cpp
+++ b/examples/qmc-example.cpp
@@ -5,6 +5,7 @@
 #include "csapi/room_send.h"
 #include "csapi/joining.h"
 #include "csapi/leaving.h"
+#include "events/simplestateevents.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QStringBuilder>
@@ -27,6 +28,7 @@ class QMCTest : public QObject
         void onNewRoom(Room* r);
         void startTests();
             void sendMessage();
+            void setTopic();
             void addAndRemoveTag();
             void sendAndRedact();
                 void checkRedactionOutcome(const QString& evtIdToRedact,
@@ -143,6 +145,7 @@ void QMCTest::startTests()
 {
     cout << "Starting tests" << endl;
     sendMessage();
+    setTopic();
     addAndRemoveTag();
     sendAndRedact();
     markDirectChat();
@@ -168,6 +171,49 @@ void QMCTest::sendMessage()
     // Independently, check when it shows up in the timeline.
 }
 
+void QMCTest::setTopic()
+{
+    running.push_back("State setting test");
+    running.push_back("Fake state event immunity test");
+    auto initialTopic = targetRoom->topic();
+
+    const auto newTopic = c->generateTxnId();
+    targetRoom->setTopic(newTopic); // Sets the state by proper means
+    const auto fakeTopic = c->generateTxnId();
+    targetRoom->postJson(RoomTopicEvent::matrixTypeId(), // Fake state event
+                         RoomTopicEvent(fakeTopic).contentJson());
+
+    {
+        auto* context = new QObject;
+        connect(targetRoom, &Room::topicChanged, context,
+            [this,newTopic,fakeTopic,initialTopic,context] {
+                if (targetRoom->topic() == newTopic)
+                {
+                    QMC_CHECK("State setting test", true);
+                    // Don't reset the topic yet if the negative test still runs
+                    if (!running.contains("Fake state event immunity test"))
+                        targetRoom->setTopic(initialTopic);
+
+                    context->deleteLater();
+                }
+            });
+    }
+
+    {
+        auto* context = new QObject;
+        connect(targetRoom, &Room::pendingEventAboutToMerge, context,
+            [this,fakeTopic,initialTopic,context] (const RoomEvent* e, int) {
+                if (e->contentJson().value("topic").toString() != fakeTopic)
+                    return; // Wait on for the right event
+
+                QMC_CHECK("Fake state event immunity test", !e->isStateEvent());
+                if (!running.contains("State setting test"))
+                    targetRoom->setTopic(initialTopic);
+                context->deleteLater();
+            });
+    }
+}
+
 void QMCTest::addAndRemoveTag()
 {
     running.push_back("Tagging test");
-- 
cgit v1.2.3


From 863848b2158e3278ae65d25de0b189a6008c60d1 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 13 Jan 2019 18:44:27 +0900
Subject: Update version in CMakeLists.txt

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a1950b3..7a9b7d11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,7 +140,7 @@ add_library(QMatrixClient ${libqmatrixclient_SRCS}
             ${libqmatrixclient_cswellknown_SRCS}
             ${libqmatrixclient_asdef_SRCS} ${libqmatrixclient_isdef_SRCS})
 set(API_VERSION "0.4")
-set_property(TARGET QMatrixClient PROPERTY VERSION "${API_VERSION}.0")
+set_property(TARGET QMatrixClient PROPERTY VERSION "${API_VERSION}.2.1")
 set_property(TARGET QMatrixClient PROPERTY SOVERSION ${API_VERSION} )
 set_property(TARGET QMatrixClient PROPERTY
              INTERFACE_QMatrixClient_MAJOR_VERSION ${API_VERSION})
-- 
cgit v1.2.3