@@ -155,40 +155,92 @@ set_up_oidc() {
155
155
fi
156
156
}
157
157
158
- set_up_ldap () {
159
- if [[ " $LDAP_ENABLE " != " true" ]]; then
160
- echo " ... LDAP authentication disabled"
158
+ set_up_apachesecureauth () {
159
+ if [[ " $APACHESECUREAUTH_LDAP_ENABLE " != " true" ]]; then
160
+ echo " ... LDAP APACHESECUREAUTH authentication disabled"
161
161
return
162
162
fi
163
163
164
+
165
+ if [ ! -z " $APACHESECUREAUTH_LDAP_OLD_VAR_DETECT " ]; then
166
+ echo " WARNING: old variables used for APACHESECUREAUTH bloc in env file. Switch to the new naming convention."
167
+ fi
168
+
164
169
# Check required variables
165
- # LDAP_SEARCH_FILTER may be empty
166
- check_env_vars LDAP_APACHE_ENV LDAP_SERVER LDAP_STARTTLS LDAP_READER_USER LDAP_READER_PASSWORD LDAP_DN LDAP_SEARCH_ATTRIBUTE LDAP_FILTER LDAP_DEFAULT_ROLE_ID LDAP_DEFAULT_ORG LDAP_OPT_PROTOCOL_VERSION LDAP_OPT_NETWORK_TIMEOUT LDAP_OPT_REFERRALS
170
+ # APACHESECUREAUTH_LDAP_SEARCH_FILTER may be empty
171
+ check_env_vars APACHESECUREAUTH_LDAP_APACHE_ENV APACHESECUREAUTH_LDAP_SERVER APACHESECUREAUTH_LDAP_STARTTLS APACHESECUREAUTH_LDAP_READER_USER APACHESECUREAUTH_LDAP_READER_PASSWORD APACHESECUREAUTH_LDAP_DN APACHESECUREAUTH_LDAP_SEARCH_ATTRIBUTE APACHESECUREAUTH_LDAP_FILTER APACHESECUREAUTH_LDAP_DEFAULT_ROLE_ID APACHESECUREAUTH_LDAP_DEFAULT_ORG APACHESECUREAUTH_LDAP_OPT_PROTOCOL_VERSION APACHESECUREAUTH_LDAP_OPT_NETWORK_TIMEOUT APACHESECUREAUTH_LDAP_OPT_REFERRALS
167
172
168
173
sudo -u www-data php /var/www/MISP/tests/modify_config.php modify " {
169
174
\" ApacheSecureAuth\" : {
170
- \" apacheEnv\" : \" ${LDAP_APACHE_ENV } \" ,
171
- \" ldapServer\" : \" ${LDAP_SERVER } \" ,
172
- \" starttls\" : ${LDAP_STARTTLS } ,
173
- \" ldapProtocol\" : ${LDAP_OPT_PROTOCOL_VERSION } ,
174
- \" ldapNetworkTimeout\" : ${LDAP_OPT_NETWORK_TIMEOUT } ,
175
- \" ldapReaderUser\" : \" ${LDAP_READER_USER } \" ,
176
- \" ldapReaderPassword\" : \" ${LDAP_READER_PASSWORD } \" ,
177
- \" ldapDN\" : \" ${LDAP_DN } \" ,
178
- \" ldapSearchFilter\" : \" ${LDAP_SEARCH_FILTER } \" ,
179
- \" ldapSearchAttribut\" : \" ${LDAP_SEARCH_ATTRIBUTE } \" ,
180
- \" ldapFilter\" : ${LDAP_FILTER } ,
181
- \" ldapDefaultRoleId\" : ${LDAP_DEFAULT_ROLE_ID } ,
182
- \" ldapDefaultOrg\" : \" ${LDAP_DEFAULT_ORG } \" ,
183
- \" ldapAllowReferrals\" : ${LDAP_OPT_REFERRALS } ,
184
- \" ldapEmailField\" : ${LDAP_EMAIL_FIELD }
175
+ \" apacheEnv\" : \" ${APACHESECUREAUTH_LDAP_APACHE_ENV } \" ,
176
+ \" ldapServer\" : \" ${APACHESECUREAUTH_LDAP_SERVER } \" ,
177
+ \" starttls\" : ${APACHESECUREAUTH_LDAP_STARTTLS } ,
178
+ \" ldapProtocol\" : ${APACHESECUREAUTH_LDAP_OPT_PROTOCOL_VERSION } ,
179
+ \" ldapNetworkTimeout\" : ${APACHESECUREAUTH_LDAP_OPT_NETWORK_TIMEOUT } ,
180
+ \" ldapReaderUser\" : \" ${APACHESECUREAUTH_LDAP_READER_USER } \" ,
181
+ \" ldapReaderPassword\" : \" ${APACHESECUREAUTH_LDAP_READER_PASSWORD } \" ,
182
+ \" ldapDN\" : \" ${APACHESECUREAUTH_LDAP_DN } \" ,
183
+ \" ldapSearchFilter\" : \" ${APACHESECUREAUTH_LDAP_SEARCH_FILTER } \" ,
184
+ \" ldapSearchAttribut\" : \" ${APACHESECUREAUTH_LDAP_SEARCH_ATTRIBUTE } \" ,
185
+ \" ldapFilter\" : ${APACHESECUREAUTH_LDAP_FILTER } ,
186
+ \" ldapDefaultRoleId\" : ${APACHESECUREAUTH_LDAP_DEFAULT_ROLE_ID } ,
187
+ \" ldapDefaultOrg\" : \" ${APACHESECUREAUTH_LDAP_DEFAULT_ORG } \" ,
188
+ \" ldapAllowReferrals\" : ${APACHESECUREAUTH_LDAP_OPT_REFERRALS } ,
189
+ \" ldapEmailField\" : ${APACHESECUREAUTH_LDAP_EMAIL_FIELD }
185
190
}
186
191
}" > /dev/null
187
192
188
193
# Disable password confirmation as stated at https://github.com/MISP/MISP/issues/8116
189
194
sudo -u www-data /var/www/MISP/app/Console/cake Admin setSetting -q " Security.require_password_confirmation" false
190
195
}
191
196
197
+ set_up_ldap () {
198
+ if [[ " $LDAPAUTH_ENABLE " != " true" ]]; then
199
+ echo " ... LDAPAUTH authentication disabled"
200
+ return
201
+ fi
202
+
203
+ # Check required variables
204
+ # LDAPAUTH_LDAPSEARCHFILTER may be empty
205
+ check_env_vars LDAPAUTH_LDAPSERVER LDAPAUTH_LDAPDN LDAPAUTH_LDAPREADERUSER LDAPAUTH_LDAPREADERPASSWORD LDAPAUTH_LDAPSEARCHATTRIBUTE LDAPAUTH_LDAPDEFAULTROLEID LDAPAUTH_LDAPDEFAULTORGID LDAPAUTH_LDAPEMAILFIELD LDAPAUTH_LDAPNETWORKTIMEOUT LDAPAUTH_LDAPPROTOCOL LDAPAUTH_LDAPALLOWREFERRALS LDAPAUTH_STARTTLS LDAPAUTH_MIXEDAUTH LDAPAUTH_UPDATEUSER LDAPAUTH_DEBUG LDAPAUTH_LDAPTLSREQUIRECERT LDAPAUTH_LDAPTLSCUSTOMCACERT LDAPAUTH_LDAPTLSCRLCHECK LDAPAUTH_LDAPTLSPROTOCOLMIN
206
+
207
+ sudo -u www-data php /var/www/MISP/tests/modify_config.php modify " {
208
+ \" LdapAuth\" : {
209
+ \" ldapServer\" : \" ${LDAPAUTH_LDAPSERVER} \" ,
210
+ \" ldapDn\" : \" ${LDAPAUTH_LDAPDN} \" ,
211
+ \" ldapReaderUser\" : \" ${LDAPAUTH_LDAPREADERUSER} \" ,
212
+ \" ldapReaderPassword\" : \" ${LDAPAUTH_LDAPREADERPASSWORD} \" ,
213
+ \" ldapSearchFilter\" : \" ${LDAPAUTH_LDAPSEARCHFILTER} \" ,
214
+ \" ldapSearchAttribute\" : \" ${LDAPAUTH_LDAPSEARCHATTRIBUTE} \" ,
215
+ \" ldapEmailField\" : ${LDAPAUTH_LDAPEMAILFIELD} ,
216
+ \" ldapNetworkTimeout\" : ${LDAPAUTH_LDAPNETWORKTIMEOUT} ,
217
+ \" ldapProtocol\" : ${LDAPAUTH_LDAPPROTOCOL} ,
218
+ \" ldapAllowReferrals\" : ${LDAPAUTH_LDAPALLOWREFERRALS} ,
219
+ \" starttls\" : ${LDAPAUTH_STARTTLS} ,
220
+ \" mixedAuth\" : ${LDAPAUTH_MIXEDAUTH} ,
221
+ \" ldapDefaultOrgId\" : ${LDAPAUTH_LDAPDEFAULTORGID} ,
222
+ \" ldapDefaultRoleId\" : ${LDAPAUTH_LDAPDEFAULTROLEID} ,
223
+ \" updateUser\" : ${LDAPAUTH_UPDATEUSER} ,
224
+ \" debug\" : ${LDAPAUTH_DEBUG} ,
225
+ \" ldapTlsRequireCert\" : \" ${LDAPAUTH_LDAPTLSREQUIRECERT} \" ,
226
+ \" ldapTlsCustomCaCert\" : ${LDAPAUTH_LDAPTLSCUSTOMCACERT} ,
227
+ \" ldapTlsCrlCheck\" : \" ${LDAPAUTH_LDAPTLSCRLCHECK} \" ,
228
+ \" ldapTlsProtocolMin\" : \" ${LDAPAUTH_LDAPTLSPROTOCOLMIN} \"
229
+ }
230
+ }" > /dev/null
231
+
232
+ # Configure LdapAuth in MISP
233
+ sudo -u www-data php /var/www/MISP/tests/modify_config.php modify " {
234
+ \" Security\" : {
235
+ \" auth\" : [\" LdapAuth.Ldap\" ]
236
+ }
237
+ }" > /dev/null
238
+
239
+
240
+ # Disable password confirmation as stated at https://github.com/MISP/MISP/issues/8116
241
+ sudo -u www-data /var/www/MISP/app/Console/cake Admin setSetting -q " Security.require_password_confirmation" false
242
+ }
243
+
192
244
set_up_aad () {
193
245
if [[ " $AAD_ENABLE " != " true" ]]; then
194
246
echo " ... Entra (AzureAD) authentication disabled"
@@ -449,6 +501,8 @@ echo "MISP | Create sync servers ..." && create_sync_servers
449
501
450
502
echo " MISP | Set Up OIDC ..." && set_up_oidc
451
503
504
+ echo " MISP | Set Up apachesecureauth ..." && set_up_apachesecureauth
505
+
452
506
echo " MISP | Set Up LDAP ..." && set_up_ldap
453
507
454
508
echo " MISP | Set Up AAD ..." && set_up_aad
0 commit comments