mirror of
https://github.com/ngoduykhanh/wireguard-ui.git
synced 2025-04-21 20:12:33 +03:00
Merge pull request #7 from armisss4/User-control-patch
User control patch
This commit is contained in:
commit
352e0e4e0e
1 changed files with 9 additions and 5 deletions
|
@ -215,7 +215,10 @@ func UpdateUser(db store.IStore) echo.HandlerFunc {
|
||||||
}
|
}
|
||||||
user.PasswordHash = hash
|
user.PasswordHash = hash
|
||||||
}
|
}
|
||||||
user.Admin = admin
|
|
||||||
|
if previousUsername != currentUser(c) {
|
||||||
|
user.Admin = admin
|
||||||
|
}
|
||||||
|
|
||||||
if err := db.DeleteUser(previousUsername); err != nil {
|
if err := db.DeleteUser(previousUsername); err != nil {
|
||||||
return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, err.Error()})
|
return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, err.Error()})
|
||||||
|
@ -289,6 +292,10 @@ func RemoveUser(db store.IStore) echo.HandlerFunc {
|
||||||
}
|
}
|
||||||
|
|
||||||
username := data["username"].(string)
|
username := data["username"].(string)
|
||||||
|
|
||||||
|
if username == currentUser(c) {
|
||||||
|
return c.JSON(http.StatusForbidden, jsonHTTPResponse{false, "User cannot delete itself"})
|
||||||
|
}
|
||||||
// delete user from database
|
// delete user from database
|
||||||
|
|
||||||
if err := db.DeleteUser(username); err != nil {
|
if err := db.DeleteUser(username); err != nil {
|
||||||
|
@ -297,10 +304,7 @@ func RemoveUser(db store.IStore) echo.HandlerFunc {
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Infof("Removed user: %s", username)
|
log.Infof("Removed user: %s", username)
|
||||||
if username == currentUser(c) {
|
|
||||||
log.Infof("You removed yourself, killing session")
|
|
||||||
clearSession(c)
|
|
||||||
}
|
|
||||||
return c.JSON(http.StatusOK, jsonHTTPResponse{true, "User removed"})
|
return c.JSON(http.StatusOK, jsonHTTPResponse{true, "User removed"})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue