GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

add User-Agent to OMB requests

Browse Source 
darcs-hash:20081211185525-5ed1f-ea300a9f824163ea7989baae4e4b439e58fd0881.gz
This commit is contained in:
Evan Prodromou 2008-12-11 13:55:25 -05:00
parent 897aa87c8a
commit 06f99d4b55
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/finishremotesubscribe.php
View File

@ -254,7 +254,8 @@ class FinishremotesubscribeAction extends Action {
$fetcher = Auth_Yadis_Yadis::getHTTPFetcher(); $fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
$result = $fetcher->post($req->get_normalized_http_url(), $result = $fetcher->post($req->get_normalized_http_url(),
$req->to_postdata()); $req->to_postdata(),
array('User-Agent' => 'Laconica/' . LACONICA_VERSION));
common_debug('got result: "'.print_r($result,TRUE).'"', __FILE__); common_debug('got result: "'.print_r($result,TRUE).'"', __FILE__);

15
actions/remotesubscribe.php
View File

@ -33,14 +33,14 @@ class RemotesubscribeAction extends Action {
} }
if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($_SERVER['REQUEST_METHOD'] == 'POST') {
# CSRF protection # CSRF protection
$token = $this->trimmed('token'); $token = $this->trimmed('token');
if (!$token || $token != common_session_token()) { if (!$token || $token != common_session_token()) {
$this->show_form(_('There was a problem with your session token. Try again, please.')); $this->show_form(_('There was a problem with your session token. Try again, please.'));
return; return;
} }
$this->remote_subscription(); $this->remote_subscription();
} else { } else {
$this->show_form(); $this->show_form();
@ -115,7 +115,7 @@ class RemotesubscribeAction extends Action {
} }
# XXX: a little liberal for sites that accidentally put whitespace before the xml declaration # XXX: a little liberal for sites that accidentally put whitespace before the xml declaration
$xrds =& Auth_Yadis_XRDS::parseXRDS(trim($yadis->response_text)); $xrds =& Auth_Yadis_XRDS::parseXRDS(trim($yadis->response_text));
if (!$xrds) { if (!$xrds) {
@ -141,7 +141,7 @@ class RemotesubscribeAction extends Action {
$this->show_form(_('That\'s a local profile! Login to subscribe.')); $this->show_form(_('That\'s a local profile! Login to subscribe.'));
return; return;
} }
list($token, $secret) = $this->request_token($omb); list($token, $secret) = $this->request_token($omb);
if (!$token || !$secret) { if (!$token || !$secret) {
@ -287,7 +287,8 @@ class RemotesubscribeAction extends Action {
$fetcher = Auth_Yadis_Yadis::getHTTPFetcher(); $fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
$result = $fetcher->post($req->get_normalized_http_url(), $result = $fetcher->post($req->get_normalized_http_url(),
$req->to_postdata()); $req->to_postdata(),
array('User-Agent' => 'Laconica/' . LACONICA_VERSION));
if ($result->status != 200) { if ($result->status != 200) {
return NULL; return NULL;
@ -332,7 +333,7 @@ class RemotesubscribeAction extends Action {
$this->server_error(_('User without matching profile')); $this->server_error(_('User without matching profile'));
return; return;
} }
if ($profile->fullname) { if ($profile->fullname) {
$req->set_parameter('omb_listenee_fullname', $profile->fullname); $req->set_parameter('omb_listenee_fullname', $profile->fullname);
} }
@ -370,7 +371,7 @@ class RemotesubscribeAction extends Action {
$omb['update_profile_url'] = omb_service_uri($omb[OMB_ENDPOINT_UPDATEPROFILE]); $omb['update_profile_url'] = omb_service_uri($omb[OMB_ENDPOINT_UPDATEPROFILE]);
common_ensure_session(); common_ensure_session();
$_SESSION['oauth_authorization_request'] = $omb; $_SESSION['oauth_authorization_request'] = $omb;
# Redirect to authorization service # Redirect to authorization service

28
lib/omb.php
View File

@ -128,7 +128,7 @@ function omb_broadcast_remote_subscribers($notice) {
if (!$posted[$rp->postnoticeurl]) { if (!$posted[$rp->postnoticeurl]) {
common_log(LOG_DEBUG, 'Posting to ' . $rp->postnoticeurl); common_log(LOG_DEBUG, 'Posting to ' . $rp->postnoticeurl);
if (omb_post_notice_keys($notice, $rp->postnoticeurl, $rp->token, $rp->secret)) { if (omb_post_notice_keys($notice, $rp->postnoticeurl, $rp->token, $rp->secret)) {
common_log(LOG_DEBUG, 'Finished to ' . $rp->postnoticeurl); common_log(LOG_DEBUG, 'Finished to ' . $rp->postnoticeurl);
$posted[$rp->postnoticeurl] = TRUE; $posted[$rp->postnoticeurl] = TRUE;
} else { } else {
common_log(LOG_DEBUG, 'Failed posting to ' . $rp->postnoticeurl); common_log(LOG_DEBUG, 'Failed posting to ' . $rp->postnoticeurl);
@ -138,7 +138,7 @@ function omb_broadcast_remote_subscribers($notice) {
$rp->free(); $rp->free();
unset($rp); unset($rp);
return true; return true;
} }
@ -149,7 +149,7 @@ function omb_post_notice($notice, $remote_profile, $subscription) {
function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret) { function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret) {
common_debug('Posting notice ' . $notice->id . ' to ' . $postnoticeurl, __FILE__); common_debug('Posting notice ' . $notice->id . ' to ' . $postnoticeurl, __FILE__);
$user = User::staticGet('id', $notice->profile_id); $user = User::staticGet('id', $notice->profile_id);
if (!$user) { if (!$user) {
@ -158,17 +158,17 @@ function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret) {
} }
$con = omb_oauth_consumer(); $con = omb_oauth_consumer();
$token = new OAuthToken($tk, $secret); $token = new OAuthToken($tk, $secret);
$url = $postnoticeurl; $url = $postnoticeurl;
$parsed = parse_url($url); $parsed = parse_url($url);
$params = array(); $params = array();
parse_str($parsed['query'], $params); parse_str($parsed['query'], $params);
$req = OAuthRequest::from_consumer_and_token($con, $token, $req = OAuthRequest::from_consumer_and_token($con, $token,
'POST', $url, $params); 'POST', $url, $params);
$req->set_parameter('omb_version', OMB_VERSION_01); $req->set_parameter('omb_version', OMB_VERSION_01);
$req->set_parameter('omb_listenee', $user->uri); $req->set_parameter('omb_listenee', $user->uri);
$req->set_parameter('omb_notice', $notice->uri); $req->set_parameter('omb_notice', $notice->uri);
@ -177,23 +177,24 @@ function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret) {
array('notice' => array('notice' =>
$notice->id))); $notice->id)));
$req->set_parameter('omb_notice_license', common_config('license', 'url')); $req->set_parameter('omb_notice_license', common_config('license', 'url'));
$user->free(); $user->free();
unset($user); unset($user);
$req->sign_request(omb_hmac_sha1(), $con, $token); $req->sign_request(omb_hmac_sha1(), $con, $token);
# We re-use this tool's fetcher, since it's pretty good # We re-use this tool's fetcher, since it's pretty good
$fetcher = Auth_Yadis_Yadis::getHTTPFetcher(); $fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
if (!$fetcher) { if (!$fetcher) {
common_log(LOG_WARNING, 'Failed to initialize Yadis fetcher.', __FILE__); common_log(LOG_WARNING, 'Failed to initialize Yadis fetcher.', __FILE__);
return false; return false;
} }
$result = $fetcher->post($req->get_normalized_http_url(), $result = $fetcher->post($req->get_normalized_http_url(),
$req->to_postdata()); $req->to_postdata(),
array('User-Agent' => 'Laconica/' . LACONICA_VERSION));
common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__); common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);
@ -275,7 +276,8 @@ function omb_update_profile($profile, $remote_profile, $subscription) {
common_debug('request URL = '.$req->get_normalized_http_url(), __FILE__); common_debug('request URL = '.$req->get_normalized_http_url(), __FILE__);
common_debug('postdata = '.$req->to_postdata(), __FILE__); common_debug('postdata = '.$req->to_postdata(), __FILE__);
$result = $fetcher->post($req->get_normalized_http_url(), $result = $fetcher->post($req->get_normalized_http_url(),
$req->to_postdata()); $req->to_postdata(),
array('User-Agent' => 'Laconica/' . LACONICA_VERSION));
common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__); common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);