Changeset 532

Timestamp:

Jul 13, 2015 8:11:33 PM (9 years ago)

Author:

anonymous

Message:

Added common config for codebase cli scripts. Changed behavior of db_auth.json loading. validSignature() now fails on empty string.

Location:

trunk

Files:

• bin/_config.inc.php (added)
• bin/acl.cli.php (modified) (3 diffs)
• bin/init_codebase_tables.cli.php (added)
• lib/App.inc.php (modified) (1 diff)
• lib/DB.inc.php (modified) (2 diffs)
• lib/Utilities.inc.php (modified) (1 diff)
• lib/Version.inc.php (modified) (1 diff)

trunk/bin/acl.cli.php

@@ -1 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
@@ -26 +26 @@
 *
 * @author   Quinn Comendant <quinn@strangecode.com>
-* @version  1.0
+* @version  1.1
 * @since    14 Jun 2006 23:10:45
 */
 
-
 /********************************************************************
-* STARTUP
+* CONFIG
 ********************************************************************/
 
-$this_script = basename($_SERVER['argv'][0]);
+require_once dirname(__FILE__) . '/_config.inc.php';
 
 // Give them a fighting chance. Show the help message. ;P
@@ -41 +40 @@
     help();
 }
-
-// Make sure necessary files exist.
-define('COMMON_BASE', realpath('.'));
-$db_auth_file = false;
-$rii = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(COMMON_BASE));
-$rii->setMaxDepth(2);
-foreach ($rii as $filename => $file) {
-    if (mb_strpos($filename, 'db_auth.inc.php') !== false) {
-        $db_auth_file = $filename;
-        break;
-    }
-}
-if (!$db_auth_file) {
-    die(sprintf("%s error: the current directory must be common site directory (i.e. the parent directory of the document root) AND the db_auth.inc.php file must exist.\n", $this_script));
-}
-if (fileowner($db_auth_file) != getmyuid()) {
-    die(sprintf("%s error: you must execute this script as the owner of the web files.\n", $this_script));
-}
-
-// Set include path.
-ini_set('include_path', get_include_path() . PATH_SEPARATOR . COMMON_BASE);
-
-/********************************************************************
-* CONFIG
-********************************************************************/
-
-// Include core libraries.
-require_once 'codebase/lib/App.inc.php';
-require_once 'codebase/lib/Utilities.inc.php';
-
-define('_CLI', true);
-$app =& App::getInstance('module_maker');
-$app->setParam(array(
-    'site_name' => 'ACL cli',
-    'site_email' => 'codebase@strangecode.com',
-    'enable_session' => false,
-    'enable_db' => true,
-    'db_always_debug' => false,
-    'db_debug' => true,
-    'db_die_on_failure' => true,
-    'display_errors' => true,
-    'error_reporting' => E_ALL,
-    'log_file_priority' => LOG_INFO,
-    'log_screen_priority' => LOG_ERR,
-    'log_directory' => COMMON_BASE . '/log',
-    'log_filename' => 'site_log',
-));
-require_once $db_auth_file;
-
-// Start application-based functionality: database, session, environment, ini setup, etc.
-// Most configuration parameters must be set before starting the App.
-$app->start();
-
-// Global DB object. Automatically pre-configured by $app->start().
-$db =& DB::getInstance();
 
 // ACL!

trunk/lib/App.inc.php

@@ -349 +349 @@
             }
 
-            // DB credentials for CLI scripts stored in a JSON file with read rights given only to the user who will be executing the scripts: -rw-------
-            // But only if db_pass hasn't been defined yet by other means.
-            if (defined('_CLI') && !$this->getParam('db_server') && !$this->getParam('db_name') && !$this->getParam('db_user') && !$this->getParam('db_pass')) {
+            // DB credentials for CLI scripts stored in a JSON file with read rights given only to the user who will be executing the scripts: -r--------
+            // But not if all DB credentials have been defined already by other means.
+            if (defined('_CLI') && (!$this->getParam('db_server') || !$this->getParam('db_name') || !$this->getParam('db_user') || !$this->getParam('db_pass'))) {
                 if (false !== $db_auth_file = stream_resolve_include_path($this->getParam('db_auth_file'))) {
                     if (is_readable($db_auth_file)) {

trunk/lib/DB.inc.php

@@ -378 +378 @@
     public function columnExists($table, $columns, $strict=true, $use_cached_results=true)
     {
-        if (!$this->_connected) {
+        $app =& App::getInstance();
+
+        if (!$this->_connected) {
+            $app->logMsg(sprintf('No DB connection to run %s', __METHOD__), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
@@ -384 +387 @@
         // Ensure the table exists.
         if (!$this->tableExists($table, $use_cached_results)) {
+            $app->logMsg(sprintf('Table does not exist: %s', $table), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }

trunk/lib/Utilities.inc.php

@@ -1091 +1091 @@
     $val = removeSignature($signed_val);
     // If the signed value matches the original signed value we consider the value safe.
-    if ($signed_val == addSignature($val, $salt, $length)) {
+    if ('' != $signed_val && $signed_val == addSignature($val, $salt, $length)) {
         // Signature verified.
         return true;

trunk/lib/Version.inc.php

@@ -53 +53 @@
         // This value is overwritten by the $app->getParam('db_create_tables') setting if it is available.
         'create_table' => true,
+
         // If true, makes an exact comparison of saved vs. live table schemas. If false, just checks that the saved columns are available.
         'db_schema_strict' => true,