Minor cleanups of old authentication stuff, and some documentation.

This commit is contained in:
Jan Vidar Krey 2009-07-03 01:29:04 +02:00
parent 98bffd93e9
commit e68cbd0cde
2 changed files with 12 additions and 17 deletions

View File

@ -552,14 +552,14 @@ int acl_password_verify(struct acl_handle* acl, struct user* user, const char* p
uint64_t tiger_res[3]; uint64_t tiger_res[3];
if (!password || !user || strlen(password) != MAX_CID_LEN) if (!password || !user || strlen(password) != MAX_CID_LEN)
return password_invalid; return 0;
access = acl_get_access_info(acl, user->id.nick); access = acl_get_access_info(acl, user->id.nick);
if (!access || !access->password) if (!access || !access->password)
return password_invalid; return 0;
if (TIGERSIZE+strlen(access->password) >= 1024) if (TIGERSIZE+strlen(access->password) >= 1024)
return password_invalid; return 0;
challenge = acl_password_generate_challenge(acl, user); challenge = acl_password_generate_challenge(acl, user);
@ -574,9 +574,9 @@ int acl_password_verify(struct acl_handle* acl, struct user* user, const char* p
if (strcasecmp(password, password_calc) == 0) if (strcasecmp(password, password_calc) == 0)
{ {
return password_ok; return 1;
} }
return password_invalid; return 0;
} }

View File

@ -24,18 +24,6 @@ struct hub_config;
struct user; struct user;
struct ip_addr_encap; struct ip_addr_encap;
enum password_status
{
password_invalid = 0,
password_ok = 1,
};
enum acl_status
{
acl_not_found = 0,
acl_found = 1,
};
enum user_credentials enum user_credentials
{ {
cred_none, /**<<< "User has no credentials (not yet logged in)" */ cred_none, /**<<< "User has no credentials (not yet logged in)" */
@ -93,6 +81,13 @@ extern int acl_user_unban_cid(struct acl_handle* handle, const char* cid);
extern int acl_check_ip_range(struct ip_addr_encap* addr, struct ip_ban_record* info); extern int acl_check_ip_range(struct ip_addr_encap* addr, struct ip_ban_record* info);
extern const char* acl_password_generate_challenge(struct acl_handle* acl, struct user* user); extern const char* acl_password_generate_challenge(struct acl_handle* acl, struct user* user);
/**
* Verify a password.
*
* @param password the hashed password (based on the nonce).
* @return 1 if the password matches, or 0 if the password is incorrect.
*/
extern int acl_password_verify(struct acl_handle* acl, struct user* user, const char* password); extern int acl_password_verify(struct acl_handle* acl, struct user* user, const char* password);
#endif /* HAVE_UHUB_ACL_H */ #endif /* HAVE_UHUB_ACL_H */