moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-53412 search: Correctly handle Solr over SSL

Browse source
This commit is contained in:
Eric Merrill 2016-03-17 01:13:15 -04:00
parent 7adc7ef14f
commit 5dc4624ced
5 changed files with 112 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

26
search/engine/solr/tests/engine_test.php
View file

@ -25,6 +25,10 @@
* Optional params:
* - define('TEST_SEARCH_SOLR_USERNAME', '');
* - define('TEST_SEARCH_SOLR_PASSWORD', '');
* - define('TEST_SEARCH_SOLR_SSLCERT', '');
* - define('TEST_SEARCH_SOLR_SSLKEY', '');
* - define('TEST_SEARCH_SOLR_KEYPASSWORD', '');
* - define('TEST_SEARCH_SOLR_CAINFOCERT', '');
*
* @package core_search
* @category phpunit
@ -71,13 +75,31 @@ class search_solr_engine_testcase extends advanced_testcase {
set_config('indexname', TEST_SEARCH_SOLR_INDEXNAME, 'search_solr');
if (defined('TEST_SEARCH_SOLR_USERNAME')) {
set_config('server_username', TEST_SEARCH_SOLR_USERNAME);
set_config('server_username', TEST_SEARCH_SOLR_USERNAME, 'search_solr');
}
if (defined('TEST_SEARCH_SOLR_PASSWORD')) {
set_config('server_password', TEST_SEARCH_SOLR_PASSWORD);
set_config('server_password', TEST_SEARCH_SOLR_PASSWORD, 'search_solr');
}
if (defined('TEST_SEARCH_SOLR_SSLCERT')) {
set_config('secure', true, 'search_solr');
set_config('ssl_cert', TEST_SEARCH_SOLR_SSLCERT, 'search_solr');
}
if (defined('TEST_SEARCH_SOLR_SSLKEY')) {
set_config('ssl_key', TEST_SEARCH_SOLR_SSLKEY, 'search_solr');
}
if (defined('TEST_SEARCH_SOLR_KEYPASSWORD')) {
set_config('ssl_keypassword', TEST_SEARCH_SOLR_KEYPASSWORD, 'search_solr');
}
if (defined('TEST_SEARCH_SOLR_CAINFOCERT')) {
set_config('ssl_cainfo', TEST_SEARCH_SOLR_CAINFOCERT, 'search_solr');
}
// Inject search solr engine into the testable core search as we need to add the mock
// search component to it.
$searchengine = new \search_solr\engine();