Finished off PAM module re-write

diff --git a/pam/CHANGELOG b/pam/CHANGELOG
index dc5b8d6..3cb2256 100644 (file)
--- a/pam/CHANGELOG
+++ b/pam/CHANGELOG
@@ -1,3 +1,3 @@
 ---- Changes since 1.380 ----
 Re-wrote the user interface to use the new UI library functions, for a more consistent look.
-Added support for PAM includes, as used in modern Linux distributions.
+Added support for two types of PAM includes, as used in modern Linux distributions.

diff --git a/pam/edit_pam.cgi b/pam/edit_pam.cgi
index c294b31..9d2d322 100755 (executable)
--- a/pam/edit_pam.cgi
+++ b/pam/edit_pam.cgi
@@ -47,11 +47,12 @@ foreach $t ('auth', 'account', 'session', 'password') {
                        local $mn = $m->{'module'};
                        $mn =~ s/^.*\///;
                        local @cols;
-                       if ($m->{'control'} eq 'include') {
-                               # Including some other file
-                               push(@cols, "<a href='edit_inc.cgi?".
+                       if ($m->{'include'}) {
+                               # Second type of include, using @
+                               push(@cols, "<a href='edit_atinc.cgi?".
                                    "idx=$pam->{'index'}&midx=$m->{'index'}'>".
-                                   &text('edit_inc', "<tt>$mn</tt>")."</a>");
+                                   &text('edit_inc',
+                                         "<tt>$m->{'include'}</tt>")."</a>");
                                @rtds = ( "colspan=4", "width=5%" );
                                }
                        else {
@@ -98,13 +99,35 @@ foreach $t ('auth', 'account', 'session', 'password') {
                [ map { [ $_, $text{$_} ? "$_ ($text{$_})" : $_ ] }
                      &list_modules() ]);
        $ptable .= "&nbsp;";
-       $ptable .= &ui_submit($text{'edit_addinc'}, "inc");
+       if (&include_style(\@pams) == 2) {
+               $ptable .= &ui_submit($text{'edit_addinc'}, "inc");
+               }
 
        print &ui_table_row(undef, $ptable, 2);
        print &ui_hidden_table_end();
        print &ui_form_end();
        }
 
+# Show section for other includes
+if (&include_style(\@pams) == 3) {
+       @incs = grep { $_->{'include'} } @{$pam->{'mods'}};
+       %inced = map { $_->{'include'}, 1 } @incs;
+       print &ui_form_start("save_incs.cgi");
+       print &ui_hidden("idx", $in{'idx'});
+       print &ui_hidden_table_start($text{'edit_iheader'}, "width=100%", 2,
+                                    "incs", @incs ? 1 : 0);
+       @grid = ( );
+       foreach $p (sort { $a->{'name'} cmp $b->{'name'} } @pams) {
+               $desc = $p->{'name'}." ".
+                       ($p->{'desc'} || $text{'desc_'.$p->{'name'}});
+               push(@grid, &ui_checkbox("inc", $p->{'name'}, $desc,
+                                        $inced{$p->{'name'}}));
+               }
+       print &ui_table_row(undef, &ui_grid_table(\@grid, 2), 2);
+       print &ui_hidden_table_end();
+       print &ui_form_end([ [ undef, $text{'save'} ] ]);
+       }
+
 # Delete whole service form
 print "<hr>\n";
 print &ui_form_start("delete_pam.cgi");

diff --git a/pam/lang/en b/pam/lang/en
index 90dc90c..18f8d05 100644 (file)
--- a/pam/lang/en
+++ b/pam/lang/en
@@ -1,7 +1,7 @@
 index_title=PAM Authentication
 index_name=Service
 index_desc=Description
-index_add=Add a new PAM service
+index_add=Add a new PAM service.
 index_return=service list
 index_none=No PAM configuration files were found on your system in the directory $1. Maybe PAM is not supported, or your <a href='$2'>module configuration</a> is incorrect.
 
@@ -108,6 +108,7 @@ edit_delete=Delete PAM service
 edit_move=Move
 edit_return=PAM service
 edit_inc=Include service $1
+edit_iheader=Included PAM services
 
 pam_pwdb.so=Unix password authentication
 pam_securetty.so=Secure TTY check for root
@@ -282,6 +283,7 @@ log_mod_move_l=Swapped PAM modules $1 and $2 in service $3
 log_inc_create=Added include $1 for service $2
 log_inc_modify=Modified include $1 for service $2
 log_inc_delete=Deleted include $1 for service $2
+log_incs=Updated includes for service $1
 
 inc_edit=Edit Included Service
 inc_create=Create Included Service

diff --git a/pam/log_parser.pl b/pam/log_parser.pl
index 99bc746..c548207 100644 (file)
--- a/pam/log_parser.pl
+++ b/pam/log_parser.pl
@@ -26,6 +26,9 @@ elsif ($type eq 'inc') {
        return &text("log_inc_$action", &html_escape($p->{'module'}),
                     &html_escape($object));
        }
+elsif ($type eq 'incs') {
+       return &text('log_incs', &html_escape($p->{'module'}));
+       }
 else {
        return undef;
        }

diff --git a/pam/pam-lib.pl b/pam/pam-lib.pl
index 036662e..fd9677c 100644 (file)
--- a/pam/pam-lib.pl
+++ b/pam/pam-lib.pl
@@ -29,7 +29,18 @@ FILE: foreach $f (readdir(DIR)) {
                        $serv->{'desc'} = $1;
                        }
                s/#.*$//g;
-               if (/^\s*(\S+)\s+(\S+)\s+(\S+)\s*(.*)$/) {
+               if (/^\s*\@include\s+(\S+)/) {
+                       # Special include line
+                       local $mod = { 'include' => $1,
+                                      'line' => $lnum,
+                                      'index' => @{$serv->{'mods'}}+0 };
+                       push(@{$serv->{'mods'}}, $mod);
+                       }
+               elsif (/^\s*(\S+)\s+\[([^\]*\]\s+(\S+)\s*(.*)$/) {
+                       # Line with special rules .. ignore for now
+                       }
+               elsif (/^\s*(\S+)\s+(\S+)\s+(\S+)\s*(.*)$/) {
+                       # Regular line
                        local $mod = { 'type' => $1,   'control' => $2,
                                       'module' => $3, 'args' => $4,
                                       'line' => $lnum,
@@ -87,9 +98,17 @@ $lref->[$_[2]->{'line'}] = $line;
 # Returns text for a PAM module line
 sub module_line
 {
-local $l = join("\t", $_[0]->{'type'}, $_[0]->{'control'}, $_[0]->{'module'});
-$l .= "\t$_[0]->{'args'}" if ($_[0]->{'args'});
-return $l;
+if ($_[0]->{'include'}) {
+       # Special include line
+       return "\@include ".$_[0]->{'include'};
+       }
+else {
+       # A regular module
+       local $l = join("\t", $_[0]->{'type'}, $_[0]->{'control'},
+                             $_[0]->{'module'});
+       $l .= "\t$_[0]->{'args'}" if ($_[0]->{'args'});
+       return $l;
+       }
 }
 
 # list_modules()
@@ -115,5 +134,18 @@ foreach $q (split(/\s+/, $config{'mod_equiv'})) {
 return &unique(@rv);
 }
 
+# include_style(&pam)
+# Returns 1 if includes are done with pam_stack.so, 2 if done with include
+# lines, 3 if done with @include, 0 if not supported
+sub include_style
+{
+local ($pam) = @_;
+local @allmods = map { @{$_->{'mods'}} } @$pam;
+local ($atinc) = grep { $_->{'include'} } @allmods;
+local ($inc) = grep { $_->{'control'} eq 'include' } @allmods;
+local ($stack) = grep { $_ eq "pam_stack.so" } &list_modules();
+return $atinc ? 3 : $inc ? 2 : $stack ? 1 : 0;
+}
+
 1;
 

diff --git a/pam/save_incs.cgi b/pam/save_incs.cgi
new file mode 100644 (file)
index 0000000..05b58c2
--- /dev/null
+++ b/pam/save_incs.cgi
@@ -0,0 +1,33 @@
+#!/usr/local/bin/perl
+# Update the @includes for some service
+
+require './pam-lib.pl';
+&error_setup($text{'incs_err'});
+&ReadParse();
+@pams = &get_pam_config();
+$pam = $pams[$in{'idx'}];
+&lock_file($pam->{'file'});
+
+# Add to, update or remove existing includes
+@oldincs = grep { $_->{'include'} } @{$pam->{'mods'}};
+@newincs = split(/\0/, $in{'inc'});
+for($i=0; $i<@oldincs || $i<@newincs; $i++) {
+       if ($oldincs[$i] && $newincs[$i]) {
+               # Just update
+               $oldincs[$i]->{'include'} = $newincs[$i];
+               &modify_module($pam->{'name'}, $oldincs[$i]);
+               }
+       elsif ($newincs[$i]) {
+               # Add to file
+               &create_module($pam->{'name'}, { 'include' => $newincs[$i] });
+               }
+       elsif ($oldincs[$i]) {
+               # Remove from file
+               &delete_module($pam->{'name'}, $oldincs[$i]);
+               }
+       }
+
+&unlock_file($pam->{'file'});
+&webmin_log("modify", "incs", $pam->{'name'});
+&redirect("");
+