Merge pull request #21 from D4-project/dependabot/go_modules/golang.org/x/net-0.17.0

build(deps): bump golang.org/x/net from 0.12.0 to 0.17.0
2023-10-12 08:01:55 +02:00 · 2023-10-11 22:52:51 +00:00 · 2023-07-07 14:47:04 +02:00 · 2023-02-27 07:35:36 +01:00 · 2023-02-25 02:17:49 +00:00 · 2021-03-03 12:10:46 +01:00
3 changed files with 123 additions and 45 deletions
--- a/d4-goclient.go
+++ b/d4-goclient.go
@ -10,6 +10,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"golang.org/x/net/proxy"
 	"io"
 	"io/ioutil"
 	"log"
@ -68,6 +69,8 @@ type (
 		retry          time.Duration
 		rate           time.Duration
 		cc             bool
+		tor            bool
+		daily          bool
 		json           bool
 		ca             x509.CertPool
 		d4error        uint8
@ -78,7 +81,6 @@ type (
 		mh             []byte
 		redisInputPool *redis.Pool
 		redisCon       redis.Conn
-		folderfd       os.File
 	}

 	d4params struct {
@ -111,15 +113,17 @@ var (
 	tmpretry, _ = time.ParseDuration("30s")
 	tmprate, _  = time.ParseDuration("200ms")

-	confdir  = flag.String("c", "", "configuration directory")
-	debug    = flag.Bool("v", false, "Set to True, true, TRUE, 1, or t to enable verbose output on stdout - Don't use in production")
-	ce       = flag.Bool("ce", true, "Set to True, true, TRUE, 1, or t to enable TLS on network destination")
-	ct       = flag.Duration("ct", tmpct, "Set timeout in human format")
-	cka      = flag.Duration("cka", tmpcka, "Keep Alive time human format, 0 to disable")
-	retry    = flag.Duration("rt", tmpretry, "Time in human format before retry after connection failure, set to 0 to exit on failure")
-	rate     = flag.Duration("rl", tmprate, "Rate limiter: time in human format before retry after EOF")
-	cc       = flag.Bool("cc", false, "Check TLS certificate against rootCA.crt")
-	jsonflag = flag.Bool("json", false, "The files watched are json files")
+	confdir   = flag.String("c", "", "configuration directory")
+	debug     = flag.Bool("v", false, "Set to True, true, TRUE, 1, or t to enable verbose output on stdout - Don't use in production")
+	ce        = flag.Bool("ce", true, "Set to True, true, TRUE, 1, or t to enable TLS on network destination")
+	ct        = flag.Duration("ct", tmpct, "Set timeout in human format")
+	cka       = flag.Duration("cka", tmpcka, "Keep Alive time human format, 0 to disable")
+	retry     = flag.Duration("rt", tmpretry, "Time in human format before retry after connection failure, set to 0 to exit on failure")
+	rate      = flag.Duration("rl", tmprate, "Rate limiter: time in human format before retry after EOF")
+	cc        = flag.Bool("cc", false, "Check TLS certificate against rootCA.crt")
+	torflag   = flag.Bool("tor", false, "Use a SOCKS5 tor proxy on 9050")
+	dailyflag = flag.Bool("daily", false, "Sets up filewatcher to watch a new %Y%M%D folder at midnight")
+	jsonflag  = flag.Bool("json", false, "The files watched are json files")
 )

 func main() {
@ -179,6 +183,8 @@ func main() {
 	d4.cka = *cka
 	d4.retry = *retry
 	d4.rate = *rate
+	d4.tor = *torflag
+	d4.daily = *dailyflag

 	s := make(chan os.Signal, 1)
 	signal.Notify(s, os.Interrupt, os.Kill)
@ -516,7 +522,7 @@ func setReaderWriters(d4 *d4S, force bool) bool {
 		}
 	case "folder":
 		var err error
-		(*d4).src, err = inputreader.NewFileWatcherReader(&(*d4).folderfd, d4.json)
+		(*d4).src, err = inputreader.NewFileWatcherReader((*d4).conf.folderstr, (*d4).json, (*d4).daily, logger)
 		if err != nil {
 			log.Printf("Could not create File Watcher %q \n", err)
 			return false
@ -529,35 +535,63 @@ func setReaderWriters(d4 *d4S, force bool) bool {
 		// force forces to reset the connections after
 		// failure to reuse it
 		if _, ok := (*d4).dst.w.(net.Conn); !ok || force {
-			//fmt.Println("Creating a new connection")
-			// We need a connection
-			dial := net.Dialer{
-				Timeout:       (*d4).ct,
-				KeepAlive:     (*d4).cka,
-				FallbackDelay: 0,
-			}
-			tlsc := tls.Config{
-				InsecureSkipVerify: true,
-			}
-			if (*d4).cc {
-				tlsc = tls.Config{
-					InsecureSkipVerify: false,
-					RootCAs:            &(*d4).ca,
+			if (*d4).tor {
+				dialer := net.Dialer{
+					Timeout:       (*d4).ct,
+					KeepAlive:     (*d4).cka,
+					FallbackDelay: 0,
 				}
-			}
-			if (*d4).ce == true {
-				conn, errc := tls.DialWithDialer(&dial, "tcp", dstnet, &tlsc)
+				dial, err := proxy.SOCKS5("tcp", "127.0.0.1:9050", nil, &dialer)
+				if err != nil {
+					log.Fatal(err)
+				}
+				tlsc := tls.Config{
+					InsecureSkipVerify: true,
+				}
+				if (*d4).cc {
+					tlsc = tls.Config{
+						InsecureSkipVerify: false,
+						RootCAs:            &(*d4).ca,
+					}
+				}
+				conn, errc := dial.Dial("tcp", dstnet)
 				if errc != nil {
 					logger.Println(errc)
 					return false
 				}
-				(*d4).dst = newD4Writer(conn, (*d4).conf.key)
-			} else {
-				conn, errc := dial.Dial("tcp", dstnet)
-				if errc != nil {
-					return false
+				if (*d4).ce == true {
+					conn = tls.Client(conn, &tlsc) // use tls
 				}
 				(*d4).dst = newD4Writer(conn, (*d4).conf.key)
+			} else {
+				dial := net.Dialer{
+					Timeout:       (*d4).ct,
+					KeepAlive:     (*d4).cka,
+					FallbackDelay: 0,
+				}
+				tlsc := tls.Config{
+					InsecureSkipVerify: true,
+				}
+				if (*d4).cc {
+					tlsc = tls.Config{
+						InsecureSkipVerify: false,
+						RootCAs:            &(*d4).ca,
+					}
+				}
+				if (*d4).ce == true {
+					conn, errc := tls.DialWithDialer(&dial, "tcp", dstnet, &tlsc)
+					if errc != nil {
+						logger.Println(errc)
+						return false
+					}
+					(*d4).dst = newD4Writer(conn, (*d4).conf.key)
+				} else {
+					conn, errc := dial.Dial("tcp", dstnet)
+					if errc != nil {
+						return false
+					}
+					(*d4).dst = newD4Writer(conn, (*d4).conf.key)
+				}
 			}
 		}
 	} else {
--- a/go.mod
+++ b/go.mod
@ -3,7 +3,9 @@ module github.com/D4-project/d4-goclient
 go 1.13

 require (
-	github.com/D4-project/d4-golang-utils v0.1.9
+	github.com/D4-project/d4-golang-utils v0.1.14
+	github.com/gofrs/uuid v4.4.0+incompatible // indirect
 	github.com/gomodule/redigo v2.0.0+incompatible
-	github.com/rjeczalik/notify v0.9.2
+	github.com/rjeczalik/notify v0.9.3 // indirect
+	golang.org/x/net v0.17.0
 )
--- a/go.sum
+++ b/go.sum
@ -1,21 +1,63 @@
-github.com/D4-project/d4-golang-utils v0.1.6 h1:g8To+VLwa5ucH8hcmRZGx/hmrHmn6AD6A0vaiYKFAQc=
-github.com/D4-project/d4-golang-utils v0.1.6/go.mod h1:GGR5KMhvABZtIfmS5jZkwQnBoP+9/V0ZEETSGiWLaM4=
-github.com/D4-project/d4-golang-utils v0.1.9 h1:Q4auvPBc3gHPtUz3ZbixVP9ZMAXnQbn2UjBqicMeHOc=
-github.com/D4-project/d4-golang-utils v0.1.9/go.mod h1:m0/tjCKtuSrD3HZPFFDhdtj07YhGNSmseF4EZsHB4sI=
+github.com/D4-project/d4-golang-utils v0.1.14 h1:APwN+i4qyDrxT8gvlbeV/VXfNas2GvPWOnkTGX1K2Lo=
+github.com/D4-project/d4-golang-utils v0.1.14/go.mod h1:qXVZ3kCL72i3uYe29t7aEy9dU0bNqtFvcoNE1dJu0zo=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
+github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
-github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/redislabs/redisgraph-go v2.0.2+incompatible/go.mod h1:GYn4oUFkbkHx49xm2H4G8jZziqKDKdRtDUuTBZTmqBE=
-github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8=
 github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM=
+github.com/rjeczalik/notify v0.9.3 h1:6rJAzHTGKXGj76sbRgDiDcYj/HniypXmSJo1SWakZeY=
+github.com/rjeczalik/notify v0.9.3/go.mod h1:gF3zSOrafR9DQEWSE8TjfI9NkooDxbyT4UgRGKZA0lc=
+github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7 h1:bit1t3mgdR35yN0cX0G8orgLtOuyL9Wqxa1mccLB0ig=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Author	SHA1	Message	Date
Jean-Louis Huynen	12cdeabfb6	Merge pull request #21 from D4-project/dependabot/go_modules/golang.org/x/net-0.17.0 build(deps): bump golang.org/x/net from 0.12.0 to 0.17.0	2023-10-12 08:01:55 +02:00
dependabot[bot]	3db2573aa7	build(deps): bump golang.org/x/net from 0.12.0 to 0.17.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.12.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.12.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2023-10-11 22:52:51 +00:00
Jean-Louis Huynen	f36fce9950	chg: [modules] bump modules	2023-07-07 14:47:04 +02:00
Jean-Louis Huynen	44858060c2	Merge pull request #19 from D4-project/dependabot/go_modules/golang.org/x/net-0.7.0 build(deps): bump golang.org/x/net from 0.0.0-20210119194325-5f4716e94777 to 0.7.0	2023-02-27 07:35:36 +01:00
dependabot[bot]	13b3183eec	build(deps): bump golang.org/x/net Bumps [golang.org/x/net](https://github.com/golang/net) from 0.0.0-20210119194325-5f4716e94777 to 0.7.0. - [Release notes](https://github.com/golang/net/releases) - [Commits](https://github.com/golang/net/commits/v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-25 02:17:49 +00:00
Jean-Louis Huynen	f1a5bc2c14	chg: [filewatcher] daily rotation of watched folder - fixed	2021-03-03 12:10:46 +01:00
Jean-Louis Huynen	daf9d72347	chg: [filewatcher] daily rotation of watched folder	2021-03-02 14:49:20 +01:00
Jean-Louis Huynen	7a614f706e	fix: [filerwatcher] fix silly path bug + bump glu 0.1.12	2021-02-19 10:44:11 +01:00
Jean-Louis Huynen	d015ee6388	add: [torproxy] Use tor proxy on 9050	2021-02-19 09:35:58 +01:00
Jean-Louis Huynen	879bcb6231	chg: [filerwatcher] bump golangutils	2021-02-18 15:24:02 +01:00