Merge branch 'grepplabs:master' into CVE-2020-29652

Author: asatsi

.travis.yml

@@ -24,7 +24,7 @@ notifications:
 script:
   - go build .
   - go test ./...
-  - export TAG=`if [[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $TRAVIS_BRANCH == "master" ]]; then echo "latest"; else echo "${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}"; fi`
+  - export TAG=`if [[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $TRAVIS_BRANCH == "master" ]]; then echo "latest"; else echo "${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}" | sed 's/\//_/g'; fi`
   - echo "docker tags $TAG and ${TAG}-all"
   - docker build --build-arg MAKE_TARGET="test build" -t $REPO:$TAG -f Dockerfile .
   - docker build --build-arg MAKE_TARGET="all" -t $REPO:${TAG}-all -f Dockerfile .

README.md

@@ -1,7 +1,6 @@
 ## kafka-proxy
-**Work in progress**
 
-[![Build Status](https://travis-ci.com/grepplabs/kafka-proxy.svg?branch=master)](https://travis-ci.com/grepplabs/kafka-proxy)
+[![Build Status](https://app.travis-ci.com/grepplabs/kafka-proxy.svg?branch=master)](https://app.travis-ci.com/grepplabs/kafka-proxy)
 [![Docker Hub](https://img.shields.io/badge/docker-latest-blue.svg)](https://hub.docker.com/r/grepplabs/kafka-proxy)
 [![Docker Pulls](https://img.shields.io/docker/pulls/grepplabs/kafka-proxy)](https://hub.docker.com/r/grepplabs/kafka-proxy)
 
@@ -137,7 +136,7 @@ You can launch a kafka-proxy container with auth-ldap plugin for trying it out w
           --bootstrap-server-mapping stringArray                                         Mapping of Kafka bootstrap server address to local address (host:port,host:port(,advhost:advport))
           --debug-enable                                                                 Enable Debug endpoint
           --debug-listen-address string                                                  Debug listen address (default "0.0.0.0:6060")
-          --default-listener-ip string                                                   Default listener IP (default "127.0.0.1")
+          --default-listener-ip string                                                   Default listener IP (default "0.0.0.0")
           --dial-address-mapping stringArray                                             Mapping of target broker address to new one (host:port,host:port). The mapping is performed during connection establishment
           --dynamic-advertised-listener string                                           Advertised address for dynamic listeners. If empty, default-listener-ip is used
           --dynamic-listeners-disable                                                    Disable dynamic listeners.

cmd/kafka-proxy/server.go

@@ -84,7 +84,7 @@ func init() {
 
 func initFlags() {
 	// proxy
-	Server.Flags().StringVar(&c.Proxy.DefaultListenerIP, "default-listener-ip", "127.0.0.1", "Default listener IP")
+	Server.Flags().StringVar(&c.Proxy.DefaultListenerIP, "default-listener-ip", "0.0.0.0", "Default listener IP")
 	Server.Flags().StringVar(&c.Proxy.DynamicAdvertisedListener, "dynamic-advertised-listener", "", "Advertised address for dynamic listeners. If empty, default-listener-ip is used")
 	Server.Flags().StringArrayVar(&bootstrapServersMapping, "bootstrap-server-mapping", []string{}, "Mapping of Kafka bootstrap server address to local address (host:port,host:port(,advhost:advport))")
 	Server.Flags().StringArrayVar(&externalServersMapping, "external-server-mapping", []string{}, "Mapping of Kafka server address to external address (host:port,host:port). A listener for the external address is not started")

config/config.go

@@ -258,7 +258,7 @@ func NewConfig() *Config {
 	c.Http.MetricsPath = "/metrics"
 	c.Http.HealthPath = "/health"
 
-	c.Proxy.DefaultListenerIP = "127.0.0.1"
+	c.Proxy.DefaultListenerIP = "0.0.0.0"
 	c.Proxy.DisableDynamicListeners = false
 	c.Proxy.RequestBufferSize = 4096
 	c.Proxy.ResponseBufferSize = 4096