FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 11:26:55 +00:00
Code Issues Releases Wiki Activity

50_HP1000: improved handling when webhookFWinstances attribute was not explicitly set

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17527 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2018-10-14 09:38:12 +00:00
parent 33d14b26d8
commit 22a23a222f
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fhem/FHEM/50_HP1000.pm
View File

@ -285,14 +285,12 @@ sub HP1000_Define($$$) {
. " (there can only be one instance as per restriction of the weather station itself)" . " (there can only be one instance as per restriction of the weather station itself)"
if ( defined( $modules{HP1000}{defptr} ) && !defined( $hash->{OLDDEF} ) ); if ( defined( $modules{HP1000}{defptr} ) && !defined( $hash->{OLDDEF} ) );
# check FHEMWEB instance # check FHEMWEB instance when user first defines the device
if ( $init_done && !defined( $hash->{OLDDEF} ) ) { if ( $init_done && !defined( $hash->{OLDDEF} ) ) {
my $FWports; my $FWports;
foreach ( devspec2array('TYPE=FHEMWEB:FILTER=TEMPORARY!=1') ) { foreach ( devspec2array('TYPE=FHEMWEB:FILTER=TEMPORARY!=1') ) {
$hash->{FW} = $_ $hash->{FW} = $_
if ( AttrVal( $_, "webname", "fhem" ) eq "weatherstation" ); if ( AttrVal( $_, "webname", "fhem" ) eq "weatherstation" );
push( @{$FWports}, $defs{$_}->{PORT} )
if ( defined( $defs{$_}->{PORT} ) );
} }
if ( !defined( $hash->{FW} ) ) { if ( !defined( $hash->{FW} ) ) {
@ -315,8 +313,6 @@ sub HP1000_Define($$$) {
} }
} }
$hash->{FW_PORT} = $defs{ $hash->{FW} }{PORT};
fhem 'attr ' . $name . ' stateReadings temperature humidity'; fhem 'attr ' . $name . ' stateReadings temperature humidity';
fhem 'attr ' . $name . ' stateReadingsFormat 1'; fhem 'attr ' . $name . ' stateReadingsFormat 1';
} }
@ -423,16 +419,31 @@ sub HP1000_CGI() {
# get device name # get device name
$name = $data{FWEXT}{"/updateweatherstation"}{deviceName} $name = $data{FWEXT}{"/updateweatherstation"}{deviceName}
if ( defined( $data{FWEXT}{"/updateweatherstation"} ) ); if ( defined( $data{FWEXT}{"/updateweatherstation"} ) );
$hash = $defs{$name};
# return error if no such device # return error if no such device
return ( "text/plain; charset=utf-8", return ( "text/plain; charset=utf-8",
"No HP1000 device for webhook /updateweatherstation" ) "No HP1000 device for webhook /updateweatherstation" )
unless ( IsDevice( $name, 'HP1000' ) ); unless ( IsDevice( $name, 'HP1000' ) );
# incorrect FHEMWEB instance used # Only allow data via explicitly named FHEMWEB instances,
my @webhookFWinstances = split( ",", # e.g. the user is taking care about correct incoming data
AttrVal( $name, "webhookFWinstances", "WEBweatherstation" ) ); # routing to that instance via reverse proxy
$hash->{FW} = AttrVal( $name, "webhookFWinstances", "" );
# Otherwise, only allow data via FHEMWEB instance with
# webname 'weatherstation' as hardcoded in weatherstation firmware
if ( $hash->{FW} eq "" ) {
foreach ( devspec2array('TYPE=FHEMWEB:FILTER=TEMPORARY!=1') ) {
if ( AttrVal( $_, "webname", "fhem" ) eq "weatherstation" ) {
$hash->{FW} = $_;
last;
}
}
}
# incorrect FHEMWEB instance used
my @webhookFWinstances = split( ",", $hash->{FW} );
return ( "text/plain; charset=utf-8", return ( "text/plain; charset=utf-8",
"incorrect FHEMWEB instance to receive data" ) "incorrect FHEMWEB instance to receive data" )
unless ( grep ( /^$FW_wname$/, @webhookFWinstances ) ); unless ( grep ( /^$FW_wname$/, @webhookFWinstances ) );
@ -487,7 +498,6 @@ sub HP1000_CGI() {
return ( "text/plain; charset=utf-8", "Missing data" ); return ( "text/plain; charset=utf-8", "Missing data" );
} }
$hash = $defs{$name};
my $uptime = time() - $fhem_started; my $uptime = time() - $fhem_started;
delete $hash->{FORECASTDEV} if ( $hash->{FORECASTDEV} ); delete $hash->{FORECASTDEV} if ( $hash->{FORECASTDEV} );
@ -508,20 +518,10 @@ sub HP1000_CGI() {
: 0 : 0
); );
$hash->{SYSTEMTIME_UTC} = $webArgs->{dateutc}; $hash->{SYSTEMTIME_UTC} = $webArgs->{dateutc};
$hash->{FW} = "";
$hash->{FW_PORT} = "";
$hash->{UPLOAD_TYPE} = "default"; $hash->{UPLOAD_TYPE} = "default";
$hash->{UPLOAD_TYPE} = "customize" $hash->{UPLOAD_TYPE} = "customize"
if ( defined( $webArgs->{solarradiation} ) ); if ( defined( $webArgs->{solarradiation} ) );
foreach ( devspec2array('TYPE=FHEMWEB:FILTER=TEMPORARY!=1') ) {
if ( AttrVal( $_, "webname", "fhem" ) eq "weatherstation" ) {
$hash->{FW} = $_;
$hash->{FW_PORT} = $defs{$_}{PORT};
last;
}
}
Log3 $name, 5, Log3 $name, 5,
"HP1000: received data (uptime=$uptime):\n" . Dumper($webArgs); "HP1000: received data (uptime=$uptime):\n" . Dumper($webArgs);