repair dumb merge
This commit is contained in:
parent
1f7da4fd14
commit
1e6f0b6eb0
1 changed files with 2 additions and 65 deletions
|
|
@ -6,7 +6,7 @@ import urllib
|
||||||
import aiohttp
|
import aiohttp
|
||||||
import ipinfo as ipinfoio
|
import ipinfo as ipinfoio
|
||||||
|
|
||||||
import pydig
|
import pydig
|
||||||
|
|
||||||
import telnetlib
|
import telnetlib
|
||||||
from graphviz import Digraph
|
from graphviz import Digraph
|
||||||
|
|
@ -294,13 +294,12 @@ class Utility(commands.Cog):
|
||||||
await iploading.delete()
|
await iploading.delete()
|
||||||
|
|
||||||
"""---------------------------------------------------------------------"""
|
"""---------------------------------------------------------------------"""
|
||||||
<<<<<<< HEAD
|
|
||||||
@commands.command(name='dig', pass_context=True)
|
@commands.command(name='dig', pass_context=True)
|
||||||
async def _dig(self, ctx, domain, querytype="abc", dnssec="no"):
|
async def _dig(self, ctx, domain, querytype="abc", dnssec="no"):
|
||||||
if not querytype in ['A', 'AAAA', 'CNAME', 'NS', 'DS', 'DNSKEY', 'SOA', 'TXT', 'PTR', 'MX']:
|
if not querytype in ['A', 'AAAA', 'CNAME', 'NS', 'DS', 'DNSKEY', 'SOA', 'TXT', 'PTR', 'MX']:
|
||||||
await ctx.send("Requêtes supportées : A, AAAA, CNAME, NS, DS, DNSKEY, SOA, TXT, PTR, MX")
|
await ctx.send("Requêtes supportées : A, AAAA, CNAME, NS, DS, DNSKEY, SOA, TXT, PTR, MX")
|
||||||
return
|
return
|
||||||
|
|
||||||
if(dnssec == "no"):
|
if(dnssec == "no"):
|
||||||
resolver = pydig.Resolver(
|
resolver = pydig.Resolver(
|
||||||
nameservers=[
|
nameservers=[
|
||||||
|
|
@ -331,69 +330,8 @@ class Utility(commands.Cog):
|
||||||
embed.add_field(name="Ooops", value="Pas de résultat")
|
embed.add_field(name="Ooops", value="Pas de résultat")
|
||||||
await ctx.send(embed=embed)
|
await ctx.send(embed=embed)
|
||||||
|
|
||||||
"""---------------------------------------------------------------------"""
|
|
||||||
|
|
||||||
"""---------------------------------------------------------------------"""
|
"""---------------------------------------------------------------------"""
|
||||||
@commands.command(name='getheaders', pass_context=True)
|
|
||||||
async def _getheaders(self, ctx, *, adresse):
|
|
||||||
"""Recuperer les HEADERS :d"""
|
|
||||||
if adresse.startswith("http://") != True and adresse.startswith("https://") != True:
|
|
||||||
adresse = "http://" + adresse
|
|
||||||
if len(adresse) > 200:
|
|
||||||
await ctx.send("{0} Essaye d'entrer une adresse de moins de 200 caractères plutôt.".format(ctx.author.mention))
|
|
||||||
|
|
||||||
elif adresse.startswith("http://") or adresse.startswith("https://") or adresse.startswith("ftp://"):
|
|
||||||
try:
|
|
||||||
get = urllib.request.urlopen(adresse, timeout = 1)
|
|
||||||
embed = discord.Embed(title="Entêtes de {0}".format(adresse), color=0xd75858)
|
|
||||||
embed.add_field(name="Code Réponse", value=get.getcode(), inline = True)
|
|
||||||
embed.set_thumbnail(url="https://http.cat/{}".format(str(get.getcode())))
|
|
||||||
if get.getheader('location'):
|
|
||||||
embed.add_field(name="Redirection vers", value=get.getheader('location'), inline=True)
|
|
||||||
if get.getheader('server'):
|
|
||||||
embed.add_field(name="Serveur", value=get.getheader('server'), inline=True)
|
|
||||||
if get.getheader('content-type'):
|
|
||||||
embed.add_field(name="Type de contenu", value = get.getheader('content-type'), inline = True)
|
|
||||||
if get.getheader('x-content-type-options'):
|
|
||||||
embed.add_field(name="x-content-type", value= get.getheader('x-content-type-options'), inline=True)
|
|
||||||
if get.getheader('x-frame-options'):
|
|
||||||
embed.add_field(name="x-frame-options", value= get.getheader('x-frame-options'), inline=True)
|
|
||||||
if get.getheader('cache-control'):
|
|
||||||
embed.add_field(name="Controle du cache", value = get.getheader('cache-control'), inline = True)
|
|
||||||
await ctx.send(embed=embed)
|
|
||||||
except urllib.error.HTTPError as e:
|
|
||||||
embed = discord.Embed(title="Entêtes de {0}".format(adresse), color=0xd75858)
|
|
||||||
embed.add_field(name="Code Réponse", value=e.getcode(), inline = True)
|
|
||||||
embed.set_thumbnail(url="https://http.cat/{}".format(str(e.getcode())))
|
|
||||||
await ctx.send(embed=embed)
|
|
||||||
print('''An error occurred: {} The response code was {}'''.format(e, e.getcode()))
|
|
||||||
except urllib.error.URLError as e:
|
|
||||||
if "No address associated" in str(e):
|
|
||||||
await ctx.send("Erreur, aucune adresse n'est associé à ce nom d'hôte.")
|
|
||||||
return
|
|
||||||
if "timed out" in str(e):
|
|
||||||
await ctx.send("Erreur, l'adresse en question dépasse le délais d'attente :(")
|
|
||||||
return
|
|
||||||
if "SSL" in str(e):
|
|
||||||
await ctx.send("Erreur avec le certificat SSL, essayez sans ``https://`` !")
|
|
||||||
return
|
|
||||||
return
|
|
||||||
if "no host":
|
|
||||||
await ctx.send("Erreur, aucun nom d'hôte n'a été donné.")
|
|
||||||
return
|
|
||||||
if "not known":
|
|
||||||
await ctx.send("Erreur, nom de l'hôte inconnu.")
|
|
||||||
return
|
|
||||||
print("ERROR @ getheaders @ urlerror : {} - adress {}".format(e, adresse))
|
|
||||||
await ctx.send('[CONTACTER ADMIN] URLError: {}'.format(e.reason))
|
|
||||||
except Exception as e:
|
|
||||||
print("ERROR @ getheaders @ Exception : {} - adress {}".format(e, adresse))
|
|
||||||
await ctx.send("{0} Impossible d'accèder à {1}, es-tu sur que l'adresse {1} est correcte et que le serveur est allumé ?".format(ctx.author.mention, adresse))
|
|
||||||
else:
|
|
||||||
await ctx.send("{0} Merci de faire commencer {1} par ``https://``, ``http://`` ou ``ftp://``.".format(ctx.author.mention, adresse))
|
|
||||||
|
|
||||||
=======
|
|
||||||
|
|
||||||
@commands.command(name='getheaders')
|
@commands.command(name='getheaders')
|
||||||
async def _getheaders(self, ctx: commands.Context, addr: str):
|
async def _getheaders(self, ctx: commands.Context, addr: str):
|
||||||
if (addr.startswith('http') or addr.startswith('ftp')) is not True:
|
if (addr.startswith('http') or addr.startswith('ftp')) is not True:
|
||||||
|
|
@ -423,7 +361,6 @@ class Utility(commands.Cog):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
>>>>>>> 17b3e658fc1d4bfdc8a60bde09d876d72954f060
|
|
||||||
"""---------------------------------------------------------------------"""
|
"""---------------------------------------------------------------------"""
|
||||||
@commands.command(name='peeringdb', pass_context=True)
|
@commands.command(name='peeringdb', pass_context=True)
|
||||||
async def _peeringdb(self, ctx, *, asn):
|
async def _peeringdb(self, ctx, *, asn):
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue