Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify redirect logic (#760)

Browse source
This commit is contained in:
andig 2021-03-14 17:42:19 +01:00 • committed by GitHub
parent 4cf8fe1a22
commit 2fd6345434
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

66
vehicle/vw/identity.go
View file

@ -48,28 +48,15 @@ func NewIdentity(log *util.Logger, clientID string) *Identity {
// track cookies and don't follow redirects
v.Client.Jar = jar
v.Client.CheckRedirect = func(req *http.Request, via []*http.Request) error {
return http.ErrUseLastResponse
if req.URL.Scheme != "https" {
return http.ErrUseLastResponse
}
return nil
}
return v
}
// redirect follows HTTP redirect header if error is nil. Request body is closed.
func (v *Identity) redirect(resp *http.Response, err error) (*http.Response, error) {
if err == nil {
uri := resp.Header.Get("Location")
if uri == "" {
return nil, errors.New("could not find expected HTTP redirect header\ngo to https://www.portal.volkswagen-we.com/ check account status")
}
if resp, err = v.Get(uri); err == nil {
resp.Body.Close()
}
}
return resp, err
}
// Login performs the identity.vwgroup.io login
func (v *Identity) Login(query url.Values, user, password string) error {
var vars FormVars
@ -79,35 +66,22 @@ func (v *Identity) Login(query url.Values, user, password string) error {
query.Set("nonce", RandomString(43))
query.Set("state", RandomString(43))
// GET identity.vwgroup.io/oidc/v1/authorize?ui_locales=de&scope=openid%20profile%20birthdate%20nickname%20address%20phone%20cars%20mbb&response_type=code&state=gmiJOaB4&redirect_uri=https%3A%2F%2Fwww.portal.volkswagen-we.com%2Fportal%2Fweb%2Fguest%2Fcomplete-login&nonce=38042ee3-b7a7-43cf-a9c1-63d2f3f2d9f3&prompt=login&client_id=b7a5bb47-f875-47cf-ab83-2ba3bf6bb738@apps_vw-dilab_com
uri := "https://identity.vwgroup.io/oidc/v1/authorize?" + query.Encode()
// ID - get login url
if v.clientID == "" {
uri = "https://login.apps.emea.vwapps.io/authorize?nonce=NZ2Q3T6jak0E5pDh&redirect_uri=weconnect://authenticated"
}
resp, err := v.Get(uri)
if err == nil {
resp.Body.Close()
}
// ID - get login url (previous request is ignored)
if v.clientID == "" {
uri := "https://login.apps.emea.vwapps.io/authorize?nonce=NZ2Q3T6jak0E5pDh&redirect_uri=weconnect://authenticated"
if resp, err = v.Get(uri); err == nil {
resp.Body.Close()
uri = resp.Header.Get("Location")
if resp, err = v.Get(uri); err == nil {
resp.Body.Close()
}
}
}
// GET identity.vwgroup.io/signin-service/v1/signin/b7a5bb47-f875-47cf-ab83-2ba3bf6bb738@apps_vw-dilab_com?relayState=15404cb51c8b4cc5efeee1d2c2a73e5b41562faa
if err == nil {
uri = resp.Header.Get("Location")
resp, err = v.Get(uri)
if err == nil {
vars, err = FormValues(resp.Body, "form#emailPasswordForm")
resp.Body.Close()
}
vars, err = FormValues(resp.Body, "form#emailPasswordForm")
resp.Body.Close()
}
// POST identity.vwgroup.io/signin-service/v1/b7a5bb47-f875-47cf-ab83-2ba3bf6bb738@apps_vw-dilab_com/login/identifier
@ -127,17 +101,7 @@ func (v *Identity) Login(query url.Values, user, password string) error {
// GET identity.vwgroup.io/signin-service/v1/b7a5bb47-f875-47cf-ab83-2ba3bf6bb738@apps_vw-dilab_com/login/authenticate?relayState=15404cb51c8b4cc5efeee1d2c2a73e5b41562faa&email=...
if err == nil {
uri = IdentityURI + resp.Header.Get("Location")
req, err = http.NewRequest(http.MethodGet, uri, nil)
if err == nil {
resp, err = v.Do(req)
}
if err == nil {
vars, err = FormValues(resp.Body, "form#credentialsForm")
resp.Body.Close()
}
vars, err = FormValues(resp.Body, "form#credentialsForm")
}
// POST identity.vwgroup.io/signin-service/v1/b7a5bb47-f875-47cf-ab83-2ba3bf6bb738@apps_vw-dilab_com/login/authenticate
@ -159,12 +123,8 @@ func (v *Identity) Login(query url.Values, user, password string) error {
// GET identity.vwgroup.io/oidc/v1/oauth/sso?clientId=b7a5bb47-f875-47cf-ab83-2ba3bf6bb738@apps_vw-dilab_com&relayState=15404cb51c8b4cc5efeee1d2c2a73e5b41562faa&userId=bca09cc0-8eba-4110-af71-7242868e1bf1&HMAC=2b01ce6a351fad4dd97dc8110d0967b46c95889ab5010c660a616462e66a83ca
// GET identity.vwgroup.io/signin-service/v1/consent/users/bca09cc0-8eba-4110-af71-7242868e1bf1/b7a5bb47-f875-47cf-ab83-2ba3bf6bb738@apps_vw-dilab_com?scopes=openid%20profile%20birthdate%20nickname%20address%20phone%20cars%20mbb&relayState=15404cb51c8b4cc5efeee1d2c2a73e5b41562faa&callback=https://identity.vwgroup.io/oidc/v1/oauth/client/callback&hmac=a590931ca3cd9dc3a27f1d1c0c162bf1e5c5c32c9f5b40fcb36d4c6edc631e03
// GET identity.vwgroup.io/oidc/v1/oauth/client/callback/success?user_id=bca09cc0-8eba-4110-af71-7242868e1bf1&client_id=b7a5bb47-f875-47cf-ab83-2ba3bf6bb738@apps_vw-dilab_com&scopes=openid%20profile%20birthdate%20nickname%20address%20phone%20cars%20mbb&consentedScopes=openid%20profile%20birthdate%20nickname%20address%20phone%20cars%20mbb&relayState=f89a0b750c93e278a7ace170ce374e9cb9eb0a74&hmac=2b728f463c3cfe80f3271fbb35680e5e5218ca70025a46e7fadf7c7982decc2b
for i := 6; i < 9; i++ {
resp, err = v.redirect(resp, err)
}
var location *url.URL
if err == nil {
loc := strings.ReplaceAll(resp.Header.Get("Location"), "#", "?") // convert to parseable url
location, err = url.Parse(loc)