@@ -12,18 +12,22 @@ clean:

 kakumei: kakumei.o loglib.o parselib.o sbuf.o \

 		socklib.o webkernel.o gen_res.o \

 		kakumei_session.o kakumei_pass.o \

-		kakumei_posts.o kakumei_config.o

+		kakumei_posts.o kakumei_config.o \

+		kakumei_email.o

 	$(CC) $(LDFLAGS_KAKUMEI) kakumei.o loglib.o parselib.o sbuf.o \

 		socklib.o webkernel.o gen_res.o \

 		kakumei_session.o kakumei_pass.o \

 		kakumei_posts.o kakumei_config.o \

+		kakumei_email.o \

 		-o kakumei

 kakumei.o: kakumei.c ../src/gen_res.c

 ../src/gen_res.c: ../res/index.html  ../res/script.js ../res/style.css \

 		  ../res/newuser.html ../res/newuser.js ../res/newuser.css \

-		  ../res/posts.html ../res/posts.js ../res/posts.css

+		  ../res/posts.html ../res/posts.js ../res/posts.css \

+		  ../res/newpost.html ../res/newpost.js ../res/newpost.css \

+		  ../res/account.html ../res/account.js ../res/account.css

 	( cd ../res && ./gen.sh )

 gen_res.o: ../src/gen_res.c

@@ -24,6 +24,7 @@

 #include "kakumei_session.h"

 #include "kakumei_pass.h"

 #include "kakumei_posts.h"

+#include "kakumei_email.h"

 #include "kakumei_config.h"

 #define CONFIGFILE "kakumei.conf"

@@ -50,6 +51,8 @@ wk_action http_lastpost(wk *web, int connid, wk_uri *uri, void *userptr,char *us

 wk_action http_getpost(wk *web, int connid, wk_uri *uri, void *userptr,char *user);

 wk_action http_newpost(wk *web, int connid, wk_uri *uri, void *userptr,char *user);

 wk_action http_newcomment(wk *web, int connid, wk_uri *uri, void *userptr,char *user);

+wk_action http_changeemail(wk *web, int connid, wk_uri *uri, void *userptr,char *user);

+wk_action http_getemail(wk *web, int connid, wk_uri *uri, void *userptr,char *user);

 int

 main(int argc, char *argv[])

@@ -113,8 +116,8 @@ main(int argc, char *argv[])

         log_write("INIT","Server initialized, waiting connections...");

         while(!sigint_flag) {

                 sselect_wait(ka->ssel,timeout);

-		if(sigint_flag)

-			break;

+                if(sigint_flag)

+                        break;

                 wk_service(ka->web);

         }

         wk_free(ka->web),ka->web=NULL;

@@ -322,6 +325,10 @@ callback_http(wk *web, int connid, wk_uri *uri, void *userptr)

                         return(http_newpost(web,connid,uri,userptr,user));

                 else if(memcmp(uri->path,"/newcomment?",12)==0)

                         return(http_newcomment(web,connid,uri,userptr,user));

+                else if(memcmp(uri->path,"/changeemail?",13)==0)

+                        return(http_changeemail(web,connid,uri,userptr,user));

+                else if(memcmp(uri->path,"/getemail?",10)==0)

+                        return(http_getemail(web,connid,uri,userptr,user));

         }

         /* not found */

         log_write("HTTP","URI not found: %s",uri->path);

@@ -457,7 +464,6 @@ http_lastpost(wk *web, int connid, wk_uri *uri, void *userptr,char *user)

         wk_serve_buffer_as_file(web,connid,reply,strlen(reply),"text/plain");

         log_write("LSTP","Reply: %s",reply);

         return(wkact_finished);

-

 }

 wk_action

@@ -496,6 +502,7 @@ http_newpost(wk *web, int connid, wk_uri *uri, void *userptr,char *user)

                 log_write("NEWP","invalid post, send error");

                 return(wkact_finished);

         }

+        email_notify(ka,user,-1);

         log_write("NEWP","Replying with last post");

         return(http_lastpost(web,connid,uri,userptr,user));

 }

