From 723b8764d111fd414cf2e37ae06e0b9a29c9dff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 5 Mar 2018 12:19:20 +0100
Subject: [PATCH] Add ETag to NavigationController
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/Controller/NavigationController.php      | 18 +++++++++--
 .../Controller/NavigationControllerTest.php   | 31 +++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/core/Controller/NavigationController.php b/core/Controller/NavigationController.php
index 3521fac3b4..b178cb97cd 100644
--- a/core/Controller/NavigationController.php
+++ b/core/Controller/NavigationController.php
@@ -22,6 +22,7 @@
  */
 namespace OC\Core\Controller;
 
+use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\INavigationManager;
@@ -54,7 +55,14 @@ class NavigationController extends OCSController {
 		if ($absolute) {
 			$navigation = $this->rewriteToAbsoluteUrls($navigation);
 		}
-		return new DataResponse($navigation);
+
+		$etag = md5(json_encode($navigation));
+		if ($this->request->getHeader('If-None-Match') === $etag) {
+			return new DataResponse([], Http::STATUS_NOT_MODIFIED);
+		}
+		$response = new DataResponse($navigation);
+		$response->setEtag($etag);
+		return $response;
 	}
 
 	/**
@@ -69,7 +77,13 @@ class NavigationController extends OCSController {
 		if ($absolute) {
 			$navigation = $this->rewriteToAbsoluteUrls($navigation);
 		}
-		return new DataResponse($navigation);
+		$etag = md5(json_encode($navigation));
+		if ($this->request->getHeader('If-None-Match') === $etag) {
+			return new DataResponse([], Http::STATUS_NOT_MODIFIED);
+		}
+		$response = new DataResponse($navigation);
+		$response->setEtag($etag);
+		return $response;
 	}
 
 	/**
diff --git a/tests/Core/Controller/NavigationControllerTest.php b/tests/Core/Controller/NavigationControllerTest.php
index 1143ed003f..ef4720604f 100644
--- a/tests/Core/Controller/NavigationControllerTest.php
+++ b/tests/Core/Controller/NavigationControllerTest.php
@@ -23,6 +23,7 @@
 namespace Tests\Core\Controller;
 
 use OC\Core\Controller\NavigationController;
+use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\INavigationManager;
 use OCP\IRequest;
@@ -126,4 +127,34 @@ class NavigationControllerTest extends TestCase {
 		}
 	}
 
+	public function testGetAppNavigationEtagMatch() {
+		$navigation = [ ['id' => 'files', 'href' => '/index.php/apps/files', 'icon' => 'icon' ] ];
+		$this->request->expects($this->once())
+			->method('getHeader')
+			->with('If-None-Match')
+			->willReturn(md5(json_encode($navigation)));
+		$this->navigationManager->expects($this->once())
+			->method('getAll')
+			->with('link')
+			->willReturn($navigation);
+			$actual = $this->controller->getAppsNavigation();
+			$this->assertInstanceOf(DataResponse::class, $actual);
+			$this->assertEquals(Http::STATUS_NOT_MODIFIED, $actual->getStatus());
+	}
+
+	public function testGetSettingsNavigationEtagMatch() {
+		$navigation = [ ['id' => 'files', 'href' => '/index.php/apps/files', 'icon' => 'icon' ] ];
+		$this->request->expects($this->once())
+			->method('getHeader')
+			->with('If-None-Match')
+			->willReturn(md5(json_encode($navigation)));
+		$this->navigationManager->expects($this->once())
+			->method('getAll')
+			->with('settings')
+			->willReturn($navigation);
+		$actual = $this->controller->getSettingsNavigation();
+		$this->assertInstanceOf(DataResponse::class, $actual);
+		$this->assertEquals(Http::STATUS_NOT_MODIFIED, $actual->getStatus());
+	}
+
 }