IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-26 16:16:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

WebUI: Allow to add certs to certmapping with CERT LINES around

Browse Source 
The certificate to the certmapping might be inserted as
base64 encoded blob. This patch allows to also insert the certificate
blob with surrounding "-----BEGIN CERTIFICATE-----" and
"-----END CERTIFICATE-----" lines. This behavior is the same in
widget for assigning certificates to users, so the change helps
WebUI to be more consistent.

https://pagure.io/freeipa/issue/6772

Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
This commit is contained in:
Pavel Vomacka 2017-03-27 14:14:32 +02:00
parent eeaf428b1b
commit 84b38b6793
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
install/ui/src/freeipa/plugins/certmap.js
View File

@ -8,6 +8,7 @@ define([
'dojo/_base/declare',
'dojo/Evented',
'dojo/on',
'../certificate',
'../navigation',
'../field',
'../ipa',
@ -19,8 +20,8 @@ define([
// plain imports
'../search',
'../entity'],
function(lang, declare, Evented, on, navigation, mod_field, IPA,
phases, reg, widget_mod, text, util) {
function(lang, declare, Evented, on, certificate, navigation,
mod_field, IPA, phases, reg, widget_mod, text, util) {
/**
* Certificate map module
* @class
@ -312,6 +313,12 @@ certmap.certmap_multivalued_widget = function (spec) {
var widget = widgets[0];
var inner_widgets = widget.widgets.get_widgets();
var normalize_certs = function(certs) {
for (var k = 0, l = certs.length; k<l; k++) {
certs[k] = certificate.get_base64(certs[k]);
}
};
for (var i = 0, l = inner_widgets.length; i<l; i++) {
var w = inner_widgets[i];
@ -321,6 +328,8 @@ certmap.certmap_multivalued_widget = function (spec) {
if (field.name === 'issuer' || field.name === 'subject') {
value = value[0];
} else if (field.name === 'certificate') {
normalize_certs(value);
}
if (!util.is_empty(value)) options[field.name] = value;