strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

rework the logging interface

Browse source
This commit is contained in:
Mike Macgirvin 2010-10-26 22:09:13 -07:00
parent eb5e6aae72
commit 2028e1695c
7 changed files with 47 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
boot.php
View file

@ -1276,3 +1276,15 @@ function attribute_contains($attr,$s) {
return false; return false;
}} }}
if(! function_exists('logger')) {
function logger($msg) {
$debugging = get_config('system','debugging');
$logfile = get_config('system','logfile');
if((! $debugging) || (! $logfile))
return;
@file_put_contents($logfile, datetime_convert() . ':' . session_id() . ' ' . $msg . "\n", FILE_APPEND);
return;
}}

7
include/dba.php
View file

@ -58,8 +58,11 @@ class dba {
} }
} }
else { else {
if(($result === false) && (file_exists('dbfail.out'))) if($result === false) {
file_put_contents('dbfail.out', printable($sql) . ' returned false' . "\n", FILE_APPEND); logger('dba: ' . printable($sql) . ' returned false.');
if(file_exists('dbfail.out'))
file_put_contents('dbfail.out', printable($sql) . ' returned false' . "\n", FILE_APPEND);
}
} }
if(($result === true) || ($result === false)) if(($result === true) || ($result === false))

3
include/items.php
View file

@ -923,8 +923,7 @@ function consume_feed($xml,$importer,$contact, &$hub) {
$datarray = get_atom_elements($feed,$item); $datarray = get_atom_elements($feed,$item);
if($datarray['verb'] === ACTIVITY_FOLLOW) { if($datarray['verb'] === ACTIVITY_FOLLOW) {
if($debugging) logger('consume-feed: New follower');
file_put_contents('salmon.out',"\n" . 'New follower.' . "\n", FILE_APPEND);
new_follower($importer,$contact,$datarray,$item); new_follower($importer,$contact,$datarray,$item);
return; return;
} }

5
include/notifier.php
View file

@ -343,10 +343,7 @@
continue; continue;
$params = 'hub.mode=publish&hub.url=' . urlencode($a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] ); $params = 'hub.mode=publish&hub.url=' . urlencode($a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
post_url($h,$params); post_url($h,$params);
if($debugging) { logger('pubsub: publish: ' . $h . ' returned ' . $a->get_curl_code());
file_put_contents('pubsub.out', "\n\n" . "Pinged hub " . $h . ' at '
. datetime_convert() . "\n" . "Hub returned " . $a->get_curl_code() . "\n\n" , FILE_APPEND);
}
if(count($hubs) > 1) if(count($hubs) > 1)
sleep(7); // try and avoid multiple hubs responding at precisely the same time sleep(7); // try and avoid multiple hubs responding at precisely the same time
} }

11
include/salmon.php
View file

