Merge of master branch.

Author: Ivan Stoev

pCloudCC/lib/pclsync/pbusinessaccount.c

@@ -28,8 +28,10 @@
 #include "papi.h"
 #include "plibs.h"
 #include "pnetlibs.h"
+#include "pfolder.h"
 
 #include <stdio.h>
+
 typedef struct _email_vis_params {
   char** email;
   size_t *length;
@@ -611,3 +613,112 @@ int api_error_result(binresult* res) {
   }
   return 0;
 }
+
+void psync_update_cryptostatus(){
+  binresult *res;
+  const binresult *cres;
+  psync_sql_res *q;
+  uint64_t u, crexp, crsub = 0, is_business = 0;
+  int crst = 0,crstat;
+  
+  binparam params[] = { P_STR("auth", psync_my_auth) };
+  res = psync_api_run_command("userinfo", params);
+  if (!res) {
+    debug(D_WARNING, "Send command returned invalid result.\n");
+    return;
+  }
+  
+  if (api_error_result(res))
+    return;
+  
+  q=psync_sql_prep_statement("REPLACE INTO setting (id, value) VALUES (?, ?)");
+  
+  is_business=psync_find_result(res, "business", PARAM_BOOL)->num;
+  
+  u=psync_find_result(res, "cryptosetup", PARAM_BOOL)->num;
+  psync_sql_bind_string(q, 1, "cryptosetup");
+  psync_sql_bind_uint(q, 2, u);
+  psync_sql_run(q);
+  if (u)
+    crst = 1;
+  psync_sql_bind_string(q, 1, "cryptosubscription");
+  crsub =  psync_find_result(res, "cryptosubscription", PARAM_BOOL)->num;
+  psync_sql_bind_uint(q, 2, crsub);
+  psync_sql_run(q);
+  
+  cres=psync_check_result(res, "cryptoexpires", PARAM_NUM);
+  crexp = cres?cres->num:0;
+  psync_sql_bind_string(q, 1, "cryptoexpires");
+  psync_sql_bind_uint(q, 2, crexp);
+  psync_sql_run(q);
+
+  if (is_business || crsub){
+    if (crst)
+      crstat = 5;
+    else  crstat = 4;
+  } else {
+    if (!crst)
+      crstat = 1;
+    else 
+    {
+      if (psync_time() > crexp)
+        crstat = 3;
+      else 
+        crstat = 2;
+    }
+  }
+  psync_sql_bind_string(q, 1, "cryptostatus");
+  psync_sql_bind_uint(q, 2, crstat);
+  psync_sql_run(q);
+  psync_sql_free_result(q);
+
+  
+}
+
+static int check_write_permissions (psync_folderid_t folderid) {
+  psync_sql_res* res;
+  psync_uint_row row;
+  int  ret = 0;
+  
+  res=psync_sql_query("SELECT permissions, flags, name FROM folder WHERE id=?");
+  psync_sql_bind_uint(res, 1, folderid);
+  row=psync_sql_fetch_rowint(res);
+  if (unlikely(!row))
+    debug(D_ERROR, "could not find folder of folderid %lu", (unsigned long)folderid);
+  else if (/*(((row[1]) & 3) != O_RDONLY) &&*/ ((row[0]&PSYNC_PERM_MODIFY)&&(row[0]&PSYNC_PERM_CREATE)))
+    ret = 1;
+    
+   psync_sql_free_result(res);
+   return ret;
+}
+
+psync_folderid_t psync_check_and_create_folder (const char * path) {
+  psync_folderid_t folderid=psync_get_folderid_by_path_or_create(path);
+  if (folderid==PSYNC_INVALID_FOLDERID || (!check_write_permissions(folderid))){
+    char *buff=NULL;
+    uint32_t bufflen;
+    int ind = 1;
+    char *err=NULL;
+    
+    while (ind < 100) {
+      folderid=PSYNC_INVALID_FOLDERID;
+      bufflen = strlen(path) + 1 /*zero char*/ + 3 /*parenthesis*/ + 3 /*up to 3 digit index*/;
+      buff = (char *) psync_malloc(bufflen);
+      snprintf(buff, bufflen - 1, "%s (%d)", path, ind);
+      if (psync_create_remote_folder_by_path(buff, &err)!=0)
+        debug(D_NOTICE, "Unable to create folder %s error is %s.", buff, err);
+      folderid=psync_get_folderid_by_path_or_create(buff);
+      if ((folderid!=PSYNC_INVALID_FOLDERID)&&check_write_permissions(folderid)) {
+        psync_free(buff);
+        break;
+      }
+      ++ind;
+
+      if (err)
+        psync_free(err);
+      psync_free(buff);
+    }
+  }
+
+  return folderid; 
+}

