Skip to content

Commit 54f2633

Browse files
rakillenrakillen
authored
Online discover adds invalid ActiveType values for identity asserters (#812)
* Issue #810 - Use alias check to exclude artificial folders * Issue #810 - Correct online name and get method for 5 asserter types * Issue #810 - Correct get method for 5 URI attributes in Server and ServerTemplate
1 parent dc9f1a5 commit 54f2633

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

‎core/src/main/python/wlsdeploy/aliases/alias_entries.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
from wlsdeploy.aliases.alias_constants import NAME_VALUE
2828
from wlsdeploy.aliases.alias_constants import NONE_CHILD_FOLDERS_TYPE
2929
from wlsdeploy.aliases.alias_constants import PATH_TOKEN
30-
from wlsdeploy.aliases.alias_constants import SECURITY_PROVIDER_NAME_MAP
3130
from wlsdeploy.aliases.alias_constants import SET_MBEAN_TYPE
3231
from wlsdeploy.aliases.alias_constants import SET_METHOD
3332
from wlsdeploy.aliases.alias_constants import SHORT_NAME
@@ -349,7 +348,7 @@ def get_model_folder_path_for_location(self, location):
349348
my_loc.append_location(location_folder)
350349

351350
# Have to check for security provider artificial folders that don't have a trailing name token
352-
if location_folder not in SECURITY_PROVIDER_NAME_MAP:
351+
if not self.is_location_child_folder_type(my_loc, ChildFoldersTypes.NONE):
353352
name_token = self.get_name_token_for_location(my_loc)
354353
if name_token is not None:
355354
name = location.get_name_for_token(name_token)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
"folder_order": 2,
270270
"folders": {},
271271
"attributes" : {
272-
"ActiveType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ActiveType${:s}", "wlst_path": "WP001", "value": {"default": ["AuthenticatedUser", "weblogic-jwt-token"]}, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "LSA" } ],
272+
"ActiveType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ActiveType${:s}", "wlst_path": "WP001", "value": {"default": ["AuthenticatedUser", "weblogic-jwt-token"]}, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "${LSA:GET}" } ],
273273
"Base64DecodingRequired": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Base64DecodingRequired", "wlst_path": "WP001", "value": {"default": true }, "wlst_type": "boolean" } ],
274274
"Base64EncodingException": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "Base64EncodingException${:s}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "LSA" } ],
275275
"CompatibilityObjectName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityObjectName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
@@ -420,7 +420,7 @@
420420
"child_folders_type": "none",
421421
"folders": {},
422422
"attributes" : {
423-
"ActiveType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ActiveType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "LSA" } ],
423+
"ActiveType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ActiveType${:s}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "${LSA:GET}" } ],
424424
"Base64DecodingRequired": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Base64DecodingRequired", "wlst_path": "WP001", "value": {"default": true }, "wlst_type": "boolean" } ],
425425
"BindAnonymouslyOnReferrals": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BindAnonymouslyOnReferrals", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean" } ],
426426
"CacheEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CacheEnabled", "wlst_path": "WP001", "value": {"default": true }, "wlst_type": "boolean" } ],
@@ -454,7 +454,7 @@
454454
"child_folders_type": "none",
455455
"folders": {},
456456
"attributes" : {
457-
"ActiveType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ActiveType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "LSA" } ],
457+
"ActiveType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ActiveType${:s}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "${LSA:GET}" } ],
458458
"Base64DecodingRequired": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Base64DecodingRequired", "wlst_path": "WP001", "value": {"default": true }, "wlst_type": "boolean" } ],
459459
"CompatibilityObjectName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityObjectName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "integer" } ],
460460
"FormBasedNegotiationEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FormBasedNegotiationEnabled", "wlst_path": "WP001", "value": {"default": true }, "wlst_type": "boolean" } ],
@@ -879,7 +879,7 @@
879879
"child_folders_type": "none",
880880
"folders": {},
881881
"attributes" : {
882-
"ActiveType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ActiveType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "LSA" } ],
882+
"ActiveType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ActiveType${:s}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "${LSA:GET}" } ],
883883
"Base64DecodingRequired": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Base64DecodingRequired", "wlst_path": "WP001", "value": {"default": true }, "wlst_type": "boolean" } ],
884884
"CompatibilityObjectName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityObjectName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "integer" } ],
885885
"IdentityDomain": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "IdentityDomain", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "LSA" } ],
@@ -911,7 +911,7 @@
911911
"child_folders_type": "none",
912912
"folders": {},
913913
"attributes" : {
914-
"ActiveType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ActiveType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "LSA" } ],
914+
"ActiveType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ActiveType${:s}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "${LSA:GET}" } ],
915915
"Base64DecodingRequired": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Base64DecodingRequired", "wlst_path": "WP001", "value": {"default": true }, "wlst_type": "boolean" } ],
916916
"CompatibilityObjectName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityObjectName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "integer" } ],
917917
"IdentityDomain": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "IdentityDomain", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "LSA" } ],

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@
139139
"AllowedTargetHost": [ {"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "AllowedTargetHost${:s}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "LSA" } ],
140140
"ArsRequiresSsl": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "${Ars:ARS}Requires${Ssl:SSL}", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
141141
"ArsRequiresTwoWaySsl": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "${Ars:ARS}RequiresTwoWay${Ssl:SSL}", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
142-
"AssertionConsumerUri": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AssertionConsumer${Uri:URIs}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "LSA", "restart_required": "true" } ],
143-
"AssertionRetrievalUri": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AssertionRetrieval${Uri:URIs}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "LSA", "restart_required": "true" } ],
142+
"AssertionConsumerUri": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AssertionConsumer${Uri:URIs}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "${LSA:GET}", "restart_required": "true" } ],
143+
"AssertionRetrievalUri": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AssertionRetrieval${Uri:URIs}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "${LSA:GET}", "restart_required": "true" } ],
144144
"AssertionStoreClassName": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AssertionStoreClassName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ],
145145
"AssertionStoreProperties": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AssertionStoreProperties", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "properties", "restart_required": "true" } ],
146146
"DestinationSiteEnabled": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DestinationSiteEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "restart_required": "true" } ],
147-
"IntersiteTransferUri": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "IntersiteTransfer${Uri:URIs}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "LSA", "restart_required": "true" } ],
147+
"IntersiteTransferUri": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "IntersiteTransfer${Uri:URIs}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "${LSA:GET}", "restart_required": "true" } ],
148148
"ItsRequiresSsl": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "${Its:ITS}Requires${Ssl:SSL}", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
149149
"Notes": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
150150
"PostOneUseCheckEnabled": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "${Post:POST}OneUseCheckEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,12 @@
142142
"AllowedTargetHost": [ {"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "AllowedTargetHost${:s}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "LSA" } ],
143143
"ArsRequiresSsl": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "${Ars:ARS}Requires${Ssl:SSL}", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
144144
"ArsRequiresTwoWaySsl": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "${Ars:ARS}RequiresTwoWay${Ssl:SSL}", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
145-
"AssertionConsumerUri": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AssertionConsumer${Uri:URIs}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "LSA", "restart_required": "true" } ],
146-
"AssertionRetrievalUri": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AssertionRetrieval${Uri:URIs}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "LSA", "restart_required": "true" } ],
145+
"AssertionConsumerUri": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AssertionConsumer${Uri:URIs}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "${LSA:GET}", "restart_required": "true" } ],
146+
"AssertionRetrievalUri": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AssertionRetrieval${Uri:URIs}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "${LSA:GET}", "restart_required": "true" } ],
147147
"AssertionStoreClassName": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AssertionStoreClassName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ],
148148
"AssertionStoreProperties": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AssertionStoreProperties", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "properties", "restart_required": "true" } ],
149149
"DestinationSiteEnabled": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DestinationSiteEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "restart_required": "true" } ],
150-
"IntersiteTransferUri": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "IntersiteTransfer${Uri:URIs}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "LSA", "restart_required": "true" } ],
150+
"IntersiteTransferUri": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "IntersiteTransfer${Uri:URIs}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "${LSA:GET}", "restart_required": "true" } ],
151151
"ItsRequiresSsl": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "${Its:ITS}Requires${Ssl:SSL}", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
152152
"Notes": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
153153
"PostOneUseCheckEnabled": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "${Post:POST}OneUseCheckEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],

0 commit comments

Comments
 (0)