Fix Login crash (May 2017). Add USER_AGENT setting.

.gitignore

@@ -1,2 +1,5 @@
 build/
 build/*
+*.pyc
+.idea/
+.idea/*

.travis.yml

@@ -0,0 +1,23 @@
+dist: trusty # trusty = ubuntu 14.04
+sudo: false # false = docker container environment
+language: python
+python:
+  - "2.7"
+  - "3.4"
+  - "nightly" # currently points to 3.9-dev
+# command to install dependencies
+matrix:
+  allow_failures:
+    - python: "3.4"
+    - python: "nightly"
+install:
+  - "pip install -r requirements.txt"
+  - "pip install -r tests/requirements.txt"
+  - "python setup.py install"
+  - "export PATH=$PATH:."
+  - "cp -p bin/gvoice ."
+# command to run tests
+script: pytest
+
+# script: python -B test/test.py
+# https://github.com/finnrayment/dash-h

README.rst

@@ -3,6 +3,8 @@ Python Google Voice
 
 Joe McCall & Justin Quick
 
+Updates by Chris Coleman @ Espace Networks
+
 Exposing the Google Voice "API" to the Python language
 -------------------------------------------------------
 
@@ -11,3 +13,15 @@ You can use the Python API or command line script to schedule calls, check for n
 Works for Python 2 and Python 3
 
 Full documentation is available up at http://sphinxdoc.github.com/pygooglevoice/
+
+CURRENT STATUS: 
+
+The two-step auth is broken, and appears to need rewriting, in light of the major new version of GVoice.
+
+** I invite everyone who is using this software and enjoying my recent bug fixes and feature additions, to visit my gofundme page, where anyone who is interested in supporting my serious efforts to fix and develop this software further, can make a contribution to help cover my running costs.
+
+Thank you to everyone who will support. It's because of you that I can do this and make this software work again! 
+
+- Chris Coleman @ Espace Networks **
+
+https://www.gofundme.com/espacenetworks-pygooglevoice

googlevoice/conf.py

@@ -25,9 +25,9 @@ def __init__(self):
         except IOError:
             return
 
-    def get(self, option, section='gvoice'):
+    def get(self, option, section='gvoice', **kwargs):
         try:
-            return ConfigParser.get(self, section, option).strip() or None
+            return ConfigParser.get(self, section, option, **kwargs).strip() or None
         except NoOptionError:
             return
 

googlevoice/settings.py

@@ -32,8 +32,12 @@
 }
 
 DEBUG = False
-LOGIN = 'https://accounts.google.com/ServiceLogin?service=grandcentral&passive=1209600&continue=https://www.google.com/voice&followup=https://www.google.com/voice&ltmpl=open'
-LOGIN_POST = 'https://accounts.google.com/signin/challenge/sl/password?service=grandcentral&continue=https://www.google.com/voice&followup=https://www.google.com/voice&ltmpl=open'
+
+LOGIN = 'https://accounts.google.com/ServiceLogin?continue=https://www.google.com/voice&rip=1&nojavascript=1&followup=https://www.google.com/voice&service=grandcentral&ltmpl=open&flowName=GlifWebSignIn&flowEntry=Identifier'
+LOGIN_POST = 'https://accounts.google.com/signin/challenge/sl/password?service=grandcentral&continue=https://www.google.com/voice/redirection/voice&followup=https://www.google.com/voice&ltmpl=open'
+
+USER_AGENT = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.71 Safari/537.36'
+
 SMSAUTH = 'https://accounts.google.com/SmsAuth'
 FEEDS = ('inbox', 'starred', 'all', 'spam', 'trash', 'voicemail', 'sms',
         'recorded', 'placed', 'received', 'missed')
@@ -67,4 +71,4 @@
 XML_RECORDED = XML_RECENT + 'recorded/'
 XML_PLACED = XML_RECENT + 'placed/'
 XML_RECEIVED = XML_RECENT + 'received/'
-XML_MISSED = XML_RECENT + 'missed/'
+XML_MISSED = XML_RECENT + 'missed/'

googlevoice/voice.py

@@ -72,21 +72,21 @@ def login(self, email=None, passwd=None, smsKey=None):
 
         content = self.__do_page('login').read()
         # holy hackjob
-        galx = re.search(r"type=\"hidden\"\s+name=\"GALX\"\s+value=\"(.+)\"", content).group(1)
+        # galx = re.search(r"type=\"hidden\"\s+name=\"GALX\"\s+value=\"(.+)\"", content).group(1)
         gxf = re.search(r"type=\"hidden\"\s+name=\"gxf\"\s+value=\"(.+)\"", content).group(1)
-        result = self.__do_page('login_post', {'Email': email, 'Passwd': passwd, 'GALX': galx, 'gxf': gxf})
+        result = self.__do_page('login_post', {'Email': email, 'Passwd': passwd, 'gxf': gxf})
 
         if result.geturl().startswith(getattr(settings, "SMSAUTH")):
             content = self.__smsAuth(smsKey)
 
             try:
                 smsToken = re.search(r"name=\"smsToken\"\s+value=\"([^\"]+)\"", content).group(1)
-                galx = re.search(r"name=\"GALX\"\s+value=\"([^\"]+)\"", content).group(1)
-                content = self.__do_page('login', {'smsToken': smsToken, 'service': "grandcentral", 'GALX': galx})
+                # galx = re.search(r"name=\"GALX\"\s+value=\"([^\"]+)\"", content).group(1)
+                content = self.__do_page('login', {'smsToken': smsToken, 'service': "grandcentral", })
             except AttributeError:
                 raise LoginError
 
-            del smsKey, smsToken, galx, gxf
+            del smsKey, smsToken, gxf # , galx
 
         del email, passwd
 
@@ -261,7 +261,7 @@ def __do_page(self, page, data=None, headers={}, terms={}):
         page = page.upper()
         if isinstance(data, dict) or isinstance(data, tuple):
             data = urlencode(data)
-        headers.update({'User-Agent': 'PyGoogleVoice/0.5'})
+        headers.update({'User-Agent': getattr(settings, "USER_AGENT")})
         if log:
             log.debug('%s?%s - %s' % (getattr(settings, page)[22:], data or '', headers))
         if page in ('DOWNLOAD', 'XML_SEARCH'):

requirements.txt

@@ -0,0 +1 @@
+BeautifulSoup4

tests/test_call.py

@@ -0,0 +1,19 @@
+from googlevoice import Voice
+from googlevoice.util import input
+
+
+def test_call():
+    # assert inc(3) == 5
+
+    voice = Voice()
+    # voice.login()
+
+    outgoingNumber = "18005551212" # input('Number to call: ')
+    forwardingNumber = None # input('Number to call from [optional]: ') or None
+
+    #voice.call(outgoingNumber, forwardingNumber)
+
+    #if input('Calling now... cancel?[y/N] ').lower() == 'y':
+    #    voice.cancel(outgoingNumber, forwardingNumber)
+
+    assert 1 == 1

tests/test_delete.py

@@ -0,0 +1,11 @@
+from googlevoice import Voice
+
+def test_delete():
+    voice = Voice()
+    # voice.login()
+
+    #for message in voice.sms().messages:
+    #    if message.isRead:
+    #        message.delete()
+
+    assert 1 == 1

tests/test_download-mp3.py

@@ -0,0 +1,12 @@
+from googlevoice import Voice
+
+def test_download_mp3():
+    download_dir = '.'
+
+    voice = Voice()
+    # voice.login()
+
+    #for message in voice.voicemail().messages:
+    #    message.download(download_dir)
+
+    assert 1 == 1

tests/test_folders.py

@@ -0,0 +1,12 @@
+from googlevoice import Voice,util,settings
+
+def test_folders():
+    voice = Voice()
+    # voice.login()
+
+    #for feed in settings.FEEDS:
+    #    util.print_(feed.title())
+    #    for message in getattr(voice, feed)().messages:
+    #        util.print_('\t', message)
+
+    assert 1 == 1

tests/test_parse_sms.py

@@ -0,0 +1,43 @@
+#
+# SMS test via Google Voice
+#
+# John Nagle
+#   [email protected]
+#
+from googlevoice import Voice
+import sys
+from bs4 import BeautifulSoup
+
+
+def extractsms(htmlsms):
+    """
+    extractsms  --  extract SMS messages from BeautifulSoup tree of Google Voice SMS HTML.
+
+    Output is a list of dictionaries, one per message.
+    """
+    msgitems = []  # accum message items here
+    #	Extract all conversations by searching for a DIV with an ID at top level.
+    tree = BeautifulSoup.BeautifulSoup(htmlsms)  # parse HTML into tree
+    conversations = tree.findAll("div", attrs={"id": True}, recursive=False)
+    for conversation in conversations:
+        #	For each conversation, extract each row, which is one SMS message.
+        rows = conversation.findAll(attrs={"class": "gc-message-sms-row"})
+        for row in rows:  # for all rows
+            #	For each row, which is one message, extract all the fields.
+            msgitem = {"id": conversation["id"]}  # tag this message with conversation ID
+            spans = row.findAll("span", attrs={"class": True}, recursive=False)
+            for span in spans:  # for all spans in row
+                cl = span["class"].replace('gc-message-sms-', '')
+                msgitem[cl] = (" ".join(span.findAll(text=True))).strip()  # put text in dict
+            msgitems.append(msgitem)  # add msg dictionary to list
+    return msgitems
+
+def test_parse_sms():
+    voice = Voice()
+    #voice.login()
+
+    #voice.sms()
+    #for msg in extractsms(voice.sms.html):
+    #    print str(msg)
+
+    assert 1 == 1

tests/test_phones.py

@@ -0,0 +1,9 @@
+from googlevoice import Voice,util
+
+def test_phones():
+    voice = Voice()
+    #voice.login()
+
+    #util.pprint(voice.phones)
+
+    assert 1 == 1

tests/test_search.py

@@ -0,0 +1,12 @@
+from googlevoice import Voice,util
+
+def test_search():
+    voice = Voice()
+    #voice.login()
+
+    #folder = voice.search(util.input('Search query: '))
+
+    #util.print_('Found %s messages: ', len(folder))
+    #util.pprint(folder.messages)
+
+    assert 1 == 1

tests/test_settings.py

@@ -0,0 +1,9 @@
+from googlevoice import Voice,util
+
+def test_settings():
+    voice = Voice()
+    #voice.login()
+
+    #util.pprint(voice.settings)
+
+    assert 1 == 1

tests/test_sms.py

@@ -0,0 +1,13 @@
+from googlevoice import Voice
+from googlevoice.util import input
+
+def test_sms():
+    voice = Voice()
+    #voice.login()
+
+    phoneNumber =  "18005551212"  #input('Number to send message to: ')
+    text = "Hello, world." #input('Message text: ')
+
+    #voice.send_sms(phoneNumber, text)
+
+    assert 1 == 1

tests/voicemail.py

@@ -0,0 +1,10 @@
+from googlevoice import Voice,util
+
+def test_voicemail():
+    voice = Voice()
+    #voice.login()
+
+    #for message in voice.voicemail().messages:
+    #    util.print_(message)
+
+    assert 1 == 1