arnekeller/googleplay-api
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/googleplay-api.git synced 2024-10-18 06:50:45 +00:00
Code Issues Projects Releases Wiki Activity

Fix #16

Browse Source 
Signed-off-by: Domenico Iezzi <domenico.iezzi.201@gmail.com>
This commit is contained in:
Domenico Iezzi 2017-10-13 19:12:06 +02:00
parent 2ab7ce09c6
commit 9d0d14450b
2 changed files with 98 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
gpapi/config.py
View File

@ -19,20 +19,14 @@ GOOGLE_PUBKEY = "AAAAgMom/1a/v0lblO2Ubrt60J2gcuXSljGFQXgcyZWveWLEwo6prwgi3iJIZdo
# if you want to add another phone, just create another section in # if you want to add another phone, just create another section in
# the file. Some configurations for common phones can be found here: # the file. Some configurations for common phones can be found here:
# https://github.com/yeriomin/play-store-api/tree/master/src/main/resources # https://github.com/yeriomin/play-store-api/tree/master/src/main/resources
filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)),
'device.properties')
if VERSION == 2: if VERSION == 2:
config = ConfigParser.ConfigParser() config = ConfigParser.ConfigParser()
else: else:
config = configparser.ConfigParser() config = configparser.ConfigParser()
filepath = os.path.join(os.path.dirname(os.path.realpath(__file__)),
'device.properties')
config.read(filepath) config.read(filepath)
device = {}
# initialize device, because we need to setup UserAgent
# before the end of login method. If the login defines a different
# device, it won't cause conflicts
for (key, value) in config.items('angler'):
device[key] = value
def getDevicesCodenames(): def getDevicesCodenames():
@ -50,92 +44,94 @@ def getDevicesReadableNames():
return output return output
def getUserAgent(): class DeviceBuilder(object):
return ("Android-Finsky/8.1.72.S-all [6] [PR] 165478484 ("
"api=3"
",versionCode={versionCode}"
",sdk={sdk}"
",device={device}"
",hardware={hardware}"
",product={product}").format(versionCode=device['vending.version'],
sdk=device['build.version.sdk_int'],
device=device['build.device'],
hardware=device['build.hardware'],
product=device['build.product'])
def __init__(self, device):
self.device = {}
for (key, value) in config.items(device):
self.device[key] = value
def getDeviceConfig(): def getUserAgent(self):
libList = device['sharedlibraries'].split(",") return ("Android-Finsky/8.1.72.S-all [6] [PR] 165478484 ("
featureList = device['features'].split(",") "api=3"
localeList = device['locales'].split(",") ",versionCode={versionCode}"
glList = device['gl.extensions'].split(",") ",sdk={sdk}"
platforms = device['platforms'].split(",") ",device={device}"
",hardware={hardware}"
",product={product}"
"").format(versionCode=self.device['vending.version'],
sdk=self.device['build.version.sdk_int'],
device=self.device['build.device'],
hardware=self.device['build.hardware'],
product=self.device['build.product'])
hasFiveWayNavigation = (device['hasfivewaynavigation'] == 'true') def getAndroidCheckinRequest(self):
hasHardKeyboard = (device['hashardkeyboard'] == 'true') request = googleplay_pb2.AndroidCheckinRequest()
deviceConfig = googleplay_pb2.DeviceConfigurationProto() request.id = 0
deviceConfig.touchScreen = int(device['touchscreen']) request.checkin.CopyFrom(self.getAndroidCheckin())
deviceConfig.keyboard = int(device['keyboard']) request.locale = LANG
deviceConfig.navigation = int(device['navigation']) request.timeZone = TIMEZONE
deviceConfig.screenLayout = int(device['screenlayout']) request.version = 3
deviceConfig.hasHardKeyboard = hasHardKeyboard request.deviceConfiguration.CopyFrom(self.getDeviceConfig())
deviceConfig.hasFiveWayNavigation = hasFiveWayNavigation request.fragment = 0
deviceConfig.screenDensity = int(device['screen.density']) return request
deviceConfig.screenWidth = int(device['screen.width'])
deviceConfig.screenHeight = int(device['screen.height'])
deviceConfig.glEsVersion = int(device['gl.version'])
for x in platforms:
deviceConfig.nativePlatform.append(x)
for x in libList:
deviceConfig.systemSharedLibrary.append(x)
for x in featureList:
deviceConfig.systemAvailableFeature.append(x)
for x in localeList:
deviceConfig.systemSupportedLocale.append(x)
for x in glList:
deviceConfig.glExtension.append(x)
return deviceConfig
def getDeviceConfig(self):
libList = self.device['sharedlibraries'].split(",")
featureList = self.device['features'].split(",")
localeList = self.device['locales'].split(",")
glList = self.device['gl.extensions'].split(",")
platforms = self.device['platforms'].split(",")
def getAndroidBuild(): hasFiveWayNavigation = (self.device['hasfivewaynavigation'] == 'true')
androidBuild = googleplay_pb2.AndroidBuildProto() hasHardKeyboard = (self.device['hashardkeyboard'] == 'true')
androidBuild.id = device['build.fingerprint'] deviceConfig = googleplay_pb2.DeviceConfigurationProto()
androidBuild.product = device['build.hardware'] deviceConfig.touchScreen = int(self.device['touchscreen'])
androidBuild.carrier = device['build.brand'] deviceConfig.keyboard = int(self.device['keyboard'])
androidBuild.radio = device['build.radio'] deviceConfig.navigation = int(self.device['navigation'])
androidBuild.bootloader = device['build.bootloader'] deviceConfig.screenLayout = int(self.device['screenlayout'])
androidBuild.device = device['build.device'] deviceConfig.hasHardKeyboard = hasHardKeyboard
androidBuild.sdkVersion = int(device['build.version.sdk_int']) deviceConfig.hasFiveWayNavigation = hasFiveWayNavigation
androidBuild.model = device['build.model'] deviceConfig.screenDensity = int(self.device['screen.density'])
androidBuild.manufacturer = device['build.manufacturer'] deviceConfig.screenWidth = int(self.device['screen.width'])
androidBuild.buildProduct = device['build.product'] deviceConfig.screenHeight = int(self.device['screen.height'])
androidBuild.client = device['client'] deviceConfig.glEsVersion = int(self.device['gl.version'])
androidBuild.otaInstalled = False for x in platforms:
androidBuild.timestamp = int(time.time()) deviceConfig.nativePlatform.append(x)
androidBuild.googleServices = int(device['gsf.version']) for x in libList:
return androidBuild deviceConfig.systemSharedLibrary.append(x)
for x in featureList:
deviceConfig.systemAvailableFeature.append(x)
for x in localeList:
deviceConfig.systemSupportedLocale.append(x)
for x in glList:
deviceConfig.glExtension.append(x)
return deviceConfig
def getAndroidBuild(self):
androidBuild = googleplay_pb2.AndroidBuildProto()
androidBuild.id = self.device['build.fingerprint']
androidBuild.product = self.device['build.hardware']
androidBuild.carrier = self.device['build.brand']
androidBuild.radio = self.device['build.radio']
androidBuild.bootloader = self.device['build.bootloader']
androidBuild.device = self.device['build.device']
androidBuild.sdkVersion = int(self.device['build.version.sdk_int'])
androidBuild.model = self.device['build.model']
androidBuild.manufacturer = self.device['build.manufacturer']
androidBuild.buildProduct = self.device['build.product']
androidBuild.client = self.device['client']
androidBuild.otaInstalled = False
androidBuild.timestamp = int(time.time())
androidBuild.googleServices = int(self.device['gsf.version'])
return androidBuild
def getAndroidCheckin(): def getAndroidCheckin(self):
androidCheckin = googleplay_pb2.AndroidCheckinProto() androidCheckin = googleplay_pb2.AndroidCheckinProto()
androidCheckin.build.CopyFrom(getAndroidBuild()) androidCheckin.build.CopyFrom(self.getAndroidBuild())
androidCheckin.lastCheckinMsec = 0 androidCheckin.lastCheckinMsec = 0
androidCheckin.cellOperator = device['celloperator'] androidCheckin.cellOperator = self.device['celloperator']
androidCheckin.simOperator = device['simoperator'] androidCheckin.simOperator = self.device['simoperator']
androidCheckin.roaming = device['roaming'] androidCheckin.roaming = self.device['roaming']
androidCheckin.userNumber = 0 androidCheckin.userNumber = 0
return androidCheckin return androidCheckin
def getAndroidCheckinRequest(device_codename):
for (key, value) in config.items(device_codename):
device[key] = value
request = googleplay_pb2.AndroidCheckinRequest()
request.id = 0
request.checkin.CopyFrom(getAndroidCheckin())
request.locale = LANG
request.timeZone = TIMEZONE
request.version = 3
request.deviceConfiguration.CopyFrom(getDeviceConfig())
request.fragment = 0
return request

