Skip to content

Wdt 221 add jrf installed authentication provider #278

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 4 commits into from
Mar 8, 2019
Merged

Wdt 221 add jrf installed authentication provider #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d6f788
Add trust identity asserter to alias definitions
CarolynRountree Mar 5, 2019
360ac01
JIRA WDT-221 add JRF custom identity asserter
CarolynRountree Mar 8, 2019
d267dc0
Merge branch 'master' into WDT-221-add-jrf-installed-authentication-p…
CarolynRountree Mar 8, 2019
b277836
JIRA WDT-221 remove failing test
CarolynRountree Mar 8, 2019
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
3 changes: 2 additions & 1 deletion core/src/main/python/wlsdeploy/aliases/alias_constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ def __build_security_provider_data_structures(name_map, base_path):
'SQLAuthenticator': 'weblogic.security.providers.authentication.SQLAuthenticator',
'VirtualUserAuthenticator': 'weblogic.security.providers.authentication.VirtualUserAuthenticator',
'SAMLAuthenticator': 'weblogic.security.providers.saml.SAMLAuthenticator',
'SAMLIdentityAsserterV2': 'weblogic.security.providers.saml.SAMLIdentityAsserterV2'
'SAMLIdentityAsserterV2': 'weblogic.security.providers.saml.SAMLIdentityAsserterV2',
'TrustServiceIdentityAsserter': 'oracle.security.jps.wls.providers.trust.TrustServiceIdentityAsserter',
}

AUTHORIZATION_PROVIDER_NAME_MAP = {
Expand Down
23 changes: 22 additions & 1 deletion ...main/resources/oracle/weblogic/deploy/aliases/category_modules/SecurityConfiguration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"copyright": "Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.",
"copyright": "Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.",
"license": "The Universal Permissive License (UPL), Version 1.0",
"wlst_type": "SecurityConfiguration",
"child_folders_type": "single_unpredictable",
Expand Down Expand Up @@ -876,6 +876,27 @@
"WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
}
},
"TrustServiceIdentityAsserter": {
"wlst_type": "oracle.security.jps.wls.providers.trust.TrustServiceIdentityAsserter",
"child_folders_type": "none",
"version": "[12.1.2,]",
"folders": {},
"attributes": {
"ActiveType": [{"version": "[12.1.2,12.2.1)", "wlst_mode": "online", "wlst_name": "ActiveTypes", "wlst_path": "WP001", "value": {"default": "java.lang.String['Authorization']" }, "wlst_type": "list" } ,
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ActiveType${:s}", "wlst_path": "WP001", "value": {"default": "${:java.lang.String['Authorization']}" }, "wlst_type": "${delimited_string:list}", "get_method": "${LSA:GET}" } ],
"Base64DecodingRequired": [{"version": "[12.1.2,12.2.1)", "wlst_mode": "online", "wlst_name": "Base64DecodingRequired", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean", "access": "RO" } ,
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "Base64DecodingRequired", "wlst_path": "WP001", "value": {"default": "${true:false}" }, "wlst_type": "boolean", "access": "${:RO}" } ],
"CompatibilityObjectName": [{"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CompatibilityObjectName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
"Description": [{"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "Description", "wlst_path": "WP001", "value": {"default": "Trust Service Identity Assertion Provider" }, "wlst_type": "string", "access": "RO" } ],
"ProviderClassName": [{"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "ProviderClassName", "wlst_path": "WP001", "value": {"default": "oracle.security.jps.wls.providers.trust.TrustServiceAsserterProviderImp" }, "wlst_type": "string", "access": "RO" } ],
"SupportedTypes": [{"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "SupportedTypes", "wlst_path": "WP001", "value": {"default": "java.lang.String['Authorization']" }, "wlst_type": "list", "get_method" : "GET", "access": "RO" } ],
"Version": [{"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "Version", "wlst_path": "WP001", "value": {"default": "1.0" }, "wlst_type": "string", "access": "RO" } ]
},
"wlst_attributes_path": "WP001",
"wlst_paths": {
"WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
}
},
"VirtualUserAuthenticator": {
"wlst_type": "${VirtualUserAuthenticator:weblogic.security.providers.authentication.VirtualUserAuthenticator}",
"child_folders_type": "none",
Expand Down
4 changes: 1 addition & 3 deletions core/src/test/python/aliases_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ def testSecurityProviderGetAttributes(self):
self.assertEquals(model_value, 'MyObjectName')
return

def testSecurityProviderDiscovery(self):
def testJrfSecurityProviderDiscovery(self):
location = LocationContext().append_location(FOLDERS.SECURITY_CONFIGURATION)
token = self.aliases.get_name_token(location)
location.add_name_token(token, 'my-domain')
Expand All @@ -959,8 +959,6 @@ def testSecurityProviderDiscovery(self):
location.add_name_token(token, 'myrealm')

location.append_location(FOLDERS.AUTHENTICATION_PROVIDER)
result = self.aliases.requires_artificial_type_subfolder_handling(location)
self.assertEqual(result, True)

token = self.aliases.get_name_token(location)
location.add_name_token(token, 'myprovider')
Expand Down
6 changes: 4 additions & 2 deletions core/src/test/python/attributes_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
The Universal Permissive License (UPL), Version 1.0
"""
import unittest
Expand Down Expand Up @@ -65,6 +65,7 @@ def _format(self, key, *args):
def _is_filtered_folder(self, name, location):
result = False


if name == 'Domain':
result = True
elif location.get_folder_path() == '/JDBCSystemResource/JdbcResource/JDBCDriverParams/Properties' and \
Expand All @@ -89,7 +90,8 @@ def _is_filtered_folder(self, name, location):
result = True
elif location.get_folder_path() == '/SecurityConfiguration/Realm/Auditor/DefaultAuditor':
result = True

elif location.get_folder_path() == '/SecurityConfiguration/Realm/AuthenticationProvider/TrustServiceIdentityAsserter':
result = True
return result

if __name__ == '__main__':
Expand Down