From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Wed, 17 Nov 2010 20:54:08 +0000 (-0500)
Subject: use Username while calculating the key
X-Git-Tag: plcapi-5.0-19~56^2~5^2~1
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=cebd5dfe44a46a0bb737e2977b3014fdd77186f2

use Username while calculating the key
---

diff --git a/aspects/ratelimitaspects.py b/aspects/ratelimitaspects.py
index 8c28dd5..346e137 100644
--- a/aspects/ratelimitaspects.py
+++ b/aspects/ratelimitaspects.py
@@ -25,6 +25,12 @@ class BaseRateLimit(object):
 
         self.whitelist = []
 
+    def log(self, line)
+        log = open("/var/log/plc_ratelimit.log", "a")
+        date = datetime.now().strftime("%d/%m/%y %H:%M")
+        log.write("%s - %s\n" % (date, line))
+        log.flush()
+
     def before(self, wobj, data, *args, **kwargs):
         # ratelimit_128.112.139.115_201011091532 = 1
         # ratelimit_128.112.139.115_201011091533 = 14
@@ -34,10 +40,15 @@ class BaseRateLimit(object):
 
         api_method_name = wobj.name
         api_method_source = wobj.source
+        api_method_caller = args[0]["Username"]
 
         if api_method_source == None or api_method_source[0] == self.config.PLC_API_IP or api_method_source[0] in self.whitelist:
             return
 
+        if api_method_caller == None:
+            self.log("%s called with Username = None" % api_method_source[0])
+            return
+
         mc = memcache.Client(["%s:11211" % self.config.PLC_API_HOST])
         now = datetime.now()
         current_key = "%s_%s_%s" % (self.prefix, api_method_source[0], now.strftime("%Y%m%d%H%M"))
@@ -58,10 +69,7 @@ class BaseRateLimit(object):
             total_requests += result[i]
 
         if total_requests > self.requests:
-            log = open("/var/log/plc_api_ratelimit.log", "a")
-            date = datetime.now().strftime("%d/%m/%y %H:%M")
-            log.write("%s - %s\n" % (date, api_method_source[0]))
-            log.flush()
+            self.log("%s - %s" % (api_method_source[0], api_method_caller))
             raise PLCPermissionDenied, "Maximum allowed number of API calls exceeded"
 
     def after(self, wobj, data, *args, **kwargs):