feat: perform orm and cors function

Author: hunjixin

api/api_impl/server.go

@@ -0,0 +1,86 @@
+package api_impl
+
+import (
+	"context"
+	"errors"
+	"github.com/getkin/kin-openapi/openapi3filter"
+	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/cors"
+	logging "github.com/ipfs/go-log/v2"
+	"github.com/jiaozifs/jiaozifs/api"
+	"github.com/jiaozifs/jiaozifs/config"
+	middleware "github.com/oapi-codegen/nethttp-middleware"
+	"go.uber.org/fx"
+	"net"
+	"net/http"
+	"net/url"
+)
+
+var log = logging.Logger("rpc")
+
+const APIV1Prefix = "/api/v1"
+
+func SetupAPI(lc fx.Lifecycle, apiConfig *config.APIConfig, controller APIController) error {
+	swagger, err := api.GetSwagger()
+	if err != nil {
+		return err
+	}
+
+	// Clear out the servers array in the swagger spec, that skips validating
+	// that server names match. We don't know how this thing will be run.
+	swagger.Servers = nil
+	// This is how you set up a basic chi router
+	r := chi.NewRouter()
+
+	// Use our validation middleware to check all requests against the
+	// OpenAPI schema.
+	r.Use(
+		cors.Handler(cors.Options{
+			// Basic CORS
+			// for more ideas, see: https://developer.github.com/v3/#cross-origin-resource-sharing
+
+			// AllowedOrigins:   []string{"https://foo.com"}, // Use this to allow specific origin hosts
+			AllowedOrigins: []string{"https://*", "http://*"},
+			// AllowOriginFunc:  func(r *http.Request, origin string) bool { return true },
+			AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
+			AllowedHeaders:   []string{"*"},
+			ExposedHeaders:   []string{"*"},
+			AllowCredentials: false,
+			MaxAge:           300, // Maximum value not ignored by any of major browsers
+		}),
+
+		middleware.OapiRequestValidatorWithOptions(swagger, &middleware.Options{
+			Options: openapi3filter.Options{
+				AuthenticationFunc: func(ctx context.Context, input *openapi3filter.AuthenticationInput) error {
+					return nil
+				},
+			},
+		}),
+	)
+
+	api.HandlerFromMuxWithBaseURL(controller, r, APIV1Prefix)
+
+	url, err := url.Parse(apiConfig.Listen)
+	if err != nil {
+		return err
+	}
+
+	listener, err := net.Listen("tcp", url.Host)
+	if err != nil {
+		return err
+	}
+	log.Infof("Start listen api %s", listener.Addr())
+	go func() {
+		err := http.Serve(listener, r)
+		if err != nil && !errors.Is(err, http.ErrServerClosed) {
+			log.Errorf("listen address fail %s", err)
+		}
+	}()
+
+	lc.Append(fx.Hook{
+		OnStop: func(ctx context.Context) error {
+			return listener.Close()
+		},
+	})
+	return nil
+}

api/custom_responser.go renamed to api/custom_response.go

@@ -1,17 +1,41 @@
 openapi: "3.0.0"
 
 info:
-  description: lakeFS HTTP API
-  title: lakeFS API
+  description: jiaozifs HTTP API
+  title: jiaozifs API
   license:
     name: "Apache 2.0"
     url: https://www.apache.org/licenses/LICENSE-2.0.html
   version: 1.0.0
 
 servers:
   - url: "/api/v1"
-    description: lakeFS server endpoint
+    description: jiaozifs server endpoint
+
+security:
+  - jwt_token: ["aaaa"]
+  - basic_auth: ["aaaaa"]
 components:
+  securitySchemes:
+    basic_auth:
+      type: http
+      scheme: basic
+    jwt_token:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+    cookie_auth:
+      type: apiKey
+      in: cookie
+      name: internal_auth_session
+    oidc_auth:
+      type: apiKey
+      in: cookie
+      name: oidc_auth_session
+    saml_auth:
+      type: apiKey
+      in: cookie
+      name: saml_auth_session
   schemas:
     VersionResult:
       type: object
@@ -40,6 +64,8 @@ paths:
         - common
       operationId: getVersion
       summary: return program and runtime version
+      security:
+        - jwt_token: []
       responses:
         200:
           description: program version

api/jiaozifs.gen.go

@@ -0,0 +1 @@
+package auth

api/swagger.yml

@@ -5,20 +5,16 @@ package cmd
 
 import (
 	"context"
-	"errors"
-	"github.com/go-chi/chi/v5"
 	logging "github.com/ipfs/go-log/v2"
-	"github.com/jiaozifs/jiaozifs/api"
 	"github.com/jiaozifs/jiaozifs/api/api_impl"
 	"github.com/jiaozifs/jiaozifs/config"
 	"github.com/jiaozifs/jiaozifs/fx_opt"
+	"github.com/jiaozifs/jiaozifs/models"
+	"github.com/jiaozifs/jiaozifs/models/migrations"
 	"github.com/jiaozifs/jiaozifs/utils"
-	middleware "github.com/oapi-codegen/nethttp-middleware"
 	"github.com/spf13/cobra"
-	"go.uber.org/fx"
-	"net"
-	"net/http"
-	"net/url"
+	"github.com/spf13/viper"
+	"github.com/uptrace/bun"
 )
 
 var log = logging.Logger("main")
