mirror of
https://github.com/chylex/Nextcloud-Desktop.git
synced 2026-04-03 18:11:32 +02:00
Compare commits
1 Commits
v2.6.0-fix
...
v2.6.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e0b32c19e4 |
@@ -344,9 +344,10 @@ steps:
|
||||
from_secret: DEBIAN_SECRET_IV
|
||||
trigger:
|
||||
branch:
|
||||
- stable-2.6
|
||||
- master
|
||||
event:
|
||||
- tag
|
||||
- pull_request
|
||||
- push
|
||||
---
|
||||
kind: pipeline
|
||||
name: Documentation
|
||||
|
||||
@@ -7,6 +7,7 @@ Build-Depends: cmake,
|
||||
cdbs,
|
||||
dh-python,
|
||||
extra-cmake-modules (>= 5.16),
|
||||
kdelibs5-dev,
|
||||
libkf5kio-dev,
|
||||
libcmocka-dev,
|
||||
libhttp-dav-perl,
|
||||
|
||||
@@ -466,41 +466,7 @@ void OwncloudSetupWizard::slotCreateLocalAndRemoteFolders(const QString &localFo
|
||||
_ocWizard->appendToConfigurationLog(res);
|
||||
}
|
||||
if (nextStep) {
|
||||
/*
|
||||
* BEGIN - Sanitize URL paths to eliminate double-slashes
|
||||
*
|
||||
* Purpose: Don't rely on unsafe paths, be extra careful.
|
||||
*
|
||||
* Example: https://cloud.example.com/remote.php/webdav//
|
||||
*
|
||||
*/
|
||||
qCInfo(lcWizard) << "Sanitize got URL path:" << QString(_ocWizard->account()->url().toString() + '/' + _ocWizard->account()->davPath() + remoteFolder);
|
||||
|
||||
QString newDavPath = _ocWizard->account()->davPath(),
|
||||
newRemoteFolder = remoteFolder;
|
||||
|
||||
while (newDavPath.startsWith('/')) {
|
||||
newDavPath.remove(0, 1);
|
||||
}
|
||||
while (newDavPath.endsWith('/')) {
|
||||
newDavPath.chop(1);
|
||||
}
|
||||
|
||||
while (newRemoteFolder.startsWith('/')) {
|
||||
newRemoteFolder.remove(0, 1);
|
||||
}
|
||||
while (newRemoteFolder.endsWith('/')) {
|
||||
newRemoteFolder.chop(1);
|
||||
}
|
||||
|
||||
QString newUrlPath = newDavPath + '/' + newRemoteFolder;
|
||||
|
||||
qCInfo(lcWizard) << "Sanitized to URL path:" << _ocWizard->account()->url().toString() + '/' + newUrlPath;
|
||||
/*
|
||||
* END - Sanitize URL paths to eliminate double-slashes
|
||||
*/
|
||||
|
||||
EntityExistsJob *job = new EntityExistsJob(_ocWizard->account(), newUrlPath, this);
|
||||
EntityExistsJob *job = new EntityExistsJob(_ocWizard->account(), _ocWizard->account()->davPath() + remoteFolder, this);
|
||||
connect(job, &EntityExistsJob::exists, this, &OwncloudSetupWizard::slotRemoteFolderExists);
|
||||
job->start();
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user