GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Don't try to replace http with https if https already exists

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-01-14 13:06:37 +01:00
parent 83cb1dfa68
commit bacd49a6a8
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/OStatus/classes/HubSub.php
View File

@ -306,10 +306,13 @@ class HubSub extends Managed_DataObject
if ('http' === parse_url($this->callback, PHP_URL_SCHEME)) {
// Test if the feed callback for this node has migrated to HTTPS
$httpscallback = preg_replace('/^http/', 'https', $this->callback, 1);
if ($httpscallback === $this->callback) {
throw new ServerException('Trying to preg_replace http to https on '._ve($this->callback).' failed and resulted in an identical string: '._ve($httpscallback).'.');
$alreadyreplaced = self::getByHashKey(self::hashkey($this->getTopic(), $httpscallback));
if ($alreadyreplaced instanceof HubSub) {
$this->delete();
throw new AlreadyFulfilledException('The remote side has already established an HTTPS callback, deleting the legacy HTTP entry.');
}
common_debug('PuSH callback to '._ve($this->callback).' for '._ve($this->getTopic()).' testing with HTTPS callback: '._ve($httpscallback));
common_debug('PuSH callback to '._ve($this->callback).' for '._ve($this->getTopic()).' trying HTTPS callback: '._ve($httpscallback));
$response = $request->post($httpscallback, $headers);
if ($response->isOk()) {
$orig = clone($this);

5
plugins/OStatus/lib/huboutqueuehandler.php
View File

@ -44,10 +44,11 @@ class HubOutQueueHandler extends QueueHandler
try {
$sub->push($atom);
} catch (AlreadyFulfilledException $e) {
common_log(LOG_INFO, "Failed PuSH to $sub->callback for $sub->topic (".get_class($e)."): " . $e->getMessage());
} catch (Exception $e) {
$retries--;
$msg = "Failed PuSH to $sub->callback for $sub->topic: " .
$e->getMessage();
$msg = "Failed PuSH to $sub->callback for $sub->topic (".get_class($e)."): " . $e->getMessage();
if ($retries > 0) {
common_log(LOG_INFO, "$msg; scheduling for $retries more tries");