diff --git a/lookyloo/helpers.py b/lookyloo/helpers.py index 05cc5efd..73a4b8d1 100644 --- a/lookyloo/helpers.py +++ b/lookyloo/helpers.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import os from typing import List, Optional -from io import BytesIO +from io import BufferedIOBase from pathlib import Path from .exceptions import MissingEnv, CreateDirectoryException from redis import Redis @@ -144,7 +144,7 @@ def get_user_agents() -> dict: with open(paths[0]) as f: return json.load(f) -def load_cookies(cookie_pseudofile: Optional[BytesIO]=None) -> List[dict]: +def load_cookies(cookie_pseudofile: Optional[BufferedIOBase]=None) -> List[dict]: if cookie_pseudofile: cookies = json.load(cookie_pseudofile) else: diff --git a/lookyloo/lookyloo.py b/lookyloo/lookyloo.py index b918aee1..e6343763 100644 --- a/lookyloo/lookyloo.py +++ b/lookyloo/lookyloo.py @@ -15,7 +15,7 @@ import ipaddress import socket from urllib.parse import urlsplit -from io import BytesIO +from io import BufferedIOBase, BytesIO import base64 from uuid import uuid4 @@ -162,7 +162,7 @@ class Lookyloo(): return self.sanejs.sha512(sha512) return {'response': []} - def scrape(self, url: str, cookies_pseudofile: Optional[BytesIO]=None, depth: int=1, listing: bool=True, user_agent: Optional[str]=None, perma_uuid: str=None, + def scrape(self, url: str, cookies_pseudofile: Optional[BufferedIOBase]=None, depth: int=1, listing: bool=True, user_agent: Optional[str]=None, perma_uuid: str=None, os: str=None, browser: str=None) -> Union[bool, str]: if not url.startswith('http'): url = f'http://{url}' diff --git a/website/web/__init__.py b/website/web/__init__.py index ded7ed1d..11e90d5b 100644 --- a/website/web/__init__.py +++ b/website/web/__init__.py @@ -65,8 +65,8 @@ def submit(): def scrape_web(): if request.form.get('url'): # check if the post request has the file part - if 'file' in request.files and request.files['file'].filename: - cookie_file = BytesIO(request.files['file'].stream.read()) + if 'cookies' in request.files and request.files['cookies'].filename: + cookie_file = request.files['cookies'].stream else: cookie_file = None perma_uuid = lookyloo.scrape(url=request.form.get('url'), diff --git a/website/web/templates/scrape.html b/website/web/templates/scrape.html index 9622307d..6747fd23 100644 --- a/website/web/templates/scrape.html +++ b/website/web/templates/scrape.html @@ -8,7 +8,7 @@ alt="Lookyloo" width="500"> -