diff --git a/gosa-core/include/password-methods/class_password-methods-crypt.inc b/gosa-core/include/password-methods/class_password-methods-crypt.inc
index 2c979aa9e7188f197850bbf36008c9937a5bd3c6..518449a139da862604446451b2d4d1d371a2f249 100644 (file)
<?php
/*
- This code is part of GOsa (https://gosa.gonicus.de)
- Copyright (C) 2004 Fabian Hickert
-
- 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 2 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, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * 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 2 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
class passwordMethodCrypt extends passwordMethod
{
- function passwordMethodCrypt($config)
+ function passwordMethodCrypt($config)
{
}
+
function is_available()
{
if(function_exists("crypt")){
function generate_hash($pwd)
{
- return "{CRYPT}".crypt($pwd, substr(session_id(),0,2));
+ if ($this->hash == "crypt/standard-des"){
+ $salt = "";
+ for ($i = 0; $i < 2; $i++) {
+ $salt .= get_random_char();
+ }
+ }
+
+ if ($this->hash == "crypt/enhanced-des"){
+ $salt = "_";
+ for ($i = 0; $i < 8; $i++) {
+ $salt .= get_random_char();
+ }
+ }
+
+ if ($this->hash == "crypt/md5"){
+ $salt = "\$1\$";
+ for ($i = 0; $i < 8; $i++) {
+ $salt .= get_random_char();
+ }
+ $salt .= "\$";
+ }
+
+ if ($this->hash == "crypt/blowfish"){
+ $salt = "\$2a\$07\$";
+ for ($i = 0; $i < CRYPT_SALT_LENGTH; $i++) {
+ $salt .= get_random_char();
+ }
+ $salt .= "\$";
+ }
+
+ return "{CRYPT}".crypt($pwd, $salt);
}
function get_hash_name()
{
- return "crypt";
+ $hashes= array();
+ if (CRYPT_STD_DES == 1) {
+ $hashes[]= "crypt/standard-des";
+ }
+
+ if (CRYPT_EXT_DES == 1) {
+ $hashes[]= "crypt/enhanced-des";
+ }
+
+ if (CRYPT_MD5 == 1) {
+ $hashes[]= "crypt/md5";
+ }
+
+ if (CRYPT_BLOWFISH == 1) {
+ $hashes[]= "crypt/blowfish";
+ }
+
+ return $hashes;
+ }
+
+
+ function _extract_method($password_hash)
+ {
+ if (!preg_match('/^{crypt}/i', $password_hash)){
+ return "";
+ }
+
+ $password_hash= preg_replace('/^{[^}]+}!?/', '', $password_hash);
+
+ if (preg_match("/^[a-zA-Z0-9.\/][a-zA-Z0-9.\/]/", $password_hash)){
+ return "crypt/standard-des";
+ }
+
+ if (preg_match("/^_[a-zA-Z0-9.\/]/", $password_hash)){
+ return "crypt/enhanced-des";
+ }
+
+ if (preg_match('/^\$1\$/', $password_hash)){
+ return "crypt/md5";
+ }
+
+ if (preg_match('/^(\$2\$|\$2a\$)/', $password_hash)){
+ return "crypt/blowfish";
+ }
+
+ return "";
}
}