laramies/theHarvester
1
1
Fork 0
mirror of https://github.com/laramies/theHarvester.git synced 2024-09-21 15:56:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse source
This commit is contained in:
L1ghtn1ng 2020-03-22 17:45:56 +00:00
parent 7ee5bb03eb 0bcedaa65c
commit 075d8929d7
5 changed files with 24 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Pipfile
View file

@ -11,10 +11,10 @@ beautifulsoup4 = "==4.8.2"
dnspython = "==1.16.0"
netaddr = "==0.7.19"
plotly = "==4.5.4"
PyYAML = "==5.3"
PyYAML = "==5.3.1"
requests = "==2.23.0"
retrying = "==1.3.3"
shodan = "==1.21.3"
shodan = "==1.22.0"
texttable = "==1.6.2"
lxml = "==4.5.0"
uvloop = "==0.14.0"

45
Pipfile.lock generated
View file

@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
"sha256": "198298490f37cd9e29de5711cff1e698263befb48107db33ed15b767163266b1"
"sha256": "91770d97bbe2517d64307784f5cad7a8437a62fb58f22f2c2c3363870576019a"
},
"pipfile-spec": 6,
"requires": {},
@ -267,20 +267,20 @@
},
"pyyaml": {
"hashes": [
"sha256:059b2ee3194d718896c0ad077dd8c043e5e909d9180f387ce42012662a4946d6",
"sha256:1cf708e2ac57f3aabc87405f04b86354f66799c8e62c28c5fc5f88b5521b2dbf",
"sha256:24521fa2890642614558b492b473bee0ac1f8057a7263156b02e8b14c88ce6f5",
"sha256:4fee71aa5bc6ed9d5f116327c04273e25ae31a3020386916905767ec4fc5317e",
"sha256:70024e02197337533eef7b85b068212420f950319cc8c580261963aefc75f811",
"sha256:74782fbd4d4f87ff04159e986886931456a1894c61229be9eaf4de6f6e44b99e",
"sha256:940532b111b1952befd7db542c370887a8611660d2b9becff75d39355303d82d",
"sha256:cb1f2f5e426dc9f07a7681419fe39cee823bb74f723f36f70399123f439e9b20",
"sha256:dbbb2379c19ed6042e8f11f2a2c66d39cceb8aeace421bfc29d085d93eda3689",
"sha256:e3a057b7a64f1222b56e47bcff5e4b94c4f61faac04c7c4ecb1985e18caa3994",
"sha256:e9f45bd5b92c7974e59bcd2dcc8631a6b6cc380a904725fce7bc08872e691615"
"sha256:06a0d7ba600ce0b2d2fe2e78453a470b5a6e000a985dd4a4e54e436cc36b0e97",
"sha256:240097ff019d7c70a4922b6869d8a86407758333f02203e0fc6ff79c5dcede76",
"sha256:4f4b913ca1a7319b33cfb1369e91e50354d6f07a135f3b901aca02aa95940bd2",
"sha256:69f00dca373f240f842b2931fb2c7e14ddbacd1397d57157a9b005a6a9942648",
"sha256:73f099454b799e05e5ab51423c7bcf361c58d3206fa7b0d555426b1f4d9a3eaf",
"sha256:74809a57b329d6cc0fdccee6318f44b9b8649961fa73144a98735b0aaf029f1f",
"sha256:7739fc0fa8205b3ee8808aea45e968bc90082c10aef6ea95e855e10abf4a37b2",
"sha256:95f71d2af0ff4227885f7a6605c37fd53d3a106fcab511b8860ecca9fcf400ee",
"sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d",
"sha256:cc8955cfbfc7a115fa81d85284ee61147059a753344bc51098f3ccd69b0d7e0c",
"sha256:d13155f591e6fcc1ec3b30685d50bf0711574e2c0dfffd7644babf8b5102ca1a"
],
"index": "pypi",
"version": "==5.3"
"version": "==5.3.1"
},
"requests": {
"hashes": [
@ -299,10 +299,10 @@
},
"shodan": {
"hashes": [
"sha256:3f56899f533ab001775adcdae181ce80accad53cd298d710c844bd26c76c78d5"
"sha256:a9f098c2d24cf685b6d4a4bd46c7f56653c84f777f20d1a853cfd7672f68f35d"
],
"index": "pypi",
"version": "==1.21.3"
"version": "==1.22.0"
},
"six": {
"hashes": [
@ -401,14 +401,6 @@
"index": "pypi",
"version": "==3.7.9"
},
"importlib-metadata": {
"hashes": [
"sha256:06f5b3a99029c7134207dd882428a66992a9de2bef7c2b699b5641f9886c3302",
"sha256:b97607a1a18a5100839aec1dc26a1ea17ee0d93b20b0f008d80a5a050afb200b"
],
"markers": "python_version < '3.8'",
"version": "==1.5.0"
},
"mccabe": {
"hashes": [
"sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42",
@ -556,13 +548,6 @@
"sha256:f28b3e8a6483e5d49e7f8949ac1a78314e740333ae305b4ba5defd3e74fb37a8"
],
"version": "==0.1.8"
},
"zipp": {
"hashes": [
"sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b",
"sha256:c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96"
],
"version": "==3.1.0"
}
}
}

8
requirements/base.txt
View file

@ -4,11 +4,11 @@ aiosqlite==0.11.0
beautifulsoup4==4.8.2
dnspython==1.16.0
netaddr==0.7.19
plotly==4.5.0
PyYAML==5.3
requests==2.22.0
plotly==4.5.4
PyYAML==5.3.1
requests==2.23.0
retrying==1.3.3
shodan==1.21.3
shodan==1.23.0
texttable==1.6.2
lxml==4.5.0
uvloop==0.14.0

4
requirements/dev.txt
View file

@ -1,6 +1,6 @@
-r base.txt
flake8==3.7.9
mypy==0.761
mypy==0.770
mypy-extensions==0.4.3
pytest==5.3.5
pytest==5.4.1
pytest-asyncio==0.10.0

2
theHarvester/__main__.py
View file

@ -620,7 +620,7 @@ async def handler(lst):
sys.exit(1)
try:
filename = filename.split('.')[0] + '.xml'
filename.rsplit('.', 1)[0] + '.xml'
file = open(filename, 'w')
file.write('<?xml version="1.0" encoding="UTF-8"?><theHarvester>')
for x in all_emails: