Skip to content
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

Jump to bottom

feat(jans-cli-tui): metadata location and other fields #7630

Merged
merged 4 commits into from
Feb 16, 2024
Merged

feat(jans-cli-tui): metadata location and other fields #7630

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23460ac
feat(jans-cli-tui): metadata location and other fields
devrimyatar Feb 2, 2024
257d5ee
Merge branch 'main' into jans-cli-tui-7526
devrimyatar Feb 15, 2024
15ec503
Merge branch 'main' into jans-cli-tui-7526
devrimyatar Feb 16, 2024
0cb0e12
Merge branch 'main' into jans-cli-tui-7526
devrimyatar Feb 16, 2024
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
119 changes: 72 additions & 47 deletions jans-cli-tui/cli_tui/plugins/100_saml/edit_tr_dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,31 +90,29 @@ def upload_file():
file_browser_dialog = jans_file_browser_dialog(self.app, path=self.app.browse_path, browse_type=BrowseType.file, ok_handler=read_metadata_file)
self.app.show_jans_dialog(file_browser_dialog)

def get_metadata_location(value):
if value == 'url':
def get_metadata_source_tpe(value):
if value == 'uri':
self.matadata_type_container = HSplit([
self.app.getTitledText(title=_("Metadata URL"),
name='metadataURL',
value='',
name='spMetaDataURL',
value=self.data.get('spMetaDataURL', ''),
style=cli_style.edit_text,
jans_help=_("URL of metadata"),
jans_help=_("URL of metadata for service provider"),
widget_style=cli_style.white_bg_widget
)
], width=D())
elif value == 'file':
self.matadata_type_container = HSplit([
self.app.getTitledWidget(
_("Metadata File"),
name='jansEntityId',
name='spMetaDataLocation',
widget=Button(_('Browse'), handler=upload_file),
style=cli_style.edit_text,
other_widgets=VSplit([Window(width=2), Window(FormattedTextControl(lambda: self.metadata_file_path))])
)
], width=D())


get_metadata_location(self.data.get('metaDataLocation', 'file'))
)
], width=D())

get_metadata_source_tpe(self.data.get('spMetaDataSourceType', 'file'))

add_released_attribute_button = VSplit([Window(), self.app.getButton(
text=_("Add Released Attribute"),
Expand Down Expand Up @@ -150,7 +148,6 @@ def get_metadata_location(value):
jans_help=_("Is this TR enabled?"),
style=cli_style.check_box
),

self.app.getTitledText(
title=_("Description"),
name='description',
Expand All @@ -160,19 +157,57 @@ def get_metadata_location(value):
jans_help=_("Description for TR"),
widget_style=cli_style.white_bg_widget
),

self.app.getTitledCheckBox(
_("Surrogate Auth Required"),
name='surrogateAuthRequired',
checked=self.data.get('surrogateAuthRequired', False),
jans_help=_("Is this TR enabled?"),
style=cli_style.check_box
),
self.app.getTitledText(
title=_("Root URL"),
name='rootUrl',
value=self.data.get('rootUrl', ''),
style=cli_style.edit_text,
jans_help=_("Root URL for TR"),
widget_style=cli_style.white_bg_widget
),
self.app.getTitledText(
title=_("Admin URL"),
name='adminUrl',
value=self.data.get('adminUrl', ''),
style=cli_style.edit_text,
jans_help=_("Admin URL for TR"),
widget_style=cli_style.white_bg_widget
),
self.app.getTitledText(
title=_("URL"),
name='url',
value=self.data.get('url', ''),
style=cli_style.edit_text,
jans_help=_("URL for TR"),
widget_style=cli_style.white_bg_widget
),
self.app.getTitledText(
title=_("Service Provider Logout URL"),
name='spLogoutURL',
value=self.data.get('spLogoutURL', ''),
style=cli_style.edit_text,
jans_help=_("Service Provider Logout URL for TR"),
widget_style=cli_style.white_bg_widget
),
]

if self.new_tr:
if self.data.get('spMetaDataSourceType') != 'file':
edit_tr_container_widgets.append(
self.app.getTitledWidget(
_("Metadata Location"),
name='metaDataLocation',
_("Metadata Source Type"),
name='spMetaDataSourceType',
widget=DropDownWidget(
values=[('file', 'File'), ('url', 'URL')],
value=self.data.get('metaDataLocation', 'file'),
values=[(dsp, dsp) for dsp in ('file', 'uri', 'federation', 'manual', 'mdq')],
value=self.data.get('spMetaDataSourceType', 'file'),
select_one_option = False,
on_value_changed = get_metadata_location
on_value_changed = get_metadata_source_tpe
)
)
)
Expand Down Expand Up @@ -341,37 +376,27 @@ def save(self):
metadata_location = tr_data.pop('metaDataLocation', None)
if metadata_location == 'url':
metadata_url_data = self.make_data_from_dialog({'metadataURL': self.matadata_type_container})
metadata_url = metadata_url_data['metadataURL']

try:
metadata_response = requests.get(metadata_url, verify=False)
except Exception as e:
self.app.show_message(_(common_strings.error), _("Retreiving meatada from:\n {}\nfailed. Reason:\n{}").format(metadata_url, e), tobefocused=self.edit_tr_container)
return

if not metadata_response.ok:
self.app.show_message(_(common_strings.error), _("Retreiving meatada from:\n {}\nfailed. Reason:\n{}").format(metadata_url, metadata_response.reason), tobefocused=self.edit_tr_container)
return

parsed_url = urlparse(metadata_url)
metadata_fn = parsed_url.netloc + '_' + parsed_url.path.replace('/', '_')
if not metadata_fn.endswith('xml'):
metadata_fn += '.xml'

self.metadata_file_path = os.path.join(self.app.cli_object.tmp_dir, metadata_fn)
with open(self.metadata_file_path, 'w') as w:
w.write(metadata_response.text)
tr_data['metadataURL'] = metadata_url_data['metadataURL']
else:
pass

tr_data['releasedAttributes'] = [entry[0] for entry in self.released_attributes_container.entries]

if self.new_tr and self.metadata_file_path:
tr_data['spMetaDataSourceType'] = 'FILE'
tr_data['spMetaDataFN'] = os.path.basename(self.metadata_file_path)
data = {'trustRelationship': tr_data, 'metaDataFile': self.metadata_file_path}
else:
new_data = copy.deepcopy(self.data)
new_data.update(tr_data)
data = {'trustRelationship': new_data}
matadata_type_container_data = self.make_data_from_dialog({'matadata_type_container_data': self.matadata_type_container})
new_data = copy.deepcopy(self.data)
new_data.update(tr_data)

sp_meta_data_source_type = tr_data.get('spMetaDataSourceType')
if sp_meta_data_source_type == 'file':
new_data['spMetaDataLocation'] = os.path.basename(self.metadata_file_path)
new_data.pop('spMetaDataURL', None)
elif sp_meta_data_source_type == 'uri':
new_data.pop('spMetaDataLocation', None)
new_data['spMetaDataURL'] = matadata_type_container_data['spMetaDataURL']

data = {'trustRelationship': new_data}
if sp_meta_data_source_type == 'file':
data['metaDataFile'] = self.metadata_file_path

async def coroutine():
operation_id = 'post-trust-relationship-metadata-file' if self.new_tr else 'put-trust-relationship'
Expand Down