Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -4,21 +4,39 @@ sudo: false
 os:
  - linux
 
+services:
+ - docker
+
 go:
- - 1.10.x
  - 1.11.x
  - 1.12.x
+ - 1.13.x
  - tip
 
-install:
- - echo "This is an override of the default install deps step in travis."
+env:
+ global:
+ - GO111MODULE=on
 
-script:
+install:
  - go get -t -u -v ./...
  - go build -v .
  - go vet ./...
+
+script:
  - go test ./...
 
+jobs:
+ include:
+ - stage: Fuzz regression
+ go: 1.12.x
+ dist: bionic
+ script: ./fuzzit.sh local-regression
+ - stage: Fuzz
+ if: branch = master AND type IN (push)
+ go: 1.12.x
+ dist: bionic
+ script: ./fuzzit.sh fuzzing
+
 before_deploy:
  - mkdir -p release
  - "GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags -a -tags netgo -ldflags '-s -w -extldflags -static' -o release/transfersh-$TRAVIS_TAG-linux-amd64"
@@ -38,5 +56,5 @@ deploy:
  skip_cleanup: true
  on:
  tags: true
- go: tip
- overwrite: true
+ go: 1.12.x
+ overwrite: true

README.md

@@ -1,4 +1,4 @@
-# transfer.sh [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dutchcoders/transfer.sh?utm_source=badge&utm_medium=badge&utm_campaign=&utm_campaign=pr-badge&utm_content=badge) [![Go Report Card](https://goreportcard.com/badge/github.com/dutchcoders/transfer.sh)](https://goreportcard.com/report/github.com/dutchcoders/transfer.sh) [![Docker pulls](https://img.shields.io/docker/pulls/dutchcoders/transfer.sh.svg)](https://hub.docker.com/r/dutchcoders/transfer.sh/) [![Build Status](https://travis-ci.org/dutchcoders/transfer.sh.svg?branch=master)](https://travis-ci.org/dutchcoders/transfer.sh)
+# transfer.sh [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dutchcoders/transfer.sh?utm_source=badge&utm_medium=badge&utm_campaign=&utm_campaign=pr-badge&utm_content=badge) [![Go Report Card](https://goreportcard.com/badge/github.com/dutchcoders/transfer.sh)](https://goreportcard.com/report/github.com/dutchcoders/transfer.sh) [![Docker pulls](https://img.shields.io/docker/pulls/dutchcoders/transfer.sh.svg)](https://hub.docker.com/r/dutchcoders/transfer.sh/) [![Build Status](https://travis-ci.org/dutchcoders/transfer.sh.svg?branch=master)](https://travis-ci.org/dutchcoders/transfer.sh) [![Fuzzit Status](https://app.fuzzit.dev/badge?org_id=transfer.sh)](https://app.fuzzit.dev/orgs/transfer.sh/dashboard)
 
 Easy and fast file sharing from the command-line. This code contains the server with everything you need to create your own instance.
 

fuzzit.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+set -xe
+
+# Validate arguments
+if [ "$#" -ne 1 ]; then
+ echo "Usage: $0 <fuzz-type>"
+ exit 1
+fi
+
+# Configure
+NAME=transfersh
+ROOT=./server
+TYPE=$1
+
+# Setup
+export GOFUZZ111MODULE="on"
+go get -u github.com/dvyukov/go-fuzz/go-fuzz github.com/dvyukov/go-fuzz/go-fuzz-build
+go get -d -v -u ./...
+if [ ! -f fuzzit ]; then
+ wget -q -O fuzzit https://github.com/fuzzitdev/fuzzit/releases/download/v2.4.72/fuzzit_Linux_x86_64
+ chmod a+x fuzzit
+fi
+
+# Fuzz
+function fuzz {
+ FUNC=Fuzz$1
+ TARGET=$2
+ DIR=${3:-$ROOT}
+ go-fuzz-build -libfuzzer -func $FUNC -o fuzzer.a $DIR
+ clang -fsanitize=fuzzer fuzzer.a -o fuzzer
+ ./fuzzit create job --type $TYPE $NAME/$TARGET fuzzer
+}
+fuzz LocalStorage local-storage

go.mod

@@ -3,33 +3,44 @@ module github.com/dutchcoders/transfer.sh
 go 1.12
 
 require (
+ cloud.google.com/go v0.46.3 // indirect
  github.com/PuerkitoBio/ghost v0.0.0-20160324114900-206e6e460e14
  github.com/VojtechVitek/ratelimit v0.0.0-20160722140851-dc172bc0f6d2
- github.com/aws/aws-sdk-go v1.23.8
+ github.com/aws/aws-sdk-go v1.25.7
+ github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
  github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e
  github.com/dutchcoders/go-virustotal v0.0.0-20140923143438-24cc8e6fa329
  github.com/dutchcoders/transfer.sh-web v0.0.0-20190716184912-96e06a2276ba
  github.com/elazarl/go-bindata-assetfs v1.0.0
  github.com/fatih/color v1.7.0
  github.com/garyburd/redigo v1.6.0 // indirect
- github.com/golang/gddo v0.0.0-20190815223733-287de01127ef
+ github.com/golang/gddo v0.0.0-20190904175337-72a348e765d2
+ github.com/golang/groupcache v0.0.0-20191002201903-404acd9df4cc // indirect
  github.com/gorilla/mux v1.7.3
  github.com/gorilla/securecookie v1.1.1 // indirect
+ github.com/hashicorp/golang-lru v0.5.3 // indirect
+ github.com/mattn/go-colorable v0.1.4 // indirect
+ github.com/mattn/go-isatty v0.0.9 // indirect
  github.com/microcosm-cc/bluemonday v1.0.2
  github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
+ github.com/russross/blackfriday/v2 v2.0.1
  github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
  github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9
  github.com/stretchr/testify v1.4.0 // indirect
  github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce
- github.com/urfave/cli v1.21.0
+ github.com/urfave/cli v1.22.1
  github.com/zeebo/errs v1.2.2
- golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7
- golang.org/x/net v0.0.0-20190916140828-c8589233b77d
+ go.opencensus.io v0.22.1 // indirect
+ golang.org/x/crypto v0.0.0-20190911031432-227b7
+ golang.org/x/net v0.0.0-20191007182048-72f939374954
  golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
- google.golang.org/api v0.9.0
+ golang.org/x/sys v0.0.0-20191007154456-ef33b2fb2c41 // indirect
+ google.golang.org/api v0.10.0
+ google.golang.org/appengine v1.6.4 // indirect
  gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127
  gopkg.in/russross/blackfriday.v2 v2.0.1
- storj.io/storj v0.24.5
+ google.golang.org/genproto v0.0.0-20191007162740-aa923e3a3354 // indirect
+ google.golang.org/grpc v1.24.0 // indirect
+ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
+ storj.io/storj 
 )
-
-replace gopkg.in/russross/blackfriday.v2 v2.0.1 => github.com/russross/blackfriday/v2 v2.0.1