Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option for random useragent #47

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add option for random useragent #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edef769
[NEW] add vscode and virtualenv to gitignore
sottom May 20, 2020
eacb1d1
[NEW] add ability to choose random useragent
sottom May 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,14 @@ output/*/index.html
docs/_build
build/*

# Virtualenv
venv

# VSCode
.vscode

# Misc
*.pstats
callgraph.svg
ttyrecord

41 changes: 39 additions & 2 deletions riko/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import sys
import itertools as it
import fcntl
import random
from riko import __version__

from math import isnan
Expand Down Expand Up @@ -71,14 +72,50 @@ def make_blocking(f):
make_blocking(sys.stderr)


def default_user_agent(name="riko"):
def random_useragent():
# useragents found here - https://techblog.willshouse.com/2012/01/03/most-common-user-agents/
return random.choice([
("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
"(KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36"),
("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
"(KHTML, like Gecko) Chrome/81.0.4044.129 Safari/537.36"),
("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/605.1.15 "
"(KHTML, like Gecko) Version/13.1 Safari/605.1.15"),
("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
"(KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36"),
("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
"(KHTML, like Gecko) Chrome/81.0.4044.122 Safari/537.36"),
("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:75.0) "
"Gecko/20100101 Firefox/75.0"),
("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
"(KHTML, like Gecko) Chrome/80.0.3987.163 Safari/537.36"),
("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
"(KHTML, like Gecko) Chrome/81.0.4044.113 Safari/537.36"),
("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 "
"(KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36"),
("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:76.0) "
"Gecko/20100101 Firefox/76.0"),
("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 "
"(KHTML, like Gecko) Chrome/81.0.4044.129 Safari/537.36"),
("Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:75.0) "
"Gecko/20100101 Firefox/75.0"),
("Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) "
"Gecko/20100101 Firefox/75.0"),
])


def default_useragent(name="riko"):
"""
Return a string representing the default user agent.
:rtype: str
"""
return '%s/%s' % (name, __version__)


def get_useragent(random=False):
return random_useragent() if random else default_useragent()


class Chainable(object):
def __init__(self, data, method=None):
self.data = data
Expand Down Expand Up @@ -209,7 +246,7 @@ def open(self, url, **params):
r.raw.decode_content = self.decode
response = r.text if self.cache_type else r.raw
else:
req = Request(url, headers={'User-Agent': default_user_agent()})
req = Request(url, headers={'User-Agent': get_useragent()})
try:
r = urlopen(req, context=self.context, timeout=self.timeout)
except TypeError:
Expand Down