Skip to content

Commit 6b0a1d7

Browse files
author
Sven Schmidt
authored
Merge pull request #8 from anynines/blacklist-feature
Update ciphers, force TLS1.2, blacklist feature, tokens off
2 parents 3710b15 + 2e56916 commit 6b0a1d7

File tree

18 files changed

+205
-105
lines changed

18 files changed

+205
-105
lines changed

‎.final_builds/jobs/nginx/index.yml

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ builds:
2727
version: bf23c7f17dc12386697113e5170f7129b65f3922
2828
blobstore_id: d939ca5d-c945-4502-7047-f22f72d940ad
2929
sha1: e6ee0e61a611c0dfc4458c5374bdcac4bb69ca1a
30+
ca7867c57b4f1297b6d282be27ef1bca0dc59ce7:
31+
version: ca7867c57b4f1297b6d282be27ef1bca0dc59ce7
32+
blobstore_id: 88ccd427-f240-401f-6d82-e299ee0beadd
33+
sha1: 4ac02d0aa7eafd45508d881e1f8253ea06c3b39d
3034
d084a95312b47ff0db6e55e10f5d18f142fdb43f:
3135
version: d084a95312b47ff0db6e55e10f5d18f142fdb43f
3236
blobstore_id: 5dff7038-baa3-4e05-9198-4e13891c2d81

‎.final_builds/license/index.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
builds:
2+
ae6a94b3e38944457867abb9a3ac4d796d712a59:
3+
version: ae6a94b3e38944457867abb9a3ac4d796d712a59
4+
blobstore_id: 75964d70-0d3e-45f5-461b-a9d6d3f4cfee
5+
sha1: 86167b01b4313271b502312afe0c76f7907cb022
6+
format-version: "2"

‎.final_builds/packages/nginx/index.yml

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
---
21
builds:
3-
72fe31794ebd9c46b5f7f3d8348d63c27c5b2576:
4-
version: 72fe31794ebd9c46b5f7f3d8348d63c27c5b2576
5-
sha1: 47a6d77886ad8b98440a445f84afe39933e0db7c
6-
blobstore_id: e914085d-2fa2-4705-9ad6-f89a838b7c1c
72
37ed1ccf3a27d830e9efc88d695dcae6b243ec37:
83
version: 37ed1ccf3a27d830e9efc88d695dcae6b243ec37
9-
sha1: 23870a2f672c0fb009f85026a7cee62b3bea5e72
104
blobstore_id: f68d5e72-a05e-47ea-8cc0-ff98ad6bae28
11-
format-version: '2'
5+
sha1: 23870a2f672c0fb009f85026a7cee62b3bea5e72
6+
72fe31794ebd9c46b5f7f3d8348d63c27c5b2576:
7+
version: 72fe31794ebd9c46b5f7f3d8348d63c27c5b2576
8+
blobstore_id: e914085d-2fa2-4705-9ad6-f89a838b7c1c
9+
sha1: 47a6d77886ad8b98440a445f84afe39933e0db7c
10+
8832f79a3ce14d3f25b5d14aaba0177bd58debbc:
11+
version: 8832f79a3ce14d3f25b5d14aaba0177bd58debbc
12+
blobstore_id: 89c6a7b3-8717-4419-72fc-6d7f81d56af9
13+
sha1: cc5692b75e2ea96bb624f5c625dc79fbc8138794
14+
format-version: "2"

‎.final_builds/packages/virtual_host_service_api/index.yml

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ builds:
77
version: d54906932a6789cac19d4bfbe0159cd99a21f5fe
88
blobstore_id: 4b70a1da-db5b-4ccf-77a9-6adcef0841e9
99
sha1: 85404c49c3ea20c3d1195d2be432a4c588fa261e
10+
de65d33707b24b5f5ea78cdf4d03ba2c703481cc:
11+
version: de65d33707b24b5f5ea78cdf4d03ba2c703481cc
12+
blobstore_id: f6c75142-9ea7-4a01-630f-1266a6c971f3
13+
sha1: 27e4025da119e3ab844b0d0c5a92a647a9c86ff4
1014
e70a5befc3df6dc3e3cedb81101e4699e15067de:
1115
version: e70a5befc3df6dc3e3cedb81101e4699e15067de
1216
blobstore_id: 177e2520-f2ec-4bca-8a6b-5a5d1533dbfb

‎.final_builds/packages/virtual_host_service_worker/index.yml

