feat: add more repository integration test

Author: hunjixin

api/custom_response.go

@@ -5,6 +5,8 @@ import (
 	"errors"
 	"net/http"
 
+	"github.com/jiaozifs/jiaozifs/auth"
+
 	"github.com/jiaozifs/jiaozifs/models"
 )
 
@@ -60,6 +62,10 @@ func (response *JiaozifsResponse) Error(err error) {
 		response.NotFound()
 		return
 	}
+	if errors.Is(err, auth.ErrUserNotFound) {
+		response.WriteHeader(http.StatusUnauthorized)
+		return
+	}
 
 	response.WriteHeader(http.StatusInternalServerError)
 	_, _ = response.Write([]byte(err.Error()))

api/custom_response_test.go

@@ -5,6 +5,8 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/jiaozifs/jiaozifs/auth"
+
 	"github.com/jiaozifs/jiaozifs/models"
 
 	"go.uber.org/mock/gomock"
@@ -20,6 +22,15 @@ func TestJiaozifsResponse(t *testing.T) {
 		jzResp.NotFound()
 	})
 
+	t.Run("forbidden", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		resp := NewMockResponseWriter(ctrl)
+		jzResp := JiaozifsResponse{resp}
+
+		resp.EXPECT().WriteHeader(http.StatusForbidden)
+		jzResp.Forbidden()
+	})
+
 	t.Run("not found", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		resp := NewMockResponseWriter(ctrl)
@@ -75,6 +86,15 @@ func TestJiaozifsResponse(t *testing.T) {
 		jzResp.Error(fmt.Errorf("mock %w", models.ErrNotFound))
 	})
 
+	t.Run("error no auth", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		resp := NewMockResponseWriter(ctrl)
+		jzResp := JiaozifsResponse{resp}
+
+		resp.EXPECT().WriteHeader(http.StatusUnauthorized)
+		jzResp.Error(fmt.Errorf("mock %w", auth.ErrUserNotFound))
+	})
+
 	t.Run("string", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		resp := NewMockResponseWriter(ctrl)

auth/auth_test.go

@@ -5,52 +5,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/jiaozifs/jiaozifs/config"
-
-	"github.com/go-openapi/swag"
 	logging "github.com/ipfs/go-log/v2"
-	"github.com/jiaozifs/jiaozifs/api"
 	"github.com/jiaozifs/jiaozifs/models"
 	"golang.org/x/crypto/bcrypt"
 )
 
 var log = logging.Logger("auth")
 
