feat(userMgr): add list users endpoint
Add new endpoint `/userMgr/list` to retrieve all users with superuser permission. Includes handler implementation, database query function, and API documentation update.
This commit is contained in:
BIN
Binary file not shown.
+22
-18
@@ -198,24 +198,6 @@ func UpdateUserType(userID int, newType string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func DeleteUser(userID int) error {
|
|
||||||
result, err := db.Exec("DELETE FROM userLogin WHERE userID = ?", userID)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to delete user: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
rowsAffected, err := result.RowsAffected()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to get rows affected: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if rowsAffected == 0 {
|
|
||||||
return errors.New("user not found")
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetNextAvailableUserID() (int, error) {
|
func GetNextAvailableUserID() (int, error) {
|
||||||
var maxID int
|
var maxID int
|
||||||
err := db.QueryRow("SELECT COALESCE(MAX(userID), 0) FROM userLogin").Scan(&maxID)
|
err := db.QueryRow("SELECT COALESCE(MAX(userID), 0) FROM userLogin").Scan(&maxID)
|
||||||
@@ -309,6 +291,28 @@ func InitUserDatabase(dbPath string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func DBQueryUsers() ([]User, error) { // List all users
|
||||||
|
rows, err := db.Query("SELECT userID, username, type FROM userLogin")
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to query users: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
var users []User
|
||||||
|
for rows.Next() {
|
||||||
|
var user User
|
||||||
|
if err := rows.Scan(&user.UserID, &user.Username, &user.Type); err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to scan user: %w", err)
|
||||||
|
}
|
||||||
|
users = append(users, user)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = rows.Err(); err != nil {
|
||||||
|
return nil, fmt.Errorf("rows error: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return users, nil
|
||||||
|
}
|
||||||
|
|
||||||
func DBAddFrpcInstance(instance FrpcInstance) error {
|
func DBAddFrpcInstance(instance FrpcInstance) error {
|
||||||
_, err := frpcDB.Exec("INSERT INTO frpcInstances (userID, name, serverAddr, serverPort, auth_method, bootAtStart, runUser, configPath, createdAt) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
_, err := frpcDB.Exec("INSERT INTO frpcInstances (userID, name, serverAddr, serverPort, auth_method, bootAtStart, runUser, configPath, createdAt) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
||||||
instance.UserID, instance.Name, instance.ServerAddr, instance.ServerPort, instance.AuthMethod, instance.BootAtStart, instance.RunUser, instance.ConfigPath, time.Now().Format(time.RFC3339))
|
instance.UserID, instance.Name, instance.ServerAddr, instance.ServerPort, instance.AuthMethod, instance.BootAtStart, instance.RunUser, instance.ConfigPath, time.Now().Format(time.RFC3339))
|
||||||
|
|||||||
+35
@@ -215,6 +215,41 @@ X-Timestamp: 1704067200000
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## List Users
|
||||||
|
|
||||||
|
**Endpoint**: `/userMgr/list`
|
||||||
|
**Method**: GET
|
||||||
|
**Auth Required**: Yes (token)
|
||||||
|
**Permission Level**: Superuser
|
||||||
|
|
||||||
|
**Request Headers**:
|
||||||
|
```
|
||||||
|
X-Token: your_token
|
||||||
|
X-Timestamp: 1704067200000
|
||||||
|
```
|
||||||
|
|
||||||
|
**Response**:
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"success": true,
|
||||||
|
"message": "User list retrieved successfully",
|
||||||
|
"data": [
|
||||||
|
{
|
||||||
|
"userID": 1,
|
||||||
|
"username": "admin",
|
||||||
|
"type": "superuser"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userID": 2,
|
||||||
|
"username": "new_user",
|
||||||
|
"type": "admin"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Create frpc Instance
|
## Create frpc Instance
|
||||||
|
|
||||||
**Endpoint:** `/frpcAct/instanceMgr/create`
|
**Endpoint:** `/frpcAct/instanceMgr/create`
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ func setupRoutes() {
|
|||||||
|
|
||||||
http.HandleFunc("/userMgr/create", CreateUserHandler)
|
http.HandleFunc("/userMgr/create", CreateUserHandler)
|
||||||
http.HandleFunc("/userMgr/remove", RemoveUserHandler)
|
http.HandleFunc("/userMgr/remove", RemoveUserHandler)
|
||||||
|
http.HandleFunc("/userMgr/list", ListUserHandler)
|
||||||
|
|
||||||
http.HandleFunc("/frpcAct/instanceMgr/create", CreateInstanceHandler)
|
http.HandleFunc("/frpcAct/instanceMgr/create", CreateInstanceHandler)
|
||||||
http.HandleFunc("/frpcAct/instanceMgr/list", ListInstancesHandler)
|
http.HandleFunc("/frpcAct/instanceMgr/list", ListInstancesHandler)
|
||||||
|
|||||||
+37
@@ -331,3 +331,40 @@ func RemoveUserHandler(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
SendSuccessResponse(w, "User removed successfully", nil)
|
SendSuccessResponse(w, "User removed successfully", nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ListUserHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.Method != http.MethodGet {
|
||||||
|
SendErrorResponse(w, http.StatusMethodNotAllowed, "Invalid request method")
|
||||||
|
postLog.Warning(fmt.Sprintf("[ListUserHandler] 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("[ListUserHandler] 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("[ListUserHandler] 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("[ListUserHandler] Permission denied: non-superuser token for user [%d]%s", userID, GetUsernameByID(userID)))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
userList, err := DBQueryUsers()
|
||||||
|
if err != nil {
|
||||||
|
SendErrorResponse(w, http.StatusInternalServerError, "Failed to list users")
|
||||||
|
postLog.Error(fmt.Sprintf("[ListUserHandler] Failed to list users: %v", err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
SendSuccessResponse(w, "User list retrieved successfully", userList)
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user