External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 00:38:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6665 from ansible/fallback-test

Browse Source 
Reencrypt during data migrations
This commit is contained in:
Wayne Witzel III
2017-06-21 12:03:09 -04:00
committed by GitHub
parent 79a6cabbbc fe3e5a48c3
commit d39dba9892
3 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/migrations/0039_v320_data_migrations.py
View File

@@ -8,6 +8,7 @@ from django.db import migrations
# AWX # AWX
from awx.main.migrations import _inventory_source as invsrc from awx.main.migrations import _inventory_source as invsrc
from awx.main.migrations import _migration_utils as migration_utils from awx.main.migrations import _migration_utils as migration_utils
from awx.main.migrations import _reencrypt
class Migration(migrations.Migration): class Migration(migrations.Migration):
@@ -22,4 +23,5 @@ class Migration(migrations.Migration):
migrations.RunPython(invsrc.remove_rax_inventory_sources), migrations.RunPython(invsrc.remove_rax_inventory_sources),
migrations.RunPython(invsrc.remove_inventory_source_with_no_inventory_link), migrations.RunPython(invsrc.remove_inventory_source_with_no_inventory_link),
migrations.RunPython(invsrc.rename_inventory_sources), migrations.RunPython(invsrc.rename_inventory_sources),
migrations.RunPython(_reencrypt.replace_aesecb_fernet),
] ]

16
awx/main/migrations/0044_v320_reencrypt.py
View File

@@ -1,16 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations
from awx.main.migrations import _reencrypt
class Migration(migrations.Migration):
dependencies = [
('main', '0043_v320_instancegroups'),
]
operations = [
migrations.RunPython(_reencrypt.replace_aesecb_fernet),
]

19
awx/main/migrations/_reencrypt.py
View File

@@ -1,6 +1,6 @@
import logging
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from awx.main import utils
from awx.conf.migrations._reencrypt import ( from awx.conf.migrations._reencrypt import (
decrypt_field, decrypt_field,
should_decrypt_field, should_decrypt_field,
@@ -13,7 +13,8 @@ from awx.main.notifications.pagerduty_backend import PagerDutyBackend
from awx.main.notifications.hipchat_backend import HipChatBackend from awx.main.notifications.hipchat_backend import HipChatBackend
from awx.main.notifications.webhook_backend import WebhookBackend from awx.main.notifications.webhook_backend import WebhookBackend
from awx.main.notifications.irc_backend import IrcBackend from awx.main.notifications.irc_backend import IrcBackend
from awx.main.models.credential import Credential
logger = logging.getLogger('awx.main.migrations')
__all__ = ['replace_aesecb_fernet'] __all__ = ['replace_aesecb_fernet']
@@ -27,6 +28,10 @@ NOTIFICATION_TYPES = [('email', _('Email'), CustomEmailBackend),
('irc', _('IRC'), IrcBackend)] ('irc', _('IRC'), IrcBackend)]
PASSWORD_FIELDS = ('password', 'security_token', 'ssh_key_data', 'ssh_key_unlock',
'become_password', 'vault_password', 'secret', 'authorize_password')
def replace_aesecb_fernet(apps, schema_editor): def replace_aesecb_fernet(apps, schema_editor):
_notification_templates(apps) _notification_templates(apps)
_credentials(apps) _credentials(apps)
@@ -47,16 +52,16 @@ def _notification_templates(apps):
def _credentials(apps): def _credentials(apps):
# TODO: Try to not use the model directly imported from our for credential in apps.get_model('main', 'Credential').objects.all():
# source (should use apps.get_model) to make the migration less britle. for field_name in PASSWORD_FIELDS:
for credential in Credential.objects.all(): value = getattr(credential, field_name)
for field_name, value in credential.inputs.items():
if should_decrypt_field(value): if should_decrypt_field(value):
value = decrypt_field(credential, field_name) value = decrypt_field(credential, field_name)
credential.inputs[field_name] = value setattr(credential, field_name, value)
credential.save() credential.save()
def _unified_jobs(apps): def _unified_jobs(apps):
UnifiedJob = apps.get_model('main', 'UnifiedJob') UnifiedJob = apps.get_model('main', 'UnifiedJob')
for uj in UnifiedJob.objects.all(): for uj in UnifiedJob.objects.all():