octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-06-07 03:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolves issue #155

Browse Source 
git-svn-id: http://s3fs.googlecode.com/svn/trunk@340 df820570-a93a-0410-bd06-b72b767a4274
This commit is contained in:
mooredan@suncup.net 2011-04-06 15:06:28 +00:00
parent 2e09e5201b
commit 30abdff53f
1 changed files with 87 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/s3fs.cpp
View File

@ -3393,6 +3393,68 @@ static void s3fs_check_service(void) {
return;
}
static bool check_for_aws_format (void) {
size_t first_pos = string::npos;
string line;
bool got_access_key_id_line = 0;
bool got_secret_key_line = 0;
string str1 ("AWSAccessKeyId=");
string str2 ("AWSSecretKey=");
size_t found;
ifstream PF(passwd_file.c_str());
if (PF.good()) {
while (getline(PF, line)) {
if (line[0]=='#') {
continue;
}
if (line.size() == 0) {
continue;
}
first_pos = line.find_first_of(" \t");
if (first_pos != string::npos) {
printf ("%s: invalid line in passwd file, found whitespace character\n",
program_name.c_str());
exit(EXIT_FAILURE);
}
first_pos = line.find_first_of("[");
if (first_pos != string::npos && first_pos == 0) {
printf ("%s: invalid line in passwd file, found a bracket \"[\" character\n",
program_name.c_str());
exit(EXIT_FAILURE);
}
found = line.find(str1);
if (found != string::npos) {
first_pos = line.find_first_of("=");
AWSAccessKeyId = line.substr(first_pos + 1, string::npos);
// cout << "AWSAccessKeyId: " << AWSAccessKeyId.c_str() << endl;
got_access_key_id_line = 1;
continue;
}
found = line.find(str2);
if (found != string::npos) {
first_pos = line.find_first_of("=");
AWSSecretAccessKey = line.substr(first_pos + 1, string::npos);
// cout << "AWSSecretAccessKey: " << AWSSecretAccessKey.c_str() << endl;
got_secret_key_line = 1;
continue;
}
}
}
if (got_access_key_id_line && got_secret_key_line) {
return 1;
} else {
return 0;
}
}
//////////////////////////////////////////////////////////////////
// check_passwd_file_perms
//
@ -3462,12 +3524,18 @@ static void read_passwd_file (void) {
size_t first_pos = string::npos;
size_t last_pos = string::npos;
bool default_found = 0;
bool aws_format;
// if you got here, the password file
// exists and is readable by the
// current user, check for permissions
check_passwd_file_perms();
aws_format = check_for_aws_format();
if (aws_format)
return;
ifstream PF(passwd_file.c_str());
if (PF.good()) {
while (getline(PF, line)) {
@ -3593,6 +3661,25 @@ static void get_access_keys (void) {
return;
}
// 3a - from the AWS_CREDENTIAL_FILE environment variable
char * AWS_CREDENTIAL_FILE;
AWS_CREDENTIAL_FILE = getenv("AWS_CREDENTIAL_FILE");
if (AWS_CREDENTIAL_FILE != NULL) {
passwd_file.assign(AWS_CREDENTIAL_FILE);
if (passwd_file.size() > 0) {
ifstream PF(passwd_file.c_str());
if (PF.good()) {
PF.close();
read_passwd_file();
return;
} else {
fprintf(stderr, "%s: AWS_CREDENTIAL_FILE: \"%s\" is not readable\n",
program_name.c_str(), passwd_file.c_str());
exit(EXIT_FAILURE);
}
}
}
// 4 - from the default location in the users home directory
char * HOME;
HOME = getenv ("HOME");