Skip to content

Commit 56425e7

Browse files
committed
gofmt
1 parent 4b718d4 commit 56425e7

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
func init() {
12-
flag.BoolVar(&server.DefaultConfig.RequireAuth, "require_auth", server.DefaultConfig.RequireAuth, "enable basic auth")
12+
flag.BoolVar(&server.DefaultConfig.RequireAuth, "require_auth", server.DefaultConfig.RequireAuth, "enable basic auth")
1313
flag.StringVar(&server.DefaultConfig.AuthPassEnvVar, "auth_pass_env_var", server.DefaultConfig.AuthPassEnvVar, "set an env var to provide the basic auth pass as")
1414
flag.StringVar(&server.DefaultConfig.AuthUserEnvVar, "auth_user_env_var", server.DefaultConfig.AuthUserEnvVar, "set an env var to provide the basic auth user as")
1515
flag.StringVar(&server.DefaultConfig.DefaultEnv, "default_env", server.DefaultConfig.DefaultEnv, "set the default env")

server/server.go

+21-21
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ type Service struct {
2323
}
2424

2525
type Config struct {
26-
RequireAuth bool
26+
RequireAuth bool
2727
AuthPassEnvVar string
2828
AuthUserEnvVar string
2929
DefaultEnv string
@@ -47,7 +47,7 @@ var (
4747
DefaultAddress = ":8080"
4848

4949
DefaultConfig = Config{
50-
RequireAuth: false,
50+
RequireAuth: false,
5151
AuthPassEnvVar: "",
5252
AuthUserEnvVar: "",
5353
DefaultEnv: "",
@@ -147,13 +147,13 @@ func serviceRpc(hr HandlerReq) {
147147
args := []string{rpc, "--stateless-rpc", dir}
148148
cmd := exec.Command(DefaultConfig.GitBinPath, args...)
149149
version := r.Header.Get("Git-Protocol")
150-
150+
151151
cmd.Dir = dir
152152
cmd.Env = env
153153
if len(version) != 0 {
154154
cmd.Env = append(env, fmt.Sprintf("GIT_PROTOCOL=%s", version))
155155
}
156-
156+
157157
DefaultConfig.CommandFunc(cmd)
158158

159159
in, err := cmd.StdinPipe()
@@ -213,19 +213,19 @@ func getInfoRefs(hr HandlerReq) {
213213
service_name := getServiceType(r)
214214
access := hasAccess(r, dir, service_name, false)
215215
version := r.Header.Get("Git-Protocol")
216-
217-
user, password, authok := r.BasicAuth()
218-
if DefaultConfig.RequireAuth && !authok {
219-
renderAuthRequire(w)
220-
return
221-
}
222-
223-
if authok && user != DefaultConfig.AuthUserEnvVar && password != DefaultConfig.AuthPassEnvVar {
224-
w.WriteHeader(http.StatusUnauthorized)
225-
return
226-
}
227-
228-
if access {
216+
217+
user, password, authok := r.BasicAuth()
218+
if DefaultConfig.RequireAuth && !authok {
219+
renderAuthRequire(w)
220+
return
221+
}
222+
223+
if authok && user != DefaultConfig.AuthUserEnvVar && password != DefaultConfig.AuthPassEnvVar {
224+
w.WriteHeader(http.StatusUnauthorized)
225+
return
226+
}
227+
228+
if access {
229229
args := []string{service_name, "--stateless-rpc", "--advertise-refs", "."}
230230
refs := gitCommand(dir, version, args...)
231231

@@ -402,10 +402,10 @@ func renderNoAccess(w http.ResponseWriter) {
402402
}
403403

404404
func renderAuthRequire(w http.ResponseWriter) {
405-
w.Header().Add("Content-Type", "text/plain")
406-
w.Header().Add("WWW-Authenticate", "Basic realm=\"authorization needed\"")
407-
w.WriteHeader(http.StatusUnauthorized)
408-
w.Write([]byte("401 Unauthorized"))
405+
w.Header().Add("Content-Type", "text/plain")
406+
w.Header().Add("WWW-Authenticate", "Basic realm=\"authorization needed\"")
407+
w.WriteHeader(http.StatusUnauthorized)
408+
w.Write([]byte("401 Unauthorized"))
409409
}
410410

411411
// Packet-line handling function

0 commit comments

Comments
 (0)