added certificate DB

5 files changed, 326 insertions, 0 deletions

diff --git a/application/models/Certificate.php b/application/models/Certificate.php
new file mode 100644
index 0000000..8892e68
--- /dev/null
+++ b/application/models/Certificate.php
@@ -0,0 +1,154 @@
+<?php
+/*
+ * Copyright (c) 2011 - OpenSLX GmbH, RZ Uni Freiburg
+* This program is free software distributed under the GPL version 2.
+* See http://gpl.openslx.org/
+*
+* If you have any feedback please consult http://feedback.openslx.org/ and
+* send your suggestions, praise, or complaints to feedback@openslx.org
+*
+* General information about OpenSLX can be found at http://openslx.org/
+*/
+
+class Application_Model_Certificate {
+  protected $_certificateID;
+  protected $_personID;
+  protected $_serial;
+  protected $_issuedate;
+  protected $_expiredate;
+  protected $_issuerdn;
+  protected $_guestcert;
+  protected $_revoked;
+
+  public function __construct(array $options = null) {
+    if (is_array($options)) {
+      $this->setOptions($options);
+    }
+  }
+
+  public function __set($name, $value) {
+    $method = 'set' . $name;
+    if (('mapper' == $name) || !method_exists($this, $method)) {
+      throw new Exception('Invalid certificate property');
+    }
+    $this->$method($value);
+  }
+
+  public function __get($name) {
+    $method = 'get' . $name;
+    if (('mapper' == $name) || !method_exists($this, $method)) {
+      throw new Exception('Invalid certificate property');
+    }
+    return $this->$method();
+  }
+
+  public function setOptions(array $options) {
+    $methods = get_class_methods($this);
+    foreach ($options as $key => $value) {
+      $method = 'set' . ucfirst($key);
+      if (in_array($method, $methods)) {
+        $this->$method($value);
+      }
+    }
+    return $this;
+  }
+
+  public function getID() {
+    return $this->_certificateID;
+  }
+  public function setID($_certificateID) {
+    $this->_certificateID = $_certificateID;
+    return $this;
+  }
+
+  public function getIssuedate() {
+    return $this->_issuedate;
+  }
+
+  public function setIssuedate($_issuedate) {
+    $this->_issuedate = $_issuedate;
+    return $this;
+  }
+
+  public function getExpiredate() {
+    return $this->_expiredate;
+  }
+
+  public function setExpiredate($_expiredate) {
+    $this->_expiredate = $_expiredate;
+    return $this;
+  }
+  public function getPersonID() {
+    return $this->_personID;
+  }
+  public function setPersonID($_personID) {
+    $this->_personID = $_personID;
+    return $this;
+  }
+  
+  public function getIssuerdn() {
+  	return $this->_issuerdn;
+  }
+  public function setIssuerdn($_issuerdn) {
+  	$this->_issuerdn = $_issuerdn;
+  	return $this;
+  }
+  
+  public function getGuestcert() {
+    return $this->_guestcert;
+  }
+  public function setGuestcert($_guestcert) {
+    $this->_guestcert = $_guestcert;
+    return $this;
+  }
+  public function getRevoked() {
+    return $this->_revoked;
+  }
+
+  public function setRevoked($_revoked) {
+    $this->_revoked = $_revoked;
+    return $this;
+  }
+
+  public function getSerial() {
+    return $this->_serial;
+  }
+  public function setSerial($_serial) {
+    $this->_serial = $_serial;
+    return $this;
+  }
+  /**
+   * Returns current data as associative array using ReflectionClass
+   *
+   * @return    array    Returns associative array containing model data
+   * If "get"-method not available (our primary keys) the function getID() is called
+   */
+  public function toArray() {
+    $reflectionClass = new ReflectionClass($this);
+    $properties = $reflectionClass->getProperties();
+    $result = array();
+    foreach ($properties as $property) {
+      $key = $property->name;
+      if (substr($key, 0, 1) != '_' && $this->$key !== null) {
+        $method = 'get' . ucfirst($key);
+        if ($reflectionClass->hasMethod($method)) {
+          $result[$key] = $this->$method();
+        } else {
+          $result[$key] = $this->$key;
+        }
+      }
+      elseif(substr($key, 0, 1) == '_' && $this->$key !== null) {
+        $key = substr($key, 1);
+        $method = 'get' . ucfirst($key);
+        if ($reflectionClass->hasMethod($method)) {
+          $result[$key] = $this->$method();
+        } else {
+          $result[$key] = $this->getID();
+        }
+
+      }
+    }
+    return $result;
+  }
+}
+
diff --git a/application/models/CertificateMapper.php b/application/models/CertificateMapper.php
new file mode 100644
index 0000000..7e263b5
--- /dev/null
+++ b/application/models/CertificateMapper.php
@@ -0,0 +1,134 @@
+<?php
+/*
+ * Copyright (c) 2011 - OpenSLX GmbH, RZ Uni Freiburg
+* This program is free software distributed under the GPL version 2.
+* See http://gpl.openslx.org/
+*
+* If you have any feedback please consult http://feedback.openslx.org/ and
+* send your suggestions, praise, or complaints to feedback@openslx.org
+*
+* General information about OpenSLX can be found at http://openslx.org/
+*/
+
+class Application_Model_CertificateMapper {
+
+  protected $_dbTable;
+
+  public function findBy($where, $array = false, $order = false) {
+    foreach($where as $k => $v) {
+      if($v != null)
+        { $where2[] = "$k = '$v'"; }
+      else
+        { $where2[] = "$k IS NULL"; }
+    }
+    $where = implode(" AND " , $where2);
+
+    try {
+      $db = Zend_Db_Table::getDefaultAdapter();
+      $select = $this->getDbTable()->select()
+                ->from($this->_dbTable)
+                ->where($where);
+      if(is_array($order)) {
+        foreach ($order as $k => $v)
+        $a[] = "$k $v";
+        $select->order($a);
+      }
+      $stmt = $select->query();
+      $result = $stmt->fetchAll();
+
+      if(!$array) {
+        $entries = array();
+        foreach ($result as $row) {
+          $entry = new Application_Model_Certificate($row);
+          $entry->setID($row['certificateID']);
+          $entries[] = $entry;
+        }
+        return $entries;
+      } else {
+        return $result;
+      }
+
+    } catch (Zend_Exception $e) {
+      echo "Error message 2: " . $e->getMessage() . "\n";
+    }
+  }
+
+  public function setDbTable($dbTable) {
+    if (is_string($dbTable)) {
+      $dbTable = new $dbTable();
+    }
+
+    if (!$dbTable instanceof Zend_Db_Table_Abstract) {
+      throw new Exception('Invalid table data gateway provided');
+    }
+
+    $this->_dbTable = $dbTable;
+
+    return $this;
+  }
+
+  public function getDbTable() {
+    if (null === $this->_dbTable) {
+      $this->setDbTable('Application_Model_DbTable_Certificate');
+    }
+
+    return $this->_dbTable;
+  }
+
+  public function save(Application_Model_Certificate $certificate) {
+
+    $data = array('certificateID' => $certificate->getID() , 'personID' => $certificate->getPersonID() , 'serial' => $certificate->getSerial() , 'issuedate' => $certificate->getIssuedate() , 'expiredate' => $certificate->getExpiredate(), 'issuerdn' => $certificate->getIssuerdn() , 'guestcert' => $certificate->getGuestcert() , 'revoked' => $certificate->getRevoked() );
+
+    if (null === ($id = $certificate->getID()) ) {
+      unset($data['certificateID']);
+      return $this->getDbTable()->insert($data);
+    } else {
+      $this->getDbTable()->update($data, array('certificateID = ?' => $id));
+    }
+  }
+
+  public function delete(Application_Model_Certificate $certificate) {
+    if (null === ($id = $certificate->getID()) ) {
+      return;
+    } else {
+      $this->getDbTable()->delete(array('certificateID = ?' => $id));
+    }
+  }
+
+  public function find($id, Application_Model_Certificate $certificate = null) {
+    $result = $this->getDbTable()->find($id);
+    if (0 == count($result)) {
+      return;
+    }
+
+    $row = $result->current();
+
+    if($certificate == null) {
+      $certificate = new Application_Model_Certificate();
+      $certificate->setID($row->certificateID)->setPersonID($row->personID)->setSerial($row->serial)->setIssuedate($row->issuedate)->setExpiredate($row->expiredate)->setIssuerdn($row->issuerdn)->setGuestcert($row->guestcert)->setRevoked($row->revoked);
+      return $certificate;
+    } else {
+      $certificate->setID($row->certificateID)->setPersonID($row->personID)->setSerial($row->serial)->setIssuedate($row->issuedate)->setExpiredate($row->expiredate)->setIssuerdn($row->issuerdn)->setGuestcert($row->guestcert)->setRevoked($row->revoked);
+    }
+  }
+
+  public function fetchAll() {
+    $resultSet = $this->getDbTable()->fetchAll();
+    $entries   = array();
+    foreach ($resultSet as $row) {
+      $entry = new Application_Model_Certificate();
+
+      $entry->setID($row->certificateID)->setPersonID($row->personID)->setSerial($row->serial)->setIssuedate($row->issuedate)->setExpiredate($row->expiredate)->setIssuerdn($row->issuerdn)->setGuestcert($row->guestcert)->setRevoked($row->revoked);
+
+      $entries[] = $entry;
+    }
+    return $entries;
+  }
+
+  public function compare(Application_Model_Certificate $v1, Application_Model_Certificate $v2) {
+    $vv1 = $v1->toArray();
+    $vv2 = $v2->toArray();
+    return array_diff($vv1, $vv2);
+  }
+}
+
diff --git a/application/models/DbTable/Certificate.php b/application/models/DbTable/Certificate.php
new file mode 100644
index 0000000..978345a
--- /dev/null
+++ b/application/models/DbTable/Certificate.php
@@ -0,0 +1,19 @@
+<?php
+/*
+ * Copyright (c) 2011 - OpenSLX GmbH, RZ Uni Freiburg
+* This program is free software distributed under the GPL version 2.
+* See http://gpl.openslx.org/
+*
+* If you have any feedback please consult http://feedback.openslx.org/ and
+* send your suggestions, praise, or complaints to feedback@openslx.org
+*
+* General information about OpenSLX can be found at http://openslx.org/
+*/
+
+class Application_Model_DbTable_Certificate extends Zend_Db_Table_Abstract {
+
+  protected $_name = 'pbs_certificate';
+
+
+}
+
diff --git a/application/modules/fbgui/controllers/AuthController.php b/application/modules/fbgui/controllers/AuthController.php
index 2eb42ad..5757b51 100644
--- a/application/modules/fbgui/controllers/AuthController.php
+++ b/application/modules/fbgui/controllers/AuthController.php
@@ -28,6 +28,7 @@ class Fbgui_AuthController extends Zend_Controller_Action {
     } 
     elseif($_SERVER['SSL_CLIENT_VERIFY'] === 'SUCCESS'){
     	print_a($_SERVER);
+    	
     } 
     else {
     	
diff --git a/setup/pbs.sql b/setup/pbs.sql
index 296356d..0c1a63a 100644
--- a/setup/pbs.sql
+++ b/setup/pbs.sql
@@ -378,6 +378,24 @@ CREATE TABLE IF NOT EXISTS `pbs_passwordrecovery` (
 ALTER TABLE `pbs_passwordrecovery`
   ADD CONSTRAINT `pbs_passwordrecovery_ibfk_1` FOREIGN KEY (`personID`) REFERENCES `pbs_person` (`personID`) ON DELETE CASCADE;
 
+ 
+CREATE TABLE IF NOT EXISTS `pbs_certificates` (
+  `certificateID` int(11) NOT NULL AUTO_INCREMENT,
+  `personID` int(11),
+  `serial` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `issuedate` varchar(14) COLLATE utf8_unicode_ci NOT NULL,
+  `expiredate` varchar(14) COLLATE utf8_unicode_ci NOT NULL,
+  `issuerdn` varchar(1024) COLLATE utf8_unicode_ci NOT NULL,
+  `guestcert` tinyint(1) NOT NULL,
+  `revoked` tinyint(1) NOT NULL,
+  PRIMARY KEY (`certificateID`),
+  KEY `personID` (`personID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
+
+ALTER TABLE `pbs_certificates`
+  ADD CONSTRAINT `pbs_certificates_ibfk_1` FOREIGN KEY (`personID`) REFERENCES `pbs_person` (`personID`); 
+  
+  
 -- Insert Filtertypes
 INSERT INTO `pbs_filtertype` (`filtertypeID`, `filtertypename`) VALUES
 (1, 'IP'),