Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / plugins / contrib / unixauth.mdwn

diff --git a/doc/plugins/contrib/unixauth.mdwn b/doc/plugins/contrib/unixauth.mdwn
index 12f885c3342115c96c51b874f052adb0155d4c66..76a8477446f0d9d43b7db33e203604139a795c4c 100644 (file)
--- a/doc/plugins/contrib/unixauth.mdwn
+++ b/doc/plugins/contrib/unixauth.mdwn
@@ -3,9 +3,36 @@
 
 This plugin authenticates users against the Unix user database. It presents a similar UI to [[plugins/passwordauth]], but simpler, as there's no need to be able to register or change one's password.
 
 
 This plugin authenticates users against the Unix user database. It presents a similar UI to [[plugins/passwordauth]], but simpler, as there's no need to be able to register or change one's password.
 

-[pwauth](http://www.unixpapa.com/pwauth/) must be installed and working. In particular, it must be configured to recognize the UID of the calling web server, or authentication will always fail. Set `pwauth_path` to the full path of your pwauth binary.
+To authenticate, either [checkpassword](http://cr.yp.to/checkpwd.html) or [pwauth](http://www.unixpapa.com/pwauth/) must be installed and configured. `checkpassword` is strongly preferred. If your web server runs as an unprivileged user -- as it darn well should! -- then `checkpassword` needs to be setuid root. (Or your ikiwiki CGI wrapper, I guess, but don't do that.) Other checkpassword implementations are available, notably [checkpassword-pam](http://checkpasswd-pam.sourceforge.net/).

 
 

-As [with passwordauth](/security/#index14h2), be wary of sending usernames and passwords in cleartext. Unlike with passwordauth, sniffing these credentials can get an attacker much further than mere wiki access. SSL with this plugin is a __must__.
+Config variables that affect the behavior of `unixauth`:
+
+* `unixauth_type`: defaults to unset, can be "checkpassword" or "pwauth"
+* `unixauth_command`: defaults to unset, should contain the full path and any arguments
+* `unixauth_requiressl`: defaults to 1, can be 0
+* `sslcookie`: needs to be 1 if `unixauth_requiressl` is 1 (perhaps this should be done automatically?)
+
+__Security__: [As with passwordauth](/security/#index14h2), be wary of sending usernames and passwords in cleartext. Unlike passwordauth, sniffing `unixauth` credentials can get an attacker much further than mere wiki access. Therefore, this plugin defaults to not even _displaying_ the login form fields unless we're running under SSL. Nobody should be able to do anything remotely dumb until the admin has done at least a little thinking. After that, dumb things are always possible. ;-)
+
+`unixauth` tests for the presence of the `HTTPS` environment variable. `Wrapper.pm` needs to be tweaked to pass it through; without that, the plugin fails closed.
+
+[[!toggle id="diff" text="Wrapper.pm.diff"]]
+
+[[!toggleable id="diff" text="""
+
+    --- Wrapper.pm.orig 2008-07-29 00:09:10.000000000 -0400
+    +++ Wrapper.pm
+    @@ -28,7 +28,7 @@ sub gen_wrapper () {
+        my @envsave;
+        push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
+                       CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
+    -                  HTTP_COOKIE REMOTE_USER} if $config{cgi};
+    +                  HTTP_COOKIE REMOTE_USER HTTPS} if $config{cgi};
+        my $envsave="";
+        foreach my $var (@envsave) {
+                $envsave.=<<"EOF"
+
+"""]]

 
 [[!toggle id="code" text="unixauth.pm"]]
 
 
 [[!toggle id="code" text="unixauth.pm"]]
 


@@ -19,16 +46,47 @@ As [with passwordauth](/security/#index14h2), be wary of sending usernames and p
     use strict;
     use IkiWiki 2.00;
     
     use strict;
     use IkiWiki 2.00;
     

-    sub import { #{{{
+    sub import {
+        hook(type => "getsetup", id => "unixauth", call => \&getsetup);

             hook(type => "formbuilder_setup", id => "unixauth",
                 call => \&formbuilder_setup);
             hook(type => "formbuilder", id => "unixauth",
                 call => \&formbuilder);
         hook(type => "sessioncgi", id => "unixauth", call => \&sessioncgi);
             hook(type => "formbuilder_setup", id => "unixauth",
                 call => \&formbuilder_setup);
             hook(type => "formbuilder", id => "unixauth",
                 call => \&formbuilder);
         hook(type => "sessioncgi", id => "unixauth", call => \&sessioncgi);

-    } # }}}
+    }
+    
+    sub getsetup () {
+        return
+        unixauth_type => {
+                type => "string",
+                example => "checkpassword",
+                description => "type of authenticator; can be 'checkpassword' or 'pwauth'",
+                safe => 0,
+                rebuild => 1,
+        },
+        unixauth_command => {
+                type => "string",
+                example => "/path/to/checkpassword",
+                description => "full path and any arguments",
+                safe => 0,
+                rebuild => 1,
+        },
+        unixauth_requiressl => {
+                type => "boolean",
+                example => "1",
+                description => "require SSL? strongly recommended",
+                safe => 0,
+                rebuild => 1,
+        },
+        plugin => {
+                description => "Unix user authentication",
+                safe => 0,
+                rebuild => 1,
+        },
+    }

     
     # Checks if a string matches a user's password, and returns true or false.
     
     # Checks if a string matches a user's password, and returns true or false.

-    sub checkpassword ($$;$) { #{{{
+    sub checkpassword ($$;$) {

         my $user=shift;
         my $password=shift;
         my $field=shift || "password";
         my $user=shift;
         my $password=shift;
         my $field=shift || "password";


@@ -40,13 +98,26 @@ As [with passwordauth](/security/#index14h2), be wary of sending usernames and p
         }
     
         my $ret=0;
         }
     
         my $ret=0;

-        if (! exists $config{pwauth_path}) {
-                $config{pwauth_path}="/usr/libexec/pwauth";
+        if (! exists $config{unixauth_type}) {
+                # admin needs to carefully think over his configuration
+                return 0;
+        }
+        elsif ($config{unixauth_type} eq "checkpassword") {
+                open UNIXAUTH, "|$config{unixauth_command} true 3<&0" or die("Could not run $config{unixauth_type}");
+                print UNIXAUTH "$user\0$password\0Y123456\0";
+                close UNIXAUTH;
+                $ret=!($?>>8);
+        }
+        elsif ($config{unixauth_type} eq "pwauth") {
+                open UNIXAUTH, "|$config{unixauth_command}" or die("Could not run $config{unixauth_type}");
+                print UNIXAUTH "$user\n$password\n";
+                close UNIXAUTH;
+                $ret=!($?>>8);
+        }
+        else {
+                # no such authentication type
+                return 0;

         }
         }

-        open PWAUTH, "|$config{pwauth_path}" or die("Could not run pwauth");
-        print PWAUTH "$user\n$password\n";
-        close PWAUTH;
-        $ret=!($?>>8);

     
         if ($ret) {
             my $userinfo=IkiWiki::userinfo_retrieve();
     
         if ($ret) {
             my $userinfo=IkiWiki::userinfo_retrieve();


@@ -60,15 +131,26 @@ As [with passwordauth](/security/#index14h2), be wary of sending usernames and p
         }
     
         return $ret;
         }
     
         return $ret;

-    } #}}}
+    }

     
     

-    sub formbuilder_setup (@) { #{{{
+    sub formbuilder_setup (@) {

         my %params=@_;
     
         my $form=$params{form};
         my $session=$params{session};
         my $cgi=$params{cgi};
     
         my %params=@_;
     
         my $form=$params{form};
         my $session=$params{session};
         my $cgi=$params{cgi};
     

+        # if not under SSL, die before even showing a login form,
+        # unless the admin explicitly says it's fine
+        if (! exists $config{unixauth_requiressl}) {
+                $config{unixauth_requiressl} = 1;
+        }
+        if ($config{unixauth_requiressl}) {
+            if ((! $config{sslcookie}) || (! exists $ENV{'HTTPS'})) {
+                die("SSL required to login. Contact your administrator.<br>");
+            }
+        }
+    

         if ($form->title eq "signin") {
                 $form->field(name => "name", required => 0);
                 $form->field(name => "password", type => "password", required => 0);
         if ($form->title eq "signin") {
                 $form->field(name => "name", required => 0);
                 $form->field(name => "password", type => "password", required => 0);


@@ -93,6 +175,7 @@ As [with passwordauth](/security/#index14h2), be wary of sending usernames and p
                                 );
                         }
                         
                                 );
                         }
                         

+                        # XXX is this reachable? looks like no

                         elsif ($submittype eq "Login") {
                                 $form->field( 
                                         name => "name",
                         elsif ($submittype eq "Login") {
                                 $form->field( 
                                         name => "name",


@@ -121,7 +204,7 @@ As [with passwordauth](/security/#index14h2), be wary of sending usernames and p
         }
     }
     
         }
     }
     

-    sub formbuilder (@) { #{{{
+    sub formbuilder (@) {

         my %params=@_;
     
         my $form=$params{form};
         my %params=@_;
     
         my $form=$params{form};


@@ -142,12 +225,12 @@ As [with passwordauth](/security/#index14h2), be wary of sending usernames and p
                         my $user_name=$form->field('name');
                 }
         }
                         my $user_name=$form->field('name');
                 }
         }

-    } #}}}
+    }

     
     

-    sub sessioncgi ($$) { #{{{
+    sub sessioncgi ($$) {

         my $q=shift;
         my $session=shift;
         my $q=shift;
         my $session=shift;

-    } #}}}
+    }

     
     1
 
     
     1