internetrelaychat/IRCP
internetrelaychat/IRCP
1
Fork 0
mirror of git://git.acid.vegas/IRCP.git synced 2024-11-26 01:46:39 +00:00
Code Issues Activity

Adding support for IPv6 and custom ports

Browse Source
This commit is contained in:
Dionysus 2023-06-05 18:41:08 -04:00
parent 8bf2f8bf09
commit 64e824dd19
Signed by: acidvegas
GPG Key ID: EF4B922DB85DC9DE
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ircp.py
View File

@ -84,8 +84,9 @@ def ssl_ctx():
return ctx return ctx
class probe: class probe:
def __init__(self, server, semaphore): def __init__(self, semaphore, server, port, family=2):
self.server = server self.server = server
self.port = port
self.display = server.ljust(18)+' \033[30m|\033[0m unknown network \033[30m|\033[0m ' self.display = server.ljust(18)+' \033[30m|\033[0m unknown network \033[30m|\033[0m '
self.semaphore = semaphore self.semaphore = semaphore
self.nickname = None self.nickname = None
@ -121,7 +122,7 @@ class probe:
'port' : 6667 if fallback else 6697, 'port' : 6667 if fallback else 6697,
'limit' : 1024, 'limit' : 1024,
'ssl' : None if fallback else ssl_ctx(), 'ssl' : None if fallback else ssl_ctx(),
'family' : 2, # 2 = IPv4 | 10 = IPv6 (TODO: Check for IPv6 using server DNS) 'family' : self.family,
'local_addr' : settings.vhost 'local_addr' : settings.vhost
} }
identity = { identity = {
@ -131,6 +132,7 @@ class probe:
} }
self.nickname = identity['nick'] self.nickname = identity['nick']
self.reader, self.writer = await asyncio.wait_for(asyncio.open_connection(**options), throttle.timeout) self.reader, self.writer = await asyncio.wait_for(asyncio.open_connection(**options), throttle.timeout)
self.snapshot['port'] = option['ports']
del options del options
if not fallback: if not fallback:
self.snapshot['ssl'] = True self.snapshot['ssl'] = True
@ -272,7 +274,7 @@ class probe:
self.display = f'{self.server.ljust(18)} \033[30m|\033[0m {host[:22]}... \033[30m|\033[0m ' self.display = f'{self.server.ljust(18)} \033[30m|\033[0m {host[:22]}... \033[30m|\033[0m '
else: else:
self.display = f'{self.server.ljust(18)} \033[30m|\033[0m {host.ljust(25)} \033[30m|\033[0m ' self.display = f'{self.server.ljust(18)} \033[30m|\033[0m {host.ljust(25)} \033[30m|\033[0m '
debug(self.display + '\033[1;32mconnected\033[0m') debug(self.display + f'\033[1;32mconnected\033[0m \033[30m(port {self.port})\033[0m')
self.loops['init'] = asyncio.create_task(self.loop_initial()) self.loops['init'] = asyncio.create_task(self.loop_initial())
elif event == '005': elif event == '005':
for item in args: for item in args:
@ -399,7 +401,17 @@ async def main(targets):
sema = asyncio.BoundedSemaphore(throttle.threads) # B O U N D E D S E M A P H O R E G A N G sema = asyncio.BoundedSemaphore(throttle.threads) # B O U N D E D S E M A P H O R E G A N G
jobs = list() jobs = list()
for target in targets: for target in targets:
jobs.append(asyncio.ensure_future(probe(target, sema).run())) server = ':'.join(target.split(':')[-1:])
port = ':'.join(target.split(':')[:-1])
try:
ipaddress.IPv4Address(server)
jobs.append(asyncio.ensure_future(probe(sema, server, port, 2).run()))
except:
try:
ipaddress.IPv6Address(server)
jobs.append(asyncio.ensure_future(probe(sema, server, port, 10).run()))
except:
error('failed to scan '+target, 'invalid ip address')
await asyncio.gather(*jobs) await asyncio.gather(*jobs)
# Main # Main