Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

EGPM2LAN: Password bugfix, logging changed.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@14071 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
alexus 2017-04-22 12:13:43 +00:00
parent 1c244fa174
commit afecee8bf9
2 changed files with 79 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
FHEM/17_EGPM2LAN.pm
View File

@ -36,7 +36,7 @@ EGPM2LAN_Initialize($)
$hash->{GetFn} = "EGPM2LAN_Get"; $hash->{GetFn} = "EGPM2LAN_Get";
$hash->{SetFn} = "EGPM2LAN_Set"; $hash->{SetFn} = "EGPM2LAN_Set";
$hash->{DefFn} = "EGPM2LAN_Define"; $hash->{DefFn} = "EGPM2LAN_Define";
$hash->{AttrList} = "loglevel:0,1,2,3,4,5,6 stateDisplay:sockNumber,sockName autocreate:on,off"; $hash->{AttrList} = "stateDisplay:sockNumber,sockName autocreate:on,off";
} }
################################### ###################################
@ -79,10 +79,10 @@ EGPM2LAN_Set($@)
my $name = shift @a; my $name = shift @a;
my $setcommand = shift @a; my $setcommand = shift @a;
my $params = join(" ", @a); my $params = join(" ", @a);
my $logLevel = GetLogLevel($name,4);
Log $logLevel, "EGPM2LAN set $name (". $hash->{IP}. ") $setcommand $params"; Log3 "EGPM2LAN", 4, "set $name (". $hash->{IP}. ") $setcommand $params";
EGPM2LAN_Login($hash, $logLevel); EGPM2LAN_Login($hash);
if($setcommand eq "on" || $setcommand eq "off") if($setcommand eq "on" || $setcommand eq "off")
{ {
@ -90,18 +90,18 @@ EGPM2LAN_Set($@)
{ #switch all Sockets; thanks to eric! { #switch all Sockets; thanks to eric!
for (my $count = 1; $count <= 4; $count++) for (my $count = 1; $count <= 4; $count++)
{ {
EGPM2LAN_Switch($hash, $setcommand, $count, $logLevel); EGPM2LAN_Switch($hash, $setcommand, $count);
} }
} }
else else
{ #switch single Socket { #switch single Socket
EGPM2LAN_Switch($hash, $setcommand, $params, $logLevel); EGPM2LAN_Switch($hash, $setcommand, $params);
} }
EGPM2LAN_Statusrequest($hash, $logLevel, 1); EGPM2LAN_Statusrequest($hash, 1);
} }
elsif($setcommand eq "toggle") elsif($setcommand eq "toggle")
{ {
my $currentstate = EGPM2LAN_Statusrequest($hash, $logLevel, 1); my $currentstate = EGPM2LAN_Statusrequest($hash, 1);
if(defined($currentstate)) if(defined($currentstate))
{ {
my @powerstates = split(",", $currentstate); my @powerstates = split(",", $currentstate);
@ -110,29 +110,34 @@ EGPM2LAN_Set($@)
{ {
$newcommand="on"; $newcommand="on";
} }
EGPM2LAN_Switch($hash, $newcommand, $params, $logLevel); EGPM2LAN_Switch($hash, $newcommand, $params);
EGPM2LAN_Statusrequest($hash, $logLevel, 0); EGPM2LAN_Statusrequest($hash, 0);
} }
} }
elsif($setcommand eq "statusrequest") elsif($setcommand eq "statusrequest")
{ {
EGPM2LAN_Statusrequest($hash, $logLevel, 1); EGPM2LAN_Statusrequest($hash, 1);
} }
elsif($setcommand eq "password") elsif($setcommand eq "password")
{ {
delete $hash->{PASSWORD} if($params eq "" && defined($hash->{PASSWORD})); my $result = EGPM2LAN_StorePassword($hash, $params);
EGPM2LAN_StorePassword($hash, $params); Log3 "EGPM2LAN", 1,$result;
if($params eq ""){
delete $hash->{PASSWORD} if(defined($hash->{PASSWORD}));
} else {
$params="***";
}
} }
elsif($setcommand eq "clearreadings") elsif($setcommand eq "clearreadings")
{ {
delete $hash->{READINGS}; delete $hash->{READINGS};
} }
else else
{ {
return "unknown argument $setcommand, choose one of on, off, toggle, statusrequest, clearreadings"; return "unknown argument $setcommand, choose one of on, off, toggle, statusrequest, clearreadings";
} }
EGPM2LAN_Logoff($hash, $logLevel); EGPM2LAN_Logoff($hash);
$hash->{CHANGED}[0] = $setcommand; $hash->{CHANGED}[0] = $setcommand;
$hash->{READINGS}{lastcommand}{TIME} = TimeNow(); $hash->{READINGS}{lastcommand}{TIME} = TimeNow();
@ -164,15 +169,15 @@ sub EGPM2LAN_StorePassword($$)
$key=$encode.$key; $key=$encode.$key;
} }
Log 3, "EGPM2LAN write password to file uniqueID"; Log3 "EGPM2LAN", 4, "write password to file uniqueID";
my $err = setKeyValue($index, $enc_pwd); my $err = setKeyValue($index, $enc_pwd);
if(defined($err)){ if(defined($err)){
#Fallback, if file is not available #Fallback, if file is not available
$hash->{PASSWORD}=$password; $hash->{PASSWORD}=$password;
return "EGPM2LAN write Password failed!"; return "EGPM2LAN: Write Password failed!";
} }
$hash->{PASSWORD}="***"; $hash->{PASSWORD}="***" if($password ne "");
return "Password saved."; return "EGPM2LAN: Password saved.";
} }
################################ ################################
@ -180,11 +185,8 @@ sub EGPM2LAN_ReadPassword($)
{ {
my ($hash) = @_; my ($hash) = @_;
#password available? #for old installations/fallback to clear-text PWD
return undef if (!defined($hash->{PASSWORD})); if(defined($hash->{PASSWORD}) && $hash->{PASSWORD} ne "***"){
#for old installations/fallback
if($hash->{PASSWORD} ne "***"){
return $hash->{PASSWORD}; return $hash->{PASSWORD};
} }
@ -192,11 +194,11 @@ sub EGPM2LAN_ReadPassword($)
my $key = getUniqueId().$index; my $key = getUniqueId().$index;
my ($password, $err); my ($password, $err);
Log 3, "EGPM2LAN Read password from file uniqueID"; Log3 "EGPM2LAN", 3, "Read password from file uniqueID";
($err, $password) = getKeyValue($index); ($err, $password) = getKeyValue($index);
if ( defined($err) ) { if ( defined($err) ) {
Log 1, "EGPM2LAN unable to read password from file: $err"; Log3 "EGPM2LAN",0, "unable to read password from file: $err";
return undef; return undef;
} }
@ -214,60 +216,58 @@ sub EGPM2LAN_ReadPassword($)
$key=$decode.$key; $key=$decode.$key;
} }
$hash->{PASSWORD}="***";
return $dec_pwd; return $dec_pwd;
} }
else { else {
Log 1, "EGPM2LAN No password in file"; Log3 "EGPM2LAN",4 ,"No password in file";
return undef; return "";
} }
} }
################################ ################################
sub EGPM2LAN_Switch($$$$) { sub EGPM2LAN_Switch($$$) {
my ($hash, $state, $port, $logLevel) = @_; my ($hash, $state, $port) = @_;
$state = ($state eq "on" ? "1" : "0"); $state = ($state eq "on" ? "1" : "0");
my $fritz = 0; #may be important for FritzBox-users my $fritz = 0; #may be important for FritzBox-users
my $data = "cte1=" . ($port == "1" ? $state : "") . "&cte2=" . ($port == "2" ? $state : "") . "&cte3=" . ($port == "3" ? $state : "") . "&cte4=". ($port == "4" ? $state : ""); my $data = "cte1=" . ($port == "1" ? $state : "") . "&cte2=" . ($port == "2" ? $state : "") . "&cte3=" . ($port == "3" ? $state : "") . "&cte4=". ($port == "4" ? $state : "");
Log $logLevel, "EGPM2LAN $data"; Log3 "EGPM2LAN",5 , $data;
eval { eval {
# Parameter: $url, $timeout, $data, $noshutdown, $loglevel # Parameter: $url, $timeout, $data, $noshutdown, $loglevel
GetFileFromURL("http://".$hash->{IP}."/", 5,$data ,$fritz ,$logLevel); GetFileFromURL("http://".$hash->{IP}."/", 5,$data ,$fritz);
}; };
if ($@){ if ($@){
### catch block ### catch block
Log $logLevel, "EGPM2LAN error: $@"; Log3 "EGPM2LAN", 1 ,"error: $@";
}; };
return 1; return 1;
} }
################################ ################################
sub EGPM2LAN_Login($$) { sub EGPM2LAN_Login($) {
my ($hash, $logLevel) = @_; my ($hash) = @_;
my $name = $hash->{NAME};
Log $logLevel,"EGPM2LAN try to Login @".$hash->{IP};
my $passwd = EGPM2LAN_ReadPassword($hash); my $passwd = EGPM2LAN_ReadPassword($hash);
Log3 $name,4 , "EGPM2LAN: try to connect ".$hash->{IP};
eval{ eval{
GetFileFromURLQuiet("http://".$hash->{IP}."/login.html", 5,"pw=" .(defined($passwd) ? $passwd : ""),0 ,$logLevel); GetFileFromURLQuiet("http://".$hash->{IP}."/login.html", 5,"pw=" .(defined($passwd) ? $passwd : ""),0 );
}; };
if ($@){ if ($@){
### catch block ### catch block
Log 1, "EGPM2LAN Login error: $@"; Log3 $name, 0, "EGPM2LAN Login error: $@";
return 0; return 0;
}; };
Log $logLevel,"EGPM2LAN Login successful!"; return 1;
return 1;
} }
################################ ################################
sub EGPM2LAN_GetDeviceInfo($$) { sub EGPM2LAN_GetDeviceInfo($$) {
my ($hash, $input) = @_; my ($hash, $input) = @_;
my $logLevel = GetLogLevel($hash->{NAME},4);
#try to read Device Name #try to read Device Name
my ($devicename) = $input =~ m/<h2>(.+)<\/h2><\/div>/si; my ($devicename) = $input =~ m/<h2>(.+)<\/h2><\/div>/si;
@ -287,7 +287,7 @@ sub EGPM2LAN_GetDeviceInfo($$) {
foreach my $entry (@socketlist) foreach my $entry (@socketlist)
{ {
next unless $seen{$entry}++; next unless $seen{$entry}++;
Log $logLevel, "EGPM2LAN Sorry! Can't use devicenames. ".trim($entry)." is duplicated."; Log3 "EGPM2LAN", 1, "Sorry! Can't use devicenames. ".trim($entry)." is duplicated.";
@socketlist = qw(Socket_1 Socket_2 Socket_3 Socket_4); @socketlist = qw(Socket_1 Socket_2 Socket_3 Socket_4);
} }
if(int(@socketlist) < 4) if(int(@socketlist) < 4)
@ -298,16 +298,22 @@ sub EGPM2LAN_GetDeviceInfo($$) {
} }
################################ ################################
sub EGPM2LAN_Statusrequest($$$) { sub EGPM2LAN_Statusrequest($$) {
my ($hash, $logLevel, $autoCr) = @_; my ($hash, $autoCr) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $response = GetFileFromURL("http://".$hash->{IP}."/", 5,"" , 0 ,$logLevel); my $response = GetFileFromURL("http://".$hash->{IP}."/", 5,"" , 0);
#Log 1,$response; if(not defined($response)){
if(defined($response) && $response =~ /.,.,.,./) Log3 $name, 0, "EGPM2LAN: Cant connect to ".$hash->{IP};
$hash->{STATE} = "Connection failed";
return 0
}
Log3 $name, 5, "EGPM2LAN: $response";
if($response =~ /.,.,.,./)
{ {
my $powerstatestring = $&; my $powerstatestring = $&;
Log $logLevel, "EGPM2LAN Powerstate: " . $powerstatestring; Log3 $name, 2, "EGPM2LAN Powerstate: " . $powerstatestring;
my @powerstates = split(",", $powerstatestring); my @powerstates = split(",", $powerstatestring);
if(int(@powerstates) == 4) if(int(@powerstates) == 4)
@ -337,12 +343,12 @@ sub EGPM2LAN_Statusrequest($$$) {
{ {
if(Value("autocreate") eq "active") if(Value("autocreate") eq "active")
{ {
Log $logLevel, "EGPM2LAN: Autocreate EGPM for Socket $index"; Log3 $name, 1, "EGPM2LAN: Autocreate EGPM for Socket $index";
CommandDefine(undef, $name."_".$socketlist[$index-1]." EGPM $name $index"); CommandDefine(undef, $name."_".$socketlist[$index-1]." EGPM $name $index");
} }
else else
{ {
Log 2, "EGPM2LAN: Autocreate disabled in globals section"; Log3 $name, 2, "EGPM2LAN: Autocreate disabled in globals section";
$attr{$name}{autocreate} = "off"; $attr{$name}{autocreate} = "off";
} }
} }
@ -352,7 +358,7 @@ sub EGPM2LAN_Statusrequest($$$) {
{ {
if (ReadingsVal($defptr->{NAME},"state","") ne ($powerstates[$index-1] ? "on" : "off")) if (ReadingsVal($defptr->{NAME},"state","") ne ($powerstates[$index-1] ? "on" : "off"))
{ #check for chages and update -> trigger event { #check for chages and update -> trigger event
Log $logLevel, "Update State of ".$defptr->{NAME}; Log3 $name, 3, "EGPM2LAN: Update State of ".$defptr->{NAME};
readingsSingleUpdate($defptr, "state", ($powerstates[$index-1] ? "on" : "off") ,1); readingsSingleUpdate($defptr, "state", ($powerstates[$index-1] ? "on" : "off") ,1);
} }
$defptr->{DEVICENAME} = $hash->{DEVICENAME}; $defptr->{DEVICENAME} = $hash->{DEVICENAME};
@ -369,23 +375,23 @@ sub EGPM2LAN_Statusrequest($$$) {
} }
else else
{ {
Log $logLevel, "EGPM2LAN: Failed to parse powerstate"; Log3 $name, 0,"EGPM2LAN: Failed to parse powerstate";
} }
} }
else else
{ {
$hash->{STATE} = "Login failed"; $hash->{STATE} = "Login failed";
Log $logLevel, "EGPM2LAN: Login failed"; Log3 $name, 0,"EGPM2LAN: Login failed";
} }
#something went wrong :-( #something went wrong :-(
return undef; return undef;
} }
################################ ################################
sub EGPM2LAN_Logoff($$) { sub EGPM2LAN_Logoff($) {
my ($hash, $logLevel) = @_; my ($hash) = @_;
GetFileFromURL("http://".$hash->{IP}."/login.html", 5,"" ,0 ,$logLevel); GetFileFromURL("http://".$hash->{IP}."/login.html", 5,"" ,0 ,3);
return 1; return 1;
} }
@ -403,12 +409,12 @@ sub EGPM2LAN_Define($$)
EGPM2LAN_StorePassword($hash, $a[3]); EGPM2LAN_StorePassword($hash, $a[3]);
$hash->{DEF} = $a[2]; ## remove password $hash->{DEF} = $a[2]; ## remove password
} }
my $result = EGPM2LAN_Login($hash, 3); my $result = EGPM2LAN_Login($hash);
if($result == 1) if($result == 1)
{ {
$hash->{STATE} = "initialized"; $hash->{STATE} = "initialized";
EGPM2LAN_Statusrequest($hash, 4, 0); EGPM2LAN_Statusrequest($hash,0);
EGPM2LAN_Logoff($hash, 4); EGPM2LAN_Logoff($hash);
} }
return undef; return undef;

20
FHEM/70_EGPM.pm
View File

@ -1,7 +1,7 @@
############################################## ##############################################
# $Id$ # $Id$
# #
# (c) 2013, 2014 Copyright: Alex Storny (moselking at arcor dot de) # (c) 2013, 2017 Copyright: Alex Storny (moselking at arcor dot de)
# All rights reserved # All rights reserved
# #
# This script free software; you can redistribute it and/or modify # This script free software; you can redistribute it and/or modify
@ -36,7 +36,7 @@ EGPM_Initialize($)
$hash->{SetFn} = "EGPM_Set"; $hash->{SetFn} = "EGPM_Set";
$hash->{GetFn} = "EGPM_Get"; $hash->{GetFn} = "EGPM_Get";
$hash->{DefFn} = "EGPM_Define"; $hash->{DefFn} = "EGPM_Define";
$hash->{AttrList} = "loglevel:0,1,2,3,4,5,6 $readingFnAttributes "; $hash->{AttrList} = "$readingFnAttributes ";
$hash->{UndefFn} = "EGPM_Undef"; $hash->{UndefFn} = "EGPM_Undef";
} }
@ -47,7 +47,6 @@ EGPM_Set($@)
my ($hash, @a) = @_; my ($hash, @a) = @_;
my $name = shift @a; my $name = shift @a;
my $parent = $hash->{IODEV}; my $parent = $hash->{IODEV};
my $loglevel = GetLogLevel($name,4);
my $cmdList = "off:noArg on:noArg toggle:noArg"; my $cmdList = "off:noArg on:noArg toggle:noArg";
return "no set value specified" if(int(@a) < 1); return "no set value specified" if(int(@a) < 1);
@ -56,18 +55,18 @@ EGPM_Set($@)
if(not Value($parent)) if(not Value($parent))
{ {
my $u = "$parent device not found. Please define EGPM2LAN device."; my $u = "$parent device not found. Please define EGPM2LAN device.";
Log $loglevel, $u; Log3 $name, 1, $u;
return $u; return $u;
} }
if($a[0] =~ /^(on|off|toggle)$/) if($a[0] =~ /^(on|off|toggle)$/)
{ {
my $v = join(" ", @a); my $v = join(" ", @a);
Log $loglevel, "EGPM set $name $v"; Log3 $name, 4, "EGPM set $name $v";
CommandSet(undef,$hash->{IODEV}." $v ".$hash->{SOCKETNR}); CommandSet(undef,$hash->{IODEV}." $v ".$hash->{SOCKETNR});
return undef; return undef;
} else { } else {
Log $loglevel, "EGPM set $name $a[0]"; Log3 $name, 4, "EGPM set $name $a[0]";
return SetExtensions($hash,$cmdList,$name,@a); return SetExtensions($hash,$cmdList,$name,@a);
} }
} }
@ -149,7 +148,7 @@ EGPM_Undef($$)
my $parent = $hash->{IODEV}; my $parent = $hash->{IODEV};
my $socket = $hash->{SOCKETNR}; my $socket = $hash->{SOCKETNR};
Log GetLogLevel($name,4), "Delete ".$parent.$socket; Log3 $name, 3 ,"EGPM: Delete ".$parent.$socket;
delete $modules{EGPM}{defptr}{$parent.$socket} ; delete $modules{EGPM}{defptr}{$parent.$socket} ;
return undef; return undef;
@ -158,6 +157,9 @@ EGPM_Undef($$)
1; 1;
=pod =pod
=item device
=item summary controls a single Socket of EGPM2LAN-Module
=item summary_DE steuert eine Steckdose von der EGPM2LAN-Steckdosenleiste
=begin html =begin html
<a name="EGPM"></a> <a name="EGPM"></a>
@ -197,7 +199,6 @@ EGPM_Undef($$)
<a name="EGPMattr"></a> <a name="EGPMattr"></a>
<b>Attributes</b> <b>Attributes</b>
<ul> <ul>
<li><a href="#loglevel">loglevel</a></li>
<li><a href="#readingFnAttributes">readingFnAttributes</a></li> <li><a href="#readingFnAttributes">readingFnAttributes</a></li>
</ul> </ul>
<br> <br>
@ -249,7 +250,6 @@ EGPM_Undef($$)
<a name="EGPMattr"></a> <a name="EGPMattr"></a>
<b>Attributes</b> <b>Attributes</b>
<ul> <ul>
<li><a href="#loglevel">loglevel</a></li>
<li><a href="#readingFnAttributes">readingFnAttributes</a></li> <li><a href="#readingFnAttributes">readingFnAttributes</a></li>
</ul> </ul>
<br> <br>