diff --git a/openflare_server/go.mod b/openflare_server/go.mod index d2f89634..217f270d 100644 --- a/openflare_server/go.mod +++ b/openflare_server/go.mod @@ -1,7 +1,6 @@ module openflare -// +heroku goVersion go1.24 -go 1.25.0 +go 1.25.7 require ( github.com/bwmarrin/snowflake v0.3.0 @@ -17,6 +16,7 @@ require ( github.com/go-redis/redis/v8 v8.11.5 github.com/google/uuid v1.6.0 github.com/oschwald/maxminddb-golang v1.13.1 + github.com/pressly/goose/v3 v3.27.1 github.com/robfig/cron/v3 v3.0.1 github.com/swaggo/files v1.0.1 github.com/swaggo/gin-swagger v1.6.1 @@ -57,7 +57,7 @@ require ( github.com/gorilla/sessions v1.2.1 // 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.6.0 // indirect + github.com/jackc/pgx/v5 v5.9.2 // 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 @@ -68,13 +68,17 @@ require ( github.com/longbridgeapp/sqlparser v0.3.1 // indirect github.com/mailru/easyjson v0.7.6 // indirect github.com/mattn/go-isatty v0.0.21 // indirect + github.com/mfridman/interpolate v0.0.2 // indirect github.com/miekg/dns v1.1.72 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect + github.com/ncruces/go-strftime v1.0.0 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect + github.com/sethvargo/go-retry v0.3.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect + go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.7.0 // indirect golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f // indirect golang.org/x/mod v0.35.0 // indirect @@ -85,8 +89,8 @@ require ( google.golang.org/protobuf v1.36.11 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - modernc.org/libc v1.22.5 // indirect - modernc.org/mathutil v1.5.0 // indirect - modernc.org/memory v1.5.0 // indirect - modernc.org/sqlite v1.23.1 // indirect + modernc.org/libc v1.72.1 // indirect + modernc.org/mathutil v1.7.1 // indirect + modernc.org/memory v1.11.0 // indirect + modernc.org/sqlite v1.49.1 // indirect ) diff --git a/openflare_server/go.sum b/openflare_server/go.sum index 14f8c9a3..fd804ba7 100644 --- a/openflare_server/go.sum +++ b/openflare_server/go.sum @@ -1,3 +1,5 @@ +filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= +filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= @@ -87,8 +89,8 @@ github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= -github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= -github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo= +github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU= github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M= github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= @@ -99,8 +101,8 @@ github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= -github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= +github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs= +github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= 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/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= @@ -110,12 +112,14 @@ github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+ github.com/gorilla/sessions v1.1.1/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w= github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= +github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= +github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= 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.6.0 h1:SWJzexBzPL5jb0GEsrPMLIsi/3jOo7RHlzTjcAeDrPY= -github.com/jackc/pgx/v5 v5.6.0/go.mod h1:DNZ/vlrUnhWCoFGxHAG8U2ljioxukquj7utPDgtQdTw= +github.com/jackc/pgx/v5 v5.9.2 h1:3ZhOzMWnR4yJ+RW1XImIPsD1aNSz4T4fyP7zlQb56hw= +github.com/jackc/pgx/v5 v5.9.2/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4= 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= @@ -152,6 +156,8 @@ github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.21 h1:xYae+lCNBP7QuW4PUnNG61ffM4hVIfm+zUzDuSzYLGs= github.com/mattn/go-isatty v0.0.21/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= +github.com/mfridman/interpolate v0.0.2 h1:pnuTK7MQIxxFz1Gr+rjSIx9u7qVjf5VOoM/u6BbAxPY= +github.com/mfridman/interpolate v0.0.2/go.mod h1:p+7uk6oE07mpE/Ik1b8EckO0O4ZXiGAfshKBWLUM9Xg= github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI= github.com/miekg/dns v1.1.72/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -161,6 +167,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8= github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w= +github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -175,13 +183,16 @@ github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdU 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/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/pressly/goose/v3 v3.27.1 h1:6uEvcprBybDmW4hcz3gYujhARhye+GoWKhEWyzD5sh4= +github.com/pressly/goose/v3 v3.27.1/go.mod h1:maruOxsPnIG2yHHyo8UqKWXYKFcH7Q76csUV7+7KYoM= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= 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/sethvargo/go-retry v0.3.0 h1:EEt31A35QhrcRZtrYFDTBg91cqZVnFL2navjDrah2SE= +github.com/sethvargo/go-retry v0.3.0/go.mod h1:mNX17F0C/HguQMyMyJxcnU471gOZGxCLyYaFyAZraas= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -208,6 +219,8 @@ github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLY 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/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +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.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc= golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= @@ -287,13 +300,33 @@ gorm.io/plugin/dbresolver v1.5.1 h1:s9Dj9f7r+1rE3nx/Ywzc85nXptUEaeOO0pt27xdopM8= gorm.io/plugin/dbresolver v1.5.1/go.mod h1:l4Cn87EHLEYuqUncpEeTC2tTJQkjngPSD+lo8hIvcT0= gorm.io/sharding v0.6.2 h1:V9inmbdhN+RfWPEKTvbKKKv7qxLz1CneBDQvuL5P7jg= gorm.io/sharding v0.6.2/go.mod h1:dXaAZv0qyUmLkLAciQ+NH2O1D1A4/ttrrZ/XK4xW9HU= -modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE= -modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY= -modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= -modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= -modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= -modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM= -modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk= +modernc.org/cc/v4 v4.28.1 h1:XpLbkYVQ24E8tX5u8+yWGvaxerxkR/S4zqxI8ZoSBuc= +modernc.org/cc/v4 v4.28.1/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI= +modernc.org/ccgo/v4 v4.33.0 h1:dspBCm75jsj8Y/ufwAMVfe375L2iYdMyQ2QG/v3hL54= +modernc.org/ccgo/v4 v4.33.0/go.mod h1:+RhXBoRYzRwaH21mV/aj6XvQRDtfjcZfAlPMsQo8CR0= +modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM= +modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU= +modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI= +modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito= +modernc.org/gc/v3 v3.1.2 h1:ZtDCnhonXSZexk/AYsegNRV1lJGgaNZJuKjJSWKyEqo= +modernc.org/gc/v3 v3.1.2/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY= +modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks= +modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI= +modernc.org/libc v1.72.1 h1:db1xwJ6u1kE3KHTFTTbe2GCrczHPKzlURP0aDC4NGD0= +modernc.org/libc v1.72.1/go.mod h1:HRMiC/PhPGLIPM7GzAFCbI+oSgE3dhZ8FWftmRrHVlY= +modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= +modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= +modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI= +modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= +modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg= +modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns= +modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w= +modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE= +modernc.org/sqlite v1.49.1 h1:dYGHTKcX1sJ+EQDnUzvz4TJ5GbuvhNJa8Fg6ElGx73U= +modernc.org/sqlite v1.49.1/go.mod h1:m0w8xhwYUVY3H6pSDwc3gkJ/irZT/0YEXwBlhaxQEew= +modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= +modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= +modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= +modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/openflare_server/model/database_schema_version.go b/openflare_server/model/database_schema_version.go index fd931ca8..2546c2f9 100644 --- a/openflare_server/model/database_schema_version.go +++ b/openflare_server/model/database_schema_version.go @@ -6,11 +6,14 @@ import ( ) const ( - legacyDatabaseSchemaVersion = migrate.BaseDatabaseSchemaVersion - databaseSchemaVersionRowID = 1 + legacyDatabaseSchemaVersion = migrate.BaseDatabaseSchemaVersion + legacyMigrationTerminalVersion = 17 + databaseSchemaVersionRowID = 1 ) -var currentDatabaseSchemaVersion = migrate.CurrentVersion() +// currentDatabaseSchemaVersion tracks the current physical schema validated by the +// legacy validator set. Goose owns only post-v17 migrations, and none exist yet. +var currentDatabaseSchemaVersion = legacyMigrationTerminalVersion type DatabaseSchemaVersion struct { ID uint `json:"id" gorm:"primaryKey"` diff --git a/openflare_server/model/goose_bridge.go b/openflare_server/model/goose_bridge.go new file mode 100644 index 00000000..3a30c5dc --- /dev/null +++ b/openflare_server/model/goose_bridge.go @@ -0,0 +1,194 @@ +package model + +import ( + "database/sql" + "errors" + "fmt" + "log/slog" + + "gorm.io/gorm" +) + +type schemaMigrationState int + +const ( + schemaMigrationStateFresh schemaMigrationState = iota + schemaMigrationStateLegacyOnly + schemaMigrationStateGooseOnly + schemaMigrationStateLegacyBootstrap + schemaMigrationStateMixed +) + +func detectLegacySchemaState(db *gorm.DB) (schemaMigrationState, error) { + hasLegacyTable := db.Migrator().HasTable(&DatabaseSchemaVersion{}) + hasGooseTable := db.Migrator().HasTable("goose_db_version") + + switch { + case hasLegacyTable && hasGooseTable: + return schemaMigrationStateMixed, nil + case hasLegacyTable: + return schemaMigrationStateLegacyOnly, nil + case hasGooseTable: + return schemaMigrationStateGooseOnly, nil + } + + empty, err := isDatabaseEmpty(db) + if err != nil { + return 0, err + } + if empty { + return schemaMigrationStateFresh, nil + } + return schemaMigrationStateLegacyBootstrap, nil +} + +func loadGooseDatabaseVersion(db *gorm.DB) (int, bool, error) { + if db == nil || !db.Migrator().HasTable("goose_db_version") { + return 0, false, nil + } + + var version int64 + err := db.Table("goose_db_version"). + Where("is_applied = ?", true). + Order("version_id DESC"). + Select("version_id"). + Limit(1). + Row(). + Scan(&version) + if errors.Is(err, sql.ErrNoRows) { + return 0, false, nil + } + if err != nil { + return 0, false, err + } + return int(version), true, nil +} + +func bootstrapLegacySchemaVersion(db *gorm.DB) error { + if err := autoMigrateLegacySchemaMetadata(db); err != nil { + return err + } + version, exists, err := loadLegacyDatabaseSchemaVersion(db) + if err != nil { + return err + } + if exists { + if version > legacyMigrationTerminalVersion { + return fmt.Errorf("legacy schema version %d is newer than supported terminal version %d", version, legacyMigrationTerminalVersion) + } + return nil + } + return saveLegacyDatabaseSchemaVersion(db, legacyDatabaseSchemaVersion) +} + +func upgradeLegacyToLegacyTerminal(db *gorm.DB, backend string) error { + if err := bootstrapLegacySchemaVersion(db); err != nil { + return err + } + version, exists, err := loadLegacyDatabaseSchemaVersion(db) + if err != nil { + return err + } + if !exists { + return fmt.Errorf("legacy schema version record is missing after bootstrap") + } + return upgradeLegacyDatabaseSchema(db, backend, version) +} + +func validateGooseBridgeState(db *gorm.DB) error { + version, exists, err := loadGooseDatabaseVersion(db) + if err != nil { + return err + } + if !exists { + return nil + } + if version < legacyMigrationTerminalVersion { + return fmt.Errorf("goose schema version %d is below legacy bridge baseline %d", version, legacyMigrationTerminalVersion) + } + if int64(version) > currentGooseTargetVersion() { + return fmt.Errorf("goose schema version %d is newer than application target version %d", version, currentGooseTargetVersion()) + } + return nil +} + +func finalizeLegacyToGooseBridge(db *gorm.DB) error { + gooseVersion, exists, err := loadGooseDatabaseVersion(db) + if err != nil { + return err + } + if !exists || gooseVersion < legacyMigrationTerminalVersion { + return nil + } + if !db.Migrator().HasTable(&DatabaseSchemaVersion{}) { + return nil + } + if err := db.Migrator().DropTable(&DatabaseSchemaVersion{}); err != nil { + return fmt.Errorf("drop legacy schema versions table failed: %w", err) + } + slog.Info("completed legacy-to-goose migration bridge", "goose_version", gooseVersion) + return nil +} + +func repairCurrentSchemaState(db *gorm.DB, backend string) error { + if err := dropLegacyNodeColumns(db, backend); err != nil { + return err + } + if err := ensureDefaultGitHubAuthSource(db); err != nil { + return err + } + if err := ensureDefaultWAFRuleGroup(db); err != nil { + return err + } + return nil +} + +func ensureDatabaseSchemaUpToDate(db *gorm.DB, backend string) error { + state, err := detectLegacySchemaState(db) + if err != nil { + return err + } + + switch state { + case schemaMigrationStateFresh: + if err := initializeFreshDatabaseSchema(db, backend); err != nil { + return err + } + case schemaMigrationStateLegacyOnly: + if err := upgradeLegacyToLegacyTerminal(db, backend); err != nil { + return err + } + case schemaMigrationStateGooseOnly: + if err := validateGooseBridgeState(db); err != nil { + return err + } + case schemaMigrationStateLegacyBootstrap: + if err := upgradeLegacyToLegacyTerminal(db, backend); err != nil { + return err + } + case schemaMigrationStateMixed: + legacyVersion, exists, err := loadLegacyDatabaseSchemaVersion(db) + if err != nil { + return err + } + if exists && legacyVersion != legacyMigrationTerminalVersion { + return fmt.Errorf("incomplete mixed migration state: legacy schema version %d does not match bridge terminal version %d", legacyVersion, legacyMigrationTerminalVersion) + } + if err := validateGooseBridgeState(db); err != nil { + return err + } + default: + return fmt.Errorf("unknown schema migration state: %d", state) + } + + if err := runGooseMigrations(db, backend); err != nil { + return err + } + if err := finalizeLegacyToGooseBridge(db); err != nil { + return err + } + if err := repairCurrentSchemaState(db, backend); err != nil { + return err + } + return validateCurrentDatabaseSchema(db, backend) +} diff --git a/openflare_server/model/goose_migrations.go b/openflare_server/model/goose_migrations.go new file mode 100644 index 00000000..27e8c4bc --- /dev/null +++ b/openflare_server/model/goose_migrations.go @@ -0,0 +1,62 @@ +package model + +import ( + "context" + "database/sql" + "fmt" + + "github.com/pressly/goose/v3" + "gorm.io/gorm" +) + +func newGooseBaselineMigration() *goose.Migration { + migration := goose.NewGoMigration(int64(legacyMigrationTerminalVersion), nil, nil) + migration.Source = fmt.Sprintf("%05d_legacy_terminal_baseline.go", legacyMigrationTerminalVersion) + return migration +} + +func newGooseGORMMigration( + version int64, + source string, + backend string, + up func(ctx databaseSchemaMigrationContext, db *gorm.DB, backend string) error, +) *goose.Migration { + migration := goose.NewGoMigration(version, &goose.GoFunc{ + RunDB: func(_ context.Context, sqlDB *sql.DB) error { + gormDB, err := getGORMDBFromSQLDB(sqlDB, backend) + if err != nil { + return err + } + ctx := databaseSchemaMigrationContext{} + if backend == "postgres" { + return gormDB.Transaction(func(tx *gorm.DB) error { + return up(ctx, tx, backend) + }) + } + return up(ctx, gormDB, backend) + }, + }, nil) + migration.Source = source + return migration +} + +func registeredGooseMigrations(backend string) []*goose.Migration { + _ = backend + return nil +} + +func buildGooseMigrations(backend string) []*goose.Migration { + migrations := []*goose.Migration{newGooseBaselineMigration()} + migrations = append(migrations, registeredGooseMigrations(backend)...) + return migrations +} + +func currentGooseTargetVersion() int64 { + var maxVersion int64 = legacyMigrationTerminalVersion + for _, migration := range buildGooseMigrations("sqlite") { + if migration.Version > maxVersion { + maxVersion = migration.Version + } + } + return maxVersion +} diff --git a/openflare_server/model/goose_provider.go b/openflare_server/model/goose_provider.go new file mode 100644 index 00000000..7ad0e096 --- /dev/null +++ b/openflare_server/model/goose_provider.go @@ -0,0 +1,76 @@ +package model + +import ( + "context" + "database/sql" + "fmt" + + "github.com/glebarez/sqlite" + "github.com/pressly/goose/v3" + "gorm.io/driver/postgres" + "gorm.io/gorm" + "gorm.io/gorm/schema" +) + +func gooseDialectForBackend(backend string) (goose.Dialect, error) { + switch backend { + case "postgres": + return goose.DialectPostgres, nil + case "sqlite": + return goose.DialectSQLite3, nil + default: + return "", fmt.Errorf("unsupported database backend: %s", backend) + } +} + +func getGORMDBFromSQLDB(db *sql.DB, backend string) (*gorm.DB, error) { + var dialector gorm.Dialector + switch backend { + case "postgres": + dialector = postgres.New(postgres.Config{Conn: db}) + case "sqlite": + dialector = &sqlite.Dialector{Conn: db} + default: + return nil, fmt.Errorf("unsupported database backend: %s", backend) + } + + gormDB, err := gorm.Open(dialector, &gorm.Config{ + NamingStrategy: schema.NamingStrategy{}, + }) + if err != nil { + return nil, err + } + if err := registerSharding(gormDB, backend); err != nil { + return nil, err + } + return gormDB, nil +} + +func buildGooseProvider(db *gorm.DB, backend string) (*goose.Provider, error) { + sqlDB, err := db.DB() + if err != nil { + return nil, err + } + dialect, err := gooseDialectForBackend(backend) + if err != nil { + return nil, err + } + return goose.NewProvider( + dialect, + sqlDB, + nil, + goose.WithDisableGlobalRegistry(true), + goose.WithGoMigrations(buildGooseMigrations(backend)...), + ) +} + +func runGooseMigrations(db *gorm.DB, backend string) error { + provider, err := buildGooseProvider(db, backend) + if err != nil { + return fmt.Errorf("build goose provider: %w", err) + } + if _, err := provider.Up(context.Background()); err != nil { + return fmt.Errorf("goose up failed: %w", err) + } + return nil +} diff --git a/openflare_server/model/main.go b/openflare_server/model/main.go index 3854e941..f05be420 100644 --- a/openflare_server/model/main.go +++ b/openflare_server/model/main.go @@ -54,12 +54,23 @@ func registeredModels() []any { } } -func schemaMetadataModels() []any { +func currentSchemaMetadataModels() []any { + return nil +} + +func legacySchemaMetadataModels() []any { return []any{ &DatabaseSchemaVersion{}, } } +func schemaMetadataModels() []any { + models := make([]any, 0, len(currentSchemaMetadataModels())+len(legacySchemaMetadataModels())) + models = append(models, currentSchemaMetadataModels()...) + models = append(models, legacySchemaMetadataModels()...) + return models +} + func buildDBModels() ([]dbModel, error) { models := registeredModels() result := make([]dbModel, 0, len(models)) diff --git a/openflare_server/model/main_test.go b/openflare_server/model/main_test.go index e3cdc26d..735247a5 100644 --- a/openflare_server/model/main_test.go +++ b/openflare_server/model/main_test.go @@ -195,8 +195,8 @@ func TestUpgradeDatabaseSchemaV15ToV16AppliesCompressedReleaseSchema(t *testing. if err := registerSharding(db, "sqlite"); err != nil { t.Fatalf("register sharding: %v", err) } - if err := autoMigrateSchemaMetadata(db); err != nil { - t.Fatalf("auto migrate schema metadata: %v", err) + if err := autoMigrateLegacySchemaMetadata(db); err != nil { + t.Fatalf("auto migrate legacy schema metadata: %v", err) } if err := applyCurrentSchema(db, "sqlite"); err != nil { t.Fatalf("apply current schema: %v", err) @@ -306,6 +306,12 @@ func TestEnsureDatabaseSchemaUpToDateInitializesFreshDatabase(t *testing.T) { if version != currentDatabaseSchemaVersion { t.Fatalf("unexpected schema version: got %d want %d", version, currentDatabaseSchemaVersion) } + if db.Migrator().HasTable(&DatabaseSchemaVersion{}) { + t.Fatal("expected fresh database to avoid legacy database_schema_versions table") + } + if !db.Migrator().HasTable("goose_db_version") { + t.Fatal("expected fresh database to initialize goose_db_version") + } } func TestEnsureDatabaseSchemaUpToDateUpgradesLegacyDatabase(t *testing.T) { @@ -340,6 +346,12 @@ func TestEnsureDatabaseSchemaUpToDateUpgradesLegacyDatabase(t *testing.T) { if version != currentDatabaseSchemaVersion { t.Fatalf("unexpected schema version: got %d want %d", version, currentDatabaseSchemaVersion) } + if db.Migrator().HasTable(&DatabaseSchemaVersion{}) { + t.Fatal("expected legacy database_schema_versions table to be removed after bridging to goose") + } + if !db.Migrator().HasTable("goose_db_version") { + t.Fatal("expected legacy upgrade to initialize goose_db_version") + } } func TestMigrateOriginsSchemaBackfillsOrigins(t *testing.T) { @@ -402,8 +414,8 @@ func TestEnsureDatabaseSchemaUpToDateAddsProxyRouteDomainCertificateFields(t *te if err := registerSharding(db, "sqlite"); err != nil { t.Fatalf("register sharding: %v", err) } - if err := autoMigrateSchemaMetadata(db); err != nil { - t.Fatalf("auto migrate schema metadata: %v", err) + if err := autoMigrateLegacySchemaMetadata(db); err != nil { + t.Fatalf("auto migrate legacy schema metadata: %v", err) } for _, item := range registeredModels() { @@ -478,7 +490,7 @@ func TestRunDatabaseSchemaMigrationDoesNotAdvanceVersionWhenValidationFails(t *t fromVersion: legacyDatabaseSchemaVersion, toVersion: 11, migrate: func(tx *gorm.DB, backend string) error { - return autoMigrateSchemaMetadata(tx) + return autoMigrateLegacySchemaMetadata(tx) }, validate: func(tx *gorm.DB, backend string) error { return gorm.ErrInvalidDB @@ -655,6 +667,44 @@ func TestEnsureDatabaseSchemaUpToDateV16DropsLegacyNodeColumnsWhenAlreadyCurrent t.Fatalf("expected current-schema cleanup to drop legacy nodes.%s column", column) } } + if db.Migrator().HasTable(&DatabaseSchemaVersion{}) { + t.Fatal("expected current-schema legacy version table to be removed after goose bridge") + } + if !db.Migrator().HasTable("goose_db_version") { + t.Fatal("expected current-schema goose_db_version table to exist") + } +} + +func TestEnsureDatabaseSchemaUpToDateKeepsGooseOnlyDatabaseOnReentry(t *testing.T) { + db := openBareTestSQLiteDB(t, "goose-only-reentry.db") + if err := registerSharding(db, "sqlite"); err != nil { + t.Fatalf("register sharding: %v", err) + } + + if err := ensureDatabaseSchemaUpToDate(db, "sqlite"); err != nil { + t.Fatalf("first ensureDatabaseSchemaUpToDate: %v", err) + } + if db.Migrator().HasTable(&DatabaseSchemaVersion{}) { + t.Fatal("expected first initialization to avoid legacy table") + } + + if err := ensureDatabaseSchemaUpToDate(db, "sqlite"); err != nil { + t.Fatalf("second ensureDatabaseSchemaUpToDate: %v", err) + } + + if db.Migrator().HasTable(&DatabaseSchemaVersion{}) { + t.Fatal("expected goose-only database to remain free of legacy version table") + } + version, exists, err := loadGooseDatabaseVersion(db) + if err != nil { + t.Fatalf("loadGooseDatabaseVersion: %v", err) + } + if !exists { + t.Fatal("expected goose-only database to keep goose version record") + } + if version != currentDatabaseSchemaVersion { + t.Fatalf("unexpected goose version: got %d want %d", version, currentDatabaseSchemaVersion) + } } func TestAllRegisteredMigrationsHaveValidationDefined(t *testing.T) { diff --git a/openflare_server/model/migrations.go b/openflare_server/model/migrations.go index 9ca2b015..a5514b20 100644 --- a/openflare_server/model/migrations.go +++ b/openflare_server/model/migrations.go @@ -93,8 +93,17 @@ func (databaseSchemaMigrationContext) ValidateDatabaseSchemaVersion(db *gorm.DB, } } -func autoMigrateSchemaMetadata(db *gorm.DB) error { - for _, item := range schemaMetadataModels() { +func autoMigrateCurrentSchemaMetadata(db *gorm.DB) error { + for _, item := range currentSchemaMetadataModels() { + if err := db.AutoMigrate(item); err != nil { + return err + } + } + return nil +} + +func autoMigrateLegacySchemaMetadata(db *gorm.DB) error { + for _, item := range legacySchemaMetadataModels() { if err := db.AutoMigrate(item); err != nil { return err } @@ -245,7 +254,7 @@ func applyCurrentSchemaExcept(db *gorm.DB, backend string, excludedTables ...str } } slog.Info("applyCurrentSchema: step 1/5 - auto migrate schema metadata") - if err := autoMigrateSchemaMetadata(db); err != nil { + if err := autoMigrateCurrentSchemaMetadata(db); err != nil { return err } slog.Info("applyCurrentSchema: step 2/5 - migrate proxy route https column") @@ -268,7 +277,7 @@ func applyCurrentSchemaExcept(db *gorm.DB, backend string, excludedTables ...str return nil } -func loadDatabaseSchemaVersion(db *gorm.DB) (int, bool, error) { +func loadLegacyDatabaseSchemaVersion(db *gorm.DB) (int, bool, error) { if db == nil { return 0, false, nil } @@ -286,19 +295,37 @@ func loadDatabaseSchemaVersion(db *gorm.DB) (int, bool, error) { return state.Version, true, nil } -func saveDatabaseSchemaVersion(db *gorm.DB, version int) error { +func saveLegacyDatabaseSchemaVersion(db *gorm.DB, version int) error { + if err := autoMigrateLegacySchemaMetadata(db); err != nil { + return err + } return db.Save(&DatabaseSchemaVersion{ ID: databaseSchemaVersionRowID, Version: version, }).Error } +func loadDatabaseSchemaVersion(db *gorm.DB) (int, bool, error) { + version, exists, err := loadGooseDatabaseVersion(db) + if err != nil { + return 0, false, err + } + if exists { + return version, true, nil + } + return loadLegacyDatabaseSchemaVersion(db) +} + +func saveDatabaseSchemaVersion(db *gorm.DB, version int) error { + return saveLegacyDatabaseSchemaVersion(db, version) +} + func validateDatabaseSchemaV2(db *gorm.DB, backend string) error { if db == nil { return fmt.Errorf("database handle is nil") } - if !db.Migrator().HasTable(&DatabaseSchemaVersion{}) { - return fmt.Errorf("table %s is missing", (&DatabaseSchemaVersion{}).TableName()) + if !db.Migrator().HasTable(&DatabaseSchemaVersion{}) && !db.Migrator().HasTable("goose_db_version") { + return fmt.Errorf("neither %s nor goose_db_version exists", (&DatabaseSchemaVersion{}).TableName()) } models, err := buildDBModels() if err != nil { @@ -1385,7 +1412,7 @@ func runDatabaseSchemaMigration(db *gorm.DB, backend string, migration databaseS if err := migration.validate(db, backend); err != nil { return fmt.Errorf("validate database schema v%d failed: %w", migration.toVersion, err) } - if err := saveDatabaseSchemaVersion(db, migration.toVersion); err != nil { + if err := saveLegacyDatabaseSchemaVersion(db, migration.toVersion); err != nil { return fmt.Errorf("persist database schema version v%d failed: %w", migration.toVersion, err) } return nil @@ -1398,26 +1425,26 @@ func runDatabaseSchemaMigration(db *gorm.DB, backend string, migration databaseS if err := migration.validate(tx, backend); err != nil { return fmt.Errorf("validate database schema v%d failed: %w", migration.toVersion, err) } - if err := saveDatabaseSchemaVersion(tx, migration.toVersion); err != nil { + if err := saveLegacyDatabaseSchemaVersion(tx, migration.toVersion); err != nil { return fmt.Errorf("persist database schema version v%d failed: %w", migration.toVersion, err) } return nil }) } -func upgradeDatabaseSchema(db *gorm.DB, backend string, version int) error { - if version > currentDatabaseSchemaVersion { - return fmt.Errorf("database schema version %d is newer than application version %d", version, currentDatabaseSchemaVersion) +func upgradeLegacyDatabaseSchema(db *gorm.DB, backend string, version int) error { + if version > legacyMigrationTerminalVersion { + return fmt.Errorf("database schema version %d is newer than legacy migration terminal version %d", version, legacyMigrationTerminalVersion) } if version < legacyDatabaseSchemaVersion { slog.Warn("database schema version is below supported baseline; treating it as historical initial schema", "version", version, "baseline", legacyDatabaseSchemaVersion) version = legacyDatabaseSchemaVersion } - if version == currentDatabaseSchemaVersion { + if version == legacyMigrationTerminalVersion { return nil } migrationMap := databaseSchemaMigrationMap() - for version < currentDatabaseSchemaVersion { + for version < legacyMigrationTerminalVersion { migration, ok := migrationMap[version] if !ok { return fmt.Errorf("database schema migration from v%d is not defined", version) @@ -1458,32 +1485,9 @@ func initializeFreshDatabaseSchema(db *gorm.DB, backend string) error { if err := ensureDefaultWAFRuleGroup(db); err != nil { return err } - if err := validateCurrentDatabaseSchema(db, backend); err != nil { - return err - } - return saveDatabaseSchemaVersion(db, currentDatabaseSchemaVersion) + return nil } -func ensureDatabaseSchemaUpToDate(db *gorm.DB, backend string) error { - version, exists, err := loadDatabaseSchemaVersion(db) - if err != nil { - return err - } - if exists { - if err := upgradeDatabaseSchema(db, backend, version); err != nil { - return err - } - return dropLegacyNodeColumns(db, backend) - } - empty, err := isDatabaseEmpty(db) - if err != nil { - return err - } - if empty { - return initializeFreshDatabaseSchema(db, backend) - } - if err := autoMigrateSchemaMetadata(db); err != nil { - return err - } - return upgradeDatabaseSchema(db, backend, legacyDatabaseSchemaVersion) +func upgradeDatabaseSchema(db *gorm.DB, backend string, version int) error { + return upgradeLegacyDatabaseSchema(db, backend, version) }