Merge remote-tracking branch 'origin/master'

Author: ddsharpe

core/src/main/python/wlsdeploy/aliases/alias_constants.py

@@ -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 = {

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SecurityConfiguration.json

@@ -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",
@@ -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",

core/src/test/python/aliases_test.py

@@ -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')
@@ -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')

core/src/test/python/attributes_test.py

@@ -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
@@ -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 \
@@ -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__':