foo

.gitignore

@@ -83,3 +83,4 @@ Thumbs.db
 mitmaddon/venv/
 CMakeCache*
 CMakeFiles/
+.coverage

CMakeLists.txt

@@ -11,7 +11,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

docs/network_simple_example.dot

@@ -0,0 +1,7 @@
+digraph G {
+	HTTP_REQUEST -> ACK -> HTTP_RESPONSE -> ACK;
+	HTTP_REQUEST -> MODIFY;
+	HTTP_RESPONSE -> MODIFY;
+	HTTP_REQUEST -> KILL;
+	HTTP_RESPONSE -> KILL;
+}

mitmaddon/requirements.txt

@@ -4,3 +4,4 @@ pyzmq
 deepdiff
 pytest
 tox
+coverage

mitmaddon/tox.ini

@@ -13,3 +13,4 @@ setenv =
     PYTHONDONTWRITEBYTECODE=1
 commands =
     pytest
+    coverage run -m pytest

plugins/mitmproxy/mitmproxy_network.cpp

@@ -22,6 +22,35 @@ void mitmproxyPlugin::reconnect()
     this->connect();
 }
 
+void mitmproxyPlugin::handle_packet(const Packet p)
+{
+    switch(p.ptype) {
+    case PacketType::NACK: {
+        // probably input validation fail
+        return;
+    }
+    case PacketType::KILL: {
+        // the client should never kill packets, but ok
+        return;
+    }
+    case PacketType::ERROR: {
+    }
+    case PacketType::WARNING: {
+    }
+    case PacketType::ACK: {
+    }
+    case PacketType::HTTP_REQUEST: {
+        
+    }
+    case PacketType::HTTP_RESPONSE: {
+
+    }
+    case PacketType::PING: {
+
+    }
+    }
+}
+
 QString mitmproxyPlugin::getName()
 {
     return QString("mitmproxy bridge");
@@ -43,6 +72,11 @@ void mitmproxyPlugin::process()
             qDebug() << err.what();
             qDebug() << "malformed json received " << response.to_string().c_str();
         }
+
+        auto p = Packet(j);
+        handle_packet(p);
+
+        /*
         //std::cout << std::setw(4) << j << "\n\n";
         std::string msg_type;
         if(!json_get(j, msg_type, "msg")) {
@@ -77,6 +111,7 @@ void mitmproxyPlugin::process()
         } else {
             qDebug() << "unknown or broken message type received: " << msg_type.c_str();
         }
+        */
 
         qDebug() << "sending ack";
         std::string m = "{\"msg\": \"ack\"}";

plugins/mitmproxy/mitmproxy_network.h

@@ -4,10 +4,58 @@
 #include "proxyinterface.h"
 #include <QObject>
 #include <QtPlugin>
+#include <QDebug>
 
 #include <set>
 #include <zmq.hpp>
 
+enum PacketType {
+    NACK = 0,
+    ACK = 1,
+    KILL = 2,
+    WARNING = 3,
+    ERROR = 4,
+    PING = 5,
+    HTTP_REQUEST = 6,
+    HTTP_RESPONSE = 7
+};
+
+enum FlowState {
+    ERROR = 0,
+    UNSENT_HTTP_REQUEST = 1,
+    SENT_HTTP_REQUEST = 2,
+    UNSENT_HTTP_RESPONSE = 3,
+    SENT_HTTP_RESPONSE = 4
+};
+
+struct Flow {
+    FlowState state;
+    std::string id;
+    std::string data;
+};
+
+struct Packet {
+    PacketType ptype = PacketType::NACK;
+    std::string flowid = "";
+    std::string data = "";
+    Packet(json j) {
+        // input validation, on error use default values
+        try {
+            int ptype_int = j["ptype"];
+            if(ptype_int < PacketType::NACK ||
+                    ptype_int > PacketType::HTTP_RESPONSE) {
+                return;
+            }
+            ptype = static_cast<PacketType>(ptype_int);
+            flowid = j["flowid"];
+            data = j["data"];
+        } catch (nlohmann::detail::parse_error& err) {
+            qDebug() << "broken packet constructed from json";
+            return;
+        }
+    };
+};
+
 /*
 mitmproxy base plugin
 
@@ -19,13 +67,13 @@ class mitmproxyPlugin : public QObject, public http::ProxyInterface
     Q_PLUGIN_METADATA(IID HTTPProxyInterfaceIID FILE "mitmproxy.json")
     Q_INTERFACES(http::ProxyInterface)
 private:
-    std::set<std::string> received;
     zmq::context_t context;
     zmq::socket_t *socket;
-    std::set<std::string> accepted_flows;
+    std::map<std::string, Flow> flows;
     bool is_connected = false;
     void connect();
     void reconnect();
+    void handle_packet(const Packet p);
 
 public:
     //! name of the plugin

test.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-mitmdump -k -p 1878 -s ./mitmaddon/bigsnitch.py &
+#mitmdump -k -p 1878 -s ./mitmaddon/bigsnitch.py &
 export mitmpid=$!
 #./build/bin/bigsnitch &