mirror of
https://github.com/Yubico/yubikey-val.git
synced 2025-01-20 10:52:15 +01:00
start work on integrating oracle patches from Remi Mollon <Remi.Mollon@cern.ch>
This commit is contained in:
Klas Lindfors
parent
060b35453d
commit
dd9f567e22
227
ykval-db-oci.php
Normal file
227
ykval-db-oci.php
Normal file
@ -0,0 +1,227 @@
|
||||
<?php
|
||||
|
||||
|
||||
/**
|
||||
* Class for managing oracle database connection
|
||||
*/
|
||||
|
||||
require_once('ykval-log.php');
|
||||
require_once('ykval-db.php');
|
||||
|
||||
class OciDb extends DB
|
||||
{
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param string $host Database host
|
||||
* @param string $user Database user
|
||||
* @param string $pwd Database password
|
||||
* @param string $name Database table name
|
||||
* @return void
|
||||
*
|
||||
*/
|
||||
public function __construct($db_dsn, $db_username, $db_password, $db_options, $name='ykval-db')
|
||||
{
|
||||
$this->db_dsn=$db_dsn;
|
||||
$this->db_username=$db_username;
|
||||
$this->db_password=$db_password;
|
||||
$this->db_options=$db_options;
|
||||
|
||||
if(substr($db_dsn, 0, 3) == 'oci') {
|
||||
# "oci:" prefix needs to be removed before passing db_dsn to OCI
|
||||
$this->db_dsn = substr($this->db_dsn, 4);
|
||||
}
|
||||
|
||||
$this->myLog=new Log($name);
|
||||
}
|
||||
|
||||
/**
|
||||
* function to connect to database defined in config.php
|
||||
*
|
||||
* @return boolean True on success, otherwise false.
|
||||
*
|
||||
*/
|
||||
public function connect(){
|
||||
$this->dbh = oci_connect($this->db_username, $this->db_password, $this->db_dsn);
|
||||
if (!$this->dbh) {
|
||||
$error = oci_error();
|
||||
$this->myLog->log(LOG_CRIT, "Database connection error: " . $error["message"]);
|
||||
$this->dbh=Null;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private function query($query, $returnresult=false) {
|
||||
if(!$this->isConnected()) {
|
||||
$this->connect();
|
||||
}
|
||||
if($this->isConnected()) {
|
||||
$this->myLog->log(LOG_DEBUG, 'DB query is: ' . $query);
|
||||
# OCI mode
|
||||
$result = oci_parse($this->dbh, $query);
|
||||
if(!oci_execute($result)) {
|
||||
$this->myLog->log(LOG_INFO, 'Database query error: ' . preg_replace('/\n/',' ',print_r(oci_error($result), true)));
|
||||
$this->dbh = Null;
|
||||
return false;
|
||||
}
|
||||
$this->result = $result;
|
||||
if ($returnresult) return $this->result;
|
||||
else return true;
|
||||
} else {
|
||||
$this->myLog->log(LOG_CRIT, 'No database connection');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* function to get a row from the query result
|
||||
* Once all rows have been fetch, function closeCursor needs to be called
|
||||
*
|
||||
* @param object $result Query result object or null to use the current one
|
||||
* @return array a query row
|
||||
*
|
||||
*/
|
||||
public function fetchArray($result=null){
|
||||
if(!$result) $result = $this->result;
|
||||
if(!$result) return null;
|
||||
|
||||
return oci_fetch_array($result, OCI_ASSOC);
|
||||
}
|
||||
|
||||
/**
|
||||
* function to close the cursor after having fetched rows
|
||||
*
|
||||
* @param object $result Query result object or null to use the current one
|
||||
*
|
||||
*/
|
||||
public function closeCursor($result=null){
|
||||
}
|
||||
|
||||
/**
|
||||
* main function used to get rows by multiple key=>value pairs from Db table.
|
||||
*
|
||||
* @param string $table Database table to update row in
|
||||
* @param array $where Array with column=>values to select rows by
|
||||
* @param int $nr Number of rows to collect. NULL=>inifinity. Default=NULL.
|
||||
* @param int $rev rev=1 indicates order should be reversed. Default=NULL.
|
||||
* @param string distinct Select rows with distinct columns, Default=NULL
|
||||
* @return mixed Array with values from Db row or 2d-array with multiple rows
|
||||
*
|
||||
*/
|
||||
public function findByMultiple($table, $where, $nr=null, $rev=null, $distinct=null)
|
||||
{
|
||||
$value=""; /* quiet the PHP Notice */
|
||||
$match=null; /* quiet the PHP Notice */
|
||||
# LIMIT doesn't exist in Oracle, so we encapsulate the query to be
|
||||
# able to filter a given number of rows afterwars (after ordering)
|
||||
$query="SELECT * FROM (SELECT";
|
||||
|
||||
if ($distinct!=null) {
|
||||
$query.= " DISTINCT " . $distinct;
|
||||
} else {
|
||||
$query.= " *";
|
||||
}
|
||||
$query.= " FROM " . $table;
|
||||
if ($where!=null){
|
||||
foreach ($where as $key=>$value) {
|
||||
if ($key!=null) {
|
||||
if ($value!=null) $match.= " ". $key . " = '" . $value . "' and";
|
||||
else $match.= " ". $key . " is NULL and";
|
||||
}
|
||||
}
|
||||
if ($match!=null) $query .= " WHERE" . $match;
|
||||
$query=rtrim($query, "and");
|
||||
$query=rtrim($query);
|
||||
}
|
||||
if ($rev==1) $query.= " ORDER BY id DESC";
|
||||
if ($nr!=null) {
|
||||
$query .= ") WHERE rownum < " . ($nr+1);
|
||||
}
|
||||
|
||||
$result = $this->query($query, true);
|
||||
if (!$result) return false;
|
||||
|
||||
if ($nr==1) {
|
||||
$row = $this->fetchArray($result);
|
||||
$this->closeCursor($result);
|
||||
return $row;
|
||||
}
|
||||
else {
|
||||
$collection=array();
|
||||
while($row = $this->fetchArray($result)){
|
||||
$collection[]=$row;
|
||||
}
|
||||
$this->closeCursor($result);
|
||||
return $collection;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* main function used to delete rows by multiple key=>value pairs from Db table.
|
||||
*
|
||||
* @param string $table Database table to delete row in
|
||||
* @param array $where Array with column=>values to select rows by
|
||||
* @param int $nr Number of rows to collect. NULL=>inifinity. Default=NULL.
|
||||
* @param int $rev rev=1 indicates order should be reversed. Default=NULL.
|
||||
* @param string distinct Select rows with distinct columns, Default=NULL
|
||||
* @return boolean True on success, otherwise false.
|
||||
*
|
||||
*/
|
||||
public function deleteByMultiple($table, $where, $nr=null, $rev=null)
|
||||
{
|
||||
$query="DELETE";
|
||||
$query.= " FROM " . $table;
|
||||
$query .= " WHERE id IN (SELECT id FROM " . $table;
|
||||
if ($where!=null){
|
||||
$query.= " WHERE";
|
||||
foreach ($where as $key=>$value) {
|
||||
$query.= " ". $key . " = '" . $value . "' and";
|
||||
}
|
||||
$query=rtrim($query, "and");
|
||||
$query=rtrim($query);
|
||||
}
|
||||
if ($rev==1) $query.= " ORDER BY id DESC";
|
||||
|
||||
$query .= ")";
|
||||
if ($nr!=null) $query.= " and rownum < " . ($nr+1);
|
||||
|
||||
return $this->query($query, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to get the number of rows
|
||||
*
|
||||
* @param object $result Query result object or null to use the current one
|
||||
* @return int number of rows affected by last statement or 0 if database connection is not functional.
|
||||
*
|
||||
*/
|
||||
public function rowCount($result=null)
|
||||
{
|
||||
if(!$result) $result = $this->result;
|
||||
if($result) {
|
||||
return oci_num_rows($result);
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to return the value corresponding to a given attribute name
|
||||
* PDO requires lower case strings, whereas OCI requires upper case strings
|
||||
*
|
||||
* @param array $row Query result's row
|
||||
* @param string $key Attribute name
|
||||
* @return string Value of the attribute in this row
|
||||
*
|
||||
*/
|
||||
public function getRowValue($row, $key)
|
||||
{
|
||||
$attr = strtoupper($key);
|
||||
return $row[$attr];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
225
ykval-db-pdo.php
Normal file
225
ykval-db-pdo.php
Normal file
@ -0,0 +1,225 @@
|
||||
<?php
|
||||
|
||||
|
||||
/**
|
||||
* Class for managing database connection
|
||||
*/
|
||||
|
||||
require_once('ykval-log.php');
|
||||
require_once('ykval-db.php');
|
||||
|
||||
class PdoDb
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param string $host Database host
|
||||
* @param string $user Database user
|
||||
* @param string $pwd Database password
|
||||
* @param string $name Database table name
|
||||
* @return void
|
||||
*
|
||||
*/
|
||||
public function __construct($db_dsn, $db_username, $db_password, $db_options, $name='ykval-db')
|
||||
{
|
||||
$this->db_dsn=$db_dsn;
|
||||
$this->db_username=$db_username;
|
||||
$this->db_password=$db_password;
|
||||
$this->db_options=$db_options;
|
||||
|
||||
$this->myLog=new Log($name);
|
||||
}
|
||||
|
||||
/**
|
||||
* function to connect to database defined in config.php
|
||||
*
|
||||
* @return boolean True on success, otherwise false.
|
||||
*
|
||||
*/
|
||||
public function connect(){
|
||||
|
||||
try {
|
||||
$this->dbh = new PDO($this->db_dsn, $this->db_username, $this->db_password, $this->db_options);
|
||||
} catch (PDOException $e) {
|
||||
$this->myLog->log(LOG_CRIT, "Database connection error: " . $e->getMessage());
|
||||
$this->dbh=Null;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private function query($query, $returnresult=false) {
|
||||
if(!$this->isConnected()) {
|
||||
$this->connect();
|
||||
}
|
||||
if($this->isConnected()) {
|
||||
$this->myLog->log(LOG_DEBUG, 'DB query is: ' . $query);
|
||||
|
||||
try {
|
||||
$this->result = $this->dbh->query($query);
|
||||
} catch (PDOException $e) {
|
||||
$this->myLog->log(LOG_INFO, 'Database query error: ' . preg_replace('/\n/',' ',print_r($this->dbh->errorInfo(), true)));
|
||||
$this->dbh = Null;
|
||||
return false;
|
||||
}
|
||||
if ($returnresult) return $this->result;
|
||||
else return true;
|
||||
} else {
|
||||
$this->myLog->log(LOG_CRIT, 'No database connection');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* function to get a row from the query result
|
||||
* Once all rows have been fetch, function closeCursor needs to be called
|
||||
*
|
||||
* @param object $result Query result object or null to use the current one
|
||||
* @return array a query row
|
||||
*
|
||||
*/
|
||||
public function fetchArray($result=null){
|
||||
if(!$result) $result = $this->result;
|
||||
if(!$result) return null;
|
||||
|
||||
return $result->fetch(PDO::FETCH_ASSOC);
|
||||
}
|
||||
|
||||
/**
|
||||
* function to close the cursor after having fetched rows
|
||||
*
|
||||
* @param object $result Query result object or null to use the current one
|
||||
*
|
||||
*/
|
||||
public function closeCursor($result=null){
|
||||
if(!$result) $result = $this->result;
|
||||
$result->closeCursor();
|
||||
}
|
||||
|
||||
public function truncateTable($name)
|
||||
{
|
||||
$this->query("TRUNCATE TABLE " . $name);
|
||||
}
|
||||
|
||||
/**
|
||||
* main function used to get rows by multiple key=>value pairs from Db table.
|
||||
*
|
||||
* @param string $table Database table to update row in
|
||||
* @param array $where Array with column=>values to select rows by
|
||||
* @param int $nr Number of rows to collect. NULL=>inifinity. Default=NULL.
|
||||
* @param int $rev rev=1 indicates order should be reversed. Default=NULL.
|
||||
* @param string distinct Select rows with distinct columns, Default=NULL
|
||||
* @return mixed Array with values from Db row or 2d-array with multiple rows
|
||||
*
|
||||
*/
|
||||
public function findByMultiple($table, $where, $nr=null, $rev=null, $distinct=null)
|
||||
{
|
||||
$value=""; /* quiet the PHP Notice */
|
||||
$match=null; /* quiet the PHP Notice */
|
||||
$query="SELECT";
|
||||
if ($distinct!=null) {
|
||||
$query.= " DISTINCT " . $distinct;
|
||||
} else {
|
||||
$query.= " *";
|
||||
}
|
||||
$query.= " FROM " . $table;
|
||||
if ($where!=null){
|
||||
foreach ($where as $key=>$value) {
|
||||
if ($key!=null) {
|
||||
if ($value!=null) $match.= " ". $key . " = '" . $value . "' and";
|
||||
else $match.= " ". $key . " is NULL and";
|
||||
}
|
||||
}
|
||||
if ($match!=null) $query .= " WHERE" . $match;
|
||||
$query=rtrim($query, "and");
|
||||
$query=rtrim($query);
|
||||
}
|
||||
if ($rev==1) $query.= " ORDER BY id DESC";
|
||||
if ($nr!=null) $query.= " LIMIT " . $nr;
|
||||
|
||||
$result = $this->query($query, true);
|
||||
if (!$result) return false;
|
||||
|
||||
if ($nr==1) {
|
||||
$row = $this->fetchArray($result);
|
||||
$this->closeCursor($result);
|
||||
return $row;
|
||||
}
|
||||
else {
|
||||
$collection=array();
|
||||
while($row = $this->fetchArray($result)){
|
||||
$collection[]=$row;
|
||||
}
|
||||
$this->closeCursor($result);
|
||||
return $collection;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* main function used to delete rows by multiple key=>value pairs from Db table.
|
||||
*
|
||||
* @param string $table Database table to delete row in
|
||||
* @param array $where Array with column=>values to select rows by
|
||||
* @param int $nr Number of rows to collect. NULL=>inifinity. Default=NULL.
|
||||
* @param int $rev rev=1 indicates order should be reversed. Default=NULL.
|
||||
* @param string distinct Select rows with distinct columns, Default=NULL
|
||||
* @return boolean True on success, otherwise false.
|
||||
*
|
||||
*/
|
||||
public function deleteByMultiple($table, $where, $nr=null, $rev=null)
|
||||
{
|
||||
$query="DELETE";
|
||||
$query.= " FROM " . $table;
|
||||
if ($where!=null){
|
||||
$query.= " WHERE";
|
||||
foreach ($where as $key=>$value) {
|
||||
$query.= " ". $key . " = '" . $value . "' and";
|
||||
}
|
||||
$query=rtrim($query, "and");
|
||||
$query=rtrim($query);
|
||||
}
|
||||
if ($rev==1) $query.= " ORDER BY id DESC";
|
||||
if ($nr!=null) $query.= " LIMIT " . $nr;
|
||||
return $this->query($query, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to get the number of rows
|
||||
*
|
||||
* @param object $result Query result object or null to use the current one
|
||||
* @return int number of rows affected by last statement or 0 if database connection is not functional.
|
||||
*
|
||||
*/
|
||||
public function rowCount($result=null)
|
||||
{
|
||||
if(!$result) $result = $this->result;
|
||||
if($result) {
|
||||
$count = count($result->fetchAll());
|
||||
$result->closeCursor();
|
||||
return $count;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to return the value corresponding to a given attribute name
|
||||
* PDO requires lower case strings, whereas OCI requires upper case strings
|
||||
*
|
||||
* @param array $row Query result's row
|
||||
* @param string $key Attribute name
|
||||
* @return string Value of the attribute in this row
|
||||
*
|
||||
*/
|
||||
public function getRowValue($row, $key)
|
||||
{
|
||||
return $row[$key];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
162
ykval-db.php
162
ykval-db.php
@ -9,28 +9,6 @@ require_once('ykval-log.php');
|
||||
|
||||
class Db
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param string $host Database host
|
||||
* @param string $user Database user
|
||||
* @param string $pwd Database password
|
||||
* @param string $name Database table name
|
||||
* @return void
|
||||
*
|
||||
*/
|
||||
public function __construct($db_dsn, $db_username, $db_password, $db_options, $name='ykval-db')
|
||||
{
|
||||
$this->db_dsn=$db_dsn;
|
||||
$this->db_username=$db_username;
|
||||
$this->db_password=$db_password;
|
||||
$this->db_options=$db_options;
|
||||
|
||||
$this->myLog=new Log($name);
|
||||
}
|
||||
|
||||
function addField($name, $value)
|
||||
{
|
||||
$this->myLog->addField($name, $value);
|
||||
@ -85,45 +63,6 @@ class Db
|
||||
if ($this->dbh!=NULL) return True;
|
||||
else return False;
|
||||
}
|
||||
/**
|
||||
* function to connect to database defined in config.php
|
||||
*
|
||||
* @return boolean True on success, otherwise false.
|
||||
*
|
||||
*/
|
||||
public function connect(){
|
||||
|
||||
try {
|
||||
$this->dbh = new PDO($this->db_dsn, $this->db_username, $this->db_password, $this->db_options);
|
||||
} catch (PDOException $e) {
|
||||
$this->myLog->log(LOG_CRIT, "Database connection error: " . $e->getMessage());
|
||||
$this->dbh=Null;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private function query($query, $returnresult=false) {
|
||||
if(!$this->isConnected()) {
|
||||
$this->connect();
|
||||
}
|
||||
if($this->isConnected()) {
|
||||
$this->myLog->log(LOG_DEBUG, 'DB query is: ' . $query);
|
||||
|
||||
try {
|
||||
$this->result = $this->dbh->query($query);
|
||||
} catch (PDOException $e) {
|
||||
$this->myLog->log(LOG_INFO, 'Database query error: ' . preg_replace('/\n/',' ',print_r($this->dbh->errorInfo(), true)));
|
||||
$this->dbh = Null;
|
||||
return false;
|
||||
}
|
||||
if ($returnresult) return $this->result;
|
||||
else return true;
|
||||
} else {
|
||||
$this->myLog->log(LOG_CRIT, 'No database connection');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public function truncateTable($name)
|
||||
{
|
||||
@ -273,90 +212,6 @@ or false on failure.
|
||||
return $this->findByMultiple($table, array($key=>$value), $nr, $rev);
|
||||
}
|
||||
|
||||
/**
|
||||
* main function used to get rows by multiple key=>value pairs from Db table.
|
||||
*
|
||||
* @param string $table Database table to update row in
|
||||
* @param array $where Array with column=>values to select rows by
|
||||
* @param int $nr Number of rows to collect. NULL=>inifinity. Default=NULL.
|
||||
* @param int $rev rev=1 indicates order should be reversed. Default=NULL.
|
||||
* @param string distinct Select rows with distinct columns, Default=NULL
|
||||
* @return mixed Array with values from Db row or 2d-array with multiple rows
|
||||
*
|
||||
*/
|
||||
public function findByMultiple($table, $where, $nr=null, $rev=null, $distinct=null)
|
||||
{
|
||||
$value=""; /* quiet the PHP Notice */
|
||||
$match=null; /* quiet the PHP Notice */
|
||||
$query="SELECT";
|
||||
if ($distinct!=null) {
|
||||
$query.= " DISTINCT " . $distinct;
|
||||
} else {
|
||||
$query.= " *";
|
||||
}
|
||||
$query.= " FROM " . $table;
|
||||
if ($where!=null){
|
||||
foreach ($where as $key=>$value) {
|
||||
if ($key!=null) {
|
||||
if ($value!=null) $match.= " ". $key . " = '" . $value . "' and";
|
||||
else $match.= " ". $key . " is NULL and";
|
||||
}
|
||||
}
|
||||
if ($match!=null) $query .= " WHERE" . $match;
|
||||
$query=rtrim($query, "and");
|
||||
$query=rtrim($query);
|
||||
}
|
||||
if ($rev==1) $query.= " ORDER BY id DESC";
|
||||
if ($nr!=null) $query.= " LIMIT " . $nr;
|
||||
|
||||
$result = $this->query($query, true);
|
||||
if (!$result) return false;
|
||||
|
||||
if ($nr==1) {
|
||||
$row = $result->fetch(PDO::FETCH_ASSOC);
|
||||
$result->closeCursor();
|
||||
return $row;
|
||||
}
|
||||
else {
|
||||
$collection=array();
|
||||
while($row = $result->fetch(PDO::FETCH_ASSOC)){
|
||||
$collection[]=$row;
|
||||
}
|
||||
$result->closeCursor();
|
||||
return $collection;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* main function used to delete rows by multiple key=>value pairs from Db table.
|
||||
*
|
||||
* @param string $table Database table to delete row in
|
||||
* @param array $where Array with column=>values to select rows by
|
||||
* @param int $nr Number of rows to collect. NULL=>inifinity. Default=NULL.
|
||||
* @param int $rev rev=1 indicates order should be reversed. Default=NULL.
|
||||
* @param string distinct Select rows with distinct columns, Default=NULL
|
||||
* @return boolean True on success, otherwise false.
|
||||
*
|
||||
*/
|
||||
public function deleteByMultiple($table, $where, $nr=null, $rev=null)
|
||||
{
|
||||
$query="DELETE";
|
||||
$query.= " FROM " . $table;
|
||||
if ($where!=null){
|
||||
$query.= " WHERE";
|
||||
foreach ($where as $key=>$value) {
|
||||
$query.= " ". $key . " = '" . $value . "' and";
|
||||
}
|
||||
$query=rtrim($query, "and");
|
||||
$query=rtrim($query);
|
||||
}
|
||||
if ($rev==1) $query.= " ORDER BY id DESC";
|
||||
if ($nr!=null) $query.= " LIMIT " . $nr;
|
||||
return $this->query($query, false);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Function to do a custom query on database connection
|
||||
*
|
||||
@ -369,23 +224,6 @@ or false on failure.
|
||||
return $this->query($query, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to do a custom query on database connection
|
||||
*
|
||||
* @return int number of rows affected by last statement or 0 if database connection is not functional.
|
||||
*
|
||||
*/
|
||||
public function rowCount()
|
||||
{
|
||||
if($this->result) {
|
||||
$count=count($this->result->fetchAll());
|
||||
$this->result->closeCursor();
|
||||
return $count;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* helper function used to get rows from Db table in reversed order.
|
||||
* defaults to obtaining 1 row.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user