[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Pass through X-MediaWiki- headers in SwiftFileBackend

[Code Review]

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402474 )

Change subject: Pass through X-MediaWiki- headers in SwiftFileBackend
......................................................................

Pass through X-MediaWiki- headers in SwiftFileBackend

Also simplify sanitizeHdrsStrict logic a bit.

For this to have any effect, Swift needs to be configured
to accept the header. Patches:
* operations/puppet: Ic7a940a0b74f83f2de507ecbaccd09d73180b140
* mediawiki/vagrant: Iea170f59a07c2cf57540a5011a6ae24871cd609b

Bug: T167400
Change-Id: Ic6a9e763f2e1d2e55612ec75cce921a8120f833d
---
M includes/libs/filebackend/SwiftFileBackend.php
1 file changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/74/402474/1

diff --git a/includes/libs/filebackend/SwiftFileBackend.php 
b/includes/libs/filebackend/SwiftFileBackend.php
index 27ce212..4a61783 100644
--- a/includes/libs/filebackend/SwiftFileBackend.php
+++ b/includes/libs/filebackend/SwiftFileBackend.php
@@ -182,13 +182,8 @@
         * @return array Sanitized value of 'headers' field in $params
         */
        protected function sanitizeHdrsStrict( array $params ) {
-               if ( !isset( $params['headers'] ) ) {
-                       return [];
-               }
-
-               $headers = $this->getCustomHeaders( $params['headers'] );
+               $headers = $this->sanitizeHdrs( $params );
                unset( $headers[ 'content-type' ] );
-
                return $headers;
        }
 
@@ -224,6 +219,8 @@
                                continue; // blacklisted
                        } elseif ( preg_match( '/^(x-)?content-/', $name ) ) {
                                $headers[$name] = $value; // allowed
+                       } elseif ( preg_match( '/^x-mediawiki-/', $name ) ) {
+                               $headers[$name] = $value; // allowed
                        } elseif ( preg_match( '/^content-(disposition)/', 
$name ) ) {
                                $headers[$name] = $value; // allowed
                        }

-- 
To view, visit https://gerrit.wikimedia.org/r/402474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6a9e763f2e1d2e55612ec75cce921a8120f833d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits