* [FIX] Fixed issue when searching an user groupmembership to access …

…to an account. Thanks to @basil-twisleton * [FIX] Closes #157. Fixed issue when adding LDAP users that don't have any default group/profile set, they are disabled. Thanks to @CyrosX * [FIX] Closes #154. Modified a string in the ldap template. Thanks to @tsener * [MOD] Changed default behavior when creating a new account. Now a blank form is displayed. Thanks to @basil-twisleton * [MOD] Closes #155. Extensions cannot contain other characters than "A-Z", "0-9", "_" and "-". Thanks to @tsener
nuxsmin · Oct 22, 2015 · 9451281 · 9451281
1 parent adb5d06
commit 9451281
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 19 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,11 @@
+=== ** v1.2.0.07 ===
+
+* [FIX] Fixed issue when searching an user groupmembership to access to an account. Thanks to @basil-twisleton
+* [FIX] Closes #157. Fixed issue when adding LDAP users that don't have any default group/profile set, they are disabled. Thanks to @CyrosX
+* [FIX] Closes #154. Modified a string in the ldap template. Thanks to @tsener
+* [MOD] Changed default behavior when creating a new account. Now a blank form is displayed. Thanks to @basil-twisleton
+* [MOD] Closes #155. Extensions cannot contain other characters than "A-Z", "0-9", "_" and "-". Thanks to @tsener
+
 === ** v1.2.0.06 ===
 
 * [ADD] New language translation to Catalan. Thanks to @ferrergl

diff --git a/CHANGELOG-ES b/CHANGELOG-ES
@@ -1,3 +1,11 @@
+=== ** v1.2.0.07 ===
+
+* [FIX] Arreglado error cuando se obtenía la pertenencia a grupos de un usuario para acceder a una cuenta. Thanks to @basil-twisleton
+* [FIX] Closes #157. Arreglado error cuando se añaden usuarios desde LDAP que no tienen grupo o perfil por defecto, son deshabilitados. Thanks to @CyrosX
+* [FIX] Closes #154. Modificada cadena en la plantilla de LDAP. Thanks to @tsener
+* [MOD] Cambiado comportamiento al crear una nueva cuenta. Ahora se muestra un formularion en blanco. Thanks to @basil-twisleton
+* [MOD] Closes #155. Las extensiones sólo pueden contener los siguientes caracteres: "A-Z", "0-9", "_" and "-". Thanks to @tsener
+
 === ** v1.2.0.06 ===
 
 * [ADD] Nueva traducción al catalán. Gracias a @ferrergl

diff --git a/ajax/ajax_configSave.php b/ajax/ajax_configSave.php
@@ -97,14 +97,24 @@
         $filesAllowedSize = SP\Request::analyze('files_allowed_size', 1024);
         $filesAllowedExts = SP\Request::analyze('files_allowed_exts');
 
-        SP\Config::setCacheConfigValue('files_enabled', $filesEnabled);
-        SP\Config::setCacheConfigValue('files_allowed_size', $filesAllowedSize);
-        SP\Config::setCacheConfigValue('files_allowed_exts', $filesAllowedExts);
-
         if ($filesEnabled && $filesAllowedSize >= 16384) {
             SP\Response::printJSON(_('El tamaño máximo por archivo es de 16MB'));
         }
 
+        if (!empty($filesAllowedExts)){
+            $exts = explode(',', $filesAllowedExts);
+
+            array_walk($exts, function(&$value) {
+                if (preg_match('/[^a-z0-9_-]+/i', $value)) {
+                    SP\Response::printJSON(_('Extensión no permitida'));
+                }
+            });
+        }
+
+        SP\Config::setCacheConfigValue('files_enabled', $filesEnabled);
+        SP\Config::setCacheConfigValue('files_allowed_size', $filesAllowedSize);
+        SP\Config::setCacheConfigValue('files_allowed_exts', $filesAllowedExts);
+
         // Proxy
         $proxyEnabled = SP\Request::analyze('proxy_enabled', false, false, true);
         $proxyServer = SP\Request::analyze('proxy_server');

diff --git a/inc/Acl.class.php b/inc/Acl.class.php
@@ -176,13 +176,15 @@ public static function checkAccountAccess($module, $accountData)
         $userId = Session::getUserId();
         $userIsAdminApp = Session::getUserIsAdminApp();
         $userIsAdminAcc = Session::getUserIsAdminAcc();
-        $userToGroups = false;
+        $userToGroups = in_array($userGroupId,Groups::getUsersForGroup($accountData['group_id']));
 
