feat(user): add user creation endpoint for superusers
- Add new `/userMgr/create` endpoint for superusers to create users with specified types - Update AddUser function to accept user type parameter - Add documentation for the new endpoint in api.md - Remove debug log comment in auth.go
This commit is contained in:
@@ -117,7 +117,6 @@ func extractUserIDFromToken(token string) (int, error) {
|
|||||||
defer tokenMux.RUnlock()
|
defer tokenMux.RUnlock()
|
||||||
for userID, tokenInfo := range tokenMap {
|
for userID, tokenInfo := range tokenMap {
|
||||||
if tokenInfo.Token == token {
|
if tokenInfo.Token == token {
|
||||||
// postLog.Debug(fmt.Sprintf("[extractUserIDFromToken] Extracted userID %d from token: %s", userID, token))
|
|
||||||
return userID, nil
|
return userID, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
Binary file not shown.
+3
-3
@@ -43,8 +43,8 @@ func isValidInput(input string) bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
func AddUser(username, passwd string) (int, error) { // New user registration with default type "visitor"
|
func AddUser(username, passwd, userType string) (int, error) { // New user registration with specified type
|
||||||
if !isValidInput(username) || !isValidInput(passwd) {
|
if !isValidInput(username) || !isValidInput(passwd) || !isValidInput(userType) {
|
||||||
return 0, errors.New("invalid input: contains illegal characters")
|
return 0, errors.New("invalid input: contains illegal characters")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@ func AddUser(username, passwd string) (int, error) { // New user registration wi
|
|||||||
}
|
}
|
||||||
|
|
||||||
result, err := db.Exec("INSERT INTO userLogin (username, passwd, type) VALUES (?, ?, ?)",
|
result, err := db.Exec("INSERT INTO userLogin (username, passwd, type) VALUES (?, ?, ?)",
|
||||||
username, hashedPasswd, "visitor")
|
username, hashedPasswd, userType)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if strings.Contains(err.Error(), "UNIQUE constraint failed") {
|
if strings.Contains(err.Error(), "UNIQUE constraint failed") {
|
||||||
return 0, errors.New("username already exists")
|
return 0, errors.New("username already exists")
|
||||||
|
|||||||
+47
@@ -33,6 +33,7 @@ All API responses are returned in JSON format:
|
|||||||
**Endpoint:** `/register`
|
**Endpoint:** `/register`
|
||||||
**Method:** POST
|
**Method:** POST
|
||||||
**Content-Type:** application/json
|
**Content-Type:** application/json
|
||||||
|
**Permission Level:** None
|
||||||
|
|
||||||
**Request Headers:**
|
**Request Headers:**
|
||||||
```
|
```
|
||||||
@@ -78,6 +79,7 @@ X-Timestamp: 1704067200000
|
|||||||
**Endpoint:** `/login`
|
**Endpoint:** `/login`
|
||||||
**Method:** POST
|
**Method:** POST
|
||||||
**Content-Type:** application/json
|
**Content-Type:** application/json
|
||||||
|
**Permission Level:** None
|
||||||
|
|
||||||
**Request Headers:**
|
**Request Headers:**
|
||||||
```
|
```
|
||||||
@@ -122,6 +124,7 @@ X-Timestamp: 1704067200000
|
|||||||
**Endpoint:** `/logout`
|
**Endpoint:** `/logout`
|
||||||
**Method:** GET
|
**Method:** GET
|
||||||
**Auth Required:** Yes (token)
|
**Auth Required:** Yes (token)
|
||||||
|
**Permission Level:** None
|
||||||
|
|
||||||
**Request Headers:**
|
**Request Headers:**
|
||||||
```
|
```
|
||||||
@@ -143,12 +146,51 @@ X-Timestamp: 1704067200000
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## Create User
|
||||||
|
|
||||||
|
**Endpoint**: `/userMgr/create`
|
||||||
|
**Method**: POST
|
||||||
|
**Content-Type**: application/json
|
||||||
|
**Auth Required**: Yes (token)
|
||||||
|
**Permission Level**: Superuser
|
||||||
|
|
||||||
|
**Request Headers**:
|
||||||
|
```
|
||||||
|
X-Token: your_token
|
||||||
|
X-Timestamp: 1704067200000
|
||||||
|
```
|
||||||
|
|
||||||
|
**Request Body**:
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"username": "new_user",
|
||||||
|
"passwd": "NewPass123!",
|
||||||
|
"type": "admin"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Response**:
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"success": true,
|
||||||
|
"message": "user created successfully",
|
||||||
|
"data": {
|
||||||
|
"userID": 2,
|
||||||
|
"username": "new_user",
|
||||||
|
"type": "admin"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Create frpc Instance
|
## Create frpc Instance
|
||||||
|
|
||||||
**Endpoint:** `/frpcAct/instanceMgr/create`
|
**Endpoint:** `/frpcAct/instanceMgr/create`
|
||||||
**Method:** POST
|
**Method:** POST
|
||||||
**Content-Type:** application/json
|
**Content-Type:** application/json
|
||||||
**Auth Required:** Yes (token)
|
**Auth Required:** Yes (token)
|
||||||
|
**Permission Level:** Admin
|
||||||
|
|
||||||
**Request Headers:**
|
**Request Headers:**
|
||||||
```
|
```
|
||||||
@@ -209,6 +251,7 @@ X-Timestamp: 1704067200000
|
|||||||
**Method:** POST
|
**Method:** POST
|
||||||
**Content-Type:** application/json
|
**Content-Type:** application/json
|
||||||
**Auth Required:** Yes (token)
|
**Auth Required:** Yes (token)
|
||||||
|
**Permission Level:** Admin
|
||||||
|
|
||||||
**Request Headers:**
|
**Request Headers:**
|
||||||
```
|
```
|
||||||
@@ -242,6 +285,7 @@ X-Timestamp: 1704067200000
|
|||||||
**Method:** POST
|
**Method:** POST
|
||||||
**Content-Type:** application/json
|
**Content-Type:** application/json
|
||||||
**Auth Required:** Yes (token)
|
**Auth Required:** Yes (token)
|
||||||
|
**Permission Level:** Admin
|
||||||
|
|
||||||
Modify instance configuration. Supports two modification types: `configFile` (modify frpc config file) and `systemConfig` (modify system-level settings).
|
Modify instance configuration. Supports two modification types: `configFile` (modify frpc config file) and `systemConfig` (modify system-level settings).
|
||||||
|
|
||||||
@@ -366,6 +410,9 @@ Modify system-level settings such as instance name, boot-at-start configuration,
|
|||||||
**Endpoint:** `/frpcAct/instanceMgr/list`
|
**Endpoint:** `/frpcAct/instanceMgr/list`
|
||||||
**Method:** GET
|
**Method:** GET
|
||||||
**Auth Required:** Yes (token)
|
**Auth Required:** Yes (token)
|
||||||
|
**Permission Level:** Admin
|
||||||
|
|
||||||
|
Retrieve a list of all frpc instances.
|
||||||
|
|
||||||
**Request Headers:**
|
**Request Headers:**
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ func setupRoutes() {
|
|||||||
http.HandleFunc("/login", LoginHandler)
|
http.HandleFunc("/login", LoginHandler)
|
||||||
http.HandleFunc("/logout", LogoutHandler)
|
http.HandleFunc("/logout", LogoutHandler)
|
||||||
|
|
||||||
|
http.HandleFunc("/userMgr/create", CreateUserHandler)
|
||||||
|
|
||||||
http.HandleFunc("/frpcAct/instanceMgr/create", CreateInstanceHandler)
|
http.HandleFunc("/frpcAct/instanceMgr/create", CreateInstanceHandler)
|
||||||
http.HandleFunc("/frpcAct/instanceMgr/list", ListInstancesHandler)
|
http.HandleFunc("/frpcAct/instanceMgr/list", ListInstancesHandler)
|
||||||
|
|
||||||
|
|||||||
+84
-1
@@ -18,6 +18,12 @@ type LoginRequest struct {
|
|||||||
Passwd string `json:"passwd"`
|
Passwd string `json:"passwd"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type CreateUserRequest struct {
|
||||||
|
Username string `json:"username"`
|
||||||
|
Passwd string `json:"passwd"`
|
||||||
|
Type string `json:"type"`
|
||||||
|
}
|
||||||
|
|
||||||
func RegisterHandler(w http.ResponseWriter, r *http.Request) {
|
func RegisterHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
if r.Method != http.MethodPost {
|
if r.Method != http.MethodPost {
|
||||||
SendErrorResponse(w, http.StatusMethodNotAllowed, "Invalid request method")
|
SendErrorResponse(w, http.StatusMethodNotAllowed, "Invalid request method")
|
||||||
@@ -64,7 +70,7 @@ func RegisterHandler(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
userID, err := AddUser(req.Username, req.Passwd)
|
userID, err := AddUser(req.Username, req.Passwd, "visitor")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
SendErrorResponse(w, http.StatusInternalServerError, err.Error())
|
SendErrorResponse(w, http.StatusInternalServerError, err.Error())
|
||||||
postLog.Error(fmt.Sprintf("[RegisterHandler] Failed to register user \"%s\": %v", req.Username, err))
|
postLog.Error(fmt.Sprintf("[RegisterHandler] Failed to register user \"%s\": %v", req.Username, err))
|
||||||
@@ -188,3 +194,80 @@ func LogoutHandler(w http.ResponseWriter, r *http.Request) {
|
|||||||
SendSuccessResponse(w, "Logout successful", nil)
|
SendSuccessResponse(w, "Logout successful", nil)
|
||||||
postLog.Info(fmt.Sprintf("[LogoutHandler] User [%d]%s Logout successful", userID, GetUsernameByID(userID)))
|
postLog.Info(fmt.Sprintf("[LogoutHandler] User [%d]%s Logout successful", userID, GetUsernameByID(userID)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func CreateUserHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.Method != http.MethodPost {
|
||||||
|
SendErrorResponse(w, http.StatusMethodNotAllowed, "Invalid request method")
|
||||||
|
postLog.Warning(fmt.Sprintf("[CreateUserHandler] Invalid request method: %s", r.Method))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !ValidateTimeStamp(r.Header) {
|
||||||
|
SendErrorResponse(w, http.StatusBadRequest, "Invalid or missing X-Timestamp in header")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
userID, err := extractUserIDFromToken(r.Header.Get("X-Token"))
|
||||||
|
if err != nil {
|
||||||
|
SendErrorResponse(w, http.StatusUnauthorized, "Invalid or missing token")
|
||||||
|
postLog.Warning(fmt.Sprintf("[CreateUserHandler] Invalid or missing token: %v", err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
user, err := GetUserByID(userID)
|
||||||
|
if err != nil {
|
||||||
|
SendErrorResponse(w, http.StatusInternalServerError, "Failed to get user info")
|
||||||
|
postLog.Error(fmt.Sprintf("[CreateUserHandler] Failed to get user info for user [%d]%s: %v", userID, GetUsernameByID(userID), err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if user.Type != "superuser" {
|
||||||
|
SendErrorResponse(w, http.StatusForbidden, "Permission denied")
|
||||||
|
postLog.Warning(fmt.Sprintf("[CreateUserHandler] Permission denied: non-superuser token for user [%d]%s", userID, GetUsernameByID(userID)))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
body, err := io.ReadAll(r.Body)
|
||||||
|
if err != nil {
|
||||||
|
SendErrorResponse(w, http.StatusBadRequest, "Failed to read request body")
|
||||||
|
postLog.Warning(fmt.Sprintf("[CreateUserHandler] Failed to read request body: %v", err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer r.Body.Close()
|
||||||
|
|
||||||
|
var req CreateUserRequest
|
||||||
|
if err := json.Unmarshal(body, &req); err != nil {
|
||||||
|
SendErrorResponse(w, http.StatusBadRequest, "Invalid request format")
|
||||||
|
postLog.Warning(fmt.Sprintf("[CreateUserHandler] Invalid request format: %v", err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if req.Username == "" || req.Passwd == "" || req.Type == "" {
|
||||||
|
SendErrorResponse(w, http.StatusBadRequest, "Username, password, and type are required")
|
||||||
|
postLog.Warning("[CreateUserHandler] CreateUser failed: username, password, or type is empty")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if req.Type != "admin" && req.Type != "user" && req.Type != "superuser" {
|
||||||
|
SendErrorResponse(w, http.StatusBadRequest, "Invalid type: must be 'admin' or 'user' or 'superuser'")
|
||||||
|
postLog.Warning(fmt.Sprintf("[CreateUserHandler] CreateUser failed: invalid type: %s", req.Type))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
userID, err = AddUser(req.Username, req.Passwd, req.Type)
|
||||||
|
if err != nil {
|
||||||
|
SendErrorResponse(w, http.StatusInternalServerError, err.Error())
|
||||||
|
postLog.Error(fmt.Sprintf("[RegisterHandler] Failed to register user \"%s\": %v", req.Username, err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
user, err = GetUserByID(userID)
|
||||||
|
if err != nil {
|
||||||
|
SendErrorResponse(w, http.StatusInternalServerError, "Failed to retrieve user after creation")
|
||||||
|
postLog.Error(fmt.Sprintf("[CreateUserHandler] Failed to retrieve user \"%s\" after creation: %v", req.Username, err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
SendSuccessResponse(w, "User created successfully", map[string]interface{}{
|
||||||
|
"userID": user.UserID,
|
||||||
|
"username": user.Username,
|
||||||
|
"type": user.Type,
|
||||||
|
})
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user