Remove f5-sdk from bigip_profile_client_ssl (#48525)
This commit is contained in:
parent
50fb2d7795
commit
f126db7f21
2 changed files with 427 additions and 121 deletions
|
@ -1,12 +1,13 @@
|
||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
#
|
#
|
||||||
# Copyright (c) 2017 F5 Networks Inc.
|
# Copyright: (c) 2017, F5 Networks Inc.
|
||||||
# GNU General Public License v3.0 (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
# GNU General Public License v3.0 (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||||
|
|
||||||
from __future__ import absolute_import, division, print_function
|
from __future__ import absolute_import, division, print_function
|
||||||
__metaclass__ = type
|
__metaclass__ = type
|
||||||
|
|
||||||
|
|
||||||
ANSIBLE_METADATA = {'metadata_version': '1.1',
|
ANSIBLE_METADATA = {'metadata_version': '1.1',
|
||||||
'status': ['preview'],
|
'status': ['preview'],
|
||||||
'supported_by': 'certified'}
|
'supported_by': 'certified'}
|
||||||
|
@ -97,12 +98,13 @@ options:
|
||||||
- pkcs1-check-2
|
- pkcs1-check-2
|
||||||
- netscape-ca-dn-bug
|
- netscape-ca-dn-bug
|
||||||
- netscape-demo-cipher-change-bug
|
- netscape-demo-cipher-change-bug
|
||||||
|
- "none"
|
||||||
version_added: 2.7
|
version_added: 2.7
|
||||||
secure_renegotiation:
|
secure_renegotiation:
|
||||||
description:
|
description:
|
||||||
- Specifies the method of secure renegotiations for SSL connections. When
|
- Specifies the method of secure renegotiations for SSL connections. When
|
||||||
creating a new profile, the setting is provided by the parent profile.
|
creating a new profile, the setting is provided by the parent profile.
|
||||||
- When C(request) is set the ssystem request secure renegotation of SSL
|
- When C(request) is set the system request secure renegotation of SSL
|
||||||
connections.
|
connections.
|
||||||
- C(require) is a default setting and when set the system permits initial SSL
|
- C(require) is a default setting and when set the system permits initial SSL
|
||||||
handshakes from clients but terminates renegotiations from unpatched clients.
|
handshakes from clients but terminates renegotiations from unpatched clients.
|
||||||
|
@ -120,6 +122,79 @@ options:
|
||||||
- When creating a new profile, the setting is provided by the parent profile.
|
- When creating a new profile, the setting is provided by the parent profile.
|
||||||
type: bool
|
type: bool
|
||||||
version_added: 2.7
|
version_added: 2.7
|
||||||
|
server_name:
|
||||||
|
description:
|
||||||
|
- Specifies the fully qualified DNS hostname of the server used in Server Name Indication communications.
|
||||||
|
When creating a new profile, the setting is provided by the parent profile.
|
||||||
|
- The server name can also be a wildcard string containing the asterisk C(*) character.
|
||||||
|
version_added: 2.8
|
||||||
|
sni_default:
|
||||||
|
description:
|
||||||
|
- Indicates that the system uses this profile as the default SSL profile when there is no match to the
|
||||||
|
server name, or when the client provides no SNI extension support.
|
||||||
|
- When creating a new profile, the setting is provided by the parent profile.
|
||||||
|
- There can be only one SSL profile with this setting enabled.
|
||||||
|
type: bool
|
||||||
|
version_added: 2.8
|
||||||
|
sni_require:
|
||||||
|
description:
|
||||||
|
- Requires that the network peers also provide SNI support. This setting only takes effect when C(sni_default) is
|
||||||
|
set to C(true). When creating a new profile, the setting is provided by the parent profile.
|
||||||
|
type: bool
|
||||||
|
version_added: 2.8
|
||||||
|
client_certificate:
|
||||||
|
description:
|
||||||
|
- Specifies the way the system handles client certificates.
|
||||||
|
- When C(ignore), specifies that the system ignores certificates from client
|
||||||
|
systems.
|
||||||
|
- When C(require), specifies that the system requires a client to present a
|
||||||
|
valid certificate.
|
||||||
|
- When C(request), specifies that the system requests a valid certificate from a
|
||||||
|
client but always authenticate the client.
|
||||||
|
choices:
|
||||||
|
- ignore
|
||||||
|
- require
|
||||||
|
- request
|
||||||
|
version_added: 2.8
|
||||||
|
client_auth_frequency:
|
||||||
|
description:
|
||||||
|
- Specifies the frequency of client authentication for an SSL session.
|
||||||
|
- When C(once), specifies that the system authenticates the client once for an
|
||||||
|
SSL session.
|
||||||
|
- When C(always), specifies that the system authenticates the client once for an
|
||||||
|
SSL session and also upon reuse of that session.
|
||||||
|
choices:
|
||||||
|
- once
|
||||||
|
- always
|
||||||
|
version_added: 2.8
|
||||||
|
retain_certificate:
|
||||||
|
description:
|
||||||
|
- When C(yes), client certificate is retained in SSL session.
|
||||||
|
type: bool
|
||||||
|
version_added: 2.8
|
||||||
|
cert_auth_depth:
|
||||||
|
description:
|
||||||
|
- Specifies the maximum number of certificates to be traversed in a client
|
||||||
|
certificate chain.
|
||||||
|
version_added: 2.8
|
||||||
|
trusted_cert_authority:
|
||||||
|
description:
|
||||||
|
- Specifies a client CA that the system trusts.
|
||||||
|
version_added: 2.8
|
||||||
|
advertised_cert_authority:
|
||||||
|
description:
|
||||||
|
- Specifies that the CAs that the system advertises to clients is being trusted
|
||||||
|
by the profile.
|
||||||
|
version_added: 2.8
|
||||||
|
client_auth_crl:
|
||||||
|
description:
|
||||||
|
- Specifies the name of a file containing a list of revoked client certificates.
|
||||||
|
version_added: 2.8
|
||||||
|
allow_expired_crl:
|
||||||
|
description:
|
||||||
|
- Instructs the system to use the specified CRL file even if it has expired.
|
||||||
|
type: bool
|
||||||
|
version_added: 2.8
|
||||||
state:
|
state:
|
||||||
description:
|
description:
|
||||||
- When C(present), ensures that the profile exists.
|
- When C(present), ensures that the profile exists.
|
||||||
|
@ -223,33 +298,29 @@ from ansible.module_utils.basic import env_fallback
|
||||||
from ansible.module_utils.six import iteritems
|
from ansible.module_utils.six import iteritems
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from library.module_utils.network.f5.bigip import HAS_F5SDK
|
from library.module_utils.network.f5.bigip import F5RestClient
|
||||||
from library.module_utils.network.f5.bigip import F5Client
|
|
||||||
from library.module_utils.network.f5.common import F5ModuleError
|
from library.module_utils.network.f5.common import F5ModuleError
|
||||||
from library.module_utils.network.f5.common import AnsibleF5Parameters
|
from library.module_utils.network.f5.common import AnsibleF5Parameters
|
||||||
from library.module_utils.network.f5.common import cleanup_tokens
|
from library.module_utils.network.f5.common import cleanup_tokens
|
||||||
from library.module_utils.network.f5.common import fq_name
|
from library.module_utils.network.f5.common import fq_name
|
||||||
from library.module_utils.network.f5.common import f5_argument_spec
|
from library.module_utils.network.f5.common import f5_argument_spec
|
||||||
from library.module_utils.network.f5.common import flatten_boolean
|
from library.module_utils.network.f5.common import flatten_boolean
|
||||||
|
from library.module_utils.network.f5.common import transform_name
|
||||||
|
from library.module_utils.network.f5.common import exit_json
|
||||||
|
from library.module_utils.network.f5.common import fail_json
|
||||||
from library.module_utils.network.f5.common import is_empty_list
|
from library.module_utils.network.f5.common import is_empty_list
|
||||||
try:
|
|
||||||
from library.module_utils.network.f5.common import iControlUnexpectedHTTPError
|
|
||||||
except ImportError:
|
|
||||||
HAS_F5SDK = False
|
|
||||||
except ImportError:
|
except ImportError:
|
||||||
from ansible.module_utils.network.f5.bigip import HAS_F5SDK
|
from ansible.module_utils.network.f5.bigip import F5RestClient
|
||||||
from ansible.module_utils.network.f5.bigip import F5Client
|
|
||||||
from ansible.module_utils.network.f5.common import F5ModuleError
|
from ansible.module_utils.network.f5.common import F5ModuleError
|
||||||
from ansible.module_utils.network.f5.common import AnsibleF5Parameters
|
from ansible.module_utils.network.f5.common import AnsibleF5Parameters
|
||||||
from ansible.module_utils.network.f5.common import cleanup_tokens
|
from ansible.module_utils.network.f5.common import cleanup_tokens
|
||||||
from ansible.module_utils.network.f5.common import fq_name
|
from ansible.module_utils.network.f5.common import fq_name
|
||||||
from ansible.module_utils.network.f5.common import f5_argument_spec
|
from ansible.module_utils.network.f5.common import f5_argument_spec
|
||||||
from ansible.module_utils.network.f5.common import flatten_boolean
|
from ansible.module_utils.network.f5.common import flatten_boolean
|
||||||
|
from ansible.module_utils.network.f5.common import transform_name
|
||||||
|
from ansible.module_utils.network.f5.common import exit_json
|
||||||
|
from ansible.module_utils.network.f5.common import fail_json
|
||||||
from ansible.module_utils.network.f5.common import is_empty_list
|
from ansible.module_utils.network.f5.common import is_empty_list
|
||||||
try:
|
|
||||||
from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError
|
|
||||||
except ImportError:
|
|
||||||
HAS_F5SDK = False
|
|
||||||
|
|
||||||
|
|
||||||
class Parameters(AnsibleF5Parameters):
|
class Parameters(AnsibleF5Parameters):
|
||||||
|
@ -259,24 +330,86 @@ class Parameters(AnsibleF5Parameters):
|
||||||
'allowNonSsl': 'allow_non_ssl',
|
'allowNonSsl': 'allow_non_ssl',
|
||||||
'secureRenegotiation': 'secure_renegotiation',
|
'secureRenegotiation': 'secure_renegotiation',
|
||||||
'tmOptions': 'options',
|
'tmOptions': 'options',
|
||||||
|
'sniDefault': 'sni_default',
|
||||||
|
'sniRequire': 'sni_require',
|
||||||
|
'serverName': 'server_name',
|
||||||
|
'peerCertMode': 'client_certificate',
|
||||||
|
'authenticate': 'client_auth_frequency',
|
||||||
|
'retainCertificate': 'retain_certificate',
|
||||||
|
'authenticateDepth': 'cert_auth_depth',
|
||||||
|
'caFile': 'trusted_cert_authority',
|
||||||
|
'clientCertCa': 'advertised_cert_authority',
|
||||||
|
'crlFile': 'client_auth_crl',
|
||||||
|
'allowExpiredCrl': 'allow_expired_crl',
|
||||||
}
|
}
|
||||||
|
|
||||||
api_attributes = [
|
api_attributes = [
|
||||||
'ciphers', 'certKeyChain',
|
'ciphers',
|
||||||
'defaultsFrom', 'tmOptions',
|
'certKeyChain',
|
||||||
'secureRenegotiation', 'allowNonSsl',
|
'defaultsFrom',
|
||||||
|
'tmOptions',
|
||||||
|
'secureRenegotiation',
|
||||||
|
'allowNonSsl',
|
||||||
|
'sniDefault',
|
||||||
|
'sniRequire',
|
||||||
|
'serverName',
|
||||||
|
'peerCertMode',
|
||||||
|
'authenticate',
|
||||||
|
'retainCertificate',
|
||||||
|
'authenticateDepth',
|
||||||
|
'caFile',
|
||||||
|
'clientCertCa',
|
||||||
|
'crlFile',
|
||||||
|
'allowExpiredCrl',
|
||||||
]
|
]
|
||||||
|
|
||||||
returnables = [
|
returnables = [
|
||||||
'ciphers', 'allow_non_ssl', 'options',
|
'ciphers',
|
||||||
|
'allow_non_ssl',
|
||||||
|
'options',
|
||||||
'secure_renegotiation',
|
'secure_renegotiation',
|
||||||
|
'cert_key_chain',
|
||||||
|
'parent',
|
||||||
|
'sni_default',
|
||||||
|
'sni_require',
|
||||||
|
'server_name',
|
||||||
|
'client_certificate',
|
||||||
|
'client_auth_frequency',
|
||||||
|
'retain_certificate',
|
||||||
|
'cert_auth_depth',
|
||||||
|
'trusted_cert_authority',
|
||||||
|
'advertised_cert_authority',
|
||||||
|
'client_auth_crl',
|
||||||
|
'allow_expired_crl',
|
||||||
]
|
]
|
||||||
|
|
||||||
updatables = [
|
updatables = [
|
||||||
'ciphers', 'cert_key_chain', 'allow_non_ssl',
|
'ciphers',
|
||||||
'options', 'secure_renegotiation',
|
'cert_key_chain',
|
||||||
|
'allow_non_ssl',
|
||||||
|
'options',
|
||||||
|
'secure_renegotiation',
|
||||||
|
'sni_default',
|
||||||
|
'sni_require',
|
||||||
|
'server_name',
|
||||||
|
'client_certificate',
|
||||||
|
'client_auth_frequency',
|
||||||
|
'retain_certificate',
|
||||||
|
'cert_auth_depth',
|
||||||
|
'trusted_cert_authority',
|
||||||
|
'advertised_cert_authority',
|
||||||
|
'client_auth_crl',
|
||||||
|
'allow_expired_crl',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@property
|
||||||
|
def retain_certificate(self):
|
||||||
|
return flatten_boolean(self._values['retain_certificate'])
|
||||||
|
|
||||||
|
@property
|
||||||
|
def allow_expired_crl(self):
|
||||||
|
return flatten_boolean(self._values['allow_expired_crl'])
|
||||||
|
|
||||||
|
|
||||||
class ModuleParameters(Parameters):
|
class ModuleParameters(Parameters):
|
||||||
def _key_filename(self, name):
|
def _key_filename(self, name):
|
||||||
|
@ -302,6 +435,8 @@ class ModuleParameters(Parameters):
|
||||||
def parent(self):
|
def parent(self):
|
||||||
if self._values['parent'] is None:
|
if self._values['parent'] is None:
|
||||||
return None
|
return None
|
||||||
|
if self._values['parent'] == 'clientssl':
|
||||||
|
return '/Common/clientssl'
|
||||||
result = fq_name(self.partition, self._values['parent'])
|
result = fq_name(self.partition, self._values['parent'])
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
@ -347,45 +482,54 @@ class ModuleParameters(Parameters):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def options(self):
|
def options(self):
|
||||||
choices = [
|
|
||||||
'netscape-reuse-cipher-change-bug',
|
|
||||||
'microsoft-big-sslv3-buffer',
|
|
||||||
'msie-sslv2-rsa-padding',
|
|
||||||
'ssleay-080-client-dh-bug',
|
|
||||||
'tls-d5-bug',
|
|
||||||
'tls-block-padding-bug',
|
|
||||||
'dont-insert-empty-fragments',
|
|
||||||
'no-ssl',
|
|
||||||
'no-dtls',
|
|
||||||
'no-session-resumption-on-renegotiation',
|
|
||||||
'no-tlsv1.1',
|
|
||||||
'no-tlsv1.2',
|
|
||||||
'single-dh-use',
|
|
||||||
'ephemeral-rsa',
|
|
||||||
'cipher-server-preference',
|
|
||||||
'tls-rollback-bug',
|
|
||||||
'no-sslv2',
|
|
||||||
'no-sslv3',
|
|
||||||
'no-tls',
|
|
||||||
'no-tlsv1',
|
|
||||||
'pkcs1-check-1',
|
|
||||||
'pkcs1-check-2',
|
|
||||||
'netscape-ca-dn-bug',
|
|
||||||
'netscape-demo-cipher-change-bug'
|
|
||||||
]
|
|
||||||
options = self._values['options']
|
options = self._values['options']
|
||||||
|
|
||||||
if options is None:
|
if options is None:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
if is_empty_list(options):
|
if is_empty_list(options):
|
||||||
return []
|
return []
|
||||||
|
return options
|
||||||
|
|
||||||
if set(options).issubset(set(choices)):
|
@property
|
||||||
return options
|
def sni_require(self):
|
||||||
|
require = flatten_boolean(self._values['sni_require'])
|
||||||
|
default = self.sni_default
|
||||||
|
if require is None:
|
||||||
|
return None
|
||||||
|
if default in [None, False]:
|
||||||
|
if require == 'yes':
|
||||||
|
raise F5ModuleError(
|
||||||
|
"Cannot set 'sni_require' to {0} if 'sni_default' is set as {1}".format(require, default))
|
||||||
|
if require == 'yes':
|
||||||
|
return True
|
||||||
else:
|
else:
|
||||||
offenders = set(options).difference(set(choices))
|
return False
|
||||||
raise F5ModuleError('Invalid options specified: {0}'.format(offenders))
|
|
||||||
|
@property
|
||||||
|
def trusted_cert_authority(self):
|
||||||
|
if self._values['trusted_cert_authority'] is None:
|
||||||
|
return None
|
||||||
|
if self._values['trusted_cert_authority'] in ['', 'none']:
|
||||||
|
return ''
|
||||||
|
result = fq_name(self.partition, self._values['trusted_cert_authority'])
|
||||||
|
return result
|
||||||
|
|
||||||
|
@property
|
||||||
|
def advertised_cert_authority(self):
|
||||||
|
if self._values['advertised_cert_authority'] is None:
|
||||||
|
return None
|
||||||
|
if self._values['advertised_cert_authority'] in ['', 'none']:
|
||||||
|
return ''
|
||||||
|
result = fq_name(self.partition, self._values['advertised_cert_authority'])
|
||||||
|
return result
|
||||||
|
|
||||||
|
@property
|
||||||
|
def client_auth_crl(self):
|
||||||
|
if self._values['client_auth_crl'] is None:
|
||||||
|
return None
|
||||||
|
if self._values['client_auth_crl'] in ['', 'none']:
|
||||||
|
return ''
|
||||||
|
result = fq_name(self.partition, self._values['client_auth_crl'])
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
class ApiParameters(Parameters):
|
class ApiParameters(Parameters):
|
||||||
|
@ -407,6 +551,44 @@ class ApiParameters(Parameters):
|
||||||
result = sorted(result, key=lambda y: y['name'])
|
result = sorted(result, key=lambda y: y['name'])
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
@property
|
||||||
|
def sni_default(self):
|
||||||
|
result = self._values['sni_default']
|
||||||
|
if result is None:
|
||||||
|
return None
|
||||||
|
if result == 'true':
|
||||||
|
return True
|
||||||
|
else:
|
||||||
|
return False
|
||||||
|
|
||||||
|
@property
|
||||||
|
def sni_require(self):
|
||||||
|
result = self._values['sni_require']
|
||||||
|
if result is None:
|
||||||
|
return None
|
||||||
|
if result == 'true':
|
||||||
|
return True
|
||||||
|
else:
|
||||||
|
return False
|
||||||
|
|
||||||
|
@property
|
||||||
|
def trusted_cert_authority(self):
|
||||||
|
if self._values['trusted_cert_authority'] in [None, 'none']:
|
||||||
|
return None
|
||||||
|
return self._values['trusted_cert_authority']
|
||||||
|
|
||||||
|
@property
|
||||||
|
def advertised_cert_authority(self):
|
||||||
|
if self._values['advertised_cert_authority'] in [None, 'none']:
|
||||||
|
return None
|
||||||
|
return self._values['advertised_cert_authority']
|
||||||
|
|
||||||
|
@property
|
||||||
|
def client_auth_crl(self):
|
||||||
|
if self._values['client_auth_crl'] in [None, 'none']:
|
||||||
|
return None
|
||||||
|
return self._values['client_auth_crl']
|
||||||
|
|
||||||
|
|
||||||
class Changes(Parameters):
|
class Changes(Parameters):
|
||||||
def to_return(self):
|
def to_return(self):
|
||||||
|
@ -421,7 +603,21 @@ class Changes(Parameters):
|
||||||
|
|
||||||
|
|
||||||
class UsableChanges(Changes):
|
class UsableChanges(Changes):
|
||||||
pass
|
@property
|
||||||
|
def retain_certificate(self):
|
||||||
|
if self._values['retain_certificate'] is None:
|
||||||
|
return None
|
||||||
|
elif self._values['retain_certificate'] == 'yes':
|
||||||
|
return 'true'
|
||||||
|
return 'false'
|
||||||
|
|
||||||
|
@property
|
||||||
|
def allow_expired_crl(self):
|
||||||
|
if self._values['allow_expired_crl'] is None:
|
||||||
|
return None
|
||||||
|
elif self._values['allow_expired_crl'] == 'yes':
|
||||||
|
return 'enabled'
|
||||||
|
return 'disabled'
|
||||||
|
|
||||||
|
|
||||||
class ReportableChanges(Changes):
|
class ReportableChanges(Changes):
|
||||||
|
@ -433,6 +629,14 @@ class ReportableChanges(Changes):
|
||||||
return 'yes'
|
return 'yes'
|
||||||
return 'no'
|
return 'no'
|
||||||
|
|
||||||
|
@property
|
||||||
|
def retain_certificate(self):
|
||||||
|
return flatten_boolean(self._values['retain_certificate'])
|
||||||
|
|
||||||
|
@property
|
||||||
|
def allow_expired_crl(self):
|
||||||
|
return flatten_boolean(self._values['allow_expired_crl'])
|
||||||
|
|
||||||
|
|
||||||
class Difference(object):
|
class Difference(object):
|
||||||
def __init__(self, want, have=None):
|
def __init__(self, want, have=None):
|
||||||
|
@ -503,6 +707,47 @@ class Difference(object):
|
||||||
if set(self.want.options) != set(self.have.options):
|
if set(self.want.options) != set(self.have.options):
|
||||||
return self.want.options
|
return self.want.options
|
||||||
|
|
||||||
|
@property
|
||||||
|
def sni_require(self):
|
||||||
|
if self.want.sni_require is None:
|
||||||
|
return None
|
||||||
|
if self.want.sni_require is False:
|
||||||
|
if self.have.sni_default is True and self.want.sni_default is None:
|
||||||
|
raise F5ModuleError(
|
||||||
|
"Cannot set 'sni_require' to {0} if 'sni_default' is {1}".format(
|
||||||
|
self.want.sni_require, self.have.sni_default)
|
||||||
|
)
|
||||||
|
if self.want.sni_require == self.have.sni_require:
|
||||||
|
return None
|
||||||
|
return self.want.sni_require
|
||||||
|
|
||||||
|
@property
|
||||||
|
def trusted_cert_authority(self):
|
||||||
|
if self.want.trusted_cert_authority is None:
|
||||||
|
return None
|
||||||
|
if self.want.trusted_cert_authority == '' and self.have.trusted_cert_authority is None:
|
||||||
|
return None
|
||||||
|
if self.want.trusted_cert_authority != self.have.trusted_cert_authority:
|
||||||
|
return self.want.trusted_cert_authority
|
||||||
|
|
||||||
|
@property
|
||||||
|
def advertised_cert_authority(self):
|
||||||
|
if self.want.advertised_cert_authority is None:
|
||||||
|
return None
|
||||||
|
if self.want.advertised_cert_authority == '' and self.have.advertised_cert_authority is None:
|
||||||
|
return None
|
||||||
|
if self.want.advertised_cert_authority != self.have.advertised_cert_authority:
|
||||||
|
return self.want.advertised_cert_authority
|
||||||
|
|
||||||
|
@property
|
||||||
|
def client_auth_crl(self):
|
||||||
|
if self.want.client_auth_crl is None:
|
||||||
|
return None
|
||||||
|
if self.want.client_auth_crl == '' and self.have.client_auth_crl is None:
|
||||||
|
return None
|
||||||
|
if self.want.client_auth_crl != self.have.client_auth_crl:
|
||||||
|
return self.want.client_auth_crl
|
||||||
|
|
||||||
|
|
||||||
class ModuleManager(object):
|
class ModuleManager(object):
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
|
@ -538,18 +783,21 @@ class ModuleManager(object):
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
def should_update(self):
|
||||||
|
result = self._update_changed_options()
|
||||||
|
if result:
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
def exec_module(self):
|
def exec_module(self):
|
||||||
changed = False
|
changed = False
|
||||||
result = dict()
|
result = dict()
|
||||||
state = self.want.state
|
state = self.want.state
|
||||||
|
|
||||||
try:
|
if state == "present":
|
||||||
if state == "present":
|
changed = self.present()
|
||||||
changed = self.present()
|
elif state == "absent":
|
||||||
elif state == "absent":
|
changed = self.absent()
|
||||||
changed = self.absent()
|
|
||||||
except iControlUnexpectedHTTPError as e:
|
|
||||||
raise F5ModuleError(str(e))
|
|
||||||
|
|
||||||
reportable = ReportableChanges(params=self.changes.to_return())
|
reportable = ReportableChanges(params=self.changes.to_return())
|
||||||
changes = reportable.to_return()
|
changes = reportable.to_return()
|
||||||
|
@ -561,7 +809,7 @@ class ModuleManager(object):
|
||||||
def _announce_deprecations(self, result):
|
def _announce_deprecations(self, result):
|
||||||
warnings = result.pop('__warnings', [])
|
warnings = result.pop('__warnings', [])
|
||||||
for warning in warnings:
|
for warning in warnings:
|
||||||
self.module.deprecate(
|
self.client.module.deprecate(
|
||||||
msg=warning['msg'],
|
msg=warning['msg'],
|
||||||
version=warning['version']
|
version=warning['version']
|
||||||
)
|
)
|
||||||
|
@ -572,19 +820,21 @@ class ModuleManager(object):
|
||||||
else:
|
else:
|
||||||
return self.create()
|
return self.create()
|
||||||
|
|
||||||
def create(self):
|
def exists(self):
|
||||||
self._set_changed_options()
|
uri = "https://{0}:{1}/mgmt/tm/ltm/profile/client-ssl/{2}".format(
|
||||||
if self.module.check_mode:
|
self.client.provider['server'],
|
||||||
return True
|
self.client.provider['server_port'],
|
||||||
self.create_on_device()
|
transform_name(self.want.partition, self.want.name)
|
||||||
|
)
|
||||||
|
resp = self.client.api.get(uri)
|
||||||
|
try:
|
||||||
|
response = resp.json()
|
||||||
|
except ValueError:
|
||||||
|
return False
|
||||||
|
if resp.status == 404 or 'code' in response and response['code'] == 404:
|
||||||
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def should_update(self):
|
|
||||||
result = self._update_changed_options()
|
|
||||||
if result:
|
|
||||||
return True
|
|
||||||
return False
|
|
||||||
|
|
||||||
def update(self):
|
def update(self):
|
||||||
self.have = self.read_current_from_device()
|
self.have = self.read_current_from_device()
|
||||||
if not self.should_update():
|
if not self.should_update():
|
||||||
|
@ -594,57 +844,94 @@ class ModuleManager(object):
|
||||||
self.update_on_device()
|
self.update_on_device()
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def absent(self):
|
|
||||||
if self.exists():
|
|
||||||
return self.remove()
|
|
||||||
return False
|
|
||||||
|
|
||||||
def remove(self):
|
def remove(self):
|
||||||
if self.module.check_mode:
|
if self.module.check_mode:
|
||||||
return True
|
return True
|
||||||
self.remove_from_device()
|
self.remove_from_device()
|
||||||
if self.exists():
|
if self.exists():
|
||||||
raise F5ModuleError("Failed to delete the profile.")
|
raise F5ModuleError("Failed to delete the resource.")
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def read_current_from_device(self):
|
def create(self):
|
||||||
resource = self.client.api.tm.ltm.profile.client_ssls.client_ssl.load(
|
self._set_changed_options()
|
||||||
name=self.want.name,
|
if self.module.check_mode:
|
||||||
partition=self.want.partition
|
return True
|
||||||
)
|
self.create_on_device()
|
||||||
result = resource.attrs
|
return True
|
||||||
return ApiParameters(params=result)
|
|
||||||
|
|
||||||
def exists(self):
|
def create_on_device(self):
|
||||||
result = self.client.api.tm.ltm.profile.client_ssls.client_ssl.exists(
|
params = self.changes.api_params()
|
||||||
name=self.want.name,
|
params['name'] = self.want.name
|
||||||
partition=self.want.partition
|
params['partition'] = self.want.partition
|
||||||
|
uri = "https://{0}:{1}/mgmt/tm/ltm/profile/client-ssl/".format(
|
||||||
|
self.client.provider['server'],
|
||||||
|
self.client.provider['server_port']
|
||||||
)
|
)
|
||||||
return result
|
resp = self.client.api.post(uri, json=params)
|
||||||
|
try:
|
||||||
|
response = resp.json()
|
||||||
|
except ValueError as ex:
|
||||||
|
raise F5ModuleError(str(ex))
|
||||||
|
|
||||||
|
if 'code' in response and response['code'] in [400, 403]:
|
||||||
|
if 'message' in response:
|
||||||
|
raise F5ModuleError(response['message'])
|
||||||
|
else:
|
||||||
|
raise F5ModuleError(resp.content)
|
||||||
|
|
||||||
def update_on_device(self):
|
def update_on_device(self):
|
||||||
params = self.changes.api_params()
|
params = self.changes.api_params()
|
||||||
result = self.client.api.tm.ltm.profile.client_ssls.client_ssl.load(
|
uri = "https://{0}:{1}/mgmt/tm/ltm/profile/client-ssl/{2}".format(
|
||||||
name=self.want.name,
|
self.client.provider['server'],
|
||||||
partition=self.want.partition
|
self.client.provider['server_port'],
|
||||||
|
transform_name(self.want.partition, self.want.name)
|
||||||
)
|
)
|
||||||
result.modify(**params)
|
resp = self.client.api.patch(uri, json=params)
|
||||||
|
try:
|
||||||
|
response = resp.json()
|
||||||
|
except ValueError as ex:
|
||||||
|
raise F5ModuleError(str(ex))
|
||||||
|
|
||||||
def create_on_device(self):
|
if 'code' in response and response['code'] == 400:
|
||||||
params = self.want.api_params()
|
if 'message' in response:
|
||||||
self.client.api.tm.ltm.profile.client_ssls.client_ssl.create(
|
raise F5ModuleError(response['message'])
|
||||||
name=self.want.name,
|
else:
|
||||||
partition=self.want.partition,
|
raise F5ModuleError(resp.content)
|
||||||
**params
|
|
||||||
)
|
def absent(self):
|
||||||
|
if self.exists():
|
||||||
|
return self.remove()
|
||||||
|
return False
|
||||||
|
|
||||||
def remove_from_device(self):
|
def remove_from_device(self):
|
||||||
result = self.client.api.tm.ltm.profile.client_ssls.client_ssl.load(
|
uri = "https://{0}:{1}/mgmt/tm/ltm/profile/client-ssl/{2}".format(
|
||||||
name=self.want.name,
|
self.client.provider['server'],
|
||||||
partition=self.want.partition
|
self.client.provider['server_port'],
|
||||||
|
transform_name(self.want.partition, self.want.name)
|
||||||
)
|
)
|
||||||
if result:
|
response = self.client.api.delete(uri)
|
||||||
result.delete()
|
if response.status == 200:
|
||||||
|
return True
|
||||||
|
raise F5ModuleError(response.content)
|
||||||
|
|
||||||
|
def read_current_from_device(self):
|
||||||
|
uri = "https://{0}:{1}/mgmt/tm/ltm/profile/client-ssl/{2}".format(
|
||||||
|
self.client.provider['server'],
|
||||||
|
self.client.provider['server_port'],
|
||||||
|
transform_name(self.want.partition, self.want.name)
|
||||||
|
)
|
||||||
|
resp = self.client.api.get(uri)
|
||||||
|
try:
|
||||||
|
response = resp.json()
|
||||||
|
except ValueError as ex:
|
||||||
|
raise F5ModuleError(str(ex))
|
||||||
|
|
||||||
|
if 'code' in response and response['code'] == 400:
|
||||||
|
if 'message' in response:
|
||||||
|
raise F5ModuleError(response['message'])
|
||||||
|
else:
|
||||||
|
raise F5ModuleError(resp.content)
|
||||||
|
return ApiParameters(params=response)
|
||||||
|
|
||||||
|
|
||||||
class ArgumentSpec(object):
|
class ArgumentSpec(object):
|
||||||
|
@ -685,6 +972,7 @@ class ArgumentSpec(object):
|
||||||
'pkcs1-check-2',
|
'pkcs1-check-2',
|
||||||
'netscape-ca-dn-bug',
|
'netscape-ca-dn-bug',
|
||||||
'netscape-demo-cipher-change-bug',
|
'netscape-demo-cipher-change-bug',
|
||||||
|
'none',
|
||||||
]
|
]
|
||||||
),
|
),
|
||||||
cert_key_chain=dict(
|
cert_key_chain=dict(
|
||||||
|
@ -700,6 +988,21 @@ class ArgumentSpec(object):
|
||||||
default='present',
|
default='present',
|
||||||
choices=['present', 'absent']
|
choices=['present', 'absent']
|
||||||
),
|
),
|
||||||
|
sni_default=dict(type='bool'),
|
||||||
|
sni_require=dict(type='bool'),
|
||||||
|
server_name=dict(),
|
||||||
|
client_certificate=dict(
|
||||||
|
choices=['require', 'ignore', 'request']
|
||||||
|
),
|
||||||
|
client_auth_frequency=dict(
|
||||||
|
choices=['once', 'always']
|
||||||
|
),
|
||||||
|
cert_auth_depth=dict(type='int'),
|
||||||
|
retain_certificate=dict(type='bool'),
|
||||||
|
trusted_cert_authority=dict(),
|
||||||
|
advertised_cert_authority=dict(),
|
||||||
|
client_auth_crl=dict(),
|
||||||
|
allow_expired_crl=dict(type='bool'),
|
||||||
partition=dict(
|
partition=dict(
|
||||||
default='Common',
|
default='Common',
|
||||||
fallback=(env_fallback, ['F5_PARTITION'])
|
fallback=(env_fallback, ['F5_PARTITION'])
|
||||||
|
@ -712,23 +1015,22 @@ class ArgumentSpec(object):
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
spec = ArgumentSpec()
|
spec = ArgumentSpec()
|
||||||
|
|
||||||
module = AnsibleModule(
|
module = AnsibleModule(
|
||||||
argument_spec=spec.argument_spec,
|
argument_spec=spec.argument_spec,
|
||||||
supports_check_mode=spec.supports_check_mode
|
supports_check_mode=spec.supports_check_mode,
|
||||||
)
|
)
|
||||||
if not HAS_F5SDK:
|
|
||||||
module.fail_json(msg="The python f5-sdk module is required")
|
|
||||||
|
|
||||||
client = F5Client(**module.params)
|
client = F5RestClient(**module.params)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
mm = ModuleManager(module=module, client=client)
|
mm = ModuleManager(module=module, client=client)
|
||||||
results = mm.exec_module()
|
results = mm.exec_module()
|
||||||
cleanup_tokens(client)
|
cleanup_tokens(client)
|
||||||
module.exit_json(**results)
|
exit_json(module, results, client)
|
||||||
except F5ModuleError as ex:
|
except F5ModuleError as ex:
|
||||||
cleanup_tokens(client)
|
cleanup_tokens(client)
|
||||||
module.fail_json(msg=str(ex))
|
fail_json(module, ex, client)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
|
@ -8,16 +8,12 @@ __metaclass__ = type
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import json
|
import json
|
||||||
import pytest
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from nose.plugins.skip import SkipTest
|
from nose.plugins.skip import SkipTest
|
||||||
if sys.version_info < (2, 7):
|
if sys.version_info < (2, 7):
|
||||||
raise SkipTest("F5 Ansible modules require Python >= 2.7")
|
raise SkipTest("F5 Ansible modules require Python >= 2.7")
|
||||||
|
|
||||||
from units.compat import unittest
|
|
||||||
from units.compat.mock import Mock
|
|
||||||
from units.compat.mock import patch
|
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
@ -25,17 +21,25 @@ try:
|
||||||
from library.modules.bigip_profile_client_ssl import ApiParameters
|
from library.modules.bigip_profile_client_ssl import ApiParameters
|
||||||
from library.modules.bigip_profile_client_ssl import ModuleManager
|
from library.modules.bigip_profile_client_ssl import ModuleManager
|
||||||
from library.modules.bigip_profile_client_ssl import ArgumentSpec
|
from library.modules.bigip_profile_client_ssl import ArgumentSpec
|
||||||
from library.module_utils.network.f5.common import F5ModuleError
|
|
||||||
from library.module_utils.network.f5.common import iControlUnexpectedHTTPError
|
# In Ansible 2.8, Ansible changed import paths.
|
||||||
from test.unit.modules.utils import set_module_args
|
from test.units.compat import unittest
|
||||||
|
from test.units.compat.mock import Mock
|
||||||
|
from test.units.compat.mock import patch
|
||||||
|
|
||||||
|
from test.units.modules.utils import set_module_args
|
||||||
except ImportError:
|
except ImportError:
|
||||||
try:
|
try:
|
||||||
from ansible.modules.network.f5.bigip_profile_client_ssl import ModuleParameters
|
from ansible.modules.network.f5.bigip_profile_client_ssl import ModuleParameters
|
||||||
from ansible.modules.network.f5.bigip_profile_client_ssl import ApiParameters
|
from ansible.modules.network.f5.bigip_profile_client_ssl import ApiParameters
|
||||||
from ansible.modules.network.f5.bigip_profile_client_ssl import ModuleManager
|
from ansible.modules.network.f5.bigip_profile_client_ssl import ModuleManager
|
||||||
from ansible.modules.network.f5.bigip_profile_client_ssl import ArgumentSpec
|
from ansible.modules.network.f5.bigip_profile_client_ssl import ArgumentSpec
|
||||||
from ansible.module_utils.network.f5.common import F5ModuleError
|
|
||||||
from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError
|
# Ansible 2.8 imports
|
||||||
|
from units.compat import unittest
|
||||||
|
from units.compat.mock import Mock
|
||||||
|
from units.compat.mock import patch
|
||||||
|
|
||||||
from units.modules.utils import set_module_args
|
from units.modules.utils import set_module_args
|
||||||
except ImportError:
|
except ImportError:
|
||||||
raise SkipTest("F5 Ansible modules require the f5-sdk Python library")
|
raise SkipTest("F5 Ansible modules require the f5-sdk Python library")
|
||||||
|
|
Loading…
Reference in a new issue