added odf, ms office attachment support

src/extract.c

@@ -4,15 +4,91 @@
 #include <unistd.h>
 #include <piler.h>
 
+#ifdef HAVE_ZIP
+   #include <zip.h>
+#endif
 
-void extract_pdf(struct session_data *sdata, struct _state *state, char *filename, struct __config *cfg){
+
+void remove_xml(char *buf, int *html){
+   int i=0;
+   char *p;
+
+   p = buf;
+
+   for(; *p; p++){
+      if(*p == '<'){ *html = 1; }
+
+      if(*html == 0){
+         *(buf+i) = *p;
+         i++;
+      }
+
+      if(*p == '>'){
+         *html = 0;
+
+         if(i > 2 && *(buf+i-1) != ' '){
+            *(buf+i) = ' '; i++;
+         }
+
+      }
+
+   }
+
+   *(buf+i) = '\0';
+}
+
+
+int extract_opendocument(struct session_data *sdata, struct _state *state, char *filename, char *prefix){
+   int errorp, i=0, len=0, html=0;
+   char buf[MAXBUFSIZE];
+   struct zip *z;
+   struct zip_stat sb;
+   struct zip_file *zf;
+
+   z = zip_open(filename, 0, &errorp);
+   if(!z) return 1;
+
+   memset(buf, 0, sizeof(buf));
+
+   while(zip_stat_index(z, i, 0, &sb) == 0){
+      if(strncmp(sb.name, prefix, strlen(prefix)) == 0){
+
+         zf = zip_fopen_index(z, i, 0);
+         if(zf){
+            while((len = zip_fread(zf, buf, sizeof(buf))) > 0){
+
+               remove_xml(buf, &html);
+               len = strlen(buf);
+
+               if(state->bodylen < BIGBUFSIZE-len-1){
+                  memcpy(&(state->b_body[state->bodylen]), buf, len);
+                  state->bodylen += len;
+               }
+
+               memset(buf, 0, sizeof(buf));
+            }
+            zip_fclose(zf);
+         }
+
+         if(state->bodylen > BIGBUFSIZE-1024) break;
+      }
+
+      i++;
+   }
+
+
+   zip_close(z);
+
+   return 0;
+}
+
+
+void read_content_with_popen(struct session_data *sdata, struct _state *state, char *cmd){
    int len;
    char buf[MAXBUFSIZE];
    FILE *f;
 
-   snprintf(buf, sizeof(buf)-1, "%s -enc UTF-8 %s -", HAVE_PDFTOTEXT, filename);
-
-   f = popen(buf, "r");
+   f = popen(cmd, "r");
    if(f){
       while(fgets(buf, sizeof(buf)-1, f)){
          len = strlen(buf);
@@ -31,3 +107,62 @@ void extract_pdf(struct session_data *sdata, struct _state *state, char *filenam
 }
 
 
+void extract_attachment_content(struct session_data *sdata, struct _state *state, char *filename, char *type, int *rec){
+   char cmd[SMALLBUFSIZE];
+
+   if(strcmp(type, "other") == 0) return;
+
+   memset(cmd, 0, sizeof(cmd));
+
+#ifdef HAVE_PDFTOTEXT
+   if(strcmp(type, "pdf") == 0) snprintf(cmd, sizeof(cmd)-1, "%s -enc UTF-8 %s -", HAVE_PDFTOTEXT, filename);
+#endif
+
+#ifdef HAVE_CATDOC
+   if(strcmp(type, "doc") == 0) snprintf(cmd, sizeof(cmd)-1, "%s -d utf-8 %s", HAVE_CATDOC, filename);
+#endif
+
+#ifdef HAVE_CATPPT
+   if(strcmp(type, "ppt") == 0) snprintf(cmd, sizeof(cmd)-1, "%s -d utf-8 %s", HAVE_CATPPT, filename);
+#endif
+
+#ifdef HAVE_XLS2CSV
+   if(strcmp(type, "xls") == 0) snprintf(cmd, sizeof(cmd)-1, "%s -d utf-8 %s", HAVE_XLS2CSV, filename);
+#endif
+
+   if(strlen(cmd) > 12){
+      read_content_with_popen(sdata, state, cmd);
+      return;
+   }
+
+
+#ifdef HAVE_ZIP
+   if(strcmp(type, "odf") == 0){
+      extract_opendocument(sdata, state, filename, "content.xml");
+      return;
+   }
+
+   if(strcmp(type, "docx") == 0){
+      extract_opendocument(sdata, state, filename, "word/document.xml");
+      return;
+   }
+
+   if(strcmp(type, "xlsx") == 0){
+      extract_opendocument(sdata, state, filename, "xl/worksheets/sheet");
+      return;
+   }
+
+   if(strcmp(type, "pptx") == 0){
+      extract_opendocument(sdata, state, filename, "ppt/slides/slide");
+      return;
+   }
+
+   if(strcmp(type, "zip") == 0 && *rec == 0){
+      (*rec)++;
+
+   }
+#endif
+
+}
+
+