Display infobar for blocked relative image path (#1695)

* Updated Parsing extension to show infobar when relative URL isblocked and updated corresponding tests

* Updated Controller to display infobar when html img tag is embedded in markdown

src/modules/previewpane/MarkDownPreviewHandler/HTMLParsingExtension.cs

@@ -91,23 +91,9 @@ namespace MarkdownPreviewHandler
                     {
                         if (link.IsImage)
                         {
+                            link.Url = "#";
                             link.GetAttributes().AddClass("img-fluid");
-                        }
+                            this.imagesBlockedCallBack();
-
-                        if (!Uri.TryCreate(link.Url, UriKind.Absolute, out _))
-                        {
-                            link.Url = link.Url.TrimStart('/', '\\');
-                            this.BaseUrl = this.BaseUrl.TrimEnd('/', '\\');
-                            Uri uriLink = new Uri(Path.Combine(this.BaseUrl, link.Url));
-                            link.Url = uriLink.ToString();
-                        }
-                        else
-                        {
-                            if (link.IsImage)
-                            {
-                                link.Url = "#";
-                                this.imagesBlockedCallBack();
-                            }
                         }
                     }
                 }

src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandlerControl.cs

@@ -8,6 +8,7 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using Common;
 using Markdig;
@@ -83,6 +84,12 @@ namespace MarkdownPreviewHandler
                     string fileText = File.ReadAllText(filePath);
                     this.extension.BaseUrl = Path.GetDirectoryName(filePath);
 
+                    Regex rgx = new Regex(@"<[ ]*img.*>");
+                    if (rgx.IsMatch(fileText))
+                    {
+                        this.infoBarDisplayed = true;
+                    }
+
                     MarkdownPipeline pipeline = this.pipelineBuilder.Build();
                     string parsedMarkdown = Markdown.ToHtml(fileText, pipeline);
                     sb.AppendFormat("{0}{1}{2}", this.htmlHeader, parsedMarkdown, this.htmlFooter);

src/modules/previewpane/PreviewPaneUnitTests/HTMLParsingExtensionTest.cs

@@ -47,7 +47,7 @@ namespace PreviewPaneUnitTests
         }
 
         [TestMethod]
-        public void Extension_UpdatesFigureClassAndRelativeUrltoAbsolute_WhenUsed()
+        public void Extension_UpdatesFigureClassAndBlocksRelativeUrl_WhenUsed()
         {
             // arrange 
             String mdString = "![text](a.jpg \"Figure\")";
@@ -58,37 +58,7 @@ namespace PreviewPaneUnitTests
             String html = Markdown.ToHtml(mdString, markdownPipeline);
 
             // Assert
-            Assert.AreEqual(html, "<p><img src=\"file:///C:/Users/a.jpg\" class=\"img-fluid\" alt=\"text\" title=\"Figure\" /></p>\n");
+            Assert.AreEqual(html, "<p><img src=\"#\" class=\"img-fluid\" alt=\"text\" title=\"Figure\" /></p>\n");
-        }
-
-        [TestMethod]
-        public void Extension_CreatesCorrectAbsoluteLinkByTrimmingForwardSlash_WhenUsed()
-        {
-            // arrange 
-            String mdString = "![text](\\document\\a.jpg \"Figure\")";
-            HTMLParsingExtension htmlParsingExtension = new HTMLParsingExtension(() => { }, "C:\\Users\\");
-            MarkdownPipeline markdownPipeline = BuidPipeline(htmlParsingExtension);
-
-            // Act
-            String html = Markdown.ToHtml(mdString, markdownPipeline);
-
-            // Assert
-            Assert.AreEqual(html, "<p><img src=\"file:///C:/Users/document/a.jpg\" class=\"img-fluid\" alt=\"text\" title=\"Figure\" /></p>\n");
-        }
-
-        [TestMethod]
-        public void Extension_CreatesCorrectAbsoluteLinkByTrimmingBackwardSlash_WhenUsed()
-        {
-            // arrange 
-            String mdString = "![text](/document/a.jpg \"Figure\")";
-            HTMLParsingExtension htmlParsingExtension = new HTMLParsingExtension(() => { }, "C:/Users/");
-            MarkdownPipeline markdownPipeline = BuidPipeline(htmlParsingExtension);
-
-            // Act
-            String html = Markdown.ToHtml(mdString, markdownPipeline);
-
-            // Assert
-            Assert.AreEqual(html, "<p><img src=\"file:///C:/Users/document/a.jpg\" class=\"img-fluid\" alt=\"text\" title=\"Figure\" /></p>\n");
         }
 
         [TestMethod]

src/modules/previewpane/PreviewPaneUnitTests/HelperFiles/MarkdownWithHTMLImageTag.txt

@@ -0,0 +1,2 @@
+## Something
+<img src="./a.jpg" \>

src/modules/previewpane/PreviewPaneUnitTests/MarkdownPreviewHandlerTest.cs

@@ -42,6 +42,20 @@ namespace PreviewPaneUnitTests
             Assert.IsInstanceOfType(markdownPreviewHandlerControl.Controls[1], typeof(RichTextBox));
         }
 
+        [TestMethod]
+        public void MarkdownPreviewHandlerControl__AddsInfoBarToFormIfHTMLImageTagIsPresent_WhenDoPreviewIsCalled()
+        {
+            // Arrange 
+            MarkdownPreviewHandlerControl markdownPreviewHandlerControl = new MarkdownPreviewHandlerControl();
+
+            // Act
+            markdownPreviewHandlerControl.DoPreview<string>("HelperFiles/MarkdownWithHTMLImageTag.txt");
+
+            // Assert
+            Assert.AreEqual(markdownPreviewHandlerControl.Controls.Count, 2);
+            Assert.IsInstanceOfType(markdownPreviewHandlerControl.Controls[1], typeof(RichTextBox));
+        }
+
         [TestMethod]
         public void MarkdownPreviewHandlerControl__DoesNotAddInfoBarToFormIfExternalImageLinkNotPresent_WhenDoPreviewIsCalled()
         {

src/modules/previewpane/PreviewPaneUnitTests/UnitTests-MarkdownPreviewHandler.csproj

@@ -116,6 +116,9 @@
     <Content Include="HelperFiles\MarkdownWithExternalImage.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="HelperFiles\MarkdownWithHTMLImageTag.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="HelperFiles\MarkdownWithscript.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>