Commit 40961941 authored by Ondrej Holy's avatar Ondrej Holy
Browse files

admin: Ensure correct ownership when moving to file:// uri

User and group is not restored properly when moving (or copying with
G_FILE_COPY_ALL_METADATA) from admin:// to file://, because it is handled
by GIO fallback code, which doesn't run with root permissions. Let's
handle this case with pull method to ensure correct ownership.
parent d7d36299
Pipeline #86271 passed with stage
in 2 minutes and 8 seconds
......@@ -807,6 +807,51 @@ do_move (GVfsBackend *backend,
complete_job (job, error);
static void
do_pull (GVfsBackend *backend,
GVfsJobPull *pull_job,
const char *source,
const char *local_path,
GFileCopyFlags flags,
gboolean remove_source,
GFileProgressCallback progress_callback,
gpointer progress_callback_data)
GVfsBackendAdmin *self = G_VFS_BACKEND_ADMIN (backend);
GVfsJob *job = G_VFS_JOB (pull_job);
GError *error = NULL;
GFile *src_file, *dst_file;
/* Pull method is necessary when user/group needs to be restored, return
* G_IO_ERROR_NOT_SUPPORTED in other cases to proceed with the fallback code.
if (!(flags & G_FILE_COPY_ALL_METADATA))
g_vfs_job_failed_literal (G_VFS_JOB (job), G_IO_ERROR,
_("Operation not supported"));
if (!check_permission (self, job))
src_file = g_file_new_for_path (source);
dst_file = g_file_new_for_path (local_path);
if (remove_source)
g_file_move (src_file, dst_file, flags, job->cancellable,
progress_callback, progress_callback_data, &error);
g_file_copy (src_file, dst_file, flags, job->cancellable,
progress_callback, progress_callback_data, &error);
g_object_unref (src_file);
g_object_unref (dst_file);
complete_job (job, error);
static void
do_query_settable_attributes (GVfsBackend *backend,
GVfsJobQueryAttributes *query_job,
......@@ -927,6 +972,7 @@ g_vfs_backend_admin_class_init (GVfsBackendAdminClass * klass)
backend_class->set_attribute = do_set_attribute;
backend_class->delete = do_delete;
backend_class->move = do_move;
backend_class->pull = do_pull;
backend_class->query_settable_attributes = do_query_settable_attributes;
backend_class->query_writable_namespaces = do_query_writable_namespaces;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment