重构管理员密码处理逻辑,添加权限管理功能,优化表单处理
This commit is contained in:
parent
214c87c6b4
commit
5c380331ba
@ -24,11 +24,11 @@ extern "C"
|
|||||||
|
|
||||||
int set_user_permission(const char* user_id, int permission);
|
int set_user_permission(const char* user_id, int permission);
|
||||||
|
|
||||||
int set_admin_password_hash(const char* hash);
|
int set_admin_password(const char* password);
|
||||||
|
|
||||||
int admin_login(const char* password, int* result);
|
int admin_login(const char* password, int* result);
|
||||||
|
|
||||||
int has_admin_password_hash(int* result);
|
int has_admin_password(int* result);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#include "server/auth.h"
|
#include "server/auth.h"
|
||||||
#include "server/response.h"
|
#include "server/response.h"
|
||||||
|
#include "server/types.h"
|
||||||
#include "server/util.h"
|
#include "server/util.h"
|
||||||
|
|
||||||
#include "db/auth.h"
|
#include "db/auth.h"
|
||||||
@ -16,12 +17,24 @@
|
|||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
char* action;
|
||||||
char* password;
|
char* password;
|
||||||
|
char* token;
|
||||||
|
char* user_id;
|
||||||
|
char* raw_passwd;
|
||||||
|
char* new_passwd;
|
||||||
|
char* permission;
|
||||||
} admin_form_t;
|
} admin_form_t;
|
||||||
|
|
||||||
static void admin_form_dtor(admin_form_t* form)
|
static void admin_form_dtor(admin_form_t* form)
|
||||||
{
|
{
|
||||||
|
if (form->action) free(form->action);
|
||||||
if (form->password) free(form->password);
|
if (form->password) free(form->password);
|
||||||
|
if (form->token) free(form->token);
|
||||||
|
if (form->user_id) free(form->user_id);
|
||||||
|
if (form->raw_passwd) free(form->raw_passwd);
|
||||||
|
if (form->new_passwd) free(form->new_passwd);
|
||||||
|
if (form->permission) free(form->permission);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int field_found(const char* key, const char* filename, char* path, size_t pathlen, void* user_data)
|
static int field_found(const char* key, const char* filename, char* path, size_t pathlen, void* user_data)
|
||||||
@ -32,13 +45,117 @@ static int field_found(const char* key, const char* filename, char* path, size_t
|
|||||||
static int field_get(const char* key, const char* value, size_t valuelen, void* user_data)
|
static int field_get(const char* key, const char* value, size_t valuelen, void* user_data)
|
||||||
{
|
{
|
||||||
admin_form_t* form = (admin_form_t*)user_data;
|
admin_form_t* form = (admin_form_t*)user_data;
|
||||||
if (strcmp(key, "password") == 0) {
|
if (strcmp(key, "action") == 0) {
|
||||||
|
form->action = kqm_strndup(value, valuelen);
|
||||||
|
} else if (strcmp(key, "password") == 0) {
|
||||||
form->password = kqm_strndup(value, valuelen);
|
form->password = kqm_strndup(value, valuelen);
|
||||||
return MG_FORM_FIELD_HANDLE_ABORT;
|
} else if (strcmp(key, "token") == 0) {
|
||||||
|
form->token = kqm_strndup(value, valuelen);
|
||||||
|
} else if (strcmp(key, "user_id") == 0) {
|
||||||
|
form->user_id = kqm_strndup(value, valuelen);
|
||||||
|
} else if (strcmp(key, "raw_passwd") == 0) {
|
||||||
|
form->raw_passwd = kqm_strndup(value, valuelen);
|
||||||
|
} else if (strcmp(key, "permission") == 0) {
|
||||||
|
form->permission = kqm_strndup(value, valuelen);
|
||||||
}
|
}
|
||||||
return MG_FORM_FIELD_HANDLE_GET;
|
return MG_FORM_FIELD_HANDLE_GET;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void impl_login(mg_connection* conn, admin_form_t* form)
|
||||||
|
{
|
||||||
|
if (!form->password) {
|
||||||
|
res_need_password(conn);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int result;
|
||||||
|
int flag = admin_login(form->password, &result);
|
||||||
|
if (!flag) {
|
||||||
|
res_login_fail(conn);
|
||||||
|
} else if (!result) {
|
||||||
|
res_incorrect(conn);
|
||||||
|
} else {
|
||||||
|
if (admin_session) free(admin_session);
|
||||||
|
admin_session = kqm_random_password(32);
|
||||||
|
res_login(conn, admin_session);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void impl_repasswd(mg_connection* conn, admin_form_t* form)
|
||||||
|
{
|
||||||
|
if (!form->raw_passwd || !form->new_passwd) {
|
||||||
|
res_need_password(conn);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int result;
|
||||||
|
if (!admin_login(form->password, &result)) {
|
||||||
|
res_auth_fail(conn);
|
||||||
|
} else if (!result) {
|
||||||
|
res_incorrect(conn);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!set_admin_password(form->new_passwd)) {
|
||||||
|
res_repasswd_fail(conn);
|
||||||
|
} else {
|
||||||
|
res_repasswd(conn);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void impl_repasswd2(mg_connection* conn, admin_form_t* form)
|
||||||
|
{
|
||||||
|
if (!form->user_id) {
|
||||||
|
res_need_user_id(conn);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!form->new_passwd) {
|
||||||
|
res_need_password(conn);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int flag = set_user_password(form->user_id, form->new_passwd);
|
||||||
|
if (!flag) {
|
||||||
|
res_repasswd_fail(conn);
|
||||||
|
} else {
|
||||||
|
res_repasswd(conn);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void impl_permission(mg_connection* conn, admin_form_t* form)
|
||||||
|
{
|
||||||
|
if (!form->user_id) {
|
||||||
|
res_need_user_id(conn);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!form->permission) {
|
||||||
|
res_need_xxx(conn, "permission");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int flag = set_user_permission(form->user_id, atoi(form->permission));
|
||||||
|
if (!flag) {
|
||||||
|
res_repermission_fail(conn);
|
||||||
|
} else {
|
||||||
|
res_repermission(conn);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void impl_delete(mg_connection* conn, admin_form_t* form)
|
||||||
|
{
|
||||||
|
if (!form->user_id) {
|
||||||
|
res_need_user_id(conn);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int flag = delete_user(form->user_id);
|
||||||
|
if (!flag) {
|
||||||
|
res_delete_account_fail(conn);
|
||||||
|
} else {
|
||||||
|
res_delete_account(conn);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
int admin_handler(mg_connection* conn, void* cbdata)
|
int admin_handler(mg_connection* conn, void* cbdata)
|
||||||
{
|
{
|
||||||
const mg_request_info* post_body = mg_get_request_info(conn);
|
const mg_request_info* post_body = mg_get_request_info(conn);
|
||||||
@ -53,7 +170,7 @@ int admin_handler(mg_connection* conn, void* cbdata)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
admin_form_t form = {NULL};
|
admin_form_t form = {NULL, NULL, NULL, NULL, NULL, NULL, NULL};
|
||||||
|
|
||||||
mg_form_data_handler admin_callback = {
|
mg_form_data_handler admin_callback = {
|
||||||
.field_found = field_found,
|
.field_found = field_found,
|
||||||
@ -64,22 +181,31 @@ int admin_handler(mg_connection* conn, void* cbdata)
|
|||||||
|
|
||||||
mg_handle_form_request(conn, &admin_callback);
|
mg_handle_form_request(conn, &admin_callback);
|
||||||
|
|
||||||
if (!form.password) {
|
if (!strcmp(form.action, "login")) {
|
||||||
res_need_password(conn);
|
form.token = strdup("");
|
||||||
admin_form_dtor(&form);
|
admin_session = strdup("");
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int result;
|
if (!form.action) {
|
||||||
int flag = admin_login(form.password, &result);
|
res_need_action(conn);
|
||||||
if (!flag) {
|
} else if (!form.token) {
|
||||||
res_login_fail(conn);
|
res_need_token(conn);
|
||||||
} else if (!result) {
|
} else if (!admin_session || strcmp(form.token, admin_session)) {
|
||||||
res_incorrect(conn);
|
res_permission_denied(conn);
|
||||||
} else {
|
} else {
|
||||||
if (admin_session) free(admin_session);
|
if (!strcmp(form.action, "login")) {
|
||||||
admin_session = kqm_random_password(16);
|
impl_login(conn, &form);
|
||||||
res_login(conn, admin_session);
|
} else if (!strcmp(form.action, "repasswd")) {
|
||||||
|
impl_repasswd(conn, &form);
|
||||||
|
} else if (!strcmp(form.action, "repasswd2")) {
|
||||||
|
impl_repasswd2(conn, &form);
|
||||||
|
} else if (!strcmp(form.action, "permission")) {
|
||||||
|
impl_permission(conn, &form);
|
||||||
|
} else if (!strcmp(form.action, "delete")) {
|
||||||
|
impl_delete(conn, &form);
|
||||||
|
} else {
|
||||||
|
res_bad_action(conn);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
admin_form_dtor(&form);
|
admin_form_dtor(&form);
|
||||||
|
83
src/server/auth/permission.c
Normal file
83
src/server/auth/permission.c
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
#include "server/auth.h"
|
||||||
|
#include "server/response.h"
|
||||||
|
#include "server/util.h"
|
||||||
|
|
||||||
|
#include "db/auth.h"
|
||||||
|
|
||||||
|
#include "jwt/jwt.h"
|
||||||
|
|
||||||
|
#include <civetweb.h>
|
||||||
|
|
||||||
|
#include <cjson/cJSON.h>
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
char* user_id;
|
||||||
|
} permission_form_t;
|
||||||
|
|
||||||
|
static void permission_form_dtor(permission_form_t* form)
|
||||||
|
{
|
||||||
|
if (form->user_id) free(form->user_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int field_found(const char* key, const char* filename, char* path, size_t pathlen, void* user_data)
|
||||||
|
{
|
||||||
|
return MG_FORM_FIELD_HANDLE_GET;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int field_get(const char* key, const char* value, size_t valuelen, void* user_data)
|
||||||
|
{
|
||||||
|
permission_form_t* form = (permission_form_t*)user_data;
|
||||||
|
if (strcmp(key, "user_id") == 0) {
|
||||||
|
form->user_id = kqm_strndup(value, valuelen);
|
||||||
|
return MG_FORM_FIELD_HANDLE_ABORT;
|
||||||
|
}
|
||||||
|
return MG_FORM_FIELD_HANDLE_GET;
|
||||||
|
}
|
||||||
|
|
||||||
|
int user_permission_handler(mg_connection* conn, void* cbdata)
|
||||||
|
{
|
||||||
|
const mg_request_info* post_body = mg_get_request_info(conn);
|
||||||
|
|
||||||
|
if (post_body == NULL) {
|
||||||
|
res_null_req(conn);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (strcmp(post_body->request_method, "POST")) {
|
||||||
|
res_must_post(conn);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
permission_form_t form = {NULL};
|
||||||
|
|
||||||
|
mg_form_data_handler permission_callback = {
|
||||||
|
.field_found = field_found,
|
||||||
|
.field_get = field_get,
|
||||||
|
.field_store = NULL,
|
||||||
|
.user_data = &form,
|
||||||
|
};
|
||||||
|
|
||||||
|
mg_handle_form_request(conn, &permission_callback);
|
||||||
|
|
||||||
|
if (!form.user_id) {
|
||||||
|
res_need_user_id(conn);
|
||||||
|
permission_form_dtor(&form);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
int perm;
|
||||||
|
int flag = get_user_permission(form.user_id, &perm);
|
||||||
|
if (!flag) {
|
||||||
|
res_check_permission_fail(conn);
|
||||||
|
} else {
|
||||||
|
res_permission(conn, perm);
|
||||||
|
}
|
||||||
|
|
||||||
|
permission_form_dtor(&form);
|
||||||
|
return 1;
|
||||||
|
}
|
@ -27,6 +27,8 @@ static void repasswd_form_dtor(repasswd_form_t* form)
|
|||||||
{
|
{
|
||||||
if (form->token) free(form->token);
|
if (form->token) free(form->token);
|
||||||
if (form->user_id) free(form->user_id);
|
if (form->user_id) free(form->user_id);
|
||||||
|
if (form->raw_passwd) free(form->raw_passwd);
|
||||||
|
if (form->new_passwd) free(form->new_passwd);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int field_found(const char* key, const char* filename, char* path, size_t pathlen, void* user_data)
|
static int field_found(const char* key, const char* filename, char* path, size_t pathlen, void* user_data)
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
<v-card-text class="text-center">
|
<v-card-text class="text-center">
|
||||||
<a class="text-red text-decoration-none"
|
<a class="text-red text-decoration-none"
|
||||||
@click="dialog('忘记密码', '请联系老师重置密码。')">
|
@click="dialog('忘记密码', '请联系老师或管理员重置密码。')">
|
||||||
忘记密码<v-icon icon="mdi-chevron-right"></v-icon>
|
忘记密码<v-icon icon="mdi-chevron-right"></v-icon>
|
||||||
</a>
|
</a>
|
||||||
</v-card-text>
|
</v-card-text>
|
||||||
|
Loading…
Reference in New Issue
Block a user