jrd/tls-dashboard
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix parsing order for dashboard presentation

Browse Source
This commit is contained in:
Craine Runton 2016-06-17 14:21:50 -06:00
parent 0500ae139b
commit babb94c2fc
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
node_app/get_cert_info.js
View File

@ -48,9 +48,20 @@ function get_cert_parameters(element, index, array) {
'info': { 'info': {
'valid_from': parse_date(cert.valid_from), 'valid_from': parse_date(cert.valid_from),
'valid_to': parse_date(cert.valid_to), 'valid_to': parse_date(cert.valid_to),
'days_left': get_days_left(cert.valid_to) 'days_left': get_days_left(cert.valid_to),
'sort_order': get_days_left(cert.valid_to),
'background_class': ''
} }
}; };
if (parsed.info.days_left <= 30 ){
parsed.info.background_class = 'danger';
} else if (parsed.info.days_left > 30 && parsed.info.days_left <= 60 ) {
parsed.info.background_class = 'warning';
} else {
parsed.info.background_class = 'success';
};
add_cert_details(parsed, iteration); add_cert_details(parsed, iteration);
check_iterations(); check_iterations();
}); });

30
web_service/js/tls-dashboard/scripts.js
View File

@ -3,7 +3,7 @@ $(function () {
var sorted_certificates = Object.keys(cert_info) var sorted_certificates = Object.keys(cert_info)
.sort(function( a, b ) { .sort(function( a, b ) {
return cert_info[a].info.days_left - cert_info[b].info.days_left; return cert_info[a].info.sort_order - cert_info[b].info.sort_order;
}).map(function(sortedKey) { }).map(function(sortedKey) {
return cert_info[sortedKey]; return cert_info[sortedKey];
}); });
@ -39,16 +39,24 @@ $(function () {
'issuer': element.issuer.org, 'issuer': element.issuer.org,
'common_name': element.subject.common_name, 'common_name': element.subject.common_name,
'issuer_cn': element.issuer.common_name 'issuer_cn': element.issuer.common_name
} };
if (element.info.days_left <= 30 ){ switch (element.info.background_class) {
json.background = 'card-inverse card-danger'; case "danger":
} else if (element.info.days_left > 30 && element.info.days_left <= 60 ) { json.background = 'card-inverse card-danger';
json.background = 'card-inverse card-warning'; break;
} else if (element.info.days_left === "??") { case "warning":
json.background = 'card-inverse card-info'; json.background = 'card-inverse card-warning';
} else { break;
json.background = 'card-inverse card-success'; case "info":
} json.background = 'card-inverse card-info';
break;
case "success":
json.background = 'card-inverse card-success';
break;
default:
json.background = 'card-inverse card-info';
break;
};
insert_card(json); insert_card(json);
}); });