From d8caef7e5de879f56d7f76087d8d307629a9f5ee Mon Sep 17 00:00:00 2001 From: hex Date: Mon, 5 May 2025 19:34:28 +0200 Subject: [PATCH 01/39] feat: basic auth shit + db init --- .env.example | 14 +++- .gitignore | 3 +- go.mod | 17 ++--- go.sum | 54 +++++---------- internal/api/api.go | 1 + internal/api/routes/auth.go | 28 ++++++++ internal/auth/client/client.go | 116 +++++++++++++++++++++++++++++++++ internal/auth/types.go | 32 +++++++++ internal/types/types.go | 24 ++----- main.go | 41 ++++++++++++ 10 files changed, 261 insertions(+), 69 deletions(-) create mode 100644 internal/api/routes/auth.go create mode 100644 internal/auth/client/client.go create mode 100644 internal/auth/types.go diff --git a/.env.example b/.env.example index 4ba3dd8..b286a0b 100644 --- a/.env.example +++ b/.env.example @@ -1 +1,13 @@ -IMAGE_PATH= \ No newline at end of file +IMAGE_PATH=/tmp +REDIRECT_URI=http://localhost:8081/api/auth/callback +CLIENT_ID= +CLIENT_SECRET= + +# can be either postgres or sqlite +DATABASE_TYPE= + +# database file, stereo.db by default. +SQLITE_FILE= + +# postgres DSN, look at https://gorm.io/docs/connecting_to_the_database.html#PostgreSQL +POSTGRES_DSN= diff --git a/.gitignore b/.gitignore index 0efc5d4..b0088e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .env -tmp \ No newline at end of file +tmp +*.db diff --git a/go.mod b/go.mod index 452489f..1f25bff 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,11 @@ module stereo.cat/backend go 1.24.2 -require github.com/gin-gonic/gin v1.10.0 +require ( + github.com/gin-gonic/gin v1.10.0 + github.com/joho/godotenv v1.5.1 + gorm.io/gorm v1.26.0 +) require ( github.com/bytedance/sonic v1.13.2 // indirect @@ -14,36 +18,33 @@ require ( github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.26.0 // indirect github.com/goccy/go-json v0.10.5 // indirect - github.com/golang/protobuf v1.5.4 // 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.4 // 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/joho/godotenv v1.5.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.10 // indirect + github.com/kr/pretty v0.3.1 // indirect github.com/leodido/go-urn v1.4.0 // indirect - github.com/markbates/goth v1.81.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-sqlite3 v1.14.28 // 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.2.4 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect golang.org/x/arch v0.16.0 // indirect golang.org/x/crypto v0.37.0 // indirect golang.org/x/net v0.39.0 // indirect - golang.org/x/oauth2 v0.30.0 // indirect - golang.org/x/sync v0.13.0 // indirect + golang.org/x/sync v0.14.0 // indirect golang.org/x/sys v0.32.0 // indirect golang.org/x/text v0.24.0 // indirect - google.golang.org/appengine v1.6.8 // indirect google.golang.org/protobuf v1.36.6 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/postgres v1.5.11 // indirect gorm.io/driver/sqlite v1.5.7 // indirect - gorm.io/gorm v1.26.0 // indirect ) diff --git a/go.sum b/go.sum index 055fd16..9b0df5c 100644 --- a/go.sum +++ b/go.sum @@ -6,6 +6,7 @@ github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFos github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -25,10 +26,6 @@ github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -52,10 +49,15 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02 github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= 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/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/markbates/goth v1.81.0 h1:XVcCkeGWokynPV7MXvgb8pd2s3r7DS40P7931w6kdnE= -github.com/markbates/goth v1.81.0/go.mod h1:+6z31QyUms84EHmuBY7iuqYSxyoN3njIgg9iCF/lR1k= 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.28 h1:ThEiQrnbtumT+QMknw63Befp/ce/nUPgBPMlRFEum7A= @@ -67,8 +69,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.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +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/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= @@ -83,56 +89,26 @@ 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/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/arch v0.16.0 h1:foMtLTdyOmIniqWCHjY6+JxuC54XP1fDwx4N0ASyW+U= golang.org/x/arch v0.16.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= -golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= -golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610= -golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= +golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -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.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= -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/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= 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/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= diff --git a/internal/api/api.go b/internal/api/api.go index 6aecb5b..7861d03 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -8,4 +8,5 @@ import ( func Register(cfg *types.StereoConfig) { api := cfg.Router.Group("/api") routes.RegisterUploadRoutes(cfg, api) + routes.RegisterAuthRoutes(cfg, api) } diff --git a/internal/api/routes/auth.go b/internal/api/routes/auth.go new file mode 100644 index 0000000..29c0ad1 --- /dev/null +++ b/internal/api/routes/auth.go @@ -0,0 +1,28 @@ +package routes + +import ( + "net/http" + + "github.com/gin-gonic/gin" + "stereo.cat/backend/internal/types" +) + +func RegisterAuthRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { + api.GET("/auth/callback", func(c *gin.Context) { + code := c.Query("code") + + t, err := cfg.Client.ExchangeCode(code) + + if err != nil { + panic(err) + } + + user, err := cfg.Client.GetUser(t) + + if err != nil { + panic(err) + } + + c.JSON(http.StatusOK, user) + }) +} diff --git a/internal/auth/client/client.go b/internal/auth/client/client.go new file mode 100644 index 0000000..7168fd2 --- /dev/null +++ b/internal/auth/client/client.go @@ -0,0 +1,116 @@ +package client + +import ( + "encoding/json" + "errors" + "fmt" + "io" + "net/http" + "net/url" + "strings" + "time" + + "stereo.cat/backend/internal/auth" +) + +type Client struct { + RedirectUri string + ClientSecret string + ClientId string +} + +const api = "https://discord.com/api/v10" + +func New(redirectUri, clientId, clientSecret string) Client { + return Client{ + RedirectUri: redirectUri, + ClientId: clientId, + ClientSecret: clientSecret, + } +} + +func (c Client) GetUser(t auth.TokenResponse) (auth.User, error) { + user := auth.User { + Blacklisted: false, + } + + req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/%s", api, "users/@me"), nil) + + if err != nil { + return user, nil + } + + req.Header.Add("Content-Type", "application/json") + req.Header.Add("Authorization", "Bearer "+t.AccessToken) + + resp, err := http.DefaultClient.Do(req) + + if resp.StatusCode != http.StatusOK { + bodyBytes, err := io.ReadAll(resp.Body) + + if err != nil { + return user, err + } + + return user, errors.New(string(bodyBytes)) + } + + if err != nil { + return user, err + } + + defer resp.Body.Close() + + err = json.NewDecoder(resp.Body).Decode(&user) + + if err != nil { + return user, err + } + + return user, nil +} + +func (c Client) ExchangeCode(code string) (auth.TokenResponse, error) { + var tokenResponse auth.TokenResponse + + requestBody := url.Values{ + "grant_type": {"authorization_code"}, + "code": {code}, + "redirect_uri": {c.RedirectUri}, + } + + req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("%s/%s", api, "/oauth2/token"), strings.NewReader(requestBody.Encode())) + + if err != nil { + return tokenResponse, err + } + + req.Header.Add("Content-Type", "application/x-www-form-urlencoded") + req.SetBasicAuth(c.ClientId, c.ClientSecret) + + resp, err := http.DefaultClient.Do(req) + + if resp.StatusCode != http.StatusOK { + bodyBytes, err := io.ReadAll(resp.Body) + + if err != nil { + return tokenResponse, err + } + + return tokenResponse, errors.New(string(bodyBytes)) + } + + if err != nil { + return tokenResponse, err + } + + defer resp.Body.Close() + + err = json.NewDecoder(resp.Body).Decode(&tokenResponse) + + if err != nil { + return tokenResponse, err + } + + return tokenResponse, nil +} diff --git a/internal/auth/types.go b/internal/auth/types.go new file mode 100644 index 0000000..cd07010 --- /dev/null +++ b/internal/auth/types.go @@ -0,0 +1,32 @@ +package auth + +import ( + "gorm.io/gorm" +) + +type TokenResponse struct { + AccessToken string `json:"access_token"` + TokenType string `json:"token_type"` + ExpiresIn uint64 `json:"expires_in"` + RefreshToken string `json:"refresh_token"` + Scope string `json:"scope"` +} + +type User struct { + gorm.Model + ID string `json:"id" gorm:"primaryKey;autoIncrement:false"` + Username string `json:"username"` + Blacklisted bool + Email string `json:"email"` +} + +type AvatarDecorationData struct { + Asset string + SkuID string +} + +type ExchangeCodeRequest struct { + GrantType string `json:"grant_type"` + Code string `json:"code"` + RedirectUri string `json:"redirect_uri"` +} diff --git a/internal/types/types.go b/internal/types/types.go index 991c961..fcafa83 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -1,10 +1,9 @@ package types import ( - "time" - "github.com/gin-gonic/gin" "gorm.io/gorm" + "stereo.cat/backend/internal/auth/client" ) type Route struct { @@ -14,23 +13,8 @@ type Route struct { } type StereoConfig struct { - Router *gin.Engine ImagePath string -} - -type User struct { - gorm.Model - ID uint - Username string - RegistrationDate time.Time - Blacklisted bool - Email string -} - -func RegisterRoutes(groupName string, routes []Route, cfg *StereoConfig) { - group := cfg.Router.Group(groupName) - - for _, route := range routes { - group.Handle(route.Method, route.Path, route.Exec(cfg)) - } + Router *gin.Engine + Client client.Client + Database *gorm.DB } diff --git a/main.go b/main.go index 7ce6158..90a965f 100644 --- a/main.go +++ b/main.go @@ -1,12 +1,18 @@ package main import ( + "errors" "log" "os" "github.com/gin-gonic/gin" "github.com/joho/godotenv" + "gorm.io/driver/postgres" + "gorm.io/driver/sqlite" + "gorm.io/gorm" "stereo.cat/backend/internal/api" + "stereo.cat/backend/internal/auth" + "stereo.cat/backend/internal/auth/client" "stereo.cat/backend/internal/types" ) @@ -20,6 +26,8 @@ func getEnv(key, fallback string) string { func main() { _ = godotenv.Load() + databaseType := getEnv("DATABASE_TYPE", "sqlite") + sqliteFile := getEnv("SQLITE_FILE", "stereo.db") imagePath := getEnv("IMAGE_PATH", os.TempDir()) if _, err := os.Stat(imagePath); err != nil { @@ -33,8 +41,41 @@ func main() { c := types.StereoConfig{ Router: gin.Default(), ImagePath: imagePath, + Client: client.New( + os.Getenv("REDIRECT_URI"), + os.Getenv("CLIENT_ID"), + os.Getenv("CLIENT_SECRET"), + ), } + switch databaseType { + case "sqlite": + db, err := gorm.Open(sqlite.Open(sqliteFile), &gorm.Config{}) + + c.Database = db + + if err != nil { + panic(err) + } + + break + + case "postgres": + db, err := gorm.Open(postgres.Open(os.Getenv("POSTGRES_DSN")), &gorm.Config{}) + + c.Database = db + + if err != nil { + panic(err) + } + + break + default: + panic(errors.New("Invalid database type was specified.")) + } + + c.Database.AutoMigrate(&auth.User{}) + api.Register(&c) c.Router.Run() From b28b719b5109827d5777c22845ef914ad51f891b Mon Sep 17 00:00:00 2001 From: hex Date: Mon, 5 May 2025 23:04:50 +0200 Subject: [PATCH 02/39] feat: jwt token generation (todo: create jwt validation middleware) --- .env.example | 3 +++ go.mod | 1 + go.sum | 2 ++ internal/api/routes/auth.go | 10 ++++++- internal/auth/client/client.go | 2 -- internal/auth/jwt.go | 37 +++++++++++++++++++++++++ internal/auth/types.go | 10 +++---- internal/types/types.go | 1 + main.go | 49 ++++++++++++++++++++-------------- 9 files changed, 86 insertions(+), 29 deletions(-) create mode 100644 internal/auth/jwt.go diff --git a/.env.example b/.env.example index b286a0b..b96334a 100644 --- a/.env.example +++ b/.env.example @@ -11,3 +11,6 @@ SQLITE_FILE= # postgres DSN, look at https://gorm.io/docs/connecting_to_the_database.html#PostgreSQL POSTGRES_DSN= + +# Random secret. Recommended length is 64 characters at minimum. +JWT_SECRET= diff --git a/go.mod b/go.mod index 1f25bff..db43dc3 100644 --- a/go.mod +++ b/go.mod @@ -18,6 +18,7 @@ require ( github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.26.0 // indirect github.com/goccy/go-json v0.10.5 // indirect + github.com/golang-jwt/jwt/v5 v5.2.2 // 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.4 // indirect diff --git a/go.sum b/go.sum index 9b0df5c..d3761d1 100644 --- a/go.sum +++ b/go.sum @@ -26,6 +26,8 @@ github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= +github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= diff --git a/internal/api/routes/auth.go b/internal/api/routes/auth.go index 29c0ad1..709eae4 100644 --- a/internal/api/routes/auth.go +++ b/internal/api/routes/auth.go @@ -2,8 +2,10 @@ package routes import ( "net/http" + "time" "github.com/gin-gonic/gin" + "stereo.cat/backend/internal/auth" "stereo.cat/backend/internal/types" ) @@ -23,6 +25,12 @@ func RegisterAuthRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { panic(err) } - c.JSON(http.StatusOK, user) + jwt, err := auth.GenerateJWT(cfg.JWTSecret, user, uint64(time.Now().Add(time.Second*time.Duration(t.ExpiresIn)).Unix())) + + if err != nil { + panic(err) + } + + c.String(http.StatusOK, jwt) }) } diff --git a/internal/auth/client/client.go b/internal/auth/client/client.go index 7168fd2..9a415f5 100644 --- a/internal/auth/client/client.go +++ b/internal/auth/client/client.go @@ -8,8 +8,6 @@ import ( "net/http" "net/url" "strings" - "time" - "stereo.cat/backend/internal/auth" ) diff --git a/internal/auth/jwt.go b/internal/auth/jwt.go new file mode 100644 index 0000000..d2ee5d7 --- /dev/null +++ b/internal/auth/jwt.go @@ -0,0 +1,37 @@ +package auth + +import ( + "fmt" + + "github.com/golang-jwt/jwt/v5" +) + +func GenerateJWT(key string, user User, expiryTimestamp uint64) (string, error) { + claims := jwt.MapClaims{ + "user": user, + "exp": expiryTimestamp, + } + + token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) + return token.SignedString([]byte(key)) +} + +func ValidateJWT(jwtString, key string) (jwt.MapClaims, error) { + token, err := jwt.Parse(jwtString, func(token *jwt.Token) (any, error) { + if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok { + return nil, fmt.Errorf("Invalid signing method!") + } + + return []byte(key), nil + }) + + if err != nil { + return nil, err + } + + if claims, ok := token.Claims.(jwt.MapClaims); ok && token.Valid { + return claims, nil + } + + return nil, fmt.Errorf("Invalid token!") +} diff --git a/internal/auth/types.go b/internal/auth/types.go index cd07010..2b61913 100644 --- a/internal/auth/types.go +++ b/internal/auth/types.go @@ -1,23 +1,21 @@ package auth -import ( - "gorm.io/gorm" -) +import "time" type TokenResponse struct { AccessToken string `json:"access_token"` TokenType string `json:"token_type"` - ExpiresIn uint64 `json:"expires_in"` + ExpiresIn int64 `json:"expires_in"` RefreshToken string `json:"refresh_token"` Scope string `json:"scope"` } type User struct { - gorm.Model - ID string `json:"id" gorm:"primaryKey;autoIncrement:false"` + ID string `json:"id" gorm:"primaryKey"` Username string `json:"username"` Blacklisted bool Email string `json:"email"` + CreatedAt time.Time } type AvatarDecorationData struct { diff --git a/internal/types/types.go b/internal/types/types.go index fcafa83..c29a507 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -17,4 +17,5 @@ type StereoConfig struct { Router *gin.Engine Client client.Client Database *gorm.DB + JWTSecret string } diff --git a/main.go b/main.go index 90a965f..f8a4ae7 100644 --- a/main.go +++ b/main.go @@ -2,6 +2,7 @@ package main import ( "errors" + "fmt" "log" "os" @@ -23,6 +24,13 @@ func getEnv(key, fallback string) string { return fallback } +func requireEnv(key string) string { + if value, ok := os.LookupEnv(key); ok { + return value + } + panic(errors.New(fmt.Sprintf("Environment variable %s is required but not specified. Exiting...", key))) +} + func main() { _ = godotenv.Load() @@ -42,39 +50,40 @@ func main() { Router: gin.Default(), ImagePath: imagePath, Client: client.New( - os.Getenv("REDIRECT_URI"), - os.Getenv("CLIENT_ID"), - os.Getenv("CLIENT_SECRET"), + requireEnv("REDIRECT_URI"), + requireEnv("CLIENT_ID"), + requireEnv("CLIENT_SECRET"), ), + JWTSecret: requireEnv("JWT_SECRET"), } switch databaseType { - case "sqlite": - db, err := gorm.Open(sqlite.Open(sqliteFile), &gorm.Config{}) + case "sqlite": + db, err := gorm.Open(sqlite.Open(sqliteFile), &gorm.Config{}) - c.Database = db + c.Database = db - if err != nil { - panic(err) - } + if err != nil { + panic(err) + } - break + break - case "postgres": - db, err := gorm.Open(postgres.Open(os.Getenv("POSTGRES_DSN")), &gorm.Config{}) + case "postgres": + db, err := gorm.Open(postgres.Open(requireEnv("POSTGRES_DSN")), &gorm.Config{}) - c.Database = db + c.Database = db - if err != nil { - panic(err) - } + if err != nil { + panic(err) + } - break - default: - panic(errors.New("Invalid database type was specified.")) + break + default: + panic(errors.New("Invalid database type was specified.")) } - c.Database.AutoMigrate(&auth.User{}) + c.Database.AutoMigrate(&auth.User{}) api.Register(&c) From 0b20a0d027f9207740584cbb400e2af97c7a68cd Mon Sep 17 00:00:00 2001 From: hex Date: Tue, 6 May 2025 08:39:19 +0200 Subject: [PATCH 03/39] feat: auth middleware + /me endpoint --- internal/api/routes/auth.go | 5 +++++ internal/auth/jwt.go | 30 ++++++++++++++++++++++++++++++ internal/auth/types.go | 10 +++++----- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/internal/api/routes/auth.go b/internal/api/routes/auth.go index 709eae4..a6a634f 100644 --- a/internal/api/routes/auth.go +++ b/internal/api/routes/auth.go @@ -33,4 +33,9 @@ func RegisterAuthRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { c.String(http.StatusOK, jwt) }) + + api.GET("/auth/me", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { + claims, _ := c.Get("claims") + c.JSON(http.StatusOK, claims) + }) } diff --git a/internal/auth/jwt.go b/internal/auth/jwt.go index d2ee5d7..6a01712 100644 --- a/internal/auth/jwt.go +++ b/internal/auth/jwt.go @@ -2,7 +2,10 @@ package auth import ( "fmt" + "net/http" + "strings" + "github.com/gin-gonic/gin" "github.com/golang-jwt/jwt/v5" ) @@ -16,6 +19,33 @@ func GenerateJWT(key string, user User, expiryTimestamp uint64) (string, error) return token.SignedString([]byte(key)) } +func invalidAuth(c *gin.Context) { + c.String(http.StatusUnauthorized, "Unauthorized.") + c.Abort() +} + +func JwtMiddleware(secret string) gin.HandlerFunc { + return func(c *gin.Context) { + jwtSplit := strings.Split(c.GetHeader("Authorization"), " ") + + if jwtSplit[0] != "Bearer" { + invalidAuth(c) + return + } + + claims, err := ValidateJWT(jwtSplit[1], secret) + + if err != nil { + invalidAuth(c) + return + } + + c.Set("claims", claims) + + c.Next() + } +} + func ValidateJWT(jwtString, key string) (jwt.MapClaims, error) { token, err := jwt.Parse(jwtString, func(token *jwt.Token) (any, error) { if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok { diff --git a/internal/auth/types.go b/internal/auth/types.go index 2b61913..a83b941 100644 --- a/internal/auth/types.go +++ b/internal/auth/types.go @@ -11,11 +11,11 @@ type TokenResponse struct { } type User struct { - ID string `json:"id" gorm:"primaryKey"` - Username string `json:"username"` - Blacklisted bool - Email string `json:"email"` - CreatedAt time.Time + ID string `json:"id" gorm:"primaryKey"` + Username string `json:"username"` + Blacklisted bool `json:"blacklisted"` + Email string `json:"email"` + CreatedAt time.Time `json:"created_at"` } type AvatarDecorationData struct { From 95a94bfed536c42da8d06c034a92be026c147c2d Mon Sep 17 00:00:00 2001 From: hex Date: Tue, 6 May 2025 19:00:17 +0200 Subject: [PATCH 04/39] fix: add creation date upon user registration --- internal/auth/client/client.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/auth/client/client.go b/internal/auth/client/client.go index 9a415f5..ae172d9 100644 --- a/internal/auth/client/client.go +++ b/internal/auth/client/client.go @@ -8,6 +8,8 @@ import ( "net/http" "net/url" "strings" + "time" + "stereo.cat/backend/internal/auth" ) @@ -30,6 +32,7 @@ func New(redirectUri, clientId, clientSecret string) Client { func (c Client) GetUser(t auth.TokenResponse) (auth.User, error) { user := auth.User { Blacklisted: false, + CreatedAt: time.Now(), } req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/%s", api, "users/@me"), nil) From fbd23fe2cf2e978c915e8fd5ea1bd2d8f9bf239d Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Tue, 6 May 2025 21:34:26 +0100 Subject: [PATCH 05/39] idk but it did something --- internal/auth/client/client.go | 8 +++--- internal/auth/jwt.go | 48 ++++++++++++++++++++++------------ 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/internal/auth/client/client.go b/internal/auth/client/client.go index ae172d9..3a922bc 100644 --- a/internal/auth/client/client.go +++ b/internal/auth/client/client.go @@ -30,10 +30,10 @@ func New(redirectUri, clientId, clientSecret string) Client { } func (c Client) GetUser(t auth.TokenResponse) (auth.User, error) { - user := auth.User { - Blacklisted: false, - CreatedAt: time.Now(), - } + user := auth.User{ + Blacklisted: false, + CreatedAt: time.Now(), + } req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/%s", api, "users/@me"), nil) diff --git a/internal/auth/jwt.go b/internal/auth/jwt.go index 6a01712..9e7aec2 100644 --- a/internal/auth/jwt.go +++ b/internal/auth/jwt.go @@ -1,6 +1,7 @@ package auth import ( + "encoding/json" "fmt" "net/http" "strings" @@ -20,30 +21,45 @@ func GenerateJWT(key string, user User, expiryTimestamp uint64) (string, error) } func invalidAuth(c *gin.Context) { - c.String(http.StatusUnauthorized, "Unauthorized.") - c.Abort() + c.String(http.StatusUnauthorized, "Unauthorized.") + c.Abort() } func JwtMiddleware(secret string) gin.HandlerFunc { - return func(c *gin.Context) { - jwtSplit := strings.Split(c.GetHeader("Authorization"), " ") + return func(c *gin.Context) { + jwtSplit := strings.Split(c.GetHeader("Authorization"), " ") - if jwtSplit[0] != "Bearer" { - invalidAuth(c) - return - } + if len(jwtSplit) < 2 || jwtSplit[0] != "Bearer" { + invalidAuth(c) + return + } - claims, err := ValidateJWT(jwtSplit[1], secret) + claims, err := ValidateJWT(jwtSplit[1], secret) + if err != nil { + invalidAuth(c) + return + } - if err != nil { - invalidAuth(c) - return - } + if userClaims, ok := claims["user"].(map[string]interface{}); ok { + userJSON, err := json.Marshal(userClaims) // Convert map to JSON + if err != nil { + invalidAuth(c) + return + } - c.Set("claims", claims) + var user User + err = json.Unmarshal(userJSON, &user) + if err != nil { + invalidAuth(c) + return + } - c.Next() - } + claims["user"] = user + } + + c.Set("claims", claims) + c.Next() + } } func ValidateJWT(jwtString, key string) (jwt.MapClaims, error) { From a3312ef6f84cc1d13e95596e6ce72e07da57d7ac Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Tue, 6 May 2025 21:50:06 +0100 Subject: [PATCH 06/39] add auth to /uploads --- .gitignore | 1 + internal/api/routes/upload.go | 18 ++++++++++++++++-- internal/auth/jwt.go | 6 +++--- internal/auth/types.go | 12 +++++++++++- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b0088e0..d17bf15 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .env tmp *.db +imgs \ No newline at end of file diff --git a/internal/api/routes/upload.go b/internal/api/routes/upload.go index baed591..d4950e7 100644 --- a/internal/api/routes/upload.go +++ b/internal/api/routes/upload.go @@ -4,22 +4,36 @@ import ( "path/filepath" "github.com/gin-gonic/gin" + "github.com/golang-jwt/jwt/v5" + "stereo.cat/backend/internal/auth" "stereo.cat/backend/internal/types" ) func RegisterUploadRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { - api.POST("/upload", func(c *gin.Context) { + api.POST("/upload", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { + claims := c.MustGet("claims").(jwt.MapClaims) + user := claims["user"].(auth.User) + + uid := user.ID + + if uid == "" { + c.JSON(401, gin.H{"error": "unauthorized"}) + return + } + file, err := c.FormFile("file") if err != nil { c.JSON(400, gin.H{"error": "file is required"}) return } - filePath := filepath.Join(cfg.ImagePath, file.Filename) + filePath := filepath.Join(cfg.ImagePath, uid, file.Filename) if err := c.SaveUploadedFile(file, filePath); err != nil { c.JSON(500, gin.H{"error": "failed to save file"}) return } + + c.JSON(200, gin.H{"message": "file uploaded successfully"}) }) api.GET("/:name", func(c *gin.Context) { diff --git a/internal/auth/jwt.go b/internal/auth/jwt.go index 9e7aec2..1ea6d0f 100644 --- a/internal/auth/jwt.go +++ b/internal/auth/jwt.go @@ -11,9 +11,9 @@ import ( ) func GenerateJWT(key string, user User, expiryTimestamp uint64) (string, error) { - claims := jwt.MapClaims{ - "user": user, - "exp": expiryTimestamp, + claims := Claims{ + User: user, + Exp: expiryTimestamp, } token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) diff --git a/internal/auth/types.go b/internal/auth/types.go index a83b941..8627df7 100644 --- a/internal/auth/types.go +++ b/internal/auth/types.go @@ -1,6 +1,10 @@ package auth -import "time" +import ( + "time" + + "github.com/golang-jwt/jwt/v5" +) type TokenResponse struct { AccessToken string `json:"access_token"` @@ -28,3 +32,9 @@ type ExchangeCodeRequest struct { Code string `json:"code"` RedirectUri string `json:"redirect_uri"` } + +type Claims struct { + User User `json:"user"` + Exp uint64 `json:"exp"` + jwt.RegisteredClaims +} From 93aec1336d2fa3c9576cba36f35aeb5bf19a2871 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Tue, 6 May 2025 22:20:30 +0100 Subject: [PATCH 07/39] add to db --- go.mod | 2 ++ go.sum | 4 ++++ internal/api/routes/upload.go | 23 +++++++++++++++++++++-- internal/types/types.go | 13 +++++++++++-- main.go | 2 +- 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index db43dc3..72ef5f2 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,7 @@ require ( github.com/go-playground/validator/v10 v10.26.0 // indirect github.com/goccy/go-json v0.10.5 // indirect github.com/golang-jwt/jwt/v5 v5.2.2 // indirect + github.com/google/uuid v1.6.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.4 // indirect @@ -29,6 +30,7 @@ require ( github.com/klauspost/cpuid/v2 v2.2.10 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/leodido/go-urn v1.4.0 // indirect + github.com/lithammer/shortuuid/v4 v4.2.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-sqlite3 v1.14.28 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect diff --git a/go.sum b/go.sum index d3761d1..ce498a0 100644 --- a/go.sum +++ b/go.sum @@ -31,6 +31,8 @@ github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVI github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/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= @@ -60,6 +62,8 @@ 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.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/lithammer/shortuuid/v4 v4.2.0 h1:LMFOzVB3996a7b8aBuEXxqOBflbfPQAiVzkIcHO0h8c= +github.com/lithammer/shortuuid/v4 v4.2.0/go.mod h1:D5noHZ2oFw/YaKCfGy0YxyE7M0wMbezmMjPdhyEFe6Y= 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.28 h1:ThEiQrnbtumT+QMknw63Befp/ce/nUPgBPMlRFEum7A= diff --git a/internal/api/routes/upload.go b/internal/api/routes/upload.go index d4950e7..e55ee52 100644 --- a/internal/api/routes/upload.go +++ b/internal/api/routes/upload.go @@ -1,7 +1,9 @@ package routes import ( + "os" "path/filepath" + "time" "github.com/gin-gonic/gin" "github.com/golang-jwt/jwt/v5" @@ -15,7 +17,6 @@ func RegisterUploadRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { user := claims["user"].(auth.User) uid := user.ID - if uid == "" { c.JSON(401, gin.H{"error": "unauthorized"}) return @@ -28,12 +29,30 @@ func RegisterUploadRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { } filePath := filepath.Join(cfg.ImagePath, uid, file.Filename) + + if err := os.MkdirAll(filepath.Dir(filePath), os.ModePerm); err != nil { + c.JSON(500, gin.H{"error": "failed to create directory"}) + return + } + if err := c.SaveUploadedFile(file, filePath); err != nil { c.JSON(500, gin.H{"error": "failed to save file"}) return } - c.JSON(200, gin.H{"message": "file uploaded successfully"}) + fileMeta := types.File{ + ID: uid + "_" + file.Filename, + Path: filePath, + Owner: uid, + CreatedAt: time.Now(), + } + + if err := cfg.Database.Create(&fileMeta).Error; err != nil { + c.JSON(500, gin.H{"error": "failed to save file metadata"}) + return + } + + c.JSON(200, gin.H{"message": "file uploaded successfully", "file_id": fileMeta.ID}) }) api.GET("/:name", func(c *gin.Context) { diff --git a/internal/types/types.go b/internal/types/types.go index c29a507..98dd231 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -1,6 +1,8 @@ package types import ( + "time" + "github.com/gin-gonic/gin" "gorm.io/gorm" "stereo.cat/backend/internal/auth/client" @@ -16,6 +18,13 @@ type StereoConfig struct { ImagePath string Router *gin.Engine Client client.Client - Database *gorm.DB - JWTSecret string + Database *gorm.DB + JWTSecret string +} + +type File struct { + ID string `gorm:"primaryKey"` + Path string `gorm:"not null;index"` + Owner string `gorm:"not null;index"` + CreatedAt time.Time `gorm:"autoCreateTime"` } diff --git a/main.go b/main.go index f8a4ae7..6059919 100644 --- a/main.go +++ b/main.go @@ -83,7 +83,7 @@ func main() { panic(errors.New("Invalid database type was specified.")) } - c.Database.AutoMigrate(&auth.User{}) + c.Database.AutoMigrate(&auth.User{}, &types.File{}) api.Register(&c) From 0521b523c4dcce35d7409abfed6519630e5a1190 Mon Sep 17 00:00:00 2001 From: hex Date: Sat, 10 May 2025 15:31:34 +0200 Subject: [PATCH 08/39] feat: database user creation && readme explanation --- README.md | 5 +++++ internal/api/routes/auth.go | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fb342cc..b58e450 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ # stereo.cat backend written in Go, uses Gin. + +## database shit + +Instead of using Discord oAuth as a database, we instead use it as a login source, only using it to source a username/id, avatar data and a secure login/registration flow. +We store these attributes alongside stereo.cat specific attributes in our own database. There is a trade-off however: this means that avatar & username data is not updated in real-time, only when the oauth flow is executed. diff --git a/internal/api/routes/auth.go b/internal/api/routes/auth.go index a6a634f..53082dc 100644 --- a/internal/api/routes/auth.go +++ b/internal/api/routes/auth.go @@ -31,11 +31,21 @@ func RegisterAuthRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { panic(err) } - c.String(http.StatusOK, jwt) + res := cfg.Database.FirstOrCreate(&user) + + if res.Error != nil { + panic(res.Error) + } + + // TODO: redirect to dashboard + c.JSON(http.StatusOK, gin.H{ + "jwt": jwt, + "known": res.RowsAffected == 0, + }) }) api.GET("/auth/me", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { - claims, _ := c.Get("claims") + claims, _ := c.Get("claims") c.JSON(http.StatusOK, claims) }) } From e16a4eae261533e86951b400e0a9f986de0dc83f Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sat, 7 Jun 2025 23:48:05 +0100 Subject: [PATCH 09/39] skibidi --- internal/api/api.go | 2 +- internal/api/routes/{upload.go => files.go} | 15 ++++++++++++++- main.go | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) rename internal/api/routes/{upload.go => files.go} (76%) diff --git a/internal/api/api.go b/internal/api/api.go index 7861d03..592bc7b 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -7,6 +7,6 @@ import ( func Register(cfg *types.StereoConfig) { api := cfg.Router.Group("/api") - routes.RegisterUploadRoutes(cfg, api) + routes.RegisterFileRoutes(cfg, api) routes.RegisterAuthRoutes(cfg, api) } diff --git a/internal/api/routes/upload.go b/internal/api/routes/files.go similarity index 76% rename from internal/api/routes/upload.go rename to internal/api/routes/files.go index e55ee52..0471632 100644 --- a/internal/api/routes/upload.go +++ b/internal/api/routes/files.go @@ -11,7 +11,7 @@ import ( "stereo.cat/backend/internal/types" ) -func RegisterUploadRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { +func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { api.POST("/upload", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { claims := c.MustGet("claims").(jwt.MapClaims) user := claims["user"].(auth.User) @@ -60,4 +60,17 @@ func RegisterUploadRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { path := filepath.Join(cfg.ImagePath, name) c.File(path) }) + + api.GET("/list", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { + claims := c.MustGet("claims").(jwt.MapClaims) + user := claims["user"].(auth.User) + + var files []types.File + if err := cfg.Database.Where("owner = ?", user.ID).Find(&files).Error; err != nil { + c.JSON(500, gin.H{"error": "failed to retrieve files"}) + return + } + + c.JSON(200, files) + }) } diff --git a/main.go b/main.go index 6059919..54351ce 100644 --- a/main.go +++ b/main.go @@ -86,6 +86,6 @@ func main() { c.Database.AutoMigrate(&auth.User{}, &types.File{}) api.Register(&c) - + fmt.Printf("Running on port %s\n", getEnv("PORT", "8080")) c.Router.Run() } From e5265e35e4f400d538775d331fe78c132f3fc020 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sun, 8 Jun 2025 00:00:56 +0100 Subject: [PATCH 10/39] sharing base64 file data --- internal/api/routes/files.go | 17 +++++++++++++++++ internal/types/types.go | 1 + 2 files changed, 18 insertions(+) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index 0471632..f90fbd6 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -1,6 +1,7 @@ package routes import ( + "encoding/base64" "os" "path/filepath" "time" @@ -40,11 +41,17 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { return } + // conver file variable to base64 string + b64, err := convertToBase64(filePath) + if err != nil { + } + fileMeta := types.File{ ID: uid + "_" + file.Filename, Path: filePath, Owner: uid, CreatedAt: time.Now(), + Base64: b64, } if err := cfg.Database.Create(&fileMeta).Error; err != nil { @@ -74,3 +81,13 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { c.JSON(200, files) }) } + +func convertToBase64(filePath string) (string, error) { + file, err := os.ReadFile(filePath) + if err != nil { + return "", err + } + + b64 := base64.StdEncoding.EncodeToString(file) + return b64, nil +} diff --git a/internal/types/types.go b/internal/types/types.go index 98dd231..6120f08 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -27,4 +27,5 @@ type File struct { Path string `gorm:"not null;index"` Owner string `gorm:"not null;index"` CreatedAt time.Time `gorm:"autoCreateTime"` + Base64 string `gorm:"type:text"` } From f20ad1475b938f65a16b6d6abb3024bd83f423b0 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sun, 8 Jun 2025 00:01:06 +0100 Subject: [PATCH 11/39] j --- internal/api/routes/files.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index f90fbd6..e5a1216 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -41,7 +41,6 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { return } - // conver file variable to base64 string b64, err := convertToBase64(filePath) if err != nil { } From 8942778377ac3864ac325bed676ca6ffe6d2f189 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sun, 8 Jun 2025 15:10:51 +0100 Subject: [PATCH 12/39] fix file retrieval --- internal/api/routes/files.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index e5a1216..ee1d295 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -4,6 +4,7 @@ import ( "encoding/base64" "os" "path/filepath" + "strings" "time" "github.com/gin-gonic/gin" @@ -63,7 +64,17 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { api.GET("/:name", func(c *gin.Context) { name := c.Param("name") - path := filepath.Join(cfg.ImagePath, name) + parts := strings.SplitN(name, "_", 2) + if len(parts) != 2 { + c.JSON(400, gin.H{"error": "invalid file name"}) + return + } + uid, filename := parts[0], parts[1] + path := filepath.Join(cfg.ImagePath, uid, filename) + if _, err := os.Stat(path); err != nil { + c.JSON(404, gin.H{"error": "file not found"}) + return + } c.File(path) }) From 064ce7979da95d4129ccdb93966f900b504244d0 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sun, 8 Jun 2025 17:27:40 +0100 Subject: [PATCH 13/39] delete route --- internal/api/routes/files.go | 51 ++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index ee1d295..28accb4 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -62,6 +62,57 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { c.JSON(200, gin.H{"message": "file uploaded successfully", "file_id": fileMeta.ID}) }) + api.DELETE("/delete", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { + claims := c.MustGet("claims").(jwt.MapClaims) + user := claims["user"].(auth.User) + + uid := user.ID + if uid == "" { + c.JSON(401, gin.H{"error": "unauthorized"}) + return + } + + var response struct { + FileID string `json:"file_id" binding:"required"` + } + + if err := c.ShouldBindJSON(&response); err != nil { + c.JSON(400, gin.H{"error": "file_id is required"}) + return + } + + resfID := response.FileID + if resfID == "" { + c.JSON(400, gin.H{"error": "file_id cannot be empty"}) + return + } + + parts := strings.SplitN(resfID, "_", 2) + if len(parts) != 2 { + c.JSON(400, gin.H{"error": "invalid file_id format"}) + return + } + + fileID, filename := parts[0], parts[1] + if fileID != uid { + c.JSON(403, gin.H{"error": "you can only delete your own files"}) + return + } + + filePath := filepath.Join(cfg.ImagePath, uid, filename) + if err := os.Remove(filePath); err != nil { + c.JSON(500, gin.H{"error": "failed to delete file"}) + return + } + + if err := cfg.Database.Where("id = ?", resfID).Delete(&types.File{}).Error; err != nil { + c.JSON(500, gin.H{"error": "failed to delete file metadata"}) + return + } + + c.JSON(200, gin.H{"message": "file deleted successfully"}) + }) + api.GET("/:name", func(c *gin.Context) { name := c.Param("name") parts := strings.SplitN(name, "_", 2) From 7733556c76bf2714caa3a91630e1c525100e37cc Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Tue, 6 May 2025 21:50:06 +0100 Subject: [PATCH 14/39] add auth to /uploads --- .gitignore | 1 + internal/api/routes/upload.go | 18 ++++++++++++++++-- internal/auth/jwt.go | 6 +++--- internal/auth/types.go | 12 +++++++++++- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b0088e0..d17bf15 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .env tmp *.db +imgs \ No newline at end of file diff --git a/internal/api/routes/upload.go b/internal/api/routes/upload.go index baed591..d4950e7 100644 --- a/internal/api/routes/upload.go +++ b/internal/api/routes/upload.go @@ -4,22 +4,36 @@ import ( "path/filepath" "github.com/gin-gonic/gin" + "github.com/golang-jwt/jwt/v5" + "stereo.cat/backend/internal/auth" "stereo.cat/backend/internal/types" ) func RegisterUploadRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { - api.POST("/upload", func(c *gin.Context) { + api.POST("/upload", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { + claims := c.MustGet("claims").(jwt.MapClaims) + user := claims["user"].(auth.User) + + uid := user.ID + + if uid == "" { + c.JSON(401, gin.H{"error": "unauthorized"}) + return + } + file, err := c.FormFile("file") if err != nil { c.JSON(400, gin.H{"error": "file is required"}) return } - filePath := filepath.Join(cfg.ImagePath, file.Filename) + filePath := filepath.Join(cfg.ImagePath, uid, file.Filename) if err := c.SaveUploadedFile(file, filePath); err != nil { c.JSON(500, gin.H{"error": "failed to save file"}) return } + + c.JSON(200, gin.H{"message": "file uploaded successfully"}) }) api.GET("/:name", func(c *gin.Context) { diff --git a/internal/auth/jwt.go b/internal/auth/jwt.go index 9e7aec2..1ea6d0f 100644 --- a/internal/auth/jwt.go +++ b/internal/auth/jwt.go @@ -11,9 +11,9 @@ import ( ) func GenerateJWT(key string, user User, expiryTimestamp uint64) (string, error) { - claims := jwt.MapClaims{ - "user": user, - "exp": expiryTimestamp, + claims := Claims{ + User: user, + Exp: expiryTimestamp, } token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) diff --git a/internal/auth/types.go b/internal/auth/types.go index a83b941..8627df7 100644 --- a/internal/auth/types.go +++ b/internal/auth/types.go @@ -1,6 +1,10 @@ package auth -import "time" +import ( + "time" + + "github.com/golang-jwt/jwt/v5" +) type TokenResponse struct { AccessToken string `json:"access_token"` @@ -28,3 +32,9 @@ type ExchangeCodeRequest struct { Code string `json:"code"` RedirectUri string `json:"redirect_uri"` } + +type Claims struct { + User User `json:"user"` + Exp uint64 `json:"exp"` + jwt.RegisteredClaims +} From f2f1c28c714022142a0b861c8ff91e9302d7b4e3 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Tue, 6 May 2025 22:20:30 +0100 Subject: [PATCH 15/39] add to db --- go.mod | 2 ++ go.sum | 4 ++++ internal/api/routes/upload.go | 23 +++++++++++++++++++++-- internal/types/types.go | 13 +++++++++++-- main.go | 2 +- 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index db43dc3..72ef5f2 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,7 @@ require ( github.com/go-playground/validator/v10 v10.26.0 // indirect github.com/goccy/go-json v0.10.5 // indirect github.com/golang-jwt/jwt/v5 v5.2.2 // indirect + github.com/google/uuid v1.6.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.4 // indirect @@ -29,6 +30,7 @@ require ( github.com/klauspost/cpuid/v2 v2.2.10 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/leodido/go-urn v1.4.0 // indirect + github.com/lithammer/shortuuid/v4 v4.2.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-sqlite3 v1.14.28 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect diff --git a/go.sum b/go.sum index d3761d1..ce498a0 100644 --- a/go.sum +++ b/go.sum @@ -31,6 +31,8 @@ github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVI github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/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= @@ -60,6 +62,8 @@ 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.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/lithammer/shortuuid/v4 v4.2.0 h1:LMFOzVB3996a7b8aBuEXxqOBflbfPQAiVzkIcHO0h8c= +github.com/lithammer/shortuuid/v4 v4.2.0/go.mod h1:D5noHZ2oFw/YaKCfGy0YxyE7M0wMbezmMjPdhyEFe6Y= 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.28 h1:ThEiQrnbtumT+QMknw63Befp/ce/nUPgBPMlRFEum7A= diff --git a/internal/api/routes/upload.go b/internal/api/routes/upload.go index d4950e7..e55ee52 100644 --- a/internal/api/routes/upload.go +++ b/internal/api/routes/upload.go @@ -1,7 +1,9 @@ package routes import ( + "os" "path/filepath" + "time" "github.com/gin-gonic/gin" "github.com/golang-jwt/jwt/v5" @@ -15,7 +17,6 @@ func RegisterUploadRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { user := claims["user"].(auth.User) uid := user.ID - if uid == "" { c.JSON(401, gin.H{"error": "unauthorized"}) return @@ -28,12 +29,30 @@ func RegisterUploadRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { } filePath := filepath.Join(cfg.ImagePath, uid, file.Filename) + + if err := os.MkdirAll(filepath.Dir(filePath), os.ModePerm); err != nil { + c.JSON(500, gin.H{"error": "failed to create directory"}) + return + } + if err := c.SaveUploadedFile(file, filePath); err != nil { c.JSON(500, gin.H{"error": "failed to save file"}) return } - c.JSON(200, gin.H{"message": "file uploaded successfully"}) + fileMeta := types.File{ + ID: uid + "_" + file.Filename, + Path: filePath, + Owner: uid, + CreatedAt: time.Now(), + } + + if err := cfg.Database.Create(&fileMeta).Error; err != nil { + c.JSON(500, gin.H{"error": "failed to save file metadata"}) + return + } + + c.JSON(200, gin.H{"message": "file uploaded successfully", "file_id": fileMeta.ID}) }) api.GET("/:name", func(c *gin.Context) { diff --git a/internal/types/types.go b/internal/types/types.go index c29a507..98dd231 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -1,6 +1,8 @@ package types import ( + "time" + "github.com/gin-gonic/gin" "gorm.io/gorm" "stereo.cat/backend/internal/auth/client" @@ -16,6 +18,13 @@ type StereoConfig struct { ImagePath string Router *gin.Engine Client client.Client - Database *gorm.DB - JWTSecret string + Database *gorm.DB + JWTSecret string +} + +type File struct { + ID string `gorm:"primaryKey"` + Path string `gorm:"not null;index"` + Owner string `gorm:"not null;index"` + CreatedAt time.Time `gorm:"autoCreateTime"` } diff --git a/main.go b/main.go index f8a4ae7..6059919 100644 --- a/main.go +++ b/main.go @@ -83,7 +83,7 @@ func main() { panic(errors.New("Invalid database type was specified.")) } - c.Database.AutoMigrate(&auth.User{}) + c.Database.AutoMigrate(&auth.User{}, &types.File{}) api.Register(&c) From c4f7f79cfda2b43f0e0df0ac7bce95521f7bf4d6 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sat, 7 Jun 2025 23:48:05 +0100 Subject: [PATCH 16/39] skibidi --- internal/api/api.go | 2 +- internal/api/routes/{upload.go => files.go} | 15 ++++++++++++++- main.go | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) rename internal/api/routes/{upload.go => files.go} (76%) diff --git a/internal/api/api.go b/internal/api/api.go index 7861d03..592bc7b 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -7,6 +7,6 @@ import ( func Register(cfg *types.StereoConfig) { api := cfg.Router.Group("/api") - routes.RegisterUploadRoutes(cfg, api) + routes.RegisterFileRoutes(cfg, api) routes.RegisterAuthRoutes(cfg, api) } diff --git a/internal/api/routes/upload.go b/internal/api/routes/files.go similarity index 76% rename from internal/api/routes/upload.go rename to internal/api/routes/files.go index e55ee52..0471632 100644 --- a/internal/api/routes/upload.go +++ b/internal/api/routes/files.go @@ -11,7 +11,7 @@ import ( "stereo.cat/backend/internal/types" ) -func RegisterUploadRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { +func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { api.POST("/upload", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { claims := c.MustGet("claims").(jwt.MapClaims) user := claims["user"].(auth.User) @@ -60,4 +60,17 @@ func RegisterUploadRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { path := filepath.Join(cfg.ImagePath, name) c.File(path) }) + + api.GET("/list", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { + claims := c.MustGet("claims").(jwt.MapClaims) + user := claims["user"].(auth.User) + + var files []types.File + if err := cfg.Database.Where("owner = ?", user.ID).Find(&files).Error; err != nil { + c.JSON(500, gin.H{"error": "failed to retrieve files"}) + return + } + + c.JSON(200, files) + }) } diff --git a/main.go b/main.go index 6059919..54351ce 100644 --- a/main.go +++ b/main.go @@ -86,6 +86,6 @@ func main() { c.Database.AutoMigrate(&auth.User{}, &types.File{}) api.Register(&c) - + fmt.Printf("Running on port %s\n", getEnv("PORT", "8080")) c.Router.Run() } From f947cba89d9210ba3f9ed0f207f984937f5c4638 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sun, 8 Jun 2025 00:00:56 +0100 Subject: [PATCH 17/39] sharing base64 file data --- internal/api/routes/files.go | 17 +++++++++++++++++ internal/types/types.go | 1 + 2 files changed, 18 insertions(+) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index 0471632..f90fbd6 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -1,6 +1,7 @@ package routes import ( + "encoding/base64" "os" "path/filepath" "time" @@ -40,11 +41,17 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { return } + // conver file variable to base64 string + b64, err := convertToBase64(filePath) + if err != nil { + } + fileMeta := types.File{ ID: uid + "_" + file.Filename, Path: filePath, Owner: uid, CreatedAt: time.Now(), + Base64: b64, } if err := cfg.Database.Create(&fileMeta).Error; err != nil { @@ -74,3 +81,13 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { c.JSON(200, files) }) } + +func convertToBase64(filePath string) (string, error) { + file, err := os.ReadFile(filePath) + if err != nil { + return "", err + } + + b64 := base64.StdEncoding.EncodeToString(file) + return b64, nil +} diff --git a/internal/types/types.go b/internal/types/types.go index 98dd231..6120f08 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -27,4 +27,5 @@ type File struct { Path string `gorm:"not null;index"` Owner string `gorm:"not null;index"` CreatedAt time.Time `gorm:"autoCreateTime"` + Base64 string `gorm:"type:text"` } From 56a907689e2bf99a0019a5d1089411011aef573f Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sun, 8 Jun 2025 00:01:06 +0100 Subject: [PATCH 18/39] j --- internal/api/routes/files.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index f90fbd6..e5a1216 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -41,7 +41,6 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { return } - // conver file variable to base64 string b64, err := convertToBase64(filePath) if err != nil { } From ea86ebc6a3972b9a0d302b0a986149a879de4f25 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sun, 8 Jun 2025 15:10:51 +0100 Subject: [PATCH 19/39] fix file retrieval --- internal/api/routes/files.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index e5a1216..ee1d295 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -4,6 +4,7 @@ import ( "encoding/base64" "os" "path/filepath" + "strings" "time" "github.com/gin-gonic/gin" @@ -63,7 +64,17 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { api.GET("/:name", func(c *gin.Context) { name := c.Param("name") - path := filepath.Join(cfg.ImagePath, name) + parts := strings.SplitN(name, "_", 2) + if len(parts) != 2 { + c.JSON(400, gin.H{"error": "invalid file name"}) + return + } + uid, filename := parts[0], parts[1] + path := filepath.Join(cfg.ImagePath, uid, filename) + if _, err := os.Stat(path); err != nil { + c.JSON(404, gin.H{"error": "file not found"}) + return + } c.File(path) }) From b3057e185ca05b8b8164c1f99729ab501e8744e0 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sun, 8 Jun 2025 17:27:40 +0100 Subject: [PATCH 20/39] delete route --- internal/api/routes/files.go | 51 ++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index ee1d295..28accb4 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -62,6 +62,57 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { c.JSON(200, gin.H{"message": "file uploaded successfully", "file_id": fileMeta.ID}) }) + api.DELETE("/delete", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { + claims := c.MustGet("claims").(jwt.MapClaims) + user := claims["user"].(auth.User) + + uid := user.ID + if uid == "" { + c.JSON(401, gin.H{"error": "unauthorized"}) + return + } + + var response struct { + FileID string `json:"file_id" binding:"required"` + } + + if err := c.ShouldBindJSON(&response); err != nil { + c.JSON(400, gin.H{"error": "file_id is required"}) + return + } + + resfID := response.FileID + if resfID == "" { + c.JSON(400, gin.H{"error": "file_id cannot be empty"}) + return + } + + parts := strings.SplitN(resfID, "_", 2) + if len(parts) != 2 { + c.JSON(400, gin.H{"error": "invalid file_id format"}) + return + } + + fileID, filename := parts[0], parts[1] + if fileID != uid { + c.JSON(403, gin.H{"error": "you can only delete your own files"}) + return + } + + filePath := filepath.Join(cfg.ImagePath, uid, filename) + if err := os.Remove(filePath); err != nil { + c.JSON(500, gin.H{"error": "failed to delete file"}) + return + } + + if err := cfg.Database.Where("id = ?", resfID).Delete(&types.File{}).Error; err != nil { + c.JSON(500, gin.H{"error": "failed to delete file metadata"}) + return + } + + c.JSON(200, gin.H{"message": "file deleted successfully"}) + }) + api.GET("/:name", func(c *gin.Context) { name := c.Param("name") parts := strings.SplitN(name, "_", 2) From 6e34203afde3c710b895785a1f1489f5aaf5de44 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sun, 8 Jun 2025 18:44:19 +0100 Subject: [PATCH 21/39] =?UTF-8?q?no=20more=20base=2064=20=F0=9F=98=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/api/routes/files.go | 18 ++++-------------- internal/types/types.go | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index 28accb4..db70537 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -1,7 +1,6 @@ package routes import ( - "encoding/base64" "os" "path/filepath" "strings" @@ -42,8 +41,9 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { return } - b64, err := convertToBase64(filePath) - if err != nil { + if file.Size <= 0 { + c.JSON(400, gin.H{"error": "file size must be greater than zero"}) + return } fileMeta := types.File{ @@ -51,7 +51,7 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { Path: filePath, Owner: uid, CreatedAt: time.Now(), - Base64: b64, + Size: file.Size, } if err := cfg.Database.Create(&fileMeta).Error; err != nil { @@ -142,13 +142,3 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { c.JSON(200, files) }) } - -func convertToBase64(filePath string) (string, error) { - file, err := os.ReadFile(filePath) - if err != nil { - return "", err - } - - b64 := base64.StdEncoding.EncodeToString(file) - return b64, nil -} diff --git a/internal/types/types.go b/internal/types/types.go index 6120f08..99e5186 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -26,6 +26,6 @@ type File struct { ID string `gorm:"primaryKey"` Path string `gorm:"not null;index"` Owner string `gorm:"not null;index"` + Size int64 `gorm:"not null;type:bigint"` CreatedAt time.Time `gorm:"autoCreateTime"` - Base64 string `gorm:"type:text"` } From 8bae137886ba5ac5493d0d1a4b7ca09660580308 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sun, 8 Jun 2025 20:00:38 +0100 Subject: [PATCH 22/39] edit example env --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index 19c21ad..a19a2f8 100644 --- a/.env.example +++ b/.env.example @@ -2,6 +2,7 @@ IMAGE_PATH=/tmp REDIRECT_URI=http://localhost:8081/api/auth/callback CLIENT_ID= CLIENT_SECRET= +PORT= # can be either postgres or sqlite DATABASE_TYPE= From c5aa21b75e52709a8a4d60384fbfe88baf1f2131 Mon Sep 17 00:00:00 2001 From: hex Date: Sun, 8 Jun 2025 21:13:32 +0200 Subject: [PATCH 23/39] add shit --- .env.example | 2 ++ internal/api/routes/auth.go | 5 ++++- internal/api/routes/files.go | 1 - internal/types/types.go | 13 +++++++------ main.go | 7 ++++++- testing.md | 4 ++++ 6 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 testing.md diff --git a/.env.example b/.env.example index 19c21ad..4d9babe 100644 --- a/.env.example +++ b/.env.example @@ -2,6 +2,8 @@ IMAGE_PATH=/tmp REDIRECT_URI=http://localhost:8081/api/auth/callback CLIENT_ID= CLIENT_SECRET= +FRONTEND_URI= +DOMAIN=localhost # can be either postgres or sqlite DATABASE_TYPE= diff --git a/internal/api/routes/auth.go b/internal/api/routes/auth.go index b4a2f38..90ef30f 100644 --- a/internal/api/routes/auth.go +++ b/internal/api/routes/auth.go @@ -38,10 +38,13 @@ func RegisterAuthRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { } // TODO: redirect to dashboard - c.JSON(http.StatusOK, gin.H{ + /*c.JSON(http.StatusOK, gin.H{ "jwt": jwt, "known": res.RowsAffected == 0, }) + */ + c.SetCookie("jwt", jwt, int(t.ExpiresIn), "", cfg.Domain, true, true) + c.Redirect(http.StatusTemporaryRedirect, cfg.FrontendUri) }) api.GET("/auth/me", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index c54489d..0d987f4 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -48,7 +48,6 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { fileMeta := types.File{ ID: uid + "_" + file.Filename, - Path: filePath, Owner: uid, CreatedAt: time.Now(), Size: file.Size, diff --git a/internal/types/types.go b/internal/types/types.go index 505c1fe..abae4ee 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -15,16 +15,17 @@ type Route struct { } type StereoConfig struct { - ImagePath string - Router *gin.Engine - Client client.Client - Database *gorm.DB - JWTSecret string + ImagePath string + Router *gin.Engine + Client client.Client + Database *gorm.DB + JWTSecret string + FrontendUri string + Domain string } type File struct { ID string `gorm:"primaryKey"` - Path string `gorm:"not null;index"` Owner string `gorm:"not null;index"` Size int64 `gorm:"not null;type:bigint"` CreatedAt time.Time `gorm:"autoCreateTime"` diff --git a/main.go b/main.go index 92466c0..5b58333 100644 --- a/main.go +++ b/main.go @@ -54,9 +54,14 @@ func main() { requireEnv("CLIENT_ID"), requireEnv("CLIENT_SECRET"), ), + FrontendUri: requireEnv("FRONTEND_URI"), + Domain: requireEnv("DOMAIN"), JWTSecret: requireEnv("JWT_SECRET"), } + log.Println(c.Domain) + log.Println(c.FrontendUri) + switch databaseType { case "sqlite": db, err := gorm.Open(sqlite.Open(sqliteFile), &gorm.Config{}) @@ -86,6 +91,6 @@ func main() { c.Database.AutoMigrate(&auth.User{}, &types.File{}) api.Register(&c) - fmt.Printf("Running on port %s\n", getEnv("PORT", "8080")) + fmt.Printf("Running on port %s\n", getEnv("PORT", "8081")) c.Router.Run() } diff --git a/testing.md b/testing.md new file mode 100644 index 0000000..eb1e991 --- /dev/null +++ b/testing.md @@ -0,0 +1,4 @@ +## curl +### uploading + +curl -F "file=@(path_to_test_img)" "http://localhost:8081/api/upload" -H "Authorization: Bearer (jwt here)" From b05135420cb63dc52b70a8770a147f96ff3bc0ef Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sun, 8 Jun 2025 20:45:39 +0100 Subject: [PATCH 24/39] fix jwt middleware --- .env.example | 2 ++ internal/auth/jwt.go | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.env.example b/.env.example index 76ca780..4fc749b 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,7 @@ IMAGE_PATH=/tmp REDIRECT_URI=http://localhost:8081/api/auth/callback +FRONTEND_URI= +DOMAIN= CLIENT_ID= CLIENT_SECRET= FRONTEND_URI= diff --git a/internal/auth/jwt.go b/internal/auth/jwt.go index 46cea85..7f21182 100644 --- a/internal/auth/jwt.go +++ b/internal/auth/jwt.go @@ -27,14 +27,20 @@ func invalidAuth(c *gin.Context) { func JwtMiddleware(secret string) gin.HandlerFunc { return func(c *gin.Context) { - jwtSplit := strings.Split(c.GetHeader("Authorization"), " ") + jwt, err := c.Cookie("jwt") + if err != nil { + // js as a fallback incase hex does a stupid again + jwtSplit := strings.Split(c.GetHeader("Authorization"), " ") - if len(jwtSplit) < 2 || jwtSplit[0] != "Bearer" { - invalidAuth(c) - return + if len(jwtSplit) < 2 || jwtSplit[0] != "Bearer" { + invalidAuth(c) + return + } + + jwt = jwtSplit[1] } - claims, err := ValidateJWT(jwtSplit[1], secret) + claims, err := ValidateJWT(jwt, secret) if err != nil { invalidAuth(c) return From 2b64d64f80049def751bb13cda0bb2f3acbc996a Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Mon, 9 Jun 2025 23:11:32 +0100 Subject: [PATCH 25/39] sanitise file name --- internal/api/routes/files.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index 0d987f4..a345fdf 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -114,12 +114,31 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { api.GET("/:name", func(c *gin.Context) { name := c.Param("name") + name = strings.TrimSpace(name) + + safe := "" + for _, r := range name { + if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') || + (r >= '0' && r <= '9') || r == '_' || r == '.' || r == '-' { + safe += string(r) + } else { + safe += "_" + } + } + name = safe + parts := strings.SplitN(name, "_", 2) if len(parts) != 2 { c.JSON(400, gin.H{"error": "invalid file name"}) return } + uid, filename := parts[0], parts[1] + if uid == "" || filename == "" { + c.JSON(400, gin.H{"error": "invalid file name"}) + return + } + path := filepath.Join(cfg.ImagePath, uid, filename) if _, err := os.Stat(path); err != nil { c.JSON(404, gin.H{"error": "file not found"}) From 9ef77609678ddd80686d14f7ae6a876958be9b83 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Tue, 10 Jun 2025 00:10:03 +0100 Subject: [PATCH 26/39] split single file id "" into 2 properties --- internal/api/routes/files.go | 143 +++++++++++++++++++++++------------ internal/types/types.go | 2 +- 2 files changed, 96 insertions(+), 49 deletions(-) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index a345fdf..3123de0 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -47,7 +47,7 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { } fileMeta := types.File{ - ID: uid + "_" + file.Filename, + Name: file.Filename, Owner: uid, CreatedAt: time.Now(), Size: file.Size, @@ -58,66 +58,113 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { return } - c.JSON(200, gin.H{"message": "file uploaded successfully", "file_id": fileMeta.ID}) + c.JSON(200, gin.H{"message": "file uploaded successfully", "name": fileMeta.Name}) }) - api.DELETE("/delete", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { + // api.DELETE("/delete", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { + // claims := c.MustGet("claims").(jwt.MapClaims) + // user := claims["user"].(auth.User) + + // uid := user.ID + // if uid == "" { + // c.JSON(401, gin.H{"error": "unauthorized"}) + // return + // } + + // var response struct { + // Name string `json:"name" binding:"required"` + // ID string `json:"id" binding:"required"` + // } + + // if err := c.ShouldBindJSON(&response); err != nil { + // c.JSON(400, gin.H{"error": "name is required"}) + // return + // } + + // name := response.Name + // if name == "" { + // c.JSON(400, gin.H{"error": "name cannot be empty"}) + // return + // } + + // resID := response.ID + // if resID == "" { + // c.JSON(400, gin.H{"error": "id cannot be empty"}) + // return + // } + + // if resID != uid { + // c.JSON(403, gin.H{"error": "you can only delete your own files"}) + // return + // } + + // filePath := filepath.Join(cfg.ImagePath, uid, name) + // if err := os.Remove(filePath); err != nil { + // c.JSON(500, gin.H{"error": "failed to delete file"}) + // return + // } + + // if err := cfg.Database.Where("name = ?", name).Where("owner = ?", uid).Delete(&types.File{}).Error; err != nil { + // c.JSON(500, gin.H{"error": "failed to delete file metadata"}) + // return + // } + + // c.JSON(200, gin.H{"message": "file deleted successfully"}) + // }) + + api.DELETE("/:uid/:name", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { claims := c.MustGet("claims").(jwt.MapClaims) user := claims["user"].(auth.User) - uid := user.ID + uid := c.Param("uid") + uid = strings.TrimSpace(uid) if uid == "" { - c.JSON(401, gin.H{"error": "unauthorized"}) + c.JSON(400, gin.H{"error": "uid is required"}) return } - var response struct { - FileID string `json:"file_id" binding:"required"` - } - - if err := c.ShouldBindJSON(&response); err != nil { - c.JSON(400, gin.H{"error": "file_id is required"}) - return - } - - resfID := response.FileID - if resfID == "" { - c.JSON(400, gin.H{"error": "file_id cannot be empty"}) - return - } - - parts := strings.SplitN(resfID, "_", 2) - if len(parts) != 2 { - c.JSON(400, gin.H{"error": "invalid file_id format"}) - return - } - - fileID, filename := parts[0], parts[1] - if fileID != uid { + if uid != user.ID { c.JSON(403, gin.H{"error": "you can only delete your own files"}) return } - filePath := filepath.Join(cfg.ImagePath, uid, filename) - if err := os.Remove(filePath); err != nil { + filename := c.Param("name") + filename = strings.TrimSpace(filename) + if filename == "" { + c.JSON(400, gin.H{"error": "filename is required"}) + return + } + + path := filepath.Join(cfg.ImagePath, uid, filename) + if _, err := os.Stat(path); os.IsNotExist(err) { + c.JSON(404, gin.H{"error": "file not found"}) + return + } + + if err := os.Remove(path); err != nil { c.JSON(500, gin.H{"error": "failed to delete file"}) return } - - if err := cfg.Database.Where("id = ?", resfID).Delete(&types.File{}).Error; err != nil { + if err := cfg.Database.Where("owner = ? AND name = ?", uid, filename).Delete(&types.File{}).Error; err != nil { c.JSON(500, gin.H{"error": "failed to delete file metadata"}) return } - c.JSON(200, gin.H{"message": "file deleted successfully"}) }) - api.GET("/:name", func(c *gin.Context) { - name := c.Param("name") - name = strings.TrimSpace(name) + api.GET("/:uid/:name", func(c *gin.Context) { + uid := c.Param("uid") + uid = strings.TrimSpace(uid) + if uid == "" { + c.JSON(400, gin.H{"error": "uid is required"}) + return + } + + filename := c.Param("name") + filename = strings.TrimSpace(filename) safe := "" - for _, r := range name { + for _, r := range filename { if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') || (r >= '0' && r <= '9') || r == '_' || r == '.' || r == '-' { safe += string(r) @@ -125,19 +172,19 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { safe += "_" } } - name = safe + filename = safe - parts := strings.SplitN(name, "_", 2) - if len(parts) != 2 { - c.JSON(400, gin.H{"error": "invalid file name"}) - return - } + // parts := strings.SplitN(name, "_", 2) + // if len(parts) != 2 { + // c.JSON(400, gin.H{"error": "invalid file name"}) + // return + // } - uid, filename := parts[0], parts[1] - if uid == "" || filename == "" { - c.JSON(400, gin.H{"error": "invalid file name"}) - return - } + // uid, filename := parts[0], parts[1] + // if uid == "" || filename == "" { + // c.JSON(400, gin.H{"error": "invalid file name"}) + // return + // } path := filepath.Join(cfg.ImagePath, uid, filename) if _, err := os.Stat(path); err != nil { diff --git a/internal/types/types.go b/internal/types/types.go index abae4ee..9dd0178 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -25,7 +25,7 @@ type StereoConfig struct { } type File struct { - ID string `gorm:"primaryKey"` + Name string `gorm:"primaryKey"` Owner string `gorm:"not null;index"` Size int64 `gorm:"not null;type:bigint"` CreatedAt time.Time `gorm:"autoCreateTime"` From c844ab063bafeecdaf2db82a5dc0777c6d47051a Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Tue, 10 Jun 2025 00:30:40 +0100 Subject: [PATCH 27/39] remove dead code lmao --- internal/api/routes/files.go | 51 ------------------------------------ 1 file changed, 51 deletions(-) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index 3123de0..d45d4d5 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -61,57 +61,6 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { c.JSON(200, gin.H{"message": "file uploaded successfully", "name": fileMeta.Name}) }) - // api.DELETE("/delete", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { - // claims := c.MustGet("claims").(jwt.MapClaims) - // user := claims["user"].(auth.User) - - // uid := user.ID - // if uid == "" { - // c.JSON(401, gin.H{"error": "unauthorized"}) - // return - // } - - // var response struct { - // Name string `json:"name" binding:"required"` - // ID string `json:"id" binding:"required"` - // } - - // if err := c.ShouldBindJSON(&response); err != nil { - // c.JSON(400, gin.H{"error": "name is required"}) - // return - // } - - // name := response.Name - // if name == "" { - // c.JSON(400, gin.H{"error": "name cannot be empty"}) - // return - // } - - // resID := response.ID - // if resID == "" { - // c.JSON(400, gin.H{"error": "id cannot be empty"}) - // return - // } - - // if resID != uid { - // c.JSON(403, gin.H{"error": "you can only delete your own files"}) - // return - // } - - // filePath := filepath.Join(cfg.ImagePath, uid, name) - // if err := os.Remove(filePath); err != nil { - // c.JSON(500, gin.H{"error": "failed to delete file"}) - // return - // } - - // if err := cfg.Database.Where("name = ?", name).Where("owner = ?", uid).Delete(&types.File{}).Error; err != nil { - // c.JSON(500, gin.H{"error": "failed to delete file metadata"}) - // return - // } - - // c.JSON(200, gin.H{"message": "file deleted successfully"}) - // }) - api.DELETE("/:uid/:name", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { claims := c.MustGet("claims").(jwt.MapClaims) user := claims["user"].(auth.User) From 8c7b09b8d87325370ace9734aa185c31c2bd0892 Mon Sep 17 00:00:00 2001 From: hex Date: Sat, 14 Jun 2025 16:07:40 +0200 Subject: [PATCH 28/39] add docker stuff --- Dockerfile | 17 +++++++++++++++++ compose.yaml | 12 ++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 Dockerfile create mode 100644 compose.yaml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..007e603 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,17 @@ +FROM docker.io/golang:1.24.4-alpine3.22 as compiled + +WORKDIR /tmp/src + +# Copy the source code into the temp folder. +COPY . /tmp/src + +RUN go build -v -o /tmp/src/backend + +FROM alpine:latest AS run + +COPY --from=compiled /tmp/src/backend /usr/bin/backend + +WORKDIR /app + +ENV GIN_MODE=release +CMD ["/usr/bin/backend"] diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 0000000..861d28e --- /dev/null +++ b/compose.yaml @@ -0,0 +1,12 @@ +services: + seaweedfs: + container_name: seaweedfs + image: docker.io/chrislusf/seaweedfs + command: server -dir=/data + volume: + ./tmp:/data + ports: + - 9333:9333 + shell: + image: docker.io/alpine:latest + command: sh -c 'sleep 100000' From bb52442373e03c7f9cf90b56b5d5c8b0062e9de4 Mon Sep 17 00:00:00 2001 From: hex Date: Sat, 14 Jun 2025 17:48:05 +0200 Subject: [PATCH 29/39] feat: s3 support --- .env.example | 19 +++- go.mod | 11 +++ go.sum | 23 +++++ internal/api/routes/files.go | 164 ++++++++++++++++++++++------------- internal/types/types.go | 14 ++- main.go | 29 +++++-- 6 files changed, 187 insertions(+), 73 deletions(-) diff --git a/.env.example b/.env.example index 4fc749b..7a4a794 100644 --- a/.env.example +++ b/.env.example @@ -1,13 +1,26 @@ +# Path to store images IMAGE_PATH=/tmp -REDIRECT_URI=http://localhost:8081/api/auth/callback + +# URL to frontend FRONTEND_URI= + +# Domain (e.g. stereo.cat) DOMAIN= + +# Discord oAuth2 credentials +REDIRECT_URI=http://localhost:8081/api/auth/callback CLIENT_ID= CLIENT_SECRET= -FRONTEND_URI= -DOMAIN=localhost + +# Listening port PORT= +# S3 +S3_ENDPOINT= +S3_KEY= +S3_SECRET= +S3_BUCKET= + # can be either postgres or sqlite DATABASE_TYPE= diff --git a/go.mod b/go.mod index 72ef5f2..97c77aa 100644 --- a/go.mod +++ b/go.mod @@ -12,14 +12,18 @@ require ( github.com/bytedance/sonic v1.13.2 // indirect github.com/bytedance/sonic/loader v0.2.4 // indirect github.com/cloudwego/base64x v0.1.5 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/gabriel-vasile/mimetype v1.4.9 // indirect github.com/gin-contrib/sse v1.1.0 // indirect + github.com/go-ini/ini v1.67.0 // 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.26.0 // indirect github.com/goccy/go-json v0.10.5 // indirect + github.com/gofrs/uuid v4.4.0+incompatible // indirect github.com/golang-jwt/jwt/v5 v5.2.2 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/h2non/filetype v1.1.3 // 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.4 // indirect @@ -27,16 +31,23 @@ require ( 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/compress v1.18.0 // indirect github.com/klauspost/cpuid/v2 v2.2.10 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/lithammer/shortuuid/v4 v4.2.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-sqlite3 v1.14.28 // indirect + github.com/minio/crc64nvme v1.0.1 // indirect + github.com/minio/md5-simd v1.1.2 // indirect + github.com/minio/minio-go/v7 v7.0.93 // 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.2.4 // indirect + github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/rs/xid v1.6.0 // indirect + github.com/tinylib/msgp v1.3.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect golang.org/x/arch v0.16.0 // indirect diff --git a/go.sum b/go.sum index ce498a0..e3ca063 100644 --- a/go.sum +++ b/go.sum @@ -10,12 +10,16 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY= github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok= github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w= github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM= 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-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= +github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= 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= @@ -26,6 +30,8 @@ github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= +github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= @@ -33,6 +39,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg= +github.com/h2non/filetype v1.1.3/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY= 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= @@ -49,6 +57,9 @@ github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= 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/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= +github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= @@ -68,6 +79,12 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-sqlite3 v1.14.28 h1:ThEiQrnbtumT+QMknw63Befp/ce/nUPgBPMlRFEum7A= github.com/mattn/go-sqlite3 v1.14.28/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/minio/crc64nvme v1.0.1 h1:DHQPrYPdqK7jQG/Ls5CTBZWeex/2FMS3G5XGkycuFrY= +github.com/minio/crc64nvme v1.0.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg= +github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= +github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= +github.com/minio/minio-go/v7 v7.0.93 h1:lAB4QJp8Nq3vDMOU0eKgMuyBiEGMNlXQ5Glc8qAxqSU= +github.com/minio/minio-go/v7 v7.0.93/go.mod h1:71t2CqDt3ThzESgZUlU1rBN54mksGGlkLcFgguDnnAc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -75,12 +92,16 @@ 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.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= +github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c h1:dAMKvw0MlJT1GshSTtih8C2gDs04w8dReiOGXrGLNoY= +github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= 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/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= +github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= 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= @@ -91,6 +112,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/tinylib/msgp v1.3.0 h1:ULuf7GPooDaIlbyvgAxBV/FI7ynli6LZ1/nVUNu+0ww= +github.com/tinylib/msgp v1.3.0/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= 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= diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index d45d4d5..09a8cbb 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -1,17 +1,30 @@ package routes import ( - "os" - "path/filepath" + "bytes" + "io" + "log" "strings" "time" "github.com/gin-gonic/gin" + "github.com/gofrs/uuid" "github.com/golang-jwt/jwt/v5" + "github.com/h2non/filetype" + "github.com/minio/minio-go/v7" "stereo.cat/backend/internal/auth" "stereo.cat/backend/internal/types" ) +func getLengthFromReader(r io.Reader) (io.Reader, int64, error) { + buf, err := io.ReadAll(r) + if err != nil { + return nil, 0, err + } + + return io.NopCloser(bytes.NewBuffer(buf)), int64(len(buf)), nil +} + func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { api.POST("/upload", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { claims := c.MustGet("claims").(jwt.MapClaims) @@ -29,28 +42,32 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { return } - filePath := filepath.Join(cfg.ImagePath, uid, file.Filename) - - if err := os.MkdirAll(filepath.Dir(filePath), os.ModePerm); err != nil { - c.JSON(500, gin.H{"error": "failed to create directory"}) - return - } - - if err := c.SaveUploadedFile(file, filePath); err != nil { - c.JSON(500, gin.H{"error": "failed to save file"}) - return - } - if file.Size <= 0 { c.JSON(400, gin.H{"error": "file size must be greater than zero"}) return } + fileReader, err := file.Open() + + if err != nil { + c.JSON(500, gin.H{"error": "couldn't open file"}) + log.Println(err) + return + } + + fileType, err := filetype.MatchReader(fileReader) + + if err != nil { + c.JSON(500, gin.H{"error": "couldn't open file"}) + log.Println(err) + return + } + fileMeta := types.File{ - Name: file.Filename, Owner: uid, CreatedAt: time.Now(), Size: file.Size, + Extension: fileType.Extension, } if err := cfg.Database.Create(&fileMeta).Error; err != nil { @@ -58,10 +75,26 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { return } - c.JSON(200, gin.H{"message": "file uploaded successfully", "name": fileMeta.Name}) + newReader, length, err := getLengthFromReader(fileReader) + + if err != nil { + c.JSON(500, gin.H{"error": "couldn't open file"}) + log.Println(err) + return + } + + _, err = cfg.MinioClient.PutObject(cfg.Context, cfg.Bucket, fileMeta.ID.String(), newReader, length, minio.PutObjectOptions{ContentType: fileType.MIME.Value}) + + if err != nil { + c.JSON(500, gin.H{"error": "failed to upload file"}) + log.Println(err) + return + } + + c.JSON(200, gin.H{"message": "file uploaded successfully", "name": fileMeta.ID.String()}) }) - api.DELETE("/:uid/:name", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { + api.DELETE("/:id", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { claims := c.MustGet("claims").(jwt.MapClaims) user := claims["user"].(auth.User) @@ -77,70 +110,77 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { return } - filename := c.Param("name") - filename = strings.TrimSpace(filename) - if filename == "" { - c.JSON(400, gin.H{"error": "filename is required"}) - return - } - - path := filepath.Join(cfg.ImagePath, uid, filename) - if _, err := os.Stat(path); os.IsNotExist(err) { + fileID, err := uuid.FromString(strings.TrimSpace(c.Param("id"))) + if err != nil { c.JSON(404, gin.H{"error": "file not found"}) return } - if err := os.Remove(path); err != nil { + var file *types.File + + cfg.Database.First(&file, fileID) + + if file == nil { + c.JSON(404, gin.H{"error": "file not found"}) + return + } + + if err := cfg.MinioClient.RemoveObject(cfg.Context, cfg.Bucket, fileID.String(), minio.RemoveObjectOptions{}); err != nil { c.JSON(500, gin.H{"error": "failed to delete file"}) return } - if err := cfg.Database.Where("owner = ? AND name = ?", uid, filename).Delete(&types.File{}).Error; err != nil { + + if err := cfg.Database.Delete(&file).Error; err != nil { c.JSON(500, gin.H{"error": "failed to delete file metadata"}) return } + c.JSON(200, gin.H{"message": "file deleted successfully"}) }) - api.GET("/:uid/:name", func(c *gin.Context) { - uid := c.Param("uid") - uid = strings.TrimSpace(uid) - if uid == "" { - c.JSON(400, gin.H{"error": "uid is required"}) + api.GET("/:id", func(c *gin.Context) { + fileID := c.Param("id") + fileID = strings.TrimSpace(fileID) + + var file *types.File + + id, err := uuid.FromString(fileID) + if err != nil { + c.JSON(500, gin.H{"error": "invalid file id"}) + log.Println(err) return } - filename := c.Param("name") - filename = strings.TrimSpace(filename) + cfg.Database.First(&file, id) - safe := "" - for _, r := range filename { - if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') || - (r >= '0' && r <= '9') || r == '_' || r == '.' || r == '-' { - safe += string(r) - } else { - safe += "_" - } - } - filename = safe - - // parts := strings.SplitN(name, "_", 2) - // if len(parts) != 2 { - // c.JSON(400, gin.H{"error": "invalid file name"}) - // return - // } - - // uid, filename := parts[0], parts[1] - // if uid == "" || filename == "" { - // c.JSON(400, gin.H{"error": "invalid file name"}) - // return - // } - - path := filepath.Join(cfg.ImagePath, uid, filename) - if _, err := os.Stat(path); err != nil { - c.JSON(404, gin.H{"error": "file not found"}) + if file == nil { + c.JSON(500, gin.H{"error": "file does not exist"}) + log.Println(err) return } - c.File(path) + + object, err := cfg.MinioClient.GetObject(cfg.Context, cfg.Bucket, fileID, minio.GetObjectOptions{}) + if err != nil { + c.JSON(500, gin.H{"error": "failed to retrieve file"}) + log.Println(err) + return + } + + stat, err := object.Stat() + if err != nil { + c.JSON(500, gin.H{"error": "failed to retrieve file"}) + log.Println(err) + return + } + + fileType := filetype.GetType(file.Extension) + if err != nil { + c.JSON(500, gin.H{"error": "failed to retrieve file"}) + log.Println(err) + return + } + + c.DataFromReader(200, stat.Size, fileType.MIME.Value, object, nil) }) api.GET("/list", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { diff --git a/internal/types/types.go b/internal/types/types.go index 9dd0178..70ab2cb 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -1,9 +1,12 @@ package types import ( + "context" "time" "github.com/gin-gonic/gin" + "github.com/gofrs/uuid" + "github.com/minio/minio-go/v7" "gorm.io/gorm" "stereo.cat/backend/internal/auth/client" ) @@ -16,17 +19,26 @@ type Route struct { type StereoConfig struct { ImagePath string + Bucket string + MinioClient *minio.Client Router *gin.Engine Client client.Client Database *gorm.DB JWTSecret string FrontendUri string Domain string + Context context.Context } type File struct { - Name string `gorm:"primaryKey"` + ID uuid.UUID `gorm:"type:uuid;primaryKey"` Owner string `gorm:"not null;index"` Size int64 `gorm:"not null;type:bigint"` CreatedAt time.Time `gorm:"autoCreateTime"` + Extension string +} + +func (f *File) BeforeCreate(tx *gorm.DB) (err error) { + f.ID, err = uuid.NewV4() + return } diff --git a/main.go b/main.go index 5b58333..7d23b8f 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,7 @@ package main import ( + "context" "errors" "fmt" "log" @@ -8,6 +9,8 @@ import ( "github.com/gin-gonic/gin" "github.com/joho/godotenv" + "github.com/minio/minio-go/v7" + "github.com/minio/minio-go/v7/pkg/credentials" "gorm.io/driver/postgres" "gorm.io/driver/sqlite" "gorm.io/gorm" @@ -46,22 +49,34 @@ func main() { } } + minioClient, err := minio.New( + requireEnv("S3_ENDPOINT"), + &minio.Options{ + Creds: credentials.NewStaticV4(requireEnv("S3_KEY"), requireEnv("S3_SECRET"), ""), + Secure: true, + }, + ) + + if err != nil { + log.Fatal(err) + } + c := types.StereoConfig{ - Router: gin.Default(), - ImagePath: imagePath, + Router: gin.Default(), + MinioClient: minioClient, + Bucket: requireEnv("S3_BUCKET"), + Context: context.Background(), + ImagePath: imagePath, Client: client.New( requireEnv("REDIRECT_URI"), requireEnv("CLIENT_ID"), requireEnv("CLIENT_SECRET"), ), FrontendUri: requireEnv("FRONTEND_URI"), - Domain: requireEnv("DOMAIN"), - JWTSecret: requireEnv("JWT_SECRET"), + Domain: requireEnv("DOMAIN"), + JWTSecret: requireEnv("JWT_SECRET"), } - log.Println(c.Domain) - log.Println(c.FrontendUri) - switch databaseType { case "sqlite": db, err := gorm.Open(sqlite.Open(sqliteFile), &gorm.Config{}) From 018e0b45ed1ce17adacb8fce7e593a4d050b0739 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sat, 14 Jun 2025 17:19:24 +0100 Subject: [PATCH 30/39] yes --- internal/api/routes/auth.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/routes/auth.go b/internal/api/routes/auth.go index 90ef30f..3679710 100644 --- a/internal/api/routes/auth.go +++ b/internal/api/routes/auth.go @@ -44,7 +44,7 @@ func RegisterAuthRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { }) */ c.SetCookie("jwt", jwt, int(t.ExpiresIn), "", cfg.Domain, true, true) - c.Redirect(http.StatusTemporaryRedirect, cfg.FrontendUri) + c.Redirect(http.StatusTemporaryRedirect, cfg.FrontendUri+"?jwt_set=true") }) api.GET("/auth/me", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { From f348e7d40f19f072b0bebf1be54d78bf5fe42c21 Mon Sep 17 00:00:00 2001 From: hex Date: Sat, 14 Jun 2025 19:18:02 +0200 Subject: [PATCH 31/39] holy shit i FUCKING HATE golang io.Readers --- internal/api/routes/files.go | 50 +++++++++++------------------------- internal/types/types.go | 2 +- 2 files changed, 16 insertions(+), 36 deletions(-) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index 09a8cbb..3a3f48e 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -16,15 +16,11 @@ import ( "stereo.cat/backend/internal/types" ) -func getLengthFromReader(r io.Reader) (io.Reader, int64, error) { - buf, err := io.ReadAll(r) - if err != nil { - return nil, 0, err - } - - return io.NopCloser(bytes.NewBuffer(buf)), int64(len(buf)), nil +func intoReader(buf []byte) io.Reader { + return io.NopCloser(bytes.NewBuffer(buf)) } + func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { api.POST("/upload", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { claims := c.MustGet("claims").(jwt.MapClaims) @@ -48,14 +44,20 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { } fileReader, err := file.Open() - if err != nil { c.JSON(500, gin.H{"error": "couldn't open file"}) log.Println(err) return } - fileType, err := filetype.MatchReader(fileReader) + buf, err := io.ReadAll(fileReader) + if err != nil { + c.JSON(500, gin.H{"error": "couldn't open file"}) + log.Println(err) + return + } + + fileType, err := filetype.Match(buf) if err != nil { c.JSON(500, gin.H{"error": "couldn't open file"}) @@ -66,8 +68,8 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { fileMeta := types.File{ Owner: uid, CreatedAt: time.Now(), - Size: file.Size, - Extension: fileType.Extension, + Size: int64(len(buf)), + Mime: fileType.MIME.Value, } if err := cfg.Database.Create(&fileMeta).Error; err != nil { @@ -75,15 +77,7 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { return } - newReader, length, err := getLengthFromReader(fileReader) - - if err != nil { - c.JSON(500, gin.H{"error": "couldn't open file"}) - log.Println(err) - return - } - - _, err = cfg.MinioClient.PutObject(cfg.Context, cfg.Bucket, fileMeta.ID.String(), newReader, length, minio.PutObjectOptions{ContentType: fileType.MIME.Value}) + _, err = cfg.MinioClient.PutObject(cfg.Context, cfg.Bucket, fileMeta.ID.String(), intoReader(buf), fileMeta.Size, minio.PutObjectOptions{ContentType: fileMeta.Mime}) if err != nil { c.JSON(500, gin.H{"error": "failed to upload file"}) @@ -166,21 +160,7 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { return } - stat, err := object.Stat() - if err != nil { - c.JSON(500, gin.H{"error": "failed to retrieve file"}) - log.Println(err) - return - } - - fileType := filetype.GetType(file.Extension) - if err != nil { - c.JSON(500, gin.H{"error": "failed to retrieve file"}) - log.Println(err) - return - } - - c.DataFromReader(200, stat.Size, fileType.MIME.Value, object, nil) + c.DataFromReader(200, file.Size, file.Mime, object, nil) }) api.GET("/list", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { diff --git a/internal/types/types.go b/internal/types/types.go index 70ab2cb..eeb81c2 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -35,7 +35,7 @@ type File struct { Owner string `gorm:"not null;index"` Size int64 `gorm:"not null;type:bigint"` CreatedAt time.Time `gorm:"autoCreateTime"` - Extension string + Mime string } func (f *File) BeforeCreate(tx *gorm.DB) (err error) { From 09d8ffa82caee41413ec5d1329965cb00fcd1ae5 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sat, 14 Jun 2025 20:28:53 +0100 Subject: [PATCH 32/39] add name to file struct --- internal/api/routes/files.go | 4 ++-- internal/types/types.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index 3a3f48e..e827e17 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -20,7 +20,6 @@ func intoReader(buf []byte) io.Reader { return io.NopCloser(bytes.NewBuffer(buf)) } - func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { api.POST("/upload", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { claims := c.MustGet("claims").(jwt.MapClaims) @@ -67,6 +66,7 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { fileMeta := types.File{ Owner: uid, + Name: file.Filename, CreatedAt: time.Now(), Size: int64(len(buf)), Mime: fileType.MIME.Value, @@ -85,7 +85,7 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { return } - c.JSON(200, gin.H{"message": "file uploaded successfully", "name": fileMeta.ID.String()}) + c.JSON(200, gin.H{"message": "file uploaded successfully", "id": fileMeta.ID.String()}) }) api.DELETE("/:id", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { diff --git a/internal/types/types.go b/internal/types/types.go index eeb81c2..1c77dd6 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -32,6 +32,7 @@ type StereoConfig struct { type File struct { ID uuid.UUID `gorm:"type:uuid;primaryKey"` + Name string `gorm:"not null;index"` Owner string `gorm:"not null;index"` Size int64 `gorm:"not null;type:bigint"` CreatedAt time.Time `gorm:"autoCreateTime"` From c99c202bc859b4be1b03b6075d4fcbe259becdf9 Mon Sep 17 00:00:00 2001 From: hex Date: Sat, 14 Jun 2025 23:39:20 +0200 Subject: [PATCH 33/39] new error system (+ some quick fixes) --- internal/api/routes/files.go | 62 ++++++++++++++------------------- internal/types/errors.go | 66 ++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 36 deletions(-) create mode 100644 internal/types/errors.go diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index e827e17..74a0fd3 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -3,7 +3,6 @@ package routes import ( "bytes" "io" - "log" "strings" "time" @@ -27,40 +26,42 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { uid := user.ID if uid == "" { - c.JSON(401, gin.H{"error": "unauthorized"}) + types.ErrorInvalidParams.Throw(c, nil) return } file, err := c.FormFile("file") if err != nil { - c.JSON(400, gin.H{"error": "file is required"}) + types.ErrorInvalidParams.Throw(c, err) return } if file.Size <= 0 { - c.JSON(400, gin.H{"error": "file size must be greater than zero"}) + types.ErrorInvalidParams.Throw(c, nil) return } fileReader, err := file.Open() if err != nil { - c.JSON(500, gin.H{"error": "couldn't open file"}) - log.Println(err) + types.ErrorReaderOpen.Throw(c, err) return } buf, err := io.ReadAll(fileReader) if err != nil { - c.JSON(500, gin.H{"error": "couldn't open file"}) - log.Println(err) + types.ErrorReaderOpen.Throw(c, err) + return + } + + if !filetype.IsImage(buf) { + types.ErrorInvalidFile.Throw(c, nil) return } fileType, err := filetype.Match(buf) if err != nil { - c.JSON(500, gin.H{"error": "couldn't open file"}) - log.Println(err) + types.ErrorReaderOpen.Throw(c, err) return } @@ -73,15 +74,14 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { } if err := cfg.Database.Create(&fileMeta).Error; err != nil { - c.JSON(500, gin.H{"error": "failed to save file metadata"}) + types.ErrorDatabase.Throw(c, err) return } _, err = cfg.MinioClient.PutObject(cfg.Context, cfg.Bucket, fileMeta.ID.String(), intoReader(buf), fileMeta.Size, minio.PutObjectOptions{ContentType: fileMeta.Mime}) if err != nil { - c.JSON(500, gin.H{"error": "failed to upload file"}) - log.Println(err) + types.ErrorS3.Throw(c, err) return } @@ -92,21 +92,9 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { claims := c.MustGet("claims").(jwt.MapClaims) user := claims["user"].(auth.User) - uid := c.Param("uid") - uid = strings.TrimSpace(uid) - if uid == "" { - c.JSON(400, gin.H{"error": "uid is required"}) - return - } - - if uid != user.ID { - c.JSON(403, gin.H{"error": "you can only delete your own files"}) - return - } - fileID, err := uuid.FromString(strings.TrimSpace(c.Param("id"))) if err != nil { - c.JSON(404, gin.H{"error": "file not found"}) + types.ErrorInvalidFile.Throw(c, err) return } @@ -115,17 +103,22 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { cfg.Database.First(&file, fileID) if file == nil { - c.JSON(404, gin.H{"error": "file not found"}) + types.ErrorFileNotFound.Throw(c, nil) + return + } + + if file.Owner != user.ID { + types.ErrorUnauthorized.Throw(c, nil) return } if err := cfg.MinioClient.RemoveObject(cfg.Context, cfg.Bucket, fileID.String(), minio.RemoveObjectOptions{}); err != nil { - c.JSON(500, gin.H{"error": "failed to delete file"}) + types.ErrorS3.Throw(c, err) return } if err := cfg.Database.Delete(&file).Error; err != nil { - c.JSON(500, gin.H{"error": "failed to delete file metadata"}) + types.ErrorDatabase.Throw(c, err) return } @@ -140,23 +133,20 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { id, err := uuid.FromString(fileID) if err != nil { - c.JSON(500, gin.H{"error": "invalid file id"}) - log.Println(err) + types.ErrorInvalidFile.Throw(c, err) return } cfg.Database.First(&file, id) if file == nil { - c.JSON(500, gin.H{"error": "file does not exist"}) - log.Println(err) + types.ErrorFileNotFound.Throw(c, nil) return } object, err := cfg.MinioClient.GetObject(cfg.Context, cfg.Bucket, fileID, minio.GetObjectOptions{}) if err != nil { - c.JSON(500, gin.H{"error": "failed to retrieve file"}) - log.Println(err) + types.ErrorS3.Throw(c, err) return } @@ -169,7 +159,7 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { var files []types.File if err := cfg.Database.Where("owner = ?", user.ID).Find(&files).Error; err != nil { - c.JSON(500, gin.H{"error": "failed to retrieve files"}) + types.ErrorDatabase.Throw(c, err) return } diff --git a/internal/types/errors.go b/internal/types/errors.go new file mode 100644 index 0000000..3ed414e --- /dev/null +++ b/internal/types/errors.go @@ -0,0 +1,66 @@ +package types + +import ( + "errors" + "fmt" + + "github.com/gin-gonic/gin" +) + +type StereoError struct { + Code int + StatusCode int +} + +func (e *StereoError) Throw(c *gin.Context, err error) { + c.JSON(e.StatusCode, gin.H{ + "code": e.Code, + "success": false, + }) + + if err != nil { + c.Error(err) + } else { + c.Error(errors.New(fmt.Sprintf("Got an error with code: %v", e.Code))) + } +} + +var ErrorFileNotFound = StereoError{ + Code: 0, + StatusCode: 404, +} + +var ErrorReaderOpen = StereoError{ + Code: 1, + StatusCode: 500, +} + +var ErrorUnauthorized = StereoError{ + Code: 2, + StatusCode: 401, +} + +var ErrorInvalidParams = StereoError{ + Code: 3, + StatusCode: 400, +} + +var ErrorEmptyFile = StereoError{ + Code: 4, + StatusCode: 400, +} + +var ErrorInvalidFile = StereoError{ + Code: 5, + StatusCode: 400, +} + +var ErrorDatabase = StereoError{ + Code: 6, + StatusCode: 500, +} + +var ErrorS3 = StereoError{ + Code: 7, + StatusCode: 500, +} From e3049dddd987613126d781e5b332e6ee19e17667 Mon Sep 17 00:00:00 2001 From: grngxd <36968271+grngxd@users.noreply.github.com> Date: Sun, 15 Jun 2025 10:13:09 +0100 Subject: [PATCH 34/39] =?UTF-8?q?stop=20frontend=20crashing=20=F0=9F=98=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/api/routes/files.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index 74a0fd3..8accd1b 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -103,6 +103,11 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { cfg.Database.First(&file, fileID) if file == nil { + err := cfg.Database.Delete(&file).Error + if err != nil { + types.ErrorDatabase.Throw(c, err) + return + } types.ErrorFileNotFound.Throw(c, nil) return } @@ -149,6 +154,10 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { types.ErrorS3.Throw(c, err) return } + if _, err := object.Stat(); err != nil { + types.ErrorFileNotFound.Throw(c, err) + return + } c.DataFromReader(200, file.Size, file.Mime, object, nil) }) From a6a02d352135c613d9dde7d4af57b830478fc9b3 Mon Sep 17 00:00:00 2001 From: hex Date: Sun, 15 Jun 2025 12:09:55 +0200 Subject: [PATCH 35/39] some cleaning up --- internal/api/routes/auth.go | 6 +++--- internal/api/routes/files.go | 18 +++++++----------- internal/auth/{ => token}/jwt.go | 23 ++++++++++------------- internal/types/errors.go | 5 +++++ 4 files changed, 25 insertions(+), 27 deletions(-) rename internal/auth/{ => token}/jwt.go (75%) diff --git a/internal/api/routes/auth.go b/internal/api/routes/auth.go index 3679710..38a85b2 100644 --- a/internal/api/routes/auth.go +++ b/internal/api/routes/auth.go @@ -5,7 +5,7 @@ import ( "time" "github.com/gin-gonic/gin" - "stereo.cat/backend/internal/auth" + "stereo.cat/backend/internal/auth/token" "stereo.cat/backend/internal/types" ) @@ -25,7 +25,7 @@ func RegisterAuthRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { panic(err) } - jwt, err := auth.GenerateJWT(cfg.JWTSecret, user, uint64(time.Now().Add(time.Second*time.Duration(t.ExpiresIn)).Unix())) + jwt, err := token.GenerateJWT(cfg.JWTSecret, user, uint64(time.Now().Add(time.Second*time.Duration(t.ExpiresIn)).Unix())) if err != nil { panic(err) @@ -47,7 +47,7 @@ func RegisterAuthRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { c.Redirect(http.StatusTemporaryRedirect, cfg.FrontendUri+"?jwt_set=true") }) - api.GET("/auth/me", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { + api.GET("/auth/me", token.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { claims, _ := c.Get("claims") c.JSON(http.StatusOK, claims) }) diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index 8accd1b..5c046ed 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -12,6 +12,7 @@ import ( "github.com/h2non/filetype" "github.com/minio/minio-go/v7" "stereo.cat/backend/internal/auth" + "stereo.cat/backend/internal/auth/token" "stereo.cat/backend/internal/types" ) @@ -20,7 +21,7 @@ func intoReader(buf []byte) io.Reader { } func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { - api.POST("/upload", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { + api.POST("/upload", token.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { claims := c.MustGet("claims").(jwt.MapClaims) user := claims["user"].(auth.User) @@ -88,7 +89,7 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { c.JSON(200, gin.H{"message": "file uploaded successfully", "id": fileMeta.ID.String()}) }) - api.DELETE("/:id", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { + api.DELETE("/:id", token.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { claims := c.MustGet("claims").(jwt.MapClaims) user := claims["user"].(auth.User) @@ -100,15 +101,10 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { var file *types.File - cfg.Database.First(&file, fileID) + err = cfg.Database.First(&file, fileID).Error - if file == nil { - err := cfg.Database.Delete(&file).Error - if err != nil { - types.ErrorDatabase.Throw(c, err) - return - } - types.ErrorFileNotFound.Throw(c, nil) + if err != nil { + types.ErrorFileNotFound.Throw(c, err) return } @@ -162,7 +158,7 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { c.DataFromReader(200, file.Size, file.Mime, object, nil) }) - api.GET("/list", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { + api.GET("/list", token.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { claims := c.MustGet("claims").(jwt.MapClaims) user := claims["user"].(auth.User) diff --git a/internal/auth/jwt.go b/internal/auth/token/jwt.go similarity index 75% rename from internal/auth/jwt.go rename to internal/auth/token/jwt.go index 7f21182..e98e376 100644 --- a/internal/auth/jwt.go +++ b/internal/auth/token/jwt.go @@ -1,17 +1,18 @@ -package auth +package token import ( "encoding/json" "fmt" - "net/http" "strings" "github.com/gin-gonic/gin" "github.com/golang-jwt/jwt/v5" + "stereo.cat/backend/internal/auth" + "stereo.cat/backend/internal/types" ) -func GenerateJWT(key string, user User, expiryTimestamp uint64) (string, error) { - claims := Claims{ +func GenerateJWT(key string, user auth.User, expiryTimestamp uint64) (string, error) { + claims := auth.Claims{ User: user, Exp: expiryTimestamp, } @@ -20,10 +21,6 @@ func GenerateJWT(key string, user User, expiryTimestamp uint64) (string, error) return token.SignedString([]byte(key)) } -func invalidAuth(c *gin.Context) { - c.String(http.StatusUnauthorized, "Unauthorized.") - c.Abort() -} func JwtMiddleware(secret string) gin.HandlerFunc { return func(c *gin.Context) { @@ -33,7 +30,7 @@ func JwtMiddleware(secret string) gin.HandlerFunc { jwtSplit := strings.Split(c.GetHeader("Authorization"), " ") if len(jwtSplit) < 2 || jwtSplit[0] != "Bearer" { - invalidAuth(c) + types.ErrorUnauthorized.Throw(c, nil) return } @@ -42,21 +39,21 @@ func JwtMiddleware(secret string) gin.HandlerFunc { claims, err := ValidateJWT(jwt, secret) if err != nil { - invalidAuth(c) + types.ErrorUnauthorized.Throw(c, err) return } if userClaims, ok := claims["user"].(map[string]interface{}); ok { userJSON, err := json.Marshal(userClaims) // Convert map to JSON if err != nil { - invalidAuth(c) + types.ErrorUnauthorized.Throw(c, err) return } - var user User + var user auth.User err = json.Unmarshal(userJSON, &user) if err != nil { - invalidAuth(c) + types.ErrorUserNotFound.Throw(c, err) return } diff --git a/internal/types/errors.go b/internal/types/errors.go index 3ed414e..5dd84e3 100644 --- a/internal/types/errors.go +++ b/internal/types/errors.go @@ -64,3 +64,8 @@ var ErrorS3 = StereoError{ Code: 7, StatusCode: 500, } + +var ErrorUserNotFound = StereoError{ + Code: 8, + StatusCode: 404, +} From 25cdfd5b9af370806849e45bfd75f944760a77e8 Mon Sep 17 00:00:00 2001 From: hex Date: Sun, 15 Jun 2025 12:20:07 +0200 Subject: [PATCH 36/39] better readme --- README.md | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2c2667c..4f0f8f9 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,22 @@ -# stereo.cat backend +# stereo.cat backend! -written in Go, uses Gin. +## Introduction +This is the backend that is supposed to glue together our frontend with our database & S3. + +## Technologies +* Golang (1.24.2+) (worst mistake of our entire lives) +* Gin (web framework) +* Gorm (database ORM) +* MinIO S3 SDK (for storing images) -## database shit +## Contributing +1. Make sure you test your PR before submitting. +2. Make sure that it works everywhere. +3. Format your code, make it look nice :D +4. Make sure to add an explanation. -Instead of using Discord oAuth as a database, we instead use it as a login source, only using it to source a username/id, avatar data and a secure login/registration flow. -We store these attributes alongside stereo.cat specific attributes in our own database. There is a trade-off however: this means that avatar & username data is not updated in real-time, only when the oauth flow is executed. +To generate a patch file, first commit your changes and then do: +```bash +git format-patch -1 HEAD +``` +Patches can be sent to hex@iwakura.rip. From c4bad54fe1baec6154efacdac12ba7d218f9e5d0 Mon Sep 17 00:00:00 2001 From: hex Date: Sun, 15 Jun 2025 12:53:27 +0200 Subject: [PATCH 37/39] Add License --- Dockerfile | 15 + LICENSE | 675 +++++++++++++++++++++++++++++++++ README.md | 3 + internal/api/api.go | 17 + internal/api/routes/auth.go | 17 + internal/api/routes/files.go | 17 + internal/auth/client/client.go | 17 + internal/auth/token/jwt.go | 17 + internal/auth/types.go | 17 + internal/types/errors.go | 16 + internal/types/types.go | 17 + main.go | 17 + 12 files changed, 845 insertions(+) create mode 100644 LICENSE diff --git a/Dockerfile b/Dockerfile index 007e603..4a18265 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,18 @@ +# Copyright (C) 2025 hexlocation (hex@iwakura.rip) & grngxd (grng@iwakura.rip) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + FROM docker.io/golang:1.24.4-alpine3.22 as compiled WORKDIR /tmp/src diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..53d1f3d --- /dev/null +++ b/LICENSE @@ -0,0 +1,675 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + diff --git a/README.md b/README.md index 4f0f8f9..3b2a11a 100644 --- a/README.md +++ b/README.md @@ -20,3 +20,6 @@ To generate a patch file, first commit your changes and then do: git format-patch -1 HEAD ``` Patches can be sent to hex@iwakura.rip. + +## License +This project is licensed under the GPLv3, as can be seen in the LICENSE file distributed alongside this project. diff --git a/internal/api/api.go b/internal/api/api.go index bb61ef1..8b5b7e9 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -1,3 +1,20 @@ +/* + Copyright (C) 2025 hexlocation (hex@iwakura.rip) & grngxd (grng@iwakura.rip) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + package api import ( diff --git a/internal/api/routes/auth.go b/internal/api/routes/auth.go index 38a85b2..fdc79bb 100644 --- a/internal/api/routes/auth.go +++ b/internal/api/routes/auth.go @@ -1,3 +1,20 @@ +/* + Copyright (C) 2025 hexlocation (hex@iwakura.rip) & grngxd (grng@iwakura.rip) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + package routes import ( diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index 5c046ed..98145ef 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -1,3 +1,20 @@ +/* + Copyright (C) 2025 hexlocation (hex@iwakura.rip) & grngxd (grng@iwakura.rip) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + package routes import ( diff --git a/internal/auth/client/client.go b/internal/auth/client/client.go index 661ee7a..b720cdd 100644 --- a/internal/auth/client/client.go +++ b/internal/auth/client/client.go @@ -1,3 +1,20 @@ +/* + Copyright (C) 2025 hexlocation (hex@iwakura.rip) & grngxd (grng@iwakura.rip) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + package client import ( diff --git a/internal/auth/token/jwt.go b/internal/auth/token/jwt.go index e98e376..628cb92 100644 --- a/internal/auth/token/jwt.go +++ b/internal/auth/token/jwt.go @@ -1,3 +1,20 @@ +/* + Copyright (C) 2025 hexlocation (hex@iwakura.rip) & grngxd (grng@iwakura.rip) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + package token import ( diff --git a/internal/auth/types.go b/internal/auth/types.go index 361cebe..8b42642 100644 --- a/internal/auth/types.go +++ b/internal/auth/types.go @@ -1,3 +1,20 @@ +/* + Copyright (C) 2025 hexlocation (hex@iwakura.rip) & grngxd (grng@iwakura.rip) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + package auth import ( diff --git a/internal/types/errors.go b/internal/types/errors.go index 5dd84e3..ec42289 100644 --- a/internal/types/errors.go +++ b/internal/types/errors.go @@ -1,3 +1,19 @@ +/* + Copyright (C) 2025 hexlocation (hex@iwakura.rip) & grngxd (grng@iwakura.rip) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ package types import ( diff --git a/internal/types/types.go b/internal/types/types.go index 1c77dd6..535be51 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -1,3 +1,20 @@ +/* + Copyright (C) 2025 hexlocation (hex@iwakura.rip) & grngxd (grng@iwakura.rip) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + package types import ( diff --git a/main.go b/main.go index 7d23b8f..bf5eb73 100644 --- a/main.go +++ b/main.go @@ -1,3 +1,20 @@ +/* + Copyright (C) 2025 hexlocation (hex@iwakura.rip) & grngxd (grng@iwakura.rip) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + package main import ( From c95707b08daec7ff2bbe0513f5c792cb17b30f25 Mon Sep 17 00:00:00 2001 From: hex Date: Sun, 15 Jun 2025 12:55:39 +0200 Subject: [PATCH 38/39] there we go --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 3b2a11a..aa8628f 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,9 @@ This is the backend that is supposed to glue together our frontend with our data 2. Make sure that it works everywhere. 3. Format your code, make it look nice :D 4. Make sure to add an explanation. +5. Make sure that your commit and any dependencies you add do not contain malicious code. This will be checked by maintainers. +6. Make sure that your commit follows the license of this project (GPLv3) +7. Make sure to add a license header, as can be seen in main.go to any new files in your commit. To generate a patch file, first commit your changes and then do: ```bash From 128e19759e23bc2464eee23827757800b4711927 Mon Sep 17 00:00:00 2001 From: hex Date: Sun, 15 Jun 2025 13:00:42 +0200 Subject: [PATCH 39/39] disclaimer --- LICENSE | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/LICENSE b/LICENSE index 53d1f3d..d0cc89b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,7 @@ +This license was added at commit c4bad54f, but it applies to the +entire history of this project prior to commit c4bad54f aswell. +===================================================================== + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007