mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 08:22:27 -05:00 
			
		
		
		
	[bugfix] Fix HTML escaping in instance title (#607)
* move caption sanitization -> sanitize.go * use sanitizeplaintext rather than removehtml * rename sanitizecaption to sanitizeplaintext * avoid removing html twice from statuses * unexport remoteHTML it's no longer used outside the text package so this makes it less confusing * test instance PATCH
This commit is contained in:
		
					parent
					
						
							
								f848aaa81f
							
						
					
				
			
			
				commit
				
					
						5668ce1ec7
					
				
			
		
					 15 changed files with 381 additions and 151 deletions
				
			
		
							
								
								
									
										126
									
								
								internal/api/client/instance/instance_test.go
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										126
									
								
								internal/api/client/instance/instance_test.go
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,126 @@ | |||
| /* | ||||
|    GoToSocial | ||||
|    Copyright (C) 2021-2022 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 instance_test | ||||
| 
 | ||||
| import ( | ||||
| 	"bytes" | ||||
| 	"fmt" | ||||
| 	"net/http" | ||||
| 	"net/http/httptest" | ||||
| 
 | ||||
| 	"codeberg.org/gruf/go-store/kv" | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	"github.com/spf13/viper" | ||||
| 	"github.com/stretchr/testify/suite" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/api/client/instance" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/concurrency" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/config" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/db" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/email" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/federation" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/media" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/messages" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/processing" | ||||
| 	"github.com/superseriousbusiness/gotosocial/testrig" | ||||
| ) | ||||
| 
 | ||||
| type InstanceStandardTestSuite struct { | ||||
| 	// standard suite interfaces | ||||
| 	suite.Suite | ||||
| 	db           db.DB | ||||
| 	storage      *kv.KVStore | ||||
| 	mediaManager media.Manager | ||||
| 	federator    federation.Federator | ||||
| 	processor    processing.Processor | ||||
| 	emailSender  email.Sender | ||||
| 	sentEmails   map[string]string | ||||
| 
 | ||||
| 	// 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 | ||||
| 	instanceModule *instance.Module | ||||
| } | ||||
| 
 | ||||
| func (suite *InstanceStandardTestSuite) 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 *InstanceStandardTestSuite) SetupTest() { | ||||
| 	testrig.InitTestConfig() | ||||
| 	testrig.InitTestLog() | ||||
| 
 | ||||
| 	fedWorker := concurrency.NewWorkerPool[messages.FromFederator](-1, -1) | ||||
| 	clientWorker := concurrency.NewWorkerPool[messages.FromClientAPI](-1, -1) | ||||
| 
 | ||||
| 	suite.db = testrig.NewTestDB() | ||||
| 	suite.storage = testrig.NewTestStorage() | ||||
| 	suite.mediaManager = testrig.NewTestMediaManager(suite.db, suite.storage) | ||||
| 	suite.federator = testrig.NewTestFederator(suite.db, testrig.NewTestTransportController(testrig.NewMockHTTPClient(nil), suite.db, fedWorker), suite.storage, suite.mediaManager, fedWorker) | ||||
| 	suite.sentEmails = make(map[string]string) | ||||
| 	suite.emailSender = testrig.NewEmailSender("../../../../web/template/", suite.sentEmails) | ||||
| 	suite.processor = testrig.NewTestProcessor(suite.db, suite.storage, suite.federator, suite.emailSender, suite.mediaManager, clientWorker, fedWorker) | ||||
| 	suite.instanceModule = instance.New(suite.processor).(*instance.Module) | ||||
| 	testrig.StandardDBSetup(suite.db, nil) | ||||
| 	testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") | ||||
| } | ||||
| 
 | ||||
| func (suite *InstanceStandardTestSuite) TearDownTest() { | ||||
| 	testrig.StandardDBTeardown(suite.db) | ||||
| 	testrig.StandardStorageTeardown(suite.storage) | ||||
| } | ||||
| 
 | ||||
| func (suite *InstanceStandardTestSuite) newContext(recorder *httptest.ResponseRecorder, requestMethod string, requestBody []byte, requestPath string, bodyContentType string) *gin.Context { | ||||
| 	ctx, _ := gin.CreateTestContext(recorder) | ||||
| 
 | ||||
| 	ctx.Set(oauth.SessionAuthorizedAccount, suite.testAccounts["admin_account"]) | ||||
| 	ctx.Set(oauth.SessionAuthorizedToken, oauth.DBTokenToToken(suite.testTokens["admin_account"])) | ||||
| 	ctx.Set(oauth.SessionAuthorizedApplication, suite.testApplications["admin_account"]) | ||||
| 	ctx.Set(oauth.SessionAuthorizedUser, suite.testUsers["admin_account"]) | ||||
| 
 | ||||
| 	protocol := viper.GetString(config.Keys.Protocol) | ||||
| 	host := viper.GetString(config.Keys.Host) | ||||
| 
 | ||||
| 	baseURI := fmt.Sprintf("%s://%s", protocol, host) | ||||
| 	requestURI := fmt.Sprintf("%s/%s", baseURI, requestPath) | ||||
| 
 | ||||
| 	ctx.Request = httptest.NewRequest(http.MethodPatch, requestURI, bytes.NewReader(requestBody)) // the endpoint we're hitting | ||||
| 
 | ||||
| 	if bodyContentType != "" { | ||||
| 		ctx.Request.Header.Set("Content-Type", bodyContentType) | ||||
| 	} | ||||
| 
 | ||||
| 	ctx.Request.Header.Set("accept", "application/json") | ||||
| 
 | ||||
| 	return ctx | ||||
| } | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue