From: Jörn Friedrich Dreyer
+ + +
+
diff --git a/lib/db.php b/lib/db.php
index 08bd06df95e..a2dbc5dfac9 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -44,15 +44,18 @@ class OC_DB {
* @return BACKEND_MDB2 or BACKEND_PDO
*/
private static function getDBBackend(){
- $backend=self::BACKEND_MDB2;
if(class_exists('PDO') && OC_Config::getValue('installed', false)){//check if we can use PDO, else use MDB2 (instalation always needs to be done my mdb2)
$type = OC_Config::getValue( "dbtype", "sqlite" );
+ if($type=='oci') { //oracle also always needs mdb2
+ return self::BACKEND_MDB2;
+ }
if($type=='sqlite3') $type='sqlite';
$drivers=PDO::getAvailableDrivers();
if(array_search($type,$drivers)!==false){
- $backend=self::BACKEND_PDO;
+ return self::BACKEND_PDO;
}
}
+ return self::BACKEND_MDB2;
}
/**
@@ -129,7 +132,14 @@ class OC_DB {
$dsn='pgsql:dbname='.$name.';host='.$host;
}
break;
- }
+ case 'oci':
+ if ($port) {
+ $dsn = 'oci:dbname=//' . $host . ':' . $port . '/' . $name;
+ } else {
+ $dsn = 'oci:dbname=//' . $host . '/' . $name;
+ }
+ break;
+ }
try{
self::$PDO=new PDO($dsn,$user,$pass,$opts);
}catch(PDOException $e){
@@ -345,9 +355,17 @@ class OC_DB {
$file2 = 'static://db_scheme';
$content = str_replace( '*dbname*', $CONFIG_DBNAME, $content );
$content = str_replace( '*dbprefix*', $CONFIG_DBTABLEPREFIX, $content );
- if( $CONFIG_DBTYPE == 'pgsql' ){ //mysql support it too but sqlite doesn't
- $content = str_replace( '
';
+ $entry.='Offending command was: '.$query.'
';
+ echo($entry);
+ }
+ $result = oci_execute($stmt);
+ if($result) {
+ $row = oci_fetch_row($stmt);
+ }
+ if($result and $row[0] > 0) {
+ //use the admin login data for the new database user
+
+ //add prefix to the oracle user name to prevent collisions
+ $dbusername='oc_'.$username;
+ //create a new password so we don't need to store the admin config in the config file
+ $dbpassword=md5(time().$dbpass);
+
+ //oracle passwords are treated as identifiers:
+ // must start with aphanumeric char
+ // needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
+ $dbpassword=substr($dbpassword, 0, 30);
+
+ self::oci_createDBUser($dbusername, $dbpassword, $dbtablespace, $connection);
+
+ OC_CONFIG::setValue('dbuser', $dbusername);
+ OC_CONFIG::setValue('dbname', $dbusername);
+ OC_CONFIG::setValue('dbpassword', $dbpassword);
+
+ //create the database not neccessary, oracle implies user = schema
+ //self::oci_createDatabase($dbname, $dbusername, $connection);
+ } else {
+
+ OC_CONFIG::setValue('dbuser', $dbuser);
+ OC_CONFIG::setValue('dbpassword', $dbpass);
+
+ //create the database not neccessary, oracle implies user = schema
+ //self::oci_createDatabase($dbname, $dbuser, $connection);
+ }
+
+ //FIXME check tablespace exists: select * from user_tablespaces
+
+ // the connection to dbname=oracle is not needed anymore
+ oci_close($connection);
+
+ // connect to the oracle database (schema=$dbuser) an check if the schema needs to be filled
+ $dbuser = OC_CONFIG::getValue('dbuser');
+ //$dbname = OC_CONFIG::getValue('dbname');
+ $dbpass = OC_CONFIG::getValue('dbpassword');
+
+ $e_host = addslashes($dbhost);
+ $e_dbname = addslashes($dbname);
+
+ $connection_string = '//'.$e_host.'/'.$e_dbname;
+ $connection = @oci_connect($dbuser, $dbpass, $connection_string);
+ if(!$connection) {
+ $error[] = array(
+ 'error' => 'Oracle username and/or password not valid',
+ 'hint' => 'You need to enter either an existing account or the administrator.'
+ );
+ return $error;
+ } else {
+ $query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
+ $stmt = oci_parse($connection, $query);
+ $un = $dbtableprefix.'users';
+ oci_bind_by_name($stmt, ':un', $un);
+ if (!$stmt) {
+ $entry='DB Error: "'.oci_last_error($connection).'"
';
+ $entry.='Offending command was: '.$query.'
';
+ echo($entry);
+ }
+ $result = oci_execute($stmt);
+
+ if($result) {
+ $row = oci_fetch_row($stmt);
+ }
+ if(!$result or $row[0]==0) {
+ OC_DB::createDbFromStructure('db_structure.xml');
+ }
+ }
+ }
+ }
else {
//delete the old sqlite database first, might cause infinte loops otherwise
if(file_exists("$datadir/owncloud.db")){
@@ -307,6 +422,79 @@ class OC_Setup {
echo($entry);
}
}
+ /**
+ *
+ * @param String $name
+ * @param String $password
+ * @param String $tablespace
+ * @param resource $connection
+ */
+ private static function oci_createDBUser($name, $password, $tablespace, $connection) {
+
+ $query = "SELECT * FROM all_users WHERE USERNAME = :un";
+ $stmt = oci_parse($connection, $query);
+ if (!$stmt) {
+ $entry='DB Error: "'.oci_error($connection).'"
';
+ $entry.='Offending command was: '.$query.'
';
+ echo($entry);
+ }
+ oci_bind_by_name($stmt, ':un', $name);
+ $result = oci_execute($stmt);
+ if(!$result) {
+ $entry='DB Error: "'.oci_error($connection).'"
';
+ $entry.='Offending command was: '.$query.'
';
+ echo($entry);
+ }
+
+ if(! oci_fetch_row($stmt)) {
+ //user does not exists let's create it :)
+ //password must start with alphabetic character in oracle
+ $query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$tablespace; //TODO set default tablespace
+ $stmt = oci_parse($connection, $query);
+ if (!$stmt) {
+ $entry='DB Error: "'.oci_error($connection).'"
';
+ $entry.='Offending command was: '.$query.'
';
+ echo($entry);
+ }
+ //oci_bind_by_name($stmt, ':un', $name);
+ $result = oci_execute($stmt);
+ if(!$result) {
+ $entry='DB Error: "'.oci_error($connection).'"
';
+ $entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'
';
+ echo($entry);
+ }
+ } else { // change password of the existing role
+ $query = "ALTER USER :un IDENTIFIED BY :pw";
+ $stmt = oci_parse($connection, $query);
+ if (!$stmt) {
+ $entry='DB Error: "'.oci_error($connection).'"
';
+ $entry.='Offending command was: '.$query.'
';
+ echo($entry);
+ }
+ oci_bind_by_name($stmt, ':un', $name);
+ oci_bind_by_name($stmt, ':pw', $password);
+ $result = oci_execute($stmt);
+ if(!$result) {
+ $entry='DB Error: "'.oci_error($connection).'"
';
+ $entry.='Offending command was: '.$query.'
';
+ echo($entry);
+ }
+ }
+ // grant neccessary roles
+ $query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
+ $stmt = oci_parse($connection, $query);
+ if (!$stmt) {
+ $entry='DB Error: "'.oci_error($connection).'"
';
+ $entry.='Offending command was: '.$query.'
';
+ echo($entry);
+ }
+ $result = oci_execute($stmt);
+ if(!$result) {
+ $entry='DB Error: "'.oci_error($connection).'"
';
+ $entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'
';
+ echo($entry);
+ }
+ }
/**
* create .htaccess files for apache hosts