Merge pull request #3280 from annando/issue-3142-2

[friendica.git] / include / diaspora.php

diff --git a/include/diaspora.php b/include/diaspora.php
index 302492efea5011d1db5fa9945ae4cff687d6db5f..bdedb9e0b7336ede8ef8b4e455c67e116febeb6e 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -10,17 +10,17 @@
 
 use \Friendica\Core\Config;
 
-require_once("include/items.php");
-require_once("include/bb2diaspora.php");
-require_once("include/Scrape.php");
-require_once("include/Contact.php");
-require_once("include/Photo.php");
-require_once("include/socgraph.php");
-require_once("include/group.php");
-require_once("include/xml.php");
-require_once("include/datetime.php");
-require_once("include/queue_fn.php");
-require_once("include/cache.php");
+require_once 'include/items.php';
+require_once 'include/bb2diaspora.php';
+require_once 'include/Scrape.php';
+require_once 'include/Contact.php';
+require_once 'include/Photo.php';
+require_once 'include/socgraph.php';
+require_once 'include/group.php';
+require_once 'include/xml.php';
+require_once 'include/datetime.php';
+require_once 'include/queue_fn.php';
+require_once 'include/cache.php';
 
 /**
  * @brief This class contain functions to create and send Diaspora XML files
@@ -160,6 +160,32 @@ class Diaspora {
                return $data;
        }
 
+       /**
+        * @brief encrypts data via AES
+        *
+        * @param string $key The AES key
+        * @param string $iv The IV (is used for CBC encoding)
+        * @param string $data The data that is to be encrypted
+        *
+        * @return string encrypted data
+        */
+       private static function aes_encrypt($key, $iv, $data) {
+               return openssl_encrypt($data, 'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
+       }
+
+       /**
+        * @brief decrypts data via AES
+        *
+        * @param string $key The AES key
+        * @param string $iv The IV (is used for CBC encoding)
+        * @param string $encrypted The encrypted data
+        *
+        * @return string decrypted data
+        */
+       private static function aes_decrypt($key, $iv, $encrypted) {
+               return openssl_decrypt($encrypted,'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA,str_pad($iv, 16, "\0"));
+       }
+
        /**
         * @brief: Decodes incoming Diaspora message
         *
@@ -199,10 +225,7 @@ class Diaspora {
                        $outer_iv = base64_decode($j_outer_key_bundle->iv);
                        $outer_key = base64_decode($j_outer_key_bundle->key);
 
-                       $decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $outer_key, $ciphertext, MCRYPT_MODE_CBC, $outer_iv);
-
-
-                       $decrypted = pkcs5_unpad($decrypted);
+                       $decrypted = self::aes_decrypt($outer_key, $outer_iv, $ciphertext);
 
                        logger('decrypted: '.$decrypted, LOGGER_DEBUG);
                        $idom = parse_xml_string($decrypted,false);
@@ -261,8 +284,7 @@ class Diaspora {
                        // Decode the encrypted blob
 
                        $inner_encrypted = base64_decode($data);
-                       $inner_decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $inner_aes_key, $inner_encrypted, MCRYPT_MODE_CBC, $inner_iv);
-                       $inner_decrypted = pkcs5_unpad($inner_decrypted);
+                       $inner_decrypted = self::aes_decrypt($inner_aes_key, $inner_iv, $inner_encrypted);
                }
 
                if (!$author_link) {
@@ -1848,18 +1870,15 @@ class Diaspora {
                        intval($importer["uid"])
                );
 
-               if ($searchable) {
-                       poco_check($contact["url"], $name, NETWORK_DIASPORA, $image_url, $about, $location, $gender, $keywords, "",
-                               datetime_convert(), 2, $contact["id"], $importer["uid"]);
-               }
-
                $gcontact = array("url" => $contact["url"], "network" => NETWORK_DIASPORA, "generation" => 2,
                                        "photo" => $image_url, "name" => $name, "location" => $location,
                                        "about" => $about, "birthday" => $birthday, "gender" => $gender,
                                        "addr" => $author, "nick" => $nick, "keywords" => $keywords,
                                        "hide" => !$searchable, "nsfw" => $nsfw);
 
-               update_gcontact($gcontact);
+               $gcid = update_gcontact($gcontact);
+
+               link_gcontact($gcid, $importer["uid"], $contact["id"]);
 
                logger("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"], LOGGER_DEBUG);
 
@@ -2621,20 +2640,19 @@ class Diaspora {
                        return false;
                }
 
-               $inner_aes_key = random_string(32);
+               $inner_aes_key = openssl_random_pseudo_bytes(32);
                $b_inner_aes_key = base64_encode($inner_aes_key);
-               $inner_iv = random_string(16);
+               $inner_iv = openssl_random_pseudo_bytes(16);
                $b_inner_iv = base64_encode($inner_iv);
 
-               $outer_aes_key = random_string(32);
+               $outer_aes_key = openssl_random_pseudo_bytes(32);
                $b_outer_aes_key = base64_encode($outer_aes_key);
-               $outer_iv = random_string(16);
+               $outer_iv = openssl_random_pseudo_bytes(16);
                $b_outer_iv = base64_encode($outer_iv);
 
                $handle = self::my_handle($user);
 
-               $padded_data = pkcs5_pad($msg,16);
-               $inner_encrypted = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $inner_aes_key, $padded_data, MCRYPT_MODE_CBC, $inner_iv);
+               $inner_encrypted = self::aes_encrypt($inner_aes_key, $inner_iv, $msg);
 
                $b64_data = base64_encode($inner_encrypted);
 
@@ -2656,9 +2674,8 @@ class Diaspora {
                                                        "author_id" => $handle));
 
                $decrypted_header = xml::from_array($xmldata, $xml, true);
-               $decrypted_header = pkcs5_pad($decrypted_header,16);
 
-               $ciphertext = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $outer_aes_key, $decrypted_header, MCRYPT_MODE_CBC, $outer_iv);
+               $ciphertext = self::aes_encrypt($outer_aes_key, $outer_iv, $decrypted_header);
 
                $outer_json = json_encode(array("iv" => $b_outer_iv, "key" => $b_outer_aes_key));
 
@@ -3574,7 +3591,7 @@ class Diaspora {
                if ($searchable === 'true') {
                        $dob = '1000-00-00';
 
-                       if (($profile['dob']) && ($profile['dob'] > '0001-01-01'))
+                       if (($profile['dob']) && ($profile['dob'] != '0000-00-00'))
                                $dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC','UTC',$profile['dob'],'m-d');
 
                        $about = $profile['about'];