-type Login struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
-}
-
-func (l *Login) Login(ctx context.Context, repo models.IUserRepo, config *config.AuthConfig) (token api.AuthenticationToken, err error) {
-	// get user encryptedPassword by username
-	ep, err := repo.GetEPByName(ctx, l.Username)
-	if err != nil {
-		return token, fmt.Errorf("cannt get user %s encrypt password %w", l.Username, err)
-	}
-
-	// Compare ep and password
-	err = bcrypt.CompareHashAndPassword([]byte(ep), []byte(l.Password))
-	if err != nil {
-		log.Errorf("password err: %s", err)
-		return token, fmt.Errorf("user %s password not match %w", l.Username, err)
-	}
-	// Generate user token
-	loginTime := time.Now()
-	expires := loginTime.Add(expirationDuration)
-	secretKey := config.SecretKey
-
-	tokenString, err := GenerateJWTLogin(secretKey, l.Username, loginTime, expires)
-	if err != nil {
-		return token, fmt.Errorf("generate token err: %w", err)
-	}
-
-	log.Infof("usert %s login successful", l.Username)
-
-	token.Token = tokenString
-	token.TokenExpiration = swag.Int64(expires.Unix())
-	return token, nil
-}
-
 type Register struct {
 	Username string `json:"username"`
 	Email    string `json:"email"`

auth/basic_auth.go

@@ -7,6 +7,8 @@ import (
 	"github.com/jiaozifs/jiaozifs/models"
 )
 
+var ErrUserNotFound = fmt.Errorf("UserNotFound")
+
 type contextKey string
 
 const (
@@ -16,7 +18,7 @@ const (
 func GetOperator(ctx context.Context) (*models.User, error) {
 	user, ok := ctx.Value(userContextKey).(*models.User)
 	if !ok {
-		return nil, fmt.Errorf("UserNotFound")
+		return nil, ErrUserNotFound
 	}
 	return user, nil
 }

auth/context.go

@@ -3,6 +3,6 @@ package auth
 import "time"
 
 const (
-	expirationDuration = time.Hour
+	ExpirationDuration = time.Hour
 	passwordCost       = 12
 )

auth/types.go

@@ -29,7 +29,8 @@ const DefaultBranchName = "main"
 var maxNameLength = 20
 var alphanumeric = regexp.MustCompile("^[a-zA-Z0-9_]*$")
 
-var RepoNameBlackList = []string{"repository", "repo", "user", "users"}
+// RepoNameBlackList forbid repo name, reserve for routes
+var RepoNameBlackList = []string{"repository", "repositories", "wip", "wips", "object", "objects", "commit", "commits", "ref", "refs", "repo", "repos", "user", "users"}
 
 func CheckRepositoryName(name string) error {
 	for _, blackName := range RepoNameBlackList {
@@ -162,7 +163,13 @@ func (repositoryCtl RepositoryController) DeleteRepository(ctx context.Context,
 		return
 	}
 
-	if operator.Name != ownerName {
+	owner, err := repositoryCtl.Repo.UserRepo().Get(ctx, models.NewGetUserParams().SetName(ownerName))
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	if operator.Name != owner.Name {
 		w.Forbidden()
 		return
 	}
@@ -273,6 +280,11 @@ func (repositoryCtl RepositoryController) GetCommitsInRepository(ctx context.Con
 		return
 	}
 
+	if ref.CommitHash.IsEmpty() {
+		w.JSON([]api.Commit{})
+		return
+	}
+
 	commit, err := repositoryCtl.Repo.CommitRepo().Commit(ctx, ref.CommitHash)
 	if err != nil {
 		w.Error(err)

controller/repository_ctl.go

@@ -3,6 +3,10 @@ package controller
 import (
 	"context"
 	"net/http"
+	"time"
+
+	"github.com/go-openapi/swag"
+	"golang.org/x/crypto/bcrypt"
 
 	openapitypes "github.com/oapi-codegen/runtime/types"
 
@@ -33,27 +37,45 @@ type UserController struct {
 }
 
 func (userCtl UserController) Login(ctx context.Context, w *api.JiaozifsResponse, r *http.Request, body api.LoginJSONRequestBody) {
-	login := auth.Login{
-		Username: body.Username,
-		Password: body.Password,
+
+	// get user encryptedPassword by username
+	ep, err := userCtl.Repo.UserRepo().GetEPByName(ctx, body.Username)
+	if err != nil {
+		w.Code(http.StatusUnauthorized)
+		return
 	}
 
-	// perform login
-	authToken, err := login.Login(ctx, userCtl.Repo.UserRepo(), userCtl.Config)
+	// Compare ep and password
+	err = bcrypt.CompareHashAndPassword([]byte(ep), []byte(body.Password))
+	if err != nil {
+		w.Code(http.StatusUnauthorized)
+		return
+	}
+	// Generate user token
+	loginTime := time.Now()
+	expires := loginTime.Add(auth.ExpirationDuration)
+	secretKey := userCtl.Config.SecretKey
+
+	tokenString, err := auth.GenerateJWTLogin(secretKey, body.Username, loginTime, expires)
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
+	userCtlLog.Infof("usert %s login successful", body.Username)
+
 	internalAuthSession, _ := userCtl.SessionStore.Get(r, auth.InternalAuthSessionName)
-	internalAuthSession.Values[auth.TokenSessionKeyName] = authToken.Token
+	internalAuthSession.Values[auth.TokenSessionKeyName] = tokenString
 	err = userCtl.SessionStore.Save(r, w, internalAuthSession)
 	if err != nil {
 		userCtlLog.Errorf("Failed to save internal auth session %v", err)
 		w.Code(http.StatusInternalServerError)
 		return
 	}
-	w.JSON(authToken)
+	w.JSON(api.AuthenticationToken{
+		Token:           tokenString,
+		TokenExpiration: swag.Int64(expires.Unix()),
+	})
 }
 
 func (userCtl UserController) Register(ctx context.Context, w *api.JiaozifsResponse, _ *http.Request, body api.RegisterJSONRequestBody) {