From: zapata <zapata>
Date: Sat, 3 May 2003 02:20:05 +0000 (+0000)
Subject: debug code added
X-Git-Tag: BEFORE_MERGE_1_1~123
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=e6aa766896749ea7c9356b2d48b47f0885a7a73b;p=mir.git

debug code added
---

diff --git a/source/mircoders/global/Abuse.java b/source/mircoders/global/Abuse.java
index b0e28d50..58df7cf4 100755
--- a/source/mircoders/global/Abuse.java
+++ b/source/mircoders/global/Abuse.java
@@ -181,32 +181,40 @@ public class Abuse {
     return false;
   }
 
-  public void checkComment(EntityComment aComment, Request aRequest, HttpServletResponse aResponse) {
-    try {
-      long time = System.currentTimeMillis();
-      String address = "0.0.0.0";
-      String browser = "unknown";
-      Cookie[] cookies = {};
+  public boolean checkRequest(Request aRequest, HttpServletResponse aResponse, String anId, boolean anIsComment) {
+    String address = "0.0.0.0";
+    String browser = "unknown";
+    List cookies = null;
 
-      HttpServletRequest request = null;
+    HttpServletRequest request = null;
 
-      if (aRequest instanceof HTTPAdapters.HTTPParsedRequestAdapter) {
-        request = ((HTTPAdapters.HTTPParsedRequestAdapter) aRequest).getRequest();
-      }
-      else if (aRequest instanceof HTTPAdapters.HTTPRequestAdapter) {
-        request = ((HTTPAdapters.HTTPRequestAdapter) aRequest).getRequest();
-      }
-      if (request!=null) {
-        browser = (String) request.getHeader("User-Agent");
-        address = request.getRemoteAddr();
-        cookies = request.getCookies();
-      }
+    if (aRequest instanceof HTTPAdapters.HTTPParsedRequestAdapter) {
+      request = ((HTTPAdapters.HTTPParsedRequestAdapter) aRequest).getRequest();
+    }
+    else if (aRequest instanceof HTTPAdapters.HTTPRequestAdapter) {
+      request = ((HTTPAdapters.HTTPRequestAdapter) aRequest).getRequest();
+    }
+    if (request!=null) {
+      browser = (String) request.getHeader("User-Agent");
+      address = request.getRemoteAddr();
+      cookies = Arrays.asList(request.getCookies());
+    }
 
-      logComment(address, aComment.getId(), new Date(), browser);
+    if (anIsComment)
+      logComment(address, anId , new Date(), browser);
+    else
+      logArticle(address, anId , new Date(), browser);
+
+    return checkCookie(cookies) || checkIpFilter(address);
+  }
+
+  public void checkComment(EntityComment aComment, Request aRequest, HttpServletResponse aResponse) {
+    try {
+      long time = System.currentTimeMillis();
 
       MirAdminInterfaceLocalizer.MirSimpleEntityOperation operation = MirGlobal.localizer().adminInterface().simpleCommentOperationForName(commentBlockAction);
 
-      if (checkCookie(Arrays.asList(cookies)) || checkIpFilter(address) || checkRegExpFilter(aComment)) {
+      if (checkRequest(aRequest, aResponse, aComment.getId(), true) || checkRegExpFilter(aComment)) {
         logger.debug("performing operation " + operation.getName());
         operation.perform(null, MirGlobal.localizer().dataModel().adapterModel().makeEntityAdapter("comment", aComment));
         setCookie(aResponse);
@@ -215,6 +223,7 @@ public class Abuse {
       logger.info("checkComment: " + (System.currentTimeMillis()-time) + "ms");
     }
     catch (Throwable t) {
+      t.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));
       logger.error("Abuse.checkComment: " + t.toString());
     }
   }
@@ -222,31 +231,10 @@ public class Abuse {
   public void checkArticle(EntityContent anArticle, Request aRequest, HttpServletResponse aResponse) {
     try {
       long time = System.currentTimeMillis();
-      String address = "0.0.0.0";
-      String browser = "unknown";
-      Cookie[] cookies = {};
-
-      HttpServletRequest request = null;
-
-      if (aRequest instanceof HTTPAdapters.HTTPParsedRequestAdapter) {
-        request = ((HTTPAdapters.HTTPParsedRequestAdapter) aRequest).getRequest();
-      }
-      else if (aRequest instanceof HTTPAdapters.HTTPRequestAdapter) {
-        request = ((HTTPAdapters.HTTPRequestAdapter) aRequest).getRequest();
-      }
-      if (request!=null) {
-        browser = (String) request.getHeader("User-Agent");
-        address = request.getRemoteAddr();
-        cookies = request.getCookies();
-      }
-      else
-        logger.debug("no request available! " + aRequest.getClass().getName());
-
-      logArticle(address, anArticle.getId(), new Date(), browser);
 
       MirAdminInterfaceLocalizer.MirSimpleEntityOperation operation = MirGlobal.localizer().adminInterface().simpleArticleOperationForName(commentBlockAction);
 
-      if (checkCookie(Arrays.asList(cookies)) || checkIpFilter(address) || checkRegExpFilter(anArticle)) {
+      if (checkRequest(aRequest, aResponse, anArticle.getId(), false) || checkRegExpFilter(anArticle)) {
         logger.debug("performing operation " + operation.getName());
         operation.perform(null, MirGlobal.localizer().dataModel().adapterModel().makeEntityAdapter("content", anArticle));
         setCookie(aResponse);
@@ -255,6 +243,7 @@ public class Abuse {
       logger.info("checkArticle: " + (System.currentTimeMillis()-time) + "ms");
     }
     catch (Throwable t) {
+      t.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));
       logger.error("Abuse.checkArticle: " + t.toString());
     }
   }