Skip to content

Fix for new atp format without server dn entries #1356

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

Merged
merged 2 commits into from
Jan 14, 2023
Merged

Fix for new atp format without server dn entries #1356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f23d8c
Fix for new atp format without server dn entries
jshum2479 Jan 14, 2023
a12e682
comment
jshum2479 Jan 14, 2023
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
39 changes: 21 additions & 18 deletions core/src/main/python/wlsdeploy/tool/create/atp_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,33 +103,36 @@ def cleanup_connect_string(connect_string):

Input:
(description= (address=(protocol=tcps)(port=1522)(host=*******.oraclecloud.com))(connect_data=(service_name=someservice-in.oraclecloud.com))(security=(ssl_server_cert_dn= "CN=somewhere-in.oraclecloud.com,OU=Oracle BMCS US,O=Oracle Corporation,L=Redwood City,ST=California,C=US")) )
or
(description= (retry_count=20)(retry_delay=3)(address=(protocol=tcps)(port=1522)(host=*******.oraclecloud.com))(connect_data=(service_name=someservice-in.oraclecloud.com))(security=(ssl_server_dn_match=yes)))
Output Parts:
1. (description=(address=(protocol=tcps)(port=1522)(host=*******.oraclecloud.com))(connect_data=(service_name=someservice-in.oraclecloud.com))(security=(
2. ssl_server_cert_dn=
3. "CN=somewhere-in.oraclecloud.com,OU=Oracle BMCS US,O=Oracle Corporation,L=Redwood City,ST=California,C=US"
4. )))
:param connect_string:
:return:
:return: fixed connection string without white spaces
"""

toks = connect_string.split('(description=')
pattern = "(.*)(ssl_server_cert_dn=)\s*(\".*\")(.*)"
result = ''
for token in toks:
if token.find("(ssl_server_cert_dn=") > 0:
match = re.search(pattern, token)
if match:
part1 = match.group(1).replace(' ','')
part2 = match.group(2).replace(' ', '')
# We don't want to remove the spaces from serverDN part.
part3 = match.group(3)
part4 = match.group(4).replace(' ', '')
result += "(description=%s%s%s%s" % (part1, part2, part3, part4)
else:
result += token.replace(' ', '')

if result == '':
result = connect_string
if connect_string.find("(ssl_server_cert_dn=") > 0:
toks = connect_string.split('(description=')
# can have multiples
pattern = "(.*)(ssl_server_cert_dn=)\s*(\".*\")(.*)"
for token in toks:
if token.find("(ssl_server_cert_dn=") > 0:
match = re.search(pattern, token)
if match:
part1 = match.group(1).replace(' ','')
part2 = match.group(2).replace(' ', '')
# We don't want to remove the spaces from serverDN part.
part3 = match.group(3)
part4 = match.group(4).replace(' ', '')
result += "(description=%s%s%s%s" % (part1, part2, part3, part4)
else:
result += token.replace(' ', '')
else:
result = connect_string.replace(' ','')

return result

42 changes: 42 additions & 0 deletions core/src/test/python/atp_helper_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,45 @@ def testFixingNonDescriptionList(self):

self.assertEqual(fixed_url, expected_url)
return

def testFixingDescriptionListWithoutServerDN(self):
src_url = '(description_list=(failover=on)(load_balance=off)(description=(retry_count=15)(retry_delay=3)' \
'(address=(protocol=tcps)(port=1522)(host=somewhere-in.oraclecloud.com))' \
'(connect_data=(service_name=some-service-in.oraclecloud.com))' \
'(security=(ssl_server_dn_match=yes)))' \
'(description=(retry_count=15)(retry_delay=3)(address=(protocol=tcps)(port=1522)(host=somewhere2-in.oraclecloud.com))' \
'(connect_data=(service_name=some-service-in.oraclecloud.com))' \
'(security=(ssl_server_dn_match=yes)))' \
'(description=(retry_count=15)(retry_delay=3)(address=(protocol=tcps)(port=1523)(host=somewhere2-in.oraclecloud.com))' \
'(connect_data=(service_name=some-service-in.oraclecloud.com))' \
'(security=(ssl_server_dn_match=yes)))'

expected_url = '(description_list=(failover=on)(load_balance=off)(description=(retry_count=15)(retry_delay=3)' \
'(address=(protocol=tcps)(port=1522)(host=somewhere-in.oraclecloud.com))' \
'(connect_data=(service_name=some-service-in.oraclecloud.com))' \
'(security=(ssl_server_dn_match=yes)))' \
'(description=(retry_count=15)(retry_delay=3)(address=(protocol=tcps)(port=1522)(host=somewhere2-in.oraclecloud.com))' \
'(connect_data=(service_name=some-service-in.oraclecloud.com))' \
'(security=(ssl_server_dn_match=yes)))' \
'(description=(retry_count=15)(retry_delay=3)(address=(protocol=tcps)(port=1523)(host=somewhere2-in.oraclecloud.com))' \
'(connect_data=(service_name=some-service-in.oraclecloud.com))' \
'(security=(ssl_server_dn_match=yes)))'


fixed_url = atp_helper.cleanup_connect_string(src_url)
self.assertEqual(fixed_url, expected_url)
return

def testFixingNonDescriptionListWithoutServerDN(self):
src_url = '(description= (address=(protocol=tcps)(port=1522)(host=some-cn-in.oraclecloud.com))' \
'(connect_data=(service_name=some-service-in.oraclecloud.com))' \
'(security=(ssl_server_dn_match=yes)) )'

expected_url = '(description=(address=(protocol=tcps)(port=1522)(host=some-cn-in.oraclecloud.com))' \
'(connect_data=(service_name=some-service-in.oraclecloud.com))' \
'(security=(ssl_server_dn_match=yes)))'

fixed_url = atp_helper.cleanup_connect_string(src_url)

self.assertEqual(fixed_url, expected_url)
return