diff --git a/app/app.go b/app/app.go index 2b1e150..f811901 100644 --- a/app/app.go +++ b/app/app.go @@ -15,16 +15,18 @@ type App struct { Database types.Database Cache types.CachingServer Service types.Services + Storage types.Storage Logger *logger.AggregatedLogger Mail *email.SmtpServer } -func NewClientServer(addr string, handler http.Handler, logger logger.AggregatedLogger, database types.Database, cache types.CachingServer, service types.Services, mail email.SmtpServer) App { +func NewClientServer(addr string, handler http.Handler, logger logger.AggregatedLogger, database types.Database, cache types.CachingServer, storage types.Storage, service types.Services, mail email.SmtpServer) App { return App{ Server: http.Server{ Addr: addr, Handler: handler, }, + Storage: storage, Logger: &logger, Database: database, Cache: cache, diff --git a/go.mod b/go.mod index 64fd1bb..8922f74 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,10 @@ go 1.23.1 require ( github.com/a-h/templ v0.2.778 + github.com/aws/aws-sdk-go v1.55.5 + github.com/aws/aws-sdk-go-v2 v1.30.5 + github.com/aws/aws-sdk-go-v2/config v1.27.35 + github.com/aws/aws-sdk-go-v2/service/s3 v1.62.0 github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 github.com/joho/godotenv v1.5.1 @@ -11,7 +15,7 @@ require ( github.com/shirou/gopsutil/v3 v3.24.5 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/xlzd/gotp v0.1.0 - golang.org/x/crypto v0.24.0 + golang.org/x/crypto v0.26.0 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gorm.io/driver/mysql v1.5.7 gorm.io/driver/postgres v1.5.9 @@ -20,24 +24,49 @@ require ( require ( filippo.io/edwards25519 v1.1.0 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.33 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.22.8 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.30.8 // indirect + github.com/aws/smithy-go v1.20.4 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/go-ini/ini v1.67.0 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-sql-driver/mysql v1.8.1 // indirect + github.com/goccy/go-json v0.10.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.6.0 // indirect github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect + github.com/minio/md5-simd v1.1.2 // indirect + github.com/minio/minio-go/v7 v7.0.76 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/rs/xid v1.6.0 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect + golang.org/x/net v0.28.0 // indirect golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.23.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/text v0.17.0 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect ) diff --git a/go.sum b/go.sum index dd59194..1bd4963 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,44 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/a-h/templ v0.2.778 h1:VzhOuvWECrwOec4790lcLlZpP4Iptt5Q4K9aFxQmtaM= github.com/a-h/templ v0.2.778/go.mod h1:lq48JXoUvuQrU0VThrK31yFwdRjTCnIE5bcPCM9IP1w= +github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= +github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/aws/aws-sdk-go-v2 v1.30.5 h1:mWSRTwQAb0aLE17dSzztCVJWI9+cRMgqebndjwDyK0g= +github.com/aws/aws-sdk-go-v2 v1.30.5/go.mod h1:CT+ZPWXbYrci8chcARI3OmI/qgd+f6WtuLOoaIA8PR0= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 h1:70PVAiL15/aBMh5LThwgXdSQorVr91L127ttckI9QQU= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4/go.mod h1:/MQxMqci8tlqDH+pjmoLu1i0tbWCUP1hhyMRuFxpQCw= +github.com/aws/aws-sdk-go-v2/config v1.27.35 h1:jeFgiWYNV0vrgdZqB4kZBjYNdy0IKkwrAjr2fwpHIig= +github.com/aws/aws-sdk-go-v2/config v1.27.35/go.mod h1:qnpEvTq8ZfjrCqmJGRfWZuF+lGZ/vG8LK2K0L/TY1gQ= +github.com/aws/aws-sdk-go-v2/credentials v1.17.33 h1:lBHAQQznENv0gLHAZ73ONiTSkCtr8q3pSqWrpbBBZz0= +github.com/aws/aws-sdk-go-v2/credentials v1.17.33/go.mod h1:MBuqCUOT3ChfLuxNDGyra67eskx7ge9e3YKYBce7wpI= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 h1:pfQ2sqNpMVK6xz2RbqLEL0GH87JOwSxPV2rzm8Zsb74= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13/go.mod h1:NG7RXPUlqfsCLLFfi0+IpKN4sCB9D9fw/qTaSB+xRoU= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 h1:pI7Bzt0BJtYA0N/JEC6B8fJ4RBrEMi1LBrkMdFYNSnQ= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17/go.mod h1:Dh5zzJYMtxfIjYW+/evjQ8uj2OyR/ve2KROHGHlSFqE= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 h1:Mqr/V5gvrhA2gvgnF42Zh5iMiQNcOYthFYwCyrnuWlc= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17/go.mod h1:aLJpZlCmjE+V+KtN1q1uyZkfnUWpQGpbsn89XPKyzfU= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17 h1:Roo69qTpfu8OlJ2Tb7pAYVuF0CpuUMB0IYWwYP/4DZM= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17/go.mod h1:NcWPxQzGM1USQggaTVwz6VpqMZPX1CvDJLDh6jnOCa4= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 h1:KypMCbLPPHEmf9DgMGw51jMj77VfGPAN2Kv4cfhlfgI= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4/go.mod h1:Vz1JQXliGcQktFTN/LN6uGppAIRoLBR2bMvIMP0gOjc= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19 h1:FLMkfEiRjhgeDTCjjLoc3URo/TBkgeQbocA78lfkzSI= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19/go.mod h1:Vx+GucNSsdhaxs3aZIKfSUjKVGsxN25nX2SRcdhuw08= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 h1:rfprUlsdzgl7ZL2KlXiUAoJnI/VxfHCvDFr2QDFj6u4= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19/go.mod h1:SCWkEdRq8/7EK60NcvvQ6NXKuTcchAD4ROAsC37VEZE= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17 h1:u+EfGmksnJc/x5tq3A+OD7LrMbSSR/5TrKLvkdy/fhY= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17/go.mod h1:VaMx6302JHax2vHJWgRo+5n9zvbacs3bLU/23DNQrTY= +github.com/aws/aws-sdk-go-v2/service/s3 v1.62.0 h1:rd/aA3iDq1q7YsL5sc4dEwChutH7OZF9Ihfst6pXQzI= +github.com/aws/aws-sdk-go-v2/service/s3 v1.62.0/go.mod h1:5FmD/Dqq57gP+XwaUnd5WFPipAuzrf0HmupX27Gvjvc= +github.com/aws/aws-sdk-go-v2/service/sso v1.22.8 h1:JRwuL+S1Qe1owZQoxblV7ORgRf2o0SrtzDVIbaVCdQ0= +github.com/aws/aws-sdk-go-v2/service/sso v1.22.8/go.mod h1:eEygMHnTKH/3kNp9Jr1n3PdejuSNcgwLe1dWgQtO0VQ= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8 h1:+HpGETD9463PFSj7lX5+eq7aLDs85QUIA+NBkeAsscA= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8/go.mod h1:bCbAxKDqNvkHxRaIMnyVPXPo+OaPRwvmgzMxbz1VKSA= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.8 h1:bAi+4p5EKnni+jrfcAhb7iHFQ24bthOAV9t0taf3DCE= +github.com/aws/aws-sdk-go-v2/service/sts v1.30.8/go.mod h1:NXi1dIAGteSaRLqYgarlhP/Ij0cFT+qmCwiJqWh/U5o= +github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4= +github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= @@ -13,11 +51,17 @@ 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/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +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/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= +github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= +github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= +github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -37,16 +81,31 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= +github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +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.76 h1:9nxHH2XDai61cT/EFhyIw/wW4vJfpPNvl7lSFpRt+Ng= +github.com/minio/minio-go/v7 v7.0.76/go.mod h1:AVM3IUN6WwKzmwBxVdjzhH8xq+f57JSbbvzqvUzR6eg= 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/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4= github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA= +github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= +github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= @@ -70,22 +129,33 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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/handler/file/delete/delete.go b/handler/file/delete/delete.go index da4f1a5..076077b 100644 --- a/handler/file/delete/delete.go +++ b/handler/file/delete/delete.go @@ -1,11 +1,10 @@ package deleteHandler import ( + "fmt" "github.com/fossyy/filekeeper/app" "github.com/fossyy/filekeeper/types" "net/http" - "os" - "path/filepath" ) func DELETE(w http.ResponseWriter, r *http.Request) { @@ -30,11 +29,7 @@ func DELETE(w http.ResponseWriter, r *http.Request) { return } - uploadDir := "uploads" - currentDir, _ := os.Getwd() - basePath := filepath.Join(currentDir, uploadDir) - fileFolder := filepath.Join(basePath, file.OwnerID.String(), file.ID.String()) - err = os.RemoveAll(fileFolder) + err = app.Server.Storage.Delete(r.Context(), fmt.Sprintf("%s/%s", file.OwnerID.String(), file.ID.String())) if err != nil { w.WriteHeader(http.StatusInternalServerError) return diff --git a/handler/file/download/download.go b/handler/file/download/download.go index 66d3b2c..5bb5233 100644 --- a/handler/file/download/download.go +++ b/handler/file/download/download.go @@ -1,14 +1,12 @@ package downloadHandler import ( + "context" "fmt" "github.com/fossyy/filekeeper/app" "github.com/fossyy/filekeeper/session" "github.com/fossyy/filekeeper/types/models" - "io" "net/http" - "os" - "path/filepath" "strconv" "strings" ) @@ -33,16 +31,16 @@ func GET(w http.ResponseWriter, r *http.Request) { } } - uploadDir := "uploads" - currentDir, _ := os.Getwd() - basePath := filepath.Join(currentDir, uploadDir) - saveFolder := filepath.Join(basePath, file.OwnerID.String(), file.ID.String()) - - if filepath.Dir(saveFolder) != filepath.Join(basePath, file.OwnerID.String()) { - http.Error(w, "Invalid Path", http.StatusInternalServerError) - app.Server.Logger.Error("invalid path") - return - } + //uploadDir := "uploads" + //currentDir, _ := os.Getwd() + //basePath := filepath.Join(currentDir, uploadDir) + //saveFolder := filepath.Join(basePath, file.OwnerID.String(), file.ID.String()) + // + //if filepath.Dir(saveFolder) != filepath.Join(basePath, file.OwnerID.String()) { + // http.Error(w, "Invalid Path", http.StatusInternalServerError) + // app.Server.Logger.Error("invalid path") + // return + //} rangeHeader := r.Header.Get("Range") if rangeHeader != "" { @@ -69,7 +67,7 @@ func GET(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", start, end, file.Size)) w.Header().Set("Content-Length", fmt.Sprintf("%d", end-start+1)) w.WriteHeader(http.StatusPartialContent) - sendFileChunk(w, saveFolder, file, start, end) + sendFileChunk(w, file, start, end) return } } @@ -79,11 +77,11 @@ func GET(w http.ResponseWriter, r *http.Request) { w.Header().Set("Accept-Ranges", "bytes") w.Header().Set("Content-Length", fmt.Sprintf("%d", file.Size)) - sendFileChunk(w, saveFolder, file, 0, int64(file.Size-1)) + sendFileChunk(w, file, 0, int64(file.Size-1)) return } -func sendFileChunk(w http.ResponseWriter, saveFolder string, file *models.File, start, end int64) { +func sendFileChunk(w http.ResponseWriter, file *models.File, start, end int64) { chunkSize := int64(2 * 1024 * 1024) startChunk := start / chunkSize @@ -93,64 +91,39 @@ func sendFileChunk(w http.ResponseWriter, saveFolder string, file *models.File, endOffset := end % chunkSize for i := startChunk; i <= endChunk; i++ { - chunkPath := filepath.Join(saveFolder, fmt.Sprintf("chunk_%d", i)) - chunkFile, err := os.Open(chunkPath) + chunkKey := fmt.Sprintf("%s/%s/chunk_%d", file.OwnerID.String(), file.ID.String(), i) + chunkData, err := app.Server.Storage.Get(context.TODO(), chunkKey) if err != nil { - http.Error(w, fmt.Sprintf("Error opening chunk: %v", err), http.StatusInternalServerError) - app.Server.Logger.Error(err.Error()) - return - } - defer chunkFile.Close() - - var chunkStart, chunkEnd int64 - if i == startChunk { - chunkStart = startOffset - } else { - chunkStart = 0 - } - if i == endChunk { - chunkEnd = endOffset - } else { - chunkEnd = chunkSize - 1 - } - - _, err = chunkFile.Seek(chunkStart, io.SeekStart) - if err != nil { - http.Error(w, fmt.Sprintf("Error seeking chunk: %v", err), http.StatusInternalServerError) + http.Error(w, fmt.Sprintf("Error retrieving chunk: %v", err), http.StatusInternalServerError) app.Server.Logger.Error(err.Error()) return } - buffer := make([]byte, 2048) - toSend := chunkEnd - chunkStart + 1 - for toSend > 0 { - n, err := chunkFile.Read(buffer) - if err != nil && err != io.EOF { - http.Error(w, fmt.Sprintf("Error reading chunk: %v", err), http.StatusInternalServerError) - app.Server.Logger.Error(err.Error()) - return - } - if n == 0 { - break - } - if int64(n) > toSend { - n = int(toSend) - } - _, err = w.Write(buffer[:n]) + var dataToSend []byte + if i == startChunk && i == endChunk { + dataToSend = chunkData[startOffset : endOffset+1] + } else if i == startChunk { + dataToSend = chunkData[startOffset:] + } else if i == endChunk { + dataToSend = chunkData[:endOffset+1] + } else { + dataToSend = chunkData + } + + _, err = w.Write(dataToSend) + if err != nil { + http.Error(w, fmt.Sprintf("Error writing chunk: %v", err), http.StatusInternalServerError) + app.Server.Logger.Error(err.Error()) + return + } + + if i == int64(file.TotalChunk)-1 { + err := app.Server.Database.IncrementDownloadCount(file.ID.String()) if err != nil { - http.Error(w, fmt.Sprintf("Error writing chunk: %v", err), http.StatusInternalServerError) + http.Error(w, fmt.Sprintf("Error updating download count: %v", err), http.StatusInternalServerError) app.Server.Logger.Error(err.Error()) return } - toSend -= int64(n) - if i == int64(file.TotalChunk)-1 && toSend == 0 { - err := app.Server.Database.IncrementDownloadCount(file.ID.String()) - if err != nil { - http.Error(w, fmt.Sprintf("Error writing chunk: %v", err), http.StatusInternalServerError) - app.Server.Logger.Error(err.Error()) - return - } - } } } } diff --git a/handler/file/file.go b/handler/file/file.go index 8ea8978..f92856e 100644 --- a/handler/file/file.go +++ b/handler/file/file.go @@ -8,7 +8,6 @@ import ( "github.com/fossyy/filekeeper/utils" fileView "github.com/fossyy/filekeeper/view/client/file" "net/http" - "path/filepath" "strconv" ) @@ -23,12 +22,16 @@ func GET(w http.ResponseWriter, r *http.Request) { var filesData []types.FileData for _, file := range files { - saveFolder := filepath.Join("uploads", userSession.UserID.String(), file.ID.String()) + prefix := fmt.Sprintf("%s/%s/chunk_", file.OwnerID.String(), file.ID.String()) - pattern := fmt.Sprintf("%s/chunk_*", saveFolder) - chunkFiles, err := filepath.Glob(pattern) + existingChunks, err := app.Server.Storage.ListObjects(r.Context(), prefix) + if err != nil { + app.Server.Logger.Error(err.Error()) + w.WriteHeader(http.StatusInternalServerError) + return + } - missingChunk := err != nil || len(chunkFiles) != int(file.TotalChunk) + missingChunk := len(existingChunks) != int(file.TotalChunk) filesData = append(filesData, types.FileData{ ID: file.ID.String(), diff --git a/handler/file/query/query.go b/handler/file/query/query.go index 18df543..8e3d098 100644 --- a/handler/file/query/query.go +++ b/handler/file/query/query.go @@ -7,7 +7,6 @@ import ( "github.com/fossyy/filekeeper/utils" fileView "github.com/fossyy/filekeeper/view/client/file" "net/http" - "path/filepath" "strconv" ) @@ -16,6 +15,7 @@ func GET(w http.ResponseWriter, r *http.Request) { query := r.URL.Query().Get("q") status := r.URL.Query().Get("status") var fileStatus types.FileStatus + if status == "private" { fileStatus = types.Private } else if status == "public" { @@ -23,6 +23,7 @@ func GET(w http.ResponseWriter, r *http.Request) { } else { fileStatus = types.All } + files, err := app.Server.Database.GetFiles(userSession.UserID.String(), query, fileStatus) if err != nil { app.Server.Logger.Error(err.Error()) @@ -33,12 +34,16 @@ func GET(w http.ResponseWriter, r *http.Request) { var filesData []types.FileData for _, file := range files { - saveFolder := filepath.Join("uploads", userSession.UserID.String(), file.ID.String()) + prefix := fmt.Sprintf("%s/%s/chunk_", file.OwnerID.String(), file.ID.String()) - pattern := fmt.Sprintf("%s/chunk_*", saveFolder) - chunkFiles, err := filepath.Glob(pattern) + existingChunks, err := app.Server.Storage.ListObjects(r.Context(), prefix) + if err != nil { + app.Server.Logger.Error(err.Error()) + w.WriteHeader(http.StatusInternalServerError) + return + } - missingChunk := err != nil || len(chunkFiles) != int(file.TotalChunk) + missingChunk := len(existingChunks) != int(file.TotalChunk) filesData = append(filesData, types.FileData{ ID: file.ID.String(), @@ -62,5 +67,4 @@ func GET(w http.ResponseWriter, r *http.Request) { } w.WriteHeader(http.StatusForbidden) - return } diff --git a/handler/file/rename/rename.go b/handler/file/rename/rename.go index 7a61e30..d811ae6 100644 --- a/handler/file/rename/rename.go +++ b/handler/file/rename/rename.go @@ -7,7 +7,6 @@ import ( "github.com/fossyy/filekeeper/utils" fileView "github.com/fossyy/filekeeper/view/client/file" "net/http" - "path/filepath" "strconv" ) @@ -38,11 +37,16 @@ func PATCH(w http.ResponseWriter, r *http.Request) { return } - saveFolder := filepath.Join("uploads", userSession.UserID.String(), file.ID.String()) - pattern := fmt.Sprintf("%s/chunk_*", saveFolder) - chunkFiles, err := filepath.Glob(pattern) + prefix := fmt.Sprintf("%s/%s/chunk_", file.OwnerID.String(), file.ID.String()) - missingChunk := err != nil || len(chunkFiles) != int(file.TotalChunk) + existingChunks, err := app.Server.Storage.ListObjects(r.Context(), prefix) + if err != nil { + app.Server.Logger.Error(err.Error()) + w.WriteHeader(http.StatusInternalServerError) + return + } + + missingChunk := len(existingChunks) != int(file.TotalChunk) fileData := types.FileData{ ID: newFile.ID.String(), diff --git a/handler/file/upload/upload.go b/handler/file/upload/upload.go index 4ec0822..544c29d 100644 --- a/handler/file/upload/upload.go +++ b/handler/file/upload/upload.go @@ -3,13 +3,9 @@ package uploadHandler import ( "fmt" "github.com/fossyy/filekeeper/app" - "github.com/fossyy/filekeeper/types" "io" "net/http" - "os" - "path/filepath" "strconv" - "strings" ) func POST(w http.ResponseWriter, r *http.Request) { @@ -19,17 +15,6 @@ func POST(w http.ResponseWriter, r *http.Request) { return } - userSession := r.Context().Value("user").(types.User) - - uploadDir := "uploads" - if _, err := os.Stat(uploadDir); os.IsNotExist(err) { - if err := os.Mkdir(uploadDir, os.ModePerm); err != nil { - app.Server.Logger.Error("error getting upload info: " + err.Error()) - w.WriteHeader(http.StatusInternalServerError) - return - } - } - file, err := app.Server.Service.GetFile(fileID) if err != nil { app.Server.Logger.Error("error getting upload info: " + err.Error()) @@ -43,34 +28,6 @@ func POST(w http.ResponseWriter, r *http.Request) { return } - currentDir, err := os.Getwd() - if err != nil { - app.Server.Logger.Error("unable to get current directory") - w.WriteHeader(http.StatusInternalServerError) - return - } - - basePath := filepath.Join(currentDir, uploadDir) - cleanBasePath := filepath.Clean(basePath) - - saveFolder := filepath.Join(cleanBasePath, userSession.UserID.String(), file.ID.String()) - - cleanSaveFolder := filepath.Clean(saveFolder) - - if !strings.HasPrefix(cleanSaveFolder, cleanBasePath) { - app.Server.Logger.Error("invalid path") - w.WriteHeader(http.StatusInternalServerError) - return - } - - if _, err := os.Stat(saveFolder); os.IsNotExist(err) { - if err := os.MkdirAll(saveFolder, os.ModePerm); err != nil { - app.Server.Logger.Error("error creating save folder: " + err.Error()) - w.WriteHeader(http.StatusInternalServerError) - return - } - } - fileByte, _, err := r.FormFile("chunk") if err != nil { app.Server.Logger.Error("error getting upload info: " + err.Error()) @@ -79,15 +36,15 @@ func POST(w http.ResponseWriter, r *http.Request) { } defer fileByte.Close() - dst, err := os.OpenFile(filepath.Join(saveFolder, fmt.Sprintf("chunk_%d", index)), os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0666) + buffer, err := io.ReadAll(fileByte) if err != nil { - app.Server.Logger.Error("error making upload folder: " + err.Error()) + app.Server.Logger.Error("error copying byte to file dst: " + err.Error()) w.WriteHeader(http.StatusInternalServerError) return } - defer dst.Close() - if _, err := io.Copy(dst, fileByte); err != nil { + err = app.Server.Storage.Add(r.Context(), fmt.Sprintf("%s/%s/chunk_%d", file.OwnerID.String(), file.ID.String(), index), buffer) + if err != nil { app.Server.Logger.Error("error copying byte to file dst: " + err.Error()) w.WriteHeader(http.StatusInternalServerError) return diff --git a/handler/file/visibility/visibility.go b/handler/file/visibility/visibility.go index 6b62183..903fc86 100644 --- a/handler/file/visibility/visibility.go +++ b/handler/file/visibility/visibility.go @@ -7,7 +7,6 @@ import ( "github.com/fossyy/filekeeper/utils" fileView "github.com/fossyy/filekeeper/view/client/file" "net/http" - "path/filepath" "strconv" ) @@ -32,11 +31,17 @@ func PUT(w http.ResponseWriter, r *http.Request) { app.Server.Logger.Error(err.Error()) return } - saveFolder := filepath.Join("uploads", userSession.UserID.String(), file.ID.String()) - pattern := fmt.Sprintf("%s/chunk_*", saveFolder) - chunkFiles, err := filepath.Glob(pattern) - missingChunk := err != nil || len(chunkFiles) != int(file.TotalChunk) + prefix := fmt.Sprintf("%s/%s/chunk_", file.OwnerID.String(), file.ID.String()) + + existingChunks, err := app.Server.Storage.ListObjects(r.Context(), prefix) + if err != nil { + app.Server.Logger.Error(err.Error()) + w.WriteHeader(http.StatusInternalServerError) + return + } + + missingChunk := len(existingChunks) != int(file.TotalChunk) fileData := types.FileData{ ID: file.ID.String(), Name: file.Name, diff --git a/handler/user/user.go b/handler/user/user.go index 761efe2..bf7c306 100644 --- a/handler/user/user.go +++ b/handler/user/user.go @@ -1,6 +1,7 @@ package userHandler import ( + "context" "encoding/json" "errors" "fmt" @@ -15,7 +16,6 @@ import ( "github.com/gorilla/websocket" "gorm.io/gorm" "net/http" - "path/filepath" "strings" ) @@ -196,34 +196,27 @@ func handlerWS(conn *websocket.Conn, userSession types.User) { Name: newFile.Name, Size: newFile.Size, Downloaded: newFile.Downloaded, + Done: false, } fileData.Chunk = make(map[string]bool) - saveFolder := filepath.Join("uploads", userSession.UserID.String(), newFile.ID.String()) + prefix := fmt.Sprintf("%s/%s/chunk_", userSession.UserID.String(), newFile.ID.String()) - pattern := fmt.Sprintf("%s/chunk_*", saveFolder) - chunkFiles, err := filepath.Glob(pattern) + existingChunks, err := app.Server.Storage.ListObjects(context.TODO(), prefix) if err != nil { app.Server.Logger.Error(err.Error()) - fileData.Done = false + sendErrorResponse(conn, action.Action, "Unknown error") + continue } else { - for i := 0; i <= int(newFile.TotalChunk); i++ { + for i := 0; i < int(newFile.TotalChunk); i++ { fileData.Chunk[fmt.Sprintf("chunk_%d", i)] = false } - for _, chunkFile := range chunkFiles { + for _, chunkFile := range existingChunks { var chunkIndex int - fmt.Sscanf(filepath.Base(chunkFile), "chunk_%d", &chunkIndex) - + fmt.Sscanf(chunkFile, "chunk_%d", &chunkIndex) fileData.Chunk[fmt.Sprintf("chunk_%d", chunkIndex)] = true } - - for i := 0; i <= int(newFile.TotalChunk); i++ { - if !fileData.Chunk[fmt.Sprintf("chunk_%d", i)] { - fileData.Done = false - break - } - } } sendSuccessResponseWithID(conn, action.Action, fileData, uploadNewFile.RequestID) continue @@ -246,10 +239,8 @@ func handlerWS(conn *websocket.Conn, userSession types.User) { Done: true, } - saveFolder := filepath.Join("uploads", userSession.UserID.String(), fileData.ID.String()) - pattern := fmt.Sprintf("%s/chunk_*", saveFolder) - chunkFiles, err := filepath.Glob(pattern) - + prefix := fmt.Sprintf("%s/%s/chunk_", userSession.UserID.String(), file.ID.String()) + existingChunks, err := app.Server.Storage.ListObjects(context.TODO(), prefix) if err != nil { app.Server.Logger.Error(err.Error()) fileData.Done = false @@ -257,9 +248,9 @@ func handlerWS(conn *websocket.Conn, userSession types.User) { for i := 0; i < int(file.TotalChunk); i++ { fileData.Chunk[fmt.Sprintf("chunk_%d", i)] = false } - for _, chunkFile := range chunkFiles { + for _, chunkFile := range existingChunks { var chunkIndex int - fmt.Sscanf(filepath.Base(chunkFile), "chunk_%d", &chunkIndex) + fmt.Sscanf(chunkFile, "chunk_%d", &chunkIndex) fileData.Chunk[fmt.Sprintf("chunk_%d", chunkIndex)] = true } diff --git a/main.go b/main.go index e58bbc8..e7c4028 100644 --- a/main.go +++ b/main.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "github.com/fossyy/filekeeper/storage" "strconv" "github.com/fossyy/filekeeper/app" @@ -36,7 +37,14 @@ func main() { smtpPort, _ := strconv.Atoi(utils.Getenv("SMTP_PORT")) mailServer := email.NewSmtpServer(utils.Getenv("SMTP_HOST"), smtpPort, utils.Getenv("SMTP_USER"), utils.Getenv("SMTP_PASSWORD")) - app.Server = app.NewClientServer(clientAddr, middleware.Handler(client.SetupRoutes()), *logger.Logger(), database, cacheServer, services, mailServer) + bucket := utils.Getenv("S3_BUCKET_NAME") + region := utils.Getenv("S3_REGION") + endpoint := utils.Getenv("S3_ENDPOINT") + accessKey := utils.Getenv("S3_ACCESS_KEY") + secretKey := utils.Getenv("S3_SECRET_KEY") + S3 := storage.NewS3(bucket, region, endpoint, accessKey, secretKey) + + app.Server = app.NewClientServer(clientAddr, middleware.Handler(client.SetupRoutes()), *logger.Logger(), database, cacheServer, S3, services, mailServer) app.Admin = app.NewAdminServer(adminAddr, middleware.Handler(admin.SetupRoutes()), database) go func() { diff --git a/routes/client/routes.go b/routes/client/routes.go index 03c4772..3983fe4 100644 --- a/routes/client/routes.go +++ b/routes/client/routes.go @@ -1,6 +1,8 @@ package client import ( + "fmt" + "github.com/fossyy/filekeeper/app" googleOauthHandler "github.com/fossyy/filekeeper/handler/auth/google" googleOauthCallbackHandler "github.com/fossyy/filekeeper/handler/auth/google/callback" googleOauthSetupHandler "github.com/fossyy/filekeeper/handler/auth/google/setup" @@ -157,6 +159,25 @@ func SetupRoutes() *http.ServeMux { http.ServeFile(w, r, "public/favicon.ico") }) + handler.HandleFunc("GET /test", func(w http.ResponseWriter, r *http.Request) { + objects, err := app.Server.Storage.ListObjects(r.Context(), "test/") + fmt.Println(objects) + if err != nil { + return + } + if r.URL.Query().Get("new") != "" { + app.Server.Storage.Add(r.Context(), "test.txt", []byte(r.URL.Query().Get("new"))) + w.Write([]byte("succes")) + return + } + get, err := app.Server.Storage.Get(r.Context(), "test.txt") + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + return + } + w.Write(get) + }) + fileServer := http.FileServer(http.Dir("./public")) handler.Handle("/public/", http.StripPrefix("/public", fileServer)) diff --git a/storage/storage.go b/storage/storage.go new file mode 100644 index 0000000..28e32a3 --- /dev/null +++ b/storage/storage.go @@ -0,0 +1,80 @@ +package storage + +import ( + "bytes" + "context" + "fmt" + "github.com/minio/minio-go/v7" + "github.com/minio/minio-go/v7/pkg/credentials" + "io" + "path/filepath" +) + +type S3 struct { + Client *minio.Client + Bucket string +} + +func NewS3(bucket string, region string, endpoint string, accessKey string, secretKey string) *S3 { + minioClient, err := minio.New(endpoint, &minio.Options{ + Creds: credentials.NewStaticV4(accessKey, secretKey, ""), + Secure: true, + Region: region, + }) + if err != nil { + return nil + } + return &S3{Client: minioClient, Bucket: bucket} +} + +func (storage *S3) Get(ctx context.Context, key string) ([]byte, error) { + object, err := storage.Client.GetObject(ctx, storage.Bucket, key, minio.GetObjectOptions{}) + if err != nil { + return nil, err + } + defer object.Close() + + data, err := io.ReadAll(object) + if err != nil { + return nil, err + } + + return data, nil +} + +func (storage *S3) Add(ctx context.Context, key string, data []byte) error { + reader := bytes.NewReader(data) + _, err := storage.Client.PutObject(ctx, storage.Bucket, key, reader, int64(reader.Len()), minio.PutObjectOptions{ + ContentType: "application/octet-stream", + }) + + if err != nil { + return err + } + return nil +} + +func (storage *S3) Delete(ctx context.Context, key string) error { + err := storage.Client.RemoveObject(ctx, storage.Bucket, key, minio.RemoveObjectOptions{}) + if err != nil { + return err + } + + return nil +} + +func (storage *S3) ListObjects(ctx context.Context, prefix string) ([]string, error) { + var objects []string + objectCh := storage.Client.ListObjects(ctx, storage.Bucket, minio.ListObjectsOptions{ + Prefix: prefix, + }) + + for object := range objectCh { + if object.Err != nil { + return nil, fmt.Errorf("failed to list objects: %w", object.Err) + } + fileName := filepath.Base(object.Key) + objects = append(objects, fileName) + } + return objects, nil +} diff --git a/types/types.go b/types/types.go index 9fd6162..aed2357 100644 --- a/types/types.go +++ b/types/types.go @@ -2,9 +2,10 @@ package types import ( "context" + "time" + "github.com/fossyy/filekeeper/types/models" "github.com/google/uuid" - "time" ) type FileStatus string @@ -92,3 +93,10 @@ type Services interface { GetUserFile(name, ownerID string) (*FileWithDetail, error) GetUserStorageUsage(ownerID string) (uint64, error) } + +type Storage interface { + Get(ctx context.Context, key string) ([]byte, error) + Add(ctx context.Context, key string, data []byte) error + Delete(ctx context.Context, key string) error + ListObjects(ctx context.Context, prefix string) ([]string, error) +}