From 3176828950f7fc259cbc9ef431466e0107ed06df Mon Sep 17 00:00:00 2001 From: Marcello Barnaba Date: Sun, 26 Mar 2017 21:57:55 +0200 Subject: [PATCH] Move from vendored to go get supported fork of go-clamd --- Makefile | 6 +- src/clammit/scanner/clamav.go | 2 +- .../dutchcoders/go-clamd/.gitignore | 24 -- .../dutchcoders/go-clamd/.travis.yml | 10 - .../github.com/dutchcoders/go-clamd/LICENSE | 22 -- .../github.com/dutchcoders/go-clamd/README.md | 35 --- .../github.com/dutchcoders/go-clamd/clamd.go | 292 ------------------ .../github.com/dutchcoders/go-clamd/conn.go | 129 -------- .../dutchcoders/go-clamd/examples/main.go | 72 ----- 9 files changed, 6 insertions(+), 586 deletions(-) delete mode 100644 src/clammit/vendor/github.com/dutchcoders/go-clamd/.gitignore delete mode 100644 src/clammit/vendor/github.com/dutchcoders/go-clamd/.travis.yml delete mode 100644 src/clammit/vendor/github.com/dutchcoders/go-clamd/LICENSE delete mode 100644 src/clammit/vendor/github.com/dutchcoders/go-clamd/README.md delete mode 100644 src/clammit/vendor/github.com/dutchcoders/go-clamd/clamd.go delete mode 100644 src/clammit/vendor/github.com/dutchcoders/go-clamd/conn.go delete mode 100644 src/clammit/vendor/github.com/dutchcoders/go-clamd/examples/main.go diff --git a/Makefile b/Makefile index 1e651ee..86bbc24 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,14 @@ cleanimports: application: cd src/clammit && go install -gets: gcfg testify + +gets: gcfg testify go-clamd gcfg: [ -d src/gopkg.in/gcfg.v1 ] || go get gopkg.in/gcfg.v1 +go-clamd: + [ -d src/github.com/Freeaqingme/go-clamd ] || go get github.com/Freeaqingme/go-clamd + testify: [ -d src/gopkg.in/testify.v1 ] || go get gopkg.in/stretchr/testify.v1 diff --git a/src/clammit/scanner/clamav.go b/src/clammit/scanner/clamav.go index 366f853..4ece004 100644 --- a/src/clammit/scanner/clamav.go +++ b/src/clammit/scanner/clamav.go @@ -1,7 +1,7 @@ package scanner import ( - clamd "github.com/dutchcoders/go-clamd" + clamd "github.com/Freeaqingme/go-clamd" "io" ) diff --git a/src/clammit/vendor/github.com/dutchcoders/go-clamd/.gitignore b/src/clammit/vendor/github.com/dutchcoders/go-clamd/.gitignore deleted file mode 100644 index daf913b..0000000 --- a/src/clammit/vendor/github.com/dutchcoders/go-clamd/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -# Compiled Object files, Static and Dynamic libs (Shared Objects) -*.o -*.a -*.so - -# Folders -_obj -_test - -# Architecture specific extensions/prefixes -*.[568vq] -[568vq].out - -*.cgo1.go -*.cgo2.c -_cgo_defun.c -_cgo_gotypes.go -_cgo_export.* - -_testmain.go - -*.exe -*.test -*.prof diff --git a/src/clammit/vendor/github.com/dutchcoders/go-clamd/.travis.yml b/src/clammit/vendor/github.com/dutchcoders/go-clamd/.travis.yml deleted file mode 100644 index 212857d..0000000 --- a/src/clammit/vendor/github.com/dutchcoders/go-clamd/.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -language: go -go: - - 1.1 - - 1.2 - - 1.3 - - release - - tip - -script: - - go test -v ./... diff --git a/src/clammit/vendor/github.com/dutchcoders/go-clamd/LICENSE b/src/clammit/vendor/github.com/dutchcoders/go-clamd/LICENSE deleted file mode 100644 index e85f3f1..0000000 --- a/src/clammit/vendor/github.com/dutchcoders/go-clamd/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014 dutchcoders - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - diff --git a/src/clammit/vendor/github.com/dutchcoders/go-clamd/README.md b/src/clammit/vendor/github.com/dutchcoders/go-clamd/README.md deleted file mode 100644 index cc459e6..0000000 --- a/src/clammit/vendor/github.com/dutchcoders/go-clamd/README.md +++ /dev/null @@ -1,35 +0,0 @@ -go-clamd -======== - -Interface to clamd (clamav daemon). You can use go-clamd to implement virus detection capabilities to your application. - -[![GoDoc](https://godoc.org/github.com/dutchcoders/go-clamd?status.svg)](https://godoc.org/github.com/dutchcoders/go-clamd) -[![Build Status](https://travis-ci.org/dutchcoders/go-clamd.svg?branch=master)](https://travis-ci.org/dutchcoders/go-clamd) - -## Examples - -``` -c := clamd.NewClamd("/tmp/clamd.socket") - -reader := bytes.NewReader(clamd.EICAR) -response, err := c.ScanStream(reader) - -for s := range response { - fmt.Printf("%v %v\n", s, err) -} -``` - -## Contributions - -Contributions are welcome. - -## Creators - -**Remco Verhoef** -- - -- - -## Copyright and license - -Code and documentation copyright 2011-2014 Remco Verhoef. Code released under [the MIT license](LICENSE). diff --git a/src/clammit/vendor/github.com/dutchcoders/go-clamd/clamd.go b/src/clammit/vendor/github.com/dutchcoders/go-clamd/clamd.go deleted file mode 100644 index bef89ec..0000000 --- a/src/clammit/vendor/github.com/dutchcoders/go-clamd/clamd.go +++ /dev/null @@ -1,292 +0,0 @@ -/* -Open Source Initiative OSI - The MIT License (MIT):Licensing - -The MIT License (MIT) -Copyright (c) 2013 DutchCoders - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -package clamd - -import ( - "errors" - "fmt" - "io" - "log" - "net/url" - "strings" -) - -type Clamd struct { - address string -} - -type Stats struct { - Pools string - State string - Threads string - Memstats string - Queue string -} - -var EICAR = []byte(`X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*`) - -func (c *Clamd) newConnection() (conn *CLAMDConn, err error) { - - var u *url.URL - - if u, err = url.Parse(c.address); err != nil { - return - } - - switch u.Scheme { - case "tcp": - conn, err = newCLAMDTcpConn(u.Host) - case "unix": - conn, err = newCLAMDUnixConn(u.Path) - default: - conn, err = newCLAMDUnixConn(c.address) - } - - return -} - -func (c *Clamd) simpleCommand(command string) (chan string, error) { - conn, err := c.newConnection() - if err != nil { - return nil, err - } - - // defer conn.Close() - - err = conn.sendCommand(command) - if err != nil { - return nil, err - } - - ch, wg, err := conn.readResponse() - - go func() { - // wait for waitgroup - wg.Wait() - - // close connection - conn.Close() - }() - - return ch, err -} - -/* -Check the daemon's state (should reply with PONG). -*/ -func (c *Clamd) Ping() error { - ch, err := c.simpleCommand("PING") - if err != nil { - return err - } - - select { - case s := (<-ch): - switch s { - case "PONG": - return nil - default: - return errors.New(fmt.Sprintf("Invalid response, got %s.", s)) - } - } - - return nil -} - -/* -Print program and database versions. -*/ -func (c *Clamd) Version() (chan string, error) { - dataArrays, err := c.simpleCommand("VERSION") - return dataArrays, err -} - -/* -On this command clamd provides statistics about the scan queue, contents of scan -queue, and memory usage. The exact reply format is subject to changes in future -releases. -*/ -func (c *Clamd) Stats() (*Stats, error) { - ch, err := c.simpleCommand("STATS") - if err != nil { - return nil, err - } - - stats := &Stats{} - - for s := range ch { - if strings.HasPrefix(s, "POOLS") { - stats.Pools = strings.Trim(s[6:], " ") - } else if strings.HasPrefix(s, "STATE") { - stats.State = s - } else if strings.HasPrefix(s, "THREADS") { - stats.Threads = s - } else if strings.HasPrefix(s, "QUEUE") { - stats.Queue = s - } else if strings.HasPrefix(s, "MEMSTATS") { - stats.Memstats = s - } else if strings.HasPrefix(s, "END") { - } else { - // return nil, errors.New(fmt.Sprintf("Unknown response, got %s.", s)) - } - } - - return stats, nil -} - -/* -Reload the databases. -*/ -func (c *Clamd) Reload() error { - ch, err := c.simpleCommand("RELOAD") - if err != nil { - return err - } - - select { - case s := (<-ch): - switch s { - case "RELOADING": - return nil - default: - return errors.New(fmt.Sprintf("Invalid response, got %s.", s)) - } - } - - return nil -} - -func (c *Clamd) Shutdown() error { - _, err := c.simpleCommand("SHUTDOWN") - if err != nil { - return err - } - - return err -} - -/* -Scan file or directory (recursively) with archive support enabled (a full path is -required). -*/ -func (c *Clamd) ScanFile(path string) (chan string, error) { - command := fmt.Sprintf("SCAN %s", path) - ch, err := c.simpleCommand(command) - return ch, err -} - -/* -Scan file or directory (recursively) with archive and special file support disabled -(a full path is required). -*/ -func (c *Clamd) RawScanFile(path string) (chan string, error) { - command := fmt.Sprintf("RAWSCAN %s", path) - ch, err := c.simpleCommand(command) - return ch, err -} - -/* -Scan file in a standard way or scan directory (recursively) using multiple threads -(to make the scanning faster on SMP machines). -*/ -func (c *Clamd) MultiScanFile(path string) (chan string, error) { - command := fmt.Sprintf("MULTISCAN %s", path) - ch, err := c.simpleCommand(command) - return ch, err -} - -/* -Scan file or directory (recursively) with archive support enabled and don’t stop -the scanning when a virus is found. -*/ -func (c *Clamd) ContScanFile(path string) (chan string, error) { - command := fmt.Sprintf("CONTSCAN %s", path) - ch, err := c.simpleCommand(command) - return ch, err -} - -/* -Scan file or directory (recursively) with archive support enabled and don’t stop -the scanning when a virus is found. -*/ -func (c *Clamd) AllMatchScanFile(path string) (chan string, error) { - command := fmt.Sprintf("ALLMATCHSCAN %s", path) - ch, err := c.simpleCommand(command) - return ch, err -} - -/* -Scan a stream of data. The stream is sent to clamd in chunks, after INSTREAM, -on the same socket on which the command was sent. This avoids the overhead -of establishing new TCP connections and problems with NAT. The format of the -chunk is: where is the size of the following data in -bytes expressed as a 4 byte unsigned integer in network byte order and is -the actual chunk. Streaming is terminated by sending a zero-length chunk. Note: -do not exceed StreamMaxLength as defined in clamd.conf, otherwise clamd will -reply with INSTREAM size limit exceeded and close the connection -*/ -func (c *Clamd) ScanStream(r io.Reader) (chan string, error) { - conn, err := c.newConnection() - if err != nil { - return nil, err - } - - conn.sendCommand("INSTREAM") - - for { - buf := make([]byte, CHUNK_SIZE) - - nr, err := r.Read(buf) - if nr > 0 { - log.Printf("Error %v, %v, %v", buf[0:nr], nr, err) - conn.sendChunk(buf[0:nr]) - } - - if err != nil { - break - } - - } - - err = conn.sendEOF() - if err != nil { - return nil, err - } - - ch, wg, err := conn.readResponse() - - go func() { - wg.Wait() - conn.Close() - }() - - return ch, nil -} - -func NewClamd(address string) *Clamd { - clamd := &Clamd{address: address} - return clamd -} diff --git a/src/clammit/vendor/github.com/dutchcoders/go-clamd/conn.go b/src/clammit/vendor/github.com/dutchcoders/go-clamd/conn.go deleted file mode 100644 index ef4c9fb..0000000 --- a/src/clammit/vendor/github.com/dutchcoders/go-clamd/conn.go +++ /dev/null @@ -1,129 +0,0 @@ -/* -Open Source Initiative OSI - The MIT License (MIT):Licensing - -The MIT License (MIT) -Copyright (c) 2013 DutchCoders - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -package clamd - -import ( - "bufio" - "fmt" - "io" - "net" - "strings" - "sync" -) - -const CHUNK_SIZE = 1024 - -type CLAMDConn struct { - net.Conn -} - -func (conn *CLAMDConn) sendCommand(command string) error { - commandBytes := []byte(fmt.Sprintf("n%s\n", command)) - - _, err := conn.Write(commandBytes) - return err -} - -func (conn *CLAMDConn) sendEOF() error { - _, err := conn.Write([]byte{0, 0, 0, 0}) - return err -} - -func (conn *CLAMDConn) sendChunk(data []byte) error { - var buf [4]byte - lenData := len(data) - buf[0] = byte(lenData >> 24) - buf[1] = byte(lenData >> 16) - buf[2] = byte(lenData >> 8) - buf[3] = byte(lenData >> 0) - - a := buf - - b := make([]byte, len(a)) - for i := range a { - b[i] = a[i] - } - - conn.Write(b) - - _, err := conn.Write(data) - return err -} - -func (c *CLAMDConn) readResponse() (chan string, *sync.WaitGroup, error) { - var wg sync.WaitGroup - - wg.Add(1) - - // read data - reader := bufio.NewReader(c) - - // reading - ch := make(chan string) - - // var dataArrays []string - go func() { - defer func() { - close(ch) - wg.Done() - }() - - for { - line, err := reader.ReadString('\n') - if err == io.EOF { - return - } - - if err != nil { - return - } - - line = strings.TrimRight(line, " \t\r\n") - - ch <- line - } - }() - - return ch, &wg, nil -} - -func newCLAMDTcpConn(address string) (*CLAMDConn, error) { - conn, err := net.Dial("tcp", address) - if err != nil { - return nil, err - } - - return &CLAMDConn{Conn: conn}, err -} - -func newCLAMDUnixConn(address string) (*CLAMDConn, error) { - conn, err := net.Dial("unix", address) - if err != nil { - return nil, err - } - - return &CLAMDConn{Conn: conn}, err -} diff --git a/src/clammit/vendor/github.com/dutchcoders/go-clamd/examples/main.go b/src/clammit/vendor/github.com/dutchcoders/go-clamd/examples/main.go deleted file mode 100644 index 1b4ccf2..0000000 --- a/src/clammit/vendor/github.com/dutchcoders/go-clamd/examples/main.go +++ /dev/null @@ -1,72 +0,0 @@ -/* -Open Source Initiative OSI - The MIT License (MIT):Licensing - -The MIT License (MIT) -Copyright (c) 2013 DutchCoders - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -package main - -import ( - _ "bytes" - "fmt" - "github.com/dutchcoders/go-clamd" -) - -func main() { - fmt.Println("Made with <3 DutchCoders") - - c := clamd.NewClamd("/tmp/clamd.socket") - _ = c - - /* - reader := bytes.NewReader(clamd.EICAR) - response, err := c.ScanStream(reader) - - for s := range response { - fmt.Printf("%v %v\n", s, err) - } - - response, err = c.ScanFile(".") - - for s := range response { - fmt.Printf("%v %v\n", s, err) - } - - response, err = c.Version() - - for s := range response { - fmt.Printf("%v %v\n", s, err) - } - */ - - err := c.Ping() - fmt.Printf("Ping: %v\n", err) - - stats, err := c.Stats() - fmt.Printf("%v %v\n", stats, err) - - err = c.Reload() - fmt.Printf("Reload: %v\n", err) - - // response, err = c.Shutdown() - // fmt.Println(response) -}