pCloudCC/lib/pclsync/pcompat.c

@@ -156,15 +156,15 @@ static wchar_t *utf8_to_wchar_path(const char *str){
   /* MAX_PATH seems not to be apporopriate here as it is defined as 260, and CreateDirectory() description says:
    * There is a default string size limit for paths of 248 characters. This limit is related to how the CreateDirectory function parses paths.
    */
-  if (len>=248){
+//  if (len>=248){
     ret=psync_new_cnt(wchar_t, len+4);
     memcpy(ret, L"\\\\?\\", 4*sizeof(wchar_t));
     MultiByteToWideChar(CP_UTF8, 0, str, -1, ret+4, len);
-  }
-  else{
-    ret=psync_new_cnt(wchar_t, len);
-    MultiByteToWideChar(CP_UTF8, 0, str, -1, ret, len);
-  }
+//  }
+//  else{
+//    ret=psync_new_cnt(wchar_t, len);
+//    MultiByteToWideChar(CP_UTF8, 0, str, -1, ret, len);
+//  }
   return ret;
 }
 
@@ -617,22 +617,22 @@ static void psync_get_random_seed_from_db(psync_lhash_ctx *hctx){
   psync_lhash_update(hctx, &tm, sizeof(&tm));
   res=psync_sql_query_rdlock("SELECT * FROM setting ORDER BY RANDOM()");
   psync_get_random_seed_from_query(hctx, res);
-  res=psync_sql_query_rdlock("SELECT * FROM filerevision ORDER BY RANDOM() LIMIT 50");
+  res=psync_sql_query_rdlock("SELECT * FROM resolver ORDER BY RANDOM() LIMIT 50");
+  psync_get_random_seed_from_query(hctx, res);
+/*  res=psync_sql_query_rdlock("SELECT * FROM filerevision ORDER BY RANDOM() LIMIT 50");
   psync_get_random_seed_from_query(hctx, res);
   res=psync_sql_query_rdlock("SELECT * FROM file ORDER BY RANDOM() LIMIT 50");
   psync_get_random_seed_from_query(hctx, res);
   res=psync_sql_query_rdlock("SELECT * FROM localfile ORDER BY RANDOM() LIMIT 50");
   psync_get_random_seed_from_query(hctx, res);
-  res=psync_sql_query_rdlock("SELECT * FROM resolver ORDER BY RANDOM() LIMIT 50");
-  psync_get_random_seed_from_query(hctx, res);
   res=psync_sql_query_rdlock("SELECT * FROM folder ORDER BY RANDOM() LIMIT 25");
   psync_get_random_seed_from_query(hctx, res);
   res=psync_sql_query_rdlock("SELECT * FROM localfolder ORDER BY RANDOM() LIMIT 25");
   psync_get_random_seed_from_query(hctx, res);
   res=psync_sql_query_rdlock("SELECT * FROM hashchecksum ORDER BY RANDOM() LIMIT 25");
   psync_get_random_seed_from_query(hctx, res);
   res=psync_sql_query_rdlock("SELECT * FROM pagecache WHERE type=1 AND rowid>(ABS(RANDOM())%(SELECT MAX(rowid)+1 FROM pagecache)) ORDER BY rowid LIMIT 50");
-  psync_get_random_seed_from_query(hctx, res);
+  psync_get_random_seed_from_query(hctx, res); */
   psync_sql_statement("REPLACE INTO setting (id, value) VALUES ('random', RANDOM())");
   psync_nanotime(&tm);
   psync_lhash_update(hctx, &tm, sizeof(&tm));
@@ -665,12 +665,12 @@ static void psync_store_seed_in_db(const unsigned char *seed){
   unsigned char hashbin[PSYNC_LHASH_DIGEST_LEN];
   char hashhex[PSYNC_LHASH_DIGEST_HEXLEN], nm[16];
   memcpy(hashbin, seed, PSYNC_LHASH_DIGEST_LEN);
-  psync_rehash_cnt(hashbin, 5000);
+  psync_rehash_cnt(hashbin, 2000);
   psync_binhex(hashhex, hashbin, PSYNC_LHASH_DIGEST_LEN);
   res=psync_sql_prep_statement("REPLACE INTO setting (id, value) VALUES ('randomhash', ?)");
   psync_sql_bind_lstring(res, 1, hashhex, PSYNC_LHASH_DIGEST_HEXLEN);
   psync_sql_run_free(res);
-  psync_rehash_cnt(hashbin, 5000);
+  psync_rehash_cnt(hashbin, 2000);
   psync_binhex(hashhex, hashbin, PSYNC_LHASH_DIGEST_LEN);
   memcpy(nm, "randomhash", 10);
   nm[10]=hashhex[0];
@@ -691,7 +691,7 @@ void psync_get_random_seed(unsigned char *seed, const void *addent, size_t aelen
   psync_uint_t i, j;
   int64_t i64;
   pthread_t threadid;
-  unsigned char lsc[100][PSYNC_LHASH_DIGEST_LEN];
+  unsigned char lsc[64][PSYNC_LHASH_DIGEST_LEN];
 #if defined(P_OS_POSIX)
   debug(D_NOTICE, "in");
   struct utsname un;
@@ -802,7 +802,6 @@ void psync_get_random_seed(unsigned char *seed, const void *addent, size_t aelen
   if (home){
     i64=psync_get_free_space_by_path(home);
     psync_lhash_update(&hctx, &i64, sizeof(i64));
-    psync_lhash_update(&hctx, &home, sizeof(home));
     psync_lhash_update(&hctx, home, strlen(home));
     if (likely_log(!psync_stat(home, &st)))
       psync_lhash_update(&hctx, &st, sizeof(st));
@@ -821,7 +820,7 @@ void psync_get_random_seed(unsigned char *seed, const void *addent, size_t aelen
     for (j=0; j<PSYNC_LHASH_DIGEST_LEN; j++)
       lsc[i][j]^=(unsigned char)i;
   }
-  for (j=fast?98:0; j<100; j++){
+  for (j=fast?3:0; j<5; j++){
     for (i=0; i<100; i++){
       psync_lhash_update(&hctx, &i, sizeof(i));
       psync_lhash_update(&hctx, &j, sizeof(j));

pCloudCC/lib/pclsync/pcompat.h

@@ -145,10 +145,11 @@ typedef unsigned long psync_uint_t;
 #define psync_stat_isfolder(s) S_ISDIR((s)->st_mode)
 #define psync_stat_size(s) ((s)->st_size)
 #ifdef _DARWIN_FEATURE_64_BIT_INODE
-#define psync_stat_ctime(s) ((s)->st_birthtime)
+#define psync_stat_birthtime(s) ((s)->st_birthtime)
 #else
-#define psync_stat_ctime(s) ((s)->st_ctime)
+#define psync_stat_birthtime(s) ((s)->st_mtime)
 #endif
+#define psync_stat_ctime(s) ((s)->st_ctime)
 #define psync_stat_mtime(s) ((s)->st_mtime)
 
 #if defined(st_mtime)
@@ -266,6 +267,7 @@ int psync_stat(const char *path, psync_stat_t *st);
 #define psync_stat_size(s) psync_32to64((s)->nFileSizeHigh, (s)->nFileSizeLow)
 #define psync_stat_ctime(s) psync_filetime_to_timet(&(s)->ftCreationTime)
 #define psync_stat_mtime(s) psync_filetime_to_timet(&(s)->ftLastWriteTime)
+#define psync_stat_birthtime(s) psync_filetime_to_timet(&(s)->ftCreationTime)
 #define psync_stat_mtime_native(s) psync_32to64((s)->ftLastWriteTime.dwHighDateTime, (s)->ftLastWriteTime.dwLowDateTime)
 #define psync_mtime_native_to_mtime(n) psync_filetime64_to_timet(n)
 #define psync_stat_inode(s) psync_32to64((s)->nFileIndexHigh, (s)->nFileIndexLow)