Bumped v0.4.14

vishr · vishr · commit 743d38cac17c · 2019-07-14T17:51:25.000-07:00
Signed-off-by: Vishal Rana &lt;vr@labstack.com&gt;
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
-FROM alpine:3.7
+FROM alpine:3.9
 
 # https://letsencrypt.org
 RUN apk add --no-cache ca-certificates
 
-COPY dist/linux_amd64/armor /usr/local/bin
+COPY dist/armor_linux_amd64/armor /usr/local/bin
 
 ENTRYPOINT ["armor"]
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 IMAGE = labstack/armor
-VERSION = 0.4.13
+VERSION = 0.4.14
 
 run:
 	go run cmd/armor/main.go
diff --git a/_fixture/cert.pem b/_fixture/cert.pem
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAeGgAwIBAgIQfvDmeKi9wQ4ViW0BkXGF0zANBgkqhkiG9w0BAQsFADAS
+MRAwDgYDVQQKEwdBY21lIENvMB4XDTE5MDcxNDIwNTAyN1oXDTIwMDcxMzIwNTAy
+N1owEjEQMA4GA1UEChMHQWNtZSBDbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKMPdbQa0bC7wNXIGVX6s82OE8FCS/8N/q+Qnfl5PwiBOW0iOFNA637P
+B2GUg5VKO9aH9713Kd450tzQNltn+R4XvGYY/ee3Fmvy9D0YtHpvhk/sJE0zZL4S
+bqCIiLFGUIoYveo7HE0xduPJB26sTElLcdI+OroZA5mLY1ZIGu6KrjMjSfi1GwO9
+itlh1ksSXPj/tnDubB6JMYjOfJxrcHh2yYONaifOLppY2KbYpNkIRy3nGSv7tXGz
+7ilzgJiCqvrfdIICMh3F6aqvrLZBOOk3NfH8azKznLi9TAGSBf6otqemBsXnQKnx
+9fL+b1N35FscJ/1VadAltzRWk1RQwvsCAwEAAaNLMEkwDgYDVR0PAQH/BAQDAgWg
+MBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwFAYDVR0RBA0wC4IJ
+bG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQBIqbGy228tZR/H2dbTL393MrF3
+J+64X9KvTwj0zVkiFwocBVSOCJg0N6olLawmWH+CJ65hEkFj3SNspkyUZO/UFNPO
+/1RNh1/z4azPEorcWV5K33jOZLUTM6EE+k9P82wAbYUevo34I8LmvB0fqnod5/Tq
+90xyIZsczMFMeOoFVGILIQfQvu6pC7warVsjyxqN1DIn1NYi9iIbJczip+Dl0oJC
+c50g58YkT+jLHJz+/Z8QE0rVsjWSAdbuuJg/J7czoS7NICMP4CxxeTRKSh8UVMxJ
+yPSLxQiMSXLD38QJnuO2vPukAqnH5Hnq9BeRePWWTqei3jusJtZHgA2x1tii
+-----END CERTIFICATE-----
diff --git a/_fixture/config/1.yaml b/_fixture/config/1.yaml
@@ -1,11 +1,10 @@
-name: test
-address: :8080
+address: :7000
 plugins:
   - name: logger
-hosts:
-  localhost:
-    plugins:
-      - name: proxy
-        targets:
-        - name: cloud
-          url: http://localhost:9090
+  - name: redirect
+    from: /docs
+    to: /docs/api/currency/convert
+    code: 302
+  - name: static
+    root: /Users/vr/Projects/labstack/web/build
+    html5: true
diff --git a/_fixture/config/bug51.yaml b/_fixture/config/bug51.yaml
@@ -0,0 +1,13 @@
+address: ":8000"
+tls:
+  address: ":4430"
+  cert_file: _fixture/cert.pem
+  key_file: _fixture/key.pem
+  key_pinning: true
+hosts:
+  localhost:
+    plugins:
+      - name: static
+        html5: true
+        browse: true
+        root: "."
diff --git a/_fixture/key.pem b/_fixture/key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAow91tBrRsLvA1cgZVfqzzY4TwUJL/w3+r5Cd+Xk/CIE5bSI4
+U0Drfs8HYZSDlUo71of3vXcp3jnS3NA2W2f5Hhe8Zhj957cWa/L0PRi0em+GT+wk
+TTNkvhJuoIiIsUZQihi96jscTTF248kHbqxMSUtx0j46uhkDmYtjVkga7oquMyNJ
++LUbA72K2WHWSxJc+P+2cO5sHokxiM58nGtweHbJg41qJ84umljYptik2QhHLecZ
+K/u1cbPuKXOAmIKq+t90ggIyHcXpqq+stkE46Tc18fxrMrOcuL1MAZIF/qi2p6YG
+xedAqfH18v5vU3fkWxwn/VVp0CW3NFaTVFDC+wIDAQABAoIBAQCNXe/bz4yQPpa2
+QR7GDe4ofc7etA2S+J0ftK9hBB8DzpTs6sgOVbBVZkOt88YIfi1WltbP6ingQh1v
+1wvpP0EZN9bcZTpr062atS3Ocka2B05YqA/o5m+m4fALOZPYrW9R6pVsJwcoXYQH
+g9fvuW0B9midr9nWUa1vRws+WJEQ0MRjlkb1xjgUoE9aPJVYIWnywe8+dAVev+B2
+GJM4kFAbf1/ijfpr/Nd9iWwjsMDY+KBAK1hII2ShovcY6vVYbB9quJCj2V+tid81
+Q8Owtt1S8zdo3hIe050HxSyK01bnWld3rPBih1LtFJRAfZbyy/1k/0R/0fID9uHZ
+U0brCNFxAoGBAM2+fAP4LmnFZ7e8UTXtlMLK9GF79rj3YOQPoB4fXwszbetSj6X3
+LJWdULDr5o+yjAaAO6VleIMa7Ihz/JgL9WuiCgdO6Ctu/zliW87imokvoSNL2+ca
+Hv/oG6b1Hl5QKWBTEq6MfS1ceici/B4A3x0FFU4yepjSpfI81eeU4ig/AoGBAMrj
+5N8qaf4D7oUgvee9a7bxY+TrJg3rapfAx5lfKQe+M7N6fMsTH27JgGS7M/PIclEX
+4L4chGH1bGO8ZNSnr9w82poVKpKmaB8UWLE1w0wB7QnhcPa7mpZwEz90v47Mawf+
+5Ry8Ct1+p0zPzXE6yz2c7JOG5imI8+zLph7WeZZFAoGAdmnWiJZTaC7kddwdxXL6
+tm4G3wBwzJ4cFsZjelLF6fVsow6+fF/ZOjbzlRAAf93cN3WgXp4bESHy1soirAPd
++Veme/RPLYhRvl48xsKm/KP8Ewt7AfSHuPOGzr2u/8sVNUo6q1lSRkQ+Tb4V6tLH
+lrUxQPNOmhxKxDN9TS7kRxMCgYEAuvP2AKGPm246ClgaRYDo0WFrQBRiM29bAEy2
+X6AtKaJc96QFfAa57xckBS3u+FMa65iKEgQrBCzm3JxLeRyvUsyMTnD0kr9dsE3K
+UDiPJemcZ39h3SkPkFHjmpRUsxuwAGUi7zBi/qhnNsNAtnaLstF3uZUTXvCAfBFH
+mKDe1tUCgYAbfMSgrTX4QuEyt9oe20HET4csHjEOeZoSNOeTdr1R7bXeNkxIzBzf
+kbKDJSr9NCn3VlnH1+Lru3ijKCuP5BGZNz5YnAT/eI6qXSM/is0ufErxx0LthsQo
+u9aOi6JOfGQ9/fTSyPBYx/fOcmfbRg1lIdJ3vnJHBWl8OMuR/TGrmQ==
+-----END RSA PRIVATE KEY-----
diff --git a/admin/ui/package.json b/admin/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "armor",
-  "version": "0.4.13",
+  "version": "0.4.14",
   "description": "Armor admin",
   "author": "Vishal Rana <vr@labstack.com>",
   "private": true,
diff --git a/armor.go b/armor.go
@@ -99,7 +99,7 @@ type (
 )
 
 const (
-	Version = "0.4.13"
+	Version = "0.4.14"
 	Website = "https://armor.labstack.com"
 )
 
@@ -114,6 +114,7 @@ var (
 		plugin.PluginAddTrailingSlash:    true,
 		plugin.PluginRemoveTrailingSlash: true,
 		plugin.PluginNonWWWRedirect:      true,
+		plugin.PluginRewrite:             true,
 	}
 )
 
