mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-11 09:11:05 +01:00
41fd3575c9
- backport of security features from Trunk: support for sha512_crypt password and session-list without access to session-directory - backport of numerous CalDAV/CardDAV features and fixes from Trunk: multiple addressbooks and calendars, support of resources, request logging
374 lines
13 KiB
PHP
374 lines
13 KiB
PHP
<?php
|
|
/**
|
|
* eGroupWare - API Setup
|
|
*
|
|
* Update scripts 1.6 --> 1.8
|
|
*
|
|
* @link http://www.egroupware.org
|
|
* @package api
|
|
* @subpackage setup
|
|
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
|
|
* @version $Id$
|
|
*/
|
|
|
|
/* Include older eGroupWare update support */
|
|
include('tables_update_0_9_9.inc.php');
|
|
include('tables_update_0_9_10.inc.php');
|
|
include('tables_update_0_9_12.inc.php');
|
|
include('tables_update_0_9_14.inc.php');
|
|
include('tables_update_1_0.inc.php');
|
|
include('tables_update_1_2.inc.php');
|
|
include('tables_update_1_4.inc.php');
|
|
|
|
/**
|
|
* Update from the stable 1.6 branch to the new devel branch 1.7.xxx
|
|
*/
|
|
function phpgwapi_upgrade1_6_001()
|
|
{
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.001';
|
|
}
|
|
|
|
function phpgwapi_upgrade1_6_002()
|
|
{
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.001';
|
|
}
|
|
|
|
function phpgwapi_upgrade1_6_003()
|
|
{
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.001';
|
|
}
|
|
|
|
function phpgwapi_upgrade1_7_001()
|
|
{
|
|
$GLOBALS['egw_setup']->oProc->AddColumn('egw_sqlfs','fs_link',array(
|
|
'type' => 'varchar',
|
|
'precision' => '255'
|
|
));
|
|
// moving symlinks from fs_content to fs_link
|
|
$GLOBALS['egw_setup']->oProc->query("UPDATE egw_sqlfs SET fs_link=fs_content,fs_content=NULL WHERE fs_mime='application/x-symlink'",__LINE__,__FILE__);
|
|
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.002';
|
|
}
|
|
|
|
|
|
function phpgwapi_upgrade1_7_002()
|
|
{
|
|
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_sqlfs','fs_mime',array(
|
|
'type' => 'varchar',
|
|
'precision' => '96',
|
|
'nullable' => False
|
|
));
|
|
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.7.003';
|
|
}
|
|
|
|
|
|
function phpgwapi_upgrade1_7_003()
|
|
{
|
|
// resetting owner for all global (and group) cats to -1
|
|
$GLOBALS['egw_setup']->db->update('egw_categories',array('cat_owner' => -1),'cat_owner <= 0',__LINE__,__FILE__);
|
|
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.8.001';
|
|
}
|
|
|
|
function phpgwapi_upgrade1_8_001()
|
|
{
|
|
// French language: Français
|
|
$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->languages_table,array('lang_name' => 'Français'),array('lang_id' => 'fr'),__LINE__,__FILE__);
|
|
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.8.002';
|
|
}
|
|
|
|
/**
|
|
* Reserve 1.8.003 in case we want to create a separte security update
|
|
*
|
|
* @return string
|
|
*/
|
|
function phpgwapi_upgrade1_8_002()
|
|
{
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.8.003';
|
|
}
|
|
|
|
/**
|
|
* Update methods for 1.8.004 (called below)
|
|
*/
|
|
/**
|
|
* Add index to improve import of contacts using a custom field as primary key
|
|
*
|
|
* @return string
|
|
*/
|
|
function phpgwapi_upgrade1_9_001()
|
|
{
|
|
$GLOBALS['egw_setup']->oProc->CreateIndex('egw_addressbook_extra',
|
|
array('contact_name','contact_value(32)'));
|
|
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.002';
|
|
}
|
|
|
|
function phpgwapi_upgrade1_9_002()
|
|
{
|
|
/* done by RefreshTable() anyway
|
|
$GLOBALS['egw_setup']->oProc->AddColumn('egw_links','deleted',array(
|
|
'type' => 'timestamp'
|
|
));*/
|
|
$GLOBALS['egw_setup']->oProc->RefreshTable('egw_links',array(
|
|
'fd' => array(
|
|
'link_id' => array('type' => 'auto','nullable' => False),
|
|
'link_app1' => array('type' => 'varchar','precision' => '25','nullable' => False),
|
|
'link_id1' => array('type' => 'varchar','precision' => '50','nullable' => False),
|
|
'link_app2' => array('type' => 'varchar','precision' => '25','nullable' => False),
|
|
'link_id2' => array('type' => 'varchar','precision' => '50','nullable' => False),
|
|
'link_remark' => array('type' => 'varchar','precision' => '100'),
|
|
'link_lastmod' => array('type' => 'int','precision' => '8','nullable' => False),
|
|
'link_owner' => array('type' => 'int','precision' => '4','nullable' => False),
|
|
'deleted' => array('type' => 'timestamp')
|
|
),
|
|
'pk' => array('link_id'),
|
|
'fk' => array(),
|
|
'ix' => array('deleted',array('link_app1','link_id1','link_lastmod'),array('link_app2','link_id2','link_lastmod')),
|
|
'uc' => array()
|
|
));
|
|
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.003';
|
|
}
|
|
|
|
|
|
function phpgwapi_upgrade1_9_003()
|
|
{
|
|
$GLOBALS['egw_setup']->oProc->AddColumn('egw_addressbook','adr_one_countrycode',array(
|
|
'type' => 'varchar',
|
|
'precision' => '2'
|
|
));
|
|
$GLOBALS['egw_setup']->oProc->AddColumn('egw_addressbook','adr_two_countrycode',array(
|
|
'type' => 'varchar',
|
|
'precision' => '2'
|
|
));
|
|
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.004';
|
|
}
|
|
|
|
|
|
/**
|
|
* Update script to populate country codes
|
|
*
|
|
* Sets country code for any recognized country in any installed language, then clears the country name
|
|
* to avoid conflicts / confusion.
|
|
*/
|
|
function phpgwapi_upgrade1_9_004()
|
|
{
|
|
// Get all installed translations for names
|
|
$country = new country();
|
|
$country_query = 'SELECT DISTINCT message_id, content
|
|
FROM ' . translation::LANG_TABLE . '
|
|
WHERE message_id IN ("' . implode('","', array_values($country->countries())) . '")
|
|
ORDER BY message_id';
|
|
$result = $GLOBALS['egw_setup']->oProc->query($country_query, __LINE__, __FILE__);
|
|
|
|
$country_list = array();
|
|
$current_name = null;
|
|
$id = null;
|
|
foreach($result as $row) {
|
|
if($row['message_id'] != $current_name) {
|
|
$current_name = $row['message_id'];
|
|
$id = array_search(strtoupper($current_name), $country->countries());
|
|
if(!$id) continue;
|
|
}
|
|
$country_list[$id][] = $row['content'];
|
|
}
|
|
|
|
// Build conversion
|
|
$case = 'CASE UPPER(adr_%1$s_countryname)';
|
|
foreach($country_list as $key => $names) {
|
|
foreach($names as $name) {
|
|
$case .= "\n" . "WHEN UPPER(\"$name\") THEN '$key'";
|
|
}
|
|
}
|
|
$case .= ' END';
|
|
|
|
$sql = 'UPDATE egw_addressbook SET ';
|
|
$sql .= "adr_one_countrycode = (" . sprintf($case, 'one') . '),';
|
|
$sql .= "adr_two_countrycode = (" . sprintf($case, 'two') . ')';
|
|
|
|
// Change names
|
|
$GLOBALS['egw_setup']->oProc->query($sql,__LINE__,__FILE__);
|
|
|
|
// Clear text names
|
|
$GLOBALS['egw_setup']->oProc->query('UPDATE egw_addressbook SET adr_one_countryname = NULL WHERE adr_one_countrycode IS NOT NULL',__LINE__,__FILE__);
|
|
$GLOBALS['egw_setup']->oProc->query('UPDATE egw_addressbook SET adr_two_countryname = NULL WHERE adr_two_countrycode IS NOT NULL',__LINE__,__FILE__);
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.005';
|
|
}
|
|
|
|
|
|
/**
|
|
* Add index to li (login time) column to speed up maintenance (periodic delete of old rows)
|
|
*
|
|
* Delete some obsolete / since a long time not used tables:
|
|
* - egw_vfs (replaced by egw_sqlfs in 1.6)
|
|
* - egw_(app_)sessions (not used since 1.4)
|
|
*/
|
|
function phpgwapi_upgrade1_9_005()
|
|
{
|
|
$GLOBALS['egw_setup']->oProc->CreateIndex('egw_access_log','li');
|
|
|
|
$GLOBALS['egw_setup']->oProc->DropTable('egw_app_sessions');
|
|
$GLOBALS['egw_setup']->oProc->DropTable('egw_sessions');
|
|
$GLOBALS['egw_setup']->oProc->DropTable('egw_vfs');
|
|
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.006';
|
|
}
|
|
|
|
/**
|
|
* Add column to store CalDAV name given by client
|
|
*/
|
|
function phpgwapi_upgrade1_9_006()
|
|
{
|
|
$GLOBALS['egw_setup']->oProc->AddColumn('egw_addressbook','carddav_name',array(
|
|
'type' => 'varchar',
|
|
'precision' => '64',
|
|
'comment' => 'name part of CardDAV URL, if specified by client'
|
|
));
|
|
$GLOBALS['egw_setup']->db->query($sql='UPDATE egw_addressbook SET carddav_name='.
|
|
$GLOBALS['egw_setup']->db->concat(
|
|
$GLOBALS['egw_setup']->db->to_varchar('contact_id'),"'.vcf'"),__LINE__,__FILE__);
|
|
|
|
$GLOBALS['egw_setup']->oProc->CreateIndex('egw_addressbook','carddav_name');
|
|
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.007';
|
|
}
|
|
|
|
/**
|
|
* Add columns for session list (dla, action), make sessionid primary key and TS 64bit
|
|
*/
|
|
function phpgwapi_upgrade1_9_007()
|
|
{
|
|
$GLOBALS['egw_setup']->oProc->RefreshTable('egw_access_log',array(
|
|
'fd' => array(
|
|
'sessionid' => array('type' => 'auto','nullable' => False,'comment' => 'primary key'),
|
|
'loginid' => array('type' => 'varchar','precision' => '64','nullable' => False,'comment' => 'username used to login'),
|
|
'ip' => array('type' => 'varchar','precision' => '40','nullable' => False,'comment' => 'ip of user'),
|
|
'li' => array('type' => 'int','precision' => '8','nullable' => False,'comment' => 'TS if login'),
|
|
'lo' => array('type' => 'int','precision' => '8','comment' => 'TD of logout'),
|
|
'account_id' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'numerical account id'),
|
|
'session_dla' => array('type' => 'int','precision' => '8','comment' => 'TS of last user action'),
|
|
'session_action' => array('type' => 'varchar','precision' => '64','comment' => 'menuaction or path of last user action'),
|
|
'session_php' => array('type' => 'char','precision' => '64','nullable' => False,'comment' => 'php session-id or error-message'),
|
|
'notification_heartbeat' => array('type' => 'int','precision' => '8','comment' => 'TS of last notification request')
|
|
),
|
|
'pk' => array('sessionid'),
|
|
'fk' => array(),
|
|
'ix' => array('li','lo','session_dla','notification_heartbeat'),
|
|
'uc' => array()
|
|
),array(
|
|
'session_php' => 'sessionid',
|
|
'sessionid' => 'NULL', // to NOT copy old sessionid, but create a new sequence
|
|
));
|
|
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.008';
|
|
}
|
|
|
|
/**
|
|
* Alter column cat_owner to varchar(255) to support multiple owners/groups per cat
|
|
*/
|
|
function phpgwapi_upgrade1_9_008()
|
|
{
|
|
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_categories','cat_owner',array(
|
|
'type' => 'varchar',
|
|
'precision' => '255',
|
|
'nullable' => False,
|
|
'default' => '0'
|
|
));
|
|
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.009';
|
|
}
|
|
|
|
/**
|
|
* Alter column account_pwd to varchar(128) to allow to store sha256_crypt hashes
|
|
*
|
|
* Enable password migration to new default "securest available", if current hash is the default (sql: md5, ldap: des)
|
|
* or the 1.9.009 migration to ssha is running
|
|
*/
|
|
function phpgwapi_upgrade1_9_009()
|
|
{
|
|
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_accounts','account_pwd',array(
|
|
'type' => 'varchar',
|
|
'precision' => '128',
|
|
'nullable' => False
|
|
));
|
|
|
|
// query password hashing from database
|
|
$config = array(
|
|
'auth_type' => 'sql',
|
|
'account_repository' => null, // default is auth_type
|
|
'sql_encryption_type' => 'md5',
|
|
'ldap_encryption_type' => 'des',
|
|
'pwd_migration_allowed' => null, // default off
|
|
'pwd_migration_types' => null,
|
|
);
|
|
foreach($GLOBALS['egw_setup']->db->select('egw_config','config_name,config_value',array(
|
|
'config_app' => 'phpgwapi',
|
|
'config_name' => array_keys($config),
|
|
),__LINE__,__FILE__) as $row)
|
|
{
|
|
$config[$row['config_name']] = $row['config_value'];
|
|
}
|
|
if (!isset($config['account_repository'])) $config['account_repository'] = $config['auth_type'];
|
|
|
|
// changing pw hashing only, if we auth agains our own account repository and no migration already active
|
|
if ($config['auth_type'] == $config['account_repository'] &&
|
|
(!$config['pwd_migration_allowed'] || $config['pwd_migration_types'] == 'md5,crypt')) // 1.9.009 migration to ssha
|
|
{
|
|
require_once EGW_SERVER_ROOT.'/setup/inc/hook_config.inc.php'; // for sql_passwdhashes to get securest available password hash
|
|
sql_passwdhashes(array(), true, $securest);
|
|
// OpenLDAP has no own support for extended crypt like sha512_crypt, but relys the OS crypt implementation,
|
|
// do NOT automatically migrate to anything above SSHA for OS other then Linux (Darwin can not auth anymore!)
|
|
if ($config['auth_type'] == 'sql' && in_array($config['sql_encryption_type'], array('md5','ssha')) ||
|
|
$config['auth_type'] == 'ldap'&& in_array($config['ldap_encryption_type'], array('des','ssha')) &&
|
|
(PHP_OS == 'Linux' || $securest == 'ssha'))
|
|
{
|
|
$config['pwd_migration_types'] = 'md5,crypt'; // des is called crypt in hash
|
|
if ($config['pwd_migration_allowed'] && $securest != 'ssha') $config['pwd_migration_types'] .= ',ssha';
|
|
$config['sql_encryption_type'] = $config['ldap_encryption_type'] = $securest;
|
|
$config['pwd_migration_allowed'] = 'True';
|
|
echo "<p>Enabling password migration to $securest</p>\n";
|
|
}
|
|
foreach($config as $name => $value)
|
|
{
|
|
$GLOBALS['egw_setup']->db->insert('egw_config',array(
|
|
'config_value' => $value,
|
|
),array(
|
|
'config_app' => 'phpgwapi',
|
|
'config_name' => $name,
|
|
),__LINE__,__FILE__);
|
|
}
|
|
}
|
|
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.012'; // was 1.9.010, but in case someone updates from an older Trunk
|
|
}
|
|
|
|
/**
|
|
* Add index for contact_modified to improve performance of ctag generation on big installtions
|
|
*/
|
|
function phpgwapi_upgrade1_9_012()
|
|
{
|
|
$GLOBALS['egw_setup']->oProc->CreateIndex('egw_addressbook','contact_modified');
|
|
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.8.004';
|
|
}
|
|
|
|
/**
|
|
* Combiupdate 1.8.004: includes Trunk updates 1.9.001-1.9.010+1.9.013
|
|
*
|
|
* @return string
|
|
*/
|
|
function phpgwapi_upgrade1_8_003()
|
|
{
|
|
foreach(array('1.9.001','1.9.002','1.9.003','1.9.004','1.9.005','1.9.006','1.9.007','1.9.008','1.9.009','1.9.012') as $version)
|
|
{
|
|
$func = 'phpgwapi_upgrade'.str_replace('.', '_', $version);
|
|
$func();
|
|
}
|
|
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.8.004';
|
|
}
|
|
|
|
|