* readuserfile() now pre-parses the file into a Stream

 -> * Added stream_readuserfile to parse Stream.gets() (auto decrypts)

svn: 2947

src/users.c

@@ -54,9 +54,11 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include "misc_file.h"
+#include "EncryptedStream.h"
+#include "String.h"
 
 char userfile[121] = "";	/* where the user records are stored */
-interval_t ignore_time = 10;		/* how many minutes will ignores last? */
+time_t ignore_time = 10;		/* how many minutes will ignores last? */
 bool	dont_restructure = 0;		/* set when we botlink() to a hub with +U, only stops bot from restructuring */
 
 /* is this nick!user@host being ignored? */
@@ -585,16 +587,23 @@ void backup_userfile()
  */
 
 int readuserfile(const char *file, struct userrec **ret)
+{
+  const char salt1[] = SALT1;
+  EncryptedStream stream(salt1);
+  stream.loadFile(file);
+  int res = stream_readuserfile(stream, ret);
+  return res;
+}
+
+int stream_readuserfile(Stream& stream, struct userrec **ret)
 {
   char *p = NULL, buf[1024] = "", lasthand[512] = "", *attr = NULL, *pass = NULL;
-  char *code = NULL, s1[1024] = "", *s = buf, cbuf[1024] = "", *temps = NULL, ignored[512] = "";
-  FILE *f = NULL;
+  char *code = NULL, s1[1024] = "", *s = buf, ignored[512] = "";
   struct userrec *bu = NULL, *u = NULL;
   struct chanset_t *cst = NULL;
   struct flag_record fr;
   struct chanuserrec *cr = NULL;
   int i, line = 0;
-  const char salt1[] = SALT1;
 
   bu = (*ret);
   if (bu == userlist) {
@@ -605,16 +614,10 @@ int readuserfile(const char *file, struct userrec **ret)
     global_exempts = NULL;
     global_invites = NULL;
   }
-  f = fopen(file, "r");
-  if (f == NULL)
-    return 0;
   noshare = 1;
   /* read opening comment */
-  fgets(cbuf, 180, f);
-  remove_crlf(cbuf);
-  temps = (char *) decrypt_string(salt1, cbuf);
-  simple_snprintf(s, 180, "%s", temps);
-  free(temps);
+  stream.gets(s, 180);
+  remove_crlf(s);
   if (s[1] < '4') {
     putlog(LOG_MISC, "*", "!*! Empty or malformed userfile.");
     return 0;
@@ -623,15 +626,11 @@ int readuserfile(const char *file, struct userrec **ret)
     putlog(LOG_MISC, "*", "Invalid userfile format.");
     return 0;
   }
-  while (!feof(f)) {
+  while (stream.tell() < stream.length()) {
     s = buf;
-    fgets(cbuf, 1024, f);
-    remove_crlf(cbuf);
-    temps = (char *) decrypt_string(salt1, cbuf);
-    simple_snprintf(s, 1024, "%s", temps);
-    OPENSSL_cleanse(temps, strlen(temps));
-    free(temps);
-    if (!feof(f)) {
+    stream.gets(s, 1024);
+    remove_crlf(s);
+    if (1) {
       line++;
       if (s[0] != '#' && s[0] != ';' && s[0]) {
 	code = newsplit(&s);
@@ -739,7 +738,6 @@ int readuserfile(const char *file, struct userrec **ret)
            if (channel_add(resultbuf, chan, options) != OK) {
              putlog(LOG_MISC, "*", "Channel parsing error in userfile on line %d", line);
              free(my_ptr);
-             fclose(f);
              noshare = 0;
              return 0;
            }
@@ -862,7 +860,6 @@ int readuserfile(const char *file, struct userrec **ret)
 	  if (!attr[0] || !pass[0]) {
 	    putlog(LOG_MISC, "*", "* Corrupt user record line: %d!", line);
 	    lasthand[0] = 0;
-            fclose(f);
             noshare = 0;
             return 0;
 	  } else {
@@ -910,7 +907,7 @@ int readuserfile(const char *file, struct userrec **ret)
       }
     }
   }
-  fclose(f);
+
   (*ret) = bu;
   if (ignored[0]) {
     putlog(LOG_MISC, "*", "Ignored masks for channel(s): %s", ignored);

src/users.h

@@ -171,6 +171,7 @@ void tell_file_stats(int, char *);
 void tell_user_ident(int, char *);
 void tell_users_match(int, char *, int, int, char *, int);
 int readuserfile(const char *, struct userrec **);
+int stream_readuserfile(Stream&, struct userrec **);
 void check_pmode();
 void link_pref_val(struct userrec *u, char *lval);
 void check_stale_dcc_users();