-
Notifications
You must be signed in to change notification settings - Fork 95
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.
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
Bugfix/copy object bugs #1200
Merged
Merged
Bugfix/copy object bugs #1200
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shino
force-pushed
the
bugfix/copy-object-bugs
branch
2 times, most recently
from
July 28, 2015 06:22
61c5121
to
e418dfc
Compare
Rebasing or merging develop needed. diff --cc riak_test/src/rtcs.erl
index 744446b,dccc445..0000000
--- a/riak_test/src/rtcs.erl
+++ b/riak_test/src/rtcs.erl
@@@ -1013,17 -1020,17 +1020,28 @@@ pbc({multibag, _} = Flavor, ObjectKind
rtcs_bag:pbc(Flavor, ObjectKind, RiakNodes, Opts).
make_authorization(Method, Resource, ContentType, Config, Date) ->
++<<<<<<< HEAD
+ make_authorization(Method, Resource, ContentType, Config, Date, []).
+
+%% AmzHeaders are assumed already normalized and sorted
+make_authorization(Method, Resource, ContentType, Config, Date, AmzHeaders) ->
+ StsAmzHeaderPart = [[K, $:, V, $\n] || {K, V} <- AmzHeaders],
+ StringToSign = [Method, $\n, [], $\n, ContentType, $\n, Date, $\n,
+ StsAmzHeaderPart, Resource],
+ lager:debug("StringToSign~n~s~n", [StringToSign]),
++=======
+ make_authorization(s3, Method, Resource, ContentType, Config, Date).
+
+ make_authorization(Type, Method, Resource, ContentType, Config, Date) ->
+ StringToSign = [Method, $\n, [], $\n, ContentType, $\n, Date, $\n, Resource],
++>>>>>>> develop
Signature =
base64:encode_to_string(sha_mac(Config#aws_config.secret_access_key, StringToSign)),
- lists:flatten(["AWS ", Config#aws_config.access_key_id, $:, Signature]).
+ Prefix = case Type of
+ s3 -> "AWS";
+ velvet -> "MOSS"
+ end,
+ lists:flatten([Prefix, " ", Config#aws_config.access_key_id, $:, Signature]). |
Non-existent source and illegal access to source is handled by this commit to respond resource path in XML bocy as source path.
shino
force-pushed
the
bugfix/copy-object-bugs
branch
from
July 30, 2015 02:35
e418dfc
to
223c7ba
Compare
Rebased on current develop and force pushed. |
end | ||
end. | ||
|
||
%% `valid_entity_length' helper. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be good to have @doc
prefix to let edoc know.
borshop
added a commit
that referenced
this pull request
Jul 30, 2015
Bugfix/copy object bugs Reviewed-by: kuenishi
@borshop merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes a few bugs around PUT Copy / Multipart Upload Copy APIs.
not existent or not accessible, source bucket/key should be displayed
there instead of target bucket/key. The bug description is at
PUT Copy shows target key when source is not found [JIRA: RCS-215] #1169, but this PR does not
cover error response XML structure compatibility with S3.
Before this PR, such requests fails with 5xx errors. This PR allows
requests without CL header in Copy API calls. Additionally, Copy API
calls with CL more than zero is made to explicitly errors.
unknown upload ID correct (or more understandable.)