Skip to content

Commit

Permalink
Changed authentication method.
Browse files Browse the repository at this point in the history
  • Loading branch information
nakahiro committed Jul 1, 2000
1 parent 45f362a commit 1cfc7a8
Showing 1 changed file with 44 additions and 53 deletions.
97 changes: 44 additions & 53 deletions src/cgi.pl
View file
@@ -1,4 +1,4 @@
# $Id: cgi.pl,v 2.50 2000-06-23 10:12:26 nakahiro Exp $ # $Id: cgi.pl,v 2.51 2000-07-01 13:11:26 nakahiro Exp $




# Small CGI tool package(use this with jcode.pl-2.0). # Small CGI tool package(use this with jcode.pl-2.0).
Expand Down Expand Up @@ -886,12 +886,12 @@ package cgiauth;
# &cgi'decode; # &cgi'decode;
# &cgi'cookie; # &cgi'cookie;
# $cgiauth'AUTH_TYPE = 1; # $cgiauth'AUTH_TYPE = 1;
# ( $status, $uid, $passwd, @userInfo ) = &cgiauth'checkUser( $userdb ); # ( $status, $uid, $sessKey, @userInfo ) = &cgiauth'checkUser( $userdb );
# #
# with Server Authentication # with Server Authentication
# require( 'cgi.pl' ); # require( 'cgi.pl' );
# $cgiauth'AUTH_TYPE = 2; # $cgiauth'AUTH_TYPE = 2;
# ( $status, $uid, $passwd, @userInfo ) = &cgiauth'checkUser( $userdb ); # ( $status, $uid, $sessKey, @userInfo ) = &cgiauth'checkUser( $userdb );
# #
# with direct URL Authentication # with direct URL Authentication
# require( 'cgi.pl' ); # require( 'cgi.pl' );
Expand All @@ -900,7 +900,7 @@ package cgiauth;
# $cgi'TAGS{'kinoT'} = 0 ... plain passwd / 1 ... encrypted # $cgi'TAGS{'kinoT'} = 0 ... plain passwd / 1 ... encrypted
# $cgi'TAGS{'kinoU'} = user's name # $cgi'TAGS{'kinoU'} = user's name
# $cgi'TAGS{'kinoP'} = user's passwd # $cgi'TAGS{'kinoP'} = user's passwd
# ( $status, $uid, $passwd, @userInfo ) = &cgiauth'checkUser( $userdb ); # ( $status, $uid, $sessKey, @userInfo ) = &cgiauth'checkUser( $userdb );
# #
# - ARGS # - ARGS
# $userdb user db. # $userdb user db.
Expand All @@ -909,8 +909,7 @@ package cgiauth;
# check user's name and password. # check user's name and password.
# #
# - RETURN # - RETURN
# returns status, user entry, encrypted password, # returns status, user entry, session key, and listed user's info.
# and listed user's info.
# #
# status: # status:
# 0 ... succeed authentication. # 0 ... succeed authentication.
Expand Down Expand Up @@ -1075,7 +1074,7 @@ sub setUserPasswd
local( $userdb, $user, $passwd ) = @_; local( $userdb, $user, $passwd ) = @_;
local( $tmpFile ) = "$userdb.tmp.$$"; local( $tmpFile ) = "$userdb.tmp.$$";
local( $found ) = 0; local( $found ) = 0;
local( $dId, $dUser, $dSalt, $dPasswd, $dTime, $dAddr, $dInfo ); local( $dId, $dUser, $dSalt, $dSPhrase, $dTime, $dAddr, $dInfo );


local( $salt ) = &newSalt(); local( $salt ) = &newSalt();
open( USERDBTMP, ">$tmpFile" ) || return 0; open( USERDBTMP, ">$tmpFile" ) || return 0;
Expand All @@ -1088,13 +1087,12 @@ sub setUserPasswd
next; next;
} }
chop; chop;
( $dId, $dUser, $dSalt, $dPasswd, $dTime, $dAddr, $dInfo ) = split( /\t/, $_, 7 ); ( $dId, $dUser, $dSalt, $dSPhrase, $dTime, $dAddr, $dInfo ) = split( /\t/, $_, 7 );


