Replace on self is useless

This commit is contained in:
root 2014-07-17 20:46:01 +10:00
parent 3031412133
commit 3d3099fb00

View file

@ -13,10 +13,10 @@ class Replace(CacheKill,Plugin):
def initialize(self,options):
'''Called if plugin is enabled, passed the options namespace'''
self.options = options
self.match_str = options.match_str
self.search_str = options.search_str
self.replace_str = options.replace_str
if self.options.preserve_cache:
if self.options.keep_cache:
self.implements.remove("handleHeader")
self.implements.remove("connectionMade")
@ -30,12 +30,11 @@ class Replace(CacheKill,Plugin):
ip,hn,mime = self._get_req_info(request)
if self._should_replace(ip,hn,mime) and (not self.replace_str==self.search_str==None) and (not self.search_str==""):
data = self.replace(self.search_str, self.replace_str)
data = data.replace(self.search_str, self.replace_str)
self.ctable[ip] = time.time()
self.dtable[ip+hn] = True
logging.info("%s [%s] Replaced '%s' with '%s'" % (request.client.getClientIP(), request.headers['host'], self.match_str, self.replace_str))
logging.info("%s [%s] Replaced '%s' with '%s'" % (request.client.getClientIP(), request.headers['host'], self.search_str, self.replace_str))
return {'request':request,'data':data}
@ -44,7 +43,7 @@ class Replace(CacheKill,Plugin):
def add_options(self,options):
options.add_argument("--replace-str",type=str,default="",help="String you would like to replace.")
options.add_argument("--search-str",type=str,default="",help="String you would like to replace --replace-str with. Default: '' (empty string)")
options.add_argument("--preserve-cache",action="store_true",help="Don't kill the server/client caching.")
options.add_argument("--keep-cache",action="store_true",help="Don't kill the server/client caching.")
def _should_replace(self,ip,hn,mime):
return mime.find(self.mime)!=-1
@ -53,4 +52,5 @@ class Replace(CacheKill,Plugin):
ip = request.client.getClientIP()
hn = request.client.getRequestHostname()
mime = request.client.headers['Content-Type']
return (ip,hn,mime)