+4
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,8 @@ builds:
1919
version: dcb9d5f2e65718c99e22138ec7ba105da7ef8bef
2020
blobstore_id: c92076ab-764a-4634-9eec-c36e10d10204
2121
sha1: fded8c290925976c79ad33d41b63f455c97f34ec
22+
f99880f0cbe4ad9bbbad4d46ec98f0d6244b0312:
23+
version: f99880f0cbe4ad9bbbad4d46ec98f0d6244b0312
24+
blobstore_id: ffedc3a2-9de3-4ad0-5425-9beb133f97a9
25+
sha1: e3da817ae95fec2724ab900ea7be71b45d72dc5f
2226
format-version: "2"

‎acceptance-tests/manifests/reachability.yml

+14-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: ssl-gateway
33

44
releases:
55
- name: ssl-gateway
6-
version: 12+dev.6
6+
version: 13+dev.1
77

88
- name: rabbitmq36
99
version: 5
@@ -95,7 +95,7 @@ properties:
9595
host: ssl-gateway-rabbitmq-0.node.dc1.((iaas.consul.domain))
9696

9797
a9s_ssl_gateway:
98-
default_apps_domain: ((iaas.cf.system_domain))
98+
default_apps_domain: ((iaas.cf.app_domain))
9999
cf_routers: ((iaas.cf.router_ips))
100100
default_apps_domain_cert: ((default_app.certificate))
101101
default_apps_domain_ca_cert: ((default_app.ca))
@@ -135,23 +135,30 @@ variables:
135135
type: password
136136
- name: ssl_gw_rabbitmq_password
137137
type: password
138-
- name: default_ca
138+
- name: default_app_ca
139139
type: certificate
140140
options:
141141
is_ca: true
142142
common_name: ssl_gateway_default
143143
- name: default_app
144144
type: certificate
145145
options:
146-
ca: default_ca
147-
common_name: ((iaas.cf.system_domain))
146+
ca: default_app_ca
147+
common_name: default_app
148148
- name: ssltest
149149
type: certificate
150150
options:
151-
ca: default_ca
151+
ca: default_app_ca
152152
common_name: ssltest
153153
- name: ssltest2
154154
type: certificate
155155
options:
156-
ca: default_ca
156+
ca: default_app_ca
157157
common_name: ssltest2
158+
159+
160+
161+
162+
163+
164+

‎acceptance-tests/run-testsuite.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ export OPS_FILE=/home/vcap/bosh/anynines-PaaS-deployment/ssl-gateway/ops/vSphere
1010
export IAAS_CONFIG=/home/vcap/bosh/anynines-PaaS-deployment/iaas-config/a9s-staging-vsphere.yml
1111
export EXTERNAL_SECRETS=/home/vcap/bosh/anynines-deployment/secrets/external-secrets.yml
1212
export LOCALHOST_IP=172.27.1.5
13+
export ANYNINES_PAAS_DEPLOYMENT=/home/vcap/bosh/anynines-PaaS-deployment
14+
1315

1416
cf auth $CF_USER $CF_PASSWORD
1517

@@ -30,4 +32,7 @@ cf create-domain ssl-gateway-acceptance ssltest.com
3032
bundle install
3133
rspec
3234

33-
cf delete-org ssl-gateway-acceptance
35+
cf -f delete-org ssl-gateway-acceptance
36+
37+
bosh deploy -n $ANYNINES_PAAS_DEPLOYMENT/ssl-gateway/ssl-gateway.yml -l $IAAS_CONFIG -o $OPS_FILE
38+
bosh clean-up --all

‎acceptance-tests/spec/support/cf_helpers.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module CFHelpers
22
def push_checker_app(name, port, domain=nil)
3-
cmd = "cf push #{name} -f #{File.join(__dir__, "../../service-binding-checker/manifest.yml")}"
4-
cmd << "-d #{domain}" if ENV["PORT"] == port.to_s
3+
cmd = "cf push #{name}"
4+
cmd << "-d #{domain}" if domain
55
system(cmd)
66
end
77

‎create-final-release.sh

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
cd acceptance-tests
3+
./run-testsuite.sh
4+
cd ..
5+
6+
bosh create-release --final --name=ssl-gateway --version=$VERSION --tarball=/tmp/ssl-gateway-v$VERSION.tgz
7+
8+
sha=$(sha256sum /tmp/ssl-gateway-v$VERSION.tgz)
9+
10+
cat <<EOF > release-versions.yml
11+
12+
name: ssl-gateway-v$VERSION
13+
url: https://s3-eu-west-1.amazonaws.com/anynines-bosh-releases/ssl-gateway-v$VERSION.tgz
14+
sha: $sha
15+
version: $VERSION
16+
EOF
17+
18+
aws s3 cp /tmp/ssl-gateway-v$VERSION.tgz s3://anynines-bosh-releases/ssl-gateway-v$VERSION.tgz
19+
20+
git add .
21+
# git commit -m "Create new final release ssl-gateway-v$VERSION"
22+

