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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-workhorse
Commits
9e17fc4c
Commit
9e17fc4c
authored
Dec 18, 2015
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move git-related code into internal/git package
parent
27900114
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
39 additions
and
63 deletions
+39
-63
handlers.go
handlers.go
+2
-2
handlers_test.go
handlers_test.go
+6
-6
helpers.go
helpers.go
+0
-36
internal/git/archive.go
internal/git/archive.go
+6
-3
internal/git/git-http.go
internal/git/git-http.go
+11
-3
main.go
main.go
+14
-13
No files found.
handlers.go
View file @
9e17fc4c
...
...
@@ -8,7 +8,7 @@ import (
"net/http"
)
func
contentEncodingHandler
(
h
http
.
Handler
Func
)
http
.
HandlerFunc
{
func
contentEncodingHandler
(
h
http
.
Handler
)
http
.
HandlerFunc
{
return
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
var
body
io
.
ReadCloser
var
err
error
...
...
@@ -33,6 +33,6 @@ func contentEncodingHandler(h http.HandlerFunc) http.HandlerFunc {
r
.
Body
=
body
r
.
Header
.
Del
(
"Content-Encoding"
)
h
(
w
,
r
)
h
.
ServeHTTP
(
w
,
r
)
}
}
handlers_test.go
View file @
9e17fc4c
...
...
@@ -28,14 +28,14 @@ func TestGzipEncoding(t *testing.T) {
}
req
.
Header
.
Set
(
"Content-Encoding"
,
"gzip"
)
contentEncodingHandler
(
func
(
_
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
contentEncodingHandler
(
http
.
HandlerFunc
(
func
(
_
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
if
_
,
ok
:=
r
.
Body
.
(
*
gzip
.
Reader
);
!
ok
{
t
.
Fatal
(
"Expected gzip reader for body, but it's:"
,
reflect
.
TypeOf
(
r
.
Body
))
}
if
r
.
Header
.
Get
(
"Content-Encoding"
)
!=
""
{
t
.
Fatal
(
"Content-Encoding should be deleted"
)
}
})(
resp
,
req
)
})
)
(
resp
,
req
)
helper
.
AssertResponseCode
(
t
,
resp
,
200
)
}
...
...
@@ -52,14 +52,14 @@ func TestNoEncoding(t *testing.T) {
}
req
.
Header
.
Set
(
"Content-Encoding"
,
""
)
contentEncodingHandler
(
func
(
_
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
contentEncodingHandler
(
http
.
HandlerFunc
(
func
(
_
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
if
r
.
Body
!=
body
{
t
.
Fatal
(
"Expected the same body"
)
}
if
r
.
Header
.
Get
(
"Content-Encoding"
)
!=
""
{
t
.
Fatal
(
"Content-Encoding should be deleted"
)
}
})(
resp
,
req
)
})
)
(
resp
,
req
)
helper
.
AssertResponseCode
(
t
,
resp
,
200
)
}
...
...
@@ -73,9 +73,9 @@ func TestInvalidEncoding(t *testing.T) {
}
req
.
Header
.
Set
(
"Content-Encoding"
,
"application/unknown"
)
contentEncodingHandler
(
func
(
_
http
.
ResponseWriter
,
_
*
http
.
Request
)
{
contentEncodingHandler
(
http
.
HandlerFunc
(
func
(
_
http
.
ResponseWriter
,
_
*
http
.
Request
)
{
t
.
Fatal
(
"it shouldn't be executed"
)
})(
resp
,
req
)
})
)
(
resp
,
req
)
helper
.
AssertResponseCode
(
t
,
resp
,
500
)
}
helpers.go
View file @
9e17fc4c
...
...
@@ -5,12 +5,8 @@ Miscellaneous helpers: logging, errors, subprocesses
package
main
import
(
"fmt"
"net/http"
"os"
"os/exec"
"path"
"syscall"
)
func
httpError
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
,
error
string
,
code
int
)
{
...
...
@@ -22,38 +18,6 @@ func httpError(w http.ResponseWriter, r *http.Request, error string, code int) {
http
.
Error
(
w
,
error
,
code
)
}
// Git subprocess helpers
func
gitCommand
(
gl_id
string
,
name
string
,
args
...
string
)
*
exec
.
Cmd
{
cmd
:=
exec
.
Command
(
name
,
args
...
)
// Start the command in its own process group (nice for signalling)
cmd
.
SysProcAttr
=
&
syscall
.
SysProcAttr
{
Setpgid
:
true
}
// Explicitly set the environment for the Git command
cmd
.
Env
=
[]
string
{
fmt
.
Sprintf
(
"HOME=%s"
,
os
.
Getenv
(
"HOME"
)),
fmt
.
Sprintf
(
"PATH=%s"
,
os
.
Getenv
(
"PATH"
)),
fmt
.
Sprintf
(
"LD_LIBRARY_PATH=%s"
,
os
.
Getenv
(
"LD_LIBRARY_PATH"
)),
fmt
.
Sprintf
(
"GL_ID=%s"
,
gl_id
),
}
// If we don't do something with cmd.Stderr, Git errors will be lost
cmd
.
Stderr
=
os
.
Stderr
return
cmd
}
func
cleanUpProcessGroup
(
cmd
*
exec
.
Cmd
)
{
if
cmd
==
nil
{
return
}
process
:=
cmd
.
Process
if
process
!=
nil
&&
process
.
Pid
>
0
{
// Send SIGTERM to the process group of cmd
syscall
.
Kill
(
-
process
.
Pid
,
syscall
.
SIGTERM
)
}
// reap our child process
cmd
.
Wait
()
}
// Borrowed from: net/http/server.go
// Return the canonical path for p, eliminating . and .. elements.
func
cleanURIPath
(
p
string
)
string
{
...
...
archive.go
→
internal/git/
archive.go
View file @
9e17fc4c
...
...
@@ -2,11 +2,11 @@
In this file we handle 'git archive' downloads
*/
package
main
package
git
import
(
".
/internal
/api"
".
/internal
/helper"
".
.
/api"
".
.
/helper"
"fmt"
"io"
"io/ioutil"
...
...
@@ -19,6 +19,9 @@ import (
"time"
)
func
GetArchive
(
a
*
api
.
API
)
http
.
Handler
{
return
repoPreAuthorizeHandler
(
a
,
handleGetArchive
)
}
func
handleGetArchive
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
,
a
*
api
.
Response
)
{
var
format
string
urlPath
:=
r
.
URL
.
Path
...
...
git-http.go
→
internal/git/
git-http.go
View file @
9e17fc4c
...
...
@@ -2,11 +2,11 @@
In this file we handle the Git 'smart HTTP' protocol
*/
package
main
package
git
import
(
".
/internal
/api"
".
/internal
/helper"
".
.
/api"
".
.
/helper"
"errors"
"fmt"
"io"
...
...
@@ -18,6 +18,14 @@ import (
"strings"
)
func
GetInfoRefs
(
a
*
api
.
API
)
http
.
Handler
{
return
repoPreAuthorizeHandler
(
a
,
handleGetInfoRefs
)
}
func
PostRPC
(
a
*
api
.
API
)
http
.
Handler
{
return
repoPreAuthorizeHandler
(
a
,
handlePostRPC
)
}
func
looksLikeRepo
(
p
string
)
bool
{
// If /path/to/foo.git/objects exists then let's assume it is a valid Git
// repository.
...
...
main.go
View file @
9e17fc4c
...
...
@@ -15,6 +15,7 @@ package main
import
(
"./internal/errorpage"
"./internal/git"
"flag"
"fmt"
"log"
...
...
@@ -65,24 +66,24 @@ func compileRoutes(u *upstream) {
proxy
:=
u
.
Proxy
httpRoutes
=
[]
httpRoute
{
// Git Clone
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
gitProjectPattern
+
`info/refs\z`
),
repoPreAuthorizeHandler
(
api
,
handleGetInfoRefs
)},
httpRoute
{
"POST"
,
regexp
.
MustCompile
(
gitProjectPattern
+
`git-upload-pack\z`
),
contentEncodingHandler
(
repoPreAuthorizeHandler
(
api
,
handlePostRPC
))},
httpRoute
{
"POST"
,
regexp
.
MustCompile
(
gitProjectPattern
+
`git-receive-pack\z`
),
contentEncodingHandler
(
repoPreAuthorizeHandler
(
api
,
handlePostRPC
))},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
gitProjectPattern
+
`info/refs\z`
),
git
.
GetInfoRefs
(
api
)},
httpRoute
{
"POST"
,
regexp
.
MustCompile
(
gitProjectPattern
+
`git-upload-pack\z`
),
contentEncodingHandler
(
git
.
PostRPC
(
api
))},
httpRoute
{
"POST"
,
regexp
.
MustCompile
(
gitProjectPattern
+
`git-receive-pack\z`
),
contentEncodingHandler
(
git
.
PostRPC
(
api
))},
httpRoute
{
"PUT"
,
regexp
.
MustCompile
(
gitProjectPattern
+
`gitlab-lfs/objects/([0-9a-f]{64})/([0-9]+)\z`
),
lfsAuthorizeHandler
(
api
,
handleStoreLfsObject
(
proxy
))},
// Repository Archive
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectPattern
+
`repository/archive\z`
),
repoPreAuthorizeHandler
(
api
,
handleGetArchive
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectPattern
+
`repository/archive.zip\z`
),
repoPreAuthorizeHandler
(
api
,
handleGetArchive
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectPattern
+
`repository/archive.tar\z`
),
repoPreAuthorizeHandler
(
api
,
handleGetArchive
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectPattern
+
`repository/archive.tar.gz\z`
),
repoPreAuthorizeHandler
(
api
,
handleGetArchive
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectPattern
+
`repository/archive.tar.bz2\z`
),
repoPreAuthorizeHandler
(
api
,
handleGetArchive
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectPattern
+
`repository/archive\z`
),
git
.
GetArchive
(
api
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectPattern
+
`repository/archive.zip\z`
),
git
.
GetArchive
(
api
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectPattern
+
`repository/archive.tar\z`
),
git
.
GetArchive
(
api
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectPattern
+
`repository/archive.tar.gz\z`
),
git
.
GetArchive
(
api
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectPattern
+
`repository/archive.tar.bz2\z`
),
git
.
GetArchive
(
api
)},
// Repository Archive API
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectsAPIPattern
+
`repository/archive\z`
),
repoPreAuthorizeHandler
(
api
,
handleGetArchive
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectsAPIPattern
+
`repository/archive.zip\z`
),
repoPreAuthorizeHandler
(
api
,
handleGetArchive
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectsAPIPattern
+
`repository/archive.tar\z`
),
repoPreAuthorizeHandler
(
api
,
handleGetArchive
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectsAPIPattern
+
`repository/archive.tar.gz\z`
),
repoPreAuthorizeHandler
(
api
,
handleGetArchive
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectsAPIPattern
+
`repository/archive.tar.bz2\z`
),
repoPreAuthorizeHandler
(
api
,
handleGetArchive
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectsAPIPattern
+
`repository/archive\z`
),
git
.
GetArchive
(
api
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectsAPIPattern
+
`repository/archive.zip\z`
),
git
.
GetArchive
(
api
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectsAPIPattern
+
`repository/archive.tar\z`
),
git
.
GetArchive
(
api
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectsAPIPattern
+
`repository/archive.tar.gz\z`
),
git
.
GetArchive
(
api
)},
httpRoute
{
"GET"
,
regexp
.
MustCompile
(
projectsAPIPattern
+
`repository/archive.tar.bz2\z`
),
git
.
GetArchive
(
api
)},
// CI Artifacts API
httpRoute
{
"POST"
,
regexp
.
MustCompile
(
ciAPIPattern
+
`v1/builds/[0-9]+/artifacts\z`
),
contentEncodingHandler
(
artifactsAuthorizeHandler
(
api
,
handleFileUploads
(
proxy
)))},
...
...
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