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

improve the sys channel location repair to check key issues and re-installs and/or site moves

Browse Source
This commit is contained in:
redmatrix
2015-09-29 17:21:14 -07:00
parent 8f7b869c08
commit a795f03c48
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/zot.php
View File

@@ -3798,6 +3798,9 @@ function zotinfo($arr) {
function check_zotinfo($channel,$locations,&$ret) { function check_zotinfo($channel,$locations,&$ret) {
// logger('locations: ' . print_r($locations,true),LOGGER_DATA);
// This function will likely expand as we find more things to detect and fix. // This function will likely expand as we find more things to detect and fix.
// 1. Because magic-auth is reliant on it, ensure that the system channel has a valid hubloc // 1. Because magic-auth is reliant on it, ensure that the system channel has a valid hubloc
// Force this to be the case if anything is found to be wrong with it. // Force this to be the case if anything is found to be wrong with it.
@@ -3808,10 +3811,15 @@ function check_zotinfo($channel,$locations,&$ret) {
// the sys channel must have a location (hubloc) // the sys channel must have a location (hubloc)
$valid_location = false; $valid_location = false;
if((count($locations) === 1) && ($locations[0]['primary']) && (! $locations[0]['deleted'])) { if((count($locations) === 1) && ($locations[0]['primary']) && (! $locations[0]['deleted'])) {
$valid_location = true; if((rsa_verify($locations[0]['url'],base64url_decode($locations[0]['url_sig']),$channel['channel_pubkey']))
&& ($locations[0]['sitekey'] === get_config('system','pubkey'))
&& ($locations[0]['url'] === z_root()))
$valid_location = true;
else
logger('sys channel: invalid url signature');
} }
if((! $locations) || (! $valid_locations)) { if((! $locations) || (! $valid_location)) {
logger('System channel locations are not valid. Attempting repair.'); logger('System channel locations are not valid. Attempting repair.');