-
-
Notifications
You must be signed in to change notification settings - Fork 349
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update webfingering a little, add tests (#236)
* Update webfingering a little, add tests * fix broken tests oops
- Loading branch information
1 parent
92186c8
commit b315eee
Showing
9 changed files
with
324 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| /* | ||
| GoToSocial | ||
| Copyright (C) 2021 GoToSocial Authors [email protected] | ||
| 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 webfinger_test | ||
|
|
||
| import ( | ||
| "crypto/rand" | ||
| "crypto/rsa" | ||
| "time" | ||
|
|
||
| "git.iim.gay/grufwub/go-store/kv" | ||
| "github.com/sirupsen/logrus" | ||
| "github.com/stretchr/testify/suite" | ||
| "github.com/superseriousbusiness/gotosocial/internal/ap" | ||
| "github.com/superseriousbusiness/gotosocial/internal/api/s2s/webfinger" | ||
| "github.com/superseriousbusiness/gotosocial/internal/api/security" | ||
| "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/processing" | ||
| "github.com/superseriousbusiness/gotosocial/internal/typeutils" | ||
| "github.com/superseriousbusiness/gotosocial/testrig" | ||
| ) | ||
|
|
||
| type WebfingerStandardTestSuite struct { | ||
| // standard suite interfaces | ||
| suite.Suite | ||
| config *config.Config | ||
| db db.DB | ||
| log *logrus.Logger | ||
| tc typeutils.TypeConverter | ||
| federator federation.Federator | ||
| processor processing.Processor | ||
| storage *kv.KVStore | ||
| securityModule *security.Module | ||
|
|
||
| // standard suite models | ||
| testTokens map[string]*gtsmodel.Token | ||
| testClients map[string]*gtsmodel.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 | ||
| webfingerModule *webfinger.Module | ||
| } | ||
|
|
||
| func (suite *WebfingerStandardTestSuite) 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 *WebfingerStandardTestSuite) 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.db), suite.storage) | ||
| suite.processor = testrig.NewTestProcessor(suite.db, suite.storage, suite.federator) | ||
| suite.webfingerModule = webfinger.New(suite.config, suite.processor, suite.log).(*webfinger.Module) | ||
| suite.securityModule = security.New(suite.config, suite.db, suite.log).(*security.Module) | ||
| testrig.StandardDBSetup(suite.db, suite.testAccounts) | ||
| testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") | ||
| } | ||
|
|
||
| func (suite *WebfingerStandardTestSuite) TearDownTest() { | ||
| testrig.StandardDBTeardown(suite.db) | ||
| testrig.StandardStorageTeardown(suite.storage) | ||
| } | ||
|
|
||
| func accountDomainAccount() *gtsmodel.Account { | ||
| privateKey, err := rsa.GenerateKey(rand.Reader, 2048) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| publicKey := &privateKey.PublicKey | ||
|
|
||
| acct := >smodel.Account{ | ||
| ID: "01FG1K8EA7SYHEC7V6XKVNC4ZA", | ||
| CreatedAt: time.Now(), | ||
| UpdatedAt: time.Now(), | ||
| Username: "aaaaa", | ||
| Domain: "", | ||
| Privacy: gtsmodel.VisibilityDefault, | ||
| Language: "en", | ||
| URI: "http://gts.example.org/users/aaaaa", | ||
| URL: "http://gts.example.org/@aaaaa", | ||
| InboxURI: "http://gts.example.org/users/aaaaa/inbox", | ||
| OutboxURI: "http://gts.example.org/users/aaaaa/outbox", | ||
| FollowingURI: "http://gts.example.org/users/aaaaa/following", | ||
| FollowersURI: "http://gts.example.org/users/aaaaa/followers", | ||
| FeaturedCollectionURI: "http://gts.example.org/users/aaaaa/collections/featured", | ||
| ActorType: ap.ActorPerson, | ||
| PrivateKey: privateKey, | ||
| PublicKey: publicKey, | ||
| PublicKeyURI: "http://gts.example.org/users/aaaaa/main-key", | ||
| } | ||
|
|
||
| return acct | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,19 +43,21 @@ func (m *Module) WebfingerGETRequest(c *gin.Context) { | |
| return | ||
| } | ||
|
|
||
| withAcct := strings.Split(q, "acct:") | ||
| if len(withAcct) != 2 { | ||
| l.Debugf("aborting request because resource query %s could not be split by 'acct:'", q) | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": "bad request"}) | ||
| return | ||
| } | ||
| // remove the acct: prefix if it's present | ||
| trimAcct := strings.TrimPrefix(q, "acct:") | ||
| // remove the first @ in @[email protected] if it's present | ||
| namestring := strings.TrimPrefix(trimAcct, "@") | ||
|
|
||
| usernameAndAccountDomain := strings.Split(withAcct[1], "@") | ||
| // at this point we should have a string like [email protected] | ||
| l.Debugf("got finger request for '%s'", namestring) | ||
|
|
||
| usernameAndAccountDomain := strings.Split(namestring, "@") | ||
| if len(usernameAndAccountDomain) != 2 { | ||
| l.Debugf("aborting request because username and domain could not be parsed from %s", withAcct[1]) | ||
| l.Debugf("aborting request because username and domain could not be parsed from %s", namestring) | ||
| c.JSON(http.StatusBadRequest, gin.H{"error": "bad request"}) | ||
| return | ||
| } | ||
|
|
||
| username := strings.ToLower(usernameAndAccountDomain[0]) | ||
| accountDomain := strings.ToLower(usernameAndAccountDomain[1]) | ||
| if username == "" || accountDomain == "" { | ||
|
|
@@ -77,7 +79,7 @@ func (m *Module) WebfingerGETRequest(c *gin.Context) { | |
| ctx = context.WithValue(ctx, util.APRequestingPublicKeyVerifier, verifier) | ||
| } | ||
|
|
||
| resp, err := m.processor.GetWebfingerAccount(ctx, username, c.Request.URL) | ||
| resp, err := m.processor.GetWebfingerAccount(ctx, username) | ||
| if err != nil { | ||
| l.Debugf("aborting request with an error: %s", err.Error()) | ||
| c.JSON(err.Code(), gin.H{"error": err.Safe()}) | ||
|
|
||
Oops, something went wrong.