diff options
| author | Gabe Kangas <gabek@real-ity.com> | 2022-01-12 19:55:10 -0800 |
|---|---|---|
| committer | Gabe Kangas <gabek@real-ity.com> | 2022-01-12 19:56:55 -0800 |
| commit | 01d83064daede7270dc6f516e4d239ecb364cd08 (patch) | |
| tree | e0f939730e55d61a1746060330e0be3add42d2be | |
| parent | 9eecf1c90234ebedaac1f60c961d617a5e252642 (diff) | |
Make acct webfinger prefix optional. Closes #1662"
| -rw-r--r-- | activitypub/controllers/webfinger.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/activitypub/controllers/webfinger.go b/activitypub/controllers/webfinger.go index f3c733a97..22a29a776 100644 --- a/activitypub/controllers/webfinger.go +++ b/activitypub/controllers/webfinger.go @@ -20,7 +20,13 @@ func WebfingerHandler(w http.ResponseWriter, r *http.Request) { resource := r.URL.Query().Get("resource") resourceComponents := strings.Split(resource, ":") - account := resourceComponents[1] + + var account string + if len(resourceComponents) == 2 { + account = resourceComponents[1] + } else { + account = resourceComponents[0] + } userComponents := strings.Split(account, "@") if len(userComponents) < 2 { @@ -32,7 +38,7 @@ func WebfingerHandler(w http.ResponseWriter, r *http.Request) { if _, valid := data.GetFederatedInboxMap()[user]; !valid { // User is not valid w.WriteHeader(http.StatusNotFound) - log.Println("Webfinger request rejected") + log.Errorln("webfinger request rejected for user:", user) return } |