q/thirdculture-werc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace debug and 'false' calls with setting $status

Browse source
This commit is contained in:
Uriel 2008-10-21 16:36:45 +02:00
parent 840cb9effa
commit 34a99124a9
1 changed files with 14 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

44
bin/cgilib.rc
View file

@ -127,17 +127,13 @@ fn get_cookie {
# Auth code # Auth code
# Cookie format: WERC_USER: name:timestamp:hash(name.timestamp.password) # Cookie format: WERC_USER: name:timestamp:hash(name.timestamp.password)
# login_user can't be used from a template because it sets a cookie! # login_user can't be used from a template because it sets a cookie
fn login_user { fn login_user {
get_post_args user_name user_password get_post_args user_name user_password
if(auth_user $user_name $user_password) { if(auth_user $user_name $user_password)
set_cookie werc_user $"user_name^':0:'^$"user_password set_cookie werc_user $"user_name^':0:'^$"user_password
dprint Auth: SET COOKIE FOR USER: $user_name if not
} status='Auth: failed login for $user_name $user_password'
if not {
dprint Auth: failed login for $user_name $user_password
false
}
} }
fn auth_user { fn auth_user {
@ -145,36 +141,24 @@ fn auth_user {
user_pass = $2 user_pass = $2
pfile = 'etc/users/'^$"user_name^'/password' pfile = 'etc/users/'^$"user_name^'/password'
if (~ $#user_name 0 || ~ $#user_password 0) { if (~ $#user_name 0 || ~ $#user_password 0)
dprint Auth: missing user name or pass: $user_name / $user_password status='Auth: missing user name or pass: '^$user_name^' / '^$user_password
false if not if(! test -f $pfile)
} status='Auth: cant find '^$pfile
if not if(! test -f $pfile) { if not if (! ~ $user_pass `{cat $pfile})
dprint Auth: cant find $pfile status='Auth: Pass '$user_pass' doesnt match '^`{cat $pfile}
false if not
}
if not if (! ~ $user_pass `{cat $pfile}) {
dprint Auth: Pass $user_pass doesnt match `{cat $pfile}
false
}
if not {
dprint Auth: success dprint Auth: success
true
}
} }
fn user_in_group { fn user_in_group {
if(~ $#logged_user 0) if(~ $#logged_user 0)
get_user get_user
if(~ $#logged_user 0) { if(~ $#logged_user 0)
dprint Auth: user_in_group: No logged in user
false false
} if not if (! grep -s '^'^$logged_user^'$' etc/groups/$1)
if not if (! grep -s '^'^$logged_user^'$' etc/groups/$1) {
dprint Auth: user_in_group: Cant find $logged_user in etc/groups/$1
false false
}
if not if not
true true
} }