TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-07 08:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: use PATCH for EditPrefs, not POST

Browse Source 
Addendum to earlier 00d641d9fc69557fdac6500eb889088520010705.

Reserve POST for SetPrefs in the future.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-04-11 20:49:07 -07:00
parent 4b47393e0c
commit 79109f4965
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/tailscale/tailscale.go
View File

@ -219,7 +219,7 @@ func EditPrefs(ctx context.Context, mp *ipn.MaskedPrefs) (*ipn.Prefs, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
body, err := send(ctx, "POST", "/localapi/v0/prefs", http.StatusOK, bytes.NewReader(mpj)) body, err := send(ctx, "PATCH", "/localapi/v0/prefs", http.StatusOK, bytes.NewReader(mpj))
if err != nil { if err != nil {
return nil, err return nil, err
} }

8
ipn/localapi/localapi.go
View File

@ -226,7 +226,8 @@ func (h *Handler) servePrefs(w http.ResponseWriter, r *http.Request) {
return return
} }
var prefs *ipn.Prefs var prefs *ipn.Prefs
if r.Method == "POST" { switch r.Method {
case "PATCH":
mp := new(ipn.MaskedPrefs) mp := new(ipn.MaskedPrefs)
if err := json.NewDecoder(r.Body).Decode(mp); err != nil { if err := json.NewDecoder(r.Body).Decode(mp); err != nil {
http.Error(w, err.Error(), 400) http.Error(w, err.Error(), 400)
@ -238,8 +239,11 @@ func (h *Handler) servePrefs(w http.ResponseWriter, r *http.Request) {
http.Error(w, err.Error(), 400) http.Error(w, err.Error(), 400)
return return
} }
} else { case "GET", "HEAD":
prefs = h.b.Prefs() prefs = h.b.Prefs()
default:
http.Error(w, "unsupported method", http.StatusMethodNotAllowed)
return
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
e := json.NewEncoder(w) e := json.NewEncoder(w)