Skip to content

Commit 0855b33

Browse files
mneethirajmneethiraj
authored
RANGER-5515: remove javax.servlet-api depedency in agents-common module (#874)
1 parent e16981f commit 0855b33

5 files changed

Lines changed: 62 additions & 67 deletions

File tree

‎agents-audit/dest-auditserver/src/main/java/org/apache/ranger/audit/destination/RangerAuditServerDestination.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@
2424
import org.apache.commons.lang3.StringUtils;
2525
import org.apache.hadoop.conf.Configuration;
2626
import org.apache.hadoop.security.UserGroupInformation;
27+
import org.apache.http.HttpStatus;
2728
import org.apache.ranger.audit.model.AuditEventBase;
2829
import org.apache.ranger.audit.model.AuthzAuditEvent;
2930
import org.apache.ranger.audit.provider.MiscUtil;
3031
import org.apache.ranger.plugin.util.RangerRESTClient;
3132
import org.slf4j.Logger;
3233
import org.slf4j.LoggerFactory;
3334

34-
import javax.servlet.http.HttpServletResponse;
35-
3635
import java.security.PrivilegedExceptionAction;
3736
import java.util.Collection;
3837
import java.util.HashMap;
@@ -209,7 +208,7 @@ private boolean sendBatch(Collection<AuditEventBase> events, RangerRESTClient re
209208
if (response != null) {
210209
int status = response.getStatus();
211210

212-
if (status == HttpServletResponse.SC_OK) {
211+
if (status == HttpStatus.SC_OK) {
213212
if (LOG.isDebugEnabled()) {
214213
LOG.debug("Audit batch sent successfully. {} events delivered. Response: {}", events.size(), response.getEntity(String.class));
215214
}
@@ -228,7 +227,7 @@ private boolean sendBatch(Collection<AuditEventBase> events, RangerRESTClient re
228227

229228
LOG.error("Failed to send audit batch. HTTP status: {}, Response: {}", status, errorBody);
230229

231-
if (status == HttpServletResponse.SC_UNAUTHORIZED) {
230+
if (status == HttpStatus.SC_UNAUTHORIZED) {
232231
LOG.error("Authentication failure (401). Verify credentials are valid and audit server is properly configured.");
233232
}
234233

‎agents-common/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,6 @@
8383
</exclusion>
8484
</exclusions>
8585
</dependency>
86-
<dependency>
87-
<groupId>javax.servlet</groupId>
88-
<artifactId>javax.servlet-api</artifactId>
89-
<version>${javax.servlet.version}</version>
90-
</dependency>
9186
<dependency>
9287
<groupId>net.java.dev.jna</groupId>
9388
<artifactId>jna</artifactId>

‎agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.slf4j.Logger;
4848
import org.slf4j.LoggerFactory;
4949

50-
import javax.servlet.http.HttpServletResponse;
5150
import javax.ws.rs.core.Cookie;
5251
import javax.ws.rs.core.NewCookie;
5352

@@ -168,7 +167,7 @@ public ServicePolicies getServicePoliciesIfUpdated(final long lastKnownVersion,
168167

169168
checkAndResetSessionCookie(response);
170169

171-
if (response == null || response.getStatus() == HttpServletResponse.SC_NOT_MODIFIED || response.getStatus() == HttpServletResponse.SC_NO_CONTENT) {
170+
if (response == null || response.getStatus() == HttpStatus.SC_NOT_MODIFIED || response.getStatus() == HttpStatus.SC_NO_CONTENT) {
172171
if (response == null) {
173172
LOG.error("Error getting policies; Received NULL response!!. secureMode={}, serviceName={}", isSecureMode, serviceName);
174173
} else {
@@ -179,9 +178,9 @@ public ServicePolicies getServicePoliciesIfUpdated(final long lastKnownVersion,
179178
}
180179

181180
ret = null;
182-
} else if (response.getStatus() == HttpServletResponse.SC_OK) {
181+
} else if (response.getStatus() == HttpStatus.SC_OK) {
183182
ret = JsonUtilsV2.readResponse(response, ServicePolicies.class);
184-
} else if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) {
183+
} else if (response.getStatus() == HttpStatus.SC_NOT_FOUND) {
185184
ret = null;
186185

187186
LOG.error("Error getting policies; service not found. secureMode={}, response={}, serviceName={}, lastKnownVersion={}, lastActivationTimeInMillis={}",
@@ -246,7 +245,7 @@ public RangerRoles getRolesIfUpdated(final long lastKnownRoleVersion, final long
246245

247246
checkAndResetSessionCookie(response);
248247

249-
if (response == null || response.getStatus() == HttpServletResponse.SC_NOT_MODIFIED || response.getStatus() == HttpServletResponse.SC_NO_CONTENT) {
248+
if (response == null || response.getStatus() == HttpStatus.SC_NOT_MODIFIED || response.getStatus() == HttpStatus.SC_NO_CONTENT) {
250249
if (response == null) {
251250
LOG.error("Error getting Roles; Received NULL response!!. secureMode={}, serviceName={}", isSecureMode, serviceName);
252251
} else {
@@ -257,9 +256,9 @@ public RangerRoles getRolesIfUpdated(final long lastKnownRoleVersion, final long
257256
}
258257

259258
ret = null;
260-
} else if (response.getStatus() == HttpServletResponse.SC_OK) {
259+
} else if (response.getStatus() == HttpStatus.SC_OK) {
261260
ret = JsonUtilsV2.readResponse(response, RangerRoles.class);
262-
} else if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) {
261+
} else if (response.getStatus() == HttpStatus.SC_NOT_FOUND) {
263262
ret = null;
264263

265264
LOG.error("Error getting Roles; service not found. secureMode={}, response={}, serviceName={}, lastKnownRoleVersion={}, lastActivationTimeInMillis={}",
@@ -315,12 +314,12 @@ public RangerRole createRole(final RangerRole request) throws Exception {
315314

316315
checkAndResetSessionCookie(response);
317316

318-
if (response != null && response.getStatus() != HttpServletResponse.SC_OK) {
317+
if (response != null && response.getStatus() != HttpStatus.SC_OK) {
319318
RESTResponse resp = RESTResponse.fromClientResponse(response);
320319

321320
LOG.error("createRole() failed: HTTP status={}, message={}, isSecure={}{}", response.getStatus(), resp.getMessage(), isSecureMode);
322321

323-
if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
322+
if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
324323
throw new AccessControlException();
325324
}
326325

@@ -370,12 +369,12 @@ public void dropRole(final String execUser, final String roleName) throws Except
370369

371370
if (response == null) {
372371
throw new Exception("unknown error during deleteRole. roleName=" + roleName);
373-
} else if (response.getStatus() != HttpServletResponse.SC_OK && response.getStatus() != HttpServletResponse.SC_NO_CONTENT) {
372+
} else if (response.getStatus() != HttpStatus.SC_OK && response.getStatus() != HttpStatus.SC_NO_CONTENT) {
374373
RESTResponse resp = RESTResponse.fromClientResponse(response);
375374

376375
LOG.error("createRole() failed: HTTP status={}, message={}, isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
377376

378-
if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
377+
if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
379378
throw new AccessControlException();
380379
}
381380

@@ -420,12 +419,12 @@ public List<String> getAllRoles(final String execUser) throws Exception {
420419
List<String> ret;
421420

422421
if (response != null) {
423-
if (response.getStatus() != HttpServletResponse.SC_OK) {
422+
if (response.getStatus() != HttpStatus.SC_OK) {
424423
RESTResponse resp = RESTResponse.fromClientResponse(response);
425424

426425
LOG.error("getAllRoles() failed: HTTP status={}, message={}, isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
427426

428-
if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
427+
if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
429428
throw new AccessControlException();
430429
}
431430

@@ -472,12 +471,12 @@ public List<String> getUserRoles(final String execUser) throws Exception {
472471
List<String> ret;
473472

474473
if (response != null) {
475-
if (response.getStatus() != HttpServletResponse.SC_OK) {
474+
if (response.getStatus() != HttpStatus.SC_OK) {
476475
RESTResponse resp = RESTResponse.fromClientResponse(response);
477476

478477
LOG.error("getUserRoles() failed: HTTP status={}, message={}, isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
479478

480-
if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
479+
if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
481480
throw new AccessControlException();
482481
}
483482

@@ -528,12 +527,12 @@ public RangerRole getRole(final String execUser, final String roleName) throws E
528527
RangerRole ret;
529528

530529
if (response != null) {
531-
if (response.getStatus() != HttpServletResponse.SC_OK) {
530+
if (response.getStatus() != HttpStatus.SC_OK) {
532531
RESTResponse resp = RESTResponse.fromClientResponse(response);
533532

534533
LOG.error("getRole() failed: HTTP status={}, message={}, isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
535534

536-
if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
535+
if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
537536
throw new AccessControlException();
538537
}
539538

@@ -577,12 +576,12 @@ public void grantRole(final GrantRevokeRoleRequest request) throws Exception {
577576

578577
checkAndResetSessionCookie(response);
579578

580-
if (response != null && response.getStatus() != HttpServletResponse.SC_OK) {
579+
if (response != null && response.getStatus() != HttpStatus.SC_OK) {
581580
RESTResponse resp = RESTResponse.fromClientResponse(response);
582581

583582
LOG.error("grantRole() failed: HTTP status={}, message={}, isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
584583

585-
if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
584+
if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
586585
throw new AccessControlException();
587586
}
588587

@@ -621,12 +620,12 @@ public void revokeRole(final GrantRevokeRoleRequest request) throws Exception {
621620

622621
checkAndResetSessionCookie(response);
623622

624-
if (response != null && response.getStatus() != HttpServletResponse.SC_OK) {
623+
if (response != null && response.getStatus() != HttpStatus.SC_OK) {
625624
RESTResponse resp = RESTResponse.fromClientResponse(response);
626625

627626
LOG.error("revokeRole() failed: HTTP status={}, message={}, isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
628627

629-
if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
628+
if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
630629
throw new AccessControlException();
631630
}
632631

@@ -672,12 +671,12 @@ public void grantAccess(final GrantRevokeRequest request) throws Exception {
672671

673672
checkAndResetSessionCookie(response);
674673

675-
if (response != null && response.getStatus() != HttpServletResponse.SC_OK) {
674+
if (response != null && response.getStatus() != HttpStatus.SC_OK) {
676675
RESTResponse resp = RESTResponse.fromClientResponse(response);
677676

678677
LOG.error("grantAccess() failed: HTTP status={}, message={}, isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
679678

680-
if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
679+
if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
681680
throw new AccessControlException();
682681
}
683682

@@ -723,12 +722,12 @@ public void revokeAccess(final GrantRevokeRequest request) throws Exception {
723722

724723
checkAndResetSessionCookie(response);
725724

726-
if (response != null && response.getStatus() != HttpServletResponse.SC_OK) {
725+
if (response != null && response.getStatus() != HttpStatus.SC_OK) {
727726
RESTResponse resp = RESTResponse.fromClientResponse(response);
728727

729728
LOG.error("revokeAccess() failed: HTTP status={}, message={}, isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
730729

731-
if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
730+
if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
732731
throw new AccessControlException();
733732
}
734733

@@ -780,7 +779,7 @@ public ServiceTags getServiceTagsIfUpdated(final long lastKnownVersion, final lo
780779

781780
final ServiceTags ret;
782781

783-
if (response == null || response.getStatus() == HttpServletResponse.SC_NOT_MODIFIED) {
782+
if (response == null || response.getStatus() == HttpStatus.SC_NOT_MODIFIED) {
784783
if (response == null) {
785784
LOG.error("Error getting tags; Received NULL response!!. secureMode={}, serviceName={}", isSecureMode, serviceName);
786785
} else {
@@ -791,9 +790,9 @@ public ServiceTags getServiceTagsIfUpdated(final long lastKnownVersion, final lo
791790
}
792791

793792
ret = null;
794-
} else if (response.getStatus() == HttpServletResponse.SC_OK) {
793+
} else if (response.getStatus() == HttpStatus.SC_OK) {
795794
ret = JsonUtilsV2.readResponse(response, ServiceTags.class);
796-
} else if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) {
795+
} else if (response.getStatus() == HttpStatus.SC_NOT_FOUND) {
797796
ret = null;
798797

799798
LOG.error("Error getting tags; service not found. secureMode={}, response={}, serviceName={}, lastKnownVersion={}, lastActivationTimeInMillis={}",
@@ -851,7 +850,7 @@ public List<String> getTagTypes(String pattern) throws Exception {
851850

852851
List<String> ret;
853852

854-
if (response != null && response.getStatus() == HttpServletResponse.SC_OK) {
853+
if (response != null && response.getStatus() == HttpStatus.SC_OK) {
855854
ret = JsonUtilsV2.readResponse(response, TYPE_LIST_STRING);
856855
} else {
857856
RESTResponse resp = RESTResponse.fromClientResponse(response);
@@ -908,7 +907,7 @@ public RangerUserStore getUserStoreIfUpdated(long lastKnownUserStoreVersion, lon
908907

909908
final RangerUserStore ret;
910909

911-
if (response == null || response.getStatus() == HttpServletResponse.SC_NOT_MODIFIED) {
910+
if (response == null || response.getStatus() == HttpStatus.SC_NOT_MODIFIED) {
912911
if (response == null) {
913912
LOG.error("Error getting UserStore; Received NULL response!!. secureMode={}, serviceName={}", isSecureMode, serviceName);
914913
} else {
@@ -919,9 +918,9 @@ public RangerUserStore getUserStoreIfUpdated(long lastKnownUserStoreVersion, lon
919918
}
920919

921920
ret = null;
922-
} else if (response.getStatus() == HttpServletResponse.SC_OK) {
921+
} else if (response.getStatus() == HttpStatus.SC_OK) {
923922
ret = JsonUtilsV2.readResponse(response, RangerUserStore.class);
924-
} else if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) {
923+
} else if (response.getStatus() == HttpStatus.SC_NOT_FOUND) {
925924
ret = null;
926925

927926
LOG.error("Error getting UserStore; service not found. secureMode={}, response={}, serviceName={}, lastKnownUserStoreVersion={}, lastActivationTimeInMillis={}",
@@ -989,16 +988,16 @@ public ServiceGdsInfo getGdsInfoIfUpdated(long lastKnownVersion, long lastActiva
989988
ret = null;
990989

991990
LOG.error("Error getting GdsInfo - received NULL response: secureMode={}, serviceName={}", isSecureMode, serviceName);
992-
} else if (response.getStatus() == HttpServletResponse.SC_NOT_MODIFIED) {
991+
} else if (response.getStatus() == HttpStatus.SC_NOT_MODIFIED) {
993992
ret = null;
994993

995994
RESTResponse resp = RESTResponse.fromClientResponse(response);
996995

997996
LOG.debug("No change in GdsInfo: secureMode={}, response={}, serviceName={}, lastKnownGdsVersion={}, lastActivationTimeInMillis={}",
998997
isSecureMode, resp, serviceName, lastKnownVersion, lastActivationTimeInMillis);
999-
} else if (response.getStatus() == HttpServletResponse.SC_OK) {
998+
} else if (response.getStatus() == HttpStatus.SC_OK) {
1000999
ret = JsonUtilsV2.readResponse(response, ServiceGdsInfo.class);
1001-
} else if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) {
1000+
} else if (response.getStatus() == HttpStatus.SC_NOT_FOUND) {
10021001
ret = null;
10031002

10041003
LOG.error("Error getting GdsInfo - service not found: secureMode={}, response={}, serviceName={}, lastKnownGdsVersion={},lastActivationTimeInMillis={}",

‎agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerUserStoreRefresher.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
import org.slf4j.Logger;
3535
import org.slf4j.LoggerFactory;
3636

37-
import javax.servlet.http.HttpServletResponse;
38-
3937
import java.io.File;
4038
import java.io.FileReader;
4139
import java.io.FileWriter;
@@ -47,6 +45,10 @@
4745
import java.util.Map;
4846
import java.util.concurrent.BlockingQueue;
4947

48+
import static org.apache.http.HttpStatus.SC_NOT_FOUND;
49+
import static org.apache.http.HttpStatus.SC_NOT_MODIFIED;
50+
import static org.apache.http.HttpStatus.SC_OK;
51+
5052
public class RangerUserStoreRefresher extends Thread {
5153
private static final Logger LOG = LoggerFactory.getLogger(RangerUserStoreRefresher.class);
5254
private static final Logger PERF_REFRESHER_INIT_LOG = RangerPerfTracer.getPerfLogger("userstore.init");
@@ -378,7 +380,7 @@ private RangerUserStore getUserStoreIfUpdated(long lastKnownUserStoreVersion, lo
378380

379381
final RangerUserStore ret;
380382

381-
if (response == null || response.getStatus() == HttpServletResponse.SC_NOT_MODIFIED) {
383+
if (response == null || response.getStatus() == SC_NOT_MODIFIED) {
382384
if (response == null) {
383385
LOG.error("Error getting UserStore; Received NULL response!!. secureMode={}, user={}", isSecureMode, user);
384386
} else {
@@ -389,9 +391,9 @@ private RangerUserStore getUserStoreIfUpdated(long lastKnownUserStoreVersion, lo
389391
}
390392

391393
ret = null;
392-
} else if (response.getStatus() == HttpServletResponse.SC_OK) {
394+
} else if (response.getStatus() == SC_OK) {
393395
ret = JsonUtilsV2.readResponse(response, RangerUserStore.class);
394-
} else if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) {
396+
} else if (response.getStatus() == SC_NOT_FOUND) {
395397
ret = null;
396398

397399
LOG.error("Error getting UserStore; service not found. secureMode={}, user={}, response={}, lastKnownUserStoreVersion={}, lastActivationTimeInMillis={}",

0 commit comments

Comments
 (0)