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>
		
			
				
	
	
		
			127 lines
		
	
	
	
		
			3.5 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			127 lines
		
	
	
	
		
			3.5 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2018 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 setting
 | |
| 
 | |
| import (
 | |
| 	"code.gitea.io/gitea/models"
 | |
| 	"code.gitea.io/gitea/modules/auth/openid"
 | |
| 	"code.gitea.io/gitea/modules/context"
 | |
| 	auth "code.gitea.io/gitea/modules/forms"
 | |
| 	"code.gitea.io/gitea/modules/log"
 | |
| 	"code.gitea.io/gitea/modules/setting"
 | |
| 	"code.gitea.io/gitea/modules/web"
 | |
| )
 | |
| 
 | |
| // OpenIDPost response for change user's openid
 | |
| func OpenIDPost(ctx *context.Context) {
 | |
| 	form := web.GetForm(ctx).(*auth.AddOpenIDForm)
 | |
| 	ctx.Data["Title"] = ctx.Tr("settings")
 | |
| 	ctx.Data["PageIsSettingsSecurity"] = true
 | |
| 
 | |
| 	if ctx.HasError() {
 | |
| 		loadSecurityData(ctx)
 | |
| 
 | |
| 		ctx.HTML(200, tplSettingsSecurity)
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	// WARNING: specifying a wrong OpenID here could lock
 | |
| 	// a user out of her account, would be better to
 | |
| 	// verify/confirm the new OpenID before storing it
 | |
| 
 | |
| 	// Also, consider allowing for multiple OpenID URIs
 | |
| 
 | |
| 	id, err := openid.Normalize(form.Openid)
 | |
| 	if err != nil {
 | |
| 		loadSecurityData(ctx)
 | |
| 
 | |
| 		ctx.RenderWithErr(err.Error(), tplSettingsSecurity, &form)
 | |
| 		return
 | |
| 	}
 | |
| 	form.Openid = id
 | |
| 	log.Trace("Normalized id: " + id)
 | |
| 
 | |
| 	oids, err := models.GetUserOpenIDs(ctx.User.ID)
 | |
| 	if err != nil {
 | |
| 		ctx.ServerError("GetUserOpenIDs", err)
 | |
| 		return
 | |
| 	}
 | |
| 	ctx.Data["OpenIDs"] = oids
 | |
| 
 | |
| 	// Check that the OpenID is not already used
 | |
| 	for _, obj := range oids {
 | |
| 		if obj.URI == id {
 | |
| 			loadSecurityData(ctx)
 | |
| 
 | |
| 			ctx.RenderWithErr(ctx.Tr("form.openid_been_used", id), tplSettingsSecurity, &form)
 | |
| 			return
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	redirectTo := setting.AppURL + "user/settings/security"
 | |
| 	url, err := openid.RedirectURL(id, redirectTo, setting.AppURL)
 | |
| 	if err != nil {
 | |
| 		loadSecurityData(ctx)
 | |
| 
 | |
| 		ctx.RenderWithErr(err.Error(), tplSettingsSecurity, &form)
 | |
| 		return
 | |
| 	}
 | |
| 	ctx.Redirect(url)
 | |
| }
 | |
| 
 | |
| func settingsOpenIDVerify(ctx *context.Context) {
 | |
| 	log.Trace("Incoming call to: " + ctx.Req.URL.String())
 | |
| 
 | |
| 	fullURL := setting.AppURL + ctx.Req.URL.String()[1:]
 | |
| 	log.Trace("Full URL: " + fullURL)
 | |
| 
 | |
| 	id, err := openid.Verify(fullURL)
 | |
| 	if err != nil {
 | |
| 		ctx.RenderWithErr(err.Error(), tplSettingsSecurity, &auth.AddOpenIDForm{
 | |
| 			Openid: id,
 | |
| 		})
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	log.Trace("Verified ID: " + id)
 | |
| 
 | |
| 	oid := &models.UserOpenID{UID: ctx.User.ID, URI: id}
 | |
| 	if err = models.AddUserOpenID(oid); err != nil {
 | |
| 		if models.IsErrOpenIDAlreadyUsed(err) {
 | |
| 			ctx.RenderWithErr(ctx.Tr("form.openid_been_used", id), tplSettingsSecurity, &auth.AddOpenIDForm{Openid: id})
 | |
| 			return
 | |
| 		}
 | |
| 		ctx.ServerError("AddUserOpenID", err)
 | |
| 		return
 | |
| 	}
 | |
| 	log.Trace("Associated OpenID %s to user %s", id, ctx.User.Name)
 | |
| 	ctx.Flash.Success(ctx.Tr("settings.add_openid_success"))
 | |
| 
 | |
| 	ctx.Redirect(setting.AppSubURL + "/user/settings/security")
 | |
| }
 | |
| 
 | |
| // DeleteOpenID response for delete user's openid
 | |
| func DeleteOpenID(ctx *context.Context) {
 | |
| 	if err := models.DeleteUserOpenID(&models.UserOpenID{ID: ctx.QueryInt64("id"), UID: ctx.User.ID}); err != nil {
 | |
| 		ctx.ServerError("DeleteUserOpenID", err)
 | |
| 		return
 | |
| 	}
 | |
| 	log.Trace("OpenID address deleted: %s", ctx.User.Name)
 | |
| 
 | |
| 	ctx.Flash.Success(ctx.Tr("settings.openid_deletion_success"))
 | |
| 	ctx.JSON(200, map[string]interface{}{
 | |
| 		"redirect": setting.AppSubURL + "/user/settings/security",
 | |
| 	})
 | |
| }
 | |
| 
 | |
| // ToggleOpenIDVisibility response for toggle visibility of user's openid
 | |
| func ToggleOpenIDVisibility(ctx *context.Context) {
 | |
| 	if err := models.ToggleUserOpenIDVisibility(ctx.QueryInt64("id")); err != nil {
 | |
| 		ctx.ServerError("ToggleUserOpenIDVisibility", err)
 | |
| 		return
 | |
| 	}
 | |
| 
 | |
| 	ctx.Redirect(setting.AppSubURL + "/user/settings/security")
 | |
| }
 |