added geetest captcha

Author: imagetyperz-api

.gitignore

@@ -0,0 +1,2 @@
+*.pyc
+.idea

README.md

@@ -54,7 +54,10 @@ ita.solve_captcha('captcha.jpg', case_sensitive=False)
 ``` python
 ita.solve_captcha('http://abc.com/your_captcha.jpg')   
 ```
-**Submit recaptcha details**
+
+## reCAPTCHA
+
+### Submit recaptcha details
 
 For recaptcha submission there are two things that are required.
 - page_url
@@ -80,7 +83,7 @@ captcha_id = ita.submit_recaptcha(recaptcha_params)
 This method returns a captchaID. This ID will be used next, to retrieve the g-response, once workers have 
 completed the captcha. This takes somewhere between 10-80 seconds.
 
-**Retrieve captcha response**
+### Retrieve captcha response
 
 Once you have the captchaID, you check for it's progress, and later on retrieve the gresponse.
 
@@ -97,6 +100,47 @@ recaptcha_response = ita.retrieve_recaptcha(captcha_id)           # captcha_id i
 print 'Recaptcha response: {}'.format(recaptcha_response)         # print google response
 ```
 
+## GeeTest
+
+GeeTest is a captcha that requires 3 parameters to be solved:
+- domain
+- challenge
+- gt
+
+The response of this captcha after completion are 3 codes:
+- challenge
+- validate
+- seccode
+
+### Submit GeeTest
+```python
+geetest_params = {
+        'domain' :'domain_here',
+        'challenge': 'challenge_here',
+        'gt': 'gt_here',
+        'proxy': '126.45.34.53:345',    # or 126.45.34.53:123:joe:password, optional
+        'user_agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/60.0'    # optional
+}
+captcha_id = ita.submit_geetest(geetest_params)
+```
+
+Just like reCAPTCHA, you'll receive a captchaID.
+Using the ID, you'll be able to retrieve 3 codes after completion.
+
+Optionally, you can send proxy and user_agent along.
+
+### Retrieve GeeTest codes
+```python
+print ('Geetest captcha ID: {}'.format(captcha_id))
+print ('Waiting for geetest to be solved...')
+while ita.in_progress():
+    sleep(10)
+geetest_response = ita.retrieve_geetest(captcha_id)
+print (geetest_response)
+```
+
+Response will look like this: `{'challenge': '...', 'validate': '...', 'seccode': '...'}`
+
 ## Other methods/variables
 
 **Affiliate id**

changelog.md

@@ -0,0 +1,3 @@
+14.03.2019
+------
+- added geetest captcha

imagetyperzapi2/imagetyperzapi.py

@@ -8,6 +8,7 @@
 
 import os, json
 from base64 import b64encode
+from urllib import urlencode
 
 # endpoints
 # -------------------------------------------------------------------------------------------
@@ -17,6 +18,8 @@
 BALANCE_ENDPOINT = 'http://captchatypers.com/Forms/RequestBalance.ashx'
 BAD_IMAGE_ENDPOINT = 'http://captchatypers.com/Forms/SetBadImage.ashx'
 PROXY_CHECK_ENDPOINT = 'http://captchatypers.com/captchaAPI/GetReCaptchaTextJSON.ashx'
+GEETEST_SUBMIT_ENDPOINT = 'http://captchatypers.com/captchaapi/UploadGeeTest.ashx'
+GEETEST_RETRIEVE_ENDPOINT = 'http://captchatypers.com/captchaapi/getrecaptchatext.ashx'
 
 CAPTCHA_ENDPOINT_CONTENT_TOKEN = 'http://captchatypers.com/Forms/UploadFileAndGetTextNEWToken.ashx'
 CAPTCHA_ENDPOINT_URL_TOKEN = 'http://captchatypers.com/Forms/FileUploadAndGetTextCaptchaURLToken.ashx'
@@ -25,6 +28,8 @@
 BALANCE_ENDPOINT_TOKEN = 'http://captchatypers.com/Forms/RequestBalanceToken.ashx'
 BAD_IMAGE_ENDPOINT_TOKEN = 'http://captchatypers.com/Forms/SetBadImageToken.ashx'
 PROXY_CHECK_ENDPOINT_TOKEN = 'http://captchatypers.com/captchaAPI/GetReCaptchaTextTokenJSON.ashx'
+GEETEST_SUBMIT_ENDPOINT_TOKEN = 'http://captchatypers.com/captchaapi/UploadGeeTestToken.ashx'
+
 # user agent used in requests
 # ---------------------------
 USER_AGENT = 'pythonAPI1.0'
@@ -76,6 +81,32 @@ def captcha_id(self):
     def response(self):
         return self._response
 
+# Geetest class
+# ---------------------------------
+class Geetest:
+    def __init__(self, captcha_id):
+        self._captcha_id = captcha_id
+        self._response = ''
+
+    # set response
+    def set_response(self, response):
+        self._response = response
+
+    @property
+    def captcha_id(self):
+        return self._captcha_id
+
+    @property
+    def response(self):
+        s = self._response.split(';;;')
+        if len(s) == 3:
+            return {
+                'challenge': s[0],
+                'validate': s[1],
+                'seccode': s[2]
+            }
+        else: return self._response
+
 
 # API class
 # -----------------------------------------
@@ -221,6 +252,81 @@ def submit_recaptcha(self, d):
 
         return self._recaptcha.captcha_id           # return the ID
 
+    # submit geetest captcha
+    def submit_geetest(self, d):
+        # check if page_url and sitekey are != None
+        if not d.has_key('domain'): raise Exception('domain is missing')
+        if not d.has_key('challenge'): raise Exception('challenge is missing')
+        if not d.has_key('gt'): raise Exception('gt is missing')
+        d['action'] = 'UPLOADCAPTCHA'
+        # credentials and url
+        if self._username:
+            d['username'] = self._username
+            d['password'] = self._password
+            url = GEETEST_SUBMIT_ENDPOINT
+        else:
+            d['token'] = self._access_token
+            url = GEETEST_SUBMIT_ENDPOINT_TOKEN
+
+        # affiliate ID
+        if self._affiliate_id: d['affiliateid'] = self._affiliate_id
+
+        url = '{}?{}'.format(url, urlencode(d))
+        # make request with all data
+        response = self._session.post(url, data=d,
+                                      headers=self._headers, timeout=self._timeout)
+        response_text = response.text.encode('utf-8')  # get text from response
+
+        # check if we got an error
+        # -------------------------------------------------------------
+        if 'ERROR:' in response_text and response_text.split('|') != 2:
+            response_err = response_text.split('ERROR:')[1].strip()
+            self._error = response_err
+            raise Exception(response_err)  # raise Ex
+
+        self._geetest = Geetest(response_text)  # init recaptcha obj with captcha_id (which is in the resp)
+        return self._geetest.captcha_id  # return the ID
+
+    # retrieve geetest captcha
+    def retrieve_geetest(self, captcha_id = None):
+        # if captcha id is not specified, use the ID of the last captcha submited
+        if not captcha_id:
+            if not self._geetest: raise Exception('no geetest was submited previously, submit a captcha'
+                                                    ' first or give captcha_id as argument')  # raise it
+            captcha_id = self._geetest.captcha_id
+        # create params dict (multipart)
+        data = {
+            'action': 'GETTEXT',
+            'captchaid': captcha_id
+        }
+        # set URL
+        if self._username:
+            data['username'] = self._username
+            data['password'] = self._password
+            url = GEETEST_RETRIEVE_ENDPOINT
+        else:
+            data['token'] = self._access_token
+            url = GEETEST_RETRIEVE_ENDPOINT
+
+        url = '{}?{}'.format(url, urlencode(data))
+        # make request with all data
+        response = self._session.get(url,
+                                      headers=self._headers, timeout=self._timeout)
+        response_text = response.text.encode('utf-8')  # get text from response
+
+        # check if we got an error
+        # -------------------------------------------------------------
+        if 'ERROR:' in response_text and response_text.split('|') != 2:
+            response_err = response_text.split('ERROR:')[1].strip()
+            # if error is different than NOT_DECODED, save it to obj
+            if response_err != 'NOT_DECODED': self._error = response_err
+
+            raise Exception(response_err)  # raise Ex
+
+        self._geetest.set_response(response_text)  # set response to recaptcha obj
+
+        return self._geetest.response  # return response
+
     # retrieve recaptcha
     def retrieve_recaptcha(self, captcha_id = None):
         # if captcha id is not specified, use the ID of the last captcha submited
@@ -264,8 +370,14 @@ def retrieve_recaptcha(self, captcha_id = None):
     # check if captcha is still being decoded
     def in_progress(self, captcha_id = None):
         try:
-            self.retrieve_recaptcha(captcha_id)     # retrieve captcha
-            return False                             # captcha got decoded
+            if self._geetest:
+                # geetest
+                self.retrieve_geetest(captcha_id)
+                return False
+            else:
+                # recaptcha
+                self.retrieve_recaptcha(captcha_id)     # retrieve captcha
+                return False                             # captcha got decoded
         except Exception, ex:
             if 'NOT_DECODED' in str(ex):        # if NOT_DECODED in response, it's 'OK'
                 return True

main.py

@@ -47,6 +47,23 @@ def test_api():
     recaptcha_response = ita.retrieve_recaptcha(captcha_id)           # captcha_id is optional, if not given, will use last captcha id submited
     print 'Recaptcha response: {}'.format(recaptcha_response)         # print google response
 
+    # GeeTest captcha
+    # ----------------
+    # geetest_params = {
+    #     'domain' :'domain_here',
+    #     'challenge': 'challenge_here',
+    #     'gt': 'gt_here',
+    #     'proxy': '126.45.34.53:345',    # or 126.45.34.53:123:joe:password
+    #     'user_agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/60.0'    # optional
+    # }
+    # captcha_id = ita.submit_geetest(geetest_params)
+    # print ('Geetest captcha ID: {}'.format(captcha_id))
+    # print ('Waiting for geetest to be solved...')
+    # while ita.in_progress():
+    #     sleep(10)
+    # geetest_response = ita.retrieve_geetest(captcha_id)
+    # print (geetest_response)      # {'challenge': '...', 'validate': '...', 'seccode': '...'}
+
     # other examples
     # --------------------------------------------------------------------------------------
     # ita = ImageTypersAPI(access_token, 123)  # init imagetyperz api obj with access_token and affiliate id