@@ -519,6 +526,41 @@ http_newcomment(wk *web, int connid, wk_uri *uri, void *userptr,char *user)

         }

         wk_serve_buffer_as_file(web,connid,n,strlen(n),"text/plain");

         log_write("NEWC","Reply: %s",n);

+        email_notify(ka,user,num);

+        return(wkact_finished);

+}

+

+wk_action

+http_changeemail(wk *web, int connid, wk_uri *uri, void *userptr,char *user)

+{

+        char useremail[128];

+        kakumei *ka=(kakumei *)userptr;

+        if(wk_uri_copyvar(uri,"a",useremail,sizeof(useremail))==NULL)

+                useremail[0]='\0';

+        if(email_set(ka,user,useremail)!=0) {

+                wk_serve_error(web,connid,wkerr_internal);

+                log_write("EMCH","couldn't change email, send error");

+                return(wkact_finished);

+        }

+        /* valid */

+        wk_serve_buffer_as_file(web,connid,useremail,strlen(useremail),"text/plain");

+        log_write("EMCH","Reply: %s",useremail);

+        return(wkact_finished);

+}

+

+wk_action

+http_getemail(wk *web, int connid, wk_uri *uri, void *userptr,char *user)

+{

+        char useremail[128];

+        kakumei *ka=(kakumei *)userptr;

+        if(email_get(ka,user,useremail,sizeof(useremail))!=0) {

+                wk_serve_error(web,connid,wkerr_internal);

+                log_write("EMGT","no user email, send error");

+                return(wkact_finished);

+        }

+        /* valid */

+        wk_serve_buffer_as_file(web,connid,useremail,strlen(useremail),"text/plain");

+        log_write("EMGT","Reply: %s",useremail);

         return(wkact_finished);

 }

@@ -6,7 +6,7 @@

  * Header file

  *

  * Author: Dario Rodriguez dario@softhome.net

- * This progran is licensed under the terms of the Affero GPL v1+

+ * This program is licensed under the terms of the Affero GPL v1+

  */

 #ifndef KAKUMEI_H

@@ -19,6 +19,13 @@

 #include "kakumei_config.h"

 #define MAXLINESIZE 2048

+#define LINESBLOCK 32

+

+typedef enum esection {

+        section_none=0,

+        section_general,

+        section_mail

+} esection;

 kaconfig *

 kaconfig_init(char *configfile)

@@ -28,7 +35,7 @@ kaconfig_init(char *configfile)

         char line[MAXLINESIZE];

         int len;

         char *ptr,*sep,*value;

-        int generalsection;

+        esection section;

         int lineno;

         char **configvalue;

         if((f=fopen(configfile,"r"))==NULL)

@@ -38,15 +45,22 @@ kaconfig_init(char *configfile)

                 return(NULL);

         }

         memset(config,0,sizeof(kaconfig));

-        generalsection=0;

