harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the z6 re-org

Browse Source
This commit is contained in:
zotlabs 2018-02-21 20:59:30 -08:00
parent fef3155e6a
commit 2d69b419ff
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Zot/Verify.php → Zotlabs/Lib/Verify.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Zotlabs\Zot; namespace Zotlabs\Lib;
class Verify { class Verify {

2
Zotlabs/Module/Magic.php
View File

@ -166,7 +166,7 @@ class Magic extends \Zotlabs\Web\Controller {
$token = random_string(); $token = random_string();
\Zotlabs\Zot\Verify::create('auth',$channel['channel_id'],$token,$x[0]['hubloc_url']); \Zotlabs\Lib\Verify::create('auth',$channel['channel_id'],$token,$x[0]['hubloc_url']);
$target_url = $x[0]['hubloc_callback'] . '/?f=&auth=' . urlencode(channel_reddress($channel)) $target_url = $x[0]['hubloc_callback'] . '/?f=&auth=' . urlencode(channel_reddress($channel))
. '&sec=' . $token . '&dest=' . urlencode($dest) . '&version=' . ZOT_REVISION; . '&sec=' . $token . '&dest=' . urlencode($dest) . '&version=' . ZOT_REVISION;

2
Zotlabs/Module/Owa.php
View File

@ -42,7 +42,7 @@ class Owa extends \Zotlabs\Web\Controller {
logger('OWA success: ' . $hubloc['hubloc_addr'],LOGGER_DATA); logger('OWA success: ' . $hubloc['hubloc_addr'],LOGGER_DATA);
$ret['success'] = true; $ret['success'] = true;
$token = random_string(32); $token = random_string(32);
\Zotlabs\Zot\Verify::create('owt',0,$token,$hubloc['hubloc_addr']); \Zotlabs\Lib\Verify::create('owt',0,$token,$hubloc['hubloc_addr']);
$result = ''; $result = '';
openssl_public_encrypt($token,$result,$hubloc['xchan_pubkey']); openssl_public_encrypt($token,$result,$hubloc['xchan_pubkey']);
$ret['encrypted_token'] = base64url_encode($result); $ret['encrypted_token'] = base64url_encode($result);

4
include/zid.php
View File

@ -265,9 +265,9 @@ function red_zrlify_img_callback($matches) {
*/ */
function owt_init($token) { function owt_init($token) {
\Zotlabs\Zot\Verify::purge('owt', '3 MINUTE'); \Zotlabs\Lib\Verify::purge('owt', '3 MINUTE');
$ob_hash = \Zotlabs\Zot\Verify::get_meta('owt', 0, $token); $ob_hash = \Zotlabs\Lib\Verify::get_meta('owt', 0, $token);
if($ob_hash === false) { if($ob_hash === false) {
return; return;

4
include/zot.php
View File

@ -4913,7 +4913,7 @@ function zot_reply_auth_check($data,$encrypted_packet) {
* the web server. We should probably convert this to webserver time rather than DB time so * the web server. We should probably convert this to webserver time rather than DB time so
* that the different clocks won't affect it and allow us to keep the time short. * that the different clocks won't affect it and allow us to keep the time short.
*/ */
Zotlabs\Zot\Verify::purge('auth', '30 MINUTE'); Zotlabs\Lib\Verify::purge('auth', '30 MINUTE');
$y = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1", $y = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1",
dbesc($sender_hash) dbesc($sender_hash)
@ -4954,7 +4954,7 @@ function zot_reply_auth_check($data,$encrypted_packet) {
// This additionally checks for forged sites since we already stored the expected result in meta // This additionally checks for forged sites since we already stored the expected result in meta
// and we've already verified that this is them via zot_gethub() and that their key signed our token // and we've already verified that this is them via zot_gethub() and that their key signed our token
$z = Zotlabs\Zot\Verify::match('auth',$c[0]['channel_id'],$data['secret'],$data['sender']['url']); $z = Zotlabs\Lib\Verify::match('auth',$c[0]['channel_id'],$data['secret'],$data['sender']['url']);
if (! $z) { if (! $z) {
logger('mod_zot: auth_check: verification key not found.'); logger('mod_zot: auth_check: verification key not found.');
$ret['message'] .= 'verification key not found' . EOL; $ret['message'] .= 'verification key not found' . EOL;