From 78897712c1cc5b7e673caa1cd321a539835ebef3 Mon Sep 17 00:00:00 2001 From: zhouzian Date: Tue, 16 Jul 2019 15:13:02 +0800 Subject: [PATCH] =?UTF-8?q?Add=20aaa-12=20=E6=96=B0=E5=A2=9E=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=AE=A4=E8=AF=81=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=20RCA=EF=BC=9A=20SOL=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E4=BA=BA?= =?UTF-8?q?=EF=BC=9Azhouzian=20=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9Azhouzia?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 3 + .../usermanager-server/user.c | 6 +- Product/build/user.usermanager-auth.Makefile | 77 ++++ Product/build/user.usermanager-test.Makefile | 20 +- .../user_manager/usermanager-auth/user_auth.c | 395 ++++++++++++++++++ .../user_manager/usermanager-auth/user_auth.h | 58 +++ .../usermanager-auth/user_json.json | 46 ++ .../usermanager-test/test_usermanager.c | 74 ++-- 8 files changed, 629 insertions(+), 50 deletions(-) create mode 100644 Product/build/user.usermanager-auth.Makefile create mode 100644 Product/user/user_manager/usermanager-auth/user_auth.c create mode 100644 Product/user/user_manager/usermanager-auth/user_auth.h create mode 100644 Product/user/user_manager/usermanager-auth/user_json.json diff --git a/Makefile b/Makefile index eeb68d334..4cddaa6a6 100755 --- a/Makefile +++ b/Makefile @@ -125,10 +125,13 @@ endif usermanager: ifeq ($(OPT), clean) + $(MLOG)make $(MAKE_FLAGS) -C Product/build -f user.usermanager-auth.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=usermanager-auth $(MLOG)make $(MAKE_FLAGS) -C Product/build -f user.usermanager-test.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=usermanager-test else ifeq ($(OPT), install) + $(MLOG)make $(MAKE_FLAGS) -C Product/build -f user.usermanager-auth.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=usermanager-auth $(MLOG)make $(MAKE_FLAGS) -C Product/build -f user.usermanager-test.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=usermanager-test else + $(MLOG)make all $(MAKE_FLAGS) -C Product/build -f user.usermanager-auth.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=usermanager-auth $(MLOG)make all $(MAKE_FLAGS) -C Product/build -f user.usermanager-test.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=usermanager-test endif diff --git a/Platform/user/configm/config-server/user_manager_config/usermanager-server/user.c b/Platform/user/configm/config-server/user_manager_config/usermanager-server/user.c index 894150fe2..30d70ab94 100644 --- a/Platform/user/configm/config-server/user_manager_config/usermanager-server/user.c +++ b/Platform/user/configm/config-server/user_manager_config/usermanager-server/user.c @@ -336,8 +336,10 @@ int usermanager_del_user(USER_DEL* in) /* DELETE FROM user WHERE user_name = "" */ - /* 强制用户下线 */ + /* 强制用户下线 + * 新起一个线程（理论上最多会起100个线程），异步的将需要下线的用户id发送到消息队列 + */ - return DELGROUP_SUCCESS; + return DELUSER_SUCCESS; } \ No newline at end of file diff --git a/Product/build/user.usermanager-auth.Makefile b/Product/build/user.usermanager-auth.Makefile new file mode 100644 index 000000000..848bbe27c --- /dev/null +++ b/Product/build/user.usermanager-auth.Makefile @@ -0,0 +1,77 @@ +# target name, the target name must have the same name of c source file +TARGET_NAME=userauthapi + +# target +# for linux module driver: KO +# for application: EXE +# for dynamic library: DLL +TARGET_TYPE = DLL + +# target object +# for application: APP +# for device driver: DRV +TARGET_OBJ = APP + +# custom install dir +TARGET_BOX = + +#debug mode or release mode +DEBUG = TRUE + +PLAT_LINUX ?= TRUE +PLAT_ARM64 ?= TRUE + +VPATH = ../user/user_manager/usermanager-auth + +# source code + +# set the source file, don't used .o because of ... + +COMMON_SRCS = user_auth.c + +# MRS Board Source Files +PLAT_LINUX_SRCS = $(COMMON_SRCS) +PLAT_ARM64_SRCS = $(COMMON_SRCS) + +# gcc CFLAGS +PLAT_ARM64_CFLAGS := -fPIC -I../../Common +PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) + + +PLAT_ARM64_LDFLAGS := -fPIC -shared +PLAT_LINUX_LDFLAGS := $(PLAT_ARM64_LDFLAGS) + + +#gcc libs +ARM64_LIBS := -lcjson -lpthread -lm +LINUX_LIBS := -lcjson -lpthread -lm + +ifeq ($(PLAT_ARM64), TRUE) +DEPEND_LIB += +USER_CLEAN_ITEMS += +endif + +ifeq ($(PLAT_LINUX), TRUE) +DEPEND_LIB += +USER_CLEAN_ITEMS += +endif + +# this line must be at below of thus, because of... +include ../../Common/common.Makefile + +ifneq ($(MAKECMDGOALS), clean) +ifneq ($(MAKECMDGOALS), cleanall) +ifneq ($(notdir $(DEPEND_LIB)), $(wildcard $(DEPEND_LIB))) +$(shell $(CP) $(DEPEND_LIB) ./) +endif +endif +endif + +ifeq ($(MAKECMDGOALS), ) +$(shell find ./ -name "$(TARGET)-*.ko" -delete) +else +ifeq ($(MAKECMDGOALS), all) +$(shell find ./ -name "$(TARGET)-*.ko" -delete) +endif +endif + diff --git a/Product/build/user.usermanager-test.Makefile b/Product/build/user.usermanager-test.Makefile index 1665b79ea..6cb9e850f 100644 --- a/Product/build/user.usermanager-test.Makefile +++ b/Product/build/user.usermanager-test.Makefile @@ -21,13 +21,14 @@ DEBUG = TRUE PLAT_LINUX ?= TRUE PLAT_ARM64 ?= FALSE -VPATH = ../user/user_manager/usermanager-test/ ../../Platform/user/configm/config-server/user_manager_config/ +VPATH = ../user/user_manager/ ../../Platform/user/configm/config-server/user_manager_config/ # source code # set the source file, don't used .o because of ... -COMMON_SRCS = test_usermanager.c user_account_config.c user_group_config.c usermanager-server/array_index.c usermanager-server/user_group.c usermanager-server/user_mod.c usermanager-server/user.c +COMMON_SRCS = usermanager-test/test_usermanager.c user_account_config.c user_group_config.c usermanager-server/array_index.c usermanager-server/user_group.c \ + usermanager-server/user_mod.c usermanager-server/user.c # MRS Board Source Files PLAT_LINUX_SRCS = $(COMMON_SRCS) @@ -35,7 +36,8 @@ PLAT_ARM64_SRCS = $(COMMON_SRCS) # gcc CFLAGS PLAT_ARM64_CFLAGS := -I../../Platform/user/configm/config-server/user_manager_config -I../../Platform/user/configm/config-server/user_manager_config/usermanager-server/include -I../../Common -I../common \ - -I../../Platform/user/configm/config-server/include -I../../Platform/common/configm -I../../Platform/common/rpc -I../../Platform/common/rpc/hashtable + -I../../Platform/user/configm/config-server/include -I../../Platform/common/configm -I../../Platform/common/rpc -I../../Platform/common/rpc/hashtable \ + -I../user/user_manager/usermanager-auth PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) @@ -43,17 +45,17 @@ PLAT_ARM64_LDFLAGS := PLAT_LINUX_LDFLAGS := #gcc libs -ARM64_LIBS := -lcjson -lpthread -lm -LINUX_LIBS := -lcjson -lpthread -lm +ARM64_LIBS := -lcjson ./userauthapi-arm64.so -lpthread -lm +LINUX_LIBS := -lcjson ./userauthapi-linux.so -lpthread -lm ifeq ($(PLAT_ARM64), TRUE) -DEPEND_LIB += ./debug/usermanager-arm64.so -USER_CLEAN_ITEMS += ./usermanager-arm64.so +DEPEND_LIB += ./debug/userauthapi-arm64.so +USER_CLEAN_ITEMS += ./userauthapi-arm64.so endif ifeq ($(PLAT_LINUX), TRUE) -DEPEND_LIB += ./debug/usermanager-linux.so -USER_CLEAN_ITEMS += ./usermanager-linux.so +DEPEND_LIB += ./debug/userauthapi-linux.so +USER_CLEAN_ITEMS += ./userauthapi-linux.so endif # this line must be at below of thus, because of... diff --git a/Product/user/user_manager/usermanager-auth/user_auth.c b/Product/user/user_manager/usermanager-auth/user_auth.c new file mode 100644 index 000000000..e35003364 --- /dev/null +++ b/Product/user/user_manager/usermanager-auth/user_auth.c @@ -0,0 +1,395 @@ +#include +#include +#include +#include +#include +#include +#include "user_auth.h" + +#define NOT_LOCK 0 +#define DATA_EMPTY 0 +#define AUTH_INIT_FAIL -1 +#define AUTH_INIT_SUCCESS 0 +#define AUTH_USER_INDEX_MAX (100 + 2) + +#define UNAMESIZE (127 + 1) +#define UDESIZE (127 + 1) +#define UPWDSIZE (63 + 1) + +typedef struct user_auth +{ + unsigned short ID; //用户id + char uname[UNAMESIZE]; //用户名 + char udescription[UDESIZE]; //用户描述 + unsigned short GID; //用户组ID + char passwd[UPWDSIZE]; //密码 + unsigned short multi_valid; //多人登陆、永久有效 + time_t valid_begin_time; //有效期开始时间 + time_t valid_end_time; //有效期结束时间 +}USERACCOUNT; + +#define JSON_URL "/nasdata/zhouzian/secogateway/Product/user/user_manager/usermanager-auth/user_json.json" +#define AUTH_RECORD (g_user_auth_ret_table[user_id]) + +#define AUTH_TIME_T2STRING(time_int, time_char) (strftime((time_char), 20, "%Y-%m-%d %H:%M:%S", (localtime(&time_int)))) +#define AUTH_STRING2TIME_T(time_char,time_int) \ +do { \ + struct tm tm_time; \ + int res = sscanf(time_char, "%4d-%2d-%2d %2d:%2d:%2d", \ + &tm_time.tm_year, &tm_time.tm_mon, &tm_time.tm_mday, \ + &tm_time.tm_hour, &tm_time.tm_min, &tm_time.tm_sec); \ + tm_time.tm_year -= 1900; \ + tm_time.tm_mon--; \ + tm_time.tm_isdst = -1; \ + time_int = mktime(&tm_time); \ +} while (0) + +#define AUTH_MULTI_MASK 0x0002 +#define AUTH_VALID_MASK 0x0001 + +#define AUTH_MULTI_GET(element) ((element) >> 1) +#define AUTH_MULTI_SET(element, value) (((element) & AUTH_VALID_MASK) | (((value) << 1) & AUTH_MULTI_MASK)) +#define AUTH_VALID_GET(element) ((element) & AUTH_VALID_MASK) +#define AUTH_VALID_SET(element, value) (((element) & AUTH_MULTI_MASK) | ((value) & AUTH_VALID_MASK)) + +#define xfree(X) \ + if(X){ \ + free(X); \ + X = NULL; \ + }; \ + +/* 定义用户认证结果记录表 */ +static USER_AUTH_LIST g_user_auth_ret_table[AUTH_USER_INDEX_MAX] = { 0 }; + +/* +* config_lock_time 锁定后-时间,单位(分钟) +* config_fail_num 锁定前-次数 +* config_fail_time 锁定前-时间,单位(分钟) +*/ +static int g_config_lock_time, g_config_fail_num, g_config_fail_time; + +/* 创建认证失败时间队列 */ +static int init_fail_time_queue(unsigned short user_id, int max_size) +{ + AUTH_RECORD.fail_time = (time_t *)malloc(sizeof(time_t) * max_size); + if (NULL == AUTH_RECORD.fail_time) + { + //记录日志，申请内存失败 + return AUTH_INIT_FAIL; + } + AUTH_RECORD.max_size = max_size; + + return AUTH_INIT_SUCCESS; +} + +/* 清空认证失败时间队列,不释放内存 */ +static void empty_fail_time_queue(unsigned short user_id) +{ + memset(AUTH_RECORD.fail_time, 0, sizeof(AUTH_RECORD.fail_time)); + AUTH_RECORD.front = 0; + AUTH_RECORD.rear = 0; + AUTH_RECORD.lock_time = 0; +} + +/* 判断队列为空 */ +static bool queue_is_empty(unsigned short user_id) +{ + if (AUTH_RECORD.front == AUTH_RECORD.rear) + { + return true; + } + return false; +} + +/* 判断队列为满 */ +static bool queue_is_full(unsigned short user_id) +{ + if (AUTH_RECORD.front == (AUTH_RECORD.rear + 1) % AUTH_RECORD.max_size) + { + return true; + } + return false; +} + +/* 认证失败时间队列删除数据 */ +static void de_fail_time_queue(unsigned short user_id) +{ + if (queue_is_empty(user_id)) + { + return; + } + AUTH_RECORD.front = (AUTH_RECORD.front + 1) % AUTH_RECORD.max_size; +} + +/* 认证失败时间队列添加数据 */ +static void en_fail_time_queue(unsigned short user_id, time_t value) +{ + //满了，删front + if (queue_is_full(user_id)) + { + de_fail_time_queue(user_id); + } + AUTH_RECORD.fail_time[AUTH_RECORD.rear] = value; + AUTH_RECORD.rear = (AUTH_RECORD.rear + 1) % AUTH_RECORD.max_size; + return; +} + +/* 认证失败后的处理 */ +static void auth_fail_operate(unsigned short user_id, time_t login_time, int config_fail_time) +{ + time_t time_from_front; //单位：秒 + + //AUTH_RECORD.fail_num++; + //计算当前时间到front下标下的时间段,添加当时失败时间到queueu + if (queue_is_empty(user_id)) + { + time_from_front = 0; + } + else + { + time_from_front = login_time - AUTH_RECORD.fail_time[AUTH_RECORD.front]; + } + en_fail_time_queue(user_id, login_time); + + //队列已经满，且时间小于配置的失败时间，锁定用户 + if (queue_is_full(user_id) && (time_from_front < (int)(60.0 * config_fail_time))) + { + //锁定用户，设置锁定时间 + AUTH_RECORD.lock_time = login_time; + } +} + +/* 查询json文件数据 */ +static void get_from_json(char *user_name, USERACCOUNT *user_info) +{ + FILE* f; + long len; //文件长度 + char* content; //文件内容 + cJSON* root, * user_body; + int array_size; //用户个数 + time_t time_begin = 0; + time_t time_end = 0; + + if (NULL == user_name) + { + user_info = NULL; + return; + } + + memset(user_info, 0, sizeof(USERACCOUNT)); + + f = fopen(JSON_URL, "rb"); + fseek(f, 0, SEEK_END); + len = ftell(f); + fseek(f, 0, SEEK_SET); + content = (char*)malloc(len + 1); + fread(content, 1, len, f); + fclose(f); + + root = cJSON_Parse(content); + if (!root) + { + printf("Error before: [%s]\n", cJSON_GetErrorPtr()); + } + + array_size = cJSON_GetArraySize(root); + + for (int i = 0; i < array_size; i++) + { + user_body = cJSON_GetArrayItem(root, i); + //获取用户名 + char* user_name_temp = cJSON_GetObjectItem(user_body, "user_name")->valuestring; + if (0 == strcmp(user_name, user_name_temp)) + { + /* 转存用户信息，返回 */ + user_info->ID = cJSON_GetObjectItem(user_body, "id")->valueint; + user_info->GID = cJSON_GetObjectItem(user_body, "group_id")->valueint; + user_info->multi_valid = cJSON_GetObjectItem(user_body, "multi_valid")->valueint; + + AUTH_STRING2TIME_T(cJSON_GetObjectItem(user_body, "valid_begin_time")->valuestring, time_begin); + AUTH_STRING2TIME_T(cJSON_GetObjectItem(user_body, "valid_end_time")->valuestring, time_end); + user_info->valid_begin_time = time_begin; + user_info->valid_end_time = time_end; + + strcpy(user_info->uname, cJSON_GetObjectItem(user_body, "user_name")->valuestring); + strcpy(user_info->passwd, cJSON_GetObjectItem(user_body, "password")->valuestring); + + xfree(content); + cJSON_Delete(root); + return; + } + } + + /* 未查到用户名，释放内存*/ + xfree(content); + cJSON_Delete(root); + user_info = NULL; +} + +/* 用户认证 */ +void user_auth_login(char* username, char* password, time_t login_time, USER_AUTH_RET *auth_result) +{ + unsigned short user_id, group_id; + int init_queue_ret; //初始化循环列表的结果 + int user_valid; //数据库中的数据 + int config_lock_time = 0; //锁定后的锁定时间，锁定后 + int config_fail_num = 0; //规定时间内允许失败的次数，锁定次数，锁定前 + int config_fail_time = 0; //规定时间，失败的时间范围，锁定前 + time_t remain_lock_time; //锁定剩余时间 + USERACCOUNT *user_info; //临时数据，存储登陆用户名对应的用户信息 + + memset(auth_result, 0, sizeof(USER_AUTH_RET)); + + //1、校验用户名和密码 + if (NULL == username || NULL == password || 0 == login_time) + { + auth_result->ret = AUTH_FAIL_INPUT; + return; + } + + //2、数据库查询配置数据 + /*if (false) + { + auth_result->ret = AUTH_FAIL_LACKINFO; + return auth_result; + }*/ + + config_lock_time = 2; + config_fail_num = 5; + config_fail_time = 40; + /* 校验上述的三个参数都要大于0 */ + + //3、根据用户名查询用户信息-用户id和用户组id + user_info = (USERACCOUNT*)malloc(sizeof(USERACCOUNT)); + if (NULL == user_info) + { + /* 记录日志 */ + printf("user_auth()->user_auth->user_info:error. \n"); + auth_result->ret = AUTH_ERR; + return; + } + //读取json文件获取数据 + get_from_json(username, user_info); + if (NULL == user_info) + { + auth_result->ret = AUTH_FAIL_PASSWD; + xfree(user_info); + return; + } + + user_id = user_info->ID; + group_id = user_info->GID; + + /* 数据库查询 */ + /* SELECT id，group_id FROM `user` WHERE user_name = ""; */ + + //4、初始化用户认证结果记录表对应id内的循环队列 + if (DATA_EMPTY == AUTH_RECORD.max_size) + { + g_config_lock_time = config_lock_time; + g_config_fail_time = config_fail_time; + g_config_fail_num = config_fail_num; + + init_queue_ret = init_fail_time_queue(user_id, config_fail_num + 1); + if (AUTH_INIT_FAIL == init_queue_ret) + { + auth_result->ret = AUTH_ERR; + xfree(user_info); + return; + } + } + + /* 如果用户锁定的配置数据发生修改 */ + if (g_config_lock_time != config_lock_time || + g_config_fail_time != config_fail_time || g_config_fail_num != config_fail_num) + { + xfree(AUTH_RECORD.fail_time); + g_config_lock_time = config_lock_time; + g_config_fail_time = config_fail_time; + g_config_fail_num = config_fail_num; + + init_queue_ret = init_fail_time_queue(user_id, config_fail_num + 1); + if (AUTH_INIT_FAIL == init_queue_ret) + { + auth_result->ret = AUTH_ERR; + xfree(user_info); + return; + } + empty_fail_time_queue(user_id); + } + + //5、判断用户是否锁定 + if (NOT_LOCK != AUTH_RECORD.lock_time)//锁定 + { + remain_lock_time = login_time - AUTH_RECORD.lock_time; + if (remain_lock_time < 0) + { + auth_result->ret = AUTH_FAIL_INPUT; + xfree(user_info); + return; + } + if ((int)(60.0 * config_lock_time) > 60 *remain_lock_time) + { + auth_result->ret = AUTH_FAIL_LOCK; + auth_result->remain_lock_time = remain_lock_time; + xfree(user_info); + return; + } + //锁定时间已过,解锁，清空该队列 + empty_fail_time_queue(user_id); + } + + //6、判断是否在有效期内 + user_valid = AUTH_VALID_GET(user_info->multi_valid); + if (1 == user_valid) + { + if (login_time < user_info->valid_begin_time || login_time > user_info->valid_end_time) + { + auth_result->ret = AUTH_FAIL_VALID; + /* 认证失败处理 */ + auth_fail_operate(user_id, login_time, config_fail_time); + xfree(user_info); + return; + } + } + + //7、判断在线用户是否到最大值 + if (AUTH_USER_INDEX_MAX - 2 <= AUTH_RECORD.online_num) + { + auth_result->ret = AUTH_FAIL_OVER; + + /* 认证失败处理 */ + auth_fail_operate(user_id, login_time, config_fail_time); + xfree(user_info); + return; + } + + //8、匹配密码 + if (0 != strcmp(password, user_info->passwd)) + { + auth_result->ret = AUTH_FAIL_PASSWD; + + /* 认证失败处理 */ + auth_fail_operate(user_id, login_time, config_fail_time); + xfree(user_info); + return; + } + + //9、认证成功处理 + empty_fail_time_queue(user_id); + AUTH_RECORD.online_num++; + auth_result->ret = AUTH_SUCCESS; + auth_result->user_id = user_id; + auth_result->group_id = group_id; + xfree(user_info); + return; +} + +/* 用户下线数-1 */ +void reduce_online_num(unsigned short user_id) +{ + if(AUTH_RECORD.online_num > 0) + { + AUTH_RECORD.online_num--; + } +} \ No newline at end of file diff --git a/Product/user/user_manager/usermanager-auth/user_auth.h b/Product/user/user_manager/usermanager-auth/user_auth.h new file mode 100644 index 000000000..257821677 --- /dev/null +++ b/Product/user/user_manager/usermanager-auth/user_auth.h @@ -0,0 +1,58 @@ +#ifndef USER_AUTH_ +#define USER_AUTH_ + +#include + +typedef enum { + AUTH_SUCCESS = 0, + AUTH_FAIL_PASSWD = 1, + AUTH_FAIL_VALID = 2, + AUTH_FAIL_MULTI = 3, + AUTH_FAIL_LOCK = 4, + AUTH_FAIL_LACKINFO = 5, + AUTH_FAIL_INPUT = 6, + AUTH_FAIL_OVER = 7, + AUTH_ERR = 8, + +} auth_ret; + +#define USER_AUTH_RET_ERROR_DISC \ +{ \ + { AUTH_SUCCESS, "SUCCESS" },\ + { AUTH_FAIL_PASSWD, "ErrorUsernameOrPasswd" },\ + { AUTH_FAIL_VALID, "NotInValidTime" },\ + { AUTH_FAIL_MULTI, "OutMaxOnlineNum" },\ + { AUTH_FAIL_LOCK, "UserIsLocked" },\ + { AUTH_FAIL_LACKINFO, "LackConfigInfo" },\ + { AUTH_FAIL_INPUT, "InputError"},\ + { AUTH_FAIL_OVER, "OverMaxOnlineNum"},\ + { AUTH_ERR, "OtherErr"}\ +} + +typedef struct user_auth_list +{ + time_t* fail_time; //循环队列存储认证失败时间点 + int front; //循环队列头 + int rear; //循环队列尾 + int max_size; //循环队列的最大存储空间，锁定次数+1（config_fail_num + 1） + + unsigned int online_num; //用户上线数量 + time_t lock_time; //用户锁定时间 + //unsigned int fail_num; //用户认证失败次数 +} USER_AUTH_LIST; + +typedef struct user_auth_ret +{ + auth_ret ret; + unsigned short user_id; + unsigned short group_id; + time_t remain_lock_time; +} USER_AUTH_RET; + +/* 用户认证 */ +void user_auth_login(char* username, char* password, time_t login_time, USER_AUTH_RET* auth_result); + +/* 用户下线数-1 */ +void reduce_online_num(unsigned short user_id); + +#endif \ No newline at end of file diff --git a/Product/user/user_manager/usermanager-auth/user_json.json b/Product/user/user_manager/usermanager-auth/user_json.json new file mode 100644 index 000000000..949277ea9 --- /dev/null +++ b/Product/user/user_manager/usermanager-auth/user_json.json @@ -0,0 +1,46 @@ +[ + { + "uid": 1, + "id": 1, + "group_id": 2, + "user_name": "用户01", + "udescription": "", + "password": "123456", + "multi_valid": 3, + "valid_begin_time": "2013-07-04 15:04:23", + "valid_end_time": "2020-07-04 15:04:23" + }, + { + "uid": 2, + "id": 2, + "group_id": 1, + "user_name": "用户02", + "udescription": "", + "password": "123456", + "multi_valid": 0, + "valid_begin_time": "", + "valid_end_time": "" + }, + { + "uid": 3, + "id": 3, + "group_id": 2, + "user_name": "用户03", + "udescription": "", + "password": "123456", + "multi_valid": 1, + "valid_begin_time": "", + "valid_end_time": "" + }, + { + "uid": 4, + "id": 2, + "group_id": 1, + "user_name": "用户05", + "udescription": "", + "password": "zhelishidenglumima", + "multi_valid": 0, + "valid_begin_time": "", + "valid_end_time": "" + } + ] \ No newline at end of file diff --git a/Product/user/user_manager/usermanager-test/test_usermanager.c b/Product/user/user_manager/usermanager-test/test_usermanager.c index bc144408d..84675fdaf 100644 --- a/Product/user/user_manager/usermanager-test/test_usermanager.c +++ b/Product/user/user_manager/usermanager-test/test_usermanager.c @@ -9,7 +9,7 @@ #include "user.h" #include "user_account_config.h" #include "user_group_config.h" - +#include "../usermanager-auth/user_auth.h" @@ -428,53 +428,49 @@ int main(void) printf("*******************************************************************************\n"); UCHAR_FREE(output5); - // USER_AUTH_RET* aret; - // aret = (USER_AUTH_RET*)malloc(sizeof(USER_AUTH_RET)); - // if (NULL == aret) - // { - // printf("111111111111"); - // } - // time_t t1 = time(NULL); + USER_AUTH_RET* aret; + aret = (USER_AUTH_RET*)malloc(sizeof(USER_AUTH_RET)); + if (NULL == aret) + { + printf("111111111111"); + } + time_t t1 = time(NULL); - // aret = user_auth("用户05", "zhelishidenglumima", t1, aret); - // printf("%d,%d,%d\n", aret->ret, aret->user_id, aret->group_id); + user_auth_login("用户05", "zhelishidenglumima", t1, aret); + printf("%d,%d,%d\n", aret->ret, aret->user_id, aret->group_id); - // Sleep(1000); - // t1 = time(NULL); - // aret = user_auth("用户05", "zhelishidenglumima", t1, aret); - // printf("%d,%d,%d\n", aret->ret, aret->user_id, aret->group_id); + sleep(1); + t1 = time(NULL); + user_auth_login("用户05", "zhelishidenglumima", t1, aret); + printf("%d,%d,%d\n", aret->ret, aret->user_id, aret->group_id); - // Sleep(1000); - // t1 = time(NULL); - // aret = user_auth("用户05", "zhelishidenglumima", t1, aret); - // printf("%d,%d,%d\n",aret->ret,aret->user_id,aret->group_id); + sleep(1); + t1 = time(NULL); + user_auth_login("用户05", "zhelishidenglumima", t1, aret); + printf("%d,%d,%d\n",aret->ret,aret->user_id,aret->group_id); - // Sleep(1000); - // t1 = time(NULL); - // aret = user_auth("用户05", "zhelishidenglumima", t1, aret); - // printf("%d,%d,%d\n", aret->ret, aret->user_id, aret->group_id); + sleep(1); + t1 = time(NULL); + user_auth_login("用户05", "zhelishidenglumima", t1, aret); + printf("%d,%d,%d\n", aret->ret, aret->user_id, aret->group_id); - // Sleep(1000); - // t1 = time(NULL); - // aret = user_auth("用户05", "zhelishidenglumima", t1, aret); - // printf("%d,%d,%d\n", aret->ret, aret->user_id, aret->group_id); + sleep(1); + t1 = time(NULL); + user_auth_login("用户05", "zhelishidenglumima", t1, aret); + printf("%d,%d,%d\n", aret->ret, aret->user_id, aret->group_id); - // Sleep(1000); - // t1 = time(NULL); - // aret = user_auth("用户05", "zhelishidenglumima", t1, aret); - // printf("%d,%d,%d\n", aret->ret, aret->user_id, aret->group_id); + sleep(1); + t1 = time(NULL); + user_auth_login("用户05", "zhelishidenglumima", t1, aret); + printf("%d,%d,%d\n", aret->ret, aret->user_id, aret->group_id); - // mod_user_line("用户05", 6, "2020-03-03 15:04:23"); - // Sleep(4000); - // t1 = time(NULL); - // aret = user_auth("用户05", "zhelishidenglumima", t1, aret); - // printf("%d,%d,%d\n", aret->ret, aret->user_id, aret->group_id); + mod_user_line("用户05", 6, "2020-03-03 15:04:23"); + sleep(4); + t1 = time(NULL); + user_auth_login("用户05", "zhelishidenglumima", t1, aret); + printf("%d,%d,%d\n", aret->ret, aret->user_id, aret->group_id); - ///extern USER_AUTH_LIST g_user_auth_ret_table[USER_INDEX_MAX]; - - //printf("%lld,%lld,%lld",g_user_auth_ret_table[3].fail_time[0], g_user_auth_ret_table[3].fail_time[1], g_user_auth_ret_table[3].fail_time[2]); - return 0;