From 11534604fee2747576565297d3c94cc650278542 Mon Sep 17 00:00:00 2001 From: Mads Marquart Date: Wed, 11 Mar 2020 15:44:34 +0100 Subject: [PATCH] Remove user agent randomization Caused problems with logging in, and didn't really help on anything --- fbchat/_session.py | 8 ++++++-- fbchat/_util.py | 10 ---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/fbchat/_session.py b/fbchat/_session.py index be0d580..024d56f 100644 --- a/fbchat/_session.py +++ b/fbchat/_session.py @@ -56,10 +56,14 @@ def find_input_fields(html: str): def session_factory() -> requests.Session: + from . import __version__ + session = requests.session() session.headers["Referer"] = "https://www.facebook.com" - # TODO: Deprecate setting the user agent manually - session.headers["User-Agent"] = random.choice(_util.USER_AGENTS) + # We won't try to set a fake user agent to mask our presence! + # Facebook allows us access anyhow, and it makes our motives clearer: + # We're not trying to cheat Facebook, we simply want to access their service + session.headers["User-Agent"] = "fbchat/{}".format(__version__) return session diff --git a/fbchat/_util.py b/fbchat/_util.py index 2c46fba..d6e9376 100644 --- a/fbchat/_util.py +++ b/fbchat/_util.py @@ -9,16 +9,6 @@ from . import _exception from typing import Iterable, Optional, Any, Mapping, Sequence -#: Default list of user agents -USER_AGENTS = [ - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.90 Safari/537.36", - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_3) AppleWebKit/601.1.10 (KHTML, like Gecko) Version/8.0.5 Safari/601.1.10", - "Mozilla/5.0 (Windows NT 6.3; WOW64; ; NCT50_AAP285C84A1328) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.90 Safari/537.36", - "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/22.0.1207.1 Safari/537.1", - "Mozilla/5.0 (X11; CrOS i686 2268.111.0) AppleWebKit/536.11 (KHTML, like Gecko) Chrome/20.0.1132.57 Safari/536.11", - "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6", -] - def int_or_none(inp: Any) -> Optional[int]: try: