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

regression in zot site info after zot6 work

Browse Source
This commit is contained in:
zotlabs 2017-10-16 15:20:45 -07:00
parent a33562144b
commit cf7481da53
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/zot.php
View File

@ -4201,8 +4201,7 @@ function zotinfo($arr) {
if($x) if($x)
$ret['locations'] = $x; $ret['locations'] = $x;
$ret['site'] = zot_site_info(); $ret['site'] = zot_site_info($e['xchan_pubkey']);
check_zotinfo($e,$x,$ret); check_zotinfo($e,$x,$ret);
@ -4213,7 +4212,7 @@ function zotinfo($arr) {
} }
function zot_site_info() { function zot_site_info($channel_key = '') {
$signing_key = get_config('system','prvkey'); $signing_key = get_config('system','prvkey');
$sig_method = get_config('system','signature_algorithm','sha256'); $sig_method = get_config('system','signature_algorithm','sha256');
@ -4221,7 +4220,10 @@ function zot_site_info() {
$ret = []; $ret = [];
$ret['site'] = []; $ret['site'] = [];
$ret['site']['url'] = z_root(); $ret['site']['url'] = z_root();
$ret['site']['url_sig'] = base64url_encode(rsa_sign(z_root(),$signing_key,$sig_method)); if($channel_key) {
$ret['site']['url_sig'] = base64url_encode(rsa_sign(z_root(),$channel_key,$sig_method));
}
$ret['site']['url_site_sig'] = base64url_encode(rsa_sign(z_root(),$signing_key,$sig_method));
$ret['site']['post'] = z_root() . '/post'; $ret['site']['post'] = z_root() . '/post';
$ret['site']['openWebAuth'] = z_root() . '/owa'; $ret['site']['openWebAuth'] = z_root() . '/owa';
$ret['site']['authRedirect'] = z_root() . '/magic'; $ret['site']['authRedirect'] = z_root() . '/magic';