forked from savetheinternet/Tinyboard
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
second iteration of nntpchan implementation
- Loading branch information
Showing
4 changed files
with
231 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| <?php | ||
| /* | ||
| * Copyright (c) 2016 vichan-devel | ||
| */ | ||
|
|
||
| defined('TINYBOARD') or exit; | ||
|
|
||
| function gen_msgid($board, $id) { | ||
| global $config; | ||
|
|
||
| $b = preg_replace("/[^0-9a-zA-Z$]/", 'x', $board); | ||
| $salt = sha1($board . "|" . $id . "|" . $config['nntpchan']['salt']); | ||
| $salt = substr($salt, 0, 7); | ||
| $salt = base_convert($salt, 16, 36); | ||
|
|
||
| return "<$b.$id.$salt@".$config['nntpchan']['domain'].">"; | ||
| } | ||
|
|
||
|
|
||
| function gen_nntp($headers, $files) { | ||
| if (count($files) == 0) { | ||
| } | ||
| else if (count($files) == 1 && $files[0]['type'] == 'text/plain') { | ||
| $content = $files[0]['text'] . "\r\n"; | ||
| $headers['Content-Type'] = "text/plain; charset=UTF-8"; | ||
| } | ||
| else { | ||
| $boundary = sha1($headers['Message-Id']); | ||
| $content = ""; | ||
| $headers['Content-Type'] = "multipart/mixed; boundary=$boundary"; | ||
| foreach ($files as $file) { | ||
| $content .= "--$boundary\r\n"; | ||
| if (isset($file['name'])) { | ||
| $file['name'] = preg_replace('/[\r\n\0"]/', '', $file['name']); | ||
| $content .= "Content-Disposition: form-data; filename=\"$file[name]\"; name=\"attachment\"\r\n"; | ||
| } | ||
| $type = explode('/', $file['type'])[0]; | ||
| if ($type == 'text') { | ||
| $file['type'] .= '; charset=UTF-8'; | ||
| } | ||
| $content .= "Content-Type: $file[type]\r\n"; | ||
| if ($type != 'text' && $type != 'message') { | ||
| $file['text'] = base64_encode($file['text']); | ||
| $content .= "Content-Transfer-Encoding: base64\r\n"; | ||
| } | ||
| $content .= "\r\n"; | ||
| $content .= $file['text']; | ||
| $content .= "\r\n"; | ||
| } | ||
| $content .= "--$boundary--\r\n"; | ||
|
|
||
| $headers['Mime-Version'] = '1.0'; | ||
| } | ||
| //$headers['Content-Length'] = strlen($content); | ||
| $headers['Date'] = date('r', $headers['Date']); | ||
| $out = ""; | ||
| foreach ($headers as $id => $val) { | ||
| $val = str_replace("\n", "\n\t", $val); | ||
| $out .= "$id: $val\r\n"; | ||
| } | ||
| $out .= "\r\n"; | ||
| $out .= $content; | ||
| return $out; | ||
| } | ||
|
|
||
| function nntp_publish($msg, $id) { | ||
| $s = fsockopen("tcp://localhost:1119"); | ||
| fgets($s); | ||
| fputs($s, "MODE STREAM\r\n"); | ||
| fgets($s); | ||
| fputs($s, "TAKETHIS $id\r\n"); | ||
| fputs($s, $msg); | ||
| fputs($s, "\r\n.\r\n"); | ||
| fgets($s); | ||
| fclose($s); | ||
| } | ||
|
|
||
| function post2nntp($post, $msgid) { | ||
| global $config; | ||
|
|
||
| $headers = array(); | ||
| $files = array(); | ||
|
|
||
| $headers['Message-Id'] = $msgid; | ||
| $headers['Newsgroups'] = $config['nntpchan']['group']; | ||
| $headers['Date'] = time(); | ||
| $headers['Subject'] = $post['subject'] ? $post['subject'] : "None"; | ||
| $headers['From'] = $post['name'] . " <poster@" . $config['nntpchan']['domain'] . ">"; | ||
|
|
||
| if ($post['email'] == 'sage') { | ||
| $headers['X-Sage'] = true; | ||
| } | ||
|
|
||
| if (!$post['op']) { | ||
| // Get muh parent | ||
| $query = prepare("SELECT `message_id` FROM ``nntp_references`` WHERE `board` = :board AND `id` = :id"); | ||
| $query->bindValue(':board', $post['board']); | ||
| $query->bindValue(':id', $post['thread']); | ||
| $query->execute() or error(db_error($query)); | ||
|
|
||
| if ($result = $query->fetch(PDO::FETCH_ASSOC)) { | ||
| $headers['References'] = $result['message_id']; | ||
| } | ||
| else { | ||
| return false; // We don't have OP. Discarding. | ||
| } | ||
| } | ||
|
|
||
| // Let's parse the body a bit. | ||
| $body = trim($post['body_nomarkup']); | ||
| $body = preg_replace('/\r?\n/', "\r\n", $body); | ||
| $body = preg_replace_callback('@>>(>/([a-zA-Z0-9_+-]+)/)?([0-9]+)@', function($o) use ($post) { | ||
| if ($o[1]) { | ||
| $board = $o[2]; | ||
| } | ||
| else { | ||
| $board = $post['board']; | ||
| } | ||
| $id = $o[3]; | ||
|
|
||
| $query = prepare("SELECT `message_id_digest` FROM ``nntp_references`` WHERE `board` = :board AND `id` = :id"); | ||
| $query->bindValue(':board', $board); | ||
| $query->bindValue(':id', $id); | ||
| $query->execute() or error(db_error($query)); | ||
|
|
||
| if ($result = $query->fetch(PDO::FETCH_ASSOC)) { | ||
| return ">>".substr($result['message_id_digest'], 0, 16); | ||
| } | ||
| else { | ||
| return $o[0]; // Should send URL imo | ||
| } | ||
| }, $body); | ||
| $body = preg_replace('/>>>>([0-9a-fA-F])+/', '>>\1', $body); | ||
|
|
||
|
|
||
| $files[] = array('type' => 'text/plain', 'text' => $body); | ||
|
|
||
| foreach ($post['files'] as $id => $file) { | ||
| $fc = array(); | ||
|
|
||
| $fc['type'] = $file['type']; | ||
| $fc['text'] = file_get_contents($file['file_path']); | ||
| $fc['name'] = $file['name']; | ||
|
|
||
| $files[] = $fc; | ||
| } | ||
|
|
||
| return array($headers, $files); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?php | ||
| define('TINYBOARD', 'fuck yeah'); | ||
| require_once('nntpchan.php'); | ||
|
|
||
|
|
||
| die(); | ||
|
|
||
| $time = time(); | ||
| echo "\n@@@@ Thread:\n"; | ||
| echo $m0 = gennntp(["From" => "czaks <marcin@6irc.net>", "Message-Id" => "<1234.0000.".$time."@example.vichan.net>", "Newsgroups" => "overchan.test", "Date" => time(), "Subject" => "None"], | ||
| [['type' => 'text/plain', 'text' => "THIS IS A NEW TEST THREAD"]]); | ||
| echo "\n@@@@ Single msg:\n"; | ||
| echo $m1 = gennntp(["From" => "czaks <marcin@6irc.net>", "Message-Id" => "<1234.1234.".$time."@example.vichan.net>", "Newsgroups" => "overchan.test", "Date" => time(), "Subject" => "None", "References" => "<1234.0000.".$time."@example.vichan.net>"], | ||
| [['type' => 'text/plain', 'text' => "hello world, with no image :("]]); | ||
| echo "\n@@@@ Single msg and pseudoimage:\n"; | ||
| echo $m2 = gennntp(["From" => "czaks <marcin@6irc.net>", "Message-Id" => "<1234.2137.".$time."@example.vichan.net>", "Newsgroups" => "overchan.test", "Date" => time(), "Subject" => "None", "References" => "<1234.0000.".$time."@example.vichan.net>"], | ||
| [['type' => 'text/plain', 'text' => "hello world, now with an image!"], | ||
| ['type' => 'image/gif', 'text' => base64_decode("R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="), 'name' => "urgif.gif"]]); | ||
| echo "\n@@@@ Single msg and two pseudoimages:\n"; | ||
| echo $m3 = gennntp(["From" => "czaks <marcin@6irc.net>", "Message-Id" => "<1234.1488.".$time."@example.vichan.net>", "Newsgroups" => "overchan.test", "Date" => time(), "Subject" => "None", "References" => "<1234.0000.".$time."@example.vichan.net>"], | ||
| [['type' => 'text/plain', 'text' => "hello world, now WITH TWO IMAGES!!!"], | ||
| ['type' => 'image/gif', 'text' => base64_decode("R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="), 'name' => "urgif.gif"], | ||
| ['type' => 'image/gif', 'text' => base64_decode("R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="), 'name' => "urgif2.gif"]]); | ||
| shoveitup($m0, "<1234.0000.".$time."@example.vichan.net>"); | ||
| sleep(1); | ||
| shoveitup($m1, "<1234.1234.".$time."@example.vichan.net>"); | ||
| sleep(1); | ||
| shoveitup($m2, "<1234.2137.".$time."@example.vichan.net>"); | ||
| shoveitup($m3, "<1234.1488.".$time."@example.vichan.net>"); | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters