doghouse: log correct remote addr

reviewdog · Jul 24, 2020 · 0f71ddf · 0f71ddf
1 parent 3571cb2
commit 0f71ddf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/doghouse/appengine/checker.go b/doghouse/appengine/checker.go
@@ -82,7 +82,7 @@ func (gc *githubChecker) validateCheckRequest(ctx context.Context, w http.Respon
 			log.Printf("[ERROR] failed to update travis CI IP addresses: %v\n", err)
 		}
 	}
-	logger.LogWithReq(r, fmt.Sprintf("[INFO] Remote Addr: %s\n", r.RemoteAddr))
+	logger.LogWithReq(r, fmt.Sprintf("[INFO] Remote Addr: %s", ciutil.IPFromReq(r)))
 	if ciutil.IsFromCI(r) {
 		// Skip token validation if it's from trusted CI providers.
 		return true

diff --git a/doghouse/server/ciutil/ciutil.go b/doghouse/server/ciutil/ciutil.go
@@ -79,7 +79,7 @@ func IsFromCI(r *http.Request) bool {
 func IsFromTravisCI(r *http.Request) bool {
 	muTravisIPAddrs.RLock()
 	defer muTravisIPAddrs.RUnlock()
-	return travisIPAddrs[ipFromReq(r)]
+	return travisIPAddrs[IPFromReq(r)]
 }
 
 // https://docs.travis-ci.com/user/ip-addresses/
@@ -100,10 +100,10 @@ func UpdateTravisCIIPAddrs(cli *http.Client) error {
 // IsFromAppveyor returns true if given request is from Appveyor.
 // https://www.appveyor.com/docs/build-environment/#ip-addresses
 func IsFromAppveyor(r *http.Request) bool {
-	return appveyorIPAddrs[ipFromReq(r)]
+	return appveyorIPAddrs[IPFromReq(r)]
 }
 
-func ipFromReq(r *http.Request) string {
+func IPFromReq(r *http.Request) string {
 	if f := r.Header.Get("Forwarded"); f != "" {
 		for _, kv := range strings.Split(f, ";") {
 			if kvPair := strings.SplitN(kv, "=", 2); len(kvPair) == 2 &&