Merge branch 'master' into fcgi-handler

.dockerignore

@@ -0,0 +1,2 @@
+fabio
+dist/

.gitignore

@@ -1,18 +1,21 @@
 *-amd64
-*.out
 *.orig
+*.out
 *.p12
 *.pem
 *.pprof
 *.sha256
 *.swp
+*.tar.gz
 *.test
 *.un~
+*.zip
 .DS_Store
 .idea
 .vagrant
 build/builds/
 fabio
+fabio.exe
 fabio.sublime-*
 demo/cert/
 pkg/

.goreleaser.yml

@@ -9,6 +9,7 @@ builds:
       - freebsd
       - netbsd
       - openbsd
+      - windows
     goarch:
       - 386
       - amd64
@@ -19,7 +20,7 @@ archive:
   format: binary
 
 checksum:
-  name_template: '{{.ProjectName}}-{{ .Env.GOVERSION }}-{{.Version}}.sha256'
+  name_template: '{{.ProjectName}}-{{.Version}}-{{ .Env.GOVERSION }}.sha256'
 
 sign:
   artifacts: checksum

CHANGELOG.md

@@ -1,11 +1,151 @@
 ## Changelog
 
-### Unreleased
+### [v1.5.9](https://github.com/fabiolb/fabio/releases/tag/v1.5.9) - 16 May 2018
+
+#### Notes
+
+ * [Issue #494](https://github.com/fabiolb/fabio/issues/494): Tests fail with Vault > 0.9.6 and Consul > 1.0.6
+
+   Needs more investigation.
+
+#### Breaking Changes
+
+ * None
+
+#### Bug Fixes
+
+ * [Issue #460](https://github.com/fabiolb/fabio/issues/460): Fix access logging when gzip is enabled
+
+   Fabio was not writing access logs when the gzip compression was enabled.
+
+   Thanks to [@tino](https://github.com/tino) for finding this and providing
+   and initial patch.
+
+ * [PR #468](https://github.com/fabiolb/fabio/pull/468): Fix the regex of the example proxy.gzip.contenttype
+
+   The example regexp for `proxy.gzip.contenttype` in `fabio.properties` was not properly escaped.
+
+   Thanks to [@tino](https://github.com/tino) for the patch.
+
+ * [Issue #421](https://github.com/fabiolb/fabio/issues/421): Fabio routing to wrong backend
+
+   Fabio does not close websocket connections if the connection upgrade fails. This can lead to
+   connections being routed to the wrong backend if there is another HTTP router like nginx in
+   front of fabio. The failed websocket connection creates a direct TCP tunnel to the original
+   backend server and that connection is not closed properly.
+
+   The patches detect an unsuccessful handshake and close the connection properly.
+
+   Thanks to [@craigday](https://github.com/craigday) for the original reporting and debugging.
+
+#### Improvements
+
+ * [Issue #427](https://github.com/fabiolb/fabio/issues/427): Fabio does not remove service when one of the registered health-checks fail
+
+   If a service has more than one health check then the behavior in whether the
+   service is available differs between Consul and Fabio. Consul requires that
+   all health checks for a service need to pass in order to return a positive
+   DNS result. Fabio requires only one of the health checks to pass.
+
+   A new config option `registry.consul.checksRequired` has been added which
+   defaults to the current fabio behavior of `one` passing health check for the
+   service to be added to the routing table. To make fabio behave like Consul
+   you can set the option to `all`.
+
+   Fabio will make `all` the default as of version 1.6.
+
+   Thanks to [@systemfreund](https://github.com/systemfreund) for the patch.
+
+ * [Issue #448](https://github.com/fabiolb/fabio/issues/448): Redirect http to https on the same destination
+
+   Fabio will now handle redirecting from http to https on the same destination
+   without a redirect loop.
+
+   Thanks to [@leprechau](https://github.com/leprechau) for the patch and to
+   [@atillamas](https://github.com/atillamas) for the original PR and the
+   discussion.
+
+ * [PR #453](https://github.com/fabiolb/fabio/pull/453): Handle proxy chains of any length
+
+   Fabio will now validate that all elements of the `X-Forwarded-For` header
+   are allowed by the given ACL of the route. See discussion in
+   [PR #449](https://github.com/fabiolb/fabio/pull/449) for details.
+
+   Thanks to [@leprechau](https://github.com/leprechau) for the patch and to
+   [@atillamas](https://github.com/atillamas) for the original PR and the
+   discussion.
+
+ * [Issue #452](https://github.com/fabiolb/fabio/issues/452): Add improved glob matcher
+
+   Fabio now uses the `github.com/gobaws/glob` package for glob matching which
+   allows more complex patterns.
+
+   Thanks to [@sharbov](https://github.com/sharbov) for the patch.
+
+#### Features
+
+ * None
+
+### [v1.5.8](https://github.com/fabiolb/fabio/releases/tag/v1.5.8) - 18 Feb 2018
+
+#### Breaking Changes
+
+ * None
+
+#### Bug Fixes
+
+ * Fix windows build.
+
+   fabio 1.5.7 broke the Windows build but this wasn't detected since the new
+   build process did not build the Windows binaries. This has been fixed.
+
+ * [Issue #438](https://github.com/fabiolb/fabio/pull/438): Do not add separator to `noroute.html` page
+
+   fabio 1.5.7 added support for multiple routing tables in Consul and added a
+   comment which described the origin to the output. The same comment was added
+   to the `noroute.html` page since the same code is used to fetch it. This
+   returned an invalid HTML page which has been fixed.
+
+#### Improvements
+
+ * [PR #423](https://github.com/fabiolb/fabio/pull/423): TCP+SNI support arbitrary large Client Hello
+
+   With this patch fabio correctly parses `ClientHello` messages on TLS
+   connections up to their maximum size.
+
+   Thanks to [@DanSipola](https://github.com/DanSipola) for the patch.
+
+#### Features
+
+ * [PR #426](https://github.com/fabiolb/fabio/pull/426): Add option to allow Fabio to register frontend services in Consul on behalf of user services
+
+   With this patch fabio can register itself multiple times under different
+   names in Consul. By adding the `register=name` option to a route fabio will
+   register itself under that name as well.
+
+   Thanks to [@rileyje](https://github.com/rileyje) for the patch.
+
+ * [PR #442](https://github.com/fabiolb/fabio/pull/442): Add basic ip centric access control on routes
+
+   With this patch fabio adds an `allow` and `deny` option to the routes which
+   allows for basic ip white and black listing of IPv4 and IPv6 addresses. See
+   http://fabiolb.net/feature/access-control/ for more details.
+
+   Thanks to [@leprechau](https://github.com/leprechau) for the patch and
+   [@microadam](https://github.com/microadam) for the testing.
+
+### [v1.5.7](https://github.com/fabiolb/fabio/releases/tag/v1.5.7) - 6 Feb 2018
 
 #### Breaking Changes
 
  * None
 
+#### Bug Fixes
+
+ * [Issue #434](https://github.com/fabiolb/fabio/issues/434): VaultPKI tests fail with go1.10rc1
+
+   All unit tests pass now on go1.10rc1.
+
 #### Improvements
 
  * [Issue #369](https://github.com/fabiolb/fabio/issues/369): Warn if fabio is run as root
@@ -21,9 +161,9 @@
 
 #### Features
 
- * [Issue #396](https://github.com/fabiolb/fabio/issue/396): treat `registry.consul.kvpath` as prefix
+ * [Issue #396](https://github.com/fabiolb/fabio/issues/396): treat `registry.consul.kvpath` as prefix
 
-   This patch allows fabio to have multiple manual routing tables stored in consul, e.g. 
+   This patch allows fabio to have multiple manual routing tables stored in consul, e.g.
    under `fabio/config/foo` and `fabio/config/bar`. The routing table fragments are
    concatenated in lexicographical order of the keys and the log output contains comments
    to indicate to which key the segment belongs.
@@ -32,7 +172,7 @@
 
    fabio has now support for adding HSTS headers to the response.
 
-   Thanks to (@leprechau)[https://github.com/leprechau] for the patch.
+   Thanks to [@leprechau](https://github.com/leprechau) for the patch.
 
 ### [v1.5.6](https://github.com/fabiolb/fabio/releases/tag/v1.5.6) - 5 Jan 2018
 

Dockerfile-test

@@ -0,0 +1,15 @@
+FROM ubuntu
+RUN apt-get update && apt-get -y install unzip make git-core
+ARG consul_version
+ARG vault_version
+ARG go_version
+COPY consul_${consul_version}_linux_amd64.zip /tmp
+COPY vault_${vault_version}_linux_amd64.zip /tmp
+COPY go${go_version}.linux-amd64.tar.gz /tmp
+RUN unzip /tmp/consul_${consul_version}_linux_amd64.zip -d /usr/local/bin
+RUN unzip /tmp/vault_${vault_version}_linux_amd64.zip -d /usr/local/bin
+RUN tar -C /usr/local -x -f /tmp/go${go_version}.linux-amd64.tar.gz
+ENV PATH=/usr/local/go/bin:/root/go/bin:$PATH
+WORKDIR /root/go/src/github.com/fabiolb/fabio
+COPY . .
+CMD "/bin/bash"