[Openinteract-commits] CVS: OpenInteract2/lib/Apache/OpenInteract2 HttpAuth.pm,1.9,1.10

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/Apache/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8503/Apache/OpenInteract2

Modified Files:
	HttpAuth.pm 
Log Message:
simple log message updates


Index: HttpAuth.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/Apache/OpenInteract2/HttpAuth.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** HttpAuth.pm	22 Feb 2004 04:41:48 -0000	1.9
--- HttpAuth.pm	25 Feb 2005 00:03:05 -0000	1.10
***************
*** 16,21 ****
  
      unless ( $r->some_auth_required ) {
!         $log->error( "Asked to process authentication request ",
!                               "but no authentication configured" );
          $r->log_reason( "No authentication has been configured" );
          return FORBIDDEN;
--- 16,21 ----
  
      unless ( $r->some_auth_required ) {
!         $log->warn( "Asked to process authentication request ",
!                     "but no authentication configured" );
          $r->log_reason( "No authentication has been configured" );
          return FORBIDDEN;
***************
*** 26,37 ****
      # e.g., HTTP_UNAUTHORIZED
      if ( $res ) {
!         $log->is_info &&
!             $log->info( "Got result [$res] from auth" );
          return $res;
      }
  
      my $user_sent = $r->connection->user;
!     $log->is_debug &&
!         $log->debug( "Trying to authenticate [$user_sent]" );
      unless ( $user_sent ) {
          return AUTH_REQUIRED;
--- 26,35 ----
      # e.g., HTTP_UNAUTHORIZED
      if ( $res ) {
!         $log->is_debug && $log->debug( "Got result '$res' from auth" );
          return $res;
      }
  
      my $user_sent = $r->connection->user;
!     $log->is_debug && $log->debug( "Trying to authenticate '$user_sent'" );
      unless ( $user_sent ) {
          return AUTH_REQUIRED;
***************
*** 41,59 ****
                    ->fetch_by_login_name( $user_sent, { skip_security => 1 } );
      unless ( $user ) {
!         $log->is_info &&
!             $log->info( "User [$user_sent] is not in OI" );
!         $r->log_reason( "User [$user_sent] is not in OI" );
          return AUTH_REQUIRED;
      }
      unless ( $user->check_password( $password_sent ) ) {
!         $log->is_info &&
!             $log->info( "User [$user->{login_name}] found but password ",
!                              "mismatch" );
!         $r->log_reason( "User [$user->{login_name}] exists, but password ",
!                         "does not match" );
          return AUTH_REQUIRED;
      }
!     $log->is_debug &&
!         $log->debug( "User [$user->{login_name}] auth ok" );
      $r->pnotes( 'login_user', $user );
      return OK;
--- 39,54 ----
                    ->fetch_by_login_name( $user_sent, { skip_security => 1 } );
      unless ( $user ) {
!         my $msg = "User '$user_sent' is not an OpenInteract user.";
!         $log->is_info && $log->info( $msg );
!         $r->log_reason( $msg );
          return AUTH_REQUIRED;
      }
      unless ( $user->check_password( $password_sent ) ) {
!         my $msg = "User '$user_sent' found but password does not match";
!         $log->is_info && $log->info( $msg );
!         $r->log_reason( $msg );
          return AUTH_REQUIRED;
      }
!     $log->is_debug && $log->debug( "User '$user_sent' auth ok" );
      $r->pnotes( 'login_user', $user );
      return OK;