Revision: 6070
http://ipcop.svn.sourceforge.net/ipcop/?rev=6070&view=rev
Author: owes
Date: 2011-11-12 23:14:03 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
'move' chpasswd from https:8443 to http:81, otherwise the user trying to change
proxy password is bothered with self-signed-certificate
Added Paths:
-----------
ipcop/trunk/html/vhost81/cgi-bin/chpasswd.cgi
Removed Paths:
-------------
ipcop/trunk/html/cgi-bin/chpasswd.cgi
Deleted: ipcop/trunk/html/cgi-bin/chpasswd.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/chpasswd.cgi 2011-11-12 23:13:20 UTC (rev
6069)
+++ ipcop/trunk/html/cgi-bin/chpasswd.cgi 2011-11-12 23:14:03 UTC (rev
6070)
@@ -1,272 +0,0 @@
-#!/usr/bin/perl
-#
-# This file is part of the IPCop Firewall.
-#
-# IPCop is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# IPCop is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
-#
-# (c) 2005 marco.s - http://www.advproxy.net
-# (c) 2010-2011 The IPCop Team
-#
-# $Id$
-#
-
-use strict;
-
-# enable only the following on debugging purpose
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
-
-require '/usr/lib/ipcop/general-functions.pl';
-require '/usr/lib/ipcop/lang.pl';
-require '/usr/lib/ipcop/header.pl';
-
-my %cgiparams;
-my %proxysettings;
-
-$proxysettings{'NCSA_MIN_PASS_LEN'} = 6;
-
-### Initialize environment
-&General::readhash("/var/ipcop/proxy/settings", \%proxysettings);
-
-my $userdb = "/var/ipcop/proxy/ncsa/passwd";
-
-my @users = ();
-my @temp = ();
-
-my $success = 0;
-my $errormessage = '';
-my $username = '';
-my $cryptpwd = '';
-my $returncode = '';
-
-&General::getcgihash(\%cgiparams);
-
-if ($cgiparams{'SUBMIT'} eq $Lang::tr{'change password'})
-{
- if ($cgiparams{'USERNAME'} eq '') {
- $errormessage = $Lang::tr{'errmsg no username'};
- goto ERROR;
- }
- if (($cgiparams{'OLD_PASSWORD'} eq '') || ($cgiparams{'NEW_PASSWORD_1'} eq
'') || ($cgiparams{'NEW_PASSWORD_2'} eq '')) {
- $errormessage = $Lang::tr{'errmsg no password'};
- goto ERROR;
- }
- if (!($cgiparams{'NEW_PASSWORD_1'} eq $cgiparams{'NEW_PASSWORD_2'})) {
- $errormessage = $Lang::tr{'errmsg passwords different'};
- goto ERROR;
- }
- if (length($cgiparams{'NEW_PASSWORD_1'}) <
$proxysettings{'NCSA_MIN_PASS_LEN'}) {
- $errormessage = $Lang::tr{'errmsg password length 1'}.'
'.$proxysettings{'NCSA_MIN_PASS_LEN'}.' '.$Lang::tr{'errmsg password length 2'};
- goto ERROR;
- }
- if (! -z $userdb) {
- open FILE, $userdb;
- @users = <FILE>;
- close FILE;
-
- $username = '';
- $cryptpwd = '';
-
- foreach (@users) {
- chomp;
- @temp = split(/:/,$_);
- if ($temp[0] =~ /^$cgiparams{'USERNAME'}$/i) {
- $username = $temp[0];
- $cryptpwd = $temp[1];
- }
- }
- }
- if ($username eq '') {
- $errormessage = $Lang::tr{'errmsg invalid user'};
- goto ERROR;
- }
- if (!(crypt($cgiparams{'OLD_PASSWORD'}, $cryptpwd) eq $cryptpwd)) {
- $errormessage = $Lang::tr{'incorrect password'};
- goto ERROR;
- }
- $returncode = system("/usr/sbin/htpasswd -b $userdb $username
$cgiparams{'NEW_PASSWORD_1'}");
- if ($returncode == 0) {
- $success = 1;
- undef %cgiparams;
- }
- else {
- $errormessage = $Lang::tr{'errmsg change fail'};
- goto ERROR;
- }
-}
-
-ERROR:
-
-&Header::showhttpheaders();
-
-print <<END
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-<head>
- <title>IPCop - $Lang::tr{'change web access password'}</title>
-
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <link rel="shortcut icon" href="/favicon.ico" />
- <style type="text/css">\@import url(/include/ipcop.css);</style>
-</head>
-
-<body>
-
-<!-- IPCOP CONTENT -->
-
- <table width='100%' border='0'>
- <tr>
- <td valign='top' align='center'>
- <table width='100%' cellspacing='0' cellpadding='10' border='0'>
- <tr>
- <td align='left' valign='top'>
- <form method='post' action='/cgi-bin/chpasswd.cgi'>
- <table cellspacing='0' cellpadding='0' width='100%'
border='0'>
- <col width='18' />
- <col width='12' />
- <col width='100%' />
- <col width='145' />
- <col width='18' />
-
- <tr>
- <td width='18'><img src='/images/null.gif' width='18'
height='1' alt='' /></td>
-
- <td width='12'><img src='/images/null.gif' width='12'
height='1' alt='' /></td>
-
- <td width='100%'><img src='/images/null.gif' width='257'
height='1' alt='' /></td>
-
- <td width='145'><img src='/images/null.gif' width='145'
height='1' alt='' /></td>
-
- <td width='18'><img src='/images/null.gif' width='18'
height='1' alt='' /></td>
- </tr>
-
- <tr>
- <td colspan='2'><img src='/images/boxtop1.png' width='30'
height='53' alt='' /></td>
-
- <td style='background:
url(/images/boxtop2.png);'><b>$Lang::tr{'change web access password'}:</b></td>
-
- <td colspan='2'><img src='/images/boxtop3.png' width='163'
height='53' alt='' /></td>
- </tr>
- </table>
-
- <table cellspacing='0' cellpadding='0' width='100%' border='0'>
- <tr>
- <td style='background: url(/images/boxleft.png);'><img
src='/images/null.gif' width='18' height='1' alt='' /></td>
-
- <td colspan='3' style='background-color: #E0E0E0;'
width='100%'>
- <table width='100%' cellpadding='5'>
- <tr>
- <td align='left' valign='top'>
- <table width='100%'>
- <tr><td> </td></tr>
- <tr>
- <td width='15%' class='base'> </td>
- <td width='25%' class='base'
align='right'>$Lang::tr{'username'}:</td>
- <td width='5%'> </td>
- <td><input type='text' name='USERNAME'
size='19' maxlength='40' /></td>
- </tr>
- <tr><td> </td></tr>
- <tr>
- <td width='15%' class='base'> </td>
- <td width='25%' class='base'
align='right'>$Lang::tr{'current password'}:</td>
- <td width='5%'> </td>
- <td><input type='password' name='OLD_PASSWORD'
size='20' maxlength='128' /></td>
- </tr>
- <tr><td> </td></tr>
- <tr>
- <td width='15%' class='base'> </td>
- <td width='25%' class='base'
align='right'>$Lang::tr{'new password'}:</td>
- <td width='5%'> </td>
- <td><input type='password'
name='NEW_PASSWORD_1' size='20' maxlength='128' /></td>
- </tr>
- <tr><td> </td></tr>
- <tr>
- <td width='15%' class='base'> </td>
- <td width='25%' class='base'
align='right'>$Lang::tr{'confirm new password'}:</td>
- <td width='5%'> </td>
- <td><input type='password'
name='NEW_PASSWORD_2' size='20' maxlength='128' /></td>
- </tr>
- <tr><td> </td></tr>
- </table>
- <hr />
- <table width='100%'>
-END
-;
-
-if ($errormessage) {
- print "<tr><td width='5%'></td><td bgcolor='#CC0000'><center><b><font
color='white'>$Lang::tr{'capserror'}: $errormessage</font></b></center></td><td
width='5%'></td></tr>\n";
-}
-else {
- if ($success) {
- print "<tr><td width='5%'></td><td bgcolor='#339933'><center><b><font
color='white'>$Lang::tr{'password changed'}</font></b></center></td><td
width='5%'></td></tr>\n";
- }
- else {
- print "<tr><td><center>$Lang::tr{'web access password
hint'}</center></td></tr>\n";
- }
-}
-
-print <<END
- </table>
- <hr />
- <table width='100%'>
- <tr>
- <td class='comment1button'> </td>
-
- <td class='button1button'><input type='submit'
name='SUBMIT' value='$Lang::tr{'change password'}' /></td>
-
- <td class='onlinehelp'>
- <!--<a
href='http://www.ipcop.org/2.0.0/en/admin/html/webaccess-passwords.html'
- target='_blank'><img
src='/images/web-support.png' alt='Online Help (in English)'
- title='Online Help (in English)' /></a>-->
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
-
- <td style='background: url(/images/boxright.png);'><img
src='/images/null.gif' width='12' alt='' /></td>
- </tr>
-
- <tr>
- <td style='background:
url(/images/boxbottom1.png);background-repeat:no-repeat;'><img src=
- '/images/null.gif' width='18' height='18' alt='' /></td>
-
- <td style='background:
url(/images/boxbottom2.png);background-repeat:repeat-x;' colspan='3'><img src=
- '/images/null.gif' width='1' height='18' alt='' /></td>
-
- <td style='background:
url(/images/boxbottom3.png);background-repeat:no-repeat;'><img src=
- '/images/null.gif' width='18' height='18' alt='' /></td>
- </tr>
-
- <tr>
- <td colspan='5'><img src='/images/null.gif' width='1'
height='5' alt='' /></td>
- </tr>
- </table>
- </form>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-
-END
-;
-
-&Header::closepage('skip_connected');
Copied: ipcop/trunk/html/vhost81/cgi-bin/chpasswd.cgi (from rev 6055,
ipcop/trunk/html/cgi-bin/chpasswd.cgi)
===================================================================
--- ipcop/trunk/html/vhost81/cgi-bin/chpasswd.cgi
(rev 0)
+++ ipcop/trunk/html/vhost81/cgi-bin/chpasswd.cgi 2011-11-12 23:14:03 UTC
(rev 6070)
@@ -0,0 +1,272 @@
+#!/usr/bin/perl
+#
+# This file is part of the IPCop Firewall.
+#
+# IPCop is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# IPCop is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
+#
+# (c) 2005 marco.s - http://www.advproxy.net
+# (c) 2010-2011 The IPCop Team
+#
+# $Id$
+#
+
+use strict;
+
+# enable only the following on debugging purpose
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
+
+require '/usr/lib/ipcop/general-functions.pl';
+require '/usr/lib/ipcop/lang.pl';
+require '/usr/lib/ipcop/header.pl';
+
+my %cgiparams;
+my %proxysettings;
+
+$proxysettings{'NCSA_MIN_PASS_LEN'} = 6;
+
+### Initialize environment
+&General::readhash("/var/ipcop/proxy/settings", \%proxysettings);
+
+my $userdb = "/var/ipcop/proxy/ncsa/passwd";
+
+my @users = ();
+my @temp = ();
+
+my $success = 0;
+my $errormessage = '';
+my $username = '';
+my $cryptpwd = '';
+my $returncode = '';
+
+&General::getcgihash(\%cgiparams);
+
+if ($cgiparams{'SUBMIT'} eq $Lang::tr{'change password'})
+{
+ if ($cgiparams{'USERNAME'} eq '') {
+ $errormessage = $Lang::tr{'errmsg no username'};
+ goto ERROR;
+ }
+ if (($cgiparams{'OLD_PASSWORD'} eq '') || ($cgiparams{'NEW_PASSWORD_1'} eq
'') || ($cgiparams{'NEW_PASSWORD_2'} eq '')) {
+ $errormessage = $Lang::tr{'errmsg no password'};
+ goto ERROR;
+ }
+ if (!($cgiparams{'NEW_PASSWORD_1'} eq $cgiparams{'NEW_PASSWORD_2'})) {
+ $errormessage = $Lang::tr{'errmsg passwords different'};
+ goto ERROR;
+ }
+ if (length($cgiparams{'NEW_PASSWORD_1'}) <
$proxysettings{'NCSA_MIN_PASS_LEN'}) {
+ $errormessage = $Lang::tr{'errmsg password length 1'}.'
'.$proxysettings{'NCSA_MIN_PASS_LEN'}.' '.$Lang::tr{'errmsg password length 2'};
+ goto ERROR;
+ }
+ if (! -z $userdb) {
+ open FILE, $userdb;
+ @users = <FILE>;
+ close FILE;
+
+ $username = '';
+ $cryptpwd = '';
+
+ foreach (@users) {
+ chomp;
+ @temp = split(/:/,$_);
+ if ($temp[0] =~ /^$cgiparams{'USERNAME'}$/i) {
+ $username = $temp[0];
+ $cryptpwd = $temp[1];
+ }
+ }
+ }
+ if ($username eq '') {
+ $errormessage = $Lang::tr{'errmsg invalid user'};
+ goto ERROR;
+ }
+ if (!(crypt($cgiparams{'OLD_PASSWORD'}, $cryptpwd) eq $cryptpwd)) {
+ $errormessage = $Lang::tr{'incorrect password'};
+ goto ERROR;
+ }
+ $returncode = system("/usr/sbin/htpasswd -b $userdb $username
$cgiparams{'NEW_PASSWORD_1'}");
+ if ($returncode == 0) {
+ $success = 1;
+ undef %cgiparams;
+ }
+ else {
+ $errormessage = $Lang::tr{'errmsg change fail'};
+ goto ERROR;
+ }
+}
+
+ERROR:
+
+&Header::showhttpheaders();
+
+print <<END
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+ <title>IPCop - $Lang::tr{'change web access password'}</title>
+
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <link rel="shortcut icon" href="/favicon.ico" />
+ <style type="text/css">\@import url(/include/ipcop.css);</style>
+</head>
+
+<body>
+
+<!-- IPCOP CONTENT -->
+
+ <table width='100%' border='0'>
+ <tr>
+ <td valign='top' align='center'>
+ <table width='100%' cellspacing='0' cellpadding='10' border='0'>
+ <tr>
+ <td align='left' valign='top'>
+ <form method='post' action='/cgi-bin/chpasswd.cgi'>
+ <table cellspacing='0' cellpadding='0' width='100%'
border='0'>
+ <col width='18' />
+ <col width='12' />
+ <col width='100%' />
+ <col width='145' />
+ <col width='18' />
+
+ <tr>
+ <td width='18'><img src='/images/null.gif' width='18'
height='1' alt='' /></td>
+
+ <td width='12'><img src='/images/null.gif' width='12'
height='1' alt='' /></td>
+
+ <td width='100%'><img src='/images/null.gif' width='257'
height='1' alt='' /></td>
+
+ <td width='145'><img src='/images/null.gif' width='145'
height='1' alt='' /></td>
+
+ <td width='18'><img src='/images/null.gif' width='18'
height='1' alt='' /></td>
+ </tr>
+
+ <tr>
+ <td colspan='2'><img src='/images/boxtop1.png' width='30'
height='53' alt='' /></td>
+
+ <td style='background:
url(/images/boxtop2.png);'><b>$Lang::tr{'change web access password'}:</b></td>
+
+ <td colspan='2'><img src='/images/boxtop3.png' width='163'
height='53' alt='' /></td>
+ </tr>
+ </table>
+
+ <table cellspacing='0' cellpadding='0' width='100%' border='0'>
+ <tr>
+ <td style='background: url(/images/boxleft.png);'><img
src='/images/null.gif' width='18' height='1' alt='' /></td>
+
+ <td colspan='3' style='background-color: #E0E0E0;'
width='100%'>
+ <table width='100%' cellpadding='5'>
+ <tr>
+ <td align='left' valign='top'>
+ <table width='100%'>
+ <tr><td> </td></tr>
+ <tr>
+ <td width='15%' class='base'> </td>
+ <td width='25%' class='base'
align='right'>$Lang::tr{'username'}:</td>
+ <td width='5%'> </td>
+ <td><input type='text' name='USERNAME'
size='19' maxlength='40' /></td>
+ </tr>
+ <tr><td> </td></tr>
+ <tr>
+ <td width='15%' class='base'> </td>
+ <td width='25%' class='base'
align='right'>$Lang::tr{'current password'}:</td>
+ <td width='5%'> </td>
+ <td><input type='password' name='OLD_PASSWORD'
size='20' maxlength='128' /></td>
+ </tr>
+ <tr><td> </td></tr>
+ <tr>
+ <td width='15%' class='base'> </td>
+ <td width='25%' class='base'
align='right'>$Lang::tr{'new password'}:</td>
+ <td width='5%'> </td>
+ <td><input type='password'
name='NEW_PASSWORD_1' size='20' maxlength='128' /></td>
+ </tr>
+ <tr><td> </td></tr>
+ <tr>
+ <td width='15%' class='base'> </td>
+ <td width='25%' class='base'
align='right'>$Lang::tr{'confirm new password'}:</td>
+ <td width='5%'> </td>
+ <td><input type='password'
name='NEW_PASSWORD_2' size='20' maxlength='128' /></td>
+ </tr>
+ <tr><td> </td></tr>
+ </table>
+ <hr />
+ <table width='100%'>
+END
+;
+
+if ($errormessage) {
+ print "<tr><td width='5%'></td><td bgcolor='#CC0000'><center><b><font
color='white'>$Lang::tr{'capserror'}: $errormessage</font></b></center></td><td
width='5%'></td></tr>\n";
+}
+else {
+ if ($success) {
+ print "<tr><td width='5%'></td><td bgcolor='#339933'><center><b><font
color='white'>$Lang::tr{'password changed'}</font></b></center></td><td
width='5%'></td></tr>\n";
+ }
+ else {
+ print "<tr><td><center>$Lang::tr{'web access password
hint'}</center></td></tr>\n";
+ }
+}
+
+print <<END
+ </table>
+ <hr />
+ <table width='100%'>
+ <tr>
+ <td class='comment1button'> </td>
+
+ <td class='button1button'><input type='submit'
name='SUBMIT' value='$Lang::tr{'change password'}' /></td>
+
+ <td class='onlinehelp'>
+ <!--<a
href='http://www.ipcop.org/2.0.0/en/admin/html/webaccess-passwords.html'
+ target='_blank'><img
src='/images/web-support.png' alt='Online Help (in English)'
+ title='Online Help (in English)' /></a>-->
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+
+ <td style='background: url(/images/boxright.png);'><img
src='/images/null.gif' width='12' alt='' /></td>
+ </tr>
+
+ <tr>
+ <td style='background:
url(/images/boxbottom1.png);background-repeat:no-repeat;'><img src=
+ '/images/null.gif' width='18' height='18' alt='' /></td>
+
+ <td style='background:
url(/images/boxbottom2.png);background-repeat:repeat-x;' colspan='3'><img src=
+ '/images/null.gif' width='1' height='18' alt='' /></td>
+
+ <td style='background:
url(/images/boxbottom3.png);background-repeat:no-repeat;'><img src=
+ '/images/null.gif' width='18' height='18' alt='' /></td>
+ </tr>
+
+ <tr>
+ <td colspan='5'><img src='/images/null.gif' width='1'
height='5' alt='' /></td>
+ </tr>
+ </table>
+ </form>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+
+END
+;
+
+&Header::closepage('skip_connected');
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
