WordPress Setup: Add Nginx ssl_client_certificate #869

tangrufus · 2017-08-16T11:03:06Z

Usage:

wordpress_sites:
  example.com:
    site_hosts:
      - canonical: example.com
    ssl:
      enabled: true
      provider: self-signed
      client_cert_url: 'https://support.cloudflare.com/hc/en-us/article_attachments/201243967/origin-pull-ca.pem'

See:

swalkinshaw · 2017-08-17T02:23:22Z

Seems fairly simple and it's a generic Nginx setting.

My only concern is the downloading with force being set.

Ansible docs say

Generally should be yes only for small local files.

Not exactly sure what the alternative is though or how much it matters. Obviously Trellis "downloads" many things during a provision but this won't be idempotent.

fullyint · 2017-08-17T06:56:36Z

Idempotent reporting. I was delightfully surprised that even with force, the get_url task reporting shows ok if the file is unchanged, versus always showing changed. I believe that to force download of the temp file every time enables calculating and comparing checksums.

Copy module more flexible? Could users want a ssl_client_certificate that is not accessible via URL? Using the copy module may accommodate more scenarios. We could let users specify a local path to their own origin-pull-ca.pem they've previously downloaded to their machine, as is done with the provider: manual certs and keys. Using the copy module would avoid downloading every time and the related potential for playbook failure due to network connectivity issues.

Capturing updates via partial hash in dest filename. If you stick with get_url, I assume the intent in using force is to detect and incorporate changes in the content at the URL. I think we could still capture updates even when force: no by appending to the dest filename a few characters from a hash of the URL. Ansible would detect that dest does not exist and proceed to get_url.

This assumes that the update would be at a new URL, NOT the same URL. The source URL doesn't strike me as official/canonical being in Cloudflare's support article_attachments: https://support.cloudflare.com/hc/en-us/article_attachments/201243967/origin-pull-ca.pem. I couldn't find any other URL. I suspect any updates to origin-pull-ca.pem could likely appear at a new URL.

tangrufus · 2017-08-17T11:51:41Z

Updated:

Using md5 hash as file name
Not using force anymore, only download at the first provision
Using ssl_client_cert_url as global default

Usage 1:

wordpress_sites:
  example.com:
    ssl:
      enabled: true
      client_cert_url: 'https://example.com/origin-pull-ca.pem'

Usage 2:

ssl_client_cert_url: 'https://another-example.com/origin-pull-ca.pem'

wordpress_sites:
  example.com:
    ssl:
      enabled: true

Usage 3:

ssl_client_cert_url: 'https://another-example.com/origin-pull-ca.pem'

wordpress_sites:
  example.com:
    ssl:
      enabled: true
      client_cert_url: false

Usage 4:

ssl_client_cert_url: 'https://another-example.com/origin-pull-ca.pem'

wordpress_sites:
  example.com:
    ssl:
      enabled: true
      client_cert_url: 'https://example.com/origin-pull-ca.pem'

About using ansible copy module: maybe another pull request for another time

Thanks!

swalkinshaw

Is it even worth having the global option? Wondering if we should only allow the per site one and just let people define the same one if need be.

swalkinshaw · 2017-08-25T03:31:44Z

roles/wordpress-setup/templates/wordpress-site.conf.j2

