diff options
| author | 2021-05-08 14:25:55 +0200 | |
|---|---|---|
| committer | 2021-05-08 14:25:55 +0200 | |
| commit | 6f5c045284d34ba580d3007f70b97e05d6760527 (patch) | |
| tree | 7614da22fba906361a918fb3527465b39272ac93 /internal/api/s2s | |
| parent | Revert "make boosts work woo (#12)" (#15) (diff) | |
| download | gotosocial-6f5c045284d34ba580d3007f70b97e05d6760527.tar.xz | |
Ap (#14)
Big restructuring and initial work on activitypub
Diffstat (limited to 'internal/api/s2s')
| -rw-r--r-- | internal/api/s2s/user/user.go | 70 | ||||
| -rw-r--r-- | internal/api/s2s/user/user_test.go | 40 | ||||
| -rw-r--r-- | internal/api/s2s/user/userget.go | 67 | ||||
| -rw-r--r-- | internal/api/s2s/user/userget_test.go | 155 | 
4 files changed, 332 insertions, 0 deletions
| diff --git a/internal/api/s2s/user/user.go b/internal/api/s2s/user/user.go new file mode 100644 index 000000000..693fac7c3 --- /dev/null +++ b/internal/api/s2s/user/user.go @@ -0,0 +1,70 @@ +/* +   GoToSocial +   Copyright (C) 2021 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 user + +import ( +	"net/http" + +	"github.com/sirupsen/logrus" +	"github.com/superseriousbusiness/gotosocial/internal/api" +	"github.com/superseriousbusiness/gotosocial/internal/config" +	"github.com/superseriousbusiness/gotosocial/internal/message" +	"github.com/superseriousbusiness/gotosocial/internal/router" +	"github.com/superseriousbusiness/gotosocial/internal/util" +) + +const ( +	// UsernameKey is for account usernames. +	UsernameKey = "username" +	// UsersBasePath is the base path for serving information about Users eg https://example.org/users +	UsersBasePath = "/" + util.UsersPath +	// UsersBasePathWithUsername is just the users base path with the Username key in it. +	// Use this anywhere you need to know the username of the user being queried. +	// Eg https://example.org/users/:username +	UsersBasePathWithUsername = UsersBasePath + "/:" + UsernameKey +) + +// ActivityPubAcceptHeaders represents the Accept headers mentioned here: +// https://www.w3.org/TR/activitypub/#retrieving-objects +var ActivityPubAcceptHeaders = []string{ +	`application/activity+json`, +	`application/ld+json; profile="https://www.w3.org/ns/activitystreams"`, +} + +// Module implements the FederationAPIModule interface +type Module struct { +	config    *config.Config +	processor message.Processor +	log       *logrus.Logger +} + +// New returns a new auth module +func New(config *config.Config, processor message.Processor, log *logrus.Logger) api.FederationModule { +	return &Module{ +		config:    config, +		processor: processor, +		log:       log, +	} +} + +// Route satisfies the RESTAPIModule interface +func (m *Module) Route(s router.Router) error { +	s.AttachHandler(http.MethodGet, UsersBasePathWithUsername, m.UsersGETHandler) +	return nil +} diff --git a/internal/api/s2s/user/user_test.go b/internal/api/s2s/user/user_test.go new file mode 100644 index 000000000..84e35ab68 --- /dev/null +++ b/internal/api/s2s/user/user_test.go @@ -0,0 +1,40 @@ +package user_test + +import ( +	"github.com/sirupsen/logrus" +	"github.com/stretchr/testify/suite" +	"github.com/superseriousbusiness/gotosocial/internal/api/s2s/user" +	"github.com/superseriousbusiness/gotosocial/internal/config" +	"github.com/superseriousbusiness/gotosocial/internal/db" +	"github.com/superseriousbusiness/gotosocial/internal/federation" +	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" +	"github.com/superseriousbusiness/gotosocial/internal/message" +	"github.com/superseriousbusiness/gotosocial/internal/oauth" +	"github.com/superseriousbusiness/gotosocial/internal/storage" +	"github.com/superseriousbusiness/gotosocial/internal/typeutils" +) + +// nolint +type UserStandardTestSuite struct { +	// standard suite interfaces +	suite.Suite +	config    *config.Config +	db        db.DB +	log       *logrus.Logger +	tc        typeutils.TypeConverter +	federator federation.Federator +	processor message.Processor +	storage   storage.Storage + +	// standard suite models +	testTokens       map[string]*oauth.Token +	testClients      map[string]*oauth.Client +	testApplications map[string]*gtsmodel.Application +	testUsers        map[string]*gtsmodel.User +	testAccounts     map[string]*gtsmodel.Account +	testAttachments  map[string]*gtsmodel.MediaAttachment +	testStatuses     map[string]*gtsmodel.Status + +	// module being tested +	userModule *user.Module +} diff --git a/internal/api/s2s/user/userget.go b/internal/api/s2s/user/userget.go new file mode 100644 index 000000000..8df137f44 --- /dev/null +++ b/internal/api/s2s/user/userget.go @@ -0,0 +1,67 @@ +/* +   GoToSocial +   Copyright (C) 2021 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 user + +import ( +	"net/http" + +	"github.com/gin-gonic/gin" +	"github.com/sirupsen/logrus" +) + +// UsersGETHandler should be served at https://example.org/users/:username. +// +// The goal here is to return the activitypub representation of an account +// in the form of a vocab.ActivityStreamsPerson. This should only be served +// to REMOTE SERVERS that present a valid signature on the GET request, on +// behalf of a user, otherwise we risk leaking information about users publicly. +// +// And of course, the request should be refused if the account or server making the +// request is blocked. +func (m *Module) UsersGETHandler(c *gin.Context) { +	l := m.log.WithFields(logrus.Fields{ +		"func": "UsersGETHandler", +		"url":  c.Request.RequestURI, +	}) + +	requestedUsername := c.Param(UsernameKey) +	if requestedUsername == "" { +		c.JSON(http.StatusBadRequest, gin.H{"error": "no username specified in request"}) +		return +	} + +	// make sure this actually an AP request +	format := c.NegotiateFormat(ActivityPubAcceptHeaders...) +	if format == "" { +		c.JSON(http.StatusNotAcceptable, gin.H{"error": "could not negotiate format with given Accept header(s)"}) +		return +	} +	l.Tracef("negotiated format: %s", format) + +	// make a copy of the context to pass along so we don't break anything +	cp := c.Copy() +	user, err := m.processor.GetFediUser(requestedUsername, cp.Request) // GetAPUser handles auth as well +	if err != nil { +		l.Info(err.Error()) +		c.JSON(err.Code(), gin.H{"error": err.Safe()}) +		return +	} + +	c.JSON(http.StatusOK, user) +} diff --git a/internal/api/s2s/user/userget_test.go b/internal/api/s2s/user/userget_test.go new file mode 100644 index 000000000..b45b01b63 --- /dev/null +++ b/internal/api/s2s/user/userget_test.go @@ -0,0 +1,155 @@ +package user_test + +import ( +	"bytes" +	"context" +	"crypto/x509" +	"encoding/json" +	"encoding/pem" +	"fmt" +	"io/ioutil" +	"net/http" +	"net/http/httptest" +	"strings" +	"testing" + +	"github.com/gin-gonic/gin" +	"github.com/go-fed/activity/streams" +	"github.com/go-fed/activity/streams/vocab" +	"github.com/stretchr/testify/assert" +	"github.com/stretchr/testify/suite" +	"github.com/superseriousbusiness/gotosocial/internal/api/s2s/user" +	"github.com/superseriousbusiness/gotosocial/testrig" +) + +type UserGetTestSuite struct { +	UserStandardTestSuite +} + +func (suite *UserGetTestSuite) SetupSuite() { +	suite.testTokens = testrig.NewTestTokens() +	suite.testClients = testrig.NewTestClients() +	suite.testApplications = testrig.NewTestApplications() +	suite.testUsers = testrig.NewTestUsers() +	suite.testAccounts = testrig.NewTestAccounts() +	suite.testAttachments = testrig.NewTestAttachments() +	suite.testStatuses = testrig.NewTestStatuses() +} + +func (suite *UserGetTestSuite) SetupTest() { +	suite.config = testrig.NewTestConfig() +	suite.db = testrig.NewTestDB() +	suite.tc = testrig.NewTestTypeConverter(suite.db) +	suite.storage = testrig.NewTestStorage() +	suite.log = testrig.NewTestLog() +	suite.federator = testrig.NewTestFederator(suite.db, testrig.NewTestTransportController(testrig.NewMockHTTPClient(nil))) +	suite.processor = testrig.NewTestProcessor(suite.db, suite.storage, suite.federator) +	suite.userModule = user.New(suite.config, suite.processor, suite.log).(*user.Module) +	testrig.StandardDBSetup(suite.db) +	testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") +} + +func (suite *UserGetTestSuite) TearDownTest() { +	testrig.StandardDBTeardown(suite.db) +	testrig.StandardStorageTeardown(suite.storage) +} + +func (suite *UserGetTestSuite) TestGetUser() { +	// the dereference we're gonna use +	signedRequest := testrig.NewTestDereferenceRequests(suite.testAccounts)["foss_satan_dereference_zork"] + +	requestingAccount := suite.testAccounts["remote_account_1"] +	targetAccount := suite.testAccounts["local_account_1"] + +	encodedPublicKey, err := x509.MarshalPKIXPublicKey(requestingAccount.PublicKey) +	assert.NoError(suite.T(), err) +	publicKeyBytes := pem.EncodeToMemory(&pem.Block{ +		Type:  "PUBLIC KEY", +		Bytes: encodedPublicKey, +	}) +	publicKeyString := strings.ReplaceAll(string(publicKeyBytes), "\n", "\\n") + +	// for this test we need the client to return the public key of the requester on the 'remote' instance +	responseBodyString := fmt.Sprintf(` +	{ +		"@context": [ +			"https://www.w3.org/ns/activitystreams", +			"https://w3id.org/security/v1" +		], + +		"id": "%s", +		"type": "Person", +		"preferredUsername": "%s", +		"inbox": "%s", + +		"publicKey": { +			"id": "%s", +			"owner": "%s", +			"publicKeyPem": "%s" +		} +	}`, requestingAccount.URI, requestingAccount.Username, requestingAccount.InboxURI, requestingAccount.PublicKeyURI, requestingAccount.URI, publicKeyString) + +	// create a transport controller whose client will just return the response body string we specified above +	tc := testrig.NewTestTransportController(testrig.NewMockHTTPClient(func(req *http.Request) (*http.Response, error) { +		r := ioutil.NopCloser(bytes.NewReader([]byte(responseBodyString))) +		return &http.Response{ +			StatusCode: 200, +			Body:       r, +		}, nil +	})) +	// get this transport controller embedded right in the user module we're testing +	federator := testrig.NewTestFederator(suite.db, tc) +	processor := testrig.NewTestProcessor(suite.db, suite.storage, federator) +	userModule := user.New(suite.config, processor, suite.log).(*user.Module) + +	// setup request +	recorder := httptest.NewRecorder() +	ctx, _ := gin.CreateTestContext(recorder) +	ctx.Request = httptest.NewRequest(http.MethodGet, fmt.Sprintf("http://localhost:8080%s", strings.Replace(user.UsersBasePathWithUsername, ":username", targetAccount.Username, 1)), nil) // the endpoint we're hitting + +	// normally the router would populate these params from the path values, +	// but because we're calling the function directly, we need to set them manually. +	ctx.Params = gin.Params{ +		gin.Param{ +			Key:   user.UsernameKey, +			Value: targetAccount.Username, +		}, +	} + +	// we need these headers for the request to be validated +	ctx.Request.Header.Set("Signature", signedRequest.SignatureHeader) +	ctx.Request.Header.Set("Date", signedRequest.DateHeader) +	ctx.Request.Header.Set("Digest", signedRequest.DigestHeader) + +	// trigger the function being tested +	userModule.UsersGETHandler(ctx) + +	// check response +	suite.EqualValues(http.StatusOK, recorder.Code) + +	result := recorder.Result() +	defer result.Body.Close() +	b, err := ioutil.ReadAll(result.Body) +	assert.NoError(suite.T(), err) + +	// should be a Person +	m := make(map[string]interface{}) +	err = json.Unmarshal(b, &m) +	assert.NoError(suite.T(), err) + +	t, err := streams.ToType(context.Background(), m) +	assert.NoError(suite.T(), err) + +	person, ok := t.(vocab.ActivityStreamsPerson) +	assert.True(suite.T(), ok) + +	// convert person to account +	// since this account is already known, we should get a pretty full model of it from the conversion +	a, err := suite.tc.ASRepresentationToAccount(person) +	assert.NoError(suite.T(), err) +	assert.EqualValues(suite.T(), targetAccount.Username, a.Username) +} + +func TestUserGetTestSuite(t *testing.T) { +	suite.Run(t, new(UserGetTestSuite)) +} | 
