Merge pull request #57 from jiaozifs/test/add_branch_integration_test

Test/add branch integration test

Author: Brownjy

auth/session_store.go

@@ -1,6 +1,8 @@
 package auth
 
 import (
+	"encoding/hex"
+
 	"github.com/gorilla/sessions"
 	"github.com/jiaozifs/jiaozifs/auth/crypt"
 	"github.com/jiaozifs/jiaozifs/config"
@@ -10,6 +12,10 @@ func NewSessionStore(secretStrore crypt.SecretStore) sessions.Store {
 	return sessions.NewCookieStore(secretStrore.SharedSecret())
 }
 
-func NewSectetStore(authConfig *config.AuthConfig) crypt.SecretStore {
-	return crypt.NewSecretStore(authConfig.SecretKey)
+func NewSectetStore(authConfig *config.AuthConfig) (crypt.SecretStore, error) {
+	secretKey, err := hex.DecodeString(authConfig.SecretKey)
+	if err != nil {
+		return nil, err
+	}
+	return crypt.NewSecretStore(secretKey), nil
 }

cmd/init.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/jiaozifs/jiaozifs/config"
@@ -38,7 +37,7 @@ var initCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
-		fmt.Println(cfg.API.Listen)
+
 		if cfg.Blockstore.Type == "local" {
 			_, err = os.Stat(cfg.Blockstore.Local.Path)
 			if os.IsNotExist(err) {

cmd/root.go

@@ -30,7 +30,7 @@ func RootCmd() *cobra.Command {
 	return rootCmd
 }
 func init() {
-	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.jiaozifs/config.yaml)")
+	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "~/.jiaozifs/config.toml", "config file (default is $HOME/.jiaozifs/config.toml)")
 	rootCmd.PersistentFlags().String("listen", config.DefaultLocalBSPath, "config blockstore path")
 	_ = viper.BindPFlag("api.listen", rootCmd.PersistentFlags().Lookup("listen"))
 	_ = viper.BindPFlag("config", rootCmd.PersistentFlags().Lookup("config"))

config/config.go

@@ -5,6 +5,8 @@ import (
 	"os"
 	"path"
 
+	"github.com/mitchellh/go-homedir"
+
 	ms "github.com/mitchellh/mapstructure"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -39,7 +41,7 @@ type DatabaseConfig struct {
 }
 
 type AuthConfig struct {
-	SecretKey []byte `mapstructure:"secretKey"`
+	SecretKey string `mapstructure:"secretKey"`
 
 	UIConfig struct {
 		RBAC               string   `mapstructure:"rbac"`
@@ -52,33 +54,47 @@ type AuthConfig struct {
 	} `mapstructure:"ui_config"`
 }
 
-func InitConfig(cfgPath string) error {
-	// Search config in home directory with name ".jiaozifs" (without extension).
-	viper.AddConfigPath(cfgPath)
-	viper.SetConfigType("toml")
-	viper.SetConfigName("config")
-	if len(viper.ConfigFileUsed()) == 0 {
-		data := make(map[string]interface{})
-		err := ms.Decode(defaultCfg, &data)
-		if err != nil {
-			return err
-		}
-		for k, v := range data {
-			viper.SetDefault(k, v)
-		}
-
-		basePath := path.Dir(cfgPath)
-		err = os.MkdirAll(basePath, 0755)
-		if err != nil {
-			return err
-		}
-		return viper.WriteConfigAs(cfgPath)
+func InitConfig(cfgFile string) error {
+	var err error
+	cfgFile, err = homedir.Expand(cfgFile)
+	if err != nil {
+		return err
+	}
+
+	_, err = os.Stat(cfgFile)
+	if err == nil {
+		return fmt.Errorf("config already exit in %s", cfgFile)
+	}
+	if err != nil && !os.IsNotExist(err) {
+		return err
+	}
+
+	viper.SetConfigFile(cfgFile)
+
+	data := make(map[string]interface{})
+	err = ms.Decode(defaultCfg, &data)
+	if err != nil {
+		return err
+	}
+	for k, v := range data {
+		viper.SetDefault(k, v)
+	}
+
+	basePath := path.Dir(cfgFile)
+	err = os.MkdirAll(basePath, 0755)
+	if err != nil {
+		return err
 	}
-	return fmt.Errorf("config already exit in %s", cfgPath)
+	return viper.WriteConfigAs(cfgFile)
 }
 
 // LoadConfig reads in config file and ENV variables if set.
 func LoadConfig(cfgFile string) (*Config, error) {
+	var err error
+	cfgFile, err = homedir.Expand(cfgFile)
+	if err != nil {
+		return nil, err
+	}
 	if len(cfgFile) > 0 {
 		// Use config file from the flag.
 		viper.SetConfigFile(cfgFile)
@@ -96,7 +112,7 @@ func LoadConfig(cfgFile string) (*Config, error) {
 	viper.AutomaticEnv() // read in environment variables that match
 
 	// If a config file is found, read it in.
-	err := viper.ReadInConfig()
+	err = viper.ReadInConfig()
 	if err != nil {
 		return nil, err
 	}

config/default.go

@@ -1,6 +1,10 @@
 package config
 
-import "github.com/jiaozifs/jiaozifs/utils"
+import (
+	"encoding/hex"
+
+	"github.com/jiaozifs/jiaozifs/utils"
+)
 
 var DefaultLocalBSPath = "~/.jiaozifs/blockstore"
 
@@ -28,7 +32,7 @@ var defaultCfg = Config{
 		}{Path: DefaultLocalBSPath, ImportEnabled: false, ImportHidden: false, AllowedExternalPrefixes: nil}),
 	},
 	Auth: AuthConfig{
-		SecretKey: []byte("THIS_MUST_BE_CHANGED_IN_PRODUCTION"),
+		SecretKey: hex.EncodeToString([]byte("THIS_MUST_BE_CHANGED_IN_PRODUCTION")),
 		UIConfig: struct {
 			RBAC               string   `mapstructure:"rbac"`
 			LoginURL           string   `mapstructure:"login_url"`

controller/branch_ctl.go

@@ -3,16 +3,46 @@ package controller
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/http"
+	"regexp"
+	"strings"
 	"time"
 
+	"github.com/jiaozifs/jiaozifs/utils/hash"
+
 	"github.com/jiaozifs/jiaozifs/auth"
 
 	"github.com/jiaozifs/jiaozifs/api"
 	"github.com/jiaozifs/jiaozifs/models"
 	"go.uber.org/fx"
 )
 
+var maxBranchNameLength = 20
+var branchNameRegex = regexp.MustCompile("^[a-zA-Z0-9_]*$")
+
+func CheckBranchName(name string) error {
+	for _, blackName := range RepoNameBlackList {
+		if name == blackName {
+			return errors.New("repository name is black list")
+		}
+	}
+
+	if len(name) > maxBranchNameLength {
+		return fmt.Errorf("branch name is too long")
+	}
+
+	seg := strings.Split(name, "/")
+	if len(seg) > 2 {
+		return fmt.Errorf("ref format must be <name> or <name>/<name>")
+	}
+
+	if !branchNameRegex.Match([]byte(seg[0])) || !branchNameRegex.Match([]byte(seg[1])) {
+		return fmt.Errorf("branch name must be combination of number and letter or combine with '/'")
+	}
+	return nil
+}
+
 type BranchController struct {
 	fx.In
 
@@ -60,6 +90,11 @@ func (bct BranchController) ListBranches(ctx context.Context, w *api.JiaozifsRes
 }
 
 func (bct BranchController) CreateBranch(ctx context.Context, w *api.JiaozifsResponse, _ *http.Request, body api.CreateBranchJSONRequestBody, ownerName string, repositoryName string) {
+	if err := CheckBranchName(body.Name); err != nil {
+		w.BadRequest(err.Error())
+		return
+	}
+
 	operator, err := auth.GetOperator(ctx)
 	if err != nil {
 		w.Error(err)
@@ -84,18 +119,33 @@ func (bct BranchController) CreateBranch(ctx context.Context, w *api.JiaozifsRes
 		return
 	}
 
-	// Get source ref
-	ref, err := bct.Repo.RefRepo().Get(ctx, models.NewGetRefParams().SetName(body.Name).SetRepositoryID(repository.ID))
+	//check exit
+	_, err = bct.Repo.RefRepo().Get(ctx, models.NewGetRefParams().SetName(body.Name).SetRepositoryID(repository.ID))
+	if err == nil {
+		w.BadRequest(fmt.Sprintf("%s already exit", body.Name))
+		return
+	}
 	if err != nil && !errors.Is(err, models.ErrNotFound) {
 		w.Error(err)
 		return
 	}
+	//get source ref
+	sourceRef, err := bct.Repo.RefRepo().Get(ctx, models.NewGetRefParams().SetName(body.Source).SetRepositoryID(repository.ID))
+	if err != nil && !errors.Is(err, models.ErrNotFound) {
+		w.Error(err)
+		return
+	}
+
+	commitHash := hash.EmptyHash
+	if sourceRef != nil {
+		commitHash = sourceRef.CommitHash
+	}
+
 	// Create branch
 	newRef := &models.Ref{
 		RepositoryID: repository.ID,
-		CommitHash:   ref.CommitHash,
+		CommitHash:   commitHash,
 		Name:         body.Name,
-		Description:  ref.Description,
 		CreatorID:    operator.ID,
 		CreatedAt:    time.Now(),
 		UpdatedAt:    time.Now(),
@@ -142,6 +192,12 @@ func (bct BranchController) DeleteBranch(ctx context.Context, w *api.JiaozifsRes
 		return
 	}
 
+	_, err = bct.Repo.RefRepo().Get(ctx, models.NewGetRefParams().SetName(params.RefName).SetRepositoryID(repository.ID))
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
 	// Delete branch
 	err = bct.Repo.RefRepo().Delete(ctx, models.NewDeleteRefParams().SetName(params.RefName).SetRepositoryID(repository.ID))
 	if err != nil {

controller/user_ctl.go

@@ -2,6 +2,7 @@ package controller
 
 import (
 	"context"
+	"encoding/hex"
 	"net/http"
 	"time"
 
@@ -54,7 +55,11 @@ func (userCtl UserController) Login(ctx context.Context, w *api.JiaozifsResponse
 	// Generate user token
 	loginTime := time.Now()
 	expires := loginTime.Add(auth.ExpirationDuration)
-	secretKey := userCtl.Config.SecretKey
+	secretKey, err := hex.DecodeString(userCtl.Config.SecretKey)
+	if err != nil {
+		w.Error(err)
+		return
+	}
 
 	tokenString, err := auth.GenerateJWTLogin(secretKey, body.Username, loginTime, expires)
 	if err != nil {