diff --git a/cmd/gokapi/Main.go b/cmd/gokapi/Main.go index 1be7958..488d386 100644 --- a/cmd/gokapi/Main.go +++ b/cmd/gokapi/Main.go @@ -7,6 +7,7 @@ Main routine import ( "Gokapi/internal/configuration" "Gokapi/internal/configuration/cloudconfig" + "Gokapi/internal/configuration/dataStorage" "Gokapi/internal/configuration/setup" "Gokapi/internal/environment" "Gokapi/internal/helper" @@ -20,6 +21,8 @@ import ( "fmt" "math/rand" "os" + "os/signal" + "syscall" "time" ) @@ -38,10 +41,8 @@ func main() { fmt.Println("Gokapi v" + Version + " starting") setup.RunIfFirstStart() configuration.Load() - settings := configuration.GetServerSettingsReadOnly() - authentication.Init(settings.Authentication) - configuration.ReleaseReadOnly() - reonfigureServer(passedFlags) + authentication.Init(configuration.Get().Authentication) + reconfigureServer(passedFlags) createSsl(passedFlags) cConfig, ok := cloudconfig.Load() @@ -52,7 +53,19 @@ func main() { } go storage.CleanUp(true) logging.AddString("Gokapi started") - webserver.Start() + go webserver.Start() + + c := make(chan os.Signal) + signal.Notify(c, os.Interrupt, syscall.SIGTERM) + <-c + cleanup() + os.Exit(0) +} + +func cleanup() { + fmt.Println("Shutting down...") + // webserver.Stop() TODO + dataStorage.Close() } // Checks for command line arguments that have to be parsed before loading the configuration @@ -82,7 +95,7 @@ func parseFlags() flags { } // Checks for command line arguments that have to be parsed after loading the configuration -func reonfigureServer(passedFlags flags) { +func reconfigureServer(passedFlags flags) { if passedFlags.reconfigure { setup.RunConfigModification() } @@ -90,9 +103,7 @@ func reonfigureServer(passedFlags flags) { func createSsl(passedFlags flags) { if passedFlags.createSsl { - settings := configuration.GetServerSettingsReadOnly() - ssl.GenerateIfInvalidCert(settings.ServerUrl, true) - configuration.ReleaseReadOnly() + ssl.GenerateIfInvalidCert(configuration.Get().ServerUrl, true) } } diff --git a/cmd/gokapi/Main_test.go b/cmd/gokapi/Main_test.go index 0a37ebf..1041336 100644 --- a/cmd/gokapi/Main_test.go +++ b/cmd/gokapi/Main_test.go @@ -37,7 +37,7 @@ func TestShowVersion(t *testing.T) { } func TestNoResetPw(t *testing.T) { - reonfigureServer(flags{}) + reconfigureServer(flags{}) } func TestCreateSsl(t *testing.T) { diff --git a/go.mod b/go.mod index ade6cb4..28bdf25 100644 --- a/go.mod +++ b/go.mod @@ -3,24 +3,32 @@ module Gokapi go 1.17 require ( + git.mills.io/prologic/bitcask v1.0.2 github.com/aws/aws-sdk-go v1.42.22 github.com/caarlos0/env/v6 v6.9.1 github.com/johannesboyne/gofakes3 v0.0.0-20210415062230-4b6b67a85d38 - golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d + golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 gopkg.in/yaml.v2 v2.4.0 ) require ( - github.com/golang/protobuf v1.4.2 // indirect + github.com/abcum/lcp v0.0.0-20201209214815-7a3f3840be81 // indirect + github.com/gofrs/flock v0.8.0 // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/plar/go-adaptive-radix-tree v1.0.4 // indirect github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect github.com/shabbyrobe/gocovmerge v0.0.0-20180507124511-f6ea450bfb63 // indirect + github.com/sirupsen/logrus v1.8.1 // indirect golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect + golang.org/x/exp v0.0.0-20200228211341-fcea875c7e85 // indirect golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect - golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 // indirect - google.golang.org/appengine v1.6.6 // indirect - google.golang.org/protobuf v1.23.0 // indirect + golang.org/x/tools v0.1.2 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.26.0 // indirect + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/square/go-jose.v2 v2.5.1 // indirect ) diff --git a/go.sum b/go.sum index 8491812..2977626 100644 --- a/go.sum +++ b/go.sum @@ -1,26 +1,208 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +git.mills.io/prologic/bitcask v1.0.2 h1:Iy9x3mVVd1fB+SWY0LTmsSDPGbzMrd7zCZPKbsb/tDA= +git.mills.io/prologic/bitcask v1.0.2/go.mod h1:ppXpR3haeYrijyJDleAkSGH3p90w6sIHxEA/7UHMxH4= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/abcum/lcp v0.0.0-20201209214815-7a3f3840be81 h1:uHogIJ9bXH75ZYrXnVShHIyywFiUZ7OOabwd9Sfd8rw= +github.com/abcum/lcp v0.0.0-20201209214815-7a3f3840be81/go.mod h1:6ZvnjTZX1LNo1oLpfaJK8h+MXqHxcBFBIwkgsv+xlv0= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go v1.17.4/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.42.22 h1:EwcM7/+Ytg6xK+jbeM2+f9OELHqPiEiEKetT/GgAr7I= github.com/aws/aws-sdk-go v1.42.22/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/caarlos0/env/v6 v6.9.1 h1:zOkkjM0F6ltnQ5eBX6IPI41UP/KDGEK7rRPwGCNos8k= github.com/caarlos0/env/v6 v6.9.1/go.mod h1:hvp/ryKXKipEkcuYjs9mI4bBCg+UI0Yhgm5Zu0ddvwc= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-oidc/v3 v3.1.0 h1:6avEvcdvTa1qYsOZ6I5PRkSYHzpTNWgKYmaJfaYbrRw= github.com/coreos/go-oidc/v3 v3.1.0/go.mod h1:rEJ/idjfUyfkBit1eI1fvyr+64/g9dcKpAm8MJMesvo= -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= 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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gofrs/flock v0.8.0 h1:MSdYClljsF3PbENUUEx85nkWfJSGfzYI9yEBZOJz6CY= +github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +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/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0= +github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= 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= @@ -28,73 +210,511 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/johannesboyne/gofakes3 v0.0.0-20210415062230-4b6b67a85d38 h1:RzxIE+fiv4JCG5pPjTLWdegsdoDCQHZEE+ByYC49Y0Y= github.com/johannesboyne/gofakes3 v0.0.0-20210415062230-4b6b67a85d38/go.mod h1:Zj9d90chLFOXPNj/m+HfCAFx1s8zSue9HiqC/hbHLS0= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/plar/go-adaptive-radix-tree v1.0.4 h1:Ucd8R6RH2E7RW8ZtDKrsWyOD3paG2qqJO0I20WQ8oWQ= +github.com/plar/go-adaptive-radix-tree v1.0.4/go.mod h1:Ot8d28EII3i7Lv4PSvBlF8ejiD/CtRYDuPsySJbSaK8= 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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 h1:GHRpF1pTW19a8tTFrMLUcfWwyC0pnifVo2ClaLq+hP8= github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shabbyrobe/gocovmerge v0.0.0-20180507124511-f6ea450bfb63 h1:J6qvD6rbmOil46orKqJaRPG+zTpoGlBTUdyv8ki63L0= github.com/shabbyrobe/gocovmerge v0.0.0-20180507124511-f6ea450bfb63/go.mod h1:n+VKSARF5y/tS9XFSP7vWDfS+GUC5vs/YT7M5XDTUEM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs= +github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.1/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tidwall/btree v0.4.2/go.mod h1:huei1BkDWJ3/sLXmO+bsCNELL+Bp2Kks9OLyQFkzvA8= +github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= +github.com/tidwall/redcon v1.4.1/go.mod h1:XwNPFbJ4ShWNNSA2Jazhbdje6jegTCcwFR6mfaADvHA= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20200228211341-fcea875c7e85 h1:jqhIzSw5SQNkbu5hOGpgMHhkfXxrbsLJdkIRcX19gCY= +golang.org/x/exp v0.0.0-20200228211341-fcea875c7e85/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190310074541-c10a0554eabf/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200505041828-1ed23360d12c/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 h1:0Ja1LBD+yisY6RWM/BH7TJVXWsSjs2VwBSmvSX4HdBc= +golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486 h1:5hpz5aRr+W1erYCL5JRhSUBJRph7l9XkNveoExlrKYk= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190308174544-00c44ba9c14f/go.mod h1:25r3+/G6/xytQM8iWZKq3Hn0kr0rgFKPUNVEL/dr3z4= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 h1:TFlARGu6Czu1z7q93HTxcP1P+/ZFC/IKythI5RzrnRg= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/internal/configuration/Configuration.go b/internal/configuration/Configuration.go index c0cb377..0d7d937 100644 --- a/internal/configuration/Configuration.go +++ b/internal/configuration/Configuration.go @@ -7,17 +7,20 @@ Loading and saving of the persistent configuration import ( "Gokapi/internal/configuration/cloudconfig" "Gokapi/internal/configuration/configUpgrade" + "Gokapi/internal/configuration/dataStorage" "Gokapi/internal/environment" "Gokapi/internal/helper" log "Gokapi/internal/logging" "Gokapi/internal/models" + "Gokapi/internal/webserver/downloadstatus" + "bytes" "crypto/sha1" "encoding/hex" "encoding/json" "errors" "fmt" + "io" "os" - "sync" ) // Min length of admin password in characters @@ -29,9 +32,6 @@ var Environment environment.Environment // ServerSettings is an object containing the server configuration var serverSettings models.Configuration -// For locking this object to prevent race conditions -var mutex sync.RWMutex - func Exists() bool { configPath, _, _, _ := environment.GetConfigPaths() return helper.FileExists(configPath) @@ -48,6 +48,7 @@ func Load() { err = decoder.Decode(&serverSettings) helper.Check(err) file.Close() + dataStorage.Init(Environment.FileDbPath) if configUpgrade.DoUpgrade(&serverSettings, &Environment) { save() } @@ -56,44 +57,15 @@ func Load() { serverSettings.MaxMemory = Environment.MaxMemory } helper.CreateDir(serverSettings.DataDir) + downloadstatus.Init() log.Init(Environment.ConfigDir) } -// Lock locks configuration to prevent race conditions (blocking) -func Lock() { - mutex.Lock() -} - -// ReleaseAndSave unlocks and saves the configuration -func ReleaseAndSave() { - save() - mutex.Unlock() -} - -// Release unlocks the configuration -func Release() { - mutex.Unlock() -} - -// GetServerSettings locks the settings returns a pointer to the configuration for Read/Write access -// Release needs to be called when finished with the operation! -func GetServerSettings() *models.Configuration { - mutex.Lock() +// Get returns a pointer to the server configuration +func Get() *models.Configuration { return &serverSettings } -// GetServerSettingsReadOnly locks the settings for read-only access and returns a copy of the configuration -// ReleaseReadOnly needs to be called when finished with the operation! -func GetServerSettingsReadOnly() *models.Configuration { - mutex.RLock() - return &serverSettings -} - -// ReleaseReadOnly unlocks the configuration opened for read-only access -func ReleaseReadOnly() { - mutex.RUnlock() -} - // Save the configuration as a json file func save() { file, err := os.OpenFile(Environment.ConfigPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) @@ -102,25 +74,25 @@ func save() { os.Exit(1) } defer file.Close() - encoder := json.NewEncoder(file) - err = encoder.Encode(&serverSettings) + + configJson, err := json.MarshalIndent(serverSettings, "", " ") + if err != nil { + fmt.Println("Error encoding configuration:", err) + os.Exit(1) + } + _, err = io.Copy(file, bytes.NewReader(configJson)) if err != nil { fmt.Println("Error writing configuration:", err) os.Exit(1) } } -func LoadFromSetup(config models.Configuration, cloudConfig *cloudconfig.CloudConfig, isInitialConfig bool) { +func LoadFromSetup(config models.Configuration, cloudConfig *cloudconfig.CloudConfig, isInitialSetup bool) { Environment = environment.New() helper.CreateDir(Environment.ConfigDir) - if !isInitialConfig { + if !isInitialSetup { Load() - config.DefaultDownloads = serverSettings.DefaultDownloads - config.DefaultExpiry = serverSettings.DefaultExpiry - config.DefaultPassword = serverSettings.DefaultPassword - config.Files = serverSettings.Files - config.Hotlinks = serverSettings.Hotlinks - config.ApiKeys = serverSettings.ApiKeys + dataStorage.DeleteAllSessions() } serverSettings = config @@ -140,11 +112,6 @@ func LoadFromSetup(config models.Configuration, cloudConfig *cloudconfig.CloudCo save() } -// GetLengthId returns the length of the file IDs to be generated -func GetLengthId() int { - return serverSettings.LengthId -} - // HashPassword hashes a string with SHA256 and a salt func HashPassword(password string, useFileSalt bool) string { if useFileSalt { diff --git a/internal/configuration/Configuration_test.go b/internal/configuration/Configuration_test.go index 3407d7a..49d2a89 100644 --- a/internal/configuration/Configuration_test.go +++ b/internal/configuration/Configuration_test.go @@ -11,7 +11,6 @@ import ( "Gokapi/internal/test/testconfiguration" "os" "testing" - "time" ) func TestMain(m *testing.M) { @@ -31,55 +30,10 @@ func TestLoad(t *testing.T) { test.IsEqualString(t, serverSettings.Authentication.Password, "10340aece68aa4fb14507ae45b05506026f276cf") test.IsEqualString(t, HashPassword("testtest", false), "10340aece68aa4fb14507ae45b05506026f276cf") test.IsEqualBool(t, serverSettings.UseSsl, false) - test.IsEqualInt(t, GetLengthId(), 20) - settings := GetServerSettings() - Release() - test.IsEqualInt(t, settings.LengthId, 20) + test.IsEqualInt(t, serverSettings.LengthId, 20) + test.IsEqualInt(t, Get().LengthId, 20) } -func TestMutexSession(t *testing.T) { - finished := make(chan bool) - oldValue := serverSettings.ConfigVersion - go func() { - time.Sleep(100 * time.Millisecond) - Lock() - test.IsEqualInt(t, serverSettings.ConfigVersion, -9) - serverSettings.ConfigVersion = oldValue - ReleaseAndSave() - test.IsEqualInt(t, serverSettings.ConfigVersion, oldValue) - finished <- true - }() - Lock() - serverSettings.ConfigVersion = -9 - time.Sleep(150 * time.Millisecond) - test.IsEqualInt(t, serverSettings.ConfigVersion, -9) - Release() - <-finished - GetServerSettingsReadOnly() - ReleaseReadOnly() -} - -func TestUpgradeDb(t *testing.T) { - testconfiguration.WriteUpgradeConfigFileV0() - os.Setenv("GOKAPI_USE_SSL", "true") - os.Setenv("GOKAPI_MAX_FILESIZE", "5") - Load() - test.IsEqualString(t, serverSettings.Authentication.SaltAdmin, "eefwkjqweduiotbrkl##$2342brerlk2321") - test.IsEqualString(t, serverSettings.Authentication.SaltFiles, "P1UI5sRNDwuBgOvOYhNsmucZ2pqo4KEvOoqqbpdu") - test.IsEqualString(t, serverSettings.DataDir, Environment.DataDir) - test.IsEqualInt(t, serverSettings.LengthId, 15) - test.IsEqualBool(t, serverSettings.Hotlinks == nil, false) - test.IsEqualBool(t, serverSettings.Sessions == nil, false) - test.IsEqualBool(t, serverSettings.DownloadStatus == nil, false) - test.IsEqualString(t, serverSettings.Files["MgXJLe4XLfpXcL12ec4i"].ContentType, "application/octet-stream") - test.IsEqualInt(t, serverSettings.ConfigVersion, configUpgrade.CurrentConfigVersion) - test.IsEqualBool(t, serverSettings.UseSsl, false) - test.IsEqualInt(t, serverSettings.MaxFileSizeMB, 5) - os.Unsetenv("GOKAPI_USE_SSL") - os.Unsetenv("GOKAPI_MAX_FILESIZE") - testconfiguration.Create(false) - Load() -} func TestHashPassword(t *testing.T) { test.IsEqualString(t, HashPassword("123", false), "423b63a68c68bd7e07b14590927c1e9a473fe035") test.IsEqualString(t, HashPassword("", false), "") @@ -117,10 +71,9 @@ func TestLoadFromSetup(t *testing.T) { testconfiguration.WriteCloudConfigFile(true) LoadFromSetup(newConfig, nil, false) test.FileDoesNotExist(t, "test/cloudconfig.yml") - test.IsEqualBool(t, serverSettings.Files != nil, true) test.IsEqualString(t, serverSettings.RedirectUrl, "redirect") - LoadFromSetup(newConfig, &newCloudConfig, true) + LoadFromSetup(newConfig, &newCloudConfig, false) test.FileExists(t, "test/cloudconfig.yml") config, ok := cloudconfig.Load() test.IsEqualBool(t, ok, true) diff --git a/internal/configuration/configUpgrade/Upgrade.go b/internal/configuration/configUpgrade/Upgrade.go index 9803a18..ac64977 100644 --- a/internal/configuration/configUpgrade/Upgrade.go +++ b/internal/configuration/configUpgrade/Upgrade.go @@ -1,16 +1,18 @@ package configUpgrade import ( + "Gokapi/internal/configuration/dataStorage" "Gokapi/internal/environment" "Gokapi/internal/helper" "Gokapi/internal/models" "encoding/json" "fmt" "os" + "time" ) // CurrentConfigVersion is the version of the configuration structure. Used for upgrading -const CurrentConfigVersion = 10 +const CurrentConfigVersion = 11 func DoUpgrade(settings *models.Configuration, env *environment.Environment) bool { if settings.ConfigVersion < CurrentConfigVersion { @@ -24,29 +26,12 @@ func DoUpgrade(settings *models.Configuration, env *environment.Environment) boo // Upgrades the settings if saved with a previous version func updateConfig(settings *models.Configuration, env *environment.Environment) { - // < v1.1.2 - if settings.ConfigVersion < 3 { - settings.Authentication.SaltAdmin = "eefwkjqweduiotbrkl##$2342brerlk2321" - settings.Authentication.SaltFiles = "P1UI5sRNDwuBgOvOYhNsmucZ2pqo4KEvOoqqbpdu" - settings.LengthId = 15 - settings.DataDir = env.DataDir - } - // < v1.1.3 - if settings.ConfigVersion < 4 { - settings.Hotlinks = make(map[string]models.Hotlink) - } - // < v1.1.4 - if settings.ConfigVersion < 5 { - settings.LengthId = 15 - settings.DownloadStatus = make(map[string]models.DownloadStatus) - for _, file := range settings.Files { - file.ContentType = "application/octet-stream" - settings.Files[file.Id] = file - } - } + // < v1.2.0 if settings.ConfigVersion < 6 { - settings.ApiKeys = make(map[string]models.ApiKey) + fmt.Println("Please update to version 1.2 before running this version,") + osExit(1) + return } // < v1.3.0 if settings.ConfigVersion < 7 { @@ -56,12 +41,12 @@ func updateConfig(settings *models.Configuration, env *environment.Environment) if settings.ConfigVersion < 8 { settings.MaxFileSizeMB = env.MaxFileSize } - // < v1.5.0 + // < v1.5.0-dev if settings.ConfigVersion < 10 { settings.Authentication.Method = 0 // authentication.AuthenticationInternal settings.Authentication.HeaderUsers = []string{} settings.Authentication.OauthUsers = []string{} - legacyConfig := loadLegacyConfig(env) + legacyConfig := loadLegacyConfigPreAuth(env) settings.Authentication.Username = legacyConfig.AdminName settings.Authentication.Password = legacyConfig.AdminPassword if legacyConfig.SaltAdmin != "" { @@ -71,24 +56,73 @@ func updateConfig(settings *models.Configuration, env *environment.Environment) settings.Authentication.SaltFiles = legacyConfig.SaltFiles } } + // < v1.5.0 + if settings.ConfigVersion < 11 { + legacyConfig := loadLegacyConfigPreDb(env) + dataStorage.SaveUploadDefaults(legacyConfig.DefaultDownloads, legacyConfig.DefaultExpiry, legacyConfig.DefaultPassword) + + for _, hotlink := range legacyConfig.Hotlinks { + dataStorage.SaveHotlink(hotlink.Id, models.File{Id: hotlink.FileId}) + } + for _, apikey := range legacyConfig.ApiKeys { + dataStorage.SaveApiKey(apikey, false) + } + for _, file := range legacyConfig.Files { + dataStorage.SaveMetaData(file) + } + for key, session := range legacyConfig.Sessions { + dataStorage.SaveSession(key, session, 48*time.Hour) + } + } } -func loadLegacyConfig(env *environment.Environment) configurationLegacy { +func loadLegacyConfigPreAuth(env *environment.Environment) configurationLegacyPreAuth { file, err := os.Open(env.ConfigPath) defer file.Close() helper.Check(err) decoder := json.NewDecoder(file) - result := configurationLegacy{} + result := configurationLegacyPreAuth{} err = decoder.Decode(&result) helper.Check(err) return result } -// configurationLegacy is a struct that contains missing values for the global configuration when loading pre v1.5 format -type configurationLegacy struct { +func loadLegacyConfigPreDb(env *environment.Environment) configurationLegacyPreDb { + file, err := os.Open(env.ConfigPath) + defer file.Close() + helper.Check(err) + decoder := json.NewDecoder(file) + + result := configurationLegacyPreDb{} + err = decoder.Decode(&result) + helper.Check(err) + return result +} + +// configurationLegacyPreAuth is a struct that contains missing values for the global configuration when loading pre v1.5-dev format +type configurationLegacyPreAuth struct { AdminName string `json:"AdminName"` AdminPassword string `json:"AdminPassword"` SaltAdmin string `json:"SaltAdmin"` SaltFiles string `json:"SaltFiles"` } + +// configurationLegacyPreAuth is a struct that contains missing values for the global configuration when loading pre v1.5 format +type configurationLegacyPreDb struct { + DefaultDownloads int `json:"DefaultDownloads"` + DefaultExpiry int `json:"DefaultExpiry"` + DefaultPassword string `json:"DefaultPassword"` + Files map[string]models.File `json:"Files"` + Hotlinks map[string]Hotlink `json:"Hotlinks"` + ApiKeys map[string]models.ApiKey `json:"ApiKeys"` + Sessions map[string]models.Session `json:"Sessions"` +} + +// Hotlink is a legacy struct containing hotlink ids +type Hotlink struct { + Id string `json:"Id"` + FileId string `json:"FileId"` +} + +var osExit = os.Exit diff --git a/internal/configuration/configUpgrade/Upgrade_test.go b/internal/configuration/configUpgrade/Upgrade_test.go index 50f8912..8bdf175 100644 --- a/internal/configuration/configUpgrade/Upgrade_test.go +++ b/internal/configuration/configUpgrade/Upgrade_test.go @@ -1,6 +1,7 @@ package configUpgrade import ( + "Gokapi/internal/configuration/dataStorage" "Gokapi/internal/environment" "Gokapi/internal/models" "Gokapi/internal/test" @@ -10,15 +11,10 @@ import ( ) var oldConfigFile = models.Configuration{ - Authentication: models.AuthenticationConfig{}, - Port: "127.0.0.1:53844", - ServerUrl: "https://gokapi.url/", - DefaultDownloads: 1, - DefaultExpiry: 14, - DefaultPassword: "123", - RedirectUrl: "https://github.com/Forceu/Gokapi/", - Sessions: make(map[string]models.Session), - Files: make(map[string]models.File), + Authentication: models.AuthenticationConfig{}, + Port: "127.0.0.1:53844", + ServerUrl: "https://gokapi.url/", + RedirectUrl: "https://github.com/Forceu/Gokapi/", } func TestMain(m *testing.M) { @@ -31,43 +27,24 @@ func TestMain(m *testing.M) { func TestUpgradeDb(t *testing.T) { testconfiguration.WriteUpgradeConfigFileV0() os.Setenv("GOKAPI_MAX_FILESIZE", "5") - oldConfigFile.Files["MgXJLe4XLfpXcL12ec4i"] = models.File{ - Id: "MgXJLe4XLfpXcL12ec4i", - } env := environment.New() bufferConfig := oldConfigFile - upgradeDone := DoUpgrade(&bufferConfig, &env) - test.IsEqualBool(t, upgradeDone, true) - upgradeDone = DoUpgrade(&bufferConfig, &env) - test.IsEqualBool(t, upgradeDone, false) - firstUpgrade := oldConfigFile - upgradeDone = DoUpgrade(&firstUpgrade, &env) - test.IsEqualBool(t, upgradeDone, true) - - test.IsEqualString(t, firstUpgrade.Authentication.SaltAdmin, "eefwkjqweduiotbrkl##$2342brerlk2321") - test.IsEqualString(t, firstUpgrade.Authentication.SaltFiles, "P1UI5sRNDwuBgOvOYhNsmucZ2pqo4KEvOoqqbpdu") - test.IsEqualString(t, firstUpgrade.DataDir, env.DataDir) - test.IsEqualInt(t, firstUpgrade.LengthId, 15) - test.IsEqualBool(t, firstUpgrade.Hotlinks == nil, false) - test.IsEqualBool(t, firstUpgrade.Sessions == nil, false) - test.IsEqualBool(t, firstUpgrade.DownloadStatus == nil, false) - test.IsEqualString(t, firstUpgrade.Files["MgXJLe4XLfpXcL12ec4i"].ContentType, "application/octet-stream") - test.IsEqualInt(t, firstUpgrade.ConfigVersion, CurrentConfigVersion) - test.IsEqualInt(t, firstUpgrade.MaxFileSizeMB, 5) - test.IsEqualInt(t, firstUpgrade.Authentication.Method, 0) - test.IsEqualBool(t, firstUpgrade.Authentication.HeaderUsers == nil, false) - test.IsEqualBool(t, firstUpgrade.Authentication.OauthUsers == nil, false) - test.IsEqualString(t, firstUpgrade.Authentication.Username, "admin") - test.IsEqualString(t, firstUpgrade.Authentication.Password, "7450c2403ab85f0e8d5436818b66b99fdd287ac6") + wasExit := false + osExit = func(code int) { + wasExit = true + } + _ = DoUpgrade(&bufferConfig, &env) + test.IsEqualBool(t, wasExit, true) oldConfigFile.ConfigVersion = 8 + dataStorage.Init("./test/filestorage.db") testconfiguration.WriteUpgradeConfigFileV8() - upgradeDone = DoUpgrade(&oldConfigFile, &env) + upgradeDone := DoUpgrade(&oldConfigFile, &env) test.IsEqualBool(t, upgradeDone, true) test.IsEqualString(t, oldConfigFile.Authentication.SaltAdmin, "LW6fW4Pjv8GtdWVLSZD66gYEev6NAaXxOVBw7C") test.IsEqualString(t, oldConfigFile.Authentication.SaltFiles, "lL5wMTtnVCn5TPbpRaSe4vAQodWW0hgk00WCZE") - + // TODO write further tests os.Unsetenv("GOKAPI_MAX_FILESIZE") } diff --git a/internal/configuration/dataStorage/DataStorage.go b/internal/configuration/dataStorage/DataStorage.go new file mode 100644 index 0000000..bd19161 --- /dev/null +++ b/internal/configuration/dataStorage/DataStorage.go @@ -0,0 +1,284 @@ +package dataStorage + +import ( + "Gokapi/internal/helper" + "Gokapi/internal/models" + "bytes" + "encoding/binary" + "encoding/gob" + "fmt" + "git.mills.io/prologic/bitcask" + "log" + "strings" + "time" +) + +const prefixApiKey = "apikey:id:" +const prefixFile = "file:id:" +const prefixHotlink = "hotlink:id:" +const prefixSessions = "session:id:" +const idDefaultDownloads = "default:downloads" +const idDefaultExpiry = "default:expiry" +const idDefaultPassword = "default:password" + +var database *bitcask.Bitcask + +func Init(dbPath string) { + if database == nil { + // TODO check that parameters do not exceed 64 byte + db, err := bitcask.Open(dbPath, bitcask.WithMaxKeySize(128)) + if err != nil { + log.Fatal(err) + } + database = db + } +} + +func Close() { + if database != nil { + err := database.Sync() + if err != nil { + fmt.Println(err) + } + err = database.Close() + if err != nil { + fmt.Println(err) + } + } + database = nil +} + +// ## File Metadata ## + +func GetAllMetadata() map[string]models.File { + result := make(map[string]models.File) + var keys []string + err := database.Scan([]byte(prefixFile), func(key []byte) error { + fileId := strings.Replace(string(key), prefixFile, "", 1) + keys = append(keys, fileId) + return nil + }) + + helper.Check(err) + + for _, key := range keys { + file, ok := GetMetaDataById(key) + if ok { + result[file.Id] = file + } + } + + return result +} + +func GetMetaDataById(id string) (models.File, bool) { + result := models.File{} + value, ok := getValue(prefixFile + id) + if !ok { + return result, false + } + buf := bytes.NewBuffer(value) + dec := gob.NewDecoder(buf) + err := dec.Decode(&result) + helper.Check(err) + return result, true +} + +func SaveMetaData(file models.File) { + var buf bytes.Buffer + enc := gob.NewEncoder(&buf) + err := enc.Encode(file) + helper.Check(err) + err = database.Put([]byte(prefixFile+file.Id), buf.Bytes()) + helper.Check(err) + err = database.Sync() + helper.Check(err) +} + +func DeleteMetaData(id string) { + deleteKey(prefixFile + id) +} + +// ## Hotlinks ## + +func GetHotlink(id string) (string, bool) { + value, ok := getValue(prefixHotlink + id) + if !ok { + return "", false + } + return string(value), true +} + +func SaveHotlink(id string, file models.File) { + err := database.PutWithTTL([]byte(prefixHotlink+id), []byte(file.Id), expiryToDuration(file)) + helper.Check(err) + err = database.Sync() + helper.Check(err) +} + +func DeleteHotlink(id string) { + deleteKey(prefixHotlink + id) +} + +// ## API Keys ## + +func GetAllApiKeys() map[string]models.ApiKey { + result := make(map[string]models.ApiKey) + var keys []string + err := database.Scan([]byte(prefixApiKey), func(key []byte) error { + apikeyID := strings.Replace(string(key), prefixApiKey, "", 1) + keys = append(keys, apikeyID) + return nil + }) + helper.Check(err) + + for _, key := range keys { + apiKey, ok := GetApiKey(key) + if ok { + result[apiKey.Id] = apiKey + } + } + return result +} + +func GetApiKey(id string) (models.ApiKey, bool) { + result := models.ApiKey{} + value, ok := getValue(prefixApiKey + id) + if !ok { + return result, false + } + buf := bytes.NewBuffer(value) + dec := gob.NewDecoder(buf) + err := dec.Decode(&result) + helper.Check(err) + return result, true +} + +func SaveApiKey(apikey models.ApiKey, updateTimeOnly bool) { + var buf bytes.Buffer + enc := gob.NewEncoder(&buf) + err := enc.Encode(apikey) + helper.Check(err) + err = database.Put([]byte(prefixApiKey+apikey.Id), buf.Bytes()) + helper.Check(err) + if !updateTimeOnly { + err = database.Sync() + helper.Check(err) + } +} + +func DeleteApiKey(id string) { + deleteKey(prefixApiKey + id) +} + +// ## Sessions ## + +func GetSession(id string) (models.Session, bool) { + result := models.Session{} + value, ok := getValue(prefixSessions + id) + if !ok { + return result, false + } + buf := bytes.NewBuffer(value) + dec := gob.NewDecoder(buf) + err := dec.Decode(&result) + helper.Check(err) + return result, true +} + +func DeleteSession(id string) { + deleteKey(prefixSessions + id) +} +func DeleteAllSessions() { + err := database.SiftScan([]byte(prefixSessions), func(key []byte) (bool, error) { + return true, nil + }) + helper.Check(err) +} + +func SaveSession(id string, session models.Session, expiry time.Duration) { + var buf bytes.Buffer + enc := gob.NewEncoder(&buf) + err := enc.Encode(session) + helper.Check(err) + err = database.PutWithTTL([]byte(prefixSessions+id), buf.Bytes(), expiry) + helper.Check(err) + err = database.Sync() + helper.Check(err) +} + +// ## Upload Defaults ## + +func GetUploadDefaults() (int, int, string) { + downloads := 1 + expiry := 14 + password := "" + if database.Has([]byte(idDefaultDownloads)) { + bufByte, err := database.Get([]byte(idDefaultDownloads)) + helper.Check(err) + downloads = byteToInt(bufByte) + } + if database.Has([]byte(idDefaultExpiry)) { + bufByte, err := database.Get([]byte(idDefaultExpiry)) + helper.Check(err) + expiry = byteToInt(bufByte) + } + if database.Has([]byte(idDefaultPassword)) { + buf, err := database.Get([]byte(idDefaultPassword)) + helper.Check(err) + password = string(buf) + } + return downloads, expiry, password +} + +func SaveUploadDefaults(downloads, expiry int, password string) { + err := database.Put([]byte(idDefaultDownloads), intToByte(downloads)) + helper.Check(err) + err = database.Put([]byte(idDefaultExpiry), intToByte(expiry)) + helper.Check(err) + err = database.Put([]byte(idDefaultPassword), []byte(password)) + helper.Check(err) + err = database.Sync() + helper.Check(err) +} + +func RunGc() { + err := database.RunGC() + helper.Check(err) +} + +func intToByte(integer int) []byte { + buf := make([]byte, binary.MaxVarintLen32) + n := binary.PutVarint(buf, int64(integer)) + return buf[:n] +} + +func byteToInt(intByte []byte) int { + integer, _ := binary.Varint(intByte) + return int(integer) +} + +func deleteKey(id string) { + if !database.Has([]byte(id)) { + return + } + err := database.Delete([]byte(id)) + helper.Check(err) + err = database.Sync() + helper.Check(err) +} + +func getValue(id string) ([]byte, bool) { + value, err := database.Get([]byte(id)) + if err == nil { + return value, true + } + if err == bitcask.ErrEmptyKey || err == bitcask.ErrKeyExpired || err == bitcask.ErrKeyNotFound { + return nil, false + } + panic(err) +} + +func expiryToDuration(file models.File) time.Duration { + return time.Until(time.Unix(file.ExpireAt, 0)) +} diff --git a/internal/configuration/dataStorage/DataStorage_test.go b/internal/configuration/dataStorage/DataStorage_test.go new file mode 100644 index 0000000..633ccc4 --- /dev/null +++ b/internal/configuration/dataStorage/DataStorage_test.go @@ -0,0 +1,181 @@ +package dataStorage + +import ( + "Gokapi/internal/environment" + "Gokapi/internal/models" + "Gokapi/internal/test" + "os" + "testing" + "time" +) + +func TestMain(m *testing.M) { + os.Setenv("GOKAPI_CONFIG_DIR", "test") + os.Setenv("GOKAPI_DATA_DIR", "test") + os.Mkdir("test", 0777) + exitVal := m.Run() + os.RemoveAll("test") + os.Exit(exitVal) +} + +func TestInit(t *testing.T) { + Init(environment.New().FileDbPath) + test.IsEqualBool(t, database != nil, true) + // Test that second init doesn't raise an error + Init(environment.New().FileDbPath) +} + +func TestClose(t *testing.T) { + test.IsEqualBool(t, database != nil, true) + Close() + test.IsEqualBool(t, database == nil, true) + Init(environment.New().FileDbPath) +} + +func TestMetaData(t *testing.T) { + files := GetAllMetadata() + test.IsEqualInt(t, len(files), 0) + + SaveMetaData(models.File{Id: "testfile", Name: "test.txt", ExpireAt: time.Now().Add(time.Hour).Unix()}) + files = GetAllMetadata() + test.IsEqualInt(t, len(files), 1) + test.IsEqualString(t, files["testfile"].Name, "test.txt") + + file, ok := GetMetaDataById("testfile") + test.IsEqualBool(t, ok, true) + test.IsEqualString(t, file.Id, "testfile") + _, ok = GetMetaDataById("invalid") + test.IsEqualBool(t, ok, false) + + test.IsEqualInt(t, len(GetAllMetadata()), 1) + DeleteMetaData("invalid") + test.IsEqualInt(t, len(GetAllMetadata()), 1) + DeleteMetaData("testfile") + test.IsEqualInt(t, len(GetAllMetadata()), 0) +} + +func TestHotlink(t *testing.T) { + SaveHotlink("testlink", models.File{Id: "testhfile", Name: "testh.txt", ExpireAt: time.Now().Add(time.Hour).Unix()}) + + hotlink, ok := GetHotlink("testlink") + test.IsEqualBool(t, ok, true) + test.IsEqualString(t, hotlink, "testhfile") + _, ok = GetHotlink("invalid") + test.IsEqualBool(t, ok, false) + + DeleteHotlink("invalid") + _, ok = GetHotlink("testlink") + test.IsEqualBool(t, ok, true) + DeleteHotlink("testlink") + _, ok = GetHotlink("testlink") + test.IsEqualBool(t, ok, false) +} + +func TestApiKey(t *testing.T) { + SaveApiKey(models.ApiKey{ + Id: "newkey", + FriendlyName: "New Key", + LastUsed: 100, + LastUsedString: "LastUsed", + }, false) + SaveApiKey(models.ApiKey{ + Id: "newkey2", + FriendlyName: "New Key2", + LastUsed: 200, + LastUsedString: "LastUsed2", + }, true) + + keys := GetAllApiKeys() + test.IsEqualInt(t, len(keys), 2) + test.IsEqualString(t, keys["newkey"].FriendlyName, "New Key") + test.IsEqualString(t, keys["newkey"].Id, "newkey") + test.IsEqualString(t, keys["newkey"].LastUsedString, "LastUsed") + test.IsEqualBool(t, keys["newkey"].LastUsed == 100, true) + + test.IsEqualInt(t, len(GetAllApiKeys()), 2) + DeleteApiKey("newkey2") + test.IsEqualInt(t, len(GetAllApiKeys()), 1) + + key, ok := GetApiKey("newkey") + test.IsEqualBool(t, ok, true) + test.IsEqualString(t, key.FriendlyName, "New Key") + _, ok = GetApiKey("newkey2") + test.IsEqualBool(t, ok, false) + + SaveApiKey(models.ApiKey{ + Id: "newkey", + FriendlyName: "Old Key", + LastUsed: 100, + LastUsedString: "LastUsed", + }, false) + key, ok = GetApiKey("newkey") + test.IsEqualBool(t, ok, true) + test.IsEqualString(t, key.FriendlyName, "Old Key") +} + +func TestSession(t *testing.T) { + renewAt := time.Now().Add(1 * time.Hour).Unix() + SaveSession("newsession", models.Session{ + RenewAt: renewAt, + ValidUntil: time.Now().Add(2 * time.Hour).Unix(), + }, 2*time.Hour) + + session, ok := GetSession("newsession") + test.IsEqualBool(t, ok, true) + test.IsEqualBool(t, session.RenewAt == renewAt, true) + + DeleteSession("newsession") + _, ok = GetSession("newsession") + test.IsEqualBool(t, ok, false) + + SaveSession("newsession", models.Session{ + RenewAt: renewAt, + ValidUntil: time.Now().Add(2 * time.Hour).Unix(), + }, 2*time.Hour) + + SaveSession("anothersession", models.Session{ + RenewAt: renewAt, + ValidUntil: time.Now().Add(2 * time.Hour).Unix(), + }, 2*time.Hour) + _, ok = GetSession("newsession") + test.IsEqualBool(t, ok, true) + _, ok = GetSession("anothersession") + test.IsEqualBool(t, ok, true) + + DeleteAllSessions() + _, ok = GetSession("newsession") + test.IsEqualBool(t, ok, false) + _, ok = GetSession("anothersession") + test.IsEqualBool(t, ok, false) +} + +func TestUploadDefaults(t *testing.T) { + downloads, expiry, password := GetUploadDefaults() + test.IsEqualInt(t, downloads, 1) + test.IsEqualInt(t, expiry, 14) + test.IsEqualString(t, password, "") + + SaveUploadDefaults(20, 30, "abcd") + downloads, expiry, password = GetUploadDefaults() + test.IsEqualInt(t, downloads, 20) + test.IsEqualInt(t, expiry, 30) + test.IsEqualString(t, password, "abcd") +} + +func TestBinaryConversion(t *testing.T) { + test.IsEqualInt(t, byteToInt(intToByte(0)), 0) + test.IsEqualInt(t, byteToInt(intToByte(-100)), -100) + test.IsEqualInt(t, byteToInt(intToByte(100)), 100) + test.IsEqualInt(t, byteToInt(intToByte(10000)), 10000) + test.IsEqualInt(t, byteToInt(intToByte(2147483647)), 2147483647) + test.IsEqualInt(t, byteToInt(intToByte(-2147483647)), -2147483647) +} + +func TestRunGc(t *testing.T) { + items := database.Len() + database.PutWithTTL([]byte("test"), []byte("value"), 500*time.Millisecond) + test.IsEqualInt(t, database.Len(), items+1) + time.Sleep(501 * time.Millisecond) + RunGc() + test.IsEqualInt(t, database.Len(), items) +} diff --git a/internal/configuration/downloadstatus/DownloadStatus.go b/internal/configuration/downloadstatus/DownloadStatus.go deleted file mode 100644 index 28825a1..0000000 --- a/internal/configuration/downloadstatus/DownloadStatus.go +++ /dev/null @@ -1,58 +0,0 @@ -package downloadstatus - -import ( - "Gokapi/internal/configuration" - "Gokapi/internal/helper" - "Gokapi/internal/models" - "time" -) - -// SetDownload creates a new DownloadStatus struct and returns its Id -func SetDownload(file models.File) string { - status := newDownloadStatus(file) - settings := configuration.GetServerSettings() - settings.DownloadStatus[status.Id] = status - configuration.ReleaseAndSave() - return status.Id -} - -// SetComplete removes the download object -func SetComplete(id string) { - settings := configuration.GetServerSettings() - delete(settings.DownloadStatus, id) - configuration.ReleaseAndSave() -} - -// Clean removes all expires status objects -func Clean() { - settings := configuration.GetServerSettings() - now := time.Now().Unix() - for _, item := range settings.DownloadStatus { - if item.ExpireAt < now { - delete(settings.DownloadStatus, item.Id) - } - } - configuration.Release() -} - -// newDownloadStatus initialises the a new DownloadStatus item -func newDownloadStatus(file models.File) models.DownloadStatus { - s := models.DownloadStatus{ - Id: helper.GenerateRandomString(30), - FileId: file.Id, - ExpireAt: time.Now().Add(24 * time.Hour).Unix(), - } - return s -} - -// IsCurrentlyDownloading returns true if file is currently being downloaded -func IsCurrentlyDownloading(file models.File, settings *models.Configuration) bool { - for _, status := range settings.DownloadStatus { - if status.FileId == file.Id { - if status.ExpireAt > time.Now().Unix() { - return true - } - } - } - return false -} diff --git a/internal/configuration/downloadstatus/DownloadStatus_test.go b/internal/configuration/downloadstatus/DownloadStatus_test.go deleted file mode 100644 index 3e26a8d..0000000 --- a/internal/configuration/downloadstatus/DownloadStatus_test.go +++ /dev/null @@ -1,87 +0,0 @@ -//go:build test -// +build test - -package downloadstatus - -import ( - "Gokapi/internal/configuration" - "Gokapi/internal/models" - "Gokapi/internal/test" - "Gokapi/internal/test/testconfiguration" - "os" - "testing" - "time" -) - -var testFile models.File -var statusId string - -func TestMain(m *testing.M) { - testconfiguration.Create(false) - configuration.Load() - settings := configuration.GetServerSettings() - settings.DownloadStatus = make(map[string]models.DownloadStatus) - testFile = models.File{ - Id: "test", - Name: "testName", - Size: "3 B", - SHA256: "123456", - ExpireAt: 500, - ExpireAtString: "expire", - DownloadsRemaining: 1, - } - configuration.Release() - exitVal := m.Run() - testconfiguration.Delete() - os.Exit(exitVal) -} - -func TestNewDownloadStatus(t *testing.T) { - status := newDownloadStatus(models.File{Id: "testId"}) - test.IsNotEmpty(t, status.Id) - test.IsEqualString(t, status.FileId, "testId") - test.IsEqualBool(t, status.ExpireAt > time.Now().Unix(), true) -} - -func TestSetDownload(t *testing.T) { - statusId = SetDownload(testFile) - settings := configuration.GetServerSettings() - status := settings.DownloadStatus[statusId] - configuration.Release() - test.IsNotEmpty(t, status.Id) - test.IsEqualString(t, status.Id, statusId) - test.IsEqualString(t, status.FileId, testFile.Id) - test.IsEqualBool(t, status.ExpireAt > time.Now().Unix(), true) -} - -func TestSetComplete(t *testing.T) { - settings := configuration.GetServerSettings() - status := settings.DownloadStatus[statusId] - configuration.Release() - test.IsNotEmpty(t, status.Id) - SetComplete(statusId) - status = settings.DownloadStatus[statusId] - test.IsEmpty(t, status.Id) -} - -func TestIsCurrentlyDownloading(t *testing.T) { - statusId = SetDownload(testFile) - settings := configuration.GetServerSettings() - configuration.Release() - test.IsEqualBool(t, IsCurrentlyDownloading(testFile, settings), true) - test.IsEqualBool(t, IsCurrentlyDownloading(models.File{Id: "notDownloading"}, settings), false) -} - -func TestClean(t *testing.T) { - settings := configuration.GetServerSettings() - configuration.Release() - test.IsEqualInt(t, len(settings.DownloadStatus), 1) - Clean() - test.IsEqualInt(t, len(settings.DownloadStatus), 1) - status := settings.DownloadStatus[statusId] - status.ExpireAt = 1 - settings.DownloadStatus[statusId] = status - test.IsEqualInt(t, len(settings.DownloadStatus), 1) - Clean() - test.IsEqualInt(t, len(settings.DownloadStatus), 0) -} diff --git a/internal/configuration/setup/Setup.go b/internal/configuration/setup/Setup.go index 55fa687..2d25998 100644 --- a/internal/configuration/setup/Setup.go +++ b/internal/configuration/setup/Setup.go @@ -168,18 +168,11 @@ func toConfiguration(formObjects *[]jsonFormObject) (models.Configuration, *clou parsedEnv := environment.New() result := models.Configuration{ - DefaultDownloads: 1, - DefaultExpiry: 14, - MaxFileSizeMB: parsedEnv.MaxFileSize, - LengthId: parsedEnv.LengthId, - MaxMemory: parsedEnv.MaxMemory, - DataDir: parsedEnv.DataDir, - Sessions: make(map[string]models.Session), - Files: make(map[string]models.File), - Hotlinks: make(map[string]models.Hotlink), - DownloadStatus: make(map[string]models.DownloadStatus), - ApiKeys: make(map[string]models.ApiKey), - ConfigVersion: configUpgrade.CurrentConfigVersion, + MaxFileSizeMB: parsedEnv.MaxFileSize, + LengthId: parsedEnv.LengthId, + MaxMemory: parsedEnv.MaxMemory, + DataDir: parsedEnv.DataDir, + ConfigVersion: configUpgrade.CurrentConfigVersion, Authentication: models.AuthenticationConfig{ SaltAdmin: helper.GenerateRandomString(30), SaltFiles: helper.GenerateRandomString(30), @@ -375,9 +368,9 @@ func splitAndTrim(input string) []string { type setupView struct { IsInitialSetup bool - LocalhostOnly bool - HasAwsFeature bool - Port int + LocalhostOnly bool + HasAwsFeature bool + Port int OAuthUsers string HeaderUsers string Auth models.AuthenticationConfig @@ -391,7 +384,7 @@ func (v *setupView) loadFromConfig() { return } configuration.Load() - settings := configuration.GetServerSettingsReadOnly() + settings := configuration.Get() v.HasAwsFeature = aws.IsIncludedInBuild v.Settings = *settings v.Auth = settings.Authentication @@ -409,7 +402,6 @@ func (v *setupView) loadFromConfig() { } else { v.Port = environment.DefaultPort } - configuration.ReleaseReadOnly() } // Handling of /start diff --git a/internal/configuration/setup/Setup_test.go b/internal/configuration/setup/Setup_test.go index e2e0d08..5ca9d21 100644 --- a/internal/configuration/setup/Setup_test.go +++ b/internal/configuration/setup/Setup_test.go @@ -46,24 +46,16 @@ func TestInputToJson(t *testing.T) { } var config = models.Configuration{ - Authentication: models.AuthenticationConfig{}, - Port: "", - ServerUrl: "", - DefaultDownloads: 0, - DefaultExpiry: 0, - DefaultPassword: "", - RedirectUrl: "", - Sessions: nil, - Files: nil, - Hotlinks: nil, - DownloadStatus: nil, - ApiKeys: nil, - ConfigVersion: 0, - LengthId: 0, - DataDir: "", - MaxMemory: 0, - UseSsl: false, - MaxFileSizeMB: 0, + Authentication: models.AuthenticationConfig{}, + Port: "", + ServerUrl: "", + RedirectUrl: "", + ConfigVersion: 0, + LengthId: 0, + DataDir: "", + MaxMemory: 0, + UseSsl: false, + MaxFileSizeMB: 0, } func TestToConfiguration(t *testing.T) { @@ -139,7 +131,7 @@ func TestInitialSetup(t *testing.T) { test.CompletesWithinTime(t, RunIfFirstStart, 3*time.Second) testconfiguration.Delete() go func() { - time.Sleep(2 * time.Second) + time.Sleep(1 * time.Second) srv.Shutdown(context.Background()) }() RunIfFirstStart() @@ -151,7 +143,7 @@ func TestRunConfigModification(t *testing.T) { username = "" password = "" go func() { - time.Sleep(2 * time.Second) + time.Sleep(1 * time.Second) test.HttpPageResult(t, test.HttpTestConfig{ Url: "http://localhost:53842/setup/start", IsHtml: false, @@ -172,7 +164,7 @@ func TestIntegration(t *testing.T) { testconfiguration.Delete() test.FileDoesNotExist(t, "test/config.json") go RunIfFirstStart() - time.Sleep(2 * time.Second) + time.Sleep(1 * time.Second) test.HttpPageResult(t, test.HttpTestConfig{ Url: "http://localhost:53842/admin", @@ -209,10 +201,9 @@ func TestIntegration(t *testing.T) { Body: strings.NewReader(testInputInternalAuth), }) - time.Sleep(2 * time.Second) + time.Sleep(1 * time.Second) test.FileExists(t, "test/config.json") - settings := configuration.GetServerSettingsReadOnly() - configuration.ReleaseReadOnly() + settings := configuration.Get() test.IsEqualInt(t, settings.Authentication.Method, 0) test.IsEqualString(t, settings.Authentication.Username, "admin") test.IsEqualString(t, settings.Authentication.OauthProvider, "") @@ -238,7 +229,7 @@ func TestIntegration(t *testing.T) { test.FileExists(t, "test/cloudconfig.yml") go RunConfigModification() - time.Sleep(2 * time.Second) + time.Sleep(1 * time.Second) username = "test" password = "testpw" @@ -282,10 +273,9 @@ func TestIntegration(t *testing.T) { Body: strings.NewReader(testInputHeaderAuth), }) - time.Sleep(2 * time.Second) + time.Sleep(1 * time.Second) test.FileExists(t, "test/config.json") - settings = configuration.GetServerSettingsReadOnly() - configuration.ReleaseReadOnly() + settings = configuration.Get() test.IsEqualInt(t, settings.Authentication.Method, 2) test.IsEqualString(t, settings.Authentication.Username, "") test.IsEqualString(t, settings.Authentication.OauthProvider, "") @@ -311,7 +301,7 @@ func TestIntegration(t *testing.T) { test.FileDoesNotExist(t, "test/cloudconfig.yml") go RunConfigModification() - time.Sleep(2 * time.Second) + time.Sleep(1 * time.Second) username = "test" password = "testpw" @@ -326,7 +316,7 @@ func TestIntegration(t *testing.T) { Body: strings.NewReader(testInputOauth), }) - time.Sleep(2 * time.Second) + time.Sleep(1 * time.Second) test.IsEqualString(t, settings.Authentication.OauthProvider, "provider") test.IsEqualString(t, settings.Authentication.OAuthClientId, "id") diff --git a/internal/environment/Environment.go b/internal/environment/Environment.go index b5aeb69..b002e94 100644 --- a/internal/environment/Environment.go +++ b/internal/environment/Environment.go @@ -26,6 +26,8 @@ type Environment struct { AwsKeySecret string `env:"AWS_KEY_SECRET"` AwsEndpoint string `env:"AWS_ENDPOINT"` ConfigPath string + FileDbPath string + FileDb string `env:"FILE_DB" envDefault:"filestorage.db"` } // New parses the env variables @@ -41,6 +43,7 @@ func New() Environment { } helper.Check(err) result.ConfigPath = result.ConfigDir + "/" + result.ConfigFile + result.FileDbPath = result.DataDir + "/" + result.FileDb if IsDocker == "true" && os.Getenv("TMPDIR") == "" { os.Setenv("TMPDIR", result.DataDir) } diff --git a/internal/models/Configuration.go b/internal/models/Configuration.go index a1586af..d6f747a 100644 --- a/internal/models/Configuration.go +++ b/internal/models/Configuration.go @@ -2,22 +2,14 @@ package models // Configuration is a struct that contains the global configuration type Configuration struct { - Authentication AuthenticationConfig `json:"Authentication"` - Port string `json:"Port"` - ServerUrl string `json:"ServerUrl"` - DefaultDownloads int `json:"DefaultDownloads"` - DefaultExpiry int `json:"DefaultExpiry"` - DefaultPassword string `json:"DefaultPassword"` - RedirectUrl string `json:"RedirectUrl"` - Sessions map[string]Session `json:"Sessions"` - Files map[string]File `json:"Files"` - Hotlinks map[string]Hotlink `json:"Hotlinks"` - DownloadStatus map[string]DownloadStatus `json:"DownloadStatus"` - ApiKeys map[string]ApiKey `json:"ApiKeys"` - ConfigVersion int `json:"ConfigVersion"` - LengthId int `json:"LengthId"` - DataDir string `json:"DataDir"` - MaxMemory int `json:"MaxMemory"` - UseSsl bool `json:"UseSsl"` - MaxFileSizeMB int `json:"MaxFileSizeMB"` + Authentication AuthenticationConfig `json:"Authentication"` + Port string `json:"Port"` + ServerUrl string `json:"ServerUrl"` + RedirectUrl string `json:"RedirectUrl"` + ConfigVersion int `json:"ConfigVersion"` + LengthId int `json:"LengthId"` + DataDir string `json:"DataDir"` + MaxMemory int `json:"MaxMemory"` + UseSsl bool `json:"UseSsl"` + MaxFileSizeMB int `json:"MaxFileSizeMB"` } diff --git a/internal/models/FileList.go b/internal/models/FileList.go index f3e7d23..944c9ac 100644 --- a/internal/models/FileList.go +++ b/internal/models/FileList.go @@ -36,12 +36,6 @@ func (f *File) ToJsonResult(serverUrl string) string { return string(bytes) } -// Hotlink is a struct containing hotlink ids -type Hotlink struct { - Id string `json:"Id"` - FileId string `json:"FileId"` -} - // Result is the struct used for the result after an upload // swagger:model UploadResult type Result struct { @@ -51,6 +45,7 @@ type Result struct { HotlinkUrl string `json:"HotlinkUrl"` } + // DownloadStatus contains current downloads, so they do not get removed during cleanup type DownloadStatus struct { Id string diff --git a/internal/storage/FileServing.go b/internal/storage/FileServing.go index d32b70d..bb07e3c 100644 --- a/internal/storage/FileServing.go +++ b/internal/storage/FileServing.go @@ -6,11 +6,12 @@ Serving and processing uploaded files import ( "Gokapi/internal/configuration" - "Gokapi/internal/configuration/downloadstatus" + "Gokapi/internal/configuration/dataStorage" "Gokapi/internal/helper" "Gokapi/internal/logging" "Gokapi/internal/models" "Gokapi/internal/storage/cloudstorage/aws" + "Gokapi/internal/webserver/downloadstatus" "bytes" "crypto/sha1" "encoding/hex" @@ -31,11 +32,8 @@ import ( // already exists, it is deduplicated. This function gathers information about the file, creates an ID and saves // it into the global configuration. func NewFile(fileContent io.Reader, fileHeader *multipart.FileHeader, uploadRequest models.UploadRequest) (models.File, error) { - id := helper.GenerateRandomString(configuration.GetLengthId()) - settings := configuration.GetServerSettingsReadOnly() - maxSize := settings.MaxFileSizeMB - configuration.ReleaseReadOnly() - if fileHeader.Size > int64(maxSize)*1024*1024 { + id := helper.GenerateRandomString(configuration.Get().LengthId) + if fileHeader.Size > int64(configuration.Get().MaxFileSizeMB)*1024*1024 { return models.File{}, errors.New("upload limit exceeded") } var hasBeenRenamed bool @@ -56,11 +54,8 @@ func NewFile(fileContent io.Reader, fileHeader *multipart.FileHeader, uploadRequ if aws.IsAvailable() { aws.AddBucketName(&file) } - settings = configuration.GetServerSettings() - filename := settings.DataDir + "/" + file.SHA256 - dataDir := settings.DataDir - settings.Files[id] = file - configuration.ReleaseAndSave() + filename := configuration.Get().DataDir + "/" + file.SHA256 + dataDir := configuration.Get().DataDir if aws.IsAvailable() { aws.AddBucketName(&file) _, err := aws.Upload(reader, file) @@ -88,6 +83,7 @@ func NewFile(fileContent io.Reader, fileHeader *multipart.FileHeader, uploadRequ return models.File{}, err } } + dataStorage.SaveMetaData(file) return file, nil } @@ -131,12 +127,7 @@ func addHotlink(file *models.File) { } link := helper.GenerateRandomString(40) + extension file.HotlinkId = link - settings := configuration.GetServerSettings() - settings.Hotlinks[link] = models.Hotlink{ - Id: link, - FileId: file.Id, - } - configuration.Release() + dataStorage.SaveHotlink(link, *file) } // GetFile gets the file by id. Returns (empty File, false) if invalid / expired file @@ -146,13 +137,14 @@ func GetFile(id string) (models.File, bool) { if id == "" { return emptyResult, false } - settings := configuration.GetServerSettingsReadOnly() - defer configuration.ReleaseReadOnly() - file := settings.Files[id] + file, ok := dataStorage.GetMetaDataById(id) + if !ok { + return emptyResult, false + } if file.ExpireAt < time.Now().Unix() || file.DownloadsRemaining < 1 { return emptyResult, false } - if !FileExists(file, settings.DataDir) { + if !FileExists(file, configuration.Get().DataDir) { return emptyResult, false } return file, true @@ -165,25 +157,23 @@ func GetFileByHotlink(id string) (models.File, bool) { if id == "" { return emptyResult, false } - settings := configuration.GetServerSettingsReadOnly() - hotlink := settings.Hotlinks[id] - configuration.ReleaseReadOnly() - return GetFile(hotlink.FileId) + fileId, ok := dataStorage.GetHotlink(id) + if !ok { + return emptyResult, false + } + return GetFile(fileId) } // ServeFile subtracts a download allowance and serves the file to the browser func ServeFile(file models.File, w http.ResponseWriter, r *http.Request, forceDownload bool) { file.DownloadsRemaining = file.DownloadsRemaining - 1 - settings := configuration.GetServerSettings() - settings.Files[file.Id] = file - dataDir := settings.DataDir - configuration.Release() + dataStorage.SaveMetaData(file) logging.AddDownload(&file, r) // If file is not stored on AWS if file.AwsBucket == "" { - storageData, size := getFileHandler(file, dataDir) - defer storageData.Close() + fileData, size := getFileHandler(file, configuration.Get().DataDir) + defer fileData.Close() if forceDownload { w.Header().Set("Content-Disposition", "attachment; filename=\""+file.Name+"\"") } else { @@ -192,7 +182,7 @@ func ServeFile(file models.File, w http.ResponseWriter, r *http.Request, forceDo w.Header().Set("Content-Length", strconv.FormatInt(size, 10)) w.Header().Set("Content-Type", file.ContentType) statusId := downloadstatus.SetDownload(file) - http.ServeContent(w, r, file.Name, time.Now(), storageData) + http.ServeContent(w, r, file.Name, time.Now(), fileData) downloadstatus.SetComplete(statusId) } else { // If file is stored on AWS @@ -229,34 +219,31 @@ func FileExists(file models.File, dataDir string) bool { // Will be called periodically or after a file has been manually deleted in the admin view. // If parameter periodic is true, this function is recursive and calls itself every hour. func CleanUp(periodic bool) { + dataStorage.RunGc() downloadstatus.Clean() timeNow := time.Now().Unix() wasItemDeleted := false - settings := configuration.GetServerSettings() - for key, element := range settings.Files { - fileExists := FileExists(element, settings.DataDir) - if (element.ExpireAt < timeNow || element.DownloadsRemaining < 1 || !fileExists) && !downloadstatus.IsCurrentlyDownloading(element, settings) { + for key, element := range dataStorage.GetAllMetadata() { + fileExists := FileExists(element, configuration.Get().DataDir) + if (element.ExpireAt < timeNow || element.DownloadsRemaining < 1 || !fileExists) && !downloadstatus.IsCurrentlyDownloading(element) { deleteFile := true - for _, secondLoopElement := range settings.Files { + for _, secondLoopElement := range dataStorage.GetAllMetadata() { if element.Id != secondLoopElement.Id && element.SHA256 == secondLoopElement.SHA256 { deleteFile = false } } if deleteFile && fileExists { - deleteSource(element, settings.DataDir) + deleteSource(element, configuration.Get().DataDir) } if element.HotlinkId != "" { - delete(settings.Hotlinks, element.HotlinkId) + dataStorage.DeleteHotlink(element.HotlinkId) } - delete(settings.Files, key) + dataStorage.DeleteMetaData(key) wasItemDeleted = true } } if wasItemDeleted { - configuration.ReleaseAndSave() CleanUp(false) - } else { - configuration.Release() } if periodic { time.Sleep(time.Hour) @@ -283,21 +270,17 @@ func DeleteFile(keyId string) bool { if keyId == "" { return false } - settings := configuration.GetServerSettings() - item, ok := settings.Files[keyId] + item, ok := dataStorage.GetMetaDataById(keyId) if !ok { - configuration.Release() return false } item.ExpireAt = 0 - settings.Files[keyId] = item - for _, status := range settings.DownloadStatus { + dataStorage.SaveMetaData(item) + for _, status := range downloadstatus.GetAll() { if status.FileId == item.Id { - status.ExpireAt = 0 - settings.DownloadStatus[status.Id] = status + downloadstatus.SetComplete(status.Id) } } - configuration.Release() CleanUp(false) return true } diff --git a/internal/storage/FileServing_test.go b/internal/storage/FileServing_test.go index 108571c..514e328 100644 --- a/internal/storage/FileServing_test.go +++ b/internal/storage/FileServing_test.go @@ -6,10 +6,12 @@ package storage import ( "Gokapi/internal/configuration" "Gokapi/internal/configuration/cloudconfig" + "Gokapi/internal/configuration/dataStorage" "Gokapi/internal/models" "Gokapi/internal/storage/cloudstorage/aws" "Gokapi/internal/test" "Gokapi/internal/test/testconfiguration" + "Gokapi/internal/webserver/downloadstatus" "bytes" "io" "io/ioutil" @@ -18,6 +20,7 @@ import ( "net/textproto" "os" "testing" + "time" ) func TestMain(m *testing.M) { @@ -56,8 +59,8 @@ func TestGetFileByHotlink(t *testing.T) { test.IsEqualBool(t, result, false) _, result = GetFileByHotlink("") test.IsEqualBool(t, result, false) - file, result := GetFileByHotlink("PhSs6mFtf8O5YGlLMfNw9rYXx9XRNkzCnJZpQBi7inunv3Z4A.jpg") - test.IsEqualBool(t, result, true) + file, ok := GetFileByHotlink("PhSs6mFtf8O5YGlLMfNw9rYXx9XRNkzCnJZpQBi7inunv3Z4A.jpg") + test.IsEqualBool(t, ok, true) test.IsEqualString(t, file.Id, "n1tSTAGj8zan9KaT4u6p") test.IsEqualString(t, file.Name, "picture.jpg") test.IsEqualString(t, file.Size, "4 B") @@ -65,18 +68,17 @@ func TestGetFileByHotlink(t *testing.T) { } func TestAddHotlink(t *testing.T) { - file := models.File{Name: "test.dat", Id: "testIdE"} + file := models.File{Name: "test.dat", Id: "testId"} addHotlink(&file) test.IsEqualString(t, file.HotlinkId, "") - file = models.File{Name: "test.jpg", Id: "testId"} + file = models.File{Name: "test.jpg", Id: "testId", ExpireAt: time.Now().Add(time.Hour).Unix()} addHotlink(&file) test.IsEqualInt(t, len(file.HotlinkId), 44) lastCharacters := file.HotlinkId[len(file.HotlinkId)-4:] test.IsEqualBool(t, lastCharacters == ".jpg", true) - settings := configuration.GetServerSettings() - test.IsEqualString(t, settings.Hotlinks[file.HotlinkId].FileId, "testId") - test.IsEqualString(t, settings.Hotlinks[file.HotlinkId].Id, file.HotlinkId) - configuration.Release() + link, ok := dataStorage.GetHotlink(file.HotlinkId) + test.IsEqualBool(t, ok, true) + test.IsEqualString(t, link, "testId") } func TestNewFile(t *testing.T) { @@ -142,7 +144,7 @@ func TestNewFile(t *testing.T) { bigFile.Close() os.Remove("bigfile") - createBigFile("bigfile", 30) + createBigFile("bigfile", 50) bigFile, _ = os.Open("bigfile") mimeHeader = make(textproto.MIMEHeader) mimeHeader.Set("Content-Disposition", "form-data; name=\"file\"; filename=\"bigfile\"") @@ -150,7 +152,7 @@ func TestNewFile(t *testing.T) { header = multipart.FileHeader{ Filename: "bigfile", Header: mimeHeader, - Size: int64(30) * 1024 * 1024, + Size: int64(50) * 1024 * 1024, } request = models.UploadRequest{ AllowedDownloads: 1, @@ -228,69 +230,78 @@ func TestServeFile(t *testing.T) { } func TestCleanUp(t *testing.T) { - settings := configuration.GetServerSettings() - configuration.Release() - test.IsEqualString(t, settings.Files["cleanuptest123456789"].Name, "cleanup") - test.IsEqualString(t, settings.Files["Wzol7LyY2QVczXynJtVo"].Name, "smallfile2") - test.IsEqualString(t, settings.Files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") - test.IsEqualString(t, settings.Files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") - test.IsEqualString(t, settings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "picture.jpg") - test.IsEqualString(t, settings.Files["deletedfile123456789"].Name, "DeletedFile") + files := dataStorage.GetAllMetadata() + downloadstatus.Init() + downloadstatus.SetDownload(files["cleanuptest123456789"]) + + test.IsEqualString(t, files["cleanuptest123456789"].Name, "cleanup") + test.IsEqualString(t, files["Wzol7LyY2QVczXynJtVo"].Name, "smallfile2") + test.IsEqualString(t, files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") + test.IsEqualString(t, files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") + test.IsEqualString(t, files["n1tSTAGj8zan9KaT4u6p"].Name, "picture.jpg") + test.IsEqualString(t, files["deletedfile123456789"].Name, "DeletedFile") test.FileExists(t, "test/data/2341354656543213246465465465432456898794") CleanUp(false) - test.IsEqualString(t, settings.Files["cleanuptest123456789"].Name, "cleanup") + files = dataStorage.GetAllMetadata() + test.IsEqualString(t, files["cleanuptest123456789"].Name, "cleanup") test.FileExists(t, "test/data/2341354656543213246465465465432456898794") - test.IsEqualString(t, settings.Files["deletedfile123456789"].Name, "") - test.IsEqualString(t, settings.Files["Wzol7LyY2QVczXynJtVo"].Name, "smallfile2") - test.IsEqualString(t, settings.Files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") - test.IsEqualString(t, settings.Files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") - test.IsEqualString(t, settings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "picture.jpg") + test.IsEqualString(t, files["deletedfile123456789"].Name, "") + test.IsEqualString(t, files["Wzol7LyY2QVczXynJtVo"].Name, "smallfile2") + test.IsEqualString(t, files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") + test.IsEqualString(t, files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") + test.IsEqualString(t, files["n1tSTAGj8zan9KaT4u6p"].Name, "picture.jpg") file, _ := GetFile("n1tSTAGj8zan9KaT4u6p") file.DownloadsRemaining = 0 - settings.Files["n1tSTAGj8zan9KaT4u6p"] = file + dataStorage.SaveMetaData(file) + files = dataStorage.GetAllMetadata() CleanUp(false) + files = dataStorage.GetAllMetadata() test.FileDoesNotExist(t, "test/data/a8fdc205a9f19cc1c7507a60c4f01b13d11d7fd0") - test.IsEqualString(t, settings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "") - test.IsEqualString(t, settings.Files["deletedfile123456789"].Name, "") - test.IsEqualString(t, settings.Files["Wzol7LyY2QVczXynJtVo"].Name, "smallfile2") - test.IsEqualString(t, settings.Files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") - test.IsEqualString(t, settings.Files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") + test.IsEqualString(t, files["n1tSTAGj8zan9KaT4u6p"].Name, "") + test.IsEqualString(t, files["deletedfile123456789"].Name, "") + test.IsEqualString(t, files["Wzol7LyY2QVczXynJtVo"].Name, "smallfile2") + test.IsEqualString(t, files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") + test.IsEqualString(t, files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") file, _ = GetFile("Wzol7LyY2QVczXynJtVo") file.DownloadsRemaining = 0 - settings.Files["Wzol7LyY2QVczXynJtVo"] = file + dataStorage.SaveMetaData(file) CleanUp(false) + files = dataStorage.GetAllMetadata() test.FileExists(t, "test/data/e017693e4a04a59d0b0f400fe98177fe7ee13cf7") - test.IsEqualString(t, settings.Files["Wzol7LyY2QVczXynJtVo"].Name, "") - test.IsEqualString(t, settings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "") - test.IsEqualString(t, settings.Files["deletedfile123456789"].Name, "") - test.IsEqualString(t, settings.Files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") - test.IsEqualString(t, settings.Files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") + test.IsEqualString(t, files["Wzol7LyY2QVczXynJtVo"].Name, "") + test.IsEqualString(t, files["n1tSTAGj8zan9KaT4u6p"].Name, "") + test.IsEqualString(t, files["deletedfile123456789"].Name, "") + test.IsEqualString(t, files["e4TjE7CokWK0giiLNxDL"].Name, "smallfile2") + test.IsEqualString(t, files["wefffewhtrhhtrhtrhtr"].Name, "smallfile3") file, _ = GetFile("e4TjE7CokWK0giiLNxDL") file.DownloadsRemaining = 0 - settings.Files["e4TjE7CokWK0giiLNxDL"] = file + dataStorage.SaveMetaData(file) file, _ = GetFile("wefffewhtrhhtrhtrhtr") file.DownloadsRemaining = 0 - settings.Files["wefffewhtrhhtrhtrhtr"] = file + dataStorage.SaveMetaData(file) CleanUp(false) + files = dataStorage.GetAllMetadata() test.FileDoesNotExist(t, "test/data/e017693e4a04a59d0b0f400fe98177fe7ee13cf7") - test.IsEqualString(t, settings.Files["Wzol7LyY2QVczXynJtVo"].Name, "") - test.IsEqualString(t, settings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "") - test.IsEqualString(t, settings.Files["deletedfile123456789"].Name, "") - test.IsEqualString(t, settings.Files["e4TjE7CokWK0giiLNxDL"].Name, "") - test.IsEqualString(t, settings.Files["wefffewhtrhhtrhtrhtr"].Name, "") + test.IsEqualString(t, files["Wzol7LyY2QVczXynJtVo"].Name, "") + test.IsEqualString(t, files["n1tSTAGj8zan9KaT4u6p"].Name, "") + test.IsEqualString(t, files["deletedfile123456789"].Name, "") + test.IsEqualString(t, files["e4TjE7CokWK0giiLNxDL"].Name, "") + test.IsEqualString(t, files["wefffewhtrhhtrhtrhtr"].Name, "") - test.IsEqualString(t, settings.Files["cleanuptest123456789"].Name, "cleanup") + test.IsEqualString(t, files["cleanuptest123456789"].Name, "cleanup") test.FileExists(t, "test/data/2341354656543213246465465465432456898794") - settings.DownloadStatus = make(map[string]models.DownloadStatus) + + downloadstatus.Init() CleanUp(false) - test.IsEqualString(t, settings.Files["cleanuptest123456789"].Name, "") + files = dataStorage.GetAllMetadata() + test.IsEqualString(t, files["cleanuptest123456789"].Name, "") test.FileDoesNotExist(t, "test/data/2341354656543213246465465465432456898794") if aws.IsIncludedInBuild { @@ -299,7 +310,7 @@ func TestCleanUp(t *testing.T) { test.IsEqualBool(t, ok, true) ok = aws.Init(config.Aws) test.IsEqualBool(t, ok, true) - test.IsEqualString(t, settings.Files["awsTest1234567890123"].Name, "Aws Test File") + test.IsEqualString(t, files["awsTest1234567890123"].Name, "Aws Test File") testconfiguration.DisableS3() } } @@ -307,13 +318,13 @@ func TestCleanUp(t *testing.T) { func TestDeleteFile(t *testing.T) { testconfiguration.Create(true) configuration.Load() - settings := configuration.GetServerSettings() - configuration.Release() - test.IsEqualString(t, settings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "picture.jpg") + files := dataStorage.GetAllMetadata() + test.IsEqualString(t, files["n1tSTAGj8zan9KaT4u6p"].Name, "picture.jpg") test.FileExists(t, "test/data/a8fdc205a9f19cc1c7507a60c4f01b13d11d7fd0") result := DeleteFile("n1tSTAGj8zan9KaT4u6p") test.IsEqualBool(t, result, true) - test.IsEqualString(t, settings.Files["n1tSTAGj8zan9KaT4u6p"].Name, "") + files = dataStorage.GetAllMetadata() + test.IsEqualString(t, files["n1tSTAGj8zan9KaT4u6p"].Name, "") test.FileDoesNotExist(t, "test/data/a8fdc205a9f19cc1c7507a60c4f01b13d11d7fd0") result = DeleteFile("invalid") test.IsEqualBool(t, result, false) @@ -333,8 +344,9 @@ func TestDeleteFile(t *testing.T) { SHA256: "x341354656543213246465465465432456898794", AwsBucket: "gokapi-test", } - settings.Files["awsTest1234567890123"] = awsFile - result, err := aws.FileExists(settings.Files["awsTest1234567890123"]) + dataStorage.SaveMetaData(awsFile) + files = dataStorage.GetAllMetadata() + result, err := aws.FileExists(files["awsTest1234567890123"]) test.IsEqualBool(t, result, true) test.IsNil(t, err) DeleteFile("awsTest1234567890123") diff --git a/internal/test/testconfiguration/TestConfiguration.go b/internal/test/testconfiguration/TestConfiguration.go index b19e699..84bdbb6 100644 --- a/internal/test/testconfiguration/TestConfiguration.go +++ b/internal/test/testconfiguration/TestConfiguration.go @@ -4,6 +4,8 @@ package testconfiguration import ( + "Gokapi/internal/configuration/dataStorage" + "Gokapi/internal/models" "Gokapi/internal/storage/cloudstorage/aws" "bytes" "fmt" @@ -11,6 +13,7 @@ import ( "github.com/johannesboyne/gofakes3/backend/s3mem" "net/http/httptest" "os" + "time" ) const ( @@ -29,6 +32,14 @@ func SetDirEnv() { func Create(initFiles bool) { SetDirEnv() os.WriteFile(configFile, configTestFile, 0777) + dataStorage.Init("./test/filestorage.db") + writeTestSessions() + dataStorage.SaveUploadDefaults(3, 20, "123") + writeTestFiles() + dataStorage.SaveHotlink("PhSs6mFtf8O5YGlLMfNw9rYXx9XRNkzCnJZpQBi7inunv3Z4A.jpg", models.File{Id: "n1tSTAGj8zan9KaT4u6p", ExpireAt: time.Now().Add(time.Hour).Unix()}) + writeApiKeyys() + dataStorage.Close() + if initFiles { os.Mkdir("test/data", 0777) os.WriteFile("test/data/a8fdc205a9f19cc1c7507a60c4f01b13d11d7fd0", []byte("123"), 0777) @@ -44,6 +55,7 @@ func WriteUpgradeConfigFileV0() { os.Mkdir(dataDir, 0777) os.WriteFile(configFile, configUpgradeTestFile, 0777) } + // WriteUpgradeConfigFileV8 writes a Gokapi v1.3 config file func WriteUpgradeConfigFileV8() { os.Mkdir(dataDir, 0777) @@ -123,190 +135,166 @@ func DisableS3() { os.Unsetenv("AWS_SECRET_ACCESS_KEY") } +func writeTestSessions() { + dataStorage.SaveSession("validsession", models.Session{ + RenewAt: 2147483645, + ValidUntil: 2147483646, + }, 1*time.Hour) + dataStorage.SaveSession("logoutsession", models.Session{ + RenewAt: 2147483645, + ValidUntil: 2147483646, + }, 1*time.Hour) + dataStorage.SaveSession("needsRenewal", models.Session{ + RenewAt: 0, + ValidUntil: 2147483646, + }, 1*time.Hour) + dataStorage.SaveSession("expiredsession", models.Session{ + RenewAt: 0, + ValidUntil: 0, + }, 1*time.Hour) +} + +func writeApiKeyys() { + dataStorage.SaveApiKey(models.ApiKey{ + Id: "validkey", + FriendlyName: "First Key", + }, false) + dataStorage.SaveApiKey(models.ApiKey{ + Id: "GAh1IhXDvYnqfYLazWBqMB9HSFmNPO", + FriendlyName: "Second Key", + LastUsed: 1620671580, + LastUsedString: "used", + }, false) + dataStorage.SaveApiKey(models.ApiKey{ + Id: "jiREglQJW0bOqJakfjdVfe8T1EM8n8", + FriendlyName: "Unnamed Key", + }, false) + dataStorage.SaveApiKey(models.ApiKey{ + Id: "okeCMWqhVMZSpt5c1qpCWhKvJJPifb", + FriendlyName: "Unnamed Key", + }, false) +} + +func writeTestFiles() { + dataStorage.SaveMetaData(models.File{ + Id: "Wzol7LyY2QVczXynJtVo", + Name: "smallfile2", + Size: "8 B", + SHA256: "e017693e4a04a59d0b0f400fe98177fe7ee13cf7", + ExpireAt: 2147483646, + ExpireAtString: "2021-05-04 15:19", + DownloadsRemaining: 1, + ContentType: "text/html", + }) + dataStorage.SaveMetaData(models.File{ + Id: "e4TjE7CokWK0giiLNxDL", + Name: "smallfile2", + Size: "8 B", + SHA256: "e017693e4a04a59d0b0f400fe98177fe7ee13cf7", + ExpireAt: 2147483645, + ExpireAtString: "2021-05-04 15:19", + DownloadsRemaining: 2, + ContentType: "text/html", + }) + dataStorage.SaveMetaData(models.File{ + Id: "wefffewhtrhhtrhtrhtr", + Name: "smallfile3", + Size: "8 B", + SHA256: "e017693e4a04a59d0b0f400fe98177fe7ee13cf7", + ExpireAt: 2147483645, + ExpireAtString: "2021-05-04 15:19", + DownloadsRemaining: 1, + ContentType: "text/html", + }) + dataStorage.SaveMetaData(models.File{ + Id: "deletedfile123456789", + Name: "DeletedFile", + Size: "8 B", + SHA256: "invalid", + ExpireAt: 2147483645, + ExpireAtString: "2021-05-04 15:19", + DownloadsRemaining: 2, + ContentType: "text/html", + }) + dataStorage.SaveMetaData(models.File{ + Id: "jpLXGJKigM4hjtA6T6sN", + Name: "smallfile", + Size: "7 B", + SHA256: "c4f9375f9834b4e7f0a528cc65c055702bf5f24a", + ExpireAt: 2147483646, + ExpireAtString: "2021-05-04 15:18", + DownloadsRemaining: 1, + ContentType: "text/html", + PasswordHash: "7b30508aa9b233ab4b8a11b2af5816bdb58ca3e7", + }) + dataStorage.SaveMetaData(models.File{ + Id: "jpLXGJKigM4hjtA6T6sN2", + Name: "smallfile", + Size: "7 B", + SHA256: "c4f9375f9834b4e7f0a528cc65c055702bf5f24a", + ExpireAt: 2147483646, + ExpireAtString: "2021-05-04 15:18", + DownloadsRemaining: 1, + ContentType: "text/html", + PasswordHash: "7b30508aa9b233ab4b8a11b2af5816bdb58ca3e7", + }) + dataStorage.SaveMetaData(models.File{ + Id: "n1tSTAGj8zan9KaT4u6p", + Name: "picture.jpg", + Size: "4 B", + SHA256: "a8fdc205a9f19cc1c7507a60c4f01b13d11d7fd0", + ExpireAt: 2147483646, + ExpireAtString: "2021-05-04 15:19", + DownloadsRemaining: 1, + ContentType: "text/html", + HotlinkId: "PhSs6mFtf8O5YGlLMfNw9rYXx9XRNkzCnJZpQBi7inunv3Z4A.jpg", + }) + dataStorage.SaveMetaData(models.File{ + Id: "cleanuptest123456789", + Name: "cleanup", + Size: "4 B", + SHA256: "2341354656543213246465465465432456898794", + ExpireAt: 2147483646, + ExpireAtString: "2021-05-04 15:19", + DownloadsRemaining: 0, + ContentType: "text/html", + }) + dataStorage.SaveMetaData(models.File{ + Id: "awsTest1234567890123", + Name: "Aws Test File", + Size: "20 MB", + SHA256: "x341354656543213246465465465432456898794", + ExpireAt: 2147483646, + ExpireAtString: "2021-05-04 15:19", + DownloadsRemaining: 4, + ContentType: "application/octet-stream", + AwsBucket: "gokapi-test", + }) +} + var configTestFile = []byte(`{ +"Authentication": { + "Method": 0, + "SaltAdmin": "LW6fW4Pjv8GtdWVLSZD66gYEev6NAaXxOVBw7C", + "SaltFiles": "lL5wMTtnVCn5TPbpRaSe4vAQodWW0hgk00WCZE", + "Username": "test", + "Password": "10340aece68aa4fb14507ae45b05506026f276cf", + "HeaderKey": "", + "OauthProvider": "", + "OAuthClientId": "", + "OAuthClientSecret": "", + "HeaderUsers": null, + "OauthUsers": null + }, "Port":"127.0.0.1:53843", - "AdminName":"test", - "AdminPassword":"10340aece68aa4fb14507ae45b05506026f276cf", - "ServerUrl":"http://127.0.0.1:53843/", - "DefaultDownloads":3, - "DefaultExpiry":20, - "DefaultPassword":"123", - "RedirectUrl":"https://test.com/", - "Sessions":{ - "validsession":{ - "RenewAt":2147483645, - "ValidUntil":2147483646 - }, - "logoutsession":{ - "RenewAt":2147483645, - "ValidUntil":2147483646 - }, - "needsRenewal":{ - "RenewAt":0, - "ValidUntil":2147483646 - }, - "expiredsession":{ - "RenewAt":0, - "ValidUntil":0 - } - }, - "Files":{ - "Wzol7LyY2QVczXynJtVo":{ - "Id":"Wzol7LyY2QVczXynJtVo", - "Name":"smallfile2", - "Size":"8 B", - "SHA256":"e017693e4a04a59d0b0f400fe98177fe7ee13cf7", - "ExpireAt":2147483646, - "ExpireAtString":"2021-05-04 15:19", - "DownloadsRemaining":1, - "PasswordHash":"", - "ContentType":"text/html", - "HotlinkId":"" - }, - "e4TjE7CokWK0giiLNxDL":{ - "Id":"e4TjE7CokWK0giiLNxDL", - "Name":"smallfile2", - "Size":"8 B", - "SHA256":"e017693e4a04a59d0b0f400fe98177fe7ee13cf7", - "ExpireAt":2147483645, - "ExpireAtString":"2021-05-04 15:19", - "DownloadsRemaining":2, - "PasswordHash":"", - "ContentType":"text/html", - "HotlinkId":"" - }, - "wefffewhtrhhtrhtrhtr":{ - "Id":"wefffewhtrhhtrhtrhtr", - "Name":"smallfile3", - "Size":"8 B", - "SHA256":"e017693e4a04a59d0b0f400fe98177fe7ee13cf7", - "ExpireAt":2147483645, - "ExpireAtString":"2021-05-04 15:19", - "DownloadsRemaining":1, - "PasswordHash":"", - "ContentType":"text/html", - "HotlinkId":"" - }, - "deletedfile123456789":{ - "Id":"deletedfile123456789", - "Name":"DeletedFile", - "Size":"8 B", - "SHA256":"invalid", - "ExpireAt":2147483645, - "ExpireAtString":"2021-05-04 15:19", - "DownloadsRemaining":2, - "PasswordHash":"", - "ContentType":"text/html", - "HotlinkId":"" - }, - "jpLXGJKigM4hjtA6T6sN":{ - "Id":"jpLXGJKigM4hjtA6T6sN", - "Name":"smallfile", - "Size":"7 B", - "SHA256":"c4f9375f9834b4e7f0a528cc65c055702bf5f24a", - "ExpireAt":2147483646, - "ExpireAtString":"2021-05-04 15:18", - "DownloadsRemaining":1, - "ContentType":"text/html", - "PasswordHash":"7b30508aa9b233ab4b8a11b2af5816bdb58ca3e7", - "HotlinkId":"" - }, - "jpLXGJKigM4hjtA6T6sN2":{ - "Id":"jpLXGJKigM4hjtA6T6sN2", - "Name":"smallfile", - "Size":"7 B", - "SHA256":"c4f9375f9834b4e7f0a528cc65c055702bf5f24a", - "ExpireAt":2147483646, - "ExpireAtString":"2021-05-04 15:18", - "DownloadsRemaining":1, - "ContentType":"text/html", - "PasswordHash":"7b30508aa9b233ab4b8a11b2af5816bdb58ca3e7", - "HotlinkId":"" - }, - "n1tSTAGj8zan9KaT4u6p":{ - "Id":"n1tSTAGj8zan9KaT4u6p", - "Name":"picture.jpg", - "Size":"4 B", - "SHA256":"a8fdc205a9f19cc1c7507a60c4f01b13d11d7fd0", - "ExpireAt":2147483646, - "ExpireAtString":"2021-05-04 15:19", - "DownloadsRemaining":1, - "PasswordHash":"", - "ContentType":"text/html", - "HotlinkId":"PhSs6mFtf8O5YGlLMfNw9rYXx9XRNkzCnJZpQBi7inunv3Z4A.jpg" - }, - "cleanuptest123456789":{ - "Id":"cleanuptest123456789", - "Name":"cleanup", - "Size":"4 B", - "SHA256":"2341354656543213246465465465432456898794", - "ExpireAt":2147483646, - "ExpireAtString":"2021-05-04 15:19", - "DownloadsRemaining":0, - "PasswordHash":"", - "ContentType":"text/html", - "HotlinkId":"" - }, - "awsTest1234567890123":{ - "Id":"awsTest1234567890123", - "Name":"Aws Test File", - "Size":"20 MB", - "SHA256":"x341354656543213246465465465432456898794", - "ExpireAt":2147483646, - "ExpireAtString":"2021-05-04 15:19", - "DownloadsRemaining":4, - "PasswordHash":"", - "ContentType":"application/octet-stream", - "AwsBucket":"gokapi-test", - "HotlinkId":"" - } - }, - "Hotlinks":{ - "PhSs6mFtf8O5YGlLMfNw9rYXx9XRNkzCnJZpQBi7inunv3Z4A.jpg":{ - "Id":"PhSs6mFtf8O5YGlLMfNw9rYXx9XRNkzCnJZpQBi7inunv3Z4A.jpg", - "FileId":"n1tSTAGj8zan9KaT4u6p" - } - }, - "DownloadStatus":{ - "69JCbLVxx2KxfvB6FYkrDn3oCU7BWT":{ - "Id":"69JCbLVxx2KxfvB6FYkrDn3oCU7BWT", - "FileId":"cleanuptest123456789", - "ExpireAt":2147483646 - } - }, - "ApiKeys":{ - "validkey":{ - "Id":"validkey", - "FriendlyName":"First Key", - "LastUsed":0, - "LastUsedString":"" - }, - "GAh1IhXDvYnqfYLazWBqMB9HSFmNPO":{ - "Id":"GAh1IhXDvYnqfYLazWBqMB9HSFmNPO", - "FriendlyName":"Second Key", - "LastUsed":1620671580, - "LastUsedString":"used" - }, - "jiREglQJW0bOqJakfjdVfe8T1EM8n8":{ - "Id":"jiREglQJW0bOqJakfjdVfe8T1EM8n8", - "FriendlyName":"Unnamed Key", - "LastUsed":0, - "LastUsedString":"" - }, - "okeCMWqhVMZSpt5c1qpCWhKvJJPifb":{ - "Id":"okeCMWqhVMZSpt5c1qpCWhKvJJPifb", - "FriendlyName":"Unnamed Key", - "LastUsed":0, - "LastUsedString":"" - } - }, - "ConfigVersion":8, - "SaltAdmin":"LW6fW4Pjv8GtdWVLSZD66gYEev6NAaXxOVBw7C", - "SaltFiles":"lL5wMTtnVCn5TPbpRaSe4vAQodWW0hgk00WCZE", - "LengthId":20, - "DataDir":"test/data", - "UseSsl":false, - "MaxFileSizeMB":25 + "ServerUrl": "http://127.0.0.1:53843/", + "RedirectUrl": "https://test.com/", + "ConfigVersion": 11, + "LengthId": 20, + "DataDir": "test/data", + "MaxMemory": 40, + "UseSsl": false, + "MaxFileSizeMB": 25 }`) var configTestFileV8 = []byte(`{ "Port":"127.0.0.1:53843", @@ -502,45 +490,7 @@ var configUpgradeTestFile = []byte(`{ "DefaultDownloads":1, "DefaultExpiry":14, "DefaultPassword":"123", - "RedirectUrl":"https://github.com/Forceu/Gokapi/", - "Sessions":{ - "y0t-OQGF5UPFHyFOLab38SNjrc_a4xdIHTsZclkLpxuSwwTzS_qEETsinkgVIdWNMnQjhcaZtgCoJdpu":{ - "RenewAt":1619774155, - "ValidUntil":1622362555 - } - }, - "Files":{ - "MgXJLe4XLfpXcL12ec4i":{ - "Id":"MgXJLe4XLfpXcL12ec4i", - "Name":"gokapi-linux_amd64", - "Size":"10.2 MB", - "SHA256":"b08f5989e1c6d57b45fffe39a8edc5da715799b7", - "ExpireAt":1620980170, - "ExpireAtString":"2021-05-14 10:16", - "DownloadsRemaining":1, - "PasswordHash":"e143a1801faba4c5c6fdc2e823127c988940f72e" - }, - "doLN1pgbb945DfhGottx":{ - "Id":"doLN1pgbb945DfhGottx", - "Name":"config.json", - "Size":"945 B", - "SHA256":"d2d6fd5fbf4a4bb1b1ae2f19130dd75b5adc0a0b", - "ExpireAt":1620980181, - "ExpireAtString":"2021-05-14 10:16", - "DownloadsRemaining":1, - "PasswordHash":"e143a1801faba4c5c6fdc2e823127c988940f72e" - }, - "q06tcBco9gdJTf_pZ8xf":{ - "Id":"q06tcBco9gdJTf_pZ8xf", - "Name":"gokapi-linux_amd64", - "Size":"10.2 MB", - "SHA256":"b08f5989e1c6d57b45fffe39a8edc5da715799b7", - "ExpireAt":1620980160, - "ExpireAtString":"2021-05-14 10:16", - "DownloadsRemaining":1, - "PasswordHash":"" - } - } + "RedirectUrl":"https://github.com/Forceu/Gokapi/" }`) var sslCertValid = []byte(`-----BEGIN CERTIFICATE----- diff --git a/internal/webserver/Webserver.go b/internal/webserver/Webserver.go index c3f82b3..d60793d 100644 --- a/internal/webserver/Webserver.go +++ b/internal/webserver/Webserver.go @@ -6,6 +6,7 @@ Handling of webserver and requests / uploads import ( "Gokapi/internal/configuration" + "Gokapi/internal/configuration/dataStorage" "Gokapi/internal/helper" "Gokapi/internal/models" "Gokapi/internal/storage" @@ -49,18 +50,8 @@ var imageExpiredPicture []byte const expiredFile = "static/expired.png" -var ( - webserverRedirectUrl string - webserverMaxMemory int -) - // Start the webserver on the port set in the config func Start() { - settings := configuration.GetServerSettingsReadOnly() - configuration.ReleaseReadOnly() - webserverRedirectUrl = settings.RedirectUrl - webserverMaxMemory = settings.MaxMemory - initTemplates(templateFolderEmbedded) webserverDir, _ := fs.Sub(staticFolderEmbedded, "web/static") var err error @@ -90,28 +81,28 @@ func Start() { http.HandleFunc("/logout", doLogout) http.HandleFunc("/upload", requireLogin(uploadFile, true)) http.HandleFunc("/error-auth", showErrorAuth) - if settings.Authentication.Method == authentication.OAuth2 { - oauth.Init(settings.ServerUrl, settings.Authentication) + if configuration.Get().Authentication.Method == authentication.OAuth2 { + oauth.Init(configuration.Get().ServerUrl, configuration.Get().Authentication) http.HandleFunc("/oauth-login", oauth.HandlerLogin) http.HandleFunc("/oauth-callback", oauth.HandlerCallback) } - fmt.Println("Binding webserver to " + settings.Port) + fmt.Println("Binding webserver to " + configuration.Get().Port) srv := &http.Server{ - Addr: settings.Port, + Addr: configuration.Get().Port, ReadTimeout: timeOutWebserver, WriteTimeout: timeOutWebserver, } - infoMessage := "Webserver can be accessed at " + settings.ServerUrl + "admin" - if strings.Contains(settings.ServerUrl, "127.0.0.1") { - if settings.UseSsl { + infoMessage := "Webserver can be accessed at " + configuration.Get().ServerUrl + "admin\nPress CTRL+C to stop Gokapi" + if strings.Contains(configuration.Get().ServerUrl, "127.0.0.1") { + if configuration.Get().UseSsl { infoMessage = strings.Replace(infoMessage, "http://", "https://", 1) } else { infoMessage = strings.Replace(infoMessage, "https://", "http://", 1) } } - if settings.UseSsl { - ssl.GenerateIfInvalidCert(settings.ServerUrl, false) + if configuration.Get().UseSsl { + ssl.GenerateIfInvalidCert(configuration.Get().ServerUrl, false) fmt.Println(infoMessage) log.Fatal(srv.ListenAndServeTLS(ssl.GetCertificateLocations())) } else { @@ -147,7 +138,7 @@ func doLogout(w http.ResponseWriter, r *http.Request) { // Handling of /index and redirecting to globalConfig.RedirectUrl func showIndex(w http.ResponseWriter, r *http.Request) { - err := templateFolder.ExecuteTemplate(w, "index", genericView{RedirectUrl: webserverRedirectUrl}) + err := templateFolder.ExecuteTemplate(w, "index", genericView{RedirectUrl: configuration.Get().RedirectUrl}) helper.Check(err) } @@ -193,7 +184,7 @@ func deleteApiKey(w http.ResponseWriter, r *http.Request) { // Handling of /api/ func processApi(w http.ResponseWriter, r *http.Request) { - api.Process(w, r, webserverMaxMemory) + api.Process(w, r, configuration.Get().MaxMemory) } // Handling of /login @@ -215,7 +206,7 @@ func showLogin(w http.ResponseWriter, r *http.Request) { failedLogin := false if pw != "" && user != "" { if authentication.IsCorrectUsernameAndPassword(user, pw) { - sessionmanager.CreateSession(w, nil) + sessionmanager.CreateSession(w) redirect(w, "admin") return } @@ -309,7 +300,7 @@ func deleteFile(w http.ResponseWriter, r *http.Request) { // Stops for 500ms to limit brute forcing if invalid key and redirects to redirectUrl func queryUrl(w http.ResponseWriter, r *http.Request, redirectUrl string) string { keys, ok := r.URL.Query()["id"] - if !ok || len(keys[0]) < configuration.GetLengthId() { + if !ok || len(keys[0]) < configuration.Get().LengthId { time.Sleep(500 * time.Millisecond) redirect(w, redirectUrl) return "" @@ -355,9 +346,8 @@ type UploadView struct { func (u *UploadView) convertGlobalConfig(isMainView bool) *UploadView { var result []models.File var resultApi []models.ApiKey - settings := configuration.GetServerSettingsReadOnly() if isMainView { - for _, element := range settings.Files { + for _, element := range dataStorage.GetAllMetadata() { result = append(result, element) } sort.Slice(result[:], func(i, j int) bool { @@ -367,7 +357,7 @@ func (u *UploadView) convertGlobalConfig(isMainView bool) *UploadView { return result[i].ExpireAt > result[j].ExpireAt }) } else { - for _, element := range settings.ApiKeys { + for _, element := range dataStorage.GetAllApiKeys() { if element.LastUsed == 0 { element.LastUsedString = "Never" } else { @@ -382,19 +372,16 @@ func (u *UploadView) convertGlobalConfig(isMainView bool) *UploadView { return resultApi[i].LastUsed > resultApi[j].LastUsed }) } - u.Url = settings.ServerUrl + "d?id=" - u.HotlinkUrl = settings.ServerUrl + "hotlink/" - u.DefaultPassword = settings.DefaultPassword + u.Url = configuration.Get().ServerUrl + "d?id=" + u.HotlinkUrl = configuration.Get().ServerUrl + "hotlink/" u.Items = result - u.DefaultExpiry = settings.DefaultExpiry u.ApiKeys = resultApi - u.DefaultDownloads = settings.DefaultDownloads u.TimeNow = time.Now().Unix() u.IsAdminView = true u.IsMainView = isMainView - u.MaxFileSize = settings.MaxFileSizeMB + u.MaxFileSize = configuration.Get().MaxFileSizeMB u.IsLogoutAvailable = authentication.IsLogoutAvailable() - configuration.ReleaseReadOnly() + u.DefaultDownloads, u.DefaultExpiry, u.DefaultPassword = dataStorage.GetUploadDefaults() return u } @@ -403,7 +390,7 @@ func (u *UploadView) convertGlobalConfig(isMainView bool) *UploadView { // adds it to the system. func uploadFile(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=UTF-8") - err := fileupload.Process(w, r, true, webserverMaxMemory) + err := fileupload.Process(w, r, true, configuration.Get().MaxMemory) responseError(w, err) } diff --git a/internal/webserver/Webserver_test.go b/internal/webserver/Webserver_test.go index 499f657..d75a94a 100644 --- a/internal/webserver/Webserver_test.go +++ b/internal/webserver/Webserver_test.go @@ -5,6 +5,7 @@ package webserver import ( "Gokapi/internal/configuration" + "Gokapi/internal/configuration/dataStorage" "Gokapi/internal/test" "Gokapi/internal/test/testconfiguration" "Gokapi/internal/webserver/authentication" @@ -55,13 +56,11 @@ func TestIndexRedirect(t *testing.T) { } func TestIndexFile(t *testing.T) { t.Parallel() - settings := configuration.GetServerSettings() test.HttpPageResult(t, test.HttpTestConfig{ Url: "http://localhost:53843/index", - RequiredContent: []string{settings.RedirectUrl}, + RequiredContent: []string{configuration.Get().RedirectUrl}, IsHtml: true, }) - configuration.Release() } func TestStaticDirs(t *testing.T) { t.Parallel() @@ -105,15 +104,13 @@ func TestLogin(t *testing.T) { } test.HttpPostRequest(t, config) - settings := configuration.GetServerSettings() - settings.Authentication.Method = authentication.OAuth2 - authentication.Init(settings.Authentication) - configuration.Release() + configuration.Get().Authentication.Method = authentication.OAuth2 + authentication.Init(configuration.Get().Authentication) config.RequiredContent = []string{"\"Refresh\" content=\"0; URL=./oauth-login\""} config.PostValues = []test.PostBody{} test.HttpPageResult(t, config) - settings.Authentication.Method = authentication.Internal - authentication.Init(settings.Authentication) + configuration.Get().Authentication.Method = authentication.Internal + authentication.Init(configuration.Get().Authentication) buf := config.RequiredContent config.RequiredContent = config.ExcludedContent @@ -518,9 +515,7 @@ func TestApiPageNotAuthorized(t *testing.T) { func TestNewApiKey(t *testing.T) { // Authorised - settings := configuration.GetServerSettings() - amountKeys := len(settings.ApiKeys) - configuration.Release() + amountKeys := len(dataStorage.GetAllApiKeys()) test.HttpPageResult(t, test.HttpTestConfig{ Url: "http://127.0.0.1:53843/apiNew", IsHtml: true, @@ -531,9 +526,7 @@ func TestNewApiKey(t *testing.T) { Value: "validsession", }}, }) - settings = configuration.GetServerSettings() - amountKeysAfter := len(settings.ApiKeys) - configuration.Release() + amountKeysAfter := len(dataStorage.GetAllApiKeys()) test.IsEqualInt(t, amountKeysAfter, amountKeys+1) test.IsEqualInt(t, amountKeysAfter, 5) @@ -549,18 +542,14 @@ func TestNewApiKey(t *testing.T) { Value: "invalid", }}, }) - settings = configuration.GetServerSettings() - amountKeysAfter = len(settings.ApiKeys) - configuration.Release() + amountKeysAfter = len(dataStorage.GetAllApiKeys()) test.IsEqualInt(t, amountKeysAfter, amountKeys) test.IsEqualInt(t, amountKeysAfter, 5) } func TestDeleteApiKey(t *testing.T) { // Not authorised - settings := configuration.GetServerSettings() - amountKeys := len(settings.ApiKeys) - configuration.Release() + amountKeys := len(dataStorage.GetAllApiKeys()) test.HttpPageResult(t, test.HttpTestConfig{ Url: "http://127.0.0.1:53843/apiDelete?id=jiREglQJW0bOqJakfjdVfe8T1EM8n8", IsHtml: true, @@ -571,10 +560,10 @@ func TestDeleteApiKey(t *testing.T) { Value: "invalid", }}, }) - settings = configuration.GetServerSettings() - amountKeysAfter := len(settings.ApiKeys) - test.IsEqualString(t, settings.ApiKeys["jiREglQJW0bOqJakfjdVfe8T1EM8n8"].Id, "jiREglQJW0bOqJakfjdVfe8T1EM8n8") - configuration.Release() + amountKeysAfter := len(dataStorage.GetAllApiKeys()) + key, ok := dataStorage.GetApiKey("jiREglQJW0bOqJakfjdVfe8T1EM8n8") + test.IsEqualBool(t, ok, true) + test.IsEqualString(t, key.Id, "jiREglQJW0bOqJakfjdVfe8T1EM8n8") test.IsEqualInt(t, amountKeysAfter, amountKeys) test.IsEqualInt(t, amountKeysAfter, 5) @@ -589,10 +578,9 @@ func TestDeleteApiKey(t *testing.T) { Value: "validsession", }}, }) - settings = configuration.GetServerSettings() - amountKeysAfter = len(settings.ApiKeys) - test.IsEmpty(t, settings.ApiKeys["jiREglQJW0bOqJakfjdVfe8T1EM8n8"].Id) - configuration.Release() + amountKeysAfter = len(dataStorage.GetAllApiKeys()) + _, ok = dataStorage.GetApiKey("jiREglQJW0bOqJakfjdVfe8T1EM8n8") + test.IsEqualBool(t, ok, false) test.IsEqualInt(t, amountKeysAfter, amountKeys-1) test.IsEqualInt(t, amountKeysAfter, 4) } @@ -645,10 +633,8 @@ func TestDisableLogin(t *testing.T) { Value: "invalid", }}, }) - settings := configuration.GetServerSettings() - settings.Authentication.Method = authentication.Disabled - authentication.Init(settings.Authentication) - configuration.Release() + configuration.Get().Authentication.Method = authentication.Disabled + authentication.Init(configuration.Get().Authentication) test.HttpPageResult(t, test.HttpTestConfig{ Url: "http://localhost:53843/admin", RequiredContent: []string{"Downloads remaining"}, @@ -658,10 +644,8 @@ func TestDisableLogin(t *testing.T) { Value: "invalid", }}, }) - settings = configuration.GetServerSettings() - settings.Authentication.Method = authentication.Internal - authentication.Init(settings.Authentication) - configuration.Release() + configuration.Get().Authentication.Method = authentication.Internal + authentication.Init(configuration.Get().Authentication) } func TestResponseError(t *testing.T) { @@ -681,4 +665,4 @@ func TestShowErrorAuth(t *testing.T) { RequiredContent: []string{"Log in as different user"}, IsHtml: true, }) -} \ No newline at end of file +} diff --git a/internal/webserver/api/Api.go b/internal/webserver/api/Api.go index a178249..87be3b1 100644 --- a/internal/webserver/api/Api.go +++ b/internal/webserver/api/Api.go @@ -1,7 +1,7 @@ package api import ( - "Gokapi/internal/configuration" + "Gokapi/internal/configuration/dataStorage" "Gokapi/internal/helper" "Gokapi/internal/models" "Gokapi/internal/storage" @@ -43,22 +43,18 @@ func DeleteKey(id string) bool { if !IsValidApiKey(id, false) { return false } - settings := configuration.GetServerSettings() - delete(settings.ApiKeys, id) - configuration.ReleaseAndSave() + dataStorage.DeleteApiKey(id) return true } // NewKey generates a new API key func NewKey() string { - settings := configuration.GetServerSettings() newKey := models.ApiKey{ Id: helper.GenerateRandomString(30), FriendlyName: "Unnamed key", LastUsed: 0, } - settings.ApiKeys[newKey.Id] = newKey - configuration.ReleaseAndSave() + dataStorage.SaveApiKey(newKey, false) return newKey.Id } @@ -70,14 +66,14 @@ func changeFriendlyName(w http.ResponseWriter, request apiRequest) { if request.friendlyName == "" { request.friendlyName = "Unnamed key" } - settings := configuration.GetServerSettings() - key := settings.ApiKeys[request.apiKeyToModify] + key, ok := dataStorage.GetApiKey(request.apiKeyToModify) + if !ok { + sendError(w, http.StatusInternalServerError, "Could not modify API key") + return + } if key.FriendlyName != request.friendlyName { key.FriendlyName = request.friendlyName - settings.ApiKeys[request.apiKeyToModify] = key - configuration.ReleaseAndSave() - } else { - configuration.Release() + dataStorage.SaveApiKey(key, false) } sendOk(w) } @@ -94,13 +90,11 @@ func deleteFile(w http.ResponseWriter, request apiRequest) { func list(w http.ResponseWriter) { var validFiles []models.File sendOk(w) - settings := configuration.GetServerSettingsReadOnly() - for _, element := range settings.Files { + for _, element := range dataStorage.GetAllMetadata() { if element.ExpireAt > time.Now().Unix() && element.DownloadsRemaining > 0 { validFiles = append(validFiles, element) } } - configuration.ReleaseReadOnly() result, err := json.Marshal(validFiles) helper.Check(err) _, _ = w.Write(result) @@ -156,13 +150,11 @@ func IsValidApiKey(key string, modifyTime bool) bool { if key == "" { return false } - settings := configuration.GetServerSettings() - defer configuration.Release() - savedKey, ok := settings.ApiKeys[key] + savedKey, ok := dataStorage.GetApiKey(key) if ok && savedKey.Id != "" { if modifyTime { savedKey.LastUsed = time.Now().Unix() - settings.ApiKeys[key] = savedKey + dataStorage.SaveApiKey(savedKey, true) } return true } diff --git a/internal/webserver/api/Api_test.go b/internal/webserver/api/Api_test.go index 1fec4dd..54cdb87 100644 --- a/internal/webserver/api/Api_test.go +++ b/internal/webserver/api/Api_test.go @@ -5,6 +5,7 @@ package api import ( "Gokapi/internal/configuration" + "Gokapi/internal/configuration/dataStorage" "Gokapi/internal/models" "Gokapi/internal/test" "Gokapi/internal/test/testconfiguration" @@ -33,31 +34,34 @@ var newKeyId string func TestNewKey(t *testing.T) { newKeyId = NewKey() - settings := configuration.GetServerSettings() - configuration.Release() - test.IsEqualString(t, settings.ApiKeys[newKeyId].FriendlyName, "Unnamed key") + key, ok := dataStorage.GetApiKey(newKeyId) + test.IsEqualBool(t, ok, true) + test.IsEqualString(t, key.FriendlyName, "Unnamed key") } func TestDeleteKey(t *testing.T) { - settings := configuration.GetServerSettings() - configuration.Release() - test.IsEqualString(t, settings.ApiKeys[newKeyId].FriendlyName, "Unnamed key") + key, ok := dataStorage.GetApiKey(newKeyId) + test.IsEqualBool(t, ok, true) + test.IsEqualString(t, key.FriendlyName, "Unnamed key") result := DeleteKey(newKeyId) - test.IsEqualString(t, settings.ApiKeys[newKeyId].FriendlyName, "") test.IsEqualBool(t, result, true) + _, ok = dataStorage.GetApiKey(newKeyId) + test.IsEqualBool(t, ok, false) result = DeleteKey("invalid") test.IsEqualBool(t, result, false) } func TestIsValidApiKey(t *testing.T) { - settings := configuration.GetServerSettings() - configuration.Release() test.IsEqualBool(t, IsValidApiKey("", false), false) test.IsEqualBool(t, IsValidApiKey("invalid", false), false) test.IsEqualBool(t, IsValidApiKey("validkey", false), true) - test.IsEqualBool(t, settings.ApiKeys["validkey"].LastUsed == 0, true) + key, ok := dataStorage.GetApiKey("validkey") + test.IsEqualBool(t, ok, true) + test.IsEqualBool(t, key.LastUsed == 0, true) test.IsEqualBool(t, IsValidApiKey("validkey", true), true) - test.IsEqualBool(t, settings.ApiKeys["validkey"].LastUsed == 0, false) + key, ok = dataStorage.GetApiKey("validkey") + test.IsEqualBool(t, ok, true) + test.IsEqualBool(t, key.LastUsed == 0, false) } func TestProcess(t *testing.T) { @@ -85,18 +89,14 @@ func TestAuthDisabledLogin(t *testing.T) { w, r := test.GetRecorder("GET", "/api/auth/friendlyname", nil, nil, nil) Process(w, r, maxMemory) test.ResponseBodyContains(t, w, "{\"Result\":\"error\",\"ErrorMessage\":\"Unauthorized\"}") - settings := configuration.GetServerSettings() - settings.Authentication.Method = authentication.Disabled - configuration.Release() + configuration.Get().Authentication.Method = authentication.Disabled w, r = test.GetRecorder("GET", "/api/auth/friendlyname", nil, nil, nil) Process(w, r, maxMemory) test.ResponseBodyContains(t, w, "{\"Result\":\"error\",\"ErrorMessage\":\"Unauthorized\"}") - settings.Authentication.Method = authentication.Internal + configuration.Get().Authentication.Method = authentication.Internal } func TestChangeFriendlyName(t *testing.T) { - settings := configuration.GetServerSettings() - configuration.Release() w, r := test.GetRecorder("GET", "/api/auth/friendlyname", nil, []test.Header{{ Name: "apikey", Value: "validkey", @@ -108,22 +108,25 @@ func TestChangeFriendlyName(t *testing.T) { Name: "apiKeyToModify", Value: "validkey"}}, nil) Process(w, r, maxMemory) test.IsEqualInt(t, w.Code, 200) - test.IsEqualString(t, settings.ApiKeys["validkey"].FriendlyName, "Unnamed key") + + key, ok := dataStorage.GetApiKey("validkey") + test.IsEqualBool(t, ok, true) + test.IsEqualString(t, key.FriendlyName, "Unnamed key") w, r = test.GetRecorder("GET", "/api/auth/friendlyname", nil, []test.Header{{ Name: "apikey", Value: "validkey"}, { Name: "apiKeyToModify", Value: "validkey"}, { Name: "friendlyName", Value: "NewName"}}, nil) Process(w, r, maxMemory) test.IsEqualInt(t, w.Code, 200) - test.IsEqualString(t, settings.ApiKeys["validkey"].FriendlyName, "NewName") + key, ok = dataStorage.GetApiKey("validkey") + test.IsEqualBool(t, ok, true) + test.IsEqualString(t, key.FriendlyName, "NewName") w = httptest.NewRecorder() Process(w, r, maxMemory) test.IsEqualInt(t, w.Code, 200) } func TestDeleteFile(t *testing.T) { - settings := configuration.GetServerSettings() - configuration.Release() w, r := test.GetRecorder("GET", "/api/files/delete", nil, []test.Header{{ Name: "apikey", Value: "validkey", @@ -140,7 +143,9 @@ func TestDeleteFile(t *testing.T) { }, nil) Process(w, r, maxMemory) test.ResponseBodyContains(t, w, "Invalid id provided.") - test.IsEqualString(t, settings.Files["jpLXGJKigM4hjtA6T6sN2"].Id, "jpLXGJKigM4hjtA6T6sN2") + file, ok := dataStorage.GetMetaDataById("jpLXGJKigM4hjtA6T6sN2") + test.IsEqualBool(t, ok, true) + test.IsEqualString(t, file.Id, "jpLXGJKigM4hjtA6T6sN2") w, r = test.GetRecorder("GET", "/api/files/delete", nil, []test.Header{{ Name: "apikey", Value: "validkey", @@ -151,7 +156,8 @@ func TestDeleteFile(t *testing.T) { }, nil) Process(w, r, maxMemory) test.IsEqualInt(t, w.Code, 200) - test.IsEqualString(t, settings.Files["jpLXGJKigM4hjtA6T6sN2"].Id, "") + _, ok = dataStorage.GetMetaDataById("jpLXGJKigM4hjtA6T6sN2") + test.IsEqualBool(t, ok, false) } func TestUpload(t *testing.T) { diff --git a/internal/webserver/authentication/Authentication.go b/internal/webserver/authentication/Authentication.go index ff1b4d5..31fb45b 100644 --- a/internal/webserver/authentication/Authentication.go +++ b/internal/webserver/authentication/Authentication.go @@ -66,7 +66,7 @@ func isUserInArray(userEntered string, strArray []string) bool { func CheckOauthUser(userInfo *oidc.UserInfo, w http.ResponseWriter) { if isValidOauthUser(userInfo.Email) { // TODO revoke session if oauth is not valid any more - sessionmanager.CreateSession(w, nil) + sessionmanager.CreateSession(w) redirect(w, "admin") return } diff --git a/internal/webserver/authentication/sessionmanager/SessionManager.go b/internal/webserver/authentication/sessionmanager/SessionManager.go index 589d09d..b9414a8 100644 --- a/internal/webserver/authentication/sessionmanager/SessionManager.go +++ b/internal/webserver/authentication/sessionmanager/SessionManager.go @@ -5,14 +5,14 @@ Manages the sessions for the admin user or to access password-protected files */ import ( - "Gokapi/internal/configuration" + "Gokapi/internal/configuration/dataStorage" "Gokapi/internal/helper" "Gokapi/internal/models" "net/http" "time" ) -// TODO add username to check for revokkation +// TODO add username to check for revocation // If no login occurred during this time, the admin session will be deleted. Default 30 days const cookieLifeAdmin = 30 * 24 * time.Hour @@ -25,11 +25,9 @@ func IsValidSession(w http.ResponseWriter, r *http.Request) bool { if err == nil { sessionString := cookie.Value if sessionString != "" { - settings := configuration.GetServerSettings() - defer configuration.Release() - _, ok := (settings.Sessions)[sessionString] + session, ok := dataStorage.GetSession(sessionString) if ok { - return useSession(w, sessionString, &settings.Sessions) + return useSession(w, sessionString, session) } } } @@ -40,32 +38,26 @@ func IsValidSession(w http.ResponseWriter, r *http.Request) bool { // if it has // been used for more than an hour to limit session hijacking // Returns true if session is still valid // Returns false if session is invalid (and deletes it) -func useSession(w http.ResponseWriter, sessionString string, sessions *map[string]models.Session) bool { - session := (*sessions)[sessionString] +func useSession(w http.ResponseWriter, id string, session models.Session) bool { if session.ValidUntil < time.Now().Unix() { - delete(*sessions, sessionString) + dataStorage.DeleteSession(id) return false } if session.RenewAt < time.Now().Unix() { - CreateSession(w, sessions) - delete(*sessions, sessionString) + CreateSession(w) + dataStorage.DeleteSession(id) } return true } // CreateSession creates a new session - called after login with correct username / password // If sessions parameter is nil, it will be loaded from config -func CreateSession(w http.ResponseWriter, sessions *map[string]models.Session) { - if sessions == nil { - settings := configuration.GetServerSettings() - sessions = &settings.Sessions - defer configuration.ReleaseAndSave() - } +func CreateSession(w http.ResponseWriter) { sessionString := helper.GenerateRandomString(60) - (*sessions)[sessionString] = models.Session{ + dataStorage.SaveSession(sessionString, models.Session{ RenewAt: time.Now().Add(time.Hour).Unix(), ValidUntil: time.Now().Add(cookieLifeAdmin).Unix(), - } + }, cookieLifeAdmin) writeSessionCookie(w, sessionString, time.Now().Add(cookieLifeAdmin)) } @@ -73,9 +65,7 @@ func CreateSession(w http.ResponseWriter, sessions *map[string]models.Session) { func LogoutSession(w http.ResponseWriter, r *http.Request) { cookie, err := r.Cookie("session_token") if err == nil { - settings := configuration.GetServerSettings() - delete(settings.Sessions, cookie.Value) - configuration.ReleaseAndSave() + dataStorage.DeleteSession(cookie.Value) } writeSessionCookie(w, "", time.Now()) } diff --git a/internal/webserver/authentication/sessionmanager/SessionManager_test.go b/internal/webserver/authentication/sessionmanager/SessionManager_test.go index 352660f..0730201 100644 --- a/internal/webserver/authentication/sessionmanager/SessionManager_test.go +++ b/internal/webserver/authentication/sessionmanager/SessionManager_test.go @@ -56,7 +56,7 @@ func TestIsValidSession(t *testing.T) { func TestCreateSession(t *testing.T) { w, _ := getRecorder(nil) - CreateSession(w, nil) + CreateSession(w) cookies := w.Result().Cookies() test.IsEqualInt(t, len(cookies), 1) test.IsEqualString(t, cookies[0].Name, "session_token") diff --git a/internal/webserver/downloadstatus/DownloadStatus.go b/internal/webserver/downloadstatus/DownloadStatus.go new file mode 100644 index 0000000..ca6d251 --- /dev/null +++ b/internal/webserver/downloadstatus/DownloadStatus.go @@ -0,0 +1,61 @@ +package downloadstatus + +import ( + "Gokapi/internal/helper" + "Gokapi/internal/models" + "time" +) + +var status map[string]models.DownloadStatus + +func Init() { + status = make(map[string]models.DownloadStatus) +} + +// SetDownload creates a new DownloadStatus struct and returns its Id +func SetDownload(file models.File) string { + newStatus := newDownloadStatus(file) + status[newStatus.Id] = newStatus + return newStatus.Id +} + +// SetComplete removes the download object +func SetComplete(id string) { + delete(status, id) +} + +// Clean removes all expires status objects +func Clean() { + now := time.Now().Unix() + for _, item := range status { + if item.ExpireAt < now { + delete(status, item.Id) + } + } +} + +// newDownloadStatus initialises a new DownloadStatus item +func newDownloadStatus(file models.File) models.DownloadStatus { + s := models.DownloadStatus{ + Id: helper.GenerateRandomString(30), + FileId: file.Id, + ExpireAt: time.Now().Add(24 * time.Hour).Unix(), + } + return s +} + +// IsCurrentlyDownloading returns true if file is currently being downloaded +func IsCurrentlyDownloading(file models.File) bool { + for _, statusField := range status { + if statusField.FileId == file.Id { + if statusField.ExpireAt > time.Now().Unix() { + return true + } + } + } + return false +} + +func GetAll() map[string]models.DownloadStatus { + return status +} diff --git a/internal/webserver/downloadstatus/DownloadStatus_test.go b/internal/webserver/downloadstatus/DownloadStatus_test.go new file mode 100644 index 0000000..9c51598 --- /dev/null +++ b/internal/webserver/downloadstatus/DownloadStatus_test.go @@ -0,0 +1,75 @@ +//go:build test +// +build test + +package downloadstatus + +import ( + "Gokapi/internal/models" + "Gokapi/internal/test" + "os" + "testing" + "time" +) + +var testFile models.File +var statusId string + +func TestMain(m *testing.M) { + testFile = models.File{ + Id: "test", + Name: "testName", + Size: "3 B", + SHA256: "123456", + ExpireAt: 500, + ExpireAtString: "expire", + DownloadsRemaining: 1, + } + Init() + exitVal := m.Run() + os.Exit(exitVal) +} + +func TestNewDownloadStatus(t *testing.T) { + newStatus := newDownloadStatus(models.File{Id: "testId"}) + test.IsNotEmpty(t, newStatus.Id) + test.IsEqualString(t, newStatus.FileId, "testId") + test.IsEqualBool(t, newStatus.ExpireAt > time.Now().Unix(), true) +} + +func TestSetDownload(t *testing.T) { + statusId = SetDownload(testFile) + newStatus := status[statusId] + test.IsNotEmpty(t, newStatus.Id) + test.IsEqualString(t, newStatus.Id, statusId) + test.IsEqualString(t, newStatus.FileId, testFile.Id) + test.IsEqualBool(t, newStatus.ExpireAt > time.Now().Unix(), true) +} + +func TestSetComplete(t *testing.T) { + newStatus := status[statusId] + test.IsNotEmpty(t, newStatus.Id) + SetComplete(statusId) + newStatus = status[statusId] + test.IsEmpty(t, newStatus.Id) +} + +func TestIsCurrentlyDownloading(t *testing.T) { + statusId = SetDownload(testFile) + test.IsEqualBool(t, IsCurrentlyDownloading(testFile), true) + test.IsEqualBool(t, IsCurrentlyDownloading(models.File{Id: "notDownloading"}), false) +} +func TestClean(t *testing.T) { + test.IsEqualInt(t, len(status), 1) + Clean() + test.IsEqualInt(t, len(status), 1) + newStatus := status[statusId] + newStatus.ExpireAt = 1 + status[statusId] = newStatus + test.IsEqualInt(t, len(status), 1) + Clean() + test.IsEqualInt(t, len(status), 0) +} + +func TestGetAll(t *testing.T) { + test.IsEqualInt(t, len(GetAll()), len(status)) +} diff --git a/internal/webserver/fileupload/FileUpload.go b/internal/webserver/fileupload/FileUpload.go index 04c1371..56b4106 100644 --- a/internal/webserver/fileupload/FileUpload.go +++ b/internal/webserver/fileupload/FileUpload.go @@ -2,6 +2,7 @@ package fileupload import ( "Gokapi/internal/configuration" + "Gokapi/internal/configuration/dataStorage" "Gokapi/internal/helper" "Gokapi/internal/models" "Gokapi/internal/storage" @@ -45,31 +46,27 @@ func parseConfig(values formOrHeader, setNewDefaults bool) models.UploadRequest expiryDays := values.Get("expiryDays") password := values.Get("password") allowedDownloadsInt, err := strconv.Atoi(allowedDownloads) - settings := configuration.GetServerSettings() if err != nil { - allowedDownloadsInt = settings.DefaultDownloads + previous, _, _ := dataStorage.GetUploadDefaults() + allowedDownloadsInt = previous } expiryDaysInt, err := strconv.Atoi(expiryDays) if err != nil { - expiryDaysInt = settings.DefaultExpiry + _, previous, _ := dataStorage.GetUploadDefaults() + expiryDaysInt = previous } if setNewDefaults { - settings.DefaultExpiry = expiryDaysInt - settings.DefaultDownloads = allowedDownloadsInt - settings.DefaultPassword = password + dataStorage.SaveUploadDefaults(allowedDownloadsInt, expiryDaysInt, password) } - externalUrl := settings.ServerUrl - dataDir := settings.DataDir - maxMemory := settings.MaxMemory - configuration.Release() + settings := configuration.Get() return models.UploadRequest{ AllowedDownloads: allowedDownloadsInt, Expiry: expiryDaysInt, ExpiryTimestamp: time.Now().Add(time.Duration(expiryDaysInt) * time.Hour * 24).Unix(), Password: password, - ExternalUrl: externalUrl, - MaxMemory: maxMemory, - DataDir: dataDir, + ExternalUrl: settings.ServerUrl, + MaxMemory: settings.MaxMemory, + DataDir: settings.DataDir, } } diff --git a/internal/webserver/fileupload/FileUpload_test.go b/internal/webserver/fileupload/FileUpload_test.go index 202b982..c8b7e24 100644 --- a/internal/webserver/fileupload/FileUpload_test.go +++ b/internal/webserver/fileupload/FileUpload_test.go @@ -5,6 +5,7 @@ package fileupload import ( "Gokapi/internal/configuration" + "Gokapi/internal/configuration/dataStorage" "Gokapi/internal/models" "Gokapi/internal/test" "Gokapi/internal/test/testconfiguration" @@ -28,22 +29,22 @@ func TestMain(m *testing.M) { } func TestParseConfig(t *testing.T) { - settings := configuration.GetServerSettings() - configuration.Release() data := testData{ allowedDownloads: "9", expiryDays: "5", password: "123", } config := parseConfig(data, false) + downloads, _, _ := dataStorage.GetUploadDefaults() test.IsEqualInt(t, config.AllowedDownloads, 9) test.IsEqualString(t, config.Password, "123") test.IsEqualInt(t, config.Expiry, 5) - test.IsEqualInt(t, settings.DefaultDownloads, 3) + + test.IsEqualInt(t, downloads, 3) config = parseConfig(data, true) - test.IsEqualInt(t, settings.DefaultDownloads, 9) - settings.DefaultDownloads = 3 - settings.DefaultExpiry = 20 + downloads, _, _ = dataStorage.GetUploadDefaults() + test.IsEqualInt(t, downloads, 9) + dataStorage.SaveUploadDefaults(3, 20, "") data.allowedDownloads = "" data.expiryDays = "invalid" config = parseConfig(data, false)