diff options
author | Yehuda Sadeh <yehuda@inktank.com> | 2013-06-28 11:26:30 -0700 |
---|---|---|
committer | Yehuda Sadeh <yehuda@inktank.com> | 2013-06-28 11:26:30 -0700 |
commit | 12ab4f881d09b47d515e3f2d509c4ef051c56d34 (patch) | |
tree | adc22fa0b6620763f1ab967094cd99a42830f798 | |
parent | 72ac281d7a8b548429cedd1a186e010390b65aa1 (diff) | |
parent | b4ee7cac1f66389f434aa1db76c7f14e8c514121 (diff) | |
download | ceph-12ab4f881d09b47d515e3f2d509c4ef051c56d34.tar.gz |
Merge remote-tracking branch 'enovance/wip-rgw-geo-2-opstate' into wip-rgw-geo-2
Conflicts:
src/Makefile.am
src/rgw/rgw_admin.cc
src/rgw/rgw_common.h
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
-rw-r--r-- | src/Makefile.am | 9 | ||||
-rw-r--r-- | src/rgw/rgw_admin.cc | 4 | ||||
-rw-r--r-- | src/rgw/rgw_common.h | 4 | ||||
-rw-r--r-- | src/rgw/rgw_main.cc | 2 | ||||
-rw-r--r-- | src/rgw/rgw_rest_opstate.cc | 189 | ||||
-rw-r--r-- | src/rgw/rgw_rest_opstate.h | 109 | ||||
-rw-r--r-- | src/test/test_rgw_admin_opstate.cc | 836 |
7 files changed, 1149 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index dff7489de43..e673a8943fc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -424,6 +424,7 @@ radosgw_SOURCES = \ rgw/rgw_rest_metadata.cc \ rgw/rgw_replica_log.cc \ rgw/rgw_rest_log.cc \ + rgw/rgw_rest_opstate.cc \ rgw/rgw_http_client.cc \ rgw/rgw_swift.cc \ rgw/rgw_swift_auth.cc \ @@ -986,6 +987,13 @@ unittest_rgw_log_LDADD = librgw.a ${UNITTEST_LDADD} ${UNITTEST_STATIC_LDADD} -lc libcls_log_client.a libcls_statelog_client.a libcls_refcount_client.a libcls_rgw_client.a libcls_lock_client.a unittest_rgw_log_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} bin_DEBUGPROGRAMS += unittest_rgw_log + +unittest_rgw_opstate_SOURCES = test/test_rgw_admin_opstate.cc +unittest_rgw_opstate_LDFLAGS = libglobal.la +unittest_rgw_opstate_LDADD = librgw.a ${UNITTEST_LDADD} ${UNITTEST_STATIC_LDADD} -lcryptopp -lcurl -luuid -lexpat librados.la libcls_version_client.a \ + libcls_log_client.a libcls_statelog_client.a libcls_refcount_client.a libcls_rgw_client.a libcls_lock_client.a +unittest_rgw_opstate_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} +bin_DEBUGPROGRAMS += unittest_rgw_opstate endif ceph_test_librbd_SOURCES = test/librbd/test_librbd.cc test/librados/test.cc @@ -2143,6 +2151,7 @@ noinst_HEADERS = \ rgw/rgw_tools.h\ rgw/rgw_rest_metadata.h\ rgw/rgw_rest_log.h\ + rgw/rgw_rest_opstate.h\ rgw/rgw_usage.h\ rgw/rgw_user.h\ rgw/rgw_bucket.h\ diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 30fdac966cd..52f4af54f99 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -98,8 +98,8 @@ void _usage() cerr << " opstate list list stateful operations entries (use client_id,\n"; cerr << " op_id, object)\n"; cerr << " opstate set set state on an entry (use client_id, op_id, object)\n"; - cerr << " opstate renewstate renew state on an entry (use client_id, op_id, object)\n"; - cerr << " opstate rmstate remove entry (use client_id, op_id, object)\n"; + cerr << " opstate renew renew state on an entry (use client_id, op_id, object)\n"; + cerr << " opstate rm remove entry (use client_id, op_id, object)\n"; cerr << " replicamdlog get get the replica metadata log\n"; cerr << " replicamdlog delete delete the replica metadata log\n"; cerr << " replicadatalog get get the replica data log\n"; diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index e9c12a3d35c..7bcd06f6a91 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -649,7 +649,7 @@ struct RGWBucketInfo ::encode(owner, bl); ::encode(flags, bl); ::encode(region, bl); - ::encode(creation_time, bl); + ::encode((uint64_t)creation_time, bl); ::encode(placement_rule, bl); ::encode(has_instance_obj, bl); ENCODE_FINISH(bl); @@ -664,7 +664,7 @@ struct RGWBucketInfo if (struct_v >= 5) ::decode(region, bl); if (struct_v >= 6) - ::decode(creation_time, bl); + ::decode((uint64_t&)creation_time, bl); if (struct_v >= 7) ::decode(placement_rule, bl); if (struct_v >= 8) diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index ba894334444..f2170929d6a 100644 --- a/src/rgw/rgw_main.cc +++ b/src/rgw/rgw_main.cc @@ -42,6 +42,7 @@ #include "rgw_rest_bucket.h" #include "rgw_rest_metadata.h" #include "rgw_rest_log.h" +#include "rgw_rest_opstate.h" #include "rgw_swift_auth.h" #include "rgw_swift.h" #include "rgw_log.h" @@ -506,6 +507,7 @@ int main(int argc, const char **argv) /*Registering resource for /admin/metadata */ admin_resource->register_resource("metadata", new RGWRESTMgr_Metadata); admin_resource->register_resource("log", new RGWRESTMgr_Log); + admin_resource->register_resource("opstate", new RGWRESTMgr_Opstate); rest.register_resource(g_conf->rgw_admin_entry, admin_resource); } diff --git a/src/rgw/rgw_rest_opstate.cc b/src/rgw/rgw_rest_opstate.cc new file mode 100644 index 00000000000..434b0db5989 --- /dev/null +++ b/src/rgw/rgw_rest_opstate.cc @@ -0,0 +1,189 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab +/* + * Ceph - scalable distributed file system + * + * Copyright (C) 2013 eNovance SAS <licensing@enovance.com> + * + * This is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software + * Foundation. See file COPYING. + * + */ +#include "common/ceph_json.h" +#include "common/strtol.h" +#include "rgw_rest.h" +#include "rgw_op.h" +#include "rgw_rest_s3.h" +#include "rgw_rest_opstate.h" +#include "rgw_client_io.h" +#include "common/errno.h" + +#define OPSTATE_LIST_MAX_ENTRIES 1000 +#define dout_subsys ceph_subsys_rgw + +void RGWOp_Opstate_List::execute() { + string client_id = s->info.args.get("client-id"), + op_id = s->info.args.get("op-id"), + object = s->info.args.get("object"), + max_entries_str = s->info.args.get("max-entries"); + unsigned max_entries = OPSTATE_LIST_MAX_ENTRIES; + + if (!max_entries_str.empty()) { + string err; + max_entries = (unsigned)strict_strtol(max_entries_str.c_str(), 10, &err); + if (!err.empty()) { + dout(5) << "Error parsing max-entries " << max_entries_str << dendl; + http_ret = -EINVAL; + return; + } + } + + RGWOpState oc = RGWOpState(store); + void *handle; + bool done; + list<cls_statelog_entry> entries; + + oc.init_list_entries(client_id, op_id, object, &handle); + + http_ret = 0; + send_response(); + do { + int ret = oc.list_entries(handle, max_entries, entries, &done); + + if (ret < 0) { + dout(5) << "oc.list_entries failed with error " << ret << dendl; + http_ret = ret; + oc.finish_list_entries(handle); + return; + } + + if (!max_entries_str.empty()) + max_entries -= entries.size(); + + send_response(entries); + } while (!done && max_entries > 0); + + oc.finish_list_entries(handle); + send_response_end(); +} + +void RGWOp_Opstate_List::send_response() { + if (sent_header) + return; + + set_req_state_err(s, http_ret); + dump_errno(s); + end_header(s); + + sent_header = true; + + if (http_ret < 0) + return; + + s->formatter->open_array_section("entries"); +} + +void RGWOp_Opstate_List::send_response(list<cls_statelog_entry> entries) { + RGWOpState oc(store); + for (list<cls_statelog_entry>::iterator it = entries.begin(); + it != entries.end(); it++) { + oc.dump_entry(*it, s->formatter); + flusher.flush(); + } +} + +void RGWOp_Opstate_List::send_response_end() { + s->formatter->close_section(); + flusher.flush(); +} + +void RGWOp_Opstate_Set::execute() { + string client_id = s->info.args.get("client-id"), + op_id = s->info.args.get("op-id"), + object = s->info.args.get("object"), + state_str = s->info.args.get("state"); + + if (client_id.empty() || + op_id.empty() || + object.empty() || + state_str.empty()) { + dout(5) << "Error - invalid parameter list" << dendl; + http_ret = -EINVAL; + return; + } + + RGWOpState oc(store); + RGWOpState::OpState state; + + http_ret = oc.state_from_str(state_str, &state); + if (http_ret < 0) { + dout(5) << "Error - invalid state" << dendl; + return; + } + + http_ret = oc.set_state(client_id, op_id, object, state); + if (http_ret < 0) { + dout(5) << "Error - Unable to set state" << dendl; + return; + } +} + +void RGWOp_Opstate_Renew::execute() { + string client_id = s->info.args.get("client-id"), + op_id = s->info.args.get("op-id"), + object = s->info.args.get("object"), + state_str = s->info.args.get("state"); + + if (client_id.empty() || + op_id.empty() || + object.empty() || + state_str.empty()) { + dout(5) << "Error - invalid parameter list" << dendl; + http_ret = -EINVAL; + return; + } + RGWOpState oc(store); + RGWOpState::OpState state; + + http_ret = oc.state_from_str(state_str, &state); + if (http_ret < 0) { + dout(5) << "Error - invalid state" << dendl; + return; + } + + http_ret = oc.renew_state(client_id, op_id, object, state); + if (http_ret < 0) { + dout(5) << "Error - Unable to renew state" << dendl; + return; + } +} + +void RGWOp_Opstate_Delete::execute() { + string client_id = s->info.args.get("client-id"), + op_id = s->info.args.get("op-id"), + object = s->info.args.get("object"); + + if (client_id.empty() || + op_id.empty() || + object.empty()) { + dout(5) << "Error - invalid parameter list" << dendl; + http_ret = -EINVAL; + return; + } + + RGWOpState oc(store); + + http_ret = oc.remove_entry(client_id, op_id, object); + if (http_ret < 0) { + dout(5) << "Error - Unable to remove entry" << dendl; + } +} + +RGWOp *RGWHandler_Opstate::op_post() { + if (s->info.args.exists("renew")) { + return new RGWOp_Opstate_Renew; + } + return new RGWOp_Opstate_Set; +} diff --git a/src/rgw/rgw_rest_opstate.h b/src/rgw/rgw_rest_opstate.h new file mode 100644 index 00000000000..0d069e0c9c0 --- /dev/null +++ b/src/rgw/rgw_rest_opstate.h @@ -0,0 +1,109 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab +/* + * Ceph - scalable distributed file system + * + * Copyright (C) 2013 eNovance SAS <licensing@enovance.com> + * + * This is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software + * Foundation. See file COPYING. + * + */ +#ifndef CEPH_RGW_REST_OPSTATE_H +#define CEPH_RGW_REST_OPSTATE_H + +class RGWOp_Opstate_List : public RGWRESTOp { + bool sent_header; +public: + RGWOp_Opstate_List() {} + ~RGWOp_Opstate_List() {} + + int check_caps(RGWUserCaps& caps) { + return caps.check_cap("opstate", RGW_CAP_READ); + } + int verify_permission() { + return check_caps(s->user.caps); + } + void execute(); + virtual void send_response(); + virtual void send_response(list<cls_statelog_entry> entries); + virtual void send_response_end(); + virtual const char *name() { + return "opstate_list"; + } +}; + +class RGWOp_Opstate_Set : public RGWRESTOp { +public: + RGWOp_Opstate_Set() {} + ~RGWOp_Opstate_Set() {} + + int check_caps(RGWUserCaps& caps) { + return caps.check_cap("opstate", RGW_CAP_WRITE); + } + void execute(); + virtual const char *name() { + return "set_opstate"; + } +}; + +class RGWOp_Opstate_Renew : public RGWRESTOp { +public: + RGWOp_Opstate_Renew() {} + ~RGWOp_Opstate_Renew() {} + + int check_caps(RGWUserCaps& caps) { + return caps.check_cap("opstate", RGW_CAP_WRITE); + } + void execute(); + virtual const char *name() { + return "renew_opstate"; + } +}; + +class RGWOp_Opstate_Delete : public RGWRESTOp { +public: + RGWOp_Opstate_Delete() {} + ~RGWOp_Opstate_Delete() {} + + int check_caps(RGWUserCaps& caps) { + return caps.check_cap("opstate", RGW_CAP_WRITE); + } + void execute(); + virtual const char *name() { + return "delete_opstate"; + } +}; + +class RGWHandler_Opstate : public RGWHandler_Auth_S3 { +protected: + RGWOp *op_get() { + return new RGWOp_Opstate_List; + } + RGWOp *op_delete() { + return new RGWOp_Opstate_Delete; + } + RGWOp *op_post(); + + int read_permissions(RGWOp*) { + return 0; + } +public: + RGWHandler_Opstate() : RGWHandler_Auth_S3() {} + virtual ~RGWHandler_Opstate() {} +}; + +class RGWRESTMgr_Opstate : public RGWRESTMgr { +public: + RGWRESTMgr_Opstate() {} + virtual ~RGWRESTMgr_Opstate() {} + + virtual RGWHandler *get_handler(struct req_state *s){ + return new RGWHandler_Opstate; + } +}; + +#endif /*!CEPH_RGW_REST_OPSTATE_H*/ + diff --git a/src/test/test_rgw_admin_opstate.cc b/src/test/test_rgw_admin_opstate.cc new file mode 100644 index 00000000000..df99dd814d8 --- /dev/null +++ b/src/test/test_rgw_admin_opstate.cc @@ -0,0 +1,836 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab +/* + * Ceph - scalable distributed file system + * + * Copyright (C) 2013 eNovance SAS <licensing@enovance.com> + * + * This is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software + * Foundation. See file COPYING. + * + */ +#include <iostream> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include <time.h> +#include <sys/wait.h> +#include <unistd.h> +#include <fstream> +#include <map> +#include <list> +extern "C"{ +#include <curl/curl.h> +} +#include "common/ceph_crypto.h" +#include "include/str_list.h" +#include "common/ceph_json.h" +#include "common/code_environment.h" +#include "common/ceph_argparse.h" +#include "common/Finisher.h" +#include "global/global_init.h" +#include "rgw/rgw_common.h" +#include "rgw/rgw_bucket.h" +#include "rgw/rgw_rados.h" +#include "include/utime.h" +#include "include/object.h" +#include "cls/statelog/cls_statelog_types.h" +#define GTEST +#ifdef GTEST +#include <gtest/gtest.h> +#else +#define TEST(x, y) void y() +#define ASSERT_EQ(v, s) if(v != s)cout << "Error at " << __LINE__ << "(" << #v << "!= " << #s << "\n"; \ + else cout << "(" << #v << "==" << #s << ") PASSED\n"; +#define EXPECT_EQ(v, s) ASSERT_EQ(v, s) +#define ASSERT_TRUE(c) if(c)cout << "Error at " << __LINE__ << "(" << #c << ")" << "\n"; \ + else cout << "(" << #c << ") PASSED\n"; +#define EXPECT_TRUE(c) ASSERT_TRUE(c) +#endif +using namespace std; + +#define CURL_VERBOSE 0 +#define HTTP_RESPONSE_STR "RespCode" +#define CEPH_CRYPTO_HMACSHA1_DIGESTSIZE 20 +#define RGW_ADMIN_RESP_PATH "/tmp/.test_rgw_admin_resp" + +static string uid = "ceph"; +static string display_name = "CEPH"; + +extern "C" int ceph_armor(char *dst, const char *dst_end, + const char *src, const char *end); +static void print_usage(char *exec){ + cout << "Usage: " << exec << " <Options>\n"; + cout << "Options:\n" + "-g <gw-ip> - The ip address of the gateway\n" + "-p <gw-port> - The port number of the gateway\n" + "-c <ceph.conf> - Absolute path of ceph config file\n" + "-rgw-admin <path/to/radosgw-admin> - radosgw-admin absolute path\n"; +} + +namespace admin_log { +class test_helper { + private: + string host; + string port; + string creds; + string rgw_admin_path; + string conf_path; + CURL *curl_inst; + map<string, string> response; + list<string> extra_hdrs; + string *resp_data; + unsigned resp_code; + public: + test_helper() : resp_data(NULL){ + curl_global_init(CURL_GLOBAL_ALL); + } + ~test_helper(){ + curl_global_cleanup(); + } + int send_request(string method, string uri, + size_t (*function)(void *,size_t,size_t,void *) = 0, + void *ud = 0, size_t length = 0); + int extract_input(int argc, char *argv[]); + string& get_response(string hdr){ + return response[hdr]; + } + void set_extra_header(string hdr){ + extra_hdrs.push_back(hdr); + } + void set_response(char *val); + void set_response_data(char *data, size_t len){ + if(resp_data) delete resp_data; + resp_data = new string(data, len); + } + string& get_rgw_admin_path() { + return rgw_admin_path; + } + string& get_ceph_conf_path() { + return conf_path; + } + void set_creds(string& c) { + creds = c; + } + const string *get_response_data(){return resp_data;} + unsigned get_resp_code(){return resp_code;} +}; + +int test_helper::extract_input(int argc, char *argv[]){ +#define ERR_CHECK_NEXT_PARAM(o) \ + if((loop + 1) >= argc)return -1; \ + else o = argv[loop+1]; + + for(unsigned loop = 1;loop < (unsigned)argc; loop += 2){ + if(strcmp(argv[loop], "-g") == 0){ + ERR_CHECK_NEXT_PARAM(host); + }else if(strcmp(argv[loop],"-p") == 0){ + ERR_CHECK_NEXT_PARAM(port); + }else if(strcmp(argv[loop], "-c") == 0){ + ERR_CHECK_NEXT_PARAM(conf_path); + }else if(strcmp(argv[loop], "-rgw-admin") == 0){ + ERR_CHECK_NEXT_PARAM(rgw_admin_path); + }else return -1; + } + if(host.length() <= 0 || + rgw_admin_path.length() <= 0) + return -1; + return 0; +} + +void test_helper::set_response(char *r){ + string sr(r), h, v; + unsigned off = sr.find(": "); + if(off != string::npos){ + h.assign(sr, 0, off); + v.assign(sr, off + 2, sr.find("\r\n") - (off+2)); + }else{ + /*Could be the status code*/ + if(sr.find("HTTP/") != string::npos){ + h.assign(HTTP_RESPONSE_STR); + off = sr.find(" "); + v.assign(sr, off + 1, sr.find("\r\n") - (off + 1)); + resp_code = atoi((v.substr(0, 3)).c_str()); + } + } + response[h] = v; +} + +size_t write_header(void *ptr, size_t size, size_t nmemb, void *ud){ + test_helper *h = (test_helper *)ud; + h->set_response((char *)ptr); + return size*nmemb; +} + +size_t write_data(void *ptr, size_t size, size_t nmemb, void *ud){ + test_helper *h = (test_helper *)ud; + h->set_response_data((char *)ptr, size*nmemb); + return size*nmemb; +} + +static inline void buf_to_hex(const unsigned char *buf, int len, char *str) +{ + int i; + str[0] = '\0'; + for (i = 0; i < len; i++) { + sprintf(&str[i*2], "%02x", (int)buf[i]); + } +} + +static void calc_hmac_sha1(const char *key, int key_len, + const char *msg, int msg_len, char *dest) +/* destination should be CEPH_CRYPTO_HMACSHA1_DIGESTSIZE bytes long */ +{ + ceph::crypto::HMACSHA1 hmac((const unsigned char *)key, key_len); + hmac.Update((const unsigned char *)msg, msg_len); + hmac.Final((unsigned char *)dest); + + char hex_str[(CEPH_CRYPTO_HMACSHA1_DIGESTSIZE * 2) + 1]; + admin_log::buf_to_hex((unsigned char *)dest, CEPH_CRYPTO_HMACSHA1_DIGESTSIZE, hex_str); +} + +static int get_s3_auth(string method, string creds, string date, string res, string& out){ + string aid, secret, auth_hdr; + string tmp_res; + unsigned off = creds.find(":"); + out = ""; + if(off != string::npos){ + aid.assign(creds, 0, off); + secret.assign(creds, off + 1, string::npos); + + /*sprintf(auth_hdr, "%s\n\n\n%s\n%s", req_type, date, res);*/ + char hmac_sha1[CEPH_CRYPTO_HMACSHA1_DIGESTSIZE]; + char b64[65]; /* 64 is really enough */ + unsigned off = res.find("?"); + if(off == string::npos) + tmp_res = res; + else + tmp_res.assign(res, 0, off); + auth_hdr.append(method + string("\n\n\n") + date + string("\n") + tmp_res); + admin_log::calc_hmac_sha1(secret.c_str(), secret.length(), + auth_hdr.c_str(), auth_hdr.length(), hmac_sha1); + int ret = ceph_armor(b64, b64 + 64, hmac_sha1, + hmac_sha1 + CEPH_CRYPTO_HMACSHA1_DIGESTSIZE); + if (ret < 0) { + cout << "ceph_armor failed\n"; + return -1; + } + b64[ret] = 0; + out.append(aid + string(":") + b64); + }else return -1; + return 0; +} + +void get_date(string& d){ + struct timeval tv; + char date[64]; + struct tm tm; + char *days[] = {(char *)"Sun", (char *)"Mon", (char *)"Tue", + (char *)"Wed", (char *)"Thu", (char *)"Fri", + (char *)"Sat"}; + char *months[] = {(char *)"Jan", (char *)"Feb", (char *)"Mar", + (char *)"Apr", (char *)"May", (char *)"Jun", + (char *)"Jul",(char *) "Aug", (char *)"Sep", + (char *)"Oct", (char *)"Nov", (char *)"Dec"}; + gettimeofday(&tv, NULL); + gmtime_r(&tv.tv_sec, &tm); + sprintf(date, "%s, %d %s %d %d:%d:%d GMT", + days[tm.tm_wday], + tm.tm_mday, months[tm.tm_mon], + tm.tm_year + 1900, + tm.tm_hour, tm.tm_min, tm.tm_sec); + d = date; +} + +int test_helper::send_request(string method, string res, + size_t (*read_function)( void *,size_t,size_t,void *), + void *ud, + size_t length){ + string url; + string auth, date; + url.append(string("http://") + host); + if(port.length() > 0)url.append(string(":") + port); + url.append(res); + curl_inst = curl_easy_init(); + if(curl_inst){ + curl_easy_setopt(curl_inst, CURLOPT_URL, url.c_str()); + curl_easy_setopt(curl_inst, CURLOPT_CUSTOMREQUEST, method.c_str()); + curl_easy_setopt(curl_inst, CURLOPT_VERBOSE, CURL_VERBOSE); + curl_easy_setopt(curl_inst, CURLOPT_HEADERFUNCTION, admin_log::write_header); + curl_easy_setopt(curl_inst, CURLOPT_WRITEHEADER, (void *)this); + curl_easy_setopt(curl_inst, CURLOPT_WRITEFUNCTION, admin_log::write_data); + curl_easy_setopt(curl_inst, CURLOPT_WRITEDATA, (void *)this); + if(read_function){ + curl_easy_setopt(curl_inst, CURLOPT_READFUNCTION, read_function); + curl_easy_setopt(curl_inst, CURLOPT_READDATA, (void *)ud); + curl_easy_setopt(curl_inst, CURLOPT_UPLOAD, 1L); + curl_easy_setopt(curl_inst, CURLOPT_INFILESIZE_LARGE, (curl_off_t)length); + } + + get_date(date); + string http_date; + http_date.append(string("Date: ") + date); + + string s3auth; + if (admin_log::get_s3_auth(method, creds, date, res, s3auth) < 0) + return -1; + auth.append(string("Authorization: AWS ") + s3auth); + + struct curl_slist *slist = NULL; + slist = curl_slist_append(slist, auth.c_str()); + slist = curl_slist_append(slist, http_date.c_str()); + for(list<string>::iterator it = extra_hdrs.begin(); + it != extra_hdrs.end(); it++){ + slist = curl_slist_append(slist, (*it).c_str()); + } + if(read_function) + curl_slist_append(slist, "Expect:"); + curl_easy_setopt(curl_inst, CURLOPT_HTTPHEADER, slist); + + response.erase(response.begin(), response.end()); + extra_hdrs.erase(extra_hdrs.begin(), extra_hdrs.end()); + CURLcode res = curl_easy_perform(curl_inst); + if(res != CURLE_OK){ + cout << "Curl perform failed for " << url << ", res: " << + curl_easy_strerror(res) << "\n"; + return -1; + } + curl_slist_free_all(slist); + } + curl_easy_cleanup(curl_inst); + return 0; +} +}; + +admin_log::test_helper *g_test; +Finisher *finisher; +RGWRados *store; + +int run_rgw_admin(string& cmd, string& resp) { + pid_t pid; + pid = fork(); + if (pid == 0) { + /* child */ + list<string> l; + get_str_list(cmd, " \t", l); + char *argv[l.size()]; + unsigned loop = 1; + + argv[0] = (char *)"radosgw-admin"; + for (list<string>::iterator it = l.begin(); + it != l.end(); it++) { + argv[loop++] = (char *)(*it).c_str(); + } + argv[loop] = NULL; + close(1); + stdout = fopen(RGW_ADMIN_RESP_PATH, "w+"); + if (!stdout) { + cout << "Unable to open stdout file" << std::endl; + } + execv((g_test->get_rgw_admin_path()).c_str(), argv); + } else if (pid > 0) { + int status; + waitpid(pid, &status, 0); + if (WIFEXITED(status)) { + if(WEXITSTATUS(status) != 0) { + cout << "Child exited with status " << WEXITSTATUS(status) << std::endl; + return -1; + } + } + ifstream in; + struct stat st; + + if (stat(RGW_ADMIN_RESP_PATH, &st) < 0) { + cout << "Error stating the admin response file, errno " << errno << std::endl; + return -1; + } else { + char *data = (char *)malloc(st.st_size + 1); + in.open(RGW_ADMIN_RESP_PATH); + in.read(data, st.st_size); + in.close(); + data[st.st_size] = 0; + resp = data; + free(data); + unlink(RGW_ADMIN_RESP_PATH); + /* cout << "radosgw-admin " << cmd << ": " << resp << std::endl; */ + } + } else + return -1; + return 0; +} + +int get_creds(string& json, string& creds) { + JSONParser parser; + if(!parser.parse(json.c_str(), json.length())) { + cout << "Error parsing create user response" << std::endl; + return -1; + } + + RGWUserInfo info; + decode_json_obj(info, &parser); + creds = ""; + for(map<string, RGWAccessKey>::iterator it = info.access_keys.begin(); + it != info.access_keys.end(); it++) { + RGWAccessKey _k = it->second; + /*cout << "accesskeys [ " << it->first << " ] = " << + "{ " << _k.id << ", " << _k.key << ", " << _k.subuser << "}" << std::endl;*/ + creds.append(it->first + string(":") + _k.key); + break; + } + return 0; +} + +int user_create(string& uid, string& display_name, bool set_creds = true) { + stringstream ss; + string creds; + ss << "-c " << g_test->get_ceph_conf_path() << " user create --uid=" << uid + << " --display-name=" << display_name; + + string out; + string cmd = ss.str(); + if(run_rgw_admin(cmd, out) != 0) { + cout << "Error creating user" << std::endl; + return -1; + } + get_creds(out, creds); + if(set_creds) + g_test->set_creds(creds); + return 0; +} + +int user_info(string& uid, string& display_name, RGWUserInfo& uinfo) { + stringstream ss; + string creds; + ss << "-c " << g_test->get_ceph_conf_path() << " user info --uid=" << uid + << " --display-name=" << display_name; + + string out; + string cmd = ss.str(); + if(run_rgw_admin(cmd, out) != 0) { + cout << "Error reading user information" << std::endl; + return -1; + } + JSONParser parser; + if(!parser.parse(out.c_str(), out.length())) { + cout << "Error parsing create user response" << std::endl; + return -1; + } + decode_json_obj(uinfo, &parser); + return 0; +} + +int user_rm(string& uid, string& display_name) { + stringstream ss; + string creds; + ss << "-c " << g_test->get_ceph_conf_path() << + " metadata rm --metadata-key=user:" << uid; + + string out; + string cmd = ss.str(); + if(run_rgw_admin(cmd, out) != 0) { + cout << "Error removing user" << std::endl; + return -1; + } + return 0; +} + +int caps_add(const char * name, const char *perm) { + stringstream ss; + + ss << "-c " << g_test->get_ceph_conf_path() << " caps add --caps=" << + name << "=" << perm << " --uid=" << uid; + string out; + string cmd = ss.str(); + if(run_rgw_admin(cmd, out) != 0) { + cout << "Error creating user" << std::endl; + return -1; + } + return 0; +} + +int caps_rm(const char * name, const char *perm) { + stringstream ss; + + ss << "-c " << g_test->get_ceph_conf_path() << " caps rm --caps=" << + name << "=" << perm << " --uid=" << uid; + string out; + string cmd = ss.str(); + if(run_rgw_admin(cmd, out) != 0) { + cout << "Error creating user" << std::endl; + return -1; + } + return 0; +} + +size_t read_dummy_post(void *ptr, size_t s, size_t n, void *ud) { + int dummy = 0; + memcpy(ptr, &dummy, sizeof(dummy)); + return sizeof(dummy); +} + +int parse_json_resp(JSONParser &parser) { + string *resp; + resp = (string *)g_test->get_response_data(); + if(!resp) + return -1; + if(!parser.parse(resp->c_str(), resp->length())) { + cout << "Error parsing create user response" << std::endl; + return -1; + } + return 0; +} + +static int decode_json(JSONObj *obj, cls_statelog_entry& ret) { + JSONDecoder::decode_json("op_id", ret.op_id, obj); + JSONDecoder::decode_json("client_id", ret.client_id, obj); + JSONDecoder::decode_json("object", ret.object, obj); + string state; + JSONDecoder::decode_json("state", state, obj); + RGWOpState oc(store); + return oc.state_from_str(state, (RGWOpState::OpState *)&ret.state); +} + +static int get_opstate_list(list<cls_statelog_entry> &entries) { + JSONParser parser; + if (parse_json_resp(parser) != 0) + return -1; + if (!parser.is_array()) + return -1; + + vector<string> l; + l = parser.get_array_elements(); + int loop = 0; + for(vector<string>::iterator it = l.begin(); + it != l.end(); it++, loop++) { + JSONParser jp; + cls_statelog_entry entry; + + if(!jp.parse((*it).c_str(), (*it).length())) { + cerr << "Error parsing log json object" << std::endl; + return -1; + } + EXPECT_EQ(decode_json((JSONObj *)&jp, entry), 0); + entries.push_back(entry); + } + return 0; +} + + +TEST(TestRGWAdmin, opstate_set_list_delete) { + const char *cname = "opstate", + *perm = "*"; + string rest_req; + stringstream ss; + list<cls_statelog_entry> entries; + string cid_1 = "cid_1", cid_2 = "cid_2"; + string oid_1 = "operation", oid_2 = "operation"; + string obj_1 = "obj1", obj_2 = "obj2"; + string state; + + ASSERT_EQ(user_create(uid, display_name), 0); + ASSERT_EQ(0, caps_add(cname, perm)); + + rest_req = "/admin/opstate?client-id=1&op-id=1&object=o"; + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(400U, g_test->get_resp_code()); /*Missing state*/ + + rest_req = "/admin/opstate?client-id=1&op-id=1&state=in-progress"; + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(400U, g_test->get_resp_code()); /*Missing object*/ + + rest_req = "/admin/opstate?client-id=1&state=in-progress&object=o"; + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(400U, g_test->get_resp_code()); /*Missing op-id*/ + + rest_req = "/admin/opstate?state=in-progress&op-id=1&object=o"; + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(400U, g_test->get_resp_code()); /*Missing client-id*/ + + rest_req = "/admin/opstate?state=invalid&op-id=1&object=o&client-id=1"; + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(400U, g_test->get_resp_code()); /*Invalid state*/ + + state = "in-progress"; + entries.clear(); + ss << "/admin/opstate?client-id=" << cid_1 << "&op-id=" << oid_1 + << "&object=" << obj_1 << "&state=" << state; + rest_req = ss.str(); + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(200U, g_test->get_resp_code()); + + ss.str(""); + entries.clear(); + rest_req = "/admin/opstate"; + g_test->send_request(string("GET"), rest_req); + EXPECT_EQ(200U, g_test->get_resp_code()); + EXPECT_EQ(get_opstate_list(entries), 0); + EXPECT_EQ(entries.size(), 1U); + + if (entries.size() == 1U) { + list<cls_statelog_entry>::iterator it = entries.begin(); + + EXPECT_TRUE((*it).client_id.compare(cid_1) == 0); + EXPECT_TRUE((*it).op_id.compare(oid_1) == 0); + EXPECT_TRUE((*it).object.compare(obj_1) == 0); + EXPECT_EQ((*it).state, RGWOpState::OPSTATE_IN_PROGRESS); + } + + state = "complete"; + ss.str(""); + entries.clear(); + ss << "/admin/opstate?client-id=" << cid_1 << "&op-id=" << oid_1 + << "&object=" << obj_1 << "&state=" << state; + rest_req = ss.str(); + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(200U, g_test->get_resp_code()); + + entries.clear(); + rest_req = "/admin/opstate"; + g_test->send_request(string("GET"), rest_req); + EXPECT_EQ(200U, g_test->get_resp_code()); + EXPECT_EQ(get_opstate_list(entries), 0); + EXPECT_EQ(entries.size(), 1U); + + if (entries.size() == 1U) { + list<cls_statelog_entry>::iterator it = entries.begin(); + + EXPECT_TRUE((*it).client_id.compare(cid_1) == 0); + EXPECT_TRUE((*it).op_id.compare(oid_1) == 0); + EXPECT_TRUE((*it).object.compare(obj_1) == 0); + EXPECT_EQ((*it).state, RGWOpState::OPSTATE_COMPLETE); + } + + ss.str(""); + entries.clear(); + ss << "/admin/opstate?client-id=" << cid_2 << "&op-id=" << oid_2 + << "&object=" << obj_2 << "&state=" << state; + rest_req = ss.str(); + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(200U, g_test->get_resp_code()); + + entries.clear(); + rest_req = "/admin/opstate"; + g_test->send_request(string("GET"), rest_req); + EXPECT_EQ(200U, g_test->get_resp_code()); + EXPECT_EQ(get_opstate_list(entries), 0); + EXPECT_EQ(entries.size(), 2U); + + if (entries.size() == 1U) { + list<cls_statelog_entry>::iterator it = entries.begin(); + + EXPECT_TRUE((*it).client_id.compare(cid_1) == 0); + EXPECT_TRUE((*it).op_id.compare(oid_1) == 0); + EXPECT_TRUE((*it).object.compare(obj_1) == 0); + EXPECT_EQ((*it).state, RGWOpState::OPSTATE_COMPLETE); + + it++; + EXPECT_TRUE((*it).client_id.compare(cid_2) == 0); + EXPECT_TRUE((*it).op_id.compare(oid_2) == 0); + EXPECT_TRUE((*it).object.compare(obj_2) == 0); + EXPECT_EQ((*it).state, RGWOpState::OPSTATE_COMPLETE); + } + + entries.clear(); + rest_req = "/admin/opstate?max-entries=1"; + g_test->send_request(string("GET"), rest_req); + EXPECT_EQ(200U, g_test->get_resp_code()); + EXPECT_EQ(get_opstate_list(entries), 0); + EXPECT_EQ(entries.size(), 1U); + + ss.str(""); + entries.clear(); + ss << "/admin/opstate?client-id=" << cid_2 << "&op-id=" << oid_2 << "&object=" << obj_2; + rest_req = ss.str(); + g_test->send_request(string("GET"), rest_req); + EXPECT_EQ(200U, g_test->get_resp_code()); + EXPECT_EQ(get_opstate_list(entries), 0); + EXPECT_EQ(entries.size(), 1U); + + ss.str(""); + entries.clear(); + ss << "/admin/opstate?client-id=" << cid_2; + rest_req = ss.str(); + g_test->send_request(string("GET"), rest_req); + EXPECT_EQ(200U, g_test->get_resp_code()); + EXPECT_EQ(get_opstate_list(entries), 0); + EXPECT_EQ(entries.size(), 1U); + + ss.str(""); + entries.clear(); + ss << "/admin/opstate?op-id=" << oid_2; + rest_req = ss.str(); + g_test->send_request(string("GET"), rest_req); + EXPECT_EQ(200U, g_test->get_resp_code()); + EXPECT_EQ(get_opstate_list(entries), 0); + EXPECT_EQ(entries.size(), 2U); + + ss.str(""); + entries.clear(); + ss << "/admin/opstate?op-id=" << oid_2 << "&object=" << obj_1 << "&client-id=" << cid_2 ; + rest_req = ss.str(); + g_test->send_request(string("GET"), rest_req); + EXPECT_EQ(200U, g_test->get_resp_code()); + EXPECT_EQ(get_opstate_list(entries), 0); + EXPECT_EQ(entries.size(), 0U); + + rest_req = "/admin/opstate?client-id=1&op-id=1"; + g_test->send_request(string("DELETE"), rest_req); + EXPECT_EQ(400U, g_test->get_resp_code()); /*Missing object*/ + + rest_req = "/admin/opstate?client-id=1&object=1"; + g_test->send_request(string("DELETE"), rest_req); + EXPECT_EQ(400U, g_test->get_resp_code()); /*Missing op-id*/ + + rest_req = "/admin/opstate?object=1&op-id=1"; + g_test->send_request(string("DELETE"), rest_req); + EXPECT_EQ(400U, g_test->get_resp_code()); /*Missing client-id*/ + + rest_req = "/admin/opstate?object=1&op-id=1&client-id=1"; + g_test->send_request(string("DELETE"), rest_req); + EXPECT_EQ(404U, g_test->get_resp_code()); + + ss.str(""); + ss << "/admin/opstate?client-id=" << cid_1 << "&op-id=" << oid_1 + << "&object=" << obj_1; + rest_req = ss.str(); + g_test->send_request(string("DELETE"), rest_req); + EXPECT_EQ(200U, g_test->get_resp_code()); + + ss.str(""); + entries.clear(); + ss << "/admin/opstate"; + rest_req = ss.str(); + g_test->send_request(string("GET"), rest_req); + EXPECT_EQ(200U, g_test->get_resp_code()); + EXPECT_EQ(get_opstate_list(entries), 0); + EXPECT_EQ(entries.size(), 1U); + + ss.str(""); + ss << "/admin/opstate?client-id=" << cid_2 << "&op-id=" << oid_2 + << "&object=" << obj_2; + rest_req = ss.str(); + g_test->send_request(string("DELETE"), rest_req); + EXPECT_EQ(200U, g_test->get_resp_code()); + + ss.str(""); + entries.clear(); + ss << "/admin/opstate"; + rest_req = ss.str(); + g_test->send_request(string("GET"), rest_req); + EXPECT_EQ(200U, g_test->get_resp_code()); + EXPECT_EQ(get_opstate_list(entries), 0); + EXPECT_EQ(entries.size(), 0U); + + ASSERT_EQ(caps_rm(cname, perm), 0); + ASSERT_EQ(user_rm(uid, display_name), 0); +} + +TEST(TestRGWAdmin, opstate_renew) { + const char *cname = "opstate", + *perm = "*"; + string rest_req; + stringstream ss; + string cid_1 = "cid_1"; + string oid_1 = "operation"; + string obj_1 = "obj1"; + string state; + + ASSERT_EQ(user_create(uid, display_name), 0); + ASSERT_EQ(0, caps_add(cname, perm)); + + rest_req = "/admin/opstate?renew&client-id=1&op-id=1&object=o"; + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(400U, g_test->get_resp_code()); /*Missing state*/ + + rest_req = "/admin/opstate?renew&client-id=1&op-id=1&state=in-progress"; + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(400U, g_test->get_resp_code()); /*Missing object*/ + + rest_req = "/admin/opstate?renew&client-id=1&state=in-progress&object=o"; + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(400U, g_test->get_resp_code()); /*Missing op-id*/ + + rest_req = "/admin/opstate?renew&state=in-progress&op-id=1&object=o"; + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(400U, g_test->get_resp_code()); /*Missing client-id*/ + + rest_req = "/admin/opstate?&renew&state=invalid&op-id=1&object=o&client-id=1"; + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(400U, g_test->get_resp_code()); /*Invalid state*/ + + state = "complete"; + ss.str(""); + ss << "/admin/opstate?client-id=" << cid_1 << "&op-id=" << oid_1 + << "&object=" << obj_1 << "&state=" << state; + rest_req = ss.str(); + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(200U, g_test->get_resp_code()); + + rest_req = "/admin/opstate"; + g_test->send_request(string("GET"), rest_req); + EXPECT_EQ(200U, g_test->get_resp_code()); + + ss.str(""); + ss << "/admin/opstate?renew&client-id=" << cid_1 << "&op-id=1" + << "&object=" << obj_1 << "&state=" << state; + rest_req = ss.str(); + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(404U, g_test->get_resp_code()); + + ss.str(""); + ss << "/admin/opstate?renew&client-id=" << cid_1 << "&op-id=" << oid_1 + << "&object=" << obj_1 << "&state=" << state; + rest_req = ss.str(); + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(200U, g_test->get_resp_code()); + + ss.str(""); + ss << "/admin/opstate?renew&client-id=" << cid_1 << "&op-id=" << oid_1 + << "&object=" << obj_1 << "&state=in-progress"; + rest_req = ss.str(); + g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); + EXPECT_EQ(500U, g_test->get_resp_code()); + + ss.str(""); + ss << "/admin/opstate?client-id=" << cid_1 << "&op-id=" << oid_1 + << "&object=" << obj_1; + rest_req = ss.str(); + g_test->send_request(string("DELETE"), rest_req); + EXPECT_EQ(200U, g_test->get_resp_code()); + + ASSERT_EQ(caps_rm(cname, perm), 0); + ASSERT_EQ(user_rm(uid, display_name), 0); +} + +int main(int argc, char *argv[]){ + vector<const char*> args; + argv_to_vec(argc, (const char **)argv, args); + + global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0); + common_init_finish(g_ceph_context); + store = RGWStoreManager::get_storage(g_ceph_context, false); + g_test = new admin_log::test_helper(); + finisher = new Finisher(g_ceph_context); +#ifdef GTEST + ::testing::InitGoogleTest(&argc, argv); +#endif + finisher->start(); + + if(g_test->extract_input(argc, argv) < 0){ + print_usage(argv[0]); + return -1; + } +#ifdef GTEST + int r = RUN_ALL_TESTS(); + if (r >= 0) { + cout << "There are no failures in the test case\n"; + } else { + cout << "There are some failures\n"; + } +#endif + finisher->stop(); + return 0; +} |