X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.c;h=9f690d3af68d5eaf0a319b2c8439534587249101;hp=8f61e715fe5af8490f2cc8c5e7822a75e3d3bbde;hb=9642d9bf3d80d6a45ecdd107ff12c676b5ef0870;hpb=c70636a7342f34e3be68fcf411cf3e3718b8e73f diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c index 8f61e715f..9f690d3af 100644 --- a/src/bin/lttng-relayd/session.c +++ b/src/bin/lttng-relayd/session.c @@ -1,25 +1,16 @@ /* - * Copyright (C) 2013 - Julien Desfossez - * David Goulet - * 2015 - Mathieu Desnoyers + * Copyright (C) 2013 Julien Desfossez + * Copyright (C) 2013 David Goulet + * Copyright (C) 2015 Mathieu Desnoyers * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2 only, as - * published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _LGPL_SOURCE #include -#include +#include +#include #include #include #include @@ -180,15 +171,47 @@ static int init_session_output_path(struct relay_session *session) return ret; } +static struct lttng_directory_handle *session_create_output_directory_handle( + struct relay_session *session) +{ + int ret; + /* + * relayd_output_path/session_directory + * e.g. /home/user/lttng-traces/hostname/session_name + */ + char *full_session_path = NULL; + struct lttng_directory_handle *handle = NULL; + + pthread_mutex_lock(&session->lock); + full_session_path = create_output_path(session->output_path); + if (!full_session_path) { + goto end; + } + + ret = utils_mkdir_recursive( + full_session_path, S_IRWXU | S_IRWXG, -1, -1); + if (ret) { + ERR("Failed to create session output path \"%s\"", + full_session_path); + goto end; + } + + handle = fd_tracker_create_directory_handle(the_fd_tracker, full_session_path); +end: + pthread_mutex_unlock(&session->lock); + free(full_session_path); + return handle; +} + static int session_set_anonymous_chunk(struct relay_session *session) { int ret = 0; struct lttng_trace_chunk *chunk = NULL; enum lttng_trace_chunk_status status; - struct lttng_directory_handle output_directory; + struct lttng_directory_handle *output_directory; - ret = session_init_output_directory_handle(session, &output_directory); - if (ret) { + output_directory = session_create_output_directory_handle(session); + if (!output_directory) { goto end; } @@ -197,25 +220,58 @@ static int session_set_anonymous_chunk(struct relay_session *session) goto end; } + lttng_trace_chunk_set_fd_tracker(chunk, the_fd_tracker); status = lttng_trace_chunk_set_credentials_current_user(chunk); if (status != LTTNG_TRACE_CHUNK_STATUS_OK) { ret = -1; goto end; } - status = lttng_trace_chunk_set_as_owner(chunk, &output_directory); + status = lttng_trace_chunk_set_as_owner(chunk, output_directory); if (status != LTTNG_TRACE_CHUNK_STATUS_OK) { ret = -1; goto end; } + session->current_trace_chunk = chunk; chunk = NULL; end: lttng_trace_chunk_put(chunk); - lttng_directory_handle_fini(&output_directory); + lttng_directory_handle_put(output_directory); return ret; } +/* + * Check if a name is safe to use in a path. + * + * A name that is deemed "path-safe": + * - Does not contains a path separator (/ or \, platform dependant), + * - Does not start with a '.' (hidden file/folder), + * - Is not empty. + */ +static bool is_name_path_safe(const char *name) +{ + const size_t name_len = strlen(name); + + /* Not empty. */ + if (name_len == 0) { + WARN("An empty name is not allowed to be used in a path"); + return false; + } + /* Does not start with '.'. */ + if (name[0] == '.') { + WARN("Name \"%s\" is not allowed to be used in a path since it starts with '.'", name); + return false; + } + /* Does not contain a path-separator. */ + if (strchr(name, LTTNG_PATH_SEPARATOR)) { + WARN("Name \"%s\" is not allowed to be used in a path since it contains a path separator", name); + return false; + } + + return true; +} + /* * Create a new session by assigning a new session ID. * @@ -240,9 +296,12 @@ struct relay_session *session_create(const char *session_name, assert(hostname); assert(base_path); - if (strstr(session_name, ".")) { - ERR("Illegal character in session name: \"%s\"", - session_name); + if (!is_name_path_safe(session_name)) { + ERR("Refusing to create session as the provided session name is not path-safe"); + goto error; + } + if (!is_name_path_safe(hostname)) { + ERR("Refusing to create session as the provided hostname is not path-safe"); goto error; } if (strstr(base_path, "../")) { @@ -250,17 +309,23 @@ struct relay_session *session_create(const char *session_name, base_path); goto error; } - if (strstr(hostname, ".")) { - ERR("Invalid character in hostname: \"%s\"", - hostname); - goto error; - } session = zmalloc(sizeof(*session)); if (!session) { PERROR("Failed to allocate session"); goto error; } + + pthread_mutex_lock(&last_relay_session_id_lock); + session->id = ++last_relay_session_id; + pthread_mutex_unlock(&last_relay_session_id_lock); + + lttng_ht_node_init_u64(&session->session_n, session->id); + urcu_ref_init(&session->ref); + CDS_INIT_LIST_HEAD(&session->recv_list); + pthread_mutex_init(&session->lock, NULL); + pthread_mutex_init(&session->recv_list_lock, NULL); + if (lttng_strncpy(session->session_name, session_name, sizeof(session->session_name))) { WARN("Session name exceeds maximal allowed length"); @@ -287,17 +352,8 @@ struct relay_session *session_create(const char *session_name, goto error; } - pthread_mutex_lock(&last_relay_session_id_lock); - session->id = ++last_relay_session_id; - pthread_mutex_unlock(&last_relay_session_id_lock); - session->major = major; session->minor = minor; - lttng_ht_node_init_u64(&session->session_n, session->id); - urcu_ref_init(&session->ref); - CDS_INIT_LIST_HEAD(&session->recv_list); - pthread_mutex_init(&session->lock, NULL); - pthread_mutex_init(&session->recv_list_lock, NULL); session->live_timer = live_timer; session->snapshot = snapshot; @@ -322,6 +378,9 @@ struct relay_session *session_create(const char *session_name, } if (id_sessiond && current_chunk_id) { + enum lttng_trace_chunk_status chunk_status; + struct lttng_directory_handle *session_output_directory; + session->current_trace_chunk = sessiond_trace_chunk_registry_get_chunk( sessiond_trace_chunk_registry, @@ -335,7 +394,18 @@ struct relay_session *session_create(const char *session_name, ERR("Could not find trace chunk: sessiond = {%s}, sessiond session id = %" PRIu64 ", trace chunk id = %" PRIu64, uuid_str, *id_sessiond, *current_chunk_id); + goto error; } + + chunk_status = lttng_trace_chunk_get_session_output_directory_handle( + session->current_trace_chunk, + &session_output_directory); + if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) { + goto error; + } + + assert(session_output_directory); + session->output_directory = session_output_directory; } else if (!id_sessiond) { /* * Pre-2.11 peers will not announce trace chunks. An @@ -346,6 +416,12 @@ struct relay_session *session_create(const char *session_name, if (ret) { goto error; } + } else { + session->output_directory = + session_create_output_directory_handle(session); + if (!session->output_directory) { + goto error; + } } lttng_ht_add_unique_u64(sessions_ht, &session->session_n); @@ -435,6 +511,8 @@ static void destroy_session(struct relay_session *session) ret = sessiond_trace_chunk_registry_session_destroyed( sessiond_trace_chunk_registry, session->sessiond_uuid); assert(!ret); + lttng_directory_handle_put(session->output_directory); + session->output_directory = NULL; call_rcu(&session->rcu_node, rcu_destroy_session); } @@ -530,38 +608,3 @@ void print_sessions(void) } rcu_read_unlock(); } - -int session_init_output_directory_handle(struct relay_session *session, - struct lttng_directory_handle *handle) -{ - int ret; - /* - * relayd_output_path/session_directory - * e.g. /home/user/lttng-traces/hostname/session_name - */ - char *full_session_path = NULL; - - pthread_mutex_lock(&session->lock); - full_session_path = create_output_path(session->output_path); - if (!full_session_path) { - ret = -1; - goto end; - } - - ret = utils_mkdir_recursive( - full_session_path, S_IRWXU | S_IRWXG, -1, -1); - if (ret) { - ERR("Failed to create session output path \"%s\"", - full_session_path); - goto end; - } - - ret = lttng_directory_handle_init(handle, full_session_path); - if (ret) { - goto end; - } -end: - pthread_mutex_unlock(&session->lock); - free(full_session_path); - return ret; -}