[PATCH] obex: Use GLib helper function to manipulate paths

[PATCH] obex: Use GLib helper function to manipulate paths

[Bastien Nocera]

Instead of trying to do it by hand. This also makes sure that
relative paths aren't used by the agent.
---
 obexd/src/manager.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index cec8a39..f18896e 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -651,14 +651,14 @@ static void agent_reply(DBusPendingCall *call, void *user_data)
 				DBUS_TYPE_STRING, &name,
 				DBUS_TYPE_INVALID)) {
 		/* Splits folder and name */
-		const char *slash = strrchr(name, '/');
+		gboolean is_relative = !g_path_is_absolute(name);
 		DBG("Agent replied with %s", name);
-		if (!slash) {
-			agent->new_name = g_strdup(name);
+		if (is_relative) {
+			agent->new_name = g_path_get_basename(name);
 			agent->new_folder = NULL;
 		} else {
-			agent->new_name = g_strdup(slash + 1);
-			agent->new_folder = g_strndup(name, slash - name);
+			agent->new_name = g_path_get_basename(name);
+			agent->new_folder = g_path_get_dirname(name);
 		}
 	}
 
-- 
1.8.4.2

Re: [PATCH] obex: Use GLib helper function to manipulate paths

[Bastien Nocera]

On Sat, 2013-11-09 at 18:18 +0100, Bastien Nocera wrote:
> Instead of trying to do it by hand. This also makes sure that
> relative paths aren't used by the agent.

This is still relevant and applicable.

Re: [PATCH] obex: Use GLib helper function to manipulate paths

[Luiz Augusto von Dentz]

Hi Bastien,

On Fri, Nov 24, 2017 at 4:12 PM, Bastien Nocera <hadess@hadess.net> wrote:
> On Sat, 2013-11-09 at 18:18 +0100, Bastien Nocera wrote:
>> Instead of trying to do it by hand. This also makes sure that
>> relative paths aren't used by the agent.
>
> This is still relevant and applicable.

Id leave as it is if that is not causing any bugs, we do intend to
move away from glib at some point.

-- 
Luiz Augusto von Dentz

Re: [PATCH] obex: Use GLib helper function to manipulate paths

[Bastien Nocera]

On Fri, 2017-11-24 at 17:12 +0200, Luiz Augusto von Dentz wrote:
> Hi Bastien,
> 
> On Fri, Nov 24, 2017 at 4:12 PM, Bastien Nocera <hadess@hadess.net>
> wrote:
> > On Sat, 2013-11-09 at 18:18 +0100, Bastien Nocera wrote:
> > > Instead of trying to do it by hand. This also makes sure that
> > > relative paths aren't used by the agent.
> > 
> > This is still relevant and applicable.
> 
> Id leave as it is if that is not causing any bugs, we do intend to
> move away from glib at some point.

I'm pretty sure that the existing code isn't secure and passing a
relative path as the name will make it break out of the expected
destination folder.