diff options
Diffstat (limited to 'internal/api/activitypub/users')
| -rw-r--r-- | internal/api/activitypub/users/publickeyget.go | 71 | ||||
| -rw-r--r-- | internal/api/activitypub/users/user.go | 3 |
2 files changed, 0 insertions, 74 deletions
diff --git a/internal/api/activitypub/users/publickeyget.go b/internal/api/activitypub/users/publickeyget.go deleted file mode 100644 index 27457f107..000000000 --- a/internal/api/activitypub/users/publickeyget.go +++ /dev/null @@ -1,71 +0,0 @@ -/* - GoToSocial - Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -package users - -import ( - "encoding/json" - "errors" - "net/http" - "strings" - - "github.com/gin-gonic/gin" - apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" -) - -// PublicKeyGETHandler should be served at eg https://example.org/users/:username/main-key. -// -// The goal here is to return a MINIMAL activitypub representation of an account -// in the form of a vocab.ActivityStreamsPerson. The account will only contain the id, -// public key, username, and type of the account. -func (m *Module) PublicKeyGETHandler(c *gin.Context) { - // usernames on our instance are always lowercase - requestedUsername := strings.ToLower(c.Param(UsernameKey)) - if requestedUsername == "" { - err := errors.New("no username specified in request") - apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) - return - } - - format, err := apiutil.NegotiateAccept(c, apiutil.HTMLOrActivityPubHeaders...) - if err != nil { - apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1) - return - } - - if format == string(apiutil.TextHTML) { - // redirect to the user's profile - c.Redirect(http.StatusSeeOther, "/@"+requestedUsername) - return - } - - resp, errWithCode := m.processor.GetFediUser(apiutil.TransferSignatureContext(c), requestedUsername, c.Request.URL) - if errWithCode != nil { - apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) - return - } - - b, err := json.Marshal(resp) - if err != nil { - apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) - return - } - - c.Data(http.StatusOK, format, b) -} diff --git a/internal/api/activitypub/users/user.go b/internal/api/activitypub/users/user.go index 71e47d7e9..257453bcb 100644 --- a/internal/api/activitypub/users/user.go +++ b/internal/api/activitypub/users/user.go @@ -42,8 +42,6 @@ const ( // BasePath is the base path for serving AP 'users' requests, minus the 'users' prefix. BasePath = "/:" + UsernameKey - // PublicKeyPath is a path to a user's public key, for serving bare minimum AP representations. - PublicKeyPath = BasePath + "/" + uris.PublicKeyPath // InboxPath is for serving POST requests to a user's inbox with the given username key. InboxPath = BasePath + "/" + uris.InboxPath // OutboxPath is for serving GET requests to a user's outbox with the given username key. @@ -74,7 +72,6 @@ func (m *Module) Route(attachHandler func(method string, path string, f ...gin.H attachHandler(http.MethodGet, FollowersPath, m.FollowersGETHandler) attachHandler(http.MethodGet, FollowingPath, m.FollowingGETHandler) attachHandler(http.MethodGet, StatusPath, m.StatusGETHandler) - attachHandler(http.MethodGet, PublicKeyPath, m.PublicKeyGETHandler) attachHandler(http.MethodGet, StatusRepliesPath, m.StatusRepliesGETHandler) attachHandler(http.MethodGet, OutboxPath, m.OutboxGETHandler) } |