martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-02-12 03:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing test

Browse Source
This commit is contained in:
Roland Osborne 2022-01-12 23:04:43 -08:00
parent 683ae8f27e
commit 2cfdf1514c
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
net/server/internal/api_admin.go
View File

@ -18,6 +18,27 @@ import (
"databag/internal/store" "databag/internal/store"
) )
func adminLogin(r *http.Request) bool {
// check configured state
if !_configured || _adminUsername == "" || _adminPassword == nil {
return false;
}
// validate imput
username, password, ok := r.BasicAuth();
if !ok || username == "" || password == "" {
return false
}
// compare credentials
if username != _adminUsername || bcrypt.CompareHashAndPassword(_adminPassword, []byte(password)) != nil {
return false
}
return true;
}
func AddNodeAccount(w http.ResponseWriter, r *http.Request) { func AddNodeAccount(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json; charset=UTF-8") w.Header().Set("Content-Type", "application/json; charset=UTF-8")
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
@ -35,6 +56,7 @@ func GetNodeAccounts(w http.ResponseWriter, r *http.Request) {
func GetNodeClaimable(w http.ResponseWriter, r *http.Request) { func GetNodeClaimable(w http.ResponseWriter, r *http.Request) {
// check if has been configured
if _configured { if _configured {
w.WriteHeader(http.StatusNotAcceptable) w.WriteHeader(http.StatusNotAcceptable)
} else { } else {
@ -64,7 +86,7 @@ func SetNodeAccount(w http.ResponseWriter, r *http.Request) {
func SetNodeClaim(w http.ResponseWriter, r *http.Request) { func SetNodeClaim(w http.ResponseWriter, r *http.Request) {
// confirm node is claimable // confirm node hasn't been configured
if _configured { if _configured {
w.WriteHeader(http.StatusUnauthorized) w.WriteHeader(http.StatusUnauthorized)
return return
@ -72,7 +94,8 @@ func SetNodeClaim(w http.ResponseWriter, r *http.Request) {
// extract credentials // extract credentials
username, password, ok := r.BasicAuth(); username, password, ok := r.BasicAuth();
if !ok { if !ok || username == "" || password == "" {
log.Printf("SetNodeClaim - invalid credenitals");
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -102,19 +125,15 @@ func SetNodeClaim(w http.ResponseWriter, r *http.Request) {
// set global values // set global values
_adminUsername = username _adminUsername = username
_adminPassword = hashedPassword _adminPassword = hashedPassword
_configured = true
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
} }
func SetNodeConfig(w http.ResponseWriter, r *http.Request) { func SetNodeConfig(w http.ResponseWriter, r *http.Request) {
// validate admin password // validate login
username, password, ok := r.BasicAuth(); if !adminLogin(r) {
if !ok {
w.WriteHeader(http.StatusBadRequest)
return
}
if username != _adminUsername || bcrypt.CompareHashAndPassword(_adminPassword, []byte(password)) != nil {
log.Printf("SetNodeConfig - invalid admin credentials"); log.Printf("SetNodeConfig - invalid admin credentials");
w.WriteHeader(http.StatusUnauthorized); w.WriteHeader(http.StatusUnauthorized);
return return
@ -157,3 +176,4 @@ func SetNodeConfig(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
} }