eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

Browse Source
This commit is contained in:
Zach Copley 2009-03-06 21:11:19 -08:00
commit 597e1988b0
3 changed files with 84 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
extlib/OAuth.php
View File

@ -16,6 +16,10 @@ class OAuthConsumer {/*{{{*/
$this->secret = $secret; $this->secret = $secret;
$this->callback_url = $callback_url; $this->callback_url = $callback_url;
}/*}}}*/ }/*}}}*/
function __toString() {/*{{{*/
return "OAuthConsumer[key=$this->key,secret=$this->secret]";
}/*}}}*/
}/*}}}*/ }/*}}}*/
class OAuthToken {/*{{{*/ class OAuthToken {/*{{{*/
@ -37,8 +41,8 @@ class OAuthToken {/*{{{*/
* would respond to request_token and access_token calls with * would respond to request_token and access_token calls with
*/ */
function to_string() {/*{{{*/ function to_string() {/*{{{*/
return "oauth_token=" . OAuthUtil::urlencodeRFC3986($this->key) . return "oauth_token=" . OAuthUtil::urlencode_rfc3986($this->key) .
"&oauth_token_secret=" . OAuthUtil::urlencodeRFC3986($this->secret); "&oauth_token_secret=" . OAuthUtil::urlencode_rfc3986($this->secret);
}/*}}}*/ }/*}}}*/
function __toString() {/*{{{*/ function __toString() {/*{{{*/
@ -67,7 +71,7 @@ class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {/*{{{*/
($token) ? $token->secret : "" ($token) ? $token->secret : ""
); );
$key_parts = array_map(array('OAuthUtil','urlencodeRFC3986'), $key_parts); $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
$key = implode('&', $key_parts); $key = implode('&', $key_parts);
return base64_encode( hash_hmac('sha1', $base_string, $key, true)); return base64_encode( hash_hmac('sha1', $base_string, $key, true));
@ -81,11 +85,11 @@ class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {/*{{{*/
public function build_signature($request, $consumer, $token) {/*{{{*/ public function build_signature($request, $consumer, $token) {/*{{{*/
$sig = array( $sig = array(
OAuthUtil::urlencodeRFC3986($consumer->secret) OAuthUtil::urlencode_rfc3986($consumer->secret)
); );
if ($token) { if ($token) {
array_push($sig, OAuthUtil::urlencodeRFC3986($token->secret)); array_push($sig, OAuthUtil::urlencode_rfc3986($token->secret));
} else { } else {
array_push($sig, ''); array_push($sig, '');
} }
@ -94,7 +98,7 @@ class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {/*{{{*/
// for debug purposes // for debug purposes
$request->base_string = $raw; $request->base_string = $raw;
return OAuthUtil::urlencodeRFC3986($raw); return OAuthUtil::urlencode_rfc3986($raw);
}/*}}}*/ }/*}}}*/
}/*}}}*/ }/*}}}*/
@ -182,7 +186,7 @@ class OAuthRequest {/*{{{*/
*/ */
public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) {/*{{{*/ public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) {/*{{{*/
$scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") ? 'http' : 'https'; $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") ? 'http' : 'https';
@$http_url or $http_url = $scheme . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; @$http_url or $http_url = $scheme . '://' . $_SERVER['HTTP_HOST'] . ':' . $_SERVER['SERVER_PORT'] . $_SERVER['REQUEST_URI'];
@$http_method or $http_method = $_SERVER['REQUEST_METHOD']; @$http_method or $http_method = $_SERVER['REQUEST_METHOD'];
$request_headers = OAuthRequest::get_headers(); $request_headers = OAuthRequest::get_headers();
@ -192,27 +196,23 @@ class OAuthRequest {/*{{{*/
// do this // do this
if ($parameters) { if ($parameters) {
$req = new OAuthRequest($http_method, $http_url, $parameters); $req = new OAuthRequest($http_method, $http_url, $parameters);
} else {
// collect request parameters from query string (GET) and post-data (POST) if appropriate (note: POST vars have priority)
$req_parameters = $_GET;
if ($http_method == "POST" && @strstr($request_headers["Content-Type"], "application/x-www-form-urlencoded") ) {
$req_parameters = array_merge($req_parameters, $_POST);
}
// next check for the auth header, we need to do some extra stuff
// if that is the case, namely suck in the parameters from GET or POST
// so that we can include them in the signature
if (@substr($request_headers['Authorization'], 0, 6) == "OAuth ") {
$header_parameters = OAuthRequest::split_header($request_headers['Authorization']);
$parameters = array_merge($req_parameters, $header_parameters);
$req = new OAuthRequest($http_method, $http_url, $parameters);
} else $req = new OAuthRequest($http_method, $http_url, $req_parameters);
} }
// next check for the auth header, we need to do some extra stuff
// if that is the case, namely suck in the parameters from GET or POST
// so that we can include them in the signature
else if (@substr($request_headers['Authorization'], 0, 5) == "OAuth") {
$header_parameters = OAuthRequest::split_header($request_headers['Authorization']);
if ($http_method == "GET") {
$req_parameters = $_GET;
}
else if ($http_method == "POST") {
$req_parameters = $_POST;
}
$parameters = array_merge($header_parameters, $req_parameters);
$req = new OAuthRequest($http_method, $http_url, $parameters);
}
else if ($http_method == "GET") {
$req = new OAuthRequest($http_method, $http_url, $_GET);
}
else if ($http_method == "POST") {
$req = new OAuthRequest($http_method, $http_url, $_POST);
}
return $req; return $req;
}/*}}}*/ }/*}}}*/
@ -238,7 +238,7 @@ class OAuthRequest {/*{{{*/
}/*}}}*/ }/*}}}*/
public function get_parameter($name) {/*{{{*/ public function get_parameter($name) {/*{{{*/
return $this->parameters[$name]; return isset($this->parameters[$name]) ? $this->parameters[$name] : null;
}/*}}}*/ }/*}}}*/
public function get_parameters() {/*{{{*/ public function get_parameters() {/*{{{*/
@ -267,12 +267,12 @@ class OAuthRequest {/*{{{*/
} }
// Urlencode both keys and values // Urlencode both keys and values
$keys = array_map(array('OAuthUtil', 'urlencodeRFC3986'), array_keys($params)); $keys = OAuthUtil::urlencode_rfc3986(array_keys($params));
$values = array_map(array('OAuthUtil', 'urlencodeRFC3986'), array_values($params)); $values = OAuthUtil::urlencode_rfc3986(array_values($params));
$params = array_combine($keys, $values); $params = array_combine($keys, $values);
// Sort by keys (natsort) // Sort by keys (natsort)
uksort($params, 'strnatcmp'); uksort($params, 'strcmp');
// Generate key=value pairs // Generate key=value pairs
$pairs = array(); $pairs = array();
@ -307,7 +307,7 @@ class OAuthRequest {/*{{{*/
$this->get_signable_parameters() $this->get_signable_parameters()
); );
$parts = array_map(array('OAuthUtil', 'urlencodeRFC3986'), $parts); $parts = OAuthUtil::urlencode_rfc3986($parts);
return implode('&', $parts); return implode('&', $parts);
}/*}}}*/ }/*}}}*/
@ -351,11 +351,21 @@ class OAuthRequest {/*{{{*/
/** /**
* builds the data one would send in a POST request * builds the data one would send in a POST request
*
* TODO(morten.fangel):
* this function might be easily replaced with http_build_query()
* and corrections for rfc3986 compatibility.. but not sure
*/ */
public function to_postdata() {/*{{{*/ public function to_postdata() {/*{{{*/
$total = array(); $total = array();
foreach ($this->parameters as $k => $v) { foreach ($this->parameters as $k => $v) {
$total[] = OAuthUtil::urlencodeRFC3986($k) . "=" . OAuthUtil::urlencodeRFC3986($v); if (is_array($v)) {
foreach ($v as $va) {
$total[] = OAuthUtil::urlencode_rfc3986($k) . "[]=" . OAuthUtil::urlencode_rfc3986($va);
}
} else {
$total[] = OAuthUtil::urlencode_rfc3986($k) . "=" . OAuthUtil::urlencode_rfc3986($v);
}
} }
$out = implode("&", $total); $out = implode("&", $total);
return $out; return $out;
@ -364,12 +374,13 @@ class OAuthRequest {/*{{{*/
/** /**
* builds the Authorization: header * builds the Authorization: header
*/ */
public function to_header($realm="") {/*{{{*/ public function to_header() {/*{{{*/
$out ='"Authorization: OAuth realm="' . $realm . '",'; $out ='Authorization: OAuth realm=""';
$total = array(); $total = array();
foreach ($this->parameters as $k => $v) { foreach ($this->parameters as $k => $v) {
if (substr($k, 0, 5) != "oauth") continue; if (substr($k, 0, 5) != "oauth") continue;
$out .= ',' . OAuthUtil::urlencodeRFC3986($k) . '="' . OAuthUtil::urlencodeRFC3986($v) . '"'; if (is_array($v)) throw new OAuthException('Arrays not supported in headers');
$out .= ',' . OAuthUtil::urlencode_rfc3986($k) . '="' . OAuthUtil::urlencode_rfc3986($v) . '"';
} }
return $out; return $out;
}/*}}}*/ }/*}}}*/
@ -412,24 +423,22 @@ class OAuthRequest {/*{{{*/
* parameters, has to do some unescaping * parameters, has to do some unescaping
*/ */
private static function split_header($header) {/*{{{*/ private static function split_header($header) {/*{{{*/
// remove 'OAuth ' at the start of a header $pattern = '/(([-_a-z]*)=("([^"]*)"|([^,]*)),?)/';
$header = substr($header, 6); $offset = 0;
$params = array();
// error cases: commas in parameter values? while (preg_match($pattern, $header, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) {
$parts = explode(",", $header); $match = $matches[0];
$out = array(); $header_name = $matches[2][0];
foreach ($parts as $param) { $header_content = (isset($matches[5])) ? $matches[5][0] : $matches[4][0];
$param = ltrim($param); $params[$header_name] = OAuthUtil::urldecode_rfc3986( $header_content );
// skip the "realm" param, nobody ever uses it anyway $offset = $match[1] + strlen($match[0]);
if (substr($param, 0, 5) != "oauth") continue;
$param_parts = explode("=", $param);
// rawurldecode() used because urldecode() will turn a "+" in the
// value into a space
$out[$param_parts[0]] = rawurldecode(substr($param_parts[1], 1, -1));
} }
return $out;
if (isset($params['realm'])) {
unset($params['realm']);
}
return $params;
}/*}}}*/ }/*}}}*/
/** /**
@ -506,6 +515,7 @@ class OAuthServer {/*{{{*/
// requires authorized request token // requires authorized request token
$token = $this->get_token($request, $consumer, "request"); $token = $this->get_token($request, $consumer, "request");
$this->check_signature($request, $consumer, $token); $this->check_signature($request, $consumer, $token);
$new_token = $this->data_store->new_access_token($token, $consumer); $new_token = $this->data_store->new_access_token($token, $consumer);
@ -654,11 +664,11 @@ class OAuthDataStore {/*{{{*/
// implement me // implement me
}/*}}}*/ }/*}}}*/
function fetch_request_token($consumer) {/*{{{*/ function new_request_token($consumer) {/*{{{*/
// return a new token attached to this consumer // return a new token attached to this consumer
}/*}}}*/ }/*}}}*/
function fetch_access_token($token, $consumer) {/*{{{*/ function new_access_token($token, $consumer) {/*{{{*/
// return a new access token attached to this consumer // return a new access token attached to this consumer
// for the user associated with this token if the request token // for the user associated with this token if the request token
// is authorized // is authorized
@ -737,17 +747,22 @@ class SimpleOAuthDataStore extends OAuthDataStore {/*{{{*/
}/*}}}*/ }/*}}}*/
class OAuthUtil {/*{{{*/ class OAuthUtil {/*{{{*/
public static function urlencodeRFC3986($string) {/*{{{*/ public static function urlencode_rfc3986($input) {/*{{{*/
return str_replace('+', ' ', if (is_array($input)) {
str_replace('%7E', '~', rawurlencode($string))); return array_map(array('OAuthUtil','urlencode_rfc3986'), $input);
} else if (is_scalar($input)) {
return str_replace('+', ' ',
str_replace('%7E', '~', rawurlencode($input)));
} else {
return '';
}
}/*}}}*/ }/*}}}*/
// This decode function isn't taking into consideration the above // This decode function isn't taking into consideration the above
// modifications to the encoding process. However, this method doesn't // modifications to the encoding process. However, this method doesn't
// seem to be used anywhere so leaving it as is. // seem to be used anywhere so leaving it as is.
public static function urldecodeRFC3986($string) {/*{{{*/ public static function urldecode_rfc3986($string) {/*{{{*/
return rawurldecode($string); return rawurldecode($string);
}/*}}}*/ }/*}}}*/
}/*}}}*/ }/*}}}*/

7
lib/router.php
View File

@ -49,6 +49,8 @@ class Router
{ {
var $m = null; var $m = null;
static $inst = null; static $inst = null;
static $bare = array('requesttoken', 'accesstoken', 'userauthorization',
'postnotice', 'updateprofile', 'finishremotesubscribe');
static function get() static function get()
{ {
@ -118,8 +120,7 @@ class Router
$m->connect('main/remote', array('action' => 'remotesubscribe')); $m->connect('main/remote', array('action' => 'remotesubscribe'));
$m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '[A-Za-z0-9_-]+')); $m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '[A-Za-z0-9_-]+'));
foreach (array('requesttoken', 'accesstoken', 'userauthorization', foreach (Router::$bare as $action) {
'postnotice', 'updateprofile', 'finishremotesubscribe') as $action) {
$m->connect('index.php?action=' . $action, array('action' => $action)); $m->connect('index.php?action=' . $action, array('action' => $action));
} }
@ -277,7 +278,6 @@ class Router
'apiaction' => 'friendships'), 'apiaction' => 'friendships'),
array('method' => 'exists(\.(xml|json|rss|atom))')); array('method' => 'exists(\.(xml|json|rss|atom))'));
// Social graph // Social graph
$m->connect('api/friends/ids/:argument', $m->connect('api/friends/ids/:argument',
@ -352,7 +352,6 @@ class Router
array('action' => 'api', array('action' => 'api',
'apiaction' => 'laconica')); 'apiaction' => 'laconica'));
// search // search
$m->connect('api/search.atom', array('action' => 'twitapisearchatom')); $m->connect('api/search.atom', array('action' => 'twitapisearchatom'));
$m->connect('api/search.json', array('action' => 'twitapisearchjson')); $m->connect('api/search.json', array('action' => 'twitapisearchjson'));

9
lib/util.php
View File

@ -722,12 +722,15 @@ function common_local_url($action, $args=null, $params=null, $fragment=null)
{ {
$r = Router::get(); $r = Router::get();
$path = $r->build($action, $args, $params, $fragment); $path = $r->build($action, $args, $params, $fragment);
if ($path) {
}
if (common_config('site','fancy')) { if (common_config('site','fancy')) {
$url = common_path(mb_substr($path, 1)); $url = common_path(mb_substr($path, 1));
} else { } else {
$url = common_path('index.php'.$path); if (mb_strpos($path, '/index.php') === 0) {
$url = common_path(mb_substr($path, 1));
} else {
$url = common_path('index.php'.$path);
}
} }
return $url; return $url;
} }