@@ -8,4 +8,4 @@ res/*.workingnote

 src/data

 src/*.txt

 src/*.workingnote

-

+src/kakumei.conf

@@ -12,11 +12,11 @@ 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_posts.o kakumei_config.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_posts.o kakumei_config.o \

 		-o kakumei

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

@@ -23,6 +23,12 @@

 #include "kakumei_session.h"

 #include "kakumei_pass.h"

 #include "kakumei_posts.h"

+#include "kakumei_config.h"

+

+#define CONFIGFILE "kakumei.conf"

+#define CFCOOKIEPREFIX "kakumei_"

+#define CFCOOKIEDOMAIN "localhost"

+#define CFBANNERPATH "default.png"

 static int signal_init(int signum, void (*fn)(int));

 static void sigint(int signum);

@@ -52,6 +58,14 @@ main(int argc, char *argv[])

                 return(1);

         }

         port=atoi(argv[1]);

+        if(kaconfig_exists(CONFIGFILE)!=0) {

+                log_write("INIT","Config file not found, writing default file %s",CONFIGFILE);

+                kaconfig_write(CONFIGFILE,CFCOOKIEPREFIX,CFCOOKIEDOMAIN,CFBANNERPATH);

+        }

+        if((ka->config=kaconfig_init(CONFIGFILE))==NULL) {

+                log_write("INIT","ERROR: insufficient memory or config file error");

+                return(1);

+        }

         if((ka->ssel=sselect_init())==NULL) {

                 log_write("INIT","ERROR: insufficient memory");

                 return(1);

@@ -70,6 +84,7 @@ main(int argc, char *argv[])

         }

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

         sselect_free(ka->ssel),ka->ssel=NULL;

+        kaconfig_free(ka->config),ka->config=NULL;

         log_write("FINI","SIGINT detected, exiting...");

         return(0);

 }

@@ -166,6 +181,8 @@ callback_http(wk *web, int connid, wk_uri *uri, void *userptr)

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

         if(strcmp(uri->path,"/")==0)

                 strcpy(partialpath,"/index.html");

+        if(strcmp(uri->path,"/banner.png")==0)

+                strcpy(partialpath,(ka->config->bannerpath!=NULL)?ka->config->bannerpath:"/" CFBANNERPATH);

         if((ptr=strchr(partialpath,'?'))!=NULL)

                 *ptr='\0';

         /* check whitelist */

@@ -199,6 +216,14 @@ callback_http(wk *web, int connid, wk_uri *uri, void *userptr)

                         wk_serve_error(web,connid,wkerr_internal);

                         return(wkact_finished); /* internal error */

                 }

+        } else if(strcmp(uri->path,"/banner.png")==0) {

+                log_write("HTTP","Serving banner from disk, file %s",partialpath);

+                if(wk_serve_file(web,connid,partialpath,mime_getdefault(partialpath,"image/png"))!=0) {

+                        log_write("HTTP","File not found, file %s",partialpath);

+                        wk_serve_error(web,connid,wkerr_notfound);

+                        return(wkact_finished); /* internal error */

+                }

+                return(wkact_finished);

         }

         /* check for actions */

         if(memcmp(uri->path,"/login?",7)==0) {

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

 #include "socklib.h"

 #include "webkernel.h"

+#include "kakumei_config.h"

 #define INVITATIONUSER "invitation"

 #define DATADIR "data"

@@ -28,6 +29,7 @@

 typedef struct kakumei {

         sselect *ssel;

         wk *web;

+        kaconfig *config;

 } kakumei;

 int kakumei_uservalid(kakumei *ka, char *username); /* no unallowed characters */

new file mode 100644

@@ -0,0 +1,156 @@

+/*

+ * kakumei_config.c

+ *

+ * Config management for the kakumei server.

+ *

+ * Author: Dario Rodriguez dario@softhome.net

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

+ */

+

+

+#include <stdio.h>

+#include <stdlib.h>

+#include <unistd.h>

+#include <string.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+

+#include "loglib.h"

+#include "kakumei_config.h"

+

+#define MAXLINESIZE 2048

+

+kaconfig *

+kaconfig_init(char *configfile)

+{

+        kaconfig *config;

+        FILE *f;

+        char line[MAXLINESIZE];

+        int len;

+        char *ptr,*sep,*value;

+        int generalsection;

+        int lineno;

+        char **configvalue;

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

+                return(NULL);

+        if((config=malloc(sizeof(kaconfig)))==NULL) {

+                fclose(f),f=NULL;

+                return(NULL);

+        }

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

+        generalsection=0;

+        lineno=0;

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

+                lineno++;

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

+                /* trim line */

+                len=strlen(line);

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

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

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

+                        ;

+                len=strlen(ptr);

+                /* ignore empty lines and comments */

+                if(*ptr=='\0' || strchr("#;",*ptr)!=NULL)

+                        continue;

+                /* parse line */

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

+                        /* section */

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

+                                generalsection=1;

+                        else {

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

+                                generalsection=0;

+                        }

+                        continue;

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

+                        *sep='\0';

+                        value=sep+1;

+                        /* trim key */

+                        while(sep>ptr && strchr(" \t",sep[-1])!=NULL) {

+                                sep--;

+                                *sep='\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);

+                                continue;

+                        }

+                        /* assign value */

+                        if(generalsection!=1) {

+                                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,"cookieprefix")==0) {

+                                configvalue=&(config->cookieprefix);

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

+                                configvalue=&(config->cookiedomain);

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

+                                configvalue=&(config->bannerpath);

+                        } else {

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

+                                continue;

+                        }

+                        /* store value */

+                        if(*configvalue!=NULL) {

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

+                                continue;

+                        }

+                        if((*configvalue=strdup(value))==NULL) {

+                                fclose(f),f=NULL;

+                                kaconfig_free(config),config=NULL;

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

+                        }

+                        continue;

+                } else {

+                        log_write("CONF","%s:%i: malformed line, ignoring; contents:\"%s\"\n",configfile,lineno,ptr);

+                        continue;

+                }

+        }

+        fclose(f),f=NULL;

+        return(config);

+

+}

+

+void

+kaconfig_free(kaconfig *config)

+{

+        if(config==NULL)

+                return;

+        if(config->cookieprefix!=NULL)

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

+        if(config->cookiedomain!=NULL)

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

+        if(config->bannerpath!=NULL)

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

+        free(config),config=NULL;

+        return;

+}

+

+int

+kaconfig_exists(char *configfile)

+{

+        struct stat st;

+        if(stat(configfile,&st)!=0)

+                return(-1);

+        return(0);

+}

+

+int

+kaconfig_write(char *configfile,char *cookieprefix,char *cookiedomain, char *bannerpath)

+{

+        FILE *f;

+        if((f=fopen(configfile,"w"))==NULL)

+                return(-1);

+        fprintf(f,"; kakumei config file\n");

+        fprintf(f,"[general]\n");

+        fprintf(f,"cookieprefix=%s\n",(cookieprefix!=NULL)?cookieprefix:"kakumei_");

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

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

+        return(0);

+}

+

new file mode 100644

@@ -0,0 +1,25 @@

+/*

+ * kakumei_config.h

+ *

+ * Config management for the kakumei server.

+ *

+ * Header file.

+ *

+ * Author: Dario Rodriguez dario@softhome.net

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

+ */

+

+#ifndef KAKUMEI_CONFIG_H

+#define KAKUMEI_CONFIG_H

+typedef struct kaconfig {

+        char *cookieprefix;

+        char *cookiedomain;

+        char *bannerpath;

+} kaconfig;

+

+kaconfig *kaconfig_init(char *configfile);

+void kaconfig_free(kaconfig *config);

+

+int kaconfig_exists(char *configfile);

+int kaconfig_write(char *configfile,char *cookieprefix,char *cookiedomain, char *bannerpath);

+#endif