Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-workhorse
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-workhorse
Commits
ec721eef
Commit
ec721eef
authored
Nov 06, 2015
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into lfs_support
parents
9b99c614
efbc977c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
164 additions
and
98 deletions
+164
-98
Makefile
Makefile
+1
-1
archive.go
archive.go
+17
-1
authorization.go
authorization.go
+82
-0
git-http.go
git-http.go
+13
-4
main_test.go
main_test.go
+3
-2
upstream.go
upstream.go
+42
-85
xsendfile.go
xsendfile.go
+6
-5
No files found.
Makefile
View file @
ec721eef
PREFIX
=
/usr/local
PREFIX
=
/usr/local
VERSION
=
$(
shell
git describe
)
-
$(
shell
date
-u
+%Y%m%d.%H%M%S
)
VERSION
=
$(
shell
git describe
)
-
$(
shell
date
-u
+%Y%m%d.%H%M%S
)
gitlab-workhorse
:
main.go upstream.go archive.go git-http.go helpers.go
lfs.go xsendfile
.go
gitlab-workhorse
:
main.go upstream.go archive.go git-http.go helpers.go
xsendfile.go authorization.go lfs
.go
go build
-ldflags
"-X main.Version
${VERSION}
"
-o
gitlab-workhorse
go build
-ldflags
"-X main.Version
${VERSION}
"
-o
gitlab-workhorse
install
:
gitlab-workhorse
install
:
gitlab-workhorse
...
...
archive.go
View file @
ec721eef
...
@@ -14,9 +14,25 @@ import (
...
@@ -14,9 +14,25 @@ import (
"os/exec"
"os/exec"
"path"
"path"
"time"
"time"
"path/filepath"
"errors"
)
)
func
handleGetArchive
(
w
http
.
ResponseWriter
,
r
*
gitRequest
,
format
string
)
{
func
handleGetArchive
(
w
http
.
ResponseWriter
,
r
*
gitRequest
)
{
var
format
string
switch
filepath
.
Base
(
r
.
URL
.
Path
)
{
case
"archive.zip"
:
format
=
"zip"
case
"archive.tar"
:
format
=
"tar"
case
"archive"
,
"archive.tar.gz"
:
format
=
"tar.gz"
case
"archive.tar.bz2"
:
format
=
"tar.bz2"
default
:
fail500
(
w
,
"handleGetArchive"
,
errors
.
New
(
"invalid archive format"
))
}
archiveFilename
:=
path
.
Base
(
r
.
ArchivePath
)
archiveFilename
:=
path
.
Base
(
r
.
ArchivePath
)
if
cachedArchive
,
err
:=
os
.
Open
(
r
.
ArchivePath
);
err
==
nil
{
if
cachedArchive
,
err
:=
os
.
Open
(
r
.
ArchivePath
);
err
==
nil
{
...
...
authorization.go
0 → 100644
View file @
ec721eef
package
main
import
(
"encoding/json"
"errors"
"io"
"net/http"
"strings"
)
func
preAuthorizeHandler
(
handleFunc
serviceHandleFunc
,
suffix
string
)
serviceHandleFunc
{
return
func
(
w
http
.
ResponseWriter
,
r
*
gitRequest
)
{
authReq
,
err
:=
r
.
u
.
newUpstreamRequest
(
r
.
Request
,
nil
,
suffix
)
if
err
!=
nil
{
fail500
(
w
,
"newUpstreamRequest"
,
err
)
return
}
authResponse
,
err
:=
r
.
u
.
httpClient
.
Do
(
authReq
)
if
err
!=
nil
{
fail500
(
w
,
"doAuthRequest"
,
err
)
return
}
defer
authResponse
.
Body
.
Close
()
if
authResponse
.
StatusCode
!=
200
{
// The Git request is not allowed by the backend. Maybe the
// client needs to send HTTP Basic credentials. Forward the
// response from the auth backend to our client. This includes
// the 'WWW-Authenticate' header that acts as a hint that
// Basic auth credentials are needed.
for
k
,
v
:=
range
authResponse
.
Header
{
// Accomodate broken clients that do case-sensitive header lookup
if
k
==
"Www-Authenticate"
{
w
.
Header
()[
"WWW-Authenticate"
]
=
v
}
else
{
w
.
Header
()[
k
]
=
v
}
}
w
.
WriteHeader
(
authResponse
.
StatusCode
)
io
.
Copy
(
w
,
authResponse
.
Body
)
return
}
// The auth backend validated the client request and told us additional
// request metadata. We must extract this information from the auth
// response body.
if
err
:=
json
.
NewDecoder
(
authResponse
.
Body
)
.
Decode
(
&
r
.
authorizationResponse
);
err
!=
nil
{
fail500
(
w
,
"decode authorization response"
,
err
)
return
}
// Don't hog a TCP connection in CLOSE_WAIT, we can already close it now
authResponse
.
Body
.
Close
()
// Negotiate authentication (Kerberos) may need to return a WWW-Authenticate
// header to the client even in case of success as per RFC4559.
for
k
,
v
:=
range
authResponse
.
Header
{
// Case-insensitive comparison as per RFC7230
if
strings
.
EqualFold
(
k
,
"WWW-Authenticate"
)
{
w
.
Header
()[
k
]
=
v
}
}
handleFunc
(
w
,
r
)
}
}
func
repoPreAuthorizeHandler
(
handleFunc
serviceHandleFunc
)
serviceHandleFunc
{
return
preAuthorizeHandler
(
func
(
w
http
.
ResponseWriter
,
r
*
gitRequest
)
{
if
r
.
RepoPath
==
""
{
fail500
(
w
,
"repoPreAuthorizeHandler"
,
errors
.
New
(
"missing authorization response"
))
return
}
if
!
looksLikeRepo
(
r
.
RepoPath
)
{
http
.
Error
(
w
,
"Not Found"
,
404
)
return
}
handleFunc
(
w
,
r
)
},
""
)
}
git-http.go
View file @
ec721eef
...
@@ -10,9 +10,10 @@ import (
...
@@ -10,9 +10,10 @@ import (
"io"
"io"
"net/http"
"net/http"
"strings"
"strings"
"path/filepath"
)
)
func
handleGetInfoRefs
(
w
http
.
ResponseWriter
,
r
*
gitRequest
,
_
string
)
{
func
handleGetInfoRefs
(
w
http
.
ResponseWriter
,
r
*
gitRequest
)
{
rpc
:=
r
.
URL
.
Query
()
.
Get
(
"service"
)
rpc
:=
r
.
URL
.
Query
()
.
Get
(
"service"
)
if
!
(
rpc
==
"git-upload-pack"
||
rpc
==
"git-receive-pack"
)
{
if
!
(
rpc
==
"git-upload-pack"
||
rpc
==
"git-receive-pack"
)
{
// The 'dumb' Git HTTP protocol is not supported
// The 'dumb' Git HTTP protocol is not supported
...
@@ -58,10 +59,18 @@ func handleGetInfoRefs(w http.ResponseWriter, r *gitRequest, _ string) {
...
@@ -58,10 +59,18 @@ func handleGetInfoRefs(w http.ResponseWriter, r *gitRequest, _ string) {
return
return
}
}
func
handlePostRPC
(
w
http
.
ResponseWriter
,
r
*
gitRequest
,
rpc
string
)
{
func
handlePostRPC
(
w
http
.
ResponseWriter
,
r
*
gitRequest
)
{
var
body
io
.
ReadCloser
var
body
io
.
ReadCloser
var
err
error
var
err
error
// Get Git action from URL
action
:=
filepath
.
Base
(
r
.
URL
.
Path
)
if
!
(
action
==
"git-upload-pack"
||
action
==
"git-receive-pack"
)
{
// The 'dumb' Git HTTP protocol is not supported
fail500
(
w
,
"handlePostRPC"
,
err
)
return
}
// The client request body may have been gzipped.
// The client request body may have been gzipped.
if
r
.
Header
.
Get
(
"Content-Encoding"
)
==
"gzip"
{
if
r
.
Header
.
Get
(
"Content-Encoding"
)
==
"gzip"
{
body
,
err
=
gzip
.
NewReader
(
r
.
Body
)
body
,
err
=
gzip
.
NewReader
(
r
.
Body
)
...
@@ -75,7 +84,7 @@ func handlePostRPC(w http.ResponseWriter, r *gitRequest, rpc string) {
...
@@ -75,7 +84,7 @@ func handlePostRPC(w http.ResponseWriter, r *gitRequest, rpc string) {
defer
body
.
Close
()
defer
body
.
Close
()
// Prepare our Git subprocess
// Prepare our Git subprocess
cmd
:=
gitCommand
(
r
.
GL_ID
,
"git"
,
subCommand
(
rpc
),
"--stateless-rpc"
,
r
.
RepoPath
)
cmd
:=
gitCommand
(
r
.
GL_ID
,
"git"
,
subCommand
(
action
),
"--stateless-rpc"
,
r
.
RepoPath
)
stdout
,
err
:=
cmd
.
StdoutPipe
()
stdout
,
err
:=
cmd
.
StdoutPipe
()
if
err
!=
nil
{
if
err
!=
nil
{
fail500
(
w
,
"handlePostRPC"
,
err
)
fail500
(
w
,
"handlePostRPC"
,
err
)
...
@@ -110,7 +119,7 @@ func handlePostRPC(w http.ResponseWriter, r *gitRequest, rpc string) {
...
@@ -110,7 +119,7 @@ func handlePostRPC(w http.ResponseWriter, r *gitRequest, rpc string) {
body
.
Close
()
body
.
Close
()
// Start writing the response
// Start writing the response
w
.
Header
()
.
Add
(
"Content-Type"
,
fmt
.
Sprintf
(
"application/x-%s-result"
,
rpc
))
w
.
Header
()
.
Add
(
"Content-Type"
,
fmt
.
Sprintf
(
"application/x-%s-result"
,
action
))
w
.
Header
()
.
Add
(
"Cache-Control"
,
"no-cache"
)
w
.
Header
()
.
Add
(
"Cache-Control"
,
"no-cache"
)
w
.
WriteHeader
(
200
)
// Don't bother with HTTP 500 from this point on, just return
w
.
WriteHeader
(
200
)
// Don't bother with HTTP 500 from this point on, just return
...
...
main_test.go
View file @
ec721eef
...
@@ -287,7 +287,7 @@ func TestDeniedXSendfileDownload(t *testing.T) {
...
@@ -287,7 +287,7 @@ func TestDeniedXSendfileDownload(t *testing.T) {
t
.
Fatalf
(
`X-Sendfile-Type want "X-Sendfile" got %q`
,
xSendfileType
)
t
.
Fatalf
(
`X-Sendfile-Type want "X-Sendfile" got %q`
,
xSendfileType
)
}
}
w
.
Header
()
.
Set
(
"Content-Disposition"
,
fmt
.
Sprintf
(
`attachment; filename="%s"`
,
contentFilename
))
w
.
Header
()
.
Set
(
"Content-Disposition"
,
fmt
.
Sprintf
(
`attachment; filename="%s"`
,
contentFilename
))
w
.
WriteHeader
(
404
)
w
.
WriteHeader
(
200
)
fmt
.
Fprint
(
w
,
"Denied"
)
fmt
.
Fprint
(
w
,
"Denied"
)
}))
}))
defer
ts
.
Close
()
defer
ts
.
Close
()
...
@@ -336,7 +336,8 @@ func testAuthServer(code int, body string) *httptest.Server {
...
@@ -336,7 +336,8 @@ func testAuthServer(code int, body string) *httptest.Server {
}
}
func
startServerOrFail
(
t
*
testing
.
T
,
ts
*
httptest
.
Server
)
*
exec
.
Cmd
{
func
startServerOrFail
(
t
*
testing
.
T
,
ts
*
httptest
.
Server
)
*
exec
.
Cmd
{
cmd
:=
exec
.
Command
(
"go"
,
"run"
,
"main.go"
,
"upstream.go"
,
"archive.go"
,
"git-http.go"
,
"helpers.go"
,
"lfs.go"
,
"xsendfile.go"
,
fmt
.
Sprintf
(
"-authBackend=%s"
,
ts
.
URL
),
fmt
.
Sprintf
(
"-listenAddr=%s"
,
servAddr
))
cmd
:=
exec
.
Command
(
"go"
,
"run"
,
"main.go"
,
"upstream.go"
,
"archive.go"
,
"git-http.go"
,
"helpers.go"
,
"xsendfile.go"
,
"authorization.go"
,
"lfs.go"
,
fmt
.
Sprintf
(
"-authBackend=%s"
,
ts
.
URL
),
fmt
.
Sprintf
(
"-listenAddr=%s"
,
servAddr
))
cmd
.
SysProcAttr
=
&
syscall
.
SysProcAttr
{
Setpgid
:
true
}
cmd
.
SysProcAttr
=
&
syscall
.
SysProcAttr
{
Setpgid
:
true
}
cmd
.
Stdout
=
os
.
Stdout
cmd
.
Stdout
=
os
.
Stdout
cmd
.
Stderr
=
os
.
Stderr
cmd
.
Stderr
=
os
.
Stderr
...
...
upstream.go
View file @
ec721eef
...
@@ -7,33 +7,28 @@ In this file we handle request routing and interaction with the authBackend.
...
@@ -7,33 +7,28 @@ In this file we handle request routing and interaction with the authBackend.
package
main
package
main
import
(
import
(
"encoding/json"
"io"
"io"
"log"
"log"
"net/http"
"net/http"
"os"
"os"
"path"
"path"
"regexp"
"regexp"
"strings"
)
)
type
serviceHandleFunc
func
(
w
http
.
ResponseWriter
,
r
*
gitRequest
)
type
upstream
struct
{
type
upstream
struct
{
httpClient
*
http
.
Client
httpClient
*
http
.
Client
authBackend
string
authBackend
string
}
}
type
gitService
struct
{
type
gitService
struct
{
method
string
method
string
regex
*
regexp
.
Regexp
regex
*
regexp
.
Regexp
middlewareFunc
func
(
u
*
upstream
,
w
http
.
ResponseWriter
,
r
*
http
.
Request
,
handleFunc
func
(
w
http
.
ResponseWriter
,
r
*
gitRequest
,
rpc
string
),
rpc
string
)
handleFunc
serviceHandleFunc
handleFunc
func
(
w
http
.
ResponseWriter
,
r
*
gitRequest
,
rpc
string
)
rpc
string
}
}
// A gitReqest is an *http.Request decorated with attributes returned by the
type
authorizationResponse
struct
{
// GitLab Rails application.
type
gitRequest
struct
{
*
http
.
Request
// GL_ID is an environment variable used by gitlab-shell hooks during 'git
// GL_ID is an environment variable used by gitlab-shell hooks during 'git
// push' and 'git pull'
// push' and 'git pull'
GL_ID
string
GL_ID
string
...
@@ -54,19 +49,27 @@ type gitRequest struct {
...
@@ -54,19 +49,27 @@ type gitRequest struct {
StoreLFSPath
string
StoreLFSPath
string
}
}
// A gitReqest is an *http.Request decorated with attributes returned by the
// GitLab Rails application.
type
gitRequest
struct
{
*
http
.
Request
authorizationResponse
u
*
upstream
}
// Routing table
// Routing table
var
gitServices
=
[
...
]
gitService
{
var
gitServices
=
[
...
]
gitService
{
gitService
{
"GET"
,
regexp
.
MustCompile
(
`/info/refs\z`
),
repoPreAuth
,
handleGetInfoRefs
,
""
},
gitService
{
"GET"
,
regexp
.
MustCompile
(
`/info/refs\z`
),
repoPreAuth
orizeHandler
(
handleGetInfoRefs
)
},
gitService
{
"POST"
,
regexp
.
MustCompile
(
`/git-upload-pack\z`
),
repoPreAuth
,
handlePostRPC
,
"git-upload-pack"
},
gitService
{
"POST"
,
regexp
.
MustCompile
(
`/git-upload-pack\z`
),
repoPreAuth
orizeHandler
(
handlePostRPC
)
},
gitService
{
"POST"
,
regexp
.
MustCompile
(
`/git-receive-pack\z`
),
repoPreAuth
,
handlePostRPC
,
"git-receive-pack"
},
gitService
{
"POST"
,
regexp
.
MustCompile
(
`/git-receive-pack\z`
),
repoPreAuth
orizeHandler
(
handlePostRPC
)
},
gitService
{
"GET"
,
regexp
.
MustCompile
(
`/repository/archive\z`
),
repoPreAuth
,
handleGetArchive
,
"tar.gz"
},
gitService
{
"GET"
,
regexp
.
MustCompile
(
`/repository/archive\z`
),
repoPreAuth
orizeHandler
(
handleGetArchive
)
},
gitService
{
"GET"
,
regexp
.
MustCompile
(
`/repository/archive.zip\z`
),
repoPreAuth
,
handleGetArchive
,
"zip"
},
gitService
{
"GET"
,
regexp
.
MustCompile
(
`/repository/archive.zip\z`
),
repoPreAuth
orizeHandler
(
handleGetArchive
)
},
gitService
{
"GET"
,
regexp
.
MustCompile
(
`/repository/archive.tar\z`
),
repoPreAuth
,
handleGetArchive
,
"tar"
},
gitService
{
"GET"
,
regexp
.
MustCompile
(
`/repository/archive.tar\z`
),
repoPreAuth
orizeHandler
(
handleGetArchive
)
},
gitService
{
"GET"
,
regexp
.
MustCompile
(
`/repository/archive.tar.gz\z`
),
repoPreAuth
,
handleGetArchive
,
"tar.gz"
},
gitService
{
"GET"
,
regexp
.
MustCompile
(
`/repository/archive.tar.gz\z`
),
repoPreAuth
orizeHandler
(
handleGetArchive
)
},
gitService
{
"GET"
,
regexp
.
MustCompile
(
`/repository/archive.tar.bz2\z`
),
repoPreAuth
,
handleGetArchive
,
"tar.bz2"
},
gitService
{
"GET"
,
regexp
.
MustCompile
(
`/repository/archive.tar.bz2\z`
),
repoPreAuth
orizeHandler
(
handleGetArchive
)
},
gitService
{
"
PUT"
,
regexp
.
MustCompile
(
`/gitlab-lfs/objects/([0-9a-f]{64})/([0-9]+)\z`
),
repoPreAuth
,
handleStoreLfsObject
,
"lfs-object-receive"
},
gitService
{
"
GET"
,
regexp
.
MustCompile
(
`/uploads/`
),
handleSendFile
},
gitService
{
"
GET"
,
regexp
.
MustCompile
(
`/gitlab-lfs/objects/([0-9a-f]{64})\z`
),
xSendFile
,
nil
,
"lfs-object-upload"
},
gitService
{
"
PUT"
,
regexp
.
MustCompile
(
`/gitlab-lfs/objects/([0-9a-f]{64})/([0-9]+)\z`
),
repoPreAuthorizeHandler
(
handleStoreLfsObject
)
},
gitService
{
"GET"
,
regexp
.
MustCompile
(
`/
uploads/`
),
xSendFile
,
nil
,
""
},
gitService
{
"GET"
,
regexp
.
MustCompile
(
`/
gitlab-lfs/objects/([0-9a-f]{64})\z`
),
handleSendFile
},
}
}
func
newUpstream
(
authBackend
string
,
authTransport
http
.
RoundTripper
)
*
upstream
{
func
newUpstream
(
authBackend
string
,
authTransport
http
.
RoundTripper
)
*
upstream
{
...
@@ -93,68 +96,12 @@ func (u *upstream) ServeHTTP(w http.ResponseWriter, r *http.Request) {
...
@@ -93,68 +96,12 @@ func (u *upstream) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return
return
}
}
g
.
middlewareFunc
(
u
,
w
,
r
,
g
.
handleFunc
,
g
.
rpc
)
request
:=
gitRequest
{
}
Request
:
r
,
u
:
u
,
func
repoPreAuth
(
u
*
upstream
,
w
http
.
ResponseWriter
,
r
*
http
.
Request
,
handleFunc
func
(
w
http
.
ResponseWriter
,
r
*
gitRequest
,
rpc
string
),
rpc
string
)
{
authReq
,
err
:=
u
.
newUpstreamRequest
(
r
)
if
err
!=
nil
{
fail500
(
w
,
"newUpstreamRequest"
,
err
)
return
}
}
authResponse
,
err
:=
u
.
httpClient
.
Do
(
authReq
)
g
.
handleFunc
(
w
,
&
request
)
if
err
!=
nil
{
fail500
(
w
,
"doAuthRequest"
,
err
)
return
}
defer
authResponse
.
Body
.
Close
()
if
authResponse
.
StatusCode
!=
200
{
// The Git request is not allowed by the backend. Maybe the
// client needs to send HTTP Basic credentials. Forward the
// response from the auth backend to our client. This includes
// the 'WWW-Authenticate' header that acts as a hint that
// Basic auth credentials are needed.
for
k
,
v
:=
range
authResponse
.
Header
{
// Accomodate broken clients that do case-sensitive header lookup
if
k
==
"Www-Authenticate"
{
w
.
Header
()[
"WWW-Authenticate"
]
=
v
}
else
{
w
.
Header
()[
k
]
=
v
}
}
w
.
WriteHeader
(
authResponse
.
StatusCode
)
io
.
Copy
(
w
,
authResponse
.
Body
)
return
}
// The auth backend validated the client request and told us additional
// request metadata. We must extract this information from the auth
// response body.
gitReq
:=
&
gitRequest
{
Request
:
r
}
if
err
:=
json
.
NewDecoder
(
authResponse
.
Body
)
.
Decode
(
gitReq
);
err
!=
nil
{
fail500
(
w
,
"decode JSON GL_ID"
,
err
)
return
}
// Don't hog a TCP connection in CLOSE_WAIT, we can already close it now
authResponse
.
Body
.
Close
()
// Negotiate authentication (Kerberos) may need to return a WWW-Authenticate
// header to the client even in case of success as per RFC4559.
for
k
,
v
:=
range
authResponse
.
Header
{
// Case-insensitive comparison as per RFC7230
if
strings
.
EqualFold
(
k
,
"WWW-Authenticate"
)
{
w
.
Header
()[
k
]
=
v
}
}
if
!
looksLikeRepo
(
gitReq
.
RepoPath
)
{
http
.
Error
(
w
,
"Not Found"
,
404
)
return
}
handleFunc
(
w
,
gitReq
,
rpc
)
}
}
func
looksLikeRepo
(
p
string
)
bool
{
func
looksLikeRepo
(
p
string
)
bool
{
...
@@ -167,9 +114,9 @@ func looksLikeRepo(p string) bool {
...
@@ -167,9 +114,9 @@ func looksLikeRepo(p string) bool {
return
true
return
true
}
}
func
(
u
*
upstream
)
newUpstreamRequest
(
r
*
http
.
Request
)
(
*
http
.
Request
,
error
)
{
func
(
u
*
upstream
)
newUpstreamRequest
(
r
*
http
.
Request
,
body
io
.
Reader
,
suffix
string
)
(
*
http
.
Request
,
error
)
{
url
:=
u
.
authBackend
+
r
.
URL
.
RequestURI
()
url
:=
u
.
authBackend
+
r
.
URL
.
RequestURI
()
+
suffix
authReq
,
err
:=
http
.
NewRequest
(
r
.
Method
,
url
,
nil
)
authReq
,
err
:=
http
.
NewRequest
(
r
.
Method
,
url
,
body
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
...
@@ -178,6 +125,16 @@ func (u *upstream) newUpstreamRequest(r *http.Request) (*http.Request, error) {
...
@@ -178,6 +125,16 @@ func (u *upstream) newUpstreamRequest(r *http.Request) (*http.Request, error) {
for
k
,
v
:=
range
r
.
Header
{
for
k
,
v
:=
range
r
.
Header
{
authReq
.
Header
[
k
]
=
v
authReq
.
Header
[
k
]
=
v
}
}
// Clean some headers when issuing a new request without body
if
body
==
nil
{
authReq
.
Header
.
Del
(
"Content-Type"
)
authReq
.
Header
.
Del
(
"Content-Encoding"
)
authReq
.
Header
.
Del
(
"Content-Length"
)
authReq
.
Header
.
Del
(
"Accept-Encoding"
)
authReq
.
Header
.
Del
(
"Transfer-Encoding"
)
}
// Also forward the Host header, which is excluded from the Header map by the http libary.
// Also forward the Host header, which is excluded from the Header map by the http libary.
// This allows the Host header received by the backend to be consistent with other
// This allows the Host header received by the backend to be consistent with other
// requests not going through gitlab-workhorse.
// requests not going through gitlab-workhorse.
...
...
xsendfile.go
View file @
ec721eef
...
@@ -13,15 +13,16 @@ import (
...
@@ -13,15 +13,16 @@ import (
"os"
"os"
)
)
func
xSendFile
(
u
*
upstream
,
w
http
.
ResponseWriter
,
r
*
http
.
Request
,
_
func
(
http
.
ResponseWriter
,
*
gitRequest
,
string
),
_
string
)
{
func
handleSendFile
(
w
http
.
ResponseWriter
,
r
*
gitRequest
)
{
upRequest
,
err
:=
u
.
newUpstreamRequest
(
r
)
upRequest
,
err
:=
r
.
u
.
newUpstreamRequest
(
r
.
Request
,
r
.
Body
,
""
)
if
err
!=
nil
{
if
err
!=
nil
{
fail500
(
w
,
"newUpstreamRequest"
,
err
)
fail500
(
w
,
"newUpstreamRequest"
,
err
)
return
return
}
}
upRequest
.
Header
.
Set
(
"X-Sendfile-Type"
,
"X-Sendfile"
)
upRequest
.
Header
.
Set
(
"X-Sendfile-Type"
,
"X-Sendfile"
)
upResponse
,
err
:=
u
.
httpClient
.
Do
(
upRequest
)
upResponse
,
err
:=
r
.
u
.
httpClient
.
Do
(
upRequest
)
r
.
Body
.
Close
()
if
err
!=
nil
{
if
err
!=
nil
{
fail500
(
w
,
"do upstream request"
,
err
)
fail500
(
w
,
"do upstream request"
,
err
)
return
return
...
@@ -38,7 +39,7 @@ func xSendFile(u *upstream, w http.ResponseWriter, r *http.Request, _ func(http.
...
@@ -38,7 +39,7 @@ func xSendFile(u *upstream, w http.ResponseWriter, r *http.Request, _ func(http.
}
}
// Use accelerated file serving
// Use accelerated file serving
if
sendfile
==
""
&&
upResponse
.
StatusCode
/
100
!=
2
{
if
sendfile
==
""
{
// Copy request body otherwise
// Copy request body otherwise
w
.
WriteHeader
(
upResponse
.
StatusCode
)
w
.
WriteHeader
(
upResponse
.
StatusCode
)
...
@@ -63,5 +64,5 @@ func xSendFile(u *upstream, w http.ResponseWriter, r *http.Request, _ func(http.
...
@@ -63,5 +64,5 @@ func xSendFile(u *upstream, w http.ResponseWriter, r *http.Request, _ func(http.
fail500
(
w
,
"xSendFile get mtime"
,
err
)
fail500
(
w
,
"xSendFile get mtime"
,
err
)
return
return
}
}
http
.
ServeContent
(
w
,
r
,
""
,
fi
.
ModTime
(),
content
)
http
.
ServeContent
(
w
,
r
.
Request
,
""
,
fi
.
ModTime
(),
content
)
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment