From 109056e676489a457511f8092ba0164f290e00cf Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 25 Nov 2016 18:47:37 +0100 Subject: [PATCH] owncloudcmd: Don't put the password in the URL As the URL might be print on the logs. Also don't change the scheme from http to owncloud. This was required before when we were using neon through csync, but now that we use QNAM for everything we don't need it. The credentials from the account are used. --- src/cmd/cmd.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp index a37de2853..09b9de11d 100644 --- a/src/cmd/cmd.cpp +++ b/src/cmd/cmd.cpp @@ -329,8 +329,7 @@ int main(int argc, char **argv) { if( !options.target_url.contains( account->davPath() )) { options.target_url.append(account->davPath()); } - if (options.target_url.startsWith("http")) - options.target_url.replace(0, 4, "owncloud"); + QUrl url = QUrl::fromUserInput(options.target_url); // Order of retrieval attempt (later attempts override earlier ones): @@ -371,14 +370,6 @@ int main(int argc, char **argv) { } } - // ### ensure URL is free of credentials - if (url.userName().isEmpty()) { - url.setUserName(user); - } - if (url.password().isEmpty()) { - url.setPassword(password); - } - // take the unmodified url to pass to csync_create() QByteArray remUrl = options.target_url.toUtf8();