Skip to content

Commit be7b241

Browse files
chenwk96FangQianan
chenwk96
authored and
FangQianan
committed
bugfix for option default_acl not working.
1 parent 25dc29c commit be7b241

File tree

9 files changed

+73
-43
lines changed

9 files changed

+73
-43
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ test/junk_data
8686
test/s3proxy-*
8787
test/write_multiblock
8888
test/direct_read_test
89+
test/install_ossutil.sh
8990
#
9091
# Windows ports
9192
#

‎doc/man/ossfs.1.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ All ossfs options must given in the form where "opt" is:
6161
\fB\-o\fR bucket
6262
if it is not specified bucket name (and path) in command line, must specify this option after \-o option for bucket name.
6363
.TP
64-
\fB\-o\fR default_acl (default="private")
65-
the default canned acl to apply to all written oss objects, e.g., "private", "public-read".
64+
\fB\-o\fR default_acl (default="default")
65+
the default canned acl to apply to all written oss objects, e.g., "private", "public-read", "public-read-write".
6666
.TP
6767
\fB\-o\fR retries (default="5")
6868
number of times to retry a failed OSS transaction.

‎src/curl.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ long S3fsCurl::connect_timeout = 300; // default
8989
time_t S3fsCurl::readwrite_timeout = 120; // default
9090
int S3fsCurl::retries = 5; // default
9191
bool S3fsCurl::is_public_bucket = false;
92-
acl_t S3fsCurl::default_acl = acl_t::PRIVATE;
92+
acl_t S3fsCurl::default_acl = acl_t::DEFAULT;
9393
std::string S3fsCurl::storage_class = "STANDARD";
9494
sseckeylist_t S3fsCurl::sseckeys;
9595
std::string S3fsCurl::ssekmsid;
@@ -3268,7 +3268,7 @@ int S3fsCurl::PutHeadRequest(const char* tpath, headers_t& meta, bool is_copy)
32683268
for(headers_t::iterator iter = meta.begin(); iter != meta.end(); ++iter){
32693269
std::string key = lower(iter->first);
32703270
std::string value = iter->second;
3271-
if(is_prefix(key.c_str(), "x-oss-acl")){
3271+
if(is_prefix(key.c_str(), "x-oss-object-acl")){
32723272
// not set value, but after set it.
32733273
}else if(is_prefix(key.c_str(), "x-oss-meta")){
32743274
requestHeaders = curl_slist_sort_insert(requestHeaders, iter->first.c_str(), value.c_str());
@@ -3294,9 +3294,9 @@ int S3fsCurl::PutHeadRequest(const char* tpath, headers_t& meta, bool is_copy)
32943294
}
32953295
}
32963296

3297-
// "x-oss-acl", storage class, sse
3298-
if(S3fsCurl::default_acl != acl_t::PRIVATE){
3299-
requestHeaders = curl_slist_sort_insert(requestHeaders, "x-oss-acl", S3fsCurl::default_acl.str());
3297+
// "x-oss-object-acl", storage class, sse
3298+
if(S3fsCurl::default_acl != acl_t::DEFAULT){
3299+
requestHeaders = curl_slist_sort_insert(requestHeaders, "x-oss-object-acl", S3fsCurl::default_acl.str());
33003300
}
33013301
if(strcasecmp(GetStorageClass().c_str(), "STANDARD") != 0){
33023302
requestHeaders = curl_slist_sort_insert(requestHeaders, "x-oss-storage-class", GetStorageClass().c_str());
@@ -3408,7 +3408,7 @@ int S3fsCurl::PutRequest(const char* tpath, headers_t& meta, int fd)
34083408
for(headers_t::iterator iter = meta.begin(); iter != meta.end(); ++iter){
34093409
std::string key = lower(iter->first);
34103410
std::string value = iter->second;
3411-
if(is_prefix(key.c_str(), "x-oss-acl")){
3411+
if(is_prefix(key.c_str(), "x-oss-object-acl")){
34123412
// not set value, but after set it.
34133413
}else if(is_prefix(key.c_str(), "x-oss-meta")){
34143414
requestHeaders = curl_slist_sort_insert(requestHeaders, iter->first.c_str(), value.c_str());
@@ -3420,9 +3420,9 @@ int S3fsCurl::PutRequest(const char* tpath, headers_t& meta, int fd)
34203420
// skip this header, because this header is specified after logic.
34213421
}
34223422
}
3423-
// "x-oss-acl", storage class, sse
3424-
if(S3fsCurl::default_acl != acl_t::PRIVATE){
3425-
requestHeaders = curl_slist_sort_insert(requestHeaders, "x-oss-acl", S3fsCurl::default_acl.str());
3423+
// "x-oss-object-acl", storage class, sse
3424+
if(S3fsCurl::default_acl != acl_t::DEFAULT){
3425+
requestHeaders = curl_slist_sort_insert(requestHeaders, "x-oss-object-acl", S3fsCurl::default_acl.str());
34263426
}
34273427
if(strcasecmp(GetStorageClass().c_str(), "STANDARD") != 0){
34283428
requestHeaders = curl_slist_sort_insert(requestHeaders, "x-oss-storage-class", GetStorageClass().c_str());
@@ -3802,7 +3802,7 @@ int S3fsCurl::PreMultipartPostRequest(const char* tpath, headers_t& meta, std::s
38023802
for(headers_t::iterator iter = meta.begin(); iter != meta.end(); ++iter){
38033803
std::string key = lower(iter->first);
38043804
std::string value = iter->second;
3805-
if(is_prefix(key.c_str(), "x-oss-acl")){
3805+
if(is_prefix(key.c_str(), "x-oss-object-acl")){
38063806
// not set value, but after set it.
38073807
}else if(is_prefix(key.c_str(), "x-oss-meta")){
38083808
requestHeaders = curl_slist_sort_insert(requestHeaders, iter->first.c_str(), value.c_str());
@@ -3825,9 +3825,9 @@ int S3fsCurl::PreMultipartPostRequest(const char* tpath, headers_t& meta, std::s
38253825
}
38263826
}
38273827
}
3828-
// "x-oss-acl", storage class, sse
3829-
if(S3fsCurl::default_acl != acl_t::PRIVATE){
3830-
requestHeaders = curl_slist_sort_insert(requestHeaders, "x-oss-acl", S3fsCurl::default_acl.str());
3828+
// "x-oss-object-acl", storage class, sse
3829+
if(S3fsCurl::default_acl != acl_t::DEFAULT){
3830+
requestHeaders = curl_slist_sort_insert(requestHeaders, "x-oss-object-acl", S3fsCurl::default_acl.str());
38313831
}
38323832
if(strcasecmp(GetStorageClass().c_str(), "STANDARD") != 0){
38333833
requestHeaders = curl_slist_sort_insert(requestHeaders, "x-oss-storage-class", GetStorageClass().c_str());
@@ -4207,7 +4207,7 @@ int S3fsCurl::CopyMultipartPostSetup(const char* from, const char* to, int part_
42074207
}else if(key == "x-oss-copy-source-range"){
42084208
requestHeaders = curl_slist_sort_insert(requestHeaders, iter->first.c_str(), value.c_str());
42094209
}
4210-
// NOTICE: x-oss-acl, x-oss-server-side-encryption is not set!
4210+
// NOTICE: x-oss-object-acl, x-oss-server-side-encryption is not set!
42114211
}
42124212

42134213
op = "PUT";

‎src/s3fs_help.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ static const char help_string[] =
6161
" - if it is not specified bucket name (and path) in command line,\n"
6262
" must specify this option after -o option for bucket name.\n"
6363
"\n"
64-
" default_acl (default=\"private\")\n"
64+
" default_acl (default=\"default\")\n"
6565
" - the default canned acl to apply to all written oss objects,\n"
66-
" e.g., private, public-read.\n"
66+
" e.g., private, public-read, public-read-write.\n"
6767
"\n"
6868
" retries (default=\"5\")\n"
6969
" - number of times to retry a failed OSS transaction\n"

‎src/types.h

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,18 @@ typedef std::map<std::string, PXATTRVAL> xattrs_t;
7070

7171
//-------------------------------------------------------------------
7272
// acl_t
73+
// Note: Header "x-oss-object-acl" is for acl. OSS's acl is not compatible with S3.
74+
// OSS object's acl is "private", "public-read", "public-read-write", "default"
75+
// ref: https://help.aliyun.com/zh/oss/developer-reference/putobjectacl?spm=a2c4g.11186623.0.i26
76+
// https://docs.aws.amazon.com/AmazonS3/latest/userguide/acl-overview.html#canned-acl
7377
//-------------------------------------------------------------------
7478
class acl_t{
7579
public:
7680
enum Value{
7781
PRIVATE,
7882
PUBLIC_READ,
7983
PUBLIC_READ_WRITE,
80-
AWS_EXEC_READ,
81-
AUTHENTICATED_READ,
82-
BUCKET_OWNER_READ,
83-
BUCKET_OWNER_FULL_CONTROL,
84-
LOG_DELIVERY_WRITE,
84+
DEFAULT,
8585
UNKNOWN
8686
};
8787

@@ -99,16 +99,8 @@ class acl_t{
9999
return "public-read";
100100
case PUBLIC_READ_WRITE:
101101
return "public-read-write";
102-
case AWS_EXEC_READ:
103-
return "aws-exec-read";
104-
case AUTHENTICATED_READ:
105-
return "authenticated-read";
106-
case BUCKET_OWNER_READ:
107-
return "bucket-owner-read";
108-
case BUCKET_OWNER_FULL_CONTROL:
109-
return "bucket-owner-full-control";
110-
case LOG_DELIVERY_WRITE:
111-
return "log-delivery-write";
102+
case DEFAULT:
103+
return "default";
112104
case UNKNOWN:
113105
return NULL;
114106
}
@@ -123,16 +115,8 @@ class acl_t{
123115
return PUBLIC_READ;
124116
}else if(0 == strcmp(acl, "public-read-write")){
125117
return PUBLIC_READ_WRITE;
126-
}else if(0 == strcmp(acl, "aws-exec-read")){
127-
return AWS_EXEC_READ;
128-
}else if(0 == strcmp(acl, "authenticated-read")){
129-
return AUTHENTICATED_READ;
130-
}else if(0 == strcmp(acl, "bucket-owner-read")){
131-
return BUCKET_OWNER_READ;
132-
}else if(0 == strcmp(acl, "bucket-owner-full-control")){
133-
return BUCKET_OWNER_FULL_CONTROL;
134-
}else if(0 == strcmp(acl, "log-delivery-write")){
135-
return LOG_DELIVERY_WRITE;
118+
}else if(0 == strcmp(acl, "default")){
119+
return DEFAULT;
136120
}else{
137121
return UNKNOWN;
138122
}

‎test/integration-test-common.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,17 @@ function common_exit_handler {
319319
}
320320
trap common_exit_handler EXIT
321321

322+
function install_ossutil {
323+
if ! [ -x "$(command -v ossutil)" ]; then
324+
curl https://gosspublic.alicdn.com/ossutil/install.sh > install_ossutil.sh
325+
bash install_ossutil.sh
326+
if ! [ -x "$(command -v ossutil)" ]; then
327+
echo "Failed to install ossutil"
328+
exit 1
329+
fi
330+
fi
331+
}
332+
322333
#
323334
# Local variables:
324335
# tab-width: 4

‎test/integration-test-main.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2463,6 +2463,26 @@ function test_free_cache_ahead {
24632463
rm_test_file "${TEST_FILE}"
24642464
}
24652465

2466+
function test_default_acl {
2467+
describe "Testing defacult acl..."
2468+
2469+
local DIR_NAME; DIR_NAME=$(basename "${PWD}")
2470+
touch "test.txt"
2471+
2472+
local CONTENT_TYPE; CONTENT_TYPE=$(ossutil_cmd stat "oss://${TEST_BUCKET_1}/${DIR_NAME}/test.txt" | grep ACL)
2473+
if ps u -p "${OSSFS_PID}" | grep -q default_acl; then
2474+
if ! echo "${CONTENT_TYPE}" | grep -q "private"; then
2475+
return 1
2476+
fi
2477+
else
2478+
if ! echo "${CONTENT_TYPE}" | grep -q "default"; then
2479+
return 1
2480+
fi
2481+
fi
2482+
2483+
rm -rf "test.txt"
2484+
}
2485+
24662486
function add_all_tests {
24672487
# shellcheck disable=SC2009
24682488
if ps u -p "${OSSFS_PID}" | grep -q use_cache; then
@@ -2577,6 +2597,10 @@ function add_all_tests {
25772597
if ps u -p "${OSSFS_PID}" | grep -q parallel_count && ps u -p "${OSSFS_PID}" | grep -q fake_diskfree; then
25782598
add_tests test_free_cache_ahead
25792599
fi
2600+
2601+
if ! uname | grep -q Darwin; then
2602+
add_tests test_default_acl
2603+
fi
25802604
}
25812605

25822606
init_suite

‎test/small-integration-test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ if [ -n "${ALL_TESTS}" ]; then
6161
"use_xattr=0 -o readdir_optimize -o readdir_check_size=48 -o symlink_in_meta"
6262
"use_cache=${CACHE_DIR} -o direct_read"
6363
"fake_diskfree=${FAKE_FREE_DISK_SIZE} -oparallel_count=10 -omultipart_size=10"
64+
"default_acl=private"
6465
)
6566
else
6667
FLAGS=(
@@ -69,6 +70,7 @@ else
6970
fi
7071

7172
start_s3proxy
73+
install_ossutil
7274

7375
if ! aws_cli s3api head-bucket --bucket "${TEST_BUCKET_1}" --region "${OSS_REGION}"; then
7476
aws_cli s3 mb "s3://${TEST_BUCKET_1}" --region "${OSS_REGION}"

‎test/test-utils.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,14 @@ function aws_cli() {
340340
aws $@ --endpoint-url "${OSS_URL}" --ca-bundle /tmp/keystore.pem ${FLAGS}
341341
}
342342

343+
function ossutil_cmd() {
344+
OSS_ACCESS_KEY_ID=$(cut -d: -f1 "${OSSFS_CREDENTIALS_FILE}")
345+
OSS_SECRET_ACCESS_KEY=$(cut -d: -f2 "${OSSFS_CREDENTIALS_FILE}")
346+
347+
ossutil64 -i "${OSS_ACCESS_KEY_ID}" -k "${OSS_SECRET_ACCESS_KEY}" -e "${OSS_URL}" $@
348+
349+
}
350+
343351
function wait_for_port() {
344352
local PORT="$1"
345353
for _ in $(seq 30); do

0 commit comments

Comments
 (0)