‎release-versions.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
name: ssl-gateway-v1.0.0
3+
url: https://s3-eu-west-1.amazonaws.com/anynines-bosh-releases/ssl-gateway-v1.0.0.tgz
4+
sha: 7b5f7309cddb153a1bd6c468a0d911bc2811c69a8286ea068a7f4c448ae55f00 /tmp/ssl-gateway-v1.0.0.tgz
5+
version: 1.0.0

‎releases/ssl-gateway/index.yml

+4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@ builds:
1717
version: "7"
1818
be3bd329-08be-4325-8e11-4e749ebd6737:
1919
version: "5"
20+
d38cdbbf-4b5d-4ee6-4881-30787fb2afc3:
21+
version: 1.0.0
2022
ee88a057-6c45-4655-a4a3-29c611fe070c:
2123
version: "10"
24+
ef01ded7-0364-465f-7a75-5f0d5d58f50e:
25+
version: "13"
2226
fa6407ee-0cd1-4418-9e09-2c6ae19156ed:
2327
version: "6"
2428
fbe1d8d3-6898-42e5-8177-c9d09628be60:

‎releases/ssl-gateway/ssl-gateway-1.0.0.yml

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: ssl-gateway
2+
version: 1.0.0
3+
commit_hash: 632e694
4+
uncommitted_changes: true
5+
jobs:
6+
- name: nginx
7+
version: ca7867c57b4f1297b6d282be27ef1bca0dc59ce7
8+
fingerprint: ca7867c57b4f1297b6d282be27ef1bca0dc59ce7
9+
sha1: 4ac02d0aa7eafd45508d881e1f8253ea06c3b39d
10+
- name: virtual_host_service_api
11+
version: 4ca130dd7b124570d801e3c45aa5219efe69e29b
12+
fingerprint: 4ca130dd7b124570d801e3c45aa5219efe69e29b
13+
sha1: 60713cd5d440bbe51ebd0aa381237d8190ee08a0
14+
- name: virtual_host_service_worker
15+
version: 2bc642145b8991d0c4c9d6c4c6c900e27c95ff5c
16+
fingerprint: 2bc642145b8991d0c4c9d6c4c6c900e27c95ff5c
17+
sha1: 0703113c43f5c9dea9bb084798424ba7d6cefcf2
18+
packages:
19+
- name: libpq
20+
version: d27de4889ebd19799ed3f0a663b642de80dca5bb
21+
fingerprint: d27de4889ebd19799ed3f0a663b642de80dca5bb
22+
sha1: 2b5faf4f70c3a19bac285439510639b632bacbf5
23+
dependencies: []
24+
- name: libyaml
25+
version: ec170fd1ca2cda520318a00bda317209f6976459
26+
fingerprint: ec170fd1ca2cda520318a00bda317209f6976459
27+
sha1: 492ad761f980078cc5b2cd73f26f2a8d3bf15c85
28+
dependencies: []
29+
- name: nginx
30+
version: 8832f79a3ce14d3f25b5d14aaba0177bd58debbc
31+
fingerprint: 8832f79a3ce14d3f25b5d14aaba0177bd58debbc
32+
sha1: cc5692b75e2ea96bb624f5c625dc79fbc8138794
33+
dependencies: []
34+
- name: ruby
35+
version: 9b91b689aa1f8f4690b55532c1ffcca32379bf4f
36+
fingerprint: 9b91b689aa1f8f4690b55532c1ffcca32379bf4f
37+
sha1: 73a6a7b79ebe418209612244b9f910ba8ae21abf
38+
dependencies:
39+
- libyaml
40+
- zlib
41+
- name: virtual_host_service_api
42+
version: de65d33707b24b5f5ea78cdf4d03ba2c703481cc
43+
fingerprint: de65d33707b24b5f5ea78cdf4d03ba2c703481cc
44+
sha1: 27e4025da119e3ab844b0d0c5a92a647a9c86ff4
45+
dependencies:
46+
- ruby
47+
- libpq
48+
- name: virtual_host_service_worker
49+
version: f99880f0cbe4ad9bbbad4d46ec98f0d6244b0312
50+
fingerprint: f99880f0cbe4ad9bbbad4d46ec98f0d6244b0312
51+
sha1: e3da817ae95fec2724ab900ea7be71b45d72dc5f
52+
dependencies:
53+
- ruby
54+
- name: zlib
55+
version: 5995f47d27c11d09522a631a1a2ff2a0622d53db
56+
fingerprint: 5995f47d27c11d09522a631a1a2ff2a0622d53db
57+
sha1: ae413c53cf6f465d5e4724fb56156a86931f1cd9
58+
dependencies: []
59+
license:
60+
version: ae6a94b3e38944457867abb9a3ac4d796d712a59
61+
fingerprint: ae6a94b3e38944457867abb9a3ac4d796d712a59
62+
sha1: 86167b01b4313271b502312afe0c76f7907cb022

