gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-11 14:26:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Net 822 (#2745)

Browse source 
* add extclient allowed ips to rac resp

* add gw peer public key

* fix static check

* add param for remote access client id

* don't decode body

* debug

* debug

* change user gws req to POST

* debug

* change api to GET
This commit is contained in:
Abhishek K 2023-12-20 13:17:34 +04:00 • committed by GitHub
parent e801c157d1
commit 9fcefd7911
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pro/controllers/users.go
View file

@ -152,17 +152,23 @@ func getUserRemoteAccessGws(w http.ResponseWriter, r *http.Request) {
logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("required params username"), "badrequest")) logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("required params username"), "badrequest"))
return return
} }
remoteAccessClientID := r.URL.Query().Get("remote_access_clientid")
var req models.UserRemoteGwsReq var req models.UserRemoteGwsReq
if remoteAccessClientID == "" {
err := json.NewDecoder(r.Body).Decode(&req) err := json.NewDecoder(r.Body).Decode(&req)
if err != nil { if err != nil {
slog.Error("error decoding request body: ", "error", err) slog.Error("error decoding request body: ", "error", err)
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest")) logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
return return
} }
if req.RemoteAccessClientID == "" { }
if req.RemoteAccessClientID == "" && remoteAccessClientID == "" {
logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("remote access client id cannot be empty"), "badrequest")) logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("remote access client id cannot be empty"), "badrequest"))
return return
} }
if req.RemoteAccessClientID == "" {
req.RemoteAccessClientID = remoteAccessClientID
}
userGws := make(map[string][]models.UserRemoteGws) userGws := make(map[string][]models.UserRemoteGws)
user, err := logic.GetUser(username) user, err := logic.GetUser(username)
if err != nil { if err != nil {