refactoring

.gitignore

@@ -148,7 +148,6 @@ dist
 .pnp.*
 
 torima
-proxy
 sqlite3.db
 test.sqlite3
 secret.env
@@ -157,7 +156,8 @@ private.der
 .gitignore
 cert.der
 
-example/main
+serv/serv
 *.db
 tmp
 
+

README.md

@@ -100,7 +100,7 @@ default_origin: app:5000 # your front-end server
 protection_scope: 
 - api:5001 # your API servers
 
-white_list_path: 
+skip_auth_list: 
 - /favicon.ico
 
 scheme: http 

config.yaml

@@ -1,6 +1,6 @@
 port: 8080
 
-white_list_path:
+skip_auth_list:
   - /favicon.ico
 
 # default_origin: 127.0.0.1:8080

core/config.go

@@ -1,8 +1,6 @@
 package core
 
 import (
-	"fmt"
-	"log"
 	"os"
 
 	"github.com/creasty/defaults"
@@ -14,12 +12,12 @@ type TorimaConfig struct {
 	Host            string   `yaml:"host" default:"http://127.0.0.1:8080"`
 	Port            int      `yaml:"port" default:"8080" `
 	Scheme          string   `yaml:"scheme" default:"http"`
-	WhiteListPath   []string `yaml:"white_list_path" default:"[]"`
+	SkipAuthList    []string `yaml:"skip_auth_list" default:"[]"`
 	ProtectionScope []string `yaml:"protection_scope" default:"[]"`
 	WebRoot         string   `yaml:"web_root" default:"/torima"`
 }
 
-func readConfig() (*TorimaConfig, error) {
+func ReadConfig() (*TorimaConfig, error) {
 	var m TorimaConfig
 	var def TorimaConfig // default config
 
@@ -44,34 +42,3 @@ func readConfig() (*TorimaConfig, error) {
 
 	return &m, err
 }
-
-func printConfig(config *TorimaConfig) {
-	fmt.Println("default_origin:", config.DefaultOrigin)
-	fmt.Println("host:", config.Host)
-	fmt.Println("port:", config.Port)
-	fmt.Println("scheme:", config.Scheme)
-	fmt.Println("white_list_path:", config.WhiteListPath)
-	fmt.Println("protection_scope:", config.ProtectionScope)
-	fmt.Println("web_root:", config.WebRoot)
-}
-
-func readEnv(name, def string) string {
-	value := os.Getenv(name)
-
-	if value == "" {
-		fmt.Printf("environment variable '%v' is not found so that proxy use '%v'\n", name, def)
-		value = def
-	}
-
-	return value
-}
-
-func readEnvOrPanic(name string) string {
-	value := os.Getenv(name)
-
-	if value == "" {
-		log.Fatalf("environment variable '%v' is not found", name)
-	}
-
-	return value
-}

core/core.go

@@ -7,13 +7,38 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-type TorimaDirector = func(proxy *TorimaProxy, req *http.Request, c *gin.Context) (bool, error)
-type TorimaModifyResponse = func(proxy *TorimaProxy, req *http.Response, c *gin.Context) (bool, error)
+type TorimaPackageStatus = int
+
+const (
+	AuthNeeded TorimaPackageStatus = iota
+	Authed
+	NoAuthNeeded
+	ForceStop
+	Keep
+)
+
+type TorimaPackageTarget interface{ *http.Request | *http.Response }
+
+type TorimaPackageContext[T TorimaPackageTarget] struct {
+	Proxy         *TorimaProxy
+	Target        T
+	GinContext    *gin.Context
+	PackageStatus TorimaPackageStatus
+}
+
+type TorimaDirectorPackageContext = TorimaPackageContext[*http.Request]
+type TorimaModifyResponsePackageContext = TorimaPackageContext[*http.Response]
+
+type TorimaDirector func(*TorimaDirectorPackageContext) (TorimaPackageStatus, error)
+type TorimaModifyResponse func(*TorimaModifyResponsePackageContext) (TorimaPackageStatus, error)
+type TorimaDirectors []func(*TorimaDirectorPackageContext) (TorimaPackageStatus, error)
+type TorimaModifyResponses []func(*TorimaModifyResponsePackageContext) (TorimaPackageStatus, error)
+
 type TorimaProxyWebPage = func(proxy *TorimaProxy, c *gin.RouterGroup)
 
 type TorimaProxy struct {
-	Directors       []TorimaDirector
-	ModifyResponses []TorimaModifyResponse
+	Directors       TorimaDirectors
+	ModifyResponses TorimaModifyResponses
 	ProxyWebPages   []TorimaProxyWebPage
 	Engine          *gin.Engine
 	Database        *Database
@@ -24,8 +49,8 @@ type TorimaProxy struct {
 
 func NewOchancoProxy(
 	r *gin.Engine,
-	directors []TorimaDirector,
-	modifyResponses []TorimaModifyResponse,
+	directors TorimaDirectors,
+	modifyResponses TorimaModifyResponses,
 	proxyWebPages []TorimaProxyWebPage,
 	config *TorimaConfig,
 	database *Database,