From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Fri, 26 Jun 2009 13:36:39 +0000 (+0000)
Subject: Protect ip2name against buffer overflows and replace characters that are valid in... 
X-Git-Tag: v2_2_6~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1c55d8c2af859964577b31f7e2c91b143c49756;p=thirdparty%2Fsarg.git

Protect ip2name against buffer overflows and replace characters that are valid in URL but not in file names when building a file name from a URL.
---

diff --git a/authfail.c b/authfail.c
index d4a5a88..843d602 100644
--- a/authfail.c
+++ b/authfail.c
@@ -139,7 +139,7 @@ void authfail_report()
       }
 
       if(strcmp(Ip2Name,"yes") == 0) 
-         ip2name(ip);
+         ip2name(ip,sizeof(ip));
 
       if(!z) {
          strcpy(ouser,user);
diff --git a/dansguardian_report.c b/dansguardian_report.c
index 3b80de4..b87c662 100644
--- a/dansguardian_report.c
+++ b/dansguardian_report.c
@@ -146,7 +146,7 @@ void dansguardian_report()
       }
 
       if(strcmp(Ip2Name,"yes") == 0) 
-         ip2name(ip);
+         ip2name(ip,sizeof(ip));
 
       if(!z) {
          strcpy(ouser,user);
diff --git a/datafile.c b/datafile.c
index 3df03fe..c94ec40 100644
--- a/datafile.c
+++ b/datafile.c
@@ -95,7 +95,7 @@ void data_file(char *tmp)
          if(strcmp(Ip2Name,"yes") == 0) {
             if(strcmp(accip,ipantes) != 0) {
                strcpy(ipantes,accip);
-               ip2name(accip);
+               ip2name(accip,sizeof(accip));
                strcpy(nameantes,accip);
             } 
 	    else strcpy(accip,nameantes);
diff --git a/denied.c b/denied.c
index e793146..21f20dd 100644
--- a/denied.c
+++ b/denied.c
@@ -124,7 +124,7 @@ void gen_denied_report()
       }
 
       if(strcmp(Ip2Name,"yes") == 0) 
-         ip2name(ip);
+         ip2name(ip,sizeof(ip));
 
       if(!z) {
          strcpy(ouser,user);
diff --git a/download.c b/download.c
index a9a0df6..bb3c56a 100644
--- a/download.c
+++ b/download.c
@@ -131,7 +131,7 @@ void download_report()
       }
 
       if(strcmp(Ip2Name,"yes") == 0) 
-         ip2name(ip);
+         ip2name(ip,sizeof(ip));
 
       if(!z) {
          strcpy(ouser,user);
diff --git a/grepday.c b/grepday.c
index af67fe3..2b2153b 100644
--- a/grepday.c
+++ b/grepday.c
@@ -407,7 +407,7 @@ void greport_day(char *user, int *iprel, int *ipuser)
    if(strcmp(Ip2Name,"yes") == 0)
       if((str=(char *) strstr(name, ".")) != (char *) NULL) {
          if((str=(char *) strstr(str+1, ".")) != (char *) NULL)
-            ip2name(wuser);
+            ip2name(wuser,sizeof(wuser));
    }
 
    if(UserTabFile[0] != '\0') {
diff --git a/html.c b/html.c
index ac4fdf1..70b8c2d 100644
--- a/html.c
+++ b/html.c
@@ -233,7 +233,7 @@ void htmlrel()
          fixip(u2);
       }
       if(strcmp(Ip2Name,"yes") == 0)
-         ip2name(u2);
+         ip2name(u2,sizeof(u2));
 
       if(UserTabFile[0] != '\0') {
          sprintf(warea,":%s:",u2);
@@ -397,8 +397,9 @@ void htmlrel()
             }
             strcpy(siteind,urly);
             str=siteind;
-            for(z1=0; z1<strlen(str); z1++) {
-	       if(str[z1]=='?' || str[z1]=='-' || str[z1]=='.' || str[z1]==':' || str[z1]=='/' || str[z1]=='\\')
+            for(z1=0; str[z1]; z1++) {
+               if(str[z1]=='?' || str[z1]=='-' || str[z1]=='.' || str[z1]==':' || str[z1]=='/' || str[z1]=='\\' || str[z1]=='*' ||
+                  str[z1]=='\'' || str[z1]=='\"' || str[z1]=='$')
                   str[z1]='_';
             }
             sprintf(href2,"<a href=\"tt%s-%s.html\"><img src=\"%s/datetime.png\" border=\"0\" title=\"%s %s\"></a>",usuario,siteind,tmp6,ltext110,text[55]);
diff --git a/include/conf.h b/include/conf.h
index 2aaf653..faae954 100755
--- a/include/conf.h
+++ b/include/conf.h
@@ -351,6 +351,6 @@ int getword(char *word, int limit, char *line, int stop);
 int getword_multisep(char *word, int limit, char *line, int stop);
 int getword3(char *word, int limit, char *line, int stop);
 void name_month(char *month,int month_len);
-
+void ip2name(char *ip,int ip_len);
 
       
\ No newline at end of file
diff --git a/ip2name.c b/ip2name.c
index 3f7c409..1907130 100644
--- a/ip2name.c
+++ b/ip2name.c
@@ -25,7 +25,7 @@
 
 #include "include/conf.h"
 
-void ip2name(char *ip)
+void ip2name(char *ip,int ip_len)
 { 
    u_long addr;
    struct hostent *hp; 
@@ -42,7 +42,8 @@ void ip2name(char *ip)
       struct in_addr in; 
 
       (void) memcpy(&in.s_addr, *p, sizeof (in.s_addr));         
-      (void) sprintf(ip,"%s", hp->h_name); 
+      strncpy(ip,hp->h_name,ip_len-1);
+      ip[ip_len-1]=0;
    } 
 
    return;
diff --git a/log.c b/log.c
index 258ecc9..e837f68 100644
--- a/log.c
+++ b/log.c
@@ -1127,7 +1127,7 @@ int main(argc,argv)
         }
 
 	str=user;
-	for(z1=0; z1<strlen(str); z1++) {
+	for(z1=0; str[z1]; z1++) {
 	   if(isalnum(str[z1]) || ispunct(str[z1])) {
 	   if(str[z1]=='.') dotinuser++;
 	   if(str[z1]=='?' || str[z1]=='.' || str[z1]==':' || str[z1]=='/' || str[z1]=='\\')
diff --git a/realtime.c b/realtime.c
index 5f0be08..6b71f5f 100755
--- a/realtime.c
+++ b/realtime.c
@@ -237,7 +237,7 @@ void datashow(char *tmp)
 
       strcpy(u2,user);
       if(strcmp(Ip2Name,"yes") == 0)
-         ip2name(u2);
+         ip2name(u2,sizeof(u2));
       if(UserTabFile[0] != '\0') {
          sprintf(warea,":%s:",u2);
          if((str=(char *) strstr(userfile,warea)) != (char *) NULL ) {
diff --git a/repday.c b/repday.c
index 9c13b81..aa0bafc 100644
--- a/repday.c
+++ b/repday.c
@@ -96,7 +96,7 @@ void report_day(char *user, int *iprel, int *ipuser)
    if(strcmp(Ip2Name,"yes") == 0)
       if((str=(char *) strstr(name, ".")) != (char *) NULL) {
          if((str=(char *) strstr(str+1, ".")) != (char *) NULL)
-            ip2name(wuser);
+            ip2name(wuser,sizeof(wuser));
    }
 
    if(UserTabFile[0] != '\0') {
diff --git a/report.c b/report.c
index d069032..10d790d 100644
--- a/report.c
+++ b/report.c
@@ -128,7 +128,7 @@ void gerarel()
          if(strcmp(Ip2Name,"yes") == 0) {
             if(strcmp(accip,ipantes) != 0) {
                strcpy(ipantes,accip);
-               ip2name(accip);
+               ip2name(accip,sizeof(accip));
                strcpy(nameantes,accip);
             } else strcpy(accip,nameantes);
          }
@@ -193,10 +193,11 @@ void gerarel()
             ind2++;
 	    strcpy(siteind,accurl);
 	    str=siteind;
-	    for(z1=0; z1<strlen(str); z1++) {
-	    if(str[z1]=='?' || str[z1]=='-' || str[z1]=='.' || str[z1]==':' || str[z1]=='/' || str[z1]=='\\')
-	                     str[z1]='_';
-            }
+	    for(z1=0; str[z1]; z1++) {
+	       if(str[z1]=='?' || str[z1]=='-' || str[z1]=='.' || str[z1]==':' || str[z1]=='/' || str[z1]=='\\' || str[z1]=='*' ||
+              str[z1]=='\'' || str[z1]=='\"' || str[z1]=='$')
+	          str[z1]='_';
+        }
 	    sprintf(arqtt,"%s/%s",dirname,accuser);
 	    if(access(arqtt, R_OK) != 0)
                my_mkdir(arqtt);
@@ -240,7 +241,7 @@ void gerarel()
 
             strcpy(u2,user);
             if(strcmp(Ip2Name,"yes") == 0)
-               ip2name(u2);
+               ip2name(u2,sizeof(u2));
             if(UserTabFile[0] != '\0') {
                sprintf(warea,":%s:",u2);
                if((str=(char *) strstr(userfile,warea)) != (char *) NULL ) {
diff --git a/siteuser.c b/siteuser.c
index c300cc9..261644a 100644
--- a/siteuser.c
+++ b/siteuser.c
@@ -157,10 +157,10 @@ void siteuser()
       }
 
       if(strcmp(Ip2Name,"yes") == 0)
-         ip2name(user);
+         ip2name(user,sizeof(user));
 
       if(strcmp(Ip2Name,"yes") == 0)
-         ip2name(user);
+         ip2name(user,sizeof(user));
 
       if (getword(nacc,sizeof(nacc),buf,' ')<0){
          printf("SARG: Maybe you have an invalid number of access in your %s file of the siteuser.\n",general2);
diff --git a/squidguard_report.c b/squidguard_report.c
index 8b0cb5e..ada1d45 100644
--- a/squidguard_report.c
+++ b/squidguard_report.c
@@ -138,7 +138,7 @@ void squidguard_report()
       }
 
       if(strcmp(Ip2Name,"yes") == 0) 
-         ip2name(ip);
+         ip2name(ip,sizeof(ip));
 
       if(!z) {
          strcpy(ouser,user);
diff --git a/topuser.c b/topuser.c
index 9a230d5..d172ef9 100644
--- a/topuser.c
+++ b/topuser.c
@@ -408,7 +408,7 @@ int topuser()
          if(strcmp(Ip2Name,"yes") == 0) {
             if(strcmp(user2,ipantes) != 0) {
                strcpy(ipantes,user2);
-               ip2name(user2);
+               ip2name(user2,sizeof(user2));
                strcpy(nameantes,user2);
             } else strcpy(user2,nameantes);
          }
@@ -445,7 +445,7 @@ int topuser()
       if((strcmp(Ip2Name,"yes") == 0) && 
         ((str=(char *) strstr(name, ".")) != (char *) NULL) && 
 	((str=(char *) strstr(str+1, ".")) != (char *) NULL))
-               ip2name(name);
+               ip2name(name,sizeof(name));
 
       twork=my_atoll(nacc);
       my_lltoa(twork,nacc,0);
diff --git a/useragent.c b/useragent.c
index 4d47da9..15ed405 100644
--- a/useragent.c
+++ b/useragent.c
@@ -184,7 +184,7 @@ void useragent()
       if(strcmp(Ip2Name,"yes") == 0) {
          if(strcmp(ip,ipbefore) != 0) {
             strcpy(ipbefore,ip);
-            ip2name(ip);
+            ip2name(ip,sizeof(ip));
             strcpy(namebefore,ip);
          } else strcpy(ip,namebefore);
       }