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

HttpUtils.pm: optional user+pwd in the parameter hash (by Markus, Forum #80412)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15535 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-12-01 20:12:47 +00:00
parent 09c6a0d99d
commit 0a80a78beb
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fhem/FHEM/HttpUtils.pm
View File

@ -319,7 +319,17 @@ HttpUtils_Connect($)
$hash->{hu_port} = $port; $hash->{hu_port} = $port;
$hash->{path} = '/' unless defined($hash->{path}); $hash->{path} = '/' unless defined($hash->{path});
$hash->{addr} = "$hash->{protocol}://$host:$port"; $hash->{addr} = "$hash->{protocol}://$host:$port";
$hash->{auth} = urlDecode("$user:$pwd") if($authstring);
if($authstring) {
$hash->{auth} = 1;
$hash->{user} = urlDecode("$user");
$hash->{pwd} = urlDecode("$pwd");
} elsif(defined($hash->{user}) && defined($hash->{pwd})) {
$hash->{auth} = 1;
} else {
$hash->{auth} = 0;
}
my $proxy = AttrVal("global", "proxy", undef); my $proxy = AttrVal("global", "proxy", undef);
if($proxy) { if($proxy) {
@ -520,8 +530,8 @@ HttpUtils_Connect2($)
$hdr .= "Connection: Close\r\n" $hdr .= "Connection: Close\r\n"
if($httpVersion ne "1.0" && !$hash->{keepalive}); if($httpVersion ne "1.0" && !$hash->{keepalive});
$hdr .= "Authorization: Basic ".encode_base64($hash->{auth}, "")."\r\n" $hdr .= "Authorization: Basic ".encode_base64($hash->{user}.":".$hash->{pwd}, "")."\r\n"
if(defined($hash->{auth}) && !$hash->{digest} && if($hash->{auth} && !$hash->{digest} &&
!($hash->{header} && !($hash->{header} &&
$hash->{header} =~ /^Authorization:\s*Digest/mi)); $hash->{header} =~ /^Authorization:\s*Digest/mi));
$hdr .= $hash->{header}."\r\n" if($hash->{header}); $hdr .= $hash->{header}."\r\n" if($hash->{header});
@ -659,7 +669,7 @@ HttpUtils_DigestHeader($$)
} }
my ($ha1, $ha2, $response); my ($ha1, $ha2, $response);
my ($user,$passwd) = split(/:/, $hash->{auth}, 2); my ($user,$passwd) = ($hash->{user}, $hash->{pwd});
if(exists($digdata{qop})) { if(exists($digdata{qop})) {
$digdata{nc} = "00000001"; $digdata{nc} = "00000001";
@ -755,7 +765,7 @@ HttpUtils_ParseAnswer($)
$hash->{code} = $code; $hash->{code} = $code;
# if servers requests digest authentication # if servers requests digest authentication
if($code==401 && defined($hash->{auth}) && if($code==401 && $hash->{auth} &&
!($hash->{header} && $hash->{header} =~ /^Authorization:\s*Digest/mi) && !($hash->{header} && $hash->{header} =~ /^Authorization:\s*Digest/mi) &&
$hash->{httpheader} =~ /^WWW-Authenticate:\s*Digest\s*(.+?)\s*$/mi) { $hash->{httpheader} =~ /^WWW-Authenticate:\s*Digest\s*(.+?)\s*$/mi) {
@ -771,7 +781,7 @@ HttpUtils_ParseAnswer($)
return HttpUtils_BlockingGet($hash); return HttpUtils_BlockingGet($hash);
} }
} elsif($code==401 && defined($hash->{auth})) { } elsif($code==401 && $hash->{auth}) {
return ("$hash->{displayurl}: wrong authentication", "") return ("$hash->{displayurl}: wrong authentication", "")
} }
@ -811,7 +821,7 @@ HttpUtils_ParseAnswer($)
# optional(default): # optional(default):
# digest(0),hideurl(0),timeout(4),data(""),loglevel(4),header("" or HASH), # digest(0),hideurl(0),timeout(4),data(""),loglevel(4),header("" or HASH),
# noshutdown(1),shutdown(0),httpversion("1.0"),ignoreredirects(0) # noshutdown(1),shutdown(0),httpversion("1.0"),ignoreredirects(0)
# method($data ? "POST" : "GET"),keepalive(0),sslargs({}) # method($data?"POST":"GET"),keepalive(0),sslargs({}),user(),pwd()
# Example: # Example:
# { HttpUtils_NonblockingGet({ url=>"http://www.google.de/", # { HttpUtils_NonblockingGet({ url=>"http://www.google.de/",
# callback=>sub($$$){ Log 1,"ERR:$_[1] DATA:".length($_[2]) } }) } # callback=>sub($$$){ Log 1,"ERR:$_[1] DATA:".length($_[2]) } }) }