FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

32_withings: temporary fix of login function before rewrite

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14576 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
moises 2017-06-25 22:46:20 +00:00
parent 99eaf99c74
commit 8598d34bff
2 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 32_withings: temporary fix of login function before rewrite
- bugfix: 93_DbRep: V5.2.1, bugfix in sqlCmd to support PRAGMA, UTF8 - bugfix: 93_DbRep: V5.2.1, bugfix in sqlCmd to support PRAGMA, UTF8
- feature: 93_DbLog: V2.17.1, optional UTF-8 support for MySQL database - feature: 93_DbLog: V2.17.1, optional UTF-8 support for MySQL database
(additional parameter in db.conf neccesary for activation) (additional parameter in db.conf neccesary for activation)

104
fhem/FHEM/32_withings.pm
View File

@ -10,7 +10,7 @@
# #
# #
############################################################################## ##############################################################################
# Release 03 / 2017-04-14 # Release 04 / 2017-06-25
package main; package main;
@ -372,8 +372,8 @@ sub withings_Define($$) {
$hash->{helper}{username} = $username; $hash->{helper}{username} = $username;
$hash->{helper}{password} = $password; $hash->{helper}{password} = $password;
$hash->{helper}{appliver} = undef; $hash->{helper}{appliver} = '9855c478';
$hash->{helper}{csrf_token} = undef; $hash->{helper}{csrf_token} = '9855c478';
} else { } else {
return "Usage: define <name> withings ACCOUNT <login> <password>" if(@a < 3 || @a > 5); return "Usage: define <name> withings ACCOUNT <login> <password>" if(@a < 3 || @a > 5);
} }
@ -519,7 +519,9 @@ sub withings_getSessionKey($) {
return if( $hash->{SUBTYPE} ne "ACCOUNT" ); return if( $hash->{SUBTYPE} ne "ACCOUNT" );
my $resolve = inet_aton("healthmate.withings.com"); return if( $hash->{SessionKey} && $hash->{SessionTimestamp} && gettimeofday() - $hash->{SessionTimestamp} < (60*60*24*7-3600) );
my $resolve = inet_aton("account.health.nokia.com");
if(!defined($resolve)) if(!defined($resolve))
{ {
$hash->{SessionTimestamp} = 0; $hash->{SessionTimestamp} = 0;
@ -527,67 +529,65 @@ sub withings_getSessionKey($) {
return undef; return undef;
} }
return if( $hash->{SessionKey} && $hash->{SessionTimestamp} && gettimeofday() - $hash->{SessionTimestamp} < (60*60*24*7-3600) );
$hash->{'.https'} = "https" if(!defined($hash->{'.https'})); $hash->{'.https'} = "https" if(!defined($hash->{'.https'}));
my $data1; # my $data1;
if( !defined($hash->{helper}{appliver}) || !defined($hash->{helper}{csrf_token}) || !defined($hash->{SessionTimestamp}) || gettimeofday() - $hash->{SessionTimestamp} > (30*60) )#!defined($hash->{helper}{appliver}) || !defined($hash->{helper}{csrf_token})) # if( !defined($hash->{helper}{appliver}) || !defined($hash->{helper}{csrf_token}) || !defined($hash->{SessionTimestamp}) || gettimeofday() - $hash->{SessionTimestamp} > (30*60) )#!defined($hash->{helper}{appliver}) || !defined($hash->{helper}{csrf_token}))
{ # {
my($err0,$data0) = HttpUtils_BlockingGet({ # my($err0,$data0) = HttpUtils_BlockingGet({
url => $hash->{'.https'}."://healthmate.withings.com/", # url => $hash->{'.https'}."://healthmate.withings.com/",
timeout => 10, # timeout => 10,
noshutdown => 1, # noshutdown => 1,
}); # });
if($err0 || !defined($data0)) # if($err0 || !defined($data0))
{ # {
Log3 "withings", 1, "$name: appliver call failed! ".$err0; # Log3 "withings", 1, "$name: appliver call failed! ".$err0;
return undef; # return undef;
} # }
$data1 = $data0; # $data1 = $data0;
$data0 =~ /appliver=([^.*]+)\&/; # $data0 =~ /appliver=([^.*]+)\&/;
$hash->{helper}{appliver} = $1; # $hash->{helper}{appliver} = $1;
if(!defined($hash->{helper}{appliver})) { # if(!defined($hash->{helper}{appliver})) {
Log3 "withings", 1, "$name: APPLIVER ERROR "; # Log3 "withings", 1, "$name: APPLIVER ERROR ";
$hash->{STATE} = "APPLIVER error"; # $hash->{STATE} = "APPLIVER error";
return undef; # return undef;
} # }
Log3 "withings", 4, "$name: appliver ".$hash->{helper}{appliver}; # Log3 "withings", 4, "$name: appliver ".$hash->{helper}{appliver};
# #}
#
#
# #if( !defined($hash->{helper}{csrf_token}) )
# #{
# $data1 =~ /csrf_token" value="(.*)"/;
# $hash->{helper}{csrf_token} = $1;
#
# if(!defined($hash->{helper}{csrf_token})) {
# Log3 "withings", 1, "$name: CSRF ERROR ";
# $hash->{STATE} = "CSRF error";
# return undef;
# }
# Log3 "withings", 4, "$name: csrf_token ".$hash->{helper}{csrf_token};
#} #}
#if( !defined($hash->{helper}{csrf_token}) )
#{
$data1 =~ /csrf_token" value="(.*)"/;
$hash->{helper}{csrf_token} = $1;
if(!defined($hash->{helper}{csrf_token})) {
Log3 "withings", 1, "$name: CSRF ERROR ";
$hash->{STATE} = "CSRF error";
return undef;
}
Log3 "withings", 4, "$name: csrf_token ".$hash->{helper}{csrf_token};
}
#my $ua = LWP::UserAgent->new; #my $ua = LWP::UserAgent->new;
#my $request = HTTP::Request->new(POST => $hash->{'.https'}.'://account.withings.com/connectionuser/account_login?appname=my2&appliver='.$hash->{helper}{appliver}.'&r=https%3A%2F%2Fhealthmate.withings.com%2F',[email => withings_decrypt($hash->{helper}{username}), password => withings_decrypt($hash->{helper}{password}), is_admin => '',]); #my $request = HTTP::Request->new(POST => $hash->{'.https'}.'://account.withings.com/connectionuser/account_login?appname=my2&appliver='.$hash->{helper}{appliver}.'&r=https%3A%2F%2Fhealthmate.withings.com%2F',[email => withings_decrypt($hash->{helper}{username}), password => withings_decrypt($hash->{helper}{password}), is_admin => '',]);
#my $get_data = 'use_authy=&is_admin=&email='.uri_escape(withings_decrypt($hash->{helper}{username})).'&password='.uri_escape(withings_decrypt($hash->{helper}{password})); #my $get_data = 'use_authy=&is_admin=&email='.uri_escape(withings_decrypt($hash->{helper}{username})).'&password='.uri_escape(withings_decrypt($hash->{helper}{password}));
#$request->content($get_data); #$request->content($get_data);
#my $response = $ua->request($request); #my $response = $ua->request($request);
$resolve = inet_aton("account.withings.com"); # $resolve = inet_aton("account.health.nokia.com");
if(!defined($resolve)) # if(!defined($resolve))
{ # {
Log3 "withings", 1, "$name: DNS error on getSessionKey."; # Log3 "withings", 1, "$name: DNS error on getSessionKey.";
return undef; # return undef;
} # }
my $datahash = { my $datahash = {
url => $hash->{'.https'}."://account.withings.com/connectionuser/account_login?appname=my2&appliver=".$hash->{helper}{appliver}."&r=https%3A%2F%2Fhealthmate.withings.com%2F", url => $hash->{'.https'}."://account.health.nokia.com/connectionwou/account_login?r=https://dashboard.health.nokia.com/",
timeout => 10, timeout => 10,
noshutdown => 1, noshutdown => 1,
ignoreredirects => 1, ignoreredirects => 1,
data => { email=> withings_decrypt($hash->{helper}{username}), password => withings_decrypt($hash->{helper}{password}), is_admin => '', csrf_token => $hash->{helper}{csrf_token} }, data => { email=> withings_decrypt($hash->{helper}{username}), password => withings_decrypt($hash->{helper}{password}), is_admin => '' },
}; };
my($err,$data) = HttpUtils_BlockingGet($datahash); my($err,$data) = HttpUtils_BlockingGet($datahash);
@ -612,8 +612,8 @@ sub withings_getSessionKey($) {
{ {
$hash->{STATE} = "Cookie error"; $hash->{STATE} = "Cookie error";
Log3 "withings", 1, "$name: COOKIE ERROR "; Log3 "withings", 1, "$name: COOKIE ERROR ";
$hash->{helper}{appliver} = undef; $hash->{helper}{appliver} = '9855c478';
$hash->{helper}{csrf_token} = undef; $hash->{helper}{csrf_token} = '9855c478';
return undef; return undef;
} }
} }