WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #51 from LDAPAccountManager/apache2.2-removal 

drop Apache 2.2 support
This commit is contained in:
gruberroland 2018-08-11 14:59:44 +02:00 committed by GitHub
parent 0d70919200 7da2586583
commit 2acd157626
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 182 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lam-packaging/RPM/lam.apache.conf
View File

@ -4,13 +4,7 @@ Alias /lam /usr/share/ldap-account-manager
<Directory /usr/share/ldap-account-manager> <Directory /usr/share/ldap-account-manager>
Options +FollowSymLinks Options +FollowSymLinks
AllowOverride All AllowOverride All
<IfModule !mod_authz_core.c> Require all granted
Order allow,deny
Allow from all
</IfModule>
<IfModule mod_authz_core.c>
Require all granted
</IfModule>
DirectoryIndex index.html DirectoryIndex index.html
</Directory> </Directory>
@ -20,67 +14,31 @@ Alias /lam /usr/share/ldap-account-manager
<Directory /var/lib/ldap-account-manager/tmp/internal> <Directory /var/lib/ldap-account-manager/tmp/internal>
Options -Indexes Options -Indexes
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Directory> </Directory>
<Directory /var/lib/ldap-account-manager/sess> <Directory /var/lib/ldap-account-manager/sess>
Options -Indexes Options -Indexes
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Directory> </Directory>
<Directory /var/lib/ldap-account-manager/config> <Directory /var/lib/ldap-account-manager/config>
Options -Indexes Options -Indexes
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Directory> </Directory>
<Directory /usr/share/ldap-account-manager/lib> <Directory /usr/share/ldap-account-manager/lib>
Options -Indexes Options -Indexes
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Directory> </Directory>
<Directory /usr/share/ldap-account-manager/help> <Directory /usr/share/ldap-account-manager/help>
Options -Indexes Options -Indexes
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Directory> </Directory>
<Directory /usr/share/ldap-account-manager/locale> <Directory /usr/share/ldap-account-manager/locale>
Options -Indexes Options -Indexes
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Directory> </Directory>

2
lam-packaging/debian/control
View File

@ -13,7 +13,7 @@ Depends: php5 (>= 5.4.26) | php (>= 7), php5-ldap | php-ldap, php5-gd | php-gd,
php5 | php-zip, php5 | php-xml, php5-imagick | php-imagick, php5 | php-zip, php5 | php-xml, php5-imagick | php-imagick,
libapache2-mod-php5 | libapache2-mod-php | php5-fpm | php-fpm, libapache2-mod-php5 | libapache2-mod-php | php5-fpm | php-fpm,
php-tcpdf, php-phpseclib (>= 2.0), php-tcpdf, php-phpseclib (>= 2.0),
apache2 | httpd, fonts-dejavu, debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends} apache2 (>= 2.4.0) | httpd, fonts-dejavu, debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends}
Recommends: php-apc | php-opcache Recommends: php-apc | php-opcache
Suggests: ldap-server, php5-mcrypt | php-mcrypt, ldap-account-manager-lamdaemon, perl Suggests: ldap-server, php5-mcrypt | php-mcrypt, ldap-account-manager-lamdaemon, perl
Description: webfrontend for managing accounts in an LDAP directory Description: webfrontend for managing accounts in an LDAP directory

56
lam-packaging/debian/lam.apache.conf
View File

@ -4,13 +4,7 @@ Alias /lam /usr/share/ldap-account-manager
<Directory /usr/share/ldap-account-manager> <Directory /usr/share/ldap-account-manager>
Options +FollowSymLinks Options +FollowSymLinks
AllowOverride All AllowOverride All
<IfModule !mod_authz_core.c> Require all granted
Order allow,deny
Allow from all
</IfModule>
<IfModule mod_authz_core.c>
Require all granted
</IfModule>
DirectoryIndex index.html DirectoryIndex index.html
</Directory> </Directory>
@ -20,67 +14,31 @@ Alias /lam /usr/share/ldap-account-manager
<Directory /var/lib/ldap-account-manager/tmp/internal> <Directory /var/lib/ldap-account-manager/tmp/internal>
Options -Indexes Options -Indexes
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Directory> </Directory>
<Directory /var/lib/ldap-account-manager/sess> <Directory /var/lib/ldap-account-manager/sess>
Options -Indexes Options -Indexes
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Directory> </Directory>
<Directory /var/lib/ldap-account-manager/config> <Directory /var/lib/ldap-account-manager/config>
Options -Indexes Options -Indexes
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Directory> </Directory>
<Directory /usr/share/ldap-account-manager/lib> <Directory /usr/share/ldap-account-manager/lib>
Options -Indexes Options -Indexes
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Directory> </Directory>
<Directory /usr/share/ldap-account-manager/help> <Directory /usr/share/ldap-account-manager/help>
Options -Indexes Options -Indexes
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Directory> </Directory>
<Directory /usr/share/ldap-account-manager/locale> <Directory /usr/share/ldap-account-manager/locale>
Options -Indexes Options -Indexes
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Directory> </Directory>

