deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Updates for SSL Certificates

Browse Source
This commit is contained in:
Deon George
2011-12-27 00:52:46 +11:00
parent 7fdba208eb
commit fe317b9cb0
7 changed files with 80 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/ssl/classes/model/service/plugin/ssl.php
View File

@@ -27,6 +27,9 @@ class Model_Service_Plugin_SSL extends Model_Service_Plugin {
'csr'=>array(
array('SSL::csrsubject',array(':value')),
),
'cert'=>array(
array('SSL::subject',array(':value')),
),
);
// Required abstract functions
@@ -36,7 +39,7 @@ class Model_Service_Plugin_SSL extends Model_Service_Plugin {
}
public function name() {
return $this->display('csr');
return $this->display($this->cert ? 'cert' : 'csr');
}
// @todo This needs to be validated for this model
@@ -47,12 +50,12 @@ class Model_Service_Plugin_SSL extends Model_Service_Plugin {
return $this->service->product->plugin();
}
public function valid_from() {
return SSL::from($this->cert);
public function valid_from($format=FALSE) {
return SSL::from($this->cert,$format);
}
public function valid_to() {
return SSL::expire($this->cert);
public function valid_to($format=FALSE) {
return SSL::expire($this->cert,$format);
}
public function serial_num() {
@@ -96,7 +99,7 @@ class Model_Service_Plugin_SSL extends Model_Service_Plugin {
}
public function download_button() {
if (! preg_match('/client/',$this->ssl->extensions))
if (! $this->service->active OR ! preg_match('/client/',$this->ssl->extensions) OR $this->valid_to() < time())
return '';
// @todo Do some password validation