Merge pull request #45 from essentialkaos/develop

Version 4.1.0

common/pkgre.spec

@@ -54,7 +54,7 @@
 
 Summary:            pkg.re morpher server
 Name:               pkgre
-Version:            4.0.0
+Version:            4.1.0
 Release:            0%{?dist}
 Group:              Applications/System
 License:            Apache License, Version 2.0
@@ -153,6 +153,9 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Tue Dec 08 2020 Anton Novojilov <[email protected]> - 4.1.0-0
+- Fixed bug with proxying requests to GitHub
+
 * Thu Nov 12 2020 Anton Novojilov <[email protected]> - 4.0.0-0
 - Proxying all requests due to problems with Go Modules Services
 - ek package updated to v12

server/morpher/morpher.go

@@ -8,6 +8,7 @@ package morpher
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 	"net/http"
@@ -62,6 +63,13 @@ type Metrics struct {
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
+var (
+	UAGit = []byte("git/")            // Git User-Agent
+	UAGo  = []byte("Go-http-client/") // Go User-Agent
+)
+
+// ////////////////////////////////////////////////////////////////////////////////// //
+
 // majorVerRegExp regexp for extracting major version
 var majorVerRegExp = regexp.MustCompile(`^[a-zA-Z]{0,}([0-9]{1}.*)`)
 
@@ -187,15 +195,19 @@ func requestHandler(ctx *fasthttp.RequestCtx) {
 		return
 	}
 
-	atomic.AddUint64(&metrics.Redirects, 1)
-
-	// Redirect to github
 	appendProcHeader(ctx, start)
 
 	url := repoInfo.GitHubURL(pkgInfo.TargetName)
 
-	log.Debug("Proxying request to %s", url)
-	proxyRequest(ctx, url)
+	// Proxy only requests from Go and Git
+	if bytes.HasPrefix(ctx.UserAgent(), UAGit) || bytes.HasPrefix(ctx.UserAgent(), UAGo) {
+		log.Debug("Proxying request to %s", url)
+		proxyRequest(ctx, url)
+	} else {
+		atomic.AddUint64(&metrics.Redirects, 1)
+		log.Debug("Redirecting request to %s", url)
+		redirectRequest(ctx, url)
+	}
 }
 
 // processBasicRequest redirect requests from main page to page defined in config

server/server.go

@@ -31,7 +31,7 @@ import (
 // Application info
 const (
 	APP  = "PkgRE Morpher Server"
-	VER  = "4.0.0"
+	VER  = "4.1.0"
 	DESC = "HTTP Server for morphing go get requests"
 )