Fixes to OSB to work with KH 3.3

2012-11-10 10:13:57 +11:00
parent ea36639638
commit 6db02ae77d
238 changed files with 813 additions and 938 deletions
--- a/modules/ssl/classes/Controller/Admin/Ssl.php
+++ b/modules/ssl/classes/Controller/Admin/Ssl.php
@@ -0,0 +1,110 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class provides Admin SSL functions
+ *
+ * @package    OSB
+ * @subpackage SSL
+ * @category   Controllers/Admin
+ * @author     Deon George
+ * @copyright  (c) 2010 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
+ */
+class Controller_Admin_SSL extends Controller_TemplateDefault_Admin {
+	protected $secure_actions = array(
+		'add'=>TRUE,
+		'list'=>TRUE,
+		'view'=>TRUE,
+	);
+
+	public function action_list() {
+		Block::add(array(
+			'title'=>_('SSL CA Certificates'),
+			'body'=>Table::display(
+				ORM::factory('SSL_CA')->find_all(),
+				25,
+				array(
+					'id'=>array('label'=>'ID','url'=>'admin/ssl/view/'),
+					'sign_cert'=>array('label'=>'Cert'),
+					'issuer()'=>array('label'=>'Issuer'),
+					'valid_to(TRUE)'=>array('label'=>'Expires'),
+				),
+				array(
+					'page'=>TRUE,
+					'type'=>'select',
+					'form'=>'admin/ssl/view',
+				)),
+			));
+	}
+
+	private function add_view($id=NULL,$output='') {
+		$so = ORM::factory('SSL_CA',$id);
+
+		if ($_POST) {
+			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('o',$so);
+		$output .= Form::submit('submit','submit',array('class'=>'form_button'));
+		$output .= Form::close();
+
+		return $output;
+	}
+
+	public function action_add() {
+		Block::add(array(
+			'title'=>_('Add SSL CA Certificate'),
+			'body'=>$this->add_view(),
+		));
+	}
+
+	public function action_view() {
+		list($id,$output) = Table::page(__METHOD__);
+
+		Block::add(array(
+			'title'=>sprintf('%s: %s (%s)',_('View SSL CA Certificate'),$id,ORM::factory('SSL_CA',$id)->display('sign_cert')),
+			'body'=>$this->add_view($id,$output),
+		));
+
+		Block::add(array(
+			'title'=>_('Services using this Certificate'),
+			'body'=>Table::display(
+				ORM::factory('SSL_CA',$id)->list_issued(),
+				25,
+				array(
+					'id'=>array('label'=>'ID','url'=>'admin/service/view/'),
+					'plugin()->dn()'=>array('label'=>'Cert'),
+					'plugin()->valid_to(TRUE)'=>array('label'=>'Expires'),
+				),
+				array(
+					'page'=>TRUE,
+					'type'=>'select',
+					'form'=>'admin/service/view',
+				)),
+		));
+
+	}
+}
+?>
--- a/modules/ssl/classes/Controller/User/Ssl.php
+++ b/modules/ssl/classes/Controller/User/Ssl.php
@@ -0,0 +1,51 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class provides User SSL functions
+ *
+ * @package    OSB
+ * @subpackage SSL
+ * @category   Controllers/Admin
+ * @author     Deon George
+ * @copyright  (c) 2010 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
+ */
+class Controller_User_SSL extends Controller_TemplateDefault_User {
+	protected $secure_actions = array(
+		'download'=>FALSE,
+	);
+
+	public function action_download() {
+		$id = $_POST['sid'];
+		$so = ORM::factory('Service',$id);
+
+		if (! $so->loaded())
+			HTTP::redirect('welcome/index');
+
+		$passwd = $_POST['passwd'];
+		if (strlen($passwd) < Kohana::$config->load('ssl')->minpass_length) {
+			SystemMessage::add(array(
+				'title'=>_('Validation failed'),
+				'type'=>'error',
+				'body'=>_('Your requested password is too short.'),
+			));
+
+			HTTP::redirect('user/service/view/'.$so->id);
+		}
+
+		if (! $so->loaded() OR ! Auth::instance()->authorised($so->account_id,$so->affiliate_id)) {
+			$this->template->content = 'Unauthorised or doesnt exist?';
+			return FALSE;
+		}
+
+		$file = sprintf('%s/%s.pkcs12',Kohana::$config->load('config')->tmpdir,$so->name());
+		openssl_pkcs12_export_to_file($so->plugin()->cert,$file,$so->plugin()->pk,$passwd,array('extracerts'=>$so->plugin()->cacerts()));
+		$x = file_get_contents($file);
+		unlink($file);
+		$this->response->headers('Content-Type','application/pks12');
+		$this->response->headers('Content-Disposition','attachment; filename="'.basename($file).'"');
+		$this->response->body($x);
+		$this->auto_render = FALSE;
+	}
+}
+?>