Merge branch 'writeas'

http.go

@@ -54,7 +54,7 @@ func (s *Service) Webfinger(w http.ResponseWriter, r *http.Request) {
 		rels = append(rels, Rel(r))
 	}
 
-	rsc, err := s.Resolver.FindUser(a.Name, a.Hostname, rels)
+	rsc, err := s.Resolver.FindUser(a.Name, a.Hostname, r.Host, rels)
 	if err != nil {
 		if !s.Resolver.IsNotFoundError(err) {
 			s.ErrorHandler.ServeHTTP(w, addError(r, err))

http_test.go

@@ -19,7 +19,7 @@ import (
 type dummyUserResolver struct {
 }
 
-func (d *dummyUserResolver) FindUser(username string, hostname string, rel []Rel) (*Resource, error) {
+func (d *dummyUserResolver) FindUser(username string, hostname, requestHost string, rel []Rel) (*Resource, error) {
 	if username == "hello" {
 		if len(rel) == 2 && rel[0] == "x" && rel[1] == "y" {
 			return &Resource{

resolver.go

@@ -6,7 +6,7 @@ package webfinger
 type Resolver interface {
 
 	// FindUser finds the user given the username and hostname.
-	FindUser(username string, hostname string, r []Rel) (*Resource, error)
+	FindUser(username string, hostname, requestHost string, r []Rel) (*Resource, error)
 
 	// DummyUser allows us to return a dummy user to avoid user-enumeration via webfinger 404s. This
 	// can be done in the webfinger code itself but then it would be obvious which users are real