diff --git a/lam/HISTORY b/lam/HISTORY
index 50b33fd6..523e192b 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -3,6 +3,7 @@ March 2018 6.3
- LAM Pro:
-> Support custom structural object classes with new custom type
-> Support dynamic lists
+ -> Self service login and password self reset can be secured with captcha
04.02.2018 6.2.1
diff --git a/lam/docs/manual-sources/chapter-installation.xml b/lam/docs/manual-sources/chapter-installation.xml
index fd0a77cd..f09bd1a5 100644
--- a/lam/docs/manual-sources/chapter-installation.xml
+++ b/lam/docs/manual-sources/chapter-installation.xml
@@ -574,6 +574,16 @@
version. Unless explicitly noticed there is no need to install an
intermediate release.
+
+ 6.2 -> 6.3
+
+ Self Service: If you use a captcha for user self registration
+ this needs to be reconfigured. On tab General settings please activate
+ Google reCAPTCHA (the checkbox to secure login is optional). On tab
+ Module settings please tick the captcha checkbox at self registration
+ settings.
+
+
6.1 -> 6.2
diff --git a/lam/docs/manual-sources/chapter-selfService.xml b/lam/docs/manual-sources/chapter-selfService.xml
index 2e258962..27be9679 100644
--- a/lam/docs/manual-sources/chapter-selfService.xml
+++ b/lam/docs/manual-sources/chapter-selfService.xml
@@ -75,7 +75,7 @@
-
+
@@ -86,7 +86,7 @@
-
+
@@ -97,7 +97,7 @@
-
+
@@ -120,7 +120,7 @@
-
+
@@ -253,7 +253,7 @@
-
+
2-factor authentication
@@ -281,7 +281,7 @@
-
+
@@ -293,11 +293,34 @@
-
+
+
+
+ Captcha
+
+ LAM Pro can optionally display a captcha to verify that logins
+ are not from robots. The supported captcha provider is Google
+ reCAPTCHA. You will need the site and secret key for your domain. They
+ can be retrieved from here: https://www.google.com/recaptcha
+
+ Please note that your web server must be able to access
+ "https://www.google.com/recaptcha/api/siteverify" to verify the
+ captchas. Captchas will be displayed when you tick the chekbox to
+ secure login with a captcha.
+
+
+
+
+
+
+
+
+
@@ -321,7 +344,7 @@
-
+
@@ -350,7 +373,7 @@
-
+
Asterisk (voicemail)
@@ -363,7 +386,7 @@
-
+
Kerberos
@@ -376,7 +399,7 @@
-
+
Kolab
@@ -394,7 +417,7 @@
-
+
Password policy
@@ -406,7 +429,7 @@
-
+
Password self reset
@@ -431,103 +454,103 @@
-
+
Personal
Business category
-
+
Car license
-
+
Department
-
+
Description
-
+
Email address
-
+
Fax number
-
+
First name
-
+
Home telephone number
-
+
Initials
-
+
Job title
-
+
Last name
-
+
Location
-
+
Mobile number
-
+
Office name
-
+
Organisation
-
+
Organisational unit
-
+
@@ -540,49 +563,49 @@
Postal address
-
+
Postal code
-
+
Post office box
-
+
Registered address
-
+
Room number
-
+
State
-
+
Street
-
+
Telephone number
-
+
@@ -594,19 +617,19 @@
User name
-
+
Web site
-
+
-
+
Samba 3
@@ -648,7 +671,7 @@
-
+
Shadow
@@ -661,7 +684,7 @@
-
+
Windows
@@ -673,67 +696,67 @@
Location
-
+
Office name
-
+
Postal code
-
+
Post office box
-
+
State
-
+
Street
-
+
Telephone number
-
+
Web site
-
+
-
+
Unix
Common name
-
+
Login shell
-
+
@@ -753,7 +776,7 @@
-
+
Kopano
@@ -771,7 +794,7 @@
-
+
Zarafa
@@ -789,7 +812,7 @@
-
+
PyKota
@@ -829,7 +852,7 @@
-
+
@@ -852,7 +875,7 @@
-
+
@@ -883,7 +906,7 @@
-
+
@@ -939,6 +962,26 @@
care since anybody with access to the user's mail account can reset the
password.
+ Captcha support
+
+ LAM Pro can optionally display a captcha to verify that password
+ resets are not from robots. The supported captcha provider is Google
+ reCAPTCHA. You will need the site and secret key for your domain. This
+ is setup on tab "General settings". They can be retrieved from here:
+ https://www.google.com/recaptcha
+
+ Please note that your web server must be able to access
+ "https://www.google.com/recaptcha/api/siteverify" to verify the
+ captchas. Captchas will be displayed when you tick the chekbox to use a
+ captcha.
+
+
+
+
+
+
+
Troubleshooting:
1. You get messages like "Unable to find user account."
@@ -983,7 +1026,7 @@
-
+
@@ -994,7 +1037,7 @@
-
+
@@ -1008,7 +1051,7 @@
-
+
@@ -1019,7 +1062,7 @@
-
+
@@ -1033,7 +1076,7 @@
-
+
@@ -1054,7 +1097,7 @@
-
+
@@ -1085,7 +1128,7 @@
you can enter additional options:
-
+
@@ -1150,9 +1193,9 @@
attribute value, supports wirldcards to insert other
attribute values (e.g. "@@uid@@")
-
+
-
+
@@ -1209,18 +1252,19 @@
LAM Pro can optionally display a captcha to verify that
registrations are not from robots. The supported captcha provider is
Google reCAPTCHA. You will need the site and secret key for your domain.
- They can be retrieved from here: https://www.google.com/recaptcha
Please note that your web server must be able to access
"https://www.google.com/recaptcha/api/siteverify" to verify the
- captchas. Captchas will be displayed automatically when site+secret key
- are filled.
+ captchas. Captchas will be displayed when you tick the chekbox to use a
+ captcha.
-
+
@@ -1236,7 +1280,7 @@
-
+
@@ -1247,7 +1291,7 @@
-
+
@@ -1317,7 +1361,7 @@
-
+
@@ -1362,7 +1406,7 @@
-
+
@@ -1372,7 +1416,7 @@
-
+
@@ -1386,7 +1430,7 @@
-
+
@@ -1396,7 +1440,7 @@
-
+
@@ -1415,7 +1459,7 @@
-
+
@@ -1425,7 +1469,7 @@
-
+
@@ -1440,7 +1484,7 @@
-
+
@@ -1450,7 +1494,7 @@
-
+
@@ -1467,7 +1511,7 @@
-
+
@@ -1477,7 +1521,7 @@
-
+
@@ -1493,7 +1537,7 @@
-
+
@@ -1503,7 +1547,7 @@
-
+
@@ -1511,7 +1555,7 @@
-
+
@@ -1525,7 +1569,7 @@
-
+
@@ -1544,7 +1588,7 @@
-
+
@@ -1560,7 +1604,7 @@
-
+
@@ -1607,7 +1651,7 @@
value):
-
+
Constant value |
@@ -1640,7 +1684,7 @@
-
+
Presentation:
@@ -1649,7 +1693,7 @@
-
+
@@ -1665,7 +1709,7 @@
-
+
@@ -1677,7 +1721,7 @@
-
+
@@ -1726,7 +1770,7 @@
-
+
@@ -1745,7 +1789,7 @@
-
+
diff --git a/lam/docs/manual-sources/images/accountRegistration4.png b/lam/docs/manual-sources/images/accountRegistration4.png
index ff935562..2e499130 100644
Binary files a/lam/docs/manual-sources/images/accountRegistration4.png and b/lam/docs/manual-sources/images/accountRegistration4.png differ
diff --git a/lam/docs/manual-sources/images/passwordSelfReset10.png b/lam/docs/manual-sources/images/passwordSelfReset10.png
new file mode 100644
index 00000000..2e499130
Binary files /dev/null and b/lam/docs/manual-sources/images/passwordSelfReset10.png differ
diff --git a/lam/docs/manual-sources/images/selfServiceCaptcha.png b/lam/docs/manual-sources/images/selfServiceCaptcha.png
new file mode 100644
index 00000000..9c0c04c3
Binary files /dev/null and b/lam/docs/manual-sources/images/selfServiceCaptcha.png differ