X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=339897cb1faf89fc4337e08605fd45122eeba697;hp=2545aea9af2d9dbb5d34b4a41a6d3363c35c3385;hb=74592ed100009a2d73e03861ae9626363f06aca9;hpb=f48194d3ff2a3983f21cab1553fbe29529f2e790 diff --git a/blob.c b/blob.c index 2545aea9..339897cb 100644 --- a/blob.c +++ b/blob.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 Andre Noll + * Copyright (C) 2007 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -9,6 +9,7 @@ #include #include #include +#include #include "para.h" #include "error.h" @@ -18,6 +19,8 @@ #include "afs.h" #include "ipc.h" #include "portable_io.h" +#include "sideband.h" +#include "command.h" /** * Compare two osl objects pointing to unsigned integers of 32 bit size. @@ -64,7 +67,7 @@ static struct osl_column_description blob_cols[] = { /** Define an osl table description for a blob table. */ #define DEFINE_BLOB_TABLE_DESC(table_name) \ - struct osl_table_description table_name ## _table_desc = { \ + static struct osl_table_description table_name ## _table_desc = { \ .name = #table_name, \ .num_columns = NUM_BLOB_COLUMNS, \ .flags = OSL_LARGE_TABLE, \ @@ -98,79 +101,67 @@ enum blob_ls_flags { BLOB_LS_FLAG_SORT_BY_ID = 4, }; -/** Structure passed to the \p print_blob function. */ -struct lsblob_action_data { - /** The flags given at the command line. */ - uint32_t flags; - /** Message buffer. */ - struct para_buffer pb; -}; - static int print_blob(struct osl_table *table, struct osl_row *row, const char *name, void *data) { - struct lsblob_action_data *lbad = data; + struct afs_callback_arg *aca = data; + uint32_t flags = *(uint32_t *)aca->query.data; struct osl_object obj; uint32_t id; int ret; - if (!(lbad->flags & BLOB_LS_FLAG_LONG)) - return para_printf(&lbad->pb, "%s\n", name); + if (!(flags & BLOB_LS_FLAG_LONG)) { + para_printf(&aca->pbout, "%s\n", name); + return 0; + } ret = osl(osl_get_object(table, row, BLOBCOL_ID, &obj)); if (ret < 0) { - para_printf(&lbad->pb, "%s: %s\n", name, para_strerror(-ret)); + para_printf(&aca->pbout, "cannot list %s\n", name); return ret; } id = *(uint32_t *)obj.data; - return para_printf(&lbad->pb, "%u\t%s\n", id, name); + para_printf(&aca->pbout, "%u\t%s\n", id, name); + return 1; } -static void com_lsblob_callback(struct osl_table *table, - int fd, const struct osl_object *query) +static int com_lsblob_callback(struct osl_table *table, + struct afs_callback_arg *aca) { - struct lsblob_action_data lbad = { - .flags = *(uint32_t *)query->data, - .pb = { - .max_size = shm_get_shmmax(), - .private_data = &fd, - .max_size_handler = pass_buffer_as_shm - } - }; + uint32_t flags = *(uint32_t *)aca->query.data; struct pattern_match_data pmd = { .table = table, - .patterns = {.data = (char *)query->data + sizeof(uint32_t), - .size = query->size - sizeof(uint32_t)}, + .patterns = {.data = (char *)aca->query.data + sizeof(uint32_t), + .size = aca->query.size - sizeof(uint32_t)}, .pm_flags = PM_NO_PATTERN_MATCHES_EVERYTHING | PM_SKIP_EMPTY_NAME, .match_col_num = BLOBCOL_NAME, - .data = &lbad, + .data = aca, .action = print_blob, }; int ret; - if (lbad.flags & BLOB_LS_FLAG_REVERSE) + if (flags & BLOB_LS_FLAG_REVERSE) pmd.pm_flags |= PM_REVERSE_LOOP; - if (!(lbad.flags & BLOB_LS_FLAG_SORT_BY_ID)) + if (!(flags & BLOB_LS_FLAG_SORT_BY_ID)) pmd.loop_col_num = BLOBCOL_NAME; else pmd.loop_col_num = BLOBCOL_ID; ret = for_each_matching_row(&pmd); if (ret < 0) - para_printf(&lbad.pb, "%s\n", para_strerror(-ret)); - else if (pmd.num_matches == 0 && pmd.patterns.size > 0) - para_printf(&lbad.pb, "no matches\n"); - if (lbad.pb.offset) - pass_buffer_as_shm(lbad.pb.buf, lbad.pb.offset, &fd); - free(lbad.pb.buf); + goto out; + if (pmd.num_matches == 0 && pmd.patterns.size > 0) + ret = -E_NO_MATCH; +out: + return ret; } -static int com_lsblob(callback_function *f, struct stream_cipher_context *scc, int argc, char * const * const argv) +static int com_lsblob(afs_callback *f, struct command_context *cc) { uint32_t flags = 0; struct osl_object options = {.data = &flags, .size = sizeof(flags)}; int i; - for (i = 1; i < argc; i++) { - const char *arg = argv[i]; + for (i = 1; i < cc->argc; i++) { + const char *arg = cc->argv[i]; if (arg[0] != '-') break; if (!strcmp(arg, "--")) { @@ -193,123 +184,106 @@ static int com_lsblob(callback_function *f, struct stream_cipher_context *scc, i } // if (argc > i) // return -E_BLOB_SYNTAX; - return send_option_arg_callback_request(&options, argc - i, - argv + i, f, sc_send_result, scc); + return send_option_arg_callback_request(&options, cc->argc - i, + cc->argv + i, f, afs_cb_result_handler, cc); } static int cat_blob(struct osl_table *table, struct osl_row *row, __a_unused const char *name, void *data) { - int ret = 0, ret2; + int ret = 0, ret2, fd = *(int *)data; struct osl_object obj; ret = osl(osl_open_disk_object(table, row, BLOBCOL_DEF, &obj)); if (ret < 0) return (ret == osl(-E_OSL_EMPTY))? 0 : ret; assert(obj.size > 0); - ret = pass_buffer_as_shm(obj.data, obj.size, data); + ret = pass_buffer_as_shm(fd, SBD_OUTPUT, obj.data, obj.size); ret2 = osl(osl_close_disk_object(&obj)); return (ret < 0)? ret : ret2; } -static void com_catblob_callback(struct osl_table *table, int fd, - const struct osl_object *query) +static int com_catblob_callback(struct osl_table *table, + struct afs_callback_arg *aca) { + int ret; struct pattern_match_data pmd = { .table = table, - .patterns = *query, + .patterns = aca->query, .loop_col_num = BLOBCOL_NAME, .match_col_num = BLOBCOL_NAME, .pm_flags = PM_SKIP_EMPTY_NAME, - .data = &fd, + .data = &aca->fd, .action = cat_blob }; - for_each_matching_row(&pmd); - if (pmd.num_matches == 0) { - char err_msg[] = "no matches\n"; - pass_buffer_as_shm(err_msg, sizeof(err_msg), &fd); - } + ret = for_each_matching_row(&pmd); + if (ret < 0) + return ret; + if (pmd.num_matches == 0) + ret = -E_NO_MATCH; + return ret; } -static int com_catblob(callback_function *f, struct stream_cipher_context *scc, int argc, - char * const * const argv) +static int com_catblob(afs_callback *f, struct command_context *cc) { - if (argc < 2) + if (cc->argc < 2) return -E_BLOB_SYNTAX; - return send_standard_callback_request(argc - 1, argv + 1, f, - sc_send_result, scc); + return send_standard_callback_request(cc->argc - 1, cc->argv + 1, f, + afs_cb_result_handler, cc); } -/** Used for removing rows from a blob table. */ -struct rmblob_data { - /** Message buffer. */ - struct para_buffer pb; -}; - static int remove_blob(struct osl_table *table, struct osl_row *row, const char *name, void *data) { - struct rmblob_data *rmbd = data; + struct afs_callback_arg *aca = data; int ret = osl(osl_del_row(table, row)); if (ret < 0) { - para_printf(&rmbd->pb, "%s: %s\n", name, para_strerror(-ret)); + para_printf(&aca->pbout, "cannot remove %s\n", name); return ret; } return 1; } -static void com_rmblob_callback(struct osl_table *table, int fd, - const struct osl_object *query) +static int com_rmblob_callback(struct osl_table *table, + struct afs_callback_arg *aca) { - int ret, ret2 = 0; - struct rmblob_data rmbd = { - .pb = { - .max_size = shm_get_shmmax(), - .private_data = &fd, - .max_size_handler = pass_buffer_as_shm - } - }; + int ret; struct pattern_match_data pmd = { .table = table, - .patterns = *query, + .patterns = aca->query, .loop_col_num = BLOBCOL_NAME, .match_col_num = BLOBCOL_NAME, .pm_flags = PM_SKIP_EMPTY_NAME, - .data = &rmbd, + .data = aca, .action = remove_blob }; ret = for_each_matching_row(&pmd); - if (ret < 0) { - ret2 = para_printf(&rmbd.pb, "%s\n", para_strerror(-ret)); - if (ret2 < 0) - goto out; - } + if (ret < 0) + goto out; if (pmd.num_matches == 0) - ret2 = para_printf(&rmbd.pb, "no matches, nothing removed\n"); + ret = -E_NO_MATCH; else { - ret2 = para_printf(&rmbd.pb, "removed %d blobs\n", pmd.num_matches); - afs_event(BLOB_RENAME, NULL, table); + para_printf(&aca->pbout, "removed %u blob(s)\n", + pmd.num_matches); + ret = afs_event(BLOB_REMOVE, NULL, table); } out: - if (ret2 >= 0 && rmbd.pb.offset) - pass_buffer_as_shm(rmbd.pb.buf, rmbd.pb.offset, &fd); - free(rmbd.pb.buf); + return ret; } -static int com_rmblob(callback_function *f, struct stream_cipher_context *scc, int argc, - char * const * const argv) +static int com_rmblob(afs_callback *f, struct command_context *cc) { - if (argc < 2) + if (cc->argc < 2) return -E_MOOD_SYNTAX; - return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f, - sc_send_result, scc); + return send_option_arg_callback_request(NULL, cc->argc - 1, cc->argv + 1, f, + afs_cb_result_handler, cc); } -static void com_addblob_callback(struct osl_table *table, __a_unused int fd, - const struct osl_object *query) +static int com_addblob_callback(struct osl_table *table, + struct afs_callback_arg *aca) { struct osl_object objs[NUM_BLOB_COLUMNS]; - char *name = query->data; + char *name = aca->query.data; size_t name_len = strlen(name) + 1; uint32_t id; unsigned num_rows; @@ -338,8 +312,12 @@ static void com_addblob_callback(struct osl_table *table, __a_unused int fd, if (ret < 0 && ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) goto out; if (ret >= 0) { /* we already have a blob with this name */ + ret = osl(osl_get_object(table, row, BLOBCOL_ID, &obj)); + if (ret < 0) + goto out; + id = *(uint32_t *)obj.data; obj.data = name + name_len; - obj.size = query->size - name_len; + obj.size = aca->query.size - name_len; ret = osl(osl_update_object(table, row, BLOBCOL_DEF, &obj)); goto out; } @@ -364,145 +342,143 @@ static void com_addblob_callback(struct osl_table *table, __a_unused int fd, objs[BLOBCOL_NAME].data = name; objs[BLOBCOL_NAME].size = name_len; objs[BLOBCOL_DEF].data = name + name_len; - objs[BLOBCOL_DEF].size = query->size - name_len; + objs[BLOBCOL_DEF].size = aca->query.size - name_len; ret = osl(osl_add_row(table, objs)); if (ret < 0) goto out; - afs_event(BLOB_ADD, NULL, table); + ret = afs_event(BLOB_ADD, NULL, table); out: if (ret < 0) - PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); + para_printf(&aca->pbout, "cannot add %s\n", name); + else + para_printf(&aca->pbout, "added %s as id %u\n", name, id); + return ret; } -/* - * write input from fd to dynamically allocated buffer, - * but maximal max_size byte. - */ -static int fd2buf(struct stream_cipher_context *scc, unsigned max_size, struct osl_object *obj) +/* Write input from fd to dynamically allocated buffer, but maximal 10M. */ +static int fd2buf(struct stream_cipher_context *scc, struct osl_object *obj) { - const size_t chunk_size = 1024; - size_t size = 2048, received = 0; + size_t max_size = 10 * 1024 * 1024; int ret; - char *buf = para_malloc(size); + struct iovec iov; - for (;;) { - ret = sc_recv_bin_buffer(scc, buf + received, chunk_size); - if (ret <= 0) - break; - received += ret; - if (received + chunk_size >= size) { - size *= 2; - ret = -E_INPUT_TOO_LARGE; - if (size > max_size) - break; - buf = para_realloc(buf, size); - } + obj->data = NULL; + obj->size = 0; +again: + do { + ret = recv_sb(scc, SBD_BLOB_DATA, max_size, &iov); + } while (ret == 0); + + if (ret < 0) { + free(obj->data); + obj->data = NULL; + obj->size = 0; + return ret; } - obj->data = buf; - obj->size = received; - if (ret < 0) - free(buf); - return ret; + if (iov.iov_len == 0) /* end of blob */ + return 1; + if (!obj->data) { + obj->data = iov.iov_base; + obj->size = iov.iov_len; + } else { + obj->data = para_realloc(obj->data, obj->size + iov.iov_len); + memcpy(obj->data + obj->size, iov.iov_base, iov.iov_len); + obj->size += iov.iov_len; + free(iov.iov_base); + max_size -= iov.iov_len; + } + goto again; + return 1; } /* - * Read data from a file descriptor, and send it to the afs process. - * - * \param scc crypt context containing the file descriptor to read data from. - * \param arg_obj Pointer to the arguments to \a f. - * \param f The callback function. - * \param max_len Don't read more than that many bytes from stdin. - * \param result_handler See \ref send_callback_request. - * \param private_result_data See \ref send_callback_request. + * Read blob from a file descriptor and send it to afs. * - * This function is used by commands that wish to let para_server store - * arbitrary data specified by the user (for instance the add_blob family of - * commands). First, at most \a max_len bytes are read and decrypted from the - * file descriptor given by \a scc. The result is concatenated with the buffer - * given by \a arg_obj, and the combined buffer is made available to the afs - * process via the callback method. See \ref send_callback_request for details. - * - * \return Negative on errors, the return value of the underlying call to - * send_callback_request() otherwise. + * This function is called from the addblob command handlers to instruct the + * afs process to store the input in a blob table. Input is read and decrypted + * from the file descriptor given by cc and appended to arg_obj, which contains + * the name of the blob to create. The combined buffer is made available to the + * afs process via the callback method. */ -static int stdin_command(struct stream_cipher_context *scc, struct osl_object *arg_obj, - callback_function *f, unsigned max_len, - callback_result_handler *result_handler, - void *private_result_data) +static int stdin_command(struct command_context *cc, struct osl_object *arg_obj, + afs_callback *f) { struct osl_object query, stdin_obj; int ret; - ret = sc_send_buffer(scc, AWAITING_DATA_MSG); + ret = send_sb(&cc->scc, NULL, 0, SBD_AWAITING_DATA, false); if (ret < 0) return ret; - ret = fd2buf(scc, max_len, &stdin_obj); + ret = fd2buf(&cc->scc, &stdin_obj); if (ret < 0) return ret; query.size = arg_obj->size + stdin_obj.size; query.data = para_malloc(query.size); memcpy(query.data, arg_obj->data, arg_obj->size); - memcpy((char *)query.data + arg_obj->size, stdin_obj.data, stdin_obj.size); + if (stdin_obj.size > 0) + memcpy((char *)query.data + arg_obj->size, stdin_obj.data, + stdin_obj.size); free(stdin_obj.data); - ret = send_callback_request(f, &query, result_handler, private_result_data); + ret = send_callback_request(f, &query, afs_cb_result_handler, cc); free(query.data); return ret; } -static int com_addblob(callback_function *f, struct stream_cipher_context *scc, int argc, - char * const * const argv) +static int com_addblob(afs_callback *f, struct command_context *cc) { struct osl_object arg_obj; - if (argc != 2) + if (cc->argc != 2) return -E_BLOB_SYNTAX; - if (!*argv[1]) /* empty name is reserved for the dummy row */ + if (!*cc->argv[1]) /* empty name is reserved for the dummy row */ return -E_BLOB_SYNTAX; - arg_obj.size = strlen(argv[1]) + 1; - arg_obj.data = (char *)argv[1]; - return stdin_command(scc, &arg_obj, f, 10 * 1024 * 1024, NULL, NULL); + arg_obj.size = strlen(cc->argv[1]) + 1; + arg_obj.data = (char *)cc->argv[1]; + return stdin_command(cc, &arg_obj, f); } -/* FIXME: Print output to client, not to log file */ -static void com_mvblob_callback(struct osl_table *table, __a_unused int fd, - const struct osl_object *query) +static int com_mvblob_callback(struct osl_table *table, + struct afs_callback_arg *aca) { - char *src = (char *) query->data; + char *src = (char *)aca->query.data; struct osl_object obj = {.data = src, .size = strlen(src) + 1}; char *dest = src + obj.size; struct osl_row *row; int ret = osl(osl_get_row(table, BLOBCOL_NAME, &obj, &row)); - if (ret < 0) + if (ret < 0) { + para_printf(&aca->pbout, "cannot find source blob %s\n", src); goto out; + } obj.data = dest; obj.size = strlen(dest) + 1; ret = osl(osl_update_object(table, row, BLOBCOL_NAME, &obj)); - if (ret < 0) + if (ret < 0) { + para_printf(&aca->pbout, "cannot rename blob %s to %s\n", + src, dest); goto out; - afs_event(BLOB_RENAME, NULL, table); + } + ret = afs_event(BLOB_RENAME, NULL, table); out: - if (ret < 0) - PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); + return ret; } -static int com_mvblob(callback_function *f, __a_unused struct stream_cipher_context *scc, - int argc, char * const * const argv) +static int com_mvblob(afs_callback *f, struct command_context *cc) { - if (argc != 3) + if (cc->argc != 3) return -E_MOOD_SYNTAX; - return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f, - NULL, NULL); + return send_option_arg_callback_request(NULL, cc->argc - 1, + cc->argv + 1, f, afs_cb_result_handler, cc); } #define DEFINE_BLOB_COMMAND(cmd_name, table_name, cmd_prefix) \ - static void com_ ## cmd_name ## cmd_prefix ## _callback(int fd, const struct osl_object *query) \ + static int com_ ## cmd_name ## cmd_prefix ## _callback(struct afs_callback_arg *aca) \ { \ - return com_ ## cmd_name ## blob_callback(table_name ## _table, fd, query); \ + return com_ ## cmd_name ## blob_callback(table_name ## _table, aca); \ } \ - int com_ ## cmd_name ## cmd_prefix(struct stream_cipher_context *scc, int argc, char * const * const argv) \ + int com_ ## cmd_name ## cmd_prefix(struct command_context *cc) \ { \ - return com_ ## cmd_name ## blob(com_ ## cmd_name ## cmd_prefix ## _callback, scc, argc, argv); \ + return com_ ## cmd_name ## blob(com_ ## cmd_name ## cmd_prefix ## _callback, cc); \ } static int blob_get_name_by_id(struct osl_table *table, uint32_t id, @@ -512,7 +488,8 @@ static int blob_get_name_by_id(struct osl_table *table, uint32_t id, struct osl_object obj = {.data = &id, .size = sizeof(id)}; int ret; - *name = NULL; + if (name) + *name = NULL; if (!id) return 1; ret = osl(osl_get_row(table, BLOBCOL_ID, &obj, &row)); @@ -521,7 +498,10 @@ static int blob_get_name_by_id(struct osl_table *table, uint32_t id, ret = osl(osl_get_object(table, row, BLOBCOL_NAME, &obj)); if (ret < 0) return ret; - *name = (char *)obj.data; + if (*(char *)obj.data == '\0') + return -E_DUMMY_ROW; + if (name) + *name = (char *)obj.data; return 1; } @@ -611,7 +591,7 @@ static int blob_get_name_and_def_by_row(struct osl_table *table, static int table_name ## _create(const char *dir) \ { \ table_name ## _table_desc.dir = dir; \ - return osl_create_table(&table_name ## _table_desc); \ + return osl(osl_create_table(&table_name ## _table_desc)); \ } static int blob_open(struct osl_table **table,