From ab321e5460d12c649ce882301ed891f8dbda2bf3 Mon Sep 17 00:00:00 2001 From: kanoi Date: Sun, 3 Jan 2016 10:59:37 +1100 Subject: [PATCH] ckdb - replace username min length constants with a #define --- src/ckdb.h | 4 +++- src/ckdb_cmd.c | 40 ++++++++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/src/ckdb.h b/src/ckdb.h index c6640ada..63074072 100644 --- a/src/ckdb.h +++ b/src/ckdb.h @@ -51,7 +51,7 @@ #define DB_VLOCK "1" #define DB_VERSION "1.0.4" -#define CKDB_VERSION DB_VERSION"-1.901" +#define CKDB_VERSION DB_VERSION"-1.902" #define WHERE_FFL " - from %s %s() line %d" #define WHERE_FFL_HERE __FILE__, __func__, __LINE__ @@ -1077,6 +1077,8 @@ typedef struct users { #define DATA_USERS(_var, _item) DATA_GENERIC(_var, _item, users, true) #define DATA_USERS_NULL(_var, _item) DATA_GENERIC(_var, _item, users, false) +#define MIN_USERNAME 3 + #define SHA256SIZHEX 64 #define SHA256SIZBIN 32 #define SALTSIZHEX 32 diff --git a/src/ckdb_cmd.c b/src/ckdb_cmd.c index e6e22796..8ed93bbb 100644 --- a/src/ckdb_cmd.c +++ b/src/ckdb_cmd.c @@ -19,13 +19,13 @@ static K_ITEM *adminuser(K_TREE *trf_root, char *reply, size_t siz) K_ITEM *i_username, *i_admin; char reply2[1024] = ""; - i_username = require_name(trf_root, "username", 3, (char *)userpatt, - reply, siz); + i_username = require_name(trf_root, "username", MIN_USERNAME, + (char *)userpatt, reply, siz); if (!i_username) return NULL; - i_admin = optional_name(trf_root, "admin", 3, (char *)userpatt, - reply2, sizeof(reply2)); + i_admin = optional_name(trf_root, "admin", MIN_USERNAME, + (char *)userpatt, reply2, sizeof(reply2)); if (i_admin) return i_admin; @@ -42,7 +42,8 @@ static char *cmd_adduser(PGconn *conn, char *cmd, char *id, tv_t *now, char *by, LOGDEBUG("%s(): cmd '%s'", __func__, cmd); - i_username = require_name(trf_root, "username", 3, (char *)userpatt, reply, siz); + i_username = require_name(trf_root, "username", MIN_USERNAME, + (char *)userpatt, reply, siz); if (!i_username) return strdup(reply); @@ -94,8 +95,8 @@ static char *cmd_newpass(__maybe_unused PGconn *conn, char *cmd, char *id, LOGDEBUG("%s(): cmd '%s'", __func__, cmd); - i_username = require_name(trf_root, "username", 3, (char *)userpatt, - reply, siz); + i_username = require_name(trf_root, "username", MIN_USERNAME, + (char *)userpatt, reply, siz); if (!i_username) return strdup(reply); @@ -166,7 +167,8 @@ static char *cmd_chkpass(__maybe_unused PGconn *conn, char *cmd, char *id, LOGDEBUG("%s(): cmd '%s'", __func__, cmd); - i_username = require_name(trf_root, "username", 3, (char *)userpatt, reply, siz); + i_username = require_name(trf_root, "username", MIN_USERNAME, + (char *)userpatt, reply, siz); if (!i_username) return strdup(reply); @@ -218,8 +220,8 @@ static char *cmd_2fa(__maybe_unused PGconn *conn, char *cmd, char *id, LOGDEBUG("%s(): cmd '%s'", __func__, cmd); - i_username = require_name(trf_root, "username", 3, (char *)userpatt, - reply, siz); + i_username = require_name(trf_root, "username", MIN_USERNAME, + (char *)userpatt, reply, siz); if (!i_username) return strdup(reply); @@ -464,7 +466,8 @@ static char *cmd_userset(PGconn *conn, char *cmd, char *id, LOGDEBUG("%s(): cmd '%s'", __func__, cmd); - i_username = require_name(trf_root, "username", 3, (char *)userpatt, reply, siz); + i_username = require_name(trf_root, "username", MIN_USERNAME, + (char *)userpatt, reply, siz); if (!i_username) { // For web this message is detailed enough reason = "System error"; @@ -760,7 +763,8 @@ static char *cmd_workerset(PGconn *conn, char *cmd, char *id, tv_t *now, LOGDEBUG("%s(): cmd '%s'", __func__, cmd); - i_username = require_name(trf_root, "username", 3, (char *)userpatt, reply, siz); + i_username = require_name(trf_root, "username", MIN_USERNAME, + (char *)userpatt, reply, siz); if (!i_username) { // For web this message is detailed enough reason = "System error"; @@ -3428,7 +3432,8 @@ static char *cmd_getatts(__maybe_unused PGconn *conn, char *cmd, char *id, LOGDEBUG("%s(): cmd '%s'", __func__, cmd); - i_username = require_name(trf_root, "username", 3, (char *)userpatt, reply, siz); + i_username = require_name(trf_root, "username", MIN_USERNAME, + (char *)userpatt, reply, siz); if (!i_username) { reason = "Missing username"; goto nuts; @@ -3591,7 +3596,8 @@ static char *cmd_setatts(PGconn *conn, char *cmd, char *id, LOGDEBUG("%s(): cmd '%s'", __func__, cmd); - i_username = require_name(trf_root, "username", 3, (char *)userpatt, reply, siz); + i_username = require_name(trf_root, "username", MIN_USERNAME, + (char *)userpatt, reply, siz); if (!i_username) { reason = "Missing user"; goto bats; @@ -3752,7 +3758,8 @@ static char *cmd_expatts(__maybe_unused PGconn *conn, char *cmd, char *id, LOGDEBUG("%s(): cmd '%s'", __func__, cmd); - i_username = require_name(trf_root, "username", 3, (char *)userpatt, reply, siz); + i_username = require_name(trf_root, "username", MIN_USERNAME, + (char *)userpatt, reply, siz); if (!i_username) { reason = "Missing username"; goto rats; @@ -5728,7 +5735,8 @@ static char *cmd_userstatus(PGconn *conn, char *cmd, char *id, tv_t *now, char * LOGDEBUG("%s(): cmd '%s'", __func__, cmd); - i_username = optional_name(trf_root, "username", 3, (char *)userpatt, reply, siz); + i_username = optional_name(trf_root, "username", MIN_USERNAME, + (char *)userpatt, reply, siz); i_userid = optional_name(trf_root, "userid", 1, (char *)intpatt, reply, siz); // Either username or userid if (!i_username && !i_userid) {