mailer daemon start

darcs-hash:20080717132533-84dde-4ada5d4a103d92b9767726e723b26246205b9cbd.gz

diff --git a/classes/User.php b/classes/User.php
index bf13e1e34c170e2c4447b739090d2294081bc42c..8600bae7a2370e43c9cb61958abea79cfa211862 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -34,6 +34,7 @@ class User extends DB_DataObject
     public $nickname;                        // varchar(64)  unique_key
     public $password;                        // varchar(255)  
     public $email;                           // varchar(255)  unique_key
+    public $incomingemail;                   // varchar(255)  unique_key
     public $emailnotifysub;                  // tinyint(1)   default_1
     public $jabber;                          // varchar(255)  unique_key
     public $jabbernotify;                    // tinyint(1)  

diff --git a/classes/stoica.ini b/classes/stoica.ini
index 295ae9b4f2d0c853c11d52cdda15ca27c222ecb2..bee53f86308985eabbf1a83cf09433831ee50643 100644 (file)
--- a/classes/stoica.ini
+++ b/classes/stoica.ini
@@ -157,6 +157,7 @@ id = 129
 nickname = 2
 password = 2
 email = 2
+incomingemail = 2
 emailnotifysub = 17
 jabber = 2
 jabbernotify = 17
@@ -173,6 +174,7 @@ modified = 384
 id = K
 nickname = U
 email = U
+incomingemail = U
 jabber = U
 sms = U
 uri = U

diff --git a/db/laconica.sql b/db/laconica.sql
index bb9f16459bf3c81caf2d004d0c66c0ef4908e8f6..cf3c51251c130c0ceb71587b4500f1cfb5cfdc00 100644 (file)
--- a/db/laconica.sql
+++ b/db/laconica.sql
@@ -45,6 +45,7 @@ create table user (
     nickname varchar(64) unique key comment 'nickname or username, duped in profile',
     password varchar(255) comment 'salted password, can be null for OpenID users',
     email varchar(255) unique key comment 'email address for password recovery etc.',
+    incomingemail varchar(255) unique key comment 'email address for post-by-email',
     emailnotifysub tinyint default 1 comment 'Notify by email of subscriptions',
     jabber varchar(255) unique key comment 'jabber ID for notices',
     jabbernotify tinyint default 0 comment 'whether to send notices to jabber',

diff --git a/maildaemon.php b/maildaemon.php
new file mode 100755 (executable)
index 0000000..cd62875
--- /dev/null
+++ b/maildaemon.php
@@ -0,0 +1,155 @@
+#!/usr/bin/env php
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+# Abort if called from a web server
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+       print "This script must be run from the command line\n";
+       exit();
+}
+
+define('INSTALLDIR', dirname(__FILE__));
+define('LACONICA', true);
+
+require_once(INSTALLDIR . '/lib/common.php');
+require_once(INSTALLDIR . '/lib/mail.php');
+require_once('Mail/mimeDecode.php');
+
+class MailerDaemon {
+       
+       function __construct() {
+       }
+       
+       function save_message($fname='php://stdin') {
+               list($from, $to, $msg) = $this->parse_message($fname);
+               if (!$from || !$to || !$msg) {
+                       $this->error(NULL, _t('Could not parse message.'));
+               }
+               $user = User::staticGet('email', common_canonical_email($from));
+               if (!$user) {
+                       $this->error($from, _('Not a registered user.'));
+                       return false;
+               }
+               if ($user->incomingemail != common_canonical_email($to)) {
+                       $this->error($from, _('Sorry, that is not your incoming email address.'));
+               }
+               $response = $this->handle_command($user, $msg);
+               if ($response) {
+                       $this->respond($from, $to, $response);
+               }
+               $this->add_notice($user, $msg);
+       }
+
+       function error($from, $msg) {
+               file_put_contents("php://stderr", $msg);
+               exit(1);
+       }
+
+       function respond($from, $to, $response) {
+
+               $headers['From'] = $to;
+               $headers['To'] = $from;
+               $headers['Subject'] = "Command complete";
+
+               return mail_send(array($from), $headers, $response);
+       }
+       
+       function log($level, $msg) {
+               common_log($level, 'MailDaemon: '.$msg);
+       }
+       
+       function add_notice($user, $msg) {
+               $notice = new Notice();
+               $notice->profile_id = $user->id;
+               $notice->content = trim(substr($msg, 0, 140));
+               $notice->rendered = common_render_content($notice->content, $notice);
+               $notice->created = DB_DataObject_Cast::dateTime();
+               $notice->query('BEGIN');
+               $id = $notice->insert();
+               if (!$id) {
+                       $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
+                       $this->log(LOG_ERROR,
+                                          'Could not insert ' . common_log_objstring($notice) .
+                                          ' for user ' . common_log_objstring($user) .
+                                          ': ' . $last_error->message);
+                       return;
+               }
+               $orig = clone($notice);
+               $notice->uri = common_notice_uri($notice);
+               $result = $notice->update($orig);
+               if (!$result) {
+                       $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
+                       $this->log(LOG_ERROR,
+                                          'Could not add URI to ' . common_log_objstring($notice) .
+                                          ' for user ' . common_log_objstring($user) .
+                                          ': ' . $last_error->message);
+                       return;
+               }
+               $notice->query('COMMIT');
+        common_save_replies($notice);  
+               common_real_broadcast($notice);
+               $this->log(LOG_INFO,
+                                  'Added notice ' . $notice->id . ' from user ' . $user->nickname);
+       }
+       
+       function parse_message($fname) {
+               $contents = file_get_contents($fname);
+               $parsed = Mail_mimeDecode::decode(array('input' => $contents,
+                                                                                               'include_bodies' => true,
+                                                                                               'decode_headers' => true,
+                                                                                               'decode_bodies' => true));
+               if (!$parsed) {
+                       return NULL;
+               }
+               $from = $parsed->headers['from'];
+               $to = $parsed->headers['to'];
+               
+               switch ($parsed->ctype_primary) {
+                case 'multitype':
+                       # try and find a text/plain in the mix
+                       foreach ($parsed->parts as $part) {
+                               if ($part->ctype_primary == 'text' &&
+                                       $part->ctype_secondary == 'plain') {
+                                       $msg = $part->body;
+                                       break;
+                               }
+                       }
+                       break;
+                case 'text':
+                       switch ($parsed->ctype_secondary) {
+                        case 'plain':
+                               $msg = $parsed->body;
+                               break;
+                        default:
+                               $this->unsupported_type();
+                       }
+                default:
+                       $this->unsupported_type();
+               }
+               
+               return array($from, $to, $msg);
+       }
+       
+       function unsupported_type() {
+               $this->error("Unsupported message type");
+       }
+}
+
+$md = new MailerDaemon();
+$md->handle_message('php://stdin');
\ No newline at end of file