aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-29 16:55:51 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-29 16:55:51 -0700
commitc5294f994e5a0f52588eb03186e78ede75cb4b42 (patch)
treea813ff6753545c6b38dec09fdd8c35479d98107a
parentb3525b865784ff5d2d5a76b913b8c86d139cc0f3 (diff)
downloadvolse-hubzilla-c5294f994e5a0f52588eb03186e78ede75cb4b42.tar.gz
volse-hubzilla-c5294f994e5a0f52588eb03186e78ede75cb4b42.tar.bz2
volse-hubzilla-c5294f994e5a0f52588eb03186e78ede75cb4b42.zip
check and repair sys channel locations (hublocs) in zot-finger if they are messed up
-rw-r--r--include/zot.php61
1 files changed, 61 insertions, 0 deletions
diff --git a/include/zot.php b/include/zot.php
index ef9f325d0..8e053ed6f 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2392,6 +2392,9 @@ function sync_locations($sender, $arr, $absolute = false) {
}
}
}
+ else {
+ logger('No locations to sync!');
+ }
$ret['change_message'] = $what;
$ret['changed'] = $changed;
@@ -3783,7 +3786,65 @@ function zotinfo($arr) {
$ret['site']['realm'] = get_directory_realm();
}
+
+ check_zotinfo($e,$x,$ret);
+
+
call_hooks('zot_finger',$ret);
return($ret);
}
+
+
+function check_zotinfo($channel,$locations,&$ret) {
+
+ // 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
+ // Force this to be the case if anything is found to be wrong with it.
+
+ // @FIXME ensure that the system channel exists in the first place and has an xchan
+
+ if($channel['channel_system']) {
+ // the sys channel must have a location (hubloc)
+ $valid_location = false;
+ if((count($locations) === 1) && ($locations[0]['primary']) && (! $locations[0]['deleted'])) {
+ $valid_location = true;
+ }
+
+ if((! $locations) || (! $valid_locations)) {
+
+ logger('System channel locations are not valid. Attempting repair.');
+
+ // Don't trust any existing records. Just get rid of them, but only do this
+ // for the sys channel as normal channels will be trickier.
+
+ q("delete from hubloc where hubloc_hash = '%s'",
+ dbesc($channel['channel_hash'])
+ );
+ $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_primary,
+ hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_network )
+ values ( '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s' )",
+ dbesc($channel['channel_guid']),
+ dbesc($channel['channel_guid_sig']),
+ dbesc($channel['channel_hash']),
+ dbesc($channel['channel_address'] . '@' . get_app()->get_hostname()),
+ intval(1),
+ dbesc(z_root()),
+ dbesc(base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey']))),
+ dbesc(get_app()->get_hostname()),
+ dbesc(z_root() . '/post'),
+ dbesc(get_config('system','pubkey')),
+ dbesc('zot')
+ );
+ if($r) {
+ $x = zot_encode_locations($channel);
+ if($x) {
+ $ret['locations'] = $x;
+ }
+ }
+ else {
+ logger('Unable to store sys hub location');
+ }
+ }
+ }
+} \ No newline at end of file