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

Merge pull request #1842 from gravitl/bugfix_empty_extclientid

Browse source 
Do not validate empty ext client ids
This commit is contained in:
dcarns 2022-12-21 14:26:35 -05:00 • committed by GitHub
commit 1c14e84f34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
controllers/ext_client.go
View file

@ -43,14 +43,13 @@ func checkIngressExists(nodeID string) bool {
// Get all extclients associated with network. // Get all extclients associated with network.
// Gets all extclients associated with network, including pending extclients. // Gets all extclients associated with network, including pending extclients.
// //
// Schemes: https // Schemes: https
// //
// Security: // Security:
// oauth // oauth
//
// Responses:
// 200: extClientSliceResponse
// //
// Responses:
// 200: extClientSliceResponse
func getNetworkExtClients(w http.ResponseWriter, r *http.Request) { func getNetworkExtClients(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
@ -75,14 +74,13 @@ func getNetworkExtClients(w http.ResponseWriter, r *http.Request) {
// //
// A separate function to get all extclients, not just extclients for a particular network. // A separate function to get all extclients, not just extclients for a particular network.
// //
// Schemes: https
// //
// Schemes: https // Security:
// oauth
// //
// Security: // Responses:
// oauth // 200: extClientSliceResponse
//
// Responses:
// 200: extClientSliceResponse
// //
// Not quite sure if this is necessary. Probably necessary based on front end but may // 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 // want to review after iteration 1 if it's being used or not
@ -126,14 +124,13 @@ func getAllExtClients(w http.ResponseWriter, r *http.Request) {
// //
// Get an individual extclient. // Get an individual extclient.
// //
// Schemes: https // Schemes: https
// //
// Security: // Security:
// oauth // oauth
//
// Responses:
// 200: extClientResponse
// //
// Responses:
// 200: extClientResponse
func getExtClient(w http.ResponseWriter, r *http.Request) { func getExtClient(w http.ResponseWriter, r *http.Request) {
// set header. // set header.
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
@ -158,14 +155,13 @@ func getExtClient(w http.ResponseWriter, r *http.Request) {
// //
// Get an individual extclient. // Get an individual extclient.
// //
// Schemes: https // Schemes: https
// //
// Security: // Security:
// oauth // oauth
//
// Responses:
// 200: extClientResponse
// //
// Responses:
// 200: extClientResponse
func getExtClientConf(w http.ResponseWriter, r *http.Request) { func getExtClientConf(w http.ResponseWriter, r *http.Request) {
// set header. // set header.
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
@ -293,11 +289,10 @@ Endpoint = %s
// //
// Create an individual extclient. Must have valid key and be unique. // Create an individual extclient. Must have valid key and be unique.
// //
// Schemes: https // Schemes: https
//
// Security:
// oauth
// //
// Security:
// oauth
func createExtClient(w http.ResponseWriter, r *http.Request) { func createExtClient(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
@ -320,7 +315,7 @@ func createExtClient(w http.ResponseWriter, r *http.Request) {
err := json.NewDecoder(r.Body).Decode(&CustomExtClient) err := json.NewDecoder(r.Body).Decode(&CustomExtClient)
if err == nil { if err == nil {
if !validName(CustomExtClient.ClientID) { if CustomExtClient.ClientID != "" && !validName(CustomExtClient.ClientID) {
logic.ReturnErrorResponse(w, r, logic.FormatError(errInvalidExtClientID, "badrequest")) logic.ReturnErrorResponse(w, r, logic.FormatError(errInvalidExtClientID, "badrequest"))
return return
} }
@ -385,14 +380,13 @@ func createExtClient(w http.ResponseWriter, r *http.Request) {
// //
// Update an individual extclient. // Update an individual extclient.
// //
// Schemes: https // Schemes: https
// //
// Security: // Security:
// oauth // oauth
//
// Responses:
// 200: extClientResponse
// //
// Responses:
// 200: extClientResponse
func updateExtClient(w http.ResponseWriter, r *http.Request) { func updateExtClient(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
@ -484,14 +478,13 @@ func updateExtClient(w http.ResponseWriter, r *http.Request) {
// //
// Delete an individual extclient. // Delete an individual extclient.
// //
// Schemes: https // Schemes: https
// //
// Security: // Security:
// oauth // oauth
//
// Responses:
// 200: successResponse
// //
// Responses:
// 200: successResponse
func deleteExtClient(w http.ResponseWriter, r *http.Request) { func deleteExtClient(w http.ResponseWriter, r *http.Request) {
// Set header // Set header
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")