fix bypasscaptcha, add imagetyperz

1 files changed, 47 insertions, 71 deletions

diff --git a/module/plugins/hooks/BypassCaptcha.py b/module/plugins/hooks/BypassCaptcha.py
index c68f8a66b..24ad17dd8 100644
--- a/module/plugins/hooks/BypassCaptcha.py
+++ b/module/plugins/hooks/BypassCaptcha.py
@@ -13,23 +13,18 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-    @author: RaNaN
+    @author: RaNaN, Godofdream, zoidberg
 """
 
-import base64
-
-try:
-    from json import loads
-except ImportError:
-    from simplejson import loads
-
 from thread import start_new_thread
 from pycurl import FORM_FILE, LOW_SPEED_TIME
 
 from module.network.RequestFactory import getURL, getRequest
 from module.network.HTTPRequest import BadHeader
 
-from module.plugins.Addon import Addon
+from module.plugins.Hook import Hook
+
+PYLOAD_KEY = "4f771155b640970d5607f919a615bdefc67e7d32"
 
 class BypassCaptchaException(Exception):
     def __init__(self, err):
@@ -44,15 +39,15 @@ class BypassCaptchaException(Exception):
     def __repr__(self):
         return "<BypassCaptchaException %s>" % self.err
 
-class BypassCaptcha(Addon):
+class BypassCaptcha(Hook):
     __name__ = "BypassCaptcha"
-    __version__ = "0.02"
-    __description__ = """send captchas to bypasscaptcha.com"""
+    __version__ = "0.03"
+    __description__ = """send captchas to BypassCaptcha.com"""
     __config__ = [("activated", "bool", "Activated", True),
-                  ("key", "str", "Key", ""),
-                  ("force", "bool", "Force CT even if client is connected", False),]
-    __author_name__ = ("Godofdream")
-    __author_mail__ = ("soilfcition@gmail.com")
+                  ("force", "bool", "Force BC even if client is connected", False),
+                  ("passkey", "password", "Passkey", "")]
+    __author_name__ = ("RaNaN", "Godofdream", "zoidberg")
+    __author_mail__ = ("RaNaN@pyload.org", "soilfcition@gmail.com", "zoidberg@mujmail.cz")
 
     SUBMIT_URL = "http://bypasscaptcha.com/upload.php"
     RESPOND_URL = "http://bypasscaptcha.com/check_value.php"
@@ -62,76 +57,58 @@ class BypassCaptcha(Addon):
         self.info = {}
 
     def getCredits(self):
-        json = getURL(BypassCaptcha.GETCREDITS_URL % {"key": self.getConfig("key")})
-        response = loads(json)
-        if response[0] < 0:
-            raise BypassCaptchaException(response[1])
-        else:
-            self.logInfo(_("%s credits left") % response['Left'])
-            self.info["credits"] = response['Left']
-            return response['Left']
+        response = getURL(self.GETCREDITS_URL,
+                      post = {"key": self.getConfig("passkey")}
+                      )
+                                                                         
+        data = dict([x.split(' ',1) for x in response.splitlines()])
+        return int(data['Left'])
+        
 
     def submit(self, captcha, captchaType="file", match=None):
-        #if type(captcha) == str and captchaType == "file":
-        #    raise BypassCaptchaException("Invalid Type")
-        assert captchaType in ("file", "url-jpg", "url-jpeg", "url-png", "url-bmp")
-
-		self.logInfo(_("submitting %s, type %s") % (captcha, captchaType))
-
         req = getRequest()
 
         #raise timeout threshold
         req.c.setopt(LOW_SPEED_TIME, 80)
 
-		try:
-			img = Image.open(captcha)
-			self.logDebug("CAPTCHA IMAGE", img, img.format)
-			output = StringIO.StringIO()
-			img.save(output, "JPEG")
-			data = base64.b64encode(output.getvalue())
-			output.close()
-		except Exception, e:
-			raise BypassCaptchaException("Reading or converting captcha image failed: %s" % e)
-
         try:
-            json = req.load(BypassCaptcha.SUBMIT_URL, post={"key": self.getConfig("key"),
-                                                           "password": self.getConfig("passkey"),
-                                                           "file": data,
-                                                           "submit": "Submit",
-														   "gen_task_id": 1,
-														   "base64_code": 1})
+            response = req.load(self.SUBMIT_URL, 
+                            post={"vendor_key": PYLOAD_KEY,
+                                  "key": self.getConfig("passkey"),
+                                  "gen_task_id": "1",
+                                  "file": (FORM_FILE, captcha)},
+                            multipart=True)
         finally:
             req.close()
 
-        response = loads(json)
-        if response[0] < 0:
-            raise BypassCaptchaException(response[1])
-
-        ticket = response['TaskId']
-        result = response['Value']
+        data = dict([x.split(' ',1) for x in response.splitlines()])
+        if not data or "Value" not in data:
+            raise BypassCaptchaException(response)
+            
+        result = data['Value']
+        ticket = data['TaskId']
         self.logDebug("result %s : %s" % (ticket,result))
 
         return ticket, result
 
     def respond(self, ticket, success):
         try:
-            json = getURL(BypassCaptcha.RESPOND_URL, post={ "key": self.getConfig("key"),
-															"task_id": ticket,
-															"cv": 1 if success else 0,
-															"submit": "Submit" })
-
-            response = loads(json)
-            if response[0] < 0:
-                raise BypassCaptchaException(response[1])
-
+            response = getURL(self.RESPOND_URL, 
+                              post={"task_id": ticket,
+                                    "key": self.getConfig("passkey"),
+                                    "cv": 1 if success else 0}
+                              )
         except BadHeader, e:
-            self.logError(_("Could not send response."), str(e))
+            self.logError("Could not send response.", str(e))
 
     def newCaptchaTask(self, task):
+        if "service" in task.data:
+            return False
+        
         if not task.isTextual():
             return False
 
-        if not self.getConfig("key"):
+        if not self.getConfig("passkey"):
             return False
 
         if self.core.isClientConnected() and not self.getConfig("force"):
@@ -139,21 +116,20 @@ class BypassCaptcha(Addon):
 
         if self.getCredits() > 0:
             task.handler.append(self)
+            task.data['service'] = self.__name__
             task.setWaiting(100)
             start_new_thread(self.processCaptcha, (task,))
 
         else:
-            self.logInfo(_("Your BypassCaptcha Account has not enough credits"))
+            self.logInfo("Your %s account has not enough credits" % self.__name__)
 
     def captchaCorrect(self, task):
-        if "TaskId" in task.data:
-            ticket = task.data["TaskId"]
-            self.respond(ticket, True)
+        if task.data['service'] == self.__name__ and "ticket" in task.data:
+            self.respond(task.data["ticket"], True)
 
     def captchaInvalid(self, task):
-        if "TaskId" in task.data:
-            ticket = task.data["TaskId"]
-            self.respond(ticket, False)
+        if task.data['service'] == self.__name__ and "ticket" in task.data:
+            self.respond(task.data["ticket"], False)
 
     def processCaptcha(self, task):
         c = task.captchaFile
@@ -164,4 +140,4 @@ class BypassCaptcha(Addon):
             return
 
         task.data["ticket"] = ticket
-        task.setResult(result)
+        task.setResult(result)
\ No newline at end of file