M hfcs.go → hfcs.go

@@ -297,8 +297,7 @@ return !knowns[actor]
 }
 
 func stealthmode(userid int64, r *http.Request) bool {
-	agent := r.UserAgent()
-	agent = originate(agent)
+	agent := requestActor(r)
 	if agent != "" {
 		fake := rejectorigin(userid, agent, false)
 		if fake {

M web.go → web.go

@@ -1078,16 +1078,17 @@ }
 
 var re_keyholder = regexp.MustCompile(`keyId="([^"]+)"`)
 
-func trackback(xid string, r *http.Request) {
-	agent := r.UserAgent()
-	who := originate(agent)
-	sig := r.Header.Get("Signature")
-	if sig != "" {
-		m := re_keyholder.FindStringSubmatch(sig)
-		if len(m) == 2 {
-			who = m[1]
+func requestActor(r *http.Request) string {
+	if sig := r.Header.Get("Signature"); sig != "" {
+		if m := re_keyholder.FindStringSubmatch(sig); len(m) == 2 {
+			return m[1]
 		}
 	}
+	return ""
+}
+
+func trackback(xid string, r *http.Request) {
+	who := requestActor(r)
 	if who != "" {
 		trackchan <- Track{xid: xid, who: who}
 	}