From 41ec772c8419891f7b7a2a4d0fcb50545edae2b4 Mon Sep 17 00:00:00 2001 From: andig Date: Tue, 18 Jul 2023 16:13:56 +0200 Subject: [PATCH] VAG: fix login (#9009) --- vehicle/vag/vwidentity/forms.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vehicle/vag/vwidentity/forms.go b/vehicle/vag/vwidentity/forms.go index 14a492554..1e06929c9 100644 --- a/vehicle/vag/vwidentity/forms.go +++ b/vehicle/vag/vwidentity/forms.go @@ -82,8 +82,14 @@ func ParseCredentialsPage(r io.ReadCloser) (CredentialParams, error) { re := regexp.MustCompile(`(?s)window._IDK\s*=\s*(.*?)[;<]`) match := re.FindAllStringSubmatch(buf.String(), -1) + // clean quotes tmpl := strings.ReplaceAll(match[0][1], `'`, `"`) - for _, v := range []string{"templateModel", "currentLocale", "csrf_parameterName", "csrf_token", "userSession", "userId", "countryOfResidence", "baseUrl", "consentBaseUrl"} { + + // strip , } + re2 := regexp.MustCompile(`(?s),\s+}`) + tmpl = re2.ReplaceAllString(tmpl, "}") + + for _, v := range []string{"templateModel", "disabledFeatures", "isFooterEnabled", "currentLocale", "csrf_parameterName", "csrf_token", "userSession", "userId", "countryOfResidence", "baseUrl", "consentBaseUrl"} { tmpl = strings.Replace(tmpl, v, fmt.Sprintf(`"%s"`, v), 1) }