* @brief The dfrn notify endpoint
* @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
*/
-require_once('include/items.php');
-require_once('include/dfrn.php');
-require_once('include/event.php');
-require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
+use Friendica\Protocol\DFRN;
+
+require_once 'include/items.php';
+require_once 'include/event.php';
function dfrn_notify_post(App $a) {
logger(__function__, LOGGER_TRACE);
dbesc($dfrn_id),
dbesc($challenge)
);
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
logger('dfrn_notify: could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
- xml_status(3);
+ xml_status(3, 'Could not match challenge');
}
$r = q("DELETE FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s'",
// find the local user who owns this relationship.
$sql_extra = '';
- switch($direction) {
+ switch ($direction) {
case (-1):
$sql_extra = sprintf(" AND ( `issued-id` = '%s' OR `dfrn-id` = '%s' ) ", dbesc($dfrn_id), dbesc($dfrn_id));
break;
$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
break;
default:
- xml_status(3);
+ xml_status(3, 'Invalid direction');
break; // NOTREACHED
}
dbesc($a->argv[1])
);
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
logger('dfrn_notify: contact not found for dfrn_id ' . $dfrn_id);
- xml_status(3);
+ xml_status(3, 'Contact not found');
//NOTREACHED
}
logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
if ($dissolve == 1) {
-
- /*
- * Relationship is dissolved permanently
- */
-
- require_once('include/Contact.php');
- contact_remove($importer['id']);
+ // Relationship is dissolved permanently
+ Contact::remove($importer['id']);
logger('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']);
- xml_status(0);
-
+ xml_status(0, 'relationship dissolved');
}
- /// @TODO remove this old-lost code then?
- // If we are setup as a soapbox we aren't accepting input from this person
- // This behaviour is deactivated since it really doesn't make sense to even disallow comments
- // The check if someone is a friend or simply a follower is done in a later place so it needn't to be done here
- //if($importer['page-flags'] == PAGE_SOAPBOX)
- // xml_status(0);
-
- $rino = get_config('system','rino_encrypt');
+ $rino = Config::get('system', 'rino_encrypt');
$rino = intval($rino);
- // use RINO1 if mcrypt isn't installed and RINO2 was selected
- if ($rino == 2 && !function_exists('mcrypt_create_iv')) {
- $rino = 1;
- }
- logger("Local rino version: ". $rino, LOGGER_DEBUG);
+ logger("Local rino version: " . $rino, LOGGER_DEBUG);
if (strlen($key)) {
// but only for $remote_rino > 1, because old code did't send rino version
if ($rino_remote_version > 1 && $rino < $rino_remote) {
logger("rino version '$rino_remote' is lower than supported '$rino'");
- xml_status(0,"rino version '$rino_remote' is lower than supported '$rino'");
+ xml_status(0, "rino version '$rino_remote' is lower than supported '$rino'");
}
$rawkey = hex2bin(trim($key));
if ($dfrn_version >= 2.1) {
if ((($importer['duplex']) && strlen($importer['cprvkey'])) || (! strlen($importer['cpubkey']))) {
- openssl_private_decrypt($rawkey,$final_key,$importer['cprvkey']);
+ openssl_private_decrypt($rawkey, $final_key, $importer['cprvkey']);
} else {
- openssl_public_decrypt($rawkey,$final_key,$importer['cpubkey']);
+ openssl_public_decrypt($rawkey, $final_key, $importer['cpubkey']);
}
} else {
if ((($importer['duplex']) && strlen($importer['cpubkey'])) || (! strlen($importer['cprvkey']))) {
- openssl_public_decrypt($rawkey,$final_key,$importer['cpubkey']);
+ openssl_public_decrypt($rawkey, $final_key, $importer['cpubkey']);
} else {
- openssl_private_decrypt($rawkey,$final_key,$importer['cprvkey']);
+ openssl_private_decrypt($rawkey, $final_key, $importer['cprvkey']);
}
}
case 0:
case 1:
/*
- * we got a key. old code send only the key, without RINO version.
+ *we got a key. old code send only the key, without RINO version.
* we assume RINO 1 if key and no RINO version
*/
- $data = aes_decrypt(hex2bin($data),$final_key);
+ $data = DFRN::aesDecrypt(hex2bin($data), $final_key);
break;
case 2:
try {
- $data = Crypto::decrypt(hex2bin($data),$final_key);
- } catch (InvalidCiphertext $ex) { // VERY IMPORTANT
+ $data = \Crypto::decrypt(hex2bin($data), $final_key);
+ } catch (\InvalidCiphertextException $ex) { // VERY IMPORTANT
/*
* Either:
* 1. The ciphertext was modified by the attacker,
* Assume the worst.
*/
logger('The ciphertext has been tampered with!');
- xml_status(0,'The ciphertext has been tampered with!');
- } catch (Ex\CryptoTestFailed $ex) {
+ xml_status(0, 'The ciphertext has been tampered with!');
+ } catch (\CryptoTestFailedException $ex) {
logger('Cannot safely perform dencryption');
- xml_status(0,'CryptoTestFailed');
- } catch (Ex\CannotPerformOperation $ex) {
+ xml_status(0, 'CryptoTestFailed');
+ } catch (\CannotPerformOperationException $ex) {
logger('Cannot safely perform decryption');
- xml_status(0,'Cannot safely perform decryption');
+ xml_status(0, 'Cannot safely perform decryption');
}
break;
default:
- logger("rino: invalid sent verision '$rino_remote'");
- xml_status(0);
+ logger("rino: invalid sent version '$rino_remote'");
+ xml_status(0, "Invalid sent version '$rino_remote'");
}
logger('rino: decrypted data: ' . $data, LOGGER_DATA);
}
- $ret = dfrn::import($data, $importer);
- xml_status($ret);
+ $ret = DFRN::import($data, $importer);
+ xml_status($ret, 'Processed');
// NOTREACHED
}
dbesc($a->argv[1])
);
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
$status = 1;
}
$encrypted_id = bin2hex($encrypted_id);
- $rino = get_config('system','rino_encrypt');
+ $rino = Config::get('system', 'rino_encrypt');
$rino = intval($rino);
- // use RINO1 if mcrypt isn't installed and RINO2 was selected
- if ($rino == 2 && !function_exists('mcrypt_create_iv')) {
- $rino = 1;
- }
logger("Local rino version: ". $rino, LOGGER_DEBUG);
projects / friendica.git / blobdiff