Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

FB_CALLMONITOR: fix url encoding of passwords via TR-064 and wrong authentication check (Forum: #78087)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@15402 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch 2017-11-05 19:55:08 +00:00
parent d6d6941c5d
commit f1394a3cd0
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
FHEM/72_FB_CALLMONITOR.pm
View File

@ -1348,7 +1348,7 @@ sub FB_CALLMONITOR_requestTR064($$$$;$$)
return "no password available to access FritzBox. Please set your FRITZ!Box password via 'set ".$hash->{NAME}." password <your password>'"; return "no password available to access FritzBox. Please set your FRITZ!Box password via 'set ".$hash->{NAME}." password <your password>'";
} }
my $tr064_base_url = "http://$fb_user:$fb_pw\@$fb_ip:49000"; my $tr064_base_url = "http://".urlEncode($fb_user).":".urlEncode($fb_pw)."\@$fb_ip:49000";
$param->{noshutdown} = 1; $param->{noshutdown} = 1;
$param->{timeout} = AttrVal($name, "fritzbox-remote-timeout", 5); $param->{timeout} = AttrVal($name, "fritzbox-remote-timeout", 5);
@ -1365,9 +1365,9 @@ sub FB_CALLMONITOR_requestTR064($$$$;$$)
'</s:Body>'. '</s:Body>'.
'</s:Envelope>'; '</s:Envelope>';
$param->{url} = "$tr064_base_url/upnp/control/deviceinfo"; $param->{url} = "$tr064_base_url/upnp/control/deviceinfo";
$param->{header} = "SOAPACTION: urn:dslforum-org:service:DeviceInfo:1#GetSecurityPort\r\nContent-Type: text/xml; charset=utf-8"; $param->{header} = "SOAPACTION: urn:dslforum-org:service:DeviceInfo:1#GetSecurityPort\r\nContent-Type: text/xml; charset=utf-8";
$param->{data} = $get_security_port; $param->{data} = $get_security_port;
Log3 $name, 4, "FB_CALLMONITOR ($name) - request SSL port for TR-064 access via method GetSecurityPort:\n$get_security_port"; Log3 $name, 4, "FB_CALLMONITOR ($name) - request SSL port for TR-064 access via method GetSecurityPort:\n$get_security_port";
my ($err, $data) = HttpUtils_BlockingGet($param); my ($err, $data) = HttpUtils_BlockingGet($param);
@ -1388,16 +1388,16 @@ sub FB_CALLMONITOR_requestTR064($$$$;$$)
if($data =~ /<NewSecurityPort>(\d+)<\/NewSecurityPort>/) if($data =~ /<NewSecurityPort>(\d+)<\/NewSecurityPort>/)
{ {
$tr064_base_url = "https://$fb_user:$fb_pw\@$fb_ip:$1"; $tr064_base_url = "https://".urlEncode($fb_user).":".urlEncode($fb_pw)."\@$fb_ip:$1";
$hash->{helper}{TR064}{SECURITY_PORT} = $1; $hash->{helper}{TR064}{SECURITY_PORT} = $1;
} }
} }
else else
{ {
$tr064_base_url = "https://$fb_user:$fb_pw\@$fb_ip:".$hash->{helper}{TR064}{SECURITY_PORT}; $tr064_base_url = "https://".urlEncode($fb_user).":".urlEncode($fb_pw)."\@$fb_ip:".$hash->{helper}{TR064}{SECURITY_PORT};
} }
# generate challenge XML # éxecute the TR-064 request
my $soap_request = '<?xml version="1.0" encoding="utf-8"?>'. my $soap_request = '<?xml version="1.0" encoding="utf-8"?>'.
'<s:Envelope s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" >'. '<s:Envelope s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" >'.
'<s:Body>'. '<s:Body>'.
@ -1415,8 +1415,17 @@ sub FB_CALLMONITOR_requestTR064($$$$;$$)
if($err ne "") if($err ne "")
{ {
Log3 $name, 3, "FB_CALLMONITOR ($name) - error while requesting TR-064 method $command: $err"; if(exists($param->{code}) and $param->{code} eq "401")
return "error while requesting TR-064 TR-064 method $command: $err"; {
$hash->{helper}{PWD_NEEDED} = 1;
Log3 $name, 3, "FB_CALLMONITOR ($name) - unable to login via TR-064, wrong user/password";
return "unable to login via TR-064, wrong user/password";
}
else
{
Log3 $name, 3, "FB_CALLMONITOR ($name) - error while requesting TR-064 method $command: $err";
return "error while requesting TR-064 TR-064 method $command: $err";
}
} }
if($data eq "" and exists($param->{code})) if($data eq "" and exists($param->{code}))