Added more null parameter checking.

Some REST methods have been modified to check for null parameters
and return the proper error code.

Ticket #749

2 files changed, 11 insertions, 0 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java
index 065f93c8f..5f9a3b947 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java
@@ -334,6 +334,9 @@ public class GroupService extends PKIService implements GroupResource {
 
     @Override
     public GroupMemberCollection findGroupMembers(String groupID, Integer start, Integer size) {
+
+        if (groupID == null) throw new BadRequestException("Group ID is null.");
+
         try {
             GroupMemberProcessor processor = new GroupMemberProcessor(getLocale(headers));
             processor.setUriInfo(uriInfo);
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorService.java b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorService.java
index 53ff8e9a2..310e08206 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAConnectorService.java
@@ -24,6 +24,7 @@ import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.UriInfo;
 
+import com.netscape.certsrv.base.BadRequestException;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.PKIException;
 import com.netscape.certsrv.system.KRAConnectorInfo;
@@ -49,6 +50,9 @@ public class KRAConnectorService extends PKIService implements KRAConnectorResou
 
     @Override
     public void addConnector(KRAConnectorInfo info) {
+
+        if (info == null) throw new BadRequestException("KRA connector info is null.");
+
         try {
             KRAConnectorProcessor processor = new KRAConnectorProcessor(getLocale(headers));
             processor.addConnector(info);
@@ -60,6 +64,10 @@ public class KRAConnectorService extends PKIService implements KRAConnectorResou
 
     @Override
     public void removeConnector(String host, String port) {
+
+        if (host == null) throw new BadRequestException("KRA connector host is null.");
+        if (port == null) throw new BadRequestException("KRA connector port is null.");
+
         try {
             KRAConnectorProcessor processor = new KRAConnectorProcessor(getLocale(headers));
             processor.removeConnector(host, port);