Mirrors/wg-portal
1
0
Fork 0
mirror of https://github.com/h44z/wg-portal.git synced 2025-11-03 23:56:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

only remove private key if a custom public key was specified (#112)

Browse Source
This commit is contained in:
Christoph Haas
2022-10-28 18:40:06 +02:00
parent 352c689623
commit ab7f19bb55
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/server/handlers_peer.go
View File

@@ -420,10 +420,10 @@ func (s *Server) PostUserCreatePeer(c *gin.Context) {
formPeer = currentSession.FormData.(wireguard.Peer) formPeer = currentSession.FormData.(wireguard.Peer)
} }
formPeer.Email = currentSession.Email; formPeer.Email = currentSession.Email
formPeer.Identifier = currentSession.Email; formPeer.Identifier = currentSession.Email
formPeer.DeviceType = wireguard.DeviceTypeServer; formPeer.DeviceType = wireguard.DeviceTypeServer
if err := c.ShouldBind(&formPeer); err != nil { if err := c.ShouldBind(&formPeer); err != nil {
_ = s.updateFormInSession(c, formPeer) _ = s.updateFormInSession(c, formPeer)
SetFlashMessage(c, "failed to bind form data: "+err.Error(), "danger") SetFlashMessage(c, "failed to bind form data: "+err.Error(), "danger")
@@ -431,6 +431,11 @@ func (s *Server) PostUserCreatePeer(c *gin.Context) {
return return
} }
// if public key was manually set, remove the incorrect private key
if formPeer.PublicKey != currentSession.FormData.(wireguard.Peer).PublicKey {
formPeer.PrivateKey = ""
}
disabled := c.PostForm("isdisabled") != "" disabled := c.PostForm("isdisabled") != ""
now := time.Now() now := time.Now()
if disabled { if disabled {
@@ -451,7 +456,6 @@ func (s *Server) PostUserCreatePeer(c *gin.Context) {
func (s *Server) GetUserEditPeer(c *gin.Context) { func (s *Server) GetUserEditPeer(c *gin.Context) {
peer := s.peers.GetPeerByKey(c.Query("pkey")) peer := s.peers.GetPeerByKey(c.Query("pkey"))
currentSession, err := s.setFormInSession(c, peer) currentSession, err := s.setFormInSession(c, peer)
if err != nil { if err != nil {
s.GetHandleError(c, http.StatusInternalServerError, "Session error", err.Error()) s.GetHandleError(c, http.StatusInternalServerError, "Session error", err.Error())
@@ -460,7 +464,7 @@ func (s *Server) GetUserEditPeer(c *gin.Context) {
if peer.Email != currentSession.Email { if peer.Email != currentSession.Email {
s.GetHandleError(c, http.StatusUnauthorized, "No permissions", "You don't have permissions to view this resource!") s.GetHandleError(c, http.StatusUnauthorized, "No permissions", "You don't have permissions to view this resource!")
return; return
} }
c.HTML(http.StatusOK, "user_edit_client.html", gin.H{ c.HTML(http.StatusOK, "user_edit_client.html", gin.H{
@@ -485,7 +489,7 @@ func (s *Server) PostUserEditPeer(c *gin.Context) {
if currentPeer.Email != currentSession.Email { if currentPeer.Email != currentSession.Email {
s.GetHandleError(c, http.StatusUnauthorized, "No permissions", "You don't have permissions to view this resource!") s.GetHandleError(c, http.StatusUnauthorized, "No permissions", "You don't have permissions to view this resource!")
return; return
} }
disabled := c.PostForm("isdisabled") != "" disabled := c.PostForm("isdisabled") != ""
@@ -493,7 +497,7 @@ func (s *Server) PostUserEditPeer(c *gin.Context) {
if disabled && currentPeer.DeactivatedAt == nil { if disabled && currentPeer.DeactivatedAt == nil {
currentPeer.DeactivatedAt = &now currentPeer.DeactivatedAt = &now
} }
// Update in database // Update in database
if err := s.UpdatePeer(currentPeer, now); err != nil { if err := s.UpdatePeer(currentPeer, now); err != nil {
_ = s.updateFormInSession(c, currentPeer) _ = s.updateFormInSession(c, currentPeer)