Skip to content

Website merge code review#7

Open
bafna wants to merge 109 commits intohammer-jfrom
website-merge
Open

Website merge code review#7
bafna wants to merge 109 commits intohammer-jfrom
website-merge

Conversation

@bafna
Copy link
Copy Markdown
Owner

@bafna bafna commented Jul 6, 2016

No description provided.

harshalgupta and others added 30 commits April 22, 2016 15:06
No functionality changes in this commit, just shuffle lines to new files
and adding #include headers to ensure it still compiles.

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>

Conflicts:
	src/mds/MDSDaemon.cc
	src/mds/MDSRank.cc

Fixing compilation error
StaticSites/S3Website has error output in HTML, for which we need a new
formatter. It's implemented by extending the existing XMLFormatter.

This will print the actual entries, but not any document structure
around them. Unless otherwise documented, this codes strives for the
Amazon format of:
<li>key: value</li>

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Formatters now gain first-class headers and footers, along with
consistent handling of having header/footer only output ONCE.

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
move website rules to separate file, check rules,
and implement key modification functionality

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

Conflicts:
	src/rgw/Makefile.am
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

Conflicts:
	src/rgw/rgw_main.cc
	src/rgw/rgw_op.h
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
also enable GetBucketWebsite op.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
similar to the json decoder, for easier xml parsing.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
let the parser do the allocation if needed. Also, keep unallocated
objects in a list.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
only when key matches, not checking for return code yet.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
ListBucket/StatBucket are not a valid action for website mode, redirect
it to GetObj instead, where it will modified via get_effective_key to
point to the correct suffix document.

S3 explicitly does NOT support anything like mod_autoindex when used in
static website mode.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
With the XML dumping moved, this variable is not required.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Rather than duplicate code to construct the redirect if redirect_all is
used, construct a catch-all RoutingRule with redirect_all as the target,
and return it as the matching rule.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
…ith many endpoint hostnames.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

Conflicts:
	src/rgw/rgw_rest.cc
AmazonS3 detects S3website mode via DNS:
${bucket}.s3-website-${region}.amazonaws.com.
VS:
${bucket}.s3-${region}.amazonaws.com.

This allows us to store what hostnames to use for the website endpoint.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

Conflicts:
	src/rgw/rgw_rest.cc
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
…cketmode&&auth to decide.

WIP-FIXME rgw-website: refactor to have RGW*S3Website classes for website-specific stuff

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

Conflicts:
	src/common/config_opts.h
	src/rgw/rgw_rest.cc
	src/rgw/rgw_rest_s3.cc
	src/rgw/rgw_rest_s3.h
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Robin H. Johnson and others added 13 commits June 22, 2016 19:40
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>

Conflicts:
	src/rgw/rgw_rest_s3.cc
When modifying rgw_enable_apis per RGW instance, such as for staticsites, you
can end up with RESTManager instance being null in some cases, which returns a
HTTP 405 MethodNotAllowed to all requests.

Example configuration to trigger the bug:
rgw_enable_apis = s3website

Backport: jewel
X-Note: Patch from Yehuda in private IRC discussion, 2016/05/20.
Fixes: http://tracker.ceph.com/issues/15973
Fixes: http://tracker.ceph.com/issues/15974
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
(cherry picked from commit 7c7a465)
bafna and others added 16 commits September 26, 2016 20:43
Adding allowed headers for console sse
Fixing memory leaks and adding debug log messages
…efix in x-jcs/x-amz type headers are replaced with 'x-amz'.

Because of this x-jcs headers are not passed as it is and causes an issue in creating cannonical string for authentication with IAM.
Fix: 1. Added x-jcs in the mix with other x-* type headers so that it wont be ignored.
     2. We are retaining original prefix and not replacing it with x-amz.
Adding a header for encrypted objects Get/Head Ops
adding error code for wrong encryption header
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants