Diff for /loncom/auth/lonwebdavauth.pm between versions 1.3 and 1.4

version 1.3, 2015/05/29 18:42:01 version 1.4, 2015/05/29 20:00:49
Line 57  The perlvar "lonDAVsessDir" in /etc/http Line 57  The perlvar "lonDAVsessDir" in /etc/http
 provides the directory location: /home/httpd/webdav/sessionIDs.  provides the directory location: /home/httpd/webdav/sessionIDs.
   
 If the session is stale, or the cookie is missing or invalid,   If the session is stale, or the cookie is missing or invalid, 
 the user is re-challenged for login information. If the perlvar  the user is re-challenged for login information, by sending
 lonOtherAuthen has been set, Single Sign On will be used, otherwise  an Apache Basic Auth request to the client.
 an Apache Basic Auth request will be sent to the client.  
   
 If Apache Basic Auth is used, successful authentication will  If Apache Basic Auth is successful authentication will
 result in creation of a webDAV session file containing a   result in creation of a webDAV session file containing a 
 minimal set of information about the user which will also be   minimal set of information about the user which will also be 
 loaded into the user's environment.  The environment persists  loaded into the user's environment.  The environment persists
Line 87  Check for valid webDAV session Line 86  Check for valid webDAV session
   
 =item *  =item *
   
 No session? - if SSO enabled: return DECLINED  No session? return AUTH_REQUIRED which will prompt 
   webDAV client to authenticate user (via Apache Basic Auth). 
 =item *  
   
 No session? - if SSO not enabled: return AUTH_REQUIRED  
 which will prompt webDAV client to authenticate user   
 (via Apache Basic Auth).  
   
 =item *  =item *
   
Line 179  sub handler { Line 173  sub handler {
         }          }
     }      }
   
     if ($r->dir_config('lonOtherAuthen') eq 'yes') {  
         if (defined($r->dir_config('lonOtherAuthenType'))) {  
             $r->auth_type($r->dir_config('lonOtherAuthenType'));  
         }  
         return DECLINED;  
     }  
   
     my ($status,$upass) = $r->get_basic_auth_pw;      my ($status,$upass) = $r->get_basic_auth_pw;
     return $status unless ($status == 0 || $status == OK);      return $status unless ($status == 0 || $status == OK);
   
Line 198  sub handler { Line 185  sub handler {
     } else {      } else {
         $uname = $r->user;          $uname = $r->user;
         ($udom) = ($r->uri =~ m{^/webdav/($match_domain)/});          ($udom) = ($r->uri =~ m{^/webdav/($match_domain)/});
         unless (($udom ne '' ) && ($uname =~ /^$match_username$/)) {          unless (($udom ne '' ) && ($uname =~ /^$match_username$/) && ($upass ne '')) {
             $r->note_basic_auth_failure;              $r->note_basic_auth_failure;
             return AUTH_REQUIRED;              return AUTH_REQUIRED;
         }          }

Removed from v.1.3  
changed lines
  Added in v.1.4


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>