Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unquote s3 key names. Closes #13.

Browse Source
This commit is contained in:
Steve Pulec 2013-04-13 19:00:37 -04:00
parent 8fe0c91853
commit 98d7a50790
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
moto/s3/models.py
View File

@ -2,6 +2,7 @@ import datetime
import md5 import md5
from moto.core import BaseBackend from moto.core import BaseBackend
from .utils import clean_key_name
class FakeKey(object): class FakeKey(object):
@ -72,6 +73,8 @@ class S3Backend(BaseBackend):
return None return None
def set_key(self, bucket_name, key_name, value): def set_key(self, bucket_name, key_name, value):
key_name = clean_key_name(key_name)
bucket = self.buckets[bucket_name] bucket = self.buckets[bucket_name]
new_key = FakeKey(name=key_name, value=value) new_key = FakeKey(name=key_name, value=value)
bucket.keys[key_name] = new_key bucket.keys[key_name] = new_key
@ -79,6 +82,7 @@ class S3Backend(BaseBackend):
return new_key return new_key
def get_key(self, bucket_name, key_name): def get_key(self, bucket_name, key_name):
key_name = clean_key_name(key_name)
bucket = self.get_bucket(bucket_name) bucket = self.get_bucket(bucket_name)
if bucket: if bucket:
return bucket.keys.get(key_name) return bucket.keys.get(key_name)
@ -107,10 +111,13 @@ class S3Backend(BaseBackend):
return key_results, folder_results return key_results, folder_results
def delete_key(self, bucket_name, key_name): def delete_key(self, bucket_name, key_name):
key_name = clean_key_name(key_name)
bucket = self.buckets[bucket_name] bucket = self.buckets[bucket_name]
return bucket.keys.pop(key_name) return bucket.keys.pop(key_name)
def copy_key(self, src_bucket_name, src_key_name, dest_bucket_name, dest_key_name): def copy_key(self, src_bucket_name, src_key_name, dest_bucket_name, dest_key_name):
src_key_name = clean_key_name(src_key_name)
dest_key_name = clean_key_name(dest_key_name)
src_bucket = self.buckets[src_bucket_name] src_bucket = self.buckets[src_bucket_name]
dest_bucket = self.buckets[dest_bucket_name] dest_bucket = self.buckets[dest_bucket_name]
dest_bucket.keys[dest_key_name] = src_bucket.keys[src_key_name] dest_bucket.keys[dest_key_name] = src_bucket.keys[src_key_name]

5
moto/s3/utils.py
View File

@ -1,4 +1,5 @@
import re import re
import urllib2
import urlparse import urlparse
bucket_name_regex = re.compile("(.+).s3.amazonaws.com") bucket_name_regex = re.compile("(.+).s3.amazonaws.com")
@ -21,3 +22,7 @@ def bucket_name_from_hostname(hostname):
else: else:
# No subdomain found. # No subdomain found.
return None return None
def clean_key_name(key_name):
return urllib2.unquote(key_name)

13
tests/test_s3/test_s3.py
View File

@ -205,3 +205,16 @@ def test_bucket_name_with_dot():
k = Key(bucket, 'somekey') k = Key(bucket, 'somekey')
k.set_contents_from_string('somedata') k.set_contents_from_string('somedata')
@mock_s3
def test_key_with_special_characters():
conn = boto.connect_s3()
bucket = conn.create_bucket('test_bucket_name')
key = Key(bucket, 'test_list_keys_2/x?y')
key.set_contents_from_string('value1')
key_list = bucket.list('test_list_keys_2/', '/')
keys = [x for x in key_list]
keys[0].name.should.equal("test_list_keys_2/x?y")