fhem.pl: Slight authorize/authenticate mods (Forum #46380)

git-svn-id: https://svn.fhem.de/fhem/trunk@10305 2b470e98-0d58-463d-a4d8-8e2adae1ed80

fhem/FHEM/96_allowed.pm

@@ -59,12 +59,13 @@ allowed_Authorize($$$$)
 
   if($type eq "cmd") {
     return 0 if(!$me->{allowedCommands});
-    return ($me->{allowedCommands} =~ m/\b$arg\b/) ? 1 : 2;
+    # Return 0: allow stacking with other instances, see Forum#46380
+    return ($me->{allowedCommands} =~ m/\b$arg\b/) ? 0 : 2;
   }
 
   if($type eq "devicename") {
     return 0 if(!$me->{allowedDevices});
-    return ($me->{allowedDevices} =~ m/\b$arg\b/) ? 1 : 2;
+    return ($me->{allowedDevices} =~ m/\b$arg\b/) ? 0 : 2;
   }
 
   return 0;
@@ -182,7 +183,12 @@ allowed_Attr(@)
     <code>define &lt;name&gt; allowed &lt;deviceList&gt;</code>
     <br><br>
     Authorize execution of commands and modification of devices based on the
-    frontend used.<br>
+    frontend used and/or authenticate users.<br><br>
+
+    If there are multiple instances defined, which are valid for a given
+    frontend device, then all authorizations must succeed. For authentication
+    it is sufficient when one of the instances succeeds.<br><br>
+
     <b>Note:</b> this module should work as intended, but no guarantee
     can be given that there is no way to circumvent it.<br><br>
     Examples:
@@ -316,10 +322,17 @@ allowed_Attr(@)
     Authorisiert das Ausf&uuml;hren von Kommandos oder das &Auml;ndern von
     Ger&auml;ten abh&auml;ngig vom verwendeten Frontend.<br>
 
+    Falls man mehrere allowed Instanzen definiert hat, die f&uuml;r dasselbe
+    Frontend verantwortlich sind, dann m&uuml;ssen alle Authorisierungen
+    genehmigt sein, um das Befehl ausf&uuml;hren zu k&ouml;nnen. Auf der
+    anderen Seite reicht es, wenn einer der Authentifizierungen positiv
+    entschieden wird.  Die Pr&uuml;fungen werden in alphabetischer Reihenfolge
+    der Instanznamen ausgef&uuml;hrt.  <br><br>
+
     <b>Achtung:</b> das Modul sollte wie hier beschrieben funktionieren,
     allerdings k&ouml;nnen wir keine Garantie geben, da&szlig; man sie nicht
-    &uuml;berlisten, und Schaden anrichten kann.
-    <br>
+    &uuml;berlisten, und Schaden anrichten kann.<br><br>
+
     Beispiele:
     <ul><code>
       define allowedWEB allowed<br>

fhem/FHEM/98_JsonList2.pm

@@ -81,10 +81,10 @@ CommandJsonList2($$)
   if($param) {
     my @arg = split(" ", $param);
     $attr = $arg[1];
-    @d = devspec2array($arg[0]);
+    @d = devspec2array($arg[0],$cl);
 
   } else {
-    @d = keys %defs;
+    @d = devspec2array(".*", $cl);      # Needed for Authorization
     $param="";
 
   }

fhem/FHEM/98_XmlList.pm

@@ -47,17 +47,14 @@ CommandXmlList($$)
   my $lt = "";
   my %filter;
 
-  if($param) {
-   my @arr = devspec2array($param);
-   map { $filter{$_} = 1 } @arr;
-  }
-  delete($modules{""}) if(defined($modules{""})); # ???
+  my @arr = devspec2array($param ? $param : ".*", $cl); # for Authorize
+  map { $filter{$_} = 1 } @arr;
 
   for my $d (sort { my $x = $modules{$defs{$a}{TYPE}}{ORDER}.$defs{$a}{TYPE} cmp
     		            $modules{$defs{$b}{TYPE}}{ORDER}.$defs{$b}{TYPE};
     		    $x = ($a cmp $b) if($x == 0); $x; } keys %defs) {
 
-      next if(IsIgnored($d) || (%filter && !$filter{$d}));
+      next if(IsIgnored($d) || !$filter{$d});
       my $p = $defs{$d};
       my $t = $p->{TYPE};
       if($t ne $lt) {

fhem/fhem.pl

@@ -2115,7 +2115,7 @@ CommandList($$)
     for my $d (sort { my $x=$modules{$defs{$a}{TYPE}}{ORDER}.$defs{$a}{TYPE} cmp
                             $modules{$defs{$b}{TYPE}}{ORDER}.$defs{$b}{TYPE};
                          $x=($a cmp $b) if($x == 0); $x; } keys %defs) {
-      next if(IsIgnored($d));
+      next if(IsIgnored($d) || ($cl && !Authorized($cl,"devicename",$d)));
       my $t = $defs{$d}{TYPE};
       $str .= "\n$t:\n" if($t ne $lt);
       $str .= sprintf("  %-20s (%s)\n", $d, $defs{$d}{STATE});
@@ -4537,6 +4537,7 @@ Each($$;$)      # can be used e.g. in at, Forum #40022
 
 ##################
 # Return 1 if Authorized, else 0
+# Note: AuthorizeFn's returning 1 are not stackable.
 sub
 Authorized($$$)
 {
@@ -4555,6 +4556,7 @@ Authorized($$$)
 
 ##################
 # Return 0 if not needed, 1 if authenticated, 2 if authentication failed
+# Loop until one Authenticate is ok
 sub
 Authenticate($$)
 {
@@ -4563,11 +4565,13 @@ Authenticate($$)
   return 1 if(!$init_done || !$cl || !$cl->{SNAME}); # Safeguarding
   RefreshAuthList() if($auth_refresh);
 
+  my $needed = 0;
   foreach my $a (@authenticate) {
     my $r = CallFn($a, "AuthenticateFn", $defs{$a}, $cl, $arg);
-    return $r if($r);
+    $needed = $r if($r);
+    return $r if($r == 1);
   }
-  return 0;
+  return $needed;
 }
 
 sub