github/gPanel
2
0
Fork 0
mirror of https://github.com/donl/gPanel.git synced 2026-07-11 22:06:02 -06:00
Code Issues Projects Packages Wiki Activity Actions

added checks to bundle creation process, preventing most common errors, referencing issue #135. removed system package and instead using package github.com/george-e-shaw-iv/nixtools

Browse source
This commit is contained in:
George Shaw 2018-04-06 15:37:35 -05:00
parent be864e0511
commit 80532f6eb8
10 changed files with 178 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkg/api/ssh/addkey.go
View file

@ -6,7 +6,7 @@ import (
"net/http"
"strconv"
"github.com/Ennovar/gPanel/pkg/system"
"github.com/george-e-shaw-iv/nixtools"
)
func AddKey(res http.ResponseWriter, req *http.Request, logger *log.Logger) bool {
@ -28,7 +28,14 @@ func AddKey(res http.ResponseWriter, req *http.Request, logger *log.Logger) bool
return false
}
if err = system.AddAuthorizedKey(requestData.Username, requestData.PublicKey); err != nil {
sysUser, err := nixtools.GetUser(requestData.Username, false)
if err != nil {
logger.Println(req.URL.Path + "::" + err.Error())
http.Error(res, err.Error(), http.StatusBadRequest)
return false
}
if err = sysUser.AddAuthorizedKey(requestData.PublicKey); err != nil {
logger.Println(req.URL.Path + "::" + err.Error())
http.Error(res, err.Error(), http.StatusInternalServerError)
return false

11
pkg/api/ssh/deletekey.go
View file

@ -6,7 +6,7 @@ import (
"net/http"
"strconv"
"github.com/Ennovar/gPanel/pkg/system"
"github.com/george-e-shaw-iv/nixtools"
)
func DeleteKey(res http.ResponseWriter, req *http.Request, logger *log.Logger) bool {
@ -28,7 +28,14 @@ func DeleteKey(res http.ResponseWriter, req *http.Request, logger *log.Logger) b
return false
}
if err = system.DeleteAuthorizedKey(requestData.Username, requestData.PublicKey); err != nil {
sysUser, err := nixtools.GetUser(requestData.Username, false)
if err != nil {
logger.Println(req.URL.Path + "::" + err.Error())
http.Error(res, err.Error(), http.StatusBadRequest)
return false
}
if err = sysUser.DeleteAuthorizedKey(requestData.PublicKey); err != nil {
logger.Println(req.URL.Path + "::" + err.Error())
http.Error(res, err.Error(), http.StatusInternalServerError)
return false

11
pkg/api/ssh/getkeys.go
View file

@ -6,7 +6,7 @@ import (
"net/http"
"strconv"
"github.com/Ennovar/gPanel/pkg/system"
"github.com/george-e-shaw-iv/nixtools"
)
func GetKeys(res http.ResponseWriter, req *http.Request, logger *log.Logger) bool {
@ -27,8 +27,15 @@ func GetKeys(res http.ResponseWriter, req *http.Request, logger *log.Logger) boo
return false
}
sysUser, err := nixtools.GetUser(requestData.Username, false)
if err != nil {
logger.Println(req.URL.Path + "::" + err.Error())
http.Error(res, err.Error(), http.StatusBadRequest)
return false
}
var keys []string
if keys, err = system.GetAuthorizedKeys(requestData.Username); err != nil {
if keys, err = sysUser.GetAuthorizedKeys(true); err != nil {
logger.Println(req.URL.Path + "::" + err.Error())
http.Error(res, err.Error(), http.StatusInternalServerError)
return false