Page MenuHomestyx hydra
Files F207635

No OneTemporary
Actions

View Options

diff --git a/src/applications/notification/client/PhabricatorNotificationClient.php b/src/applications/notification/client/PhabricatorNotificationClient.php
index 85ff2937be..b3367dd54c 100644
--- a/src/applications/notification/client/PhabricatorNotificationClient.php
+++ b/src/applications/notification/client/PhabricatorNotificationClient.php
@@ -1,58 +1,63 @@
<?php
final class PhabricatorNotificationClient {
const EXPECT_VERSION = 7;
public static function getServerStatus() {
$uri = PhabricatorEnv::getEnvConfig('notification.server-uri');
$uri = id(new PhutilURI($uri))
->setPath('/status/')
->setQueryParam('instance', self::getInstance());
+ // We always use HTTP to connect to the server itself: it's simpler and
+ // there's no meaningful security benefit to securing this link today.
+ // Force the protocol to HTTP in case users have set it to something else.
+ $uri->setProtocol('http');
+
list($body) = id(new HTTPSFuture($uri))
->setTimeout(3)
->resolvex();
$status = phutil_json_decode($body);
if (!is_array($status)) {
throw new Exception(
pht(
'Expected JSON response from notification server, received: %s',
$body));
}
return $status;
}
public static function tryToPostMessage(array $data) {
if (!PhabricatorEnv::getEnvConfig('notification.enabled')) {
return;
}
try {
self::postMessage($data);
} catch (Exception $ex) {
// Just ignore any issues here.
phlog($ex);
}
}
private static function postMessage(array $data) {
$server_uri = PhabricatorEnv::getEnvConfig('notification.server-uri');
$server_uri = id(new PhutilURI($server_uri))
->setPath('/')
->setQueryParam('instance', self::getInstance());
id(new HTTPSFuture($server_uri, json_encode($data)))
->setMethod('POST')
->setTimeout(1)
->resolvex();
}
private static function getInstance() {
$client_uri = PhabricatorEnv::getEnvConfig('notification.client-uri');
return id(new PhutilURI($client_uri))->getPath();
}
}

File Metadata

Mime Type
text/x-diff
Expires
Wed, Jul 2, 9:24 PM (22 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
165147
Default Alt Text
(2 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)