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
050eff65
Commit
050eff65
authored
Jul 28, 2015
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Receive GL_ID as JSON
parent
241facbb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
11 deletions
+17
-11
main.go
main.go
+16
-10
support/say-yes.go
support/say-yes.go
+1
-1
No files found.
main.go
View file @
050eff65
...
@@ -14,6 +14,7 @@ package main
...
@@ -14,6 +14,7 @@ package main
import
(
import
(
"compress/gzip"
"compress/gzip"
"encoding/json"
"flag"
"flag"
"fmt"
"fmt"
"io"
"io"
...
@@ -29,10 +30,14 @@ import (
...
@@ -29,10 +30,14 @@ import (
type
gitService
struct
{
type
gitService
struct
{
method
string
method
string
regexp
*
regexp
.
Regexp
regexp
*
regexp
.
Regexp
handleFunc
func
(
string
,
string
,
string
,
http
.
ResponseWriter
,
*
http
.
Request
)
handleFunc
func
(
gitEnv
,
string
,
string
,
http
.
ResponseWriter
,
*
http
.
Request
)
rpc
string
rpc
string
}
}
type
gitEnv
struct
{
GL_ID
string
}
var
httpClient
=
&
http
.
Client
{}
var
httpClient
=
&
http
.
Client
{}
var
pathTraversal
=
regexp
.
MustCompile
(
`/../`
)
var
pathTraversal
=
regexp
.
MustCompile
(
`/../`
)
...
@@ -67,7 +72,7 @@ func main() {
...
@@ -67,7 +72,7 @@ func main() {
}
}
func
gitHandler
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
func
gitHandler
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
var
gl_id
string
var
env
gitEnv
var
pathMatch
[]
string
var
pathMatch
[]
string
var
g
gitService
var
g
gitService
var
foundService
bool
var
foundService
bool
...
@@ -111,7 +116,8 @@ func gitHandler(w http.ResponseWriter, r *http.Request) {
...
@@ -111,7 +116,8 @@ func gitHandler(w http.ResponseWriter, r *http.Request) {
// The auth backend validated the client request and told us who
// The auth backend validated the client request and told us who
// the user is according to them (GL_ID). We must extract this
// the user is according to them (GL_ID). We must extract this
// information from the auth response body.
// information from the auth response body.
if
_
,
err
:=
fmt
.
Fscan
(
authResponse
.
Body
,
&
gl_id
);
err
!=
nil
{
dec
:=
json
.
NewDecoder
(
authResponse
.
Body
)
if
err
:=
dec
.
Decode
(
&
env
);
err
!=
nil
{
fail500
(
w
,
err
)
fail500
(
w
,
err
)
return
return
}
}
...
@@ -123,7 +129,7 @@ func gitHandler(w http.ResponseWriter, r *http.Request) {
...
@@ -123,7 +129,7 @@ func gitHandler(w http.ResponseWriter, r *http.Request) {
return
return
}
}
g
.
handleFunc
(
gl_id
,
g
.
rpc
,
path
.
Join
(
repoRoot
,
foundPath
),
w
,
r
)
g
.
handleFunc
(
env
,
g
.
rpc
,
path
.
Join
(
repoRoot
,
foundPath
),
w
,
r
)
}
}
func
validPath
(
p
string
)
bool
{
func
validPath
(
p
string
)
bool
{
...
@@ -155,7 +161,7 @@ func doAuthRequest(r *http.Request) (result *http.Response, err error) {
...
@@ -155,7 +161,7 @@ func doAuthRequest(r *http.Request) (result *http.Response, err error) {
return
httpClient
.
Do
(
authReq
)
return
httpClient
.
Do
(
authReq
)
}
}
func
handleGetInfoRefs
(
gl_id
string
,
_
string
,
path
string
,
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
func
handleGetInfoRefs
(
env
gitEnv
,
_
string
,
path
string
,
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
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
...
@@ -165,7 +171,7 @@ func handleGetInfoRefs(gl_id string, _ string, path string, w http.ResponseWrite
...
@@ -165,7 +171,7 @@ func handleGetInfoRefs(gl_id string, _ string, path string, w http.ResponseWrite
// Prepare our Git subprocess
// Prepare our Git subprocess
cmd
:=
exec
.
Command
(
"git"
,
subCommand
(
rpc
),
"--stateless-rpc"
,
"--advertise-refs"
,
path
)
cmd
:=
exec
.
Command
(
"git"
,
subCommand
(
rpc
),
"--stateless-rpc"
,
"--advertise-refs"
,
path
)
setCmdEnv
(
cmd
,
gl_id
)
setCmdEnv
(
cmd
,
env
)
stdout
,
err
:=
cmd
.
StdoutPipe
()
stdout
,
err
:=
cmd
.
StdoutPipe
()
if
err
!=
nil
{
if
err
!=
nil
{
fail500
(
w
,
err
)
fail500
(
w
,
err
)
...
@@ -200,14 +206,14 @@ func subCommand(rpc string) string {
...
@@ -200,14 +206,14 @@ func subCommand(rpc string) string {
return
strings
.
TrimPrefix
(
rpc
,
"git-"
)
return
strings
.
TrimPrefix
(
rpc
,
"git-"
)
}
}
func
setCmdEnv
(
cmd
*
exec
.
Cmd
,
gl_id
string
)
{
func
setCmdEnv
(
cmd
*
exec
.
Cmd
,
env
gitEnv
)
{
cmd
.
Env
=
[]
string
{
cmd
.
Env
=
[]
string
{
fmt
.
Sprintf
(
"PATH=%s"
,
os
.
Getenv
(
"PATH"
)),
fmt
.
Sprintf
(
"PATH=%s"
,
os
.
Getenv
(
"PATH"
)),
fmt
.
Sprintf
(
"GL_ID=%s"
,
gl_id
),
fmt
.
Sprintf
(
"GL_ID=%s"
,
env
.
GL_ID
),
}
}
}
}
func
handlePostRPC
(
gl_id
string
,
rpc
string
,
path
string
,
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
func
handlePostRPC
(
env
gitEnv
,
rpc
string
,
path
string
,
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
var
body
io
.
Reader
var
body
io
.
Reader
var
err
error
var
err
error
...
@@ -224,7 +230,7 @@ func handlePostRPC(gl_id string, rpc string, path string, w http.ResponseWriter,
...
@@ -224,7 +230,7 @@ func handlePostRPC(gl_id string, rpc string, path string, w http.ResponseWriter,
// Prepare our Git subprocess
// Prepare our Git subprocess
cmd
:=
exec
.
Command
(
"git"
,
subCommand
(
rpc
),
"--stateless-rpc"
,
path
)
cmd
:=
exec
.
Command
(
"git"
,
subCommand
(
rpc
),
"--stateless-rpc"
,
path
)
setCmdEnv
(
cmd
,
gl_id
)
setCmdEnv
(
cmd
,
env
)
stdout
,
err
:=
cmd
.
StdoutPipe
()
stdout
,
err
:=
cmd
.
StdoutPipe
()
if
err
!=
nil
{
if
err
!=
nil
{
fail500
(
w
,
err
)
fail500
(
w
,
err
)
...
...
support/say-yes.go
View file @
050eff65
...
@@ -8,7 +8,7 @@ import (
...
@@ -8,7 +8,7 @@ import (
func
main
()
{
func
main
()
{
http
.
HandleFunc
(
"/"
,
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
http
.
HandleFunc
(
"/"
,
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
fmt
.
Fprint
(
w
,
"
Yes
"
)
fmt
.
Fprint
(
w
,
"
GL_ID=
"
)
})
})
log
.
Fatal
(
http
.
ListenAndServe
(
"localhost:8080"
,
nil
))
log
.
Fatal
(
http
.
ListenAndServe
(
"localhost:8080"
,
nil
))
...
...
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