mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 21:17:23 +00:00
Always set content-type & nosniff
This commit is contained in:
parent
10979d4c75
commit
ef6cba0b36
@ -552,6 +552,8 @@ func (s *ProxyServer) Run() error {
|
|||||||
proxyMux := mux.NewPathRecorderMux("kube-proxy")
|
proxyMux := mux.NewPathRecorderMux("kube-proxy")
|
||||||
healthz.InstallHandler(proxyMux)
|
healthz.InstallHandler(proxyMux)
|
||||||
proxyMux.HandleFunc("/proxyMode", func(w http.ResponseWriter, r *http.Request) {
|
proxyMux.HandleFunc("/proxyMode", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Content-Type", "text/plain; charset=utf-8")
|
||||||
|
w.Header().Set("X-Content-Type-Options", "nosniff")
|
||||||
fmt.Fprintf(w, "%s", s.ProxyMode)
|
fmt.Fprintf(w, "%s", s.ProxyMode)
|
||||||
})
|
})
|
||||||
proxyMux.Handle("/metrics", legacyregistry.Handler())
|
proxyMux.Handle("/metrics", legacyregistry.Handler())
|
||||||
|
@ -299,6 +299,8 @@ func installMetricHandler(pathRecorderMux *mux.PathRecorderMux) {
|
|||||||
pathRecorderMux.HandleFunc("/metrics", func(w http.ResponseWriter, req *http.Request) {
|
pathRecorderMux.HandleFunc("/metrics", func(w http.ResponseWriter, req *http.Request) {
|
||||||
if req.Method == "DELETE" {
|
if req.Method == "DELETE" {
|
||||||
metrics.Reset()
|
metrics.Reset()
|
||||||
|
w.Header().Set("Content-Type", "text/plain; charset=utf-8")
|
||||||
|
w.Header().Set("X-Content-Type-Options", "nosniff")
|
||||||
io.WriteString(w, "metrics reset\n")
|
io.WriteString(w, "metrics reset\n")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -273,6 +273,8 @@ func (h *debugHTTPHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
|
|||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
w.Header().Set("Content-Type", "text/vnd.graphviz")
|
||||||
|
w.Header().Set("X-Content-Type-Options", "nosniff")
|
||||||
w.Write(data)
|
w.Write(data)
|
||||||
w.WriteHeader(http.StatusOK)
|
w.WriteHeader(http.StatusOK)
|
||||||
}
|
}
|
||||||
|
@ -210,6 +210,7 @@ func (h hcHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
|
|||||||
h.hcs.lock.RUnlock()
|
h.hcs.lock.RUnlock()
|
||||||
|
|
||||||
resp.Header().Set("Content-Type", "application/json")
|
resp.Header().Set("Content-Type", "application/json")
|
||||||
|
resp.Header().Set("X-Content-Type-Options", "nosniff")
|
||||||
if count == 0 {
|
if count == 0 {
|
||||||
resp.WriteHeader(http.StatusServiceUnavailable)
|
resp.WriteHeader(http.StatusServiceUnavailable)
|
||||||
} else {
|
} else {
|
||||||
@ -338,6 +339,7 @@ func (h healthzHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
|
|||||||
currentTime := h.hs.clock.Now()
|
currentTime := h.hs.clock.Now()
|
||||||
|
|
||||||
resp.Header().Set("Content-Type", "application/json")
|
resp.Header().Set("Content-Type", "application/json")
|
||||||
|
resp.Header().Set("X-Content-Type-Options", "nosniff")
|
||||||
if !lastUpdated.IsZero() && currentTime.After(lastUpdated.Add(h.hs.healthTimeout)) {
|
if !lastUpdated.IsZero() && currentTime.After(lastUpdated.Add(h.hs.healthTimeout)) {
|
||||||
resp.WriteHeader(http.StatusServiceUnavailable)
|
resp.WriteHeader(http.StatusServiceUnavailable)
|
||||||
} else {
|
} else {
|
||||||
|
@ -118,6 +118,7 @@ func write(w http.ResponseWriter) error {
|
|||||||
return fmt.Errorf("error marshaling json: %v", err)
|
return fmt.Errorf("error marshaling json: %v", err)
|
||||||
}
|
}
|
||||||
w.Header().Set("Content-Type", "application/json")
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.Header().Set("X-Content-Type-Options", "nosniff")
|
||||||
_, err = w.Write(b)
|
_, err = w.Write(b)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -121,6 +121,7 @@ func StringFlagPutHandler(setter StringFlagSetterFunc) http.HandlerFunc {
|
|||||||
// writePlainText renders a simple string response.
|
// writePlainText renders a simple string response.
|
||||||
func writePlainText(statusCode int, text string, w http.ResponseWriter) {
|
func writePlainText(statusCode int, text string, w http.ResponseWriter) {
|
||||||
w.Header().Set("Content-Type", "text/plain")
|
w.Header().Set("Content-Type", "text/plain")
|
||||||
|
w.Header().Set("X-Content-Type-Options", "nosniff")
|
||||||
w.WriteHeader(statusCode)
|
w.WriteHeader(statusCode)
|
||||||
fmt.Fprintln(w, text)
|
fmt.Fprintln(w, text)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user