bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

more ssl policy fixes and prevent delivery to soapbox when using local delivery

Browse source
This commit is contained in:
friendica 2012-04-02 21:01:19 -07:00
parent e1de2e3de0
commit f4721955db
3 changed files with 100 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
include/delivery.php
View file

@ -321,6 +321,56 @@ function delivery_run($argv, $argc){
$x[0]['writable'] = 1;
}
$ssl_policy = get_config('system','ssl_policy');
// if contact's ssl policy changed, update our links
$ssl_changed = false;
if($ssl_policy == SSL_POLICY_SELFSIGN && strstr($x[0]['url'],'https:')) {
$ssl_changed = true;
$x[0]['url'] = str_replace('https:','http:',$x[0]['url']);
$x[0]['request'] = str_replace('https:','http:',$x[0]['request']);
$x[0]['notify'] = str_replace('https:','http:',$x[0]['notify']);
$x[0]['poll'] = str_replace('https:','http:',$x[0]['poll']);
$x[0]['confirm'] = str_replace('https:','http:',$x[0]['confirm']);
$x[0]['poco'] = str_replace('https:','http:',$x[0]['poco']);
}
if($ssl_policy == SSL_POLICY_FULL && strstr($x[0]['url'],'http:')) {
$ssl_changed = true;
$x[0]['url'] = str_replace('http:','https:',$x[0]['url']);
$x[0]['request'] = str_replace('http:','https:',$x[0]['request']);
$x[0]['notify'] = str_replace('http:','https:',$x[0]['notify']);
$x[0]['poll'] = str_replace('http:','https:',$x[0]['poll']);
$x[0]['confirm'] = str_replace('http:','https:',$x[0]['confirm']);
$x[0]['poco'] = str_replace('http:','https:',$x[0]['poco']);
}
if($ssl_changed) {
q("update contact set
url = '%s',
request = '%s',
notify = '%s',
poll = '%s',
confirm = '%s',
poco = '%s'
where id = %d limit 1",
dbesc($x[0]['url']),
dbesc($x[0]['request']),
dbesc($x[0]['notify']),
dbesc($x[0]['poll']),
dbesc($x[0]['confirm']),
dbesc($x[0]['poco']),
intval($x[0]['id'])
);
}
// If we are setup as a soapbox we aren't accepting input from this person
if($x[0]['page-flags'] == PAGE_SOAPBOX)
break;
require_once('library/simplepie/simplepie.inc');
logger('mod-delivery: local delivery');
local_delivery($x[0],$atom);

50
include/notifier.php
View file

@ -537,6 +537,56 @@ function notifier_run($argv, $argc){
$x[0]['writable'] = 1;
}
$ssl_policy = get_config('system','ssl_policy');
// if contact's ssl policy changed, update our links
$ssl_changed = false;
if($ssl_policy == SSL_POLICY_SELFSIGN && strstr($x[0]['url'],'https:')) {
$ssl_changed = true;
$x[0]['url'] = str_replace('https:','http:',$x[0]['url']);
$x[0]['request'] = str_replace('https:','http:',$x[0]['request']);
$x[0]['notify'] = str_replace('https:','http:',$x[0]['notify']);
$x[0]['poll'] = str_replace('https:','http:',$x[0]['poll']);
$x[0]['confirm'] = str_replace('https:','http:',$x[0]['confirm']);
$x[0]['poco'] = str_replace('https:','http:',$x[0]['poco']);
}
if($ssl_policy == SSL_POLICY_FULL && strstr($x[0]['url'],'http:')) {
$ssl_changed = true;
$x[0]['url'] = str_replace('http:','https:',$x[0]['url']);
$x[0]['request'] = str_replace('http:','https:',$x[0]['request']);
$x[0]['notify'] = str_replace('http:','https:',$x[0]['notify']);
$x[0]['poll'] = str_replace('http:','https:',$x[0]['poll']);
$x[0]['confirm'] = str_replace('http:','https:',$x[0]['confirm']);
$x[0]['poco'] = str_replace('http:','https:',$x[0]['poco']);
}
if($ssl_changed) {
q("update contact set
url = '%s',
request = '%s',
notify = '%s',
poll = '%s',
confirm = '%s',
poco = '%s'
where id = %d limit 1",
dbesc($x[0]['url']),
dbesc($x[0]['request']),
dbesc($x[0]['notify']),
dbesc($x[0]['poll']),
dbesc($x[0]['confirm']),
dbesc($x[0]['poco']),
intval($x[0]['id'])
);
}
// If we are setup as a soapbox we aren't accepting input from this person
if($x[0]['page-flags'] == PAGE_SOAPBOX)
break;
require_once('library/simplepie/simplepie.inc');
logger('mod-delivery: local delivery');
local_delivery($x[0],$atom);

5
mod/dfrn_notify.php
View file

@ -106,7 +106,6 @@ function dfrn_notify_post(&$a) {
if($ssl_policy == 'self' && strstr($importer['url'],'https:')) {
$ssl_changed = true;
$importer['url'] = str_replace('https:','http:',$importer['url']);
$importer['nurl'] = normalise_link($importer['url']);
$importer['request'] = str_replace('https:','http:',$importer['request']);
$importer['notify'] = str_replace('https:','http:',$importer['notify']);
$importer['poll'] = str_replace('https:','http:',$importer['poll']);
@ -117,7 +116,6 @@ function dfrn_notify_post(&$a) {
if($ssl_policy == 'full' && strstr($importer['url'],'http:')) {
$ssl_changed = true;
$importer['url'] = str_replace('http:','https:',$importer['url']);
$importer['nurl'] = normalise_link($importer['url']);
$importer['request'] = str_replace('http:','https:',$importer['request']);
$importer['notify'] = str_replace('http:','https:',$importer['notify']);
$importer['poll'] = str_replace('http:','https:',$importer['poll']);
@ -129,9 +127,6 @@ function dfrn_notify_post(&$a) {
q("update contact set
url = '%s',
nurl = '%s',
photo = '%s',
thumb = '%s',
micro = '%s',
request = '%s',
notify = '%s',
poll = '%s',