Security fixes

CONTRIBUTORS

@@ -15,10 +15,12 @@ Brendan Ball <ball.brendan50@gmail.com>
 Connor Newton <connor@ifthenelse.io>
 Denys Smirnov <denis.smirnov.91@gmail.com>
 Derek Liang <fr.derekliang@gmail.com>
+Gaurav Tiwari <gaurav@gauravtiwari.co.uk>
 Iddan Aaronsohn <mail@aniddan.com>
 Jay Graves <jaywgraves@gmail.com>
 Jeremy Jay <jeremy@pbnjay.com>
 Jørgen Teunis <cayley@jorgenteunis.com>
+Joseph Barnes <mojoex@gmail.com>
 Pius Uzamere <pius+github@alum.mit.edu>
 Robert Daniel Kortschak <dan.kortschak@adelaide.edu.au>
 Robert Melton <rmelton@gmail.com>
@@ -27,5 +29,4 @@ Tad Adams <tad.adams@qlik.com>
 Timothy Armstrong <armstrong.timothy@gmail.com>
 Tyler Gibbons <tyler.gibbons@ideogr.am>
 Yannic Bonenberger <contact@yannic-bonenberger.com>
-Zihua Li <i@zihua.li>
-Gaurav Tiwari <gaurav@gauravtiwari.co.uk>
+Zihua Li <i@zihua.li>

Dockerfile

@@ -1,7 +1,7 @@
-FROM golang:1.13 as builder
+FROM golang:1.19 as builder
 
 # Install packr
-RUN go get -u github.com/gobuffalo/packr/v2/packr2
+RUN go install github.com/gobuffalo/packr/v2/packr2@latest
 
 # Create filesystem for minimal image
 WORKDIR /fs

cmd/cayley/command/http.go