@@ -75,6 +75,15 @@ server {

  add_header Strict-Transport-Security "max-age={{ [hsts_max_age, hsts_include_subdomains, hsts_preload] | reject('none') | join('; ') }}";

+  {% if item.value.ssl.client_cert_url is defined and item.value.ssl.client_cert_url -%}


Is this supposed to be ssl_client_cert_url in the first one? Just confused why it's checking the same variable

ssl_client_cert_url was the global option, removed now.

With the global option removed, I presume users would no longer disable client verification by setting client_cert_url: false. Rather, they simply wouldn't define client_cert_url for the relevant site.

If we don't need to check the bool interpretation of client_cert_url, could we make this change?

- {% if item.value.ssl.client_cert_url is defined and item.value.ssl.client_cert_url -%} + {% if item.value.ssl.client_cert_url is defined -%}

swalkinshaw · 2017-08-25T03:32:00Z

roles/wordpress-setup/templates/wordpress-site.conf.j2

@@ -75,6 +75,15 @@ server {

  add_header Strict-Transport-Security "max-age={{ [hsts_max_age, hsts_include_subdomains, hsts_preload] | reject('none') | join('; ') }}";

+  {% if item.value.ssl.client_cert_url is defined and item.value.ssl.client_cert_url -%}
+  ssl_client_certificate  {{ nginx_ssl_path }}/{{ item.value.ssl.client_cert_url | hash('md5') }};


There's two spaces before { 👾

swalkinshaw · 2017-08-25T03:32:05Z

roles/wordpress-setup/templates/wordpress-site.conf.j2

+  ssl_verify_client on;
+
+  {% elif ssl_client_cert_url is defined and not item.value.ssl.client_cert_url is defined -%}
+  ssl_client_certificate  {{ nginx_ssl_path }}/{{ ssl_client_cert_url | hash('md5') }};


ditto here too

tangrufus · 2017-08-25T13:59:41Z

Removed the global option.
2 spaces before { because of alignment:

tangrufus · 2017-09-07T20:00:16Z

Will this be consider to be merged, or should I extract it to be a galaxy role?

Thanks!

fullyint

@tangrufus Thanks for your great work on this! I think it's ready to go if you're willing to make a few minor changes.

fullyint · 2017-09-10T00:05:29Z

roles/wordpress-setup/tasks/nginx.yml

+- include: nginx-client-cert.yml
+  tags: wordpress-setup-nginx-client-cert
+  notify: reload nginx
+


Two minor requests:

Could you move this include task right after the other similar include tasks in tasks/main.yml? That placement strikes me as more consistent. I like the idea of avoiding nested includes when it's easy.

Let's omit the notify here. Nginx only needs to reload if the conf file produced by our wordpress-site.conf.j2 changes. A change in the "Download client cert" task produces a new or renamed client cert, which in turn will trigger a changed template task which already has notify: reload nginx.

fullyint · 2017-09-10T00:17:44Z

roles/wordpress-setup/tasks/nginx-client-cert.yml

+- name: Download client cert
+  get_url:
+    url: "{{ item.value.ssl.client_cert_url }}"
+    dest: "{{ nginx_ssl_path }}/{{ item.value.ssl.client_cert_url | hash('md5') }}"


I think a user who happens upon the server's nginx_ssl_path contents would find the filename more intuitive as client-4c1d4cc.crt instead of 4c1d4ccad291c1ac1f230ad263c4196c.

Could we make this change?

- dest: "{{ nginx_ssl_path }}/{{ item.value.ssl.client_cert_url | hash('md5') }}" + dest: "{{ nginx_ssl_path }}/client-{{ (item.value.ssl.client_cert_url | hash('md5'))[:7] }}.crt"

A similar filename change would be needed in wordpress-site.conf.j2.

fullyint · 2017-09-10T00:23:52Z

roles/wordpress-setup/templates/wordpress-site.conf.j2

@@ -75,6 +75,15 @@ server {

  add_header Strict-Transport-Security "max-age={{ [hsts_max_age, hsts_include_subdomains, hsts_preload] | reject('none') | join('; ') }}";

+  {% if item.value.ssl.client_cert_url is defined and item.value.ssl.client_cert_url -%}


With the global option removed, I presume users would no longer disable client verification by setting client_cert_url: false. Rather, they simply wouldn't define client_cert_url for the relevant site.

If we don't need to check the bool interpretation of client_cert_url, could we make this change?

- {% if item.value.ssl.client_cert_url is defined and item.value.ssl.client_cert_url -%} + {% if item.value.ssl.client_cert_url is defined -%}

tangrufus · 2017-09-10T00:56:21Z

All set. Thanks!

fullyint · 2017-09-10T01:41:03Z

Wonderful! Thank you @tangrufus!

* 'master' of https://github.com/roots/trellis: (53 commits) Revert "Vagrant: Use DHCP by default" Vagrant: Use DHCP by default Extract package names from `apt` tasks into variables Remove `update_cache` parameter from `apt` tasks Normalize `apt` tasks and check package variables format Ansible 2.4 compatibility CHANGELOG updates Default h5bp expires and cache busting to false Remove WP transient _site_transient_theme_roots during deploys Deploys: Minimize delay in updating WP theme paths Fix multisite_subdomains Ruby compat Extract Trellis::Config (roots#890) Vagrant: Support DHCP Redirect directly to https canonical domain (roots#889) Ansible: Retry ssh connection one more time Re-enable IPv4 connections in Nginx no-default.conf (roots#885) Ensure updated H5BP nginx includes sync into place (roots#884) WordPress Setup: Add Nginx ssl_client_certificate (roots#869) Nginx: Include includes.d/http/*.conf Nginx: Add include.d files to redirect domains (roots#879) ...

tangrufus force-pushed the nginx-client-cert branch from 3ee16d5 to 7580f40 Compare August 17, 2017 11:44

swalkinshaw reviewed Aug 25, 2017

View reviewed changes

tangrufus force-pushed the nginx-client-cert branch from 7580f40 to 4ddcd8a Compare August 25, 2017 13:56

fullyint suggested changes Sep 10, 2017

View reviewed changes

tangrufus force-pushed the nginx-client-cert branch from 4ddcd8a to e31612e Compare September 10, 2017 00:52

WordPress Setup: Add Nginx ssl_client_certificate

fc8c95b

tangrufus force-pushed the nginx-client-cert branch from e31612e to fc8c95b Compare September 10, 2017 00:55

fullyint approved these changes Sep 10, 2017

View reviewed changes

fullyint merged commit 8b3bc5a into roots:master Sep 10, 2017

tangrufus deleted the nginx-client-cert branch September 11, 2017 15:58

tangrufus mentioned this pull request Apr 13, 2018

400 No required SSL certificate was sent typisttech/trellis-cloudflare-origin-ca#34

Closed

8 tasks

tangrufus mentioned this pull request Aug 9, 2022

Add support for Authenticated Origin Pulls typisttech/trellis-cloudflare-origin-ca#58

Closed

kramerc mentioned this pull request Aug 9, 2022

Add client certificates to Trellis SSL docs roots/docs#420

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WordPress Setup: Add Nginx ssl_client_certificate #869

WordPress Setup: Add Nginx ssl_client_certificate #869

tangrufus commented Aug 16, 2017 •

edited

swalkinshaw commented Aug 17, 2017

fullyint commented Aug 17, 2017

tangrufus commented Aug 17, 2017

swalkinshaw left a comment

swalkinshaw Aug 25, 2017

tangrufus Aug 25, 2017

fullyint Sep 10, 2017

swalkinshaw Aug 25, 2017

swalkinshaw Aug 25, 2017

tangrufus commented Aug 25, 2017

tangrufus commented Sep 7, 2017

fullyint left a comment

fullyint Sep 10, 2017 •

edited

fullyint Sep 10, 2017

fullyint Sep 10, 2017

tangrufus commented Sep 10, 2017

fullyint commented Sep 10, 2017

		@@ -75,6 +75,15 @@ server {

		add_header Strict-Transport-Security "max-age={{ [hsts_max_age, hsts_include_subdomains, hsts_preload] \| reject('none') \| join('; ') }}";

		{% if item.value.ssl.client_cert_url is defined and item.value.ssl.client_cert_url -%}

WordPress Setup: Add Nginx ssl_client_certificate #869

WordPress Setup: Add Nginx ssl_client_certificate #869

Conversation

tangrufus commented Aug 16, 2017 • edited

swalkinshaw commented Aug 17, 2017

fullyint commented Aug 17, 2017

tangrufus commented Aug 17, 2017

swalkinshaw left a comment

Choose a reason for hiding this comment

swalkinshaw Aug 25, 2017

Choose a reason for hiding this comment

tangrufus Aug 25, 2017

Choose a reason for hiding this comment

fullyint Sep 10, 2017

Choose a reason for hiding this comment

swalkinshaw Aug 25, 2017

Choose a reason for hiding this comment

swalkinshaw Aug 25, 2017

Choose a reason for hiding this comment

tangrufus commented Aug 25, 2017

tangrufus commented Sep 7, 2017

fullyint left a comment

Choose a reason for hiding this comment

fullyint Sep 10, 2017 • edited

Choose a reason for hiding this comment

fullyint Sep 10, 2017

Choose a reason for hiding this comment

fullyint Sep 10, 2017

Choose a reason for hiding this comment

tangrufus commented Sep 10, 2017

fullyint commented Sep 10, 2017

tangrufus commented Aug 16, 2017 •

edited

fullyint Sep 10, 2017 •

edited