diff --git a/controllers/responseHttp.go b/controllers/responseHttp.go index e44ab2e1..594d1e4d 100644 --- a/controllers/responseHttp.go +++ b/controllers/responseHttp.go @@ -2,9 +2,9 @@ package controller import ( "encoding/json" - "fmt" "net/http" + "github.com/gravitl/netmaker/logic" "github.com/gravitl/netmaker/models" ) @@ -48,7 +48,7 @@ func returnErrorResponse(response http.ResponseWriter, request *http.Request, er if err != nil { panic(err) } - fmt.Println(errorMessage) + logic.Log("processed request error: "+errorMessage.Message, 1) response.Header().Set("Content-Type", "application/json") response.WriteHeader(errorMessage.Code) response.Write(jsonResponse) diff --git a/controllers/userHttpController.go b/controllers/userHttpController.go index 478dc42f..17b541ee 100644 --- a/controllers/userHttpController.go +++ b/controllers/userHttpController.go @@ -3,6 +3,7 @@ package controller import ( "encoding/json" "errors" + "fmt" "net/http" "strings" @@ -20,6 +21,7 @@ func userHandlers(r *mux.Router) { r.HandleFunc("/api/users/adm/createadmin", createAdmin).Methods("POST") r.HandleFunc("/api/users/adm/authenticate", authenticateUser).Methods("POST") r.HandleFunc("/api/users/{username}", authorizeUser(http.HandlerFunc(updateUser))).Methods("PUT") + r.HandleFunc("/api/users/networks/{username}", authorizeUser(http.HandlerFunc(updateUserNetworks))).Methods("PUT") r.HandleFunc("/api/users/{username}/adm", authorizeUserAdm(http.HandlerFunc(updateUserAdm))).Methods("PUT") r.HandleFunc("/api/users/{username}", authorizeUserAdm(http.HandlerFunc(createUser))).Methods("POST") r.HandleFunc("/api/users/{username}", authorizeUser(http.HandlerFunc(deleteUser))).Methods("DELETE") @@ -253,6 +255,34 @@ func createUser(w http.ResponseWriter, r *http.Request) { json.NewEncoder(w).Encode(user) } +func updateUserNetworks(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "application/json") + var params = mux.Vars(r) + var user models.User + // start here + username := params["username"] + user, err := GetUserInternal(username) + if err != nil { + returnErrorResponse(w, r, formatError(err, "internal")) + return + } + var userchange models.User + // we decode our body request params + err = json.NewDecoder(r.Body).Decode(&userchange) + if err != nil { + returnErrorResponse(w, r, formatError(err, "internal")) + return + } + + err = logic.UpdateUserNetworks(userchange.Networks, &user) + if err != nil { + returnErrorResponse(w, r, formatError(err, "badrequest")) + return + } + functions.PrintUserLog(username, "networks were updated", 1) + json.NewEncoder(w).Encode(user) +} + func updateUser(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") var params = mux.Vars(r) @@ -264,6 +294,10 @@ func updateUser(w http.ResponseWriter, r *http.Request) { returnErrorResponse(w, r, formatError(err, "internal")) return } + if auth.IsOauthUser(&user) == nil { + returnErrorResponse(w, r, formatError(fmt.Errorf("can not update user info for oauth user %s", username), "forbidden")) + return + } var userchange models.User // we decode our body request params err = json.NewDecoder(r.Body).Decode(&userchange) @@ -292,6 +326,10 @@ func updateUserAdm(w http.ResponseWriter, r *http.Request) { returnErrorResponse(w, r, formatError(err, "internal")) return } + if auth.IsOauthUser(&user) != nil { + returnErrorResponse(w, r, formatError(fmt.Errorf("can not update user info for oauth user"), "forbidden")) + return + } var userchange models.User // we decode our body request params err = json.NewDecoder(r.Body).Decode(&userchange) diff --git a/logic/auth.go b/logic/auth.go index 3d3ae4d0..81904f70 100644 --- a/logic/auth.go +++ b/logic/auth.go @@ -152,6 +152,25 @@ func VerifyAuthRequest(authRequest models.UserAuthParams) (string, error) { return tokenString, nil } +// UpdateUserNetworks - updates the networks of a given user +func UpdateUserNetworks(newNetworks []string, currentUser *models.User) error { + // check if user exists + if _, err := GetUser(currentUser.UserName); err != nil { + return err + } + currentUser.Networks = newNetworks + + data, err := json.Marshal(currentUser) + if err != nil { + return err + } + if err = database.Insert(currentUser.UserName, string(data), database.USERS_TABLE_NAME); err != nil { + return err + } + + return nil +} + // UpdateUser - updates a given user func UpdateUser(userchange models.User, user models.User) (models.User, error) { //check if user exists @@ -194,7 +213,7 @@ func UpdateUser(userchange models.User, user models.User) (models.User, error) { if err = database.Insert(user.UserName, string(data), database.USERS_TABLE_NAME); err != nil { return models.User{}, err } - functions.PrintUserLog(models.NODE_SERVER_NAME, "updated user "+queryUser, 1) + Log("updated user "+queryUser, 1) return user, nil } diff --git a/logic/network.go b/logic/network.go index c2bb6bb1..6d763f74 100644 --- a/logic/network.go +++ b/logic/network.go @@ -5,10 +5,17 @@ import ( "os/exec" "strings" + "github.com/gravitl/netmaker/database" "github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/netclient/ncutils" ) +// CheckNetworkExists - checks i a network exists for this netmaker instance +func CheckNetworkExists(network string) bool { + var _, err = database.FetchRecord(database.NETWORKS_TABLE_NAME, network) + return err == nil +} + // GetLocalIP - gets the local ip func GetLocalIP(node models.Node) string {