Merge branch 'master' of github.com:duplicati/duplicati

Duplicati/Library/Backend/AlternativeFTP/AlternativeFTPBackend.cs

@@ -450,6 +450,11 @@ namespace Duplicati.Library.Backend.AlternativeFTP
             }
         }
 
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         private static System.IO.Stream StringToStream(string str)
         {
             var stream = new System.IO.MemoryStream();

Duplicati/Library/Backend/AmazonCloudDrive/AmzCD.cs

@@ -457,6 +457,12 @@ namespace Duplicati.Library.Backend.AmazonCloudDrive
                 return Strings.AmzCD.Description;
             }
         }
+
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         #endregion
         #region IDisposable implementation
         public void Dispose()

Duplicati/Library/Backend/AzureBlob/AzureBlobBackend.cs

@@ -157,8 +157,13 @@ namespace Duplicati.Library.Backend.AzureBlob
             {
                 return Strings.AzureBlobBackend.Description_v2;
             }
-        }
-
+        }
+
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         public void Test()
         {
             this.TestList();

Duplicati/Library/Backend/Backblaze/B2.cs

@@ -422,6 +422,11 @@ namespace Duplicati.Library.Backend.Backblaze
             get { return Strings.B2.Description; }
         }
 
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         public void Dispose()
         {
         }

Duplicati/Library/Backend/Box/BoxBackend.cs

@@ -337,6 +337,11 @@ namespace Duplicati.Library.Backend.Box
             }
         }
 
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         #endregion
 
         #region IDisposable implementation

Duplicati/Library/Backend/CloudFiles/CloudFiles.cs

@@ -290,6 +290,11 @@ namespace Duplicati.Library.Backend
             get { return true; }
         }
 
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         public void Get(string remotename, System.IO.Stream stream)
         {
             var req = CreateRequest("/" + remotename, "");

Duplicati/Library/Backend/Dropbox/Dropbox.cs

@@ -136,6 +136,11 @@ namespace Duplicati.Library.Backend
 
         public string Description { get { return Strings.Dropbox.Description; } }
 
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         public void Test()
         {
             this.TestList();

Duplicati/Library/Backend/FTP/FTPBackend.cs

@@ -355,6 +355,11 @@ namespace Duplicati.Library.Backend
             }
         }
 
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         public void Test()
         {
             this.TestList();

Duplicati/Library/Backend/File/FileBackend.cs

@@ -351,6 +351,11 @@ namespace Duplicati.Library.Backend
             }
         }
 
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         public void Rename(string oldname, string newname)
         {
             var source = GetRemoteName(oldname);

Duplicati/Library/Backend/GoogleServices/GoogleCloudStorage.cs

@@ -260,6 +260,12 @@ namespace Duplicati.Library.Backend.GoogleCloudStorage
         {
             get { return Strings.GoogleCloudStorage.Description; }
         }
+
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         #endregion
 
         public void Put(string remotename, System.IO.Stream stream)

Duplicati/Library/Backend/GoogleServices/GoogleDrive.cs

@@ -346,6 +346,12 @@ namespace Duplicati.Library.Backend.GoogleDrive
                 }
             }
         }
+
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         #endregion
 
         #region IRenameEnabledBackend implementation

Duplicati/Library/Backend/HubiC/HubiCBackend.cs

@@ -1,4 +1,4 @@
-//  Copyright (C) 2015, The Duplicati Team
+//  Copyright (C) 2015, The Duplicati Team
 //  http://www.duplicati.com, info@duplicati.com
 //
 //  This library is free software; you can redistribute it and/or modify
