haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1779 from Xelio/master

Browse Source 
Fix the escaping of special characters of Amazon Cloud Drive API filtering
This commit is contained in:
Kenneth Skovhede
2016-05-24 15:04:11 +02:00
parent ef6ed8b5b7 62653c74f1
commit db6773fdf7
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Backend/AmazonCloudDrive/AmzCD.cs
+11 -1
View File
@@ -160,7 +160,8 @@ namespace Duplicati.Library.Backend.AmazonCloudDrive
var curpath = new List<string>();
foreach(var p in (altpath ?? m_path).Split(new string[] {"/"}, StringSplitOptions.RemoveEmptyEntries))
{
var self = m_oauth.GetJSONData<ListResponse>(string.Format("{0}/nodes?filters=kind:{1}%20and%20parents:{2}%20and%20name:{3}", MetadataUrl, CONTENT_KIND_FOLDER, Utility.Uri.UrlEncode(parent.ID), Utility.Uri.UrlEncode(p)));
var requestUrl = string.Format("{0}/nodes?filters=kind:{1}%20and%20parents:{2}%20and%20name:{3}", MetadataUrl, CONTENT_KIND_FOLDER, Utility.Uri.UrlEncode(parent.ID), Utility.Uri.UrlPathEncode(EscapeFiltersValue(p)));
var self = m_oauth.GetJSONData<ListResponse>(requestUrl);
if (self == null || self.Count == 0 || self.Data == null || self.Data.Length == 0)
{
if (!createMissing)
@@ -234,6 +235,15 @@ namespace Duplicati.Library.Backend.AmazonCloudDrive
throw new FileMissingException();
}
private static System.Text.RegularExpressions.Regex FILTERS_VALUE_ESCAPECHAR = new System.Text.RegularExpressions.Regex(@"[+\-&|!(){}\[\]^'""~*?:\\ ]", System.Text.RegularExpressions.RegexOptions.Compiled);
public static string EscapeFiltersValue(string value)
{
return FILTERS_VALUE_ESCAPECHAR.Replace(value, (m) => {
return @"\" + m.Value;
});
}
#region IStreamingBackend implementation
public void Put(string remotename, System.IO.Stream stream)