X-Git-Url: https://gitweb.ps.run/matrix_esp_thesis/blobdiff_plain/504241758d7b832af61939beaf61b0e0574174c4..HEAD:/src/matrix.h

diff --git a/src/matrix.h b/src/matrix.h
index da0e859..226a341 100644
--- a/src/matrix.h
+++ b/src/matrix.h
@@ -23,6 +23,7 @@
 #define DEVICE_KEY_SIZE 44
 #define SIGNING_KEY_SIZE 44
 #define ONETIME_KEY_SIZE 44
+#define MASTER_KEY_SIZE 44
 
 #define KEY_SHARE_EVENT_LEN 1024
 
@@ -47,10 +48,53 @@
 #define JSON_ONETIME_KEY_SIGNED_SIZE 256
 #define JSON_SIGNATURE_SIZE 256
 
-#define NUM_MEGOLM_SESSIONS 10
-#define NUM_OLM_SESSIONS 10
+#define NUM_MEGOLM_SESSIONS 2
+#define NUM_OLM_SESSIONS 2
 #define NUM_DEVICES 10
 
+// HTTP
+
+typedef struct MatrixHttpConnection MatrixHttpConnection;
+
+bool
+MatrixHttpInit(
+    MatrixHttpConnection ** hc,
+    const char * host);
+
+bool
+MatrixHttpDeinit(
+    MatrixHttpConnection ** hc);
+    
+bool
+MatrixHttpSetAccessToken(
+    MatrixHttpConnection * hc,
+    const char * accessToken);
+
+bool
+MatrixHttpGet(
+    MatrixHttpConnection * hc,
+    const char * url,
+    char * outResponseBuffer, int outResponseCap,
+    bool authenticated);
+
+bool
+MatrixHttpPost(
+    MatrixHttpConnection * hc,
+    const char * url,
+    const char * requestBuffer,
+    char * outResponseBuffer, int outResponseCap,
+    bool authenticated);
+
+bool
+MatrixHttpPut(
+    MatrixHttpConnection * hc,
+    const char * url,
+    const char * requestBuffer,
+    char * outResponseBuffer, int outResponseCap,
+    bool authenticated);
+
+
+
 // Matrix Device
 
 typedef struct MatrixDevice {
@@ -105,6 +149,16 @@ MatrixOlmSessionUnpickle(
     void * pickled, int pickledLen,
     const void * key, int keyLen);
 
+// create an olm sesseion from a type 0 message
+bool
+MatrixOlmSessionFrom(
+    MatrixOlmSession * session,
+    OlmAccount * olmAccount,
+    const char * deviceId,
+    const char * deviceKey,
+    const char * encrypted);
+
+// create a new olm session from a claimed onetime key
 bool
 MatrixOlmSessionTo(
     MatrixOlmSession * session,
@@ -130,23 +184,35 @@ MatrixOlmSessionDecrypt(
 // Matrix Megolm Session
 
 typedef struct MatrixMegolmInSession {
+    char roomId[ROOM_ID_SIZE];
+    char id[MEGOLM_SESSION_ID_SIZE];
+    char key[MEGOLM_SESSION_KEY_SIZE];
+
     OlmInboundGroupSession * session;
+    char memory[MEGOLM_OUTBOUND_SESSION_MEMORY_SIZE];
+
 } MatrixMegolmInSession;
 
+bool
+MatrixMegolmInSessionInit(
+    MatrixMegolmInSession * session,
+    const char * roomId,
+    const char * sessionId,
+    const char * sessionKey, int sessionKeyLen);
+
 bool
 MatrixMegolmInSessionDecrypt(
-    MatrixMegolmInSession * megolmInSession,
-    const char * encrypted,
+    MatrixMegolmInSession * session,
+    const char * encrypted, int encryptedLen,
     char * outDecrypted, int outDecryptedCap);
 
 typedef struct MatrixMegolmOutSession {
     char roomId[ROOM_ID_SIZE];
+    char id[MEGOLM_SESSION_ID_SIZE];
+    char key[MEGOLM_SESSION_KEY_SIZE];
 
     OlmOutboundGroupSession * session;
     char memory[MEGOLM_OUTBOUND_SESSION_MEMORY_SIZE];
-
-    char id[MEGOLM_SESSION_ID_SIZE];
-    char key[MEGOLM_SESSION_KEY_SIZE];
 } MatrixMegolmOutSession;
 
 bool
@@ -160,18 +226,6 @@ MatrixMegolmOutSessionEncrypt(
     const char * plaintext,
     char * outBuffer, int outBufferCap);
 
-bool
-MatrixMegolmOutSessionSave(
-    MatrixMegolmOutSession * session,
-    const char * filename,
-    const char * key);
-    
-bool
-MatrixMegolmOutSessionLoad(
-    MatrixMegolmOutSession * session,
-    const char * filename,
-    const char * key);
-
 
 // Matrix Client
 
@@ -187,34 +241,22 @@ typedef struct MatrixClient {
     
     MatrixDevice devices[NUM_DEVICES];
     int numDevices;
-    
-    // char deviceKey[DEVICE_KEY_SIZE];
-    // char signingKey[DEVICE_KEY_SIZE];
 
     char userId[USER_ID_SIZE];
-    char server[SERVER_SIZE];
     char accessToken[ACCESS_TOKEN_SIZE];
     char deviceId[DEVICE_ID_SIZE];
     char expireMs[EXPIRE_MS_SIZE];
     char refreshToken[REFRESH_TOKEN_SIZE];
+    char masterKey[MASTER_KEY_SIZE];
+
+    bool verified;
 
-    void * httpUserData;
+    MatrixHttpConnection * hc;
 } MatrixClient;
 
 bool
 MatrixClientInit(
-    MatrixClient * client,
-    const char * server);
-
-bool
-MatrixClientSave(
-    MatrixClient * client,
-    const char * filename);
-
-bool
-MatrixClientLoad(
-    MatrixClient * client,
-    const char * filename);
+    MatrixClient * client);
 
 bool
 MatrixClientSetAccessToken(
@@ -241,7 +283,7 @@ MatrixClientUploadOnetimeKeys(
     MatrixClient * client);
 
 bool
-MatrixClientUploadDeviceKey(
+MatrixClientUploadDeviceKeys(
     MatrixClient * client);
 
 bool
@@ -275,8 +317,8 @@ MatrixClientSendEventEncrypted(
 bool
 MatrixClientSync(
     MatrixClient * client,
-    char * outSync, int outSyncCap,
-    const char * nextBatch);
+    char * outSyncBuffer, int outSyncCap,
+    char * nextBatch, int nextBatchCap);
 
 bool
 MatrixClientGetRoomEvent(
@@ -292,30 +334,38 @@ MatrixClientShareMegolmOutSession(
     const char * deviceId,
     MatrixMegolmOutSession * session);
 
+// try to lookup outgoing megolm session, return true if found
 bool
-MatrixClientShareMegolmOutSessionTest(
+MatrixClientGetMegolmOutSession(
     MatrixClient * client,
-    const char * userId,
-    const char * deviceId,
-    MatrixMegolmOutSession * session);
+    const char * roomId,
+    MatrixMegolmOutSession ** outSession);
 
+// create a new outgoing megolm session and store it locally
 bool
-MatrixClientGetMegolmOutSession(
+MatrixClientNewMegolmOutSession(
     MatrixClient * client,
     const char * roomId,
     MatrixMegolmOutSession ** outSession);
 
+// try to lookup incoming megolm session, return true if found
 bool
-MatrixClientSetMegolmOutSession(
+MatrixClientGetMegolmInSession(
     MatrixClient * client,
-    const char * roomId,
-    MatrixMegolmOutSession session);
+    const char * roomId, int roomIdLen,
+    const char * sessionId, int sessionIdLen,
+    MatrixMegolmInSession ** outSession);
 
+// create a new incoming megolm session and store it locally
 bool
-MatrixClientInitMegolmOutSession(
+MatrixClientNewMegolmInSession(
     MatrixClient * client,
-    const char * roomId);
-    
+    const char * roomId,
+    const char * sessionId,
+    const char * sessionKey,
+    MatrixMegolmInSession ** outSession);
+
+// send a m.room_key_request to the device identified by userId/devideId
 bool
 MatrixClientRequestMegolmInSession(
     MatrixClient * client,
@@ -323,9 +373,9 @@ MatrixClientRequestMegolmInSession(
     const char * sessionId,
     const char * senderKey,
     const char * userId,
-    const char * deviceId, // TODO: remove deviceId (query all devices)
-    MatrixMegolmInSession * outMegolmInSession);
+    const char * deviceId);
 
+// try to lookup olm session, return true if found
 bool
 MatrixClientGetOlmSession(
     MatrixClient * client,
@@ -333,6 +383,24 @@ MatrixClientGetOlmSession(
     const char * deviceId,
     MatrixOlmSession ** outSession);
 
+// create a new olm session from a type 0 message and store it locally
+bool
+MatrixClientNewOlmSessionIn(
+    MatrixClient * client,
+    const char * userId,
+    const char * deviceId,
+    const char * encrypted,
+    MatrixOlmSession ** outSession);
+
+// create a new olm session with device userId/deviceId and store it locally
+// this automatically claims the onetime key
+bool
+MatrixClientNewOlmSessionOut(
+    MatrixClient * client,
+    const char * userId,
+    const char * deviceId,
+    MatrixOlmSession ** outSession);
+
 bool
 MatrixClientSendToDevice(
     MatrixClient * client,
@@ -355,63 +423,37 @@ MatrixClientSendDummy(
     const char * userId,
     const char * deviceId);
 
+// lookup device key locally and if not present get it from server
 bool
 MatrixClientRequestDeviceKey(
     MatrixClient * client,
     const char * deviceId,
     char * outDeviceKey, int outDeviceKeyCap);
     
+// lookup signing key locally and if not present get it from server
 bool
 MatrixClientRequestSigningKey(
     MatrixClient * client,
     const char * deviceId,
     char * outSigningKey, int outSigningKeyCap);
 
+// lookup the master key for this user and if not present get it from server
 bool
-MatrixClientRequestDeviceKeys(
-    MatrixClient * client);
-
-bool
-MatrixClientDeleteDevice(
-    MatrixClient * client);
-
-
-
-
-bool
-MatrixHttpInit(
-    MatrixClient * client);
+MatrixClientRequestMasterKey(
+    MatrixClient * client,
+    char * outMasterKey, int outMasterKeyCap);
 
+// call keys/query and store retrieved information
+// this is called by the other Request* functions
 bool
-MatrixHttpConnect(
+MatrixClientRequestDeviceKeys(
     MatrixClient * client);
 
+// delete this device on the server
 bool
-MatrixHttpDeinit(
+MatrixClientDeleteDevice(
     MatrixClient * client);
 
-bool
-MatrixHttpGet(
-    MatrixClient * client,
-    const char * url,
-    char * outResponseBuffer, int outResponseCap,
-    bool authenticated);
-
-bool
-MatrixHttpPost(
-    MatrixClient * client,
-    const char * url,
-    const char * requestBuffer,
-    char * outResponseBuffer, int outResponseCap,
-    bool authenticated);
-
-bool
-MatrixHttpPut(
-    MatrixClient * client,
-    const char * url,
-    const char * requestBuffer,
-    char * outResponseBuffer, int outResponseCap,
-    bool authenticated);
 
 // util
 
@@ -423,6 +465,11 @@ JsonEscape(
     const char * sIn, int sInLen,
     char * sOut, int sOutCap);
     
+bool
+JsonCanonicalize(
+    const char * sIn, int sInLen,
+    char * sOut, int sOutCap);
+    
 bool
 JsonSign(
     MatrixClient * client,