Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(deadline): Disable client SSL config for HTTP Render Queue #167

Merged
merged 1 commit into from
Oct 13, 2020
Merged

fix(deadline): Disable client SSL config for HTTP Render Queue #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions packages/aws-rfdk/lib/deadline/scripts/python/client-rq-connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# Regex for counting the number of certificates in a cert chain
CERT_COUNT_RE = re.compile(r'-----BEGIN CERTIFICATE-----')

# Named tuples for storing arguments
# Named tuples for storing arguments
RenderQueue = namedtuple('RenderQueue','uri,scheme,address')
AwsSecret = namedtuple('AwsSecret','arn,region')
FileSecret = namedtuple('FileSecret', 'filepath')
Expand All @@ -42,7 +42,7 @@ def parse_args(args):
:param args: A list of command line arguments
:return: A configuration object containing the parsed arguments
"""

def _secret(value):
"""
A type function for converting args that represent secrets into a named Tuple
Expand All @@ -61,15 +61,15 @@ def _secret(value):
if match:
named_groups = match.groupdict()
return FileSecret( arn=named_groups['FilePath'] )

raise argparse.ArgumentTypeError('Given argument "%s" is not a valid secret' % value)

def _render_queue(value):
"""
A type function for converting args that represent render queue URI's into a named Tuple

:param value: The string representing the argument
:return: A RenderQueue named tuple
:return: A RenderQueue named tuple
:exception argparse.ArgumentTypeError: if the argument cannot be converted properly.
"""

Expand Down Expand Up @@ -130,15 +130,17 @@ def configure_deadline( config ):

:param config: The parsed configuration object
"""

repo_args = ['ChangeRepository','Proxy',config.render_queue.address]
if config.render_queue.scheme == 'http':
print( "Configuring Deadline to connect to the Render Queue (%s) using HTTP Traffic" % config.render_queue.address )
#Ensure SSL is disbaled
#Ensure SSL is disabled
call_deadline_command(['SetIniFileSetting','ProxyUseSSL','False'])
call_deadline_command(['SetIniFileSetting', 'ProxySSLCA', ''])
call_deadline_command(['SetIniFileSetting', 'ClientSSLAuthentication', 'NotRequired'])

else:
print("Configuring Deadline to connect to the Render Queue using HTTP Traffic")
print("Configuring Deadline to connect to the Render Queue using HTTPS Traffic")
call_deadline_command(['SetIniFileSetting','ProxyUseSSL','True'])

try:
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-rfdk/lib/deadline/test/asset-constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ export const REPO_DC_ASSET = {
};

export const RQ_CONNECTION_ASSET = {
Bucket: 'AssetParameters63694479464606109bdbd3525fb2bef7b2abfbf196d8a132832c8e5d8a3c4796S3BucketF3231D14',
Key: 'AssetParameters63694479464606109bdbd3525fb2bef7b2abfbf196d8a132832c8e5d8a3c4796S3VersionKeyE501DFB8',
Bucket: 'AssetParameters89a29e05a2a88ec4d4a02e847e3c3c9461d0154b326492f4cad655d4ca0bda98S3BucketC22E185C',
Key: 'AssetParameters89a29e05a2a88ec4d4a02e847e3c3c9461d0154b326492f4cad655d4ca0bda98S3VersionKey0833D670',
};