* [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 18e7404874ed3442a38cd538a7184cfc67951db1
@ 2012-01-21 19:14 git
0 siblings, 0 replies; only message in thread
From: git @ 2012-01-21 19:14 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7358 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 18e7404874ed3442a38cd538a7184cfc67951db1 (commit)
via d8799d92805d01a700afe3dad14c6dde439f42d7 (commit)
from 120cedf2852b71cd06cdacda10a18a8e7f2eeb8a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 18e7404874ed3442a38cd538a7184cfc67951db1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 21 20:13:54 2012 +0100
chpasswd.cgi: fixed for new MD5 password hashes.
commit d8799d92805d01a700afe3dad14c6dde439f42d7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 21 20:11:01 2012 +0100
Crypt-PasswdMD5: add new perl modul to use apache md5 passwords.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/Crypt-PasswdMD5 | 6 ++++++
config/rootfiles/core/56/filelists/files | 1 +
html/cgi-bin/chpasswd.cgi | 6 +++++-
lfs/{Locale-Country => Crypt-PasswdMD5} | 8 ++++----
make.sh | 1 +
5 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 config/rootfiles/common/Crypt-PasswdMD5
copy lfs/{Locale-Country => Crypt-PasswdMD5} (94%)
Difference in files:
diff --git a/config/rootfiles/common/Crypt-PasswdMD5 b/config/rootfiles/common/Crypt-PasswdMD5
new file mode 100644
index 0000000..93df4cb
--- /dev/null
+++ b/config/rootfiles/common/Crypt-PasswdMD5
@@ -0,0 +1,6 @@
+#usr/lib/perl5/site_perl/5.12.3/Crypt
+usr/lib/perl5/site_perl/5.12.3/Crypt/PasswdMD5.pm
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Crypt
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Crypt/PasswdMD5
+#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Crypt/PasswdMD5/.packlist
+#usr/share/man/man3/Crypt::PasswdMD5.3
diff --git a/config/rootfiles/core/56/filelists/files b/config/rootfiles/core/56/filelists/files
index c82a52e..26d35c5 100644
--- a/config/rootfiles/core/56/filelists/files
+++ b/config/rootfiles/core/56/filelists/files
@@ -1,6 +1,7 @@
etc/system-release
etc/issue
etc/rc.d/init.d/smartenabler
+srv/web/ipfire/cgi-bin/chpasswd.cgi
srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
srv/web/ipfire/cgi-bin/media.cgi
usr/local/bin/hddshutdown
diff --git a/html/cgi-bin/chpasswd.cgi b/html/cgi-bin/chpasswd.cgi
index 6ce8787..ae9e6ec 100644
--- a/html/cgi-bin/chpasswd.cgi
+++ b/html/cgi-bin/chpasswd.cgi
@@ -20,6 +20,7 @@
###############################################################################
use CGI qw(param);
+use Crypt::PasswdMD5;
$swroot = "/var/ipfire";
@@ -98,7 +99,10 @@ if ($cgiparams{'SUBMIT'} eq $tr{'advproxy chgwebpwd change password'})
$errormessage = $tr{'advproxy errmsg invalid user'};
goto ERROR;
}
- if (!(crypt($cgiparams{'OLD_PASSWORD'}, $cryptpwd) eq $cryptpwd))
+ if (
+ !(crypt($cgiparams{'OLD_PASSWORD'}, $cryptpwd) eq $cryptpwd) &&
+ !(apache_md5_crypt($cgiparams{'OLD_PASSWORD'}, $cryptpwd) eq $cryptpwd)
+ )
{
$errormessage = $tr{'advproxy errmsg password incorrect'};
goto ERROR;
diff --git a/lfs/Crypt-PasswdMD5 b/lfs/Crypt-PasswdMD5
new file mode 100644
index 0000000..57c88fc
--- /dev/null
+++ b/lfs/Crypt-PasswdMD5
@@ -0,0 +1,77 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
+# #
+# This program 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 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.3
+
+THISAPP = Crypt-PasswdMD5-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 368205b1be8c0d4f807afe25d6fbd1ad
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && perl Makefile.PL
+ cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 3dad5a3..dba36b4 100755
--- a/make.sh
+++ b/make.sh
@@ -571,6 +571,7 @@ buildipfire() {
ipfiremake Text-Tabs+Wrap
ipfiremake Locale-Country
ipfiremake XML-Parser
+ ipfiremake Crypt-PasswdMD5
ipfiremake python-setuptools
ipfiremake python-clientform
ipfiremake python-mechanize
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-01-21 19:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-21 19:14 [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 18e7404874ed3442a38cd538a7184cfc67951db1 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox