some major cleanup of api authentication stuff - still needs much more and this still may not solve #206
This commit is contained in:
redmatrix
parent
7fa944ed95
commit
8389d8677d
@ -2298,12 +2298,11 @@ require_once('include/api_auth.php');
|
||||
api_register_func('api/direct_messages','api_direct_messages_inbox',true);
|
||||
|
||||
|
||||
|
||||
function api_oauth_request_token(&$a, $type){
|
||||
try{
|
||||
$oauth = new FKOAuth1();
|
||||
$oauth = new ZotOAuth1();
|
||||
$req = OAuthRequest::from_request();
|
||||
logger('Req: ' . var_export($req,true));
|
||||
logger('Req: ' . var_export($req,true),LOGGER_DATA);
|
||||
$r = $oauth->fetch_request_token($req);
|
||||
}catch(Exception $e){
|
||||
logger('oauth_exception: ' . print_r($e->getMessage(),true));
|
||||
@ -2313,9 +2312,10 @@ logger('Req: ' . var_export($req,true));
|
||||
echo $r;
|
||||
killme();
|
||||
}
|
||||
|
||||
function api_oauth_access_token(&$a, $type){
|
||||
try{
|
||||
$oauth = new FKOAuth1();
|
||||
$oauth = new ZotOAuth1();
|
||||
$req = OAuthRequest::from_request();
|
||||
$r = $oauth->fetch_access_token($req);
|
||||
}catch(Exception $e){
|
||||
|
||||
@ -1,16 +1,18 @@
|
||||
<?php /** @file */
|
||||
|
||||
require_once('include/oauth.php');
|
||||
|
||||
|
||||
/**
|
||||
* Simple HTTP Login
|
||||
* API Login via basic-auth or OAuth
|
||||
*/
|
||||
|
||||
function api_login(&$a){
|
||||
|
||||
$record = null;
|
||||
|
||||
require_once('include/oauth.php');
|
||||
|
||||
// login with oauth
|
||||
try {
|
||||
$oauth = new FKOAuth1();
|
||||
$oauth = new ZotOAuth1();
|
||||
$req = OAuthRequest::from_request();
|
||||
|
||||
list($consumer,$token) = $oauth->verify_request($req);
|
||||
@ -23,16 +25,14 @@ function api_login(&$a){
|
||||
call_hooks('logged_in', $a->user);
|
||||
return;
|
||||
}
|
||||
echo __file__.__line__.__function__."<pre>";
|
||||
// var_dump($consumer, $token);
|
||||
killme();
|
||||
}
|
||||
catch(Exception $e) {
|
||||
logger(__file__.__line__.__function__."\n".$e);
|
||||
}
|
||||
|
||||
|
||||
// workaround for HTTP-auth in CGI mode
|
||||
// workarounds for HTTP-auth in CGI mode
|
||||
|
||||
if(x($_SERVER,'REDIRECT_REMOTE_USER')) {
|
||||
$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"],6)) ;
|
||||
if(strlen($userpass)) {
|
||||
@ -51,43 +51,43 @@ function api_login(&$a){
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!isset($_SERVER['PHP_AUTH_USER'])) {
|
||||
logger('API_login: ' . print_r($_SERVER,true), LOGGER_DEBUG);
|
||||
retry_basic_auth();
|
||||
}
|
||||
|
||||
// process normal login request
|
||||
require_once('include/auth.php');
|
||||
$channel_login = 0;
|
||||
$record = account_verify_password($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']);
|
||||
if(! $record) {
|
||||
$r = q("select * from channel where channel_address = '%s' limit 1",
|
||||
require_once('include/security.php');
|
||||
|
||||
// process normal login request
|
||||
|
||||
if(isset($_SERVER['PHP_AUTH_USER'])) {
|
||||
$channel_login = 0;
|
||||
$record = account_verify_password($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']);
|
||||
if(! $record) {
|
||||
$r = q("select * from channel left join account on account.account_id = channel.channel_account_id
|
||||
where channel.channel_address = '%s' limit 1",
|
||||
dbesc($_SERVER['PHP_AUTH_USER'])
|
||||
);
|
||||
if ($r) {
|
||||
$x = q("select * from account where account_id = %d limit 1",
|
||||
intval($r[0]['channel_account_id'])
|
||||
);
|
||||
if ($x) {
|
||||
$record = account_verify_password($x[0]['account_email'],$_SERVER['PHP_AUTH_PW']);
|
||||
$record = account_verify_password($r[0]['account_email'],$_SERVER['PHP_AUTH_PW']);
|
||||
if($record)
|
||||
$channel_login = $r[0]['channel_id'];
|
||||
}
|
||||
}
|
||||
if(! $record) {
|
||||
logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
|
||||
retry_basic_auth();
|
||||
}
|
||||
}
|
||||
|
||||
require_once('include/security.php');
|
||||
authenticate_success($record);
|
||||
if($record) {
|
||||
authenticate_success($record);
|
||||
|
||||
if($channel_login)
|
||||
change_channel($channel_login);
|
||||
if($channel_login)
|
||||
change_channel($channel_login);
|
||||
|
||||
$_SESSION['allow_api'] = true;
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
$_SERVER['PHP_AUTH_PW'] = '*****';
|
||||
logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
|
||||
log_failed_login('API login failure');
|
||||
retry_basic_auth();
|
||||
}
|
||||
|
||||
$_SESSION['allow_api'] = true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
<?php /** @file */
|
||||
|
||||
/**
|
||||
* OAuth server
|
||||
* Based on oauth2-php <http://code.google.com/p/oauth2-php/>
|
||||
@ -9,16 +10,17 @@ define('REQUEST_TOKEN_DURATION', 300);
|
||||
define('ACCESS_TOKEN_DURATION', 31536000);
|
||||
|
||||
require_once("library/OAuth1.php");
|
||||
require_once("library/oauth2-php/lib/OAuth2.inc");
|
||||
|
||||
class FKOAuthDataStore extends OAuthDataStore {
|
||||
function gen_token(){
|
||||
//require_once("library/oauth2-php/lib/OAuth2.inc");
|
||||
|
||||
class ZotOAuthDataStore extends OAuthDataStore {
|
||||
|
||||
function gen_token(){
|
||||
return md5(base64_encode(pack('N6', mt_rand(), mt_rand(), mt_rand(), mt_rand(), mt_rand(), uniqid())));
|
||||
}
|
||||
}
|
||||
|
||||
function lookup_consumer($consumer_key) {
|
||||
logger(__function__.":".$consumer_key);
|
||||
// echo "<pre>"; var_dump($consumer_key); killme();
|
||||
function lookup_consumer($consumer_key) {
|
||||
logger('consumer_key: ' . $consumer_key, LOGGER_DEBUG);
|
||||
|
||||
$r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id = '%s'",
|
||||
dbesc($consumer_key)
|
||||
@ -29,10 +31,11 @@ class FKOAuthDataStore extends OAuthDataStore {
|
||||
return new OAuthConsumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function lookup_token($consumer, $token_type, $token) {
|
||||
logger(__function__.":".$consumer.", ". $token_type.", ".$token);
|
||||
function lookup_token($consumer, $token_type, $token) {
|
||||
|
||||
logger(__function__.":".$consumer.", ". $token_type.", ".$token, LOGGER_DEBUG);
|
||||
|
||||
$r = q("SELECT id, secret, scope, expires, uid FROM tokens WHERE client_id = '%s' AND scope = '%s' AND id = '%s'",
|
||||
dbesc($consumer->key),
|
||||
@ -48,10 +51,9 @@ class FKOAuthDataStore extends OAuthDataStore {
|
||||
return $ot;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function lookup_nonce($consumer, $token, $nonce, $timestamp) {
|
||||
// echo __file__.":".__line__."<pre>"; var_dump($consumer,$key); killme();
|
||||
function lookup_nonce($consumer, $token, $nonce, $timestamp) {
|
||||
|
||||
$r = q("SELECT id, secret FROM tokens WHERE client_id = '%s' AND id = '%s' AND expires = %d",
|
||||
dbesc($consumer->key),
|
||||
@ -62,10 +64,12 @@ class FKOAuthDataStore extends OAuthDataStore {
|
||||
if (count($r))
|
||||
return new OAuthToken($r[0]['id'],$r[0]['secret']);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function new_request_token($consumer, $callback = null) {
|
||||
|
||||
logger(__function__.":".$consumer.", ". $callback, LOGGER_DEBUG);
|
||||
|
||||
function new_request_token($consumer, $callback = null) {
|
||||
logger(__function__.":".$consumer.", ". $callback);
|
||||
$key = $this->gen_token();
|
||||
$sec = $this->gen_token();
|
||||
|
||||
@ -82,29 +86,31 @@ class FKOAuthDataStore extends OAuthDataStore {
|
||||
'request',
|
||||
time()+intval(REQUEST_TOKEN_DURATION));
|
||||
|
||||
if (!$r) return null;
|
||||
if(! $r)
|
||||
return null;
|
||||
return new OAuthToken($key,$sec);
|
||||
}
|
||||
}
|
||||
|
||||
function new_access_token($token, $consumer, $verifier = null) {
|
||||
logger(__function__.":".$token.", ". $consumer.", ". $verifier);
|
||||
function new_access_token($token, $consumer, $verifier = null) {
|
||||
|
||||
logger(__function__.":".$token.", ". $consumer.", ". $verifier, LOGGER_DEBUG);
|
||||
|
||||
// return a new access token attached to this consumer
|
||||
// for the user associated with this token if the request token
|
||||
// is authorized
|
||||
// should also invalidate the request token
|
||||
|
||||
$ret=Null;
|
||||
|
||||
// get user for this verifier
|
||||
$uverifier = get_config("oauth", $verifier);
|
||||
logger(__function__.":".$verifier.",".$uverifier);
|
||||
if (is_null($verifier) || ($uverifier!==false)){
|
||||
// return a new access token attached to this consumer
|
||||
// for the user associated with this token if the request token
|
||||
// is authorized
|
||||
// should also invalidate the request token
|
||||
|
||||
$ret=Null;
|
||||
|
||||
// get user for this verifier
|
||||
$uverifier = get_config("oauth", $verifier);
|
||||
logger(__function__.":".$verifier.",".$uverifier, LOGGER_DEBUG);
|
||||
if (is_null($verifier) || ($uverifier!==false)) {
|
||||
|
||||
$key = $this->gen_token();
|
||||
$sec = $this->gen_token();
|
||||
$key = $this->gen_token();
|
||||
$sec = $this->gen_token();
|
||||
|
||||
$r = q("INSERT INTO tokens (id, secret, client_id, scope, expires, uid) VALUES ('%s','%s','%s','%s', %d, %d)",
|
||||
$r = q("INSERT INTO tokens (id, secret, client_id, scope, expires, uid) VALUES ('%s','%s','%s','%s', %d, %d)",
|
||||
dbesc($key),
|
||||
dbesc($sec),
|
||||
dbesc($consumer->key),
|
||||
@ -112,81 +118,70 @@ class FKOAuthDataStore extends OAuthDataStore {
|
||||
time()+intval(ACCESS_TOKEN_DURATION),
|
||||
intval($uverifier));
|
||||
|
||||
if ($r)
|
||||
$ret = new OAuthToken($key,$sec);
|
||||
}
|
||||
if ($r)
|
||||
$ret = new OAuthToken($key,$sec);
|
||||
}
|
||||
|
||||
|
||||
q("DELETE FROM tokens WHERE id='%s'", $token->key);
|
||||
q("DELETE FROM tokens WHERE id='%s'", $token->key);
|
||||
|
||||
|
||||
if (!is_null($ret) && $uverifier!==false){
|
||||
del_config("oauth", $verifier);
|
||||
/* $apps = get_pconfig($uverifier, "oauth", "apps");
|
||||
if ($apps===false) $apps=array();
|
||||
$apps[] = $consumer->key;
|
||||
set_pconfig($uverifier, "oauth", "apps", $apps);*/
|
||||
if (!is_null($ret) && $uverifier!==false) {
|
||||
del_config("oauth", $verifier);
|
||||
|
||||
// $apps = get_pconfig($uverifier, "oauth", "apps");
|
||||
// if ($apps===false) $apps=array();
|
||||
// $apps[] = $consumer->key;
|
||||
// set_pconfig($uverifier, "oauth", "apps", $apps);
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
return $ret;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
class FKOAuth1 extends OAuthServer {
|
||||
class ZotOAuth1 extends OAuthServer {
|
||||
|
||||
function __construct() {
|
||||
parent::__construct(new FKOAuthDataStore());
|
||||
parent::__construct(new ZotOAuthDataStore());
|
||||
$this->add_signature_method(new OAuthSignatureMethod_PLAINTEXT());
|
||||
$this->add_signature_method(new OAuthSignatureMethod_HMAC_SHA1());
|
||||
}
|
||||
|
||||
function loginUser($uid){
|
||||
logger("RedOAuth1::loginUser $uid");
|
||||
$a = get_app();
|
||||
|
||||
logger("ZotOAuth1::loginUser $uid");
|
||||
|
||||
$r = q("SELECT * FROM channel WHERE channel_id = %d LIMIT 1",
|
||||
intval($uid)
|
||||
);
|
||||
if(count($r)){
|
||||
$record = $r[0];
|
||||
} else {
|
||||
logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
|
||||
header('HTTP/1.0 401 Unauthorized');
|
||||
die('This api requires login');
|
||||
logger('ZotOAuth1::loginUser failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
|
||||
header('HTTP/1.0 401 Unauthorized');
|
||||
echo('This api requires login');
|
||||
killme();
|
||||
}
|
||||
|
||||
$_SESSION['uid'] = $record['channel_id'];
|
||||
$_SESSION['theme'] = $record['channel_theme'];
|
||||
$_SESSION['account_id'] = $record['channel_account_id'];
|
||||
$_SESSION['mobile_theme'] = get_pconfig($record['channel_id'], 'system', 'mobile_theme');
|
||||
$_SESSION['authenticated'] = 1;
|
||||
$_SESSION['my_url'] = $a->get_baseurl() . '/channel/' . $record['channel_address'];
|
||||
$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
|
||||
$_SESSION['allow_api'] = true;
|
||||
|
||||
$x = q("select * from account where account_id = %d limit 1",
|
||||
intval($record['channel_account_id'])
|
||||
);
|
||||
if($x)
|
||||
$a->account = $x[0];
|
||||
|
||||
change_channel($record['channel_id']);
|
||||
|
||||
$a->channel = $record;
|
||||
|
||||
if(strlen($a->channel['channel_timezone'])) {
|
||||
date_default_timezone_set($a->channel['channel_timezone']);
|
||||
if($x) {
|
||||
require_once('include/security.php');
|
||||
authenticate_success($x[0],true,false,true,true);
|
||||
$_SESSION['allow_api'] = true;
|
||||
}
|
||||
|
||||
// q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
|
||||
// dbesc(datetime_convert()),
|
||||
// intval($_SESSION['uid'])
|
||||
// );
|
||||
//
|
||||
// call_hooks('logged_in', $a->user);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
|
||||
not yet used
|
||||
|
||||
class FKOAuth2 extends OAuth2 {
|
||||
|
||||
private function db_secret($client_secret){
|
||||
|
||||
Reference in New Issue
Block a user