Merge pull request #3076 from nextcloud/backport/3042/stable27

nextcloud · Jul 21, 2023 · ee7a112 · ee7a112
2 parents 263a457 + 682724c
commit ee7a112
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -27,6 +27,7 @@
 use OCA\Files_Sharing\Event\ShareLinkAccessedEvent;
 use OCA\Richdocuments\AppConfig;
 use OCA\Richdocuments\Capabilities;
+use OCA\Richdocuments\Db\WopiMapper;
 use OCA\Richdocuments\Listener\BeforeFetchPreviewListener;
 use OCA\Richdocuments\Listener\CSPListener;
 use OCA\Richdocuments\Listener\FileCreatedFromTemplateListener;
@@ -78,6 +79,10 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(BeforePreviewFetchedEvent::class, BeforeFetchPreviewListener::class);
 		$context->registerEventListener(RenderReferenceEvent::class, ReferenceListener::class);
 		$context->registerReferenceProvider(OfficeTargetReferenceProvider::class);
+		$context->registerSensitiveMethods(WopiMapper::class, [
+			'getPathForToken',
+			'getWopiForToken',
+		]);
 	}
 
 	public function boot(IBootContext $context): void {

diff --git a/lib/Db/WopiMapper.php b/lib/Db/WopiMapper.php
@@ -122,7 +122,10 @@ public function generateInitiatorToken($uid, $remoteServer) {
 	 * @throws ExpiredTokenException
 	 * @throws UnknownTokenException
 	 */
-	public function getPathForToken($token) {
+	public function getPathForToken(
+		#[\SensitiveParameter]
+		$token
+	): Wopi {
 		return $this->getWopiForToken($token);
 	}
 
@@ -136,7 +139,10 @@ public function getPathForToken($token) {
 	 * @throws UnknownTokenException
 	 * @throws ExpiredTokenException
 	 */
-	public function getWopiForToken($token) {
+	public function getWopiForToken(
+		#[\SensitiveParameter]
+		string $token
+	): Wopi {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from('richdocuments_wopi')

diff --git a/tests/stub.phpstub b/tests/stub.phpstub
@@ -89,3 +89,7 @@ namespace Symfony\Component\HttpFoundation {
 		public static function checkIp(?string $requestIp, $ips) {}
 	}
 }
+
+#[\Attribute(Attribute::TARGET_PARAMETER)]
+class SensitiveParameter {
+}