Skip to content
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

Jump to bottom

rgw: set bucket permissions, cors on swift creation #1262

Closed
wants to merge 1 commit into from
Closed

rgw: set bucket permissions, cors on swift creation #1262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/rgw/rgw_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,6 +1150,7 @@ void RGWCreateBucket::execute()
RGWAccessControlPolicy old_policy(s->cct);
map<string, bufferlist> attrs;
bufferlist aclbl;
bufferlist corsbl;
bool existed;
int r;
rgw_obj obj(store->zone.domain_root, s->bucket_name_str);
Expand Down Expand Up @@ -1223,6 +1224,10 @@ void RGWCreateBucket::execute()

attrs[RGW_ATTR_ACL] = aclbl;

if (has_cors) {
cors_config.encode(corsbl);
attrs[RGW_ATTR_CORS] = corsbl;
}
s->bucket.name = s->bucket_name_str;
ret = store->create_bucket(s->user, s->bucket, region_name, placement_rule, attrs, info, pobjv,
&ep_objv, creation_time, pmaster_bucket, true);
Expand Down
4 changes: 3 additions & 1 deletion src/rgw/rgw_op.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,11 +268,13 @@ class RGWCreateBucket : public RGWOp {
string placement_rule;
RGWBucketInfo info;
obj_version ep_objv;
bool has_cors;
RGWCORSConfiguration cors_config;

bufferlist in_data;

public:
RGWCreateBucket() : ret(0) {}
RGWCreateBucket() : ret(0), has_cors(false) {}

int verify_permission();
void pre_exec();
Expand Down
102 changes: 63 additions & 39 deletions src/rgw/rgw_rest_swift.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,68 @@ void RGWStatBucket_ObjStore_SWIFT::send_response()
dump_start(s);
}

static int get_swift_container_settings(req_state *s, RGWRados *store, RGWAccessControlPolicy *policy, bool *has_policy,
RGWCORSConfiguration *cors_config, bool *has_cors)
{
string read_list, write_list;

const char *read_attr = s->info.env->get("HTTP_X_CONTAINER_READ");
if (read_attr) {
read_list = read_attr;
}
const char *write_attr = s->info.env->get("HTTP_X_CONTAINER_WRITE");
if (write_attr) {
write_list = write_attr;
}

*has_policy = false;

if (read_attr || write_attr) {
RGWAccessControlPolicy_SWIFT swift_policy(s->cct);
int r = swift_policy.create(store, s->user.user_id, s->user.display_name, read_list, write_list);
if (r < 0)
return r;

*policy = swift_policy;
*has_policy = true;
}

*has_cors = false;

/*Check and update CORS configuration*/
const char *allow_origins = s->info.env->get("HTTP_X_CONTAINER_META_ACCESS_CONTROL_ALLOW_ORIGIN");
const char *allow_headers = s->info.env->get("HTTP_X_CONTAINER_META_ACCESS_CONTROL_ALLOW_HEADERS");
const char *expose_headers = s->info.env->get("HTTP_X_CONTAINER_META_ACCESS_CONTROL_EXPOSE_HEADERS");
const char *max_age = s->info.env->get("HTTP_X_CONTAINER_META_ACCESS_CONTROL_MAX_AGE");
if (allow_origins) {
RGWCORSConfiguration_SWIFT *swift_cors = new RGWCORSConfiguration_SWIFT;
int r = swift_cors->create_update(allow_origins, allow_headers, expose_headers, max_age);
if (r < 0) {
dout(0) << "Error creating/updating the cors configuration" << dendl;
delete swift_cors;
return r;
}
*has_cors = true;
*cors_config = *swift_cors;
cors_config->dump();
delete swift_cors;
}

return 0;
}

int RGWCreateBucket_ObjStore_SWIFT::get_params()
{
policy.create_default(s->user.user_id, s->user.display_name);
bool has_policy;

int r = get_swift_container_settings(s, store, &policy, &has_policy, &cors_config, &has_cors);
if (r < 0) {
return r;
}

if (!has_policy) {
policy.create_default(s->user.user_id, s->user.display_name);
}

location_constraint = store->region.api_name;

Expand Down Expand Up @@ -371,44 +430,9 @@ int RGWPutMetadata_ObjStore_SWIFT::get_params()
return -EINVAL;

if (!s->object) {
string read_list, write_list;

const char *read_attr = s->info.env->get("HTTP_X_CONTAINER_READ");
if (read_attr) {
read_list = read_attr;
}
const char *write_attr = s->info.env->get("HTTP_X_CONTAINER_WRITE");
if (write_attr) {
write_list = write_attr;
}

if (read_attr || write_attr) {
RGWAccessControlPolicy_SWIFT swift_policy(s->cct);
int r = swift_policy.create(store, s->user.user_id, s->user.display_name, read_list, write_list);
if (r < 0)
return r;

policy = swift_policy;
has_policy = true;
}

/*Check and update CORS configuration*/
const char *allow_origins = s->info.env->get("HTTP_X_CONTAINER_META_ACCESS_CONTROL_ALLOW_ORIGIN");
const char *allow_headers = s->info.env->get("HTTP_X_CONTAINER_META_ACCESS_CONTROL_ALLOW_HEADERS");
const char *expose_headers = s->info.env->get("HTTP_X_CONTAINER_META_ACCESS_CONTROL_EXPOSE_HEADERS");
const char *max_age = s->info.env->get("HTTP_X_CONTAINER_META_ACCESS_CONTROL_MAX_AGE");
if (allow_origins) {
RGWCORSConfiguration_SWIFT *swift_cors = new RGWCORSConfiguration_SWIFT;
int r = swift_cors->create_update(allow_origins, allow_headers, expose_headers, max_age);
if (r < 0) {
dout(0) << "Error creating/updating the cors configuration" << dendl;
delete swift_cors;
return r;
}
has_cors = true;
cors_config = *swift_cors;
cors_config.dump();
delete swift_cors;
int r = get_swift_container_settings(s, store, &policy, &has_policy, &cors_config, &has_cors);
if (r < 0) {
return r;
}
}

Expand Down