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

Salt hash for device_id #4289

Merged
merged 16 commits into from
Aug 19, 2016
Merged

Salt hash for device_id #4289

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
271aa6f
salt the hash
BreezeRo Aug 19, 2016
d895a0e
Update config.json.example
BreezeRo Aug 19, 2016
13e8b12
Update config.json.cluster.example
BreezeRo Aug 19, 2016
c487760
Update config.json.map.example
BreezeRo Aug 19, 2016
f393688
Update config.json.optimizer.example
BreezeRo Aug 19, 2016
1190861
Update config.json.path.example
BreezeRo Aug 19, 2016
81b6e0f
Update pokecli.py
BreezeRo Aug 19, 2016
f910e32
Update api_wrapper.py
BreezeRo Aug 19, 2016
86dab85
Update config.json.cluster.example
BreezeRo Aug 19, 2016
c13e20a
Update config.json.example
BreezeRo Aug 19, 2016
0043b26
Update config.json.map.example
BreezeRo Aug 19, 2016
d2cf88c
Update config.json.optimizer.example
BreezeRo Aug 19, 2016
f778abd
Update config.json.path.example
BreezeRo Aug 19, 2016
93bd318
store device_id to file
BreezeRo Aug 19, 2016
3ac43ad
Update api_wrapper.py
BreezeRo Aug 19, 2016
bcc8b6c
Update pokecli.py
BreezeRo Aug 19, 2016
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
14 changes: 9 additions & 5 deletions pokemongo_bot/api_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import time
import logging
import random
import random, base64, struct
import hashlib

from pgoapi.exceptions import (ServerSideRequestThrottlingException,
NotLoggedInException, ServerBusyOrOfflineException,
NoPlayerPositionSetException, EmptySubrequestChainException,
Expand All @@ -11,24 +10,29 @@
from pgoapi.protos.POGOProtos.Networking.Requests.RequestType_pb2 import RequestType
from pgoapi.protos.POGOProtos.Networking.Envelopes.Signature_pb2 import Signature
from pgoapi.utilities import get_time

from pokemongo_bot.datastore import Datastore
from human_behaviour import sleep


class PermaBannedException(Exception):
pass


class ApiWrapper(PGoApi):
class ApiWrapper(Datastore, PGoApi):
DEVICE_ID = None

def __init__(self, config=None):
PGoApi.__init__(self)
self.useVanillaRequest = False
self.config = config
if self.config is not None:
key_string = self.config.username
rand_float = random.SystemRandom().random()
salt = base64.b64encode((struct.pack('!d', rand_float)))
# Unique device id per account in the same format as ios client
ApiWrapper.DEVICE_ID = hashlib.md5(self.config.username).hexdigest()
ApiWrapper.DEVICE_ID = hashlib.md5(key_string + salt).hexdigest()
with open("DeviceID.txt", "w") as text_file:
text_file.write("Device ID: {0}".format(ApiWrapper.DEVICE_ID))
if ApiWrapper.DEVICE_ID is None:
# Set to a realistic default
ApiWrapper.DEVICE_ID = "3d65919ca1c2fc3a8e2bd7cc3f974c34"
Expand Down