mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-29 10:57:44 +09:00 
			
		
		
		
	Add support for FIDO U2F (#3971)
* Add support for U2F Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add vendor library Add missing translations Signed-off-by: Jonas Franz <info@jonasfranz.software> * Minor improvements Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add U2F support for Firefox, Chrome (Android) by introducing a custom JS library Add U2F error handling Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add U2F login page to OAuth Signed-off-by: Jonas Franz <info@jonasfranz.software> * Move U2F user settings to a separate file Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add unit tests for u2f model Renamed u2f table name Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems caused by refactoring Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add U2F documentation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Remove not needed console.log-s Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add default values to app.ini.sample Add FIDO U2F to comparison Signed-off-by: Jonas Franz <info@jonasfranz.software>
This commit is contained in:
		| @@ -5,6 +5,8 @@ | ||||
| package routes | ||||
|  | ||||
| import ( | ||||
| 	"encoding/gob" | ||||
| 	"net/http" | ||||
| 	"os" | ||||
| 	"path" | ||||
| 	"time" | ||||
| @@ -37,12 +39,13 @@ import ( | ||||
| 	"github.com/go-macaron/i18n" | ||||
| 	"github.com/go-macaron/session" | ||||
| 	"github.com/go-macaron/toolbox" | ||||
| 	"github.com/tstranex/u2f" | ||||
| 	"gopkg.in/macaron.v1" | ||||
| 	"net/http" | ||||
| ) | ||||
|  | ||||
| // NewMacaron initializes Macaron instance. | ||||
| func NewMacaron() *macaron.Macaron { | ||||
| 	gob.Register(&u2f.Challenge{}) | ||||
| 	m := macaron.New() | ||||
| 	if !setting.DisableRouterLog { | ||||
| 		m.Use(macaron.Logger()) | ||||
| @@ -214,6 +217,12 @@ func RegisterRoutes(m *macaron.Macaron) { | ||||
| 			m.Get("/scratch", user.TwoFactorScratch) | ||||
| 			m.Post("/scratch", bindIgnErr(auth.TwoFactorScratchAuthForm{}), user.TwoFactorScratchPost) | ||||
| 		}) | ||||
| 		m.Group("/u2f", func() { | ||||
| 			m.Get("", user.U2F) | ||||
| 			m.Get("/challenge", user.U2FChallenge) | ||||
| 			m.Post("/sign", bindIgnErr(u2f.SignResponse{}), user.U2FSign) | ||||
|  | ||||
| 		}) | ||||
| 	}, reqSignOut) | ||||
|  | ||||
| 	m.Group("/user/settings", func() { | ||||
| @@ -235,6 +244,11 @@ func RegisterRoutes(m *macaron.Macaron) { | ||||
| 				m.Get("/enroll", userSetting.EnrollTwoFactor) | ||||
| 				m.Post("/enroll", bindIgnErr(auth.TwoFactorAuthForm{}), userSetting.EnrollTwoFactorPost) | ||||
| 			}) | ||||
| 			m.Group("/u2f", func() { | ||||
| 				m.Post("/request_register", bindIgnErr(auth.U2FRegistrationForm{}), userSetting.U2FRegister) | ||||
| 				m.Post("/register", bindIgnErr(u2f.RegisterResponse{}), userSetting.U2FRegisterPost) | ||||
| 				m.Post("/delete", bindIgnErr(auth.U2FDeleteForm{}), userSetting.U2FDelete) | ||||
| 			}) | ||||
| 			m.Group("/openid", func() { | ||||
| 				m.Post("", bindIgnErr(auth.AddOpenIDForm{}), userSetting.OpenIDPost) | ||||
| 				m.Post("/delete", userSetting.DeleteOpenID) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user