diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-03-07 12:55:09 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-03-07 12:55:09 -0800 |
| commit | 1179ecd13d68e76d74ad94e2d3ca22d9681eeffe (patch) | |
| tree | e0517dbd0df004f531adfa6f411c2087b5bd0190 /classes | |
| parent | 22742c3b72a02c29eef0e678abd839e378a783c4 (diff) | |
Fix nonce usage in OAuth store
The OAuth store was failing on getting a request token, because the
token value was forced to be non-null in the DB. Let this value be
null, and use the correct primary key (consumer, timestamp, nonce).
Drop the reference to token table, and don't ever use it.
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Nonce.php | 9 | ||||
| -rwxr-xr-x | classes/laconica.ini | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/classes/Nonce.php b/classes/Nonce.php index 2c0edfa14..486a65a3c 100644 --- a/classes/Nonce.php +++ b/classes/Nonce.php @@ -4,22 +4,21 @@ */ require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -class Nonce extends Memcached_DataObject +class Nonce extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ public $__table = 'nonce'; // table name public $consumer_key; // varchar(255) primary_key not_null - public $tok; // char(32) primary_key not_null + public $tok; // char(32) public $nonce; // char(32) primary_key not_null - public $ts; // datetime() not_null + public $ts; // datetime() primary_key not_null public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP /* Static get */ - function staticGet($k,$v=null) - { return Memcached_DataObject::staticGet('Nonce',$k,$v); } + function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Nonce',$k,$v); } /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE diff --git a/classes/laconica.ini b/classes/laconica.ini index 5fd2cd1f8..529454d99 100755 --- a/classes/laconica.ini +++ b/classes/laconica.ini @@ -145,7 +145,7 @@ id = N [nonce] consumer_key = 130 -tok = 130 +tok = 2 nonce = 130 ts = 142 created = 142 @@ -153,8 +153,8 @@ modified = 384 [nonce__keys] consumer_key = K -tok = K nonce = K +ts = K [notice] id = 129 |