ZYM/BH-Bookstore-2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test-inner'

Browse Source 
fixed many bugs
This commit is contained in:
ZhuangYumin
2023-12-14 08:10:48 +00:00
parent e6d5aeb8f6 ae8240839c
commit dd2885fd84
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/include/bs-utility.h
View File

@ -116,13 +116,13 @@ void Respond(BlockingStringStream *output_ptr, std::string SessionToken,
class UserItemClass { class UserItemClass {
public: public:
char user_id[31], password[31], user_name[31]; char user_id[35], password[35], user_name[35];
unsigned char privilege; unsigned char privilege;
}; };
class BookItemClass { class BookItemClass {
public: public:
char ISBN[21], name[61], author[61], keyword[61]; char ISBN[25], name[65], author[65], keyword[65];
double price; double price;
int quantity_remain; int quantity_remain;
int bid; int bid;

13
backend/src/engine.cpp
View File

@ -103,9 +103,11 @@ std::vector<std::string> BookStoreEngineClass::Execute(
return ExecuteBuy(cmd, login_stack); return ExecuteBuy(cmd, login_stack);
} }
case OperationType::__Kreport: { case OperationType::__Kreport: {
// return std::vector<std::string>({"Invalid"});
return ExecuteReport(cmd, login_stack); return ExecuteReport(cmd, login_stack);
} }
case OperationType::__Klog: { case OperationType::__Klog: {
// return std::vector<std::string>({"Invalid"});
return ExecuteLog(cmd, login_stack); return ExecuteLog(cmd, login_stack);
} }
} }
@ -120,11 +122,14 @@ std::vector<std::string> BookStoreEngineClass::ExecuteSu(
if (!CommandSuLexer(cmd, user_id, password)) if (!CommandSuLexer(cmd, user_id, password))
return std::vector<std::string>({"Invalid"}); return std::vector<std::string>({"Invalid"});
// debugPrint("su", user_id, " ", password); // debugPrint("su", user_id, " ", password);
if (user_data_base.GetPrevilege(user_id) == -1)
return std::vector<std::string>({"Invalid"});
if (login_stack.size() > 0 && if (login_stack.size() > 0 &&
user_data_base.GetPrevilege(login_stack.top().first) == 7) { user_data_base.GetPrevilege(login_stack.top().first) >
// debugPrint("has root previlege"); user_data_base.GetPrevilege(user_id)) {
if (user_data_base.GetPrevilege(user_id) == -1) if (password != "" && !user_data_base.PAM(user_id, password))
return std::vector<std::string>({"Invalid"}); return std::vector<std::string>({"Invalid"});
// debugPrint("has root previlege");
login_stack.push(std::make_pair(user_id, 0)); login_stack.push(std::make_pair(user_id, 0));
login_count[user_id]++; login_count[user_id]++;
return std::vector<std::string>(); return std::vector<std::string>();
@ -156,7 +161,7 @@ std::vector<std::string> BookStoreEngineClass::ExecuteRegister(
std::string user_id, password, user_name; std::string user_id, password, user_name;
if (!CommandRegisterLexer(cmd, user_id, password, user_name)) if (!CommandRegisterLexer(cmd, user_id, password, user_name))
return std::vector<std::string>({"Invalid"}); return std::vector<std::string>({"Invalid"});
if (user_data_base.GetPrevilege(cmd) != -1) if (user_data_base.GetPrevilege(user_id) != -1)
return std::vector<std::string>({"Invalid"}); return std::vector<std::string>({"Invalid"});
user_data_base.AddUser(user_id, password, user_name, 1); user_data_base.AddUser(user_id, password, user_name, 1);
return std::vector<std::string>(); return std::vector<std::string>();

9
backend/src/lexer.cpp
View File

@ -157,8 +157,7 @@ bool CommandUseraddLexer(const std::string &command, std::string &user_id,
ss >> password; ss >> password;
ss >> privilege; ss >> privilege;
ss >> username; ss >> username;
if (privilege != 0 && privilege != 1 && privilege != 3 && privilege != 7) if (privilege != 1 && privilege != 3 && privilege != 7) return false;
return false;
return true; return true;
} else } else
return false; return false;
@ -212,7 +211,7 @@ bool CommandShowLexer(const std::string &command, std::string &ISBN,
std::string &name, std::string &author, std::string &name, std::string &author,
std::string &keyword) { std::string &keyword) {
static std::basic_regex main_pattern( static std::basic_regex main_pattern(
R"(^ *show(?: +-ISBN=(?:\S{1,20})| +-name=\"(?:[^\s"]{1,60})\"| +-author=\"(?:[^\s"]{1,60})\"| +-keyword=\"(?:[^\s"]{1,60})\")* *$)", R"(^ *show(?: +-ISBN=(?:\S{1,20})| +-name=\"(?:[^\s"]{1,60})\"| +-author=\"(?:[^\s"]{1,60})\"| +-keyword=\"(?:[^\s"]{1,60})\")? *$)",
std::regex_constants::optimize); std::regex_constants::optimize);
bool has_ISBN = false; bool has_ISBN = false;
@ -337,7 +336,7 @@ bool CommandModifyLexer(const std::string &command, std::string &ISBN,
std::string &name, std::string &author, std::string &name, std::string &author,
std::string &keyword, double &price) { std::string &keyword, double &price) {
static std::basic_regex main_pattern( static std::basic_regex main_pattern(
R"(^ *modify(?: +-ISBN=(?:\S{1,20})| +-name=\"(?:[^\s"]{1,60})\"| +-author=\"(?:[^\s"]{1,60})\"| +-keyword=\"(?:[^\s"]{1,60})\"| +-price=[0-9]{1,10}(?:\.[0-9]{1,2})?)+ *$)", R"(^ *modify(?: +-ISBN=(?:\S{1,20})| +-name=\"(?:[^\s"]{1,60})\"| +-author=\"(?:[^\s"]{1,60})\"| +-keyword=\"(?:[^\s"]{1,60})\"| +-price=[0-9]{1,10}(?:\.[0-9]+)?)+ *$)",
std::regex_constants::optimize); std::regex_constants::optimize);
if (std::regex_match(command, main_pattern)) { if (std::regex_match(command, main_pattern)) {
std::stringstream ss(command); std::stringstream ss(command);
@ -385,7 +384,7 @@ bool CommandModifyLexer(const std::string &command, std::string &ISBN,
bool CommandImportLexer(const std::string &command, int &quantity, bool CommandImportLexer(const std::string &command, int &quantity,
double &total_cost) { double &total_cost) {
static std::basic_regex main_pattern( static std::basic_regex main_pattern(
R"(^ *import +[0-9]{1,10} +[0-9]{1,10}(?:\.[0-9]{1,2})? *$)", R"(^ *import +[0-9]{1,10} +[0-9]{1,10}(?:\.[0-9]+)? *$)",
std::regex_constants::optimize); std::regex_constants::optimize);
if (std::regex_match(command, main_pattern)) { if (std::regex_match(command, main_pattern)) {
std::stringstream ss(command); std::stringstream ss(command);