Changeset 7648

Show
Ignore:
Timestamp:
05/06/09 17:20:45 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 7609-7610,7612-7622 via svnmerge from
http://svn.freepbx.org/modules/branches/2.6

........

r7609 | p_lindheimer | 2009-05-02 08:59:29 -0700 (Sat, 02 May 2009) | 1 line


changes to warning msg, moved to Tools tab, System Administration

........

r7610 | p_lindheimer | 2009-05-02 09:00:19 -0700 (Sat, 02 May 2009) | 1 line


Module Publish Script: weakpasswords 2.5.0.2

........

r7621 | p_lindheimer | 2009-05-02 10:55:42 -0700 (Sat, 02 May 2009) | 1 line


closes #3645 use tail -n instead of --lines to be POSIX compliant

........

r7622 | p_lindheimer | 2009-05-02 11:04:09 -0700 (Sat, 02 May 2009) | 1 line


fixes #3640 hardcoded path

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.5

    • Property svnmerge-integrated changed from /modules/branches/2.4:1-5852,5908 /modules/branches/2.6:1-7080,7132,7158-7174,7177,7179-7186,7191-7202,7204-7226,7228-7250,7252-7273,7279-7286,7289-7292,7294-7295,7297-7312,7317-7331,7333-7340,7411,7413,7415-7417,7419-7420,7423-7434,7438-7439,7441-7442,7444-7446,7458-7469,7553,7611 to /modules/branches/2.4:1-5852,5908 /modules/branches/2.6:1-7080,7132,7158-7174,7177,7179-7186,7191-7202,7204-7226,7228-7250,7252-7273,7279-7286,7289-7292,7294-7295,7297-7312,7317-7331,7333-7340,7411,7413,7415-7417,7419-7420,7423-7434,7438-7439,7441-7442,7444-7446,7458-7469,7553,7609-7622

  • modules/branches/2.5/backup/bin/ampbackup.pl

    r7342 r7648  
    199199    $config_files .= "/etc/zaptel.conf" if -r "/etc/zaptel.conf"; 
    200200    $config_files .= "/etc/dahdi" if -r "/etc/dahdi"; 
    201     system ("/bin/tar -Pcz -f /tmp/ampbackups.$Stamp/configurations.tar.gz ".$ast{'astvarlibdir'}."/agi-bin/ ".$ast{'astvarlibdir'}."/bin/ /etc/asterisk $webroot/admin /etc/amportal.conf $config_files /tmp/ampbackups.$Stamp/astdb.dump "); 
     201    system ("/bin/tar -Pcz -f /tmp/ampbackups.$Stamp/configurations.tar.gz ".$ast{'astvarlibdir'}."/agi-bin/ ".$ast{'astvarlibdir'}."/bin/ ". 
     202        $User_Preferences{"ASTETCDIR"}." $webroot/admin /etc/amportal.conf $config_files /tmp/ampbackups.$Stamp/astdb.dump "); 
    202203 
    203204    if ($provroot ne "") { 

  • modules/branches/2.5/backup/module.xml

    r7358 r7648  
    1313  </depends> 
    1414  <changelog> 
    15     *2.5.1.6* localization updates 
     15    *2.5.1.6* #3640, localization updates 
    1616    *2.5.1.5* #3323 backup fails if zaptel.conf or dahdi directory not present 
    1717    *2.5.1.4* #3238, spelling 

  • modules/branches/2.5/logfiles/module.xml

    r7382 r7648  
    44  <version>2.5.0.1</version> 
    55  <changelog> 
    6     *2.5.0.1* localization updates 
     6    *2.5.0.1* #3645, localization updates 
    77    *2.5.0* #2776: filter out potentially bad html tags from log file 
    88    *2.4.0* bumped for 2.4 

  • modules/branches/2.5/logfiles/page.logfiles.php

    r6030 r7648  
    1919    <hr><br> 
    2020    <?php 
    21     system ('tail --line=2000 '.$amp_conf['ASTLOGDIR'].'/full | sed -e "s,<,\&lt;,g;s,>,\&gt;,g;s/$/<br>/"');  
     21    system ('tail -n2000 '.$amp_conf['ASTLOGDIR'].'/full | sed -e "s,<,\&lt;,g;s,>,\&gt;,g;s/$/<br>/"');  
    2222    break; 
    2323 

  • modules/branches/2.5/weakpasswords

    • Property lastpublish set to 7609

  • modules/branches/2.5/weakpasswords/functions.inc.php

    r7517 r7648  
    1313 
    1414function weakpasswords_get_config($engine) { 
    15         switch($engine) { 
    16                 case "asterisk": 
     15 switch($engine) { 
     16   case "asterisk": 
    1717      // Clear all weak password notifications 
    1818      $nt = notifications::create($db); 
    …… 
    2626      $weak = weakpasswords_get_users(); 
    2727      if(sizeof($weak) > 0)  { 
    28         $extended_text = _("Warning: The use of SIP/IAX passwords that are weak can allow hackers to make brute force registrations and possibly make calls through your PBX.  It is strongly recommended, you choose strong secrets.")."<br>";  
     28        $extended_text = _("Warning: The use of weak SIP/IAX passwords can compromise this system resulting in toll theft of your telephony service.  You should change the reported devices and trunks to use strong secrets.")."<br /><br />";  
    2929        $count = 0; 
    3030        foreach($weak as $details)  { 
    31           $extended_text .= sprintf(_("%s %s has a weak secret of %s: %s<br>"), $details['deviceortrunk'], $details['name'], $details['secret'], $details['message']); 
     31          $extended_text .= sprintf(_("%s: %s / secret: %s => %s<br>"), $details['deviceortrunk'], $details['name'], $details['secret'], $details['message']); 
    3232          $count++; 
    3333        } 
    34         $nt->add_security("weakpasswords", "all", $count." "._("extensions/trunks has weak secrets"),$extended_text); 
    35  
    36  
     34        if ($count == 1) { 
     35          $nt->add_security("weakpasswords", "all", $count." "._("extension/trunk has weak secret"),$extended_text); 
     36        } else { 
     37          $nt->add_security("weakpasswords", "all", $count." "._("extensions/trunks have weak secrets"),$extended_text); 
     38        } 
    3739      } 
    3840    break; 

  • modules/branches/2.5/weakpasswords/module.xml

    r7517 r7648  
    22  <rawname>weakpasswords</rawname> 
    33  <name>Weak Password Detection</name> 
    4   <version>2.5.0.1</version> 
    5   <type>setup</type> 
    6   <category>Internal Options &amp; Configuration</category> 
     4  <version>2.5.0.2</version> 
     5  <type>tool</type> 
     6  <category>System Administration</category> 
    77  <changelog> 
     8    *2.5.0.2* changes to warning msg, moved to Tools tab, System Administration 
    89    *2.5.0.1* Consolidated individual security notices to a single notice with all details in extended text 
    910    *2.5.0.0* Initial release 
    …… 
    1718    <weakpasswords>Weak Password Detection</weakpasswords> 
    1819  </menuitems> 
    19   <location>release/2.5/weakpasswords-2.5.0.0.tgz</location> 
    20   <md5sum>1</md5sum> 
     20  <location>release/2.6/weakpasswords-2.5.0.2.tgz</location> 
     21  <md5sum>78813c6862ab3f471ee0dbda1de10da1</md5sum> 
    2122</module>