if ( $dUser eq $user ) if ( $dUser eq $user )
{ {
printf( USERDBTMP "%s\t%s\t%s\t%s\t%s\t%s\t%s\n", $dId, $dUser, $dSPhrase = substr( crypt( $passwd, $salt ), 2 ) . ':';
$salt, substr( crypt( $passwd, $salt ), 2 ), $^T, printf( USERDBTMP "%s\t%s\t%s\t%s\t%s\t%s\t%s\n", $dId, $dUser, $salt, $dSPhrase, $^T, ( $cgi'REMOTE_HOST || $cgi'REMOTE_ADDR ), $dInfo ) || return 0;
( $cgi'REMOTE_HOST || $cgi'REMOTE_ADDR ), $dInfo ) || return 0;
$found = 1; $found = 1;
} }
else else
Expand Down Expand Up @@ -1134,7 +1132,7 @@ sub setUserInfo
local( $userdb, $user, @userInfo ) = @_; local( $userdb, $user, @userInfo ) = @_;
local( $tmpFile ) = "$userdb.tmp.$$"; local( $tmpFile ) = "$userdb.tmp.$$";
local( $found ) = 0; local( $found ) = 0;
local( $dId, $dUser, $dSalt, $dPasswd ); local( $dId, $dUser, $dSalt, $dSPhrase );


open( USERDBTMP, ">$tmpFile" ) || return 0; open( USERDBTMP, ">$tmpFile" ) || return 0;
open( USERDB, "<$userdb" ) || return 0; open( USERDB, "<$userdb" ) || return 0;
Expand All @@ -1146,14 +1144,11 @@ sub setUserInfo
next; next;
} }
chop; chop;
( $dId, $dUser, $dSalt, $dPasswd ) = split( /\t/, $_, 5 ); ( $dId, $dUser, $dSalt, $dSPhrase ) = split( /\t/, $_, 5 );


