=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}
+var type="GET";if(params){if(jQuery.isFunction(params)){callback=params;params=undefined;}else if(typeof params==="object"){params=jQuery.param(params,jQuery.ajaxSettings.traditional);type="POST";}}
+var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(jqXHR,status,responseText){responseText=jqXHR.responseText;if(jqXHR.isResolved()){jqXHR.done(function(r){responseText=r;});self.html(selector?jQuery("").append(responseText.replace(rscript,"")).find(selector):responseText);}
+if(callback){self.each(callback,[responseText,status,jqXHR]);}}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return this.elements?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||rselectTextarea.test(this.nodeName)||rinput.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:jQuery.isArray(val)?jQuery.map(val,function(val,i){return{name:elem.name,value:val.replace(rCRLF,"\r\n")};}):{name:elem.name,value:val.replace(rCRLF,"\r\n")};}).get();}});jQuery.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(i,o){jQuery.fn[o]=function(f){return this.on(o,f);};});jQuery.each(["get","post"],function(i,method){jQuery[method]=function(url,data,callback,type){if(jQuery.isFunction(data)){type=type||callback;callback=data;data=undefined;}
+return jQuery.ajax({type:method,url:url,data:data,success:callback,dataType:type});};});jQuery.extend({getScript:function(url,callback){return jQuery.get(url,undefined,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},ajaxSetup:function(target,settings){if(settings){ajaxExtend(target,jQuery.ajaxSettings);}else{settings=target;target=jQuery.ajaxSettings;}
+ajaxExtend(target,settings);return target;},ajaxSettings:{url:ajaxLocation,isLocal:rlocalProtocol.test(ajaxLocParts[1]),global:true,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:true,async:true,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":allTypes},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":window.String,"text html":true,"text json":jQuery.parseJSON,"text xml":jQuery.parseXML},flatOptions:{context:true,url:true}},ajaxPrefilter:addToPrefiltersOrTransports(prefilters),ajaxTransport:addToPrefiltersOrTransports(transports),ajax:function(url,options){if(typeof url==="object"){options=url;url=undefined;}
+options=options||{};var
+s=jQuery.ajaxSetup({},options),callbackContext=s.context||s,globalEventContext=callbackContext!==s&&(callbackContext.nodeType||callbackContext instanceof jQuery)?jQuery(callbackContext):jQuery.event,deferred=jQuery.Deferred(),completeDeferred=jQuery.Callbacks("once memory"),statusCode=s.statusCode||{},ifModifiedKey,requestHeaders={},requestHeadersNames={},responseHeadersString,responseHeaders,transport,timeoutTimer,parts,state=0,fireGlobals,i,jqXHR={readyState:0,setRequestHeader:function(name,value){if(!state){var lname=name.toLowerCase();name=requestHeadersNames[lname]=requestHeadersNames[lname]||name;requestHeaders[name]=value;}
+return this;},getAllResponseHeaders:function(){return state===2?responseHeadersString:null;},getResponseHeader:function(key){var match;if(state===2){if(!responseHeaders){responseHeaders={};while((match=rheaders.exec(responseHeadersString))){responseHeaders[match[1].toLowerCase()]=match[2];}}
+match=responseHeaders[key.toLowerCase()];}
+return match===undefined?null:match;},overrideMimeType:function(type){if(!state){s.mimeType=type;}
+return this;},abort:function(statusText){statusText=statusText||"abort";if(transport){transport.abort(statusText);}
+done(0,statusText);return this;}};function done(status,nativeStatusText,responses,headers){if(state===2){return;}
+state=2;if(timeoutTimer){clearTimeout(timeoutTimer);}
+transport=undefined;responseHeadersString=headers||"";jqXHR.readyState=status>0?4:0;var isSuccess,success,error,statusText=nativeStatusText,response=responses?ajaxHandleResponses(s,jqXHR,responses):undefined,lastModified,etag;if(status>=200&&status<300||status===304){if(s.ifModified){if((lastModified=jqXHR.getResponseHeader("Last-Modified"))){jQuery.lastModified[ifModifiedKey]=lastModified;}
+if((etag=jqXHR.getResponseHeader("Etag"))){jQuery.etag[ifModifiedKey]=etag;}}
+if(status===304){statusText="notmodified";isSuccess=true;}else{try{success=ajaxConvert(s,response);statusText="success";isSuccess=true;}catch(e){statusText="parsererror";error=e;}}}else{error=statusText;if(!statusText||status){statusText="error";if(status<0){status=0;}}}
+jqXHR.status=status;jqXHR.statusText=""+(nativeStatusText||statusText);if(isSuccess){deferred.resolveWith(callbackContext,[success,statusText,jqXHR]);}else{deferred.rejectWith(callbackContext,[jqXHR,statusText,error]);}
+jqXHR.statusCode(statusCode);statusCode=undefined;if(fireGlobals){globalEventContext.trigger("ajax"+(isSuccess?"Success":"Error"),[jqXHR,s,isSuccess?success:error]);}
+completeDeferred.fireWith(callbackContext,[jqXHR,statusText]);if(fireGlobals){globalEventContext.trigger("ajaxComplete",[jqXHR,s]);if(!(--jQuery.active)){jQuery.event.trigger("ajaxStop");}}}
+deferred.promise(jqXHR);jqXHR.success=jqXHR.done;jqXHR.error=jqXHR.fail;jqXHR.complete=completeDeferred.add;jqXHR.statusCode=function(map){if(map){var tmp;if(state<2){for(tmp in map){statusCode[tmp]=[statusCode[tmp],map[tmp]];}}else{tmp=map[jqXHR.status];jqXHR.then(tmp,tmp);}}
+return this;};s.url=((url||s.url)+"").replace(rhash,"").replace(rprotocol,ajaxLocParts[1]+"//");s.dataTypes=jQuery.trim(s.dataType||"*").toLowerCase().split(rspacesAjax);if(s.crossDomain==null){parts=rurl.exec(s.url.toLowerCase());s.crossDomain=!!(parts&&(parts[1]!=ajaxLocParts[1]||parts[2]!=ajaxLocParts[2]||(parts[3]||(parts[1]==="http:"?80:443))!=(ajaxLocParts[3]||(ajaxLocParts[1]==="http:"?80:443))));}
+if(s.data&&s.processData&&typeof s.data!=="string"){s.data=jQuery.param(s.data,s.traditional);}
+inspectPrefiltersOrTransports(prefilters,s,options,jqXHR);if(state===2){return false;}
+fireGlobals=s.global;s.type=s.type.toUpperCase();s.hasContent=!rnoContent.test(s.type);if(fireGlobals&&jQuery.active++===0){jQuery.event.trigger("ajaxStart");}
+if(!s.hasContent){if(s.data){s.url+=(rquery.test(s.url)?"&":"?")+s.data;delete s.data;}
+ifModifiedKey=s.url;if(s.cache===false){var ts=jQuery.now(),ret=s.url.replace(rts,"$1_="+ts);s.url=ret+((ret===s.url)?(rquery.test(s.url)?"&":"?")+"_="+ts:"");}}
+if(s.data&&s.hasContent&&s.contentType!==false||options.contentType){jqXHR.setRequestHeader("Content-Type",s.contentType);}
+if(s.ifModified){ifModifiedKey=ifModifiedKey||s.url;if(jQuery.lastModified[ifModifiedKey]){jqXHR.setRequestHeader("If-Modified-Since",jQuery.lastModified[ifModifiedKey]);}
+if(jQuery.etag[ifModifiedKey]){jqXHR.setRequestHeader("If-None-Match",jQuery.etag[ifModifiedKey]);}}
+jqXHR.setRequestHeader("Accept",s.dataTypes[0]&&s.accepts[s.dataTypes[0]]?s.accepts[s.dataTypes[0]]+(s.dataTypes[0]!=="*"?", "+allTypes+"; q=0.01":""):s.accepts["*"]);for(i in s.headers){jqXHR.setRequestHeader(i,s.headers[i]);}
+if(s.beforeSend&&(s.beforeSend.call(callbackContext,jqXHR,s)===false||state===2)){jqXHR.abort();return false;}
+for(i in{success:1,error:1,complete:1}){jqXHR[i](s[i]);}
+transport=inspectPrefiltersOrTransports(transports,s,options,jqXHR);if(!transport){done(-1,"No Transport");}else{jqXHR.readyState=1;if(fireGlobals){globalEventContext.trigger("ajaxSend",[jqXHR,s]);}
+if(s.async&&s.timeout>0){timeoutTimer=setTimeout(function(){jqXHR.abort("timeout");},s.timeout);}
+try{state=1;transport.send(requestHeaders,done);}catch(e){if(state<2){done(-1,e);}else{throw e;}}}
+return jqXHR;},param:function(a,traditional){var s=[],add=function(key,value){value=jQuery.isFunction(value)?value():value;s[s.length]=encodeURIComponent(key)+"="+encodeURIComponent(value);};if(traditional===undefined){traditional=jQuery.ajaxSettings.traditional;}
+if(jQuery.isArray(a)||(a.jquery&&!jQuery.isPlainObject(a))){jQuery.each(a,function(){add(this.name,this.value);});}else{for(var prefix in a){buildParams(prefix,a[prefix],traditional,add);}}
+return s.join("&").replace(r20,"+");}});function buildParams(prefix,obj,traditional,add){if(jQuery.isArray(obj)){jQuery.each(obj,function(i,v){if(traditional||rbracket.test(prefix)){add(prefix,v);}else{buildParams(prefix+"["+(typeof v==="object"?i:"")+"]",v,traditional,add);}});}else if(!traditional&&jQuery.type(obj)==="object"){for(var name in obj){buildParams(prefix+"["+name+"]",obj[name],traditional,add);}}else{add(prefix,obj);}}
+jQuery.extend({active:0,lastModified:{},etag:{}});function ajaxHandleResponses(s,jqXHR,responses){var contents=s.contents,dataTypes=s.dataTypes,responseFields=s.responseFields,ct,type,finalDataType,firstDataType;for(type in responseFields){if(type in responses){jqXHR[responseFields[type]]=responses[type];}}
+while(dataTypes[0]==="*"){dataTypes.shift();if(ct===undefined){ct=s.mimeType||jqXHR.getResponseHeader("content-type");}}
+if(ct){for(type in contents){if(contents[type]&&contents[type].test(ct)){dataTypes.unshift(type);break;}}}
+if(dataTypes[0]in responses){finalDataType=dataTypes[0];}else{for(type in responses){if(!dataTypes[0]||s.converters[type+" "+dataTypes[0]]){finalDataType=type;break;}
+if(!firstDataType){firstDataType=type;}}
+finalDataType=finalDataType||firstDataType;}
+if(finalDataType){if(finalDataType!==dataTypes[0]){dataTypes.unshift(finalDataType);}
+return responses[finalDataType];}}
+function ajaxConvert(s,response){if(s.dataFilter){response=s.dataFilter(response,s.dataType);}
+var dataTypes=s.dataTypes,converters={},i,key,length=dataTypes.length,tmp,current=dataTypes[0],prev,conversion,conv,conv1,conv2;for(i=1;i=options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();options.animatedProperties[this.prop]=true;for(p in options.animatedProperties){if(options.animatedProperties[p]!==true){done=false;}}
+if(done){if(options.overflow!=null&&!jQuery.support.shrinkWrapBlocks){jQuery.each(["","X","Y"],function(index,value){elem.style["overflow"+value]=options.overflow[index];});}
+if(options.hide){jQuery(elem).hide();}
+if(options.hide||options.show){for(p in options.animatedProperties){jQuery.style(elem,p,options.orig[p]);jQuery.removeData(elem,"fxshow"+p,true);jQuery.removeData(elem,"toggle"+p,true);}}
+complete=options.complete;if(complete){options.complete=false;complete.call(elem);}}
+return false;}else{if(options.duration==Infinity){this.now=t;}else{n=t-this.startTime;this.state=n/options.duration;this.pos=jQuery.easing[options.animatedProperties[this.prop]](this.state,n,0,1,options.duration);this.now=this.start+((this.end-this.start)*this.pos);}
+this.update();}
+return true;}};jQuery.extend(jQuery.fx,{tick:function(){var timer,timers=jQuery.timers,i=0;for(;i").appendTo(body),display=elem.css("display");elem.remove();if(display==="none"||display===""){if(!iframe){iframe=document.createElement("iframe");iframe.frameBorder=iframe.width=iframe.height=0;}
+body.appendChild(iframe);if(!iframeDoc||!iframe.createElement){iframeDoc=(iframe.contentWindow||iframe.contentDocument).document;iframeDoc.write((jQuery.support.boxModel?"":"")+"");iframeDoc.close();}
+elem=iframeDoc.createElement(nodeName);iframeDoc.body.appendChild(elem);display=jQuery.css(elem,"display");body.removeChild(iframe);}
+elemdisplay[nodeName]=display;}
+return elemdisplay[nodeName];}
+var getOffset,rtable=/^t(?:able|d|h)$/i,rroot=/^(?:body|html)$/i;if("getBoundingClientRect"in document.documentElement){getOffset=function(elem,doc,docElem,box){try{box=elem.getBoundingClientRect();}catch(e){}
+if(!box||!jQuery.contains(docElem,elem)){return box?{top:box.top,left:box.left}:{top:0,left:0};}
+var body=doc.body,win=getWindow(doc),clientTop=docElem.clientTop||body.clientTop||0,clientLeft=docElem.clientLeft||body.clientLeft||0,scrollTop=win.pageYOffset||jQuery.support.boxModel&&docElem.scrollTop||body.scrollTop,scrollLeft=win.pageXOffset||jQuery.support.boxModel&&docElem.scrollLeft||body.scrollLeft,top=box.top+scrollTop-clientTop,left=box.left+scrollLeft-clientLeft;return{top:top,left:left};};}else{getOffset=function(elem,doc,docElem){var computedStyle,offsetParent=elem.offsetParent,prevOffsetParent=elem,body=doc.body,defaultView=doc.defaultView,prevComputedStyle=defaultView?defaultView.getComputedStyle(elem,null):elem.currentStyle,top=elem.offsetTop,left=elem.offsetLeft;while((elem=elem.parentNode)&&elem!==body&&elem!==docElem){if(jQuery.support.fixedPosition&&prevComputedStyle.position==="fixed"){break;}
+computedStyle=defaultView?defaultView.getComputedStyle(elem,null):elem.currentStyle;top-=elem.scrollTop;left-=elem.scrollLeft;if(elem===offsetParent){top+=elem.offsetTop;left+=elem.offsetLeft;if(jQuery.support.doesNotAddBorder&&!(jQuery.support.doesAddBorderForTableAndCells&&rtable.test(elem.nodeName))){top+=parseFloat(computedStyle.borderTopWidth)||0;left+=parseFloat(computedStyle.borderLeftWidth)||0;}
+prevOffsetParent=offsetParent;offsetParent=elem.offsetParent;}
+if(jQuery.support.subtractsBorderForOverflowNotVisible&&computedStyle.overflow!=="visible"){top+=parseFloat(computedStyle.borderTopWidth)||0;left+=parseFloat(computedStyle.borderLeftWidth)||0;}
+prevComputedStyle=computedStyle;}
+if(prevComputedStyle.position==="relative"||prevComputedStyle.position==="static"){top+=body.offsetTop;left+=body.offsetLeft;}
+if(jQuery.support.fixedPosition&&prevComputedStyle.position==="fixed"){top+=Math.max(docElem.scrollTop,body.scrollTop);left+=Math.max(docElem.scrollLeft,body.scrollLeft);}
+return{top:top,left:left};};}
+jQuery.fn.offset=function(options){if(arguments.length){return options===undefined?this:this.each(function(i){jQuery.offset.setOffset(this,options,i);});}
+var elem=this[0],doc=elem&&elem.ownerDocument;if(!doc){return null;}
+if(elem===doc.body){return jQuery.offset.bodyOffset(elem);}
+return getOffset(elem,doc,doc.documentElement);};jQuery.offset={bodyOffset:function(body){var top=body.offsetTop,left=body.offsetLeft;if(jQuery.support.doesNotIncludeMarginInBodyOffset){top+=parseFloat(jQuery.css(body,"marginTop"))||0;left+=parseFloat(jQuery.css(body,"marginLeft"))||0;}
+return{top:top,left:left};},setOffset:function(elem,options,i){var position=jQuery.css(elem,"position");if(position==="static"){elem.style.position="relative";}
+var curElem=jQuery(elem),curOffset=curElem.offset(),curCSSTop=jQuery.css(elem,"top"),curCSSLeft=jQuery.css(elem,"left"),calculatePosition=(position==="absolute"||position==="fixed")&&jQuery.inArray("auto",[curCSSTop,curCSSLeft])>-1,props={},curPosition={},curTop,curLeft;if(calculatePosition){curPosition=curElem.position();curTop=curPosition.top;curLeft=curPosition.left;}else{curTop=parseFloat(curCSSTop)||0;curLeft=parseFloat(curCSSLeft)||0;}
+if(jQuery.isFunction(options)){options=options.call(elem,i,curOffset);}
+if(options.top!=null){props.top=(options.top-curOffset.top)+curTop;}
+if(options.left!=null){props.left=(options.left-curOffset.left)+curLeft;}
+if("using"in options){options.using.call(elem,props);}else{curElem.css(props);}}};jQuery.fn.extend({position:function(){if(!this[0]){return null;}
+var elem=this[0],offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=rroot.test(offsetParent[0].nodeName)?{top:0,left:0}:offsetParent.offset();offset.top-=parseFloat(jQuery.css(elem,"marginTop"))||0;offset.left-=parseFloat(jQuery.css(elem,"marginLeft"))||0;parentOffset.top+=parseFloat(jQuery.css(offsetParent[0],"borderTopWidth"))||0;parentOffset.left+=parseFloat(jQuery.css(offsetParent[0],"borderLeftWidth"))||0;return{top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};},offsetParent:function(){return this.map(function(){var offsetParent=this.offsetParent||document.body;while(offsetParent&&(!rroot.test(offsetParent.nodeName)&&jQuery.css(offsetParent,"position")==="static")){offsetParent=offsetParent.offsetParent;}
+return offsetParent;});}});jQuery.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(method,prop){var top=/Y/.test(prop);jQuery.fn[method]=function(val){return jQuery.access(this,function(elem,method,val){var win=getWindow(elem);if(val===undefined){return win?(prop in win)?win[prop]:jQuery.support.boxModel&&win.document.documentElement[method]||win.document.body[method]:elem[method];}
+if(win){win.scrollTo(!top?val:jQuery(win).scrollLeft(),top?val:jQuery(win).scrollTop());}else{elem[method]=val;}},method,val,arguments.length,null);};});function getWindow(elem){return jQuery.isWindow(elem)?elem:elem.nodeType===9?elem.defaultView||elem.parentWindow:false;}
+jQuery.each({Height:"height",Width:"width"},function(name,type){var clientProp="client"+name,scrollProp="scroll"+name,offsetProp="offset"+name;jQuery.fn["inner"+name]=function(){var elem=this[0];return elem?elem.style?parseFloat(jQuery.css(elem,type,"padding")):this[type]():null;};jQuery.fn["outer"+name]=function(margin){var elem=this[0];return elem?elem.style?parseFloat(jQuery.css(elem,type,margin?"margin":"border")):this[type]():null;};jQuery.fn[type]=function(value){return jQuery.access(this,function(elem,type,value){var doc,docElemProp,orig,ret;if(jQuery.isWindow(elem)){doc=elem.document;docElemProp=doc.documentElement[clientProp];return jQuery.support.boxModel&&docElemProp||doc.body&&doc.body[clientProp]||docElemProp;}
+if(elem.nodeType===9){doc=elem.documentElement;if(doc[clientProp]>=doc[scrollProp]){return doc[clientProp];}
+return Math.max(elem.body[scrollProp],doc[scrollProp],elem.body[offsetProp],doc[offsetProp]);}
+if(value===undefined){orig=jQuery.css(elem,type);ret=parseFloat(orig);return jQuery.isNumeric(ret)?ret:orig;}
+jQuery(elem).css(type,value);},type,value,arguments.length,null);};});window.jQuery=window.$=jQuery;if(typeof define==="function"&&define.amd&&define.amd.jQuery){define("jquery",[],function(){return jQuery;});}})(window);
\ No newline at end of file
diff --git a/tests/compare_peers.py b/tests/compare_peers.py
index 0c0939c..85c0903 100755
--- a/tests/compare_peers.py
+++ b/tests/compare_peers.py
@@ -1,32 +1,32 @@
#!/usr/bin/env python
-import xmlrpclib
+from xmlrpc.client import ServerProxy
import time
import sys
server = 'http://localhost:9911'
print("Connecting to server {}".format(server))
-s = xmlrpclib.ServerProxy(server)
+s = ServerProxy(server)
peer1 = 'http://localhost:9921'
print("Connecting to server {}".format(peer1))
-s1 = xmlrpclib.ServerProxy(peer1)
+s1 = ServerProxy(peer1)
print("peer0 all hosts:")
-print s.debug.list_all_hosts()
+print(s.debug.list_all_hosts())
print("peer1 all hosts:")
-print s1.debug.list_all_hosts()
+print(s1.debug.list_all_hosts())
print("peer0 cracker info for 69.192.72.154:")
try:
- print s.debug.get_cracker_info("69.192.72.154")
-except Exception, e:
- print e
+ print(s.debug.get_cracker_info("69.192.72.154"))
+except Exception as e:
+ print(e)
print("peer1 cracker info for 69.192.72.154:")
try:
- print s1.debug.get_cracker_info("69.192.72.154")
-except Exception, e:
- print e
+ print(s1.debug.get_cracker_info("69.192.72.154"))
+except Exception as e:
+ print(e)
diff --git a/tests/fill_database.py b/tests/fill_database.py
index dd2e772..40ec8b2 100755
--- a/tests/fill_database.py
+++ b/tests/fill_database.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
-import xmlrpclib
+
+from xmlrpc.client import ServerProxy
import time
import threading
import random
@@ -8,7 +9,7 @@
def run(server, count, known_crackers):
#print("Connecting to server {}".format(server))
- s = xmlrpclib.ServerProxy(server)
+ s = ServerProxy(server)
start_time = time.time()
s.debug.test_bulk_insert(count, known_crackers, start_time - random.random()*7*24*3600)
#print("Inserting {} hosts took {} seconds".format(count, time.time() - start_time))
@@ -18,24 +19,24 @@ def run_insert_test(server, num_threads, count, known_crackers):
threads = []
#print("Creating threads...")
- for i in xrange(num_threads):
+ for i in range(num_threads):
thread = threading.Thread(target=run, args=(server, count, known_crackers))
threads.append(thread)
#print("Starting threads...")
- for i in xrange(num_threads):
+ for i in range(num_threads):
threads[i].start()
#print("Waiting for threads...")
- for i in xrange(num_threads):
+ for i in range(num_threads):
threads[i].join()
print("Inserting {} hosts {} times took {} seconds".format(count, num_threads, time.time() - start_time))
print("Average time per insert: {} seconds".format( (time.time() - start_time) / count / num_threads))
-s = xmlrpclib.ServerProxy(server)
-for num_threads in xrange(20, 59):
+s = ServerProxy(server)
+for num_threads in range(20, 59):
print("Inserting {} hosts {} times, please wait...".format(100, num_threads))
s.debug.clear_bulk_cracker_list()
run_insert_test(server, num_threads, 100, True)
@@ -43,7 +44,7 @@ def run_insert_test(server, num_threads, count, known_crackers):
print("==============================================")
-#s = xmlrpclib.ServerProxy(server)
+#s = ServerProxy(server)
#for i in xrange(100):
# s.clear_bulk_cracker_list()
# print("Adding 20*5000=100,000 hosts...")
diff --git a/tests/sim_clients.py b/tests/sim_clients.py
index 8e594c5..5b3e3aa 100755
--- a/tests/sim_clients.py
+++ b/tests/sim_clients.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-import xmlrpclib
+from xmlrpc.client import ServerProxy
import time
import threading
import random
@@ -27,13 +27,13 @@ def random_ip_address():
def run(server, count):
# Assuming every client will supply 1 new host every 8minutes
# and ask for newly recognised crackers
- s = xmlrpclib.ServerProxy(server)
- for i in xrange(count):
+ s = ServerProxy(server)
+ for i in range(count):
ip = random_ip_address()
try:
s.add_hosts([ip])
s.get_new_hosts(time.time()-480, 3, [ip], 3600)
- except Exception, e:
+ except Exception as e:
print("Got exception {}".format(e))
def run_sim(server, num_threads, count):
@@ -41,16 +41,16 @@ def run_sim(server, num_threads, count):
threads = []
print("Creating threads...")
- for i in xrange(num_threads):
+ for i in range(num_threads):
thread = threading.Thread(target=run, args=(server, count))
threads.append(thread)
print("Starting threads...")
- for i in xrange(num_threads):
+ for i in range(num_threads):
threads[i].start()
#print("Waiting for threads...")
- for i in xrange(num_threads):
+ for i in range(num_threads):
threads[i].join()
end_time = time.time()
diff --git a/tests/test.py b/tests/test.py
index 90f4bcd..4862ca7 100755
--- a/tests/test.py
+++ b/tests/test.py
@@ -1,20 +1,21 @@
#!/usr/bin/env python
-import xmlrpclib
+
+from xmlrpc.client import ServerProxy
import time
import sys
server = 'http://localhost:9911'
print("Connecting to server {}".format(server))
-s = xmlrpclib.ServerProxy(server)
+s = ServerProxy(server)
-#print s.add_hosts(["127.0.0.3"])
-#print s.add_hosts(["192.168.1.22"])
+#print(s.add_hosts(["127.0.0.3"]))
+#print(s.add_hosts(["192.168.1.22"]))
print("Adding one host (four times)")
-print s.add_hosts(["69.192.72.154"])
-print s.add_hosts(["69.192.72.155"])
-print s.add_hosts(["69.192.72.156"])
-print s.add_hosts(["69.192.72.157"])
+print(s.add_hosts(["69.192.72.154"]))
+print(s.add_hosts(["69.192.72.155"]))
+print(s.add_hosts(["69.192.72.156"]))
+print(s.add_hosts(["69.192.72.157"]))
# Concurrency testing
#for i in range(0, 100):
@@ -39,32 +40,38 @@
#print s.get_new_hosts(time.time()-3600, 1, ["old.example.net"], 60)
print("Illegal arguments: ")
try:
- print s.get_new_hosts("12312iasda", 1, ["old.example.net"], 60)
-except Exception, e:
+ print(s.get_new_hosts("12312iasda", 1, ["old.example.net"], 60))
+except Exception as e:
print(e)
print("New crackers, resilience=60, min_reporters=1")
-print s.get_new_hosts(time.time()-3600, 1, ["69.192.72.154"], 60)
+print(s.get_new_hosts(time.time()-3600, 1, ["69.192.72.154"], 60))
peer1 = 'http://localhost:9921'
print("Connecting to server {}".format(peer1))
-s1 = xmlrpclib.ServerProxy(peer1)
+s1 = ServerProxy(peer1)
print("peer1 new crackers, resilience=60, min_reporters=1")
-print s1.get_new_hosts(time.time()-3600, 1, ["69.192.72.154"], 60)
+print(s1.get_new_hosts(time.time()-3600, 1, ["69.192.72.154"], 60))
print("peer0 all hosts:")
-print s.debug.list_all_hosts()
+print(s.debug.list_all_hosts())
+
+print("peer1 all hosts:")
+print(s1.debug.list_all_hosts())
+
+print("peer1 add 1 host:")
+print(s1.add_hosts(["69.192.72.158"]))
print("peer1 all hosts:")
-print s1.debug.list_all_hosts()
+print(s1.debug.list_all_hosts())
#print("All hosts:")
-#print s.list_all_hosts()
-# #print s.dump_database()
+#print(s.list_all_hosts())
+# #print(s.dump_database())
#
#print("Cracker info for 69.192.72.154:")
#try:
-# print s.get_cracker_info("69.192.72.154")
-#except Exception, e:
+# print(s.get_cracker_info("69.192.72.154"))
+#except Exception as e:
# print e
#
diff --git a/tests/test_add_hosts.py b/tests/test_add_hosts.py
new file mode 100644
index 0000000..6dc4871
--- /dev/null
+++ b/tests/test_add_hosts.py
@@ -0,0 +1,144 @@
+import time
+import random
+
+from xmlrpc.client import ServerProxy
+
+from denyhosts_server import models
+from denyhosts_server import controllers
+from denyhosts_server import views
+from denyhosts_server.models import Cracker, Report
+
+from twisted.internet import reactor,defer,task
+from twisted.internet.defer import inlineCallbacks, returnValue
+
+from . import base
+
+def random_ip_address():
+ return ".".join(map(str, (random.randint(0, 255) for _ in range(4))))
+
+def sleep(seconds):
+ d = defer.Deferred()
+ reactor.callLater(seconds, d.callback, seconds)
+ return d
+
+class MockHeaders:
+ def __init__(self, ip):
+ self._ip = ip
+
+ def getRawHeaders(self,key):
+ return [self._ip,]
+
+class MockRequest:
+ def __init__(self, ip):
+ self._ip = ip
+ self.received_headers = {}
+ self.requestHeaders = MockHeaders(ip)
+
+ def getClientIP(self):
+ return self._ip
+
+class AddHostsTest(base.TestBase):
+
+ @inlineCallbacks
+ def test_add_hosts_ByIP(self):
+ self.view = views.Server()
+ request = MockRequest("11.12.44.75")
+
+ self.count = 0
+ def called(result):
+ self.count += 1
+
+ def calledError(result):
+ print("Error")
+ self.count += 1
+
+ ip_list = ['1.1.1.1', '1.2.3.4']
+
+ task.deferLater(reactor, 0.01, self.view.xmlrpc_add_hosts, request,ip_list).addCallback(called).addErrback(calledError)
+ self.count -= 1
+
+ while self.count < 0:
+ yield sleep(0.1)
+
+ yield sleep(60)
+
+ task.deferLater(reactor, 0.01, self.view.xmlrpc_add_hosts, request,ip_list).addCallback(called).addErrback(calledError)
+ self.count -= 1
+
+ while self.count < 0:
+ yield sleep(0.1)
+
+ hosts = yield controllers.get_qualifying_crackers(1, 0, 0, 50, [])
+ self.assertEqual(hosts, ['1.2.3.4', '1.1.1.1'], "Wrong number of Crackers in database")
+
+ @inlineCallbacks
+ def test_add_hosts_ByName(self):
+ self.view = views.Server()
+ request = MockRequest("11.12.44.75")
+
+ self.count = 0
+ def called(result):
+ self.count += 1
+
+ def calledError(result):
+ print("Error")
+ self.count += 1
+
+ ip_list = ['ec2-161-189-70-219.cn-northwest-1.compute.amazonaws.com.cn', 'static.28.30.55.162.clients.your-server.de']
+
+ task.deferLater(reactor, 0.01, self.view.xmlrpc_add_hosts, request,ip_list).addCallback(called).addErrback(calledError)
+ self.count -= 1
+
+ while self.count < 0:
+ yield sleep(0.1)
+
+ hosts = yield controllers.get_qualifying_crackers(1, 0, 0, 50, [])
+ self.assertEqual(hosts, ['162.55.30.28', '161.189.70.219'], "Wrong number of Crackers in database")
+
+ @inlineCallbacks
+ def test_add_hosts_Mix(self):
+ self.view = views.Server()
+ request = MockRequest("11.12.44.75")
+
+ self.count = 0
+ def called(result):
+ self.count += 1
+
+ def calledError(result):
+ print("Error")
+ self.count += 1
+
+ ip_list = ['134.65.845.98', 'tor-exit-relay-2.anonymizing-proxy.digitalcourage.de', '6.89.34.25', 'hsi-kbw-078-042-091-125.hsi3.kabel-badenwuerttemberg.de']
+
+ task.deferLater(reactor, 0.01, self.view.xmlrpc_add_hosts, request,ip_list).addCallback(called).addErrback(calledError)
+ self.count -= 1
+
+ while self.count < 0:
+ yield sleep(0.1)
+
+ hosts = yield controllers.get_qualifying_crackers(1, 0, 0, 50, [])
+ self.assertEqual(hosts, ['185.220.102.248', '78.42.91.125', '6.89.34.25', ], "Wrong number of Crackers in database")
+
+ @inlineCallbacks
+ def test_add_hosts_ByName_With_Dupe(self):
+ self.view = views.Server()
+ request = MockRequest("11.12.44.75")
+
+ self.count = 0
+ def called(result):
+ self.count += 1
+
+ def calledError(result):
+ print("Error")
+ self.count += 1
+
+ ip_list = ['ec2-161-189-70-219.cn-northwest-1.compute.amazonaws.com.cn', 'static.28.30.55.162.clients.your-server.de', 'ec2-161-189-70-219.cn-northwest-1.compute.amazonaws.com.cn']
+
+ task.deferLater(reactor, 0.01, self.view.xmlrpc_add_hosts, request,ip_list).addCallback(called).addErrback(calledError)
+ self.count -= 1
+
+ while self.count < 0:
+ yield sleep(0.1)
+
+ hosts = yield controllers.get_qualifying_crackers(1, 0, 0, 50, [])
+ self.assertEqual(hosts, ['162.55.30.28', '161.189.70.219'], "Wrong number of Crackers in database")
\ No newline at end of file
diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py
index da5b568..94ddd20 100644
--- a/tests/test_concurrency.py
+++ b/tests/test_concurrency.py
@@ -8,7 +8,7 @@
from twisted.internet import reactor,defer,task
from twisted.internet.defer import inlineCallbacks, returnValue
-import base
+from . import base
def random_ip_address():
return ".".join(map(str, (random.randint(0, 255) for _ in range(4))))
@@ -40,6 +40,7 @@ class ConcurrencyTest(base.TestBase):
def test_try_and_confuse_server(self):
self.view = views.Server()
request = MockRequest("127.0.0.1")
+ print("")
for i in range(0, 25):
print("count:{}".format(i))
diff --git a/tests/test_get_new_hosts.py b/tests/test_get_new_hosts.py
index 0ddb1b9..9262c73 100644
--- a/tests/test_get_new_hosts.py
+++ b/tests/test_get_new_hosts.py
@@ -23,7 +23,7 @@
from twisted.internet.defer import inlineCallbacks, returnValue
-import base
+from . import base
import logging
class GetNewHostsTest(base.TestBase):
diff --git a/tests/test_models.py b/tests/test_models.py
index d9bf655..5f2f013 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -22,7 +22,7 @@
from twisted.internet.defer import inlineCallbacks, returnValue
-import base
+from . import base
class ModelsTest(base.TestBase):
diff --git a/tests/test_peering.py b/tests/test_peering.py
index c28a5c2..673f17a 100644
--- a/tests/test_peering.py
+++ b/tests/test_peering.py
@@ -20,8 +20,9 @@
import signal
import time
import subprocess
-import xmlrpclib
-from xmlrpclib import ServerProxy
+import base64
+
+from xmlrpc.client import ProtocolError, ServerProxy
from denyhosts_server import config
from denyhosts_server import models
@@ -38,7 +39,7 @@
import libnacl.public
import libnacl.utils
-import base
+from . import base
import logging
@@ -70,9 +71,21 @@ def setUp(self):
server.get_new_hosts(time.time(), 1, [], 3600)
is_up = True
log.msg("Peer {} is up!".format(peer_url))
- except:
+ except ProtocolError as e:
+ log.msg(e)
+ log.msg("A protocol error occurred")
+ log.msg("URL: %s" % e.url)
+ log.msg("HTTP/HTTPS headers: %s" % e.headers)
+ log.msg("Error code: %d" % e.errcode)
+ log.msg("Error message: %s" % e.errmsg)
+ time.sleep(0.2)
+ except Exception as e:
+ log.msg(e)
+ log.msg("Generic error occurred")
time.sleep(0.2)
if not is_up:
+ # Try to stop the server in case they are started to leave with a clean environment
+ self.tearDown()
self.fail("Failed to start peer {}".format(peer_url))
def tearDown(self):
@@ -107,8 +120,8 @@ def _test_with_key(self, keypair, public_key):
"hosts": ["1.1.1.1"]
}
data_json = json.dumps(data)
- crypted = box.encrypt(data_json)
- base64 = crypted.encode('base64')
+ crypted = box.encrypt(data_json.encode())
+ mybase64 = base64.b64encode(crypted)
yield peering.handle_update(public_key, crypted)
def _insert_peer(self):
@@ -134,7 +147,7 @@ def test_unknown_key(self):
def test_list_peers(self):
peer_keypair = self._insert_peer()
box = libnacl.public.Box(peer_keypair.sk, peering._own_key.pk)
- please = box.encrypt("please")
+ please = box.encrypt(b"please")
response = yield peering.list_peers(peer_keypair.pk, please)
log.msg(response)
peer_list = response["peers"]
@@ -142,7 +155,7 @@ def test_list_peers(self):
self.assertEqual(response["server_version"], server_version, "Incorrect server version in response")
for peer_url in config.peers:
self.assertIn(peer_url, peer_list, "Peer missing from received list")
- self.assertEqual(config.peers[peer_url].encode('hex'), peer_list[peer_url], "Wrong key in received peer list")
+ self.assertEqual(config.peers[peer_url].hex(), peer_list[peer_url], "Wrong key in received peer list")
def test_check_peers(self):
result = peering.check_peers()
@@ -153,9 +166,9 @@ def test_check_peers(self):
def test_check_peers_missing(self):
# check case where one of the peers has an extra peer that I don't know about
# Remove one of the peers from my list
- peer_to_remove = config.peers.keys()[0]
- del config.peers[peer_to_remove]
- del peering._peer_boxes[peer_to_remove]
+ peer_to_remove = list(config.peers.keys())[0]
+ config.peers.pop(peer_to_remove)
+ peering._peer_boxes.pop(peer_to_remove)
result = peering.check_peers()
self.assertEqual(result, False, "Check peers should fail if a peer is missing from my own config")
diff --git a/tests/test_purge_methods.py b/tests/test_purge_methods.py
index da28110..d50303a 100644
--- a/tests/test_purge_methods.py
+++ b/tests/test_purge_methods.py
@@ -23,7 +23,7 @@
from twisted.internet.defer import inlineCallbacks, returnValue
-import base
+from . import base
class PurgingTest(base.TestBase):
diff --git a/tests/test_stats.py b/tests/test_stats.py
index 1c02100..d515384 100644
--- a/tests/test_stats.py
+++ b/tests/test_stats.py
@@ -30,7 +30,7 @@
from twistar.registry import Registry
-import base
+from . import base
class StatsTest(base.TestBase):
@@ -38,7 +38,7 @@ class StatsTest(base.TestBase):
def test_fixup(self):
now = time.time()
c1 = yield Cracker(ip_address="194.109.6.92", first_time=now, latest_time=now, total_reports=0, current_reports=0).save()
- c2 = yield Cracker(ip_address="192.30.252.128", first_time=now, latest_time=now, total_reports=0, current_reports=0).save()
+ c2 = yield Cracker(ip_address="91.189.88.180", first_time=now, latest_time=now, total_reports=0, current_reports=0).save()
hosts = [c1, c2]
config.stats_resolve_hostnames = True
@@ -47,8 +47,8 @@ def test_fixup(self):
self.assertEqual(c1.hostname, "www.xs4all.nl", "Reverse DNS of www.xs4all.nl")
self.assertEqual(c1.country, "Netherlands", "Testing geoip of www.xs4all.nl")
- self.assertEqual(c2.hostname, "github.com", "Reverse DNS of github.com")
- self.assertEqual(c2.country, "United States", "Testing geoip of github.com")
+ self.assertEqual(c2.hostname, "cactuar.canonical.com", "Reverse DNS of cactuar.canonical.com")
+ self.assertEqual(c2.country, "United Kingdom", "Testing geoip of cactuar.canonical.com")
def stats_settings(self):
tests_dir = os.path.dirname(inspect.getsourcefile(self.__class__))