Merge branch 'imgcaptcha' of https://github.com/asiekierka/Tinyboard

8 files changed, 238 insertions, 1 deletions

diff --git a/imgcaptcha_im.php b/imgcaptcha_im.php
new file mode 100644
index 00000000..152d92ad
--- /dev/null
+++ b/imgcaptcha_im.php
@@ -0,0 +1,7 @@
+<?php
+ require_once("inc/functions.php"); 
+ require_once("inc/imgcaptcha.php");
+ $t = $_GET["cr"];
+ header("Content-Type: image/png");
+ generateImage($t);
+?>
diff --git a/imgcaptcha_p.php b/imgcaptcha_p.php
new file mode 100644
index 00000000..9543dc6c
--- /dev/null
+++ b/imgcaptcha_p.php
@@ -0,0 +1,5 @@
+<?php
+ require_once("inc/functions.php");
+ require_once("inc/imgcaptcha.php");
+ print generateCaptchaHash();
+?>
diff --git a/inc/config.php b/inc/config.php
index f4951a40..c700d232 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -227,6 +227,8 @@
 		'embed',
 		'recaptcha_challenge_field',
 		'recaptcha_response_field',
+		'imgcaptcha_hash',
+		'imgcaptcha_verify',
 		'spoiler',
 		'quick-reply'
 	);
@@ -262,6 +264,19 @@
 	$config['recaptcha_public'] = '6LcXTcUSAAAAAKBxyFWIt2SO8jwx4W7wcSMRoN3f';
 	$config['recaptcha_private'] = '6LcXTcUSAAAAAOGVbVdhmEM1_SyRF4xTKe8jbzf_';
 	
