OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

okapi r887: fixed oauth nonces handling

Browse Source
This commit is contained in:
following
2013-08-28 13:37:03 +02:00
parent cbcc20876d
commit 6847609902
2 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/okapi/core.php
View File

@@ -814,7 +814,7 @@ class Okapi
{
public static $data_store;
public static $server;
public static $revision = 885; # This gets replaced in automatically deployed packages
public static $revision = 887; # This gets replaced in automatically deployed packages
private static $okapi_vars = null;
/** Get a variable stored in okapi_vars. If variable not found, return $default. */

41
htdocs/okapi/datastore.php
View File

@@ -47,30 +47,25 @@ class OkapiDataStore extends OAuthDataStore
public function lookup_nonce($consumer, $token, $nonce, $timestamp)
{
# First, see if it exists. Note, that old nonces are periodically deleted.
$exists = Db::select_value("
select 1
from okapi_nonces
where
consumer_key = '".mysql_real_escape_string($consumer->key)."'
and `key` = '".mysql_real_escape_string($nonce)."'
and timestamp = '".mysql_real_escape_string($timestamp)."'
");
if ($exists)
try
{
Db::execute("
insert into okapi_nonces (consumer_key, `key`, timestamp)
values (
'".mysql_real_escape_string($consumer->key)."',
'".mysql_real_escape_string($nonce)."',
'".mysql_real_escape_string($timestamp)."'
);
");
return null;
}
catch (\Exception $e)
{
# INSERT failed. Assume this nonce was already used.
# Note, that old nonces are periodically deleted (see cronjobs).
return $nonce;
# It didn't exist. We have to remember it.
Db::execute("
insert into okapi_nonces (consumer_key, `key`, timestamp)
values (
'".mysql_real_escape_string($consumer->key)."',
'".mysql_real_escape_string($nonce)."',
'".mysql_real_escape_string($timestamp)."'
);
");
return null;
}
}
public function new_request_token($consumer, $callback = null)