projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13399: If slurm refuses to renice past 10K, stop trying.
[arvados.git]
/
services
/
keep-web
/
handler.go
diff --git
a/services/keep-web/handler.go
b/services/keep-web/handler.go
index 02e7cb185834b3cccb8a7642ea81509bfecb8dfd..7d17be6e7cfe8c59305b452c8d788bca5748acdc 100644
(file)
--- a/
services/keep-web/handler.go
+++ b/
services/keep-web/handler.go
@@
-183,6
+183,9
@@
func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
if xff := r.Header.Get("X-Forwarded-For"); xff != "" {
remoteAddr = xff + "," + remoteAddr
}
if xff := r.Header.Get("X-Forwarded-For"); xff != "" {
remoteAddr = xff + "," + remoteAddr
}
+ if xfp := r.Header.Get("X-Forwarded-Proto"); xfp != "" && xfp != "http" {
+ r.URL.Scheme = xfp
+ }
w := httpserver.WrapResponseWriter(wOrig)
defer func() {
w := httpserver.WrapResponseWriter(wOrig)
defer func() {
@@
-313,6
+316,14
@@
func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
return
}
return
}
+ if useSiteFS {
+ if tokens == nil {
+ tokens = auth.NewCredentialsFromHTTPRequest(r).Tokens
+ }
+ h.serveSiteFS(w, r, tokens, credentialsOK, attachment)
+ return
+ }
+
targetPath := pathParts[stripParts:]
if tokens == nil && len(targetPath) > 0 && strings.HasPrefix(targetPath[0], "t=") {
// http://ID.example/t=TOKEN/PATH...
targetPath := pathParts[stripParts:]
if tokens == nil && len(targetPath) > 0 && strings.HasPrefix(targetPath[0], "t=") {
// http://ID.example/t=TOKEN/PATH...
@@
-334,11
+345,6
@@
func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
tokens = append(reqTokens, h.Config.AnonymousTokens...)
}
tokens = append(reqTokens, h.Config.AnonymousTokens...)
}
- if useSiteFS {
- h.serveSiteFS(w, r, tokens, credentialsOK, attachment)
- return
- }
-
if len(targetPath) > 0 && targetPath[0] == "_" {
// If a collection has a directory called "t=foo" or
// "_", it can be served at
if len(targetPath) > 0 && targetPath[0] == "_" {
// If a collection has a directory called "t=foo" or
// "_", it can be served at
@@
-616,9
+622,9
@@
the entire directory tree with wget, try:</P>
<UL>
{{range .Files}}
{{if .IsDir }}
<UL>
{{range .Files}}
{{if .IsDir }}
- <LI>{{" " | printf "%15s " | nbsp}}<A href="{{.Name}}/">{{.Name}}/</A></LI>
+ <LI>{{" " | printf "%15s " | nbsp}}<A href="{{
print "./"
.Name}}/">{{.Name}}/</A></LI>
{{else}}
{{else}}
- <LI>{{.Size | printf "%15d " | nbsp}}<A href="{{.Name}}">{{.Name}}</A></LI>
+ <LI>{{.Size | printf "%15d " | nbsp}}<A href="{{
print "./"
.Name}}">{{.Name}}</A></LI>
{{end}}
{{end}}
</UL>
{{end}}
{{end}}
</UL>
@@
-770,6
+776,7
@@
func (h *handler) seeOtherWithCookie(w http.ResponseWriter, r *http.Request, loc
u = newu
}
redir := (&url.URL{
u = newu
}
redir := (&url.URL{
+ Scheme: r.URL.Scheme,
Host: r.Host,
Path: u.Path,
RawQuery: redirQuery.Encode(),
Host: r.Host,
Path: u.Path,
RawQuery: redirQuery.Encode(),