IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-08-13 06:25:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Web UI: Disable cert functionality if a CA is not available

Browse Source 
Part of the work for: https://fedorahosted.org/freeipa/ticket/3363
This commit is contained in:
Petr Vobornik
2013-04-02 15:32:05 +02:00
committed by Martin Kosek
parent 67c7bd3060
commit 40b4faa6d7
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/ui/src/freeipa/certificate.js
+13 -11
View File
@@ -501,7 +501,7 @@ IPA.cert.load_policy = function(spec) {
// show commands don't contain revocation_reason so previous data // show commands don't contain revocation_reason so previous data
// might be slightly incorrect // might be slightly incorrect
if (!that.has_reason && certificate && certificate.certificate && if (!that.has_reason && certificate && certificate.certificate &&
!IPA.cert.is_selfsign()) { IPA.cert.is_enabled()) {
that.load_revocation_reason(certificate.serial_number); that.load_revocation_reason(certificate.serial_number);
} }
}; };
@@ -529,8 +529,8 @@ IPA.cert.load_policy = function(spec) {
return that; return that;
}; };
IPA.cert.is_selfsign = function() { IPA.cert.is_enabled = function() {
return IPA.env.ra_plugin == 'selfsign'; return !!IPA.env.enable_ra;
}; };
IPA.cert.view_action = function(spec) { IPA.cert.view_action = function(spec) {
@@ -604,6 +604,7 @@ IPA.cert.request_action = function(spec) {
spec = spec || {}; spec = spec || {};
spec.name = spec.name || 'request_cert'; spec.name = spec.name || 'request_cert';
spec.label = spec.label || IPA.messages.objects.cert.new_certificate; spec.label = spec.label || IPA.messages.objects.cert.new_certificate;
spec.enable_cond = spec.enable_cond || ['ra_enabled'];
var that = IPA.action(spec); var that = IPA.action(spec);
that.entity_label = spec.entity_label; that.entity_label = spec.entity_label;
@@ -660,7 +661,7 @@ IPA.cert.revoke_action = function(spec) {
spec.label = spec.label || IPA.messages.buttons.revoke; spec.label = spec.label || IPA.messages.buttons.revoke;
spec.enable_cond = spec.enable_cond || ['has_certificate']; spec.enable_cond = spec.enable_cond || ['has_certificate'];
spec.disable_cond = spec.disable_cond || ['certificate_revoked']; spec.disable_cond = spec.disable_cond || ['certificate_revoked'];
spec.hide_cond = spec.hide_cond || ['selfsign']; spec.hide_cond = spec.hide_cond || ['ra_disabled'];
spec.confirm_dialog = spec.confirm_dialog || IPA.cert.revoke_dialog; spec.confirm_dialog = spec.confirm_dialog || IPA.cert.revoke_dialog;
spec.needs_confirm = spec.needs_confirm !== undefined ? spec.needs_confirm : true; spec.needs_confirm = spec.needs_confirm !== undefined ? spec.needs_confirm : true;
@@ -714,7 +715,7 @@ IPA.cert.restore_action = function(spec) {
spec.name = spec.name || 'restore_cert'; spec.name = spec.name || 'restore_cert';
spec.label = spec.label || IPA.messages.buttons.restore; spec.label = spec.label || IPA.messages.buttons.restore;
spec.enable_cond = spec.enable_cond || ['has_certificate', 'certificate_hold']; spec.enable_cond = spec.enable_cond || ['has_certificate', 'certificate_hold'];
spec.hide_cond = spec.hide_cond || ['selfsign']; spec.hide_cond = spec.hide_cond || ['ra_disabled'];
spec.confirm_msg = spec.confirm_msg || IPA.messages.objects.cert.restore_confirmation; spec.confirm_msg = spec.confirm_msg || IPA.messages.objects.cert.restore_confirmation;
spec.confirm_dialog = spec.confirm_dialog || { spec.confirm_dialog = spec.confirm_dialog || {
factory: IPA.confirm_dialog, factory: IPA.confirm_dialog,
@@ -788,8 +789,10 @@ IPA.cert.certificate_evaluator = function(spec) {
} }
} }
if (IPA.cert.is_selfsign()) { if (IPA.cert.is_enabled()) {
that.state.push('selfsign'); that.state.push('ra_enabled');
} else {
that.state.push('ra_disabled');
} }
that.notify_on_change(old_state); that.notify_on_change(old_state);
@@ -869,12 +872,11 @@ IPA.cert.status_widget = function(spec) {
certificate = certificate || {}; certificate = certificate || {};
var selfsign = IPA.cert.is_selfsign();
var has_certificate = certificate.certificate; var has_certificate = certificate.certificate;
var revoked = certificate.revocation_reason !== undefined; var revoked = certificate.revocation_reason !== undefined;
var status = IPA.cert.CERTIFICATE_STATUS_MISSING; var status = IPA.cert.CERTIFICATE_STATUS_MISSING;
if (has_certificate && (selfsign || !revoked)) { if (has_certificate && !revoked) {
status = IPA.cert.CERTIFICATE_STATUS_VALID; status = IPA.cert.CERTIFICATE_STATUS_VALID;
} else if (has_certificate) { } else if (has_certificate) {
status = IPA.cert.CERTIFICATE_STATUS_REVOKED; status = IPA.cert.CERTIFICATE_STATUS_REVOKED;
@@ -893,7 +895,7 @@ IPA.cert.status_widget = function(spec) {
that.status_valid.css('display', status === IPA.cert.CERTIFICATE_STATUS_VALID ? '' : 'none'); that.status_valid.css('display', status === IPA.cert.CERTIFICATE_STATUS_VALID ? '' : 'none');
that.status_missing.css('display', status === IPA.cert.CERTIFICATE_STATUS_MISSING ? '' : 'none'); that.status_missing.css('display', status === IPA.cert.CERTIFICATE_STATUS_MISSING ? '' : 'none');
if (!IPA.cert.is_selfsign()) { if (!IPA.cert.is_enabled()) {
that.status_revoked.css('display', status === IPA.cert.CERTIFICATE_STATUS_REVOKED ? '' : 'none'); that.status_revoked.css('display', status === IPA.cert.CERTIFICATE_STATUS_REVOKED ? '' : 'none');
var reason = IPA.cert.CRL_REASON[revocation_reason]; var reason = IPA.cert.CRL_REASON[revocation_reason];
@@ -1042,7 +1044,7 @@ IPA.cert.entity = function(spec) {
that.init = function() { that.init = function() {
if (IPA.cert.is_selfsign()) { if (!IPA.cert.is_enabled()) {
throw { throw {
expected: true expected: true
}; };