8
lam/.htaccess
View File

@ -1,11 +1,5 @@
<Files *> <Files *>
Options +FollowSymLinks Options +FollowSymLinks
<IfModule !mod_authz_core.c> Require all granted
Order allow,deny
Allow from all
</IfModule>
<IfModule mod_authz_core.c>
Require all granted
</IfModule>
DirectoryIndex index.html DirectoryIndex index.html
</Files> </Files>

1
lam/HISTORY
View File

@ -1,5 +1,6 @@
September 2018 6.5 September 2018 6.5
- Password change possible via LDAP EXOP operation (set LDAP_EXOP as password hash) - Password change possible via LDAP EXOP operation (set LDAP_EXOP as password hash)
- Dropped suppurt for Apache 2.2
- Upload: allow to overwrite existing accounts - Upload: allow to overwrite existing accounts
- Kolab updates - Kolab updates
- LAM Pro: - LAM Pro:

8
lam/config/.htaccess
View File

@ -1,9 +1,3 @@
<Files *> <Files *>
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Files> </Files>

5
lam/docs/manual-sources/appendix-security.xml
View File

@ -319,7 +319,7 @@ semodule -i httpdlocal.pp</programlisting>
<para><inlinemediaobject> <para><inlinemediaobject>
<imageobject> <imageobject>
<imagedata fileref="images/selfServiceProxy.png" /> <imagedata fileref="images/selfServiceProxy.png"/>
</imageobject> </imageobject>
</inlinemediaobject></para> </inlinemediaobject></para>
@ -333,8 +333,7 @@ semodule -i httpdlocal.pp</programlisting>
CustomLog /var/log/apache2/lam-proxy-access.log combined CustomLog /var/log/apache2/lam-proxy-access.log combined
DocumentRoot /var/www/lam-proxy DocumentRoot /var/www/lam-proxy
&lt;Proxy *&gt; &lt;Proxy *&gt;
Order deny,allow Require all granted
Allow from all
&lt;/Proxy&gt; &lt;/Proxy&gt;
SSLProxyEngine on SSLProxyEngine on
SSLEngine on SSLEngine on

318
lam/docs/manual-sources/appendix-selfResetSchema.xml
View File

