fix: URI resolution issue - avoid ambiguities

signum-network · Sep 7, 2023 · 612c0a9 · 612c0a9
1 parent 4a66ce4
commit 612c0a9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/packages/standards/src/src47/URIResolver.ts b/packages/standards/src/src47/URIResolver.ts
@@ -123,19 +123,11 @@ export class URIResolver {
      */
     public static convertKnownTldUri(uri: string): string {
         uri = uri.toLowerCase();
-        for (const knownTld of KnownTlds) {
-            const index = uri.lastIndexOf('.' + knownTld);
-            if (index > -1) {
-                const pathIndex = uri.indexOf('/', index);
-                const path = pathIndex > -1 ? uri.substring(pathIndex) : '';
-                uri = uri.slice(0, index) + `@${knownTld}`;
-                if(path){
-                    uri += path;
-                }
-                break;
-            }
+        const expression = `\\.(${KnownTlds.join('|')})(/[a-zA-Z0-9_-]+)?$`;
+        const matches = new RegExp(expression).exec(uri);
+        if (matches) {
+            return uri.substring(0, matches.index) + '@' + uri.substring(matches.index + 1);
         }
-
         return uri;
     }
 

diff --git a/packages/standards/src/src47/__tests__/URIResolver.spec.ts b/packages/standards/src/src47/__tests__/URIResolver.spec.ts
@@ -353,6 +353,12 @@ describe('URIResolver', () => {
             expect(convertedUri).toEqual('http://example@com');
         });
 
+        it('should consider only extact TLDs', () => {
+            const uri = 'http://ohager.nfts.signum';
+            const convertedUri = URIResolver.convertKnownTldUri(uri);
+            expect(convertedUri).toEqual('http://ohager.nfts@signum');
+        });
+
         it('should handle append further (deep) field paths - domain only', () => {
             for (const tld of KnownTlds) {
                 const uri = `https://domain.${tld}/ac`;