X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.c;h=5d5aa4c643d8e0d289fd9499d177277fdd068c81;hp=df6bc102ae19d434464c636d815959ff65bbe924;hb=7145f5e9af16907c65a514fe9112e99564cf6333;hpb=cbf53d23cecaca9c6ec71582663c4a8254a9f285 diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c index df6bc102a..5d5aa4c64 100644 --- a/src/bin/lttng-relayd/session.c +++ b/src/bin/lttng-relayd/session.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -180,6 +181,38 @@ 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 = lttng_directory_handle_create(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; @@ -208,6 +241,8 @@ static int session_set_anonymous_chunk(struct relay_session *session) ret = -1; goto end; } + + lttng_trace_chunk_set_fd_tracker(chunk, the_fd_tracker); output_directory = NULL; session->current_trace_chunk = chunk; chunk = NULL; @@ -217,6 +252,37 @@ end: 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. * @@ -241,9 +307,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, "../")) { @@ -251,11 +320,6 @@ 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) { @@ -323,6 +387,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, @@ -336,7 +403,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 @@ -347,6 +425,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); @@ -436,6 +520,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); } @@ -531,35 +617,3 @@ void print_sessions(void) } rcu_read_unlock(); } - -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 = lttng_directory_handle_create(full_session_path); -end: - pthread_mutex_unlock(&session->lock); - free(full_session_path); - return handle; -}