@@ -46,9 +42,13 @@ var daemonCmd = &cobra.Command{
 			//config
 			fx_opt.Override(new(*config.Config), cfg),
 			fx_opt.Override(new(*config.APIConfig), &cfg.API),
-			//business
+			fx_opt.Override(new(*config.DatabaseConfig), &cfg.Database),
+			//database
+			fx_opt.Override(new(*bun.DB), models.SetupDatabase),
+			fx_opt.Override(fx_opt.NextInvoke(), migrations.MigrateDatabase),
+			fx_opt.Override(new(*models.IUserRepo), models.NewUserRepo),
 			//api
-			fx_opt.Override(fx_opt.NextInvoke(), setupAPI),
+			fx_opt.Override(fx_opt.NextInvoke(), api_impl.SetupAPI),
 		)
 		if err != nil {
 			return err
@@ -65,47 +65,9 @@ var daemonCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(daemonCmd)
-}
-
-func setupAPI(lc fx.Lifecycle, apiConfig *config.APIConfig, controller api_impl.APIController) error {
-	swagger, err := api.GetSwagger()
-	if err != nil {
-		return err
-	}
-
-	// Clear out the servers array in the swagger spec, that skips validating
-	// that server names match. We don't know how this thing will be run.
-	swagger.Servers = nil
-	// This is how you set up a basic chi router
-	r := chi.NewRouter()
-
-	// Use our validation middleware to check all requests against the
-	// OpenAPI schema.
-	r.Use(middleware.OapiRequestValidator(swagger))
-
-	api.HandlerFromMux(controller, r)
-
-	url, err := url.Parse(apiConfig.Listen)
-	if err != nil {
-		return err
-	}
-
-	listener, err := net.Listen("tcp", url.Host)
-	if err != nil {
-		return err
-	}
-	log.Infof("Start listen api %s", listener.Addr())
-	go func() {
-		err := http.Serve(listener, r)
-		if err != nil && !errors.Is(err, http.ErrServerClosed) {
-			log.Errorf("listen address fail %s", err)
-		}
-	}()
+	daemonCmd.Flags().String("db", "", "pg connection string eg. postgres://user:pass@localhost:5432/jiaozifs?sslmode=disable")
+	daemonCmd.Flags().String("log-level", "INFO", "set log level eg. DEBUG INFO ERROR")
 
-	lc.Append(fx.Hook{
-		OnStop: func(ctx context.Context) error {
-			return listener.Close()
-		},
-	})
-	return nil
+	viper.BindPFlag("database.connection", daemonCmd.Flags().Lookup("db"))
+	viper.BindPFlag("log.level", daemonCmd.Flags().Lookup("log-level"))
 }

auth/basic_auth.go

@@ -6,18 +6,24 @@ package cmd
 import (
 	"github.com/jiaozifs/jiaozifs/config"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )
 
 // initCmd represents the init command
 var initCmd = &cobra.Command{
 	Use:   "init",
 	Short: "init jiaozifs ",
 	Long:  `create default config file for jiaoozifs`,
+	PreRun: func(cmd *cobra.Command, args []string) {
+		//provent duplicate bind flag with daemon
+		viper.BindPFlag("database.connection", cmd.Flags().Lookup("db"))
+	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return config.InitConfig()
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(initCmd)
+	initCmd.Flags().String("db", "", "pg connection string eg. postgres://user:pass@localhost:5432/jiaozifs?sslmode=disable")
 }

cmd/daemon.go

@@ -5,6 +5,7 @@ package cmd
 
 import (
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 	"os"
 )
 
@@ -15,9 +16,6 @@ var rootCmd = &cobra.Command{
 	Use:   "jiaozifs",
 	Short: "version file for manage datasets",
 	Long:  ``,
-	// Uncomment the following line if your bare application
-	// has an action associated with it:
-	// Run: func(cmd *cobra.Command, args []string) { },
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
@@ -31,5 +29,5 @@ func Execute() {
 
 func init() {
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.jiaozifs/config.yaml)")
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+	viper.BindPFlag("config", rootCmd.Flags().Lookup("config"))
 }

cmd/init.go

@@ -6,6 +6,7 @@ package cmd
 import (
 	"fmt"
 	"github.com/jiaozifs/jiaozifs/api"
+	"github.com/jiaozifs/jiaozifs/api/api_impl"
 	"github.com/jiaozifs/jiaozifs/config"
 	"github.com/jiaozifs/jiaozifs/version"
 	"github.com/spf13/cobra"
@@ -17,16 +18,19 @@ var versionCmd = &cobra.Command{
 	Short: "version of jiaozifs",
 	Long:  `jiaozifs version`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		cfg, err := config.LoadConfig(cfgFile)
+		swagger, err := api.GetSwagger()
 		if err != nil {
 			return err
 		}
-		client, err := api.NewClient(cfg.API.Listen)
+		fmt.Println("Version ", version.UserVersion())
+		fmt.Println("API Version ", swagger.Info.Version)
+
+		//get runtime version
+		cfg, err := config.LoadConfig(cfgFile)
 		if err != nil {
 			return err
 		}
-
-		swagger, err := api.GetSwagger()
+		client, err := api.NewClient(cfg.API.Listen + api_impl.APIV1Prefix)
 		if err != nil {
 			return err
 		}
@@ -42,8 +46,6 @@ var versionCmd = &cobra.Command{
 		if okResp.JSON200 == nil {
 			return fmt.Errorf("request version fail %d %s", okResp.HTTPResponse.StatusCode, okResp.HTTPResponse.Body)
 		}
-		fmt.Println("Version ", version.UserVersion())
-		fmt.Println("API Version ", swagger.Info.Version)
 		fmt.Println("Runtime Version ", okResp.JSON200.Version)
 		fmt.Println("Runtime API Version ", okResp.JSON200.ApiVersion)
 		return nil
@@ -52,14 +54,4 @@ var versionCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(versionCmd)
-
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// versionCmd.PersistentFlags().String("foo", "", "A help for foo")
-
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// versionCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }