mirror of
https://github.com/flotwig/spoofident
synced 2025-08-22 10:07:18 +00:00
Code cleanup
This commit is contained in:
parent
5f94526fc4
commit
86315bbb74
@ -4,23 +4,18 @@ from time import time
|
||||
from select import select
|
||||
import socket
|
||||
def handleIdent(fd):
|
||||
begin=time()
|
||||
fd.setblocking(0)
|
||||
data=''
|
||||
while time()-begin<1:
|
||||
try:
|
||||
data=fd.recv(1024).strip()
|
||||
if data: break
|
||||
except:
|
||||
pass # TODO: catch exceptions which are actual errors, as opposed to no-data reports
|
||||
fd.settimeout(1)
|
||||
try:
|
||||
data=fd.recv(1024).strip()
|
||||
except:
|
||||
fd.send('0,0:ERROR:UNKNOWN-ERROR\r\n') # TODO: catch exceptions which are actual errors, as opposed to no-data reports
|
||||
return
|
||||
ports=data.split(',',2)
|
||||
ports=map(validPort,ports)
|
||||
if not data:
|
||||
fd.send('0,0:ERROR:UNKNOWN-ERROR\r\n')
|
||||
elif len(ports)<2 or (not ports[0] or not ports[1]):
|
||||
if len(ports)<2 or not all(ports):
|
||||
fd.send('0,0:ERROR:INVALID-PORT\r\n')
|
||||
else:
|
||||
fd.send(str(ports[0])+','+str(ports[1])+':USERID:'+settings['os']+':'+settings['user']+'\r\n')
|
||||
fd.send(','.join(map(str,ports))+':USERID:'+settings['os']+':'+settings['user']+'\r\n')
|
||||
fd.close()
|
||||
def validPort(port):
|
||||
try:
|
||||
@ -29,26 +24,25 @@ def validPort(port):
|
||||
return False
|
||||
if port>0 and port<65536:
|
||||
return port
|
||||
else:
|
||||
return False
|
||||
if __name__ == '__main__':
|
||||
return False
|
||||
if __name__=='__main__':
|
||||
pwd=path.dirname(path.realpath(__file__))
|
||||
config=open(pwd+'/spoofident.json','r')
|
||||
settings=load(config)
|
||||
config.close()
|
||||
servers=[]
|
||||
for pair in settings['listeners']:
|
||||
if ':' in pair[0]: # TODO: write actual ip6 detection, properly?
|
||||
for host,port in settings['listeners']:
|
||||
if ':' in host: # TODO: write actual ip6 detection, properly?
|
||||
servers.append(socket.socket(socket.AF_INET6,socket.SOCK_STREAM))
|
||||
else:
|
||||
servers.append(socket.socket(socket.AF_INET,socket.SOCK_STREAM))
|
||||
servers[-1].bind((pair[0], pair[1]))
|
||||
servers[-1].bind((host,port))
|
||||
servers[-1].listen(5)
|
||||
servers[-1].setblocking(0)
|
||||
setgid(settings['setgid'])
|
||||
setuid(settings['setuid'])
|
||||
while True:
|
||||
inready,outready,excready=select(servers,[],[])
|
||||
inready,_,_=select(servers,[],[])
|
||||
for ready in inready:
|
||||
if ready in servers:
|
||||
client,addr=ready.accept()
|
||||
@ -57,4 +51,4 @@ if __name__ == '__main__':
|
||||
try:
|
||||
handleIdent(ready)
|
||||
except:
|
||||
pass
|
||||
pass
|
||||
|
Loading…
x
Reference in New Issue
Block a user