mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

72_FBTAM.pm: Bugfix beim Passwort

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@30545 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
phenning
2025-11-20 15:26:52 +00:00
parent 6c0864c70d
commit c92494750d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/FHEM/72_FBTAM.pm
View File

@@ -31,9 +31,9 @@ package main;
use strict; use strict;
use warnings; use warnings;
use XML::Simple; use XML::Simple;
use Digest::MD5 qw(md5_hex); use Digest::MD5 qw(md5_hex);
#use Digest::SHA qw(sha256_hex);
use HttpUtils; use HttpUtils;
use HTTP::Request; use HTTP::Request;
use HTTP::Request::Common qw(POST); use HTTP::Request::Common qw(POST);
@@ -212,6 +212,8 @@ sub FBTAM_storepassword {
sub FBTAM_readpassword { sub FBTAM_readpassword {
my ($hash) = @_; my ($hash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $savedUser = AttrVal($name, "username", undef);
$hash->{USERNAME} = $savedUser if defined $savedUser;
my $keyname = 'FBTAM_' . $name . '_PASSWORD'; my $keyname = 'FBTAM_' . $name . '_PASSWORD';
my $key = getUniqueId() . $keyname; my $key = getUniqueId() . $keyname;
@@ -264,8 +266,8 @@ sub FBTAM_Update {
my $fbip = InternalVal($fbDev, 'HOST', undef); my $fbip = InternalVal($fbDev, 'HOST', undef);
readingsSingleUpdate($hash, 'fritzbox_ip', $fbip, 0) if $fbip; readingsSingleUpdate($hash, 'fritzbox_ip', $fbip, 0) if $fbip;
my $username = $hash->{USERNAME} // '';
my $password = FBTAM_readpassword($hash); my $password = FBTAM_readpassword($hash);
my $username = $hash->{USERNAME};
my $tam = $hash->{TAM}; my $tam = $hash->{TAM};
return unless $fbip && $username && $password; return unless $fbip && $username && $password;
@@ -415,8 +417,8 @@ sub FBTAM_getMsgListUrl {
my $fbip = InternalVal($fbDev, 'HOST', undef); my $fbip = InternalVal($fbDev, 'HOST', undef);
my $tamIndex = $hash->{TAM}-1; my $tamIndex = $hash->{TAM}-1;
my $username = $hash->{USERNAME} // '';
my $password = FBTAM_readpassword($hash); my $password = FBTAM_readpassword($hash);
my $username = $hash->{USERNAME};
my $ua = LWP::UserAgent->new(timeout => 10); my $ua = LWP::UserAgent->new(timeout => 10);
$ua->credentials("$fbip:49000", "HTTPS Access", $username, $password); $ua->credentials("$fbip:49000", "HTTPS Access", $username, $password);
@@ -485,8 +487,8 @@ sub FBTAM_getMsgList {
return undef; return undef;
} }
my $username = $hash->{USERNAME} // '';
my $password = FBTAM_readpassword($hash); my $password = FBTAM_readpassword($hash);
my $username = $hash->{USERNAME};
my $ua = LWP::UserAgent->new; my $ua = LWP::UserAgent->new;
$ua->credentials($fbip . ':49000', 'HTTPS Access', $username, $password); $ua->credentials($fbip . ':49000', 'HTTPS Access', $username, $password);
@@ -990,8 +992,8 @@ sub FBTAM_deleteMsg {
return return
} }
my $username = $hash->{USERNAME} // '';
my $password = FBTAM_readpassword($hash); my $password = FBTAM_readpassword($hash);
my $username = $hash->{USERNAME};
my $ua = LWP::UserAgent->new(timeout => 10); my $ua = LWP::UserAgent->new(timeout => 10);
$ua->credentials("$fbip:49000", "HTTPS Access", $username, $password); $ua->credentials("$fbip:49000", "HTTPS Access", $username, $password);
@@ -1053,8 +1055,8 @@ sub FBTAM_markMsg {
my $tamIndex = $hash->{TAM}-1; my $tamIndex = $hash->{TAM}-1;
my $username = $hash->{USERNAME} // '';
my $password = FBTAM_readpassword($hash); my $password = FBTAM_readpassword($hash);
my $username = $hash->{USERNAME};
my $ua = LWP::UserAgent->new(timeout => 10); my $ua = LWP::UserAgent->new(timeout => 10);
$ua->credentials("$fbip:49000", "HTTPS Access", $username, $password); $ua->credentials("$fbip:49000", "HTTPS Access", $username, $password);
@@ -1112,8 +1114,8 @@ sub FBTAM_enableTAM {
#-- careful: tamIndex = tamNr-1 #-- careful: tamIndex = tamNr-1
my $tamIndex = $hash->{TAM}-1; my $tamIndex = $hash->{TAM}-1;
my $username = $hash->{USERNAME} // '';
my $password = FBTAM_readpassword($hash); my $password = FBTAM_readpassword($hash);
my $username = $hash->{USERNAME};
my $ua = LWP::UserAgent->new(timeout => 10); my $ua = LWP::UserAgent->new(timeout => 10);
$ua->credentials("$fbip:49000", "HTTPS Access", $username, $password); $ua->credentials("$fbip:49000", "HTTPS Access", $username, $password);
@@ -1163,8 +1165,8 @@ sub FBTAM_getinfo {
#-- careful: tamIndex = tamNr-1 #-- careful: tamIndex = tamNr-1
my $tamIndex = $hash->{TAM}-1; my $tamIndex = $hash->{TAM}-1;
my $username = $hash->{USERNAME} // '';
my $password = FBTAM_readpassword($hash); my $password = FBTAM_readpassword($hash);
my $username = $hash->{USERNAME};
my $ua = LWP::UserAgent->new(timeout => 10); my $ua = LWP::UserAgent->new(timeout => 10);
$ua->credentials("$fbip:49000", "HTTPS Access", $username, $password); $ua->credentials("$fbip:49000", "HTTPS Access", $username, $password);