From 48f30e9dfee5407b024f0431affa6e04fe2778d8 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sat, 29 Oct 2022 15:39:15 -0400 Subject: [PATCH] fix --- wrenchboard/src/shared_tool/account.cc | 17 +++++++++++++++++ wrenchboard/src/shared_tool/account_mngt.cc | 12 ++++++++++++ 2 files changed, 29 insertions(+) diff --git a/wrenchboard/src/shared_tool/account.cc b/wrenchboard/src/shared_tool/account.cc index 27f84b3c..1e263612 100644 --- a/wrenchboard/src/shared_tool/account.cc +++ b/wrenchboard/src/shared_tool/account.cc @@ -227,10 +227,27 @@ long account_calls(CVars in, CVars &out) { break; case WRENCHBOARD_ACCOUNT_PENDING: + /* + if ( load_db_record(out, "SELECT uid FROM members_pending WHERE LOWER(username)=LOWER('%s')",in["username"].c_str()) ){ + out["acc"]="DULPICATE"; + return -1; + } + if ( load_db_record(out, "SELECT uid FROM members WHERE LOWER(username)=LOWER('%s')",in["username"].c_str()) ){ + out["acc"]="DULPICATE"; + return -1; + }*/ return CreateWrenchBoardAccountPending(in, out); break; case WRENCHBOARD_ACCOUNT_CREATEACC: + /*if ( load_db_record(out, "SELECT uid FROM members_pending WHERE LOWER(username)=LOWER('%s')",in["username"].c_str()) ){ + out["acc"]="DULPICATE"; + return -1; + } + if ( load_db_record(out, "SELECT uid FROM members WHERE LOWER(username)=LOWER('%s')",in["username"].c_str()) ){ + out["acc"]="DULPICATE"; + return -1; + }*/ return CreateWrenchBoardAccount(in, out); break; diff --git a/wrenchboard/src/shared_tool/account_mngt.cc b/wrenchboard/src/shared_tool/account_mngt.cc index 8e161803..f52f1294 100644 --- a/wrenchboard/src/shared_tool/account_mngt.cc +++ b/wrenchboard/src/shared_tool/account_mngt.cc @@ -570,6 +570,18 @@ news integer DEFAULT 0, ALTER TABLE ONLY members_pending ADD CONSTRAINT members_pending_id_key UNIQUE (id); */ + + if ( load_db_record(out, "SELECT id FROM members_pending WHERE LOWER(username)=LOWER('%s')",in["username"].c_str()) ){ + out["password"]="REMOVED"; + out["acc"]="DULPICATE"; + return -1; + } + if ( load_db_record(out, "SELECT uid FROM members WHERE LOWER(username)=LOWER('%s')",in["username"].c_str()) ){ + out["password"]="REMOVED"; + out["acc"]="DULPICATE"; + return -1; + } + REQ_STRING(in, "username", 5, 49, "(.*)"); REQ_STRING(in, "firstname", 2, 49, "(.*)"); REQ_STRING(in, "lastname", 2, 49, "(.*)");