Skip to content

Prepare path escaping #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Prepare path escaping #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
136c855
test for Connection.prepare_path escaping spaces
jjb Oct 11, 2011
d991d41
Escape reserved characters when generating urls.
jjb Oct 11, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/aws/s3/connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ def connect(options = {})

def prepare_path(path)
path = path.remove_extended unless path.valid_utf8?
URI.escape(path)
chars_to_escape = /[!*'();:@&=+$,\?#\[\]\s]/ # rfc3986, without /, plus space
URI.escape( path, chars_to_escape )
end
end

Expand Down
23 changes: 22 additions & 1 deletion test/connection_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,28 @@ def test_request_only_escapes_the_path_the_first_time_it_runs_and_not_subsequent
flexmock(connection.http).should_receive(:request).ordered
connection.request :put, unescaped_path
end


def test_prepare_path_percent_escapes_spaces
assert_equal 'foo%20bar%20baz',
Connection.prepare_path('foo bar baz')
end

def test_url_for_escapes_file_paths_with_reserved_characters
reserved_chars = '!*\'();:@&=+$,?#[ ]' # rfc3986, without /, plus space
connection =
Connection.new(:access_key_id => '123', :secret_access_key => 'abc', :port => 80)
assert_match(
/http:\/\/s3.amazonaws.com\/Foo\/%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%3F%23%5B%20%5D\/foo\/bar\?AWSAccessKeyId=[^&]*&Expires=[^&]*&Signature=.*$/,
AWS::S3::S3Object.url_for("#{reserved_chars}/foo/bar", 'Foo')
)
end

def test_prepare_path_escapes_all_uri_reserved_charachters_except_slash
reserved_chars = '!*\'();:@&=+$,?#[ ]' # rfc3986, without /, plus space
assert_equal '%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%3F%23%5B%20%5D/foo/bar',
Connection.prepare_path("#{reserved_chars}/foo/bar")
end

def test_if_request_has_no_body_then_the_content_length_is_set_to_zero
# References bug: http://rubyforge.org/tracker/index.php?func=detail&aid=13052&group_id=2409&atid=9356
connection = Connection.new(@keys)
Expand Down