Start moving models implementation to C++

cryptoshark.pro

@@ -1,14 +1,19 @@
 TEMPLATE = app
 
 QT += qml quick sql widgets
+CONFIG += c+11
 
 QTPLUGIN.bearer = -
 QTPLUGIN.imageformats = -
 QTPLUGIN.qmltooling = -
 
 SOURCES += \
     main.cpp \
-    nativepointer.cpp
+    nativepointer.cpp \
+    models.cpp \
+    models/functions.cpp \
+    models/modules.cpp \
+    router.cpp
 
 RESOURCES += qml.qrc
 
@@ -21,7 +26,11 @@ QMAKE_INFO_PLIST = Info.plist
 include(deployment.pri)
 
 HEADERS += \
-    nativepointer.h
+    nativepointer.h \
+    models.h \
+    models/functions.h \
+    models/modules.h \
+    router.h
 
 unix {
     PARTS = $$[QT_INSTALL_LIBS] libQt5Core.prl

main.cpp

@@ -1,9 +1,27 @@
+#include "models.h"
 #include "nativepointer.h"
+#include "router.h"
 
 #include <QApplication>
 #include <QQmlApplicationEngine>
 #include <QtQml>
 
+static QObject *createRouterSingleton(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+
+    return new Router();
+}
+
+static QObject *createModelsSingleton(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+
+    return new Models();
+}
+
 static QObject *createNativePointerSingleton(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(engine);
@@ -19,6 +37,11 @@ int main(int argc, char *argv[])
 #endif
     QApplication app(argc, argv);
 
+    qRegisterMetaType<Modules *>("Modules *");
+    qRegisterMetaType<Functions *>("Functions *");
+
+    qmlRegisterSingletonType<NativePointer>("CryptoShark", 1, 0, "Router", createRouterSingleton);
+    qmlRegisterSingletonType<NativePointer>("CryptoShark", 1, 0, "Models", createModelsSingleton);
     qmlRegisterSingletonType<NativePointer>("CryptoShark", 1, 0, "NativePointer", createNativePointerSingleton);
 
     QQmlApplicationEngine engine;

main.qml

@@ -1,3 +1,5 @@
+import CryptoShark 1.0
+
 import QtQuick 2.2
 import QtQuick.Controls 1.2
 import QtQuick.Dialogs 1.2
@@ -6,7 +8,6 @@ import Frida 1.0
 
 import "components"
 import "session"
-import "models.js" as Models
 
 // qmlimportscanner needs to see this one for static linking:
 import QtQuick.PrivateWidgets 1.1
@@ -19,33 +20,16 @@ ApplicationWindow {
 
     Component.onCompleted: {
         processDialog.open();
-
-        /*
-        Models.open({name: "1337-hello"}, function () {
-            funcDialog.models = Models;
-            var module = Models.modules.allWithCalls().items[0];
-            var functions = Models.functions.allInModule(module);
-            var items = functions.items;
-            for (var i = 0; i !== items.length; i++) {
-                if (items[i].name.indexOf("sleep") !== -1) {
-                    funcDialog.address = items[i].address;
-                    break;
-                }
-            }
-            funcDialog.open();
-        });
-        */
     }
 
     function attach(process) {
         if (_process !== null && process.pid === _process.pid) {
             return;
         }
         _process = process;
-        Models.open(process, function () {
-            _models = Models;
-            Frida.localSystem.inject(agent, process.pid);
-        });
+        Models.open(process.name);
+        _models = Models;
+        Frida.localSystem.inject(agent, process.pid);
     }
 
     function detach() {
@@ -166,16 +150,6 @@ ApplicationWindow {
         id: errorDialog
     }
 
-    Timer {
-        Component.onCompleted: {
-            Models.scheduler.configure(this);
-        }
-
-        onTriggered: {
-            Models.scheduler.tick();
-        }
-    }
-
     ListModel {
         id: _threadsModel
     }
@@ -196,6 +170,16 @@ ApplicationWindow {
         property var _requests: Object()
         property var _nextRequestId: 1
 
+        Component.onCompleted: {
+            Router.attach(this);
+            Router.message.connect(this._onMessage);
+        }
+
+        onError: {
+            errorDialog.text = message;
+            errorDialog.open();
+        }
+
         function follow(threadId, callback) {
             _request('thread:follow', {id: threadId}, callback);
         }
@@ -249,11 +233,7 @@ ApplicationWindow {
             }
         }
 
-        onError: {
-            errorDialog.text = message;
-            errorDialog.open();
-        }
-        onMessage: {
+        function _onMessage(sender, object, data) {
             if (object.type === 'send') {
                 var id = object.payload.id;
                 if (id) {
@@ -267,8 +247,7 @@ ApplicationWindow {
                 var payload = stanza.payload;
                 switch (stanza.name) {
                     case 'modules:update':
-                        Models.modules.metadataProvider = this;
-                        Models.modules.update(payload);
+                        _models.modules.update(payload);
                         break;
                     case 'threads:update':
                         _onThreadsUpdate(payload);
@@ -277,10 +256,10 @@ ApplicationWindow {
                         _onThreadUpdate(payload);
                         break;
                      case 'thread:summary':
-                         Models.functions.update(payload);
+                         _models.functions.update(payload);
                          break;
                      case 'function:log':
-                         Models.functions.log(payload);
+                         _models.functions.log(payload);
                          break;
                      default:
                          console.log('Unhandled: ' + JSON.stringify(stanza));

models.cpp

@@ -0,0 +1,17 @@
+#include "models.h"
+
+Models::Models(QObject *parent) :
+    QObject(parent),
+    m_modules(new Modules(this)),
+    m_functions(new Functions(this))
+{
+}
+
+void Models::open(QString name)
+{
+    Q_UNUSED(name);
+}
+
+void Models::close()
+{
+}

models.h

@@ -0,0 +1,34 @@
+#ifndef MODELS_H
+#define MODELS_H
+
+#include "models/functions.h"
+#include "models/modules.h"
+
+#include <QObject>
+
+class Models : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(Models)
+    Q_PROPERTY(Modules *modules READ modules CONSTANT)
+    Q_PROPERTY(Functions *functions READ functions CONSTANT)
+
+public:
+    explicit Models(QObject *parent = 0);
+
+    Q_INVOKABLE void open(QString name);
+    Q_INVOKABLE void close();
+
+    Modules *modules() const { return m_modules; }
+    Functions *functions() const { return m_functions; }
+
+signals:
+
+public slots:
+
+private:
+    Modules *m_modules;
+    Functions *m_functions;
+};
+
+#endif // MODELS_H