@ -29,9 +29,7 @@ function base64url_decode($s) {
function get_salmon_key($uri,$keyhash) { function get_salmon_key($uri,$keyhash) {
$ret = array(); $ret = array();
$debugging = get_config('system','debugging'); logger('Fetching salmon key');
if($debugging)
file_put_contents('salmon.out', "\n" . 'Fetch key' . "\n", FILE_APPEND);
$arr = lrdd($uri); $arr = lrdd($uri);
@ -62,8 +60,8 @@ function get_salmon_key($uri,$keyhash) {
} }
} }
if($debugging)
file_put_contents('salmon.out', "\n" . 'Key located: ' . print_r($ret,true) . "\n", FILE_APPEND); logger('Key located: ' . print_r($ret,true));
if(count($ret) == 1) { if(count($ret) == 1) {
@ -90,6 +88,7 @@ function get_salmon_key($uri,$keyhash) {
function slapper($owner,$contact,$slap) { function slapper($owner,$contact,$slap) {
logger('slapper called. Data: ' . $slap);
// does contact have a salmon endpoint? // does contact have a salmon endpoint?
@ -180,7 +179,7 @@ EOT;
$return_code = trim($a->get_curl_code()); $return_code = trim($a->get_curl_code());
} }
logger('slapper returned ' . $return_code);
return; return;
} }

10
mod/pubsub.php
View file

@ -39,10 +39,7 @@ function pubsub_init(&$a) {
$hub_lease = notags(trim($_GET['hub_lease_seconds'])); $hub_lease = notags(trim($_GET['hub_lease_seconds']));
$hub_verify = notags(trim($_GET['hub_verify_token'])); $hub_verify = notags(trim($_GET['hub_verify_token']));
$debugging = get_config('system','debugging'); logger('pubsub: Subscription from' . $_SERVER['REMOTE_ADDR'] . print_r($_GET,true));
if($debugging) {
file_put_contents('pubsub.out', 'Pubsubhubbub subscription called from ' . $_SERVER['REMOTE_ADDR'] . ' at ' . datetime_convert() . "\n" . print_r($_GET,true), FILE_APPEND);
}
$subscribe = (($hub_mode === 'subscribe') ? 1 : 0); $subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
@ -89,10 +86,7 @@ function pubsub_post(&$a) {
$xml = file_get_contents('php://input'); $xml = file_get_contents('php://input');
$debugging = get_config('system','debugging'); logger('pubsub: feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $a->cmd . ':' . $xml);
$remote_host = 'Pubsub feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' at ' . datetime_convert() . ' for ' . $a->cmd . "\n\n";
if($debugging)
file_put_contents('pubsub.out', $remote_host . $xml, FILE_APPEND);
$nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
$contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0); $contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);

66
mod/salmon.php
View file

@ -12,11 +12,12 @@ require_once('simplepie/simplepie.inc');
function salmon_return($val) { function salmon_return($val) {
if($val >= 500) if($val >= 400)
$err = 'Error'; $err = 'Error';
if($val == 200) if($val == 200)
$err = 'OK'; $err = 'OK';
logger('mod-salmon returns ' . $val);
header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err); header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err);
killme(); killme();
@ -25,10 +26,8 @@ function salmon_return($val) {
function salmon_post(&$a) { function salmon_post(&$a) {
$xml = file_get_contents('php://input'); $xml = file_get_contents('php://input');
$debugging = get_config('system','debugging'); logger('mod-salmon: new salmon ' . $xml);
if($debugging)
file_put_contents('salmon.out','New Salmon: ' . $xml . "\n",FILE_APPEND);
$nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
$mentions = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false); $mentions = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false);
@ -45,10 +44,6 @@ function salmon_post(&$a) {
$dom = simplexml_load_string($xml,'SimpleXMLElement',0,NAMESPACE_SALMON_ME); $dom = simplexml_load_string($xml,'SimpleXMLElement',0,NAMESPACE_SALMON_ME);
if($debugging)
file_put_contents('salmon.out', "\n" . print_r($dom,true) . "\n" , FILE_APPEND);
// figure out where in the DOM tree our data is hiding // figure out where in the DOM tree our data is hiding
if($dom->provenance->data) if($dom->provenance->data)
@ -59,9 +54,8 @@ function salmon_post(&$a) {
$base = $dom; $base = $dom;
if(! $base) { if(! $base) {
if($debugging) logger('mod-salmon: unable to locate salmon data in xml ');
file_put_contents('salmon.out', "\n" . 'Unable to find salmon data in XML' . "\n" , FILE_APPEND); salmon_return(400);
salmon_return(500);
} }
// Stash the signature away for now. We have to find their key or it won't be good for anything. // Stash the signature away for now. We have to find their key or it won't be good for anything.
@ -69,9 +63,6 @@ function salmon_post(&$a) {
$signature = base64url_decode($base->sig); $signature = base64url_decode($base->sig);
if($debugging)
file_put_contents('salmon.out', "\n" . 'Encoded Signature: ' . $base->sig . "\n" , FILE_APPEND);
// unpack the data // unpack the data
// strip whitespace so our data element will return to one big base64 blob // strip whitespace so our data element will return to one big base64 blob
@ -104,9 +95,7 @@ function salmon_post(&$a) {
$feedxml = $tpl . $base . '</feed>'; $feedxml = $tpl . $base . '</feed>';
if($debugging) { logger('mod-salmon: Processed feed: ' . $feedxml);
file_put_contents('salmon.out', 'Processed feed: ' . $feedxml . "\n", FILE_APPEND);
}
// Now parse it like a normal atom feed to scrape out the author URI // Now parse it like a normal atom feed to scrape out the author URI
@ -115,10 +104,7 @@ function salmon_post(&$a) {
$feed->enable_order_by_date(false); $feed->enable_order_by_date(false);
$feed->init(); $feed->init();
if($debugging) { logger('mod-salmon: Feed parsed.');
file_put_contents('salmon.out', "\n" . 'Feed parsed.' . "\n", FILE_APPEND);
}
if($feed->get_item_quantity()) { if($feed->get_item_quantity()) {
foreach($feed->get_items() as $item) { foreach($feed->get_items() as $item) {
@ -129,23 +115,20 @@ function salmon_post(&$a) {
} }
if(! $author_link) { if(! $author_link) {
if($debugging) logger('mod-salmon: Could not retrieve author URI.');
file_put_contents('salmon.out',"\n" . 'Could not retrieve author URI.' . "\n", FILE_APPEND); salmon_return(400);
salmon_return(500);
} }
// Once we have the author URI, go to the web and try to find their public key // Once we have the author URI, go to the web and try to find their public key
if($debugging) { logger('mod-salmon: Fetching key for ' . $author_link );
file_put_contents('salmon.out', "\n" . 'Fetching key for ' . $author_link . "\n", FILE_APPEND);
}
$key = get_salmon_key($author_link,$keyhash); $key = get_salmon_key($author_link,$keyhash);
if(! $key) { if(! $key) {
if($debugging) logger('mod-salmon: Could not retrieve author key.');
file_put_contents('salmon.out',"\n" . 'Could not retrieve author key.' . "\n", FILE_APPEND); salmon_return(400);
salmon_return(500);
} }
// Setup RSA stuff to verify the signature // Setup RSA stuff to verify the signature
@ -159,8 +142,7 @@ function salmon_post(&$a) {
$m = base64url_decode($key_info[1]); $m = base64url_decode($key_info[1]);
$e = base64url_decode($key_info[2]); $e = base64url_decode($key_info[2]);
if($debugging) logger('mod-salmon: key details: ' . print_r($key_info,true));
file_put_contents('salmon.out',"\n" . print_r($key_info,true) . "\n", FILE_APPEND);
$rsa = new CRYPT_RSA(); $rsa = new CRYPT_RSA();
$rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1; $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
@ -180,13 +162,11 @@ function salmon_post(&$a) {
$verify = $rsa->verify($stnet_signed_data,$signature); $verify = $rsa->verify($stnet_signed_data,$signature);
if(! $verify) { if(! $verify) {
if($debugging) logger('mod-salmon: Message did not verify. Discarding.');
file_put_contents('salmon.out',"\n" . 'Message did not verify. Discarding.' . "\n", FILE_APPEND); salmon_return(400);
salmon_return(500);
} }
if($debugging) logger('mod-salmon: Message verified.');
file_put_contents('salmon.out',"\n" . 'Message verified.' . "\n", FILE_APPEND);
/* /*
@ -202,18 +182,14 @@ function salmon_post(&$a) {
intval($importer['uid']) intval($importer['uid'])
); );
if(! count($r)) { if(! count($r)) {
if($debugging) logger('mod-salmon: Author unknown to us.');
file_put_contents('salmon.out',"\n" . 'Author unknown to us.' . "\n", FILE_APPEND);
} }
if((count($r)) && ($r[0]['readonly'])) { if((count($r)) && ($r[0]['readonly'])) {
if($debugging) logger('mod-salmon: Ignoring this author.');
file_put_contents('salmon.out',"\n" . 'Ignoring this author.' . "\n", FILE_APPEND);
salmon_return(200); salmon_return(200);
// NOTREACHED // NOTREACHED
} }
require_once('include/items.php'); require_once('include/items.php');
// Placeholder for hub discovery. We shouldn't find any hubs // Placeholder for hub discovery. We shouldn't find any hubs