added geetest captcha

Author: imagetyperz-api

.gitignore

@@ -0,0 +1,3 @@
+*Debug*
+source/.vs
+source/packages

binary/imagetyperzapi.dll

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

changelog.md

@@ -36,7 +36,9 @@ string balance = i.account_balance();
 Console.WriteLine(string.format("Balance: {0}", balance));
 ```
 
-**Submit image captcha**
+## Image captcha
+
+### Submit image captcha
 
 ``` csharp
 string captcha_text = i.solve_captcha("captcha.jpg");
@@ -52,7 +54,9 @@ string captcha_text = i.solve_captcha("http://abc.com/captcha.jpg", false);
  For those that are still using username & password, retrieve your access_key from 
  imagetyperz.com
 
-**Submit recaptcha details**
+## reCAPTCHA
+ 
+### Submit recaptcha details
 
 For recaptcha submission there are two things that are required, and some optional parameters
 - page_url
@@ -77,7 +81,7 @@ string captcha_id = i.submit_recaptcha(d);
 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.
 
@@ -93,6 +97,49 @@ while(i.in_progress(captcha_id))
 string recaptcha_response = i.retrieve_captcha(captcha_id);
 ```
 
+## 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
+```csharp
+Dictionary<string, string> dg = new Dictionary<string, string>();
+dg.Add("domain", "geetest captcha domain");
+dg.Add("challenge", "geetest captcha challenge");
+dg.Add("gt", "geetest captcha gt");
+//d.Add("proxy", "126.45.34.53:123"); // or with auth 126.45.34.53:123:user:pass - optional
+//d.Add("user_agent", "Your user agent"); // optional
+```
+
+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
+```csharp
+Console.WriteLine(string.Format("Geetest captcha id: {0}", geetest_id));
+Console.WriteLine("Waiting for geetest captcha to be solved ...");
+
+// check for completion
+while (i.in_progress(geetest_id)) System.Threading.Thread.Sleep(10000);      // sleep for 10 seconds and retry
+
+// we got a response at this point
+Dictionary<string, string> geetest_response = i.retrieve_geetest(geetest_id);     // get the response
+Console.WriteLine(string.Format("Geetest response: {0} - {1} - {2}", geetest_response["challenge"], 
+	geetest_response["validate"], geetest_response["seccode"]));
+```
+
+Response will be a string dictionary, which looks like this: `{'challenge': '...', 'validate': '...', 'seccode': '...'}`
+
 ## Other methods/variables
 
 **Affiliate id**

LICENSE.md renamed to license.md

@@ -17,12 +17,11 @@ static void test_api()
             // -----------------------------------------
             string access_key = "access_token_here";
 
-
             // init imagetypersAPI obj with username and password
             ImageTypersAPI i = new ImageTypersAPI(access_key);
 
             // old school / legacy way
-            //i.set_user_and_password("your_username", "your_password");
+            // i.set_user_and_password("your_username", "your_password");
 
             // balance
             // ------------
@@ -31,9 +30,9 @@ static void test_api()
 
             // captcha image
             // ==========================================================================================
-            //Console.WriteLine("Solving image captcha ...");
-            //string captcha_image_text = i.solve_captcha("captcha.jpg");
-            //Console.WriteLine(string.Format("Captcha text: {0}", captcha_image_text));
+            Console.WriteLine("Solving image captcha ...");
+            string captcha_image_text = i.solve_captcha("captcha.jpg");
+            Console.WriteLine(string.Format("Captcha text: {0}", captcha_image_text));
 
             // ==========================================================================================
             // recaptcha
@@ -59,11 +58,32 @@ static void test_api()
             // retrieve
             // ---------
             while (i.in_progress(captcha_id)) System.Threading.Thread.Sleep(10000);      // sleep for 10 seconds and retry
+            string gresponse = i.retrieve_captcha(captcha_id);
+            Console.WriteLine(string.Format("Recaptcha response: {0}", gresponse));
 
-            // we got a response at this point
-            // ---------------------------------
-            string recaptcha_response = i.retrieve_captcha(captcha_id);     // get the response
-            Console.WriteLine(string.Format("Recaptcha response: {0}", recaptcha_response));
+            // Geetest
+            // ----------
+            // create params dict
+            //Dictionary<string, string> dg = new Dictionary<string, string>();
+            //dg.Add("domain", "geetest captcha domain");
+            //dg.Add("challenge", "geetest captcha challenge");
+            //dg.Add("gt", "geetest captcha gt");
+            ////d.Add("proxy", "126.45.34.53:123"); // or with auth 126.45.34.53:123:user:pass - optional
+            ////d.Add("user_agent", "Your user agent"); // optional
+
+            //string geetest_id = i.submit_geetest(dg);
+            //Console.WriteLine(string.Format("Geetest captcha id: {0}", geetest_id));
+            //Console.WriteLine("Waiting for geetest captcha to be solved ...");
+
+            //// retrieve
+            //// ---------
+            //while (i.in_progress(geetest_id)) System.Threading.Thread.Sleep(10000);      // sleep for 10 seconds and retry
+
+            //// we got a response at this point
+            //// ---------------------------------
+            //Dictionary<string, string> geetest_response = i.retrieve_geetest(geetest_id);     // get the response
+            //Console.WriteLine(string.Format("Geetest response: {0} - {1} - {2}", geetest_response["challenge"], 
+            //    geetest_response["validate"], geetest_response["seccode"]));
 
             // Other examples
             // ----------------

README.md renamed to readme.md

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace ImageTypers
+{
+    class Geetest
+    {
+        private string _captcha_id = "";
+        private string _response = "";
+
+        public Geetest(string captcha_id)
+        {
+            this._captcha_id = captcha_id;
+        }
+        /// <summary>
+        /// Save captcha response to obj
+        /// </summary>
+        /// <param name="response"></param>
+        public void set_response(string response)
+        {
+            this._response = response;
+        }
+        /// <summary>
+        /// Getter for ID
+        /// </summary>
+        /// <returns></returns>
+        public string captcha_id()
+        {
+            return this._captcha_id;
+        }
+        /// <summary>
+        /// Getter for response
+        /// </summary>
+        /// <returns></returns>
+        public Dictionary<string, string> response()
+        {
+            var s = this._response.Split(new string[] { ";;;" }, StringSplitOptions.None);
+            if(s.Length == 3)
+            {
+                var d = new Dictionary<string, string>();
+                d.Add("challenge", s[0]);
+                d.Add("validate", s[1]);
+                d.Add("seccode", s[2]);
+                return d;
+            }
+            throw new Exception("invalid geetest response");
+        }
+    }
+}

source/.vs/imagetyperzapi/v15/.suo

@@ -17,6 +17,8 @@ public class ImageTypersAPI
         private static string BALANCE_ENDPOINT = "http://captchatypers.com/Forms/RequestBalance.ashx";
         private static string BAD_IMAGE_ENDPOINT = "http://captchatypers.com/Forms/SetBadImage.ashx";
         private static string PROXY_CHECK_ENDPOINT = "http://captchatypers.com/captchaAPI/GetReCaptchaTextJSON.ashx";
+        private static string GEETEST_SUBMIT_ENDPOINT = "http://captchatypers.com/captchaapi/UploadGeeTest.ashx";
+        private static string GEETEST_RETRIEVE_ENDPOINT = "http://captchatypers.com/captchaapi/getrecaptchatext.ashx";
 
         private static string CAPTCHA_ENDPOINT_CONTENT_TOKEN = "http://captchatypers.com/Forms/UploadFileAndGetTextNEWToken.ashx";
         private static string CAPTCHA_ENDPOINT_URL_TOKEN = "http://captchatypers.com/Forms/FileUploadAndGetTextCaptchaURLToken.ashx";
@@ -25,6 +27,7 @@ public class ImageTypersAPI
         private static string BALANCE_ENDPOINT_TOKEN = "http://captchatypers.com/Forms/RequestBalanceToken.ashx";
         private static string BAD_IMAGE_ENDPOINT_TOKEN = "http://captchatypers.com/Forms/SetBadImageToken.ashx";
         private static string PROXY_CHECK_ENDPOINT_TOKEN = "http://captchatypers.com/captchaAPI/GetReCaptchaTextTokenJSON.ashx";
+        private static string GEETEST_SUBMIT_ENDPOINT_TOKEN = "http://captchatypers.com/captchaapi/UploadGeeTestToken.ashx";
 
         private static string USER_AGENT = "csharpAPI1.0";      // user agent used in requests
 
@@ -36,6 +39,7 @@ public class ImageTypersAPI
 
         private Captcha _captcha;
         private Recaptcha _recaptcha = null;
+        private Geetest _geetest = null;
 
         private string _error = "";
 
@@ -52,8 +56,8 @@ public ImageTypersAPI(string access_token, string affiliate_id = "0", int timeou
             this._timeout = timeout * 1000;
         }
 
-        #region captcha & recaptcha
-        /// <summary>
+        #region captcha / recaptcha / geetest
+        /// <summary> 
         /// Solve normal captcha
         /// </summary>
         /// <param name="captcha">captcha image file (local) or remote file (URL) [remote works only if tokens are used]</param>
@@ -273,7 +277,8 @@ public bool in_progress(string captcha_id)
         {
             try
             {
-                this.retrieve_captcha(captcha_id);          // try to retrieve captcha
+                if (this._geetest != null) this.retrieve_geetest(captcha_id);
+                else this.retrieve_captcha(captcha_id);          // try to retrieve captcha
                 return false;       // no error, we're good
             }
             catch (Exception ex)
@@ -288,6 +293,103 @@ public bool in_progress(string captcha_id)
             }
         }
         #endregion
+
+        #region geetest
+        /// <summary>
+        /// Submit geetest captcha
+        /// </summary>
+        /// <param name="d"></param>
+        /// <returns></returns>
+        public string submit_geetest(Dictionary<string, string> d)
+        {
+            string url = "";
+
+            if(!d.ContainsKey("domain")) throw new Exception("domain is missing");
+            if (!d.ContainsKey("challenge")) throw new Exception("challenge is missing");
+            if (!d.ContainsKey("gt")) throw new Exception("gt is missing");
+
+            d.Add("action", "UPLOADCAPTCHA");
+            // create URL
+            if (!string.IsNullOrWhiteSpace(this._username))
+            {
+                d.Add("username", this._username);
+                d.Add("password", this._password);
+                url = GEETEST_SUBMIT_ENDPOINT;
+            }
+            else
+            {
+                d.Add("token", this._access_token);
+                url = GEETEST_SUBMIT_ENDPOINT_TOKEN;
+            }
+
+            // affiliate id
+            if (!string.IsNullOrWhiteSpace(this._affiliateid) && this._affiliateid.ToString() != "0")
+            {
+                d.Add("affiliateid", this._affiliateid);
+            }
+
+            var post_data = Utils.list_to_params(d);        // transform dict to params
+            var full_url = string.Format("{0}?{1}", url, post_data);
+            string response = Utils.GET(full_url, USER_AGENT, this._timeout);       // make request
+            if (response.Contains("ERROR:"))
+            {
+                var response_err = response.Split(new string[] { "ERROR:" }, StringSplitOptions.None)[1].Trim();
+                this._error = response_err;
+                throw new Exception(response_err);
+            }
+
+            // set as recaptcha [id] response and return
+            var r = new Geetest(response);
+            this._geetest = r;
+            return this._geetest.captcha_id();        // return captcha id
+        }
+
+        /// <summary>
+        /// Get geetest response
+        /// </summary>
+        /// <param name="captcha_id"></param>
+        /// <returns></returns>
+        public Dictionary<string, string> retrieve_geetest(string captcha_id)
+        {
+            // check if ID is OK
+            if (string.IsNullOrWhiteSpace(captcha_id))
+            {
+                throw new Exception("captcha ID is null or empty");
+            }
+
+            string url = "";
+            // init params object
+            Dictionary<string, string> d = new Dictionary<string, string>();
+            d.Add("action", "GETTEXT");
+            d.Add("captchaid", captcha_id);
+
+            if (!string.IsNullOrWhiteSpace(this._username))
+            {
+                d.Add("username", this._username);
+                d.Add("password", this._password);
+                url = GEETEST_RETRIEVE_ENDPOINT;
+            }
+            else
+            {
+                d.Add("token", this._access_token);
+                url = GEETEST_RETRIEVE_ENDPOINT;
+            }
+
+            var post_data = Utils.list_to_params(d);        // transform dict to params
+            var full_url = string.Format("{0}?{1}", url, post_data);
+            string response = Utils.GET(full_url, USER_AGENT, this._timeout);       // make request
+            if (response.Contains("ERROR:"))
+            {
+                var response_err = response.Split(new string[] { "ERROR:" }, StringSplitOptions.None)[1].Trim();
+                this._error = response_err;
+                throw new Exception(response_err);
+            }
+
+            // set as recaptcha [id] response and return
+            this._geetest.set_response(response);
+            return this._geetest.response();        // return captcha id
+        }
+        #endregion
         #endregion
 
         #region others