diff --git a/go.mod b/go.mod index 853152de4..29f1b8eaf 100644 --- a/go.mod +++ b/go.mod @@ -57,7 +57,7 @@ require ( go.etcd.io/bbolt v1.3.5 go.opencensus.io v0.22.4 // indirect go.uber.org/zap v1.15.0 // indirect - goftp.io/server v0.3.4 + goftp.io/server v0.3.3 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 golang.org/x/net v0.0.0-20200625001655-4c5254603344 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d diff --git a/go.sum b/go.sum index b98380e65..3bfda6b22 100644 --- a/go.sum +++ b/go.sum @@ -32,6 +32,7 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy 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= +code.gitea.io/log v0.0.0-20191208183219-f31613838113/go.mod h1:YOBHMQw/14CwuwNStgQyvnzoDJEO6ARjcSdD48QRzhM= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-pipeline-go v0.2.2 h1:6oiIS9yaG6XCCzhgAgKFfIWyo4LLCiDhZot6ltoThhY= github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= @@ -68,6 +69,7 @@ github.com/aalpar/deheap v0.0.0-20200318053559-9a0c2883bd56/go.mod h1:EJFoWbcEEV github.com/abbot/go-http-auth v0.4.0 h1:QjmvZ5gSC7jm3Zg54DqWE/T5m1t2AfDu6QlXJT0EVT0= github.com/abbot/go-http-auth v0.4.0/go.mod h1:Cz6ARTIzApMJDzh5bRMSUou6UMSp0IEXg9km/ci7TJM= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -79,7 +81,9 @@ github.com/anacrolix/envpprof v1.0.0/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54g github.com/anacrolix/ffprobe v1.0.0/go.mod h1:BIw+Bjol6CWjm/CRWrVLk2Vy+UYlkgmBZ05vpSYqZPw= github.com/anacrolix/missinggo v1.1.0/go.mod h1:MBJu3Sk/k3ZfGYcS7z18gwfu72Ey/xopPFJJbTi5yIo= github.com/anacrolix/tagflag v0.0.0-20180109131632-2146c8d41bf0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/atotto/clipboard v0.1.2 h1:YZCtFu5Ie8qX2VmVTBnrqLSiU9XOWwqNRmdT3gIQzbY= github.com/atotto/clipboard v0.1.2/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= github.com/aws/aws-sdk-go v1.32.11 h1:1nYF+Tfccn/hnAZsuwPPMSCVUVnx3j6LKOpx/WhgH0A= @@ -128,6 +132,7 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= @@ -144,13 +149,16 @@ github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e/go.mod h1:Htrtb github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= +github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= 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/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -241,7 +249,9 @@ github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbc github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jlaffaye/ftp v0.0.0-20190624084859-c1312a7102bf/go.mod h1:lli8NYPQOFy3O++YmYbqVgOcQ1JPCwdOy+5zSjKJ9qY= github.com/jlaffaye/ftp v0.0.0-20200602180915-5563613968bf h1:U96JHc+AF5zL3M3q/ljvvwuRgjbCAxlPh0KzpDcwlIE= github.com/jlaffaye/ftp v0.0.0-20200602180915-5563613968bf/go.mod h1:PwUeyujmhaGohgOf0kJKxPfk3HcRv8QD/wAUN44go4k= @@ -263,6 +273,7 @@ github.com/jzelinskie/whirlpool v0.0.0-20170603002051-c19460b8caa6 h1:RyOL4+OIUc github.com/jzelinskie/whirlpool v0.0.0-20170603002051-c19460b8caa6/go.mod h1:KmHnJWQrgEvbuy0vcvj00gtMqbvNn1L+3YUZLK/B92c= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= @@ -284,6 +295,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB 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/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= 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/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4= @@ -295,6 +307,7 @@ github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d h1:oNAwILwmgWKFpu github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-ieproxy v0.0.1 h1:qiyop7gCflfhwCzGyeT0gro3sF9AIg9HU98JORTkqfI= github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= +github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= @@ -340,6 +353,7 @@ github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= +github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14 h1:XeOYlK9W1uCmhjJSsY78Mcuh7MVkNjTzmHx1yBzizSU= github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14/go.mod h1:jVblp62SafmidSkvWrXyxAme3gaTfEtWwRPGz5cpvHg= @@ -383,6 +397,7 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sevlyar/go-daemon v0.1.5 h1:Zy/6jLbM8CfqJ4x4RPr7MJlSKt90f00kNM1D401C+Qk= github.com/sevlyar/go-daemon v0.1.5/go.mod h1:6dJpPatBT9eUwM5VCw9Bt6CdX9Tk6UWvhW3MebLDRKE= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= @@ -415,9 +430,11 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= 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/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= github.com/stephens2424/writerset v1.0.2/go.mod h1:aS2JhsMn6eA7e82oNmW4rfsgAOp9COBTTl8mzkwADnc= 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/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -477,6 +494,8 @@ go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM= go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= +goftp.io/server v0.3.3 h1:ufplF8S62baWmzmFBkvaVfVGTD6cq8ona8BzNvwRiqc= +goftp.io/server v0.3.3/go.mod h1:Ewqfa40Xnkh/AEA+Sf9KX2lp8aKnEum77YDHhHwABK4= goftp.io/server v0.3.4 h1:Sq0leWKoZFRWtbxNrHRqKpBygVg2kcRPqgbXnLIFRVU= goftp.io/server v0.3.4/go.mod h1:hFZeR656ErRt3ojMKt7H10vQ5nuWV1e0YeUTeorlR6k= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -583,10 +602,12 @@ golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5h 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-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/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-20190415145633-3fd5a3612ccd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/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= @@ -643,6 +664,7 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn 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-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= 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= @@ -767,8 +789,12 @@ gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.57.0 h1:9unxIsFcTt4I55uWluz+UmL95q4kdJ0buvQ1ZIqVQww= gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= +gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= +gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= 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= diff --git a/vendor/goftp.io/server/.drone.yml b/vendor/goftp.io/server/.drone.yml index ec87653a2..2ed0e609f 100644 --- a/vendor/goftp.io/server/.drone.yml +++ b/vendor/goftp.io/server/.drone.yml @@ -19,7 +19,7 @@ steps: commands: - export PATH=$PATH:/go:/srv/app/bin - go vet ./... - - go test -v -race ./... + - go test -race ./... environment: GOPATH: /srv/app MINIO_SERVER_ENDPOINT: minio:9000 @@ -28,7 +28,6 @@ steps: MINIO_SERVER_SECRET_KEY: from_secret: aws_secret_access_key MINIO_SERVER_BUCKET: test - GOPROXY: https://goproxy.cn,direct when: event: - push @@ -37,7 +36,7 @@ steps: services: - name: minio - image: minio/minio:RELEASE.2020-03-14T02-21-58Z + image: minio/minio:RELEASE.2019-10-12T01-39-57Z commands: - minio server ./data environment: diff --git a/vendor/goftp.io/server/cmd.go b/vendor/goftp.io/server/cmd.go index dbf2f5699..704fb60c7 100644 --- a/vendor/goftp.io/server/cmd.go +++ b/vendor/goftp.io/server/cmd.go @@ -12,7 +12,6 @@ import ( "strings" ) -// Command represents a Command interface to a ftp command type Command interface { IsExtend() bool RequireParam() bool diff --git a/vendor/goftp.io/server/conn.go b/vendor/goftp.io/server/conn.go index 8f81530c4..1fa1807ab 100644 --- a/vendor/goftp.io/server/conn.go +++ b/vendor/goftp.io/server/conn.go @@ -26,7 +26,6 @@ const ( defaultWelcomeMessage = "Welcome to the Go FTP Server" ) -// Conn represents a connection between ftp client and the server type Conn struct { conn net.Conn controlReader *bufio.Reader @@ -48,30 +47,22 @@ type Conn struct { tls bool } -// RemoteAddr returns the remote ftp client's address -func (conn *Conn) RemoteAddr() net.Addr { - return conn.conn.RemoteAddr() -} - -// LoginUser returns the login user name if login func (conn *Conn) LoginUser() string { return conn.user } -// IsLogin returns if user has login func (conn *Conn) IsLogin() bool { return len(conn.user) > 0 } -// PublicIP returns the public ip of the server -func (conn *Conn) PublicIP() string { - return conn.server.PublicIP +func (conn *Conn) PublicIp() string { + return conn.server.PublicIp } func (conn *Conn) passiveListenIP() string { var listenIP string - if len(conn.PublicIP()) > 0 { - listenIP = conn.PublicIP() + if len(conn.PublicIp()) > 0 { + listenIP = conn.PublicIp() } else { listenIP = conn.conn.LocalAddr().(*net.TCPAddr).IP.String() } @@ -87,7 +78,6 @@ func (conn *Conn) passiveListenIP() string { return listenIP[:lastIdx] } -// PassivePort returns the port which could be used by passive mode. func (conn *Conn) PassivePort() int { if len(conn.server.PassivePorts) > 0 { portRange := strings.Split(conn.server.PassivePorts, "-") diff --git a/vendor/goftp.io/server/driver.go b/vendor/goftp.io/server/driver.go index d4b3bfe8a..83f7cf886 100644 --- a/vendor/goftp.io/server/driver.go +++ b/vendor/goftp.io/server/driver.go @@ -63,7 +63,6 @@ type MultipleDriver struct { drivers map[string]Driver } -// Stat implements Driver func (driver *MultipleDriver) Stat(path string) (FileInfo, error) { for prefix, driver := range driver.drivers { if strings.HasPrefix(path, prefix) { @@ -73,7 +72,6 @@ func (driver *MultipleDriver) Stat(path string) (FileInfo, error) { return nil, errors.New("Not a file") } -// ListDir implements Driver func (driver *MultipleDriver) ListDir(path string, callback func(FileInfo) error) error { for prefix, driver := range driver.drivers { if strings.HasPrefix(path, prefix) { @@ -83,7 +81,6 @@ func (driver *MultipleDriver) ListDir(path string, callback func(FileInfo) error return errors.New("Not a directory") } -// DeleteDir implements Driver func (driver *MultipleDriver) DeleteDir(path string) error { for prefix, driver := range driver.drivers { if strings.HasPrefix(path, prefix) { @@ -93,7 +90,6 @@ func (driver *MultipleDriver) DeleteDir(path string) error { return errors.New("Not a directory") } -// DeleteFile implements Driver func (driver *MultipleDriver) DeleteFile(path string) error { for prefix, driver := range driver.drivers { if strings.HasPrefix(path, prefix) { @@ -104,7 +100,6 @@ func (driver *MultipleDriver) DeleteFile(path string) error { return errors.New("Not a file") } -// Rename implements Driver func (driver *MultipleDriver) Rename(fromPath string, toPath string) error { for prefix, driver := range driver.drivers { if strings.HasPrefix(fromPath, prefix) { @@ -115,7 +110,6 @@ func (driver *MultipleDriver) Rename(fromPath string, toPath string) error { return errors.New("Not a file") } -// MakeDir implements Driver func (driver *MultipleDriver) MakeDir(path string) error { for prefix, driver := range driver.drivers { if strings.HasPrefix(path, prefix) { @@ -125,7 +119,6 @@ func (driver *MultipleDriver) MakeDir(path string) error { return errors.New("Not a directory") } -// GetFile implements Driver func (driver *MultipleDriver) GetFile(path string, offset int64) (int64, io.ReadCloser, error) { for prefix, driver := range driver.drivers { if strings.HasPrefix(path, prefix) { @@ -136,7 +129,6 @@ func (driver *MultipleDriver) GetFile(path string, offset int64) (int64, io.Read return 0, nil, errors.New("Not a file") } -// PutFile implements Driver func (driver *MultipleDriver) PutFile(destPath string, data io.Reader, appendData bool) (int64, error) { for prefix, driver := range driver.drivers { if strings.HasPrefix(destPath, prefix) { @@ -147,12 +139,10 @@ func (driver *MultipleDriver) PutFile(destPath string, data io.Reader, appendDat return 0, errors.New("Not a file") } -// MultipleDriverFactory implements a DriverFactory type MultipleDriverFactory struct { drivers map[string]Driver } -// NewDriver implements DriverFactory func (factory *MultipleDriverFactory) NewDriver() (Driver, error) { return &MultipleDriver{factory.drivers}, nil } diff --git a/vendor/goftp.io/server/driver_file.go b/vendor/goftp.io/server/driver_file.go index 3c074e4a4..369e76041 100644 --- a/vendor/goftp.io/server/driver_file.go +++ b/vendor/goftp.io/server/driver_file.go @@ -13,7 +13,6 @@ import ( "strings" ) -// FileDriver implements Driver directly read local file system type FileDriver struct { RootPath string Perm @@ -24,7 +23,6 @@ func (driver *FileDriver) realPath(path string) string { return filepath.Join(append([]string{driver.RootPath}, paths...)...) } -// Stat implements Driver func (driver *FileDriver) Stat(path string) (FileInfo, error) { basepath := driver.realPath(path) rPath, err := filepath.Abs(basepath) @@ -53,7 +51,6 @@ func (driver *FileDriver) Stat(path string) (FileInfo, error) { return &fileInfo{f, mode, owner, group}, nil } -// ListDir implements Driver func (driver *FileDriver) ListDir(path string, callback func(FileInfo) error) error { basepath := driver.realPath(path) return filepath.Walk(basepath, func(f string, info os.FileInfo, err error) error { @@ -89,7 +86,6 @@ func (driver *FileDriver) ListDir(path string, callback func(FileInfo) error) er }) } -// DeleteDir implements Driver func (driver *FileDriver) DeleteDir(path string) error { rPath := driver.realPath(path) f, err := os.Lstat(rPath) @@ -102,7 +98,6 @@ func (driver *FileDriver) DeleteDir(path string) error { return errors.New("Not a directory") } -// DeleteFile implements Driver func (driver *FileDriver) DeleteFile(path string) error { rPath := driver.realPath(path) f, err := os.Lstat(rPath) @@ -115,20 +110,17 @@ func (driver *FileDriver) DeleteFile(path string) error { return errors.New("Not a file") } -// Rename implements Driver func (driver *FileDriver) Rename(fromPath string, toPath string) error { oldPath := driver.realPath(fromPath) newPath := driver.realPath(toPath) return os.Rename(oldPath, newPath) } -// MakeDir implements Driver func (driver *FileDriver) MakeDir(path string) error { rPath := driver.realPath(path) return os.MkdirAll(rPath, os.ModePerm) } -// GetFile implements Driver func (driver *FileDriver) GetFile(path string, offset int64) (int64, io.ReadCloser, error) { rPath := driver.realPath(path) f, err := os.Open(rPath) @@ -146,7 +138,6 @@ func (driver *FileDriver) GetFile(path string, offset int64) (int64, io.ReadClos return info.Size() - offset, f, nil } -// PutFile implements Driver func (driver *FileDriver) PutFile(destPath string, data io.Reader, appendData bool) (int64, error) { rPath := driver.realPath(destPath) var isExist bool @@ -206,18 +197,11 @@ func (driver *FileDriver) PutFile(destPath string, data io.Reader, appendData bo return bytes, nil } -// FileDriverFactory implements DriverFactory type FileDriverFactory struct { RootPath string Perm } -// NewDriver implements DriverFactory func (factory *FileDriverFactory) NewDriver() (Driver, error) { - var err error - factory.RootPath, err = filepath.Abs(factory.RootPath) - if err != nil { - return nil, err - } return &FileDriver{factory.RootPath, factory.Perm}, nil } diff --git a/vendor/goftp.io/server/driver_minio.go b/vendor/goftp.io/server/driver_minio.go index b56154097..818066e02 100644 --- a/vendor/goftp.io/server/driver_minio.go +++ b/vendor/goftp.io/server/driver_minio.go @@ -19,7 +19,6 @@ var ( _ Driver = &MinioDriver{} ) -// MinioDriver implements Driver to store files in minio type MinioDriver struct { client *minio.Client perm Perm @@ -95,7 +94,6 @@ func (driver *MinioDriver) isDir(path string) (bool, error) { return true, nil } -// Stat implements Driver func (driver *MinioDriver) Stat(path string) (FileInfo, error) { if path == "/" { return &minioFileInfo{ @@ -126,7 +124,6 @@ func (driver *MinioDriver) Stat(path string) (FileInfo, error) { }, nil } -// ListDir implements Driver func (driver *MinioDriver) ListDir(path string, callback func(FileInfo) error) error { doneCh := make(chan struct{}) defer close(doneCh) @@ -155,7 +152,6 @@ func (driver *MinioDriver) ListDir(path string, callback func(FileInfo) error) e return nil } -// DeleteDir implements Driver func (driver *MinioDriver) DeleteDir(path string) error { doneCh := make(chan struct{}) defer close(doneCh) @@ -174,12 +170,10 @@ func (driver *MinioDriver) DeleteDir(path string) error { return nil } -// DeleteFile implements Driver func (driver *MinioDriver) DeleteFile(path string) error { return driver.client.RemoveObject(driver.bucket, buildMinioPath(path)) } -// Rename implements Driver func (driver *MinioDriver) Rename(fromPath string, toPath string) error { src := minio.NewSourceInfo(driver.bucket, buildMinioPath(fromPath), nil) dst, err := minio.NewDestinationInfo(driver.bucket, buildMinioPath(toPath), nil, nil) @@ -194,14 +188,12 @@ func (driver *MinioDriver) Rename(fromPath string, toPath string) error { return driver.client.RemoveObject(driver.bucket, buildMinioPath(fromPath)) } -// MakeDir implements Driver func (driver *MinioDriver) MakeDir(path string) error { dirPath := buildMinioDir(path) _, err := driver.client.PutObject(driver.bucket, dirPath, nil, 0, minio.PutObjectOptions{ContentType: "application/octet-stream"}) return err } -// GetFile implements Driver func (driver *MinioDriver) GetFile(path string, offset int64) (int64, io.ReadCloser, error) { var opts = minio.GetObjectOptions{} object, err := driver.client.GetObject(driver.bucket, buildMinioPath(path), opts) @@ -218,7 +210,6 @@ func (driver *MinioDriver) GetFile(path string, offset int64) (int64, io.ReadClo return info.Size - offset, object, nil } -// PutFile implements Driver func (driver *MinioDriver) PutFile(destPath string, data io.Reader, appendData bool) (int64, error) { p := buildMinioPath(destPath) if !appendData { @@ -253,7 +244,6 @@ func (driver *MinioDriver) PutFile(destPath string, data io.Reader, appendData b return size, driver.client.ComposeObject(dst, srcs) } -// MinioDriverFactory implements DriverFactory type MinioDriverFactory struct { endpoint string accessKeyID string @@ -264,7 +254,6 @@ type MinioDriverFactory struct { perm Perm } -// NewMinioDriverFactory creates a DriverFactory implementation func NewMinioDriverFactory(endpoint, accessKeyID, secretAccessKey, location, bucket string, useSSL bool, perm Perm) *MinioDriverFactory { return &MinioDriverFactory{ endpoint: endpoint, @@ -277,7 +266,6 @@ func NewMinioDriverFactory(endpoint, accessKeyID, secretAccessKey, location, buc } } -// NewDriver implements DriverFactory func (factory *MinioDriverFactory) NewDriver() (Driver, error) { // Initialize minio client object. minioClient, err := minio.New(factory.endpoint, factory.accessKeyID, factory.secretAccessKey, factory.useSSL) diff --git a/vendor/goftp.io/server/file_info.go b/vendor/goftp.io/server/file_info.go index 4eeb72751..e58e685f6 100644 --- a/vendor/goftp.io/server/file_info.go +++ b/vendor/goftp.io/server/file_info.go @@ -6,7 +6,6 @@ package server import "os" -// FileInfo represents an file interface type FileInfo interface { os.FileInfo diff --git a/vendor/goftp.io/server/go.mod b/vendor/goftp.io/server/go.mod index 85071a00a..4c765f204 100644 --- a/vendor/goftp.io/server/go.mod +++ b/vendor/goftp.io/server/go.mod @@ -3,11 +3,9 @@ module goftp.io/server go 1.12 require ( + code.gitea.io/log v0.0.0-20191208183219-f31613838113 github.com/jlaffaye/ftp v0.0.0-20190624084859-c1312a7102bf github.com/minio/minio-go/v6 v6.0.46 github.com/stretchr/testify v1.3.0 - golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect - golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 // indirect - golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e // indirect - golang.org/x/text v0.3.2 // indirect + gopkg.in/src-d/go-git.v4 v4.13.1 ) diff --git a/vendor/goftp.io/server/go.sum b/vendor/goftp.io/server/go.sum index 1f4c8c3c3..90bc32e25 100644 --- a/vendor/goftp.io/server/go.sum +++ b/vendor/goftp.io/server/go.sum @@ -1,33 +1,59 @@ +code.gitea.io/log v0.0.0-20191208183219-f31613838113 h1:r3gilyTmowpqsnvXRX7Ww1sYWmfR8pbZ1meymLXYCDA= +code.gitea.io/log v0.0.0-20191208183219-f31613838113/go.mod h1:YOBHMQw/14CwuwNStgQyvnzoDJEO6ARjcSdD48QRzhM= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= +github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jlaffaye/ftp v0.0.0-20190624084859-c1312a7102bf h1:2IYBd5TD/maMqTU2YUzp2tJL4cNaOYQ9EBullN9t9pk= github.com/jlaffaye/ftp v0.0.0-20190624084859-c1312a7102bf/go.mod h1:lli8NYPQOFy3O++YmYbqVgOcQ1JPCwdOy+5zSjKJ9qY= -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/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +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/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/minio/minio-go v6.0.14+incompatible h1:fnV+GD28LeqdN6vT2XdGKW8Qe/IfjJDswNVuni6km9o= github.com/minio/minio-go/v6 v6.0.46 h1:waExJtO53xrnsNX//7cSc1h3478wqTryDx4RVD7o26I= github.com/minio/minio-go/v6 v6.0.46/go.mod h1:qD0lajrGW49lKZLtXKtCB4X/qkMf0a5tBvN2PaZg7Gg= github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU= github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= +github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= 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/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= +golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/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-20190513172903-22d7a77e9e5f h1:R423Cnkcp5JABoeemiGEPlt9tHXFfw5kvc0yqlxRPWo= golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -37,12 +63,17 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/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-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e h1:D5TXcfTk7xF7hvieo4QErS3qqCB4teTffacDWr7CI+0= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= @@ -51,5 +82,13 @@ golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/ini.v1 v1.42.0 h1:7N3gPTt50s8GuLortA00n8AqRTk75qOP98+mTPpgzRk= gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= +gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= +gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE= +gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= diff --git a/vendor/goftp.io/server/logger.go b/vendor/goftp.io/server/logger.go index d1612e985..3413585eb 100644 --- a/vendor/goftp.io/server/logger.go +++ b/vendor/goftp.io/server/logger.go @@ -9,52 +9,40 @@ import ( "log" ) -// Logger represents an interface to record all ftp information and command type Logger interface { - Print(sessionID string, message interface{}) - Printf(sessionID string, format string, v ...interface{}) - PrintCommand(sessionID string, command string, params string) - PrintResponse(sessionID string, code int, message string) + Print(sessionId string, message interface{}) + Printf(sessionId string, format string, v ...interface{}) + PrintCommand(sessionId string, command string, params string) + PrintResponse(sessionId string, code int, message string) } -// StdLogger use an instance of this to log in a standard format +// Use an instance of this to log in a standard format type StdLogger struct{} -// Print impelment Logger -func (logger *StdLogger) Print(sessionID string, message interface{}) { - log.Printf("%s %s", sessionID, message) +func (logger *StdLogger) Print(sessionId string, message interface{}) { + log.Printf("%s %s", sessionId, message) } -// Printf impelment Logger -func (logger *StdLogger) Printf(sessionID string, format string, v ...interface{}) { - logger.Print(sessionID, fmt.Sprintf(format, v...)) +func (logger *StdLogger) Printf(sessionId string, format string, v ...interface{}) { + logger.Print(sessionId, fmt.Sprintf(format, v...)) } -// PrintCommand impelment Logger -func (logger *StdLogger) PrintCommand(sessionID string, command string, params string) { +func (logger *StdLogger) PrintCommand(sessionId string, command string, params string) { if command == "PASS" { - log.Printf("%s > PASS ****", sessionID) + log.Printf("%s > PASS ****", sessionId) } else { - log.Printf("%s > %s %s", sessionID, command, params) + log.Printf("%s > %s %s", sessionId, command, params) } } -// PrintResponse impelment Logger -func (logger *StdLogger) PrintResponse(sessionID string, code int, message string) { - log.Printf("%s < %d %s", sessionID, code, message) +func (logger *StdLogger) PrintResponse(sessionId string, code int, message string) { + log.Printf("%s < %d %s", sessionId, code, message) } -// DiscardLogger represents a silent logger, produces no output +// Silent logger, produces no output type DiscardLogger struct{} -// Print impelment Logger -func (logger *DiscardLogger) Print(sessionID string, message interface{}) {} - -// Printf impelment Logger -func (logger *DiscardLogger) Printf(sessionID string, format string, v ...interface{}) {} - -// PrintCommand impelment Logger -func (logger *DiscardLogger) PrintCommand(sessionID string, command string, params string) {} - -// PrintResponse impelment Logger -func (logger *DiscardLogger) PrintResponse(sessionID string, code int, message string) {} +func (logger *DiscardLogger) Print(sessionId string, message interface{}) {} +func (logger *DiscardLogger) Printf(sessionId string, format string, v ...interface{}) {} +func (logger *DiscardLogger) PrintCommand(sessionId string, command string, params string) {} +func (logger *DiscardLogger) PrintResponse(sessionId string, code int, message string) {} diff --git a/vendor/goftp.io/server/notifier.go b/vendor/goftp.io/server/notifier.go index 9296e442f..5b8a78692 100644 --- a/vendor/goftp.io/server/notifier.go +++ b/vendor/goftp.io/server/notifier.go @@ -111,66 +111,3 @@ func (notifiers notifierList) AfterDirDeleted(conn *Conn, dstPath string, err er notifier.AfterDirDeleted(conn, dstPath, err) } } - -// NullNotifier implements Notifier -type NullNotifier struct{} - -var ( - _ Notifier = &NullNotifier{} -) - -// BeforeLoginUser implements Notifier -func (NullNotifier) BeforeLoginUser(conn *Conn, userName string) { -} - -// BeforePutFile implements Notifier -func (NullNotifier) BeforePutFile(conn *Conn, dstPath string) { -} - -// BeforeDeleteFile implements Notifier -func (NullNotifier) BeforeDeleteFile(conn *Conn, dstPath string) { -} - -// BeforeChangeCurDir implements Notifier -func (NullNotifier) BeforeChangeCurDir(conn *Conn, oldCurDir, newCurDir string) { -} - -// BeforeCreateDir implements Notifier -func (NullNotifier) BeforeCreateDir(conn *Conn, dstPath string) { -} - -// BeforeDeleteDir implements Notifier -func (NullNotifier) BeforeDeleteDir(conn *Conn, dstPath string) { -} - -// BeforeDownloadFile implements Notifier -func (NullNotifier) BeforeDownloadFile(conn *Conn, dstPath string) { -} - -// AfterUserLogin implements Notifier -func (NullNotifier) AfterUserLogin(conn *Conn, userName, password string, passMatched bool, err error) { -} - -// AfterFilePut implements Notifier -func (NullNotifier) AfterFilePut(conn *Conn, dstPath string, size int64, err error) { -} - -// AfterFileDeleted implements Notifier -func (NullNotifier) AfterFileDeleted(conn *Conn, dstPath string, err error) { -} - -// AfterFileDownloaded implements Notifier -func (NullNotifier) AfterFileDownloaded(conn *Conn, dstPath string, size int64, err error) { -} - -// AfterCurDirChanged implements Notifier -func (NullNotifier) AfterCurDirChanged(conn *Conn, oldCurDir, newCurDir string, err error) { -} - -// AfterDirCreated implements Notifier -func (NullNotifier) AfterDirCreated(conn *Conn, dstPath string, err error) { -} - -// AfterDirDeleted implements Notifier -func (NullNotifier) AfterDirDeleted(conn *Conn, dstPath string, err error) { -} diff --git a/vendor/goftp.io/server/perm.go b/vendor/goftp.io/server/perm.go index 0bdb0ae8f..abcb70a9a 100644 --- a/vendor/goftp.io/server/perm.go +++ b/vendor/goftp.io/server/perm.go @@ -6,7 +6,6 @@ package server import "os" -// Perm represents a perm interface type Perm interface { GetOwner(string) (string, error) GetGroup(string) (string, error) @@ -17,12 +16,10 @@ type Perm interface { ChMode(string, os.FileMode) error } -// SimplePerm implements Perm interface that all files are owned by special owner and group type SimplePerm struct { owner, group string } -// NewSimplePerm creates a SimplePerm func NewSimplePerm(owner, group string) *SimplePerm { return &SimplePerm{ owner: owner, @@ -30,32 +27,26 @@ func NewSimplePerm(owner, group string) *SimplePerm { } } -// GetOwner returns the file's owner func (s *SimplePerm) GetOwner(string) (string, error) { return s.owner, nil } -// GetGroup returns the group of the file func (s *SimplePerm) GetGroup(string) (string, error) { return s.group, nil } -// GetMode returns the file's mode func (s *SimplePerm) GetMode(string) (os.FileMode, error) { return os.ModePerm, nil } -// ChOwner changed the file's owner func (s *SimplePerm) ChOwner(string, string) error { return nil } -// ChGroup changed the file's group func (s *SimplePerm) ChGroup(string, string) error { return nil } -// ChMode changed the file's mode func (s *SimplePerm) ChMode(string, os.FileMode) error { return nil } diff --git a/vendor/goftp.io/server/server.go b/vendor/goftp.io/server/server.go index ccf684e7f..b5277086d 100644 --- a/vendor/goftp.io/server/server.go +++ b/vendor/goftp.io/server/server.go @@ -35,7 +35,7 @@ type ServerOpts struct { Hostname string // Public IP of the server - PublicIP string + PublicIp string // Passive ports PassivePorts string @@ -116,10 +116,9 @@ func serverOptsWithDefaults(opts *ServerOpts) *ServerOpts { newOpts.Auth = opts.Auth } + newOpts.Logger = &StdLogger{} if opts.Logger != nil { newOpts.Logger = opts.Logger - } else { - newOpts.Logger = &StdLogger{} } newOpts.TLS = opts.TLS @@ -127,7 +126,7 @@ func serverOptsWithDefaults(opts *ServerOpts) *ServerOpts { newOpts.CertFile = opts.CertFile newOpts.ExplicitFTPS = opts.ExplicitFTPS - newOpts.PublicIP = opts.PublicIP + newOpts.PublicIp = opts.PublicIp newOpts.PassivePorts = opts.PassivePorts return &newOpts @@ -156,12 +155,6 @@ func NewServer(opts *ServerOpts) *Server { s.ServerOpts = opts s.listenTo = net.JoinHostPort(opts.Hostname, strconv.Itoa(opts.Port)) s.logger = opts.Logger - var curFeats = featCmds - if opts.TLS { - curFeats += " AUTH TLS\n PBSZ\n PROT\n" - } - s.feats = fmt.Sprintf(feats, curFeats) - return s } @@ -215,6 +208,7 @@ func simpleTLSConfig(certFile, keyFile string) (*tls.Config, error) { func (server *Server) ListenAndServe() error { var listener net.Listener var err error + var curFeats = featCmds if server.ServerOpts.TLS { server.tlsConfig, err = simpleTLSConfig(server.CertFile, server.KeyFile) @@ -222,6 +216,8 @@ func (server *Server) ListenAndServe() error { return err } + curFeats += " AUTH TLS\n PBSZ\n PROT\n" + if server.ServerOpts.ExplicitFTPS { listener, err = net.Listen("tcp", server.listenTo) } else { @@ -233,6 +229,7 @@ func (server *Server) ListenAndServe() error { if err != nil { return err } + server.feats = fmt.Sprintf(feats, curFeats) sessionID := "" server.logger.Printf(sessionID, "%s listening on %d", server.Name, server.Port) diff --git a/vendor/modules.txt b/vendor/modules.txt index 09f4a46b9..c5e8ff14d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -338,7 +338,7 @@ go.uber.org/zap/internal/bufferpool go.uber.org/zap/internal/color go.uber.org/zap/internal/exit go.uber.org/zap/zapcore -# goftp.io/server v0.3.4 +# goftp.io/server v0.3.3 ## explicit goftp.io/server # golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9