Skip to content

Commit 22c7280

Browse files
committed
Merge remote-tracking branch 'origin/Issue#164-support-custom-security-providers' into Issue#164-support-custom-security-providers
2 parents ba82883 + d79881d commit 22c7280

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

core/src/main/python/wlsdeploy/tool/create/creator.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from wlsdeploy.util import dictionary_utils
2020
from wlsdeploy.util.model import Model
2121
from wlsdeploy.util.weblogic_helper import WebLogicHelper
22-
22+
2323

2424
class Creator(object):
2525
"""
@@ -462,7 +462,10 @@ def _delete_existing_providers(self, location):
462462
The security realms providers in the model are processed as merge to the model. Each realm provider
463463
section must be complete and true to the resulting domain. Any existing provider not found in the
464464
model will be removed, and any provider in the model but not in the domain will be added. The resulting
465-
provider list will be ordered as listed in the model.
465+
provider list will be ordered as listed in the model. If the provider type (i.e. AuthenticationProvider)
466+
is not in the model, it is assumed no configuration or ordering is needed, and the provider is skipped.
467+
If the provider type is in the model, but there is no MBean entry under the provider, then it is
468+
assumed that all providers for that provider type must be removed.
466469
467470
For create, the default realm and default providers have been added by the weblogic base template and any
468471
extension templates. They have default values. These providers will be removed from the domain. During
@@ -477,9 +480,8 @@ def _delete_existing_providers(self, location):
477480
with the correct name. And the DefaultAuthenticationProvider successfully re-adds with the correct default
478481
identity asserter.
479482
480-
This release does not support updating the provider list. Because this means that the realms cannot be
481-
configured accurately, the security configuration is not configured. It is in the original configuration
482-
applied by the templates.
483+
This release also supports updating the security configuration realms in both offline and online mode. This
484+
release requires a complete list of providers as described in the first paragraph.
483485
484486
:param location: current context of the location pointing at the provider mbean
485487
"""

core/src/main/python/wlsdeploy/tool/create/security_provider_creator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class SecurityProviderCreator(Creator):
2424
2525
Custom Security Providers are supported in 12c releases only.
2626
27-
Configuration of the security realms is not supported in 11g -
2827
Default providers in 11g have no name. Offline wlst returns 'Provider' as each provider name instead.
2928
By deleting and re-adding, the providers are added with the appropriate name field.
3029
@@ -39,7 +38,8 @@ class SecurityProviderCreator(Creator):
3938
5. All 11g and 12c versions less than 12.2.1.2 cannot perform a delete on an Adjudicator object.
4039
4140
The SecurityConfiguration is added if it does not exist. The default realm is added if it does not exist.
42-
If it is not an 11g target domain, then configure the realms with merge to model with the providers
41+
If the model provides a user defined realm, the default realm is not removed.
42+
4343
"""
4444
__class_name = 'SecurityProviderHelper'
4545

core/src/main/python/wlsdeploy/tool/util/custom_folder_helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
33
The Universal Permissive License (UPL), Version 1.0
44
"""
55
from java.lang import IllegalArgumentException

0 commit comments

Comments
 (0)