fix: pass->password

Author: gc87

plugins/restful/normal_handle.c

@@ -218,18 +218,6 @@ void handle_update_user(nng_aio *aio)
                 return;
             }
 
-            // old password length check
-            int old_pass_len = strlen(req->old_pass);
-            if (old_pass_len < NEU_USER_PASSWORD_MIN_LEN ||
-                old_pass_len > NEU_USER_PASSWORD_MAX_LEN) {
-                nlog_error("user `%s` old password too short or too long",
-                           req->name);
-                NEU_JSON_RESPONSE_ERROR(NEU_ERR_INVALID_PASSWORD_LEN, {
-                    neu_http_response(aio, error_code.error, result_error);
-                });
-                return;
-            }
-
             // only admin & current user can update user
             if (0 != strcmp(req->name, "admin") &&
                 0 != strcmp(req->name, current_user)) {
@@ -250,17 +238,6 @@ void handle_update_user(nng_aio *aio)
                 return;
             }
 
-            // check old password
-            if (!neu_user_check_password(user, req->old_pass)) {
-                nlog_error("user `%s` old password check fail", req->name);
-                NEU_JSON_RESPONSE_ERROR(NEU_ERR_INVALID_USER_OR_PASSWORD, {
-                    neu_http_response(aio, error_code.error, result_error);
-                });
-
-                neu_user_free(user);
-                return;
-            }
-
             // update user password
             int rv = neu_user_update_password(user, req->new_pass);
             if (0 != rv) {

src/parser/neu_json_login.c

@@ -143,7 +143,7 @@ int neu_json_decode_add_user_req(char *buf, neu_json_add_user_req_t **result)
             .t    = NEU_JSON_STR,
         },
         {
-            .name = "pass",
+            .name = "password",
             .t    = NEU_JSON_STR,
         },
 
@@ -175,12 +175,41 @@ void neu_json_decode_add_user_req_free(neu_json_add_user_req_t *req)
 
 int neu_json_decode_update_user_req(char *buf, neu_json_password_req_t **result)
 {
-    return neu_json_decode_password_req(buf, result);
+    int                      ret = 0;
+    neu_json_password_req_t *req = calloc(1, sizeof(neu_json_password_req_t));
+    neu_json_elem_t          req_elems[] = {
+        {
+            .name = "name",
+            .t    = NEU_JSON_STR,
+        },
+        {
+            .name = "new_password",
+            .t    = NEU_JSON_STR,
+        },
+    };
+    ret = neu_json_decode(buf, NEU_JSON_ELEM_SIZE(req_elems), req_elems);
+    if (ret != 0) {
+        goto decode_fail;
+    }
+
+    req->name     = req_elems[0].v.val_str;
+    req->new_pass = req_elems[1].v.val_str;
+
+    *result = req;
+    return ret;
+
+decode_fail:
+    free(req);
+    return -1;
 }
 
 void neu_json_decode_update_user_req_free(neu_json_password_req_t *req)
 {
-    neu_json_decode_password_req_free(req);
+    if (req) {
+        free(req->name);
+        free(req->new_pass);
+        free(req);
+    }
 }
 
 int neu_json_decode_delete_user_req(char *                       buf,