Merge pull request #5688 from DSpace/backport-5328-to-dspace-8_x

[Port dspace-8_x] Fix #2789: prevent linkify from converting words with dots into links

Author: tdonohue

src/app/shared/utils/markdown.directive.spec.ts

@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import {
   Component,
   DebugElement,
@@ -20,6 +21,14 @@ import { MarkdownDirective } from './markdown.directive';
 })
 class TestComponent {}
 
+@Component({
+  template: `<div [dsMarkdown]="'Les informations demandés.es ne sont pas disponibles.'"></div>`,
+  imports: [
+    MarkdownDirective,
+  ],
+})
+class LinkifyTestComponent {}
+
 describe('MarkdownDirective', () => {
   let fixture: ComponentFixture<TestComponent>;
 
@@ -54,10 +63,9 @@ describe('MarkdownDirective sanitization with markdown disabled', () => {
     }).compileComponents();
     fixture = TestBed.createComponent(TestComponent);
     divEl = fixture.debugElement.query(By.css('div'));
-
   });
 
-  it('should sanitize the script element out of innerHTML (markdown disabled)',() => {
+  it('should sanitize the script element out of innerHTML (markdown disabled)', () => {
     fixture.detectChanges();
     divEl = fixture.debugElement.query(By.css('div'));
     expect(divEl.nativeElement.innerHTML).toEqual('test');
@@ -79,13 +87,37 @@ describe('MarkdownDirective sanitization with markdown enabled', () => {
     }).compileComponents();
     fixture = TestBed.createComponent(TestComponent);
     divEl = fixture.debugElement.query(By.css('div'));
-
   });
 
-  it('should sanitize the script element out of innerHTML (markdown enabled)',() => {
+  it('should sanitize the script element out of innerHTML (markdown enabled)', () => {
     fixture.detectChanges();
     divEl = fixture.debugElement.query(By.css('div'));
     expect(divEl.nativeElement.innerHTML).toEqual('test');
   });
 
 });
+
+describe('MarkdownDirective linkify with markdown enabled', () => {
+  let fixture: ComponentFixture<LinkifyTestComponent>;
+  let divEl: DebugElement;
+  // Enable markdown
+  environment.markdown.enabled = true;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      providers: [
+        { provide: MathService, useClass: MockMathService },
+      ],
+    }).compileComponents();
+    fixture = TestBed.createComponent(LinkifyTestComponent);
+    divEl = fixture.debugElement.query(By.css('div'));
+  });
+
+  it('should not convert words with dots (e.g. demandés.es) to links (#2789)', async () => {
+    fixture.detectChanges();
+    await fixture.whenStable();
+    divEl = fixture.debugElement.query(By.css('div'));
+    expect(divEl.nativeElement.innerHTML).not.toContain('<a href');
+  });
+
+});

src/app/shared/utils/markdown.directive.ts

@@ -86,6 +86,9 @@ export class MarkdownDirective implements OnInit, OnDestroy {
       html: true,
       linkify: true,
     });
+    md.linkify.set({
+      fuzzyLink: false,
+    });
 
     const html = alreadySanitized ? md.render(value) : this.sanitizer.sanitize(SecurityContext.HTML, md.render(value));
     this.el.innerHTML = html;