+        section=section_none;

         lineno=0;

         while(fgets(line,sizeof(line),f)!=NULL) {

                 lineno++;

                 line[sizeof(line)-1]='\0';

                 /* trim line */

+                for(ptr=line;*ptr!='\0' && strchr("\t ",*ptr)!=NULL;ptr++)

+                        ;

                 len=strlen(line);

-                while(len>1 && strchr("\n\t ",line[len-1])!=NULL)

-                        line[len-1]='\0',len--;

+                if(!(section==section_mail && memcmp(ptr,"line.",5)==0)) {

+                        while(len>0 && strchr("\n\t ",line[len-1])!=NULL)

+                                line[len-1]='\0',len--;

+                } else {

+                        while(len>0 && line[len-1]=='\n')

+                                line[len-1]='\0',len--;

+                }

                 for(ptr=line;*ptr!='\0' && strchr("\t ",*ptr)!=NULL;ptr++)

                         ;

                 len=strlen(ptr);

@@ -56,11 +70,13 @@ kaconfig_init(char *configfile)

                 /* parse line */

                 if(*ptr=='[' && ptr[len-1]==']') {

                         /* section */

-                        if(strcmp(ptr,"[general]")==0)

-                                generalsection=1;

-                        else {

+                        if(strcmp(ptr,"[general]")==0) {

+                                section=section_general;

+                        } else if(strcmp(ptr,"[mail]")==0) {

+                                section=section_mail;

+                        } else {

                                 log_write("CONF","%s:%i: unknown section name \"%s\"\n",configfile,lineno,ptr);

-                                generalsection=0;

+                                section=section_none;

                         }

                         continue;

                 } else if((sep=strchr(ptr,'='))!=NULL) {

@@ -71,38 +87,77 @@ kaconfig_init(char *configfile)

                                 sep--;

                                 *sep='\0';

                         }

-                        /* trim value */

-                        while(*value!='\0' && strchr(" \t",*value)!=NULL)

-                                value++;

+                        if(!(section==section_mail && memcmp(ptr,"line.",5)==0)) {

+                                /* trim value */

+                                while(*value!='\0' && strchr(" \t",*value)!=NULL)

+                                        value++;

+                        }

                         /* sanity check */

                         if(*value=='\0') {

-                                log_write("CONF","%s:%i: ignoring key without value; key:\"%s\"\n",configfile,lineno,ptr);

+                                if(!(section==section_mail && memcmp(ptr,"line.",5)==0))

+                                        log_write("CONF","%s:%i: ignoring key without value; key:\"%s\"\n",configfile,lineno,ptr);

                                 continue;

                         }

                         /* assign value */

-                        if(generalsection!=1) {

+                        if(section==section_none) {

                                 log_write("CONF","%s:%i: ignoring key-value pair in unknown section; key:\"%s\"\n",configfile,lineno,ptr);

                                 continue;

                         }

                         /* identify key-value pair */

-                        if(strcmp(ptr,"logfile")==0) {

-                                configvalue=&(config->logfile);

-                        } else if(strcmp(ptr,"cookiename")==0) {

-                                configvalue=&(config->cookiename);

-                        } else if(strcmp(ptr,"cookiedomain")==0) {

-                                configvalue=&(config->cookiedomain);

-                        } else if(strcmp(ptr,"bannerpath")==0) {

-                                configvalue=&(config->bannerpath);

-                        } else if(strcmp(ptr,"sslproxy")==0) {

-				if(strcmp(value,"true")==0 || strcmp(value,"1")==0 || strcmp(value,"yes")==0)

-					config->sslproxy=1;

-				else

-					config->sslproxy=0;

-				continue;

-                        } else {

-                                log_write("CONF","%s:%i: unknown key, ignoring key-value pair; key:\"%s\"\n",configfile,lineno,ptr);

+                        if(section==section_general) {

+                                if(strcmp(ptr,"logfile")==0) {

+                                        configvalue=&(config->logfile);

+                                } else if(strcmp(ptr,"cookiename")==0) {

+                                        configvalue=&(config->cookiename);

+                                } else if(strcmp(ptr,"cookiedomain")==0) {

+                                        configvalue=&(config->cookiedomain);

+                                } else if(strcmp(ptr,"bannerpath")==0) {

+                                        configvalue=&(config->bannerpath);

+                                } else if(strcmp(ptr,"sslproxy")==0) {

+                                        if(strcmp(value,"true")==0 || strcmp(value,"1")==0 || strcmp(value,"yes")==0)

+                                                config->sslproxy=1;

+                                        else

+                                                config->sslproxy=0;

+                                        continue;

+                                } else {

+                                        log_write("CONF","%s:%i: unknown key, ignoring key-value pair; key:\"%s\"\n",configfile,lineno,ptr);

+                                        continue;

+                                }

+                        } else if(section==section_mail) {

+                                if(strcmp(ptr,"from")==0) {

+                                        configvalue=&(config->from);

+                                } else if(strcmp(ptr,"subjpost")==0) {

+                                        configvalue=&(config->subjpost);

+                                } else if(strcmp(ptr,"subjcomment")==0) {

+                                        configvalue=&(config->subjcomment);

+                                } else if(memcmp(ptr,"line.",5)==0) {

+                                        int lineno=atoi(ptr+5);

+                                        if(lineno<0)

+                                                lineno=0;

+                                        if(lineno>=config->sizelines) {

+                                                char **lines;

+                                                int minsize;

+                                                minsize=(lineno+LINESBLOCK)/LINESBLOCK;

+                                                minsize*=LINESBLOCK;

+                                                if((lines=realloc(config->lines,minsize*sizeof(char *)))==NULL) {

+                                                        fclose(f),f=NULL;

+                                                        kaconfig_free(config),config=NULL;

+                                                        return(NULL); /* insufficient memory */

+                                                }

+                                                config->lines=lines;

+                                                memset(lines+config->sizelines,0,sizeof(char *)*(minsize-config->sizelines));

+                                                config->sizelines=minsize;

+                                        }

+                                        configvalue=config->lines+lineno;

+                                        if(config->usedlines<=lineno)

+                                                config->usedlines=lineno+1;

+                                } else {

+                                        log_write("CONF","%s:%i: unknown key, ignoring key-value pair; key:\"%s\"\n",configfile,lineno,ptr);

+                                        continue;

+                                }

+

+                        } else

                                 continue;

-                        }

                         /* store value */

                         if(*configvalue!=NULL) {

                                 log_write("CONF","%s:%i: duplicate key, ignoring key-value pair; key:\"%s\"\n",configfile,lineno,ptr);

@@ -137,6 +192,22 @@ kaconfig_free(kaconfig *config)

                 free(config->cookiedomain),config->cookiedomain=NULL;

         if(config->bannerpath!=NULL)

                 free(config->bannerpath),config->bannerpath=NULL;

+        if(config->from!=NULL)

+                free(config->from),config->from=NULL;

+        if(config->subjpost!=NULL)

+                free(config->subjpost),config->subjpost=NULL;

+        if(config->subjcomment!=NULL)

+                free(config->subjcomment),config->subjcomment=NULL;

+        if(config->lines!=NULL) {

+                int i;

+                for(i=0;i<config->usedlines;i++) {

+                        if(config->lines[i]!=NULL)

+                                free(config->lines[i]),config->lines[i]=NULL;

+                }

+                config->sizelines=0;

+                config->usedlines=0;

+                free(config->lines),config->lines=NULL;

+        }

         free(config),config=NULL;

         return;

 }

@@ -163,6 +234,7 @@ kaconfig_write(char *configfile,char *logfile, char *cookiename,char *cookiedoma

         fprintf(f,"cookiedomain=%s\n",(cookiedomain!=NULL)?cookiedomain:"localhost");

         fprintf(f,"bannerpath=%s\n",(bannerpath!=NULL)?bannerpath:"default.png");

         fprintf(f,"sslproxy=%s\n",(sslproxy==0)?"no":"yes");

+        fprintf(f,"\n[mail]\nfrom=\nsubjpost=New post\nsubjcomment=New comment in post\nline.0=There is a new post or comment\nline.1=Best regards, kakumei web\n");

         return(0);

 }

@@ -12,11 +12,19 @@

 #ifndef KAKUMEI_CONFIG_H

 #define KAKUMEI_CONFIG_H

 typedef struct kaconfig {

+        /* general */

         char *logfile;

         char *cookiename;

         char *cookiedomain;

         char *bannerpath;

         int sslproxy;

+        /* mail */

+        char *from;

+        char *subjpost;

+        char *subjcomment;

+        int sizelines;

+        int usedlines;

+        char **lines;

 } kaconfig;

 kaconfig *kaconfig_init(char *configfile);

new file mode 100644

@@ -0,0 +1,219 @@

+/*

+ * kakumei_email.c

+ *

+ * E-mail management

+ *

+ * Author: Dario Rodriguez dario@softhome.net

+ * This program is licensed under the terms of the Affero GPL v1+

+ */

+

+#include <stdio.h>

+#include <stdlib.h>

+#include <unistd.h>

+#include <string.h>

+#include <fcntl.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <dirent.h>

+#include "sbuf.h"

+#include "loglib.h"

+#include "kakumei.h"

+#include "kakumei_email.h"

+

+#define RD 0

+#define WR 1

+

+static int email_openprogram(kakumei *ka, char *program,char **args, int *parent2child, int *child2parent);

+static char **email_sendmailargs(kakumei *ka, sbuf *buf, char *fromuser);

+static int writestr(int fd, char *ptr);

+

+int

+email_set(kakumei *ka, char *user, char *email)

+{

+        char filename[1024];

+        int fd;

+        if(ka==NULL || user==NULL || user[0]=='\0' || email==NULL) {

+                log_write("MAIL","sanity check error");

+                return(-1);

+        }

+        mkdir(USERSDIR,0700);

+        snprintf(filename,sizeof(filename)-1,"%s/%s/email",USERSDIR,user);

+        filename[sizeof(filename)-1]='\0';

+        if(email[0]=='\0') {

+                unlink(filename);

+                return(0);

+        }

+        if((fd=open(filename,O_WRONLY|O_TRUNC|O_CREAT,0600))==-1)

+                return(-1);

+        write(fd,email,strlen(email));

+        close(fd),fd=-1;

+        return(0);

+}

+

+int

+email_get(kakumei *ka, char *user, char *email,int sizeemail)

+{

+        char filename[1024];

+        int fd;

+        if(ka==NULL || user==NULL || user[0]=='\0' || email==NULL || sizeemail<1) {

+                log_write("MAIL","sanity check error");

+                return(-1);

+        }

+        snprintf(filename,sizeof(filename)-1,"%s/%s/email",USERSDIR,user);

+        filename[sizeof(filename)-1]='\0';

+        if((fd=open(filename,O_RDONLY))==-1)

+                return(-1);

+        memset(email,0,sizeemail);

+        read(fd,email,sizeemail-1);

+        email[sizeemail-1]='\0';

+        close(fd),fd=-1;

+        return(0);

+}

+

+int

+email_notify(kakumei *ka, char *fromuser, int numpost)

+{

+        int bufnum;

+        sbuf *buf;

+        int parent2child,child2parent;

+        char **args;

+        int i;

+        /* check if from has been defined in config file */

+        if(ka->config->from==NULL) {

+                log_write("MAIL","mail isn't configured in kakumei config file (no \"from\")");

+                return(-1);

+        }

+        /* generate the list of recipients */

+        if((bufnum=wk_sbufacquire(ka->web))==-1) {

+                log_write("MAIL","couldn't acquire buffer to prepare the recipients list");

+                return(-1);

+        }

+        if((buf=wk_sbufget(ka->web,bufnum))==NULL) {

+                log_write("EINT","%s:%i",__FILE__,__LINE__);

+                return(-1);

+        }

+        if((args=email_sendmailargs(ka,buf,fromuser))==NULL) {

+                wk_sbufrelease(ka->web,bufnum),bufnum=-1;

+                log_write("MAIL","couldn't build recipient list");

+                return(-1);

+        }

+        /* send the message */

+        if(email_openprogram(ka,"/usr/sbin/sendmail",args,&parent2child,&child2parent)<=0) {

+                wk_sbufrelease(ka->web,bufnum),bufnum=-1;

+                log_write("MAIL","couldn't exec sendmail");

+                return(-1);

+        }

+        wk_sbufrelease(ka->web,bufnum),bufnum=-1;

+        writestr(parent2child,"From: ");

+        writestr(parent2child,(ka->config->from!=NULL)?ka->config->from:"");

+        writestr(parent2child,"\nSubject: ");

+        if(numpost==-1)

+                writestr(parent2child,(ka->config->subjpost!=NULL)?ka->config->subjpost:"kakumei post");

+        else

+                writestr(parent2child,(ka->config->subjcomment!=NULL)?ka->config->subjcomment:"kakumei comment");

+        if(numpost!=-1) {

+                char mybuf[32];

+                snprintf(mybuf,sizeof(mybuf)," #%i",numpost);

+                mybuf[sizeof(mybuf)-1]='\0';

+                writestr(parent2child,mybuf);

+        }

+        writestr(parent2child,"\n\n");

+        for(i=0;i<ka->config->usedlines;i++) {

+                writestr(parent2child,(ka->config->lines[i]==NULL)?"":ka->config->lines[i]);

+                writestr(parent2child,"\n");

+        }

+        close(parent2child),parent2child=-1;

+        close(child2parent),child2parent=-1;

+        log_write("MAIL","sent email notify from user:%s post:%i",fromuser,numpost);

+        return(0);

+}

+

+static int

+email_openprogram(kakumei *ka, char *program,char **args, int *paramparent2child, int *paramchild2parent)

+{

+        int parent2child[2];

+        int child2parent[2];

+        int pid;

+        parent2child[0]=parent2child[1]=-1;

+        child2parent[0]=child2parent[1]=-1;

+        if(pipe(parent2child)!=0 || pipe(child2parent)!=0) {

+                close(parent2child[0]); /* just in case the first pipe() succeeded but not the second */

+                close(parent2child[1]);

+                return(-1); /* Couldn't create pipes for communicating with child process */

+        }

+        if((pid=fork())==0) {

+                /* child process */

+                int i,l;

+                close(0);

+                dup(parent2child[RD]);

+                close(1);

+                dup(child2parent[WR]);

+                l=getdtablesize();

+                for(i=2;i<l;i++)

+                        close(i);

+                execv(program,args);

+                exit(1); /* error in exec */

+        }

+        close(parent2child[RD]),parent2child[RD]=-1;

+        close(child2parent[WR]),child2parent[WR]=-1;

+        *paramparent2child=parent2child[WR];

+        *paramchild2parent=child2parent[RD];

+        return(pid);

+}

+

+static char **

+email_sendmailargs(kakumei *ka, sbuf *buf, char *fromuser)

+{

+        DIR *dir;

+        struct dirent *de;

+        int pre;

+        int n,k;

+        char *ptr;

+        char **args;

+        char email[128];

+        sbuf_wipe(buf);

+        pre=2;

+        sbuf_addstr(buf,"sendmail");

+        sbuf_add(buf,"",1);

+        sbuf_addstr(buf,"-i");

+        sbuf_add(buf,"",1);

+        if((dir=opendir(USERSDIR))==NULL) {

+                log_write("MAIL","couldn't open users directory");

+                return(NULL);

+        }

+        for(n=0;(de=readdir(dir))!=NULL;) {

+                if(strcmp(de->d_name,fromuser)==0)

+                        continue;

+                if(email_get(ka,de->d_name,email,sizeof(email))!=0)

+                        continue;

+                uri_urldecode(email);

+                sbuf_add(buf,email,strlen(email)+1);

+                n++;

+        }

+        closedir(dir),dir=NULL;

+        if(n==0) {

+                log_write("MAIL","no recipients for e-mail notification");

+                return(NULL); /* no recipients */

+        }

+        n+=pre;

+        if(sbuf_unused(buf)<(sizeof(char *)*(n+1))) {

+                log_write("MAIL","too many recipients, couldn't build list");

+                return(NULL); /* too many recipients */

+        }

+        args=(char **)sbuf_ptrunused(buf);

+        memset((char *)args,0,(sizeof(char *)*(n+1)));

+        for(k=0,ptr=sbuf_ptr(buf);k<n;k++) {

+                args[k]=ptr;

+                ptr+=strlen(ptr)+1;

+        }

+        args[k]=NULL;

+        sbuf_addfromunused(buf,(sizeof(char *)*(n+1)));

+        return(args);

+}

+

+static int

+writestr(int fd, char *ptr)

+{

+        return(write(fd,ptr,strlen(ptr)));

+}

+

new file mode 100644

@@ -0,0 +1,17 @@

+/*

+ * kakumei_email.c

+ *

+ * E-mail management

+ *

+ * Header file.

+ *

+ * Author: Dario Rodriguez dario@softhome.net

+ * This program is licensed under the terms of the Affero GPL v1+

+ */

+

+#include "kakumei.h"

+

+int email_set(kakumei *ka, char *user, char *email);

+int email_get(kakumei *ka, char *user, char *email,int sizeemail);

+int email_notify(kakumei *ka, char *fromuser, int numpost);

+