Changeset 5415

Timestamp:

06/30/14 22:41:52 (10 years ago)

Author:

Oliver Schonefeld

Message:

• remove IP filter

Location:

OAIProvider/trunk/src/main/java/eu/clarin/oai/provider/impl

Files:

• IPFilter.java (deleted)
• OAIProvider.java (modified) (8 diffs)

OAIProvider/trunk/src/main/java/eu/clarin/oai/provider/impl/OAIProvider.java

@@ -38 +38 @@
     private Timer timer = new Timer("OAI-Provider-Maintenance", true);
     private AtomicBoolean isAvailable = new AtomicBoolean(true);
-    private IPFilter ipfilter = new IPFilter();
     private RepositoryAdapter repository;
 
@@ -45 +44 @@
             throw new NullPointerException("repository == null");
         }
-        
+
         // register basic verbs
         this.registerVerb(new VerbIdentify());
@@ -74 +73 @@
                                 i.remove();
                                 logger.debug("resumption token with id '{}' " +
-                                             " expired", token.getId());  
+                                             " expired", token.getId());
                             }
                         } // synchronized (token)
@@ -91 +90 @@
     }
 
-    public IPFilter getIPFilter() {
-        return ipfilter;
-    }
-
     public void shutdown() {
         timer.cancel();
@@ -102 +97 @@
             HttpServletResponse response) {
         try {
-            final String remoteAddr = request.getRemoteAddr(); 
-            if (ipfilter.accept(remoteAddr)) {
-                try {
-                    if (isAvailable.get()) {
-                        doProcess(request, response);
-                    } else {
-                        response.setHeader("Retry-After", "3600");
-                        sendHttpResponse(response,
-                                HttpServletResponse.SC_SERVICE_UNAVAILABLE,
-                                "The OAI provider is currently not available.");
-                    }
-                } catch (OAIException e) {
-                    logger.error("An error internal error occured", e);
-                    sendHttpResponse(
-                            response,
-                            HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
-                            "An internal error occured", e);
-                } catch (XMLStreamException e) {
-                    logger.error("An error occured while serializing reponse", e);
-                    sendHttpResponse(
-                            response,
-                            HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
-                            "An error occured while serializing reponse", e);
-                }
-            } else {
-                logger.warn("request denied for remote host {}", remoteAddr);
-                sendHttpResponse(response, HttpServletResponse.SC_FORBIDDEN,
-                        "The OAI provider will not serve you.");
+            try {
+                if (isAvailable.get()) {
+                    doProcess(request, response);
+                } else {
+                    response.setHeader("Retry-After", "3600");
+                    sendHttpResponse(response,
+                            HttpServletResponse.SC_SERVICE_UNAVAILABLE,
+                            "The OAI provider is currently not available.");
+                }
+            } catch (OAIException e) {
+                logger.error("An error internal error occured", e);
+                sendHttpResponse(response,
+                        HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+                        "An internal error occured", e);
+            } catch (XMLStreamException e) {
+                logger.error("An error occured while serializing reponse", e);
+                sendHttpResponse(response,
+                        HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+                        "An error occured while serializing reponse", e);
             }
         } catch (IOException e) {
@@ -177 +163 @@
             /*
              *  special handling of resumptionToken, because if it is
-             *  available is must be the only argument. 
+             *  available is must be the only argument.
              */
             if (verb.supportsArgument(DefaultArguments.ARG_RESUMPTIONTOKEN) &&
@@ -302 +288 @@
                 // remove from unhandled argument list
                 remaining.remove(arg.getName());
-                
+
                 // check if valid
                 Object parsedValue =
@@ -338 +324 @@
     }
 
-    
+
     private void sendHttpResponse(HttpServletResponse response, int status,
             String message) throws IOException {
         sendHttpResponse(response, status, message, null);
     }
-        
+
 
     private void sendHttpResponse(HttpServletResponse response, int status,