RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #79 from TheSerapher/api-auth

Browse Source 
Properly abort API calls if api_key is invalid
This commit is contained in:
Sebastian Grewe 2013-05-29 03:43:22 -07:00
commit 7e56f484e5
10 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
public/include/classes/user.class.php
View File

@ -232,10 +232,13 @@ class User {
**/
public function checkApiKey($key) {
$this->debug->append("STA " . __METHOD__, 4);
$stmt = $this->mysqli->prepare("SELECT api_key FROM $this->table WHERE api_key = ?");
if ($this->checkStmt($stmt) && $stmt->bind_param("s", $key) && $stmt->execute() && $stmt->bind_result($api_key) && $stmt->fetch())
return $key === $api_key;
return false;
$stmt = $this->mysqli->prepare("SELECT api_key, id FROM $this->table WHERE api_key = ? LIMIT 1");
if ($this->checkStmt($stmt) && $stmt->bind_param("s", $key) && $stmt->execute() && $stmt->bind_result($api_key, $id) && $stmt->fetch()) {
if ($api_key === $key)
return $id;
}
header("HTTP/1.1 401 Unauthorized");
die('Access denied');
}
private function checkUserPassword($username, $password) {
@ -326,12 +329,12 @@ class User {
$stmt = $this->mysqli->prepare("
INSERT INTO $this->table (username, pass, email, pin, api_key)
VALUES (?, ?, ?, ?, ?)
");
");
} else {
$stmt = $this->mysqli->prepare("
INSERT INTO $this->table (username, pass, email, pin, api_key, admin)
VALUES (?, ?, ?, ?, ?, 1)
");
");
}
if ($this->checkStmt($stmt)) {
$stmt->bind_param('sssss', $username, hash("sha256", $password1.$this->salt), $email1, hash("sha256", $pin.$this->salt), $apikey);
@ -393,14 +396,14 @@ class User {
$headers .= "MIME-Version: 1.0\n";
$headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n";
if (mail($email,
$smarty->fetch('templates/mail/subject.tpl'),
$smarty->fetch('templates/mail/body.tpl'),
$headers)) {
return true;
} else {
$this->setErrorMessage("Unable to send mail to your address");
return false;
}
$smarty->fetch('templates/mail/subject.tpl'),
$smarty->fetch('templates/mail/body.tpl'),
$headers)) {
return true;
} else {
$this->setErrorMessage("Unable to send mail to your address");
return false;
}
return false;
}
}

2
public/include/pages/api.inc.php
View File

@ -5,7 +5,7 @@ if (!defined('SECURITY'))
die('Hacking attempt');
// Check for valid API key
$user->checkApiKey($_REQUEST['api_key']);
$id = $user->checkApiKey($_REQUEST['api_key']);
header('HTTP/1.1 400 Bad Request');
die('400 Bad Request');

2
public/include/pages/api/getblockcount.inc.php
View File

@ -5,7 +5,7 @@ if (!defined('SECURITY'))
die('Hacking attempt');
// Check user token
$user->checkApiKey($_REQUEST['api_key']);
$id = $user->checkApiKey($_REQUEST['api_key']);
if ($bitcoin->can_connect() === true){
if (!$iBlock = $memcache->get('iBlock')) {

2
public/include/pages/api/getblocksfound.inc.php
View File

@ -5,7 +5,7 @@ if (!defined('SECURITY'))
die('Hacking attempt');
// Check user token
$user->checkApiKey($_REQUEST['api_key']);
$id = $user->checkApiKey($_REQUEST['api_key']);
// Set a sane limit, overwrite with URL parameter
$iLimit = 10;

2
public/include/pages/api/getcurrentworkers.inc.php
View File

@ -5,7 +5,7 @@ if (!defined('SECURITY'))
die('Hacking attempt');
// Check user token
$user->checkApiKey($_REQUEST['api_key']);
$id = $user->checkApiKey($_REQUEST['api_key']);
// Output JSON format
echo json_encode(array('getcurrentworkers' => $worker->getCountAllActiveWorkers()));

2
public/include/pages/api/getdifficulty.inc.php
View File

@ -5,7 +5,7 @@ if (!defined('SECURITY'))
die('Hacking attempt');
// Check user token
$user->checkApiKey($_REQUEST['api_key']);
$id = $user->checkApiKey($_REQUEST['api_key']);
// Fetch data from litecoind
if ($bitcoin->can_connect() === true){

2
public/include/pages/api/getestimatedtime.inc.php
View File

@ -5,7 +5,7 @@ if (!defined('SECURITY'))
die('Hacking attempt');
// Check user token
$user->checkApiKey($_REQUEST['api_key']);
$id = $user->checkApiKey($_REQUEST['api_key']);
// Estimated time to find the next block
$iCurrentPoolHashrate = $statistics->getCurrentHashrate() * 1000;

2
public/include/pages/api/getpoolhashrate.inc.php
View File

@ -5,7 +5,7 @@ if (!defined('SECURITY'))
die('Hacking attempt');
// Check user token
$user->checkApiKey($_REQUEST['api_key']);
$id = $user->checkApiKey($_REQUEST['api_key']);
// Output JSON format
echo json_encode(array('getpoolhashrate' => $statistics->getCurrentHashrate()));

2
public/include/pages/api/getpoolsharerate.inc.php
View File

@ -5,7 +5,7 @@ if (!defined('SECURITY'))
die('Hacking attempt');
// Check user token
$user->checkApiKey($_REQUEST['api_key']);
$id = $user->checkApiKey($_REQUEST['api_key']);
// Output JSON format
echo json_encode(array('getpoolsharerate' => $statistics->getCurrentShareRate()));

2
public/include/pages/api/gettimesincelastblock.inc.php
View File

@ -5,7 +5,7 @@ if (!defined('SECURITY'))
die('Hacking attempt');
// Check user token
$user->checkApiKey($_REQUEST['api_key']);
$id = $user->checkApiKey($_REQUEST['api_key']);
// Fetch our last block found
$aBlocksFoundData = $statistics->getBlocksFound(1);