Fix: % symbol crash (#2267)

microsoftgraph · Dec 9, 2022 · 89851d7 · 89851d7
1 parent 8a7e29e
commit 89851d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/modules/validation/abnf.spec.ts b/src/modules/validation/abnf.spec.ts
@@ -20,7 +20,9 @@ const validUrls = [
 
 const invalidUrls = [
   'https://graph.microsoft.com/me+you',
-  'https://graph.microsoft.com/v1.0/me/messages?$$select=id'
+  'https://graph.microsoft.com/v1.0/me/messages?$$select=id',
+  'https://graph.microsoft.com/v1.0/me/drive/root:/Encoded%',
+  'https://graph.microsoft.com/v1.0/me/drive/root:/Encoded%2'
 ];
 
 /*

diff --git a/src/modules/validation/abnf.ts b/src/modules/validation/abnf.ts
@@ -38,10 +38,12 @@ export class ValidatedUrl {
   }
 
   public validate(graphUrl: string): ValidationResult {
+    let decodedGraphUrl = graphUrl;
+    try { decodedGraphUrl = decodeURI(graphUrl); } catch (error) { /* empty */ }
     const result = ValidatedUrl.parser.parse(
       ValidatedUrl.getGrammar(),
       'odataUri',
-      decodeURI(graphUrl)
+      decodedGraphUrl
     );
     return result;
   }