‎releases/ssl-gateway/ssl-gateway-13.yml

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: ssl-gateway
2+
version: "13"
3+
commit_hash: 7d96c87
4+
uncommitted_changes: true
5+
jobs:
6+
- name: nginx
7+
version: ca7867c57b4f1297b6d282be27ef1bca0dc59ce7
8+
fingerprint: ca7867c57b4f1297b6d282be27ef1bca0dc59ce7
9+
sha1: 4ac02d0aa7eafd45508d881e1f8253ea06c3b39d
10+
- name: virtual_host_service_api
11+
version: 4ca130dd7b124570d801e3c45aa5219efe69e29b
12+
fingerprint: 4ca130dd7b124570d801e3c45aa5219efe69e29b
13+
sha1: 60713cd5d440bbe51ebd0aa381237d8190ee08a0
14+
- name: virtual_host_service_worker
15+
version: 2bc642145b8991d0c4c9d6c4c6c900e27c95ff5c
16+
fingerprint: 2bc642145b8991d0c4c9d6c4c6c900e27c95ff5c
17+
sha1: 0703113c43f5c9dea9bb084798424ba7d6cefcf2
18+
packages:
19+
- name: libpq
20+
version: d27de4889ebd19799ed3f0a663b642de80dca5bb
21+
fingerprint: d27de4889ebd19799ed3f0a663b642de80dca5bb
22+
sha1: 2b5faf4f70c3a19bac285439510639b632bacbf5
23+
dependencies: []
24+
- name: libyaml
25+
version: ec170fd1ca2cda520318a00bda317209f6976459
26+
fingerprint: ec170fd1ca2cda520318a00bda317209f6976459
27+
sha1: 492ad761f980078cc5b2cd73f26f2a8d3bf15c85
28+
dependencies: []
29+
- name: nginx
30+
version: 8832f79a3ce14d3f25b5d14aaba0177bd58debbc
31+
fingerprint: 8832f79a3ce14d3f25b5d14aaba0177bd58debbc
32+
sha1: cc5692b75e2ea96bb624f5c625dc79fbc8138794
33+
dependencies: []
34+
- name: ruby
35+
version: 9b91b689aa1f8f4690b55532c1ffcca32379bf4f
36+
fingerprint: 9b91b689aa1f8f4690b55532c1ffcca32379bf4f
37+
sha1: 73a6a7b79ebe418209612244b9f910ba8ae21abf
38+
dependencies:
39+
- libyaml
40+
- zlib
41+
- name: virtual_host_service_api
42+
version: de65d33707b24b5f5ea78cdf4d03ba2c703481cc
43+
fingerprint: de65d33707b24b5f5ea78cdf4d03ba2c703481cc
44+
sha1: 27e4025da119e3ab844b0d0c5a92a647a9c86ff4
45+
dependencies:
46+
- ruby
47+
- libpq
48+
- name: virtual_host_service_worker
49+
version: f99880f0cbe4ad9bbbad4d46ec98f0d6244b0312
50+
fingerprint: f99880f0cbe4ad9bbbad4d46ec98f0d6244b0312
51+
sha1: e3da817ae95fec2724ab900ea7be71b45d72dc5f
52+
dependencies:
53+
- ruby
54+
- name: zlib
55+
version: 5995f47d27c11d09522a631a1a2ff2a0622d53db
56+
fingerprint: 5995f47d27c11d09522a631a1a2ff2a0622d53db
57+
sha1: ae413c53cf6f465d5e4724fb56156a86931f1cd9
58+
dependencies: []
59+
license:
60+
version: ae6a94b3e38944457867abb9a3ac4d796d712a59
61+
fingerprint: ae6a94b3e38944457867abb9a3ac4d796d712a59
62+
sha1: 86167b01b4313271b502312afe0c76f7907cb022

‎unit-tests/Gemfile

-4
This file was deleted.

‎unit-tests/manifests/domain-whitelist.yml

Whitespace-only changes.

‎unit-tests/run-testsuite.sh

-9
This file was deleted.

‎unit-tests/spec/domain_whitelist_spec.rb

-57
This file was deleted.

0 commit comments

Comments
 (0)