diff --git a/go.mod b/go.mod
@@ -3,25 +3,71 @@ module github.com/labstack/armor
 go 1.12
 
 require (
+	cloud.google.com/go v0.41.0 // indirect
 	github.com/Knetic/govaluate v3.0.0+incompatible
+	github.com/Shyp/generate-tls-cert v0.0.0-20180217183001-cd913b339294 // indirect
+	github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
+	github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878 // indirect
+	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/asdine/storm v2.1.2+incompatible
+	github.com/coreos/bbolt v1.3.3 // indirect
+	github.com/coreos/etcd v3.3.13+incompatible // indirect
+	github.com/coreos/go-semver v0.3.0 // indirect
+	github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
 	github.com/docker/libkv v0.2.1
 	github.com/ghodss/yaml v1.0.0
+	github.com/go-kit/kit v0.9.0 // indirect
+	github.com/go-sql-driver/mysql v1.4.1 // indirect
+	github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
+	github.com/golang/protobuf v1.3.2 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.9.4 // indirect
 	github.com/hashicorp/consul/api v1.1.0 // indirect
+	github.com/hashicorp/go-immutable-radix v1.1.0 // indirect
+	github.com/hashicorp/go-msgpack v0.5.5 // indirect
+	github.com/hashicorp/go-retryablehttp v0.5.4 // indirect
+	github.com/hashicorp/go-rootcerts v1.0.1 // indirect
+	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
 	github.com/hashicorp/logutils v1.0.0
+	github.com/hashicorp/mdns v1.0.1 // indirect
+	github.com/hashicorp/memberlist v0.1.4 // indirect
 	github.com/hashicorp/serf v0.8.3
 	github.com/jmoiron/sqlx v1.2.0
+	github.com/kisielk/errcheck v1.2.0 // indirect
+	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
+	github.com/kr/pty v1.1.8 // indirect
 	github.com/labstack/echo v3.3.10+incompatible // indirect
 	github.com/labstack/echo/v4 v4.1.6
 	github.com/labstack/gommon v0.2.9
 	github.com/labstack/tunnel-client v0.2.12
 	github.com/lib/pq v1.1.1
+	github.com/magiconair/properties v1.8.1 // indirect
+	github.com/mattn/go-sqlite3 v1.10.0 // indirect
+	github.com/miekg/dns v1.1.15 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.1.2
+	github.com/pelletier/go-toml v1.4.0 // indirect
+	github.com/posener/complete v1.2.1 // indirect
+	github.com/prometheus/common v0.6.0 // indirect
+	github.com/prometheus/procfs v0.0.3 // indirect
+	github.com/rogpeppe/fastuuid v1.2.0 // indirect
+	github.com/russross/blackfriday v2.0.0+incompatible // indirect
 	github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec // indirect
+	github.com/sirupsen/logrus v1.4.2 // indirect
+	github.com/spf13/afero v1.2.2 // indirect
 	github.com/spf13/cobra v0.0.5
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/viper v1.4.0 // indirect
 	github.com/stretchr/testify v1.3.0
+	github.com/ugorji/go v1.1.7 // indirect
 	github.com/valyala/fasttemplate v1.0.1
 	go.etcd.io/bbolt v1.3.3 // indirect
-	golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56
+	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
+	golang.org/x/exp v0.0.0-20190627132806-fd42eb6b336f // indirect
+	golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9 // indirect
+	golang.org/x/mobile v0.0.0-20190711165009-e47acb2ca7f9 // indirect
+	golang.org/x/net v0.0.0-20190628185345-da137c7871d7 // indirect
+	golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 // indirect
+	golang.org/x/tools v0.0.0-20190712213246-8b927904ee0d // indirect
+	google.golang.org/genproto v0.0.0-20190708153700-3bdd9d9f5532 // indirect
+	google.golang.org/grpc v1.22.0 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/plugin/redirect.go b/plugin/redirect.go

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "armor",`
`3`		`- "version": "0.4.13",`
	`3`	`+ "version": "0.4.14",`
`4`	`4`	`"description": "Armor admin",`
`5`	`5`	`"author": "Vishal Rana <[email protected]>",`
`6`	`6`	`"private": true,`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ type (`
`99`	`99`	`)`
`100`	`100`
`101`	`101`	`const (`
`102`		`- Version = "0.4.13"`
	`102`	`+ Version = "0.4.14"`
`103`	`103`	`Website = "https://armor.labstack.com"`
`104`	`104`	`)`
`105`	`105`
`@@ -114,6 +114,7 @@ var (`
`114`	`114`	`plugin.PluginAddTrailingSlash: true,`
`115`	`115`	`plugin.PluginRemoveTrailingSlash: true,`
`116`	`116`	`plugin.PluginNonWWWRedirect: true,`
	`117`	`+ plugin.PluginRewrite: true,`
`117`	`118`	`}`
`118`	`119`	`)`
`119`	`120`