#include <common/time.h>
#include <common/utils.h>
#include <common/uuid.h>
+#include <common/compat/path.h>
#include <urcu/rculist.h>
#include <sys/stat.h>
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;
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;
}
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;
}
+
+ lttng_trace_chunk_set_fd_tracker(chunk, the_fd_tracker);
+ output_directory = NULL;
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.
*
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, "../")) {
base_path);
goto error;
}
- if (strstr(hostname, ".")) {
- ERR("Invalid character in hostname: \"%s\"",
- hostname);
- goto error;
- }
session = zmalloc(sizeof(*session));
if (!session) {
}
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,
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
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);
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);
}
}
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;
-}
projects / lttng-tools.git / blobdiff