Skip to content

Fix handling the response of the proxy #1027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 1 commit into from
Jun 21, 2021
Merged

Fix handling the response of the proxy #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions lib/Push.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,13 +301,19 @@ protected function sendNotificationsToProxies(): void {
'notifications' => $notifications,
],
]);
$status = $response->getStatusCode();
$body = $response->getBody();
$bodyData = json_decode($body, true);
} catch (ClientException $e) {
// Server responded with 4xx (400 Bad Request mostlikely)
$response = $e->getResponse();
$status = $response->getStatusCode();
$body = $response->getBody()->getContents();
$bodyData = json_decode($body, true);
} catch (ServerException $e) {
// Server responded with 5xx
$response = $e->getResponse();
$body = $response->getBody();
$body = $response->getBody()->getContents();
$error = \is_string($body) ? $body : ('no reason given (' . $response->getStatusCode() . ')');

$this->log->debug('Could not send notification to push server [{url}]: {error}', [
Expand All @@ -328,10 +334,6 @@ protected function sendNotificationsToProxies(): void {
continue;
}

$status = $response->getStatusCode();
$body = $response->getBody();
$bodyData = json_decode($body, true);

if (is_array($bodyData) && array_key_exists('unknown', $bodyData) && array_key_exists('failed', $bodyData)) {
if (is_array($bodyData['unknown'])) {
// Proxy returns null when the array is empty
Expand All @@ -347,15 +349,15 @@ protected function sendNotificationsToProxies(): void {
$this->printInfo('Push notification sent successfully');
}
} elseif ($status !== Http::STATUS_OK) {
$error = \is_string($body) && $body && $bodyData === null ? $body : 'no reason given';
$error = $body && $bodyData === null ? $body : 'no reason given';
$this->printInfo('Could not send notification to push server [' . $proxyServer . ']: ' . $error);
$this->log->warning('Could not send notification to push server [{url}]: {error}', [
'error' => $error,
'url' => $proxyServer,
'app' => 'notifications',
]);
} else {
$error = \is_string($body) && $body && $bodyData === null ? $body : 'no reason given';
$error = $body && $bodyData === null ? $body : 'no reason given';
$this->printInfo('Push notification sent but response was not parsable, using an outdated push proxy? [' . $proxyServer . ']: ' . $error);
$this->log->info('Push notification sent but response was not parsable, using an outdated push proxy? [{url}]: {error}', [
'error' => $error,
Expand Down
26 changes: 22 additions & 4 deletions tests/Unit/PushTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
use OCP\UserStatus\IManager as IUserStatusManager;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\StreamInterface;
use Psr\Log\LoggerInterface;

/**
Expand Down Expand Up @@ -524,9 +525,14 @@ public function testPushToDeviceSending($isDebug) {
$response1->expects($this->once())
->method('getStatusCode')
->willReturn(Http::STATUS_BAD_REQUEST);
/** @var StreamInterface|MockObject $body1 */
$body1 = $this->createMock(StreamInterface::class);
$body1->expects($this->once())
->method('getContents')
->willReturn('');
$response1->expects($this->once())
->method('getBody')
->willReturn('');
->willReturn($body1);
$e = $this->createMock(ClientException::class);
$e->method('getResponse')
->willReturn($response1);
Expand All @@ -549,9 +555,14 @@ public function testPushToDeviceSending($isDebug) {

/** @var ResponseInterface|MockObject $response1 */
$response2 = $this->createMock(ResponseInterface::class);
/** @var StreamInterface|MockObject $body2 */
$body2 = $this->createMock(StreamInterface::class);
$body2->expects($this->once())
->method('getContents')
->willReturn('Maintenance');
$response2->expects($this->once())
->method('getBody')
->willReturn('Maintenance');
->willReturn($body2);
$e = $this->createMock(ServerException::class);
$e->method('getResponse')
->willReturn($response2);
Expand All @@ -577,6 +588,8 @@ public function testPushToDeviceSending($isDebug) {
$response3->expects($this->once())
->method('getStatusCode')
->willReturn(Http::STATUS_OK);
/** @var StreamInterface|MockObject $body3 */
$body3 = $this->createMock(StreamInterface::class);
$response3->method('getBody')
->willReturn('');
$client->expects($this->at(3))
Expand All @@ -593,14 +606,19 @@ public function testPushToDeviceSending($isDebug) {
$response4->expects($this->once())
->method('getStatusCode')
->willReturn(Http::STATUS_BAD_REQUEST);
$response4->expects($this->once())
->method('getBody')
/** @var StreamInterface|MockObject $body4 */
$body4 = $this->createMock(StreamInterface::class);
$body4->expects($this->once())
->method('getContents')
->willReturn(json_encode([
'failed' => 1,
'unknown' => [
'123456'
]
]));
$response4->expects($this->once())
->method('getBody')
->willReturn($body4);
$e = $this->createMock(ClientException::class);
$e->method('getResponse')
->willReturn($response4);
Expand Down