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

FB_CALLMONITOR: add RenameFn

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10646 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch 2016-01-27 19:10:48 +00:00
parent eae7c220f6
commit 703598521d
1 changed files with 75 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
fhem/FHEM/72_FB_CALLMONITOR.pm
View File

@ -49,6 +49,7 @@ FB_CALLMONITOR_Initialize($)
$hash->{GetFn} = "FB_CALLMONITOR_Get"; $hash->{GetFn} = "FB_CALLMONITOR_Get";
$hash->{SetFn} = "FB_CALLMONITOR_Set"; $hash->{SetFn} = "FB_CALLMONITOR_Set";
$hash->{DefFn} = "FB_CALLMONITOR_Define"; $hash->{DefFn} = "FB_CALLMONITOR_Define";
$hash->{RenameFn} = "FB_CALLMONITOR_Rename";
$hash->{UndefFn} = "FB_CALLMONITOR_Undef"; $hash->{UndefFn} = "FB_CALLMONITOR_Undef";
$hash->{AttrFn} = "FB_CALLMONITOR_Attr"; $hash->{AttrFn} = "FB_CALLMONITOR_Attr";
$hash->{NotifyFn} = "FB_CALLMONITOR_Notify"; $hash->{NotifyFn} = "FB_CALLMONITOR_Notify";
@ -112,7 +113,26 @@ FB_CALLMONITOR_Undef($$)
return undef; return undef;
} }
#####################################
# If Device is renamed, copy the password data
sub
FB_CALLMONITOR_Rename($$)
{
my ($new, $old) = @_;
my $old_index = "FB_CALLMONITOR_".$old."_passwd";
my $new_index = "FB_CALLMONITOR_".$new."_passwd";
my $old_key =getUniqueId().$old_index;
my $new_key =getUniqueId().$new_index;
my ($err, $old_pwd) = getKeyValue($old_index);
return undef unless(defined($old_pwd));
setKeyValue($new_index, FB_CALLMONITOR_encrypt(FB_CALLMONITOR_decrypt($old_pwd,$old_key), $new_key));
setKeyValue($old_index, undef);
}
##################################### #####################################
# Get function for returning a reverse search name # Get function for returning a reverse search name
@ -1612,20 +1632,7 @@ sub FB_CALLMONITOR_storePassword($$)
my $index = $hash->{TYPE}."_".$hash->{NAME}."_passwd"; my $index = $hash->{TYPE}."_".$hash->{NAME}."_passwd";
my $key = getUniqueId().$index; my $key = getUniqueId().$index;
my $enc_pwd = ""; my (undef, $enc_pwd) = FB_CALLMONITOR_encrypt($password, $key);
if(eval "use Digest::MD5;1")
{
$key = Digest::MD5::md5_hex(unpack "H*", $key);
$key .= Digest::MD5::md5_hex($key);
}
for my $char (split //, $password)
{
my $encode=chop($key);
$enc_pwd.=sprintf("%.2x",ord($char)^ord($encode));
$key=$encode.$key;
}
my $err = FB_CALLMONITOR_readPhonebook($hash, $enc_pwd); my $err = FB_CALLMONITOR_readPhonebook($hash, $enc_pwd);
@ -1668,20 +1675,7 @@ sub FB_CALLMONITOR_readPassword($;$)
if(defined($password)) if(defined($password))
{ {
if(eval "use Digest::MD5;1") my (undef, $dec_pwd) = FB_CALLMONITOR_decrypt($password, $key);
{
$key = Digest::MD5::md5_hex(unpack "H*", $key);
$key .= Digest::MD5::md5_hex($key);
}
my $dec_pwd = '';
for my $char (map { pack('C', hex($_)) } ($password =~ /(..)/g))
{
my $decode=chop($key);
$dec_pwd.=chr(ord($char)^ord($decode));
$key=$decode.$key;
}
return $dec_pwd if($hash->{helper}{READ_PWD}); return $dec_pwd if($hash->{helper}{READ_PWD});
} }
@ -1697,7 +1691,6 @@ sub FB_CALLMONITOR_readPassword($;$)
# normalizes a formated phone number # normalizes a formated phone number
sub FB_CALLMONITOR_normalizePhoneNumber($$) sub FB_CALLMONITOR_normalizePhoneNumber($$)
{ {
my ($hash, $number) = @_; my ($hash, $number) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
@ -1718,6 +1711,58 @@ sub FB_CALLMONITOR_normalizePhoneNumber($$)
return $number; return $number;
} }
#####################################
# decrypt an encrypted password
sub FB_CALLMONITOR_decrypt($$)
{
my ($password, $key) = @_;
return undef unless(defined($password));
if(eval "use Digest::MD5;1")
{
$key = Digest::MD5::md5_hex(unpack "H*", $key);
$key .= Digest::MD5::md5_hex($key);
}
my $dec_pwd = '';
for my $char (map { pack('C', hex($_)) } ($password =~ /(..)/g))
{
my $decode=chop($key);
$dec_pwd.=chr(ord($char)^ord($decode));
$key=$decode.$key;
}
return (undef, $dec_pwd);
}
#####################################
# encrypts a password
sub FB_CALLMONITOR_encrypt($$)
{
my ($password, $key) = @_;
return undef unless(defined($password));
if(eval "use Digest::MD5;1")
{
$key = Digest::MD5::md5_hex(unpack "H*", $key);
$key .= Digest::MD5::md5_hex($key);
}
my $enc_pwd = '';
for my $char (split //, $password)
{
my $encode=chop($key);
$enc_pwd.=sprintf("%.2x",ord($char)^ord($encode));
$key=$encode.$key;
}
return (undef, $enc_pwd);
}
1; 1;
=pod =pod