@ -1,245 +1,241 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<appendix id="a_passwordSelfResetSchema"> <appendix id="a_passwordSelfResetSchema">
<title>Setup password self reset schema (LAM Pro)</title> <title>Setup password self reset schema (LAM Pro)</title>
<section id="passwordSelfResetSchema_new"> <section id="passwordSelfResetSchema_new">
<title>New installation</title> <title>New installation</title>
<para>Please see <link <para>Please see <link
linkend="passwordSelfResetSchema_update">here</link> if you want to linkend="passwordSelfResetSchema_update">here</link> if you want to
upgrade an existing schema version.</para> upgrade an existing schema version.</para>
<para><emphasis role="bold">Schema installation</emphasis></para> <para><emphasis role="bold">Schema installation</emphasis></para>
<para>Please install the schema that comes with LAM Pro. The schema <para>Please install the schema that comes with LAM Pro. The schema files
files are located in:</para> are located in:</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>tar.bz2: docs/schema</para> <para>tar.bz2: docs/schema</para>
</listitem> </listitem>
<listitem> <listitem>
<para>DEB: /usr/share/doc/ldap-account-manager/docs/schema</para> <para>DEB: /usr/share/doc/ldap-account-manager/docs/schema</para>
</listitem> </listitem>
<listitem> <listitem>
<para>RPM: <para>RPM: /usr/share/doc/ldap-account-manager-{VERSION}/schema</para>
/usr/share/doc/ldap-account-manager-{VERSION}/schema</para> </listitem>
</listitem> </itemizedlist>
</itemizedlist>
<literallayout> <literallayout>
</literallayout> </literallayout>
<para><emphasis role="bold">OpenLDAP with slapd.conf <para><emphasis role="bold">OpenLDAP with slapd.conf
configuration</emphasis></para> configuration</emphasis></para>
<para>For a configuration with slapd.conf-file copy <para>For a configuration with slapd.conf-file copy
passwordSelfReset.schema to /etc/ldap/schema/ and add this line to passwordSelfReset.schema to /etc/ldap/schema/ and add this line to
slapd.conf:</para> slapd.conf:</para>
<literallayout> include /etc/ldap/schema/passwordSelfReset.schema <literallayout> include /etc/ldap/schema/passwordSelfReset.schema
</literallayout> </literallayout>
<para><emphasis role="bold">OpenLDAP with slapd.d <para><emphasis role="bold">OpenLDAP with slapd.d
configuration</emphasis></para> configuration</emphasis></para>
<para>For slapd.d configurations you need to upload the schema file <para>For slapd.d configurations you need to upload the schema file
passwordSelfReset.ldif via ldapadd command:</para> passwordSelfReset.ldif via ldapadd command:</para>
<para>ldapadd -x -W -H ldap://localhost -D "cn=admin,o=test,c=de" -f <para>ldapadd -x -W -H ldap://<emphasis>localhost</emphasis> -D
passwordSelfReset.ldif</para> "<emphasis>cn=admin,o=test,c=de</emphasis>" -f
passwordSelfReset.ldif</para>
<para>Please replace "localhost" with your LDAP server and <para>Please replace "<emphasis>localhost</emphasis>" with your LDAP
"cn=admin,o=test,c=de" with your LDAP admin user (usually starts with server and "<emphasis>cn=admin,o=test,c=de</emphasis>" with your LDAP
cn=admin or cn=manager).</para> admin user (usually starts with cn=admin or cn=manager).</para>
<literallayout> <literallayout>
</literallayout> </literallayout>
<para><emphasis role="bold">389 server</emphasis></para> <para><emphasis role="bold">389 server</emphasis></para>
<para>Please replace INSTANCE with installation ID, e.g. <para>Please replace INSTANCE with installation ID, e.g.
slapd-389ds.</para> slapd-389ds.</para>
<literallayout> cp passwordSelfReset-389server.ldif /etc/dirsrv/INSTANCE/schema/70pwdreset.ldif <literallayout> cp passwordSelfReset-389server.ldif /etc/dirsrv/INSTANCE/schema/70pwdreset.ldif
systemctl restart dirsrv.target systemctl restart dirsrv.target
</literallayout> </literallayout>
<para><emphasis role="bold">Samba 4</emphasis></para> <para><emphasis role="bold">Samba 4</emphasis></para>
<para>The schema files are passwordSelfReset-Samba4-attributes.ldif and <para>The schema files are passwordSelfReset-Samba4-attributes.ldif and
passwordSelfReset-Samba4-objectClass.ldif.</para> passwordSelfReset-Samba4-objectClass.ldif.</para>
<para>First, you need to edit them and replace "DOMAIN_TOP_DN" with your <para>First, you need to edit them and replace "DOMAIN_TOP_DN" with your
LDAP suffix (e.g. dc=samba4,dc=test).</para> LDAP suffix (e.g. dc=samba4,dc=test).</para>
<para>Then install the attribute and afterwards the object class schema <para>Then install the attribute and afterwards the object class schema
file:</para> file:</para>
<literallayout> ldbmodify -H /var/lib/samba/private/sam.ldb passwordSelfReset-Samba4-attributes.ldif --option="dsdb:schema update allowed"=true <literallayout> ldbmodify -H /var/lib/samba/private/sam.ldb passwordSelfReset-Samba4-attributes.ldif --option="dsdb:schema update allowed"=true
ldbmodify -H /var/lib/samba/private/sam.ldb passwordSelfReset-Samba4-objectClass.ldif --option="dsdb:schema update allowed"=true ldbmodify -H /var/lib/samba/private/sam.ldb passwordSelfReset-Samba4-objectClass.ldif --option="dsdb:schema update allowed"=true
</literallayout> </literallayout>
<para><emphasis role="bold">Windows</emphasis></para> <para><emphasis role="bold">Windows</emphasis></para>
<para>The schema file is passwordSelfReset-Windows.ldif.</para> <para>The schema file is passwordSelfReset-Windows.ldif.</para>
<para>First, you need to edit it and replace "DOMAIN_TOP_DN" with your <para>First, you need to edit it and replace "DOMAIN_TOP_DN" with your
LDAP suffix (e.g. dc=windows,dc=test).</para> LDAP suffix (e.g. dc=windows,dc=test).</para>
<para>Then install the schema file as administrator on a command <para>Then install the schema file as administrator on a command
line:</para> line:</para>
<literallayout> ldifde -v -i -f passwordSelfReset-Windows.ldif <literallayout> ldifde -v -i -f passwordSelfReset-Windows.ldif
</literallayout> </literallayout>
<para>This allows to set a security question + answer for each <para>This allows to set a security question + answer for each
account.</para> account.</para>
</section> </section>
<section id="passwordSelfResetSchema_update"> <section id="passwordSelfResetSchema_update">
<title>Schema update</title> <title>Schema update</title>
<para>The schema files are located in:</para> <para>The schema files are located in:</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>tar.bz2: docs/schema/updates</para> <para>tar.bz2: docs/schema/updates</para>
</listitem> </listitem>
<listitem> <listitem>
<para>DEB: <para>DEB:
/usr/share/doc/ldap-account-manager/docs/schema/updates</para> /usr/share/doc/ldap-account-manager/docs/schema/updates</para>
</listitem> </listitem>
<listitem> <listitem>
<para>RPM: <para>RPM:
/usr/share/doc/ldap-account-manager-{VERSION}/schema/updates</para> /usr/share/doc/ldap-account-manager-{VERSION}/schema/updates</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<literallayout> <literallayout>
</literallayout> </literallayout>
<para>Schema versions:</para> <para>Schema versions:</para>
<orderedlist> <orderedlist>
<listitem> <listitem>
<para>Initial version (LAM Pro 3.6 - 4.4)</para> <para>Initial version (LAM Pro 3.6 - 4.4)</para>
</listitem> </listitem>
<listitem> <listitem>
<para>Added passwordSelfResetBackupMail (LAM Pro 4.5 - 5.5)</para> <para>Added passwordSelfResetBackupMail (LAM Pro 4.5 - 5.5)</para>
</listitem> </listitem>
<listitem> <listitem>
<para>Multiple security questions (LAM Pro 5.6)</para> <para>Multiple security questions (LAM Pro 5.6)</para>
</listitem> </listitem>
</orderedlist> </orderedlist>
<literallayout> <literallayout>
</literallayout> </literallayout>
<para><emphasis role="bold">OpenLDAP with slapd.conf <para><emphasis role="bold">OpenLDAP with slapd.conf
configuration</emphasis></para> configuration</emphasis></para>
<para>Install the schema file like a <link <para>Install the schema file like a <link
linkend="passwordSelfResetSchema_new">new install</link> (skip linkend="passwordSelfResetSchema_new">new install</link> (skip
modification of slapd.conf file).</para> modification of slapd.conf file).</para>
<literallayout> <literallayout>
</literallayout> </literallayout>
<para><emphasis role="bold">OpenLDAP with slapd.d <para><emphasis role="bold">OpenLDAP with slapd.d
configuration</emphasis></para> configuration</emphasis></para>
<para>The upgrade requires to stop the LDAP server.</para> <para>The upgrade requires to stop the LDAP server.</para>
<para>Steps:</para> <para>Steps:</para>
<orderedlist> <orderedlist>
<listitem> <listitem>
<para>Stop OpenLDAP with e.g. "/etc/init.d/slapd stop"</para> <para>Stop OpenLDAP with e.g. "/etc/init.d/slapd stop"</para>
</listitem> </listitem>
<listitem> <listitem>
<para>Delete the old schema file. It is located in e.g. <para>Delete the old schema file. It is located in e.g.
"/etc/ldap/slapd.d/cn=config/cn=schema" and called "/etc/ldap/slapd.d/cn=config/cn=schema" and called
"cn={XX}passwordselfreset.ldif" (XX can be any number)</para> "cn={XX}passwordselfreset.ldif" (XX can be any number)</para>
</listitem> </listitem>
<listitem> <listitem>
<para>Start OpenLDAP with e.g. "/etc/init.d/slapd start"</para> <para>Start OpenLDAP with e.g. "/etc/init.d/slapd start"</para>
</listitem> </listitem>
<listitem> <listitem>
<para>Install the schema file like a <link <para>Install the schema file like a <link
linkend="passwordSelfResetSchema_new">new install</link></para> linkend="passwordSelfResetSchema_new">new install</link></para>
</listitem> </listitem>
</orderedlist> </orderedlist>
<literallayout> <literallayout>
</literallayout> </literallayout>
<para><emphasis role="bold">Samba 4</emphasis></para> <para><emphasis role="bold">Samba 4</emphasis></para>
<para>Install the these update files by following the install <para>Install the these update files by following the install instructions
instructions in the file. In case you you upgrade with a version in the file. In case you you upgrade with a version difference of 2 or
difference of 2 or more you will need to apply all intermediate update more you will need to apply all intermediate update scripts.</para>
scripts.</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>samba4_version_1_to_2_attributes.ldif (upgrade from version 1 <para>samba4_version_1_to_2_attributes.ldif (upgrade from version 1
only)</para> only)</para>
</listitem> </listitem>
<listitem> <listitem>
<para>samba4_version_1_to_2_objectClass.ldif (upgrade from version 1 <para>samba4_version_1_to_2_objectClass.ldif (upgrade from version 1
only)</para> only)</para>
</listitem> </listitem>
<listitem> <listitem>
<para>samba4_version_2_to_3_attributes.ldif (upgrade from version <para>samba4_version_2_to_3_attributes.ldif (upgrade from version
2)</para> 2)</para>
</listitem> </listitem>
<listitem> <listitem>
<para>samba4_version_2_to_3_objectClass.ldif (upgrade from version <para>samba4_version_2_to_3_objectClass.ldif (upgrade from version
2)</para> 2)</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<para>Please note that attributes file needs to be installed <para>Please note that attributes file needs to be installed first.</para>
first.</para>
<literallayout> <literallayout>
</literallayout> </literallayout>
<para><emphasis role="bold">Windows</emphasis></para> <para><emphasis role="bold">Windows</emphasis></para>
<para>Install the file(s) by following the install instructions in the <para>Install the file(s) by following the install instructions in the
file. In case you you upgrade with a version difference of 2 or more you file. In case you you upgrade with a version difference of 2 or more you
will need to apply all intermediate update scripts.</para> will need to apply all intermediate update scripts.</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>windows_version_1_to_2.ldif (upgrade from version 1 <para>windows_version_1_to_2.ldif (upgrade from version 1 only)</para>
only)</para> </listitem>
</listitem>
<listitem> <listitem>
<para>windows_version_2_to_3.ldif (upgrade from version 2)</para> <para>windows_version_2_to_3.ldif (upgrade from version 2)</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</appendix> </appendix>

8
lam/help/.htaccess
View File

@ -1,9 +1,3 @@
<Files *> <Files *>
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Files> </Files>

8
lam/lib/.htaccess
View File

@ -1,9 +1,3 @@
<Files *> <Files *>
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Files> </Files>

8
lam/locale/.htaccess
View File

@ -1,9 +1,3 @@
<Files *> <Files *>
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Files> </Files>

8
lam/sess/.htaccess
View File

@ -1,9 +1,3 @@
<Files *> <Files *>
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Files> </Files>

8
lam/tmp/internal/.htaccess
View File

@ -1,9 +1,3 @@
<Files *> <Files *>
<IfModule !mod_authz_core.c> Require all denied
Order allow,deny
Deny from all
</IfModule>
<IfModule mod_authz_core.c>
Require all denied
</IfModule>
</Files> </Files>