diff --git a/go.mod b/go.mod index 486ab39..ffb3b18 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,11 @@ module code.smartsheep.studio/hydrogen/passport go 1.21.5 require ( - code.smartsheep.studio/hydrogen/bus v0.0.0-20240106112818-3e0b95f00f27 + github.com/go-playground/validator/v10 v10.17.0 + github.com/gofiber/fiber/v2 v2.52.0 + github.com/golang-jwt/jwt/v5 v5.2.0 + github.com/google/uuid v1.5.0 + github.com/json-iterator/go v1.1.12 github.com/rs/zerolog v1.31.0 github.com/samber/lo v1.39.0 github.com/spf13/viper v1.18.1 @@ -14,10 +18,12 @@ require ( ) require ( + github.com/andybalholm/brotli v1.0.5 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/gabriel-vasile/mimetype v1.4.2 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-sql-driver/mysql v1.7.1 // indirect - github.com/golang-jwt/jwt/v5 v5.2.0 // indirect - github.com/google/uuid v1.5.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect @@ -25,17 +31,17 @@ require ( github.com/jackc/puddle/v2 v2.2.1 // 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.6 // indirect - github.com/klauspost/reedsolomon v1.12.0 // indirect + github.com/klauspost/compress v1.17.0 // indirect + github.com/leodido/go-urn v1.2.4 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect 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/pelletier/go-toml/v2 v2.1.1 // indirect - github.com/pkg/errors v0.9.1 // indirect + github.com/rivo/uniseg v0.2.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/sourcegraph/conc v0.3.0 // indirect @@ -43,10 +49,9 @@ require ( github.com/spf13/cast v1.6.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/templexxx/cpu v0.1.0 // indirect - github.com/templexxx/xorsimd v0.4.2 // indirect - github.com/tjfoc/gmsm v1.4.1 // indirect - github.com/xtaci/kcp-go/v5 v5.6.5 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasthttp v1.51.0 // indirect + github.com/valyala/tcplisten v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 // indirect golang.org/x/net v0.19.0 // indirect diff --git a/go.sum b/go.sum index 2aa1c41..52b4bf3 100644 --- a/go.sum +++ b/go.sum @@ -1,45 +1,36 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= +github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= +github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= +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= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.17.0 h1:SmVVlfAOtlZncTxRuinDPomC2DkXJ4E5T9gDA0AIH74= +github.com/go-playground/validator/v10 v10.17.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gofiber/fiber/v2 v2.52.0 h1:S+qXi7y+/Pgvqq4DrSmREGiFwtB7Bu6+QFLuIHYw/UE= +github.com/gofiber/fiber/v2 v2.52.0/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ= github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw= github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -61,14 +52,14 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= 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.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= -github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= -github.com/klauspost/reedsolomon v1.12.0 h1:I5FEp3xSwVCcEh3F5A7dofEfhXdF/bWhQWPH+XwBFno= -github.com/klauspost/reedsolomon v1.12.0/go.mod h1:EPLZJeh4l27pUGC3aXOjheaoh1I9yut7xTURiW3LQ9Y= +github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= +github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= +github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= 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= @@ -77,6 +68,8 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/ github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= 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-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI= github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/microsoft/go-mssqldb v0.17.0 h1:Fto83dMZPnYv1Zwx5vHHxpNraeEaUlQ/hhHLgZiaenE= @@ -90,12 +83,12 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= 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/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= @@ -124,81 +117,34 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/templexxx/cpu v0.1.0 h1:wVM+WIJP2nYaxVxqgHPD4wGA2aJ9rvrQRV8CvFzNb40= -github.com/templexxx/cpu v0.1.0/go.mod h1:w7Tb+7qgcAlIyX4NhLuDKt78AHA5SzPmq0Wj6HiEnnk= -github.com/templexxx/xorsimd v0.4.2 h1:ocZZ+Nvu65LGHmCLZ7OoCtg8Fx8jnHKK37SjvngUoVI= -github.com/templexxx/xorsimd v0.4.2/go.mod h1:HgwaPoDREdi6OnULpSfxhzaiiSUY4Fi3JPn1wpt28NI= -github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= -github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= -github.com/xtaci/kcp-go/v5 v5.6.5 h1:oxGZNobj3OddrLzwdJYnR/waNgwrL98u02u0DWNHE3k= -github.com/xtaci/kcp-go/v5 v5.6.5/go.mod h1:Qy3Zf2tWTdFdEs0E8JvhrX+39r5UDZoYac8anvud7/Q= +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/fasthttp v1.51.0 h1:8b30A5JlZ6C7AS81RsWjYMQmrZG6feChmgAolCl1SqA= +github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g= +github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= 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/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 h1:+iq7lrkxmFNBM7xx+Rae2W6uyPfhPeDWD+n+JgppptE= golang.org/x/exp v0.0.0-20231219180239-dc181d75b848/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -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-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= golang.org/x/sys v0.16.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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= 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= @@ -220,5 +166,3 @@ gorm.io/driver/sqlserver v1.4.1/go.mod h1:DJ4P+MeZbc5rvY58PnmN1Lnyvb5gw5NPzGshHD gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls= gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/pkg/cmd/main.go b/pkg/cmd/main.go index d71e93c..37283a5 100644 --- a/pkg/cmd/main.go +++ b/pkg/cmd/main.go @@ -1,13 +1,13 @@ package main import ( + "code.smartsheep.studio/hydrogen/passport/pkg/server" "os" "os/signal" "syscall" passport "code.smartsheep.studio/hydrogen/passport/pkg" "code.smartsheep.studio/hydrogen/passport/pkg/database" - "code.smartsheep.studio/hydrogen/passport/pkg/server" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/spf13/viper" @@ -37,10 +37,9 @@ func main() { log.Fatal().Err(err).Msg("An error occurred when running database auto migration.") } - // Create connection between bus - server.InitConnection(viper.GetString("host"), viper.GetString("id")) - server.PublishCommands(server.C) - go server.C.ListenToServer() + // Server + server.NewServer() + go server.Listen() // Messages log.Info().Msgf("Passport v%s is started...", passport.AppVersion) diff --git a/pkg/server/accounts.go b/pkg/server/accounts_api.go similarity index 69% rename from pkg/server/accounts.go rename to pkg/server/accounts_api.go index 7a54567..2f707a7 100644 --- a/pkg/server/accounts.go +++ b/pkg/server/accounts_api.go @@ -1,21 +1,23 @@ package server import ( - "code.smartsheep.studio/hydrogen/bus/pkg/kit/adaptor" - "code.smartsheep.studio/hydrogen/bus/pkg/kit/publisher" - "code.smartsheep.studio/hydrogen/bus/pkg/wire" "code.smartsheep.studio/hydrogen/passport/pkg/database" "code.smartsheep.studio/hydrogen/passport/pkg/models" "code.smartsheep.studio/hydrogen/passport/pkg/security" + "github.com/gofiber/fiber/v2" ) -func doRegister(c *publisher.RequestCtx) error { - data := adaptor.ParseAnyToStruct[struct { +func doRegister(c *fiber.Ctx) error { + var data struct { Name string `json:"name"` Nick string `json:"nick"` Email string `json:"email"` Password string `json:"password"` - }](c.Parameters) + } + + if err := BindAndValidate(c, &data); err != nil { + return err + } user := models.Account{ Name: data.Name, @@ -37,8 +39,8 @@ func doRegister(c *publisher.RequestCtx) error { } if err := database.C.Create(&user).Error; err != nil { - return c.SendError(wire.InvalidActions, err) + return fiber.NewError(fiber.StatusBadRequest, err.Error()) } - return c.SendResponse(user) + return c.JSON(user) } diff --git a/pkg/server/auth.go b/pkg/server/auth.go index a96add6..f938f5d 100644 --- a/pkg/server/auth.go +++ b/pkg/server/auth.go @@ -1,32 +1,36 @@ package server import ( - "code.smartsheep.studio/hydrogen/bus/pkg/kit/adaptor" - "code.smartsheep.studio/hydrogen/bus/pkg/kit/publisher" - "code.smartsheep.studio/hydrogen/bus/pkg/wire" "code.smartsheep.studio/hydrogen/passport/pkg/security" "code.smartsheep.studio/hydrogen/passport/pkg/services" + "github.com/gofiber/fiber/v2" + "github.com/gofiber/fiber/v2/middleware/keyauth" ) -func doAuth(c *publisher.RequestCtx) error { - token := adaptor.ParseAnyToStruct[string](c.Parameters) +var auth = keyauth.New(keyauth.Config{ + KeyLookup: "header:Authorization", + AuthScheme: "Bearer", + Validator: func(c *fiber.Ctx, token string) (bool, error) { + claims, err := security.DecodeJwt(token) + if err != nil { + return false, err + } - claims, err := security.DecodeJwt(token) - if err != nil { - return c.SendError(wire.Unauthorized, err) - } + session, err := services.LookupSessionWithToken(claims.ID) + if err != nil { + return false, err + } else if err := session.IsAvailable(); err != nil { + return false, err + } - session, err := services.LookupSessionWithToken(claims.ID) - if err != nil { - return c.SendError(wire.Unauthorized, err) - } else if err := session.IsAvailable(); err != nil { - return c.SendError(wire.Unauthorized, err) - } + user, err := services.GetAccount(session.AccountID) + if err != nil { + return false, err + } - user, err := services.GetAccount(session.AccountID) - if err != nil { - return c.SendError(wire.Unauthorized, err) - } + c.Locals("permissions", user.Permissions.Data()) - return c.SendResponse(user.Permissions.Data()) -} + return true, nil + }, + ContextKey: "token", +}) diff --git a/pkg/server/challanges.go b/pkg/server/challanges.go deleted file mode 100644 index a2720b1..0000000 --- a/pkg/server/challanges.go +++ /dev/null @@ -1,116 +0,0 @@ -package server - -import ( - "time" - - "code.smartsheep.studio/hydrogen/bus/pkg/kit/adaptor" - "code.smartsheep.studio/hydrogen/bus/pkg/kit/publisher" - "code.smartsheep.studio/hydrogen/bus/pkg/wire" - "code.smartsheep.studio/hydrogen/passport/pkg/security" - "code.smartsheep.studio/hydrogen/passport/pkg/services" - "github.com/samber/lo" -) - -func startChallenge(c *publisher.RequestCtx) error { - meta := adaptor.ParseAnyToStruct[wire.ClientMetadata](c.Metadata) - data := adaptor.ParseAnyToStruct[struct { - ID string `json:"id"` - }](c.Parameters) - - user, err := services.LookupAccount(data.ID) - if err != nil { - return c.SendError(wire.InvalidActions, err) - } - factors, err := services.LookupFactorsByUser(user.ID) - if err != nil { - return c.SendError(wire.InvalidActions, err) - } - - challenge, err := security.NewChallenge(user, factors, meta.ClientIp, meta.UserAgent) - if err != nil { - return c.SendError(wire.InvalidActions, err) - } - - return c.SendResponse(map[string]any{ - "display_name": user.Nick, - "challenge": challenge, - "factors": factors, - }) -} - -func doChallenge(c *publisher.RequestCtx) error { - meta := adaptor.ParseAnyToStruct[wire.ClientMetadata](c.Metadata) - data := adaptor.ParseAnyToStruct[struct { - ChallengeID uint `json:"challenge_id"` - FactorID uint `json:"factor_id"` - Secret string `json:"secret"` - }](c.Parameters) - - challenge, err := services.LookupChallengeWithFingerprint(data.ChallengeID, meta.ClientIp, meta.UserAgent) - if err != nil { - return c.SendError(wire.InvalidActions, err) - } - - factor, err := services.LookupFactor(data.FactorID) - if err != nil { - return c.SendError(wire.InvalidActions, err) - } - - if err := security.DoChallenge(challenge, factor, data.Secret); err != nil { - return c.SendError(wire.InvalidActions, err) - } - - challenge, err = services.LookupChallenge(data.ChallengeID) - if err != nil { - return c.SendError(wire.InvalidActions, err) - } else if challenge.Progress >= challenge.Requirements { - session, err := security.GrantSession(challenge, []string{"*"}, nil, lo.ToPtr(time.Now())) - if err != nil { - return c.SendError(wire.InvalidActions, err) - } - - return c.SendResponse(map[string]any{ - "is_finished": true, - "challenge": challenge, - "session": session, - }) - } - - return c.SendResponse(map[string]any{ - "is_finished": false, - "challenge": challenge, - "session": nil, - }) -} - -func exchangeToken(c *publisher.RequestCtx) error { - data := adaptor.ParseAnyToStruct[struct { - GrantToken string `json:"token"` - }](c.Parameters) - - access, refresh, err := security.ExchangeToken(data.GrantToken) - if err != nil { - return c.SendError(wire.InvalidActions, err) - } - - return c.SendResponse(map[string]any{ - "access_token": access, - "refresh_token": refresh, - }) -} - -func refreshToken(c *publisher.RequestCtx) error { - data := adaptor.ParseAnyToStruct[struct { - RefreshToken string `json:"token"` - }](c.Parameters) - - access, refresh, err := security.RefreshToken(data.RefreshToken) - if err != nil { - return c.SendError(wire.InvalidActions, err) - } - - return c.SendResponse(map[string]any{ - "access_token": access, - "refresh_token": refresh, - }) -} diff --git a/pkg/server/challanges_api.go b/pkg/server/challanges_api.go new file mode 100644 index 0000000..7204b56 --- /dev/null +++ b/pkg/server/challanges_api.go @@ -0,0 +1,124 @@ +package server + +import ( + "github.com/gofiber/fiber/v2" + "time" + + "code.smartsheep.studio/hydrogen/passport/pkg/security" + "code.smartsheep.studio/hydrogen/passport/pkg/services" + "github.com/samber/lo" +) + +func startChallenge(c *fiber.Ctx) error { + var data struct { + ID string `json:"id"` + } + + if err := BindAndValidate(c, &data); err != nil { + return err + } + + user, err := services.LookupAccount(data.ID) + if err != nil { + return fiber.NewError(fiber.StatusNotFound, err.Error()) + } + factors, err := services.LookupFactorsByUser(user.ID) + if err != nil { + return fiber.NewError(fiber.StatusNotFound, err.Error()) + } + + challenge, err := security.NewChallenge(user, factors, c.IP(), c.Get(fiber.HeaderUserAgent)) + if err != nil { + return fiber.NewError(fiber.StatusNotFound, err.Error()) + } + + return c.JSON(fiber.Map{ + "display_name": user.Nick, + "challenge": challenge, + "factors": factors, + }) +} + +func doChallenge(c *fiber.Ctx) error { + var data struct { + ChallengeID uint `json:"challenge_id"` + FactorID uint `json:"factor_id"` + Secret string `json:"secret"` + } + + if err := BindAndValidate(c, &data); err != nil { + return err + } + + challenge, err := services.LookupChallengeWithFingerprint(data.ChallengeID, c.IP(), c.Get(fiber.HeaderUserAgent)) + if err != nil { + return fiber.NewError(fiber.StatusNotFound, err.Error()) + } + + factor, err := services.LookupFactor(data.FactorID) + if err != nil { + return fiber.NewError(fiber.StatusNotFound, err.Error()) + } + + if err := security.DoChallenge(challenge, factor, data.Secret); err != nil { + return fiber.NewError(fiber.StatusBadRequest, err.Error()) + } + + challenge, err = services.LookupChallenge(data.ChallengeID) + if err != nil { + return fiber.NewError(fiber.StatusBadRequest, err.Error()) + } else if challenge.Progress >= challenge.Requirements { + session, err := security.GrantSession(challenge, []string{"*"}, nil, lo.ToPtr(time.Now())) + if err != nil { + return fiber.NewError(fiber.StatusBadRequest, err.Error()) + } + + return c.JSON(fiber.Map{ + "is_finished": true, + "challenge": challenge, + "session": session, + }) + } + + return c.JSON(fiber.Map{ + "is_finished": false, + "challenge": challenge, + "session": nil, + }) +} + +func exchangeToken(c *fiber.Ctx) error { + var data struct { + Token string `json:"token"` + GrantType string `json:"grant_type"` + } + + if err := BindAndValidate(c, &data); err != nil { + return err + } + + switch data.GrantType { + case "authorization_code": + access, refresh, err := security.ExchangeToken(data.Token) + if err != nil { + return fiber.NewError(fiber.StatusBadRequest, err.Error()) + } + + return c.JSON(fiber.Map{ + "access_token": access, + "refresh_token": refresh, + }) + case "refresh_token": + access, refresh, err := security.RefreshToken(data.Token) + if err != nil { + return fiber.NewError(fiber.StatusBadRequest, err.Error()) + } + + return c.JSON(fiber.Map{ + "access_token": access, + "refresh_token": refresh, + }) + default: + return fiber.NewError(fiber.StatusBadRequest, "Unsupported exchange token type.") + } +} diff --git a/pkg/server/factors.go b/pkg/server/factors.go deleted file mode 100644 index 374d486..0000000 --- a/pkg/server/factors.go +++ /dev/null @@ -1,26 +0,0 @@ -package server - -import ( - "code.smartsheep.studio/hydrogen/bus/pkg/kit/adaptor" - "code.smartsheep.studio/hydrogen/bus/pkg/kit/publisher" - "code.smartsheep.studio/hydrogen/bus/pkg/wire" - "code.smartsheep.studio/hydrogen/passport/pkg/security" - "code.smartsheep.studio/hydrogen/passport/pkg/services" -) - -func getFactorToken(c *publisher.RequestCtx) error { - data := adaptor.ParseAnyToStruct[struct { - ID uint `json:"id"` - }](c.Parameters) - - factor, err := services.LookupFactor(data.ID) - if err != nil { - return c.SendError(wire.InvalidActions, err) - } - - if err := security.GetFactorCode(factor); err != nil { - return c.SendError(wire.InvalidActions, err) - } - - return c.SendResponse(nil) -} diff --git a/pkg/server/factors_api.go b/pkg/server/factors_api.go new file mode 100644 index 0000000..efe7435 --- /dev/null +++ b/pkg/server/factors_api.go @@ -0,0 +1,22 @@ +package server + +import ( + "code.smartsheep.studio/hydrogen/passport/pkg/security" + "code.smartsheep.studio/hydrogen/passport/pkg/services" + "github.com/gofiber/fiber/v2" +) + +func requestFactorToken(c *fiber.Ctx) error { + id, _ := c.ParamsInt("factorId", 0) + + factor, err := services.LookupFactor(uint(id)) + if err != nil { + return fiber.NewError(fiber.StatusNotFound, err.Error()) + } + + if err := security.GetFactorCode(factor); err != nil { + return fiber.NewError(fiber.StatusNotFound, err.Error()) + } + + return c.SendStatus(fiber.StatusOK) +} diff --git a/pkg/server/index.go b/pkg/server/index.go deleted file mode 100644 index 12eb221..0000000 --- a/pkg/server/index.go +++ /dev/null @@ -1,66 +0,0 @@ -package server - -import ( - "code.smartsheep.studio/hydrogen/bus/pkg/kit/publisher" - "code.smartsheep.studio/hydrogen/bus/pkg/wire" -) - -var Commands = map[string]publisher.CommandManifest{ - "passport.accounts.new": { - Name: "Create a new account", - Description: "Create a new account on passport platform.", - Requirements: wire.CommandRequirements{}, - Handle: doRegister, - }, - "passport.auth.challenges.new": { - Name: "Create a new challenge", - Description: "Create a new challenge to get access session.", - Requirements: wire.CommandRequirements{}, - Handle: startChallenge, - }, - "passport.auth.challenges.do": { - Name: "Challenge a challenge", - Description: "Getting closer to get access session.", - Requirements: wire.CommandRequirements{}, - Handle: doChallenge, - }, - "passport.auth.factor.token": { - Name: "Get a factor token", - Description: "Get the factor token to finish the challenge.", - Requirements: wire.CommandRequirements{}, - Handle: getFactorToken, - }, - "passport.auth.tokens.exchange": { - Name: "Exchange a pair of token", - Description: "Use the grant token to exchange the first token pair.", - Requirements: wire.CommandRequirements{}, - Handle: exchangeToken, - }, - "passport.auth.tokens.refresh": { - Name: "Refresh a pair token", - Description: "Use the refresh token to refresh the token pair.", - Requirements: wire.CommandRequirements{}, - Handle: refreshToken, - }, - "passport.auth": { - Name: "Auth with access token.", - Description: "Auth gateway request with access token.", - Requirements: wire.CommandRequirements{}, - Providers: []wire.CommandProvider{ - { - ID: "passport.auth", - Implementation: "gateway.auth", - Weight: 1000, - }, - }, - Handle: doAuth, - }, - "passport.test": { - Name: "Test secured resource.", - Description: "Test secured resource connectivity.", - Requirements: wire.CommandRequirements{Authorized: true}, - Handle: func(c *publisher.RequestCtx) error { - return c.SendResponse("You got me!") - }, - }, -} diff --git a/pkg/server/startup.go b/pkg/server/startup.go index ff24448..b77063d 100644 --- a/pkg/server/startup.go +++ b/pkg/server/startup.go @@ -1,39 +1,37 @@ package server import ( - "code.smartsheep.studio/hydrogen/bus/pkg/kit/publisher" + "github.com/gofiber/fiber/v2" + jsoniter "github.com/json-iterator/go" + "github.com/rs/zerolog/log" "github.com/spf13/viper" ) -const ( - Hostname = "hydrogen.passport" - Namespace = "passport" -) +var A *fiber.App -var C *publisher.PublisherConnection +func NewServer() { + A = fiber.New(fiber.Config{ + DisableStartupMessage: true, + EnableIPValidation: true, + ServerHeader: "Hydrogen.Passport", + AppName: "Hydrogen.Passport", + JSONEncoder: jsoniter.ConfigCompatibleWithStandardLibrary.Marshal, + JSONDecoder: jsoniter.ConfigCompatibleWithStandardLibrary.Unmarshal, + }) -func InitConnection(addr, id string) error { - if conn, err := publisher.NewConnection( - addr, - id, - Hostname, - Namespace, - viper.Get("credentials"), - ); err != nil { - return err - } else { - C = conn + api := A.Group("/api").Name("API") + { + api.Post("/users", doRegister) + + api.Put("/auth", startChallenge) + api.Post("/auth", doChallenge) + api.Post("/auth/token", exchangeToken) + api.Post("/auth/factors/:factorId", requestFactorToken) } - - return nil } -func PublishCommands(conn *publisher.PublisherConnection) error { - for k, v := range Commands { - if err := conn.PublishCommand(k, v); err != nil { - return err - } +func Listen() { + if err := A.Listen(viper.GetString("bind")); err != nil { + log.Fatal().Err(err).Msg("An error occurred when starting server...") } - - return nil } diff --git a/pkg/server/utils.go b/pkg/server/utils.go new file mode 100644 index 0000000..f857afd --- /dev/null +++ b/pkg/server/utils.go @@ -0,0 +1,18 @@ +package server + +import ( + "github.com/go-playground/validator/v10" + "github.com/gofiber/fiber/v2" +) + +var validation = validator.New() + +func BindAndValidate(c *fiber.Ctx, out any) error { + if err := c.BodyParser(out); err != nil { + return fiber.NewError(fiber.StatusBadRequest, err.Error()) + } else if err := validation.Struct(out); err != nil { + return fiber.NewError(fiber.StatusBadRequest, err.Error()) + } + + return nil +} diff --git a/settings.yaml b/settings.yaml index 67b6ca1..c708ecd 100644 --- a/settings.yaml +++ b/settings.yaml @@ -1,13 +1,9 @@ debug: true -id: a143dcef-3059-4d22-9ae7-839166699660 -host: 127.0.0.1:1424 +bind: 0.0.0.0:8444 domain: id.smartsheep.studio secret: LtTjzAGFLshwXhN4ZD4nG5KlMv1MWcsvfv03TSZYnT1VhiAnLIZFTnHUwR0XhGgi -credentials: - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDgVXIw08Wgl5ZTLnnH8o0EiWwvfvqbLxp7OgMsZBWOrJiaSrrNjZOyIab3T5Az/1IoUgjGnKvetiVbNL9HLaHMwaN28Q2RR1z+cw/f3NDFydDYmcj1OA/HT011Xh+K39lOjfQptEMOTCtWLOcuzu21jQICqDgsp7BSu3Lt6ezrHO4+kDSyNjclT9iX+RovjK3snJM1rsstezx1yo+f7NBA5WUs1/PfEgvwDZKBuUIqRb8GGcLEQav6FpNicx/L+I5TNDZgoeSlWYCOjZimQy7VagF7iyBwoqj9htRx3F1gZdjqdJxQzYxFrehKg+j+P/JvIifAx2CWyi5/O9BpSkW7 littlesheep@LittleSheepdeMacBook-Pro.local - database: dsn: host=localhost dbname=hy_passport port=5432 sslmode=disable prefix: passport_