diff --git a/.release/VERSION b/.release/VERSION index 1b2ee64e..25309a8c 100644 --- a/.release/VERSION +++ b/.release/VERSION @@ -1 +1 @@ -v0.3.21 +v0.3.22 diff --git a/config/bindata.go b/config/bindata.go index 71d97533..850f3ee9 100644 --- a/config/bindata.go +++ b/config/bindata.go @@ -68,7 +68,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _configConfigToml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4b\x6f\xdb\x3c\x10\xbc\xf3\x57\x2c\xe4\xcb\xf7\x01\x8d\x2c\x4b\x4e\xe2\x0a\xf0\x21\x08\x72\x48\xd1\xb4\x40\x72\x34\x82\x62\x25\xad\x25\xc2\x7c\x08\x24\xe5\x3c\x7e\x7d\xb1\xb4\xe5\x44\x6d\x2e\x05\x22\x1f\x68\x72\xf6\x31\x33\x5c\xce\xe0\xda\xf6\x2f\x4e\xb6\x5d\x80\xff\xea\xff\x21\xcf\x16\x05\x9c\xf1\xb2\x82\x4a\x61\xbd\x0b\xb6\x87\x6f\xd6\x77\x03\xc2\x1d\x4a\x43\x5f\xe0\x4a\x29\xb8\xe7\x04\x0f\xf7\xe4\xc9\xed\xa9\x49\xc5\x0c\x1e\x88\xe0\xfb\xed\xf5\xcd\x8f\x87\x1b\xd8\x5a\x07\x4a\xd6\x64\x3c\x81\x34\x5b\xeb\x34\x06\x69\x4d\x2a\xc4\xec\x73\x3e\x31\x83\xbb\x2b\xee\x06\xd7\xd6\x6c\x65\x3b\xb8\xd8\x00\xfe\xbd\xce\x27\xf1\x11\x41\x06\x45\xb0\x86\xe4\x0e\x59\x39\xdc\x0f\x26\x48\x4d\x53\x7e\x89\xd8\x93\xf3\x4c\x74\x0d\xc9\x3e\x4b\x8b\x34\x5f\x24\x42\x6c\x70\x08\x9d\x75\x8f\x02\xc0\xa0\x8e\x55\x46\xef\x13\x01\x60\x5d\x8b\x46\xbe\x1e\x14\x9e\x3a\xdc\xfe\xe4\xcc\x27\xaa\x38\x6d\x70\x8a\x91\x2c\x8d\xbf\x72\x95\x71\x1e\x36\x5a\x9a\x5f\x47\x68\x91\x5f\x46\x70\x51\x16\x45\x51\x70\x2a\x69\x94\x8a\x93\x3b\xeb\x03\x87\x78\x1d\xfa\x94\x9e\x51\xf7\x8a\xd2\xda\x6a\xae\xd1\x5b\xc7\x58\x7e\xce\x4d\x3c\x39\x8e\xe3\x95\x79\x46\x1c\xbd\xe7\x33\x5e\x9f\xac\x6b\xb8\x70\x83\x01\x2b\xf4\xf4\x5e\x8f\x8e\x9c\xcf\x48\xa1\x0f\xb2\xe6\x4c\xa9\xb1\x7d\x07\xcd\x8f\x90\x27\x74\x75\x57\x5e\xa4\xcb\xe4\x4d\x57\x17\x42\x5f\xce\xe7\xca\xd6\xa8\x98\x6d\xf9\x35\xcf\xa2\xc4\xd9\x1f\x11\xd3\x22\x63\xd4\x48\x98\x03\x47\xd2\x4c\xf6\xb4\xb7\x2e\xb0\x8a\x0d\x27\x30\x6b\xbe\x39\x3b\x44\xe1\x99\x00\x20\x83\x95\x22\x0e\x0f\x6e\x20\x21\x36\x83\xfc\x40\xdb\x4e\x56\x68\xf0\x23\x69\x07\x64\xd4\x14\x9f\x4c\x34\xf2\xa4\x67\x42\x62\xb9\x2c\x1e\x3f\x6a\x4a\x66\x2f\x9d\x35\x9a\x4c\x60\xdc\x0d\x71\x18\x1a\xda\x93\xb2\x3d\x9f\x46\xef\x6d\xbd\xa3\x38\x49\x1a\xeb\x4e\x1a\x3a\x9b\xb2\x4c\x62\xe5\xa6\xb7\xd2\xc4\x3b\x0f\xf5\xd4\xd8\xbc\xb8\xbc\x48\x26\x0e\x2c\xa2\x05\x95\x34\x8d\x7f\x2b\x53\xce\x35\xaa\x27\x74\x54\x3a\xcb\xe1\x4a\x9a\x9d\xff\xfb\x9e\xcb\xc9\x7d\x70\x60\xdd\x0f\xb0\x86\xf3\xec\xf8\x31\x4f\xd2\xd6\xbd\xf0\x61\xbe\xcc\x57\x2b\x3e\x14\x1b\x65\xdb\xf6\x20\x63\x2b\x15\x4d\x25\xa4\xca\xb6\x49\x14\xf8\xec\xe5\x2b\x03\x8b\xec\xb0\x3d\xb8\x5e\x1c\x77\x15\xd6\xbb\xa1\x67\x56\x97\xcc\x90\x25\xc6\x17\xb9\x86\x2d\x2a\xcf\x8e\xf6\xce\x3e\xbf\xbc\x79\x7d\x42\x00\x78\x9c\xc6\xe9\xe0\xff\xfe\xb0\xf9\x1d\x00\x00\xff\xff\xa9\x58\xdd\xc3\x2e\x05\x00\x00") +var _configConfigToml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4b\x6f\xdb\x3c\x10\xbc\xf3\x57\x2c\xe4\xcb\xf7\x01\x8d\x2c\x4b\x4e\xe2\x0a\xf0\x21\x08\x72\x48\xd1\xb4\x40\x72\x34\x82\x62\x25\xad\x25\xc2\x7c\x08\x24\xe5\x3c\x7e\x7d\xb1\xb4\xe5\x44\x6d\x2e\x05\x22\x1f\x68\x72\xf6\x31\x33\x5c\xce\xe0\xda\xf6\x2f\x4e\xb6\x5d\x80\xff\xea\xff\x21\xcf\x16\x05\x9c\xf1\xb2\x82\x4a\x61\xbd\x0b\xb6\x87\x6f\xd6\x77\x03\xc2\x1d\x4a\x43\x5f\xe0\x4a\x29\xb8\xe7\x04\x0f\xf7\xe4\xc9\xed\xa9\x49\xc5\x0c\x1e\x88\xe0\xfb\xed\xf5\xcd\x8f\x87\x1b\xd8\x5a\x07\x4a\xd6\x64\x3c\x81\x34\x5b\xeb\x34\x06\x69\x4d\x2a\xc4\xec\x73\x3e\x31\x83\xbb\x2b\xee\x06\xd7\xd6\x6c\x65\x3b\xb8\xd8\x00\xfe\xbd\xce\x27\xf1\x11\x41\x06\x45\xb0\x86\xe4\x0e\x59\x39\xdc\x0f\x26\x48\x4d\x53\x7e\x89\xd8\x93\xf3\x4c\x74\x0d\xc9\x3e\x4b\x8b\x34\xcf\x13\x21\x36\x38\x84\xce\xba\x47\x01\x60\x50\xc7\x2a\xa3\xf7\x89\x00\xb0\xae\x45\x23\x5f\x0f\x0a\x4f\x1d\x6e\x7f\x72\xe6\x13\x55\x9c\x36\x38\xc5\x48\x96\xc6\x5f\xb9\xca\x38\x0f\x1b\x2d\xcd\xaf\x23\xb4\xc8\x2f\x23\xb8\x28\x8b\xa2\x28\x38\x95\x34\x4a\xc5\xc9\x9d\xf5\x81\x43\xbc\x0e\x7d\x4a\xcf\xa8\x7b\x45\x69\x6d\x35\xd7\xe8\xad\x63\x2c\x3f\xe7\x26\x9e\x1c\xc7\xf1\xca\x3c\x23\x8e\xde\xf3\x19\xaf\x4f\xd6\x35\x5c\xb8\xc1\x80\x15\x7a\x7a\xaf\x47\x47\xce\x67\xa4\xd0\x07\x59\x73\xa6\xd4\xd8\xbe\x83\xe6\x47\xc8\x13\xba\xba\x2b\x2f\xd2\x65\xf2\xa6\xab\x0b\xa1\x2f\xe7\x73\x65\x6b\x54\xcc\xb6\xfc\x9a\x67\x51\xe2\xec\x8f\x88\x69\x91\x31\x6a\x24\xcc\x81\x23\x69\x26\x7b\xda\x5b\x17\x58\xc5\x86\x13\x98\x35\xdf\x9c\x1d\xa2\xf0\x4c\x00\x90\xc1\x4a\x11\x87\x07\x37\x90\x10\x9b\x41\x7e\xa0\x6d\x27\x2b\x34\xf8\x91\xb4\x03\x32\x6a\x8a\x4f\x26\x1a\x79\xd2\x33\x21\xb1\x5c\x16\x8f\x1f\x35\x25\xb3\x97\xce\x1a\x4d\x26\x30\xee\x86\x38\x0c\x0d\xed\x49\xd9\x9e\x4f\xa3\xf7\xb6\xde\x51\x9c\x24\x8d\x75\x27\x0d\x9d\x4d\x59\x26\xb1\x72\xd3\x5b\x69\xe2\x9d\x87\x7a\x6a\x6c\x5e\x5c\x5e\x24\x13\x07\x16\xd1\x82\x4a\x9a\xc6\xbf\x95\x29\xe7\x1a\xd5\x13\x3a\x2a\x9d\xe5\x70\x25\xcd\xce\xff\x7d\xcf\xe5\xe4\x3e\x38\xb0\xee\x07\x58\xc3\x79\x76\xfc\x98\x27\x69\xeb\x5e\xf8\x30\x5f\xe6\xab\x15\x1f\x8a\x8d\xb2\x6d\x7b\x90\xb1\x95\x8a\xa6\x12\x52\x65\xdb\x24\x0a\x7c\xf6\xf2\x95\x81\x45\x76\xd8\x1e\x5c\x2f\x8e\xbb\x0a\xeb\xdd\xd0\x33\xab\x4b\x66\xc8\x12\xe3\x8b\x5c\xc3\x16\x95\x67\x47\x7b\x67\x9f\x5f\xde\xbc\x3e\x21\x00\x3c\x4e\xe3\x74\xf0\x7f\x7f\xd8\xfc\x0e\x00\x00\xff\xff\x0f\x4b\xe9\xf9\x2e\x05\x00\x00") func configConfigTomlBytes() ([]byte, error) { return bindataRead( @@ -83,7 +83,7 @@ func configConfigToml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "config/config.toml", size: 1326, mode: os.FileMode(420), modTime: time.Unix(1536031229, 0)} + info := bindataFileInfo{name: "config/config.toml", size: 1326, mode: os.FileMode(420), modTime: time.Unix(1536284366, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/config/config.toml b/config/config.toml index 21d49edd..8ace5caa 100644 --- a/config/config.toml +++ b/config/config.toml @@ -6,7 +6,7 @@ ####################################################################### title = "Malice Runtime Configuration" -version = "v0.3.21" +version = "v0.3.22" [author] name = "blacktop" diff --git a/plugins/plugins.go b/plugins/plugins.go index 976e09b9..8c485f9f 100644 --- a/plugins/plugins.go +++ b/plugins/plugins.go @@ -54,15 +54,15 @@ func (plugin Plugin) StartPlugin(docker *client.Docker, arg string, scanID strin // env = append(env, "MALICE_ELASTICSEARCH="+utils.Getopt("MALICE_ELASTICSEARCH", getDbAddr())) contJSON, err := container.Start( - docker, // docker *client.Docker, - cmd, // cmd strslice.StrSlice, - plugin.Name, // name string, - plugin.Image, // image string, - logs, // logs bool, - binds, // binds []string, - nil, // portBindings nat.PortMap, - links, // links []string, - env, // env []string, + docker, // docker *client.Docker, + cmd, // cmd strslice.StrSlice, + plugin.Name+scanID, // name string, + plugin.Image, // image string, + logs, // logs bool, + binds, // binds []string, + nil, // portBindings nat.PortMap, + links, // links []string, + env, // env []string, ) log.WithFields(log.Fields{ "name": contJSON.Name,