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

98_JsonMod.pm: #109423: hide secret in source/ #109439 cron fixed after disable 0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21497 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
herrmannj
2020-03-23 20:44:04 +00:00
parent 78a4c7022d
commit d5b5875fec
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/98_JsonMod.pm
View File

@@ -72,6 +72,7 @@ sub JsonMod_Define {
$cvsid =~ s/Z\s\S+\s\$$//; $cvsid =~ s/Z\s\S+\s\$$//;
$hash->{'SVN'} = $cvsid; $hash->{'SVN'} = $cvsid;
$hash->{'CONFIG'}->{'IN_REQUEST'} = 0; $hash->{'CONFIG'}->{'IN_REQUEST'} = 0;
$hash->{'CONFIG'}->{'CRON'} = \'0 * * * *';
$hash->{'CRON'} = JsonMod::Cron->new(); $hash->{'CRON'} = JsonMod::Cron->new();
return "no FUUID, is fhem up to date?" if (not $hash->{'FUUID'}); return "no FUUID, is fhem up to date?" if (not $hash->{'FUUID'});
@@ -189,11 +190,15 @@ sub JsonMod_Attr {
return "wrong interval expression"; return "wrong interval expression";
}; };
}; };
if ($cmd eq 'delete') { if ($cmd eq 'del') {
if ($attrName eq 'interval') { if ($attrName eq 'interval') {
$hash->{'CONFIG'}->{'CRON'} = \'0 * * * *'; $hash->{'CONFIG'}->{'CRON'} = \'0 * * * *';
JsonMod_StopTimer($hash); JsonMod_StopTimer($hash);
JsonMod_StartTimer($hash); # unless IsDisabled($name); JsonMod_StartTimer($hash); # unless IsDisabled($name);
return;
};
if ($attrName eq 'disable') {
JsonMod_StartTimer($hash); # unless IsDisabled($name);
}; };
}; };
}; };
@@ -481,11 +486,13 @@ sub JsonMod_ApiRequest {
'callback' => \&JsonMod_ApiResponse 'callback' => \&JsonMod_ApiResponse
}; };
my @sec;
my $source = $hash->{'CONFIG'}->{'SOURCE'}; my $source = $hash->{'CONFIG'}->{'SOURCE'};
# fill in SECRET if available # fill in SECRET if available
$source =~ s/(\[.+?\])/(exists($hash->{'CONFIG'}->{'SECRET'}->{substr($1,1,length($1)-2)}))?${$hash->{'CONFIG'}->{'SECRET'}->{substr($1,1,length($1)-2)}}:$1/eg and $source =~ s/(\[.+?\])/(exists($hash->{'CONFIG'}->{'SECRET'}->{substr($1,1,length($1)-2)}) and push @sec, $hash->{'CONFIG'}->{'SECRET'}->{substr($1,1,length($1)-2)})?${$hash->{'CONFIG'}->{'SECRET'}->{substr($1,1,length($1)-2)}}:$1/eg and
$param->{'hideurl'} = 1; $param->{'hideurl'} = 1;
$param->{'url'} = $source; $param->{'url'} = $source;
$param->{'sec'} = \@sec;
my $header = AttrVal($name, 'httpHeader', ''); my $header = AttrVal($name, 'httpHeader', '');
if ($header) { if ($header) {
@@ -508,9 +515,15 @@ sub JsonMod_ApiResponse {
# check for error # check for error
# TODO # TODO
$hash->{'CONFIG'}->{'IN_REQUEST'} = 0; $hash->{'CONFIG'}->{'IN_REQUEST'} = 0;
$hash->{'API_LAST_RES'} = Time::HiRes::time(); $hash->{'API_LAST_RES'} = Time::HiRes::time();
$hash->{'SOURCE'} = sprintf('%s (%s)', $param->{'url'} //= '', $param->{'code'} //= '');
# delete secrets from the answering url if any
my $url = $param->{'url'} //= '';
foreach (@{$param->{'sec'}}) {
next if (ref($_) ne 'SCALAR');
$url =~ s/(\Q${$_}\E)/'X' x length($1)/e;
};
$hash->{'SOURCE'} = sprintf('%s (%s)', $url, $param->{'code'} //= '');
my sub doError { my sub doError {
my ($msg) = @_; my ($msg) = @_;