From 9c79079e9cd5c53b61209bed6754ac6c06bbbda2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 07 May 2015 07:52:47 -0400
Subject: [PATCH] Backported password generator patch
---
interface/lib/classes/auth.inc.php | 158 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 114 insertions(+), 44 deletions(-)
diff --git a/interface/lib/classes/auth.inc.php b/interface/lib/classes/auth.inc.php
index 1002bd6..13dde9b 100644
--- a/interface/lib/classes/auth.inc.php
+++ b/interface/lib/classes/auth.inc.php
@@ -33,41 +33,50 @@
public function get_user_id()
{
- return $_SESSION['s']['user']['userid'];
+ global $app;
+ return $app->functions->intval($_SESSION['s']['user']['userid']);
}
-
+
public function is_admin() {
if($_SESSION['s']['user']['typ'] == 'admin') {
return true;
} else {
return false;
}
- }
+ }
- public function has_clients($userid) {
- global $app, $conf;
-
- $userid = intval($userid);
- $client = $app->db->queryOneRecord("SELECT client.limit_client FROM sys_user, client WHERE sys_user.userid = $userid AND sys_user.client_id = client.client_id");
- if($client['limit_client'] > 0) {
+ public function is_superadmin() {
+ if($_SESSION['s']['user']['typ'] == 'admin' && $_SESSION['s']['user']['userid'] == 1) {
return true;
} else {
return false;
}
}
-
+
+ public function has_clients($userid) {
+ global $app, $conf;
+
+ $userid = $app->functions->intval($userid);
+ $client = $app->db->queryOneRecord("SELECT client.limit_client FROM sys_user, client WHERE sys_user.userid = $userid AND sys_user.client_id = client.client_id");
+ if($client['limit_client'] != 0) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
//** This function adds a given group id to a given user.
- public function add_group_to_user($userid,$groupid) {
+ public function add_group_to_user($userid, $groupid) {
global $app;
-
- $userid = intval($userid);
- $groupid = intval($groupid);
-
+
+ $userid = $app->functions->intval($userid);
+ $groupid = $app->functions->intval($groupid);
+
if($userid > 0 && $groupid > 0) {
$user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE userid = $userid");
- $groups = explode(',',$user['groups']);
- if(!in_array($groupid,$groups)) $groups[] = $groupid;
- $groups_string = implode(',',$groups);
+ $groups = explode(',', $user['groups']);
+ if(!in_array($groupid, $groups)) $groups[] = $groupid;
+ $groups_string = implode(',', $groups);
$sql = "UPDATE sys_user SET groups = '$groups_string' WHERE userid = $userid";
$app->db->query($sql);
return true;
@@ -81,32 +90,35 @@
{
global $app;
- // simple query cache
- if($this->client_limits===null)
- $this->client_limits = $app->db->queryOneRecord("SELECT client.* FROM sys_user, client WHERE sys_user.userid = $userid AND sys_user.client_id = client.client_id");
+ $userid = $app->functions->intval($userid);
+ if(!preg_match('/^[a-zA-Z0-9\-\_]{1,64}$/',$limitname)) $app->error('Invalid limit name '.$limitname);
+ // simple query cache
+ if($this->client_limits===null)
+ $this->client_limits = $app->db->queryOneRecord("SELECT client.* FROM sys_user, client WHERE sys_user.userid = $userid AND sys_user.client_id = client.client_id");
+
// isn't client -> no limit
if(!$this->client_limits)
return -1;
-
+
if(isset($this->client_limits['limit_'.$limitname])) {
return $this->client_limits['limit_'.$limitname];
- }
- }
-
+ }
+ }
+
//** This function removes a given group id from a given user.
- public function remove_group_from_user($userid,$groupid) {
+ public function remove_group_from_user($userid, $groupid) {
global $app;
-
- $userid = intval($userid);
- $groupid = intval($groupid);
-
+
+ $userid = $app->functions->intval($userid);
+ $groupid = $app->functions->intval($groupid);
+
if($userid > 0 && $groupid > 0) {
$user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE userid = $userid");
- $groups = explode(',',$user['groups']);
- $key = array_search($groupid,$groups);
+ $groups = explode(',', $user['groups']);
+ $key = array_search($groupid, $groups);
unset($groups[$key]);
- $groups_string = implode(',',$groups);
+ $groups_string = implode(',', $groups);
$sql = "UPDATE sys_user SET groups = '$groups_string' WHERE userid = $userid";
$app->db->query($sql);
return true;
@@ -114,25 +126,83 @@
return false;
}
}
-
+
public function check_module_permissions($module) {
// Check if the current user has the permissions to access this module
- if(!stristr($_SESSION["s"]["user"]["modules"],$module)) {
+ $user_modules = explode(',',$_SESSION["s"]["user"]["modules"]);
+ if(!in_array($module,$user_modules)) {
// echo "LOGIN_REDIRECT:/index.php";
header("Location: /index.php");
exit;
}
}
- public function get_random_password($length = 8) {
- $base64_alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
- $password = '';
- for ($n=0;$n<$length;$n++) {
- $password.=$base64_alphabet[mt_rand(0,63)];
- }
- return $password;
- }
+ public function check_security_permissions($permission) {
+ global $app;
+
+ $app->uses('getconf');
+ $security_config = $app->getconf->get_security_config('permissions');
+
+ $security_check = false;
+ if($security_config[$permission] == 'yes') $security_check = true;
+ if($security_config[$permission] == 'superadmin' && $app->auth->is_superadmin()) $security_check = true;
+ if($security_check !== true) {
+ $app->error($app->lng('security_check1_txt').' '.$permission.' '.$app->lng('security_check2_txt'));
+ }
+
+ }
+
+ public function get_random_password($minLength = 8, $special = false) {
+ $minLength = $minLength || 10;
+ if($minLength < 8) $minLength = 8;
+ $maxLength = $minLength + 5;
+ $length = mt_rand($minLength, $maxLength);
+
+ $alphachars = "abcdefghijklmnopqrstuvwxyz";
+ $upperchars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ $numchars = "1234567890";
+ $specialchars = "!@#_";
+
+ $num_special = 0;
+ if($special == true) {
+ $num_special = intval(mt_rand(0, round($length / 4))) + 1;
+ }
+ $numericlen = mt_rand(1, 2);
+ $alphalen = $length - $num_special - $numericlen;
+ $upperlen = intval($alphalen / 2);
+ $alphalen = $alphalen - $upperlen;
+ $password = '';
+
+ for($i = 0; $i < $alphalen; $i++) {
+ $password .= substr($alphachars, mt_rand(0, strlen($alphachars) - 1), 1);
+ }
+
+ for($i = 0; $i < $upperlen; $i++) {
+ $password .= substr($upperchars, mt_rand(0, strlen($upperchars) - 1), 1);
+ }
+
+ for($i = 0; $i < $num_special; $i++) {
+ $password .= substr($specialchars, mt_rand(0, strlen($specialchars) - 1), 1);
+ }
+
+ for($i = 0; $i < $numericlen; $i++) {
+ $password .= substr($numchars, mt_rand(0, strlen($numchars) - 1), 1);
+ }
+
+ return str_shuffle($password);
+ }
+
+ public function crypt_password($cleartext_password) {
+ $salt="$1$";
+ $base64_alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+ for ($n=0;$n<8;$n++) {
+ $salt.=$base64_alphabet[mt_rand(0, 63)];
+ }
+ $salt.="$";
+ return crypt($cleartext_password, $salt);
+ }
+
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1