honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-03 09:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure CryptoService is not null for node only services

Browse Source 
Original commit: elastic/x-pack-elasticsearch@b17e3620b5
This commit is contained in:
Ryan Ernst 2016-07-11 08:38:12 -07:00
parent 6bcf79dd6c
commit b862db93d0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java
View File

@ -60,7 +60,7 @@ public class SecurityActionFilter extends AbstractComponent implements ActionFil
@Inject @Inject
public SecurityActionFilter(Settings settings, AuthenticationService authcService, AuthorizationService authzService, public SecurityActionFilter(Settings settings, AuthenticationService authcService, AuthorizationService authzService,
@Nullable CryptoService cryptoService, AuditTrail auditTrail, SecurityLicenseState licenseState, CryptoService cryptoService, AuditTrail auditTrail, SecurityLicenseState licenseState,
SecurityActionMapper actionMapper, Set<RequestInterceptor> requestInterceptors, ThreadPool threadPool, SecurityActionMapper actionMapper, Set<RequestInterceptor> requestInterceptors, ThreadPool threadPool,
SecurityContext securityContext) { SecurityContext securityContext) {
super(settings); super(settings);

2
elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/InternalAuthenticationService.java
View File

@ -53,7 +53,7 @@ public class InternalAuthenticationService extends AbstractComponent implements
private final boolean runAsEnabled; private final boolean runAsEnabled;
@Inject @Inject
public InternalAuthenticationService(Settings settings, Realms realms, AuditTrail auditTrail, @Nullable CryptoService cryptoService, public InternalAuthenticationService(Settings settings, Realms realms, AuditTrail auditTrail, CryptoService cryptoService,
AuthenticationFailureHandler failureHandler, ThreadPool threadPool, RestController controller) { AuthenticationFailureHandler failureHandler, ThreadPool threadPool, RestController controller) {
super(settings); super(settings);
this.nodeName = Node.NODE_NAME_SETTING.get(settings); this.nodeName = Node.NODE_NAME_SETTING.get(settings);