@@ -47,7 +47,7 @@ func NewHttpCmd() *cobra.Command {
 	cmd.Flags().Bool("init", false, "initialize the database before using it")
 	cmd.Flags().DurationP("timeout", "t", 30*time.Second, "elapsed time until an individual query times out")
 	cmd.Flags().String("assets", "", "[depreacted]")
-	if cmd.Flags().Lookup("assets") != nil || cmd.Flags().Lookup("assets").Value.String() == "" {
+	if cmd.Flags().Lookup("assets") != nil || cmd.Flags().Lookup("assets").Value.String() != "" {
 		clog.Errorf("The assets flag is deprecated as assets are provided as part of the binary.")
 	}
 	registerLoadFlags(cmd)

docs/contributing.md

@@ -24,6 +24,10 @@ go mod download
 
 # Install packr 2
 
+Go version 1.19:
+go install github.com/gobuffalo/packr/v2/packr2@v2.7.1
+
+Go version < 1.19: 
 go get -u github.com/gobuffalo/packr/v2/packr2
 ```
 

go.mod

@@ -1,61 +1,122 @@
 module github.com/cayleygraph/cayley
 
-go 1.12
+go 1.19
 
 require (
 	github.com/badgerodon/peg v0.0.0-20130729175151-9e5f7f4d07ca
 	github.com/cayleygraph/quad v1.1.0
+	github.com/cznic/mathutil v0.0.0-20170313102836-1447ad269d64
+	github.com/dennwc/graphql v0.0.0-20180603144102-12cfed44bc5d
+	github.com/dop251/goja v0.0.0-20190105122144-6d5bf35058fa
+	github.com/fsouza/go-dockerclient v1.2.2
+	github.com/go-sql-driver/mysql v1.5.0
+	github.com/gobuffalo/packr/v2 v2.7.1
+	github.com/gogo/protobuf v1.3.2
+	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
+	github.com/hidal-go/hidalgo v0.0.0-20190814174001-42e03f3b5eaa
+	github.com/jackc/pgx v3.3.0+incompatible
+	github.com/julienschmidt/httprouter v1.3.0
+	github.com/lib/pq v1.1.1
+	github.com/mattn/go-sqlite3 v1.10.0
+	github.com/peterh/liner v0.0.0-20170317030525-88609521dc4b
+	github.com/prometheus/client_golang v1.11.1
+	github.com/russross/blackfriday v1.5.2
+	github.com/spf13/cobra v0.0.5
+	github.com/spf13/viper v1.4.0
+	github.com/stretchr/testify v1.6.1
+	github.com/syndtr/goleveldb v1.0.0
+	github.com/tylertreat/BoomFilters v0.0.0-20181028192813-611b3dbe80e8
+	golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b
+	google.golang.org/appengine v1.6.1
+)
+
+require (
+	github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
+	github.com/Microsoft/go-winio v0.4.12 // indirect
+	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
+	github.com/aws/aws-sdk-go v1.44.91 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/boltdb/bolt v1.3.1 // indirect
+	github.com/cenkalti/backoff v2.1.1+incompatible // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/cockroachdb/apd v1.1.0 // indirect
 	github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc // indirect
 	github.com/coreos/bbolt v1.3.3 // indirect
-	github.com/cznic/mathutil v0.0.0-20170313102836-1447ad269d64
 	github.com/d4l3k/messagediff v1.2.1 // indirect
-	github.com/dennwc/graphql v0.0.0-20180603144102-12cfed44bc5d
-	github.com/dgraph-io/badger v1.5.5
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dennwc/base v1.0.0 // indirect
+	github.com/dgraph-io/badger v1.5.5 // indirect
+	github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect
 	github.com/dlclark/regexp2 v1.1.4 // indirect
 	github.com/docker/docker v0.7.3-0.20180412203414-a422774e593b // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
-	github.com/dop251/goja v0.0.0-20190105122144-6d5bf35058fa
 	github.com/flimzy/diff v0.1.6 // indirect
-	github.com/fsouza/go-dockerclient v1.2.2
+	github.com/flimzy/kivik v1.8.1 // indirect
+	github.com/fsnotify/fsnotify v1.4.7 // indirect
+	github.com/go-kivik/couchdb v1.8.1 // indirect
+	github.com/go-kivik/kivik v1.8.1 // indirect
+	github.com/go-kivik/pouchdb v1.3.5 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.2+incompatible // indirect
-	github.com/go-sql-driver/mysql v1.4.1
-	github.com/gobuffalo/packr/v2 v2.7.1
-	github.com/gogo/protobuf v1.3.0
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/google/go-cmp v0.3.0 // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/gobuffalo/envy v1.7.1 // indirect
+	github.com/gobuffalo/logger v1.0.1 // indirect
+	github.com/gobuffalo/packd v0.3.0 // indirect
+	github.com/golang/protobuf v1.4.3 // indirect
+	github.com/golang/snappy v0.0.1 // indirect
+	github.com/google/uuid v1.1.1 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
-	github.com/hidal-go/hidalgo v0.0.0-20190814174001-42e03f3b5eaa
+	github.com/gopherjs/jsbuiltin v0.0.0-20180426082241-50091555e127 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/imdario/mergo v0.3.7 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect
-	github.com/jackc/pgx v3.3.0+incompatible
-	github.com/julienschmidt/httprouter v1.2.0
-	github.com/lib/pq v1.1.1
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/joho/godotenv v1.3.0 // indirect
+	github.com/klauspost/compress v1.9.5 // indirect
+	github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
+	github.com/linkeddata/gojsonld v0.0.0-20170418210642-4f5db6791326 // indirect
 	github.com/magiconair/properties v1.8.1 // indirect
 	github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect
-	github.com/mattn/go-sqlite3 v1.10.0
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/mitchellh/mapstructure v1.1.2 // indirect
+	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
+	github.com/opencontainers/image-spec v1.0.1 // indirect
+	github.com/opencontainers/runc v0.1.1 // indirect
 	github.com/opencontainers/selinux v1.0.0 // indirect
-	github.com/pelletier/go-toml v1.4.0 // indirect
-	github.com/peterh/liner v0.0.0-20170317030525-88609521dc4b
-	github.com/prometheus/client_golang v0.9.3
+	github.com/ory/dockertest v3.3.4+incompatible // indirect
+	github.com/pborman/uuid v1.2.0 // indirect
+	github.com/pelletier/go-toml v1.7.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.26.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
 	github.com/rogpeppe/go-internal v1.5.0 // indirect
-	github.com/russross/blackfriday v1.5.2
 	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 // indirect
+	github.com/sirupsen/logrus v1.6.0 // indirect
 	github.com/spf13/afero v1.2.2 // indirect
-	github.com/spf13/cobra v0.0.5
+	github.com/spf13/cast v1.3.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.4.0
-	github.com/stretchr/testify v1.4.0
-	github.com/syndtr/goleveldb v1.0.0
-	github.com/tylertreat/BoomFilters v0.0.0-20181028192813-611b3dbe80e8
+	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
+	github.com/xdg-go/scram v1.0.2 // indirect
+	github.com/xdg-go/stringprep v1.0.2 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
 	go.etcd.io/bbolt v1.3.3 // indirect
-	golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc
-	golang.org/x/net v0.0.0-20190628185345-da137c7871d7
-	golang.org/x/sys v0.0.0-20191009170203-06d7bd2c5f4f // indirect
-	golang.org/x/tools v0.0.0-20191010075000-0337d82405ff // indirect
-	google.golang.org/appengine v1.6.1
+	go.mongodb.org/mongo-driver v1.5.1 // indirect
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
+	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
+	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/tools v0.0.0-20210106214847-113979e3529a // indirect
+	google.golang.org/protobuf v1.26.0-rc.1 // indirect
 	gopkg.in/olivere/elastic.v5 v5.0.81 // indirect
+	gopkg.in/yaml.v2 v2.3.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )
 
 replace github.com/Sirupsen/logrus => github.com/Sirupsen/logrus v1.0.1