@@ -14,13 +14,181 @@
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-using System;
+using System;
+using Duplicati.Library.Interface;
+using Duplicati.Library;
+using Duplicati.Library.Backend.OpenStack;
+using System.Collections.Generic;
 
 namespace Duplicati.Library.Backend.HubiC
 {
     public class HubiCBackend : IBackend, IStreamingBackend
-
-namespace Duplicati.Library.Backend.HubiC
-{
-    public class HubiCBackend : IBackend, IStreamingBackend
+    {
+        private const string AUTHID_OPTION = "authid";
+        private const string HUBIC_API_URL = "https://api.hubic.com/1.0/";
+        private const string HUBIC_API_CREDENTIAL_URL = HUBIC_API_URL + "account/credentials";
 
+        private OpenStackStorage m_openstack;
+
+        private class HubiCAuthResponse
+        {
+            public string token { get; set; }
+            public string endpoint { get; set; }
+            public DateTime? expires { get; set;}
+        }
+
+        private class OpenStackHelper : OpenStackStorage
+        {
+            private OAuthHelper m_helper;
+            private HubiCAuthResponse m_token;
+
+            public OpenStackHelper(string authid, string url)
+                : base(url, MockOptions())
+            {
+                m_helper = new OAuthHelper(authid, "hubic") { AutoAuthHeader = true };
+            }
+
+            private static Dictionary<string, string> MockOptions()
+            {
+                var res = new Dictionary<string, string>();
+                res["openstack-authuri"] = "invalid://dont-use";
+                res["openstack-apikey"] = "invalid";
+                res["auth-username"] = "invalid";
+
+                return res;
+            }
+
+            private HubiCAuthResponse AuthToken
+            {
+                get
+                {
+                    if (m_token == null || (m_token.expires != null && (m_token.expires.Value - DateTime.UtcNow).TotalSeconds < 30))
+                        m_token = m_helper.ReadJSONResponse<HubiCAuthResponse>(HUBIC_API_CREDENTIAL_URL);
+                    return m_token;
+                }
+            }
+
+            protected override string AccessToken
+            {
+                get { return AuthToken.token; }
+            }
+
+            protected override string SimpleStorageEndPoint
+            {
+                get { return AuthToken.endpoint; }
+            }
+        }
+
+        public HubiCBackend()
+        {
+        }
+
+        public HubiCBackend(string url, Dictionary<string, string> options)
+        {
+            string authid = null;
+            if (options.ContainsKey(AUTHID_OPTION))
+                authid = options[AUTHID_OPTION];
+
+            m_openstack = new OpenStackHelper(authid, url);
+        }
+
+        #region IStreamingBackend implementation
+
+        public void Put(string remotename, System.IO.Stream stream)
+        {
+            m_openstack.Put(remotename, stream);
+        }
+
+        public void Get(string remotename, System.IO.Stream stream)
+        {
+            m_openstack.Get(remotename, stream);
+        }
+
+        #endregion
+
+        #region IBackend implementation
+
+        public IEnumerable<IFileEntry> List()
+        {
+            return m_openstack.List();
+        }
+
+        public void Put(string remotename, string filename)
+        {
+            m_openstack.Put(remotename, filename);
+        }
+
+        public void Get(string remotename, string filename)
+        {
+            m_openstack.Get(remotename, filename);
+        }
+
+        public void Delete(string remotename)
+        {
+            m_openstack.Delete(remotename);
+        }
+
+        public void Test()
+        {
+            m_openstack.Test();
+        }
+
+        public void CreateFolder()
+        {
+            m_openstack.CreateFolder();
+        }
+
+        public string DisplayName
+        {
+            get
+            {
+                return Strings.HubiC.DisplayName;
+            }
+        }
+
+        public string ProtocolKey
+        {
+            get
+            {
+                return "hubic";
+            }
+        }
+
+        public System.Collections.Generic.IList<ICommandLineArgument> SupportedCommands
+        {
+            get {
+                return new List<ICommandLineArgument>(new ICommandLineArgument[] {
+                    new CommandLineArgument(AUTHID_OPTION, CommandLineArgument.ArgumentType.Password, Strings.HubiC.AuthidShort, Strings.HubiC.AuthidLong(OAuthHelper.OAUTH_LOGIN_URL("hubic"))),
+                });
+            }
+        }
+
+        public string Description
+        {
+            get
+            {
+                return Strings.HubiC.Description;
+            }
+        }
+
+        public string DNSName
+        {
+            get { return null; }
+        }
+
+        #endregion
+
+        #region IDisposable implementation
+
+        public void Dispose()
+        {
+            if (m_openstack != null)
+            {
+                m_openstack.Dispose();
+                m_openstack = null;
+            }
+        }
+
+        #endregion
+    }
+}

Duplicati/Library/Backend/Jottacloud/Jottacloud.cs

@@ -316,8 +316,13 @@ namespace Duplicati.Library.Backend
         public bool SupportsStreaming
         {
             get { return true; }
-        }
-
+        }
+
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         public void Get(string remotename, System.IO.Stream stream)
         {
             // Downloading from Jottacloud: Will only succeed if the file has a completed revision,

Duplicati/Library/Backend/Mega/MegaBackend.cs

@@ -260,6 +260,11 @@ namespace Duplicati.Library.Backend.Mega
             }
         }
 
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         #endregion
 
         #region IDisposable implementation

Duplicati/Library/Backend/OneDrive/OneDrive.cs

@@ -500,7 +500,12 @@ namespace Duplicati.Library.Backend
             }
         }
 
-        #endregion 
+        public string DNSName
+        {
+            get { return null; }
+        }
+
+        #endregion
 
         #region IStreamingBackend Members
 

Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs

