octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-01-05 14:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

default_acl

Browse Source 
git-svn-id: http://s3fs.googlecode.com/svn/trunk@99 df820570-a93a-0410-bd06-b72b767a4274
This commit is contained in:
rrizun 2008-02-24 17:35:17 +00:00
parent 8484ddab8a
commit 53f27fbc4c
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
s3fs/s3fs.cpp
View File

@ -271,6 +271,9 @@ static mode_t root_mode = 0;
// if .size()==0 then local file cache is disabled // if .size()==0 then local file cache is disabled
static string use_cache; static string use_cache;
// private, public-read, public-read-write, authenticated-read
static string default_acl("private");
// key=path // key=path
typedef map<string, struct stat> stat_cache_t; typedef map<string, struct stat> stat_cache_t;
static stat_cache_t stat_cache; static stat_cache_t stat_cache;
@ -346,7 +349,7 @@ calc_signature(string method, string content_type, string date, curl_slist* head
if (headers != 0) { if (headers != 0) {
do { do {
//###cout << headers->data << endl; //###cout << headers->data << endl;
if (strncmp(headers->data, "x-amz-meta", 10) == 0) { if (strncmp(headers->data, "x-amz", 5) == 0) {
++count; ++count;
StringToSign += headers->data; StringToSign += headers->data;
StringToSign += 10; // linefeed StringToSign += 10; // linefeed
@ -482,7 +485,7 @@ get_headers(const char* path, headers_t& meta) {
meta[key] = value; meta[key] = value;
if (key == "ETag") if (key == "ETag")
meta[key] = value; meta[key] = value;
if (key.substr(0, 10) == "x-amz-meta") if (key.substr(0, 5) == "x-amz")
meta[key] = value; meta[key] = value;
} }
@ -548,8 +551,7 @@ get_local_fd(const char* path) {
if (use_cache.size() > 0) { if (use_cache.size() > 0) {
/*if (*/mkdirp(resolved_path + mydirname(path), 0777)/* == -1) /*if (*/mkdirp(resolved_path + mydirname(path), 0777)/* == -1)
return -errno*/; return -errno*/;
//###mode_t mode = atoi(responseHeaders["x-amz-meta-mode"].c_str()); mode_t mode = strtoul(responseHeaders["x-amz-meta-mode"].c_str(), (char **)NULL, 10);
mode_t mode = strtol(responseHeaders["x-amz-meta-mode"].c_str(), (char **)NULL, 10);
fd = open(cache_path.c_str(), O_CREAT|O_RDWR|O_TRUNC, mode); fd = open(cache_path.c_str(), O_CREAT|O_RDWR|O_TRUNC, mode);
} else { } else {
fd = fileno(tmpfile()); fd = fileno(tmpfile());
@ -624,12 +626,14 @@ put_local_fd(const char* path, headers_t meta, int fd) {
string date = get_date(); string date = get_date();
headers.append("Date: "+date); headers.append("Date: "+date);
meta["x-amz-acl"] = default_acl;
for (headers_t::iterator iter = meta.begin(); iter != meta.end(); ++iter) { for (headers_t::iterator iter = meta.begin(); iter != meta.end(); ++iter) {
string key = (*iter).first; string key = (*iter).first;
string value = (*iter).second; string value = (*iter).second;
if (key == "Content-Type") if (key == "Content-Type")
headers.append(key+":"+value); headers.append(key+":"+value);
if (key.substr(0,10) == "x-amz-meta") if (key.substr(0,5) == "x-amz")
headers.append(key+":"+value); headers.append(key+":"+value);
} }
@ -739,6 +743,8 @@ s3fs_mknod(const char *path, mode_t mode, dev_t rdev) {
string date = get_date(); string date = get_date();
headers.append("Date: "+date); headers.append("Date: "+date);
headers.append("Content-Type: application/octet-stream"); headers.append("Content-Type: application/octet-stream");
// x-amz headers: (a) alphabetical order and (b) no spaces after colon
headers.append("x-amz-acl:"+default_acl);
headers.append("x-amz-meta-mode:"+stringificationizer(mode)); headers.append("x-amz-meta-mode:"+stringificationizer(mode));
headers.append("x-amz-meta-mtime:"+stringificationizer(time(NULL))); headers.append("x-amz-meta-mtime:"+stringificationizer(time(NULL)));
headers.append("Authorization: AWS "+AWSAccessKeyId+":"+calc_signature("PUT", "application/octet-stream", date, headers.get(), resource)); headers.append("Authorization: AWS "+AWSAccessKeyId+":"+calc_signature("PUT", "application/octet-stream", date, headers.get(), resource));
@ -767,6 +773,8 @@ s3fs_mkdir(const char *path, mode_t mode) {
string date = get_date(); string date = get_date();
headers.append("Date: "+date); headers.append("Date: "+date);
headers.append("Content-Type: application/x-directory"); headers.append("Content-Type: application/x-directory");
// x-amz headers: (a) alphabetical order and (b) no spaces after colon
headers.append("x-amz-acl:"+default_acl);
headers.append("x-amz-meta-mode:"+stringificationizer(mode)); headers.append("x-amz-meta-mode:"+stringificationizer(mode));
headers.append("x-amz-meta-mtime:"+stringificationizer(time(NULL))); headers.append("x-amz-meta-mtime:"+stringificationizer(time(NULL)));
headers.append("Authorization: AWS "+AWSAccessKeyId+":"+calc_signature("PUT", "application/x-directory", date, headers.get(), resource)); headers.append("Authorization: AWS "+AWSAccessKeyId+":"+calc_signature("PUT", "application/x-directory", date, headers.get(), resource));
@ -1274,6 +1282,11 @@ my_fuse_opt_proc(void *data, const char *arg, int key, struct fuse_args *outargs
AWSSecretAccessKey = strchr(arg, '=') + 1; AWSSecretAccessKey = strchr(arg, '=') + 1;
return 0; return 0;
} }
if (strstr(arg, "default_acl=") != 0) {
default_acl = strchr(arg, '=') + 1;
return 0;
}
// ### TODO: prefix
if (strstr(arg, "retries=") != 0) { if (strstr(arg, "retries=") != 0) {
retries = atoi(strchr(arg, '=') + 1); retries = atoi(strchr(arg, '=') + 1);
return 0; return 0;