Remove `Named` interface (#26913)

`Named` is implemented by every `Method` and future implementations should implement the method too.

KN4CK3R committed 3 years ago

Commit 0eebeee1 parent a99b96c12 files · +12 −21Browse files

Unified · Split

12 files

@@ -36,6 +36,8 @@ var ( · 35 unmodified lines
36	algorithmPattern = regexp.MustCompile(`algorithm=(\w+)`)	36	algorithmPattern = regexp.MustCompile(`algorithm=(\w+)`)
37	versionPattern = regexp.MustCompile(`version=(\d+\.\d+)`)	37	versionPattern = regexp.MustCompile(`version=(\d+\.\d+)`)
38	authorizationPattern = regexp.MustCompile(`\AX-Ops-Authorization-(\d+)`)	38	authorizationPattern = regexp.MustCompile(`\AX-Ops-Authorization-(\d+)`)
		39
		40	_ auth.Method = &Auth{}
39	)	41	)
40		42
41	// Documentation:	43	// Documentation:

@@ -12,6 +12,8 @@ import ( · 11 unmodified lines
12	"code.gitea.io/gitea/services/packages"	12	"code.gitea.io/gitea/services/packages"
13	)	13	)
14		14
		15	var _ auth.Method = &Auth{}
		16
15	type Auth struct{}	17	type Auth struct{}
16		18
17	func (a *Auth) Name() string {	19	func (a *Auth) Name() string {

@@ -12,6 +12,8 @@ import ( · 11 unmodified lines
12	"code.gitea.io/gitea/services/packages"	12	"code.gitea.io/gitea/services/packages"
13	)	13	)
14		14
		15	var _ auth.Method = &Auth{}
		16
15	type Auth struct{}	17	type Auth struct{}
16		18
17	func (a *Auth) Name() string {	19	func (a *Auth) Name() string {

@@ -13,6 +13,8 @@ import ( · 12 unmodified lines
13	"code.gitea.io/gitea/services/auth"	13	"code.gitea.io/gitea/services/auth"
14	)	14	)
15		15
		16	var _ auth.Method = &Auth{}
		17
16	type Auth struct{}	18	type Auth struct{}
17		19
18	func (a *Auth) Name() string {	20	func (a *Auth) Name() string {

@@ -21,7 +21,6 @@ import ( · 20 unmodified lines
21	// Ensure the struct implements the interface.	21	// Ensure the struct implements the interface.
22	var (	22	var (
23	_ Method = &Basic{}	23	_ Method = &Basic{}
24	_ Named = &Basic{}
25	)	24	)
26		25
27	// BasicMethodName is the constant name of the basic authentication method	26	// BasicMethodName is the constant name of the basic authentication method

 import (
 	"net/http"
-	"reflect"
 	"strings"
 	user_model "code.gitea.io/gitea/models/user"
 func (b *Group) Name() string {
 	names := make([]string, 0, len(b.methods))
 	for _, m := range b.methods {
-		if n, ok := m.(Named); ok {
+		names = append(names, m.Name())
-			names = append(names, n.Name())
-		} else {
-			names = append(names, reflect.TypeOf(m).Elem().Name())
-		}
 	}
 	return strings.Join(names, ",")
 }
-// Verify extracts and validates
 func (b *Group) Verify(req *http.Request, w http.ResponseWriter, store DataStore, sess SessionStore) (*user_model.User, error) {
 	// Try to sign in with each of the enabled plugins
 	var retErr error
-	for _, ssoMethod := range b.methods {
+	for _, m := range b.methods {
-		user, err := ssoMethod.Verify(req, w, store, sess)
+		user, err := m.Verify(req, w, store, sess)
 		if err != nil {
 			if retErr == nil {
 				retErr = err
 		// Return the user and ignore any error returned by previous methods.
 		if user != nil {
 			if store.GetData()["AuthedMethod"] == nil {
-				if named, ok := ssoMethod.(Named); ok {
+				store.GetData()["AuthedMethod"] = m.Name()
-					store.GetData()["AuthedMethod"] = named.Name()
-				}
 			}
 			return user, nil
 		}

@@ -23,7 +23,6 @@ import ( · 22 unmodified lines
23	// Ensure the struct implements the interface.	23	// Ensure the struct implements the interface.
24	var (	24	var (
25	_ Method = &HTTPSign{}	25	_ Method = &HTTPSign{}
26	_ Named = &HTTPSign{}
27	)	26	)
28		27
29	// HTTPSign implements the Auth interface and authenticates requests (API requests	28	// HTTPSign implements the Auth interface and authenticates requests (API requests

 	// Second argument returns err if verification fails, otherwise
 	// First return argument returns nil if no matched verification condition
 	Verify(http *http.Request, w http.ResponseWriter, store DataStore, sess SessionStore) (*user_model.User, error)
-}
-// Named represents a named thing
-type Named interface {
 	Name() string
 }

@@ -22,7 +22,6 @@ import ( · 21 unmodified lines
22	// Ensure the struct implements the interface.	22	// Ensure the struct implements the interface.
23	var (	23	var (
24	_ Method = &OAuth2{}	24	_ Method = &OAuth2{}
25	_ Named = &OAuth2{}
26	)	25	)
27		26
28	// CheckOAuthAccessToken returns uid of user from oauth token	27	// CheckOAuthAccessToken returns uid of user from oauth token

@@ -20,7 +20,6 @@ import ( · 19 unmodified lines
20	// Ensure the struct implements the interface.	20	// Ensure the struct implements the interface.
21	var (	21	var (
22	_ Method = &ReverseProxy{}	22	_ Method = &ReverseProxy{}
23	_ Named = &ReverseProxy{}
24	)	23	)
25		24
26	// ReverseProxyMethodName is the constant name of the ReverseProxy authentication method	25	// ReverseProxyMethodName is the constant name of the ReverseProxy authentication method

@@ -14,7 +14,6 @@ import ( · 13 unmodified lines
14	// Ensure the struct implements the interface.	14	// Ensure the struct implements the interface.
15	var (	15	var (
16	_ Method = &Session{}	16	_ Method = &Session{}
17	_ Named = &Session{}
18	)	17	)
19		18
20	// Session checks if there is a user uid stored in the session and returns the user	19	// Session checks if there is a user uid stored in the session and returns the user

@@ -37,7 +37,6 @@ var ( · 36 unmodified lines
37		37
38	// Ensure the struct implements the interface.	38	// Ensure the struct implements the interface.
39	_ Method = &SSPI{}	39	_ Method = &SSPI{}
40	_ Named = &SSPI{}
41	)	40	)
42		41
43	// SSPI implements the SingleSignOn interface and authenticates requests	42	// SSPI implements the SingleSignOn interface and authenticates requests

Keyboard shortcuts