Use [chi](https://github.com/go-chi/chi) instead of the forked [macaron](https://gitea.com/macaron/macaron). Since macaron and chi have conflicts with session share, this big PR becomes a have-to thing. According my previous idea, we can replace macaron step by step but I'm wrong. :( Below is a list of big changes on this PR. - [x] Define `context.ResponseWriter` interface with an implementation `context.Response`. - [x] Use chi instead of macaron, and also a customize `Route` to wrap chi so that the router usage is similar as before. - [x] Create different routers for `web`, `api`, `internal` and `install` so that the codes will be more clear and no magic . - [x] Use https://github.com/unrolled/render instead of macaron's internal render - [x] Use https://github.com/NYTimes/gziphandler instead of https://gitea.com/macaron/gzip - [x] Use https://gitea.com/go-chi/session which is a modified version of https://gitea.com/macaron/session and removed `nodb` support since it will not be maintained. **BREAK** - [x] Use https://gitea.com/go-chi/captcha which is a modified version of https://gitea.com/macaron/captcha - [x] Use https://gitea.com/go-chi/cache which is a modified version of https://gitea.com/macaron/cache - [x] Use https://gitea.com/go-chi/binding which is a modified version of https://gitea.com/macaron/binding - [x] Use https://github.com/go-chi/cors instead of https://gitea.com/macaron/cors - [x] Dropped https://gitea.com/macaron/i18n and make a new one in `code.gitea.io/gitea/modules/translation` - [x] Move validation form structs from `code.gitea.io/gitea/modules/auth` to `code.gitea.io/gitea/modules/forms` to avoid dependency cycle. - [x] Removed macaron log service because it's not need any more. **BREAK** - [x] All form structs have to be get by `web.GetForm(ctx)` in the route function but not as a function parameter on routes definition. - [x] Move Git HTTP protocol implementation to use routers directly. - [x] Fix the problem that chi routes don't support trailing slash but macaron did. - [x] `/api/v1/swagger` now will be redirect to `/api/swagger` but not render directly so that `APIContext` will not create a html render. Notices: - Chi router don't support request with trailing slash - Integration test `TestUserHeatmap` maybe mysql version related. It's failed on my macOS(mysql 5.7.29 installed via brew) but succeed on CI. Co-authored-by: 6543 <6543@obermui.de>
		
			
				
	
	
		
			119 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			119 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2019 The Gitea Authors. All rights reserved.
 | |
| // Use of this source code is governed by a MIT-style
 | |
| // license that can be found in the LICENSE file.
 | |
| 
 | |
| package integrations
 | |
| 
 | |
| import (
 | |
| 	"encoding/json"
 | |
| 	"io/ioutil"
 | |
| 	"net/http"
 | |
| 	"net/http/httptest"
 | |
| 	"os"
 | |
| 	"path/filepath"
 | |
| 	"testing"
 | |
| 
 | |
| 	"code.gitea.io/gitea/modules/setting"
 | |
| 	"code.gitea.io/gitea/modules/util"
 | |
| 	"code.gitea.io/gitea/routers/routes"
 | |
| 
 | |
| 	"gitea.com/go-chi/session"
 | |
| 	"github.com/stretchr/testify/assert"
 | |
| )
 | |
| 
 | |
| func getSessionID(t *testing.T, resp *httptest.ResponseRecorder) string {
 | |
| 	cookies := resp.Result().Cookies()
 | |
| 	found := false
 | |
| 	sessionID := ""
 | |
| 	for _, cookie := range cookies {
 | |
| 		if cookie.Name == setting.SessionConfig.CookieName {
 | |
| 			sessionID = cookie.Value
 | |
| 			found = true
 | |
| 		}
 | |
| 	}
 | |
| 	assert.True(t, found)
 | |
| 	assert.NotEmpty(t, sessionID)
 | |
| 	return sessionID
 | |
| }
 | |
| 
 | |
| func sessionFile(tmpDir, sessionID string) string {
 | |
| 	return filepath.Join(tmpDir, sessionID[0:1], sessionID[1:2], sessionID)
 | |
| }
 | |
| 
 | |
| func sessionFileExist(t *testing.T, tmpDir, sessionID string) bool {
 | |
| 	sessionFile := sessionFile(tmpDir, sessionID)
 | |
| 	_, err := os.Lstat(sessionFile)
 | |
| 	if err != nil {
 | |
| 		if os.IsNotExist(err) {
 | |
| 			return false
 | |
| 		}
 | |
| 		assert.NoError(t, err)
 | |
| 	}
 | |
| 	return true
 | |
| }
 | |
| 
 | |
| func TestSessionFileCreation(t *testing.T) {
 | |
| 	defer prepareTestEnv(t)()
 | |
| 
 | |
| 	oldSessionConfig := setting.SessionConfig.ProviderConfig
 | |
| 	defer func() {
 | |
| 		setting.SessionConfig.ProviderConfig = oldSessionConfig
 | |
| 		c = routes.NormalRoutes()
 | |
| 	}()
 | |
| 
 | |
| 	var config session.Options
 | |
| 	err := json.Unmarshal([]byte(oldSessionConfig), &config)
 | |
| 	assert.NoError(t, err)
 | |
| 
 | |
| 	config.Provider = "file"
 | |
| 
 | |
| 	// Now create a temporaryDirectory
 | |
| 	tmpDir, err := ioutil.TempDir("", "sessions")
 | |
| 	assert.NoError(t, err)
 | |
| 	defer func() {
 | |
| 		if _, err := os.Stat(tmpDir); !os.IsNotExist(err) {
 | |
| 			_ = util.RemoveAll(tmpDir)
 | |
| 		}
 | |
| 	}()
 | |
| 	config.ProviderConfig = tmpDir
 | |
| 
 | |
| 	newConfigBytes, err := json.Marshal(config)
 | |
| 	assert.NoError(t, err)
 | |
| 
 | |
| 	setting.SessionConfig.ProviderConfig = string(newConfigBytes)
 | |
| 
 | |
| 	c = routes.NormalRoutes()
 | |
| 
 | |
| 	t.Run("NoSessionOnViewIssue", func(t *testing.T) {
 | |
| 		defer PrintCurrentTest(t)()
 | |
| 
 | |
| 		req := NewRequest(t, "GET", "/user2/repo1/issues/1")
 | |
| 		resp := MakeRequest(t, req, http.StatusOK)
 | |
| 		sessionID := getSessionID(t, resp)
 | |
| 
 | |
| 		// We're not logged in so there should be no session
 | |
| 		assert.False(t, sessionFileExist(t, tmpDir, sessionID))
 | |
| 	})
 | |
| 	t.Run("CreateSessionOnLogin", func(t *testing.T) {
 | |
| 		defer PrintCurrentTest(t)()
 | |
| 
 | |
| 		req := NewRequest(t, "GET", "/user/login")
 | |
| 		resp := MakeRequest(t, req, http.StatusOK)
 | |
| 		sessionID := getSessionID(t, resp)
 | |
| 
 | |
| 		// We're not logged in so there should be no session
 | |
| 		assert.False(t, sessionFileExist(t, tmpDir, sessionID))
 | |
| 
 | |
| 		doc := NewHTMLParser(t, resp.Body)
 | |
| 		req = NewRequestWithValues(t, "POST", "/user/login", map[string]string{
 | |
| 			"_csrf":     doc.GetCSRF(),
 | |
| 			"user_name": "user2",
 | |
| 			"password":  userPassword,
 | |
| 		})
 | |
| 		resp = MakeRequest(t, req, http.StatusFound)
 | |
| 		sessionID = getSessionID(t, resp)
 | |
| 
 | |
| 		assert.FileExists(t, sessionFile(tmpDir, sessionID))
 | |
| 	})
 | |
| }
 |