fix elasticsearch stuff

Gopkg.toml

@@ -49,17 +49,13 @@
   version = "1.0.2"
 
 [[constraint]]
-  name = "gopkg.in/dancannon/gorethink.v2"
-  version = "2.2.2"
+  branch = "master"
+  name = "github.com/malice-plugins/pkgs"
 
 [[constraint]]
   name = "gopkg.in/natefinch/lumberjack.v2"
   version = "2.0.0"
 
-[[override]]
-  name = "github.com/olivere/elastic"
-  version = "^6.0.0"
-
 [[override]]
   name = "github.com/docker/distribution"
   revision = "b38e5838b7b2f2ad48e06ec4b500011976080621"

commands/elk.go

@@ -2,7 +2,7 @@ package commands
 
 import (
 	log "github.com/Sirupsen/logrus"
-	"github.com/maliceio/go-plugin-utils/database/elasticsearch"
+	"github.com/malice-plugins/pkgs/database/elasticsearch"
 	"github.com/maliceio/malice/config"
 	"github.com/maliceio/malice/malice/database"
 	"github.com/maliceio/malice/malice/docker/client"

commands/lookup.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/maliceio/go-plugin-utils/database/elasticsearch"
-	"github.com/maliceio/go-plugin-utils/utils"
+	"github.com/malice-plugins/pkgs/database/elasticsearch"
+	"github.com/malice-plugins/pkgs/utils"
 	"github.com/maliceio/malice/config"
 	"github.com/maliceio/malice/malice/database"
 	"github.com/maliceio/malice/malice/docker/client"

commands/scan.go

@@ -7,8 +7,8 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/fatih/structs"
-	"github.com/maliceio/go-plugin-utils/database/elasticsearch"
-	"github.com/maliceio/go-plugin-utils/utils"
+	"github.com/malice-plugins/pkgs/database/elasticsearch"
+	"github.com/malice-plugins/pkgs/utils"
 	"github.com/maliceio/malice/config"
 	"github.com/maliceio/malice/malice/database"
 	"github.com/maliceio/malice/malice/docker/client"
@@ -22,9 +22,11 @@ import (
 func cmdScan(path string, logs bool) error {
 
 	es := elasticsearch.Database{
-		URL:   config.Conf.DB.URL,
-		Index: utils.Getopt("MALICE_ELASTICSEARCH_INDEX", "malice"),
-		Type:  "samples",
+		URL:      utils.Getopt("MALICE_ELASTICSEARCH_URL", config.Conf.DB.URL),
+		Index:    utils.Getopt("MALICE_ELASTICSEARCH_INDEX", "malice"),
+		Type:     utils.Getopt("MALICE_ELASTICSEARCH_TYPE", "samples"),
+		Username: utils.Getopt("MALICE_ELASTICSEARCH_USERNAME", config.Conf.DB.Username),
+		Password: utils.Getopt("MALICE_ELASTICSEARCH_PASSWORD", config.Conf.DB.Password),
 	}
 
 	if len(path) > 0 {

config/config.toml

@@ -25,8 +25,8 @@ version = "v0.3.20"
 [database]
   name = "malice-elastic"
   image = "malice/elasticsearch:6.4"
-  url = "http://localhost:9200"
-  # url = "http://elasticsearch:9200"
+  # url = "http://localhost:9200"
+  url = "http://elasticsearch:9200"
   username = ""
   password = ""
   ports = [9200]

malice/database/database.go

@@ -9,7 +9,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-units"
-	"github.com/maliceio/go-plugin-utils/database/elasticsearch"
+	"github.com/malice-plugins/pkgs/database/elasticsearch"
 	"github.com/maliceio/malice/config"
 	"github.com/maliceio/malice/malice/docker/client"
 	"github.com/maliceio/malice/malice/docker/client/container"

malice/docker/client/client.go

@@ -7,7 +7,7 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/docker/docker/client"
-	"github.com/maliceio/go-plugin-utils/utils"
+	"github.com/malice-plugins/pkgs/utils"
 	"github.com/maliceio/malice/config"
 	"golang.org/x/net/context"
 )

malice/persist/file.go

@@ -26,7 +26,7 @@ import (
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/docker/go-units"
 	"github.com/dustin/go-jsonpointer"
-	"github.com/maliceio/go-plugin-utils/utils"
+	"github.com/malice-plugins/pkgs/utils"
 	"github.com/maliceio/malice/config"
 	"github.com/maliceio/malice/malice/docker/client"
 	er "github.com/maliceio/malice/malice/errors"

plugins/plugins.go

@@ -15,7 +15,7 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api/types/strslice"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/maliceio/go-plugin-utils/utils"
+	"github.com/malice-plugins/pkgs/utils"
 	"github.com/maliceio/malice/config"
 	"github.com/maliceio/malice/malice/docker/client"
 	"github.com/maliceio/malice/malice/docker/client/container"

plugins/templates/go/scan.go

@@ -11,8 +11,8 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/fatih/structs"
-	"github.com/maliceio/go-plugin-utils/database/elasticsearch"
-	"github.com/maliceio/go-plugin-utils/utils"
+	"github.com/malice-plugins/pkgs/database/elasticsearch"
+	"github.com/malice-plugins/pkgs/utils"
 	"github.com/urfave/cli"
 )