fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG-14726 Error al conectar ProcessMaker con un... SOLVED

Browse Source 
- even filtered by type "SUPER".
- add validation in intall also a check for use the current user
This commit is contained in:
Marco Antonio Nina
2014-05-07 11:18:09 -04:00
parent a7c785fb3d
commit 6b015ed3b3
4 changed files with 94 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/AppCacheView.php
View File

@@ -1200,7 +1200,7 @@ class AppCacheView extends BaseAppCacheView
$sql = "SELECT * $sql = "SELECT *
FROM `information_schema`.`USER_PRIVILEGES` FROM `information_schema`.`USER_PRIVILEGES`
WHERE GRANTEE = \"'$mysqlUser'\" and PRIVILEGE_TYPE = 'SUPER' "; WHERE GRANTEE = \"'$mysqlUser'\" ";
$rs1 = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC); $rs1 = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC);
$rs1->next(); $rs1->next();

63
workflow/engine/controllers/installer.php
View File

@@ -562,8 +562,19 @@ class Installer extends Controller
public function setGrantPrivilegesMySQL ($psUser, $psPassword, $psDatabase, $host) public function setGrantPrivilegesMySQL ($psUser, $psPassword, $psDatabase, $host)
{ {
$host = ($host == 'localhost' || $host == '127.0.0.1' ? 'localhost' : '%'); $host = ($host == 'localhost' || $host == '127.0.0.1' ? 'localhost' : '%');
$query = sprintf( "GRANT ALL PRIVILEGES ON `%s`.* TO %s@'%s' IDENTIFIED BY '%s' WITH GRANT OPTION", $psDatabase, $psUser, $host, $psPassword ); $sql = sprintf( "GRANT ALL PRIVILEGES ON `%s`.* TO %s@'%s' IDENTIFIED BY '%s' WITH GRANT OPTION", $psDatabase, $psUser, $host, $psPassword );
$this->mysqlQuery( $query ); $query = @mysql_query( $sql, $this->link );
if (! $query) {
$errorMessage = mysql_error( $this->link );
$this->installLog( G::LoadTranslation('ID_MYSQL_ERROR', SYS_LANG, Array($errorMessage) ) );
if (mysql_errno( $this->link) == 1410 ){
$errorMessage .= '. ' . G::LoadTranslation('ID_INSTALL_USE_CURRENT_USER');
}
throw new Exception( $errorMessage );
return false;
}
@mysql_free_result( $query );
$this->installLog( $sql );
} }
/** /**
@@ -631,6 +642,7 @@ class Installer extends Controller
$adminPassword = trim( $_REQUEST['adminPassword'] ); $adminPassword = trim( $_REQUEST['adminPassword'] );
$adminUsername = trim( $_REQUEST['adminUsername'] ); $adminUsername = trim( $_REQUEST['adminUsername'] );
$deleteDB = ($_REQUEST['deleteDB'] == 'true'); $deleteDB = ($_REQUEST['deleteDB'] == 'true');
$userLogged = ($_REQUEST['userLogged'] == 'true');
if (substr( $pathShared, - 1 ) != '/') { if (substr( $pathShared, - 1 ) != '/') {
$pathShared .= '/'; $pathShared .= '/';
@@ -666,12 +678,25 @@ class Installer extends Controller
$this->mysqlQuery( $q ); $this->mysqlQuery( $q );
// CREATE users and GRANT Privileges // CREATE users and GRANT Privileges
$wfPass = G::generate_password( 12 ); $wf_workpace = $wf;
$rbPass = G::generate_password( 12 ); $rb_workpace = $rb;
$rpPass = G::generate_password( 12 ); $rp_workpace = $rp;
$this->setGrantPrivilegesMySQL( $wf, $wfPass, $wf, $db_hostname ); if (!$userLogged) {
$this->setGrantPrivilegesMySQL( $rb, $rbPass, $rb, $db_hostname ); $wfPass = G::generate_password( 12 );
$this->setGrantPrivilegesMySQL( $rp, $rpPass, $rp, $db_hostname ); $rbPass = G::generate_password( 12 );
$rpPass = G::generate_password( 12 );
$this->setGrantPrivilegesMySQL( $wf, $wfPass, $wf, $db_hostname );
$this->setGrantPrivilegesMySQL( $rb, $rbPass, $rb, $db_hostname );
$this->setGrantPrivilegesMySQL( $rp, $rpPass, $rp, $db_hostname );
} else {
$wfPass = $db_password;
$rbPass = $db_password;
$rpPass = $db_password;
$wf = $db_username;
$rb = $db_username;
$rp = $db_username;
}
// Generate the db.php file and folders // Generate the db.php file and folders
$pathSharedSites = $pathShared; $pathSharedSites = $pathShared;
@@ -688,15 +713,15 @@ class Installer extends Controller
$dbText .= sprintf( "// Processmaker configuration\n" ); $dbText .= sprintf( "// Processmaker configuration\n" );
$dbText .= sprintf( " define ('DB_ADAPTER', '%s' );\n", 'mysql' ); $dbText .= sprintf( " define ('DB_ADAPTER', '%s' );\n", 'mysql' );
$dbText .= sprintf( " define ('DB_HOST', '%s' );\n", $db_host ); $dbText .= sprintf( " define ('DB_HOST', '%s' );\n", $db_host );
$dbText .= sprintf( " define ('DB_NAME', '%s' );\n", $wf ); $dbText .= sprintf( " define ('DB_NAME', '%s' );\n", $wf_workpace );
$dbText .= sprintf( " define ('DB_USER', '%s' );\n", $wf ); $dbText .= sprintf( " define ('DB_USER', '%s' );\n", $wf );
$dbText .= sprintf( " define ('DB_PASS', '%s' );\n", $wfPass ); $dbText .= sprintf( " define ('DB_PASS', '%s' );\n", $wfPass );
$dbText .= sprintf( " define ('DB_RBAC_HOST', '%s' );\n", $db_host ); $dbText .= sprintf( " define ('DB_RBAC_HOST', '%s' );\n", $db_host );
$dbText .= sprintf( " define ('DB_RBAC_NAME', '%s' );\n", $rb ); $dbText .= sprintf( " define ('DB_RBAC_NAME', '%s' );\n", $rb_workpace );
$dbText .= sprintf( " define ('DB_RBAC_USER', '%s' );\n", $rb ); $dbText .= sprintf( " define ('DB_RBAC_USER', '%s' );\n", $rb );
$dbText .= sprintf( " define ('DB_RBAC_PASS', '%s' );\n", $rbPass ); $dbText .= sprintf( " define ('DB_RBAC_PASS', '%s' );\n", $rbPass );
$dbText .= sprintf( " define ('DB_REPORT_HOST', '%s' );\n", $db_host ); $dbText .= sprintf( " define ('DB_REPORT_HOST', '%s' );\n", $db_host );
$dbText .= sprintf( " define ('DB_REPORT_NAME', '%s' );\n", $rp ); $dbText .= sprintf( " define ('DB_REPORT_NAME', '%s' );\n", $rp_workpace );
$dbText .= sprintf( " define ('DB_REPORT_USER', '%s' );\n", $rp ); $dbText .= sprintf( " define ('DB_REPORT_USER', '%s' );\n", $rp );
$dbText .= sprintf( " define ('DB_REPORT_PASS', '%s' );\n", $rpPass ); $dbText .= sprintf( " define ('DB_REPORT_PASS', '%s' );\n", $rpPass );
if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) { if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) {
@@ -714,15 +739,15 @@ class Installer extends Controller
$databases_file = $path_site . 'databases.php'; $databases_file = $path_site . 'databases.php';
$dbData = sprintf( "\$dbAdapter = '%s';\n", 'mysql' ); $dbData = sprintf( "\$dbAdapter = '%s';\n", 'mysql' );
$dbData .= sprintf( "\$dbHost = '%s';\n", $db_host ); $dbData .= sprintf( "\$dbHost = '%s';\n", $db_host );
$dbData .= sprintf( "\$dbName = '%s';\n", $wf ); $dbData .= sprintf( "\$dbName = '%s';\n", $wf_workpace );
$dbData .= sprintf( "\$dbUser = '%s';\n", $wf ); $dbData .= sprintf( "\$dbUser = '%s';\n", $wf );
$dbData .= sprintf( "\$dbPass = '%s';\n", $wfPass ); $dbData .= sprintf( "\$dbPass = '%s';\n", $wfPass );
$dbData .= sprintf( "\$dbRbacHost = '%s';\n", $db_host ); $dbData .= sprintf( "\$dbRbacHost = '%s';\n", $db_host );
$dbData .= sprintf( "\$dbRbacName = '%s';\n", $rb ); $dbData .= sprintf( "\$dbRbacName = '%s';\n", $rb_workpace );
$dbData .= sprintf( "\$dbRbacUser = '%s';\n", $rb ); $dbData .= sprintf( "\$dbRbacUser = '%s';\n", $rb );
$dbData .= sprintf( "\$dbRbacPass = '%s';\n", $rbPass ); $dbData .= sprintf( "\$dbRbacPass = '%s';\n", $rbPass );
$dbData .= sprintf( "\$dbReportHost = '%s';\n", $db_host ); $dbData .= sprintf( "\$dbReportHost = '%s';\n", $db_host );
$dbData .= sprintf( "\$dbReportName = '%s';\n", $rp ); $dbData .= sprintf( "\$dbReportName = '%s';\n", $rp_workpace );
$dbData .= sprintf( "\$dbReportUser = '%s';\n", $rp ); $dbData .= sprintf( "\$dbReportUser = '%s';\n", $rp );
$dbData .= sprintf( "\$dbReportPass = '%s';\n", $rpPass ); $dbData .= sprintf( "\$dbReportPass = '%s';\n", $rpPass );
$databasesText = str_replace( '{dbData}', $dbData, @file_get_contents( PATH_HOME . 'engine/templates/installer/databases.tpl' ) ); $databasesText = str_replace( '{dbData}', $dbData, @file_get_contents( PATH_HOME . 'engine/templates/installer/databases.tpl' ) );
@@ -731,13 +756,13 @@ class Installer extends Controller
file_put_contents( $databases_file, $databasesText ); file_put_contents( $databases_file, $databasesText );
// Execute scripts to create and populates databases // Execute scripts to create and populates databases
$query = sprintf( "USE %s;", $rb ); $query = sprintf( "USE %s;", $rb_workpace );
$this->mysqlQuery( $query ); $this->mysqlQuery( $query );
$this->mysqlFileQuery( PATH_RBAC_HOME . 'engine/data/mysql/schema.sql' ); $this->mysqlFileQuery( PATH_RBAC_HOME . 'engine/data/mysql/schema.sql' );
$this->mysqlFileQuery( PATH_RBAC_HOME . 'engine/data/mysql/insert.sql' ); $this->mysqlFileQuery( PATH_RBAC_HOME . 'engine/data/mysql/insert.sql' );
$query = sprintf( "USE %s;", $wf ); $query = sprintf( "USE %s;", $wf_workpace );
$this->mysqlQuery( $query ); $this->mysqlQuery( $query );
$this->mysqlFileQuery( PATH_HOME . 'engine/data/mysql/schema.sql' ); $this->mysqlFileQuery( PATH_HOME . 'engine/data/mysql/schema.sql' );
$this->mysqlFileQuery( PATH_HOME . 'engine/data/mysql/insert.sql' ); $this->mysqlFileQuery( PATH_HOME . 'engine/data/mysql/insert.sql' );
@@ -768,13 +793,13 @@ class Installer extends Controller
} }
// Change admin user // Change admin user
$query = sprintf( "USE %s;", $wf ); $query = sprintf( "USE %s;", $wf_workpace );
$this->mysqlQuery( $query ); $this->mysqlQuery( $query );
$query = sprintf( "UPDATE USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, md5( $adminPassword ) ); $query = sprintf( "UPDATE USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, md5( $adminPassword ) );
$this->mysqlQuery( $query ); $this->mysqlQuery( $query );
$query = sprintf( "USE %s;", $rb ); $query = sprintf( "USE %s;", $rb_workpace );
$this->mysqlQuery( $query ); $this->mysqlQuery( $query );
$query = sprintf( "UPDATE USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, md5( $adminPassword ) ); $query = sprintf( "UPDATE USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, md5( $adminPassword ) );
@@ -1188,7 +1213,7 @@ class Installer extends Controller
$info->message .= G::LoadTranslation('ID_MYSQL_CREDENTIALS_WRONG'); $info->message .= G::LoadTranslation('ID_MYSQL_CREDENTIALS_WRONG');
return $info; return $info;
} }
$res = @mysql_query( "SELECT * FROM `information_schema`.`USER_PRIVILEGES` where (GRANTEE = \"'$db_username'@'$db_hostname'\" OR GRANTEE = \"'$db_username'@'%'\") and PRIVILEGE_TYPE = 'SUPER' ", $link ); $res = @mysql_query( "SELECT * FROM `information_schema`.`USER_PRIVILEGES` where (GRANTEE = \"'$db_username'@'$db_hostname'\" OR GRANTEE = \"'$db_username'@'%'\") ", $link );
$row = @mysql_fetch_array( $res ); $row = @mysql_fetch_array( $res );
$hasSuper = is_array( $row ); $hasSuper = is_array( $row );
@mysql_free_result( $res ); @mysql_free_result( $res );

53
workflow/engine/templates/installer/installer_cards.js
View File

@@ -137,11 +137,11 @@ Ext.onReady(function(){
// test database Connection // test database Connection
function testConnection() { function testConnection() {
wizard.showLoadMask(true); wizard.showLoadMask(true);
if ((Ext.getCmp('db_engine').getValue() == '') || !Ext.getCmp('db_hostname').isValid() || !Ext.getCmp('db_username').isValid()) { if ((Ext.getCmp('db_engine').getValue() == '') || !Ext.getCmp('db_hostname').isValid() || !Ext.getCmp('db_username').isValid()) {
wizard.onClientValidation(3, false); wizard.onClientValidation(3, false);
wizard.showLoadMask(false); wizard.showLoadMask(false);
return false; return false;
} }
Ext.Ajax.request({ Ext.Ajax.request({
url: 'testConnection', url: 'testConnection',
success: function(response){ success: function(response){
@@ -156,11 +156,11 @@ Ext.onReady(function(){
}, },
failure: function(){}, failure: function(){},
params: { params: {
'db_engine' : Ext.getCmp('db_engine').getValue(), 'db_engine' : Ext.getCmp('db_engine').getValue(),
'db_hostname': Ext.getCmp('db_hostname').getValue(), 'db_hostname': Ext.getCmp('db_hostname').getValue(),
'db_username': Ext.getCmp('db_username').getValue(), 'db_username': Ext.getCmp('db_username').getValue(),
'db_password': Ext.getCmp('db_password').getValue(), 'db_password': Ext.getCmp('db_password').getValue(),
'db_port' : Ext.getCmp('db_port').getValue() 'db_port' : Ext.getCmp('db_port').getValue()
} }
}); });
} }
@@ -231,15 +231,15 @@ Ext.onReady(function(){
}, },
failure: function(){}, failure: function(){},
params: { params: {
'db_engine' : Ext.getCmp('db_engine').getValue(), 'db_engine' : Ext.getCmp('db_engine').getValue(),
'db_hostname': Ext.getCmp('db_hostname').getValue(), 'db_hostname': Ext.getCmp('db_hostname').getValue(),
'db_username': Ext.getCmp('db_username').getValue(), 'db_username': Ext.getCmp('db_username').getValue(),
'db_password': Ext.getCmp('db_password').getValue(), 'db_password': Ext.getCmp('db_password').getValue(),
'db_port' : Ext.getCmp('db_port').getValue(), 'db_port' : Ext.getCmp('db_port').getValue(),
'wfDatabase' : Ext.getCmp('wfDatabase').getValue(), 'wfDatabase' : Ext.getCmp('wfDatabase').getValue(),
'rbDatabase' : Ext.getCmp('rbDatabase').getValue(), 'rbDatabase' : Ext.getCmp('rbDatabase').getValue(),
'rpDatabase' : Ext.getCmp('rpDatabase').getValue() 'rpDatabase' : Ext.getCmp('rpDatabase').getValue()
} }
}); });
} }
@@ -262,7 +262,7 @@ Ext.onReady(function(){
{ {
xtype:'panel', xtype:'panel',
layout:'border', layout:'border',
height: 340, height: 380,
items:[ items:[
{ {
region: 'west', region: 'west',
@@ -365,7 +365,7 @@ Ext.onReady(function(){
{ {
xtype:'panel', xtype:'panel',
layout:'border', layout:'border',
height: 300, height: 380,
items:[ items:[
{ {
region: 'north', region: 'north',
@@ -482,7 +482,7 @@ Ext.onReady(function(){
{ {
xtype:'panel', xtype:'panel',
layout:'border', layout:'border',
height: 340, height: 380,
items:[ items:[
{ {
region: 'center', region: 'center',
@@ -491,8 +491,8 @@ Ext.onReady(function(){
new Ext.form.TextArea({ new Ext.form.TextArea({
name : 'license', name : 'license',
readOnly : true, readOnly : true,
width : 510, width : 600,
height : 280, height : 330,
style : 'font-size:13px', style : 'font-size:13px',
value : licenseTxt value : licenseTxt
}), }),
@@ -533,7 +533,7 @@ Ext.onReady(function(){
{ {
xtype:'panel', xtype:'panel',
layout:'border', layout:'border',
height: 360, height: 380,
items:[ items:[
{ {
region: 'west', region: 'west',
@@ -671,7 +671,7 @@ Ext.onReady(function(){
{ {
xtype:'panel', xtype:'panel',
layout:'border', layout:'border',
height: 360, height: 380,
items:[ items:[
{ {
region: 'west', region: 'west',
@@ -835,6 +835,13 @@ Ext.onReady(function(){
wizard.onClientValidation(4, false); wizard.onClientValidation(4, false);
} }
}), }),
new Ext.form.Checkbox({
boxLabel: _('ID_INSTALL_USE_CURRENT_USER'),
id : 'createUserLogged',
handler: function() {
wizard.onClientValidation(4, false);
}
}),
{ {
xtype : 'displayfield', xtype : 'displayfield',
id : 'finish_message' id : 'finish_message'

37
workflow/engine/templates/installer/main.js
View File

@@ -10,7 +10,7 @@ Ext.onReady(function(){
Ext.QuickTips.init(); Ext.QuickTips.init();
wizard = new Ext.ux.Wiz({ wizard = new Ext.ux.Wiz({
height: 520, height: 555,
width : 780, width : 780,
id : 'wizard', id : 'wizard',
closable: false, closable: false,
@@ -87,23 +87,24 @@ function finishInstallation()
}, },
failure: function(){Ext.MessageBox.hide(); wizard.showLoadMask(false);}, failure: function(){Ext.MessageBox.hide(); wizard.showLoadMask(false);},
params: { params: {
'db_engine' : Ext.getCmp('db_engine' ).getValue(), 'db_engine' : Ext.getCmp('db_engine' ).getValue(),
'db_hostname' : Ext.getCmp('db_hostname' ).getValue(), 'db_hostname' : Ext.getCmp('db_hostname' ).getValue(),
'db_username' : Ext.getCmp('db_username' ).getValue(), 'db_username' : Ext.getCmp('db_username' ).getValue(),
'db_password' : Ext.getCmp('db_password' ).getValue(), 'db_password' : Ext.getCmp('db_password' ).getValue(),
'db_port' : Ext.getCmp('db_port' ).getValue(), 'db_port' : Ext.getCmp('db_port' ).getValue(),
'pathConfig' : Ext.getCmp('pathConfig' ).getValue(), 'pathConfig' : Ext.getCmp('pathConfig' ).getValue(),
'pathLanguages' : Ext.getCmp('pathLanguages').getValue(), 'pathLanguages' : Ext.getCmp('pathLanguages' ).getValue(),
'pathPlugins' : Ext.getCmp('pathPlugins' ).getValue(), 'pathPlugins' : Ext.getCmp('pathPlugins' ).getValue(),
'pathXmlforms' : Ext.getCmp('pathXmlforms' ).getValue(), 'pathXmlforms' : Ext.getCmp('pathXmlforms' ).getValue(),
'pathShared' : Ext.getCmp('pathShared' ).getValue(), 'pathShared' : Ext.getCmp('pathShared' ).getValue(),
'workspace' : Ext.getCmp('workspace' ).getValue(), 'workspace' : Ext.getCmp('workspace' ).getValue(),
'adminUsername' : Ext.getCmp('adminUsername').getValue(), 'adminUsername' : Ext.getCmp('adminUsername' ).getValue(),
'adminPassword' : Ext.getCmp('adminPassword').getValue(), 'adminPassword' : Ext.getCmp('adminPassword' ).getValue(),
'wfDatabase' : Ext.getCmp('wfDatabase' ).getValue(), 'wfDatabase' : Ext.getCmp('wfDatabase' ).getValue(),
'rbDatabase' : Ext.getCmp('rbDatabase' ).getValue(), 'rbDatabase' : Ext.getCmp('rbDatabase' ).getValue(),
'rpDatabase' : Ext.getCmp('rpDatabase' ).getValue(), 'rpDatabase' : Ext.getCmp('rpDatabase' ).getValue(),
'deleteDB' : Ext.getCmp('deleteDB' ).getValue() 'deleteDB' : Ext.getCmp('deleteDB' ).getValue(),
'userLogged' : Ext.getCmp('createUserLogged' ).getValue()
}, },
timeout: 180000 timeout: 180000
}); });