Changeset 661

Show
Ignore:
Timestamp:
06/20/07 19:25:46 (1 year ago)
Author:
raphael
Message:

Fixed #410: Undefined subroutine &main::get_file called
Improved security and removed redundant stuff
Fixed #403: Can't remove Mysql database

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/CHANGELOG

    r660 r661  
    1010|               * gui: disable stats-alias in client menu         | 
    1111\_________________________________________________________________/ 
     12 
     132007-06-19 Raphael Geissert 
     14        - INSTALLATION: 
     15                * Fixed #410: Undefined subroutine &main::get_file called 
     16        - GUI: 
     17                * Improved security and removed redundant stuff 
     18                * Fixed #403: Can't remove Mysql database 
    1219 
    13202007-06-18 Raphael Geissert 
  • trunk/engine/ispcp-db-keys.pl

    r659 r661  
    11 
    2 $main::db_pass_key = '{KEY}'; 
     2$main::db_pass_key = '{XXXXXXXXXXXXXXKEYXXXXXXXXXXXXX}'; 
    33 
    4 $main::db_pass_iv = '{IV}'; 
     4$main::db_pass_iv = '{XXIVXX}'; 
    55 
    66return 1; 
  • trunk/gui/admin/add_reseller.php

    r653 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 
  • trunk/gui/admin/add_user.php

    r645 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 
     
    2828$tpl -> define_dynamic('page_message', 'page'); 
    2929 
    30 global $cfg; 
    3130$theme_color = $cfg['USER_INITIAL_THEME']; 
    3231 
     
    215214    global $sql; 
    216215 
    217     $username= clean_input($_POST['username']); 
     216    if (chk_username($_POST['username'])) { 
     217 
     218        set_page_message( tr("Incorrect username range or syntax!")); 
     219 
     220        return false; 
     221    } 
     222    if (chk_password($_POST['pass'])) { 
     223 
     224        set_page_message( tr("Incorrect password range or syntax!")); 
     225 
     226        return false; 
     227    } 
     228    if ($_POST['pass'] != $_POST['pass_rep']) { 
     229 
     230        set_page_message( tr("Entered passwords does not match!")); 
     231 
     232        return false; 
     233    } 
     234    if (chk_email($_POST['email'])) { 
     235 
     236        set_page_message( tr("Incorrect email range or syntax!")); 
     237 
     238        return false; 
     239    } 
    218240 
    219241    $query = <<<SQL_QUERY 
     
    227249SQL_QUERY; 
    228250 
    229         $rs = exec_query($sql, $query, array($username)); 
     251 
     252    $username = clean_input($_POST['username']); 
     253 
     254    $rs = exec_query($sql, $query, array($username)); 
    230255 
    231256    if($rs -> RecordCount() != 0){ 
    232257 
    233258        set_page_message(tr('This user name already exist!')); 
    234  
    235         return false; 
    236     } 
    237     if (chk_username($_POST['username'])) { 
    238  
    239         set_page_message( tr("Incorrect username range or syntax!")); 
    240  
    241         return false; 
    242     } 
    243     if (chk_password($_POST['pass'])) { 
    244  
    245         set_page_message( tr("Incorrect password range or syntax!")); 
    246  
    247         return false; 
    248     } 
    249     if ($_POST['pass'] != $_POST['pass_rep']) { 
    250  
    251         set_page_message( tr("Entered passwords does not match!")); 
    252  
    253         return false; 
    254     } 
    255     if (chk_email($_POST['email'])) { 
    256  
    257         set_page_message( tr("Incorrect email range or syntax!")); 
    258259 
    259260        return false; 
  • trunk/gui/admin/admin_log.php

    r645 r661  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 
  • trunk/gui/admin/ahp.php

    r653 r661  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525if ($cfg['HOSTING_PLANS_LEVEL'] != strtolower('admin')) { 
  • trunk/gui/admin/change_password.php

    r645 r661  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626$tpl = new pTemplate(); 
  • trunk/gui/admin/change_personal.php

    r645 r661  
    114114} 
    115115 
    116 include '../include/ispcp-lib.php'; 
     116require '../include/ispcp-lib.php'; 
    117117 
    118 check_login(); 
     118check_login(__FILE__); 
    119119 
    120120$tpl = new pTemplate(); 
  • trunk/gui/admin/change_status.php

    r474 r661  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626 
  • trunk/gui/admin/change_user_interface.php

    r474 r661  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626 
  • trunk/gui/admin/circular.php

    r649 r661  
    2222require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626$tpl = new pTemplate(); 
  • trunk/gui/admin/custom_menus.php

    r645 r661  
    291291// end site functions 
    292292 
    293 include '../include/ispcp-lib.php'; 
    294  
    295 check_login(); 
     293require '../include/ispcp-lib.php'; 
     294 
     295check_login(__FILE__); 
    296296 
    297297$tpl = new pTemplate(); 
  • trunk/gui/admin/delete_ip.php

    r649 r661  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525/* do we have a proper delete_id ? */ 
  • trunk/gui/admin/delete_lang.php

    r474 r661  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626/* do we have a proper delete_id ? */ 
  • trunk/gui/admin/delete_ticket.php

    r474 r661  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626if (isset($_GET['ticket_id']) && $_GET['ticket_id'] !== '') { 
  • trunk/gui/admin/delete_user.php

    r653 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
     20require '../include/ispcp-lib.php'; 
    2121 
    22 check_login(); 
     22check_login(__FILE__); 
    2323 
    2424/* do we have a proper delete_id ? */ 
  • trunk/gui/admin/dhp.php

    r474 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
     20require '../include/ispcp-lib.php'; 
    2121 
    22 check_login(); 
     22check_login(__FILE__); 
    2323 
    2424global $cfg; 
  • trunk/gui/admin/domain_details.php

    r645 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 
  • trunk/gui/admin/domain_statistics.php

    r645 r661  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 
  • trunk/gui/admin/edit_reseller.php

    r653 r661  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
    23  
    24 check_login(); 
     22require '../include/ispcp-lib.php'; 
     23 
     24check_login(__FILE__); 
    2525 
    2626if (isset($_GET['edit_id'])) { 
  • trunk/gui/admin/edit_user.php

    r645 r661  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
    23  
    24 check_login(); 
     22require '../include/ispcp-lib.php'; 
     23 
     24check_login(__FILE__); 
    2525 
    2626if (isset($_GET['edit_id'])) { 
  • trunk/gui/admin/ehp.php

    r653 r661  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
    23  
    24 check_login(); 
     22require '../include/ispcp-lib.php'; 
     23 
     24check_login(__FILE__); 
    2525 
    2626if ($cfg['HOSTING_PLANS_LEVEL'] != strtolower('admin')) { 
  • trunk/gui/admin/email_setup.php

    r645 r661  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626$tpl = new pTemplate(); 
  • trunk/gui/admin/hp.php

    r645 r661  
    2121 
    2222// Begin page line 
    23 include '../include/ispcp-lib.php'; 
     23require '../include/ispcp-lib.php'; 
    2424 
    25 check_login(); 
     25check_login(__FILE__); 
    2626 
    2727if ($cfg['HOSTING_PLANS_LEVEL'] != strtolower('admin')) { 
  • trunk/gui/admin/index.php

    r649 r661  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
    23  
    24 check_login(); 
     22require '../include/ispcp-lib.php'; 
     23 
     24check_login(__FILE__); 
    2525 
    2626global $cfg; 
  • trunk/gui/admin/ip_manage.php

    r645 r661  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 
  • trunk/gui/admin/ispcp_debugger.php

    r645 r661  
    453453/* END system functions */ 
    454454 
    455 include '../include/ispcp-lib.php'; 
    456  
    457 check_login(); 
     455require '../include/ispcp-lib.php'; 
     456 
     457check_login(__FILE__); 
    458458 
    459459$tpl = new pTemplate(); 
  • trunk/gui/admin/ispcp_updates.php

    r649 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
     20require '../include/ispcp-lib.php'; 
    2121 
    22 check_login(); 
     22check_login(__FILE__); 
    2323 
    2424/* BEGIN common functions */ 
  • trunk/gui/admin/layout.php

    r653 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424function save_layout(&$sql) { 
  • trunk/gui/admin/lostpassword.php

    r645 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
     20require '../include/ispcp-lib.php'; 
    2121 
    22 check_login(); 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 
  • trunk/gui/admin/manage_reseller_owners.php

    r645 r661  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 
  • trunk/gui/admin/manage_reseller_users.php

    r645 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 
  • trunk/gui/admin/manage_sessions.php

    r645 r661  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 
  • trunk/gui/admin/manage_users.php

    r645 r661  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626$tpl = new pTemplate(); 
  • trunk/gui/admin/migration.php

    r474 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
     20require '../include/ispcp-lib.php'; 
    2121 
    22 check_login(); 
     22check_login(__FILE__); 
    2323 
    2424$query = <<<SQL_QUERY 
     
    8484 
    8585$rs = execute_query($sql, $query); 
    86 print "Emails updated";                 
     86print "Emails updated"; 
    8787 
    8888 
  • trunk/gui/admin/multilanguage.php

    r660 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 
  • trunk/gui/admin/multilanguage_export.php

    r650 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
     20require '../include/ispcp-lib.php'; 
    2121 
    2222// Security 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525if (isset($_GET['export_lang']) && $_GET['export_lang'] !== ''){ 
  • trunk/gui/admin/reseller_statistics.php

    r645 r661  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 
  • trunk/gui/admin/reseller_user_statistics.php

    r645 r661  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 
  • trunk/gui/admin/rootkit_log.php

    r649 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
     20require '../include/ispcp-lib.php'; 
    2121 
    22 check_login(); 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 
  • trunk/gui/admin/server_day_stats.php

    r645 r661  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
    23  
    24 check_login(); 
     22require '../include/ispcp-lib.php'; 
     23 
     24check_login(__FILE__); 
    2525 
    2626$tpl = new pTemplate(); 
  • trunk/gui/admin/server_statistic.php

    r645 r661  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
    23  
    24 check_login(); 
     22require '../include/ispcp-lib.php'; 
     23 
     24check_login(__FILE__); 
    2525 
    2626$tpl = new pTemplate(); 
  • trunk/gui/admin/server_status.php

    r645 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 
  • trunk/gui/admin/server_traffic_settings.php

    r645 r661  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 
  • trunk/gui/admin/servicemode.php

    r645 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
     20require '../include/ispcp-lib.php'; 
    2121 
    22 check_login(); 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 
  • trunk/gui/admin/settings.php

    r645 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
     20require '../include/ispcp-lib.php'; 
    2121 
    22 check_login(); 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 
  • trunk/gui/admin/settings_ports.php

    r645 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 
  • trunk/gui/admin/ss_closed.php

    r645 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424if (!$cfg['ISPCP_SUPPORT_SYSTEM']) { 
  • trunk/gui/admin/support_system.php

    r645 r661  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424if (!$cfg['ISPCP_SUPPORT_SYSTEM']) { 
  • trunk/gui/admin/sysinfo.php

    r645 r661  
    4646 
    4747 
    48 include '../include/ispcp-lib.php'; 
    49  
    50 check_login(); 
     48require '../include/ispcp-lib.php'; 
     49 
     50check_login(__FILE__); 
    5151 
    5252$tpl = new pTemplate(); 
  • trunk/gui/admin/view_ticket.php

    r649 r661  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525if (!$cfg['ISPCP_SUPPORT_SYSTEM']) { 
  • trunk/keys/rpl.pl

    r660 r661  
    11#!/usr/bin/perl 
     2 
     3use FindBin; 
     4 
     5use lib "$FindBin::Bin/../engine"; 
     6require 'ispcp_common_code.pl'; 
    27 
    38use strict; 
     
    2227 
    2328my %tag_hash = ( 
    24                     '{KEY}' => $key, 
    25                     '{IV}' =>  $iv 
     29                    '{XXXXXXXXXXXXXXKEYXXXXXXXXXXXXX}' => $key, 
     30                    '{XXIVXX}' =>  $iv 
    2631                ); 
    2732 
     
    5661 
    5762return $rs if ($rs != 0); 
    58  
    59  
    60 sub gen_sys_rand_num { 
    61  
    62     my ($len) = @_; 
    63  
    64     if (!defined($len) || ($len eq '')) { 
    65  
    66         print STDERR "gen_sys_rand_num() ERROR: Undefined input data, len: |$len| !"; 
    67  
    68         return (-1, ''); 
    69  
    70     } 
    71  
    72     if (0 >= $len ) { 
    73  
    74         print STDERR "gen_sys_rand_num() ERROR: Input data length '$len' is zero or negative !"; 
    75  
    76         return (-1, ''); 
    77  
    78     } 
    79      
    80     my $rs = open(F, '<', '/dev/random'); 
    81  
    82     if (!defined($rs)) { 
    83  
    84         print STDERR "gen_sys_rand_num() ERROR: Couldn't open the pseudo-random characters generator"; 
    85  
    86         return (-1, ''); 
    87      
    88     } 
    89      
    90     my ($i, $rdata, $rc, $rci) = (0, undef, undef, undef); 
    91      
    92     while ($i < $len) { 
    93  
    94         read(F, $rc, 1); 
    95          
    96         $rci = ord($rc); 
    97          
    98         next if ($rci <= 32 || $rci >= 125 || $rci == 92 ); 
    99          
    100         $rdata .= $rc; 
    101         $rc = undef; 
    102         $i++; 
    103  
    104     } 
    105      
    106     close(F); 
    107  
    108     return (0, $rdata); 
    109  
    110 }