diff --git a/Dockerfile b/Dockerfile index 69f6bbc..2774364 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,21 +6,21 @@ RUN apt-get update && \ libfreetype6-dev \ libjpeg-dev \ libpng-dev && \ - rm -rf /var/lib/apt/lists/* && \ - ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so && \ - ln -s /usr/lib/x86_64-linux-gnu/liblber.so /usr/lib/liblber.so + rm -rf /var/lib/apt/lists/* RUN docker-php-ext-configure gd \ --enable-gd-native-ttf \ --with-freetype-dir=/usr/include/freetype2 \ --with-png-dir=/usr/include \ --with-jpeg-dir=/usr/include && \ - docker-php-ext-install -j$(nproc) ldap gd + docker-php-ext-install -j$(nproc) gd && \ + libdir=$(find /usr -name "libldap.so*" | sed -e 's/\/usr\///' -e 's/\/libldap.so//') && \ + docker-php-ext-configure ldap --with-libdir=$libdir && \ + docker-php-ext-install -j$(nproc) ldap ADD https://github.com/PHPMailer/PHPMailer/archive/v6.2.0.tar.gz /tmp -RUN a2enmod rewrite ssl -RUN a2dissite 000-default default-ssl +RUN a2enmod rewrite ssl && a2dissite 000-default default-ssl EXPOSE 80 EXPOSE 443 diff --git a/README.md b/README.md index c978208..75a6828 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -LDAP User Manager --- +# LDAP User Manager This is a PHP LDAP account manager; a web-based GUI interface which allows you to quickly populate a new LDAP directory and easily manage user accounts and groups. It also has a self-service password change module. It's designed to work with OpenLDAP and to be run as a container. It complements OpenLDAP containers such as [*osixia/openldap*](https://hub.docker.com/r/osixia/openldap/). -Features ---- +*** + +## Features * Setup wizard: this will create the necessary structure to allow you to add users and groups and will set up an initial admin user that can log into the user manager. * Group creation and management. @@ -16,27 +16,27 @@ Features * Self-service password change: non-admin users can log in to change their password. * An optional form for people to request accounts (request emails are sent to an administrator). -Screenshots ---- +*** -**Initial setup: add an administrator account**: -![administrator_setup](https://user-images.githubusercontent.com/17613683/59344224-8bb8ae80-8d05-11e9-869b-d08a44f4939d.png) - -**Add a new group**: -![new_group](https://user-images.githubusercontent.com/17613683/59344242-95421680-8d05-11e9-9a72-1f55c06dd43d.png) - -**Manage group membership**: -![group_membership](https://user-images.githubusercontent.com/17613683/59344247-97a47080-8d05-11e9-8606-0bcc40471458.png) +## Screenshots **Edit accounts**: + ![account_overview](https://user-images.githubusercontent.com/17613683/59344255-9c692480-8d05-11e9-9207-051291bafd91.png) + +**Manage group membership**: + +![group_membership](https://user-images.githubusercontent.com/17613683/59344247-97a47080-8d05-11e9-8606-0bcc40471458.png) + + **Self-service password change**: + ![self_service_password_change](https://user-images.githubusercontent.com/17613683/59344258-9ffcab80-8d05-11e9-9dc2-27dfd373fcc8.png) +*** -Quick start ---- +## Quick start ``` docker run \ @@ -53,21 +53,21 @@ docker run \ -e "LDAP_ADMIN_BIND_PWD=secret"\ -e "LDAP_IGNORE_CERT_ERRORS=true" \ -e "EMAIL_DOMAIN=ldapusermanager.org" \ - wheelybird/ldap-user-manager:v1.5 + wheelybird/ldap-user-manager:v1.6 ``` Change the variable values to suit your environment. Now go to https://lum.example.com/setup. +*** -Configuration ---- +## Configuration Configuration is via environmental variables. Please bear the following in mind: * This tool needs to bind to LDAP as a user that has the permissions to modify everything under the base DN. * This interface is designed to work with a fresh LDAP server and should only be against existing, populated LDAP directories with caution and at your own risk. -Mandatory: ----- +### Mandatory: + * `LDAP_URI`: The URI of the LDAP server, e.g. `ldap://ldap.example.com` or `ldaps://ldap.example.com` @@ -79,10 +79,9 @@ Mandatory: * `LDAP_ADMINS_GROUP`: The name of the group used to define accounts that can use this tool to manage LDAP accounts. e.g. `admins` -Optional: ----- +### Optional: -**Organisation settings** +#### Organisation settings * `SERVER_HOSTNAME` (default: *ldapusername.org*): The hostname that this interface will be served from. @@ -91,7 +90,7 @@ Optional: * `SITE_NAME` (default: *{ORGANISATION_NAME} user manager*): Change this to replace the title in the menu, e.g. "My Company Account Management". -**LDAP settings** +#### LDAP settings * `LDAP_USER_OU` (default: *people*): The name of the OU used to store user accounts (without the base DN appended). @@ -103,18 +102,24 @@ Optional: * `LDAP_TLS_CACERT` (no default): If you need to use a specific CA certificate for TLS connections to the LDAP server (when `LDAP_REQUIRE_STARTTLS` is set) then assign the contents of the CA certificate to this variable. e.g. `-e LDAP_TLS_CACERT="$( The setup wizard is primarily designed to use with a new, empty LDAP directory, though it is possible to use it with existing directories as long as you ensure you use the correct advanced LDAP settings. + +Once you've set up the initial administrator account you can log into the user manager with it and start creating other accounts. Your username to log in with is (by default) whatever you set **System username** to. See [Account names](#account-names) below if you changed the default by setting `LDAP_ACCOUNT_ATTRIBUTE`. + +*** + +## Account names + +Your login ID is whatever the *account identifier* value is for your account. By default the user manager uses the **System username** as your login; this is actually the LDAP `uid` attribute. So if your system username is `test-person`, that's what you'll use to log in with. + +The `uid` is the attribute that's normally used as the login username for systems like Linux, FreeBSD, NetBSD etc., and so is a great choice if you're using LDAP to create server accounts. +Other services or software might use the *Common Name* (`cn`) attribute, which is normally a person's full name. So you might therefore log in as `Test Person`. + +The account identifier is what uniquely identifies the account, so you can't create multiple accounts where the account identifier is the same. +You should ensure your LDAP clients use the same account identifier attribute when authenticating users. + +If you're using LDAP for server accounts then you'll find there are normally constraints on how many cahracters and the type of characters you're allowed to use. The user manager will validate user and group names against `USERNAME_REGEX`. If you don't need to be so strict then you can disable these checks by setting `ENFORCE_SAFE_SYSTEM_NAMES` to `FALSE`. + +*** + +## HTTPS certificates +When `NO_HTTPS` is set to **FALSE** (the default), the user manager expects to find SSL files at `/opt/ssl/server.key` and `/opt/ssl/server.crt`. These certificates should match `SERVER_HOSTNAME`. If these files aren't found then the startup script will create self-signed certificates based on `SERVER_HOSTNAME`. To use your own key and certificate then you need to bind-mount a directory containing them to `/opt/ssl`. You can also add a certificate chain file (the Apache `SSLCertificateChainFile` option) if needed - name it `chain.pem` and place it in the same directory as `server.key` and `server.crt` . For example, if your key and certificate files are in `/home/myaccount/ssl` you can bind-mount that folder by adding this line to the docker run example above, just after the last line starting with `-e`: ``` @@ -183,20 +223,10 @@ For example, if your key and certificate files are in `/home/myaccount/ssl` you ``` -Initial setup ---- +*** -Ideally you'll be using this against an empty LDAP directory. You can use the setup utility to create the LDAP structures that this user manager needs in order to create accounts and groups. Go to `https://{SERVER_HOSTNAME}/setup` to get started (replace `{SERVER_HOSTNAME}` with whatever you set `SERVER_HOSTNAME` to in the Docker run command). +## Sending emails -The log in password is the admin user's password (what `LDAP_ADMIN_BIND_DN` was set to). - -The setup utility will create the user and account trees, records that store the last UID and GID used when creating a user account or group, a group for admins and the initial admin account. - -![initial_setup](https://user-images.githubusercontent.com/17613683/59344213-865b6400-8d05-11e9-9d86-381d59671530.png) - - -Sending emails ---- When you create an account you'll have an option to send an email to the person you created the account for. The email will give them their new username, password and a link to the self-service password change utility. @@ -205,10 +235,11 @@ If you haven't passed in those settings or if the account you've created has no When the account is created you'll be told if the email was sent or not but be aware that just because your SMTP server accepted the email it doesn't mean that it was able to deliver it. If you get a message saying the email wasn't sent then check the logs for the error. You can increase the log level (`SMTP_LOG_LEVEL`) to above 0 in order to see SMTP debug logs. -Username format ---- +*** -When entering the user's first and last names a bit of JavaScript automatically generates the username. The way it generates is it based on a template format defined by `USERNAME_FORMAT`. This is basically a string in which predefined macros are replaced by the formatted first and/or last name. +## Username format + +When entering a person's name the system username is automatically filled-in based on a template. The template is defined in `USERNAME_FORMAT` and is a string containing predefined macros that are replaced with the relevant value. The default is `{first_name}-{last_name}` with which *Jonathan Testperson*'s username would be *jonathan-testperson*. Currently the available macros are: @@ -217,27 +248,44 @@ Currently the available macros are: * `{last_name}`: the last name in lowercase * `{last_name_initial}`: the first initial of the last name in lowercase -Anything else in the `USERNAME_FORMAT` string is left as defined, but the username is also checked for validity against `USERNAME_REGEX`. This is to ensure that there aren't any characters forbidden by other systems (i.e. email or Linux/Unix accounts). - +Anything else in the `USERNAME_FORMAT` string is left unmodified. If `ENFORCE_SAFE_SYSTEM_NAMES` is set then the username is also checked for validity against `USERNAME_REGEX`. This is to ensure that there aren't any characters forbidden when using LDAP to create server or email accounts. + If `EMAIL_DOMAIN` is set then the email address field will be automatically updated in the form of `username@email_domain`. Entering anything manually in that field will stop the automatic update of the email field. +*** -Using the RFC2307BIS schema ---- +## Extra objectClasses and attributes -The user manager will attempt detect if your LDAP server has the RFC2307BIS schema available and, if it does, use it when creating groups. This will allow you to use `memberOf` in LDAP searches which gives you an easy way to check if a user is a member of a group. For example: `(&(objectClass=posixAccount)(memberof=cn=somegroup,ou=groups,dc=ldapusermanager,dc=org))`. See [this guide](https://unofficialaciguide.com/2019/07/31/ldap-schemas-for-aci-administrators-rfc2307-vs-rfc2307bis/) for more information. +If you need to use this user manager with an existing LDAP directory and your account records need additional objectClasses and attributes then you can add them via `LDAP_ACCOUNT_ADDITIONAL_OBJECTCLASSES` and `LDAP_ACCOUNT_ADDITIONAL_ATTRIBUTES`. -With OpenLDAP this schema isn't normally available by default; you need to configure your server to use the **RFC2307BIS** schema when setting up your directory. +`LDAP_ACCOUNT_ADDITIONAL_OBJECTCLASSES` is a comma-separated list of objectClasses to add when creating the account record. For example, `LDAP_ACCOUNT_ADDITIONAL_OBJECTCLASSES=ldappublickey,couriermailaccount`. + +To add extra fields for new attributes you need to pass a comma-separated string of the attributes and optionally the label for the attribute (which will be shown on the user form) and a default value to `LDAP_ACCOUNT_ADDITIONAL_ATTRIBUTES` separated by colons (`:`). +The format for configuring an attribute is: `attribute1:label1,default_value1,attribute2:label2:default_value2`. If you don't supply a label then the form field will be labelled with the attribute name. +An example (for the couriermailaccount objectClass) would be: `mailbox:Mailbox:domain.com,quota:Mail quota:20` -If for some reason you do have the schema available but it isn't being detected then you can force it's use by setting `FORCE_RFC2307BIS` to `TRUE`. +ObjectClasses often have attributes that must have a value, so you should definitely set a default for those attributes. + +This is advanced stuff and the user manager doesn't attempt to validate any objectClasses or any attributes, labels or default values you pass in. It's up to you to ensure that your LDAP server has the appropriate schemas and that the labels and values are sane. + +*** + +## Using the RFC2307BIS schema + + +Using the **RFC2307BIS** will allow you to use `memberOf` in LDAP searches which gives you an easy way to check if a user is a member of a group. For example: `(&(objectClass=posixAccount)(memberof=cn=somegroup,ou=groups,dc=ldapusermanager,dc=org))`. + +OpenLDAP will use the RFC2307 (NIS) schema by default; you'll need to configure your server to use the **RFC2307BIS** schema when setting up your directory. See [this guide](https://unofficialaciguide.com/2019/07/31/ldap-schemas-for-aci-administrators-rfc2307-vs-rfc2307bis/) for more information regarding RFC2307 vs RFC2307BIS. +Setting up RFC2307BIS is way beyond the scope of this README, but if you plan on using [osixia/openldap](https://github.com/osixia/docker-openldap) as your LDAP server then you can easily enable the RFC2307BIS schema by setting `LDAP_RFC2307BIS_SCHEMA` to `true` during the initial setup. + +The user manager will attempt detect if your LDAP server has the RFC2307BIS schema available and, if it does, use it when creating groups. This will allow you to use `memberOf` in LDAP searches which gives you an easy way to check if a user is a member of a group. For example: `(&(objectClass=posixAccount)(memberof=cn=somegroup,ou=groups,dc=ldapusermanager,dc=org))`. + +If for some reason you do have the schema available but it isn't being detected then you can force the user manager to use it by setting `FORCE_RFC2307BIS` to `TRUE`. **Note**: if you force-enable using RFC2307BIS but your LDAP server doesn't have that schema available then creating and adding users to groups won't work and the user manager will throw errors. - -If you plan on using [osixia/openldap](https://github.com/osixia/docker-openldap) as your LDAP server you can enable the RFC2307BIS schema by setting `LDAP_RFC2307BIS_SCHEMA` to `true` during the initial setup. +*** - -Testing with an LDAP container --- +## Testing with an OpenLDAP container This will set up an OpenLDAP container you can use to test the user manager against. It uses the RFC2307BIS schema. ``` diff --git a/helm/ldap-user-manager/Chart.yaml b/helm/ldap-user-manager/Chart.yaml deleted file mode 100644 index f77bee8..0000000 --- a/helm/ldap-user-manager/Chart.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -description: A helm chart for ldap-user-manager -name: ldap-user-manager -version: 0.0.1 # Will be replaced during build -sources: -- https://github.com/wheelybird/ldap-user-manager -maintainers: -- name: Abhishek Srivastava - email: abhishekguitarist@gmail.com diff --git a/helm/ldap-user-manager/templates/deployment.yaml b/helm/ldap-user-manager/templates/deployment.yaml deleted file mode 100644 index ca25143..0000000 --- a/helm/ldap-user-manager/templates/deployment.yaml +++ /dev/null @@ -1,139 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ldap-user-manager - labels: - app: ldap-user-manager - chart: ldap-user-manager-v0.9.34 - release: ldap-user-manager - heritage: Tiller -spec: - selector: - matchLabels: - app: ldap-user-manager - release: ldap-user-manager - template: - metadata: - labels: - app: ldap-user-manager - release: ldap-user-manager - spec: - containers: - - name: ldap-user-manager - image: {{ .Values.image.repository | quote }} - imagePullPolicy: {{ .Values.image.pullPolicy | quote }} - ports: - - name: http - containerPort: {{ .Values.service.httpPort }} - protocol: TCP - - name: https - containerPort: {{ .Values.service.httpsPort }} - protocol: TCP - resources: - limits: - cpu: {{ .Values.resources.limits.cpu | quote }} - memory: {{ .Values.resources.limits.memory | quote }} - requests: - cpu: {{ .Values.resources.requests.cpu | quote }} - memory: {{ .Values.resources.requests.memory | quote }} - env: - - name: LDAP_URI - value: {{ .Values.ldap.URI | quote }} - - name: LDAP_BASE_DN - value: {{ .Values.ldap.baseDN | quote }} - - name: LDAP_ADMIN_BIND_DN - value: {{ .Values.ldap.adminBindDN | quote }} - - name: LDAP_ADMIN_BIND_PWD - value: {{ .Values.ldap.adminBindPassword | quote }} - - name: LDAP_ADMINS_GROUP - value: {{ .Values.ldap.adminGroups | quote }} - {{- if .Values.ldap.userOU }} - - name: LDAP_USER_OU - value: {{ .Values.ldap.userOU | quote }} - {{- end }} - - {{- if .Values.ldap.groupOU }} - - name: LDAP_GROUP_OU - value: {{ .Values.ldap.groupOU | quote }} - {{- end }} - - {{- if .Values.ldap.groupMemAttr }} - - name: LDAP_GROUP_MEMBERSHIP_ATTRIBUTE - value: {{ .Values.ldap.groupMemAttr | quote }} - {{- end }} - - {{- if .Values.ldap.groupMemUID }} - - name: LDAP_GROUP_MEMBERSHIP_USES_UID - value: {{ .Values.ldap.groupMemUID | quote }} - {{- end }} - - {{- if .Values.ldap.defaultGroup }} - - name: DEFAULT_USER_GROUP - value: {{ .Values.ldap.defaultGroup | quote }} - {{- end }} - - {{- if .Values.ldap.userShell }} - - name: DEFAULT_USER_SHELL - value: {{ .Values.ldap.userShell | quote }} - {{- end }} - - {{- if .Values.ldap.emailDomain }} - - name: EMAIL_DOMAIN - value: {{ .Values.ldap.emailDomain | quote }} - {{- end }} - - {{- if .Values.ldap.usernameFormat }} - - name: USERNAME_FORMAT - value: {{ .Values.ldap.usernameFormat | quote }} - {{- end }} - - {{- if .Values.ldap.usernameRegex }} - - name: USERNAME_REGEX - value: {{ .Values.ldap.usernameRegex | quote }} - {{- end }} - - {{- if .Values.ldap.loginTimeout }} - - name: LOGIN_TIMEOUT_MINS - value: {{ .Values.ldap.loginTimeout | quote }} - {{- end }} - - {{- if .Values.ldap.nisSchema }} - - name: LDAP_USES_NIS_SCHEMA - value: {{ .Values.ldap.nisSchema | quote }} - {{- end }} - - {{- if .Values.cert.startTLS }} - - name: LDAP_REQUIRE_STARTTLS - value: {{ .Values.cert.startTLS | quote }} - {{- end }} - - {{- if .Values.ldap.cacert }} - - name: LDAP_TLS_CACERT - value: {{ .Values.cert.cacert | quote }} - {{- end }} - - {{- if .Values.ldap.hostname }} - - name: SERVER_HOSTNAME - value: {{ .Values.service.hostname | quote }} - {{- end }} - - {{- if .Values.ldap.noHttps }} - - name: NO_HTTPS - value: {{ .Values.service.noHttps | quote }} - {{- end }} - - {{- if .Values.ldap.siteName }} - - name: SITE_NAME - value: {{ .Values.service.siteName | quote }} - {{- end }} - - {{- if .Values.service.ldapDebug }} - - name: LDAP_DEBUG - value: {{ .Values.service.ldapDebug | quote }} - {{- end }} - - {{- if .Values.service.sessionDebug }} - - name: SESSION_DEBUG - value: {{ .Values.service.sessionDebug | quote }} - {{- end }} diff --git a/helm/ldap-user-manager/templates/service.yaml b/helm/ldap-user-manager/templates/service.yaml deleted file mode 100644 index 88e9dfc..0000000 --- a/helm/ldap-user-manager/templates/service.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: ldap-user-manager - labels: - app: ldap-user-manager - chart: ldap-user-manager-v0.0.1 - release: ldap-user-manager - heritage: Tiller -spec: - ports: - - port: {{ .Values.service.httpPort }} - targetPort: 80 - protocol: TCP - name: http - - port: {{ .Values.service.httpsPort }} - targetPort: 443 - protocol: TCP - name: https - type: {{ .Values.service.type }} - selector: - app: ldap-user-manager - release: ldap-user-manager diff --git a/helm/ldap-user-manager/values.yaml b/helm/ldap-user-manager/values.yaml deleted file mode 100644 index 7a4cb0b..0000000 --- a/helm/ldap-user-manager/values.yaml +++ /dev/null @@ -1,80 +0,0 @@ -image: - pullPolicy: "IfNotPresent" - repository: "wheelybird/ldap-user-manager:v1.0" - -service: - httpPort: 5556 - httpsPort: 5557 - # Optional: - # The hostname that this interface will be served from. - hostname: "lum.mycompany.com" - ldapDebug: "TRUE" - sessionDebug: "TRUE" - - # If you set this to TRUE then the server will run in HTTP mode, without any encryption. This is insecure and should only be used for testing. - noHttps: "FALSE" - # Change this to replace the title in the menu. e.g. "My Company" - siteName: "ldapusermanager.com" - type: LoadBalancer - -resources: - requests: - cpu: "50m" - memory: "64Mi" - limits: - cpu: "50m" - memory: "64Mi" - -ldap: - # The URI of the LDAP server. e.g. ldap://ldap.example.com or ldaps://ldap.example.com - URI: "ldap://my-openldap:389" - # The base DN for your organisation. e.g. *dc=example,dc=com` - baseDN: "dc=example,dc=org" - # The DN for the user with permission to modify all records under LDAP_BASE_DN. e.g. cn=admin,dc=example,dc=com - adminBindDN: "cn=admin,dc=example,dc=org" - # The password for LDAP_ADMIN_BIND_DN - adminBindPassword: "admin" - # The name of the group used to define accounts that can use this tool to manage LDAP accounts. e.g. admins - adminGroups: "admins" - - # Optional params - # The name of the OU used to store user accounts (without the base DN appended). - # userOU: "people" - # The name of the OU used to store groups (without the base DN appended). - # groupOU: "groups" - - # The attribute used when adding a user to a group. - # groupMemAttr: "memberUID" - - # If TRUE then the entry for a member of a group will be just the username. Otherwise it's the member's full DN. - # groupMemUID: "" - # The group that new accounts are automatically added to when created. - # NOTE: If this group doesn't exist then a group is created with the same name as the username and the user is added to that group. - - # defaultGroup: "" - # The shell that will be launched when the user logs into a server. - - # userShell: "" - # If set then the email address field will be automatically populated in the form of username@email_domain). - # emailDomain: "" - # The template used to dynamically generate usernames. See the Usernames section below. - - # usernameFormat: "" - # The regular expression used to ensure a username (and group name) is valid. See the Usernames section below. - - # usernameRegex: "" - # How long before an idle session will be timed out. - - loginTimeout: "30" - nisSchema: "TRUE" - -cert: - # Optional - - # If TRUE then a TLS connection is required for this interface to work. - # If set to FALSE then the interface will work without STARTTLS, but a warning will be displayed on the page. - startTLS: "FALSE" - # If you need to use a specific CA certificate for TLS connections to the LDAP server (when LDAP_REQUIRE_STARTTLS is set), - # then assign the contents of the CA certificate to this variable. e.g. -e LDAP_TLS_CERT=$( - - - - + + + + - Username + Account name First name Last name Email @@ -68,14 +66,14 @@ $people = ldap_get_user_list($ldap_connection); $attribs){ +foreach ($people as $account_identifier => $attribs){ - $group_membership = ldap_user_group_membership($ldap_connection,$username); + $group_membership = ldap_user_group_membership($ldap_connection,$account_identifier); - print " \n $username\n"; - print " " . $people[$username]['givenname'] . "\n"; - print " " . $people[$username]['sn'] . "\n"; - print " " . $people[$username]['mail'] . "\n"; + print " \n $account_identifier\n"; + print " " . $people[$account_identifier]['givenname'] . "\n"; + print " " . $people[$account_identifier]['sn'] . "\n"; + print " " . $people[$account_identifier]['mail'] . "\n"; print " " . implode(", ", $group_membership) . "\n"; print " \n"; } diff --git a/www/account_manager/new_user.php b/www/account_manager/new_user.php index 7603094..e5e9619 100644 --- a/www/account_manager/new_user.php +++ b/www/account_manager/new_user.php @@ -6,6 +6,8 @@ include_once "web_functions.inc.php"; include_once "ldap_functions.inc.php"; include_once "module_functions.inc.php"; +$attribute_map = ldap_complete_account_attribute_array(); + if ( $_POST['setup_admin_account'] ) { $admin_setup = TRUE; @@ -34,58 +36,84 @@ $invalid_username = FALSE; $weak_password = FALSE; $invalid_email = FALSE; $disabled_email_tickbox = TRUE; +$invalid_cn = FALSE; +$invalid_account_attribute = FALSE; + +$new_account_r = array(); + +foreach ($attribute_map as $attribute => $attr_r) { + if (isset($_POST[$attribute])) { + $$attribute = filter_var($_POST[$attribute], FILTER_SANITIZE_STRING); + } + elseif (isset($attr_r['default'])) { + $$attribute = $attr_r['default']; + } + $new_account_r[$attribute] = $$attribute; +} + +## if (isset($_GET['account_request'])) { - $first_name=filter_var($_GET['first_name'], FILTER_SANITIZE_STRING); - $last_name=filter_var($_GET['last_name'], FILTER_SANITIZE_STRING); - $email=filter_var($_GET['email'], FILTER_SANITIZE_EMAIL); - $username = generate_username($first_name,$last_name); + $givenname=filter_var($_GET['first_name'], FILTER_SANITIZE_STRING); + $new_account_r['givenname'] = $givenname; - if ($email == "") { + $sn=filter_var($_GET['last_name'], FILTER_SANITIZE_STRING); + $new_account_r['sn'] = $sn; + + $uid = generate_username($first_name,$last_name); + $new_account_r['uid'] = $uid; + + if ($ENFORCE_SAFE_SYSTEM_NAMES == TRUE) { + $cn = "$givenname$sn"; + } + else { + $cn = "$givenname $sn"; + } + + $new_account_r['cn'] = $cn; + + $mail=filter_var($_GET['email'], FILTER_SANITIZE_EMAIL); + if ($mail == "") { if (isset($EMAIL_DOMAIN)) { - $email = $username . "@" . $EMAIL_DOMAIN; + $mail = $uid . "@" . $EMAIL_DOMAIN; $disabled_email_tickbox = FALSE; } } else { $disabled_email_tickbox = FALSE; } + $new_account_r['mail'] = $mail; } if (isset($_POST['create_account'])) { - $ldap_connection = open_ldap_connection(); - - $first_name = stripslashes($_POST['first_name']); - $last_name = stripslashes($_POST['last_name']); - $username = stripslashes($_POST['username']); - $password = $_POST['password']; - - if ($_POST['email']) { $email = stripslashes($_POST['email']); } - + $password = $_POST['password']; + $new_account_r['password'] = $password; + $account_identifier = $new_account_r[$LDAP["account_attribute"]]; + + if (!isset($cn) or $cn == "") { $invalid_cn = TRUE; } + if ((!isset($account_identifier) or $account_identifier == "") and $invalid_cn != TRUE) { $invalid_account_identifier = TRUE; } if ((!is_numeric($_POST['pass_score']) or $_POST['pass_score'] < 3) and $ACCEPT_WEAK_PASSWORDS != TRUE) { $weak_password = TRUE; } - if (isset($email) and !is_valid_email($email)) { $invalid_email = TRUE; } + if (isset($mail) and !is_valid_email($mail)) { $invalid_email = TRUE; } if (preg_match("/\"|'/",$password)) { $invalid_password = TRUE; } - if ($_POST['password'] != $_POST['password_match']) { $mismatched_passwords = TRUE; } - if (!preg_match("/$USERNAME_REGEX/",$username)) { $invalid_username = TRUE; } - if (isset($_POST['send_email']) and isset($email) and $EMAIL_SENDING_ENABLED == TRUE) { $send_user_email = TRUE; } + if ($password != $_POST['password_match']) { $mismatched_passwords = TRUE; } + if ($ENFORCE_SAFE_SYSTEM_NAMES == TRUE and !preg_match("/$POSIX_REGEX/",$account_identifier)) { $invalid_account_identifier = TRUE; } + if (isset($_POST['send_email']) and isset($mail) and $EMAIL_SENDING_ENABLED == TRUE) { $send_user_email = TRUE; } - - if ( isset($first_name) - and isset($last_name) - and isset($username) + if ( isset($givenname) + and isset($sn) and isset($password) and !$mismatched_passwords and !$weak_password and !$invalid_password - and !$invalid_username + and !$invalid_account_identifier + and !$invalid_cn and !$invalid_email) { $ldap_connection = open_ldap_connection(); - - $new_account = ldap_new_account($ldap_connection, $first_name, $last_name, $username, $password, $email); + $new_account = ldap_new_account($ldap_connection, $new_account_r); if ($new_account) { @@ -98,7 +126,7 @@ if (isset($_POST['create_account'])) { $mail_body = <<
-

. Unfortunately adding it to the admin group failed.

+

Unfortunately adding it to the admin group failed.

+ ?>
-

Failed to create the account.

+

Failed to create the account:

+ 
+     
+
The Common Name is required\n"; } +if ($invalid_account_identifier) { $errors.="
  • The account identifier (" . $attribute_map[$LDAP['account_attribute']]['label'] . ") is invalid.
    • \n"; } +if ($weak_password) { $errors.="
  • The password is too weak
    • \n"; } +if ($invalid_password) { $errors.="
  • The password contained invalid characters
    • \n"; } +if ($invalid_email) { $errors.="
  • The email address is invalid
    • \n"; } +if ($mismatched_passwords) { $errors.="
  • The passwords are mismatched
    • \n"; } +if ($invalid_username) { $errors.="
  • The username is invalid
    • \n"; } -if ($weak_password) { ?> +if ($errors != "") { ?>
    -

    The password is too weak.

    +

    + There were issues creating the account: +

      + +
    +

    - -
    -

    The password contained invalid characters.

    -
    - -
    -

    The email address is invalid.

    -
    - -
    -

    The passwords are mismatched.

    -
    - -
    -

    The username is invalid.

    -
    - @@ -227,19 +254,18 @@ render_js_email_generator('username','email'); -
    -

    - +

    (admin group)" ; } ?>

    +
      @@ -237,7 +241,12 @@ ldap_close($ldap_connection);
        $member\n"; + if ($group_cn == $LDAP['admins_group'] and $member == $USER_ID) { + print "
        $member
        \n"; + } + else { + print "
      • $member
        • \n"; + } } ?>
      diff --git a/www/account_manager/show_user.php b/www/account_manager/show_user.php index d5450af..2cec14f 100644 --- a/www/account_manager/show_user.php +++ b/www/account_manager/show_user.php @@ -14,71 +14,59 @@ $invalid_password = FALSE; $mismatched_passwords = FALSE; $invalid_username = FALSE; $weak_password = FALSE; +$to_update = array(); if ($SMTP['host'] != "") { $can_send_email = TRUE; } else { $can_send_email = FALSE; } -$attribute_map = array( "givenname" => "First name", - "sn" => "Last name", - "uidnumber" => "UID", - "gidnumber" => "GID", - "loginshell" => "Login shell", - "homedirectory" => "Home directory", - "mail" => "Email" - ); +$LDAP['default_attribute_map']["uidnumber"] = array("label" => "UID"); +$LDAP['default_attribute_map']["gidnumber"] = array("label" => "GID"); +$LDAP['default_attribute_map']["loginshell"] = array("label" => "Login shell"); +$LDAP['default_attribute_map']["homedirectory"] = array("label" => "Home directory"); +$LDAP['default_attribute_map']["mail"] = array("label" => "Email", "onkeyup" => "check_if_we_should_enable_sending_email();"); +$attribute_map = ldap_complete_account_attribute_array(); -$ldap_connection = open_ldap_connection(); - - -if (!isset($_POST['username']) and !isset($_GET['username'])) { +if (!isset($_POST['account_identifier']) and !isset($_GET['account_identifier'])) { ?>
      -

      The username is missing.

      +

      The account identifier is missing.

      -
      -

      The username is invalid.

      -
      - $attr_r) { - ################################################ + $$attribute = $user[0][$attribute][0]; - ### Check for updates - - if (isset($_POST['update_account'])) { - - $to_update = array(); - - foreach ($attribute_map as $key => $value) { - - if ($user[0][$key][0] != $_POST[$key]) { - $to_update[$key] = $_POST[$key]; - $user[0][$key][0] = $_POST[$key]; + if (isset($_POST['update_account']) and isset($_POST[$attribute]) and $_POST[$attribute] != $$attribute) { + $$attribute = filter_var($_POST[$attribute], FILTER_SANITIZE_STRING); + $to_update[$attribute] = $$attribute; + } + elseif (isset($attr_r['default'])) { + $$attribute = $attr_r['default']; } - } + } + $dn = $user[0]['dn']; + + + ### Update values + + if (isset($_POST['update_account'])) { if (isset($_POST['password']) and $_POST['password'] != "") { @@ -87,42 +75,53 @@ if ($ldap_search) { if ((!is_numeric($_POST['pass_score']) or $_POST['pass_score'] < 3) and $ACCEPT_WEAK_PASSWORDS != TRUE) { $weak_password = TRUE; } if (preg_match("/\"|'/",$password)) { $invalid_password = TRUE; } if ($_POST['password'] != $_POST['password_match']) { $mismatched_passwords = TRUE; } - if (!preg_match("/$USERNAME_REGEX/",$username)) { $invalid_username = TRUE; } + if ($ENFORCE_SAFE_SYSTEM_NAMES == TRUE and !preg_match("/$USERNAME_REGEX/",$account_identifier)) { $invalid_username = TRUE; } - if ( !$mismatched_passwords + if ( !$mismatched_passwords and !$weak_password and !$invalid_password ) { - $to_update['userpassword'] = ldap_hashed_password($password); - } + $to_update['userpassword'] = ldap_hashed_password($password); + } } - if (isset($_POST['send_email']) and isset($user[0]['mail'][0]) and $can_send_email == TRUE) { - $user_email = $user[0]['mail'][0]; - $first_name = $user[0]['givenname'][0]; - $last_name = $user[0]['sn'][0]; + if (array_key_exists($LDAP['account_attribute'], $to_update)) { + $new_rdn = "${LDAP['account_attribute']}=${to_update[$LDAP['account_attribute']]}"; + $renamed_entry = ldap_rename($ldap_connection, $dn, $new_rdn, $LDAP['user_dn'], true); + if ($renamed_entry) { + $dn = "${new_rdn},${LDAP['user_dn']}"; + $account_identifier = $to_update[$LDAP['account_attribute']]; + } + else { + ldap_get_option($ldap_connection, LDAP_OPT_DIAGNOSTIC_MESSAGE, $detailed_err); + error_log("$log_prefix Failed to rename the DN for ${account_identifier}: " . ldap_error($ldap_connection) . " -- " . $detailed_err,0); + } } - $updated_account = ldap_mod_replace($ldap_connection, $user[0]['dn'] , $to_update); + $updated_account = @ ldap_mod_replace($ldap_connection, $dn, $to_update); + if (!$updated_account) { + ldap_get_option($ldap_connection, LDAP_OPT_DIAGNOSTIC_MESSAGE, $detailed_err); + error_log("$log_prefix Failed to modify account details for ${account_identifier}: " . ldap_error($ldap_connection) . " -- " . $detailed_err,0); + } $sent_email_message=""; - if ($updated_account and isset($user_email)) { + if ($updated_account and isset($mail) and $can_send_email == TRUE and isset($_POST['send_email'])) { $mail_subject = "Your $ORGANISATION_NAME password has been reset."; $mail_body = << $group) { - if (is_numeric($index) and preg_match("/$USERNAME_REGEX/",$group)) { + if (is_numeric($index)) { array_push($updated_group_membership,$group); } } + if ($USER_ID == $account_identifier and !array_search($USER_ID, $updated_group_membership)){ + array_push($updated_group_membership,$LDAP["admins_group"]); + } + $groups_to_add = array_diff($updated_group_membership,$currently_member_of); $groups_to_del = array_diff($currently_member_of,$updated_group_membership); foreach ($groups_to_del as $this_group) { - ldap_delete_member_from_group($ldap_connection,$this_group,$username); + ldap_delete_member_from_group($ldap_connection,$this_group,$account_identifier); } foreach ($groups_to_add as $this_group) { - ldap_add_member_to_group($ldap_connection,$this_group,$username); + ldap_add_member_to_group($ldap_connection,$this_group,$account_identifier); } $not_member_of = array_diff($all_groups,$updated_group_membership); @@ -220,7 +222,7 @@ EoT;
      -
      +
      -

      - -
      +

      + +
        -
        • +
        • - + $value) { + foreach ($attribute_map as $attribute => $attr_r) { + $label = $attr_r['label']; + $onkeyup = $attr_r['onkeyup']; + if ($attribute == $LDAP['account_attribute']) { $label = "$label*"; } ?> -
        - -
        - > -
        +
        + +
        + >
        +
        @@ -448,6 +449,8 @@ $full_dn = $user[0]['dn'];
        +

        *The account identifier. Changing this will change the full DN.

        +
      @@ -484,7 +487,12 @@ $full_dn = $user[0]['dn'];
        $group\n"; + if ($group == $LDAP["admins_group"] and $USER_ID == $account_identifier) { + print "
        ${group}
        \n"; + } + else { + print "
      • $group
        • \n"; + } } ?>
      @@ -500,7 +508,7 @@ $full_dn = $user[0]['dn']; - +
      diff --git a/www/account_manager/test.php b/www/account_manager/test.php deleted file mode 100644 index b5e5646..0000000 --- a/www/account_manager/test.php +++ /dev/null @@ -1,26 +0,0 @@ -"; -print $schema_base_dn . "\n"; -print_r($gom_results); -print "\n\n\n\n"; -print_r($gom_r_search); -print ""; - - - -render_footer(); -?> diff --git a/www/includes/config.inc.php b/www/includes/config.inc.php index 8a7a8af..942e22b 100644 --- a/www/includes/config.inc.php +++ b/www/includes/config.inc.php @@ -2,6 +2,16 @@ $log_prefix = ""; + #Fixed + + $LDAP['account_objectclasses'] = array( 'person', 'inetOrgPerson', 'posixAccount' ); + $LDAP['default_attribute_map'] = array( "givenname" => array("label" => "First name", "onkeyup" => "update_username(); update_email(); update_cn(); check_email_validity(document.getElementById('mail').value)"), + "sn" => array("label" => "Last name", "onkeyup" => "update_username(); update_email(); update_cn(); check_email_validity(document.getElementById('mail').value)"), + "uid" => array("label" => "System username", "onkeyup" => "check_entity_name_validity(document.getElementById('uid').value,'uid_div'); update_email(); check_email_validity(document.getElementById('mail').value)"), + "cn" => array("label" => "Common Name", "onkeyup" => "auto_cn_update = false;"), + "mail" => array("label" => "Email", "onkeyup" => "auto_email_update = false; check_email_validity(document.getElementById('mail').value)") + ); + #Mandatory $LDAP['uri'] = getenv('LDAP_URI'); @@ -9,19 +19,22 @@ $LDAP['admins_group'] = getenv('LDAP_ADMINS_GROUP'); $LDAP['admin_bind_dn'] = getenv('LDAP_ADMIN_BIND_DN'); $LDAP['admin_bind_pwd'] = getenv('LDAP_ADMIN_BIND_PWD'); - + $LDAP['connection_type'] = "plain"; #Optional + $LDAP['account_attribute'] = (getenv('LDAP_ACCOUNT_ATTRIBUTE') ? getenv('LDAP_ACCOUNT_ATTRIBUTE') : 'uid'); $LDAP['group_ou'] = (getenv('LDAP_GROUP_OU') ? getenv('LDAP_GROUP_OU') : 'groups'); $LDAP['user_ou'] = (getenv('LDAP_USER_OU') ? getenv('LDAP_USER_OU') : 'people'); $LDAP['forced_rfc2307bis'] = ((strcasecmp(getenv('FORCE_RFC2307BIS'),'TRUE') == 0) ? TRUE : FALSE); + if (getenv('LDAP_ACCOUNT_ADDITIONAL_OBJECTCLASSES')) { $LDAP['account_additional_objectclasses'] = strtolower(getenv('LDAP_ACCOUNT_ADDITIONAL_OBJECTCLASSES')); } + if (getenv('LDAP_ACCOUNT_ADDITIONAL_ATTRIBUTES')) { $LDAP['account_additional_attributes'] = getenv('LDAP_ACCOUNT_ADDITIONAL_ATTRIBUTES'); } + if (getenv('LDAP_GROUP_MEMBERSHIP_ATTRIBUTE')) { $LDAP['group_membership_attribute'] = getenv('LDAP_GROUP_MEMBERSHIP_ATTRIBUTE'); } if (getenv('LDAP_GROUP_MEMBERSHIP_USES_UID') and strtoupper(getenv('LDAP_GROUP_MEMBERSHIP_USES_UID')) == TRUE ) { $LDAP['group_membership_uses_uid'] = TRUE; } - $LDAP['account_attribute'] = 'uid'; $LDAP['require_starttls'] = ((strcasecmp(getenv('LDAP_REQUIRE_STARTTLS'),'TRUE') == 0) ? TRUE : FALSE); $LDAP['ignore_cert_errors'] = ((strcasecmp(getenv('LDAP_IGNORE_CERT_ERRORS'),'TRUE') == 0) ? TRUE : FALSE); $LDAP['rfc2307bis_check_run'] = FALSE; @@ -33,8 +46,9 @@ $SITE_NAME = (getenv('SITE_NAME') ? getenv('SITE_NAME') : "$ORGANISATION_NAME user manager"); $SERVER_HOSTNAME = (getenv('SERVER_HOSTNAME') ? getenv('SERVER_HOSTNAME') : "ldapusermanager.org"); - $USERNAME_FORMAT = (getenv('USERNAME_FORMAT') ? getenv('USERNAME_FORMAT') : '{first_name}-{last_name}'); - $USERNAME_REGEX = (getenv('USERNAME_REGEX') ? getenv('USERNAME_REGEX') : '^[a-z][a-zA-Z0-9\._-]{3,32}$'); + $ENFORCE_SAFE_SYSTEM_NAMES = ((strcasecmp(getenv('ENFORCE_SAFE_SYSTEM_NAMES'),'FALSE') == 0) ? FALSE : TRUE); + $POSIX_USERNAME_FORMAT = (getenv('USERNAME_FORMAT') ? getenv('USERNAME_FORMAT') : '{first_name}-{last_name}'); + $POSIX_REGEX = (getenv('USERNAME_REGEX') ? getenv('USERNAME_REGEX') : '^[a-z][a-zA-Z0-9\._-]{3,32}$'); #We'll use the username regex for groups too. if (getenv('PASSWORD_HASH')) { $PASSWORD_HASH = strtoupper(getenv('PASSWORD_HASH')); } @@ -64,7 +78,7 @@ if (!is_numeric($SMTP['debug_level']) or $SMTP['debug_level'] >4 or $SMTP['debug_level'] <0) { $SMTP['debug_level'] = 0; } $EMAIL_DOMAIN = (getenv('EMAIL_DOMAIN') ? getenv('EMAIL_DOMAIN') : Null); - + $default_email_from_domain = ($EMAIL_DOMAIN ? $EMAIL_DOMAIN : 'ldapusermanger.org'); $EMAIL['from_address'] = (getenv('EMAIL_FROM_ADDRESS') ? getenv('EMAIL_FROM_ADDRESS') : "admin@" . $default_email_from_domain ); @@ -76,7 +90,7 @@ ### $ACCOUNT_REQUESTS_ENABLED = ((strcasecmp(getenv('ACCOUNT_REQUESTS_ENABLED'),'TRUE') == 0) ? TRUE : FALSE); -if (($EMAIL_SENDING_ENABLED == FALSE) && ($ACCOUNT_REQUESTS_ENABLED == TRUE)) { + if (($EMAIL_SENDING_ENABLED == FALSE) && ($ACCOUNT_REQUESTS_ENABLED == TRUE)) { $ACCOUNT_REQUESTS_ENABLED = FALSE; error_log("$log_prefix Config: ACCOUNT_REQUESTS_ENABLED was set to TRUE but SMTP_HOSTNAME wasn't set, so account requesting has been disabled as we can't send out the request email",0); } @@ -108,7 +122,7 @@ if (($EMAIL_SENDING_ENABLED == FALSE) && ($ACCOUNT_REQUESTS_ENABLED == TRUE)) { } if ($errors != "") { - render_header(); + render_header("Fatal errors",false); print $errors; render_footer(); exit(1); diff --git a/www/includes/ldap_functions.inc.php b/www/includes/ldap_functions.inc.php index 3149fca..dfdb178 100644 --- a/www/includes/ldap_functions.inc.php +++ b/www/includes/ldap_functions.inc.php @@ -1,12 +1,10 @@ WARNING: Insecure LDAP connection to ${LDAP['uri']}
      "; } ldap_close($ldap_connection); @@ -45,26 +43,37 @@ function open_ldap_connection() { if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix Start STARTTLS connection to ${LDAP['uri']}",0); } - $LDAP_IS_SECURE = TRUE; + $LDAP['connection_type'] = "StartTLS"; } } - - $bind_result = @ ldap_bind( $ldap_connection, $LDAP['admin_bind_dn'], $LDAP['admin_bind_pwd']); - - if ($bind_result != TRUE) { - - $this_error = "Failed to bind to ${LDAP['uri']} as ${LDAP['admin_bind_dn']}"; - if ($LDAP_DEBUG == TRUE) { $this_error .= " with password ${LDAP['admin_bind_pwd']}"; } - $this_error .= ": " . ldap_error($ldap_connection); - print "Problem: Failed to bind as ${LDAP['admin_bind_dn']}"; - error_log("$log_prefix $this_error",0); - - exit(1); - + else { + if ($LDAP_DEBUG == TRUE) { + error_log("$log_prefix Using an LDAPS encrypted connection to ${LDAP['uri']}",0); + } + $LDAP['connection_type'] = 'LDAPS'; } - elseif ($LDAP_DEBUG == TRUE) { - error_log("$log_prefix Bound to ${LDAP['uri']} as ${LDAP['admin_bind_dn']}",0); + + if ($ldap_bind == TRUE) { + + if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix Attempting to bind to ${LDAP['uri']} as ${LDAP['admin_bind_dn']}",0); } + $bind_result = @ ldap_bind( $ldap_connection, $LDAP['admin_bind_dn'], $LDAP['admin_bind_pwd']); + + if ($bind_result != TRUE) { + + $this_error = "Failed to bind to ${LDAP['uri']} as ${LDAP['admin_bind_dn']}"; + if ($LDAP_DEBUG == TRUE) { $this_error .= " with password ${LDAP['admin_bind_pwd']}"; } + $this_error .= ": " . ldap_error($ldap_connection); + print "Problem: Failed to bind as ${LDAP['admin_bind_dn']}"; + error_log("$log_prefix $this_error",0); + + exit(1); + + } + elseif ($LDAP_DEBUG == TRUE) { + error_log("$log_prefix Bound successfully as ${LDAP['admin_bind_dn']}",0); + } + } return $ldap_connection; @@ -82,37 +91,50 @@ function ldap_auth_username($ldap_connection,$username, $password) { global $log_prefix, $LDAP, $LDAP_DEBUG; $ldap_search_query="${LDAP['account_attribute']}=" . ldap_escape($username, "", LDAP_ESCAPE_FILTER); - $ldap_search = @ ldap_search( $ldap_connection, $LDAP['base_dn'], $ldap_search_query ); + if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix Running LDAP search for: $ldap_search_query"); } - if ($LDAP_DEBUG == TRUE) { "$log_prefix Running LDAP search: $ldap_search_query"; } + $ldap_search = @ ldap_search( $ldap_connection, $LDAP['user_dn'], $ldap_search_query ); if (!$ldap_search) { - error_log("$log_prefix Couldn't search for ${username}: " . ldap_error($ldap_connection),0); + error_log("$log_prefix Couldn't search for $ldap_search_query: " . ldap_error($ldap_connection),0); return FALSE; } - $result = ldap_get_entries($ldap_connection, $ldap_search); - if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix LDAP search returned ${result["count"]} records for $username",0); } + $result = @ ldap_get_entries($ldap_connection, $ldap_search); + if (!$result) { + error_log("$log_prefix Couldn't get LDAP entries for ${username}: " . ldap_error($ldap_connection),0); + return FALSE; + } + if ($LDAP_DEBUG == TRUE) { + error_log("$log_prefix LDAP search returned " . $result["count"] . " records for $ldap_search_query",0); + for ($i=1; $i==$result["count"]; $i++) { + error_log("$log_prefix ". "Entry ${i}: " . $result[$i-1]['dn'], 0); + } + } if ($result["count"] == 1) { - $auth_ldap_connection = open_ldap_connection(); - $can_bind = @ldap_bind( $auth_ldap_connection, $result[0]['dn'], $password); - ldap_close($auth_ldap_connection); + $this_dn = $result[0]['dn']; + if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix Attempting authenticate as $username by binding with ${this_dn} ",0); } + $auth_ldap_connection = open_ldap_connection(FALSE); + $can_bind = @ ldap_bind( $auth_ldap_connection, $result[0]['dn'], $password); if ($can_bind) { preg_match("/{$LDAP['account_attribute']}=(.*?),/",$result[0]['dn'],$dn_match); + if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix Able to bind as ${username}",0); } + ldap_close($auth_ldap_connection); return $dn_match[1]; - ldap_unbind($auth_ldap_connection); - if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix Able to bind as $username",0); } } else { - if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix Unable to bind as ${username}: " . ldap_error($ldap_connection),0); } + if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix Unable to bind as ${username}: " . ldap_error($auth_ldap_connection),0); } + ldap_close($auth_ldap_connection); return FALSE; } } - + elseif ($result["count"] > 1) { + if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix There was more than one entry for ${ldap_search_query} so it wasn't possible to determine which user to log in as."); } + } } @@ -289,7 +311,7 @@ function ldap_get_user_list($ldap_connection,$start=0,$entries=NULL,$sort="asc", $ldap_search = @ ldap_search($ldap_connection, "${LDAP['user_dn']}", $this_filter, $fields); $result = @ ldap_get_entries($ldap_connection, $ldap_search); - if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix: LDAP returned ${result['count']} users for ${LDAP['user_dn']} when using this filter: $this_filter",0); } + if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix LDAP returned ${result['count']} users for ${LDAP['user_dn']} when using this filter: $this_filter",0); } $records = array(); foreach ($result as $record) { @@ -316,6 +338,29 @@ function ldap_get_user_list($ldap_connection,$start=0,$entries=NULL,$sort="asc", ################################## +function fetch_id_stored_in_ldap($ldap_connection,$type="uid") { + + global $log_prefix, $LDAP, $LDAP_DEBUG; + + $filter = "(&(objectclass=device)(cn=last${type}))"; + $ldap_search = @ ldap_search($ldap_connection, "${LDAP['base_dn']}", $filter, array('serialNumber')); + $result = ldap_get_entries($ldap_connection, $ldap_search); + + $fetched_id = $result[0]['serialnumber'][0]; + + if (isset($fetched_id) and is_numeric($fetched_id)){ + return $fetched_id; + } + else { + return FALSE; + } + +} + + +################################## + + function ldap_get_highest_id($ldap_connection,$type="uid") { global $log_prefix, $LDAP, $LDAP_DEBUG, $min_uid, $min_gid; @@ -324,30 +369,28 @@ function ldap_get_highest_id($ldap_connection,$type="uid") { $this_id = $min_uid; $record_base_dn = $LDAP['user_dn']; $record_filter = "(${LDAP['account_attribute']}=*)"; - $record_attribute = array("uidNumber"); + $record_attribute = "uidnumber"; } else { $type = "gid"; $this_id = $min_gid; $record_base_dn = $LDAP['group_dn']; $record_filter = "(objectClass=posixGroup)"; - $record_attribute = array("gidNumber"); + $record_attribute = "gidnumber"; } - $filter = "(&(objectclass=device)(cn=last${type}))"; - $ldap_search = ldap_search($ldap_connection, "${LDAP['base_dn']}", $filter, array('serialNumber')); - $result = ldap_get_entries($ldap_connection, $ldap_search); + $fetched_id = fetch_id_stored_in_ldap($ldap_connection,$type); - $fetched_id = $result[0]['serialnumber'][0]; + if ($fetched_id != FALSE) { - if (isset($fetched_id) and is_numeric($fetched_id)){ - - $this_id = $fetched_id; + return($fetched_id); } else { - $ldap_search = ldap_search($ldap_connection, $record_base_dn, $record_filter, $record_attribute); + error_log("$log_prefix cn=lastGID doesn't exist so the highest $type is determined by searching through all the LDAP records.",0); + + $ldap_search = @ ldap_search($ldap_connection, $record_base_dn, $record_filter, array($record_attribute)); $result = ldap_get_entries($ldap_connection, $ldap_search); foreach ($result as $record) { @@ -371,7 +414,7 @@ function ldap_get_group_list($ldap_connection,$start=0,$entries=NULL,$sort="asc" global $log_prefix, $LDAP, $LDAP_DEBUG; $this_filter = "(&(objectclass=*)$filters)"; - $ldap_search = ldap_search($ldap_connection, "${LDAP['group_dn']}", $this_filter); + $ldap_search = @ ldap_search($ldap_connection, "${LDAP['group_dn']}", $this_filter); $result = @ ldap_get_entries($ldap_connection, $ldap_search); if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix: LDAP returned ${result['count']} groups for ${LDAP['group_dn']} when using this filter: $this_filter",0); } @@ -446,7 +489,7 @@ function ldap_get_group_members($ldap_connection,$group_name,$start=0,$entries=N } $actual_result_count = count($records); - if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix: LDAP returned $actual_result_count members of ${group_name} when using this search: $ldap_search_query and this filter: ${LDAP['group_membership_attribute']}",0); } + if ($LDAP_DEBUG == TRUE) { error_log("$log_prefix LDAP returned $actual_result_count members of ${group_name} when using this search: $ldap_search_query and this filter: ${LDAP['group_membership_attribute']}",0); } if ($actual_result_count > 0) { if ($sort == "asc") { sort($records); } else { rsort($records); } @@ -473,7 +516,7 @@ function ldap_is_group_member($ldap_connection,$group_name,$username) { if ($LDAP['rfc2307bis_check_run'] != TRUE) { $rfc2307bis_available = ldap_detect_rfc2307bis($ldap_connection); } $ldap_search_query = "(cn=" . ldap_escape($group_name, "", LDAP_ESCAPE_FILTER) . ")"; - $ldap_search = ldap_search($ldap_connection, "${LDAP['group_dn']}", $ldap_search_query); + $ldap_search = @ ldap_search($ldap_connection, "${LDAP['group_dn']}", $ldap_search_query); $result = ldap_get_entries($ldap_connection, $ldap_search); if ($LDAP['group_membership_uses_uid'] == FALSE) { @@ -503,7 +546,7 @@ function ldap_user_group_membership($ldap_connection,$username) { } $ldap_search_query = "(&(objectClass=posixGroup)(${LDAP['group_membership_attribute']}=${username}))"; - $ldap_search = ldap_search($ldap_connection, "${LDAP['group_dn']}", $ldap_search_query, array('cn')); + $ldap_search = @ ldap_search($ldap_connection, "${LDAP['group_dn']}", $ldap_search_query, array('cn')); $result = ldap_get_entries($ldap_connection, $ldap_search); $groups = array(); @@ -562,14 +605,18 @@ function ldap_new_group($ldap_connection,$group_name) { } else { error_log("$log_prefix Added new group $group_name",0); - $update_gid = @ ldap_mod_replace($ldap_connection, "cn=lastGID,${LDAP['base_dn']}", array( 'serialNumber' => $new_gid )); - if ($update_gid) { - error_log("$log_prefix Updated cn=lastGID with $new_gid",0); - return TRUE; - } - else { - error_log("$log_prefix Failed to update cn=lastGID: " . ldap_error($ldap_connection) ,0); + + $this_gid = fetch_id_stored_in_ldap($ldap_connection,"gid"); + if ($this_gid != FALSE) { + $update_gid = @ ldap_mod_replace($ldap_connection, "cn=lastGID,${LDAP['base_dn']}", array( 'serialNumber' => $new_gid )); + if ($update_gid) { + error_log("$log_prefix Updated cn=lastGID with $new_gid",0); + } + else { + error_log("$log_prefix Unable to update cn=lastGID to $new_gid - this could cause groups to share the same GID.",0); + } } + return TRUE; } } @@ -636,13 +683,69 @@ function ldap_get_gid_of_group($ldap_connection,$group_name) { ################################## -function ldap_new_account($ldap_connection,$first_name,$last_name,$username,$password,$email) { +function ldap_complete_account_attribute_array() { + + global $LDAP; + + $attribute_r = $LDAP['default_attribute_map']; + $additional_attributes_r = array(); + + if (isset($LDAP['account_additional_attributes'])) { + + $user_attribute_r = explode(",", $LDAP['account_additional_attributes']); + + foreach ($user_attribute_r as $this_attr) { + + $this_r = array(); + $kv = explode(":", $this_attr); + $attr_name = strtolower(filter_var($kv[0], FILTER_SANITIZE_STRING)); + + if (preg_match('/^[a-zA-Z0-9\-]+$/', $attr_name) == 1) { + + if (isset($kv[1]) and $kv[1] != "") { + $this_r['label'] = filter_var($kv[1], FILTER_SANITIZE_STRING); + } + else { + $this_r['label'] = $attr_name; + } + + if (isset($kv[2]) and $kv[2] != "") { + $this_r['default'] = filter_var($kv[2], FILTER_SANITIZE_STRING); + } + + $additional_attributes_r[$attr_name] = $this_r; + + } + } + + $attribute_r = array_merge($attribute_r, $additional_attributes_r); + + } + + if (! array_key_exists($LDAP['account_attribute'], $attribute_r)) { + $attribute_r = array_merge($attribute_r, array($LDAP['account_attribute'] => array("label" => "Account UID"))); + } + + return($attribute_r); + +} + + +################################## + +function ldap_new_account($ldap_connection,$account_r) { global $log_prefix, $LDAP, $LDAP_DEBUG, $DEFAULT_USER_SHELL, $DEFAULT_USER_GROUP; - if (isset($first_name) and isset($last_name) and isset($username) and isset($password)) { + if ( isset($account_r['givenname']) + and isset($account_r['sn']) + and isset($account_r['cn']) + and isset($account_r['uid']) + and isset($account_r[$LDAP['account_attribute']]) + and isset($account_r['password'])) { - $ldap_search_query = "(${LDAP['account_attribute']}=" . ldap_escape($username, "", LDAP_ESCAPE_FILTER) . ",${LDAP['user_dn']})"; + $account_identifier = $account_r[$LDAP['account_attribute']]; + $ldap_search_query = "(${LDAP['account_attribute']}=" . ldap_escape($account_identifier, "", LDAP_ESCAPE_FILTER) . ",${LDAP['user_dn']})"; $ldap_search = @ ldap_search($ldap_connection, "${LDAP['user_dn']}", $ldap_search_query); $result = @ ldap_get_entries($ldap_connection, $ldap_search); @@ -654,56 +757,64 @@ function ldap_new_account($ldap_connection,$first_name,$last_name,$username,$pas $default_gid = ldap_get_gid_of_group($ldap_connection,$DEFAULT_USER_GROUP); if (!is_numeric($default_gid)) { - $group_add = ldap_new_group($ldap_connection,$username); - $gid = ldap_get_gid_of_group($ldap_connection,$username); - $add_to_group = $username; + $group_add = ldap_new_group($ldap_connection,$account_identifier); + $gid = ldap_get_gid_of_group($ldap_connection,$account_identifier); + $add_to_group = $account_identifier; } else { $gid = $default_gid; $add_to_group = $DEFAULT_USER_GROUP; } - $hashed_pass = ldap_hashed_password($password); + $hashed_pass = ldap_hashed_password($account_r['password']); - $user_info = array( 'objectClass' => array( 'person', 'inetOrgPerson', 'posixAccount' ), - 'uid' => $username, - 'givenName' => $first_name, - 'sn' => $last_name, - 'cn' => "$first_name $last_name", - 'displayName' => "$first_name $last_name", - 'uidNumber' => $new_uid, - 'gidNumber' => $gid, - 'loginShell' => $DEFAULT_USER_SHELL, - 'homeDirectory' => "/home/$username", - 'userPassword' => $hashed_pass, - 'mail' => $email + $objectclasses = $LDAP['account_objectclasses']; + if (isset($LDAP['account_additional_objectclasses']) and $LDAP['account_additional_objectclasses'] != "") { + $objectclasses = array_merge($objectclasses, explode(",", $LDAP['account_additional_objectclasses'])); + } + + $account_attributes = array('objectClass' => $objectclasses, + 'displayName' => $account_r['givenname'] . " " . $account_r['sn'], + 'uidNumber' => $new_uid, + 'gidNumber' => $gid, + 'loginShell' => $DEFAULT_USER_SHELL, + 'homeDirectory' => "/home/" . $account_r['uid'], + 'userPassword' => $hashed_pass, ); - $add_account = @ ldap_add($ldap_connection, - "${LDAP['account_attribute']}=$username,${LDAP['user_dn']}", - $user_info - ); + unset($account_r['password']); + $account_attributes = array_merge($account_attributes, $account_r); + + $add_account = @ ldap_add($ldap_connection, + "${LDAP['account_attribute']}=$account_identifier,${LDAP['user_dn']}", + $account_attributes + ); if ($add_account) { - error_log("$log_prefix Created new account: $username",0); - ldap_add_member_to_group($ldap_connection,$add_to_group,$username); - $update_uid = @ ldap_mod_replace($ldap_connection, "cn=lastUID,${LDAP['base_dn']}", array( 'serialNumber' => $new_uid )); - if ($update_uid) { - error_log("$log_prefix Create account; Updated cn=lastUID with $new_uid",0); - return TRUE; - } - else { - error_log("$log_prefix Create account; Failed to update cn=lastUID: " . ldap_error($ldap_connection),0); - } + error_log("$log_prefix Created new account: $account_identifier",0); + ldap_add_member_to_group($ldap_connection,$add_to_group,$account_identifier); + $this_uid = fetch_id_stored_in_ldap($ldap_connection,"uid"); + if ($this_uid != FALSE) { + $update_uid = @ ldap_mod_replace($ldap_connection, "cn=lastUID,${LDAP['base_dn']}", array( 'serialNumber' => $new_uid )); + if ($update_uid) { + error_log("$log_prefix Create account; Updated cn=lastUID with $new_uid",0); + } + else { + error_log("$log_prefix Unable to update cn=lastUID to $new_uid - this could cause user accounts to share the same UID.",0); + } + } + return TRUE; } + else { - error_log("$log_prefix Create account; couldn't create the account for ${username}: " . ldap_error($ldap_connection),0); + ldap_get_option($ldap_connection, LDAP_OPT_DIAGNOSTIC_MESSAGE, $detailed_err); + error_log("$log_prefix Create account; couldn't create the account for ${account_identifier}: " . ldap_error($ldap_connection) . " -- " . $detailed_err,0); } } else { - error_log("$log_prefix Create account; Account for $username already exists",0); + error_log("$log_prefix Create account; Account for ${account_identifier} already exists",0); } } @@ -711,7 +822,6 @@ function ldap_new_account($ldap_connection,$first_name,$last_name,$username,$pas error_log("$log_prefix Create account; missing parameters",0); } - return FALSE; } @@ -760,11 +870,12 @@ function ldap_add_member_to_group($ldap_connection,$group_name,$username) { $update = @ ldap_mod_add($ldap_connection,$group_dn,$group_update); if ($update) { - error_log("$log_prefix Added $username to $group_name",0); + error_log("$log_prefix Added $username to group '$group_name'",0); return TRUE; } else { - error_log("$log_prefix Couldn't add $username to ${group_name}: " . ldap_error($ldap_connection),0); + ldap_get_option($ldap_connection, LDAP_OPT_DIAGNOSTIC_MESSAGE, $detailed_err); + error_log("$log_prefix Couldn't add $username to group '${group_name}': " . ldap_error($ldap_connection) . " -- " . $detailed_err,0); return FALSE; } @@ -775,28 +886,33 @@ function ldap_add_member_to_group($ldap_connection,$group_name,$username) { function ldap_delete_member_from_group($ldap_connection,$group_name,$username) { - global $log_prefix, $LDAP, $LDAP_DEBUG; + global $log_prefix, $LDAP, $LDAP_DEBUG, $USER_ID; - if ($LDAP['rfc2307bis_check_run'] != TRUE) { $rfc2307bis_available = ldap_detect_rfc2307bis($ldap_connection); } - - $group_dn = "cn=" . ldap_escape($group_name, "", LDAP_ESCAPE_FILTER) . ",${LDAP['group_dn']}"; - - if ($LDAP['group_membership_uses_uid'] == FALSE) { - $username = "${LDAP['account_attribute']}=$username,${LDAP['user_dn']}"; - } - - $group_update = array($LDAP['group_membership_attribute'] => $username); - $update = @ ldap_mod_del($ldap_connection,$group_dn,$group_update); - - if ($update) { - error_log("$log_prefix Removed $username from $group_name",0); - return TRUE; + if ($group_name == $LDAP['admins_group'] and $username == $USER_ID) { + error_log("$log_prefix Won't remove ${username} from ${group_name} because you're logged in as ${username} and ${group_name} is the admin group.",0); + return FALSE; } else { - error_log("$log_prefix Couldn't remove $username from ${group_name}: " . ldap_error($ldap_connection),0); - return FALSE; - } + if ($LDAP['rfc2307bis_check_run'] != TRUE) { $rfc2307bis_available = ldap_detect_rfc2307bis($ldap_connection); } + $group_dn = "cn=" . ldap_escape($group_name, "", LDAP_ESCAPE_FILTER) . ",${LDAP['group_dn']}"; + + if ($LDAP['group_membership_uses_uid'] == FALSE) { + $username = "${LDAP['account_attribute']}=$username,${LDAP['user_dn']}"; + } + + $group_update = array($LDAP['group_membership_attribute'] => $username); + $update = @ ldap_mod_del($ldap_connection,$group_dn,$group_update); + + if ($update) { + error_log("$log_prefix Removed $username from $group_name",0); + return TRUE; + } + else { + error_log("$log_prefix Couldn't remove $username from ${group_name}: " . ldap_error($ldap_connection),0); + return FALSE; + } + } } @@ -809,7 +925,7 @@ function ldap_change_password($ldap_connection,$username,$new_password) { #Find DN of user $ldap_search_query = "${LDAP['account_attribute']}=" . ldap_escape($username, "", LDAP_ESCAPE_FILTER); - $ldap_search = @ ldap_search( $ldap_connection, $LDAP['base_dn'], $ldap_search_query); + $ldap_search = @ ldap_search( $ldap_connection, $LDAP['user_dn'], $ldap_search_query); if ($ldap_search) { $result = @ ldap_get_entries($ldap_connection, $ldap_search); if ($result["count"] == 1) { diff --git a/www/includes/web_functions.inc.php b/www/includes/web_functions.inc.php index f0ac314..1cdda64 100644 --- a/www/includes/web_functions.inc.php +++ b/www/includes/web_functions.inc.php @@ -112,7 +112,7 @@ function validate_passkey_cookie() { } } } - + } else { if ( $SESSION_DEBUG == TRUE) { error_log("$log_prefix Session: orf_cookie wasn't sent by the client.",0); } @@ -244,14 +244,14 @@ function render_menu() { #Render the navigation menu. #The menu is dynamically rendered the $MODULES hash - global $SITE_NAME, $MODULES, $THIS_MODULE_PATH, $VALIDATED, $IS_ADMIN; + global $SITE_NAME, $MODULES, $THIS_MODULE_PATH, $VALIDATED, $IS_ADMIN, $USER_ID; ?>
    +
    + +
    function check_entity_name_validity(name,div_id) { - var check_regex = /$USERNAME_REGEX/; + var check_regex = /$POSIX_REGEX/; if (! check_regex.test(name) ) { document.getElementById(div_id).classList.add("has-error"); @@ -381,7 +385,12 @@ function render_js_username_check(){ } + EoCheckJS; + } + else { + print ""; + } } @@ -389,9 +398,9 @@ EoCheckJS; function generate_username($fn,$ln) { - global $USERNAME_FORMAT; + global $POSIX_USERNAME_FORMAT; - $username = $USERNAME_FORMAT; + $username = $POSIX_USERNAME_FORMAT; $username = str_replace('{first_name}',strtolower($fn), $username); $username = str_replace('{first_name_initial}',strtolower($fn[0]), $username); $username = str_replace('{last_name}',strtolower($ln), $username); @@ -408,36 +417,75 @@ function render_js_username_generator($firstname_field_id,$lastname_field_id,$us #Parameters are the IDs of the input fields and username name div in the account creation form. #The div will be set to warning if the username is invalid. - global $USERNAME_FORMAT; + global $POSIX_USERNAME_FORMAT, $ENFORCE_SAFE_SYSTEM_NAMES; - render_js_username_check(); + $remove_accents=""; + if ($ENFORCE_SAFE_SYSTEM_NAMES == TRUE) { $remove_accents = ".normalize('NFD').replace(/[\u0300-\u036f]/g, '')"; } print << + + EoRenderJS; } +###################################################### + +function render_js_cn_generator($firstname_field_id,$lastname_field_id,$cn_field_id,$cn_div_id) { + + global $ENFORCE_SAFE_SYSTEM_NAMES; + + if ($ENFORCE_SAFE_SYSTEM_NAMES == TRUE) { + $gen_js = "first_name.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g, '') + last_name.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g, '')"; + } + else { + $gen_js = "first_name + ' ' + last_name"; + } + + print << + + var auto_cn_update = true; + + function update_cn() { + + if ( auto_cn_update == true ) { + var first_name = document.getElementById('$firstname_field_id').value; + var last_name = document.getElementById('$lastname_field_id').value; + this_cn = $gen_js; + + check_entity_name_validity(this_cn,'$cn_div_id'); + + document.getElementById('$cn_field_id').value = this_cn; + } + + } + + +EoRenderCNJS; + +} ###################################################### @@ -456,8 +504,10 @@ function render_js_email_generator($username_field_id,$email_field_id) { var username = document.getElementById('$username_field_id').value; document.getElementById('$email_field_id').value = username + '@' + "$EMAIL_DOMAIN"; } + } + EoRenderEmailJS; } diff --git a/www/setup/run_checks.php b/www/setup/run_checks.php index a17ff1b..7279096 100644 --- a/www/setup/run_checks.php +++ b/www/setup/run_checks.php @@ -38,12 +38,12 @@ $ldap_connection = open_ldap_connection(); print "$li_good Connected to ${LDAP['uri']}\n"; #TLS? -if ($LDAP_IS_SECURE == TRUE) { - print "$li_good Encrypted connection to ${LDAP['uri']} via STARTTLS\n"; +if ($LDAP['connection_type'] != "plain") { + print "$li_good Encrypted connection to ${LDAP['uri']} via ${LDAP['connection_type']}\n"; } else { - print "$li_warn Unable to connect to ${LDAP['uri']} via STARTTLS. "; - print "What's this?\n"; } diff --git a/www/setup/setup_ldap.php b/www/setup/setup_ldap.php index 63da182..21e14d6 100644 --- a/www/setup/setup_ldap.php +++ b/www/setup/setup_ldap.php @@ -35,7 +35,7 @@ if (isset($_POST['fix_problems'])) { 'organizationalUnit', 'ou' => $LDAP['group_ou'] )); + $ou_add = @ ldap_add($ldap_connection, $LDAP['group_dn'], array( 'objectClass' => 'organizationalUnit', 'ou' => $LDAP['group_ou'] )); if ($ou_add == TRUE) { print "$li_good Created OU ${LDAP['group_dn']}\n"; } @@ -48,7 +48,7 @@ if (isset($_POST['fix_problems'])) { if (isset($_POST['setup_user_ou'])) { - $ou_add = ldap_add($ldap_connection, $LDAP['user_dn'], array( 'objectClass' => 'organizationalUnit', 'ou' => $LDAP['user_ou'] )); + $ou_add = @ ldap_add($ldap_connection, $LDAP['user_dn'], array( 'objectClass' => 'organizationalUnit', 'ou' => $LDAP['user_ou'] )); if ($ou_add == TRUE) { print "$li_good Created OU ${LDAP['user_dn']}\n"; } @@ -65,10 +65,11 @@ if (isset($_POST['fix_problems'])) { $highest_gid = ldap_get_highest_id($ldap_connection,'gid'); $description = "Records the last GID used to create a Posix group. This prevents the re-use of a GID from a deleted group."; - $gid_add = ldap_add($ldap_connection, "cn=lastGID,${LDAP['base_dn']}", array( 'objectClass' => array('device','top'), - 'serialnumber' => $highest_gid, - 'description' => $description ) - ); + $add_lastgid_r = array( 'objectClass' => array('device','top'), + 'serialnumber' => $highest_gid, + 'description' => $description ); + + $gid_add = @ ldap_add($ldap_connection, "cn=lastGID,${LDAP['base_dn']}", $add_lastgid_r); if ($gid_add == TRUE) { print "$li_good Created cn=lastGID,${LDAP['base_dn']}\n"; @@ -86,10 +87,11 @@ if (isset($_POST['fix_problems'])) { $highest_uid = ldap_get_highest_id($ldap_connection,'uid'); $description = "Records the last UID used to create a Posix account. This prevents the re-use of a UID from a deleted account."; - $uid_add = ldap_add($ldap_connection, "cn=lastUID,${LDAP['base_dn']}", array( 'objectClass' => array('device','top'), - 'serialnumber' => $highest_uid, - 'description' => $description ) - ); + $add_lastuid_r = array( 'objectClass' => array('device','top'), + 'serialnumber' => $highest_uid, + 'description' => $description ); + + $uid_add = @ ldap_add($ldap_connection, "cn=lastUID,${LDAP['base_dn']}", $add_lastuid_r); if ($uid_add == TRUE) { print "$li_good Created cn=lastUID,${LDAP['base_dn']}\n"; @@ -146,7 +148,6 @@ if (isset($_POST['fix_problems'])) { print ""; print "\n"; $show_create_admin_button = TRUE; - } else { print "$li_good The LDAP account administrators group (${LDAP['admins_group']}) isn't empty."; @@ -164,6 +165,7 @@ if (isset($_POST['fix_problems'])) { if ($no_errors == TRUE) { if ($show_create_admin_button == FALSE) { ?> +
    @@ -173,15 +175,16 @@ if (isset($_POST['fix_problems'])) { } else { ?> -
    - - +
    + +
    +