Uprev githttp to v2.4.8 (#36)

This fixes logging and allows access to trees+paths
omegaup · Dec 14, 2021 · 153272e · 153272e
1 parent ee072ab
commit 153272e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/cmd/omegaup-gitserver/auth.go b/cmd/omegaup-gitserver/auth.go
@@ -238,8 +238,8 @@ func (a *omegaupAuthorization) parseAuthorizationHeader(
 				return
 			}
 
-			if (tokens[1] != a.config.Gitserver.SecretToken) &&
-				(tokens[1] != a.config.Gitserver.GraderSecretToken || tokens[2] != "omegaup:grader") {
+			if (a.config.Gitserver.SecretToken == "" || tokens[1] != a.config.Gitserver.SecretToken) &&
+				(a.config.Gitserver.GraderSecretToken == "" || tokens[1] != a.config.Gitserver.GraderSecretToken || tokens[2] != "omegaup:grader") {
 				return
 			}
 

diff --git a/go.mod b/go.mod
@@ -9,10 +9,10 @@ require (
 	github.com/mattn/go-sqlite3 v1.14.8
 	github.com/newrelic/go-agent/v3 v3.15.2
 	github.com/o1egl/paseto v1.0.0
-	github.com/omegaup/githttp/v2 v2.4.6
+	github.com/omegaup/githttp/v2 v2.4.8
 	github.com/omegaup/go-base/logging/log15 v0.0.0-20211211212159-014332e01547
 	github.com/omegaup/go-base/tracing/newrelic v0.0.0-20211211212159-014332e01547
-	github.com/omegaup/go-base/v3 v3.2.0
+	github.com/omegaup/go-base/v3 v3.2.1
 	github.com/omegaup/quark v1.9.1
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.8.0

diff --git a/go.sum b/go.sum
@@ -228,13 +228,17 @@ github.com/omegaup/githttp/v2 v2.4.5 h1:RslW/X9iRUOBnaMARMm7d9/ZlkYMouRT+OXVXDST
 github.com/omegaup/githttp/v2 v2.4.5/go.mod h1:TQ9YAhkWccbhyLQ6HAYElCgO8qpYqhNlhCnCbOGCMP0=
 github.com/omegaup/githttp/v2 v2.4.6 h1:Jsw3UQvKwIqlkNE3+/AlJjw86k/qQm2cpN8t7dZaMio=
 github.com/omegaup/githttp/v2 v2.4.6/go.mod h1:TQ9YAhkWccbhyLQ6HAYElCgO8qpYqhNlhCnCbOGCMP0=
+github.com/omegaup/githttp/v2 v2.4.8 h1:fVF4uB+WE5QSHfNjn5faUfA+CeixDu5F2AWcKzgBU0I=
+github.com/omegaup/githttp/v2 v2.4.8/go.mod h1:QlwsNOHX9T1U6ORMcRrf/wBCe/DTDaR18XTFHqIkdx8=
 github.com/omegaup/go-base/logging/log15 v0.0.0-20211211212159-014332e01547 h1:+SBWLdt2W+OwgpSmpa7AQyfUP7e/vMRtZpxINbYObaY=
 github.com/omegaup/go-base/logging/log15 v0.0.0-20211211212159-014332e01547/go.mod h1:adWq3jVZVRlre+15uby0M/AQiAFdpQPYnXiKK90KD4Q=
 github.com/omegaup/go-base/tracing/newrelic v0.0.0-20211211212159-014332e01547 h1:4xRiCayV7L85BMdfEIpW+jJJd6TvphVP/QVh+Mp6rUw=
 github.com/omegaup/go-base/tracing/newrelic v0.0.0-20211211212159-014332e01547/go.mod h1:jy2f4HY7BrytmlL1KujXUVxK3+rXerZ4JdPmMa/bR54=
 github.com/omegaup/go-base/v3 v3.0.0/go.mod h1:mJFH+bckd4aAXcpXDBFN6Et5p3sxYsHCxK8pUDp0YlM=
 github.com/omegaup/go-base/v3 v3.2.0 h1:exzk5NudNpJVn8chvvznFpI5gDZh45+ZVJE1PaWnVWQ=
 github.com/omegaup/go-base/v3 v3.2.0/go.mod h1:mJFH+bckd4aAXcpXDBFN6Et5p3sxYsHCxK8pUDp0YlM=
+github.com/omegaup/go-base/v3 v3.2.1 h1:m6OqWLAu4yr4oUwyhCFj2R187YSyDM6r06xGMY9Xt/w=
+github.com/omegaup/go-base/v3 v3.2.1/go.mod h1:mJFH+bckd4aAXcpXDBFN6Et5p3sxYsHCxK8pUDp0YlM=
 github.com/omegaup/quark v1.9.1 h1:13vhxWkLGuVgkkCdDXmU4vhKEZZAJghn60dzcuNpGHs=
 github.com/omegaup/quark v1.9.1/go.mod h1:GuxbSrGKQXXE4SHNM9hJdNo03ybIoD/ZRPGGDySKQr4=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=