Implement X.509 auth for MySQL and Glance
Related-PROD: PROD-22745
Change-Id: Ic8f390b96d223f2bd6bfb9e0d19f27f531b460da
diff --git a/glance/_ssl/mysql.sls b/glance/_ssl/mysql.sls
new file mode 100644
index 0000000..ab26c46
--- /dev/null
+++ b/glance/_ssl/mysql.sls
@@ -0,0 +1,58 @@
+{%- from "glance/map.jinja" import server with context %}
+
+{%- if server.database.get('x509',{}).get('enabled',False) %}
+
+ {%- set ca_file=server.database.x509.ca_file %}
+ {%- set key_file=server.database.x509.key_file %}
+ {%- set cert_file=server.database.x509.cert_file %}
+
+mysql_glance_ssl_x509_ca:
+ {%- if server.database.x509.cacert is defined %}
+ file.managed:
+ - name: {{ ca_file }}
+ - contents_pillar: glance:server:database:x509:cacert
+ - mode: 444
+ - makedirs: true
+ {%- else %}
+ file.exists:
+ - name: {{ ca_file }}
+ {%- endif %}
+
+mysql_glance_client_ssl_cert:
+ {%- if server.database.x509.cert is defined %}
+ file.managed:
+ - name: {{ cert_file }}
+ - contents_pillar: glance:server:database:x509:cert
+ - mode: 440
+ - makedirs: true
+ {%- else %}
+ file.exists:
+ - name: {{ cert_file }}
+ {%- endif %}
+
+mysql_glance_client_ssl_private_key:
+ {%- if server.database.x509.key is defined %}
+ file.managed:
+ - name: {{ key_file }}
+ - contents_pillar: glance:server:database:x509:key
+ - mode: 400
+ - makedirs: true
+ {%- else %}
+ file.exists:
+ - name: {{ key_file }}
+ {%- endif %}
+
+{% elif server.database.get('ssl',{}).get('enabled',False) %}
+mysql_ca_glance:
+ {%- if server.database.ssl.cacert is defined %}
+ file.managed:
+ - name: {{ server.database.ssl.cacert_file }}
+ - contents_pillar: glance:server:database:ssl:cacert
+ - mode: 0444
+ - makedirs: true
+ {%- else %}
+ file.exists:
+ - name: {{ server.database.ssl.get('cacert_file', server.cacert_file) }}
+ {%- endif %}
+
+{%- endif %}
\ No newline at end of file
diff --git a/glance/files/pike/glance-api.conf.Debian b/glance/files/pike/glance-api.conf.Debian
index bbe0dc0..8983a7f 100644
--- a/glance/files/pike/glance-api.conf.Debian
+++ b/glance/files/pike/glance-api.conf.Debian
@@ -1,5 +1,13 @@
{%- from "glance/map.jinja" import server with context %}
{% set storage_engines = server.storage.engine.split(',') %}
+
+{%- set connection_x509_ssl_option = '' %}
+{%- if server.database.get('x509',{}).get('enabled',False) %}
+ {%- set connection_x509_ssl_option = '&ssl_ca=' ~ server.database.x509.ca_file ~ '&ssl_cert=' ~ server.database.x509.cert_file ~ '&ssl_key=' ~ server.database.x509.key_file %}
+{%- elif server.database.get('ssl',{}).get('enabled',False) %}
+ {%- set connection_x509_ssl_option = '&ssl_ca=' ~ server.database.ssl.get('cacert_file', server.cacert_file) %}
+{%- endif %}
+
[DEFAULT]
#
@@ -1903,7 +1911,7 @@
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
#connection = <None>
-connection = {{ server.database.engine }}+pymysql://{{ server.database.user }}:{{ server.database.password }}@{{ server.database.host }}/{{ server.database.name }}{%- if server.database.get('ssl',{}).get('enabled',False) %}?ssl_ca={{ server.database.ssl.get('cacert_file', server.cacert_file) }}{% endif %}
+connection = {{ server.database.engine }}+pymysql://{{ server.database.user }}:{{ server.database.password }}@{{ server.database.host }}/{{ server.database.name }}?charset=utf8{{ connection_x509_ssl_option|string }}
# The SQLAlchemy connection string to use to connect to the slave database.
# (string value)
diff --git a/glance/files/pike/glance-registry.conf.Debian b/glance/files/pike/glance-registry.conf.Debian
index d5b34e4..b4ac193 100644
--- a/glance/files/pike/glance-registry.conf.Debian
+++ b/glance/files/pike/glance-registry.conf.Debian
@@ -1,4 +1,12 @@
{%- from "glance/map.jinja" import server with context %}
+
+{%- set connection_x509_ssl_option = '' %}
+{%- if server.database.get('x509',{}).get('enabled',False) %}
+ {%- set connection_x509_ssl_option = '&ssl_ca=' ~ server.database.x509.ca_file ~ '&ssl_cert=' ~ server.database.x509.cert_file ~ '&ssl_key=' ~ server.database.x509.key_file %}
+{%- elif server.database.get('ssl',{}).get('enabled',False) %}
+ {%- set connection_x509_ssl_option = '&ssl_ca=' ~ server.database.ssl.get('cacert_file', server.cacert_file) %}
+{%- endif %}
+
[DEFAULT]
#
@@ -1058,7 +1066,7 @@
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
#connection = <None>
-connection = {{ server.database.engine }}+pymysql://{{ server.database.user }}:{{ server.database.password }}@{{ server.database.host }}/{{ server.database.name }}{%- if server.database.get('ssl',{}).get('enabled',False) %}?ssl_ca={{ server.database.ssl.get('cacert_file', server.cacert_file) }}{% endif %}
+connection = {{ server.database.engine }}+pymysql://{{ server.database.user }}:{{ server.database.password }}@{{ server.database.host }}/{{ server.database.name }}?charset=utf8{{ connection_x509_ssl_option|string }}
# The SQLAlchemy connection string to use to connect to the slave database.
# (string value)
diff --git a/glance/server.sls b/glance/server.sls
index 64254dd..0077ec6 100644
--- a/glance/server.sls
+++ b/glance/server.sls
@@ -1,8 +1,14 @@
{%- from "glance/map.jinja" import server with context %}
+
{%- if server.enabled %}
+{%- set mysql_x509_ssl_enabled = server.database.get('x509',{}).get('enabled',False) or server.database.get('ssl',{}).get('enabled',False) %}
+
include:
-- glance.db.offline_sync
+ - glance.db.offline_sync
+ {%- if mysql_x509_ssl_enabled %}
+ - glance._ssl.mysql
+ {%- endif %}
glance_packages:
pkg.installed:
@@ -127,14 +133,14 @@
- name: glance-glare
- require:
- sls: glance.db.offline_sync
+ {%- if mysql_x509_ssl_enabled %}
+ - sls: glance._ssl.mysql
+ {%- endif %}
- watch:
- file: /etc/glance/glance-glare.conf
{%- if server.message_queue.get('ssl',{}).get('enabled',False) %}
- file: rabbitmq_ca_glance_server
{% endif %}
- {%- if server.database.get('ssl',{}).get('enabled',False) %}
- - file: mysql_ca_glance_server
- {% endif %}
{%- endif %}
{%- endif %}
@@ -247,6 +253,9 @@
- names: {{ server.services }}
- require:
- sls: glance.db.offline_sync
+ {%- if mysql_x509_ssl_enabled %}
+ - sls: glance._ssl.mysql
+ {%- endif %}
- watch:
- file: /etc/glance/glance-api.conf
- file: /etc/glance/glance-registry.conf
@@ -254,9 +263,6 @@
{%- if server.message_queue.get('ssl',{}).get('enabled',False) %}
- file: rabbitmq_ca_glance_server
{% endif %}
- {%- if server.database.get('ssl',{}).get('enabled',False) %}
- - file: mysql_ca_glance_server
- {% endif %}
glance_cron_glance-cache-pruner:
cron.present:
@@ -402,18 +408,4 @@
{% endif %}
{% endif %}
-{%- if server.database.get('ssl',{}).get('enabled',False) %}
-mysql_ca_glance_server:
-{%- if server.database.ssl.cacert is defined %}
- file.managed:
- - name: {{ server.database.ssl.cacert_file }}
- - contents_pillar: glance:server:database:ssl:cacert
- - mode: 0444
- - makedirs: true
-{%- else %}
- file.exists:
- - name: {{ server.database.ssl.get('cacert_file', server.cacert_file) }}
-{%- endif %}
-{%- endif %}
-
{%- endif %}