gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-25 00:24:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixed UpdateNetwork/InvalidAddress

Browse source
This commit is contained in:
Matthew R Kasun 2021-04-17 15:12:03 -04:00
parent c62dc50d46
commit 1c7dbd42c9
3 changed files with 33 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
controllers/networkHttpController.go
View file

@ -308,12 +308,6 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
networkChange.NetID = network.NetID
}
//err = validateNetwork("update", networkChange)
if err != nil {
returnErrorResponse(w, r, formatError(err, "internal"))
return
}
err = validateNetworkUpdate(networkChange)
if err != nil {
returnErrorResponse(w, r, formatError(err, "badrequest"))
@ -326,7 +320,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
returnErrorResponse(w, r, formatError(errors.New("NetID is not editable"), "badrequest"))
return
}
//MRK: I think this code block is redundant. valdiateNetworkUpdate(networkChange) covers this
if networkChange.AddressRange != "" {
network.AddressRange = networkChange.AddressRange

75
test/group_test.go
View file

@ -12,7 +12,7 @@ import (
)
func TestCreateNetwork(t *testing.T) {
t.Skip()
network := models.Network{}
network.NetID = "skynet"
network.AddressRange = "10.71.0.0/16"
@ -57,7 +57,7 @@ func TestCreateNetwork(t *testing.T) {
}
func TestGetNetworks(t *testing.T) {
t.Skip()
t.Run("ValidToken", func(t *testing.T) {
response, err := api(t, "", http.MethodGet, baseURL+"/api/networks", "secretkey")
assert.Nil(t, err, err)
@ -80,7 +80,7 @@ func TestGetNetworks(t *testing.T) {
}
func TestGetNetwork(t *testing.T) {
t.Skip()
t.Run("ValidToken", func(t *testing.T) {
var network models.Network
response, err := api(t, "", http.MethodGet, baseURL+"/api/networks/skynet", "secretkey")
@ -116,7 +116,7 @@ func TestGetNetwork(t *testing.T) {
}
func TestGetnetworkNodeNumber(t *testing.T) {
t.Skip()
//not part of api anymore
t.Run("ValidKey", func(t *testing.T) {
response, err := api(t, "", http.MethodGet, baseURL+"/api/networks/skynet/numnodes", "secretkey")
@ -152,7 +152,7 @@ func TestGetnetworkNodeNumber(t *testing.T) {
}
func TestDeletenetwork(t *testing.T) {
t.Skip()
t.Run("InvalidKey", func(t *testing.T) {
response, err := api(t, "", http.MethodDelete, baseURL+"/api/networks/skynet", "badkey")
assert.Nil(t, err, err)
@ -186,12 +186,12 @@ func TestDeletenetwork(t *testing.T) {
assert.Equal(t, http.StatusNotFound, response.StatusCode)
})
t.Run("NodesExist", func(t *testing.T) {
t.Skip()
})
}
func TestCreateAccessKey(t *testing.T) {
t.Skip()
if !networkExists(t) {
createNetwork(t)
}
@ -213,7 +213,7 @@ func TestCreateAccessKey(t *testing.T) {
})
deleteKey(t, "skynet", "skynet")
t.Run("ZeroUse", func(t *testing.T) {
//t.Skip()
//
key.Uses = 0
response, err := api(t, key, http.MethodPost, baseURL+"/api/networks/skynet/keys", "secretkey")
assert.Nil(t, err, err)
@ -258,7 +258,7 @@ func TestCreateAccessKey(t *testing.T) {
}
func TestDeleteKey(t *testing.T) {
t.Skip()
t.Run("KeyValid", func(t *testing.T) {
//fails -- deletecount not returned
response, err := api(t, "", http.MethodDelete, baseURL+"/api/networks/skynet/keys/skynet", "secretkey")
@ -274,7 +274,7 @@ func TestDeleteKey(t *testing.T) {
}
})
t.Run("InValidKey", func(t *testing.T) {
t.Skip()
//responds ok, will nil record returned.. should be an error.
response, err := api(t, "", http.MethodDelete, baseURL+"/api/networks/skynet/keys/badkey", "secretkey")
assert.Nil(t, err, err)
@ -309,7 +309,7 @@ func TestDeleteKey(t *testing.T) {
}
func TestGetKeys(t *testing.T) {
t.Skip()
createKey(t)
t.Run("Valid", func(t *testing.T) {
response, err := api(t, "", http.MethodGet, baseURL+"/api/networks/skynet/keys", "secretkey")
@ -344,8 +344,7 @@ func TestGetKeys(t *testing.T) {
})
}
func TestUpdatenetwork(t *testing.T) {
t.Skip()
func TestUpdateNetwork(t *testing.T) {
//ensure we are working with known networks
deleteNetworks(t)
createNetwork(t)
@ -366,21 +365,6 @@ func TestUpdatenetwork(t *testing.T) {
assert.Equal(t, http.StatusBadRequest, message.Code)
assert.Equal(t, "NetID is not editable", message.Message)
})
t.Run("NetIDInvalidCredentials", func(t *testing.T) {
type Network struct {
NetID string
}
var network Network
network.NetID = "wirecat"
response, err := api(t, network, http.MethodPut, baseURL+"/api/networks/skynet", "badkey")
assert.Nil(t, err, err)
var message models.ErrorResponse
err = json.NewDecoder(response.Body).Decode(&message)
assert.Nil(t, err, err)
assert.Equal(t, http.StatusUnauthorized, message.Code)
assert.Equal(t, "W1R3: You are unauthorized to access this endpoint.", message.Message)
assert.Equal(t, http.StatusUnauthorized, response.StatusCode)
})
t.Run("Invalidnetwork", func(t *testing.T) {
type Network struct {
NetID string
@ -397,19 +381,6 @@ func TestUpdatenetwork(t *testing.T) {
assert.Equal(t, "W1R3: This network does not exist.", message.Message)
assert.Equal(t, http.StatusNotFound, response.StatusCode)
})
t.Run("UpdateNetIDTooLong", func(t *testing.T) {
// ---- needs fixing -----
// succeeds for some reason
t.Skip()
type Network struct {
NetID string
}
var network Network
network.NetID = "wirecat-skynet"
response, err := api(t, network, http.MethodPut, baseURL+"/api/networks/skynet", "secretkey")
assert.Nil(t, err, err)
assert.Equal(t, http.StatusUnprocessableEntity, response.StatusCode)
})
t.Run("UpdateAddress", func(t *testing.T) {
type Network struct {
AddressRange string
@ -432,13 +403,13 @@ func TestUpdatenetwork(t *testing.T) {
network.AddressRange = "10.0.0.1/36"
response, err := api(t, network, http.MethodPut, baseURL+"/api/networks/skynet", "secretkey")
assert.Nil(t, err, err)
assert.Equal(t, http.StatusInternalServerError, response.StatusCode)
assert.Equal(t, http.StatusBadRequest, response.StatusCode)
defer response.Body.Close()
var message models.ErrorResponse
err = json.NewDecoder(response.Body).Decode(&message)
assert.Nil(t, err, err)
assert.Equal(t, http.StatusInternalServerError, message.Code)
assert.Contains(t, message.Message, "Invalid Range")
assert.Equal(t, http.StatusBadRequest, message.Code)
assert.Contains(t, message.Message, "validation for 'AddressRange' failed")
})
t.Run("UpdateDisplayName", func(t *testing.T) {
@ -459,7 +430,7 @@ func TestUpdatenetwork(t *testing.T) {
t.Run("UpdateDisplayNameInvalidName", func(t *testing.T) {
// -----needs fixing ----
// fails silently
t.Skip()
type Network struct {
DisplayName string
}
@ -511,7 +482,7 @@ func TestUpdatenetwork(t *testing.T) {
t.Run("UpdateListenPortInvalidPort", func(t *testing.T) {
// ---needs fixing -----
// value is updated anyways
t.Skip()
type Network struct {
DefaultListenPort int32
}
@ -544,7 +515,7 @@ func TestUpdatenetwork(t *testing.T) {
// -------needs fixing ------
// mismatch in models.Network between struc name and json/bson name
// does not get updated.
t.Skip()
type Network struct {
DefaultPostDown string
}
@ -575,7 +546,7 @@ func TestUpdatenetwork(t *testing.T) {
t.Run("UpdateKeepAliveTooBig", func(t *testing.T) {
//fails silently
// ----- needs fixing -----
t.Skip()
type Network struct {
DefaultKeepAlive int32
}
@ -592,7 +563,7 @@ func TestUpdatenetwork(t *testing.T) {
})
t.Run("UpdateSaveConfig", func(t *testing.T) {
//causes panic
t.Skip()
type Network struct {
DefaultSaveConfig *bool
}
@ -608,7 +579,7 @@ func TestUpdatenetwork(t *testing.T) {
assert.Equal(t, *network.DefaultSaveConfig, *returnedNetwork.DefaultSaveConfig)
})
t.Run("UpdateManualSignUP", func(t *testing.T) {
t.Skip()
type Network struct {
AllowManualSignUp *bool
}
@ -627,7 +598,7 @@ func TestUpdatenetwork(t *testing.T) {
})
t.Run("DefaultCheckInterval", func(t *testing.T) {
//value is not returned in struct ---
t.Skip()
type Network struct {
DefaultCheckInInterval int32
}
@ -643,7 +614,7 @@ func TestUpdatenetwork(t *testing.T) {
})
t.Run("DefaultCheckIntervalTooBig", func(t *testing.T) {
//value is not returned in struct ---
t.Skip()
type Network struct {
DefaultCheckInInterval int32
}

24
test/user_test.go
View file

@ -11,7 +11,6 @@ import (
)
func TestAdminCreation(t *testing.T) {
var admin models.UserAuthParams
var user models.User
admin.UserName = "admin"
@ -41,32 +40,25 @@ func TestAdminCreation(t *testing.T) {
defer response.Body.Close()
var message models.ErrorResponse
err = json.NewDecoder(response.Body).Decode(&message)
t.Log(message)
assert.Nil(t, err, err)
assert.Equal(t, http.StatusUnauthorized, response.StatusCode)
assert.Equal(t, http.StatusUnauthorized, message.Code)
assert.Equal(t, "W1R3: Admin already exists! ", message.Message)
data, _ := ioutil.ReadAll(response.Body)
t.Log(string(data))
})
}
func TestGetUser(t *testing.T) {
if !adminExists(t) {
t.Log("no admin - creating")
addAdmin(t)
} else {
t.Log("admin exists")
}
t.Run("GetUserWithValidToken", func(t *testing.T) {
token, err := authenticate(t)
assert.Nil(t, err, err)
response, err := api(t, "", http.MethodGet, "http://localhost:8081/api/users/admin", token)
t.Log(response)
assert.Nil(t, err, err)
defer response.Body.Close()
var user models.User
@ -76,15 +68,20 @@ func TestGetUser(t *testing.T) {
assert.Equal(t, true, user.IsAdmin)
})
t.Run("GetUserWithInvalidToken", func(t *testing.T) {
response, err := api(t, "", http.MethodGet, "http://localhost:8081/api/users/admin", "secretkey")
response, err := api(t, "", http.MethodGet, "http://localhost:8081/api/users/admin", "badkey")
assert.Nil(t, err, err)
defer response.Body.Close()
t.Log(response.Body)
var message models.ErrorResponse
err = json.NewDecoder(response.Body).Decode(&message)
assert.Nil(t, err, err)
assert.Equal(t, http.StatusUnauthorized, response.StatusCode)
assert.Equal(t, http.StatusUnauthorized, message.Code)
assert.Equal(t, "W1R3: Error Verifying Auth Token.", message.Message)
})
}
func TestUpdateUser(t *testing.T) {
if !adminExists(t) {
addAdmin(t)
}
@ -96,7 +93,7 @@ func TestUpdateUser(t *testing.T) {
t.Run("UpdateWrongToken", func(t *testing.T) {
admin.UserName = "admin"
admin.Password = "admin"
response, err := api(t, admin, http.MethodPut, "http://localhost:8081/api/users/admin", "secretkey")
response, err := api(t, admin, http.MethodPut, "http://localhost:8081/api/users/admin", "badkey")
assert.Nil(t, err, err)
defer response.Body.Close()
err = json.NewDecoder(response.Body).Decode(&message)
@ -116,7 +113,6 @@ func TestUpdateUser(t *testing.T) {
assert.Equal(t, true, user.IsAdmin)
assert.Equal(t, http.StatusOK, response.StatusCode)
})
}
func TestDeleteUser(t *testing.T) {
@ -154,7 +150,6 @@ func TestDeleteUser(t *testing.T) {
assert.Equal(t, http.StatusBadRequest, message.Code)
assert.Equal(t, "Delete unsuccessful.", message.Message)
})
}
func TestAuthenticateUser(t *testing.T) {
@ -201,7 +196,6 @@ func TestAuthenticateUser(t *testing.T) {
errMessage: "W1R3: Device Admin Authorized",
},
}
if !adminExists(t) {
addAdmin(t)
}