diff --git a/application/classes/orm.php b/application/classes/orm.php index bea437fe..f288d1dd 100644 --- a/application/classes/orm.php +++ b/application/classes/orm.php @@ -18,25 +18,6 @@ abstract class ORM extends Kohana_ORM { // Our filters used to display values in a friendly format protected $_display_filters = array(); - // Override check() so that it doesnt throw an exception. - // @todo Need to figure out how to show the items that fail validation - final public function check(Validation $extra_validation = NULL) { - // Determine if any external validation failed - $extra_errors = ($extra_validation AND ! $extra_validation->check()); - - // Always build a new validation object - $this->_validation(); - - $array = $this->_validation; - - if (($this->_valid = $array->check()) === FALSE OR $extra_errors) - { - return FALSE; - } - - return $this; - } - // Add our OSB site_id to each SELECT query final protected function _build($type) { // Exclude tables without site ID's diff --git a/modules/gchart/classes/GoogleChart.php b/modules/gchart/classes/GoogleChart.php index 91f1aeb8..5227948a 100644 --- a/modules/gchart/classes/GoogleChart.php +++ b/modules/gchart/classes/GoogleChart.php @@ -18,8 +18,11 @@ abstract class GoogleChart implements Iterator,Countable { protected $_max = array(); // Chart title protected $_title = ''; + protected $_dataurl = ''; + protected $_divname = ''; // Default chart size. - protected $_size = '700x200'; + protected $_height = '200'; + protected $_width = '700'; // Colors to use for series private $series_colors = array('AAACCC','E0E0E0','CCC888','EEEBBB','666CCC','888888'); @@ -46,8 +49,16 @@ abstract class GoogleChart implements Iterator,Countable { public function __call($name,$args) { switch ($name) { + case 'dataurl': $this->_dataurl = array_shift($args); + break; + case 'div': $this->_divname = array_shift($args); + break; + case 'height': $this->_height = array_shift($args); + break; case 'title': $this->_title = array_shift($args); break; + case 'width': $this->_width = array_shift($args); + break; default: throw new Kohana_Exception('Unknown method :name',array(':name'=>$name)); } @@ -79,6 +90,9 @@ abstract class GoogleChart implements Iterator,Countable { return new $c(); } + // Render the chart data in a json format + abstract public function json(); + // Our child class should define how to render as a string abstract public function render(); @@ -90,7 +104,7 @@ abstract class GoogleChart implements Iterator,Countable { * Example: * $this->data('yl'=>'Base Down Peak',array('11-12'=>1,'11-11'=>2)); */ - public function data(array $axis,array $data) { + public function sdata(array $axis,array $data) { // Some sanity checking if (count($axis) != 1) throw new Kohana_Exception('We can only take 1 series at time.'); @@ -115,6 +129,34 @@ abstract class GoogleChart implements Iterator,Countable { return $this; } + /** + * Record on plot event + * @param $data Should contain an "X" with a "YL" and/or "YR" + */ + public function pdata($x,array $data) { + if (! is_string($x)) + throw new Kohana_Exception('X should be a string'); + + foreach ($data as $key => $values) { + switch ($key) { + case 'yr': + case 'yl': + foreach ($values as $k=>$v) { + if (! in_array($k,$this->_axis)) + $this->_axis[$k] = $key; + + $this->_data[$k][$x] = $v; + $this->_plotdata[$x][$k] = $v; + } + + break; + + default: + throw new Kohana_Exception('Unknown key :key',array(':key'=>$key)); + } + } + } + /** * Return the colors that will be used for this series */ diff --git a/modules/gchart/classes/GoogleChart/ComboChart.php b/modules/gchart/classes/GoogleChart/ComboChart.php new file mode 100644 index 00000000..25c68d1b --- /dev/null +++ b/modules/gchart/classes/GoogleChart/ComboChart.php @@ -0,0 +1,156 @@ +_logy = $value; + + return $this; + } + + public function stacked($value) { + $this->_stacked = $value; + + return $this; + } + + /** + * Set the type of the chart + * @param $type Chart type as per $this->cht + */ + public function ltitle($side,$title) { + if (! in_array($side,array('yl','yr','x'))) + throw new Kohana_Exception('Unknown side :side',array(':side'=>$side)); + + $this->_ltitle[$side] = $title; + + return $this; + } + + public function json() { + $return = array(); + + $return['cols'][] = array( + 'id'=>'date', + 'label'=>'date', + 'type'=>'string', + ); + + // Columns + foreach (array_keys($this->_axis) as $l) { + $return['cols'][] = array( + 'id'=>$l, + 'label'=>$l, + 'type'=>'number', + ); + } + + // Values + foreach ($this as $k => $v) { + $data = array(); + + array_push($data,array('v'=>$k)); + + foreach ($this->_axis as $l => $axis) + array_push($data,array('v'=>isset($v[$l]) ? $v[$l] : 0)); + + $return['rows'][] = array('c'=>$data); + } + + $options = array( + 'bar' => array('groupWidth'=>'75%'), + 'vAxis' => array('logScale'=>$this->_logy ? 1:0), + 'title' => $this->_title, + 'isStacked' => $this->_stacked ? 1:0, + 'seriesType' => $this->_type, + 'series' => $this->series(), + ); + + return json_encode(array('data'=>$return,'options'=>$options)); + } + + public function render() { + Script::add(array( + 'type'=>'src', + 'data'=>'https://www.google.com/jsapi', + )); + + Script::add(array( + 'type'=>'stdin', + 'data'=>'google.load("visualization", "1", {packages: ["corechart"]});', + )); + + Script::add(array( + 'type'=>'stdin', + 'data'=>" +function drawChart".$this->_divname."() { + var jsonData = $.ajax({ + url: '".$this->_dataurl."', + dataType:'json', + async: false, + }).responseText; + + var x = JSON.parse(jsonData); + for(var key in x) { + if (key == 'data') + data = x[key]; + else if (key == 'options') + options = x[key]; + else + alert('UNKNOWN Key: '+key); + } + + // Create our data table out of JSON data loaded from server. + var data = new google.visualization.DataTable(data); + + // Instantiate and draw our chart, passing in some options. + var chart = new google.visualization.ComboChart(document.getElementById('".$this->_divname."')); + chart.draw(data, options); +} +", + )); + + Script::add(array( + 'type'=>'stdin', + 'data'=>'google.setOnLoadCallback(drawChart'.$this->_divname.');', + )); + + return sprintf('
',$this->_divname,$this->_width,$this->_height); + } + + private function series() { + $return = array(); + $c = $this->seriescolors(); + $j = count($c); + + $i = 0; + foreach ($this->_axis as $l => $axis) { + // @todo This shouldnt be hard coded + if ($axis == 'yl') + array_push($return,array('type'=>'bar','color'=>$c[$i%$j],'targetAxisIndex'=>0)); + else + array_push($return,array('type'=>'line','color'=>$c[$i%$j],'targetAxisIndex'=>1)); + + $i++; + } + + return $return; + } +} +?> diff --git a/modules/gchart/classes/GoogleChart/Legacy.php b/modules/gchart/classes/GoogleChart/Legacy.php index 060e4e5d..0ad104db 100644 --- a/modules/gchart/classes/GoogleChart/Legacy.php +++ b/modules/gchart/classes/GoogleChart/Legacy.php @@ -140,6 +140,8 @@ class GoogleChart_Legacy extends GoogleChart { return implode('|',$return); } + public function json() {} + /** * Return URL that renders the chart */ @@ -155,7 +157,7 @@ class GoogleChart_Legacy extends GoogleChart { return array( 'chf'=>'bg,s,FFFFFF00', 'cht'=>$this->_type, - 'chs'=>$this->_size, + 'chs'=>sprintf('%sx%s',$this->_width,$this->_height), 'chtt'=>$this->_title, 'chbh'=>'a', // @todo This might need to be calculated, valid options (a,r); 'chg'=>'7.7,12.5,1,5', // @todo This should be calculated diff --git a/modules/service/classes/controller/admin/service.php b/modules/service/classes/controller/admin/service.php index 6f8e9cd3..3361a783 100644 --- a/modules/service/classes/controller/admin/service.php +++ b/modules/service/classes/controller/admin/service.php @@ -13,7 +13,8 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin { // @todo This "module" menu items should belong in the module dir. protected $secure_actions = array( - 'ajaxlist'=>FALSE, // @todo To Change + 'ajaxlist'=>TRUE, + 'ajaxjson_traffic'=>TRUE, 'adslstat'=>TRUE, 'list'=>TRUE, 'listbycheckout'=>TRUE, @@ -45,6 +46,23 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin { $this->response->body(json_encode(array_values($return))); } + public function action_ajaxjson_traffic() { + $return = array(); + $svs = ORM::factory('service')->list_bylistgroup('ADSL'); + $data = $this->consoltraffic($svs,time()); + + $google = GoogleChart::factory('ComboChart'); + + foreach ($data['data'] as $key => $values) + $google->data(array('yl'=>$key),array($key=>$values)); + + $google->data(array('yr'=>'services'),array('services'=>$data['svs'])); + + $this->auto_render = FALSE; + $this->response->headers('Content-Type','application/json'); + $this->response->body($google->json()); + } + /** * Show a list of services */ @@ -179,8 +197,7 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin { $svs = ORM::factory('service')->list_bylistgroup('ADSL'); $data = $this->consoltraffic($svs,time()); - $google = GoogleChart::factory('Legacy') - ->type('vertical_bar') + $google = GoogleChart::factory('ComboChart') ->title(sprintf('ADSL traffic as at %s',date('Y-m-d',strtotime('yesterday')))); foreach ($data['data'] as $key => $values) @@ -189,9 +206,6 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin { $google->data(array('yr'=>'services'),array('services'=>$data['svs'])); Block::add(array('body'=>(string)$google)); - Block::add(array('body'=>$google->table(FALSE,array( - 'table'=>'style="border: 1px solid #bebcb7; padding: 5px 5px; background: none repeat scroll 0% 0% #f8f7f5; font-size: 70%;"', - )))); Block::add(array( 'title'=>_('ADSL Services'), diff --git a/modules/ssl/classes/controller/admin/ssl.php b/modules/ssl/classes/controller/admin/ssl.php index 65bee3a6..ab997d86 100644 --- a/modules/ssl/classes/controller/admin/ssl.php +++ b/modules/ssl/classes/controller/admin/ssl.php @@ -27,7 +27,7 @@ class Controller_Admin_SSL extends Controller_TemplateDefault_Admin { 'id'=>array('label'=>'ID','url'=>'admin/ssl/view/'), 'sign_cert'=>array('label'=>'Cert'), 'issuer()'=>array('label'=>'Issuer'), - 'expires(TRUE)'=>array('label'=>'Expires'), + 'valid_to(TRUE)'=>array('label'=>'Expires'), ), array( 'page'=>TRUE, @@ -41,18 +41,32 @@ class Controller_Admin_SSL extends Controller_TemplateDefault_Admin { $so = ORM::factory('ssl_ca',$id); if ($_POST) { - if ($so->values($_POST)->check() AND $so->save()) - SystemMessage::add(array( - 'title'=>'SSL Certificate Saved', - 'type'=>'info', - 'body'=>'SSL Certificate successfully recorded.', - )); + if ($so->values($_POST)->changed()) { + try { + $so->save(); + SystemMessage::add(array( + 'title'=>'SSL Certificate Saved', + 'type'=>'info', + 'body'=>'SSL Certificate successfully recorded.', + )); + + } catch (ORM_Validation_Exception $e) { + $errors = $e->errors('models'); + + SystemMessage::add(array( + 'title'=>'SSL Certificate NOT saved', + 'type'=>'error', + 'body'=>join("\n",array_values($errors)), + )); + + $so->reload(); + } + } } $output .= Form::open(); $output .= View::factory('ssl/admin/add_view') - ->set('so',$so) - ->set('mediapath',Route::get('default/media')); + ->set('o',$so); $output .= Form::submit('submit','submit',array('class'=>'form_button')); $output .= Form::close(); diff --git a/modules/ssl/classes/model/service/plugin/ssl.php b/modules/ssl/classes/model/service/plugin/ssl.php index eae1ba94..2fd63778 100644 --- a/modules/ssl/classes/model/service/plugin/ssl.php +++ b/modules/ssl/classes/model/service/plugin/ssl.php @@ -35,68 +35,51 @@ class Model_Service_Plugin_SSL extends Model_Service_Plugin { public function username_value() {} // Not used public function password_value() {} // Not used - public function service_view() { - return View::factory('service/user/plugin/ssl/view') - ->set('so',$this); + private $_so = NULL; + + /** + * Resolve any queries to certificate details + */ + public function __call($name,$args) { + $m = 'get_'.$name; + + if (method_exists($this->_so,$m)) + return $this->_so->{$m}($args); + else + throw new Kohana_Exception('Unknown method :method',array(':method'=>$name)); + } + + // We want to inject the SSL object into this Model + protected function _load_values(array $values) { + parent::_load_values($values); + + if ($this->cert) + $this->_so = SSL::instance($this->cert); + + return $this; + } + + // If we change the SSL certificate, we need to reload our SSL object + public function values(array $values, array $expected = NULL) { + parent::values($values,$expected); + + if (array_key_exists('cert',$values)) + $this->_so = SSL::instance($this->cert); + + return $this; } public function expire() { - return $this->valid_to(); + return $this->_so->get_valid_to(); } public function name() { - if ($this->cert) { - return sprintf('%s:%s',$this->ssl_ca->subject(),$this->display('cert')); - } else - return $this->display('csr'); + return ($this->cert) ? sprintf('%s:%s',$this->ssl_ca->subject(),$this->display('cert')) : $this->display('csr'); } - public function algorithm() { - return SSL::algorithm($this->cert); - } - - public function dn() { - return SSL::dn($this->cert); - } - - public function dnissuer() { - return SSL::dnissuer($this->cert); - } - - public function issuer() { - return SSL::issuer($this->cert); - } - - // @todo This needs to be validated for this model - public function product() { - if ($this->provided_adsl_plan_id) - return $this->adsl_plan; - else - return $this->service->product->plugin(); - } - - public function details() { - return SSL::details($this->cert); - } - - public function valid_from($format=FALSE) { - return SSL::from($this->cert,$format); - } - - public function valid_to($format=FALSE) { - return SSL::expire($this->cert,$format); - } - - public function serial_num() { - return SSL::serial($this->cert); - } - - public function hash() { - return SSL::hash($this->cert); - } - - public function version() { - return SSL::version($this->cert); + public function service_view() { + return View::factory('service/user/plugin/ssl/view') + ->set('so',$this); } /** diff --git a/modules/ssl/classes/model/ssl/ca.php b/modules/ssl/classes/model/ssl/ca.php index be603b13..80e012b9 100644 --- a/modules/ssl/classes/model/ssl/ca.php +++ b/modules/ssl/classes/model/ssl/ca.php @@ -14,9 +14,6 @@ class Model_SSL_CA extends ORM_OSB { protected $_updated_column = FALSE; // Relationships - protected $_belongs_to = array( - ); - protected $_has_many = array( 'service'=>array('through'=>'service__ssl'), ); @@ -27,44 +24,70 @@ class Model_SSL_CA extends ORM_OSB { ), ); - public function expires($format=FALSE) { - return SSL::expire($this->sign_cert,$format); + public function rules() { + return array( + 'sign_cert'=>array( + array(array($this,'isCert')), + array(array($this,'isCA')), + ), + 'parent_ssl_ca_id'=>array( + array(array($this,'Rule_ParentExists')), + ), + ); } - public function issuer() { - return SSL::issuer($this->sign_cert); + public function filters() { + return array( + 'parent_ssl_ca_id'=>array( + array(array($this,'Filter_GetParent')), + ) + ); } - public function subject() { - return SSL::subject($this->sign_cert); + private $_so = NULL; + + /** + * Resolve any queries to certificate details + */ + public function __call($name,$args) { + $m = 'get_'.$name; + + if (method_exists($this->_so,$m)) + return $this->_so->{$m}($args); + else + throw new Kohana_Exception('Unknown method :method',array(':method'=>$name)); } - public function save(Validation $validation = NULL) { - // If our parent_ssl_ca_id is null, we'll need to work it out - if (is_null($this->parent_ssl_ca_id)) { - $i = SSL::issuer($this->sign_cert); + // We want to inject the SSL object into this Model + protected function _load_values(array $values) { + parent::_load_values($values); - $po = NULL; - foreach (ORM::factory('ssl_ca')->find_all() as $sco) - if ($sco->subject() == $i) { - $po = $sco; - break; - } + if ($this->sign_cert) + $this->_so = SSL::instance($this->sign_cert); - if (is_null($po)) { - SystemMessage::add(array( - 'title'=>'Certificate NOT Recorded', - 'type'=>'warning', - 'body'=>sprintf('Parent Certificate is not available (%s)',$this->issuer()), - )); + return $this; + } - return FALSE; - } else - $this->parent_ssl_ca_id = $po->id; - } + // If we change the SSL certificate, we need to reload our SSL object + public function values(array $values, array $expected = NULL) { + parent::values($values,$expected); - // Save the record - return parent::save($validation); + if (array_key_exists('sign_cert',$values)) + $this->_so = SSL::instance($this->sign_cert); + + return $this; + } + + // @todo This could require some optimisation, by storing the keyid in the database and then getting the DB just to return that parent + public function Filter_GetParent() { + foreach (ORM::factory($this->_object_name)->find_all() as $sco) + if ($sco->aki_keyid() == $this->aki_keyid()) + return $sco->id; + } + + public function Rule_ParentExists() { + // Our parent_ssl_ca_id should have been populated by Filter_GetParent(). + return $this->parent_ssl_ca_id OR $this->isRoot(); } public function list_issued() { diff --git a/modules/ssl/classes/ssl.php b/modules/ssl/classes/ssl.php index ca4c44df..9bbbd3be 100644 --- a/modules/ssl/classes/ssl.php +++ b/modules/ssl/classes/ssl.php @@ -4,132 +4,214 @@ * This class is for access to SSL information * * @package OSB - * @subpackage System + * @subpackage SSL * @category Helpers * @author Deon George * @copyright (c) 2010 Open Source Billing * @license http://dev.osbill.net/license.html */ class SSL { - public static function instance() { - return new SSL; + private $cert = ''; + private $_details = array(); + + public function __construct($cert) { + $this->cert = $cert; } - public static function details($cert,$key=NULL) { - $k = openssl_x509_parse($cert); - - return is_null($key) ? $k : $k[$key]; + public static function instance($cert) { + return new SSL($cert); } - public static function algorithm($cert,$key=NULL) { - if (! $cert) + /** + * This function will convert a large decimal number into hex + * @param $number Large decimal number + */ + private static function _dec_to_hex($number) { + $hex = array(); + + if ($number == 0) + return '00'; + + while ($number > 0) { + if ($number == 0) { + array_push($hex, '0'); + + } else { + $x = (int) ($number/16); + array_push($hex,strtoupper(dechex((int)($number-($x*16))))); + $number = $x; + } + } + + return preg_replace('/^:/','',preg_replace('/(..)/',":$1",implode(array_reverse($hex)))); + } + + /** + * Parse our AuthorityKeyIndentifier Extension to extract information + * @param $key Return just that index + */ + private function _aki($key=NULL) { + $return = array(); + + $aki = $this->_extensions('authorityKeyIdentifier'); + if (! $aki) return ''; - $r = openssl_x509_read($cert); - openssl_x509_export($r,$e,FALSE); + foreach (explode("\n",preg_replace("/\n$/",'',$aki)) as $x) { + if (! $x) + continue; + + if (strstr($x,':')) { + list($a,$b) = explode(':',$x,2); + $return[strtolower($a)] = $b; + } + } + + return is_null($key) ? $return : (isset($return[$key]) ? $return[$key] : ''); + } + + private function _bc() { + return $this->_extensions('basicConstraints'); + } + + /** + * Parse our Sign Certifcate to extract information + * @param $key Return just that index + */ + private function _details($key=NULL) { + if (! $this->cert) + return array(); + + if (! $this->_details) + $this->_details = openssl_x509_parse($this->cert); + + return is_null($key) ? $this->_details : (isset($this->_details[$key]) ? $this->_details[$key] : array()); + } + + /** + * Parse our Sign Certifcate Extensions to extract information + * @param $key Return just that index + */ + private function _extensions($key=NULL) { + $return = $this->_details('extensions'); + + return is_null($key) ? $return : (isset($return[$key]) ? $return[$key] : ''); + } + + /** + * Render a DN array as a string + */ + private function _dn(array $array) { + $return = ''; + $i = 0; + + foreach ($array as $k=>$v) { + if ($i++) + $return .= ','; + + $return .= sprintf('%s=%s',$k,$v); + } + + return $return; + } + + public function get_aki_dirname() { + return $this->_aki('dirname'); + } + + public function get_aki_keyid() { + return $this->_aki('keyid'); + } + + public function get_aki_serial() { + return $this->_aki('serial'); + } + + public function get_algorithm() { + $e = ''; + openssl_x509_export(openssl_x509_read($this->cert),$e,FALSE); // @todo There must be a nice way to get this? - if (preg_match('/^\s+Signature Algorithm:\s*(.*)\s*$/m',$e,$match)) - return $match[1]; - else - return _('Unknown'); + return (preg_match('/^\s+Signature Algorithm:\s*(.*)\s*$/m',$e,$match)) ? $match[1] : _('Unknown'); } - public static function aki($cert,$key=NULL) { - $k = array(); - foreach (explode("\n",preg_replace("/\n$/",'',static::extensions($cert,'authorityKeyIdentifier'))) as $x) { - list($a,$b) = explode(":",$x,2); - $k[strtolower($a)] = $b; - } + public function get_ca_path_len() { + $m = array(); + $x = preg_match('/.*pathlen:\s*([0-9]+).*$/',$this->_bc(),$m); - return is_null($key) ? $k : $k[$key]; + return isset($m[1]) ? (int)$m[1] : 0; } - public static function aki_keyid($key) { - return static::aki($key,'keyid'); + public function get_dn() { + return $this->_dn($this->_details('subject')); } - public static function aki_dirname($key) { - return static::aki($key,'dirname'); + public function get_hash() { + return $this->_details('hash'); } - public static function aki_serial($key) { - return static::aki($key,'serial'); + public function get_isCA() { + return preg_match('/CA:TRUE/',$this->_bc()); } - public static function dn($cert) { - if (! $cert) - return ''; - - $s = ''; - - $c = 0; - foreach (static::details($cert,'subject') as $k=>$v) { - if ($c++) - $s .= ','; - - $s .= sprintf('%s=%s',$k,$v); - } - - return $s; + public function get_isCert() { + return is_array($this->_details()); } - public static function dnissuer($cert) { - if (! $cert) - return ''; - - $s = ''; - - $c = 0; - foreach (static::details($cert,'issuer') as $k=>$v) { - if ($c++) - $s .= ','; - - $s .= sprintf('%s=%s',$k,$v); - } - - return $s; + public function get_isRoot() { + return $this->get_aki_keyid() == $this->get_ski(); } - public static function issuer($cert) { - $k = static::details($cert,'issuer'); - return $k['CN']; + public function get_issuer() { + $k = $this->_details('issuer'); + + return isset($k['CN']) ? $k['CN'] : ''; } - public static function from($cert,$format=FALSE) { - $k = static::details($cert,'validFrom_time_t'); + public function get_issuerdn() { + return $this->_dn($this->_details('issuer')); + } + + public function get_serial() { + return $this->_dec_to_hex($this->_details('serialNumber')); + } + + public function get_subject() { + $k = $this->_details('subject'); + + return isset($k['CN']) ? $k['CN'] : ''; + } + + public function get_ski() { + return $this->_extensions('subjectKeyIdentifier'); + } + + public function get_valid_to($format=FALSE) { + $k = $this->_details('validTo_time_t'); + return $format ? Config::date($k) : $k; } - public static function expire($key,$format=FALSE) { - $k = static::details($key,'validTo_time_t'); + public function get_valid_from($format=FALSE) { + $k = $this->_details('validFrom_time_t'); + return $format ? Config::date($k) : $k; } - public static function extensions($cert,$key=NULL) { - $k = static::details($cert,'extensions'); - return is_null($key) ? $k : $k[$key]; + public function get_version() { + return $this->_details('version'); } - public static function hash($key) { - return static::details($key,'hash'); + public static function xdn($cert) { + return static::instance($cert)->get_dn(); } - public static function serial($key) { - return static::dec_to_hex(static::details($key,'serialNumber')); + public static function xexpire($cert,$format=FALSE) { + return static::instance($cert)->get_expire($format); } - public static function subject($key) { - $k = static::details($key,'subject'); - return $k['CN']; - } - - public static function ski($key) { - return static::extensions($key,'subjectKeyIdentifier'); - } - - public static function version($key) { - return static::details($key,'version'); + public static function subject($cert) { + return static::instance($cert)->get_subject(); } public static function csrsubject($csr) { @@ -137,25 +219,5 @@ class SSL { return $c['CN']; } - - private static function dec_to_hex($number) { - $hex = array(); - - if ($number == 0) - return '00'; - - while ($number > 0) { - if ($number == 0) { - array_push($hex, '0'); - - } else { - $x = (int) ($number/16); - array_push($hex,strtoupper(dechex((int)($number-($x*16))))); - $number = $x; - } - } - - return preg_replace('/^:/','',preg_replace('/(..)/',":$1",implode(array_reverse($hex)))); - } } ?> diff --git a/modules/ssl/messages/models/ssl_ca.php b/modules/ssl/messages/models/ssl_ca.php new file mode 100644 index 00000000..a5cdd659 --- /dev/null +++ b/modules/ssl/messages/models/ssl_ca.php @@ -0,0 +1,11 @@ +array( + 'isCert'=>'This is not a valid certificate', + 'isCA'=>'This is certificate is not a Certificate Authority certificate', + ), + 'parent_ssl_ca_id'=>array( + 'Rule_ParentExists'=>'The parent certificate doesnt exist, please define it first', + ), +); +?> diff --git a/modules/ssl/views/service/user/plugin/ssl/view.php b/modules/ssl/views/service/user/plugin/ssl/view.php index 15e639d7..856880b6 100644 --- a/modules/ssl/views/service/user/plugin/ssl/view.php +++ b/modules/ssl/views/service/user/plugin/ssl/view.php @@ -15,7 +15,7 @@ Issuer - dnissuer(); ?> + issuerdn(); ?> CA @@ -31,7 +31,7 @@ Serial Number - serial_num(); ?> + serial(); ?> Version diff --git a/modules/ssl/views/ssl/admin/add_view.php b/modules/ssl/views/ssl/admin/add_view.php index b4d980ed..039a101f 100644 --- a/modules/ssl/views/ssl/admin/add_view.php +++ b/modules/ssl/views/ssl/admin/add_view.php @@ -1,46 +1,55 @@ + + + + + - + - + - + - + + + + + - + - + - + - + - + - + - +
DNdn(); ?>
Subjectsign_cert),SSL::serial($so->sign_cert)); ?>subject(),$o->serial()); ?>
Subject Key IDsign_cert); ?>ski(); ?>
Issuersign_cert),SSL::aki_serial($so->sign_cert)); ?>issuer(),$o->aki_serial()); ?>
Issuer Key IDsign_cert); ?>aki_keyid(); ?>
CAisCA()); ?>
Valid Fromsign_cert,TRUE); ?>valid_from(TRUE); ?>
Valid Tosign_cert,TRUE); ?>valid_to(TRUE); ?>
Hashsign_cert); ?>hash(); ?>
Versionsign_cert); ?>version(); ?>
Key Algorithmsign_cert); ?>algorithm(); ?>
Private Keysign_pk,array('cols'=>64,'rows'=>13)); ?>sign_pk,array('cols'=>64,'rows'=>13)); ?>
Certificatesign_cert,array('cols'=>64,'rows'=>13)); ?>sign_cert,array('cols'=>64,'rows'=>13)); ?>