Merge pull request #1384 from meganz/release/v3.4.9

Version 3.4.9

bindings/java/nz/mega/sdk/MegaApiJava.java

@@ -481,8 +481,8 @@ public static String userHandleToBase64(long handle) {
      * @param size
      *            Size of the byte array (in bytes).
      */
-    public static void addEntropy(String data, long size) {
-        MegaApi.addEntropy(data, size);
+    public void addEntropy(String data, long size) {
+        megaApi.addEntropy(data, size);
     }
 
     /**
@@ -6930,6 +6930,29 @@ public MegaNode authorizeNode(MegaNode node){
         return megaApi.authorizeNode(node);
     }
 
+    /**
+     *
+     * Returns a MegaNode that can be downloaded/copied with a chat-authorization
+     *
+     * During preview of chat-links, you need to call this method to authorize the MegaNode
+     * from a node-attachment message, so the API allows to access to it. The parameter to
+     * authorize the access can be retrieved from MegaChatRoom::getAuthorizationToken when
+     * the chatroom in in preview mode.
+     *
+     * You can use MegaApi::startDownload and/or MegaApi::copyNode with the resulting
+     * node with any instance of MegaApi, even if it's logged into another account,
+     * a public folder, or not logged in.
+     *
+     * You take the ownership of the returned value.
+     *
+     * @param node MegaNode to authorize
+     * @param cauth Authorization token (public handle of the chatroom in B64url encoding)
+     * @return Authorized node, or NULL if the node can't be authorized
+     */
+    public MegaNode authorizeChatNode(MegaNode node, String cauth){
+        return megaApi.authorizeChatNode(node, cauth);
+    }
+
     /**
      * Get the SDK version.
      * 

examples/megacli.cpp

@@ -1856,7 +1856,7 @@ class TreeProcCopy_mcli : public TreeProc
             else
             {
                 byte buf[FOLDERNODEKEYLENGTH];
-                PrnGen::genblock(buf, sizeof buf);
+                client->rng.genblock(buf, sizeof buf);
                 t->nodekey.assign((char*) buf, FOLDERNODEKEYLENGTH);
             }
 
@@ -3871,7 +3871,7 @@ static void process_line(char* l)
                                     newnode->parenthandle = UNDEF;
 
                                     // generate fresh random key for this folder node
-                                    PrnGen::genblock(buf, FOLDERNODEKEYLENGTH);
+                                    client->rng.genblock(buf, FOLDERNODEKEYLENGTH);
                                     newnode->nodekey.assign((char*) buf, FOLDERNODEKEYLENGTH);
                                     key.setkey(buf);
 

include/mega/backofftimer.h

@@ -31,6 +31,7 @@ class MEGA_API BackoffTimer
     dstime next;
     dstime delta;
     dstime base;
+    PrnGen &rng;
 
 public:
     // reset timer
@@ -63,15 +64,15 @@ class MEGA_API BackoffTimer
     // update time to wait
     void update(dstime*);
 
-    BackoffTimer();
+    BackoffTimer(PrnGen &rng);
 };
 
 
 class MEGA_API TimerWithBackoff: public BackoffTimer {
 
 public:
     int tag;
-    TimerWithBackoff(int tag);
+    TimerWithBackoff(PrnGen &rng, int tag);
 };
 
 } // namespace

include/mega/crypto/cryptopp.h

@@ -44,11 +44,9 @@ using std::string;
 /**
  * @brief A generic pseudo-random number generator.
  */
-class MEGA_API PrnGen
+class MEGA_API PrnGen : public CryptoPP::AutoSeededRandomPool
 {
 public:
-    static CryptoPP::AutoSeededRandomPool rng;
-
     /**
      * @brief Generates a block of random bytes of length `len` into a buffer
      *        `buf`.
@@ -58,15 +56,15 @@ class MEGA_API PrnGen
      * @param len The number of random bytes to generate.
      * @return Void.
      */
-    static void genblock(byte* buf, int len);
+    void genblock(byte* buf, int len);
 
     /**
      * @brief Generates a random integer between 0 ... max - 1.
      *
      * @param max The maximum of which the number is to generate under.
      * @return The random number generated.
      */
-    static uint32_t genuint32(uint64_t max);
+    uint32_t genuint32(uint64_t max);
 };
 
 // symmetric cryptography: AES-128
@@ -307,13 +305,14 @@ class MEGA_API AsymmCipher
     /**
      * @brief Encrypts a randomly padded plain text into a buffer.
      *
+     * @param rng Reference to the random block generator
      * @param plain The plain text to encrypt.
      * @param plainlen Length of the plain text.
      * @param buf Buffer to take the cipher text..
      * @param buflen Length of the cipher text.
      * @return Number of bytes encrypted, 0 on failure.
      */
-    int encrypt(const byte* plain, int plainlen, byte* buf, int buflen);
+    int encrypt(PrnGen &rng, const byte* plain, int plainlen, byte* buf, int buflen);
 
     /**
      * @brief Decrypts a cipher text into a buffer and strips random padding.
@@ -374,12 +373,13 @@ class MEGA_API AsymmCipher
     /**
      * @brief Generates an RSA key pair of a given key size.
      *
+     * @param rng Reference to the random block generator
      * @param privk Private key.
      * @param pubk Public key.
      * @param size Size of key to generate in bits (key strength).
      * @return Always returns 1.
      */
-    void genkeypair(CryptoPP::Integer* privk, CryptoPP::Integer* pubk, int size);
+    void genkeypair(PrnGen &rng, CryptoPP::Integer* privk, CryptoPP::Integer* pubk, int size);
 };
 
 class MEGA_API Hash

include/mega/crypto/sodium.h

@@ -28,6 +28,8 @@
 
 namespace mega {
 
+class PrnGen;
+
 /**
  * @brief Asymmetric cryptographic signature using EdDSA with Edwards 25519.
  */
@@ -41,7 +43,7 @@ class MEGA_API EdDSA
     static const string TLV_KEY;
     bool initializationOK;
 
-    EdDSA(unsigned char* keySeed = NULL);
+    EdDSA(PrnGen &rng, unsigned char* keySeed = NULL);
     ~EdDSA();
 
     unsigned char keySeed[SEED_KEY_LENGTH];

include/mega/db.h

@@ -29,6 +29,7 @@ namespace mega {
 class MEGA_API DbTable
 {
     static const int IDSPACING = 16;
+    PrnGen &rng;
 
 public:
     // for a full sequential get: rewind to first record
@@ -67,7 +68,7 @@ class MEGA_API DbTable
     // autoincrement
     uint32_t nextid;
 
-    DbTable();
+    DbTable(PrnGen &rng);
     virtual ~DbTable() { }
 };
 
@@ -77,7 +78,7 @@ struct MEGA_API DbAccess
     static const int DB_VERSION = LEGACY_DB_VERSION + 1;
 
     DbAccess();
-    virtual DbTable* open(FileSystemAccess*, string*, bool = false) = 0;
+    virtual DbTable* open(PrnGen &rng, FileSystemAccess*, string*, bool = false) = 0;
 
     virtual ~DbAccess() { }
 

include/mega/db/sqlite.h

@@ -31,7 +31,7 @@ class MEGA_API SqliteDbAccess : public DbAccess
     string dbpath;
 
 public:
-    DbTable* open(FileSystemAccess*, string*, bool = false);
+    DbTable* open(PrnGen &rng, FileSystemAccess*, string*, bool = false);
 
     SqliteDbAccess(string* = NULL);
     ~SqliteDbAccess();
@@ -56,7 +56,7 @@ class MEGA_API SqliteDbTable : public DbTable
     void abort();
     void remove();
 
-    SqliteDbTable(sqlite3*, FileSystemAccess *fs, string *filepath);
+    SqliteDbTable(PrnGen &rng, sqlite3*, FileSystemAccess *fs, string *filepath);
     ~SqliteDbTable();
 };
 } // namespace

include/mega/fileattributefetch.h

@@ -31,6 +31,8 @@ namespace mega {
 // file attribute fetching for a specific source cluster
 struct MEGA_API FileAttributeFetchChannel
 {
+    MegaClient *client;
+
     handle fahref;
 
     BackoffTimer bt;
@@ -45,15 +47,15 @@ struct MEGA_API FileAttributeFetchChannel
     error e;
 
     // dispatch new and retrying attributes by POSTing to existing URL
-    void dispatch(MegaClient*);
+    void dispatch();
 
     // parse fetch result and remove completed attributes from pending
-    void parse(MegaClient*, int, bool);
+    void parse(int, bool);
 
     // notify app of nodes that failed to receive their requested attribute
-    void failed(MegaClient*);
+    void failed();
 
-    FileAttributeFetchChannel();
+    FileAttributeFetchChannel(MegaClient*);
 };
 
 // pending individual attribute fetch

include/mega/http.h

@@ -293,7 +293,7 @@ struct MEGA_API HttpReq
 
 struct MEGA_API GenericHttpReq : public HttpReq
 {
-    GenericHttpReq(bool = false);
+    GenericHttpReq(PrnGen &rng, bool = false);
 
     // tag related to the request
     int tag;

include/mega/megaclient.h

@@ -216,6 +216,9 @@ class MEGA_API MegaClient
     // Account has VOIP push enabled (only for Apple)
     bool aplvp_enabled;
 
+    // pseudo-random number generator
+    PrnGen rng;
+
 #ifdef ENABLE_CHAT
     // all chats
     textchat_map chats;
@@ -793,7 +796,7 @@ class MEGA_API MegaClient
     void sc_ph();
     void sc_se();
 #ifdef ENABLE_CHAT
-    void sc_chatupdate();
+    void sc_chatupdate(bool readingPublicChat);
     void sc_chatnode();
     void sc_chatflags();
 #endif

include/mega/utils.h

@@ -66,7 +66,7 @@ struct MEGA_API PaddedCBC
      *     for encryption will be generated and available through the reference.
      * @return Void.
      */
-    static void encrypt(string* data, SymmCipher* key, string* iv = NULL);
+    static void encrypt(PrnGen &rng, string* data, SymmCipher* key, string* iv = NULL);
 
     /**
      * @brief Decrypts a string and strips the padding.
@@ -141,12 +141,17 @@ class MEGA_API PayCrypter
      */
     byte iv[IV_BYTES];
 
+    /**
+     * @brief Random blocks generator
+     */
+    PrnGen &rng;
+
 public:
 
     /**
      * @brief Constructor. Initializes keys with random values.
      */
-    PayCrypter();
+    PayCrypter(PrnGen &rng);
 
     /**
      * @brief Updates the crypto keys (mainly for testing)
@@ -256,7 +261,7 @@ struct MEGA_API TLVstore
      * @param encSetting Block encryption mode to be used by AES
      * @return A new string holding the encrypted byte array. You take the ownership of the string.
      */
-    string *tlvRecordsToContainer(SymmCipher *key, encryptionsetting_t encSetting = AES_GCM_12_16);
+    string *tlvRecordsToContainer(PrnGen &rng, SymmCipher *key, encryptionsetting_t encSetting = AES_GCM_12_16);
 
     /**
      * @brief Converts the TLV records into a byte array

include/mega/version.h

@@ -5,5 +5,5 @@
 #define MEGA_MINOR_VERSION 4
 #endif
 #ifndef MEGA_MICRO_VERSION
-#define MEGA_MICRO_VERSION 8
+#define MEGA_MICRO_VERSION 9
 #endif

include/megaapi.h

@@ -6204,7 +6204,7 @@ class MegaApi
          * @param data Byte array with random data
          * @param size Size of the byte array (in bytes)
          */
-        static void addEntropy(char* data, unsigned int size);
+        void addEntropy(char* data, unsigned int size);
 
 #ifdef WINDOWS_PHONE
         /**
@@ -11626,10 +11626,11 @@ class MegaApi
          * @param parentHandle Handle of the parent node
          * @param privateAuth Private authentication token to access the node
          * @param publicAuth Public authentication token to access the node
+         * @param chatAuth Chat authentication token to access the node
          * @return MegaNode object
          */
         MegaNode *createForeignFileNode(MegaHandle handle, const char *key, const char *name,
-                                       int64_t size, int64_t mtime, MegaHandle parentHandle, const char *privateAuth, const char *publicAuth);
+                                       int64_t size, int64_t mtime, MegaHandle parentHandle, const char *privateAuth, const char *publicAuth, const char *chatAuth);
 
         /**
          * @brief Create a MegaNode that represents a folder of a different account

include/megaapi_impl.h

@@ -1761,7 +1761,7 @@ class MegaApiImpl : public MegaApp
         static const char* ebcEncryptKey(const char* encryptionKey, const char* plainKey);
         void retryPendingConnections(bool disconnect = false, bool includexfers = false, MegaRequestListener* listener = NULL);
         void setDnsServers(const char *dnsServers, MegaRequestListener* listener = NULL);
-        static void addEntropy(char* data, unsigned int size);
+        void addEntropy(char* data, unsigned int size);
         static string userAttributeToString(int);
         static string userAttributeToLongName(int);
         static int userAttributeFromString(const char *name);
@@ -2102,7 +2102,7 @@ class MegaApiImpl : public MegaApp
         MegaNodeList* search(const char* searchString, int order = MegaApi::ORDER_NONE);
 
         MegaNode *createForeignFileNode(MegaHandle handle, const char *key, const char *name, m_off_t size, m_off_t mtime,
-                                       MegaHandle parentHandle, const char *privateauth, const char *publicauth);
+                                       MegaHandle parentHandle, const char *privateauth, const char *publicauth, const char *chatauth);
         MegaNode *createForeignFolderNode(MegaHandle handle, const char *name, MegaHandle parentHandle,
                                          const char *privateauth, const char *publicauth);
 
@@ -2925,6 +2925,7 @@ class MegaHTTPContext : public MegaTCPContext
     m_off_t nodesize;
     std::string nodepubauth;
     std::string nodeprivauth;
+    std::string nodechatauth;
     int resultCode;
 
 

src/backofftimer.cpp

@@ -25,7 +25,8 @@
 
 namespace mega {
 // timer with capped exponential backoff
-BackoffTimer::BackoffTimer()
+BackoffTimer::BackoffTimer(PrnGen &rng)
+    : rng(rng)
 {
     reset();
 }
@@ -48,7 +49,7 @@ void BackoffTimer::backoff()
         base = 6000;
     }
 
-    delta = base + (dstime)((base / 2.0) * (PrnGen::genuint32(RAND_MAX)/(float)RAND_MAX));
+    delta = base + (dstime)((base / 2.0) * (rng.genuint32(RAND_MAX)/(float)RAND_MAX));
 }
 
 void BackoffTimer::backoff(dstime newdelta)
@@ -129,7 +130,8 @@ void BackoffTimer::update(dstime* waituntil)
     }
 }
 
-TimerWithBackoff::TimerWithBackoff(int tag)
+TimerWithBackoff::TimerWithBackoff(PrnGen &rng, int tag)
+    : BackoffTimer(rng)
 {
     this->tag = tag;
 }