summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPrashanth Pai <ppai@redhat.com>2015-08-27 11:36:19 +0530
committerPrashanth Pai <ppai@redhat.com>2016-01-11 20:47:05 -0800
commitac33dc6dbf1f982cf522556aa938ebfb0e6ddded (patch)
treec58c812119ca7cc438e00d500d18a58f111a5437 /tools
parentb67be0d35519e8ebadea26cad4df084cdb301bc7 (diff)
Refactor read_metadata() method
This change: * Simplifies read_metadata() method. * Validates pickle header before attempting to unpickle. This change does NOT fix the security vulnerability itself. That would be sent as a separate change. Change-Id: Id95bd584f3ad00fb075456544495f17f7038f991 Signed-off-by: Prashanth Pai <ppai@redhat.com> Reviewed-by: Thiago da Silva <tdasilva@redhat.com> Tested-by: Thiago da Silva <tdasilva@redhat.com> Reviewed-on: http://review.gluster.org/13220
Diffstat (limited to 'tools')
-rwxr-xr-xtools/object_expirer_functional.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/object_expirer_functional.sh b/tools/object_expirer_functional.sh
index 2578619..40f2f81 100755
--- a/tools/object_expirer_functional.sh
+++ b/tools/object_expirer_functional.sh
@@ -31,6 +31,7 @@ cleanup()
sudo rm -rf /mnt/gluster-object/test{,2}/* > /dev/null 2>&1
sudo rm -rf /mnt/gluster-object/gsexpiring/* > /dev/null 2>&1
sudo setfattr -x user.swift.metadata /mnt/gluster-object/test{,2} > /dev/null 2>&1
+ sudo setfattr -x user.swift.metadata /mnt/gluster-object/gsexpiring > /dev/null 2>&1
}
quit()