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

Merge pull request #563 from gravitl/bugfix_v0.9.3_user_deletes

Browse source 
Bugfix v0.9.3 user deletes
This commit is contained in:
dcarns 2022-01-03 10:05:32 -05:00 committed by GitHub
commit 40fcf78e31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -15,3 +15,4 @@ netclient/netclient32
netclient/netclient.exe
config/dnsconfig/
data/
.vscode/

3
auth/azure-ad.go
View file

@ -5,7 +5,6 @@ import (
"fmt"
"io/ioutil"
"net/http"
"os"
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/logic"
@ -36,7 +35,7 @@ func initAzureAD(redirectURL string, clientID string, clientSecret string) {
ClientID: clientID,
ClientSecret: clientSecret,
Scopes: []string{"User.Read"},
Endpoint: microsoft.AzureADEndpoint(os.Getenv("AZURE_TENANT")),
Endpoint: microsoft.AzureADEndpoint(servercfg.GetAzureTenant()),
}
}

1
config/config.go
View file

@ -68,6 +68,7 @@ type ServerConfig struct {
ClientSecret string `yaml:"clientsecret"`
FrontendURL string `yaml:"frontendurl"`
DisplayKeys string `yaml:"displaykeys"`
AzureTenant string `yaml:"azuretenant"`
}
// Generic SQL Config

2
controllers/user.go
View file

@ -23,7 +23,7 @@ func userHandlers(r *mux.Router) {
r.HandleFunc("/api/users/networks/{username}", securityCheck(true, http.HandlerFunc(updateUserNetworks))).Methods("PUT")
r.HandleFunc("/api/users/{username}/adm", securityCheck(true, http.HandlerFunc(updateUserAdm))).Methods("PUT")
r.HandleFunc("/api/users/{username}", securityCheck(true, http.HandlerFunc(createUser))).Methods("POST")
r.HandleFunc("/api/users/{username}", securityCheck(false, continueIfUserMatch(http.HandlerFunc(deleteUser)))).Methods("DELETE")
r.HandleFunc("/api/users/{username}", securityCheck(true, http.HandlerFunc(deleteUser))).Methods("DELETE")
r.HandleFunc("/api/users/{username}", securityCheck(false, continueIfUserMatch(http.HandlerFunc(getUser)))).Methods("GET")
r.HandleFunc("/api/users", securityCheck(true, http.HandlerFunc(getUsers))).Methods("GET")
r.HandleFunc("/api/oauth/login", auth.HandleAuthLogin).Methods("GET")

1
go.mod
View file

@ -31,6 +31,7 @@ require (
require (
cloud.google.com/go v0.34.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect

2
main.go
View file

@ -43,7 +43,7 @@ func initialize() { // Client Mode Prereq Check
var authProvider = auth.InitializeAuthProvider()
if authProvider != "" {
logger.Log(0, "OAuth provider, ", authProvider, ", initialized")
logger.Log(0, "OAuth provider,", authProvider+",", "initialized")
} else {
logger.Log(0, "no OAuth provider found or not configured, continuing without OAuth")
}

11
servercfg/serverconf.go
View file

@ -502,6 +502,17 @@ func GetAuthProviderInfo() []string {
return []string{"", "", ""}
}
// GetAzureTenant - retrieve the azure tenant ID from env variable or config file
func GetAzureTenant() string {
var azureTenant = ""
if os.Getenv("AZURE_TENANT") != "" {
azureTenant = os.Getenv("AZURE_TENANT")
} else if config.Config.Server.AzureTenant != "" {
azureTenant = config.Config.Server.AzureTenant
}
return azureTenant
}
// GetMacAddr - get's mac address
func getMacAddr() string {
ifas, err := net.Interfaces()