Ticket #83: newgroup-updategroup.patch

inn-2.4.1/control/controlchan.in

@@ -254 +254 @@
     return $cachedctl = [ reverse @ctllist ];
 }
 
+sub findaction {
+    my ($ctllist, $type, $newsgroup, $sender) = @_;
+    my ($action, $hier);
+
+    foreach (@$ctllist) {
+        my @ctlline = split /:/;
+        # 0: type  1: from@addr  2: group.*  3: action
+        if ($type =~ /$ctlline[0]/ and $sender =~ /$ctlline[1]/i and
+            ($type !~ /(?:new|rm)group/ or $newsgroup =~ /$ctlline[2]/)) {
+            $action = $ctlline[3];
+            $action =~ s/\^(.+)\$/$1/;
+            $action =~ s/\\//g;
+            $hier = $ctlline[2] if $type eq 'checkgroups';
+            last;
+        }
+    }
+
+    ($action, $hier);
+}
+
+# Does the group exist in the active file ?
+sub group_exists {
+    my $group = shift;
+    my $found = 0;
+    local *ACTIVE;
+
+    unless (open(ACTIVE, $inn::active)) {
+        logdie("cannot open active file $inn::active");
+    }
+
+    while (<ACTIVE>) {
+        next unless (/^([^:]+):/);
+        if ($group eq $1) {
+            $found = 1;
+            last;
+        }
+    }
+    close ACTIVE;
+
+    $found;
+}
+
+
 # Parse a control message's permissions.
 sub ctlperm {
     my ($type, $sender, $newsgroup, $token, $headers, $body) = @_;
 
-    my $action = 'drop';    # default
-    my ($logname, $hier);
+    my ($logname, $action, $hier);
 
     # newgroup and rmgroup require newsgroup names; check explicitly for that
     # here and return drop if the newsgroup is missing (to avoid a bunch of
@@ -271 +313 @@
     }
 
     my $ctllist = readctlfile();
-    foreach (@$ctllist) {
-        my @ctlline = split /:/;
-        # 0: type  1: from@addr  2: group.*  3: action
-        if ($type =~ /$ctlline[0]/ and $sender =~ /$ctlline[1]/i and
-            ($type !~ /(?:new|rm)group/ or $newsgroup =~ /$ctlline[2]/)) {
-            $action = $ctlline[3];
-            $action =~ s/\^(.+)\$/$1/;
-            $action =~ s/\\//g;
-            $hier = $ctlline[2] if $type eq 'checkgroups';
-            last;
-        }
+    if (lc $type eq 'newgroup' && group_exists($newsgroup)) {
+        ($action, $hier) = findaction($ctllist, 'updategroup',
+                                                $newsgroup, $sender);
+    }
+    if (!defined($action)) {
+        ($action, $hier) = findaction($ctllist, $type, $newsgroup, $sender);
     }
+    $action ||= 'drop';     # default if not found.
 
     ($action, $logname) = split(/=/, $action);