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

50_SSChatBot.pm: more code changes according PBP

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22627 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-08-18 22:14:14 +00:00
parent ab0f6fe5a2
commit d34fb04a56
1 changed files with 69 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
fhem/FHEM/50_SSChatBot.pm
View File

@ -106,6 +106,7 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"1.10.1" => "18.08.2020 more code changes according PBP ",
"1.10.0" => "17.08.2020 switch to packages, finalise for repo checkin ", "1.10.0" => "17.08.2020 switch to packages, finalise for repo checkin ",
"1.9.0" => "30.07.2020 restartSendqueue option 'force' added ", "1.9.0" => "30.07.2020 restartSendqueue option 'force' added ",
"1.8.0" => "27.05.2020 send SVG Plots with options like svg='<SVG-Device>,<zoom>,<offset>' possible ", "1.8.0" => "27.05.2020 send SVG Plots with options like svg='<SVG-Device>,<zoom>,<offset>' possible ",
@ -1891,13 +1892,10 @@ sub botCGI {
} }
if ($request =~ /^\/outchat(\?|&)/x) { # POST- oder GET-Methode empfangen if ($request =~ /^\/outchat(\?|&)/x) { # POST- oder GET-Methode empfangen
# data received
return _botCGIdata ($request); return _botCGIdata ($request);
} else {
# no data received
return ("text/plain; charset=utf-8", "Missing data");
} }
return ("text/plain; charset=utf-8", "Missing data");
} }
############################################################################################# #############################################################################################
@ -2091,8 +2089,9 @@ sub _botCGIdata { ## no critic
($uc,$arg) = split(/\s+/x, $uc, 2); ($uc,$arg) = split(/\s+/x, $uc, 2);
if($uc && $text =~ /^$uc\s*?$/x) { # User eigener Slash-Befehl, z.B.: /Wetter if($uc && $text =~ /^$uc\s*?$/x) { # User eigener Slash-Befehl, z.B.: /Wetter
$command = $arg;
$do = 1; $do = 1;
$command = $arg;
$au = AttrVal($name,"allowedUserForOwn", "all"); # Berechtgung des Chat-Users checken $au = AttrVal($name,"allowedUserForOwn", "all"); # Berechtgung des Chat-Users checken
@aul = split(",",$au); @aul = split(",",$au);
@ -2170,19 +2169,15 @@ sub __botCGIrecSet { ## no critic "not used"
my $state = $paref->{state}; my $state = $paref->{state};
my $p2 = $paref->{p2}; my $p2 = $paref->{p2};
my $cr = ""; my $cr = q{};
my $command = "set ".$p2; my $command = "set ".$p2;
my $au = AttrVal($name,"allowedUserForSet", "all"); my $au = AttrVal($name,"allowedUserForSet", "all");
my @aul = split(",",$au);
if($au eq "all" || $username ~~ @aul) { $paref->{au} = $au;
Log3($name, 4, qq{$name - Synology Chat user "$username" execute FHEM command: }.$command); $paref->{order} = "Set";
$cr = CommandSet(undef, $p2); $paref->{cmd} = $command;
} else {
$cr = qq{User "$username" is not allowed execute "$command" command}; ($cr, $state) = ___botCGIorder ($paref);
$state = qq{command execution denied};
Log3($name, 2, qq{$name - WARNING - Chat user "$username" is not authorized for "$command" command. Execution denied !});
}
return ($command, $cr, $state); return ($command, $cr, $state);
} }
@ -2198,19 +2193,15 @@ sub __botCGIrecGet { ## no critic "not used"
my $state = $paref->{state}; my $state = $paref->{state};
my $p2 = $paref->{p2}; my $p2 = $paref->{p2};
my $cr = ""; my $cr = q{};
my $command = "get ".$p2; my $command = "get ".$p2;
my $au = AttrVal($name,"allowedUserForGet", "all"); my $au = AttrVal($name,"allowedUserForGet", "all");
my @aul = split(",",$au);
if($au eq "all" || $username ~~ @aul) { $paref->{au} = $au;
Log3($name, 4, qq{$name - Synology Chat user "$username" execute FHEM command: }.$command); $paref->{order} = "Get";
$cr = CommandGet(undef, $p2); $paref->{cmd} = $command;
} else {
$cr = qq{User "$username" is not allowed execute "$command" command}; ($cr, $state) = ___botCGIorder ($paref);
$state = qq{command execution denied};
Log3($name, 2, qq{$name - WARNING - Chat user "$username" is not authorized for "$command" command. Execution denied !});
}
return ($command, $cr, $state); return ($command, $cr, $state);
} }
@ -2226,29 +2217,63 @@ sub __botCGIrecCod { ## no critic "not used"
my $state = $paref->{state}; my $state = $paref->{state};
my $p2 = $paref->{p2}; my $p2 = $paref->{p2};
my $cr = ""; my $cr = q{};
my $command = $p2; my $command = $p2;
my $au = AttrVal($name,"allowedUserForCode", "all"); my $au = AttrVal($name,"allowedUserForCode", "all");
my @aul = split(",",$au);
if($au eq "all" || $username ~~ @aul) { $paref->{au} = $au;
my $code = $p2; $paref->{order} = "Code";
if($p2 =~ m/^\s*(\{.*\})\s*$/xs) { $paref->{cmd} = $command;
$p2 = $1;
} else { ($cr, $state) = ___botCGIorder ($paref);
$p2 = '';
}
Log3($name, 4, qq{$name - Synology Chat user "$username" execute FHEM command: }.$p2);
$cr = AnalyzePerlCommand(undef, $p2) if($p2);
} else {
$cr = qq{User "$username" is not allowed execute "$command" command};
$state = qq{command execution denied};
Log3($name, 2, qq{$name - WARNING - Chat user "$username" is not authorized for "$command" command. Execution denied !});
}
return ($command, $cr, $state); return ($command, $cr, $state);
} }
################################################################
# Order ausführen und Ergebnis zurückliefern
################################################################
sub ___botCGIorder {
my $paref = shift;
my $name = $paref->{name};
my $username = $paref->{username};
my $state = $paref->{state};
my $p2 = $paref->{p2}; # Kommandoargument, z.B. "get <argument>" oder "code <argument>"
my $au = $paref->{au};
my $order = $paref->{order}; # Kommandotyp, z.B. "set"
my $cmd = $paref->{cmd}; # komplettes Kommando
my @aul = split(",",$au);
my $cr = q{};
if($au eq "all" || $username ~~ @aul) {
if ($order =~ /^[GS]et$/x) {
Log3($name, 4, qq{$name - Synology Chat user "$username" execute FHEM command: }.$cmd);
no strict "refs"; ## no critic 'NoStrict'
$cr = &{"Command".$order} (undef, $p2);
use strict "refs";
}
if ($order eq "Code") {
my ($arg) = $p2 =~ m/^\s*(\{.*\})\s*$/xs;
if($arg) {
Log3($name, 4, qq{$name - Synology Chat user "$username" execute FHEM command: }.$arg);
$cr = AnalyzePerlCommand(undef, $arg);
} else {
$cr = qq{function format error: may be you didn't use the format {...}};
}
}
} else {
$cr = qq{User "$username" is not allowed execute "$cmd" command};
$state = qq{command execution denied};
Log3($name, 2, qq{$name - WARNING - Chat user "$username" is not authorized for "$cmd" command. Execution denied !});
}
return ($cr, $state);
}
1; 1;
=pod =pod