Changeset 36881

Timestamp:

2022-11-04T13:04:44+13:00 (18 months ago)

Author:

anupama

Message:

Removed debugging.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -1113 +1113 @@
     }
 
-
-    private void debugCheckAgainstRegex() {
-    
-    // Load the global.properties file, get the tomcat.server.IPregex and check for any of it
-    // matching against the local IP
-    String tomcatServerIPregex = GlobalProperties.getProperty("tomcat.server.IPregex", "");
-    
-    logger.info("@@@ tomcatServerIPregex: " + tomcatServerIPregex);
-    
-    String[] testIPs = {"127.0.0.1", "::1", "0:0:0:0:0:0:0:1", "0:0:0:0:0:0:0:1%3"};
-    
-    //if(ipOfClient.equals(request.getLocalAddr()) || ipOfClient.equals("127.0.0.1")
-    //   || ipOfClient.equals("::1") || ipOfClient.startsWith("0:0:0:0:0:0:0:1")) {
-    
-    for(String testIP : testIPs) {
-        if(testIP.matches(tomcatServerIPregex)) {
-        logger.info("testIP " + testIP + " matches regex.");
-        } else {
-        logger.info("testIP " + testIP + " DOESN'T match regex.");
-        }
-    }   
-    }
-    
     
     /**
@@ -1153 +1130 @@
     // if request emanates on same machine as GS server/from local machine, let it go through
     String ipOfClient = getClientIpAddress(request); //request.getRemoteAddr();
-    logger.info("@@@ Request local IP: " + request.getLocalAddr());
-    logger.info("@@@ Client/remote IP: " + ipOfClient);
-    
-    //debugCheckAgainstRegex();
-
-    //if(ipOfClient.equals(request.getLocalAddr()) || ipOfClient.equals("127.0.0.1")
-    //   || ipOfClient.equals("::1") || ipOfClient.startsWith("0:0:0:0:0:0:0:1")) {
-    //    return true;
-    //} 
-    
+
     // Load the global.properties file, get the tomcat.server.IPregex and check for any of it
     // matching against the local IP