@@ -422,6 +422,12 @@ namespace Duplicati.Library.Backend.OpenStack
                 return Strings.OpenStack.Description;
             }
         }
+
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         #endregion
         #region IDisposable implementation
         public void Dispose()

Duplicati/Library/Backend/Rclone/Rclone.cs

@@ -282,8 +282,13 @@ namespace Duplicati.Library.Backend
             {
                 return Strings.Rclone.Description;
             }
-        }
-
+        }
+
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         public void Test()
         {
             this.TestList();

Duplicati/Library/Backend/S3/S3Backend.cs

@@ -474,6 +474,11 @@ namespace Duplicati.Library.Backend
             get { return m_wrapper; }
         }
 
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         private string GetFullKey(string name)
         {
             //AWS SDK encodes the filenames correctly

Duplicati/Library/Backend/SSHv2/SSHv2Backend.cs

@@ -368,5 +368,10 @@ namespace Duplicati.Library.Backend
                 return m_con;
             }
         }
+
+        public string DNSName
+        {
+            get { return null; }
+        }
     }
 }

Duplicati/Library/Backend/SharePoint/SharePointBackend.cs

@@ -113,12 +113,17 @@ namespace Duplicati.Library.Backend
                     new CommandLineArgument("chunk-size", CommandLineArgument.ArgumentType.Size, Strings.SharePoint.DescriptionChunkSizeShort, Strings.SharePoint.DescriptionChunkSizeLong, "4mb"),
                 });
             }
-        }
-
+        }
+
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         #endregion
-
+
         #region [Constructors]
-
+
         public SharePointBackend()
         { }
 

Duplicati/Library/Backend/Sia/Sia.cs

@@ -438,12 +438,17 @@ namespace Duplicati.Library.Backend.Sia
             {
                 return Strings.Sia.Description;
             }
-        }
-
+        }
+
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         #endregion
-
+
         #region IDisposable Members
-
+
         public void Dispose()
         {
 

Duplicati/Library/Backend/TahoeLAFS/TahoeBackend.cs

@@ -254,6 +254,11 @@ namespace Duplicati.Library.Backend
             get { return Strings.TahoeBackend.Description; }
         }
 
+        public string DNSName
+        {
+            get { return null; }
+        }
+
         #endregion
 
         #region IDisposable Members

Duplicati/Library/Backend/WEBDAV/WEBDAV.cs

@@ -33,6 +33,7 @@ namespace Duplicati.Library.Backend
         private string m_reverseProtocolUrl;
         private string m_rawurl;
         private string m_rawurlPort;
+        private string m_dnsName;
         private bool m_useIntegratedAuthentication = false;
         private bool m_forceDigestAuthentication = false;
         private bool m_useSSL = false;
@@ -61,6 +62,7 @@ namespace Duplicati.Library.Backend
         {
             var u = new Utility.Uri(url);
             u.RequireHost();
+            m_dnsName = u.Host;
 
             if (!string.IsNullOrEmpty(u.Username))
             {
@@ -311,6 +313,11 @@ namespace Duplicati.Library.Backend
             get { return Strings.WEBDAV.Description; }
         }
 
+        public string DNSName 
+        {
+            get { return m_dnsName; }
+        }
+
         public void Test()
         {
             this.List();

Duplicati/Library/Interface/IBackend.cs

@@ -81,6 +81,11 @@ namespace Duplicati.Library.Interface
         /// </summary>
         string Description { get; }
 
+        /// <summary>
+        /// The DNS name used to resolve the IP address for this backend
+        /// </summary>
+        string DNSName { get; }
+
         /// <summary>
         /// The purpose of this method is to test the connection to the remote backend.
         /// If any problem is encountered, this method should throw an exception.

Duplicati/Library/Main/BackendManager.cs

@@ -519,6 +519,22 @@ namespace Duplicati.Library.Main
                                 throw;
                             }
 
+                            if (ex is System.Net.WebException)
+                            {
+                                // Refresh DNS name if we fail to connect in order to prevent issues with incorrect DNS entries
+                                if (((System.Net.WebException)ex).Status == System.Net.WebExceptionStatus.NameResolutionFailure)
+                                {
+                                    try
+                                    {
+                                        if (!string.IsNullOrWhiteSpace(m_backend.DNSName))
+                                            System.Net.Dns.GetHostEntry(m_backend.DNSName);
+                                    }
+                                    catch
+                                    {
+                                    }
+                                }
+                            }
+
                             m_statwriter.SendEvent(item.BackendActionType, retries < m_numberofretries ? BackendEventType.Retrying : BackendEventType.Failed, item.RemoteFilename, item.Size);
 
                             bool recovered = false;