Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402582 )
Change subject: Upgrade to 1.9
......................................................................
Upgrade to 1.9
Bug: T169144
Change-Id: I1cb3d133ca3522dd64e52c6b9cb2764863ffc0ad
---
M debian/changelog
M setup.py
M wikimedia_thumbor/handler/images/images.py
3 files changed, 24 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
index 59b5c76..31a1f0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-thumbor-wikimedia (1.9-1) jessie-wikimedia; urgency=low
+
+ * New upstream release
+
+ -- Gilles Dubuc <gil...@wikimedia.org> Sat, 6 Jan 2018 13:02:00 +0000
+
python-thumbor-wikimedia (1.8-1) jessie-wikimedia; urgency=low
* New upstream release
diff --git a/setup.py b/setup.py
index 365555d..5d9cac0 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
setup(
name='wikimedia_thumbor',
- version='1.8',
+ version='1.9',
url='https://phabricator.wikimedia.org/diffusion/THMBREXT/',
license='MIT',
author='Gilles Dubuc, Wikimedia Foundation',
diff --git a/wikimedia_thumbor/handler/images/images.py
b/wikimedia_thumbor/handler/images/images.py
index 3625506..9094809 100644
--- a/wikimedia_thumbor/handler/images/images.py
+++ b/wikimedia_thumbor/handler/images/images.py
@@ -197,6 +197,11 @@
if hasattr(self.context.config, 'SWIFT_SHARDED_CONTAINERS'):
sharded_containers = self.context.config.SWIFT_SHARDED_CONTAINERS
+ private_containers = []
+
+ if hasattr(self.context.config, 'SWIFT_PRIVATE_CONTAINERS'):
+ private_containers = self.context.config.SWIFT_PRIVATE_CONTAINERS
+
projlang = '-'.join((kw['project'], kw['language']))
original_container = projlang + '-local-public'
thumbnail_container = projlang + '-local-thumb'
@@ -221,6 +226,8 @@
hashed = md5.new(hashed_name).hexdigest()
original_shard1 = hashed[:1]
original_shard2 = hashed[:2]
+
+ self.context.private = original_container in private_containers
if original_container in sharded_containers:
original_container += '.' + original_shard2
@@ -374,6 +381,16 @@
)
return
+ if self.context.private:
+ received_secret = self.request.headers.get('X-Swift-Secret', False)
+ secret = self.context.config.get('SWIFT_PRIVATE_SECRET', False)
+ if not secret or not received_secret or received_secret != secret:
+ self._error(
+ 401,
+ 'Unauthorized access to private Swift container'
+ )
+ return
+
xkey = self.set_headers(translated_kw)
mc = self.failure_memcache()
--
To view, visit https://gerrit.wikimedia.org/r/402582
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1cb3d133ca3522dd64e52c6b9cb2764863ffc0ad
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/python-thumbor-wikimedia
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
