Merge branch 'master' of https://github.com/Microsoft/BotFramework-We…

…bChat into 1964-ac-update

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+Fixes #<!-- If this addresses a specific issue, please provide the issue number here -->	
+
+ ## Changelog Entry	
+
+ <!-- Please paste your new entry from CHANGELOG.MD here -->	
+
+ ## Description	
+
+ <!-- Please discuss the changes you have worked on. What do the changes do; why is this PR needed? -->	
+
+ ## Specific Changes	
+
+ <!-- Please list the changes in a concise manner. -->	
+
+ ---	
+
+ -  [ ] Testing Added	
+   <!-- If you are adding a new feature to a library, you must include tests for your new code. -->

CHANGELOG.md

@@ -47,6 +47,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 -  Fix [#1829](https://github.com/microsoft/BotFramework-WebChat/issues/1829). Fixed long text not being synthesized by Cognitive Services by bumping to [`[email protected]`](https://github.com/compulim/react-say), by [@compulim](https://github.com/compulim) in PR [#2035](https://github.com/Microsoft/BotFramework-WebChat/pull/2035)
 -  Fix [#1982](https://github.com/Microsoft/BotFramework-WebChat/issues/1982). Move to prettier! by [@corinagum](https://github.com/corinagum) in PR [#2038](https://github.com/Microsoft/BotFramework-WebChat/pull/2038)
 -  Fix [#1429](https://github.com/Microsoft/BotFramework-WebChat/issues/1429). Added markdown string preprocessing so the renderer will respect CRLF carriage returns (\r\n), by [@tdurnford](https://github.com/tdurnford) in PR [#2055](https://github.com/Microsoft/BotFramework-WebChat/pull/2055)
+-  Fix [#2057](https://github.com/Microsoft/BotFramework-WebChat/issues/2057). Added sip protocol to sanitize HTML options, by [@tdurnford](https://github.com/tdurnford) in PR [#2061](https://github.com/Microsoft/BotFramework-WebChat/pull/2061)
 
 ## [4.4.1] - 2019-05-02
 

packages/bundle/src/__tests__/renderMarkdown.spec.js

@@ -54,4 +54,11 @@ describe('renderMarkdown', () => {
       '<pre><code>{\n  "hello": "World!"\n}\n</code></pre>\n'
     );
   });
+
+  it('should render sip protocol links correctly', () => {
+    const styleSet = { options: { markdownRespectCRLF: true } };
+    expect(renderMarkdown(`[[email protected]](sip:[email protected])`, styleSet)).toBe(
+      '<p><a href="sip:[email protected]" target="_blank">[email protected]</a></p>\n'
+    );
+  });
 });

packages/bundle/src/renderMarkdown.js

@@ -9,6 +9,7 @@ const SANITIZE_HTML_OPTIONS = {
     a: ['href', 'name', 'target', 'title'],
     img: ['alt', 'src']
   },
+  allowedSchemes: ['http', 'https', 'ftp', 'mailto', 'sip'],
   allowedTags: [
     'a',
     'b',