+	$config['imgcaptcha'] = false;
+	$config['imgcaptcha_key'] = "cos losowego"; // max 32 znaki
+	$config['imgcaptcha_list'] = "/sciezka/do/pliku.txt";
+	$config['imgcaptcha_images'] = "/sciezka/do/obrazkow"; // without a slash at the end
+	$config['imgcaptcha_question'] = "Was ist das?";
+	$config['imgcaptcha_time_limit'] = 90; // Kapcza wazna przez 90 sekund po wejsciu
+	$config['imgcaptcha_filler'] = "/plik/kliknijmie.png";
+	$config['imgcaptcha_width'] = 128;
+	$config['imgcaptcha_height'] = 96;
+
+	// JESLI DODAJESZ IMGKAPCZE, NIE ZAPOMNIJ O TYM
+	// Wymagane tez jQuery - o tam, nizej.
+	//$config['additional_javascript'][] = 'js/imgcaptcha.js';
 /*
  * ====================
  *  Post settings
diff --git a/inc/ic-encrypt.php b/inc/ic-encrypt.php
new file mode 100644
index 00000000..5d73126b
--- /dev/null
+++ b/inc/ic-encrypt.php
@@ -0,0 +1,37 @@
+<?php
+// Z internetow.
+class Encryption {
+    public  function safe_b64encode($string) {
+        $data = base64_encode($string);
+        $data = str_replace(array('+','/','='),array('-','_',''),$data);
+        return $data;
+    }
+
+    public function safe_b64decode($string) {
+        $data = str_replace(array('-','_'),array('+','/'),$string);
+        $mod4 = strlen($data) % 4;
+        if ($mod4) {
+            $data .= substr('====', $mod4);
+        }
+        return base64_decode($data);
+    }
+
+    public  function encode($key, $value){ 
+        if(!$value){return false;}
+        $text = $value;
+        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+        $crypttext = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $text, MCRYPT_MODE_ECB, $iv);
+        return trim($this->safe_b64encode($crypttext)); 
+    }
+
+    public function decode($key, $value){
+        if(!$value){return false;}
+        $crypttext = $this->safe_b64decode($value); 
+        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+        $decrypttext = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, $crypttext, MCRYPT_MODE_ECB, $iv);
+        return trim($decrypttext);
+    }
+}
+?>
diff --git a/inc/imgcaptcha.php b/inc/imgcaptcha.php
new file mode 100644
index 00000000..ab6db68f
--- /dev/null
+++ b/inc/imgcaptcha.php
@@ -0,0 +1,136 @@
+<?php
+ // Wiem, ze ten kod to czysta ohyda. Coz.
+ require_once("inc/functions.php");
+ require_once("inc/ic-encrypt.php");
+
+ global $config;
+
+ function getImages() {
+  global $config;
+  $lines = explode("\n",file_get_contents($config["imgcaptcha_list"]));
+  for($i=0;$i<count($lines);$i++) { $lines[$i] = explode(",",$lines[$i]);  }
+  return $lines;
+ }
+ function getIPath($img) {
+  global $config;
+  return $config["imgcaptcha_images"] . "/" . $img;
+ }
+ function pickImage($lines) {
+  $src = FALSE;
+  while($src == FALSE) {
+   $pick = rand(0,count($lines)-1);
+   if($lines[$pick][0] != "") $src = imagecreatefrompng(getIPath($lines[$pick][0]));
+  }
+  imagedestroy($src);
+  return $pick;
+ }
+ function ncfix($a) {
+  if($a>255) { return 255; }
+  if($a<0) { return 0; }
+  return $a;
+ }
+ function randString($length, $charset='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+=')
+ {
+  $str = '';
+  $count = strlen($charset);
+  while ($length--) {
+   $str .= $charset[rand(0, $count-1)];
+  }
+  return $str;
+ }
+ function generateCaptchaHash() {
+  global $config;
+  $lines = getImages();
+  $pick = pickImage($lines);
+  $enctext = $pick . ",," . time() . ",," . $_SERVER["REMOTE_ADDR"] . ",," . randString(12);
+  $converter = new Encryption;
+  return $converter->encode($config["imgcaptcha_key"],$enctext);
+ }
+ function ic_verifyHash($enctext, $output) {
+  global $config;
+  //print "VERIFY: " . $enctext . " " . $output . "<br>";
+  $converter = new Encryption;
+  $dectext = explode(",,",$converter->decode($config["imgcaptcha_key"],$enctext));
+  if(count($dectext)<4) return true;
+  $lines = getImages();
+  $pick = $dectext[0];
+  $time = time()-$dectext[1];
+  if($time>$config["imgcaptcha_time_limit"]) return true;
+  $lp = $lines[$pick];
+  for($i=1;$i<count($lp);$i++) {
+   if(strcasecmp($lp[$i],$output)==0) return false;
+  }
+  return true;
+ }
+ function getPick($enctext)
+ {
+  global $config;
+  $converter = new Encryption;
+  $dectext = explode(",,",$converter->decode($config["imgcaptcha_key"],$enctext));
+  if(count($dectext)<=1) return; //SC
+  $lines = getImages();
+  return $dectext[0];
+ }
+ function generateImage($enctext)
+ {
+  global $config;
+  $lines = getImages();
+  $pick = getPick($enctext);
+  if(!isset($lines[$pick])) return; //SC
+  $src = imagecreatefrompng(getIPath($lines[$pick][0]));
+  if($src == FALSE) return; //SC
+  $maxc = 8;
+  $icw = $config["imgcaptcha_width"];
+  $ich = $config["imgcaptcha_height"];
+  $dst = imagecreatetruecolor($icw,$ich);
+  $srcxm = imagesx($src)-$icw;
+  $srcym = imagesy($src)-$ich;
+  $srcx = rand(0,$srcxm-1);
+  $srcy = rand(0,$srcym-1);
+  imagecopy($dst,$src,0,0,$srcx,$srcy,$icw,$ich);
+
+  // Obfuscation step 1
+  imagecopymergegray($dst,$dst,0,0,0,0,$icw,$ich,rand(20,45));
+  // Obfuscation step 1.5
+  for($i=0;$i<8;$i++) {
+   $w = rand(5,10); $h = rand(5,10);
+   $x = rand(0,$icw-1-$w); $y = rand(0,$ich-1-$h);
+   $x2 = rand(0,$icw-1); $y2 = rand(0,$ich-1);
+   imagefilledrectangle($dst,$x,$y,$x+$w,$y+$h,imagecolorat($dst,$x2,$y2));
+  }
+  for($i=0;$i<5;$i++) {
+   $w = rand(20,40); $h = rand(20,40);
+   $x = rand(0,$icw-1-$w); $y = rand(0,$ich-1-$h);
+   imagecopymergegray($dst,$dst,$x,$y,$x,$y,$w,$h,0);
+  }
+  // Obfuscation step 2
+  for($i=0;$i<$icw*$ich;$i++) {
+   $x = $i%$icw; $y = $i/$icw;
+   $c = imagecolorat($dst,$x,$y);
+   if(rand(0,4) == 2) { $nc = $c ^ rand(0,16777215); }
+   else { $nc = imagecolorat($dst,rand(0,$icw-1),rand(0,$ich-1)); }
+   if(rand(18,24)!=21 and $c != 0 and $c != 0xFF00FF)
+   {
+    $nc = ncfix(($c&0xFF) + rand(-16,16)) | ncfix((($c>>8)&0xFF) + rand(-8,8))<<8 | ncfix((($c>>16)&0xFF) + rand(-32,32))<<16;
+    $nc1 = $nc&0xFF ^ ($nc>>8)&0xFF ^ ($nc>>16)&0xFF;
+   } else {
+    $nc1 = $nc&0xFF;
+    if($nc1>($maxc*25)) $nc1 = $nc % ($maxc*25);
+   }
+   $nc2 = $nc1 | $nc1<<8 | $nc1<<16;
+   if(rand(0,1)==0) $nc2=$nc;
+   imagesetpixel($dst,$x,$y,$nc2);
+  }
+  // Obfuscation step 3
+  for($i=0;$i<rand(10,30);$i++) {
+   $x1 = rand(0,$icw-1); $x2 = rand(0,$icw-1); $y1 = rand(0,$ich-1); $y2 = rand(0,$ich-1);
+   $color = imagecolorallocate($dst, rand(0,$maxc)*25, rand(0,$maxc)*25, rand(0,$maxc)*25);
+   imageline($dst,$x1,$y1,$x2,$y2,$color);
+  }
+
+  imagepng($dst);
+ }
+ //header('Content-Type: image/png');
+ //$t = generateCaptchaHash();
+ //generateImage($t);
+?>
diff --git a/js/imgcaptcha.js b/js/imgcaptcha.js
new file mode 100644
index 00000000..8d3ed95c
--- /dev/null
+++ b/js/imgcaptcha.js
@@ -0,0 +1,16 @@
+//function obecnyCzas() {
+// return Math.round(new Date().getTime() / 1000);
+//}
+
+function ic_odswiezKapcze() {
+ $.get("/imgcaptcha_p.php", function(data) {
+  $("#imgcaptcha_hash").val(data);
+  $("#imgcaptcha_img").prop("src","/imgcaptcha_im.php?cr=" + data);
+ });
+}
+//function resetujKapcze() {
+// $("#imgcaptcha_img").prop("src","/zakrytek.png");
+//}
+//$(document).ready(function(){
+// //resetujKapcze(); - to nie powinno byc na razie potrzebne
+//});
diff --git a/post.php b/post.php
index 16566b51..f21b6164 100644
--- a/post.php
+++ b/post.php
@@ -6,6 +6,7 @@
 
 require 'inc/functions.php';
 require 'inc/anti-bot.php';
+require 'inc/imgcaptcha.php';
 
 // Fix for magic quotes
 if (get_magic_quotes_gpc()) {
@@ -192,7 +193,12 @@ if (isset($_POST['delete'])) {
 			error($config['error']['captcha']);
 		}
 	}
-	
+	if ($config['imgcaptcha']) {
+		if (!isset($_POST['imgcaptcha_verify']) || !isset($_POST['imgcaptcha_hash']))
+			error($config['error']['bot']);
+		if (ic_verifyHash($_POST['imgcaptcha_hash'],$_POST['imgcaptcha_verify']))
+			error($config['error']['captcha']);
+	}
 	if ($post['mod'] = isset($_POST['mod']) && $_POST['mod']) {
 		require 'inc/mod.php';
 		if (!$mod) {
diff --git a/templates/post_form.html b/templates/post_form.html
index 8b7350c7..30bf9224 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -58,6 +58,21 @@
 			</td>
 		</tr>
 		{% endif %}
+		{% if config.imgcaptcha %}
+		<tr>
+			<th>
+				{% trans %}Verification{% endtrans %}
+				{{ antibot.html() }}
+			</th>
+			<td>
+				<input type="hidden" name="imgcaptcha_hash" id="imgcaptcha_hash" value="kucaj stad, kucu hakierze">
+				<img src="{{ config.imgcaptcha_filler }}" width="{{ config.imgcaptcha_width }}px" height="{{ config.imgcaptcha_height }}px" id="imgcaptcha_img"></img><br>
+				{{ config.imgcaptcha_question }} <input type="text" name="imgcaptcha_verify" id="imgcaptcha_verify" value=""></input><br>
+				<a href="javascript:ic_odswiezKapcze()">Odswiez</a>
+				{{ antibot.html() }}
+			</td>
+		</tr>
+		{% endif %}
 		<tr>
 			<th>
 				{% trans %}File{% endtrans %}