Merge pull request #59 from ParsePlatform/richardross.filestate.secure

Added `SecureUrl` to FileState to support TLS file downloads.

Author: richardjrossiii

Parse/Internal/File/State/FileState.cs

@@ -1,11 +1,26 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-
-namespace Parse.Internal {
-  internal class FileState {
-    public string Name { get; internal set; }
-    public string MimeType { get; internal set; }
-    public Uri Url { get; internal set; }
-  }
-}
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+
+namespace Parse.Internal {
+  internal class FileState {
+    private const string ParseFileSecureScheme = "https";
+    private const string ParseFileSecureDomain = "files.parsetfss.com";
+
+    public string Name { get; internal set; }
+    public string MimeType { get; internal set; }
+    public Uri Url { get; internal set; }
+    public Uri SecureUrl {
+      get {
+        Uri uri = Url;
+        if (uri.Host == ParseFileSecureDomain) {
+          return new UriBuilder(uri) {
+            Scheme = ParseFileSecureScheme,
+            Port = -1, // This makes URIBuilder assign the default port for the URL scheme.
+          }.Uri;
+        }
+        return uri;
+      }
+    }
+  }
+}

Parse/ParseFile.cs

@@ -25,7 +25,7 @@ namespace Parse {
   /// await obj.SaveAsync();
   /// </code>
   /// </example>
-  public class ParseFile : IJsonConvertible {
+  public class ParseFile : IJsonConvertible {
     private FileState state;
     private readonly Stream dataStream;
     private readonly TaskQueue taskQueue = new TaskQueue();
@@ -111,7 +111,7 @@ public string MimeType {
     [ParseFieldName("url")]
     public Uri Url {
       get {
-        return state.Url;
+        return state.SecureUrl;
       }
     }
 

ParseTest.Unit/FileStateTests.cs

@@ -0,0 +1,39 @@
+using System;
+using Parse;
+using Parse.Internal;
+using System.Text;
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace ParseTest {
+  [TestFixture]
+  public class FileStateTests {
+    [Test]
+    public void TestSecureUrl() {
+      Uri unsecureUri = new Uri("http://files.parsetfss.com/yolo.txt");
+      Uri secureUri = new Uri("https://files.parsetfss.com/yolo.txt");
+      Uri randomUri = new Uri("http://random.server.local/file.foo");
+
+      FileState state = new FileState {
+        Name = "A",
+        Url = unsecureUri,
+        MimeType = null
+      };
+
+      Assert.AreEqual(unsecureUri, state.Url);
+      Assert.AreEqual(secureUri, state.SecureUrl);
+
+      // Make sure the proper port was given back.
+      Assert.AreEqual(443, state.SecureUrl.Port);
+
+      state = new FileState {
+        Name = "B",
+        Url = randomUri,
+        MimeType = null
+      };
+
+      Assert.AreEqual(randomUri, state.Url);
+      Assert.AreEqual(randomUri, state.Url);
+    }
+  }
+}

ParseTest.Unit/FileTests.cs

@@ -49,5 +49,21 @@ public Task TestFileSave() {
         Assert.False(file.IsDirty);
       });
     }
+
+    [Test]
+    public void TestSecureUrl() {
+      Uri unsecureUri = new Uri("http://files.parsetfss.com/yolo.txt");
+      Uri secureUri = new Uri("https://files.parsetfss.com/yolo.txt");
+      Uri randomUri = new Uri("http://random.server.local/file.foo");
+
+      ParseFile file = new ParseFile("Foo", unsecureUri);
+      Assert.AreEqual(secureUri, file.Url);
+
+      file = new ParseFile("Bar", secureUri);
+      Assert.AreEqual(secureUri, file.Url);
+
+      file = new ParseFile("Baz", randomUri);
+      Assert.AreEqual(randomUri, file.Url);
+    }
   }
 }

ParseTest.Unit/ParseTest.Unit.NetFx45.csproj

@@ -84,6 +84,7 @@
     <Compile Include="DecoderTests.cs" />
     <Compile Include="EncoderTests.cs" />
     <Compile Include="FileControllerTests.cs" />
+    <Compile Include="FileStateTests.cs" />
     <Compile Include="FileTests.cs" />
     <Compile Include="ProgressTests.cs" />
     <Compile Include="GeoPointTests.cs" />
@@ -148,4 +149,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>