Permalink
Browse files

fix cert validation [closes #345, closes #313]

  • Loading branch information...
simon-weber committed Jun 21, 2015
1 parent 0a0d01e commit 6f97cf8ba7bf2f9413e9b88868ae09c2bd23c17a
Showing with 8 additions and 11 deletions.
  1. +0 −1 gmusicapi/protocol/mobileclient.py
  2. +0 −7 gmusicapi/protocol/musicmanager.py
  3. +4 −2 requirements.txt
  4. +4 −1 setup.py
@@ -435,7 +435,6 @@ class ListTracks(McListCall):
class GetStreamUrl(McCall):
static_method = 'GET'
static_url = 'https://android.clients.google.com/music/mplay'
static_verify = False
# this call will redirect to the mp3
static_allow_redirects = False
@@ -23,7 +23,6 @@
log = utils.DynamicClientLogger(__name__)
# This url has SSL issues, hence the static_verify=False.
_android_url = 'https://android.clients.google.com/upsj/'
OAuthInfo = namedtuple('OAuthInfo', 'client_id client_secret scope redirect')
@@ -102,7 +101,6 @@ class AuthenticateUploader(MmCall):
"""Sent to auth, reauth, or register our upload client."""
static_url = _android_url + 'upauth'
static_verify = False
@classmethod
def check_success(cls, response, msg):
@@ -134,7 +132,6 @@ def dynamic_data(cls, uploader_id, uploader_friendly_name):
class UploadMetadata(MmCall):
static_url = _android_url + 'metadata'
static_verify = False
static_params = {'version': 1}
@@ -309,7 +306,6 @@ def dynamic_data(cls, tracks, uploader_id, do_not_rematch=False):
class GetUploadJobs(MmCall):
# TODO
static_url = _android_url + 'getjobs'
static_verify = False
static_params = {'version': 1}
@@ -473,7 +469,6 @@ class ProvideSample(MmCall):
static_method = 'POST'
static_params = {'version': 1}
static_url = _android_url + 'sample'
static_verify = False
@staticmethod
@pb
@@ -520,7 +515,6 @@ class UpdateUploadState(MmCall):
static_method = 'POST'
static_params = {'version': 1}
static_url = _android_url + 'sample'
static_verify = False
@staticmethod
@pb
@@ -551,7 +545,6 @@ class CancelUploadJobs(MmCall):
static_method = 'POST'
static_url = _android_url + 'deleteuploadrequested'
static_verify = False
@staticmethod
@pb
View
@@ -14,25 +14,27 @@ docutils==0.11
enum34==1.0.4
flake8==2.4.0
future==0.14.3
gpsoauth==0.0.3
gpsoauth==0.0.4
httplib2==0.9
mccabe==0.3
mock==1.0.1
mutagen==1.23
ndg-httpsclient==0.4.0
nose==1.3.3
oauth2client==1.2
pep8==1.5.7
ply==3.4
proboscis==1.2.6.0
protobuf==2.5.0
py==1.4.26
pyOpenSSL==0.15.1
pyasn1==0.1.7
pycparser==2.13
pycrypto==2.6.1
pyflakes==0.8.1
python-dateutil==2.2
python-gflags==2.0
requests==2.3.0
requests==2.7.0
six==1.7.3
tox==1.8.1
validictory==1.0.0
View
@@ -56,8 +56,11 @@
'oauth2client >= 1.1', # TokenRevokeError
'mock >= 0.7.0', # MagicMock
'appdirs >= 1.1.0', # user_log_dir
'gpsoauth == 0.0.3', # mac -> android_id
'gpsoauth == 0.0.4', # mac -> android_id, validation
'MechanicalSoup',
'pyopenssl',
'ndg-httpsclient',
'pyasn1',
] + dynamic_requires,
classifiers=[
'Development Status :: 4 - Beta',

0 comments on commit 6f97cf8

Please sign in to comment.