19
gpapi/googleplay.py
View File

@ -46,11 +46,12 @@ class GooglePlayAPI(object):
AUTHURL = BASE + "auth" AUTHURL = BASE + "auth"
ACCOUNT = "HOSTED_OR_GOOGLE" ACCOUNT = "HOSTED_OR_GOOGLE"
def __init__(self, debug=False): def __init__(self, debug=False, device_codename='bacon'):
self.authSubToken = None self.authSubToken = None
self.gsfId = None self.gsfId = None
self.lang = config.LANG self.lang = config.LANG
self.debug = debug self.debug = debug
self.deviceBuilder = config.DeviceBuilder(device_codename)
def encrypt_password(self, login, passwd): def encrypt_password(self, login, passwd):
"""Encrypt the password using the google publickey, using """Encrypt the password using the google publickey, using
@ -87,7 +88,7 @@ class GooglePlayAPI(object):
headers = { headers = {
"Accept-Language": config.LANG.replace('_', '-'), "Accept-Language": config.LANG.replace('_', '-'),
"X-DFE-Encoded-Targets": config.DFE_TARGETS, "X-DFE-Encoded-Targets": config.DFE_TARGETS,
"User-Agent": config.getUserAgent() "User-Agent": self.deviceBuilder.getUserAgent()
} }
if self.gsfId is not None: if self.gsfId is not None:
headers["X-DFE-Device-Id"] = "{0:x}".format(self.gsfId) headers["X-DFE-Device-Id"] = "{0:x}".format(self.gsfId)
@ -95,11 +96,11 @@ class GooglePlayAPI(object):
headers["Authorization"] = "GoogleLogin auth=%s" % self.authSubToken headers["Authorization"] = "GoogleLogin auth=%s" % self.authSubToken
return headers return headers
def checkin(self, email, ac2dmToken, device_codename): def checkin(self, email, ac2dmToken):
headers = self.getDefaultHeaders() headers = self.getDefaultHeaders()
headers["Content-Type"] = "application/x-protobuffer" headers["Content-Type"] = "application/x-protobuffer"
request = config.getAndroidCheckinRequest(device_codename) request = self.deviceBuilder.getAndroidCheckinRequest()
stringRequest = request.SerializeToString() stringRequest = request.SerializeToString()
res = requests.post(self.CHECKINURL, data=stringRequest, res = requests.post(self.CHECKINURL, data=stringRequest,
@ -125,7 +126,7 @@ class GooglePlayAPI(object):
*device.properties* to the google account. Default device is a Google Nexus 6P""" *device.properties* to the google account. Default device is a Google Nexus 6P"""
upload = googleplay_pb2.UploadDeviceConfigRequest() upload = googleplay_pb2.UploadDeviceConfigRequest()
upload.deviceConfiguration.CopyFrom(config.getDeviceConfig()) upload.deviceConfiguration.CopyFrom(self.deviceBuilder.getDeviceConfig())
headers = self.getDefaultHeaders() headers = self.getDefaultHeaders()
headers["X-DFE-Enabled-Experiments"] = "cl:billing.select_add_instrument_by_default" headers["X-DFE-Enabled-Experiments"] = "cl:billing.select_add_instrument_by_default"
headers["X-DFE-Unsupported-Experiments"] = "nocache:billing.use_charging_poller,market_emails,buyer_currency,prod_baseline,checkin.set_asset_paid_app_field,shekel_test,content_ratings,buyer_currency_in_app,nocache:encrypted_apk,recent_changes" headers["X-DFE-Unsupported-Experiments"] = "nocache:billing.use_charging_poller,market_emails,buyer_currency,prod_baseline,checkin.set_asset_paid_app_field,shekel_test,content_ratings,buyer_currency_in_app,nocache:encrypted_apk,recent_changes"
@ -137,8 +138,7 @@ class GooglePlayAPI(object):
headers=headers, verify=ssl_verify) headers=headers, verify=ssl_verify)
googleplay_pb2.ResponseWrapper.FromString(res.content) googleplay_pb2.ResponseWrapper.FromString(res.content)
def login(self, email=None, password=None, gsfId=None, def login(self, email=None, password=None, gsfId=None, authSubToken=None):
authSubToken=None, device_codename='bacon'):
"""Login to your Google Account. """Login to your Google Account.
For first time login you should provide: For first time login you should provide:
* email * email
@ -185,7 +185,7 @@ class GooglePlayAPI(object):
else: else:
raise LoginError("Auth token not found.") raise LoginError("Auth token not found.")
self.gsfId = self.checkin(email, ac2dmToken, device_codename) self.gsfId = self.checkin(email, ac2dmToken)
if self.debug: if self.debug:
print("Google Services Framework Id: %s" % "{0:x}".format(self.gsfId)) print("Google Services Framework Id: %s" % "{0:x}".format(self.gsfId))
self.getAuthSubToken(email, encryptedPass) self.getAuthSubToken(email, encryptedPass)
@ -496,6 +496,9 @@ class GooglePlayAPI(object):
return self.delivery(packageName, versionCode, return self.delivery(packageName, versionCode,
offerType, dlToken, progress_bar=progress_bar) offerType, dlToken, progress_bar=progress_bar)
def changeDevice(self, device_codename):
self.deviceBuilder = config.DeviceBuilder(device_codename)
@staticmethod @staticmethod
def getDevicesCodenames(): def getDevicesCodenames():
return config.getDevicesCodenames() return config.getDevicesCodenames()