Fix #33 with test coverage.

src/FMData.Rest/FileMakerRestClient.cs

@@ -670,6 +670,16 @@ public override async Task ProcessContainer<T>(T instance)
  {
  var containerField = prop.GetCustomAttribute<ContainerDataForAttribute>().ContainerField;
  var containerEndPoint = ti.GetDeclaredProperty(containerField).GetValue(instance) as string;
+
+ if (string.IsNullOrEmpty(containerEndPoint))
+ {
+ continue;
+ }
+ else if (!Uri.IsWellFormedUriString(containerEndPoint, UriKind.Absolute))
+ {
+ continue;
+ }
+
  var data = await _client.GetAsync(containerEndPoint);
  var dataBytes = await data.Content.ReadAsByteArrayAsync();
  prop.SetValue(instance, dataBytes);

src/FMData.Xml/FileMakerXmlClient.cs

@@ -309,6 +309,16 @@ public override async Task ProcessContainer<T>(T instance)
  {
  var containerField = prop.GetCustomAttribute<ContainerDataForAttribute>().ContainerField;
  var containerEndPoint = ti.GetDeclaredProperty(containerField).GetValue(instance) as string;
+
+ if (string.IsNullOrEmpty(containerEndPoint))
+ {
+ continue;
+ }
+ else if (!Uri.IsWellFormedUriString(containerEndPoint, UriKind.Absolute))
+ {
+ continue;
+ }
+
  var data = await _client.GetAsync(containerEndPoint);
  var dataBytes = await data.Content.ReadAsByteArrayAsync();
  prop.SetValue(instance, dataBytes);

tests/FMData.Rest.Tests/FindRequestTests.cs

@@ -419,6 +419,39 @@ public async Task GetByRecordId_ShouldHaveContainerWithContainerDataFor()
  Assert.Equal(bytes, response.SomeContainerFieldData);
  }
 
+ [Theory]
+ [InlineData((string)null)]
+ [InlineData("//somefile")]
+ [InlineData("http:/localhost/somefile")]
+ [InlineData("s:localhost/")]
+ [InlineData("somefolder/somefile.ext")]
+ public async Task ProcessContainerData_Should_Skip_InvalidUris(string uri)
+ {
+ // arrange
+ var mockHttp = new MockHttpMessageHandler();
+
+ var server = "http://localhost";
+ var file = "test-file";
+ var user = "unit";
+ var pass = "test";
+
+ mockHttp.When(HttpMethod.Post, $"{server}/fmi/data/v1/databases/{file}/sessions")
+ .Respond("application/json", DataApiResponses.SuccessfulAuthentication());
+
+ var fdc = new FileMakerRestClient(mockHttp.ToHttpClient(), server, file, user, pass);
+
+ var model = new ContainerFieldTestModel
+ {
+ SomeContainerField = uri
+ };
+
+ // act
+ await fdc.ProcessContainer(model);
+
+ // assert
+ Assert.Null(model.SomeContainerFieldData);
+ }
+
 
  [Fact]
  public async Task SendAsync_Dictionary_WithPortals_ShouldHaveData()