From dec3fc8527f1c9bb733722048f8e6cb24ab026f7 Mon Sep 17 00:00:00 2001 From: zhouxhere Date: Thu, 19 Dec 2024 18:30:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=86gin=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=87=B3sqlx=E4=B8=8Emigrate=EF=BC=8Cgin=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=87=B3echo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/syz.go | 10 +- go.mod | 58 ++++------- go.sum | 127 +++++++++-------------- oauth/client.go | 3 - oauth/provider/provider.go | 39 ------- oauth/request.go | 134 ------------------------ oauth/storage/auth.go | 152 ---------------------------- oauth/storage/op.go | 49 --------- oauth/storage/storage.go | 20 ---- oauth/token.go | 6 -- server/server.go | 15 ++- store/migrations/0001_user.down.sql | 6 ++ store/migrations/0001_user.up.sql | 60 +++++++++++ store/store.go | 61 ++++++++--- 14 files changed, 193 insertions(+), 547 deletions(-) delete mode 100644 oauth/client.go delete mode 100644 oauth/provider/provider.go delete mode 100644 oauth/request.go delete mode 100644 oauth/storage/auth.go delete mode 100644 oauth/storage/op.go delete mode 100644 oauth/storage/storage.go delete mode 100644 oauth/token.go create mode 100644 store/migrations/0001_user.down.sql create mode 100644 store/migrations/0001_user.up.sql diff --git a/bin/syz.go b/bin/syz.go index b0a6f29..7cfcaef 100644 --- a/bin/syz.go +++ b/bin/syz.go @@ -39,11 +39,11 @@ var rootCmd = &cobra.Command{ return } - // if err := store.Migrate(ctx); err != nil { - // cancel() - // slog.Error("store migrate failed", "err", err) - // return - // } + if err := store.Migrate(ctx); err != nil { + cancel() + slog.Error("store migrate failed", "err", err) + return + } s := server.NewServer(ctx, config, store) diff --git a/go.mod b/go.mod index 25b7253..33f0289 100644 --- a/go.mod +++ b/go.mod @@ -4,18 +4,28 @@ go 1.22.5 require ( github.com/gin-gonic/gin v1.10.0 + github.com/golang-migrate/migrate/v4 v4.18.1 + github.com/jmoiron/sqlx v1.4.0 + github.com/lib/pq v1.10.9 github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.19.0 - google.golang.org/grpc v1.62.1 - gorm.io/driver/postgres v1.5.9 - gorm.io/gorm v1.25.12 + google.golang.org/grpc v1.64.1 ) -require gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect +require ( + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/labstack/echo/v4 v4.13.3 // indirect + github.com/labstack/gommon v0.4.2 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasttemplate v1.2.2 // indirect + go.uber.org/atomic v1.9.0 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect +) require ( - github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect github.com/bytedance/sonic v1.12.4 // indirect github.com/bytedance/sonic/loader v0.2.1 // indirect github.com/cloudwego/base64x v0.1.4 // indirect @@ -23,26 +33,12 @@ require ( github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/gabriel-vasile/mimetype v1.4.6 // indirect github.com/gin-contrib/sse v0.1.0 // indirect - github.com/go-chi/chi/v5 v5.1.0 // indirect - github.com/go-jose/go-jose v2.6.3+incompatible - github.com/go-jose/go-jose/v4 v4.0.4 // indirect - github.com/go-logr/logr v1.4.2 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.23.0 // indirect github.com/goccy/go-json v0.10.3 // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.6.0 - github.com/gorilla/securecookie v1.1.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect - github.com/jackc/pgx/v5 v5.7.1 // indirect - github.com/jackc/puddle/v2 v2.2.2 // indirect - github.com/jinzhu/inflection v1.0.0 // indirect - github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.9 // indirect github.com/leodido/go-urn v1.4.0 // indirect @@ -51,14 +47,10 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/muhlemmer/gu v0.3.1 // indirect - github.com/muhlemmer/httpforwarded v0.1.0 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect - github.com/rs/cors v1.11.1 // indirect github.com/sagikazarmark/locafero v0.6.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect - github.com/sirupsen/logrus v1.9.3 // indirect - github.com/soheilhy/cmux v0.1.5 // indirect + github.com/soheilhy/cmux v0.1.5 github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.7.0 // indirect @@ -66,22 +58,14 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect - github.com/zitadel/logging v0.6.1 // indirect - github.com/zitadel/oidc/v3 v3.33.1 // indirect - github.com/zitadel/schema v1.3.0 // indirect - go.opentelemetry.io/otel v1.32.0 // indirect - go.opentelemetry.io/otel/metric v1.32.0 // indirect - go.opentelemetry.io/otel/trace v1.32.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.12.0 // indirect - golang.org/x/crypto v0.29.0 // indirect + golang.org/x/crypto v0.31.0 // indirect golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect - golang.org/x/net v0.31.0 // indirect - golang.org/x/oauth2 v0.24.0 // indirect - golang.org/x/sync v0.9.0 // indirect - golang.org/x/sys v0.27.0 // indirect - golang.org/x/text v0.20.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect + golang.org/x/net v0.33.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect google.golang.org/protobuf v1.35.2 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 2927d53..ce505c3 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q= -github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/bytedance/sonic v1.12.4 h1:9Csb3c9ZJhfUWeMtpCDCq6BUoH5ogfDFLUgQ/jG+R0k= github.com/bytedance/sonic v1.12.4/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= @@ -24,17 +24,6 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= -github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw= -github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= -github.com/go-jose/go-jose v2.6.3+incompatible h1:eU70erXEHN0wZl7K7kBTRLel/hu4P09qqopkDaXiXso= -github.com/go-jose/go-jose v2.6.3+incompatible/go.mod h1:coBhWG9DQz8V/JlBMg3LkUGnarUaxjQlWQUUv9Cv7tw= -github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E= -github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= -github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= -github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= @@ -43,51 +32,56 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o= github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= +github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/golang-migrate/migrate/v4 v4.18.1 h1:JML/k+t4tpHCpQTCAD62Nu43NUFzHY4CV3uAuvHGC+Y= +github.com/golang-migrate/migrate/v4 v4.18.1/go.mod h1:HAX6m3sQgcdO81tdjn5exv20+3Kb13cmGli1hrD6hks= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= -github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA= -github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= -github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= -github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= -github.com/jackc/pgx/v5 v5.7.1 h1:x7SYsPBYDkHDksogeSmZZ5xzThcTgRz++I5E+ePFUcs= -github.com/jackc/pgx/v5 v5.7.1/go.mod h1:e7O26IywZZ+naJtWWos6i6fvWK+29etgITqrqHLfoZA= -github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= -github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= -github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= -github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= -github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o= +github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY= github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY= +github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g= +github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= +github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -95,10 +89,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/muhlemmer/gu v0.3.1 h1:7EAqmFrW7n3hETvuAdmFmn4hS8W+z3LgKtrnow+YzNM= -github.com/muhlemmer/gu v0.3.1/go.mod h1:YHtHR+gxM+bKEIIs7Hmi9sPT3ZDUvTN/i88wQpZkrdM= -github.com/muhlemmer/httpforwarded v0.1.0 h1:x4DLrzXdliq8mprgUMR0olDvHGkou5BJsK/vWUetyzY= -github.com/muhlemmer/httpforwarded v0.1.0/go.mod h1:yo9czKedo2pdZhoXe+yDkGVbU0TJ0q9oQ90BVoDEtw0= github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -106,17 +96,13 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA= -github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk= github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= -github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= @@ -147,24 +133,12 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -github.com/zitadel/logging v0.6.1 h1:Vyzk1rl9Kq9RCevcpX6ujUaTYFX43aa4LkvV1TvUk+Y= -github.com/zitadel/logging v0.6.1/go.mod h1:Y4CyAXHpl3Mig6JOszcV5Rqqsojj+3n7y2F591Mp/ow= -github.com/zitadel/oidc/v3 v3.33.1 h1:e3w9PDV0Mh50/ZiJWtzyT0E4uxJ6RXll+hqVDnqGbTU= -github.com/zitadel/oidc/v3 v3.33.1/go.mod h1:zkoZ1Oq6CweX3BaLrftLEGCs6YK6zDpjjVGZrP10AWU= -github.com/zitadel/schema v1.3.0 h1:kQ9W9tvIwZICCKWcMvCEweXET1OcOyGEuFbHs4o5kg0= -github.com/zitadel/schema v1.3.0/go.mod h1:NptN6mkBDFvERUCvZHlvWmmME+gmZ44xzwRXwhzsbtc= -go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw= -go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8= -go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= -go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= -go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc= -go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= -go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= -go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= -go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4= -go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= -go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= -go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= +github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/arch v0.12.0 h1:UsYJhbzPYGsT0HbEdmYcqtCv8UNGvnaL561NnIUvaKg= @@ -173,49 +147,44 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo= golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= -golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= -golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= -golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= -golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c h1:lfpJ/2rWPa/kJgxyyXM8PrNnfCzcmxJ265mADgwmvLI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= -google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 h1:mxSlqyb8ZAHsYDCfiXN1EDdNTdvjUJSLY+OnAUtYNYA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM= +google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA= +google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0= google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/go-jose/go-jose.v2 v2.6.3 h1:nt80fvSDlhKWQgSWyHyy5CfmlQr+asih51R8PTWNKKs= -gopkg.in/go-jose/go-jose.v2 v2.6.3/go.mod h1:zzZDPkNNw/c9IE7Z9jr11mBZQhKQTMzoEEIoEdZlFBI= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8= -gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI= -gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8= -gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= diff --git a/oauth/client.go b/oauth/client.go deleted file mode 100644 index 0706f81..0000000 --- a/oauth/client.go +++ /dev/null @@ -1,3 +0,0 @@ -package oauth - -type Client struct{} diff --git a/oauth/provider/provider.go b/oauth/provider/provider.go deleted file mode 100644 index 893d414..0000000 --- a/oauth/provider/provider.go +++ /dev/null @@ -1,39 +0,0 @@ -package provider - -import ( - "crypto/sha256" - "time" - - "github.com/zitadel/oidc/v3/pkg/op" - "golang.org/x/text/language" -) - -type Provider struct { - config *op.Config -} - -func NewProvider() *Provider { - - config := &op.Config{ - CryptoKey: sha256.Sum256([]byte("syz")), - DefaultLogoutRedirectURI: "/logged-out", - CodeMethodS256: true, - AuthMethodPost: true, - AuthMethodPrivateKeyJWT: true, - GrantTypeRefreshToken: true, - RequestObjectSupported: true, - SupportedUILocales: []language.Tag{language.Chinese}, - SupportedClaims: op.DefaultSupportedClaims, - SupportedScopes: op.DefaultSupportedScopes, - DeviceAuthorization: op.DeviceAuthorizationConfig{ - Lifetime: 5 * time.Minute, - PollInterval: 5 * time.Second, - UserFormPath: "/device", - UserCode: op.UserCodeBase20, - }, - } - - return &Provider{ - config: config, - } -} diff --git a/oauth/request.go b/oauth/request.go deleted file mode 100644 index efeda89..0000000 --- a/oauth/request.go +++ /dev/null @@ -1,134 +0,0 @@ -package oauth - -import ( - "time" - - "github.com/google/uuid" - "github.com/zitadel/oidc/v3/pkg/oidc" - "gorm.io/gorm" -) - -type AuthRequest struct { - ID uuid.UUID `gorm:"primary_key;type:char(36);default:(UUID());comment:ID"` - ClientID string `gorm:"type:varchar(255);not null;comment:客户端ID"` - UserID string `gorm:"type:varchar(255);not null;comment:用户ID"` - Scopes []string `gorm:"type:text;comment:范围"` - Audience []string `gorm:"type:text;comment:受众"` - CallbackURI string `gorm:"type:varchar(255);not null;comment:回调URI"` - State string `gorm:"type:varchar(255);not null;comment:状态"` - Acr string `gorm:"type:varchar(255);not null;comment:认证上下文类引用"` - Amr []string `gorm:"type:text;comment:认证方法引用"` - ResponseType oidc.ResponseType `gorm:"type:varchar(255);not null;comment:响应类型"` - ResponseMode oidc.ResponseMode `gorm:"type:varchar(255);not null;comment:响应模式"` - CodeChallenge *OIDCCodeChallenge `gorm:"type:varchar(255);not null;comment:pkce参数"` - Nonce string `gorm:"type:varchar(255);not null;comment:随机数"` - done bool `gorm:"type:boolean;not null;default:false;comment:完成"` - authTime time.Time `gorm:"type:timestamp;comment:认证时间"` - CreatedAt time.Time `gorm:"type:timestamp;not null;autoCreateTime;comment:创建时间"` - UpdatedAt time.Time `gorm:"type:timestamp;comment:更新时间"` - DeletedAt gorm.DeletedAt `gorm:"type:timestamp;comment:删除时间"` -} - -type AuthCode struct { - ID uuid.UUID `gorm:"primary_key;type:char(36);default:(UUID());comment:ID"` - Code string `gorm:"type:varchar(255);not null;comment:授权码"` - RequestId uuid.UUID `gorm:"type:char(36);not null;comment:请求ID"` -} - -func (a *AuthRequest) GetID() string { - return a.ID.String() -} - -func (a *AuthRequest) GetACR() string { - return a.Acr -} - -func (a *AuthRequest) GetAMR() []string { - return a.Amr -} - -func (a *AuthRequest) GetAudience() []string { - return a.Audience -} - -func (a *AuthRequest) GetAuthTime() time.Time { - return a.authTime -} - -func (a *AuthRequest) GetClientID() string { - return a.ClientID -} - -func (a *AuthRequest) GetCodeChallenge() *oidc.CodeChallenge { - return CodeChallengeToOIDC(a.CodeChallenge) -} - -func (a *AuthRequest) GetNonce() string { - return a.Nonce -} - -func (a *AuthRequest) GetRedirectURI() string { - return a.CallbackURI -} - -func (a *AuthRequest) GetResponseType() oidc.ResponseType { - return a.ResponseType -} - -func (a *AuthRequest) GetResponseMode() oidc.ResponseMode { - return a.ResponseMode -} - -func (a *AuthRequest) GetScopes() []string { - return a.Scopes -} - -func (a *AuthRequest) GetState() string { - return a.State -} - -func (a *AuthRequest) GetSubject() string { - return a.UserID -} - -func (a *AuthRequest) Done() bool { - return a.done -} - -func AuthRequestFromOIDC(authRequest *oidc.AuthRequest, userID string) *AuthRequest { - return &AuthRequest{ - ClientID: authRequest.ClientID, - UserID: userID, - Scopes: authRequest.Scopes, - CallbackURI: authRequest.RedirectURI, - State: authRequest.State, - ResponseType: authRequest.ResponseType, - ResponseMode: authRequest.ResponseMode, - CodeChallenge: &OIDCCodeChallenge{ - Challenge: authRequest.CodeChallenge, - Method: string(authRequest.CodeChallengeMethod), - }, - Acr: authRequest.ACRValues.String(), - Nonce: authRequest.Nonce, - CreatedAt: time.Now(), - } -} - -type OIDCCodeChallenge struct { - Challenge string - Method string -} - -func CodeChallengeToOIDC(challenge *OIDCCodeChallenge) *oidc.CodeChallenge { - if challenge == nil { - return nil - } - challengeMethod := oidc.CodeChallengeMethodPlain - if challenge.Method == "S256" { - challengeMethod = oidc.CodeChallengeMethodS256 - } - return &oidc.CodeChallenge{ - Challenge: challenge.Challenge, - Method: challengeMethod, - } -} diff --git a/oauth/storage/auth.go b/oauth/storage/auth.go deleted file mode 100644 index ed346ce..0000000 --- a/oauth/storage/auth.go +++ /dev/null @@ -1,152 +0,0 @@ -package storage - -import ( - "context" - "time" - - "git.zhouxhere.com/zhouxhere/syz/oauth" - "github.com/go-jose/go-jose" - "github.com/google/uuid" - "github.com/zitadel/oidc/v3/pkg/oidc" - "github.com/zitadel/oidc/v3/pkg/op" -) - -type AuthStorage struct { - op.AuthStorage -} - -func (s *Storage) CreateAuthRequest(ctx context.Context, authRequest *oidc.AuthRequest, userID string) (op.AuthRequest, error) { - s.lock.Lock() - defer s.lock.Unlock() - - request := oauth.AuthRequestFromOIDC(authRequest, userID) - - result := s.store.DB.Create(request) - - return request, result.Error -} - -func (s *Storage) AuthRequestByID(ctx context.Context, id string) (op.AuthRequest, error) { - s.lock.Lock() - defer s.lock.Unlock() - - var request oauth.AuthRequest - - result := s.store.DB.First(&request, id) - - return &request, result.Error -} - -func (s *Storage) AuthRequestByCode(ctx context.Context, code string) (op.AuthRequest, error) { - s.lock.Lock() - defer s.lock.Unlock() - - var authCode oauth.AuthCode - err := s.store.DB.Where("code = ?", code).First(&authCode).Error - if err != nil { - return nil, err - } - - var request oauth.AuthRequest - err = s.store.DB.Where("id = ?", authCode.RequestId).First(&request).Error - - return &request, err -} - -func (s *Storage) SaveAuthCode(ctx context.Context, requestID string, code string) error { - s.lock.Lock() - defer s.lock.Unlock() - - requestUUID, err := uuid.Parse(requestID) - - if err != nil { - return err - } - - authCode := oauth.AuthCode{ - RequestId: requestUUID, - Code: code, - } - - result := s.store.DB.Create(&authCode) - return result.Error -} - -func (s *Storage) DeleteAuthRequest(ctx context.Context, id string) error { - s.lock.Lock() - defer s.lock.Unlock() - - result := s.store.DB.Delete(&oauth.AuthCode{}, "request_id = ?", id) - - if result.Error != nil { - return result.Error - } - - result = s.store.DB.Delete(&oauth.AuthRequest{}, id) - return result.Error -} - -// The TokenRequest parameter of CreateAccessToken can be any of: -// -// * TokenRequest as returned by ClientCredentialsStorage.ClientCredentialsTokenRequest, -// -// * AuthRequest as returned by AuthRequestByID or AuthRequestByCode (above) -// -// - *oidc.JWTTokenRequest from a JWT that is the assertion value of a JWT Profile -// Grant: https://datatracker.ietf.org/doc/html/rfc7523#section-2.1 -// -// * TokenExchangeRequest as returned by ValidateTokenExchangeRequest -func (s *Storage) CreateAccessToken(ctx context.Context, tokenRequest op.TokenRequest) (accessTokenID string, expiration time.Time, err error) { - panic("not implemented") // TODO: Implement -} - -// The TokenRequest parameter of CreateAccessAndRefreshTokens can be any of: -// -// * TokenRequest as returned by ClientCredentialsStorage.ClientCredentialsTokenRequest -// -// * RefreshTokenRequest as returned by AuthStorage.TokenRequestByRefreshToken -// -// - AuthRequest as by returned by the AuthRequestByID or AuthRequestByCode (above). -// Used for the authorization code flow which requested offline_access scope and -// registered the refresh_token grant type in advance -// -// * TokenExchangeRequest as returned by ValidateTokenExchangeRequest -func (s *Storage) CreateAccessAndRefreshTokens(ctx context.Context, request op.TokenRequest, currentRefreshToken string) (accessTokenID string, newRefreshTokenID string, expiration time.Time, err error) { - panic("not implemented") // TODO: Implement -} - -func (s *Storage) TokenRequestByRefreshToken(ctx context.Context, refreshTokenID string) (op.RefreshTokenRequest, error) { - panic("not implemented") // TODO: Implement -} - -func (s *Storage) TerminateSession(ctx context.Context, userID string, clientID string) error { - panic("not implemented") // TODO: Implement -} - -// RevokeToken should revoke a token. In the situation that the original request was to -// revoke an access token, then tokenOrTokenID will be a tokenID and userID will be set -// but if the original request was for a refresh token, then userID will be empty and -// tokenOrTokenID will be the refresh token, not its ID. RevokeToken depends upon GetRefreshTokenInfo -// to get information from refresh tokens that are not either ":" strings -// nor JWTs. -func (s *Storage) RevokeToken(ctx context.Context, tokenOrTokenID string, userID string, clientID string) *oidc.Error { - panic("not implemented") // TODO: Implement -} - -// GetRefreshTokenInfo must return ErrInvalidRefreshToken when presented -// with a token that is not a refresh token. -func (s *Storage) GetRefreshTokenInfo(ctx context.Context, clientID string, token string) (userID string, tokenID string, err error) { - panic("not implemented") // TODO: Implement -} - -func (s *Storage) SigningKey(_ context.Context) (op.SigningKey, error) { - panic("not implemented") // TODO: Implement -} - -func (s *Storage) SignatureAlgorithms(_ context.Context) ([]jose.SignatureAlgorithm, error) { - panic("not implemented") // TODO: Implement -} - -func (s *Storage) KeySet(_ context.Context) ([]op.Key, error) { - panic("not implemented") // TODO: Implement -} diff --git a/oauth/storage/op.go b/oauth/storage/op.go deleted file mode 100644 index de4040d..0000000 --- a/oauth/storage/op.go +++ /dev/null @@ -1,49 +0,0 @@ -package storage - -import ( - "context" - - "github.com/go-jose/go-jose/v4" - "github.com/zitadel/oidc/v3/pkg/oidc" - "github.com/zitadel/oidc/v3/pkg/op" -) - -type OPStorage struct { - op.OPStorage -} - -// GetClientByClientID loads a Client. The returned Client is never cached and is only used to -// handle the current request. -func (s *Storage) GetClientByClientID(ctx context.Context, clientID string) (op.Client, error) { - panic("not implemented") // TODO: Implement -} - -func (s *Storage) AuthorizeClientIDSecret(ctx context.Context, clientID string, clientSecret string) error { - panic("not implemented") // TODO: Implement -} - -// SetUserinfoFromScopes is deprecated and should have an empty implementation for now. -// Implement SetUserinfoFromRequest instead. -func (s *Storage) SetUserinfoFromScopes(ctx context.Context, userinfo *oidc.UserInfo, userID string, clientID string, scopes []string) error { - panic("not implemented") // TODO: Implement -} - -func (s *Storage) SetUserinfoFromToken(ctx context.Context, userinfo *oidc.UserInfo, tokenID string, subject string, origin string) error { - panic("not implemented") // TODO: Implement -} - -func (s *Storage) SetIntrospectionFromToken(ctx context.Context, userinfo *oidc.IntrospectionResponse, tokenID string, subject string, clientID string) error { - panic("not implemented") // TODO: Implement -} - -func (s *Storage) GetPrivateClaimsFromScopes(ctx context.Context, userID string, clientID string, scopes []string) (map[string]any, error) { - panic("not implemented") // TODO: Implement -} - -func (s *Storage) GetKeyByIDAndClientID(ctx context.Context, keyID string, clientID string) (*jose.JSONWebKey, error) { - panic("not implemented") // TODO: Implement -} - -func (s *Storage) ValidateJWTProfileScopes(ctx context.Context, userID string, scopes []string) ([]string, error) { - panic("not implemented") // TODO: Implement -} diff --git a/oauth/storage/storage.go b/oauth/storage/storage.go deleted file mode 100644 index 494eb78..0000000 --- a/oauth/storage/storage.go +++ /dev/null @@ -1,20 +0,0 @@ -package storage - -import ( - "sync" - - "git.zhouxhere.com/zhouxhere/syz/store" -) - -type Storage struct { - lock sync.Mutex - store *store.Store - AuthStorage - OPStorage -} - -func NewStorage(store *store.Store) *Storage { - return &Storage{ - store: store, - } -} diff --git a/oauth/token.go b/oauth/token.go deleted file mode 100644 index 9ab33a2..0000000 --- a/oauth/token.go +++ /dev/null @@ -1,6 +0,0 @@ -package oauth - -type Token struct { -} - -type RefreshToken struct{} diff --git a/server/server.go b/server/server.go index a7e5aed..04c765e 100644 --- a/server/server.go +++ b/server/server.go @@ -10,7 +10,7 @@ import ( "git.zhouxhere.com/zhouxhere/syz/config" "git.zhouxhere.com/zhouxhere/syz/store" - "github.com/gin-gonic/gin" + "github.com/labstack/echo/v4" "github.com/pkg/errors" "github.com/soheilhy/cmux" "google.golang.org/grpc" @@ -30,17 +30,16 @@ func NewServer(ctx context.Context, config *config.Config, store *store.Store) * s.config = config - if config.Mode == "prod" { - gin.SetMode(gin.ReleaseMode) - } else { - gin.SetMode(gin.DebugMode) - } + echoServer := echo.New() + + echoServer.GET("/ping", func(c echo.Context) error { + return c.JSON(http.StatusOK, "pong") + }) - ginServer := gin.Default() addr := fmt.Sprintf("%s:%d", config.Addr, config.Port) s.httpServer = &http.Server{ Addr: addr, - Handler: ginServer, + Handler: echoServer, } grpcServer := grpc.NewServer() diff --git a/store/migrations/0001_user.down.sql b/store/migrations/0001_user.down.sql new file mode 100644 index 0000000..d88c68d --- /dev/null +++ b/store/migrations/0001_user.down.sql @@ -0,0 +1,6 @@ +DROP TYPE IF EXISTS user_status; +DROP TYPE IF EXISTS account_type; + +DROP TABLE IF EXISTS user_base; +DROP TABLE IF EXISTS user_account; +DROP TABLE IF EXISTS user_setting; diff --git a/store/migrations/0001_user.up.sql b/store/migrations/0001_user.up.sql new file mode 100644 index 0000000..2c19613 --- /dev/null +++ b/store/migrations/0001_user.up.sql @@ -0,0 +1,60 @@ +CREATE TYPE user_status AS ENUM ('normal', 'inactivate', 'banned', 'deleted'); +COMMENT ON TYPE user_status IS '用户状态枚举类型，包括正常、未激活、封禁和删除'; +CREATE TYPE account_type AS ENUM ('wechat', 'dingtalk'); +COMMENT ON TYPE account_type IS '账户类型枚举类型，包括微信和钉钉'; + +CREATE TABLE user_base ( + id SERIAL PRIMARY KEY, + username TEXT NOT NULL UNIQUE, + email TEXT UNIQUE, + phone TEXT UNIQUE, + avatar TEXT, + bio TEXT, + nickname TEXT, + password_hash TEXT NOT NULL, + status user_status NOT NULL DEFAULT 'normal', + created_at BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()), + updated_at BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()) +); + +COMMENT ON COLUMN user_base.id IS '用户ID'; +COMMENT ON COLUMN user_base.username IS '用户姓名'; +COMMENT ON COLUMN user_base.email IS '用户邮箱'; +COMMENT ON COLUMN user_base.phone IS '用户手机号'; +COMMENT ON COLUMN user_base.avatar IS '用户头像'; +COMMENT ON COLUMN user_base.bio IS '用户简介'; +COMMENT ON COLUMN user_base.nickname IS '用户昵称'; +COMMENT ON COLUMN user_base.password_hash IS '用户密码'; +COMMENT ON COLUMN user_base.status IS '用户状态'; +COMMENT ON COLUMN user_base.created_at IS '创建时间'; +COMMENT ON COLUMN user_base.updated_at IS '更新时间'; + +CREATE TABLE user_account ( + user_id INTEGER NOT NULL, + type account_type NOT NULL, + value TEXT NOT NULL, + created_at BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()), + updated_at BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()), + UNIQUE (user_id, type) +); + +COMMENT ON COLUMN user_account.user_id IS '用户ID'; +COMMENT ON COLUMN user_account.type IS '账户类型'; +COMMENT ON COLUMN user_account.value IS '设置值'; +COMMENT ON COLUMN user_account.created_at IS '创建时间'; +COMMENT ON COLUMN user_account.updated_at IS '更新时间'; + +CREATE TABLE user_setting ( + user_id INTEGER NOT NULL, + key TEXT NOT NULL, + value TEXT NOT NULL, + created_at BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()), + updated_at BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()), + UNIQUE (user_id, key) +); + +COMMENT ON COLUMN user_setting.user_id IS '用户ID'; +COMMENT ON COLUMN user_setting.key IS '设置项'; +COMMENT ON COLUMN user_setting.value IS '设置值'; +COMMENT ON COLUMN user_setting.created_at IS '创建时间'; +COMMENT ON COLUMN user_setting.updated_at IS '更新时间'; \ No newline at end of file diff --git a/store/store.go b/store/store.go index 5b8e016..003d053 100644 --- a/store/store.go +++ b/store/store.go @@ -1,40 +1,71 @@ package store import ( - "gorm.io/driver/postgres" - "gorm.io/gorm" + "context" + "embed" + + "github.com/golang-migrate/migrate/v4" + _ "github.com/golang-migrate/migrate/v4/database/postgres" + "github.com/golang-migrate/migrate/v4/source/iofs" + "github.com/jmoiron/sqlx" + _ "github.com/lib/pq" ) +//go:embed migrations/*.sql +var sqlMigrations embed.FS + type Store struct { - DB *gorm.DB + dsn string + DB *sqlx.DB } func NewStore(dsn string) (*Store, error) { - pgConfig := postgres.Config{ - DSN: dsn, - PreferSimpleProtocol: false, - } - - db, err := gorm.Open(postgres.New(pgConfig), &gorm.Config{}) + db, err := sqlx.Connect("postgres", dsn) if err != nil { return nil, err } return &Store{ - DB: db, + dsn: dsn, + DB: db, }, nil } func (s *Store) Close() error { - db, err := s.DB.DB() + return s.DB.Close() +} + +func (s *Store) Migrate(ctx context.Context) error { + source, err := iofs.New(sqlMigrations, "migrations") if err != nil { return err } - return db.Close() -} + m, err := migrate.NewWithSourceInstance("iofs", source, s.dsn) + if err != nil { + return err + } -func (s *Store) Migrate(dst ...interface{}) error { - return s.DB.AutoMigrate(dst...) + sourceVersion, err := source.First() + + if err != nil { + return err + } + + version, dirty, err := m.Version() + + if err != nil && err != migrate.ErrNilVersion { + return err + } + + if version == sourceVersion && !dirty { + return nil + } + + if err = m.Up(); err != nil && err != migrate.ErrNoChange { + return err + } + + return nil }