if ( $dUser eq $user ) if ( $dUser eq $user )
{ {
printf( USERDBTMP "%s\t%s\t%s\t%s\t%s\t%s\t%s\n", $dId, $dUser, printf( USERDBTMP "%s\t%s\t%s\t%s\t%s\t%s\t%s\n", $dId, $dUser, $dSalt, $dSPhrase, $^T, ( $cgi'REMOTE_HOST || $cgi'REMOTE_ADDR ), join( "\t", @userInfo )) || return 0;
$dSalt, $dPasswd, $^T,
( $cgi'REMOTE_HOST || $cgi'REMOTE_ADDR ),
join( "\t", @userInfo )) || return 0;
$found = 1; $found = 1;
} }
else else
Expand Down Expand Up @@ -1192,15 +1187,15 @@ sub searchUserInfo
{ {
local( $userdb, @userInfo ) = @_; local( $userdb, @userInfo ) = @_;
local( @dInfo ) = (); local( @dInfo ) = ();
local( $dId, $dUser, $dSalt, $dPasswd, $dTime, $dAddr, $dInfo ); local( $dId, $dUser, $dSalt, $dSPhrase, $dTime, $dAddr, $dInfo );


local( $matchFlag ); local( $matchFlag );
open( USERDB, "<$userdb" ) || return 0; open( USERDB, "<$userdb" ) || return 0;
while ( <USERDB> ) while ( <USERDB> )
{ {
next if ( /^\#/o || /^$/o ); next if ( /^\#/o || /^$/o );
chop; chop;
( $dId, $dUser, $dSalt, $dPasswd, $dTime, $dAddr, $dInfo ) = split( /\t/, $_, 7 ); ( $dId, $dUser, $dSalt, $dSPhrase, $dTime, $dAddr, $dInfo ) = split( /\t/, $_, 7 );
@dInfo = split( /\t/, $dInfo ); @dInfo = split( /\t/, $dInfo );


$matchFlag = 1; $matchFlag = 1;
Expand Down Expand Up @@ -1295,8 +1290,7 @@ sub header
# check user's name and password. # check user's name and password.
# #
# - RETURN # - RETURN
# returns status, user entry, encrypted password, # returns status, user entry, session key, and listed user's info.
# and listed user's info.
# #
# status # status
# 0 ... succeed authentication. # 0 ... succeed authentication.
Expand All @@ -1315,22 +1309,23 @@ sub checkUserPasswd


return ( &updateUserPasswd( $userdb, $user, $passwd )) if ( $checkType == 0 ); return ( &updateUserPasswd( $userdb, $user, $passwd )) if ( $checkType == 0 );


local( $retCode, $retUser, $retPasswd, $retRest ); local( $retCode, $retUser, $retKey, $retRest );
$retCode = 3; # Means `not found'. $retCode = 3; # Means `not found'.


local( $dId, $dUser, $dSalt, $dPasswd, $dRest ); local( $dId, $dUser, $dSalt, $dSPhrase, $dRest, $dPasswdDgst, $dSessionDgst );
open( USERDB, "<$userdb" ) || return ( 2 ); open( USERDB, "<$userdb" ) || return ( 2 );
while ( <USERDB> ) while ( <USERDB> )
{ {
next if (( $retCode != 3 ) || /^\#/o || /^$/o ); next if (( $retCode != 3 ) || /^\#/o || /^$/o );
chop; chop;
( $dId, $dUser, $dSalt, $dPasswd, $dRest ) = split( /\t/, $_, 5 ); ( $dId, $dUser, $dSalt, $dSPhrase, $dRest ) = split( /\t/, $_, 5 );
( $dPasswdDgst, $dSessionDgst ) = split( /:/, $dSPhrase, 2 );


if (( $dUser eq $ADMIN ) && ( $dPasswd eq '' )) if (( $dUser eq $ADMIN ) && ( $dPasswdDgst eq '' ))
{ {
$retCode = 9; $retCode = 9;
$retUser = $dUser; $retUser = $dUser;
$retPasswd = $dPasswd; $retKey = $dSessionDgst;
$retRest = $dRest; $retRest = $dRest;
last; last;
} }
Expand All @@ -1339,19 +1334,16 @@ sub checkUserPasswd
if ( if (
# No check. # No check.
( $checkType == 2 ) || ( $checkType == 2 ) ||
# Encrypted passwd. # Session check.
(( $checkType == 1 ) && ( $passwd eq $dPasswd )) || (( $checkType == 1 ) && ( substr( crypt( $passwd, $dSalt ), 2 ) eq $dSessionDgst )) ||
# Plain passwd. # For backward compatibility to R7.1.1 or before.
(( $checkType == 0 ) && (( $checkType == 1 ) && ( $dSessionDgst eq '' ) && ( $passwd eq $dPasswdDgst ))
( substr( crypt( $passwd, $dSalt ), 2 ) eq $dPasswd ))
) )
{ {
# authentication succeeded! # authentication succeeded!
$UID = $dUser; $UID = $retUser = $dUser;
$PASSWD = $dPasswd; $PASSWD = $retKey = $passwd;
$retCode = 0; $retCode = 0;
$retUser = $dUser;
$retPasswd = $dPasswd;
$retRest = $dRest; $retRest = $dRest;
last; last;
} }
Expand All @@ -1365,7 +1357,7 @@ sub checkUserPasswd
} }
close USERDB; close USERDB;


return ( $retCode, $retUser, $retPasswd, split( /\t/, $retRest )); return ( $retCode, $retUser, $retKey, split( /\t/, $retRest ));
} }




Expand All @@ -1384,7 +1376,8 @@ sub checkUserPasswd
# update user's salt. # update user's salt.
# #
# - RETURN # - RETURN
# update user's salt and returns status, user entry, encrypted password. # update user's salt and returns status, user entry, encrypted password,
# and session key.
# #
# status # status
# 0 ... succeed authentication. # 0 ... succeed authentication.
Expand All @@ -1402,12 +1395,11 @@ sub updateUserPasswd


local( $tmpFile ) = "$userdb.tmp.$$"; local( $tmpFile ) = "$userdb.tmp.$$";
local( $found ) = 0; local( $found ) = 0;
local( $dId, $dUser, $dSalt, $dPasswd );


local( $retCode, $retUser, $retPasswd, $retRest ); local( $retCode, $retUser, $retKey, $retRest );
$retCode = 3; # Means `not found'. $retCode = 3; # Means `not found'.


local( $dId, $dUser, $dSalt, $dPasswd, $dRest ); local( $dId, $dUser, $dSalt, $dSPhrase, $dRest, $dPasswdDgst, $dSessionDgst );
open( USERDBTMP, ">$tmpFile" ) || return ( 2 ); open( USERDBTMP, ">$tmpFile" ) || return ( 2 );
open( USERDB, "<$userdb" ) || return ( 2 ); open( USERDB, "<$userdb" ) || return ( 2 );
while ( <USERDB> ) while ( <USERDB> )
Expand All @@ -1418,36 +1410,35 @@ sub updateUserPasswd
next; next;
} }
chop; chop;
( $dId, $dUser, $dSalt, $dPasswd, $dRest ) = split( /\t/, $_, 5 ); ( $dId, $dUser, $dSalt, $dSPhrase, $dRest ) = split( /\t/, $_, 5 );
( $dPasswdDgst, $dSessionDgst ) = split( /:/, $dSPhrase, 2 );


if (( $dUser eq $ADMIN ) && ( $dPasswd eq '' )) if (( $dUser eq $ADMIN ) && ( $dPasswdDgst eq '' ))
{ {
$retCode = 9; $retCode = 9;
$retUser = $dUser; $retUser = $dUser;
$retPasswd = $dPasswd; $retKey = $dSessionDgst;
$retRest = $dRest; $retRest = $dRest;
print( USERDBTMP $_, "\n" ) || return ( 2 ); print( USERDBTMP $_, "\n" ) || return ( 2 );
} }
elsif ( $dUser eq $user ) elsif ( $dUser eq $user )
{ {
if ( substr( crypt( $passwd, $dSalt ), 2 ) eq $dPasswd ) if ( substr( crypt( $passwd, $dSalt ), 2 ) eq $dPasswdDgst )
{ {
$dSalt = &newSalt(); $UID = $retUser = $dUser;
$dPasswd = substr( crypt( $passwd, $dSalt ), 2 ); $PASSWD = $retKey = &createNewPasswd();
$UID = $dUser;
$PASSWD = $dPasswd;
$retCode = 0; $retCode = 0;
$retUser = $dUser;
$retPasswd = $dPasswd;
$retRest = $dRest; $retRest = $dRest;
$dSalt = &newSalt();
$dPasswdDgst = substr( crypt( $passwd, $dSalt ), 2 );
$dSessionDgst = substr( crypt( $retKey, $dSalt ), 2 );
} }
else else
{ {
# authentication failed. # authentication failed.
$retCode = 4; $retCode = 4;
} }
printf( USERDBTMP "%s\t%s\t%s\t%s\t%s\n", $dId, $dUser, $dSalt, printf( USERDBTMP "%s\t%s\t%s\t%s\t%s\n", $dId, $dUser, $dSalt, "$dPasswdDgst:$dSessionDgst", $dRest ) || return ( 2 );
$dPasswd, $dRest ) || return ( 2 );
$found = 1; $found = 1;
} }
else else
Expand All @@ -1460,7 +1451,7 @@ sub updateUserPasswd


rename( $tmpFile, $userdb ) || return ( 2 ); rename( $tmpFile, $userdb ) || return ( 2 );


return ( $retCode, $retUser, $retPasswd, split( /\t/, $retRest )); return ( $retCode, $retUser, $retKey, split( /\t/, $retRest ));
} }




Expand Down

0 comments on commit 1cfc7a8

Please sign in to comment.