diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index d41f694d..acfb1090 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -31,7 +31,8 @@ body: label: Version description: What version are you running? options: - - v0.15.1 + - v0.15.2 + - v0.15.1 - v0.15.0 - v0.14.6 - v0.14.5 diff --git a/README.md b/README.md index c037c69f..3b409658 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@

- + diff --git a/auth/auth.go b/auth/auth.go index a8572120..bd7bcd3d 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -99,7 +99,7 @@ func HandleAuthCallback(w http.ResponseWriter, r *http.Request) { // swagger:route GET /api/oauth/login nodes HandleAuthLogin // -// Handles OAuth login +// Handles OAuth login. // // Schemes: https // diff --git a/compose/docker-compose.reference.yml b/compose/docker-compose.reference.yml index 9ec7f103..3091d18f 100644 --- a/compose/docker-compose.reference.yml +++ b/compose/docker-compose.reference.yml @@ -3,7 +3,7 @@ version: "3.4" services: netmaker: # The Primary Server for running Netmaker container_name: netmaker - image: gravitl/netmaker:v0.15.1 + image: gravitl/netmaker:v0.15.2 cap_add: - NET_ADMIN - NET_RAW @@ -62,7 +62,7 @@ services: - traefik.http.services.netmaker-api.loadbalancer.server.port=8081 netmaker-ui: # The Netmaker UI Component container_name: netmaker-ui - image: gravitl/netmaker-ui:v0.15.1 + image: gravitl/netmaker-ui:v0.15.2 depends_on: - netmaker links: @@ -140,4 +140,4 @@ volumes: sqldata: {} # storage for embedded sqlite dnsconfig: {} # storage for coredns mosquitto_data: {} # storage for mqtt data - mosquitto_logs: {} # storage for mqtt logs \ No newline at end of file + mosquitto_logs: {} # storage for mqtt logs diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index d9d1c47e..a78aed34 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.4" services: netmaker: container_name: netmaker - image: gravitl/netmaker:v0.15.1 + image: gravitl/netmaker:v0.15.2 cap_add: - NET_ADMIN - NET_RAW @@ -51,7 +51,7 @@ services: - traefik.http.services.netmaker-api.loadbalancer.server.port=8081 netmaker-ui: container_name: netmaker-ui - image: gravitl/netmaker-ui:v0.15.1 + image: gravitl/netmaker-ui:v0.15.2 depends_on: - netmaker links: diff --git a/controllers/dns.go b/controllers/dns.go index 64e445f1..c5ae5afa 100644 --- a/controllers/dns.go +++ b/controllers/dns.go @@ -27,7 +27,7 @@ func dnsHandlers(r *mux.Router) { // swagger:route GET /api/dns/adm/{network}/nodes dns getNodeDNS // -// Gets node DNS entries associated with a network +// Gets node DNS entries associated with a network. // // Schemes: https // @@ -53,12 +53,16 @@ func getNodeDNS(w http.ResponseWriter, r *http.Request) { // swagger:route GET /api/dns dns getAllDNS // -// Gets all DNS entries +// Gets all DNS entries. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: dnsResponse +// func getAllDNS(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") dns, err := logic.GetAllDNS() @@ -73,12 +77,16 @@ func getAllDNS(w http.ResponseWriter, r *http.Request) { // swagger:route GET /api/dns/adm/{network}/custom dns getCustomDNS // -// Gets custom DNS entries associated with a network +// Gets custom DNS entries associated with a network. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: dnsResponse +// func getCustomDNS(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -99,12 +107,16 @@ func getCustomDNS(w http.ResponseWriter, r *http.Request) { // swagger:route GET /api/dns/adm/{network} dns getDNS // -// Gets all DNS entries associated with the network +// Gets all DNS entries associated with the network. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: dnsResponse +// func getDNS(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -125,12 +137,16 @@ func getDNS(w http.ResponseWriter, r *http.Request) { // swagger:route POST /api/dns/{network} dns createDNS // -// Create a DNS entry +// Create a DNS entry. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: dnsResponse +// func createDNS(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -184,12 +200,16 @@ func createDNS(w http.ResponseWriter, r *http.Request) { // swagger:route DELETE /api/dns/{network}/{domain} dns deleteDNS // -// Delete a DNS entry +// Delete a DNS entry. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: stringJSONResponse +// *: stringJSONResponse func deleteDNS(w http.ResponseWriter, r *http.Request) { // Set header w.Header().Set("Content-Type", "application/json") @@ -248,12 +268,16 @@ func GetDNSEntry(domain string, network string) (models.DNSEntry, error) { // swagger:route POST /api/dns/adm/pushdns dns pushDNS // -// Push DNS entries to nameserver +// Push DNS entries to nameserver. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: dnsStringJSONResponse +// *: dnsStringJSONResponse func pushDNS(w http.ResponseWriter, r *http.Request) { // Set header w.Header().Set("Content-Type", "application/json") diff --git a/controllers/docs.go b/controllers/docs.go index 1e1f5ae7..25464d7d 100644 --- a/controllers/docs.go +++ b/controllers/docs.go @@ -11,7 +11,7 @@ // // Schemes: https // BasePath: / -// Version: 0.15.1 +// Version: 0.15.2 // Host: netmaker.io // // Consumes: @@ -25,3 +25,376 @@ // // swagger:meta package controller + +import ( + serverconfigpkg "github.com/gravitl/netmaker/config" + "github.com/gravitl/netmaker/logic/acls" + "github.com/gravitl/netmaker/models" + "github.com/gravitl/netmaker/netclient/config" +) + +var _ = useUnused() // "use" the function to prevent "unused function" errors + +// swagger:parameters getNodeDNS getCustomDNS getDNS +type dnsPathParams struct { + // Network + // in: path + Network string `json:"network"` +} + +// swagger:parameters createDNS +type dnsParams struct { + // Network + // in: path + Network string `json:"network"` + + // DNS Entry + // in: body + Body []models.DNSEntry `json:"body"` +} + +// Success +// swagger:response dnsResponse +type dnsResponse struct { + // in: body + Body []models.DNSEntry `json:"body"` +} + +// swagger:parameters deleteDNS +type dnsDeletePathParams struct { + // Network + // in: path + Network string `json:"network"` + + // Domain + // in: path + Domain string `json:"domain"` +} + +// swagger:response stringJSONResponse +type stringJSONResponse struct { + // Response + // in: body + Response string `json:"response"` +} + +// swagger:parameters getAllExtClients +type getAllClientsRequest struct { + // Networks + // in:body + Networks []string `json:"networks"` +} + +// swagger:response extClientSliceResponse +type extClientSliceResponse struct { + // ExtClients + // in: body + ExtClients []models.ExtClient `json:"ext_clients"` +} + +// swagger:response extClientResponse +type extClientResponse struct { + // ExtClient + // in: body + ExtClient models.ExtClient `json:"ext_client"` +} + +// swagger:response successResponse +type successResponse struct { + // Success Response + // in: body + SuccessResponse models.SuccessResponse `json:"success_response"` +} + +// swagger:parameters getExtClient getExtClientConf updateExtClient deleteExtClient +type extClientPathParams struct { + // Client ID + // in: path + ClientID string `json:"clientid"` + + // Network + // in: path + Network string `json:"network"` +} + +// swagger:parameters updateExtClient +type extClientBodyParam struct { + // ExtClient + // in: body + ExtClient models.ExtClient `json:"ext_client"` +} + +// swagger:parameters getNetworkExtClients +type extClientNetworkPathParam struct { + // Network + // in: path + Network string `json:"network"` +} + +// swagger:parameters createExtClient +type createExtClientPathParams struct { + // Network + // in: path + Network string `json:"network"` + + // Node ID + // in: path + NodeID string `json:"node"` + + // Custom ExtClient + // in: body + CustomExtClient models.CustomExtClient `json:"custom_ext_client"` +} + +// swagger:parameters getNode updateNode deleteNode createRelay deleteRelay createEgressGateway deleteEgressGateway createIngressGateway deleteIngressGateway uncordonNode +type networkNodePathParams struct { + // Network + // in: path + Network string `json:"network"` + + // Node ID + // in: path + NodeID string `json:"nodeid"` +} + +// swagger:response byteArrayResponse +type byteArrayResponse struct { + // in: body + ByteArray []byte `json:"byte_array"` +} + +// swagger:parameters getNetworks +type headerNetworks struct { + // name: networks + // in: header + Networks []string `json:"networks"` +} + +// swagger:response getNetworksSliceResponse +type getNetworksSliceResponse struct { + // Networks + // in: body + Networks []models.Network `json:"networks"` +} + +// swagger:parameters createNetwork updateNetwork +type networkBodyParam struct { + // Network + // in: body + Network models.Network `json:"network"` +} + +// swagger:parameters updateNetwork getNetwork updateNetwork updateNetworkNodeLimit deleteNetwork keyUpdate createAccessKey getAccessKeys deleteAccessKey updateNetworkACL getNetworkACL +type networkPathParam struct { + // Network Name + // in: path + NetworkName string `json:"networkname"` +} + +// swagger:parameters deleteAccessKey +type networkAccessKeyNamePathParam struct { + // Access Key Name + // in: path + AccessKeyName string `json:"access_key_name"` +} + +// swagger:response networkBodyResponse +type networkBodyResponse struct { + // Network + // in: body + Network models.Network `json:"network"` +} + +// swagger:parameters createAccessKey +type accessKeyBodyParam struct { + // Access Key + // in: body + AccessKey models.AccessKey `json:"access_key"` +} + +// swagger:response accessKeyBodyResponse +type accessKeyBodyResponse struct { + // Access Key + // in: body + AccessKey models.AccessKey `json:"access_key"` +} + +// swagger:response accessKeySliceBodyResponse +type accessKeySliceBodyResponse struct { + // Access Keys + // in: body + AccessKey []models.AccessKey `json:"access_key"` +} + +// swagger:parameters updateNetworkACL getNetworkACL +type aclContainerBodyParam struct { + // ACL Container + // in: body + ACLContainer acls.ACLContainer `json:"acl_container"` +} + +// swagger:response aclContainerResponse +type aclContainerResponse struct { + // ACL Container + // in: body + ACLContainer acls.ACLContainer `json:"acl_container"` +} + +// swagger:response nodeSliceResponse +type nodeSliceResponse struct { + // Nodes + // in: body + Nodes []models.Node `json:"nodes"` +} + +// swagger:response nodeResponse +type nodeResponse struct { + // Node + // in: body + Node models.Node `json:"node"` +} + +// swagger:parameters updateNode deleteNode +type nodeBodyParam struct { + // Node + // in: body + Node models.Node `json:"node"` +} + +// swagger:parameters createRelay +type relayRequestBodyParam struct { + // Relay Request + // in: body + RelayRequest models.RelayRequest `json:"relay_request"` +} + +// swagger:parameters createEgressGateway +type egressGatewayBodyParam struct { + // Egress Gateway Request + // in: body + EgressGatewayRequest models.EgressGatewayRequest `json:"egress_gateway_request"` +} + +// swagger:parameters authenticate +type authParamBodyParam struct { + // AuthParams + // in: body + AuthParams models.AuthParams `json:"auth_params"` +} + +// swagger:response serverConfigResponse +type serverConfigResponse struct { + // Server Config + // in: body + ServerConfig serverconfigpkg.ServerConfig `json:"server_config"` +} + +// swagger:response nodeGetResponse +type nodeGetResponse struct { + // Node Get + // in: body + NodeGet models.NodeGet `json:"node_get"` +} + +// swagger:response nodeLastModifiedResponse +type nodeLastModifiedResponse struct { + // Node Last Modified + // in: body + NodesLastModified int64 `json:"nodes_last_modified"` +} + +// swagger:parameters register +type registerRequestBodyParam struct { + // Register Request + // in: body + RegisterRequest config.RegisterRequest `json:"register_request"` +} + +// swagger:response registerResponse +type registerResponse struct { + // Register Response + // in: body + RegisterResponse config.RegisterResponse `json:"register_response"` +} + +// swagger:response boolResponse +type boolResponse struct { + // Boolean Response + // in: body + BoolResponse bool `json:"bool_response"` +} + +// swagger:parameters createAdmin updateUser updateUserNetworks createUser +type userBodyParam struct { + // User + // in: body + User models.User `json:"user"` +} + +// swagger:response userBodyResponse +type userBodyResponse struct { + // User + // in: body + User models.User `json:"user"` +} + +// swagger:parameters authenticateUser +type userAuthBodyParam struct { + // User Auth Params + // in: body + UserAuthParams models.UserAuthParams `json:"user_auth_params"` +} + +// swagger:parameters updateUser updateUserNetworks updateUserAdm createUser deleteUser getUser +type usernamePathParam struct { + // Username + // in: path + Username string `json:"username"` +} + +// prevent issues with integration tests for types just used by Swagger docs. +func useUnused() bool { + _ = dnsPathParams{} + _ = dnsParams{} + _ = dnsResponse{} + _ = dnsDeletePathParams{} + _ = stringJSONResponse{} + _ = getAllClientsRequest{} + _ = extClientSliceResponse{} + _ = extClientResponse{} + _ = successResponse{} + _ = extClientPathParams{} + _ = extClientBodyParam{} + _ = extClientNetworkPathParam{} + _ = createExtClientPathParams{} + _ = networkNodePathParams{} + _ = byteArrayResponse{} + _ = headerNetworks{} + _ = getNetworksSliceResponse{} + _ = networkBodyParam{} + _ = networkPathParam{} + _ = networkAccessKeyNamePathParam{} + _ = networkBodyResponse{} + _ = accessKeyBodyParam{} + _ = accessKeyBodyResponse{} + _ = accessKeySliceBodyResponse{} + _ = aclContainerBodyParam{} + _ = aclContainerResponse{} + _ = nodeSliceResponse{} + _ = nodeResponse{} + _ = nodeBodyParam{} + _ = relayRequestBodyParam{} + _ = egressGatewayBodyParam{} + _ = authParamBodyParam{} + _ = serverConfigResponse{} + _ = nodeGetResponse{} + _ = nodeLastModifiedResponse{} + _ = registerRequestBodyParam{} + _ = registerResponse{} + _ = boolResponse{} + _ = userBodyParam{} + _ = userBodyResponse{} + _ = userAuthBodyParam{} + _ = usernamePathParam{} + return false +} diff --git a/controllers/ext_client.go b/controllers/ext_client.go index 3e5dc5c6..767a2ecb 100644 --- a/controllers/ext_client.go +++ b/controllers/ext_client.go @@ -38,13 +38,17 @@ func checkIngressExists(nodeID string) bool { // swagger:route GET /api/extclients/{network} ext_client getNetworkExtClients // -// Get all extclients associated with network -// Gets all extclients associated with network, including pending extclients +// Get all extclients associated with network. +// Gets all extclients associated with network, including pending extclients. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: extClientSliceResponse +// func getNetworkExtClients(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -75,6 +79,9 @@ func getNetworkExtClients(w http.ResponseWriter, r *http.Request) { // Security: // oauth // +// Responses: +// 200: extClientSliceResponse +// // Not quite sure if this is necessary. Probably necessary based on front end but may // want to review after iteration 1 if it's being used or not func getAllExtClients(w http.ResponseWriter, r *http.Request) { @@ -113,7 +120,7 @@ func getAllExtClients(w http.ResponseWriter, r *http.Request) { json.NewEncoder(w).Encode(clients) } -// swagger:route GET /api/extclients ext_client getExtClient +// swagger:route GET /api/extclients/{network}/{clientid} ext_client getExtClient // // Get an individual extclient. // @@ -122,6 +129,9 @@ func getAllExtClients(w http.ResponseWriter, r *http.Request) { // Security: // oauth // +// Responses: +// 200: extClientResponse +// func getExtClient(w http.ResponseWriter, r *http.Request) { // set header. w.Header().Set("Content-Type", "application/json") @@ -151,6 +161,9 @@ func getExtClient(w http.ResponseWriter, r *http.Request) { // Security: // oauth // +// Responses: +// 200: extClientResponse +// func getExtClientConf(w http.ResponseWriter, r *http.Request) { // set header. w.Header().Set("Content-Type", "application/json") @@ -289,7 +302,7 @@ func createExtClient(w http.ResponseWriter, r *http.Request) { var params = mux.Vars(r) networkName := params["network"] nodeid := params["nodeid"] - + ingressExists := checkIngressExists(nodeid) if !ingressExists { err := errors.New("ingress does not exist") @@ -301,11 +314,13 @@ func createExtClient(w http.ResponseWriter, r *http.Request) { var extclient models.ExtClient var CustomExtClient models.CustomExtClient - - err := json.NewDecoder(r.Body).Decode(&CustomExtClient); - - if err == nil { extclient.ClientID = CustomExtClient.ClientID } - + + err := json.NewDecoder(r.Body).Decode(&CustomExtClient) + + if err == nil { + extclient.ClientID = CustomExtClient.ClientID + } + extclient.Network = networkName extclient.IngressGatewayID = nodeid node, err := logic.GetNodeByID(nodeid) @@ -346,6 +361,9 @@ func createExtClient(w http.ResponseWriter, r *http.Request) { // Security: // oauth // +// Responses: +// 200: extClientResponse +// func updateExtClient(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -414,6 +432,9 @@ func updateExtClient(w http.ResponseWriter, r *http.Request) { // Security: // oauth // +// Responses: +// 200: successResponse +// func deleteExtClient(w http.ResponseWriter, r *http.Request) { // Set header w.Header().Set("Content-Type", "application/json") diff --git a/controllers/files.go b/controllers/files.go index 536484ae..dfe7a337 100644 --- a/controllers/files.go +++ b/controllers/files.go @@ -9,7 +9,7 @@ import ( func fileHandlers(r *mux.Router) { // swagger:route GET /meshclient/files/{filename} meshclient fileServer // - // Retrieve a file from the file server + // Retrieve a file from the file server. // // Schemes: https // diff --git a/controllers/ipservice.go b/controllers/ipservice.go index d237ab37..1f9586cc 100644 --- a/controllers/ipservice.go +++ b/controllers/ipservice.go @@ -16,13 +16,16 @@ func ipHandlers(r *mux.Router) { // swagger:route GET /api/getip ipservice getPublicIP // -// Get the current public IP address +// Get the current public IP address. // // Schemes: https // // Security: // oauth // +// Responses: +// 200: byteArrayResponse +// func getPublicIP(w http.ResponseWriter, r *http.Request) { r.Header.Set("Connection", "close") ip, err := parseIP(r) diff --git a/controllers/network.go b/controllers/network.go index 9179d271..b94a230c 100644 --- a/controllers/network.go +++ b/controllers/network.go @@ -41,12 +41,15 @@ func networkHandlers(r *mux.Router) { // swagger:route GET /api/networks networks getNetworks // -// Lists all networks +// Lists all networks. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: getNetworksSliceResponse func getNetworks(w http.ResponseWriter, r *http.Request) { headerNetworks := r.Header.Get("networks") @@ -87,14 +90,17 @@ func getNetworks(w http.ResponseWriter, r *http.Request) { json.NewEncoder(w).Encode(allnetworks) } -// swagger:route GET /api/networks networks getNetwork +// swagger:route GET /api/networks/{networkname} networks getNetwork // -// Get a network +// Get a network. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: networkBodyResponse func getNetwork(w http.ResponseWriter, r *http.Request) { // set header. w.Header().Set("Content-Type", "application/json") @@ -123,6 +129,9 @@ func getNetwork(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: networkBodyResponse func keyUpdate(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") var params = mux.Vars(r) @@ -154,12 +163,15 @@ func keyUpdate(w http.ResponseWriter, r *http.Request) { // swagger:route PUT /api/networks/{networkname} networks updateNetwork // -// Update a network +// Update a network. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: networkBodyResponse func updateNetwork(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") var params = mux.Vars(r) @@ -256,12 +268,15 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) { // swagger:route PUT /api/networks/{networkname}/nodelimit networks updateNetworkNodeLimit // -// Update a network's node limit +// Update a network's node limit. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: networkBodyResponse func updateNetworkNodeLimit(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") var params = mux.Vars(r) @@ -309,6 +324,9 @@ func updateNetworkNodeLimit(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: aclContainerResponse func updateNetworkACL(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") var params = mux.Vars(r) @@ -364,6 +382,9 @@ func updateNetworkACL(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: aclContainerResponse func getNetworkACL(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") var params = mux.Vars(r) @@ -389,6 +410,9 @@ func getNetworkACL(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: stringJSONResponse func deleteNetwork(w http.ResponseWriter, r *http.Request) { // Set header w.Header().Set("Content-Type", "application/json") @@ -413,12 +437,15 @@ func deleteNetwork(w http.ResponseWriter, r *http.Request) { // swagger:route POST /api/networks networks createNetwork // -// Create a network +// Create a network. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: networkBodyResponse func createNetwork(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -478,6 +505,9 @@ func createNetwork(w http.ResponseWriter, r *http.Request) { // Security: // oauth // +// Responses: +// 200: accessKeyBodyResponse +// // BEGIN KEY MANAGEMENT SECTION func createAccessKey(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -519,6 +549,9 @@ func createAccessKey(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: accessKeySliceBodyResponse func getAccessKeys(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") var params = mux.Vars(r) @@ -538,7 +571,7 @@ func getAccessKeys(w http.ResponseWriter, r *http.Request) { json.NewEncoder(w).Encode(keys) } -// swagger:route GET /api/networks/{networkname}/keys/{name} networks deleteAccessKey +// swagger:route DELETE /api/networks/{networkname}/keys/{name} networks deleteAccessKey // // Delete a network access key. // @@ -547,6 +580,10 @@ func getAccessKeys(w http.ResponseWriter, r *http.Request) { // Security: // oauth // +// Responses: +// 200: +// *: stringJSONResponse +// // delete key. Has to do a little funky logic since it's not a collection item func deleteAccessKey(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") diff --git a/controllers/node.go b/controllers/node.go index 7bf40840..146f5681 100644 --- a/controllers/node.go +++ b/controllers/node.go @@ -44,6 +44,9 @@ func nodeHandlers(r *mux.Router) { // // Security: // oauth +// +// Responses: +// 200: successResponse func authenticate(response http.ResponseWriter, request *http.Request) { var authRequest models.AuthParams @@ -297,12 +300,15 @@ func authorize(nodesAllowed, networkCheck bool, authNetwork string, next http.Ha // swagger:route GET /api/nodes/{network} nodes getNetworkNodes // -// Gets all nodes associated with network including pending nodes +// Gets all nodes associated with network including pending nodes. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: nodeSliceResponse func getNetworkNodes(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -339,6 +345,9 @@ func getNetworkNodes(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: nodeSliceResponse // Not quite sure if this is necessary. Probably necessary based on front end but may want to review after iteration 1 if it's being used or not func getAllNodes(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -393,6 +402,9 @@ func getUsersNodes(user models.User) ([]models.Node, error) { // // Security: // oauth +// +// Responses: +// 200: nodeResponse func getNode(w http.ResponseWriter, r *http.Request) { // set header. w.Header().Set("Content-Type", "application/json") @@ -438,6 +450,9 @@ func getNode(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: nodeLastModifiedResponse // TODO: This needs to be refactored // Potential way to do this: On UpdateNode, set a new field for "LastModified" // If we go with the existing way, we need to at least set network.NodesLastModified on UpdateNode @@ -467,6 +482,9 @@ func getLastModified(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: nodeGetResponse func createNode(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -594,6 +612,9 @@ func createNode(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: nodeResponse // Takes node out of pending state // TODO: May want to use cordon/uncordon terminology instead of "ispending". func uncordonNode(w http.ResponseWriter, r *http.Request) { @@ -624,6 +645,9 @@ func uncordonNode(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: nodeResponse func createEgressGateway(w http.ResponseWriter, r *http.Request) { var gateway models.EgressGatewayRequest var params = mux.Vars(r) @@ -660,6 +684,9 @@ func createEgressGateway(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: nodeResponse func deleteEgressGateway(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") var params = mux.Vars(r) @@ -691,6 +718,9 @@ func deleteEgressGateway(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: nodeResponse func createIngressGateway(w http.ResponseWriter, r *http.Request) { var params = mux.Vars(r) w.Header().Set("Content-Type", "application/json") @@ -720,6 +750,9 @@ func createIngressGateway(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: nodeResponse func deleteIngressGateway(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") var params = mux.Vars(r) @@ -749,6 +782,9 @@ func deleteIngressGateway(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: nodeResponse func updateNode(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -851,6 +887,9 @@ func updateNode(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: nodeResponse func deleteNode(w http.ResponseWriter, r *http.Request) { // Set header w.Header().Set("Content-Type", "application/json") diff --git a/controllers/relay.go b/controllers/relay.go index 6c5ad1a0..28b95506 100644 --- a/controllers/relay.go +++ b/controllers/relay.go @@ -20,6 +20,9 @@ import ( // // Security: // oauth +// +// Responses: +// 200: nodeResponse func createRelay(w http.ResponseWriter, r *http.Request) { var relay models.RelayRequest var params = mux.Vars(r) @@ -59,6 +62,9 @@ func createRelay(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: nodeResponse func deleteRelay(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") var params = mux.Vars(r) diff --git a/controllers/server.go b/controllers/server.go index 0ce49e4a..fb7541cc 100644 --- a/controllers/server.go +++ b/controllers/server.go @@ -75,6 +75,9 @@ func securityCheckServer(adminonly bool, next http.Handler) http.HandlerFunc { // // Security: // oauth +// +// Responses: +// 200: stringJSONResponse func removeNetwork(w http.ResponseWriter, r *http.Request) { // Set header w.Header().Set("Content-Type", "application/json") @@ -102,6 +105,9 @@ func removeNetwork(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: serverConfigResponse func getServerInfo(w http.ResponseWriter, r *http.Request) { // Set header w.Header().Set("Content-Type", "application/json") @@ -120,6 +126,9 @@ func getServerInfo(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: serverConfigResponse func getConfig(w http.ResponseWriter, r *http.Request) { // Set header w.Header().Set("Content-Type", "application/json") @@ -133,12 +142,15 @@ func getConfig(w http.ResponseWriter, r *http.Request) { // swagger:route POST /api/server/register nodes register // -// Registers a client with the server and return the Certificate Authority and certificate +// Registers a client with the server and return the Certificate Authority and certificate. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: registerResponse func register(w http.ResponseWriter, r *http.Request) { logger.Log(2, "processing registration request") w.Header().Set("Content-Type", "application/json") diff --git a/controllers/user.go b/controllers/user.go index 48872918..eddc7cef 100644 --- a/controllers/user.go +++ b/controllers/user.go @@ -39,6 +39,8 @@ func userHandlers(r *mux.Router) { // Security: // oauth // +// Responses: +// 200: successResponse func authenticateUser(response http.ResponseWriter, request *http.Request) { // Auth request consists of Mac Address and Password (from node that is authorizing @@ -103,6 +105,9 @@ func authenticateUser(response http.ResponseWriter, request *http.Request) { // // Security: // oauth +// +// Responses: +// 200: successResponse func hasAdmin(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -140,6 +145,9 @@ func GetUserInternal(username string) (models.User, error) { // // Security: // oauth +// +// Responses: +// 200: userBodyResponse func getUser(w http.ResponseWriter, r *http.Request) { // set header. w.Header().Set("Content-Type", "application/json") @@ -159,12 +167,15 @@ func getUser(w http.ResponseWriter, r *http.Request) { // swagger:route GET /api/users nodes getUsers // -// Get all users +// Get all users. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: userBodyResponse func getUsers(w http.ResponseWriter, r *http.Request) { // set header. w.Header().Set("Content-Type", "application/json") @@ -189,6 +200,9 @@ func getUsers(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: userBodyResponse func createAdmin(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -222,6 +236,9 @@ func createAdmin(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: userBodyResponse func createUser(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") @@ -246,12 +263,15 @@ func createUser(w http.ResponseWriter, r *http.Request) { // swagger:route PUT /api/users/networks/{username} nodes updateUserNetworks // -// Updates the networks of the given user +// Updates the networks of the given user. // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: userBodyResponse func updateUserNetworks(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") var params = mux.Vars(r) @@ -293,6 +313,9 @@ func updateUserNetworks(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: userBodyResponse func updateUser(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") var params = mux.Vars(r) @@ -335,12 +358,15 @@ func updateUser(w http.ResponseWriter, r *http.Request) { // swagger:route PUT /api/users/{username}/adm nodes updateUserAdm // -// Updates the given admin user's info (as long as the user is an admin) +// Updates the given admin user's info (as long as the user is an admin). // // Schemes: https // // Security: // oauth +// +// Responses: +// 200: userBodyResponse func updateUserAdm(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") var params = mux.Vars(r) @@ -390,6 +416,9 @@ func updateUserAdm(w http.ResponseWriter, r *http.Request) { // // Security: // oauth +// +// Responses: +// 200: userBodyResponse func deleteUser(w http.ResponseWriter, r *http.Request) { // Set header w.Header().Set("Content-Type", "application/json") diff --git a/k8s/client/netclient-daemonset.yaml b/k8s/client/netclient-daemonset.yaml index 1f1ab484..c4c20ce5 100644 --- a/k8s/client/netclient-daemonset.yaml +++ b/k8s/client/netclient-daemonset.yaml @@ -16,7 +16,7 @@ spec: hostNetwork: true containers: - name: netclient - image: gravitl/netclient-go:v0.15.1 + image: gravitl/netclient-go:v0.15.2 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/client/netclient.yaml b/k8s/client/netclient.yaml index 4b47aa77..fa8307ff 100644 --- a/k8s/client/netclient.yaml +++ b/k8s/client/netclient.yaml @@ -28,7 +28,7 @@ spec: # - "" containers: - name: netclient - image: gravitl/netclient:v0.15.1 + image: gravitl/netclient:v0.15.2 env: - name: TOKEN value: "TOKEN_VALUE" @@ -41,4 +41,4 @@ spec: - hostPath: path: /etc/netclient type: DirectoryOrCreate - name: etc-netclient \ No newline at end of file + name: etc-netclient diff --git a/k8s/server/netmaker-server.yaml b/k8s/server/netmaker-server.yaml index e2c6070b..ed2530b5 100644 --- a/k8s/server/netmaker-server.yaml +++ b/k8s/server/netmaker-server.yaml @@ -83,7 +83,7 @@ spec: value: "Kubernetes" - name: VERBOSITY value: "3" - image: gravitl/netmaker:v0.15.1 + image: gravitl/netmaker:v0.15.2 imagePullPolicy: Always name: netmaker ports: @@ -225,4 +225,4 @@ spec: # service: # name: netmaker-rest # port: -# number: 8081 \ No newline at end of file +# number: 8081 diff --git a/k8s/server/netmaker-ui.yaml b/k8s/server/netmaker-ui.yaml index 87727e0d..326d94a0 100644 --- a/k8s/server/netmaker-ui.yaml +++ b/k8s/server/netmaker-ui.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: netmaker-ui - image: gravitl/netmaker-ui:v0.15.1 + image: gravitl/netmaker-ui:v0.15.2 ports: - containerPort: 443 env: @@ -61,4 +61,4 @@ spec: # service: # name: netmaker-ui # port: -# number: 80 \ No newline at end of file +# number: 80 diff --git a/logic/gateway.go b/logic/gateway.go index ed74bbe5..25945f3c 100644 --- a/logic/gateway.go +++ b/logic/gateway.go @@ -14,6 +14,14 @@ import ( // CreateEgressGateway - creates an egress gateway func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, error) { + for i, cidr := range gateway.Ranges { + normalized, err := NormalizeCIDR(cidr) + if err != nil { + return models.Node{}, err + } + gateway.Ranges[i] = normalized + + } node, err := GetNodeByID(gateway.NodeID) if err != nil { return models.Node{}, err @@ -325,9 +333,6 @@ func firewallNFTCommandsCreateEgress(networkInterface string, gatewayInterface s postUp += "nft add table nat ; " postUp += "nft 'add chain ip nat prerouting { type nat hook prerouting priority 0 ;}' ; " postUp += "nft 'add chain ip nat postrouting { type nat hook postrouting priority 0 ;}' ; " - for _, networkCIDR := range gatewayranges { - postUp += "nft add rule nat postrouting iifname " + networkInterface + " oifname " + gatewayInterface + " ip saddr " + networkCIDR + " masquerade ; " - } postDown += "nft flush table filter ; " diff --git a/logic/networks.go b/logic/networks.go index 3802b9a3..0a3ad2dc 100644 --- a/logic/networks.go +++ b/logic/networks.go @@ -70,6 +70,20 @@ func DeleteNetwork(network string) error { // CreateNetwork - creates a network in database func CreateNetwork(network models.Network) (models.Network, error) { + if network.AddressRange != "" { + normalizedRange, err := NormalizeCIDR(network.AddressRange) + if err != nil { + return models.Network{}, err + } + network.AddressRange = normalizedRange + } + if network.AddressRange6 != "" { + normalizedRange, err := NormalizeCIDR(network.AddressRange6) + if err != nil { + return models.Network{}, err + } + network.AddressRange6 = normalizedRange + } network.SetDefaults() network.SetNodesLastModified() network.SetNetworkLastModified() @@ -659,8 +673,7 @@ func deleteInterface(ifacename string, postdown string) error { } _, err = ncutils.RunCmd(ipExec+" link del "+ifacename, false) if postdown != "" { - runcmds := strings.Split(postdown, "; ") - err = ncutils.RunCmds(runcmds, false) + _, err = ncutils.RunCmd(postdown, false) } } return err diff --git a/logic/server.go b/logic/server.go index 0a7933fd..56897351 100644 --- a/logic/server.go +++ b/logic/server.go @@ -1,6 +1,7 @@ package logic import ( + "encoding/json" "errors" "fmt" "net" @@ -8,6 +9,7 @@ import ( "runtime" "strings" + "github.com/gravitl/netmaker/database" "github.com/gravitl/netmaker/logger" "github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/netclient/ncutils" @@ -285,3 +287,40 @@ func serverPush(serverNode *models.Node) error { serverNode.SetLastCheckIn() return UpdateNode(serverNode, serverNode) } + +// AddServerIDIfNotPresent - add's current server ID to DB if not present +func AddServerIDIfNotPresent() error { + currentNodeID := servercfg.GetNodeID() + currentServerIDs := models.ServerIDs{} + + record, err := database.FetchRecord(database.SERVERCONF_TABLE_NAME, server_id_key) + if err != nil && !database.IsEmptyRecord(err) { + return err + } else if err == nil { + if err = json.Unmarshal([]byte(record), ¤tServerIDs); err != nil { + return err + } + } + + if !StringSliceContains(currentServerIDs.ServerIDs, currentNodeID) { + currentServerIDs.ServerIDs = append(currentServerIDs.ServerIDs, currentNodeID) + data, err := json.Marshal(¤tServerIDs) + if err != nil { + return err + } + return database.Insert(server_id_key, string(data), database.SERVERCONF_TABLE_NAME) + } + + return nil +} + +// GetServerCount - fetches server count from DB +func GetServerCount() int { + if record, err := database.FetchRecord(database.SERVERCONF_TABLE_NAME, server_id_key); err == nil { + currentServerIDs := models.ServerIDs{} + if err = json.Unmarshal([]byte(record), ¤tServerIDs); err == nil { + return len(currentServerIDs.ServerIDs) + } + } + return 1 +} diff --git a/logic/serverconf.go b/logic/serverconf.go index 0ba1e258..68469663 100644 --- a/logic/serverconf.go +++ b/logic/serverconf.go @@ -6,6 +6,9 @@ import ( "github.com/gravitl/netmaker/database" ) +// constant for database key for storing server ids +const server_id_key = "nm-server-id" + type serverData struct { PrivateKey string `json:"privatekey,omitempty" bson:"privatekey,omitempty"` } diff --git a/logic/telemetry.go b/logic/telemetry.go index 5b91095b..2eeef79e 100644 --- a/logic/telemetry.go +++ b/logic/telemetry.go @@ -43,6 +43,7 @@ func sendTelemetry() error { Event: "daily checkin", Properties: posthog.NewProperties(). Set("nodes", d.Nodes). + Set("servers", d.Servers). Set("non-server nodes", d.Count.NonServer). Set("extclients", d.ExtClients). Set("users", d.Users). @@ -65,6 +66,7 @@ func fetchTelemetryData() (telemetryData, error) { data.Users = getDBLength(database.USERS_TABLE_NAME) data.Networks = getDBLength(database.NETWORKS_TABLE_NAME) data.Version = servercfg.GetVersion() + data.Servers = GetServerCount() nodes, err := GetAllNodes() if err == nil { data.Nodes = len(nodes) @@ -140,6 +142,7 @@ type telemetryData struct { Users int Count clientCount Networks int + Servers int Version string } diff --git a/logic/util.go b/logic/util.go index e177cad6..c22ce818 100644 --- a/logic/util.go +++ b/logic/util.go @@ -13,6 +13,7 @@ import ( "strings" "time" + "github.com/c-robinson/iplib" "github.com/gravitl/netmaker/database" "github.com/gravitl/netmaker/logger" "github.com/gravitl/netmaker/models" @@ -170,6 +171,22 @@ func ShouldPublishPeerPorts(serverNode *models.Node) bool { return false } +// NormalCIDR - returns the first address of CIDR +func NormalizeCIDR(address string) (string, error) { + ip, IPNet, err := net.ParseCIDR(address) + if err != nil { + return "", err + } + if ip.To4() == nil { + net6 := iplib.Net6FromStr(IPNet.String()) + IPNet.IP = net6.FirstAddress() + } else { + net4 := iplib.Net4FromStr(IPNet.String()) + IPNet.IP = net4.NetworkAddress() + } + return IPNet.String(), nil +} + func getNetworkProtocols(cidrs []string) (bool, bool) { ipv4 := false ipv6 := false diff --git a/logic/wireguard.go b/logic/wireguard.go index 5078b7be..e85aee61 100644 --- a/logic/wireguard.go +++ b/logic/wireguard.go @@ -191,8 +191,7 @@ func removeLocalServer(node *models.Node) error { logger.Log(1, out) } if node.PostDown != "" { - runcmds := strings.Split(node.PostDown, "; ") - _ = ncutils.RunCmds(runcmds, false) + ncutils.RunCmd(node.PostDown, false) } } } diff --git a/main.go b/main.go index 5b19dfed..e0fea725 100644 --- a/main.go +++ b/main.go @@ -74,7 +74,9 @@ func initialize() { // Client Mode Prereq Check } logger.Log(0, "database successfully connected") logic.SetJWTSecret() - + if err = logic.AddServerIDIfNotPresent(); err != nil { + logger.Log(1, "failed to save server ID") + } err = logic.TimerCheckpoint() if err != nil { logger.Log(1, "Timer error occurred: ", err.Error()) diff --git a/models/node.go b/models/node.go index 59f252c6..c4a477ca 100644 --- a/models/node.go +++ b/models/node.go @@ -39,12 +39,18 @@ const ( var seededRand *rand.Rand = rand.New( rand.NewSource(time.Now().UnixNano())) +// NodeCheckin - struct for node checkins with server +type NodeCheckin struct { + Version string + Connected string +} + // Node - struct for node model type Node struct { ID string `json:"id,omitempty" bson:"id,omitempty" yaml:"id,omitempty" validate:"required,min=5,id_unique"` Address string `json:"address" bson:"address" yaml:"address" validate:"omitempty,ipv4"` Address6 string `json:"address6" bson:"address6" yaml:"address6" validate:"omitempty,ipv6"` - LocalAddress string `json:"localaddress" bson:"localaddress" yaml:"localaddress" validate:"omitempty,ip"` + LocalAddress string `json:"localaddress" bson:"localaddress" yaml:"localaddress" validate:"omitempty"` Name string `json:"name" bson:"name" yaml:"name" validate:"omitempty,max=62,in_charset"` NetworkSettings Network `json:"networksettings" bson:"networksettings" yaml:"networksettings" validate:"-"` ListenPort int32 `json:"listenport" bson:"listenport" yaml:"listenport" validate:"omitempty,numeric,min=1024,max=65535"` diff --git a/models/structs.go b/models/structs.go index 04b6fe9e..79f72a93 100644 --- a/models/structs.go +++ b/models/structs.go @@ -224,3 +224,8 @@ func (user *User) NameInCharSet() bool { } return true } + +// ServerIDs - struct to hold server ids. +type ServerIDs struct { + ServerIDs []string `json:"server_ids"` +} diff --git a/mq/handlers.go b/mq/handlers.go index 22bddfce..e00646b7 100644 --- a/mq/handlers.go +++ b/mq/handlers.go @@ -36,13 +36,19 @@ func Ping(client mqtt.Client, msg mqtt.Message) { logger.Log(0, record) return } - version, decryptErr := decryptMsg(&node, msg.Payload()) + decrypted, decryptErr := decryptMsg(&node, msg.Payload()) if decryptErr != nil { logger.Log(0, "error decrypting when updating node ", node.ID, decryptErr.Error()) return } + var checkin models.NodeCheckin + if err := json.Unmarshal(decrypted, &checkin); err != nil { + logger.Log(1, "error unmarshaling payload ", err.Error()) + return + } node.SetLastCheckIn() - node.Version = string(version) + node.Version = checkin.Version + node.Connected = checkin.Connected if err := logic.UpdateNode(&node, &node); err != nil { logger.Log(0, "error updating node", node.Name, node.ID, " on checkin", err.Error()) return diff --git a/netclient/build/netclient.service b/netclient/build/netclient.service index 97d25efd..e10f38e2 100644 --- a/netclient/build/netclient.service +++ b/netclient/build/netclient.service @@ -2,7 +2,7 @@ Description=Netclient Daemon Documentation=https://docs.netmaker.org https://k8s.netmaker.org After=network-online.target -Wants=network-online.target systemd-networkd-wait-online.service +Wants=network-online.target [Service] User=root diff --git a/netclient/functions/common.go b/netclient/functions/common.go index 2c4b40ec..a8b23c80 100644 --- a/netclient/functions/common.go +++ b/netclient/functions/common.go @@ -77,6 +77,9 @@ func getPrivateAddr() (string, error) { if local == "" { err = errors.New("could not find local ip") } + if net.ParseIP(local).To16() != nil { + local = "[" + local + "]" + } return local, err } diff --git a/netclient/functions/connection.go b/netclient/functions/connection.go index b727b0ef..f151a923 100644 --- a/netclient/functions/connection.go +++ b/netclient/functions/connection.go @@ -3,8 +3,8 @@ package functions import ( "fmt" - "github.com/gravitl/netmaker/logger" "github.com/gravitl/netmaker/netclient/config" + "github.com/gravitl/netmaker/netclient/daemon" "github.com/gravitl/netmaker/netclient/ncutils" "github.com/gravitl/netmaker/netclient/wireguard" ) @@ -24,11 +24,14 @@ func Connect(network string) error { if err = wireguard.ApplyConf(&cfg.Node, cfg.Node.Interface, filePath); err != nil { return err } - if err := PublishNodeUpdate(cfg); err != nil { - logger.Log(0, "network:", cfg.Node.Network, "could not publish connection change, it will likely get reverted") + if err := setupMQTTSingleton(cfg); err != nil { + return err } - - return config.ModNodeConfig(&cfg.Node) + if err := PublishNodeUpdate(cfg); err != nil { + return err + } + daemon.Restart() + return nil } // Disconnect - attempts to disconnect a node on given network @@ -46,9 +49,12 @@ func Disconnect(network string) error { if err = wireguard.ApplyConf(&cfg.Node, cfg.Node.Interface, filePath); err != nil { return err } - if err := PublishNodeUpdate(cfg); err != nil { - logger.Log(0, "network:", cfg.Node.Network, "could not publish connection change, it will likely get reverted") + if err := setupMQTTSingleton(cfg); err != nil { + return err } - - return config.ModNodeConfig(&cfg.Node) + if err := PublishNodeUpdate(cfg); err != nil { + return err + } + daemon.Restart() + return nil } diff --git a/netclient/functions/daemon.go b/netclient/functions/daemon.go index c00a91ba..993059be 100644 --- a/netclient/functions/daemon.go +++ b/netclient/functions/daemon.go @@ -87,8 +87,6 @@ func Daemon() error { func startGoRoutines(wg *sync.WaitGroup) context.CancelFunc { ctx, cancel := context.WithCancel(context.Background()) - wg.Add(1) - go Checkin(ctx, wg) serverSet := make(map[string]bool) networks, _ := ncutils.GetSystemNetworks() for _, network := range networks { @@ -116,6 +114,8 @@ func startGoRoutines(wg *sync.WaitGroup) context.CancelFunc { go messageQueue(ctx, wg, &cfg) } } + wg.Add(1) + go Checkin(ctx, wg) return cancel } @@ -232,6 +232,33 @@ func NewTLSConfig(server string) (*tls.Config, error) { } +// func setMQTTSingenton creates a connection to broker for single use (ie to publish a message) +// only to be called from cli (eg. connect/disconnect, join, leave) and not from daemon --- +func setupMQTTSingleton(cfg *config.ClientConfig) error { + opts := mqtt.NewClientOptions() + server := cfg.Server.Server + port := cfg.Server.MQPort + opts.AddBroker("ssl://" + server + ":" + port) + tlsConfig, err := NewTLSConfig(server) + if err != nil { + logger.Log(0, "failed to get TLS config for", server, err.Error()) + return err + } + opts.SetTLSConfig(tlsConfig) + mqclient = mqtt.NewClient(opts) + var connecterr error + opts.SetClientID(ncutils.MakeRandomString(23)) + if token := mqclient.Connect(); !token.WaitTimeout(30*time.Second) || token.Error() != nil { + logger.Log(0, "unable to connect to broker, retrying ...") + if token.Error() == nil { + connecterr = errors.New("connect timeout") + } else { + connecterr = token.Error() + } + } + return connecterr +} + // setupMQTT creates a connection to broker and returns client // this function is primarily used to create a connection to publish to the broker func setupMQTT(cfg *config.ClientConfig) error { diff --git a/netclient/functions/mqpublish.go b/netclient/functions/mqpublish.go index df2706de..8ee1cf6e 100644 --- a/netclient/functions/mqpublish.go +++ b/netclient/functions/mqpublish.go @@ -26,13 +26,16 @@ import ( func Checkin(ctx context.Context, wg *sync.WaitGroup) { logger.Log(2, "starting checkin goroutine") defer wg.Done() + checkin() + ticker := time.NewTicker(time.Second * 60) + defer ticker.Stop() for { select { case <-ctx.Done(): logger.Log(0, "checkin routine closed") return //delay should be configuraable -> use cfg.Node.NetworkSettings.DefaultCheckInInterval ?? - case <-time.After(time.Second * 60): + case <-ticker.C: checkin() } } @@ -123,7 +126,15 @@ func PublishNodeUpdate(nodeCfg *config.ClientConfig) error { // Hello -- ping the broker to let server know node it's alive and well func Hello(nodeCfg *config.ClientConfig) { - if err := publish(nodeCfg, fmt.Sprintf("ping/%s", nodeCfg.Node.ID), []byte(ncutils.Version), 0); err != nil { + var checkin models.NodeCheckin + checkin.Version = ncutils.Version + checkin.Connected = nodeCfg.Node.Connected + data, err := json.Marshal(checkin) + if err != nil { + logger.Log(0, "unable to marshal checkin data", err.Error()) + return + } + if err := publish(nodeCfg, fmt.Sprintf("ping/%s", nodeCfg.Node.ID), data, 0); err != nil { logger.Log(0, fmt.Sprintf("Network: %s error publishing ping, %v", nodeCfg.Node.Network, err)) logger.Log(0, "running pull on "+nodeCfg.Node.Network+" to reconnect") _, err := Pull(nodeCfg.Node.Network, true) diff --git a/netclient/ncutils/netclientutils.go b/netclient/ncutils/netclientutils.go index 78ff8d49..6b1192e7 100644 --- a/netclient/ncutils/netclientutils.go +++ b/netclient/ncutils/netclientutils.go @@ -437,6 +437,10 @@ func Copy(src, dst string) error { func RunCmds(commands []string, printerr bool) error { var err error for _, command := range commands { + //prevent panic + if len(strings.Trim(command, " ")) == 0 { + continue + } args := strings.Fields(command) out, err := exec.Command(args[0], args[1:]...).CombinedOutput() if err != nil && printerr { diff --git a/netclient/netclient.exe.manifest.xml b/netclient/netclient.exe.manifest.xml index 1f332fef..285f21be 100644 --- a/netclient/netclient.exe.manifest.xml +++ b/netclient/netclient.exe.manifest.xml @@ -1,7 +1,7 @@ ” There are two methods to obtain YOUR_SECRET_KEY: 1. Using the masterkey. By default, this value is “secret key,” but you should change this on your instance and keep it secure. This value can be set via env var at startup or in a config file (config/environments/< env >.yaml). See the [Netmaker](https://docs.netmaker.org/index.html) documentation for more details. 2. Using a JWT received for a node. This can be retrieved by calling the /api/nodes//authenticate endpoint, as documented below. title: Netmaker - version: 0.15.1 + version: 0.15.2 paths: /api/dns: get: - description: Gets all DNS entries operationId: getAllDNS + responses: + "200": + $ref: '#/responses/dnsResponse' schemes: - https + summary: Gets all DNS entries. tags: - dns /api/dns/{network}: post: - description: Create a DNS entry operationId: createDNS + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: DNS Entry + in: body + name: body + schema: + items: + $ref: '#/definitions/DNSEntry' + type: array + x-go-name: Body + responses: + "200": + $ref: '#/responses/dnsResponse' schemes: - https + summary: Create a DNS entry. tags: - dns /api/dns/{network}/{domain}: delete: - description: Delete a DNS entry operationId: deleteDNS + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: Domain + in: path + name: domain + required: true + type: string + x-go-name: Domain + responses: + "200": + $ref: '#/responses/stringJSONResponse' schemes: - https + summary: Delete a DNS entry. tags: - dns /api/dns/adm/{network}: get: - description: Gets all DNS entries associated with the network operationId: getDNS + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + responses: + "200": + $ref: '#/responses/dnsResponse' schemes: - https + summary: Gets all DNS entries associated with the network. tags: - dns /api/dns/adm/{network}/custom: get: - description: Gets custom DNS entries associated with a network operationId: getCustomDNS + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + responses: + "200": + $ref: '#/responses/dnsResponse' schemes: - https + summary: Gets custom DNS entries associated with a network. tags: - dns /api/dns/adm/{network}/nodes: get: - description: Gets node DNS entries associated with a network operationId: getNodeDNS + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network schemes: - https + summary: Gets node DNS entries associated with a network. tags: - dns /api/dns/adm/pushdns: post: - description: Push DNS entries to nameserver operationId: pushDNS + responses: + "200": + $ref: '#/responses/dnsStringJSONResponse' schemes: - https + summary: Push DNS entries to nameserver. tags: - dns /api/extclients: get: - operationId: getExtClient + operationId: getAllExtClients + parameters: + - description: Networks + in: body + name: networks + schema: + items: + type: string + type: array + x-go-name: Networks + responses: + "200": + $ref: '#/responses/extClientSliceResponse' schemes: - https - summary: Get an individual extclient. + summary: A separate function to get all extclients, not just extclients for a particular network. tags: - ext_client /api/extclients/{network}: get: - description: |- - Get all extclients associated with network - Gets all extclients associated with network, including pending extclients + description: Gets all extclients associated with network, including pending extclients. operationId: getNetworkExtClients + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + responses: + "200": + $ref: '#/responses/extClientSliceResponse' schemes: - https + summary: Get all extclients associated with network. tags: - ext_client /api/extclients/{network}/{clientid}: delete: operationId: deleteExtClient + parameters: + - description: Client ID + in: path + name: clientid + required: true + type: string + x-go-name: ClientID + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + responses: + "200": + $ref: '#/responses/successResponse' schemes: - https summary: Delete an individual extclient. tags: - ext_client + get: + operationId: getExtClient + parameters: + - description: Client ID + in: path + name: clientid + required: true + type: string + x-go-name: ClientID + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + responses: + "200": + $ref: '#/responses/extClientResponse' + schemes: + - https + summary: Get an individual extclient. + tags: + - ext_client put: operationId: updateExtClient + parameters: + - description: Client ID + in: path + name: clientid + required: true + type: string + x-go-name: ClientID + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: ExtClient + in: body + name: ext_client + schema: + $ref: '#/definitions/ExtClient' + x-go-name: ExtClient + responses: + "200": + $ref: '#/responses/extClientResponse' schemes: - https summary: Update an individual extclient. @@ -107,6 +989,22 @@ paths: /api/extclients/{network}/{clientid}/{type}: get: operationId: getExtClientConf + parameters: + - description: Client ID + in: path + name: clientid + required: true + type: string + x-go-name: ClientID + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + responses: + "200": + $ref: '#/responses/extClientResponse' schemes: - https summary: Get an individual extclient. @@ -115,6 +1013,25 @@ paths: /api/extclients/{network}/{nodeid}: post: operationId: createExtClient + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: Node ID + in: path + name: node + required: true + type: string + x-go-name: NodeID + - description: Custom ExtClient + in: body + name: custom_ext_client + schema: + $ref: '#/definitions/CustomExtClient' + x-go-name: CustomExtClient schemes: - https summary: Create an individual extclient. Must have valid key and be unique. @@ -122,45 +1039,102 @@ paths: - ext_client /api/getip: get: - description: Get the current public IP address operationId: getPublicIP + responses: + "200": + $ref: '#/responses/byteArrayResponse' schemes: - https + summary: Get the current public IP address. tags: - ipservice /api/networks: get: - description: Get a network - operationId: getNetwork + operationId: getNetworks + parameters: + - description: 'name: networks' + in: header + items: + type: string + name: networks + type: array + x-go-name: Networks + responses: + "200": + $ref: '#/responses/getNetworksSliceResponse' schemes: - https + summary: Lists all networks. tags: - networks post: - description: Create a network operationId: createNetwork + parameters: + - description: Network + in: body + name: network + schema: + $ref: '#/definitions/Network' + x-go-name: Network + responses: + "200": + $ref: '#/responses/networkBodyResponse' schemes: - https + summary: Create a network. tags: - networks /api/networks/{networkname}: delete: operationId: deleteNetwork + responses: + "200": + $ref: '#/responses/stringJSONResponse' schemes: - https summary: Delete a network. Will not delete if there are any nodes that belong to the network. tags: - networks - put: - description: Update a network - operationId: updateNetwork + get: + operationId: getNetwork + responses: + "200": + $ref: '#/responses/networkBodyResponse' schemes: - https + summary: Get a network. + tags: + - networks + put: + operationId: updateNetwork + parameters: + - description: Network + in: body + name: network + schema: + $ref: '#/definitions/Network' + x-go-name: Network + responses: + "200": + $ref: '#/responses/networkBodyResponse' + schemes: + - https + summary: Update a network. tags: - networks /api/networks/{networkname}/acls: get: operationId: getNetworkACL + parameters: + - description: ACL Container + in: body + name: acl_container + schema: + $ref: '#/definitions/ACLContainer' + x-go-name: ACLContainer + responses: + "200": + $ref: '#/responses/aclContainerResponse' schemes: - https summary: Get a network ACL (Access Control List). @@ -168,6 +1142,16 @@ paths: - networks put: operationId: updateNetworkACL + parameters: + - description: ACL Container + in: body + name: acl_container + schema: + $ref: '#/definitions/ACLContainer' + x-go-name: ACLContainer + responses: + "200": + $ref: '#/responses/aclContainerResponse' schemes: - https summary: Update a network ACL (Access Control List). @@ -176,6 +1160,9 @@ paths: /api/networks/{networkname}/keys: get: operationId: getAccessKeys + responses: + "200": + $ref: '#/responses/accessKeySliceBodyResponse' schemes: - https summary: Get network access keys for a network. @@ -183,14 +1170,34 @@ paths: - networks post: operationId: createAccessKey + parameters: + - description: Access Key + in: body + name: access_key + schema: + $ref: '#/definitions/AccessKey' + x-go-name: AccessKey + responses: + "200": + $ref: '#/responses/accessKeyBodyResponse' schemes: - https summary: Create a network access key. tags: - networks /api/networks/{networkname}/keys/{name}: - get: + delete: operationId: deleteAccessKey + parameters: + - description: Access Key Name + in: path + name: access_key_name + required: true + type: string + x-go-name: AccessKeyName + responses: + "200": + description: "" schemes: - https summary: Delete a network access key. @@ -199,6 +1206,9 @@ paths: /api/networks/{networkname}/keyupdate: post: operationId: keyUpdate + responses: + "200": + $ref: '#/responses/networkBodyResponse' schemes: - https summary: Update keys for a network. @@ -206,15 +1216,21 @@ paths: - networks /api/networks/{networkname}/nodelimit: put: - description: Update a network's node limit operationId: updateNetworkNodeLimit + responses: + "200": + $ref: '#/responses/networkBodyResponse' schemes: - https + summary: Update a network's node limit. tags: - networks /api/nodes: get: operationId: getAllNodes + responses: + "200": + $ref: '#/responses/nodeSliceResponse' schemes: - https summary: Get all nodes across all networks. @@ -222,14 +1238,34 @@ paths: - nodes /api/nodes/{network}: get: - description: Gets all nodes associated with network including pending nodes operationId: getNetworkNodes + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + responses: + "200": + $ref: '#/responses/nodeSliceResponse' schemes: - https + summary: Gets all nodes associated with network including pending nodes. tags: - nodes post: operationId: createNode + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + responses: + "200": + $ref: '#/responses/nodeGetResponse' schemes: - https summary: Create a node on a network. @@ -238,6 +1274,28 @@ paths: /api/nodes/{network}/{nodeid}: delete: operationId: deleteNode + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: Node ID + in: path + name: nodeid + required: true + type: string + x-go-name: NodeID + - description: Node + in: body + name: node + schema: + $ref: '#/definitions/Node' + x-go-name: Node + responses: + "200": + $ref: '#/responses/nodeResponse' schemes: - https summary: Delete an individual node. @@ -245,6 +1303,22 @@ paths: - nodes get: operationId: getNode + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: Node ID + in: path + name: nodeid + required: true + type: string + x-go-name: NodeID + responses: + "200": + $ref: '#/responses/nodeResponse' schemes: - https summary: Get an individual node. @@ -252,6 +1326,28 @@ paths: - nodes put: operationId: updateNode + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: Node ID + in: path + name: nodeid + required: true + type: string + x-go-name: NodeID + - description: Node + in: body + name: node + schema: + $ref: '#/definitions/Node' + x-go-name: Node + responses: + "200": + $ref: '#/responses/nodeResponse' schemes: - https summary: Update an individual node. @@ -260,17 +1356,52 @@ paths: /api/nodes/{network}/{nodeid}/approve: post: operationId: uncordonNode + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: Node ID + in: path + name: nodeid + required: true + type: string + x-go-name: NodeID + responses: + "200": + $ref: '#/responses/nodeResponse' schemes: - https - security: - - TODO: - - May summary: Takes a node out of pending state. tags: - nodes /api/nodes/{network}/{nodeid}/creategateway: post: operationId: createEgressGateway + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: Node ID + in: path + name: nodeid + required: true + type: string + x-go-name: NodeID + - description: Egress Gateway Request + in: body + name: egress_gateway_request + schema: + $ref: '#/definitions/EgressGatewayRequest' + x-go-name: EgressGatewayRequest + responses: + "200": + $ref: '#/responses/nodeResponse' schemes: - https summary: Create an egress gateway. @@ -279,6 +1410,22 @@ paths: /api/nodes/{network}/{nodeid}/createingress: post: operationId: createIngressGateway + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: Node ID + in: path + name: nodeid + required: true + type: string + x-go-name: NodeID + responses: + "200": + $ref: '#/responses/nodeResponse' schemes: - https summary: Create an ingress gateway. @@ -287,6 +1434,28 @@ paths: /api/nodes/{network}/{nodeid}/createrelay: post: operationId: createRelay + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: Node ID + in: path + name: nodeid + required: true + type: string + x-go-name: NodeID + - description: Relay Request + in: body + name: relay_request + schema: + $ref: '#/definitions/RelayRequest' + x-go-name: RelayRequest + responses: + "200": + $ref: '#/responses/nodeResponse' schemes: - https summary: Create a relay. @@ -295,6 +1464,22 @@ paths: /api/nodes/{network}/{nodeid}/deletegateway: delete: operationId: deleteEgressGateway + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: Node ID + in: path + name: nodeid + required: true + type: string + x-go-name: NodeID + responses: + "200": + $ref: '#/responses/nodeResponse' schemes: - https summary: Delete an egress gateway. @@ -303,6 +1488,22 @@ paths: /api/nodes/{network}/{nodeid}/deleteingress: delete: operationId: deleteIngressGateway + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: Node ID + in: path + name: nodeid + required: true + type: string + x-go-name: NodeID + responses: + "200": + $ref: '#/responses/nodeResponse' schemes: - https summary: Delete an ingress gateway. @@ -311,6 +1512,22 @@ paths: /api/nodes/{network}/{nodeid}/deleterelay: delete: operationId: deleteRelay + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: Node ID + in: path + name: nodeid + required: true + type: string + x-go-name: NodeID + responses: + "200": + $ref: '#/responses/nodeResponse' schemes: - https summary: Remove a relay. @@ -319,6 +1536,22 @@ paths: /api/nodes/adm/{network}/authenticate: post: operationId: authenticate + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + - description: AuthParams + in: body + name: auth_params + schema: + $ref: '#/definitions/AuthParams' + x-go-name: AuthParams + responses: + "200": + $ref: '#/responses/successResponse' schemes: - https summary: Authenticate to make further API calls related to a network. @@ -327,28 +1560,35 @@ paths: /api/nodes/adm/{network}/lastmodified: get: operationId: getLastModified + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + responses: + "200": + $ref: '#/responses/nodeLastModifiedResponse' schemes: - https - security: - - TODO: - - This - - Potential way to do this: - - "On" - - set summary: Get the time that a network of nodes was last modified. tags: - nodes /api/oauth/login: get: - description: Handles OAuth login operationId: HandleAuthLogin schemes: - https + summary: Handles OAuth login. tags: - nodes /api/server/getconfig: get: operationId: getConfig + responses: + "200": + $ref: '#/responses/serverConfigResponse' schemes: - https summary: Get the server configuration. @@ -357,6 +1597,9 @@ paths: /api/server/getserverinfo: get: operationId: getServerInfo + responses: + "200": + $ref: '#/responses/serverConfigResponse' schemes: - https summary: Get the server configuration. @@ -364,15 +1607,35 @@ paths: - nodes /api/server/register: post: - description: Registers a client with the server and return the Certificate Authority and certificate operationId: register + parameters: + - description: Register Request + in: body + name: register_request + schema: + $ref: '#/definitions/RegisterRequest' + x-go-name: RegisterRequest + responses: + "200": + $ref: '#/responses/registerResponse' schemes: - https + summary: Registers a client with the server and return the Certificate Authority and certificate. tags: - nodes /api/server/removenetwork/{network}: delete: operationId: removeNetwork + parameters: + - description: Network + in: path + name: network + required: true + type: string + x-go-name: Network + responses: + "200": + $ref: '#/responses/stringJSONResponse' schemes: - https summary: Remove a network from the server. @@ -380,15 +1643,28 @@ paths: - nodes /api/users: get: - description: Get all users operationId: getUsers + responses: + "200": + $ref: '#/responses/userBodyResponse' schemes: - https + summary: Get all users. tags: - nodes /api/users/{username}: delete: operationId: deleteUser + parameters: + - description: Username + in: path + name: username + required: true + type: string + x-go-name: Username + responses: + "200": + $ref: '#/responses/userBodyResponse' schemes: - https summary: Delete a user. @@ -396,6 +1672,16 @@ paths: - nodes get: operationId: getUser + parameters: + - description: Username + in: path + name: username + required: true + type: string + x-go-name: Username + responses: + "200": + $ref: '#/responses/userBodyResponse' schemes: - https summary: Get an individual user. @@ -403,6 +1689,22 @@ paths: - nodes post: operationId: createUser + parameters: + - description: User + in: body + name: user + schema: + $ref: '#/definitions/User' + x-go-name: User + - description: Username + in: path + name: username + required: true + type: string + x-go-name: Username + responses: + "200": + $ref: '#/responses/userBodyResponse' schemes: - https summary: Create a user. @@ -410,6 +1712,22 @@ paths: - nodes put: operationId: updateUser + parameters: + - description: User + in: body + name: user + schema: + $ref: '#/definitions/User' + x-go-name: User + - description: Username + in: path + name: username + required: true + type: string + x-go-name: Username + responses: + "200": + $ref: '#/responses/userBodyResponse' schemes: - https summary: Update a user. @@ -417,15 +1735,35 @@ paths: - nodes /api/users/{username}/adm: put: - description: Updates the given admin user's info (as long as the user is an admin) operationId: updateUserAdm + parameters: + - description: Username + in: path + name: username + required: true + type: string + x-go-name: Username + responses: + "200": + $ref: '#/responses/userBodyResponse' schemes: - https + summary: Updates the given admin user's info (as long as the user is an admin). tags: - nodes /api/users/adm/authenticate: post: operationId: authenticateUser + parameters: + - description: User Auth Params + in: body + name: user_auth_params + schema: + $ref: '#/definitions/UserAuthParams' + x-go-name: UserAuthParams + responses: + "200": + $ref: '#/responses/successResponse' schemes: - https summary: Node authenticates using its password and retrieves a JWT for authorization. @@ -434,6 +1772,16 @@ paths: /api/users/adm/createadmin: post: operationId: createAdmin + parameters: + - description: User + in: body + name: user + schema: + $ref: '#/definitions/User' + x-go-name: User + responses: + "200": + $ref: '#/responses/userBodyResponse' schemes: - https summary: Make a user an admin. @@ -442,6 +1790,9 @@ paths: /api/users/adm/hasadmin: get: operationId: hasAdmin + responses: + "200": + $ref: '#/responses/successResponse' schemes: - https summary: Checks whether the server has an admin. @@ -449,22 +1800,118 @@ paths: - nodes /api/users/networks/{username}: put: - description: Updates the networks of the given user operationId: updateUserNetworks + parameters: + - description: User + in: body + name: user + schema: + $ref: '#/definitions/User' + x-go-name: User + - description: Username + in: path + name: username + required: true + type: string + x-go-name: Username + responses: + "200": + $ref: '#/responses/userBodyResponse' schemes: - https + summary: Updates the networks of the given user. tags: - nodes /meshclient/files/{filename}: get: - description: Retrieve a file from the file server operationId: fileServer schemes: - https + summary: Retrieve a file from the file server. tags: - meshclient produces: - application/json +responses: + accessKeyBodyResponse: + description: "" + schema: + $ref: '#/definitions/AccessKey' + accessKeySliceBodyResponse: + description: "" + schema: + items: + $ref: '#/definitions/AccessKey' + type: array + aclContainerResponse: + description: "" + schema: + $ref: '#/definitions/ACLContainer' + boolResponse: + description: "" + byteArrayResponse: + description: "" + schema: + items: + format: uint8 + type: integer + type: array + dnsResponse: + description: Success + schema: + items: + $ref: '#/definitions/DNSEntry' + type: array + extClientResponse: + description: "" + schema: + $ref: '#/definitions/ExtClient' + extClientSliceResponse: + description: "" + schema: + items: + $ref: '#/definitions/ExtClient' + type: array + getNetworksSliceResponse: + description: "" + schema: + items: + $ref: '#/definitions/Network' + type: array + networkBodyResponse: + description: "" + schema: + $ref: '#/definitions/Network' + nodeGetResponse: + description: "" + schema: + $ref: '#/definitions/NodeGet' + nodeLastModifiedResponse: + description: "" + nodeResponse: + description: "" + schema: + $ref: '#/definitions/Node' + nodeSliceResponse: + description: "" + schema: + items: + $ref: '#/definitions/Node' + type: array + serverConfigResponse: + description: "" + schema: + $ref: '#/definitions/ServerConfig' + stringJSONResponse: + description: "" + successResponse: + description: "" + schema: + $ref: '#/definitions/SuccessResponse' + userBodyResponse: + description: "" + schema: + $ref: '#/definitions/User' schemes: - https swagger: "2.0"