0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2814 Refactor authentication property key to AUTHENTICATIONS_PROPERTY in DataConfig and WebConfig

Browse source
This commit is contained in:
Shinsuke Sugaya 2024-05-09 18:48:04 +09:00
parent 128bd4f3a9
commit f3e1e563dc
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java
View file

@ -174,8 +174,7 @@ public class DataConfig extends BsDataConfig implements CrawlingConfig {
final Credentials credentials = getCredentials(webAuthName, scheme, paramMap);
basicAuthList.add(new AuthenticationImpl(authScope, credentials, authScheme));
}
factoryParamMap.put(HcHttpClient.BASIC_AUTHENTICATIONS_PROPERTY,
basicAuthList.toArray(new Authentication[basicAuthList.size()]));
factoryParamMap.put(HcHttpClient.AUTHENTICATIONS_PROPERTY, basicAuthList.toArray(new Authentication[basicAuthList.size()]));
}
// request header

2
src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java
View file

@ -187,7 +187,7 @@ public class WebConfig extends BsWebConfig implements CrawlingConfig {
for (final WebAuthentication webAuth : webAuthList) {
basicAuthList.add(webAuth.getAuthentication());
}
paramMap.put(HcHttpClient.BASIC_AUTHENTICATIONS_PROPERTY, basicAuthList.toArray(new Authentication[basicAuthList.size()]));
paramMap.put(HcHttpClient.AUTHENTICATIONS_PROPERTY, basicAuthList.toArray(new Authentication[basicAuthList.size()]));
// request header
final List<RequestHeader> requestHeaderList = requestHeaderService.getRequestHeaderList(getId());

5
src/test/java/org/codelibs/fess/es/config/exentity/WebConfigTest.java
View file

@ -26,6 +26,7 @@ import org.codelibs.fess.app.service.RequestHeaderService;
import org.codelibs.fess.app.service.WebAuthenticationService;
import org.codelibs.fess.crawler.client.CrawlerClientFactory;
import org.codelibs.fess.crawler.client.http.Authentication;
import org.codelibs.fess.crawler.client.http.HcHttpClient;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.mylasta.direction.FessProp;
@ -100,7 +101,7 @@ public class WebConfigTest extends UnitFessTestCase {
assertNotNull(initParamMap);
assertEquals(0, ((org.codelibs.fess.crawler.client.http.RequestHeader[]) initParamMap.get("requestHeaders")).length);
assertEquals("Mozilla/5.0 (compatible; Fess/98.76; +http://fess.codelibs.org/bot.html)", initParamMap.get("userAgent"));
assertEquals(0, ((Authentication[]) initParamMap.get("basicAuthentications")).length);
assertEquals(0, ((Authentication[]) initParamMap.get(HcHttpClient.AUTHENTICATIONS_PROPERTY)).length);
assertTrue(Boolean.valueOf(initParamMap.get("robotsTxtEnabled").toString()).booleanValue());
}
@ -173,7 +174,7 @@ public class WebConfigTest extends UnitFessTestCase {
assertNotNull(initParamMap);
assertEquals(0, ((org.codelibs.fess.crawler.client.http.RequestHeader[]) initParamMap.get("requestHeaders")).length);
assertEquals(userAgent, initParamMap.get("userAgent"));
assertEquals(0, ((Authentication[]) initParamMap.get("basicAuthentications")).length);
assertEquals(0, ((Authentication[]) initParamMap.get(HcHttpClient.AUTHENTICATIONS_PROPERTY)).length);
assertFalse(Boolean.valueOf(initParamMap.get("robotsTxtEnabled").toString()).booleanValue());
}
}