Oauth2 consumer

cmd/web.go

@@ -41,6 +41,7 @@ import (
 	"github.com/go-macaron/toolbox"
 	"github.com/urfave/cli"
 	macaron "gopkg.in/macaron.v1"
+	context2 "github.com/gorilla/context"
 )
 
 // CmdWeb represents the available web sub-command.
@@ -663,11 +664,11 @@ func runWeb(ctx *cli.Context) error {
 	var err error
 	switch setting.Protocol {
 	case setting.HTTP:
-		err = runHTTP(listenAddr, m)
+		err = runHTTP(listenAddr, context2.ClearHandler(m))
 	case setting.HTTPS:
-		err = runHTTPS(listenAddr, setting.CertFile, setting.KeyFile, m)
+		err = runHTTPS(listenAddr, setting.CertFile, setting.KeyFile, context2.ClearHandler(m))
 	case setting.FCGI:
-		err = fcgi.Serve(nil, m)
+		err = fcgi.Serve(nil, context2.ClearHandler(m))
 	case setting.UnixSocket:
 		if err := os.Remove(listenAddr); err != nil && !os.IsNotExist(err) {
 			log.Fatal(4, "Failed to remove unix socket directory %s: %v", listenAddr, err)
@@ -683,7 +684,7 @@ func runWeb(ctx *cli.Context) error {
 		if err = os.Chmod(listenAddr, os.FileMode(setting.UnixSocketPermission)); err != nil {
 			log.Fatal(4, "Failed to set permission of unix socket: %v", err)
 		}
-		err = http.Serve(listener, m)
+		err = http.Serve(listener, context2.ClearHandler(m))
 	default:
 		log.Fatal(4, "Invalid protocol: %s", setting.Protocol)
 	}

models/migrations/migrations.go

@@ -80,7 +80,9 @@ var migrations = []Migration{
 	NewMigration("create user column diff view style", createUserColumnDiffViewStyle),
 	// v15 -> v16
 	NewMigration("create user column allow create organization", createAllowCreateOrganizationColumn),
-	// v16
+	// V16 -> v17
+	NewMigration("create repo unit table and add units for all repos", addUnitsToTables),
+	// v17 -> v18
 	NewMigration("add external login user", addExternalLoginUser),
 }
 

models/migrations/v16.go

@@ -1,25 +1,117 @@
-// Copyright 2016 Gitea. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
 package migrations
 
 import (
 	"fmt"
+	"time"
+
+	"code.gitea.io/gitea/modules/markdown"
 
 	"github.com/go-xorm/xorm"
 )
 
-// ExternalLoginUser makes the connecting between some existing user and additional external login sources
-type ExternalLoginUser struct {
-	ExternalID    string `xorm:"NOT NULL"`
-	UserID        int64 `xorm:"NOT NULL"`
-	LoginSourceID int64 `xorm:"NOT NULL"`
+// RepoUnit describes all units of a repository
+type RepoUnit struct {
+	ID          int64
+	RepoID      int64 `xorm:"INDEX(s)"`
+	Type        int   `xorm:"INDEX(s)"`
+	Index       int
+	Config      map[string]string `xorm:"JSON"`
+	CreatedUnix int64             `xorm:"INDEX CREATED"`
+	Created     time.Time         `xorm:"-"`
+}
+
+// Enumerate all the unit types
+const (
+	UnitTypeCode            = iota + 1 // 1 code
+	UnitTypeIssues                     // 2 issues
+	UnitTypePRs                        // 3 PRs
+	UnitTypeCommits                    // 4 Commits
+	UnitTypeReleases                   // 5 Releases
+	UnitTypeWiki                       // 6 Wiki
+	UnitTypeSettings                   // 7 Settings
+	UnitTypeExternalWiki               // 8 ExternalWiki
+	UnitTypeExternalTracker            // 9 ExternalTracker
+)
+
+// Repo describes a repository
+type Repo struct {
+	ID                                                                               int64
+	EnableWiki, EnableExternalWiki, EnableIssues, EnableExternalTracker, EnablePulls bool
+	ExternalWikiURL, ExternalTrackerURL, ExternalTrackerFormat, ExternalTrackerStyle string
 }
 
-func addExternalLoginUser(x *xorm.Engine) error {
-	if err := x.Sync2(new(ExternalLoginUser)); err != nil {
-		return fmt.Errorf("Sync2: %v", err)
+func addUnitsToTables(x *xorm.Engine) error {
+	var repos []Repo
+	err := x.Table("repository").Find(&repos)
+	if err != nil {
+		return fmt.Errorf("Query repositories: %v", err)
+	}
+
+	sess := x.NewSession()
+	defer sess.Close()
+
+	if err := sess.Begin(); err != nil {
+		return err
+	}
+
+	var repoUnit RepoUnit
+	if err := sess.CreateTable(&repoUnit); err != nil {
+		return fmt.Errorf("CreateTable RepoUnit: %v", err)
 	}
+
+	if err := sess.CreateUniques(&repoUnit); err != nil {
+		return fmt.Errorf("CreateUniques RepoUnit: %v", err)
+	}
+
+	if err := sess.CreateIndexes(&repoUnit); err != nil {
+		return fmt.Errorf("CreateIndexes RepoUnit: %v", err)
+	}
+
+	for _, repo := range repos {
+		for i := 1; i <= 9; i++ {
+			if (i == UnitTypeWiki || i == UnitTypeExternalWiki) && !repo.EnableWiki {
+				continue
+			}
+			if i == UnitTypeExternalWiki && !repo.EnableExternalWiki {
+				continue
+			}
+			if i == UnitTypePRs && !repo.EnablePulls {
+				continue
+			}
+			if (i == UnitTypeIssues || i == UnitTypeExternalTracker) && !repo.EnableIssues {
+				continue
+			}
+			if i == UnitTypeExternalTracker && !repo.EnableExternalTracker {
+				continue
+			}
+
+			var config = make(map[string]string)
+			switch i {
+			case UnitTypeExternalTracker:
+				config["ExternalTrackerURL"] = repo.ExternalTrackerURL
+				config["ExternalTrackerFormat"] = repo.ExternalTrackerFormat
+				if len(repo.ExternalTrackerStyle) == 0 {
+					repo.ExternalTrackerStyle = markdown.IssueNameStyleNumeric
+				}
+				config["ExternalTrackerStyle"] = repo.ExternalTrackerStyle
+			case UnitTypeExternalWiki:
+				config["ExternalWikiURL"] = repo.ExternalWikiURL
+			}
+
+			if _, err = sess.Insert(&RepoUnit{
+				RepoID: repo.ID,
+				Type:   i,
+				Index:  i,
+				Config: config,
+			}); err != nil {
+				return fmt.Errorf("Insert repo unit: %v", err)
+			}
+		}
+	}
+
+	if err := sess.Commit(); err != nil {
+		return err
+	}
+
 	return nil
 }

models/migrations/v17.go

@@ -0,0 +1,25 @@
+// Copyright 2016 Gitea. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+	"fmt"
+
+	"github.com/go-xorm/xorm"
+)
+
+// ExternalLoginUser makes the connecting between some existing user and additional external login sources
+type ExternalLoginUser struct {
+	ExternalID    string `xorm:"NOT NULL"`
+	UserID        int64 `xorm:"NOT NULL"`
+	LoginSourceID int64 `xorm:"NOT NULL"`
+}
+
+func addExternalLoginUser(x *xorm.Engine) error {
+	if err := x.Sync2(new(ExternalLoginUser)); err != nil {
+		return fmt.Errorf("Sync2: %v", err)
+	}
+	return nil
+}

routers/user/auth.go

@@ -338,6 +338,14 @@ func SignInOAuth(ctx *context.Context) {
 		return
 	}
 
+	// try to do a direct callback flow, so we don't authenticate the user again but use the valid accesstoken to get the user
+	user, gothUser, err := oAuth2UserLoginCallback(loginSource, ctx.Req.Request, ctx.Resp)
+	if err == nil && user != nil {
+		// we got the user without going through the whole OAuth2 authentication flow again
+		handleOAuth2SignIn(user, gothUser, ctx, err)
+		return
+	}
+
 	err = oauth2.Auth(loginSource.Name, ctx.Req.Request, ctx.Resp)
 	if err != nil {
 		ctx.Handle(500, "SignIn", err)
@@ -363,6 +371,10 @@ func SignInOAuthCallback(ctx *context.Context) {
 
 	u, gothUser, err := oAuth2UserLoginCallback(loginSource, ctx.Req.Request, ctx.Resp)
 
+	handleOAuth2SignIn(u, gothUser, ctx, err)
+}
+
+func handleOAuth2SignIn(u *models.User, gothUser goth.User, ctx *context.Context, err error) {
 	if err != nil {
 		ctx.Handle(500, "UserSignIn", err)
 		return
@@ -870,7 +882,7 @@ func ForgotPasswdPost(ctx *context.Context) {
 		return
 	}
 
-	if !u.IsLocal() {
+	if !u.IsLocal() && !u.IsOAuth2() {
 		ctx.Data["Err_Email"] = true
 		ctx.RenderWithErr(ctx.Tr("auth.non_local_account"), tplForgotPassword, nil)
 		return

templates/user/auth/signup_inner.tmpl

@@ -48,7 +48,7 @@
 						{{if not .LinkAccountMode}}
 						<div class="inline field">
 							<label></label>
-							<a href="{{AppSubUrl}}/user/login">{{.i18n.Tr "auth.register_hepler_msg"}}</a>
+							<a href="{{AppSubUrl}}/user/login">{{.i18n.Tr "auth.register_helper_msg"}}</a>
 						</div>
 						{{end}}
 					{{end}}