fix : account for zero or more spaces

Signed-off-by: Prajwal T R <[email protected]>
zmanda · May 22, 2023 · 0563c62 · 0563c62
1 parent 3534c11
commit 0563c62
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/device-src/s3.c b/device-src/s3.c
@@ -2918,8 +2918,8 @@ compile_regexes(void)
         {"^[a-z0-9](-*[a-z0-9]){2,62}$", REG_EXTENDED | REG_NOSUB, &subdomain_regex},
         {"(/>)|(>([^<]*)</LocationConstraint>)", REG_EXTENDED | REG_ICASE, &location_con_regex},
         {"^Date:(.*)$",REG_EXTENDED | REG_ICASE | REG_NEWLINE, &date_sync_regex},
-        {"\"access_token\": \"([^\"]*)\",", REG_EXTENDED | REG_ICASE | REG_NEWLINE, &access_token_regex},
-	{"\"expires_in\": (.*),", REG_EXTENDED | REG_ICASE | REG_NEWLINE, &expires_in_regex},
+        {"\"access_token\"[[:space:]]*:[[:space:]]*\"([^\"]*)\",", REG_EXTENDED | REG_ICASE | REG_NEWLINE, &access_token_regex},
+	{"\"expires_in\"[[:space:]]*:[[:space:]]*(.*),", REG_EXTENDED | REG_ICASE | REG_NEWLINE, &expires_in_regex},
         {"\"details\": \"([^\"]*)\",", REG_EXTENDED | REG_ICASE | REG_NEWLINE, &details_regex},
         {"\"code\": (.*),", REG_EXTENDED | REG_ICASE | REG_NEWLINE, &code_regex},
         {"\"message\": \"([^\"]*)\",", REG_EXTENDED | REG_ICASE | REG_NEWLINE, &json_message_regex},
@@ -2978,10 +2978,10 @@ compile_regexes(void)
         {"^Date:(.*)$",
          G_REGEX_OPTIMIZE | G_REGEX_CASELESS,
          &date_sync_regex},
-        {"\"access_token\": \"([^\"]*)\"",
+        {"\"access_token\"\\s*:\\s*\"([^\"]*)\"",
          G_REGEX_OPTIMIZE | G_REGEX_CASELESS,
          &access_token_regex},
-        {"\"expires_in\": (.*),",
+        {"\"expires_in\"\\s*:\\s*(.*),",
          G_REGEX_OPTIMIZE | G_REGEX_CASELESS,
          &expires_in_regex},
         {"\"details\" : \"([^\"]*)\"",