-        foreach($accountData['groups_id'] as $groupId){
-            $users = Groups::getUsersForGroup($groupId);
+        if ($userToGroups === false) {
+            foreach ($accountData['groups_id'] as $groupId) {
+                $users = Groups::getUsersForGroup($groupId);
 
-            if ($userGroupId === $groupId || in_array($userId, $users)){
-                $userToGroups = true;
+                if ($userGroupId === $groupId || in_array($userId, $users)) {
+                    $userToGroups = true;
+                }
             }
         }
 

diff --git a/inc/UserLdap.class.php b/inc/UserLdap.class.php
@@ -65,10 +65,10 @@ public static function newUserLDAP(User $User)
         $data['pass'] = $passdata['pass'];
         $data['hashSalt'] = $passdata['salt'];
         $data['email'] = $User->getUserEmail();
-        $data['notes'] = 'LDAP';
+        $data['notes'] = _('Usuario de LDAP');
         $data['groupId'] = $groupId;
         $data['profileId'] = $profileId;
-        $data['isDisabled'] = ($groupId && $profileId);
+        $data['isDisabled'] = (int)($groupId && $profileId);
 
         if (DB::getQuery($query, __FUNCTION__, $data) === false) {
             return false;

diff --git a/inc/Util.class.php b/inc/Util.class.php
@@ -309,7 +309,7 @@ public static function curlIsAvailable()
      */
     public static function getVersion($retBuild = false)
     {
-        $build = '06';
+        $build = '07';
         $version = array(1, 2, 0);
 
         if ($retBuild) {

diff --git a/inc/themes/material-blue/css/styles.min.css b/inc/themes/material-blue/css/styles.min.css
diff --git a/inc/themes/material-blue/ldap.inc b/inc/themes/material-blue/ldap.inc
@@ -83,7 +83,7 @@
                             <input id="ldap_binduser" name="ldap_binduser" type="text"
                                    class="mdl-textfield__input fg-blue100"
                                    maxlength="128" value="<?php echo $ldapBindUser; ?>" <?php echo $isDisabled; ?>/>
-                            <label class="mdl-textfield__label" for="ldap_binduser"><?php echo _('Servidor'); ?></label>
+                            <label class="mdl-textfield__label" for="ldap_binduser"><?php echo _('Usuario'); ?></label>
                         </div>
                     </td>
                 </tr>

diff --git a/inc/themes/material-blue/searchbox.inc b/inc/themes/material-blue/searchbox.inc
@@ -1,6 +1,6 @@
-<div id="searchbox">
+<div id="searchbox" class="round shadow">
     <form method="post" name="frmSearch" id="frmSearch" OnSubmit="return sysPassUtil.Common.accSearch(0);">
-        <div id="tblTools" class="round shadow">
+        <div id="tblTools">
             <div id="toolsLeft">
                 <i id="btnClear" class="material-icons" title="<?php echo _('Limpiar'); ?>">clear_all</i>
 

diff --git a/js/functions.js b/js/functions.js
@@ -473,6 +473,8 @@ sysPass.Util.Common = function () {
 
                     if (action && id) {
                         doAction(action, 1, id);
+                    } else if (action) {
+                        doAction(action, 1);
                     }
                 } else if (status === 10) {
                     doLogout();

diff --git a/js/functions.min.js b/js/functions.min.js
diff --git a/web/AccountC.class.php b/web/AccountC.class.php
@@ -152,7 +152,7 @@ public function getNewAccount()
             )
         );
         $this->view->assign('showform', true);
-        $this->view->assign('nextaction', Acl::ACTION_ACC_SEARCH);
+        $this->view->assign('nextaction', Acl::ACTION_ACC_NEW);
 
         Session::setLastAcountId(0);
         $this->setCommonData();

diff --git a/web/UsersMgmtC.class.php b/web/UsersMgmtC.class.php
@@ -315,8 +315,8 @@ public function getUser()
         $this->_module = self::ACTION_USR_USERS;
         $this->view->addTemplate('users');
 
-        $this->view->assign('isDisabled', ($this->view->isDemo || $this->view->actionId === self::ACTION_USR_USERS_VIEW) ? 'disabled' : '');
         $this->view->assign('user', UserUtil::getUserData($this->view->itemId));
+        $this->view->assign('isDisabled', (($this->view->user['user_login'] === 'demo' && $this->view->isDemo) || $this->view->actionId === self::ACTION_USR_USERS_VIEW) ? 'disabled' : '');
         $this->view->assign('groups', DB::getValuesForSelect('usrGroups', 'usergroup_id', 'usergroup_name'));
         $this->view->assign('profiles', DB::getValuesForSelect('usrProfiles', 'userprofile_id', 'userprofile_name'));
         $this->view->assign('ro', ($this->view->user['checks']['user_isLdap']) ? 'READONLY' : '');